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

Fix Tournament Profile having access to Fence (!358)

Browse Source 
Fixes SPT/Issues#677
Fence should be locked in Tournament Profile.
Setting Fences base.json `unlockedByDefault` to `false` makes the profile able to lock Fence

Code from Client:
Shows that unlockedByDefault overrides whatever is written in the Profile data on init.
![image](/attachments/7336f96c-31c0-4ea3-848d-65320cf41340)

Working Screen from Game:
![image](/attachments/b94f368e-91c4-4641-a31e-8b0d8c60d239)

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/358
Co-authored-by: TetrisGG <dmiller2606@gmail.com>
Co-committed-by: TetrisGG <dmiller2606@gmail.com>
This commit is contained in:
TetrisGG 2024-06-04 17:20:10 +00:00 committed by chomp
parent dde78b30eb
commit bef57f4f58
3 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
project/assets/database/templates/profiles.json
View File

@ -2624,7 +2624,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0, "initialStanding": 0,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
}, },
@ -5444,7 +5447,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0, "initialStanding": 0,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
} }
@ -8633,7 +8639,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0, "initialStanding": 0,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
}, },
@ -11921,7 +11930,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0, "initialStanding": 0,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
} }
@ -15568,7 +15580,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
}, },
@ -19412,7 +19427,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
} }
@ -23099,7 +23117,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
}, },
@ -26943,7 +26964,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
} }
@ -31271,7 +31295,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
}, },
@ -35815,7 +35842,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
} }
@ -36758,9 +36788,6 @@
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false, "jaegerUnlocked": false,
"fleaBlockedDays": 365, "fleaBlockedDays": 365,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
],
"purchaseAllClothingByDefaultForTrader":[ "purchaseAllClothingByDefaultForTrader":[
"5ac3b934156ae10c4430e83c" "5ac3b934156ae10c4430e83c"
] ]
@ -37701,9 +37728,6 @@
"initialStanding": 0.2, "initialStanding": 0.2,
"jaegerUnlocked": false, "jaegerUnlocked": false,
"fleaBlockedDays": 365, "fleaBlockedDays": 365,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
],
"purchaseAllClothingByDefaultForTrader":[ "purchaseAllClothingByDefaultForTrader":[
"5ac3b934156ae10c4430e83c" "5ac3b934156ae10c4430e83c"
] ]
@ -40748,6 +40772,9 @@
"initialSalesSum": 2600000, "initialSalesSum": 2600000,
"initialStanding": 6, "initialStanding": 6,
"jaegerUnlocked": true, "jaegerUnlocked": true,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
],
"setQuestsAvailableForFinish": true, "setQuestsAvailableForFinish": true,
"setQuestsAvailableForStart": false "setQuestsAvailableForStart": false
}, },
@ -43755,6 +43782,9 @@
"initialSalesSum": 2600000, "initialSalesSum": 2600000,
"initialStanding": 6, "initialStanding": 6,
"jaegerUnlocked": true, "jaegerUnlocked": true,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
],
"setQuestsAvailableForStart": true "setQuestsAvailableForStart": true
}, },
"weaponbuilds": {} "weaponbuilds": {}
@ -47107,6 +47137,9 @@
"initialSalesSum": 2600000, "initialSalesSum": 2600000,
"initialStanding": 1, "initialStanding": 1,
"jaegerUnlocked": true, "jaegerUnlocked": true,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
],
"setQuestsAvailableForStart": false "setQuestsAvailableForStart": false
}, },
"weaponbuilds": {} "weaponbuilds": {}
@ -50456,6 +50489,9 @@
"initialSalesSum": 2600000, "initialSalesSum": 2600000,
"initialStanding": 1, "initialStanding": 1,
"jaegerUnlocked": true, "jaegerUnlocked": true,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
],
"setQuestsAvailableForStart": false "setQuestsAvailableForStart": false
}, },
"weaponbuilds": {} "weaponbuilds": {}
@ -51367,7 +51403,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0, "initialStanding": 0,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
}, },
@ -52286,7 +52325,10 @@
}, },
"initialSalesSum": 0, "initialSalesSum": 0,
"initialStanding": 0, "initialStanding": 0,
"jaegerUnlocked": false "jaegerUnlocked": false,
"lockedByDefaultOverride": [
"579dc571d53a0658a154fbec"
]
}, },
"weaponbuilds": {} "weaponbuilds": {}
} }

2
project/assets/database/traders/579dc571d53a0658a154fbec/base.json
View File

@ -184,5 +184,5 @@
], ],
"sell_modifier_for_prohibited_items": 0, "sell_modifier_for_prohibited_items": 0,
"surname": "Fence", "surname": "Fence",
"unlockedByDefault": true "unlockedByDefault": false
} }

2
project/src/helpers/TraderHelper.ts
View File

@ -154,7 +154,7 @@ export class TraderHelper
// Check if trader should be locked by default // Check if trader should be locked by default
if (rawProfileTemplate.lockedByDefaultOverride?.includes(traderID)) if (rawProfileTemplate.lockedByDefaultOverride?.includes(traderID))
{ {
pmcData.TradersInfo[traderID].unlocked = false; pmcData.TradersInfo[traderID].unlocked = true;
} }
if (rawProfileTemplate.purchaseAllClothingByDefaultForTrader?.includes(traderID)) if (rawProfileTemplate.purchaseAllClothingByDefaultForTrader?.includes(traderID))