mirror of
https://github.com/sp-tarkov/server.git
synced 2025-02-12 17:30:42 -05:00
Biome Format
Ran the `npm run style:fix` command. These are the code-formatting fixes.
This commit is contained in:
parent
c3cd67d8b9
commit
21939dcf38
@ -371,7 +371,7 @@
|
||||
"allowBossItems": false,
|
||||
"useForcedLoot": true,
|
||||
"forcedLoot": {
|
||||
"66d9f7256916142b3b02276e": {"min": 2, "max": 4 }
|
||||
"66d9f7256916142b3b02276e": { "min": 2, "max": 4 }
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -57,98 +57,116 @@
|
||||
"textLocaleKey": "farewell"
|
||||
},
|
||||
"pages": [[0, 1]],
|
||||
"questions": [{
|
||||
"questions": [
|
||||
{
|
||||
"id": 0,
|
||||
"sortIndex": 1,
|
||||
"titleLocaleKey": "question_1",
|
||||
"hintLocaleKey": "",
|
||||
"answerLimit": 10,
|
||||
"answerType": "MultiOption",
|
||||
"answers": [{
|
||||
"answers": [
|
||||
{
|
||||
"id": 0,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_1"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 1,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_2"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_3"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_4"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_5"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_6"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_7"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_8"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_9"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_10"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
"questionId": 0,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_1_answer_11"
|
||||
}
|
||||
]
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 1,
|
||||
"sortIndex": 1,
|
||||
"titleLocaleKey": "question_2",
|
||||
"hintLocaleKey": "",
|
||||
"answerLimit": 5,
|
||||
"answerType": "SingleOption",
|
||||
"answers": [{
|
||||
"answers": [
|
||||
{
|
||||
"id": 0,
|
||||
"questionId": 1,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_2_answer_1"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 1,
|
||||
"questionId": 1,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_2_answer_2"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"questionId": 1,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_2_answer_3"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"questionId": 1,
|
||||
"sortIndex": 1,
|
||||
"localeKey": "question_2_answer_4"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"questionId": 1,
|
||||
"sortIndex": 1,
|
||||
|
@ -40,45 +40,131 @@
|
||||
],
|
||||
"craftTimeOverride": -1,
|
||||
"directRewards": [
|
||||
{"reward": ["5857a8bc2459772bad15db29"], "requiredItems": ["665ee77ccf2d642e98220bca"], "craftTimeSeconds": 360,
|
||||
"repeatable": false },
|
||||
{"reward": ["5c093ca986f7740a1867ab12"], "requiredItems": ["5732ee6a24597719ae0c0281"], "craftTimeSeconds": 3960,
|
||||
"repeatable": false },
|
||||
{"reward": ["655c669103999d3c810c025b"], "requiredItems": ["635267ab3c89e2112001f826"], "craftTimeSeconds": 3960,
|
||||
"repeatable": false },
|
||||
{"reward": ["5fc64ea372b0dd78d51159dc"], "requiredItems": ["635267ab3c89e2112001f826", "635267ab3c89e2112001f826",
|
||||
"635267ab3c89e2112001f826", "635267ab3c89e2112001f826", "635267ab3c89e2112001f826"], "craftTimeSeconds": 3960,
|
||||
"repeatable": false },
|
||||
{"reward": ["5c0e874186f7745dc7616606"], "requiredItems": ["66572c82ad599021091c6118"],
|
||||
"craftTimeSeconds": 3960, "repeatable": false },
|
||||
{"reward": ["60a7ad3a0c5cb24b0134664a", "60a7ad2a2198820d95707a2e"], "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 }
|
||||
{
|
||||
"reward": ["5857a8bc2459772bad15db29"],
|
||||
"requiredItems": ["665ee77ccf2d642e98220bca"],
|
||||
"craftTimeSeconds": 360,
|
||||
"repeatable": false
|
||||
},
|
||||
{
|
||||
"reward": ["5c093ca986f7740a1867ab12"],
|
||||
"requiredItems": ["5732ee6a24597719ae0c0281"],
|
||||
"craftTimeSeconds": 3960,
|
||||
"repeatable": false
|
||||
},
|
||||
{
|
||||
"reward": ["655c669103999d3c810c025b"],
|
||||
"requiredItems": ["635267ab3c89e2112001f826"],
|
||||
"craftTimeSeconds": 3960,
|
||||
"repeatable": false
|
||||
},
|
||||
{
|
||||
"reward": ["5fc64ea372b0dd78d51159dc"],
|
||||
"requiredItems": [
|
||||
"635267ab3c89e2112001f826",
|
||||
"635267ab3c89e2112001f826",
|
||||
"635267ab3c89e2112001f826",
|
||||
"635267ab3c89e2112001f826",
|
||||
"635267ab3c89e2112001f826"
|
||||
],
|
||||
"craftTimeSeconds": 3960,
|
||||
"repeatable": false
|
||||
},
|
||||
{
|
||||
"reward": ["5c0e874186f7745dc7616606"],
|
||||
"requiredItems": ["66572c82ad599021091c6118"],
|
||||
"craftTimeSeconds": 3960,
|
||||
"repeatable": false
|
||||
},
|
||||
{
|
||||
"reward": ["60a7ad3a0c5cb24b0134664a", "60a7ad2a2198820d95707a2e"],
|
||||
"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": {
|
||||
"exampleParentId": { "min": 1000, "max": 50000 }
|
||||
|
@ -156,8 +156,8 @@
|
||||
"5c1a1e3f2e221602b66cc4c2"
|
||||
],
|
||||
"handbookPriceOverride": {
|
||||
"63a8970d7108f713591149f5": {"price": 5000, "parentId": "5b5f6fa186f77409407a7eb7"},
|
||||
"63a898a328e385334e0640a5": {"price": 10000, "parentId": "5b5f6fa186f77409407a7eb7"},
|
||||
"63a897c6b1ff6e29734fcc95": {"price": 20000, "parentId": "5b5f6fa186f77409407a7eb7"}
|
||||
"63a8970d7108f713591149f5": { "price": 5000, "parentId": "5b5f6fa186f77409407a7eb7" },
|
||||
"63a898a328e385334e0640a5": { "price": 10000, "parentId": "5b5f6fa186f77409407a7eb7" },
|
||||
"63a897c6b1ff6e29734fcc95": { "price": 20000, "parentId": "5b5f6fa186f77409407a7eb7" }
|
||||
}
|
||||
}
|
||||
|
@ -41,7 +41,8 @@
|
||||
},
|
||||
"customWaves": {
|
||||
"boss": {
|
||||
"bigmap": [{
|
||||
"bigmap": [
|
||||
{
|
||||
"sptId": "usecbigmap",
|
||||
"BossChance": 50,
|
||||
"BossDifficult": "normal",
|
||||
@ -57,14 +58,13 @@
|
||||
"ForceSpawn": false,
|
||||
"IgnoreMaxBots": true,
|
||||
"RandomTimeSpawn": false,
|
||||
"SpawnMode": [
|
||||
"pve"
|
||||
],
|
||||
"SpawnMode": ["pve"],
|
||||
"Supports": null,
|
||||
"Time": -1,
|
||||
"TriggerId": "",
|
||||
"TriggerName": ""
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"sptId": "bearbigmap",
|
||||
"BossChance": 50,
|
||||
"BossDifficult": "normal",
|
||||
@ -80,16 +80,15 @@
|
||||
"ForceSpawn": false,
|
||||
"IgnoreMaxBots": true,
|
||||
"RandomTimeSpawn": false,
|
||||
"SpawnMode": [
|
||||
"pve"
|
||||
],
|
||||
"SpawnMode": ["pve"],
|
||||
"Supports": null,
|
||||
"Time": -1,
|
||||
"TriggerId": "",
|
||||
"TriggerName": ""
|
||||
}
|
||||
],
|
||||
"woods": [{
|
||||
"woods": [
|
||||
{
|
||||
"sptId": "usecbigmap",
|
||||
"BossChance": 50,
|
||||
"BossDifficult": "normal",
|
||||
@ -105,14 +104,13 @@
|
||||
"ForceSpawn": false,
|
||||
"IgnoreMaxBots": true,
|
||||
"RandomTimeSpawn": false,
|
||||
"SpawnMode": [
|
||||
"pve"
|
||||
],
|
||||
"SpawnMode": ["pve"],
|
||||
"Supports": null,
|
||||
"Time": -1,
|
||||
"TriggerId": "",
|
||||
"TriggerName": ""
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"sptId": "bearbigmap",
|
||||
"BossChance": 50,
|
||||
"BossDifficult": "normal",
|
||||
@ -128,16 +126,15 @@
|
||||
"ForceSpawn": false,
|
||||
"IgnoreMaxBots": true,
|
||||
"RandomTimeSpawn": false,
|
||||
"SpawnMode": [
|
||||
"pve"
|
||||
],
|
||||
"SpawnMode": ["pve"],
|
||||
"Supports": null,
|
||||
"Time": -1,
|
||||
"TriggerId": "",
|
||||
"TriggerName": ""
|
||||
}
|
||||
],
|
||||
"sandbox_high": [{
|
||||
"sandbox_high": [
|
||||
{
|
||||
"sptId": "usecbigmap",
|
||||
"BossChance": 50,
|
||||
"BossDifficult": "normal",
|
||||
@ -153,14 +150,13 @@
|
||||
"ForceSpawn": false,
|
||||
"IgnoreMaxBots": true,
|
||||
"RandomTimeSpawn": false,
|
||||
"SpawnMode": [
|
||||
"pve"
|
||||
],
|
||||
"SpawnMode": ["pve"],
|
||||
"Supports": null,
|
||||
"Time": -1,
|
||||
"TriggerId": "",
|
||||
"TriggerName": ""
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"sptId": "bearbigmap",
|
||||
"BossChance": 50,
|
||||
"BossDifficult": "normal",
|
||||
@ -176,9 +172,7 @@
|
||||
"ForceSpawn": false,
|
||||
"IgnoreMaxBots": true,
|
||||
"RandomTimeSpawn": false,
|
||||
"SpawnMode": [
|
||||
"pve"
|
||||
],
|
||||
"SpawnMode": ["pve"],
|
||||
"Supports": null,
|
||||
"Time": -1,
|
||||
"TriggerId": "",
|
||||
@ -263,19 +257,22 @@
|
||||
"addCustomBotWavesToMaps": true,
|
||||
"enableBotTypeLimits": true,
|
||||
"botTypeLimits": {
|
||||
"tarkovstreets": [{
|
||||
"tarkovstreets": [
|
||||
{
|
||||
"type": "marksman",
|
||||
"min": 2,
|
||||
"max": 4
|
||||
}
|
||||
],
|
||||
"woods": [{
|
||||
"woods": [
|
||||
{
|
||||
"type": "marksman",
|
||||
"min": 2,
|
||||
"max": 5
|
||||
}
|
||||
],
|
||||
"bigmap": [{
|
||||
"bigmap": [
|
||||
{
|
||||
"type": "marksman",
|
||||
"min": 2,
|
||||
"max": 4
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -368,10 +368,7 @@
|
||||
],
|
||||
"coopExtractGift": {
|
||||
"sendGift": true,
|
||||
"messageLocaleIds": [
|
||||
"5da89b1886f77439d7741002 0",
|
||||
"5da89b3a86f7742f9026cb83 0"
|
||||
],
|
||||
"messageLocaleIds": ["5da89b1886f77439d7741002 0", "5da89b3a86f7742f9026cb83 0"],
|
||||
"giftExpiryHours": 168,
|
||||
"weaponPresetCount": {
|
||||
"min": 0,
|
||||
|
@ -111,56 +111,64 @@
|
||||
"weights": [1, 2]
|
||||
}
|
||||
},
|
||||
"seasonDates": [{
|
||||
"seasonDates": [
|
||||
{
|
||||
"seasonType": 0,
|
||||
"name": "SUMMER",
|
||||
"startDay": "2",
|
||||
"startMonth": "6",
|
||||
"endDay": "15",
|
||||
"endMonth": "10"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"seasonType": 1,
|
||||
"name": "AUTUMN",
|
||||
"startDay": "15",
|
||||
"startMonth": "10",
|
||||
"endDay": "1",
|
||||
"endMonth": "11"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"seasonType": 4,
|
||||
"name": "AUTUMN_LATE",
|
||||
"startDay": "1",
|
||||
"startMonth": "11",
|
||||
"endDay": "21",
|
||||
"endMonth": "12"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"seasonType": 2,
|
||||
"name": "WINTER_START",
|
||||
"startDay": "21",
|
||||
"startMonth": "12",
|
||||
"endDay": "31",
|
||||
"endMonth": "12"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"seasonType": 2,
|
||||
"name": "WINTER_END",
|
||||
"startDay": "1",
|
||||
"startMonth": "1",
|
||||
"endDay": "9",
|
||||
"endMonth": "1"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"seasonType": 5,
|
||||
"name": "SPRING_EARLY",
|
||||
"startDay": "9",
|
||||
"startMonth": "1",
|
||||
"endDay": "25",
|
||||
"endMonth": "3"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"seasonType": 3,
|
||||
"name": "SPRING",
|
||||
"startDay": "25",
|
||||
"startMonth": "3",
|
||||
"endDay": "2",
|
||||
"endMonth": "6"
|
||||
}, {
|
||||
},
|
||||
{
|
||||
"seasonType": 4,
|
||||
"name": "STORM",
|
||||
"startDay": "24",
|
||||
|
@ -94,7 +94,7 @@ const updateBuildProperties = async () => {
|
||||
res.entries,
|
||||
1,
|
||||
1033,
|
||||
iconFile.icons.map((item) => item.data)
|
||||
iconFile.icons.map((item) => item.data),
|
||||
);
|
||||
|
||||
const vi = ResEdit.Resource.VersionInfo.fromEntries(res.entries)[0];
|
||||
@ -106,7 +106,7 @@ const updateBuildProperties = async () => {
|
||||
FileDescription: manifest.description,
|
||||
CompanyName: manifest.name,
|
||||
LegalCopyright: manifest.license,
|
||||
}
|
||||
},
|
||||
);
|
||||
vi.removeStringValue({ lang: 1033, codepage: 1200 }, "OriginalFilename");
|
||||
vi.removeStringValue({ lang: 1033, codepage: 1200 }, "InternalName");
|
||||
@ -189,13 +189,7 @@ const createHashFile = async () => {
|
||||
};
|
||||
|
||||
// Combine all tasks into addAssets
|
||||
const addAssets = gulp.series(
|
||||
copyAssets,
|
||||
downloadPnpm,
|
||||
copyLicense,
|
||||
writeBuildDataToJSON,
|
||||
createHashFile
|
||||
);
|
||||
const addAssets = gulp.series(copyAssets, downloadPnpm, copyLicense, writeBuildDataToJSON, createHashFile);
|
||||
|
||||
/**
|
||||
* 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: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 () => {
|
||||
await cleanCompiled();
|
||||
|
@ -711,7 +711,11 @@ export class LocationLootGenerator {
|
||||
|
||||
// Draw a random item from spawn points possible items
|
||||
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
|
||||
spawnPoint.template.Root = createItemResult.items[0]._id;
|
||||
@ -776,7 +780,7 @@ export class LocationLootGenerator {
|
||||
const createItemResult = this.createDynamicLootItem(
|
||||
lootItem.Items[0]._id,
|
||||
lootItem.Items,
|
||||
staticAmmoDist
|
||||
staticAmmoDist,
|
||||
);
|
||||
|
||||
// Update root ID with the dynamically generated ID
|
||||
@ -808,7 +812,7 @@ export class LocationLootGenerator {
|
||||
const createItemResult = this.createDynamicLootItem(
|
||||
locationTemplateToAdd.Items[0]._id,
|
||||
forcedLootLocation.template.Items,
|
||||
staticAmmoDist
|
||||
staticAmmoDist,
|
||||
);
|
||||
|
||||
// Update root ID with the dynamically generated ID
|
||||
@ -890,10 +894,7 @@ export class LocationLootGenerator {
|
||||
} else {
|
||||
// Also used by armors to get child mods
|
||||
// Get item + children and add into array we return
|
||||
let itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems(
|
||||
items,
|
||||
chosenItem._id,
|
||||
);
|
||||
let itemWithChildren = this.itemHelper.findAndReturnChildrenAsItems(items, chosenItem._id);
|
||||
|
||||
// Ensure all IDs are unique
|
||||
itemWithChildren = this.itemHelper.replaceIDs(itemWithChildren);
|
||||
|
@ -542,12 +542,10 @@ export class ProfileHelper {
|
||||
public getOtherProfileFavorites(profile: IPmcData): IItem[] {
|
||||
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
|
||||
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
|
||||
const clonedItems = this.cloner.clone(itemAndChildren);
|
||||
clonedItems[0].parentId = null;
|
||||
|
@ -1,6 +1,5 @@
|
||||
// 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_PS12B_10RND = "648983d6b5a2df1c815a04ec",
|
||||
AMMOBOX_127X55_PS12_10RND = "6570241bcfc010a0f50069f5",
|
||||
|
@ -1,6 +1,5 @@
|
||||
// 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_SKS = "574d967124597745970e7c94",
|
||||
ASSAULTCARBINE_762X51_VPO_101_VEPR_HUNTER = "5c501a4d2e221602b412b540",
|
||||
|
@ -15,7 +15,12 @@ export class BundleSerializer extends Serializer {
|
||||
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 bundle = this.bundleLoader.getBundle(key);
|
||||
if (!bundle) {
|
||||
|
@ -9,7 +9,12 @@ export class ImageSerializer extends Serializer {
|
||||
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);
|
||||
}
|
||||
|
||||
|
@ -15,7 +15,12 @@ export class NotifySerializer extends Serializer {
|
||||
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 tmpSessionID = splittedUrl[splittedUrl.length - 1].split("?last_id")[0];
|
||||
|
||||
|
@ -333,17 +333,16 @@ export class DatabaseService {
|
||||
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');
|
||||
this.validateTable(this.getQuests(), "quest") &&
|
||||
this.validateTable(this.getTraders(), "trader") &&
|
||||
this.validateTable(this.getItems(), "item") &&
|
||||
this.validateTable(this.getCustomization(), "customization");
|
||||
|
||||
if (!this.isDataValid)
|
||||
{
|
||||
if (!this.isDataValid) {
|
||||
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`);
|
||||
}
|
||||
|
||||
@ -353,12 +352,9 @@ export class DatabaseService {
|
||||
* @param tableType The type of table, used in output message
|
||||
* @returns True if the table only contains valid data
|
||||
*/
|
||||
private validateTable(table: Record<string, any>, tableType: string): boolean
|
||||
{
|
||||
for (const tableId in table)
|
||||
{
|
||||
if (!this.hashUtil.isValidMongoId(tableId))
|
||||
{
|
||||
private validateTable(table: Record<string, any>, tableType: string): boolean {
|
||||
for (const tableId in table) {
|
||||
if (!this.hashUtil.isValidMongoId(tableId)) {
|
||||
this.logger.error(`Invalid ${tableType} ID: '${tableId}'`);
|
||||
return false;
|
||||
}
|
||||
|
@ -2,7 +2,7 @@ import fs from "node:fs";
|
||||
import { ServerResponse } from "node:http";
|
||||
import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
|
||||
import { inject, injectable } from "tsyringe";
|
||||
import { pipeline } from 'stream/promises';
|
||||
import { pipeline } from "stream/promises";
|
||||
|
||||
@injectable()
|
||||
export class HttpFileUtil {
|
||||
|
@ -22,7 +22,7 @@ export class WinstonMainLogger extends AbstractWinstonLogger {
|
||||
}
|
||||
|
||||
protected getFilePath(): string {
|
||||
return path.join("user" ,"logs");
|
||||
return path.join("user", "logs");
|
||||
}
|
||||
|
||||
protected getFileName(): string {
|
||||
|
Loading…
x
Reference in New Issue
Block a user