470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0

Browse Source
This commit is contained in:
Dev 2023-11-01 11:35:18 +00:00
commit d1db6cc7a9
2 changed files with 66 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
project/assets/configs/seasonalevents.json
View File

@ -4,24 +4,24 @@
"halloween": {
"assault": {
"FaceCover": {
"5bd071d786f7747e707b93a3": 1,
"5bd0716d86f774171822ef4b": 1,
"5bd06f5d86f77427101ad47c": 1,
"6176a48d732a664031271438": 1,
"6176a40f0b8c0312ac75a3d3": 1,
"62a5c2c98ec41a51b34739c0": 1,
"62a5c333ec21e50cad3b5dc6": 1,
"62a5c41e8ec41a51b34739c3": 1,
"635267ab3c89e2112001f826": 1,
"5e54f79686f7744022011103": 1
"5bd071d786f7747e707b93a3": 1500,
"5bd0716d86f774171822ef4b": 1500,
"5bd06f5d86f77427101ad47c": 1500,
"6176a48d732a664031271438": 1500,
"6176a40f0b8c0312ac75a3d3": 1500,
"62a5c2c98ec41a51b34739c0": 1500,
"62a5c333ec21e50cad3b5dc6": 1500,
"62a5c41e8ec41a51b34739c3": 1500,
"635267ab3c89e2112001f826": 1500,
"5e54f79686f7744022011103": 1500
},
"Headwear": {
"59ef13ca86f77445fd0e2483": 2
"59ef13ca86f77445fd0e2483": 1500
}
},
"bossTagilla": {
"Scabbard": {
"63495c500c297e20065a08b1": 2
"63495c500c297e20065a08b1": 10
}
},
"bear": {
@ -65,22 +65,22 @@
"5c1a1e3f2e221602b66cc4c2": 5
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
"5a43943586f77416ad2f06e2": 500,
"5a43957686f7742a2c2f11b0": 500
}
},
"bossbully": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 5
"5c1a1e3f2e221602b66cc4c2": 120
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
"5a43943586f77416ad2f06e2": 150,
"5a43957686f7742a2c2f11b0": 150
}
},
"bossknight": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 5
"5c1a1e3f2e221602b66cc4c2": 1500
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
@ -89,20 +89,29 @@
},
"bosssanitar": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 5
"5c1a1e3f2e221602b66cc4c2": 600
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
}
},
"exusec": {
"bossboar": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 5
"5c1a1e3f2e221602b66cc4c2": 1
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
"5a43943586f77416ad2f06e2": 1,
"5a43957686f7742a2c2f11b0": 1
}
},
"exusec": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 1200
},
"Headwear": {
"5a43943586f77416ad2f06e2": 500,
"5a43957686f7742a2c2f11b0": 500
}
},
"followerbigpipe": {
@ -113,23 +122,32 @@
},
"followerbirdeye": {
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
"5a43943586f77416ad2f06e2": 1,
"5a43957686f7742a2c2f11b0": 1
}
},
"followerbully": {
"Headwear": {
"5a43943586f77416ad2f06e2": 600,
"5a43957686f7742a2c2f11b0": 600
}
},
"followerboar": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 250
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
}
},
"followergluharassault": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 5
"5c1a1e3f2e221602b66cc4c2": 550
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
"5a43943586f77416ad2f06e2": 700,
"5a43957686f7742a2c2f11b0": 700
}
},
"followergluharscout": {
@ -161,26 +179,26 @@
"5c1a1e3f2e221602b66cc4c2": 5
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
"5a43943586f77416ad2f06e2": 1,
"5a43957686f7742a2c2f11b0": 1
}
},
"marksman": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 5
"5c1a1e3f2e221602b66cc4c2": 400
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
"5a43943586f77416ad2f06e2": 1400,
"5a43957686f7742a2c2f11b0": 1400
}
},
"pmcbot": {
"FaceCover": {
"5c1a1e3f2e221602b66cc4c2": 5
"5c1a1e3f2e221602b66cc4c2": 1200
},
"Headwear": {
"5a43943586f77416ad2f06e2": 3,
"5a43957686f7742a2c2f11b0": 3
"5a43943586f77416ad2f06e2": 600,
"5a43957686f7742a2c2f11b0": 600
}
},
"sectantpriest": {

13
project/src/services/SeasonalEventService.ts
View File

@ -62,7 +62,15 @@ export class SeasonalEventService
return [
"635267ab3c89e2112001f826", // Halloween skull mask
"634959225289190e5e773b3b", // Pumpkin loot box
"59ef13ca86f77445fd0e2483" // Jack'o'lantern helmet
"59ef13ca86f77445fd0e2483", // Jack'o'lantern helmet
"6176a48d732a664031271438", // Faceless mask
"5bd071d786f7747e707b93a3", // Jason mask
"5bd0716d86f774171822ef4b", // Misha Mayorov mask
"5bd06f5d86f77427101ad47c", // Slender mask
"6176a40f0b8c0312ac75a3d3", // Ghoul mask
"62a5c2c98ec41a51b34739c0", // Hockey player mask "Captain"
"62a5c333ec21e50cad3b5dc6", // Hockey player mask "Brawler"
"62a5c41e8ec41a51b34739c3" // Hockey player mask "Quiet"
];
}
@ -376,6 +384,9 @@ export class SeasonalEventService
const gearAmendments = botGearChanges[bot];
for (const equipmentSlot in gearAmendments)
{
// Adjust slots spawn chance to be at least 75%
botToUpdate.chances.equipment[equipmentSlot] = Math.max(botToUpdate.chances.equipment[equipmentSlot], 75);
// Grab gear to add and loop over it
const itemsToAdd = gearAmendments[equipmentSlot];
for (const itemTplIdToAdd in itemsToAdd)