470486104/Server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,478 Commits 5 Branches 94 Tags 118 MiB
5b296975e8
Commit Graph

1465 Commits

Author SHA1 Message Date
Dev
727a85f5fc Improve repeatable quest exit choice code 2024-01-17 16:39:55 +00:00
Dev
43cbe45376 Make players PMC equipment id unique on profile creation 2024-01-17 15:05:01 +00:00
Dev
43699d6416 Add new bot types to pmc config 
remove new types from possible brain types on sandbox
 2024-01-17 14:22:27 +00:00
Dev
d9186e0e48 Improve workaround for spawnpoint values 2024-01-17 10:45:25 +00:00
Dev
a572d090ba Update JSONs 2024-01-17 10:27:51 +00:00
Dev
03a451115c Temp fix to ensure dynamic loot count generator doesnt generate a negative value 2024-01-16 21:55:25 +00:00
Dev
15be241dbf FIx premature exiting of loop 2024-01-16 19:00:21 +00:00
Dev
93edb3e074 Fix player being charged multiple times 
Fix issue with  `findBarterItems()` where it would incorrectly wipe out found results each loop
 2024-01-16 18:25:03 +00:00
Dev
33d1395dea Add debug logging to getSortedMoneyItemsInInventory() 2024-01-16 17:24:28 +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
fbee59fede When choosing an item to add to a bot, check if the item being added would block an item already equipped 2024-01-16 13:14:48 +00:00
Dev
0166e30dd1 Reduce instances of IItemEventRouterResponse being passed into a function and then returned, its an object and passed by ref, no need to return it 
Reduce instances of `IItemEventRouterResponse` being reassigned in a function

Rename `getMoney` to `giveProfileMoney`
 2024-01-16 12:21:42 +00:00
Dev
9daa706325 Use correct buycount when buying from fence 2024-01-16 12:08:30 +00:00
Dev
ca1df5ee71 FIx appendErrorToOutput() overwriting warnings instead of appending 2024-01-16 12:04:55 +00:00
Dev
818bb7e37a Refactored flea purchase code 2024-01-16 11:47:40 +00:00
Dev
4d1066b51a Make use of presetHelper instead of rolling own implementation 2024-01-16 10:28:08 +00:00
Spoony
e1a8f26507 Generate ammo box Ragfair offers with cartridges (!198) 
#### TL;DR
Previously, Ragfair offers involving ammo boxes weren't generated with cartridges inside of them. This copies a lot of the logic from `InventoryHelper.hydrateAmmoBoxWithAmmo()` to add ammo to offers when they are generated. Made to fix #312.

#### Testing
Purchased various ammo boxes from Flea:

![image](/attachments/340fb349-2589-4b1a-81fa-f8d63f6f1a36)

Purchased ammo boxes are listed as full:

![image](/attachments/f52057d3-efe0-40e7-b64e-8d257a818fa5)

Unloading them produces correct ammunition:

![image](/attachments/33c71f7b-d452-473e-9705-cbad1ecc3f7d)

Co-authored-by: Spoony <Spoony@example.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/198
Co-authored-by: Spoony <spoony@noreply.dev.sp-tarkov.com>
Co-committed-by: Spoony <spoony@noreply.dev.sp-tarkov.com>
 2024-01-16 10:26:48 +00:00
Dev
2787b25c8d Items json changes 2024-01-15 23:14:15 +00:00
Dev
34628561ce Filter repeatable explore quest map exits per side 2024-01-15 23:13:57 +00:00
Dev
29573c1418 Add BTR trader image 2024-01-15 22:09:52 +00:00
Dev
50d1b89505 Add missing quest images 2024-01-15 22:05:37 +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
Dev
825db77b1f Move trader purchases over to new system 
Fix callback errors not being propigated into client error message
FIx incorrect offer id being passed into `buyItem`
Update callbacks to accept a `buyCount` parameter - solves trader purchase limits being exeeded prematurely
Exit addItemToStash early if warning/error found in output
 2024-01-15 14:25:17 +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
cff4a45291 Resolve fence selling helmets that lack inserts 2024-01-15 12:41:54 +00:00
Dev
3ac64a3245 Update bot data 2024-01-15 10:48:58 +00:00
Dev
0d059fbaf4 Remove ancient profile fix 2024-01-15 10:07:57 +00:00
Dev
1d9ff8ace8 Improve buyItem() to also support putting fence purchases through addItemToStash() 2024-01-14 22:30:05 +00:00
Dev
2f07d6083f Fix armor plates/visors/helmet plate inserts not having thier durability altered on ragfair 2024-01-14 22:28:53 +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
5005a5160a Improve buyItem() handling of multiple and stackable item purchases 
rename `reparentPresets` to `reparentItemAndChildren` and move to `itemHelper`
 2024-01-14 21:12:56 +00:00
Dev
c2f390d4ac Make all properties of ITrader optional 2024-01-14 15:06:43 +00:00
Dev
48377a0e08 Update JSONs 2024-01-14 15:03:35 +00:00
Dev
303be64880 Move code to its own variable 2024-01-14 14:38:10 +00:00
Dev
66c78cabaf Update bots 2024-01-14 14:37:28 +00:00
Dev
47a84e508b Fix some quests failing twice (chemical part 4), reducing rep twice as much as it should 
Quest failure is handled by client now, no need to find and fail quests in server on quest completion

Move `getQuestsFailedByCompletingQuest()` to questHelper
 2024-01-14 12:29:58 +00:00
Dev
4efb75ea58 Fix typo 2024-01-14 10:27:45 +00:00
Dev
41d491dd16 Show error when quest not found in db 2024-01-14 10:27:26 +00:00
Dev
00660747a5 Refresh map loot 2024-01-14 10:10:41 +00:00
Dev
8b03faca89 Fix ragfair offers not saving upd properties 
Create replacement for `addItem()`, only used for ragfair purchases currently - goal is to fully remove `addItem()`

Dont show warning when generating armor without a default plate on fence
 2024-01-14 10:09:43 +00:00
Valens
743f222141 Add valens to gifts.json (!194) 
Add the "VALENS" code to the gifts system.
Consists of 1 SR-25, and 1 M1A.

Co-authored-by: VforValens <8889280+VforValens@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/194
Co-authored-by: Valens <valens@noreply.dev.sp-tarkov.com>
Co-committed-by: Valens <valens@noreply.dev.sp-tarkov.com>
 2024-01-14 09:05:28 +00:00
Dev
72fdada5d7 Add vistor shot damage to those listed on flea/fence - 25% chance a damaged helmet can have a visor with bullet hits 
Improved `FenceService.addModsToArmorModSlots()` to not break when it cant find a default plate tpl
 2024-01-13 20:47:59 +00:00
Dev
8b355adfa6 Add soft insert type to daily reward blacklist 2024-01-13 20:02:19 +00:00
Dev
ae50835391 Fix 2 issues with quests 2024-01-13 19:15:20 +00:00
Dev
bf148dba4a First pass at implementing Place of fame dogtag bonus, bonus is slight out from what is shown on client (0.0x out) 2024-01-13 16:41:06 +00:00
Dev
46ec7bf3ba Improve handling of presets when adding to player inventory 
Presets now have all child items FiR status set
 2024-01-13 15:01:29 +00:00
Dev
ae6bb7a43b Small cleanup of preset handling code in addItem() 2024-01-13 15:00:31 +00:00
Dev
6cd82ce2a6 Add location property minFillLooseMagazinePercent 
Make static/dynamic magazine loot have chance to not have cartridges
 2024-01-13 12:30:15 +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
14a8b34dcc Add sandbox to daily quest map pool 2024-01-13 09:51:09 +00:00
Dev
dc13b20ed5 Blacklist ammo boxes from completion quest item pool 2024-01-13 09:21:32 +00:00
Dev
48f99ecfa6 Additional changes to randomiseWeaponDurabilityValues() 
Move chance to make changes check outside of function
Aliased ragfair config property
Aliased chosen child multipler value
Added comment to function
 2024-01-13 09:15:11 +00:00
r2go
a87129c541 #284 fixed flea armors not having random values (!193) 
https://dev.sp-tarkov.com/SPT-AKI/Issues/issues/284

Probably needs some balancing since some armors are very random, some are not at all. It feels pretty realistic I think.

Any feedback is appriciated.

Co-authored-by: r2go-beep <hans@hummelusa.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/193
Co-authored-by: r2go <r2go@noreply.dev.sp-tarkov.com>
Co-committed-by: r2go <r2go@noreply.dev.sp-tarkov.com>
 2024-01-13 09:03:51 +00:00
CWXDEV
22ad266b27 why the f*ck we using spaces and not tabs :reee: 2024-01-12 23:47:41 +00:00
CWXDEV
091e4fa41b added check to make sure same item isnt used, still has an edge case, if maxRequestedAmount is too high, and we cant offer enough items, dupes will appear, but this will fix normal use 2024-01-12 23:44:58 +00:00
CWXDEV
04564d7e76 Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-01-12 22:00:02 +00:00
CWXDEV
f7bdded54d remove orphaned quests to stop softlocking quest screen. 2024-01-12 21:59:38 +00:00
Dev
0440bdab70 Reworked flea armor listing code 
Randomises plate durability
Randomises insert durability
 2024-01-12 21:59:30 +00:00
Kaeno
05484ff3b3 Added Missing coop extracts and vehicle extracts 2024-01-12 20:19:43 +00:00
Kaeno
5e9a1f244b Add missing quest images 2024-01-12 19:50:58 +00:00
Dev
80fa0c1b9c Introduce typo into json to follow bsg naming 2024-01-12 19:17:39 +00:00
Kaeno
664715c09e Fixed extra spawns on customs. Fixed duplicate spawns on labs. Removed Shoreline spawns due to map changes 2024-01-12 19:09:57 +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
eb961b3e11 Fix saveEquipmentBuild() not correctly setting root id to first items _id 2024-01-12 17:18:10 +00:00
Dev
9b1b8f9f10 Add missing mods to kiver helmet on PMCs 2024-01-12 17:01:40 +00:00
Dev
98241d894f Rework how plates are filtered from bot equipment 
Add `filterPlatesByLevel` to bot config
 2024-01-12 17:00:22 +00:00
Dev
a7e6eed954 Update presetSlotsToRemoveChancePercent in trader config to allow insutrance to remove armor items 2024-01-12 13:45:37 +00:00
Dev
23ebe19938 Lower chance of ECLiPSE RBAV-AF plate carrier on low level PMCs as it doesnt support the armor level we want for them 2024-01-12 13:44:58 +00:00
Dev
78759ee72e Add weighting data for left_side_plate and right_side_plate 2024-01-12 13:44:46 +00:00
Dev
bf7dac25ae Allow fence to strip items from listed weapons that're not raid-modadble, players can sell broken guns to him from menu 2024-01-12 13:33:11 +00:00
Dev
c5806aadb8 Allow fence to list items with missing required items 2024-01-12 13:30:22 +00:00
Dev
66ab32e6c4 Make new years last until 20th of jan 2024-01-12 13:01:10 +00:00
Dev
3a76757957 Add various missing type properties for new map 2024-01-12 13:00:48 +00:00
Dev
d92f30d281 Fix insurance return all child items of an item (ammo in mags/chamber) 2024-01-12 12:32:04 +00:00
Dev
6e4d5d1aca Bot update - fix various missing soft-insert shoulder armors 2024-01-12 10:35:02 +00:00
Dev
cb18d251ba Improve selection of items to add mods for: 
quest rewards
bot loot gen
map loot gen
fence assort gen

Updated `removeRandomModsOfItem()` to also skip slots with a _required prop
 2024-01-11 17:42:58 +00:00
Dev
6a8e261af1 Fix typo 2024-01-11 12:48:10 +00:00
Dev
3b255f3ce4 Fix createMagazineTemplate failing when no userbuilds.magazineBuilds array exists 2024-01-11 11:53:19 +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
DrakiaXYZ
fcbd39c6b0 Remove delivered items from player insured items (!191) 
This stops players from duplicating insured items via the BTR delivery service

Note: This does un-insure the item, I don't have any proof one way or the other for whether live causes the items to no longer be insured, but this was the easier solution to implement.

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/191
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
 2024-01-11 08:13:27 +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
033b0e6805 Slightly increase pmc conversion rate 
Reduce number of PMCs generated
 2024-01-10 21:09:27 +00:00
Dev
219086d9bb Fix only one type of bot spawning 2024-01-10 21:08:00 +00:00