Commit Graph

571 Commits

Author SHA1 Message Date
Dev
3ac5a6e41a Initial pass at adding new locales with fallbacks 2024-01-26 22:28:36 +00:00
Dev
59bc9cb3e0 Move bot hands/head/voice over to weighted lists 2024-01-26 17:57:13 +00:00
Dev
4d98cf69b8 Update bot data 2024-01-26 16:47:56 +00:00
Dev
7755daf139 Flea price update 2024-01-26 16:26:24 +00:00
Dev
05f7f8b43f Add mods to bots manually to stop warnings on generation 2024-01-26 15:58:14 +00:00
Dev
8a824c2cae removed "location": 0 from cartridge on EoD bear profile 2024-01-26 15:30:32 +00:00
Valens
b9e9e0cd4b Fix rightside_plate in multiple bot types (!208)
Fix rightside_plate to be right_side_plate matching all other entries for config/bots.json, bots/types/arenafighter, bear, and usec.json's

Co-authored-by: VforValens <8889280+VforValens@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/208
Co-authored-by: Valens <valens@noreply.dev.sp-tarkov.com>
Co-committed-by: Valens <valens@noreply.dev.sp-tarkov.com>
2024-01-25 23:29:01 +00:00
Dev
f9965becc1 Fix default preset ordering 2024-01-25 15:18:50 +00:00
Dev
fd7050b0ac Fix issue with weapon/equipment mod selection where it would ignore settings when mod slot was required
Fix JSON errors in bot.json
2024-01-25 13:45:42 +00:00
Dev
4fee533622 Add back paca fix 2024-01-25 12:58:58 +00:00
Dev
26c4138b5c Remove paca debug values 2024-01-25 10:57:37 +00:00
Dev
c376abfbfb pmc 1-14 equipment value adjustments 2024-01-25 10:52:34 +00:00
Dev
2a51d13b91 Fix caps issuewith paca 2024-01-24 22:36:41 +00:00
Dev
7d734a18f1 Bot wave adjustments
Remove gifter from streets
Remove manual waves from streets
2024-01-24 19:49:42 +00:00
Dev
6cdd1ce643 Improve PMC bot gear filtering 2024-01-24 19:15:05 +00:00
Dev
e6c3271b23 JSON update 2024-01-24 13:48:02 +00:00
Dev
b68164b830 Add support for sub locales - initial support for PT and ZH 2024-01-23 20:49:06 +00:00
Dev
dbb4bc5f03 Add missing mods to Ops-Core FAST ballistic helmet on PMCs 2024-01-23 20:25:27 +00:00
Dev
67e5e61d3c Adjust easy start profiles to be level 15 2024-01-23 15:48:08 +00:00
Dev
b3738b03d9 i hate commas 2024-01-23 13:21:22 +00:00
Dev
bcf506a57b Fix json issue 2024-01-23 13:03:04 +00:00
Dev
8816e27298 Add balaclava to vengeful zryachiy 2024-01-23 12:45:49 +00:00
Dev
c51cce269f Workaround for sandbox map having Level 20 max 2024-01-23 10:02:06 +00:00
Dev
8e232e8250 Update bot data 2024-01-21 12:00:16 +00:00
Dev
e7512872ef Add missing equipment mods to PMCs 2024-01-21 09:37:11 +00:00
DrakiaXYZ
e31c52e7ff Add BTR config options (!203)
Also add the cover service entry

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/203
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2024-01-21 08:46:12 +00:00
Dev
446b1ef4f9 Remove duplicate locale key/value 2024-01-20 18:08:25 +00:00
Dev
4cb2d8171e Fix JSON issues with ravangezryachiyevent 2024-01-19 09:37:01 +00:00
Kaeno
01b608d8b2 Adjust bot difficulty for ground zero 2024-01-18 22:03:16 +00:00
Dev
ed6ba36ff3 Update map loot 2024-01-18 21:25:31 +00:00
Dev
a3e4f6141d Adjust GIFTER_ADDITIONAL_GIFTS setting 2024-01-18 12:08:19 +00:00
Dev
bb741f681d Store and process secure container loot items for bots
Give gifter more items
2024-01-18 12:07:32 +00:00
Dev
cef8cbadea Assort updates 2024-01-17 21:46:57 +00:00
Dev
780647a40b Add correct assort data 2024-01-17 19:35:37 +00:00
Dev
71ba4f497a Update quests and traders 2024-01-17 18:32:59 +00:00
Dev
a572d090ba Update JSONs 2024-01-17 10:27:51 +00:00
Dev
0dc2dd5f68 Update flea prices 2024-01-16 17:18:14 +00:00
Dev
220764d0f7 Update bot data
Update `ravangeZryachiyEvent` mapping to use `ravangeZryachiyEvent` bot type data instead of `bossZryachiy`
2024-01-16 16:11:48 +00:00
Dev
2787b25c8d Items json changes 2024-01-15 23:14:15 +00:00
Dev
a749dcc272 Add LK services json 2024-01-15 21:45:35 +00:00
Dev
8e6d5330df Update locales 2024-01-15 18:21:11 +00:00
Dev
d95497728f Map data update 2024-01-15 16:59:21 +00:00
Dev
58d8b1157d update en locale 2024-01-15 16:26:57 +00:00
Dev
91150602ef Update items json 2024-01-15 16:26:27 +00:00
Dev
3cdc5a8e99 Update trader assorts using new quest data 2024-01-15 14:53:34 +00:00
Dev
22e9c1df8b Update quest data 2024-01-15 14:48:33 +00:00
Merijn Hendriks
bdc505bed6 Add locales fallback (!197)
Fixes [#310](https://dev.sp-tarkov.com/SPT-AKI/Issues/issues/310)

Co-authored-by: Merijn Hendriks <merijn.d.hendriks@gmail.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/197
Co-authored-by: Merijn Hendriks <senko-san@noreply.dev.sp-tarkov.com>
Co-committed-by: Merijn Hendriks <senko-san@noreply.dev.sp-tarkov.com>
2024-01-15 12:45:24 +00:00
Dev
3ac64a3245 Update bot data 2024-01-15 10:48:58 +00:00
Merijn Hendriks
f15a2ff71d Update EFT translations (!195)
Dumped the data for Haru, noticed Aki was missing them.

Changes:

- Added Romanian language
- Updated existing languages

I'll check the rest of the data and create new branches accordingly.

Co-authored-by: Merijn Hendriks <merijn.d.hendriks@gmail.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/195
Co-authored-by: Merijn Hendriks <senko-san@noreply.dev.sp-tarkov.com>
Co-committed-by: Merijn Hendriks <senko-san@noreply.dev.sp-tarkov.com>
2024-01-14 21:46:47 +00:00
Dev
48377a0e08 Update JSONs 2024-01-14 15:03:35 +00:00
Dev
66c78cabaf Update bots 2024-01-14 14:37:28 +00:00
Dev
00660747a5 Refresh map loot 2024-01-14 10:10:41 +00:00
Dev
ae50835391 Fix 2 issues with quests 2024-01-13 19:15:20 +00:00
Dev
1f05fe1994 Update bot data 2024-01-13 10:55:12 +00:00
Dev
b01e3f513a update map loot. 0.14 dumps only 2024-01-13 10:53:20 +00:00
Dev
8b9cdd485f Update items json 2024-01-13 10:05:47 +00:00
Dev
dc13b20ed5 Blacklist ammo boxes from completion quest item pool 2024-01-13 09:21:32 +00:00
Dev
80fa0c1b9c Introduce typo into json to follow bsg naming 2024-01-12 19:17:39 +00:00
Dev
a219bab82b Loot update 2024-01-12 18:41:54 +00:00
Dev
6353456b64 Update bot/map data 2024-01-12 17:59:47 +00:00
Dev
9b1b8f9f10 Add missing mods to kiver helmet on PMCs 2024-01-12 17:01:40 +00:00
Dev
6e4d5d1aca Bot update - fix various missing soft-insert shoulder armors 2024-01-12 10:35:02 +00:00
Dev
9623bd5203 Add rig to PMCs 2024-01-11 11:23:33 +00:00
Dev
0e021d246f Update PMC armor data 2024-01-11 09:56:51 +00:00
Terkoiz
b3b570824c Updated PMC name list (!192)
Updated `hazelify` name by request
Added some names of recent contributors

Co-authored-by: Terkoiz <terkoiz@spt.dev>
Co-authored-by: chomp <chomp@noreply.dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/192
Co-authored-by: Terkoiz <terkoiz@noreply.dev.sp-tarkov.com>
Co-committed-by: Terkoiz <terkoiz@noreply.dev.sp-tarkov.com>
2024-01-11 09:43:05 +00:00
Dev
5ba1ed95c1 Update bot data 2024-01-11 09:42:30 +00:00
Dev
3879d14761 Update map data 2024-01-11 08:33:42 +00:00
Dev
3ef7e3218e Update loot data 2024-01-10 23:07:06 +00:00
Dev
77ae4146c2 Fix various quest reward ids 2024-01-10 22:59:25 +00:00
Dev
53c5034edb fix variious pmc json errors 2024-01-10 22:47:48 +00:00
Dev
87bf71415f Update quest json to fix weapon reward errors 2024-01-10 22:42:03 +00:00
Dev
9d8efe8e2f Fix data issue with maska helmet 2024-01-10 15:25:20 +00:00
Dev
6e8028f9c9 Update map base jsons 2024-01-10 12:36:06 +00:00
Dev
f3964639bd Rename mods to weaponMods and add new object equipmentMods
regenerate bot jsons to include this new data (includes correct inclusion of equipment slot "TacticalVest" which was previously missing)

Fix issue with PMM ammo causes generation issues
2024-01-09 15:31:56 +00:00
Dev
60f96ea6aa Update bot + map data 2024-01-09 14:03:24 +00:00
Dev
571d04f957 Add pmc names 2024-01-09 12:33:50 +00:00
Dev
4d663c0ef1 Add missing armor 2024-01-09 10:57:32 +00:00
Aburiu
91e035d540 Added missing Hall of Fame area to BEAR/USEC EoD profiles (!188)
* Adds missing Hall of Fame area to new EoD profiles.

Should allow the area to be built without an error on EoD profiles.

Co-authored-by: Aburiu <44771615+aburiu@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/188
Co-authored-by: Aburiu <aburiu@noreply.dev.sp-tarkov.com>
Co-committed-by: Aburiu <aburiu@noreply.dev.sp-tarkov.com>
2024-01-09 08:52:40 +00:00
Dev
0efd2861c7 Update quest and trader assort data
new quests:
"Pyramid Scheme"
"Pets Wont Need It P2"
"Properties All Around"
"Dandies"
"Steady Signal"
"Nothing Fishy About This"

some traders are missing level 4
many quests still using old 0.13 data
some quests are out of order/ require wrong quests
2024-01-08 22:15:19 +00:00
Dev
aff5c69c80 Update globals with new changes from live 2024-01-08 12:39:44 +00:00
DrakiaXYZ
3401b4094e Initial commit of trader services structure (!187)
- Only contains BTR taxi and delivery services
- Super basic implementation, client doesn't seem to need anything except the service type for these
- Includes handling of the BTR Item Delivery service

Basic implementation can be merged and expanded on later, doesn't break anything by existing (Hopefully)

I've opted to add the routes to the `InRaid` controller/Callbacks, because it is a route only accessed within the raid. Seemed like it would be the best place for it

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/187
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2024-01-08 08:51:46 +00:00
Dev
54948599c3 Fix missing armor item in bot data 2024-01-07 15:35:19 +00:00
Dev
539cef5d9e Update Bear EoD account to have an ak-12 instead of an rpk 2024-01-07 09:39:40 +00:00
Dev
b9c82dbb4d Include plate mod chance % for generation 2024-01-06 23:33:57 +00:00
Dev
68731e399c FIx arena fighter bot not having helmet mods 2024-01-06 23:30:48 +00:00
Dev
ccb658db89 FIx PMCs having no armor plates 2024-01-06 23:23:02 +00:00
Dev
9f99c8d2eb Regenerate loot without terragroup trail quest dumps 2024-01-06 19:55:23 +00:00
Dev
860ca89a45 Fix dev profiles starting at level 67 instead of the intended 69 2024-01-06 15:55:46 +00:00
TheSparta
d6c7eef76d Oops 2024-01-06 13:59:49 +00:00
TheSparta
4a724e55ab Fixed a few typos in the server en.json locale
and left a few others too, I'm assuming some of them were intentional for the pmcresponses
2024-01-06 13:58:05 +00:00
Dev
62dec539db Update bot/map data 2024-01-06 12:06:19 +00:00
Dev
8ef405e551 Correctly implemented:
`client/builds/delete`
`client/builds/equipment/save`
`client/builds/weapon/save`

Updated `defaultEquipmentPresets` json data

Removed old 0.13 preset implementation files

profile-breaking change
2024-01-06 11:11:04 +00:00
Dev
9dbd3d1acf Updated server handling of quests/repeatable quests to match 0.14 changes - this will break profiles 2024-01-05 19:52:21 +00:00
Dev
6da2ce2f74 Update quest data + improve quest type accuracy 2024-01-05 14:35:29 +00:00
Dev
45748888f6 Update englsih locale 2024-01-04 21:55:04 +00:00
Dev
40e8a8d045 Update bot/map data 2024-01-04 21:15:00 +00:00
Dev
959bf52052 Update bot data 2024-01-03 21:28:06 +00:00
Dev
5b57431dc0 Regenerate map data with dynamic/static fix 2024-01-03 09:36:43 +00:00
Dev
90f82d0e03 Update map linkages 2024-01-02 19:12:11 +00:00
Dev
711b91ab0d boss support = null fixes to allow map loading 2024-01-02 18:51:05 +00:00
Dev
5d793348a4 Add missing Caliber68x51 caliber data manually 2024-01-02 18:47:10 +00:00
Dev
78dfeef1d1 Fix various bot json issues 2024-01-02 15:52:01 +00:00
Dev
ce538eaace FIx bad mod_sight_rear data for marksmen 2024-01-02 15:32:17 +00:00
Dev
2ea22adcad dynamic and static loot update - hybrid approach of 0.13 and 0.14 loot data
sandbox/shoreline/streets = only new
woods/customs/lighthouse/interchange/reserve/factory = new and old
2024-01-02 15:18:42 +00:00
Dev
45c6d4dfe7 Attempt to fix key is null error on customs load sometimes 2024-01-02 14:58:27 +00:00
Dev
0c6ac2a123 Update map x/y coords to match live + disable town+suburbs 2024-01-02 14:56:51 +00:00
Dev
4ea97558f1 Bot updates 2024-01-02 10:13:55 +00:00
Dev
86d234cbc2 update sandbox loose loot
Update bot data
remove hard-coded streets btr bot
2024-01-01 21:18:21 +00:00
Dev
612ba29fad Test: merge old and new loose loot shoreline data into one file 2024-01-01 10:59:19 +00:00
Dev
8bbea5e085 Update sandbox quest items 2024-01-01 10:45:58 +00:00
Dev
f31ee42912 Update sandbox loot tables 2024-01-01 09:45:36 +00:00
Dev
39ac1e022d Update trader JSONs 2024-01-01 09:18:50 +00:00
Dev
ca5d73df87 bot json updates 2023-12-31 23:22:59 +00:00
Dev
28f3b99ac1 Bot JSON updates 2023-12-31 16:24:17 +00:00
Dev
c80733ca17 Update sandbox loot values 2023-12-31 16:23:50 +00:00
Dev
2f783f551a Bot json updates 2023-12-31 14:34:57 +00:00
Dev
084cf38582 Update bot data 2023-12-30 21:57:02 +00:00
Dev
eca799d606 Use correct dictionary for storing data in profile TaskConditionCounters instead of BackendCounters 2023-12-30 21:30:54 +00:00
Dev
2dc172297f Improve sandbox loot data 2023-12-30 21:07:53 +00:00
Dev
3fc8905d0d Update locales 2023-12-30 20:39:00 +00:00
Dev
c41749257d Update bot data 2023-12-30 20:28:43 +00:00
Dev
30c15ec9f0 Update shoreline static group data 2023-12-30 18:12:09 +00:00
Dev
1f8b82ad08 Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2023-12-30 18:07:03 +00:00
Dev
bbaaef4e0a Update streets statics data with new groups 2023-12-30 18:05:10 +00:00
Terkoiz
593e95f9bc Updated all language files with the initial export from Crowdin 2023-12-30 19:41:16 +02:00
Dev
29995cccd8 FIx various bot armor gen errors manually 2023-12-30 14:31:30 +00:00
Dev
a055e647e4 Force bot to btr 2023-12-30 13:34:04 +00:00
Dev
e46b390551 Move jsons to correct trader 2023-12-30 12:58:43 +00:00
Dev
400b398503 Add missing btr trader files 2023-12-30 12:51:02 +00:00
Dev
1eec8cf01b Add shooterBtr bot JSON 2023-12-30 12:07:46 +00:00
Dev
2c68793d79 Add first pass of new bot JSONs 2023-12-30 11:40:03 +00:00
Dev
d72fd3fa24 Add base BTR trader server code 2023-12-30 11:21:19 +00:00
Dev
81393fb629 Improve error logging in weapon gen 2023-12-30 10:45:12 +00:00
Dev
113069464a FIx wrong id for rpd in pmc weapon pool 2023-12-30 10:44:30 +00:00
Dev
0cdb6fbb08 Merge manually updated 0.13 quests with 0.14 quests gathered so far 2023-12-30 10:44:09 +00:00
Dev
5abe3e9aac Update labs base json 2023-12-29 23:30:36 +00:00
Dev
04675c56be Fix various weapon item errors in traders 2023-12-29 21:38:15 +00:00
Dev
b70176765e Add additional quests 2023-12-29 17:28:02 +00:00
Dev
ac002fb548 Manually adjust sandbox wave zones, it looks like BSG copy/pasted the wave data from streets 2023-12-29 16:25:07 +00:00
Dev
47074e6aaa update PMC jsons with armor plate
add new 68x51 ammo
Add new weapons to primary slot pool
2023-12-29 12:19:27 +00:00
Dev
f227872ddc Revert bot debug data 2023-12-28 19:02:13 +00:00
Dev
ec263acb96 Add armor plates to various bots
Fix rigs mods not being generated for PMCs
2023-12-28 18:57:02 +00:00
Dev
17c4d6cec0 Rework on equipment generation to process mods on an item if the item supports them instead of if the bots mods array has mods
Add new bots to bot.json
2023-12-28 18:36:37 +00:00
Dev
b9d5112528 Add new map max bot value + add generated statics data for sandbox 2023-12-28 15:30:42 +00:00
Dev
8cc77d6152 Stub out new ammo 2023-12-28 14:24:53 +00:00
Dev
815bded797 Add sandbox loot data 2023-12-28 13:05:27 +00:00
Dev
07d44cd4bd Update jsons + ragman clothing 2023-12-28 12:00:11 +00:00
Dev
f3fee2bc39 Update bot difficulties + fix various mod errors 2023-12-28 10:58:29 +00:00
Dev
06c60b9fd9 Log bot role on error 2023-12-28 00:06:45 +00:00
CWXDEV
f343871706 Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2023-12-28 00:04:11 +00:00
CWXDEV
6b39146965 add armour plates for all profiles (vests, helmets) 2023-12-28 00:03:54 +00:00
Dev
ae41aeef0b Fixed various JSON issues with pmc and assault bots 2023-12-28 00:03:45 +00:00
Dev
31ed35573b Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2023-12-27 23:30:07 +00:00
Dev
369a8a6cca Begin work on updating equpiment code to handle required mods 2023-12-27 23:29:37 +00:00
CWXDEV
8e296fb086 finish off adding paca armour pieces to all profiles 2023-12-27 23:08:00 +00:00
Dev
fa01f1c2ae Add armor plates to default profile
Implemented 2 achievement endpoints
2023-12-27 22:43:42 +00:00
Dev
d9a9b67db4 Remove bad quest data 2023-12-27 22:01:52 +00:00
CWXDEV
07aadc3654 add new skills to profiles 2023-12-27 19:43:15 +00:00
Dev
083622ce3b update JSONs 2023-12-27 18:53:10 +00:00
Dev
b76d5b142c Add achievement files 2023-12-27 18:34:35 +00:00
Dev
6679cf5557 update jsons again 2023-12-27 16:14:34 +00:00
Dev
5eaca29a50 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0
# Conflicts:
#	project/assets/configs/bot.json
#	project/assets/database/locations/shoreline/base.json
#	project/assets/database/locations/tarkovstreets/base.json
#	project/assets/database/templates/handbook.json
#	project/assets/database/templates/items.json
2023-12-27 16:08:54 +00:00
Dev
80b459969a Add starter quests 2023-12-27 16:07:12 +00:00
Dev
89c4dfde35 Update JSONs 2023-12-27 15:59:43 +00:00
Dev
90324ed343 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0
# Conflicts:
#	project/assets/configs/core.json
#	project/package.json
#	project/src/generators/RagfairOfferGenerator.ts
2023-12-19 17:31:19 +00:00
Dev
ffcc6ae71f Force front/rear sights on PMCs 2023-12-17 22:43:48 +00:00
Dev
f322663530 Adjust knight spawn chance on woods 2023-12-17 17:15:42 +00:00
Dev
d8e22637ad Update flea prices 2023-12-17 12:31:03 +00:00
Dev
268a9b8abd Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0
# Conflicts:
#	project/src/callbacks/BundleCallbacks.ts
#	project/src/controllers/RepeatableQuestController.ts
#	project/src/helpers/InRaidHelper.ts
#	project/src/loaders/PreAkiModLoader.ts
2023-12-15 14:16:15 +00:00
Dev
97643f6d70 Add mising m1a 10 round mag to peacekeepr l1 assorts table 2023-12-11 16:37:02 +00:00
Dev
87a40b4d2a Remove bad magazines from usec/bear bots 2023-12-10 14:09:47 +00:00
Dev
77dba80fbd Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0
# Conflicts:
#	project/assets/configs/core.json
#	project/assets/database/locales/global/ch.json
#	project/assets/database/locales/global/cz.json
#	project/assets/database/locales/global/en.json
#	project/assets/database/locales/global/es-mx.json
#	project/assets/database/locales/global/es.json
#	project/assets/database/locales/global/fr.json
#	project/assets/database/locales/global/ge.json
#	project/assets/database/locales/global/hu.json
#	project/assets/database/locales/global/it.json
#	project/assets/database/locales/global/jp.json
#	project/assets/database/locales/global/kr.json
#	project/assets/database/locales/global/pl.json
#	project/assets/database/locales/global/po.json
#	project/assets/database/locales/global/ru.json
#	project/assets/database/locales/global/sk.json
#	project/assets/database/locales/global/tu.json
#	project/src/controllers/TradeController.ts
#	project/src/generators/LocationGenerator.ts
2023-12-08 22:20:16 +00:00
Dev
b148977c79 Update locales - fixes The Punisher - Harvest quest issue 2023-12-05 13:44:16 +00:00
Dev
2410ddfe59 Update flea prices 2023-12-03 11:41:58 +00:00
Dev
1db690afb3 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0
# Conflicts:
#	project/src/controllers/HideoutController.ts
2023-12-03 11:13:22 +00:00
Dev
044f4f9eb3 Update Skiers questassort data 2023-12-03 10:01:55 +00:00
Dev
2148eaafe5 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0
# Conflicts:
#	project/src/context/ApplicationContext.ts
#	project/src/context/ContextVariableType.ts
#	project/src/controllers/QuestController.ts
#	project/src/di/Container.ts
#	project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts
2023-11-30 10:20:37 +00:00
Dev
673cefcc00 Add PP-91-01 "Kedr-B" 9x18PM submachine gunto PMC weapon pool 2023-11-29 13:01:36 +00:00
Dev
231a52f8be Update quest assort data (includes peacekeeper ammo unlocks for new event quest) 2023-11-28 19:50:40 +00:00
Dev
d0bd178230 Add event quest: The Punisher - Harvest 2023-11-28 19:03:17 +00:00
Dev
9ec3a6ec95 update EN locale 2023-11-22 14:29:00 +00:00
Dev
aa6f765a64 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0
# Conflicts:
#	project/assets/configs/core.json
2023-11-22 14:28:30 +00:00
Dev
a5200e08d9 Add Zvezda assort for completing Our Own Land (prapor l4) 2023-11-22 14:20:17 +00:00
Dev
5559b938c3 Add thicc case barter for completing special equipment (peacekeeper l4) 2023-11-22 14:15:36 +00:00
Dev
112bbbea09 Adjust modloader-missing_package_json locale text 2023-11-21 19:35:48 +00:00
Dev
f727b13215 prevent collection quests requesting more than 1 ammo per repeatable quest 2023-11-19 20:29:41 +00:00
Dev
89ff63f822 Update flea prices 2023-11-19 17:14:16 +00:00
Dev
3b1c6b3fdd Add additional items to the find and return pool 2023-11-19 14:51:00 +00:00
Dev
eb77589606 FIx crazyassaultevent bot mod values that casued weapon generation errors 2023-11-18 18:40:37 +00:00
Refringe
6cd86e67b0
Merge branch 'master' into 3.8.0
# Conflicts:
#	project/.vscode/launch.json
#	project/assets/database/locations/bigmap/base.json
#	project/assets/database/locations/interchange/base.json
#	project/assets/database/locations/rezervbase/base.json
#	project/gulpfile.mjs
#	project/package.json
#	project/src/ErrorHandler.ts
#	project/src/Program.ts
#	project/src/callbacks/DataCallbacks.ts
#	project/src/callbacks/DialogueCallbacks.ts
#	project/src/callbacks/GameCallbacks.ts
#	project/src/callbacks/HandbookCallbacks.ts
#	project/src/callbacks/HealthCallbacks.ts
#	project/src/callbacks/HttpCallbacks.ts
#	project/src/callbacks/LauncherCallbacks.ts
#	project/src/callbacks/LocationCallbacks.ts
#	project/src/callbacks/MatchCallbacks.ts
#	project/src/callbacks/ModCallbacks.ts
#	project/src/callbacks/NotifierCallbacks.ts
#	project/src/callbacks/PresetCallbacks.ts
#	project/src/callbacks/ProfileCallbacks.ts
#	project/src/callbacks/RagfairCallbacks.ts
#	project/src/callbacks/TraderCallbacks.ts
#	project/src/context/ApplicationContext.ts
#	project/src/context/ContextVariableType.ts
#	project/src/controllers/BotController.ts
#	project/src/controllers/CustomizationController.ts
#	project/src/controllers/DialogueController.ts
#	project/src/controllers/GameController.ts
#	project/src/controllers/HealthController.ts
#	project/src/controllers/HideoutController.ts
#	project/src/controllers/InraidController.ts
#	project/src/controllers/InsuranceController.ts
#	project/src/controllers/InventoryController.ts
#	project/src/controllers/LauncherController.ts
#	project/src/controllers/LocationController.ts
#	project/src/controllers/MatchController.ts
#	project/src/controllers/QuestController.ts
#	project/src/controllers/RagfairController.ts
#	project/src/controllers/RepeatableQuestController.ts
#	project/src/controllers/TradeController.ts
#	project/src/di/Container.ts
#	project/src/di/Router.ts
#	project/src/generators/BotEquipmentModGenerator.ts
#	project/src/generators/BotLevelGenerator.ts
#	project/src/generators/BotWeaponGenerator.ts
#	project/src/generators/LocationGenerator.ts
#	project/src/generators/LootGenerator.ts
#	project/src/generators/RepeatableQuestGenerator.ts
#	project/src/generators/WeatherGenerator.ts
#	project/src/generators/weapongen/InventoryMagGen.ts
#	project/src/generators/weapongen/implementations/BarrelInventoryMagGen.ts
#	project/src/generators/weapongen/implementations/ExternalInventoryMagGen.ts
#	project/src/helpers/AssortHelper.ts
#	project/src/helpers/BotGeneratorHelper.ts
#	project/src/helpers/InRaidHelper.ts
#	project/src/helpers/ProfileHelper.ts
#	project/src/helpers/RagfairHelper.ts
#	project/src/helpers/RagfairOfferHelper.ts
#	project/src/helpers/TraderHelper.ts
#	project/src/loaders/ModLoadOrder.ts
#	project/src/loaders/PostDBModLoader.ts
#	project/src/loaders/PreAkiModLoader.ts
#	project/src/models/eft/common/IGlobals.ts
#	project/src/models/eft/common/ILocationBase.ts
#	project/src/models/eft/common/tables/IBotBase.ts
#	project/src/models/eft/common/tables/IProfileTemplate.ts
#	project/src/models/eft/common/tables/ITemplateItem.ts
#	project/src/models/eft/dialog/IAcceptFriendRequestData.ts
#	project/src/models/eft/dialog/IDeleteFriendRequest.ts
#	project/src/models/eft/game/IGameConfigResponse.ts
#	project/src/models/eft/game/IGameKeepAliveResponse.ts
#	project/src/models/eft/game/IGameStartResponse.ts
#	project/src/models/eft/match/IJoinMatchResult.ts
#	project/src/models/eft/notifier/INotifier.ts
#	project/src/models/eft/profile/GetProfileStatusResponseData.ts
#	project/src/models/eft/trade/IProcessBuyTradeRequestData.ts
#	project/src/models/eft/trade/IProcessSellTradeRequestData.ts
#	project/src/models/enums/WildSpawnTypeNumber.ts
#	project/src/models/spt/bots/BotGenerationDetails.ts
#	project/src/models/spt/config/IBotConfig.ts
#	project/src/models/spt/config/IBotDurability.ts
#	project/src/models/spt/config/IInRaidConfig.ts
#	project/src/models/spt/config/ILocationConfig.ts
#	project/src/models/spt/config/IQuestConfig.ts
#	project/src/models/spt/config/ISeasonalEventConfig.ts
#	project/src/models/spt/server/ILocations.ts
#	project/src/models/spt/utils/IUuidGenerator.ts
#	project/src/routers/dynamic/BotDynamicRouter.ts
#	project/src/routers/dynamic/BundleDynamicRouter.ts
#	project/src/routers/dynamic/CustomizationDynamicRouter.ts
#	project/src/routers/dynamic/DataDynamicRouter.ts
#	project/src/routers/dynamic/HttpDynamicRouter.ts
#	project/src/routers/dynamic/InraidDynamicRouter.ts
#	project/src/routers/dynamic/LocationDynamicRouter.ts
#	project/src/routers/dynamic/NotifierDynamicRouter.ts
#	project/src/routers/dynamic/TraderDynamicRouter.ts
#	project/src/routers/save_load/InsuranceSaveLoadRouter.ts
#	project/src/routers/save_load/ProfileSaveLoadRouter.ts
#	project/src/routers/serializers/NotifySerializer.ts
#	project/src/routers/static/BotStaticRouter.ts
#	project/src/routers/static/BundleStaticRouter.ts
#	project/src/routers/static/ClientLogStaticRouter.ts
#	project/src/routers/static/CustomizationStaticRouter.ts
#	project/src/routers/static/DataStaticRouter.ts
#	project/src/routers/static/DialogStaticRouter.ts
#	project/src/routers/static/GameStaticRouter.ts
#	project/src/routers/static/HealthStaticRouter.ts
#	project/src/routers/static/InraidStaticRouter.ts
#	project/src/routers/static/InsuranceStaticRouter.ts
#	project/src/routers/static/ItemEventStaticRouter.ts
#	project/src/routers/static/LauncherStaticRouter.ts
#	project/src/routers/static/LocationStaticRouter.ts
#	project/src/routers/static/MatchStaticRouter.ts
#	project/src/routers/static/NotifierStaticRouter.ts
#	project/src/routers/static/PresetStaticRouter.ts
#	project/src/routers/static/ProfileStaticRouter.ts
#	project/src/routers/static/QuestStaticRouter.ts
#	project/src/routers/static/RagfairStaticRouter.ts
#	project/src/routers/static/TraderStaticRouter.ts
#	project/src/routers/static/WeatherStaticRouter.ts
#	project/src/services/BotEquipmentFilterService.ts
#	project/src/services/BotGenerationCacheService.ts
#	project/src/services/BotWeaponModLimitService.ts
#	project/src/services/PaymentService.ts
#	project/src/services/ProfileFixerService.ts
#	project/src/services/RagfairOfferService.ts
#	project/src/services/RagfairTaxService.ts
#	project/src/services/RepairService.ts
#	project/src/services/SeasonalEventService.ts
#	project/src/utils/RagfairOfferHolder.ts
#	project/src/utils/TimeUtil.ts
#	project/src/utils/UUidGenerator.ts
#	project/src/utils/VFS.ts
#	project/src/utils/collections/queue/Queue.ts
#	project/src/utils/logging/AbstractWinstonLogger.ts
#	project/src/utils/logging/WinstonMainLogger.ts
#	project/src/utils/logging/WinstonRequestLogger.ts
#	project/tests/utils/TimeUtil.test.ts

Manually resolved by Refringe.
2023-11-16 23:35:11 -05:00
Dev
95ae543d7a Fix typo 2023-11-15 11:21:33 +00:00
Dev
3b053b741b Allow custom profiles to use localied descriptions
Fixed an inconsistently named locale key

Added logger to LauncherController
2023-11-15 11:16:56 +00:00
Dev
fcb1e2c2f3 Adjust sanitar+sanitarFollower to have more live-accurate generation values 2023-11-15 09:25:03 +00:00
Dev
70637679a0 Update boss spawn locations for killa, Reshala and gluhar 2023-11-14 19:25:02 +00:00
Dev
f0358f5241 Added missing locale with key ragfair-unable_to_find_offer_to_remove 2023-11-14 15:33:34 +00:00
Dev
206f0d672d Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0
# Conflicts:
#	project/assets/configs/core.json
2023-11-13 17:06:19 +00:00
Dev
b776d1cf20 Lint usec/bear jsons 2023-11-12 17:44:31 +00:00
Dev
9a6e783e9c Add more modders as PMCs 2023-11-12 17:16:54 +00:00
Terkoiz
44c2fffd70 Remove banned users from the PMC name list 2023-11-12 19:07:00 +02:00
Dev
88f83e6ae3 Update flea prices 2023-11-12 10:46:28 +00:00