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

Biome Format

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project/assets/configs/airdrop.json
View File

@ -371,7 +371,7 @@
"allowBossItems": false, "allowBossItems": false,
"useForcedLoot": true, "useForcedLoot": true,
"forcedLoot": { "forcedLoot": {
"66d9f7256916142b3b02276e": {"min": 2, "max": 4 } "66d9f7256916142b3b02276e": { "min": 2, "max": 4 }
} }
} }
}, },

54
project/assets/configs/core.json
View File

@ -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,

164
project/assets/configs/hideout.json
View File

@ -40,45 +40,131 @@
], ],
"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 }

6
project/assets/configs/item.json
View File

@ -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" }
} }
} }

51
project/assets/configs/location.json
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": "",
@ -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

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

File diff suppressed because it is too large Load Diff

5
project/assets/configs/trader.json
View File

@ -368,10 +368,7 @@
], ],
"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,

24
project/assets/configs/weather.json
View File

@ -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",

14
project/gulpfile.mjs
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();

15
project/src/generators/LocationLootGenerator.ts
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,7 +780,7 @@ 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
@ -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);

6
project/src/helpers/ProfileHelper.ts
View File

@ -542,12 +542,10 @@ export class ProfileHelper {
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;

3
project/src/models/enums/ItemTpl.ts
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",

3
project/src/models/enums/Weapons.ts
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",

7
project/src/routers/serializers/BundleSerializer.ts
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) {

7
project/src/routers/serializers/ImageSerializer.ts
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);
} }

7
project/src/routers/serializers/NotifySerializer.ts
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];

22
project/src/services/DatabaseService.ts
View File

@ -333,17 +333,16 @@ export class DatabaseService {
const start = performance.now(); const start = performance.now();
this.isDataValid = this.isDataValid =
this.validateTable(this.getQuests(), 'quest') && this.validateTable(this.getQuests(), "quest") &&
this.validateTable(this.getTraders(), 'trader') && this.validateTable(this.getTraders(), "trader") &&
this.validateTable(this.getItems(), 'item') && this.validateTable(this.getItems(), "item") &&
this.validateTable(this.getCustomization(), 'customization'); this.validateTable(this.getCustomization(), "customization");
if (!this.isDataValid) 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;
} }

2
project/src/utils/HttpFileUtil.ts
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 {

2
project/src/utils/logging/WinstonMainLogger.ts
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 {