0
0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-12 16:50:43 -05:00

Biome Format

Ran the `npm run style:fix` command. These are the code-formatting fixes.
This commit is contained in:
Refringe 2024-12-07 13:50:09 -05:00
parent c3cd67d8b9
commit 21939dcf38
Signed by: Refringe
SSH Key Fingerprint: SHA256:t865XsQpfTeqPRBMN2G6+N8wlDjkgUCZF3WGW6O9N/k
25 changed files with 11499 additions and 7373 deletions

View File

@ -4,11 +4,11 @@
"weaponArmor": 4, "weaponArmor": 4,
"foodMedical": 1, "foodMedical": 1,
"barter": 1, "barter": 1,
"radar": 0 "radar": 0
}, },
"loot": { "loot": {
"mixed": { "mixed": {
"icon": "Common", "icon": "Common",
"weaponPresetCount": { "weaponPresetCount": {
"min": 3, "min": 3,
"max": 5 "max": 5
@ -110,7 +110,7 @@
"allowBossItems": false "allowBossItems": false
}, },
"weaponArmor": { "weaponArmor": {
"icon": "Weapon", "icon": "Weapon",
"weaponPresetCount": { "weaponPresetCount": {
"min": 6, "min": 6,
"max": 8 "max": 8
@ -183,7 +183,7 @@
"allowBossItems": false "allowBossItems": false
}, },
"foodMedical": { "foodMedical": {
"icon": "Medical", "icon": "Medical",
"weaponPresetCount": { "weaponPresetCount": {
"min": 0, "min": 0,
"max": 0 "max": 0
@ -264,7 +264,7 @@
"allowBossItems": false "allowBossItems": false
}, },
"barter": { "barter": {
"icon": "Supply", "icon": "Supply",
"weaponPresetCount": { "weaponPresetCount": {
"min": 0, "min": 0,
"max": 0 "max": 0
@ -345,9 +345,9 @@
"armorLevelWhitelist": [0], "armorLevelWhitelist": [0],
"allowBossItems": false "allowBossItems": false
}, },
"radar": { "radar": {
"icon": "Supply", "icon": "Supply",
"weaponPresetCount": { "weaponPresetCount": {
"min": 0, "min": 0,
"max": 0 "max": 0
}, },
@ -355,28 +355,28 @@
"min": 0, "min": 0,
"max": 0 "max": 0
}, },
"itemCount": { "itemCount": {
"min": 0, "min": 0,
"max": 0 "max": 0
}, },
"weaponCrateCount": { "weaponCrateCount": {
"min": 0, "min": 0,
"max": 0 "max": 0
}, },
"itemBlacklist": [], "itemBlacklist": [],
"itemTypeWhitelist": [], "itemTypeWhitelist": [],
"itemLimits": {}, "itemLimits": {},
"itemStackLimits": {}, "itemStackLimits": {},
"armorLevelWhitelist": [], "armorLevelWhitelist": [],
"allowBossItems": false, "allowBossItems": false,
"useForcedLoot": true, "useForcedLoot": true,
"forcedLoot": { "forcedLoot": {
"66d9f7256916142b3b02276e": {"min": 2, "max": 4 } "66d9f7256916142b3b02276e": { "min": 2, "max": 4 }
} }
} }
}, },
"customAirdropMapping": { "customAirdropMapping": {
"66da1b49099cf6adcc07a36b": "radar", "66da1b49099cf6adcc07a36b": "radar",
"66da1b546916142b3b022777": "radar" "66da1b546916142b3b022777": "radar"
} }
} }

View File

@ -106,7 +106,7 @@
}, },
"boss": { "boss": {
"armor": { "armor": {
"lowestMaxPercent": 90, "lowestMaxPercent": 90,
"highestMaxPercent": 100, "highestMaxPercent": 100,
"maxDelta": 15, "maxDelta": 15,
"minDelta": 0, "minDelta": 0,
@ -366,8 +366,8 @@
"5448e8d64bdc2dce718b4568": 2 "5448e8d64bdc2dce718b4568": 2
}, },
"followersanitar": { "followersanitar": {
"590c2e1186f77425357b6124": 1 "590c2e1186f77425357b6124": 1
}, },
"followertagilla": {}, "followertagilla": {},
"followerbirdeye": {}, "followerbirdeye": {},
"followerbigpipe": {}, "followerbigpipe": {},
@ -1363,33 +1363,33 @@
"mod_nvg": 50 "mod_nvg": 50
} }
}, },
"minimumMagazineSize": { "minimumMagazineSize": {
"5447a9cd4bdc2dbd208b4567": 30, "5447a9cd4bdc2dbd208b4567": 30,
"5926bb2186f7744b1c6c6e60": 30, "5926bb2186f7744b1c6c6e60": 30,
"5c07c60e0db834002330051f": 30, "5c07c60e0db834002330051f": 30,
"5bb2475ed4351e00853264e3": 30, "5bb2475ed4351e00853264e3": 30,
"5bf3e03b0db834001d2c4a9c": 30, "5bf3e03b0db834001d2c4a9c": 30,
"5644bd2b4bdc2d3b4c8b4572": 30, "5644bd2b4bdc2d3b4c8b4572": 30,
"63171672192e68c5460cebc5": 30, "63171672192e68c5460cebc5": 30,
"62e7c4fba689e8c9c50dfc38": 30, "62e7c4fba689e8c9c50dfc38": 30,
"623063e994fc3f7b302a9696": 30, "623063e994fc3f7b302a9696": 30,
"5c488a752e221602b412af63": 30, "5c488a752e221602b412af63": 30,
"5fbcc1d9016cce60e8341ab3": 30, "5fbcc1d9016cce60e8341ab3": 30,
"606587252535c57a13424cfd": 30, "606587252535c57a13424cfd": 30,
"628a60ae6b1d481ff772e9c8": 30, "628a60ae6b1d481ff772e9c8": 30,
"5aafa857e5b5b00018480968": 20, "5aafa857e5b5b00018480968": 20,
"5df8ce05b11454561e39243b": 20, "5df8ce05b11454561e39243b": 20,
"5beed0f50db834001c062b12": 30, "5beed0f50db834001c062b12": 30,
"5ba26383d4351e00334c93d9": 30, "5ba26383d4351e00334c93d9": 30,
"5bd70322209c4d00d7167b8f": 30, "5bd70322209c4d00d7167b8f": 30,
"5e00903ae9dc277128008b87": 25, "5e00903ae9dc277128008b87": 25,
"5de7bd7bfd6b4e6e2276dc25": 30, "5de7bd7bfd6b4e6e2276dc25": 30,
"58948c8e86f77409493f7266": 30, "58948c8e86f77409493f7266": 30,
"59984ab886f7743e98271174": 30, "59984ab886f7743e98271174": 30,
"5fc3f2d5900b1d5091531e57": 30, "5fc3f2d5900b1d5091531e57": 30,
"5fb64bc92b1b027b1f50bcf2": 30, "5fb64bc92b1b027b1f50bcf2": 30,
"668e71a8dadf42204c032ce1": 30 "668e71a8dadf42204c032ce1": 30
} }
}, },
{ {
"levelRange": { "levelRange": {
@ -1398,7 +1398,7 @@
}, },
"equipment": { "equipment": {
"SecondPrimaryWeapon": 10, "SecondPrimaryWeapon": 10,
"Earpiece": 85, "Earpiece": 85,
"FaceCover": 75 "FaceCover": 75
}, },
"equipmentMods": { "equipmentMods": {
@ -1465,33 +1465,33 @@
"mod_nvg": 90 "mod_nvg": 90
} }
}, },
"minimumMagazineSize": { "minimumMagazineSize": {
"5447a9cd4bdc2dbd208b4567": 30, "5447a9cd4bdc2dbd208b4567": 30,
"5926bb2186f7744b1c6c6e60": 30, "5926bb2186f7744b1c6c6e60": 30,
"5c07c60e0db834002330051f": 30, "5c07c60e0db834002330051f": 30,
"5bb2475ed4351e00853264e3": 30, "5bb2475ed4351e00853264e3": 30,
"5bf3e03b0db834001d2c4a9c": 30, "5bf3e03b0db834001d2c4a9c": 30,
"5644bd2b4bdc2d3b4c8b4572": 30, "5644bd2b4bdc2d3b4c8b4572": 30,
"63171672192e68c5460cebc5": 30, "63171672192e68c5460cebc5": 30,
"62e7c4fba689e8c9c50dfc38": 30, "62e7c4fba689e8c9c50dfc38": 30,
"623063e994fc3f7b302a9696": 30, "623063e994fc3f7b302a9696": 30,
"5c488a752e221602b412af63": 30, "5c488a752e221602b412af63": 30,
"5fbcc1d9016cce60e8341ab3": 30, "5fbcc1d9016cce60e8341ab3": 30,
"606587252535c57a13424cfd": 30, "606587252535c57a13424cfd": 30,
"628a60ae6b1d481ff772e9c8": 30, "628a60ae6b1d481ff772e9c8": 30,
"5aafa857e5b5b00018480968": 20, "5aafa857e5b5b00018480968": 20,
"5df8ce05b11454561e39243b": 20, "5df8ce05b11454561e39243b": 20,
"5beed0f50db834001c062b12": 30, "5beed0f50db834001c062b12": 30,
"5ba26383d4351e00334c93d9": 30, "5ba26383d4351e00334c93d9": 30,
"5bd70322209c4d00d7167b8f": 30, "5bd70322209c4d00d7167b8f": 30,
"5e00903ae9dc277128008b87": 25, "5e00903ae9dc277128008b87": 25,
"5de7bd7bfd6b4e6e2276dc25": 30, "5de7bd7bfd6b4e6e2276dc25": 30,
"58948c8e86f77409493f7266": 30, "58948c8e86f77409493f7266": 30,
"59984ab886f7743e98271174": 30, "59984ab886f7743e98271174": 30,
"5fc3f2d5900b1d5091531e57": 30, "5fc3f2d5900b1d5091531e57": 30,
"5fb64bc92b1b027b1f50bcf2": 30, "5fb64bc92b1b027b1f50bcf2": 30,
"668e71a8dadf42204c032ce1": 30 "668e71a8dadf42204c032ce1": 30
} }
} }
], ],
"blacklist": [ "blacklist": [
@ -1511,12 +1511,12 @@
"55d4837c4bdc2d1d4e8b456c", "55d4837c4bdc2d1d4e8b456c",
"5c503ac82e221602b21d6e9a", "5c503ac82e221602b21d6e9a",
"6241c2c2117ad530666a5108", "6241c2c2117ad530666a5108",
"671d85439ae8365d69117ba6", "671d85439ae8365d69117ba6",
"671d8617a3e45c1f5908278c", "671d8617a3e45c1f5908278c",
"670e8eab8c1bb0e5a7075acf", "670e8eab8c1bb0e5a7075acf",
"671d8ac8a3e45c1f59082799", "671d8ac8a3e45c1f59082799",
"671d8b38b769f0d88c0950f8", "671d8b38b769f0d88c0950f8",
"671d8b8c0959c721a50ca838" "671d8b8c0959c721a50ca838"
], ],
"mod_scope": [ "mod_scope": [
"5a1ead28fcdbcb001912fa9f", "5a1ead28fcdbcb001912fa9f",
@ -1555,13 +1555,13 @@
"55d4837c4bdc2d1d4e8b456c", "55d4837c4bdc2d1d4e8b456c",
"5c503ac82e221602b21d6e9a", "5c503ac82e221602b21d6e9a",
"6241c2c2117ad530666a5108", "6241c2c2117ad530666a5108",
"6241c2c2117ad530666a5108", "6241c2c2117ad530666a5108",
"671d85439ae8365d69117ba6", "671d85439ae8365d69117ba6",
"671d8617a3e45c1f5908278c", "671d8617a3e45c1f5908278c",
"670e8eab8c1bb0e5a7075acf", "670e8eab8c1bb0e5a7075acf",
"671d8ac8a3e45c1f59082799", "671d8ac8a3e45c1f59082799",
"671d8b38b769f0d88c0950f8", "671d8b38b769f0d88c0950f8",
"671d8b8c0959c721a50ca838" "671d8b8c0959c721a50ca838"
], ],
"mod_scope": [ "mod_scope": [
"5a1ead28fcdbcb001912fa9f", "5a1ead28fcdbcb001912fa9f",
@ -2170,7 +2170,7 @@
"5bfd297f0db834001a669119": 0, "5bfd297f0db834001a669119": 0,
"5ae08f0a5acfc408fb1398a1": 0, "5ae08f0a5acfc408fb1398a1": 0,
"5de652c31b7e3716273428be": 0, "5de652c31b7e3716273428be": 0,
"5a38e6bac4a2826c6e06d79b": 0 "5a38e6bac4a2826c6e06d79b": 0
}, },
"Holster": { "Holster": {
"5d3eb3b0a4b93615055e84d2": 25 "5d3eb3b0a4b93615055e84d2": 25

View File

@ -16,10 +16,10 @@
"fixes": { "fixes": {
"fixShotgunDispersion": true, "fixShotgunDispersion": true,
"removeModItemsFromProfile": false, "removeModItemsFromProfile": false,
"removeInvalidTradersFromProfile": false, "removeInvalidTradersFromProfile": false,
"fixProfileBreakingInventoryItemIssues": false "fixProfileBreakingInventoryItemIssues": false
}, },
"survey": { "survey": {
"locale": { "locale": {
"en": { "en": {
"question_1": "How off-topic is general chat on the SPT discord?", "question_1": "How off-topic is general chat on the SPT discord?",
@ -57,98 +57,116 @@
"textLocaleKey": "farewell" "textLocaleKey": "farewell"
}, },
"pages": [[0, 1]], "pages": [[0, 1]],
"questions": [{ "questions": [
{
"id": 0, "id": 0,
"sortIndex": 1, "sortIndex": 1,
"titleLocaleKey": "question_1", "titleLocaleKey": "question_1",
"hintLocaleKey": "", "hintLocaleKey": "",
"answerLimit": 10, "answerLimit": 10,
"answerType": "MultiOption", "answerType": "MultiOption",
"answers": [{ "answers": [
{
"id": 0, "id": 0,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_1" "localeKey": "question_1_answer_1"
}, { },
{
"id": 1, "id": 1,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_2" "localeKey": "question_1_answer_2"
}, { },
{
"id": 2, "id": 2,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_3" "localeKey": "question_1_answer_3"
}, { },
{
"id": 3, "id": 3,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_4" "localeKey": "question_1_answer_4"
}, { },
{
"id": 4, "id": 4,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_5" "localeKey": "question_1_answer_5"
}, { },
{
"id": 5, "id": 5,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_6" "localeKey": "question_1_answer_6"
}, { },
{
"id": 6, "id": 6,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_7" "localeKey": "question_1_answer_7"
}, { },
{
"id": 7, "id": 7,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_8" "localeKey": "question_1_answer_8"
}, { },
{
"id": 8, "id": 8,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_9" "localeKey": "question_1_answer_9"
}, { },
{
"id": 9, "id": 9,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_10" "localeKey": "question_1_answer_10"
}, { },
{
"id": 10, "id": 10,
"questionId": 0, "questionId": 0,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_1_answer_11" "localeKey": "question_1_answer_11"
} }
] ]
}, { },
{
"id": 1, "id": 1,
"sortIndex": 1, "sortIndex": 1,
"titleLocaleKey": "question_2", "titleLocaleKey": "question_2",
"hintLocaleKey": "", "hintLocaleKey": "",
"answerLimit": 5, "answerLimit": 5,
"answerType": "SingleOption", "answerType": "SingleOption",
"answers": [{ "answers": [
{
"id": 0, "id": 0,
"questionId": 1, "questionId": 1,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_2_answer_1" "localeKey": "question_2_answer_1"
}, { },
{
"id": 1, "id": 1,
"questionId": 1, "questionId": 1,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_2_answer_2" "localeKey": "question_2_answer_2"
}, { },
{
"id": 2, "id": 2,
"questionId": 1, "questionId": 1,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_2_answer_3" "localeKey": "question_2_answer_3"
}, { },
{
"id": 3, "id": 3,
"questionId": 1, "questionId": 1,
"sortIndex": 1, "sortIndex": 1,
"localeKey": "question_2_answer_4" "localeKey": "question_2_answer_4"
}, { },
{
"id": 4, "id": 4,
"questionId": 1, "questionId": 1,
"sortIndex": 1, "sortIndex": 1,
@ -165,7 +183,7 @@
"compressProfile": false, "compressProfile": false,
"chatbotFeatures": { "chatbotFeatures": {
"sptFriendEnabled": true, "sptFriendEnabled": true,
"sptFriendGiftsEnabled": true, "sptFriendGiftsEnabled": true,
"commandoEnabled": true, "commandoEnabled": true,
"commandoFeatures": { "commandoFeatures": {
"giveCommandEnabled": true "giveCommandEnabled": true
@ -173,10 +191,10 @@
"commandUseLimits": { "commandUseLimits": {
"StashRows": 15 "StashRows": 15
}, },
"ids": { "ids": {
"commando": "6723fd51c5924c57ce0ca01e", "commando": "6723fd51c5924c57ce0ca01e",
"spt": "6723fd51c5924c57ce0ca01f" "spt": "6723fd51c5924c57ce0ca01f"
} }
}, },
"createNewProfileTypesBlacklist": [] "createNewProfileTypesBlacklist": []
}, },

View File

@ -8288,7 +8288,7 @@
"associatedEvent": "Promo", "associatedEvent": "Promo",
"maxToSendPlayer": 1 "maxToSendPlayer": 1
}, },
"STREAMERLOOT": { "STREAMERLOOT": {
"items": [ "items": [
{ {
"_id": "665a06ac84c6bb387e0afba2", "_id": "665a06ac84c6bb387e0afba2",
@ -8299,7 +8299,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "665a06ac84c6bb387e0afba5", "_id": "665a06ac84c6bb387e0afba5",
"_tpl": "6694f423909d2322a8073151", "_tpl": "6694f423909d2322a8073151",
"upd": { "upd": {
@ -8308,7 +8308,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "665a06ac84c6bb387e0afba7", "_id": "665a06ac84c6bb387e0afba7",
"_tpl": "6694f418c74d8a180f0f78c0", "_tpl": "6694f418c74d8a180f0f78c0",
"upd": { "upd": {
@ -8317,7 +8317,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "665a06ac84c6bb387e0afba8", "_id": "665a06ac84c6bb387e0afba8",
"_tpl": "6694f4101ae1778e310f4f8e", "_tpl": "6694f4101ae1778e310f4f8e",
"upd": { "upd": {
@ -8333,7 +8333,7 @@
"associatedEvent": "Promo", "associatedEvent": "Promo",
"maxToSendPlayer": 5 "maxToSendPlayer": 5
}, },
"500CIGARETTES": { "500CIGARETTES": {
"items": [ "items": [
{ {
"_id": "66f16f2d223efbd43f0c2e2d", "_id": "66f16f2d223efbd43f0c2e2d",
@ -8351,7 +8351,7 @@
"associatedEvent": "Promo", "associatedEvent": "Promo",
"maxToSendPlayer": 5 "maxToSendPlayer": 5
}, },
"STASHQOL": { "STASHQOL": {
"items": [ "items": [
{ {
"_id": "66f45162349a5fefd70fd437", "_id": "66f45162349a5fefd70fd437",
@ -8362,7 +8362,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45162349a5fefd70fd438", "_id": "66f45162349a5fefd70fd438",
"_tpl": "5aafbde786f774389d0cbc0f", "_tpl": "5aafbde786f774389d0cbc0f",
"upd": { "upd": {
@ -8371,7 +8371,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f4526d349a5fefd70fd445", "_id": "66f4526d349a5fefd70fd445",
"_tpl": "5b7c710788a4506dec015957", "_tpl": "5b7c710788a4506dec015957",
"upd": { "upd": {
@ -8380,7 +8380,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f4526d349a5fefd70fd444", "_id": "66f4526d349a5fefd70fd444",
"_tpl": "5c0a840b86f7742ffa4f2482", "_tpl": "5c0a840b86f7742ffa4f2482",
"upd": { "upd": {
@ -8389,7 +8389,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f4526d349a5fefd70fd443", "_id": "66f4526d349a5fefd70fd443",
"_tpl": "59fb042886f7746c5005a7b2", "_tpl": "59fb042886f7746c5005a7b2",
"upd": { "upd": {
@ -8398,7 +8398,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f4526d349a5fefd70fd442", "_id": "66f4526d349a5fefd70fd442",
"_tpl": "59fb023c86f7746d0d4b423c", "_tpl": "59fb023c86f7746d0d4b423c",
"upd": { "upd": {
@ -8407,7 +8407,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45257349a5fefd70fd441", "_id": "66f45257349a5fefd70fd441",
"_tpl": "5aafbcd986f7745e590fff23", "_tpl": "5aafbcd986f7745e590fff23",
"upd": { "upd": {
@ -8416,7 +8416,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45257349a5fefd70fd440", "_id": "66f45257349a5fefd70fd440",
"_tpl": "5c093db286f7740a1b2617e3", "_tpl": "5c093db286f7740a1b2617e3",
"upd": { "upd": {
@ -8425,7 +8425,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45257349a5fefd70fd43f", "_id": "66f45257349a5fefd70fd43f",
"_tpl": "5c127c4486f7745625356c13", "_tpl": "5c127c4486f7745625356c13",
"upd": { "upd": {
@ -8434,7 +8434,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45257349a5fefd70fd43e", "_id": "66f45257349a5fefd70fd43e",
"_tpl": "590c60fc86f77412b13fddcf", "_tpl": "590c60fc86f77412b13fddcf",
"upd": { "upd": {
@ -8443,7 +8443,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45257349a5fefd70fd43d", "_id": "66f45257349a5fefd70fd43d",
"_tpl": "590c60fc86f77412b13fddcf", "_tpl": "590c60fc86f77412b13fddcf",
"upd": { "upd": {
@ -8452,7 +8452,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45162349a5fefd70fd43b", "_id": "66f45162349a5fefd70fd43b",
"_tpl": "59fafd4b86f7745ca07e1232", "_tpl": "59fafd4b86f7745ca07e1232",
"upd": { "upd": {
@ -8461,7 +8461,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45162349a5fefd70fd43a", "_id": "66f45162349a5fefd70fd43a",
"_tpl": "5c093e3486f77430cb02e593", "_tpl": "5c093e3486f77430cb02e593",
"upd": { "upd": {
@ -8470,7 +8470,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f45162349a5fefd70fd439", "_id": "66f45162349a5fefd70fd439",
"_tpl": "5d235bb686f77443f4331278", "_tpl": "5d235bb686f77443f4331278",
"upd": { "upd": {
@ -8486,7 +8486,7 @@
"associatedEvent": "Promo", "associatedEvent": "Promo",
"maxToSendPlayer": 2 "maxToSendPlayer": 2
}, },
"SPLASH": { "SPLASH": {
"items": [ "items": [
{ {
"_id": "66f6618d8d88ae22c907775b", "_id": "66f6618d8d88ae22c907775b",
@ -8497,7 +8497,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f6618d8d88ae22c907775c", "_id": "66f6618d8d88ae22c907775c",
"_tpl": "66d98233302686954b0c6f81", "_tpl": "66d98233302686954b0c6f81",
"upd": { "upd": {
@ -8506,7 +8506,7 @@
"parentId": "665a06ac85c6ab387e0afba3", "parentId": "665a06ac85c6ab387e0afba3",
"slotId": "main" "slotId": "main"
}, },
{ {
"_id": "66f6618d8d88ae22c907775d", "_id": "66f6618d8d88ae22c907775d",
"_tpl": "66d98233302686954b0c6f81", "_tpl": "66d98233302686954b0c6f81",
"upd": { "upd": {

View File

@ -19,8 +19,8 @@
"bonusChanceMultiplier": 0.25, "bonusChanceMultiplier": 0.25,
"bonusAmountMultiplier": 0.43, "bonusAmountMultiplier": 0.43,
"highValueThresholdRub": 70000, "highValueThresholdRub": 70000,
"hideoutTaskRewardTimeSeconds": 21600, "hideoutTaskRewardTimeSeconds": 21600,
"hideoutCraftSacrificeThresholdRub": 400000, "hideoutCraftSacrificeThresholdRub": 400000,
"craftTimeThreshholds": [ "craftTimeThreshholds": [
{ {
"min": 1, "min": 1,
@ -40,56 +40,142 @@
], ],
"craftTimeOverride": -1, "craftTimeOverride": -1,
"directRewards": [ "directRewards": [
{"reward": ["5857a8bc2459772bad15db29"], "requiredItems": ["665ee77ccf2d642e98220bca"], "craftTimeSeconds": 360, {
"repeatable": false }, "reward": ["5857a8bc2459772bad15db29"],
{"reward": ["5c093ca986f7740a1867ab12"], "requiredItems": ["5732ee6a24597719ae0c0281"], "craftTimeSeconds": 3960, "requiredItems": ["665ee77ccf2d642e98220bca"],
"repeatable": false }, "craftTimeSeconds": 360,
{"reward": ["655c669103999d3c810c025b"], "requiredItems": ["635267ab3c89e2112001f826"], "craftTimeSeconds": 3960, "repeatable": false
"repeatable": false }, },
{"reward": ["5fc64ea372b0dd78d51159dc"], "requiredItems": ["635267ab3c89e2112001f826", "635267ab3c89e2112001f826", {
"635267ab3c89e2112001f826", "635267ab3c89e2112001f826", "635267ab3c89e2112001f826"], "craftTimeSeconds": 3960, "reward": ["5c093ca986f7740a1867ab12"],
"repeatable": false }, "requiredItems": ["5732ee6a24597719ae0c0281"],
{"reward": ["5c0e874186f7745dc7616606"], "requiredItems": ["66572c82ad599021091c6118"], "craftTimeSeconds": 3960,
"craftTimeSeconds": 3960, "repeatable": false }, "repeatable": false
{"reward": ["60a7ad3a0c5cb24b0134664a", "60a7ad2a2198820d95707a2e"], "requiredItems": ["66572cbdad599021091c611a"], },
"craftTimeSeconds": 3960, "repeatable": false }, {
{"reward": ["5b3b713c5acfc4330140bd8d"], "requiredItems": ["66572be36a723f7f005a066e"], "craftTimeSeconds": 3960, "reward": ["655c669103999d3c810c025b"],
"repeatable": false }, "requiredItems": ["635267ab3c89e2112001f826"],
{"reward": ["62a09dd4621468534a797ac7", "5bc9b9ecd4351e3bac122519"], "requiredItems": ["66572b8d80b1cd4b6a67847f"], "craftTimeSeconds": 3960,
"craftTimeSeconds": 3960, "repeatable": false }, "repeatable": false
{"reward": ["5d40407c86f774318526545a", "5d40407c86f774318526545a", "5d40407c86f774318526545a"], "requiredItems": ["655c66e40b2de553b618d4b8"], },
"craftTimeSeconds": 3960, "repeatable": false }, {
{"reward": ["572b7adb24597762ae139821", "56e335e4d2720b6c058b456d"], "requiredItems": ["655c673673a43e23e857aebd"], "reward": ["5fc64ea372b0dd78d51159dc"],
"craftTimeSeconds": 3960, "repeatable": false }, "requiredItems": [
{"reward": ["637b60c3b7afa97bfc3d7001", "59e3577886f774176a362503"], "requiredItems": ["655c67782a1356436041c9c5"], "635267ab3c89e2112001f826",
"craftTimeSeconds": 3960, "repeatable": false }, "635267ab3c89e2112001f826",
{"reward": ["590c657e86f77412b013051d"], "requiredItems": ["655c652d60d0ac437100fed7"], "craftTimeSeconds": 3960, "635267ab3c89e2112001f826",
"repeatable": false }, "635267ab3c89e2112001f826",
{"reward": ["5c0e655586f774045612eeb2"], "requiredItems": ["655c663a6689c676ce57af85"], "craftTimeSeconds": 3960, "635267ab3c89e2112001f826"
"repeatable": false }, ],
{"reward": ["5d1b376e86f774252519444e"], "requiredItems": ["6582dbf0b8d7830efc45016f"], "craftTimeSeconds": 3960, "craftTimeSeconds": 3960,
"repeatable": true }, "repeatable": false
{"reward": ["62a091170b9d3c46de5b6cf2"], "requiredItems": ["5aa2b986e5b5b00014028f4c"], "craftTimeSeconds": 3960, },
"repeatable": true }, {
{"reward": ["62a0a098de7ac8199358053b"], "requiredItems": ["5c13cd2486f774072c757944"], "craftTimeSeconds": 3960, "reward": ["5c0e874186f7745dc7616606"],
"repeatable": true }, "requiredItems": ["66572c82ad599021091c6118"],
{"reward": ["5d1b392c86f77425243e98fe", "5d1b392c86f77425243e98fe"], "requiredItems": ["5a0c27731526d80618476ac4"], "craftTimeSeconds": 3960,
"craftTimeSeconds": 3960, "repeatable": true }, "repeatable": false
{"reward": ["5e2aedd986f7746d404f3aa4", "5e2aedd986f7746d404f3aa4", "5c12620d86f7743f8b198b72", "5c12620d86f7743f8b198b72"], },
"requiredItems": ["59faff1d86f7746c51718c9c"], "craftTimeSeconds": 39960, "repeatable": true }, {
{"reward": ["6389c8c5dbfd5e4b95197e6b"], "requiredItems": ["5c0530ee86f774697952d952"], "craftTimeSeconds": 39960, "reward": ["60a7ad3a0c5cb24b0134664a", "60a7ad2a2198820d95707a2e"],
"repeatable": true } "requiredItems": ["66572cbdad599021091c611a"],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": ["5b3b713c5acfc4330140bd8d"],
"requiredItems": ["66572be36a723f7f005a066e"],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": ["62a09dd4621468534a797ac7", "5bc9b9ecd4351e3bac122519"],
"requiredItems": ["66572b8d80b1cd4b6a67847f"],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": ["5d40407c86f774318526545a", "5d40407c86f774318526545a", "5d40407c86f774318526545a"],
"requiredItems": ["655c66e40b2de553b618d4b8"],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": ["572b7adb24597762ae139821", "56e335e4d2720b6c058b456d"],
"requiredItems": ["655c673673a43e23e857aebd"],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": ["637b60c3b7afa97bfc3d7001", "59e3577886f774176a362503"],
"requiredItems": ["655c67782a1356436041c9c5"],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": ["590c657e86f77412b013051d"],
"requiredItems": ["655c652d60d0ac437100fed7"],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": ["5c0e655586f774045612eeb2"],
"requiredItems": ["655c663a6689c676ce57af85"],
"craftTimeSeconds": 3960,
"repeatable": false
},
{
"reward": ["5d1b376e86f774252519444e"],
"requiredItems": ["6582dbf0b8d7830efc45016f"],
"craftTimeSeconds": 3960,
"repeatable": true
},
{
"reward": ["62a091170b9d3c46de5b6cf2"],
"requiredItems": ["5aa2b986e5b5b00014028f4c"],
"craftTimeSeconds": 3960,
"repeatable": true
},
{
"reward": ["62a0a098de7ac8199358053b"],
"requiredItems": ["5c13cd2486f774072c757944"],
"craftTimeSeconds": 3960,
"repeatable": true
},
{
"reward": ["5d1b392c86f77425243e98fe", "5d1b392c86f77425243e98fe"],
"requiredItems": ["5a0c27731526d80618476ac4"],
"craftTimeSeconds": 3960,
"repeatable": true
},
{
"reward": [
"5e2aedd986f7746d404f3aa4",
"5e2aedd986f7746d404f3aa4",
"5c12620d86f7743f8b198b72",
"5c12620d86f7743f8b198b72"
],
"requiredItems": ["59faff1d86f7746c51718c9c"],
"craftTimeSeconds": 39960,
"repeatable": true
},
{
"reward": ["6389c8c5dbfd5e4b95197e6b"],
"requiredItems": ["5c0530ee86f774697952d952"],
"craftTimeSeconds": 39960,
"repeatable": true
}
], ],
"directRewardStackSize": { "directRewardStackSize": {
"exampleParentId": { "min": 1000, "max": 50000 } "exampleParentId": { "min": 1000, "max": 50000 }
}, },
"rewardItemBlacklist": [ "rewardItemBlacklist": [
"5696686a4bdc2da3298b456a", "5696686a4bdc2da3298b456a",
"5449016a4bdc2d6f028b456f", "5449016a4bdc2d6f028b456f",
"569668774bdc2da2298b4568", "569668774bdc2da2298b4568",
"5485a8684bdc2da71d8b4567", "5485a8684bdc2da71d8b4567",
"543be5dd4bdc2deb348b4569" "543be5dd4bdc2deb348b4569"
], ],
"additionalRewardItemPool": [], "additionalRewardItemPool": [],
"currencyRewards": { "currencyRewards": {
"5449016a4bdc2d6f028b456f": { "min": 20, "max": 50 }, "5449016a4bdc2d6f028b456f": { "min": 20, "max": 50 },

View File

@ -6,7 +6,7 @@
"blacklistedEquipment": ["SpecialSlot1", "SpecialSlot2", "SpecialSlot3"], "blacklistedEquipment": ["SpecialSlot1", "SpecialSlot2", "SpecialSlot3"],
"slotIdsToAlwaysRemove": ["cartridges", "patron_in_weapon"], "slotIdsToAlwaysRemove": ["cartridges", "patron_in_weapon"],
"returnTimeOverrideSeconds": 0, "returnTimeOverrideSeconds": 0,
"storageTimeOverrideSeconds": 0, "storageTimeOverrideSeconds": 0,
"runIntervalSeconds": 600, "runIntervalSeconds": 600,
"minAttachmentRoublePriceToBeTaken": 15000, "minAttachmentRoublePriceToBeTaken": 15000,
"chanceNoAttachmentsTakenPercent": 10, "chanceNoAttachmentsTakenPercent": 10,

View File

@ -1451,9 +1451,9 @@
"65268d8ecb944ff1e90ea385": 1, "65268d8ecb944ff1e90ea385": 1,
"5e848cc2988a8701445df1e8": 1, "5e848cc2988a8701445df1e8": 1,
"5a7828548dc32e5a9c28b516": 1, "5a7828548dc32e5a9c28b516": 1,
"66ffa9b66e19cc902401c5e8": 1, "66ffa9b66e19cc902401c5e8": 1,
"65fb023261d5829b2d090755": 1, "65fb023261d5829b2d090755": 1,
"67124dcfa3541f2a1f0e788b": 1 "67124dcfa3541f2a1f0e788b": 1
}, },
"defaultPresetsOnly": true, "defaultPresetsOnly": true,
"foundInRaid": true, "foundInRaid": true,

View File

@ -48,9 +48,9 @@
"5ae089fb5acfc408fb13989b", "5ae089fb5acfc408fb13989b",
"6241c2c2117ad530666a5108", "6241c2c2117ad530666a5108",
"5580239d4bdc2de7118b4583", "5580239d4bdc2de7118b4583",
"66da1b49099cf6adcc07a36b", "66da1b49099cf6adcc07a36b",
"66da1b546916142b3b022777", "66da1b546916142b3b022777",
"670ad7f1ad195290cd00da7a" "670ad7f1ad195290cd00da7a"
], ],
"lootableItemBlacklist": ["660bbc47c38b837877075e47", "660bc341c38b837877075e4c"], "lootableItemBlacklist": ["660bbc47c38b837877075e47", "660bc341c38b837877075e4c"],
"rewardItemBlacklist": [ "rewardItemBlacklist": [
@ -102,18 +102,18 @@
"6662ea05f6259762c56f3189", "6662ea05f6259762c56f3189",
"6638a5474e92f038531e210e", "6638a5474e92f038531e210e",
"65ddcc9cfa85b9f17d0dfb07", "65ddcc9cfa85b9f17d0dfb07",
"6331ba83f2ab4f3f09502983", "6331ba83f2ab4f3f09502983",
"6331bb0d1aa9f42b804997a6", "6331bb0d1aa9f42b804997a6",
"66d9f7e7099cf6adcc07a369", "66d9f7e7099cf6adcc07a369",
"6655e35b6bc645cb7b059912", "6655e35b6bc645cb7b059912",
"66d9f7256916142b3b02276e", "66d9f7256916142b3b02276e",
"671d85439ae8365d69117ba6", "671d85439ae8365d69117ba6",
"671d8617a3e45c1f5908278c", "671d8617a3e45c1f5908278c",
"670e8eab8c1bb0e5a7075acf", "670e8eab8c1bb0e5a7075acf",
"671d8ac8a3e45c1f59082799", "671d8ac8a3e45c1f59082799",
"671d8b38b769f0d88c0950f8", "671d8b38b769f0d88c0950f8",
"671d8b8c0959c721a50ca838", "671d8b8c0959c721a50ca838",
"660bc341c38b837877075e4c" "660bc341c38b837877075e4c"
], ],
"bossItems": [ "bossItems": [
"6275303a9f372d6ea97f9ec7", "6275303a9f372d6ea97f9ec7",
@ -156,8 +156,8 @@
"5c1a1e3f2e221602b66cc4c2" "5c1a1e3f2e221602b66cc4c2"
], ],
"handbookPriceOverride": { "handbookPriceOverride": {
"63a8970d7108f713591149f5": {"price": 5000, "parentId": "5b5f6fa186f77409407a7eb7"}, "63a8970d7108f713591149f5": { "price": 5000, "parentId": "5b5f6fa186f77409407a7eb7" },
"63a898a328e385334e0640a5": {"price": 10000, "parentId": "5b5f6fa186f77409407a7eb7"}, "63a898a328e385334e0640a5": { "price": 10000, "parentId": "5b5f6fa186f77409407a7eb7" },
"63a897c6b1ff6e29734fcc95": {"price": 20000, "parentId": "5b5f6fa186f77409407a7eb7"} "63a897c6b1ff6e29734fcc95": { "price": 20000, "parentId": "5b5f6fa186f77409407a7eb7" }
} }
} }

View File

@ -41,7 +41,8 @@
}, },
"customWaves": { "customWaves": {
"boss": { "boss": {
"bigmap": [{ "bigmap": [
{
"sptId": "usecbigmap", "sptId": "usecbigmap",
"BossChance": 50, "BossChance": 50,
"BossDifficult": "normal", "BossDifficult": "normal",
@ -57,14 +58,13 @@
"ForceSpawn": false, "ForceSpawn": false,
"IgnoreMaxBots": true, "IgnoreMaxBots": true,
"RandomTimeSpawn": false, "RandomTimeSpawn": false,
"SpawnMode": [ "SpawnMode": ["pve"],
"pve"
],
"Supports": null, "Supports": null,
"Time": -1, "Time": -1,
"TriggerId": "", "TriggerId": "",
"TriggerName": "" "TriggerName": ""
}, { },
{
"sptId": "bearbigmap", "sptId": "bearbigmap",
"BossChance": 50, "BossChance": 50,
"BossDifficult": "normal", "BossDifficult": "normal",
@ -80,16 +80,15 @@
"ForceSpawn": false, "ForceSpawn": false,
"IgnoreMaxBots": true, "IgnoreMaxBots": true,
"RandomTimeSpawn": false, "RandomTimeSpawn": false,
"SpawnMode": [ "SpawnMode": ["pve"],
"pve"
],
"Supports": null, "Supports": null,
"Time": -1, "Time": -1,
"TriggerId": "", "TriggerId": "",
"TriggerName": "" "TriggerName": ""
} }
], ],
"woods": [{ "woods": [
{
"sptId": "usecbigmap", "sptId": "usecbigmap",
"BossChance": 50, "BossChance": 50,
"BossDifficult": "normal", "BossDifficult": "normal",
@ -105,14 +104,13 @@
"ForceSpawn": false, "ForceSpawn": false,
"IgnoreMaxBots": true, "IgnoreMaxBots": true,
"RandomTimeSpawn": false, "RandomTimeSpawn": false,
"SpawnMode": [ "SpawnMode": ["pve"],
"pve"
],
"Supports": null, "Supports": null,
"Time": -1, "Time": -1,
"TriggerId": "", "TriggerId": "",
"TriggerName": "" "TriggerName": ""
}, { },
{
"sptId": "bearbigmap", "sptId": "bearbigmap",
"BossChance": 50, "BossChance": 50,
"BossDifficult": "normal", "BossDifficult": "normal",
@ -128,16 +126,15 @@
"ForceSpawn": false, "ForceSpawn": false,
"IgnoreMaxBots": true, "IgnoreMaxBots": true,
"RandomTimeSpawn": false, "RandomTimeSpawn": false,
"SpawnMode": [ "SpawnMode": ["pve"],
"pve"
],
"Supports": null, "Supports": null,
"Time": -1, "Time": -1,
"TriggerId": "", "TriggerId": "",
"TriggerName": "" "TriggerName": ""
} }
], ],
"sandbox_high": [{ "sandbox_high": [
{
"sptId": "usecbigmap", "sptId": "usecbigmap",
"BossChance": 50, "BossChance": 50,
"BossDifficult": "normal", "BossDifficult": "normal",
@ -153,14 +150,13 @@
"ForceSpawn": false, "ForceSpawn": false,
"IgnoreMaxBots": true, "IgnoreMaxBots": true,
"RandomTimeSpawn": false, "RandomTimeSpawn": false,
"SpawnMode": [ "SpawnMode": ["pve"],
"pve"
],
"Supports": null, "Supports": null,
"Time": -1, "Time": -1,
"TriggerId": "", "TriggerId": "",
"TriggerName": "" "TriggerName": ""
}, { },
{
"sptId": "bearbigmap", "sptId": "bearbigmap",
"BossChance": 50, "BossChance": 50,
"BossDifficult": "normal", "BossDifficult": "normal",
@ -176,9 +172,7 @@
"ForceSpawn": false, "ForceSpawn": false,
"IgnoreMaxBots": true, "IgnoreMaxBots": true,
"RandomTimeSpawn": false, "RandomTimeSpawn": false,
"SpawnMode": [ "SpawnMode": ["pve"],
"pve"
],
"Supports": null, "Supports": null,
"Time": -1, "Time": -1,
"TriggerId": "", "TriggerId": "",
@ -195,7 +189,7 @@
"5939e5a786f77461f11c0098", "5939e5a786f77461f11c0098",
"64e74a3d4d49d23b2c39d319", "64e74a3d4d49d23b2c39d319",
"6614230055afee107f05e998", "6614230055afee107f05e998",
"66b22630a6b4e5ec7c02cdb7" "66b22630a6b4e5ec7c02cdb7"
], ],
"interchange": ["64e74a5ac2b4f829615ec336"], "interchange": ["64e74a5ac2b4f829615ec336"],
"lighthouse": [ "lighthouse": [
@ -263,19 +257,22 @@
"addCustomBotWavesToMaps": true, "addCustomBotWavesToMaps": true,
"enableBotTypeLimits": true, "enableBotTypeLimits": true,
"botTypeLimits": { "botTypeLimits": {
"tarkovstreets": [{ "tarkovstreets": [
{
"type": "marksman", "type": "marksman",
"min": 2, "min": 2,
"max": 4 "max": 4
} }
], ],
"woods": [{ "woods": [
{
"type": "marksman", "type": "marksman",
"min": 2, "min": 2,
"max": 5 "max": 5
} }
], ],
"bigmap": [{ "bigmap": [
{
"type": "marksman", "type": "marksman",
"min": 2, "min": 2,
"max": 4 "max": 4
@ -538,9 +535,9 @@
"mod_equipment": 5 "mod_equipment": 5
} }
}, },
"reserveRaiderSpawnChanceOverrides": { "reserveRaiderSpawnChanceOverrides": {
"nonTriggered": 80, "nonTriggered": 80,
"triggered": 90 "triggered": 90
}, },
"nonMaps": ["base", "develop", "hideout", "privatearea", "suburbs", "terminal", "town"] "nonMaps": ["base", "develop", "hideout", "privatearea", "suburbs", "terminal", "town"]
} }

View File

@ -8,16 +8,16 @@
"5e383a6386f77465910ce1f3", "5e383a6386f77465910ce1f3",
"5e4d515e86f77438b2195244", "5e4d515e86f77438b2195244",
"639282134ed9512be67647ed", "639282134ed9512be67647ed",
"6613f3007f6666d56807c929", "6613f3007f6666d56807c929",
"6613f307fca4f2f386029409" "6613f307fca4f2f386029409"
], ],
"bearOnlyQuests": [ "bearOnlyQuests": [
"6179b5b06e9dd54ac275e409", "6179b5b06e9dd54ac275e409",
"5e381b0286f77420e3417a74", "5e381b0286f77420e3417a74",
"5e4d4ac186f774264f758336", "5e4d4ac186f774264f758336",
"639136d68ba6894d155e77cf", "639136d68ba6894d155e77cf",
"66151401efb0539ae10875ae", "66151401efb0539ae10875ae",
"6615141bfda04449120269a7" "6615141bfda04449120269a7"
], ],
"profileBlacklist": { "profileBlacklist": {
"unheard_edition": ["666314a50aa5c7436c00908a"] "unheard_edition": ["666314a50aa5c7436c00908a"]
@ -208,27 +208,27 @@
"endTimestamp": "", "endTimestamp": "",
"yearly": false "yearly": false
}, },
"66e3e2ee2136472d220bcb36": { "66e3e2ee2136472d220bcb36": {
"name": "Night of The Cult", "name": "Night of The Cult",
"season": "None", "season": "None",
"startTimestamp": 1341615600000, "startTimestamp": 1341615600000,
"endTimestamp": "", "endTimestamp": "",
"yearly": false "yearly": false
}, },
"670404a2ea1caa8f2e0be106": { "670404a2ea1caa8f2e0be106": {
"name": "Dont Believe Your Eyes", "name": "Dont Believe Your Eyes",
"season": "halloween", "season": "halloween",
"startTimestamp": 1341615600000, "startTimestamp": 1341615600000,
"endTimestamp": "", "endTimestamp": "",
"yearly": true "yearly": true
}, },
"67190f6c1b3f4964d90d71e9": { "67190f6c1b3f4964d90d71e9": {
"name": "Global Threat", "name": "Global Threat",
"season": "halloween", "season": "halloween",
"startTimestamp": 1341615600000, "startTimestamp": 1341615600000,
"endTimestamp": "", "endTimestamp": "",
"yearly": true "yearly": true
} }
}, },
"repeatableQuests": [ "repeatableQuests": [
{ {

View File

@ -39,7 +39,7 @@
"itemCountMax": 3, "itemCountMax": 3,
"priceRangeVariancePercent": 15, "priceRangeVariancePercent": 15,
"minRoubleCostToBecomeBarter": 20000, "minRoubleCostToBecomeBarter": 20000,
"makeSingleStackOnly": true, "makeSingleStackOnly": true,
"itemTypeBlacklist": [ "itemTypeBlacklist": [
"55802f4a4bdc2ddb688b4569", "55802f4a4bdc2ddb688b4569",
"55802f3e4bdc2de7118b4584", "55802f3e4bdc2de7118b4584",
@ -88,11 +88,11 @@
"max": 0.96 "max": 0.96
} }
}, },
"ignoreQualityPriceVarianceBlacklist": [ "ignoreQualityPriceVarianceBlacklist": [
"59e3577886f774176a362503", "59e3577886f774176a362503",
"5d02797c86f774203f38e30a", "5d02797c86f774203f38e30a",
"5ab8e79e86f7742d8b372e78" "5ab8e79e86f7742d8b372e78"
], ],
"showDefaultPresetsOnly": true, "showDefaultPresetsOnly": true,
"endTimeSeconds": { "endTimeSeconds": {
"min": 360, "min": 360,
@ -366,14 +366,14 @@
"57347cd0245977445a2d6ff1": 30, "57347cd0245977445a2d6ff1": 30,
"5d1b385e86f774252167b98a": 30, "5d1b385e86f774252167b98a": 30,
"62a0a124de7ac81993580542": 40, "62a0a124de7ac81993580542": 40,
"5e42c81886f7742a01529f57": 40, "5e42c81886f7742a01529f57": 40,
"5d1b371186f774253763a656": 35, "5d1b371186f774253763a656": 35,
"5d1b36a186f7742523398433": 35, "5d1b36a186f7742523398433": 35,
"5e2af29386f7746d4159f077": 35, "5e2af29386f7746d4159f077": 35,
"5d1b3a5d86f774252167ba22": 35, "5d1b3a5d86f774252167ba22": 35,
"59e3577886f774176a362503": 35 "59e3577886f774176a362503": 35
}, },
"unlocksType": { "unlocksType": {
"57864a3d24597754843f8721": 35, "57864a3d24597754843f8721": 35,

File diff suppressed because it is too large Load Diff

View File

@ -364,14 +364,11 @@
"646372518610c40fc20204e8", "646372518610c40fc20204e8",
"65ddcc9cfa85b9f17d0dfb07", "65ddcc9cfa85b9f17d0dfb07",
"660312cc4d6cdfa6f500c703", "660312cc4d6cdfa6f500c703",
"6655e35b6bc645cb7b059912" "6655e35b6bc645cb7b059912"
], ],
"coopExtractGift": { "coopExtractGift": {
"sendGift": true, "sendGift": true,
"messageLocaleIds": [ "messageLocaleIds": ["5da89b1886f77439d7741002 0", "5da89b3a86f7742f9026cb83 0"],
"5da89b1886f77439d7741002 0",
"5da89b3a86f7742f9026cb83 0"
],
"giftExpiryHours": 168, "giftExpiryHours": 168,
"weaponPresetCount": { "weaponPresetCount": {
"min": 0, "min": 0,
@ -446,13 +443,13 @@
} }
}, },
"allowBossItems": false, "allowBossItems": false,
"useRewarditemBlacklist": true "useRewarditemBlacklist": true
}, },
"btrDeliveryExpireHours": 240, "btrDeliveryExpireHours": 240,
"playerRepMin": -7, "playerRepMin": -7,
"playerRepMax": 15 "playerRepMax": 15
}, },
"moddedTraders": { "moddedTraders": {
"clothingService": [] "clothingService": []
} }
} }

View File

@ -41,7 +41,7 @@
"max": 24 "max": 24
} }
}, },
"1": { "1": {
"day": { "day": {
"min": 7, "min": 7,
"max": 15 "max": 15
@ -51,7 +51,7 @@
"max": 12 "max": 12
} }
}, },
"2": { "2": {
"day": { "day": {
"min": -10, "min": -10,
"max": 5 "max": 5
@ -61,7 +61,7 @@
"max": 0 "max": 0
} }
}, },
"3": { "3": {
"day": { "day": {
"min": 1, "min": 1,
"max": 15 "max": 15
@ -71,7 +71,7 @@
"max": 5 "max": 5
} }
}, },
"4": { "4": {
"day": { "day": {
"min": 3, "min": 3,
"max": 11 "max": 11
@ -81,7 +81,7 @@
"max": 8 "max": 8
} }
}, },
"5": { "5": {
"day": { "day": {
"min": -4, "min": -4,
"max": 7 "max": 7
@ -91,7 +91,7 @@
"max": 3 "max": 3
} }
}, },
"6": { "6": {
"day": { "day": {
"min": 0, "min": 0,
"max": 24 "max": 24
@ -111,56 +111,64 @@
"weights": [1, 2] "weights": [1, 2]
} }
}, },
"seasonDates": [{ "seasonDates": [
{
"seasonType": 0, "seasonType": 0,
"name": "SUMMER", "name": "SUMMER",
"startDay": "2", "startDay": "2",
"startMonth": "6", "startMonth": "6",
"endDay": "15", "endDay": "15",
"endMonth": "10" "endMonth": "10"
}, { },
{
"seasonType": 1, "seasonType": 1,
"name": "AUTUMN", "name": "AUTUMN",
"startDay": "15", "startDay": "15",
"startMonth": "10", "startMonth": "10",
"endDay": "1", "endDay": "1",
"endMonth": "11" "endMonth": "11"
}, { },
{
"seasonType": 4, "seasonType": 4,
"name": "AUTUMN_LATE", "name": "AUTUMN_LATE",
"startDay": "1", "startDay": "1",
"startMonth": "11", "startMonth": "11",
"endDay": "21", "endDay": "21",
"endMonth": "12" "endMonth": "12"
}, { },
{
"seasonType": 2, "seasonType": 2,
"name": "WINTER_START", "name": "WINTER_START",
"startDay": "21", "startDay": "21",
"startMonth": "12", "startMonth": "12",
"endDay": "31", "endDay": "31",
"endMonth": "12" "endMonth": "12"
}, { },
{
"seasonType": 2, "seasonType": 2,
"name": "WINTER_END", "name": "WINTER_END",
"startDay": "1", "startDay": "1",
"startMonth": "1", "startMonth": "1",
"endDay": "9", "endDay": "9",
"endMonth": "1" "endMonth": "1"
}, { },
{
"seasonType": 5, "seasonType": 5,
"name": "SPRING_EARLY", "name": "SPRING_EARLY",
"startDay": "9", "startDay": "9",
"startMonth": "1", "startMonth": "1",
"endDay": "25", "endDay": "25",
"endMonth": "3" "endMonth": "3"
}, { },
{
"seasonType": 3, "seasonType": 3,
"name": "SPRING", "name": "SPRING",
"startDay": "25", "startDay": "25",
"startMonth": "3", "startMonth": "3",
"endDay": "2", "endDay": "2",
"endMonth": "6" "endMonth": "6"
}, { },
{
"seasonType": 4, "seasonType": 4,
"name": "STORM", "name": "STORM",
"startDay": "24", "startDay": "24",

View File

@ -94,7 +94,7 @@ const updateBuildProperties = async () => {
res.entries, res.entries,
1, 1,
1033, 1033,
iconFile.icons.map((item) => item.data) iconFile.icons.map((item) => item.data),
); );
const vi = ResEdit.Resource.VersionInfo.fromEntries(res.entries)[0]; const vi = ResEdit.Resource.VersionInfo.fromEntries(res.entries)[0];
@ -106,7 +106,7 @@ const updateBuildProperties = async () => {
FileDescription: manifest.description, FileDescription: manifest.description,
CompanyName: manifest.name, CompanyName: manifest.name,
LegalCopyright: manifest.license, LegalCopyright: manifest.license,
} },
); );
vi.removeStringValue({ lang: 1033, codepage: 1200 }, "OriginalFilename"); vi.removeStringValue({ lang: 1033, codepage: 1200 }, "OriginalFilename");
vi.removeStringValue({ lang: 1033, codepage: 1200 }, "InternalName"); vi.removeStringValue({ lang: 1033, codepage: 1200 }, "InternalName");
@ -189,13 +189,7 @@ const createHashFile = async () => {
}; };
// Combine all tasks into addAssets // Combine all tasks into addAssets
const addAssets = gulp.series( const addAssets = gulp.series(copyAssets, downloadPnpm, copyLicense, writeBuildDataToJSON, createHashFile);
copyAssets,
downloadPnpm,
copyLicense,
writeBuildDataToJSON,
createHashFile
);
/** /**
* Cleans the build directory. * Cleans the build directory.
@ -333,7 +327,7 @@ gulp.task("build:bleedingmods", build("bleedingmods"));
gulp.task("run:build", async () => await exec(serverExeName, { stdio, cwd: buildDir })); gulp.task("run:build", async () => await exec(serverExeName, { stdio, cwd: buildDir }));
gulp.task( gulp.task(
"run:debug", "run:debug",
async () => await exec("ts-node-dev -r tsconfig-paths/register src/ide/TestEntry.ts", { stdio }) async () => await exec("ts-node-dev -r tsconfig-paths/register src/ide/TestEntry.ts", { stdio }),
); );
gulp.task("run:profiler", async () => { gulp.task("run:profiler", async () => {
await cleanCompiled(); await cleanCompiled();

View File

@ -711,7 +711,11 @@ export class LocationLootGenerator {
// Draw a random item from spawn points possible items // Draw a random item from spawn points possible items
const chosenComposedKey = itemArray.draw(1)[0]; const chosenComposedKey = itemArray.draw(1)[0];
const createItemResult = this.createDynamicLootItem(chosenComposedKey, spawnPoint.template.Items, staticAmmoDist); const createItemResult = this.createDynamicLootItem(
chosenComposedKey,
spawnPoint.template.Items,
staticAmmoDist,
);
// Root id can change when generating a weapon, ensure ids match // Root id can change when generating a weapon, ensure ids match
spawnPoint.template.Root = createItemResult.items[0]._id; spawnPoint.template.Root = createItemResult.items[0]._id;
@ -776,9 +780,9 @@ export class LocationLootGenerator {
const createItemResult = this.createDynamicLootItem( const createItemResult = this.createDynamicLootItem(
lootItem.Items[0]._id, lootItem.Items[0]._id,
lootItem.Items, lootItem.Items,
staticAmmoDist staticAmmoDist,
); );
// Update root ID with the dynamically generated ID // Update root ID with the dynamically generated ID
lootItem.Root = createItemResult.items[0]._id; lootItem.Root = createItemResult.items[0]._id;
lootItem.Items = createItemResult.items; lootItem.Items = createItemResult.items;
@ -808,7 +812,7 @@ export class LocationLootGenerator {
const createItemResult = this.createDynamicLootItem( const createItemResult = this.createDynamicLootItem(
locationTemplateToAdd.Items[0]._id, locationTemplateToAdd.Items[0]._id,
forcedLootLocation.template.Items, forcedLootLocation.template.Items,
staticAmmoDist staticAmmoDist,
); );
// Update root ID with the dynamically generated ID // Update root ID with the dynamically generated ID
@ -890,10 +894,7 @@ export class LocationLootGenerator {
} else { } else {
// Also used by armors to get child mods // Also used by armors to get child mods
// Get item + children and add into array we return // Get item + children and add into array we return
let itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems( let itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems(items, chosenItem._id);
items,
chosenItem._id,
);
// Ensure all IDs are unique // Ensure all IDs are unique
itemWithChildren = this.itemHelper.replaceIDs(itemWithChildren); itemWithChildren = this.itemHelper.replaceIDs(itemWithChildren);

View File

@ -536,18 +536,16 @@ export class ProfileHelper {
/** /**
* Return a favorites array in the format expected by the getOtherProfile call * Return a favorites array in the format expected by the getOtherProfile call
* @param profile * @param profile
* @returns An array of IItem objects representing the favorited data * @returns An array of IItem objects representing the favorited data
*/ */
public getOtherProfileFavorites(profile: IPmcData): IItem[] { public getOtherProfileFavorites(profile: IPmcData): IItem[] {
let fullFavorites = []; let fullFavorites = [];
for (const itemId of profile.Inventory.favoriteItems ?? []) for (const itemId of profile.Inventory.favoriteItems ?? []) {
{
// When viewing another users profile, the client expects a full item with children, so get that // When viewing another users profile, the client expects a full item with children, so get that
const itemAndChildren = this.itemHelper.findAndReturnChildrenAsItems(profile.Inventory.items, itemId); const itemAndChildren = this.itemHelper.findAndReturnChildrenAsItems(profile.Inventory.items, itemId);
if (itemAndChildren && itemAndChildren.length > 0) if (itemAndChildren && itemAndChildren.length > 0) {
{
// To get the client to actually see the items, we set the main item's parent to null, so it's treated as a root item // To get the client to actually see the items, we set the main item's parent to null, so it's treated as a root item
const clonedItems = this.cloner.clone(itemAndChildren); const clonedItems = this.cloner.clone(itemAndChildren);
clonedItems[0].parentId = null; clonedItems[0].parentId = null;

View File

@ -1,6 +1,5 @@
// This is an auto generated file, do not modify. Re-generate with `npm run gen:items` // This is an auto generated file, do not modify. Re-generate with `npm run gen:items`
export enum ItemTpl export enum ItemTpl {
{
AMMOBOX_127X55_PS12A_10RND = "65702420bfc87b3a34093219", AMMOBOX_127X55_PS12A_10RND = "65702420bfc87b3a34093219",
AMMOBOX_127X55_PS12B_10RND = "648983d6b5a2df1c815a04ec", AMMOBOX_127X55_PS12B_10RND = "648983d6b5a2df1c815a04ec",
AMMOBOX_127X55_PS12_10RND = "6570241bcfc010a0f50069f5", AMMOBOX_127X55_PS12_10RND = "6570241bcfc010a0f50069f5",

View File

@ -1,6 +1,5 @@
// This is an auto generated file, do not modify. Re-generate with `npm run gen:items` // This is an auto generated file, do not modify. Re-generate with `npm run gen:items`
export enum Weapons export enum Weapons {
{
ASSAULTCARBINE_762X39_OP_SKS = "587e02ff24597743df3deaeb", ASSAULTCARBINE_762X39_OP_SKS = "587e02ff24597743df3deaeb",
ASSAULTCARBINE_762X39_SKS = "574d967124597745970e7c94", ASSAULTCARBINE_762X39_SKS = "574d967124597745970e7c94",
ASSAULTCARBINE_762X51_VPO_101_VEPR_HUNTER = "5c501a4d2e221602b412b540", ASSAULTCARBINE_762X51_VPO_101_VEPR_HUNTER = "5c501a4d2e221602b412b540",

View File

@ -15,7 +15,12 @@ export class BundleSerializer extends Serializer {
super(); super();
} }
public override async serialize(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any): Promise<void> { public override async serialize(
sessionID: string,
req: IncomingMessage,
resp: ServerResponse,
body: any,
): Promise<void> {
const key = decodeURI(req.url.split("/bundle/")[1]); const key = decodeURI(req.url.split("/bundle/")[1]);
const bundle = this.bundleLoader.getBundle(key); const bundle = this.bundleLoader.getBundle(key);
if (!bundle) { if (!bundle) {

View File

@ -9,7 +9,12 @@ export class ImageSerializer extends Serializer {
super(); super();
} }
public override async serialize(sessionID: string, req: IncomingMessage, resp: ServerResponse, body: any): Promise<void> { public override async serialize(
sessionID: string,
req: IncomingMessage,
resp: ServerResponse,
body: any,
): Promise<void> {
await this.imageRouter.sendImage(sessionID, req, resp, body); await this.imageRouter.sendImage(sessionID, req, resp, body);
} }

View File

@ -15,7 +15,12 @@ export class NotifySerializer extends Serializer {
super(); super();
} }
public override async serialize(_sessionID: string, req: IncomingMessage, resp: ServerResponse, _: any): Promise<void> { public override async serialize(
_sessionID: string,
req: IncomingMessage,
resp: ServerResponse,
_: any,
): Promise<void> {
const splittedUrl = req.url.split("/"); const splittedUrl = req.url.split("/");
const tmpSessionID = splittedUrl[splittedUrl.length - 1].split("?last_id")[0]; const tmpSessionID = splittedUrl[splittedUrl.length - 1].split("?last_id")[0];

View File

@ -331,19 +331,18 @@ export class DatabaseService {
*/ */
public validateDatabase(): void { public validateDatabase(): void {
const start = performance.now(); const start = performance.now();
this.isDataValid =
this.validateTable(this.getQuests(), 'quest') &&
this.validateTable(this.getTraders(), 'trader') &&
this.validateTable(this.getItems(), 'item') &&
this.validateTable(this.getCustomization(), 'customization');
if (!this.isDataValid) this.isDataValid =
{ this.validateTable(this.getQuests(), "quest") &&
this.validateTable(this.getTraders(), "trader") &&
this.validateTable(this.getItems(), "item") &&
this.validateTable(this.getCustomization(), "customization");
if (!this.isDataValid) {
this.logger.error(this.localisationService.getText("database-invalid_data")); this.logger.error(this.localisationService.getText("database-invalid_data"));
} }
const validateTime = performance.now() - start const validateTime = performance.now() - start;
this.logger.debug(`ID validation took: ${validateTime.toFixed(2)}ms`); this.logger.debug(`ID validation took: ${validateTime.toFixed(2)}ms`);
} }
@ -353,12 +352,9 @@ export class DatabaseService {
* @param tableType The type of table, used in output message * @param tableType The type of table, used in output message
* @returns True if the table only contains valid data * @returns True if the table only contains valid data
*/ */
private validateTable(table: Record<string, any>, tableType: string): boolean private validateTable(table: Record<string, any>, tableType: string): boolean {
{ for (const tableId in table) {
for (const tableId in table) if (!this.hashUtil.isValidMongoId(tableId)) {
{
if (!this.hashUtil.isValidMongoId(tableId))
{
this.logger.error(`Invalid ${tableType} ID: '${tableId}'`); this.logger.error(`Invalid ${tableType} ID: '${tableId}'`);
return false; return false;
} }

View File

@ -2,7 +2,7 @@ import fs from "node:fs";
import { ServerResponse } from "node:http"; import { ServerResponse } from "node:http";
import { HttpServerHelper } from "@spt/helpers/HttpServerHelper"; import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
import { inject, injectable } from "tsyringe"; import { inject, injectable } from "tsyringe";
import { pipeline } from 'stream/promises'; import { pipeline } from "stream/promises";
@injectable() @injectable()
export class HttpFileUtil { export class HttpFileUtil {

View File

@ -22,7 +22,7 @@ export class WinstonMainLogger extends AbstractWinstonLogger {
} }
protected getFilePath(): string { protected getFilePath(): string {
return path.join("user" ,"logs"); return path.join("user", "logs");
} }
protected getFileName(): string { protected getFileName(): string {