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

1653 Commits

Author SHA1 Message Date
Dev
ceba6b3064 Move isItemInStash into inventoryHelper 
Cleanup of variable names
 2024-01-20 20:15:03 +00:00
Dev
4bca0b7747 Migrate giveProfileMoney() to use addItemToStash() 2024-01-20 20:06:15 +00:00
Dev
399bbb2e3b Add framework for BTR config 2024-01-20 18:47:57 +00:00
Dev
446b1ef4f9 Remove duplicate locale key/value 2024-01-20 18:08:25 +00:00
Dev
13ce200f80 Small optimisations applied to reateRandomLoot() 2024-01-20 18:08:09 +00:00
Dev
80fdaf65e6 Finalise fence changes 2024-01-20 17:56:19 +00:00
Dev
42b915990e Moe majority of assort generation from FenceService into FenceBaseAssortGenerator 
Generate an items children and store in fence assort base

Better handle presets
Fix `removeRandomItemFromAssorts()` not removing all of an items mods from memory
Correctly calculate an items price including its children
 2024-01-20 16:20:39 +00:00
OkaMoez
8b2fa7c8dd Adjust server raid time calculations to match client (!202) 
This change brings the server in raid time calculation (accelerated time/time you see when choosing a map) to parity with the client.

The time returned by `getInRaidTime()` effectively is the same, but the server can stop using `acceleration - 1` and the adjacent comment has an answer.

-----

The Tarkov client calculates current raid time via the following formula in `Session.GetCurrentLocationTime()`:
`In Raid Time = Today's Date + Connection Time + Time Since Client Connection * Acceleration`

The server currently uses the following:
`In Raid Time = Current Date and Time + Time Since Client Connection * (Acceleration - 1)`

The `Current Time` and `-1` used in the server calculation effectively cancel each other out if `acceleration > 1`.  Removing both should have no effect on the calculated time (not date).

The client side using `Today's Date + Connection Time` is kinda weird.  Using `acceleration = 1`, you'd see the calculated date move 2 days after 24 hours.  That said, I don't see the date portion of the raid time being used, so that might not matter.  Either way, I've matched the formula to avoid any edge cases causing desync.

Co-authored-by: OkaMoez <43766412+OkaMoez@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/202
Co-authored-by: OkaMoez <okamoez@noreply.dev.sp-tarkov.com>
Co-committed-by: OkaMoez <okamoez@noreply.dev.sp-tarkov.com>
(cherry picked from commit afb64c1ebf)
 2024-01-20 10:02:59 +00:00
Dev
b5bca2c49b Add missing property to airdrop config 2024-01-20 09:30:18 +00:00
Dev
05533bb166 Prevent no exit data killing client start 2024-01-20 00:19:52 +00:00
Dev
a1f043d088 Fix issie with BuyRestrictionCurrent value persisting between profiles 2024-01-20 00:19:13 +00:00
Dev
4fd37e3a92 Fix all items being free 2024-01-19 22:49:31 +00:00
Dev
879af0377a Adjust airdrop values 2024-01-19 21:19:14 +00:00
Dev
134d789a0e Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-01-19 19:23:11 +00:00
Dev
1c9acbbc2e improve bot generation time 2024-01-19 19:21:51 +00:00
Kaeno
812a6a6884 Fix function removing daily/weekly quests from profile on profile load 2024-01-19 16:41:35 +00:00
Dev
cdb5baac4b Improve variable names 2024-01-19 12:10:51 +00:00
Dev
34b9d318a3 Pull some code out of addLootFromPool() into its own function 2024-01-19 11:57:25 +00:00
Dev
63ca393372 Add short circuit optimisation to isItemIncompatibleWithCurrentItems() 2024-01-19 09:56:18 +00:00
Dev
f3f008e0ec Rename function to help with clarity 2024-01-19 09:52:56 +00:00
Dev
4cb2d8171e Fix JSON issues with ravangezryachiyevent 2024-01-19 09:37:01 +00:00
Dev
c96b177416 Disable use of sorting table when buying from flea/trader/fence - fixes client error 2024-01-19 09:08:11 +00:00
Dev
0d4fdf11e3 include handling armors without plates 2024-01-18 23:29:07 +00:00
Dev
310762d66d Refactor airdrop loot generation to account for armor plate changes 2024-01-18 23:25:08 +00:00
Dev
ea0d8224e6 Add loop to try multiple armor pieces to find one that's compatible with bots current loadout 2024-01-18 22:36:14 +00:00
Kaeno
01b608d8b2 Adjust bot difficulty for ground zero 2024-01-18 22:03:16 +00:00
Dev
8f12bf479a Generate armor vest for bots first, then rig 2024-01-18 21:39:35 +00:00
Dev
ed6ba36ff3 Update map loot 2024-01-18 21:25:31 +00:00
Dev
6eeb8c58d6 Improve iRagfairConfig comments 2024-01-18 20:30:13 +00:00
Dev
c8fa31184f Prevent gifter bot being added twice 2024-01-18 12:20:28 +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
snowythefox811
f6192f1891 Added The ability to have enhancements on armored rigs and helmets. (!200) 
Added the vest and headwear classes to be eligible for armor enhancement

Co-authored-by: Snow <Notarealemail@email.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/200
Co-authored-by: snowythefox811 <snowythefox811@noreply.dev.sp-tarkov.com>
Co-committed-by: snowythefox811 <snowythefox811@noreply.dev.sp-tarkov.com>
(cherry picked from commit 35eb9feebf)
 2024-01-18 09:08:22 +00:00
Dev
04edb19f14 Allow dogtags to be added to custom bots 2024-01-17 22:17:12 +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
f38d098aae Exclude scav coop exits when choosing pmc exit 2024-01-17 16:47:53 +00:00
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
Dev
f66b2d04a9 Revert "This PR aims to resolves issue #280 (!190)" 
This reverts commit e0e62d8e47.
 2024-01-10 17:43:39 +00:00
Dev
5e9be7a2fd Remove unused loot ids 2024-01-10 15:41:36 +00:00
Dev
9d8efe8e2f Fix data issue with maska helmet 2024-01-10 15:25:20 +00:00
Dev
dc1e172df0 Handle generating a fence armor item and a default plate is not found 
Add extra plates to pool

Centralise plate-related checks into itemhelper
 2024-01-10 14:47:09 +00:00
Dev
7ee3be1e2b Round completeTime property to integer to prevent client error 2024-01-10 14:10:03 +00:00
Dev
c918875a38 Fix view profile not showing correctly 2024-01-10 13:53:26 +00:00
Dev
9a4231d8b8 Rename function profileHelper.removeCompletedQuestConditionFromProfile() to removeQuestConditionFromProfile 2024-01-10 12:37:34 +00:00
Dev
6e8028f9c9 Update map base jsons 2024-01-10 12:36:06 +00:00
Dev
297bc2786a Improve armor quest rewards 
Attempt to return the armor preset found in globals.json first as this has default plates, if that fails construct item outselves based on mods _requried properties
 2024-01-10 10:04:09 +00:00
Dev
55eae60329 Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-01-10 09:14:11 +00:00
Dev
2fd2c677b7 Reduce usage of magic string inside getUserBuilds() 2024-01-10 09:13:34 +00:00
Mihai
e0e62d8e47 This PR aims to resolves issue #280 (!190) 
Updated itemDelivery method in InraidController to filter out insured items from the items array using the insuranceService.
Added logic to exclude insured items from being sent as part of the delivery message to the player.

Co-authored-by: mihaicm93 <45673304+mihaicm93@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/190
Co-authored-by: Mihai <mihai@noreply.dev.sp-tarkov.com>
Co-committed-by: Mihai <mihai@noreply.dev.sp-tarkov.com>
 2024-01-10 08:44:03 +00:00
Dev
f59041121b Fix plate filtering code not correctly handling when no plates of desired armor level are found 2024-01-09 23:46:57 +00:00
Dev
4078d7cc89 Fix plates not spawning on bots because of capitalisation 2024-01-09 20:16:49 +00:00
Dev
443d8da7f7 FIx server error when passing failed quest data to client 2024-01-09 18:46:44 +00:00
Dev
a9c36ec205 Fix issue with armors as quest rewards not being sent with soft inserts 
Centralised a soft insert check into `ItemHelper`

Add extra base types to `generateGearPool()` in equipment bot pool service
 2024-01-09 16:49:59 +00:00
Dev
68f3ee013c lint bot.json 2024-01-09 16:18:15 +00:00
Dev
154578dd44 Update randomisation config to specifiy its for weapon mods + add equipment mod adjustment system 
Adjust PMCs to use more gear mods at higher levels
 2024-01-09 16:15:31 +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
a742beeae9 Comment and property name cleanup inside removeDanglingTaskConditionCounters() 2024-01-09 12:27:08 +00:00
Terkoiz
98b0a579b3 Fixed achievement counters getting mistakenly cleaned up as stale quest counters (!189) 
Fixes #273

Co-authored-by: Terkoiz <terkoiz@spt.dev>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/189
Co-authored-by: Terkoiz <terkoiz@noreply.dev.sp-tarkov.com>
Co-committed-by: Terkoiz <terkoiz@noreply.dev.sp-tarkov.com>
 2024-01-09 11:57:27 +00:00
Dev
01e63118c6 Rename function 2024-01-09 10:58:06 +00:00
Dev
4d663c0ef1 Add missing armor 2024-01-09 10:57:32 +00:00
Dev
586a96ee9f Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-01-09 10:30:29 +00:00
Dev
bac86262d4 Improve handling of equipment mod generation 2024-01-09 10:30:00 +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
15d53a2d38 Fix armor in bot backpacks having no soft inserts 
centralise code that adds mods to equipment into one location
 2024-01-08 23:27:18 +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
5ffccddf94 Nullguard against missing properties 2024-01-08 21:17:23 +00:00
Dev
878284f108 Fix issue with insurance not returning soft inserts for armors 2024-01-08 21:16:53 +00:00
Dev
e18f75a60c Cast trader property to number before use 2024-01-08 21:14:13 +00:00
Dev
c9de59b5bf Add Zryachiy's balaclava to boss item collection 2024-01-08 17:45:07 +00:00
Dev
0c7cecdacd Add variable durability loss to armor plates sold by fence 2024-01-08 17:43:19 +00:00
Dev
0997c21ba3 Remove debug code 2024-01-08 17:39:28 +00:00
Dev
6dc4604a77 Update inventoryHelper.addItem() to account for items with children that have a upd object 
This whole function is in dire need of a rewrite, its awful
 2024-01-08 12:41:52 +00:00
Dev
aff5c69c80 Update globals with new changes from live 2024-01-08 12:39:44 +00:00
Dev
507e8eeaa7 Improve comments 2024-01-08 11:35:20 +00:00
Dev
96f75fd744 Correctly remove item + children from fence assorts when running removeFenceOffer() 2024-01-08 11:34:52 +00:00
Dev
30507acd1b Add armor to randimisation list for PMCs 2024-01-08 10:22:24 +00:00
Dev
07b5ab432e Check for empty pool when adding mods to equipment during loot generation 2024-01-08 09:40:18 +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
0b3ad5bbd8 Only send failed quest trader messages for non-repeatable quests 2024-01-07 23:51:28 +00:00
Dev
5eda074dbe Add comments 2024-01-07 23:11:18 +00:00
Dev
928e406b76 First draft of randomisd armors on fence 2024-01-07 22:11:05 +00:00
Dev
f0b9785d16 Add BTR_ITEMS_DELIVERY to enum MessageType 2024-01-07 21:21:20 +00:00
Dev
192baa7456 Add soft inserts to fence blacklist 2024-01-07 21:00:02 +00:00
Dev
92e600e906 Improve logic for choosing an exit inside generateExplorationQuest() 2024-01-07 20:49:33 +00:00
Dev
628a3f71d8 Add comment 2024-01-07 20:20:25 +00:00
Dev
9cbf87b7c3 Remove redundant writeHead() call inside sendZLibJson() 2024-01-07 20:20:10 +00:00
Dev
6231a56fea Prevent duplicate items spawning in static containers 2024-01-07 20:17:07 +00:00
Dev
ed82e9ed2f Halloween event fixes 2024-01-07 19:29:42 +00:00
Dev
54948599c3 Fix missing armor item in bot data 2024-01-07 15:35:19 +00:00
Dev
db13df89d9 Add plate filtering system based on bot level 2024-01-07 15:34:59 +00:00
Dev
0fcc411123 Add bot plate json for levels 1-10 and 11-14 2024-01-07 14:46:48 +00:00
Dev
c6135802be Refactor equipment mod parameters 2024-01-07 14:46:25 +00:00
Dev
749fc75a25 Add randomWeather/randomTime to inraidConfig 2024-01-07 12:56:57 +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
Mihai
3c32c8cc67 Addressed build failures by initializing an array properly as '[]' instead of 'undefined,' (!185) 
Co-authored-by: Mihai <mihai@something.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/185
Co-authored-by: Mihai <mihai@noreply.dev.sp-tarkov.com>
Co-committed-by: Mihai <mihai@noreply.dev.sp-tarkov.com>
 2024-01-07 07:40:16 +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
bd60cf51e2 Fix event system not working for events other than halloween and christmas 
Allow events to overlap

Rename config property from `enableWinterEvent` to `forceWinterEvent`
 2024-01-06 23:29:42 +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
Dev
9bc9d46e84 Improve function comments 2024-01-06 15:21:16 +00:00
Dev
52a5380c33 Add botRelativeLevelDeltaMin to pmc.json to allow configuration of lowest level of pmc relative to player 2024-01-06 15:19:04 +00:00
Dev
d1b17ad1ea Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-01-06 14:55:53 +00:00
Dev
e3b77568c8 Add extra achievement icons 2024-01-06 14:55:42 +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
009055ad24 Add missing aid value to IUserDialogInfo 2024-01-06 13:49:48 +00:00
Dev
4e21239de3 Improve accuracy of view profile 2024-01-06 13:40:00 +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
d3afe0b6f3 Fix issue with completing a quest 
Altered `addTimeLockedQuestsToProfile()` to not fail when checked quest has no `target` property
Altered `getNewlyAccessibleQuestsWhenStartingQuest()` to check all statuses of quest, not just first
 2024-01-06 09:11:04 +00:00
Dev
2de4164a93 Improve comments of getQuestsFailedByCompletingQuest() 2024-01-05 22:59:01 +00:00
Dev
9fb747f5f6 Only check and remove repeatable scav quests from scav profile 2024-01-05 22:55:19 +00:00
Dev
bd373a993d FIx handing in quests failing 2024-01-05 22:52:11 +00:00
Dev
861987406e Handle quest failures 2024-01-05 21:14:20 +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
3979e6ef61 Add handling for quest failing while player is at menu 2024-01-05 15:27:28 +00:00
Dev
b5951a147b Log request data when endpoint is missing 2024-01-05 14:50:27 +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
d1aee50217 Blacklist broken GK-01 12ga compensator 2024-01-04 21:46:29 +00:00
Dev
1249b309cf Improve accuracy when handling client/achievement/statistic 2024-01-04 21:28:47 +00:00
Dev
40e8a8d045 Update bot/map data 2024-01-04 21:15:00 +00:00
Dev
c5bb09cce5 Persist achievement data from client into server profile on raid end 2024-01-04 17:17:11 +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
9eee25a175 Prevent server error when loot generator tries to find non-existent loot 2024-01-02 19:46:21 +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
628d817348 Show error when missing caliber data in drawAmmoTpl() 2024-01-02 15:01:27 +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
850fc12a86 Fix json error 2024-01-02 14:38:01 +00:00
Dev
7f8d629dbe Add sandbox pmc waves 2024-01-02 13:49:08 +00:00
Dev
6080c992b9 Fix snow event not spawning 2024-01-02 13:41:52 +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
ecc8af0aea Add TWITCHNEWYEARS2023 gift code 2024-01-01 12:23:41 +00:00
Dev
224f921ea5 use different base class check 2024-01-01 11:33:19 +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