Commit Graph

2217 Commits

Author SHA1 Message Date
Dev
3c96a98a29 Remove persistPurchaseDataInProfile from trader config - causes too many issues when disabled
By default profiles keep track of purchased items
2024-03-30 12:59:56 +00:00
Dev
86bada6194 Fix variable name typo 2024-03-30 12:56:19 +00:00
Leaves
efb69d7148 Actually fixed so that multiple profiles no longer share trader buy limits (!276)
This fixes a bug I found that the server uses partially old logic when using the ``traderConfig.persistPurchaseDataInProfile``

Now it works fine for multiple profiles.

How to test before and after

```
start server
make dev account
buy something trade limited like ASH12 ammo. (Buy all)
make new dev account
try to buy same thing
```

Before it gave the user the error that you've already reached the limit. Even when you had bought nothing on that profile.
Now the trader properly sells you the stuff, with your own profile limit.

Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/276
Co-authored-by: Leaves <mwarciel@gmail.com>
Co-committed-by: Leaves <mwarciel@gmail.com>
2024-03-30 12:55:18 +00:00
Dev
4bb5e3de43 Remove redundant registerProduction() function 2024-03-30 11:33:02 +00:00
Dev
a66b6644a1 Add crafting skill into water filter drain rate calculation
Added small optimisation to only process water filters if a water filter is installed
Added crafting skill bonus to water filter craft time calculation

Various variable/comment renames for clarity
2024-03-30 11:32:14 +00:00
Dev
50f580858d * Removed broken requirement from Signal part 3 2024-03-29 20:54:47 +00:00
Dev
76733cc5db Lint JSONs
(cherry picked from commit 94c96c8ff2)
2024-03-29 20:20:37 +00:00
TheSparta
c3e203922e bundle-crc-cache (!274)
This PR is required by SPT-AKI/Modules!104 in order for it to function correctly.

## Overview

- Adds the package `buffer-crc32`, it can generate CRC32 hashes from buffers or strings
- Splits `HashCacheService` into 2 classes `ModHashCacheService` does exactly the same `HashCacheService` used to do, and added a new `BundleHashCacheService`
- `BundleLoader` now generates a CRC32 hash of every bundle file from every loaded mod
- Reworked `BundleInfo` to better represent the data expected by the client when requesting `/singleplayer/bundles`
- Removes all checks on `BundleLoader` that verified if the request was made to a localhost address, this is now addressed by the client.

## Testing

The code has been tested by @Senko-san and me.

Co-authored-by: chomp <chomp@noreply.dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/274
Co-authored-by: TheSparta <thesparta@noreply.dev.sp-tarkov.com>
Co-committed-by: TheSparta <thesparta@noreply.dev.sp-tarkov.com>
2024-03-29 18:43:36 +00:00
Dev
26484b643c Add Spear assort 2024-03-28 18:59:12 +00:00
Dev
3acf98d803 * Quest updates:
* Signal part 3
* Trust regain
 * Make an impression
 * Trouble in the big city
 * Overseas trust part 1
2024-03-28 17:56:55 +00:00
Dev
755e7ec0f6 Remove PMC name 2024-03-28 14:33:34 +00:00
Dev
d9096d650b Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-03-28 14:17:50 +00:00
Dev
6309c0b419 Bot data update 2024-03-28 14:17:18 +00:00
Refringe
41ef66298e
Skip Processing Deleted Insurance Attachments
This check simply skips over rolling for insurance for attachment items that have already been deleted due to their main-parent item being previously rolled for deletion.
2024-03-28 00:29:46 -04:00
Refringe
8a20da7e08
Resolves Insurance Attachment Return Issue
This update resolves an issue that was causing items that were not in-raid moddable to be rolled for insurance. We were checking to see if the item is in-raid moddable within the context of the main-parent item (the gun), but not the immediate parent item (upper receiver). This update resolves this by checking to see if the immediate parent is set on the attachment, and if it is, checking within that context instead of the main-parent context.

Thank you to Roselyn Cristal for the report. ♥️
2024-03-28 00:26:40 -04:00
Dev
7939e39945 Improved accuracy of fuel consumption bonus calculation inside updateFuel() 2024-03-27 21:44:58 +00:00
Dev
9ddc09c10d Adjust marksman nvg properties 2024-03-26 16:01:29 +00:00
Dev
372de25443 Add missing nvg properties to assault bots 2024-03-26 16:01:09 +00:00
Dev
9e65834668 Reduce bots generated on map load to improve load time 2024-03-26 16:00:48 +00:00
Dev
4e744d3103 Add correct type to cancel-all route + improve comment accouracy of client/match/group/status 2024-03-26 15:44:11 +00:00
Dev
ed7e30bd4c Move 6398a072e301557ae24cec92 Lightkeeper intelligence from lighthouse to reserve 2024-03-26 09:38:06 +00:00
Dev
993ea78ce6 Reduce loose loot down to 75% of live values to account for only one player being on map 2024-03-26 09:35:17 +00:00
Kaeno
9e818b065a add more boss items to list 2024-03-25 18:03:58 +00:00
Dev
473b0cc2e5 Blacklist bad vodka from reward pool 2024-03-25 15:40:06 +00:00
Dev
4e923c2378 Remove redundant CounditionCounters property from new profiles 2024-03-25 14:33:17 +00:00
Dev
9fca683415 Minor comment changes + use type in place of magic string 2024-03-25 10:38:28 +00:00
Leaves
0bb7d1d350 Fix error when created multiple items with the same unique ID (!269)
Fixes issue #592
https://dev.sp-tarkov.com/SPT-AKI/Issues/issues/592

Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/269
Co-authored-by: Leaves <mwarciel@gmail.com>
Co-committed-by: Leaves <mwarciel@gmail.com>
2024-03-25 08:32:01 +00:00
DrakiaXYZ
757c4506f5 Fix loading bundles from different local folders (!270)
Return a full path to the request for getBundles if running locally

Ran into this while working on updating Gilded Key Storage, looks like bundle files are expected to live in the same local folder as the client any time the server address is `127.0.0.1` or `localhost`.

While working in VSCode for the server, and a different folder for the client, this causes issues trying to work on mods that add bundles, as the server only passes a relative path back to the client

This PR resolves that by returning the full path to bundles when running locally

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/270
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2024-03-25 08:30:41 +00:00
Kaeno
cd8d6eaecf Update Scav fence rep after using a carextract to keep profiles in sync 2024-03-25 07:28:24 +00:00
Dev
4f3fecac61 Update server locales 2024-03-24 22:41:35 +00:00
Dev
23474bfd67 Remove redundant code 2024-03-24 22:18:05 +00:00
Dev
a35ed657c2 Persist fence standing gain on quest completion into scav profile 2024-03-24 22:16:59 +00:00
Dev
eca6f4bd75 Copy adjusted fence rep value into scav profile 2024-03-24 22:08:32 +00:00
Dev
e147b90293 Update flea prices and remove 0 valued items 2024-03-24 21:56:58 +00:00
Dev
e5142c0c54 JSON updates 2024-03-24 21:44:29 +00:00
TheSparta
5694af2030 Removed dead code from BundleCallbacks 2024-03-24 17:53:04 +00:00
TheSparta
5e8fb7b303 defered addBundles after PostDBModLoader is run
- defered addBundles after PostDBModLoader is run
- removed unused injected class instances
2024-03-24 17:52:38 +00:00
Dev
fdc6be4dc7 Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-03-24 17:17:52 +00:00
Dev
2516354451 Fixed getNewlyAccessibleQuestsWhenStartingQuest() not filtering out quests flagged for non-player side 2024-03-24 17:17:40 +00:00
Kaeno
a41bcd883e add missing boss items to item.json 2024-03-24 13:12:07 +00:00
TheSparta
9de6b19c28 export BundleInfo class 2024-03-24 00:49:53 +00:00
DrakiaXYZ
fdbbc47e59 Fix calculations for the flea min, max and avg to more accurately match live (!268)
Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/268
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2024-03-23 19:18:14 +00:00
Dev
d3fdb08528 Log when profiles save 2024-03-23 17:31:12 +00:00
Dev
f249d7058c Adjust calculateAmmoStackSizeThatFitsBudget() to never let the ammo reward stack go below 1 2024-03-23 11:32:10 +00:00
Dev
cdec8729aa Fixed scav case never giving unarmored rigs as a reward 2024-03-23 11:23:29 +00:00
Dev
7b557a31ad Small formatting changes 2024-03-23 10:59:08 +00:00
Dev
d52e2b0b60 Remove dupe item from array 2024-03-23 10:53:14 +00:00
Dev
a39d8b8419 Update daily reward system to use global reward item blacklist 2024-03-23 10:50:17 +00:00
Dev
ea18533591 Make use of reward item blacklist in airdrop reward code
Blacklist boss items from airdrop rewards
2024-03-23 10:44:28 +00:00
Dev
580d5b9829 Make use of item reward blacklist in scav case system 2024-03-23 10:43:08 +00:00
Dev
cf490c841e Create centralised reward blacklist 2024-03-23 10:42:43 +00:00
Kaeno
02ce8f24b8 Blacklist b-32 ammo from scav case 2024-03-23 10:14:38 +00:00
Dev
28d40d9443 Log IP of request when not a local address 2024-03-23 09:41:36 +00:00
Dev
d8562e610a Limit analgin painkillers on PMC to x2 2024-03-22 19:39:49 +00:00
Dev
3016d60730 Increase chance PMCs spawn on raid start in reserve 2024-03-22 19:28:10 +00:00
Dev
7f8a5cbb69 Added 1x wallet limit on scavs 2024-03-22 19:15:55 +00:00
Dev
8aa8ae4c4d Limit pineapple juice to 2x on followerkolontayassault and followerkolontaysecurity 2024-03-22 18:41:56 +00:00
Kaeno
8e4c9848ca Update more boss chances 2024-03-22 17:30:12 +00:00
Dev
fd5b0519e7 Scav case money reward adjustments 2024-03-22 15:44:21 +00:00
Kaeno
d5517d7fdf Remove server calculation of scav rep post raid changes. awaiting Client Calculations 2024-03-21 15:21:02 +00:00
Dev
04aad787d3 Store the fence rep diff after a raid has concluded, add endpoint to allow retreval of this value 2024-03-21 12:23:03 +00:00
Dev
efc3a35200 Limit aquamarie to 1x on each gluhar follower 2024-03-20 22:29:57 +00:00
Dev
443bc72995 Remove unnecessary code from flagItemsAsInspectedAndRewardXp as issue is now fixed at source 2024-03-20 18:02:19 +00:00
Dev
ecfd6883d0 Init scavs Encyclopedia on generation 2024-03-20 17:58:32 +00:00
Dev
ee7c2aab36 Nullguard inspecting a keycard when scav has no encyclopedia init 2024-03-20 17:47:48 +00:00
Dev
c0a1a73aba Limit AFAK on rogues to 2
Limit AFAK on raiders to 2
2024-03-20 17:39:05 +00:00
Dev
e3b31ed972 Added extra IFAKs to PMCs + replaced morphine with etg regen stims 2024-03-20 15:10:39 +00:00
Dev
2633d22de1 Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-03-20 13:07:02 +00:00
Dev
0118a4be24 Adjusted boss spawn chance values 2024-03-20 13:06:51 +00:00
DrakiaXYZ
a29902b980 Add a new allExtracts property to locations database, and use it for daily quest generation (!266)
- Dumped from the client using an aki-debugging patch
- Contains all extracts according to the map data, with a side indicator
- Cleaned up ILocation vs ILocationData duplication

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/266
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2024-03-20 09:43:51 +00:00
Dev
4a27a0904b Limit rouble stacks to 2 on assault bots 2024-03-19 16:32:35 +00:00
Dev
a7615b26e6 make traders set initial reset time based on min max values 2024-03-19 14:58:50 +00:00
Kaeno
480683b25b Remove grizzly from PMC secured container to avoid dropping them on the ground. 2024-03-19 12:18:09 +00:00
Refringe
662575aef1
Minor Trader Refresh Time Update
Updates trader refresh/restock times based on additional data.

Skier, 5000-9000 seconds
Peacekeeper, 2000-15000 seconds
Mechanic, 6500-13049 seconds
2024-03-18 23:21:48 -04:00
Dev
28082808a8 Remove unused code 2024-03-18 21:11:00 +00:00
Dev
c879e852ed Fix watermark not displaying correctly for non-english locales 2024-03-18 21:07:47 +00:00
Dev
5d59e4c36e Fix issue with using LogTextColor.GRAY 2024-03-18 20:34:23 +00:00
Dev
dfdf1d22db Ensure fromRUB() never returns value below 1 2024-03-18 16:25:04 +00:00
Dev
b5565f3901 Perform currency conversion at end of getDynamicOfferPriceForOffer() if necessary instead of for each item in loop
linting
2024-03-18 16:23:04 +00:00
Dev
f2254b150a Add funtionality to propigate scav Charisma gains into PMC based on live testing 2024-03-18 12:56:34 +00:00
Dev
bd0cb15596 Include damage ammo boxes in prices.json 2024-03-18 11:06:39 +00:00
Dev
4c872a343f Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-03-18 09:59:13 +00:00
Dev
067aaae706 Handle edge case in updateFuel() where function can fail due to fuel item lacking a upd object
Lint file
2024-03-18 09:58:59 +00:00
TheSparta
d4c04fc718 Simplified autoInstallDependencies() 2024-03-18 00:06:08 +00:00
TheSparta
e73fea8776 Fixed undefined behaviour
- Would break out of the loop at the first dependency removed from `dependenciesToInstall`.
2024-03-17 23:19:56 +00:00
Dev
ecc6638a20 Enable commando give command by default 2024-03-17 22:50:44 +00:00
Dev
98a7e299ba Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-03-17 21:10:48 +00:00
Dev
1afe3daf32 Added additional AI PMC heads from func_brush 2024-03-17 21:10:35 +00:00
Kaeno
b46573c805 Blacklist Both Dogtags from RepeatableQuests hopefully 2024-03-17 17:54:26 +00:00
Dev
9608ac4a2c Limit food/drinks to a max of 3 in assault bot loot 2024-03-17 15:35:01 +00:00
Dev
6af4126bc8 Resolve issue with PMCs having seasonal items on their person when they shouldn't 2024-03-17 13:33:31 +00:00
Dev
1f16e96ae9 Merge branch '3.8.0' of https://dev.sp-tarkov.com/SPT-AKI/Server into 3.8.0 2024-03-17 12:27:50 +00:00
Dev
2ffe44d153 Made ragfair run interval time dynamic based on players current location:
Player in raid = longer time between checks (60 secs)
Player out of raid = shorter time between checks (8 secs)

Original value was 45 secs
2024-03-17 12:27:24 +00:00
Kaeno
bbb74c72c9 Reduce the amount of inital spawns on Sandbox(Ground Zero) To help getting killed instantly 2024-03-17 09:08:52 +00:00
DrakiaXYZ
13fafa7faf Add new gift code for the EFT book purchase (!263)
Original gift required a purchase, not a code, so code "KONTOROVICH" picked due to the author's name

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/263
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2024-03-17 08:55:48 +00:00
Cj
0a935651f5 Add mod enabled text for the disclaimer window (!264)
Add another variation stating mods are enabled for the beta disclaimer window

![image](/attachments/af517b44-e613-4fd4-81fd-c2434d6478b5)

Co-authored-by: Cj <161484149+CJ-SPT@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/264
Co-authored-by: Cj <cj@noreply.dev.sp-tarkov.com>
Co-committed-by: Cj <cj@noreply.dev.sp-tarkov.com>
2024-03-17 08:55:02 +00:00
DrakiaXYZ
e497ecc125 Fix flea avg and fee calculations (!265)
Properly calculate the flea average, excluding barter offers for a more live-like result
Prioritize handbook price for the /client/items/prices route to match live

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/265
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2024-03-17 08:54:34 +00:00
Dev
95f5a49c5c Update trader refresh times to use a min and max value 2024-03-16 22:12:03 +00:00
Cj
be64e897b9 Enable BSG logging (!262)
Needs merged with: https://dev.sp-tarkov.com/SPT-AKI/Modules/pulls/96

Read details there.

Co-authored-by: Cj <161484149+CJ-SPT@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/262
Co-authored-by: Cj <cj@noreply.dev.sp-tarkov.com>
Co-committed-by: Cj <cj@noreply.dev.sp-tarkov.com>
2024-03-16 21:03:52 +00:00
Refringe
72ddbc4192
Adds bleedingmods Build Type 2024-03-16 16:11:24 -04:00