Skip to content

Commit 3dd9ce1

Browse files
committed
Merge branch '3.10.0-DEV'
2 parents 617a068 + 058ed22 commit 3dd9ce1

File tree

622 files changed

+876700
-690217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

622 files changed

+876700
-690217
lines changed

.drone.yml

-214
This file was deleted.

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ To prepare the project for development you will need to:
5252
The following commands are available after the initial setup. Run them with `npm run <command>`.
5353

5454
| Command | Description |
55-
| -------------------- | ------------------------------------------------------------------------- |
55+
|----------------------|---------------------------------------------------------------------------|
5656
| `check:circular` | Check for circular dependencies in the project. |
5757
| `lint` | Check the project for coding standards issues using Biome. |
5858
| `lint:fix` | Automatically fix coding standards issues using Biome. |
@@ -85,14 +85,14 @@ To debug a server mod in Visual Studio Code, you can copy the mod files into the
8585

8686
We're really excited that you're interested in contributing! Before submitting your contribution, please consider the following:
8787

88-
### Branchs
88+
### Branches
8989

9090
- **master**
9191
The default branch used for the latest stable release. This branch is protected and typically is only merges with release branches.
92-
- **3.9.4-DEV**
92+
- **3.10.X-DEV**
93+
Development for the next hotfix release. Hotfix releases include bug fixes and minor features that do not affect the coding structure of the project. Special care is taken to not break server mod stability. These always target the same version of EFT as the last minor release.
94+
- **3.11.0-DEV**
9395
Development for the next minor release of SPT. Minor releases target the latest version of EFT. Late in the minor release cycle the EFT version is frozen for stability to prepare for release. Larger changes to the project structure may be included in minor releases.
94-
- **3.10.0-DEV**
95-
Development for the next hotfix release of SPT. Hotfix releases include bug fixes and minor features that do not effect the coding structure of the project. Special care is taken to not break server mod stability. These always target the same version of EFT as the last minor release.
9696

9797
### Pull Request Guidelines
9898

project/assets/configs/airdrop.json

+44-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
22
"airdropTypeWeightings": {
33
"mixed": 5,
4-
"weaponArmor": 2,
4+
"weaponArmor": 4,
55
"foodMedical": 1,
6-
"barter": 1
6+
"barter": 1,
7+
"radar": 0
78
},
89
"loot": {
910
"mixed": {
11+
"icon": "Common",
1012
"weaponPresetCount": {
1113
"min": 3,
1214
"max": 5
@@ -108,6 +110,7 @@
108110
"allowBossItems": false
109111
},
110112
"weaponArmor": {
113+
"icon": "Weapon",
111114
"weaponPresetCount": {
112115
"min": 6,
113116
"max": 8
@@ -180,6 +183,7 @@
180183
"allowBossItems": false
181184
},
182185
"foodMedical": {
186+
"icon": "Medical",
183187
"weaponPresetCount": {
184188
"min": 0,
185189
"max": 0
@@ -189,8 +193,8 @@
189193
"max": 0
190194
},
191195
"itemCount": {
192-
"min": 17,
193-
"max": 28
196+
"min": 25,
197+
"max": 45
194198
},
195199
"weaponCrateCount": {
196200
"min": 0,
@@ -260,6 +264,7 @@
260264
"allowBossItems": false
261265
},
262266
"barter": {
267+
"icon": "Supply",
263268
"weaponPresetCount": {
264269
"min": 0,
265270
"max": 0
@@ -339,6 +344,39 @@
339344
},
340345
"armorLevelWhitelist": [0],
341346
"allowBossItems": false
342-
}
343-
}
347+
},
348+
"radar": {
349+
"icon": "Supply",
350+
"weaponPresetCount": {
351+
"min": 0,
352+
"max": 0
353+
},
354+
"armorPresetCount": {
355+
"min": 0,
356+
"max": 0
357+
},
358+
"itemCount": {
359+
"min": 0,
360+
"max": 0
361+
},
362+
"weaponCrateCount": {
363+
"min": 0,
364+
"max": 0
365+
},
366+
"itemBlacklist": [],
367+
"itemTypeWhitelist": [],
368+
"itemLimits": {},
369+
"itemStackLimits": {},
370+
"armorLevelWhitelist": [],
371+
"allowBossItems": false,
372+
"useForcedLoot": true,
373+
"forcedLoot": {
374+
"66d9f7256916142b3b02276e": {"min": 2, "max": 4 }
375+
}
376+
}
377+
},
378+
"customAirdropMapping": {
379+
"66da1b49099cf6adcc07a36b": "radar",
380+
"66da1b546916142b3b022777": "radar"
381+
}
344382
}

0 commit comments

Comments
 (0)