Skip to content

Commit 33d5137

Browse files
refringerefringe
committed
Merge branch '3.10.4-DEV'
2 parents ec5227a + c6a9a1a commit 33d5137

File tree

126 files changed

+22132
-21758
lines changed

Some content is hidden

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

126 files changed

+22132
-21758
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ There are a number of VSC extensions that we recommended for this project. VSC w
3939

4040
To prepare the project for development you will need to:
4141

42-
1. Run `git clone https://dev.sp-tarkov.com/SPT/Server.git server` to clone the repository.
42+
1. Run `git clone https://github.com/sp-tarkov/server.git server` to clone the repository.
4343
2. Run `git lfs pull` to download LFS files locally.
4444
3. Open the `project/mod.code-workspace` file in Visual Studio Code (VSC).
4545
4. Run `nvm use 20.11.1` in the VSC terminal.

‎project/Server.code-workspace

+21-5
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,36 @@
3131
"runtimeExecutable": "npm",
3232
"request": "launch",
3333
"sourceMaps": true,
34-
"runtimeArgs": ["run", "run:debug"],
35-
"outFiles": ["!**/node_modules/**"],
34+
"runtimeArgs": [
35+
"run",
36+
"run:debug"
37+
],
38+
"outFiles": [
39+
"!**/node_modules/**"
40+
],
3641
"cwd": "${workspaceFolder}",
37-
"outputCapture": "std"
42+
"outputCapture": "std",
43+
"console": "integratedTerminal",
44+
"internalConsoleOptions": "neverOpen"
3845
},
3946
{
4047
"name": "Run Vitest Tests",
4148
"type": "node",
4249
"runtimeVersion": "20.11.1",
4350
"runtimeExecutable": "npm",
4451
"request": "launch",
45-
"runtimeArgs": ["run", "test"],
52+
"runtimeArgs": [
53+
"run",
54+
"test"
55+
],
4656
"console": "integratedTerminal",
47-
"internalConsoleOptions": "neverOpen"
57+
"internalConsoleOptions": "neverOpen",
58+
"cwd": "${workspaceFolder}",
59+
"sourceMaps": true,
60+
"outputCapture": "std",
61+
"outFiles": [
62+
"!**/node_modules/**"
63+
]
4864
}
4965
]
5066
}

‎project/assets/configs/core.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"sptVersion": "3.10.3",
2+
"sptVersion": "3.10.4",
33
"projectName": "SPT",
44
"compatibleTarkovVersion": "0.15.5.33420",
55
"serverName": "SPT Server",

‎project/assets/configs/inventory.json

+25-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"57347d692459774491567cf1": 100,
3131
"5bc9c29cd4351e003562b8a3": 100,
3232
"57347d8724597744596b4e76": 100,
33-
"5c0530ee86f774697952d95200": 1
33+
"5c0530ee86f774697952d952": 10
3434
}
3535
},
3636
"63a8970d7108f713591149f5": {
@@ -1406,6 +1406,28 @@
14061406
"5448e53e4bdc2d60728b4567",
14071407
"5a2c3a9486f774688b05e574"
14081408
]
1409+
},
1410+
"674078c4a9c9adf0450d59f9": {
1411+
"_type": "opened case - walter event quest",
1412+
"rewardCount": 4,
1413+
"foundInRaid": true,
1414+
"rewardTplPool": {"67409848d0b2f8eb9b034db9": 1}
1415+
},
1416+
"674098588466ebb03408b210": {
1417+
"_type": "opened box - walter event quest",
1418+
"rewardCount": 6,
1419+
"foundInRaid": true,
1420+
"rewardTypePool": [
1421+
"57864c8c245977548867e7f1",
1422+
"54009119af1c881c07000029",
1423+
"57864c322459775490116fbf",
1424+
"57864a3d24597754843f8721",
1425+
"590c745b86f7743cc433c5f2",
1426+
"57864ee62459775490116fc1",
1427+
"57864e4c24597754843f8723",
1428+
"55818ae44bdc2dde698b456c",
1429+
"550aa4154bdc2dd8348b456b"
1430+
]
14091431
}
14101432
},
14111433
"sealedAirdropContainer": {
@@ -1573,5 +1595,6 @@
15731595
"customMoneyTpls": [],
15741596
"skillGainMultiplers": {
15751597
"Strength": 1
1576-
}
1598+
},
1599+
"deprioritisedMoneyContainers": ["590c60fc86f77412b13fddcf", "5d235bb686f77443f4331278"]
15771600
}

‎project/assets/configs/item.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@
115115
"671d8ac8a3e45c1f59082799",
116116
"671d8b38b769f0d88c0950f8",
117117
"671d8b8c0959c721a50ca838",
118-
"660bc341c38b837877075e4c"
118+
"660bc341c38b837877075e4c",
119+
"67409848d0b2f8eb9b034db9",
120+
"67449b6c89d5e1ddc603f504"
119121
],
120122
"bossItems": [
121123
"6275303a9f372d6ea97f9ec7",

‎project/assets/configs/pmc.json

+8-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@
6767
"614451b71e5874611e2c7ae5",
6868
"6540d2162ae6d96b540afcaf",
6969
"65ca457b4aafb5d7fc0dcb5d",
70-
"6331ba83f2ab4f3f09502983"
70+
"6331ba83f2ab4f3f09502983",
71+
"67409848d0b2f8eb9b034db9",
72+
"67449b6c89d5e1ddc603f504"
7173
]
7274
},
7375
"pocketLoot": {
@@ -123,7 +125,8 @@
123125
"6391fcf5744e45201147080f",
124126
"65ca457b4aafb5d7fc0dcb5d",
125127
"660bbc98c38b837877075e4a",
126-
"6331ba83f2ab4f3f09502983"
128+
"6331ba83f2ab4f3f09502983",
129+
"67449b6c89d5e1ddc603f504"
127130
]
128131
},
129132
"backpackLoot": {
@@ -184,7 +187,9 @@
184187
"65ca457b4aafb5d7fc0dcb5d",
185188
"660bbc98c38b837877075e4a",
186189
"66d9f7256916142b3b02276e",
187-
"6331ba83f2ab4f3f09502983"
190+
"6331ba83f2ab4f3f09502983",
191+
"67409848d0b2f8eb9b034db9",
192+
"67449b6c89d5e1ddc603f504"
188193
]
189194
},
190195
"useDifficultyOverride": false,

‎project/assets/configs/ragfair.json

+7-1
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,13 @@
336336
"handbookPriceOverMultiplier": 11,
337337
"newPriceHandbookMultiplier": 11
338338
}
339-
}
339+
},
340+
"itemPriceOverrideRouble":{
341+
"66bc98a01a47be227a5e956e": 500000,
342+
"63a8970d7108f713591149f5": 50000,
343+
"63a898a328e385334e0640a5": 100000,
344+
"63a897c6b1ff6e29734fcc95": 200000
345+
}
340346
},
341347
"tieredFlea": {
342348
"enabled": false,

‎project/assets/configs/seasonalevents.json

+22
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,28 @@
231231
}
232232
}
233233
},
234+
"eventLoot": {
235+
"christmas": {
236+
"assault": {
237+
"Pockets": {
238+
"5df8a6a186f77412640e2e80": 2200,
239+
"5df8a72c86f77412640e2e83": 2200,
240+
"5df8a77486f77412672a1e3f": 2200
241+
},
242+
"Backpack": {
243+
"5df8a6a186f77412640e2e80": 2200,
244+
"5df8a72c86f77412640e2e83": 2200,
245+
"5df8a77486f77412672a1e3f": 2200,
246+
"63a8970d7108f713591149f5": 250
247+
},
248+
"TacticalVest": {
249+
"5df8a6a186f77412640e2e80": 2200,
250+
"5df8a72c86f77412640e2e83": 2200,
251+
"5df8a77486f77412672a1e3f": 2200
252+
}
253+
}
254+
}
255+
},
234256
"eventBotMapping": {
235257
"peacefullZryachiyEvent": "bossZryachiy",
236258
"sectactPriestEvent": "sectantPriest",

‎project/assets/configs/weather.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"generateWeatherAmountHours": 24,
55
"clouds": {
66
"values": [-1, -0.8, -0.5, 0.1, 0, 0.15, 0.4, 1],
7-
"weights": [100, 22, 22, 15, 15, 15, 5, 4]
7+
"weights": [80, 22, 22, 15, 15, 15, 5, 4]
88
},
99
"windSpeed": {
1010
"values": [0, 1, 2, 3, 4],
@@ -20,7 +20,7 @@
2020
},
2121
"rain": {
2222
"values": [1, 2, 3, 4, 5],
23-
"weights": [25, 1, 1, 1, 1]
23+
"weights": [20, 1, 1, 1, 1]
2424
},
2525
"rainIntensity": {
2626
"min": 0,

0 commit comments

Comments
 (0)