0
0
mirror of https://github.com/sp-tarkov/server.git synced 2025-02-12 13:10:43 -05:00

3960 Commits

Author SHA1 Message Date
Bob S
0527fc2cc8 Better handle rewards not fitting (they shouldn't just poof) by trimming the rewards amount until they fit. 2024-12-09 17:55:10 -05:00
Chomp
a15a28e460 Updated JSON data 2024-12-09 20:19:28 +00:00
Chomp
7092c9991c Locked event quest behind config 2024-12-09 20:17:47 +00:00
Chomp
bfacb09268 Added Thats a Great Plan Walter quest 2024-12-09 19:33:46 +00:00
Chomp
d5ce6c4d70
Revise PMC names (#978) 2024-12-09 19:06:40 +00:00
stella
631c63a817 Revise PMC names 2024-12-09 09:56:21 -07:00
Chomp
f6c575ac5e Updated version number 2024-12-09 16:55:07 +00:00
Chomp
ff5bc64acf Added workaround for non-fence repeatable quests crashing client when the same trader is picked for replacement quest 2024-12-09 15:53:39 +00:00
Chomp
53599e46f3 Wired up item type blacklist across loot generator/airdrop and cultist circle in consistent way
Reworked Cultist circle code to pass blacklist around as a set rather than array
Removed cultist circle use of `itemRewardBlacklist` to store item parent ids, feature is handled by new config property
2024-12-09 15:03:21 +00:00
Chomp
55857a7e7a Wired up Cultist circle to use item type blacklist 2024-12-09 14:44:28 +00:00
Chomp
b41d8683b3 Added array to config to allow ignoring of item types from rewards, wired up function in itemFilterService to return values + Added built in inserts to blacklist 2024-12-09 14:41:42 +00:00
b3683f2f23
Image Asset LFS Transfer (#977)
This PR includes changes to the `.gitattributes` file to ensure images
are now stored on the custom LFS server.
2024-12-09 14:28:31 +00:00
Chomp
478b9b3914 Moved repeatablesInProfile nullguard to early in function when it can be helpful + make it check for questToReplace property too 2024-12-09 13:47:37 +00:00
Chomp
aa928ac43d only purge inactive repeatables When repeatableToChangeClone exists 2024-12-09 13:41:06 +00:00
Chomp
8f416c5dee Added logging of quest being replaced when generating new repeatable 2024-12-09 13:30:07 +00:00
Chomp
d9e893149a Improved debug logging when repeatable quest is generated 2024-12-09 13:25:22 +00:00
be88a2224e
Merge branch '3.10.2-dev' 2024-12-07 13:52:24 -05:00
21939dcf38
Biome Format
Ran the `npm run style:fix` command. These are the code-formatting fixes.
2024-12-07 13:50:09 -05:00
Chomp
c3cd67d8b9 Moved Christmas start day from 7th to 12th 3.10.2 2024-12-07 11:56:08 +00:00
Chomp
ec517bba2c Expanded error message 2024-12-07 11:43:50 +00:00
Chomp
6a4bd7ba3f Removed spammy log message 2024-12-07 11:42:21 +00:00
Chomp
07699e4144 Removed unused varaible 2024-12-07 11:42:09 +00:00
Chomp
fe482127ab Added null protection to addHideoutEliteSlots() when profile lacks a generator 2024-12-07 11:41:51 +00:00
Chomp
a431a3454b Removed duplicate face plate from killa helmet reward 2024-12-07 11:16:16 +00:00
Chomp
e6e568f62c Manually added back Christmas tree hideout area using 2023 Christmas data 2024-12-07 10:35:26 +00:00
Chomp
3c1a84230e Added money to circle blacklist 2024-12-07 10:16:15 +00:00
Chomp
b211b40c13 Added more comments 2024-12-07 10:13:47 +00:00
Chomp
3867ff336e Moved circle-specific types into correct location in project + renamed them for clarity 2024-12-07 10:05:32 +00:00
Chomp
050edec9f3 Renamed getRandomLoot to generateRandomisedItemsAndAddToRewardPool
Removed hard-coded money/ammo blacklist from `generateRandomisedItemsAndAddToRewardPool()` and moved into config
Updated function to check chosen reward items parentid against item reward blacklist
2024-12-07 10:04:12 +00:00
Chomp
b20777e1c3 Removed unnecessary comments 2024-12-07 09:54:26 +00:00
Chomp
0c02591422 Refactored code into separate functions 2024-12-07 09:53:21 +00:00
Chomp
7284bb2fdc Fixed getCultistCircleRewardPool erroring when trying to access a hideout area stage that doesnt exist 2024-12-07 09:49:49 +00:00
Chomp
66c1d23df2 Fixed cultist circle saving direct rewards to the profile incorrectly 2024-12-07 09:44:12 +00:00
Chomp
83a3fb16fe Fixed cultist circle returning direct weapon/armor rewards without mods 2024-12-07 09:43:41 +00:00
Chomp
d2b7baa8b6
Cultist circle improvements (#973)
Brings Cultist Cicle rewards closer to live behavior.

---------

Co-authored-by: Bob S <shibdib@users.noreply.github.com>
Co-authored-by: Chomp <dev@dev.sp-tarkov.com>
2024-12-06 17:15:06 +00:00
DrakiaXYZ
d34eca32bb
Further favorite item/weapon functionality and fixes (#974)
- Resolve issue where we were storing favorites in the incorrect format,
resulting in a client error on game load
- Resolve issue where we were clearing favorites when they were meant to
be saved
- On login, fix any previously corrupted favorites array
- Properly implement favorite data in `getOtherProfile`, now shows your
favorites when viewing your profile

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Co-authored-by: Chomp <27521899+chompDev@users.noreply.github.com>
2024-12-06 17:14:19 +00:00
Chomp
fdca5d39f6 Various unit test fixes 2024-12-06 17:08:48 +00:00
Chomp
e7f5db9f0a Fixed generateUniqueBotNickname() failing when no data is passed into its optional parameter 2024-12-06 16:49:39 +00:00
Chomp
43025ed8e1 Fixed generateUniqueBotNickname test 2024-12-06 16:38:22 +00:00
c071702851
Better Random (#972)
This started as a small update.

This pull request includes updates to the `RandomUtil` class to improve
the security and accuracy of random number generation by utilizing the
`node:crypto` module. Additionally, it enhances the documentation and
refactors several methods for clarity and performance.

Includes tests, both before and after the changes.

The only *possible* breaking change is that now the `getKey`,
`getKeyValue`, and `drawRandomFromDict` methods are typed with generics
instead of `any`. I tried to keep them as *generic* as possible, but we
should probably include this in a BE to ensure it doesn't break
anything.

No further changes are planned--Saved as a draft because it's late and I
still want to review.

---------

Co-authored-by: Chomp <27521899+chompDev@users.noreply.github.com>
2024-12-06 16:25:44 +00:00
Chomp
9ef8206517 Updated sortModKeys() to use mount-specific mod sorting, prioritises the scope before additional mounts
Fixed null ref exceptions due to some items lacking `slots` objects
2024-12-06 16:20:18 +00:00
Chomp
e8c3b69975 Reordered checks to slightly reduce processing required for check 2024-12-06 15:43:20 +00:00
Chomp
0397c9e121 Improved weapon mod limit check for mounts - do not prevent sub-mounts being added to existing mounts (e.g. red dots on top of scope mounts) 2024-12-06 15:42:53 +00:00
6c9e4fd0bb
Custom LFS Sever (#970)
We've created our own Git Large File Storage (LFS) server due to the
excessive cost of GitHub's bandwidth. Did you know all of their Ethernet
cables are actually gold coated diamonds?

This PR reverses the work done in #954 to compress large location JSON
files into a 7zip archive and handle the (de)compression of the archive.

Only JSON files within the `project/assets/database/` directory that are
larger than 5MB have been included in LFS. This translates to all of the
`looseLoot.json` files. The rest are small enough to be included in the
base repo.

A `.lfsconfig` file has been added to the root of the project to alert
git to the presence of the custom LFS server. This public server is
read-only. Write access is only available to developers within the
Single Player Tarkov GitHub organization.

<img
src="https://github.com/user-attachments/assets/7ddfec9b-5a9a-42e6-806d-fd419e4eaa4f"
width="250">
2024-12-06 13:56:05 +00:00
c6c983372d
Create FUNDING.yml
Should add a sponsor button to the GitHub overview page for the server repo. Adds our Patreon and Chomp's Ko-Fi.
2024-12-04 22:10:00 -05:00
Chomp
2527823208 Formatting changes 2024-12-03 16:52:20 +00:00
Chomp
9b7c31e36f Added nullgaurd to getQuestRewardItems() to protect against invalid custom quests 2024-12-03 16:50:54 +00:00
Chomp
a16aaf270f Renamed parameter to improve readability 2024-12-03 11:53:49 +00:00
Chomp
e5fb672579 Fixed price discrepancy between trader and flea price for trader items, resolves #968 2024-12-03 11:53:22 +00:00
Chomp
b48c1153e1 Removed unused subfunction from getAssort 2024-12-03 11:51:44 +00:00