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

782 Commits

Author SHA1 Message Date
Kaeno
ae6f2e4417 Gear stand changes to match dump data. Will cause client to hang. 2024-08-26 21:31:31 +01:00
CWX
05c4bb1946 Update comments, refactor check 2024-08-26 20:47:09 +01:00
CWX
b3b36c37ee dont send upgrades back to client for gear area 2024-08-26 20:39:04 +01:00
Dev
0d611eae24 Add pocket item to mannequin on area upgrade 2024-08-26 18:54:10 +01:00
Dev
7dfa911213 Added comments to function 2024-08-26 14:23:23 +01:00
Dev
63cf9ae132 Created new CircleOfCultist service and transplanted all code from Hideout controller into it 2024-08-26 11:46:38 +01:00
Dev
6803ee6241 Cultist circle:
Added support for weapon/armor rewards
Added support for variable stack sizes (only ammo for now)
Added support for breaking out of reward item while loop if no item is found (5 attempts max)
Added helper function `itemHelper.getRandomisedAmmoStackSize()`
2024-08-26 11:17:10 +01:00
Dev
d720f7fa3a Refactor of Circle of sacrifice code, added getRewardsWithinBudget() 2024-08-25 19:29:13 +01:00
Dev
768a275253 Logged error when nothing can be placed in reward grid 2024-08-25 15:13:50 +01:00
Dev
d3e7e1006b Increased multipler to 140%
Limited reward items to 5
2024-08-25 15:02:18 +01:00
Dev
94f3bd0d02 Removed debug/redundant code 2024-08-25 14:47:02 +01:00
Dev
c13d5c49a5 Added functionality to send player rewards based on cost of items sacrificed 2024-08-25 14:32:29 +01:00
eee46aad30 Fix CircleOfCultists not finishing (!402)
Production resp should be null according to network dumps. Also instead of delete nulled out the recipe, so that it properly overwrites the id.

Co-authored-by: TetrisGG <tetrisggdev@gmail.com>
Reviewed-on: SPT/Server#402
Co-authored-by: TetrisGG <tetrisgg@noreply.dev.sp-tarkov.com>
Co-committed-by: TetrisGG <tetrisgg@noreply.dev.sp-tarkov.com>
2024-08-25 13:30:10 +00:00
Dev
244fe62617 Added code to create a pool of items the player needs to complete crafts/upgrade areas in their hideout for the cultist circle rewards 2024-08-25 13:46:47 +01:00
eff5f14e5c Added feature to keep daily quest type when replacing. Refering issue #745 (!400)
## Added:
* Config to keep daily quest type

## Changed:
* changeRepeatableQuest to check if the daily quest type should be kept the same

Co-authored-by: W1ngZ <W1ngZ@NoRealMail.com>
Reviewed-on: SPT/Server#400
Co-authored-by: W1ngZ <w1ngz@noreply.dev.sp-tarkov.com>
Co-committed-by: W1ngZ <w1ngz@noreply.dev.sp-tarkov.com>
2024-08-25 07:56:48 +00:00
Dev
c8e66de039 Refactored addUpdateInventoryItemToProfile()and added addMissingPresetStandItemsToProfile() 2024-08-24 22:34:53 +01:00
Kaeno
150ae6637e Merge branch '3.10.0-DEV' of https://dev.sp-tarkov.com/SPT/Server into 3.10.0-DEV 2024-08-23 23:51:03 +01:00
Kaeno
655c0d9f27 Add check to only replace items if equipment id matches. Preventing from profile breaking 2024-08-23 23:50:52 +01:00
Dev
557dc55a33 Implemented inclusion of standx items when updating/installing hideout equipment area
Set area to level 0 for USEC
Removed unnecessary mannequin pose array from dev profiles
2024-08-23 23:41:50 +01:00
386b93e7e6 Handle Softinsertslots when insuring armor (!401)
fixes SPT/Issues#765
Tested with Uptodate Bleedingedge

Reviewed-on: SPT/Server#401
Co-authored-by: TetrisGG <dmiller2606@gmail.com>
Co-committed-by: TetrisGG <dmiller2606@gmail.com>
2024-08-23 16:35:17 +00:00
Dev
6d7c4d95b6 Added further progress on cultist circle - now rewards items upon completion
Now handles `HideoutDeleteProductionCommand` event, Deletes sacrificed items on craft start
Set craft time to 30 secs for debugging
2024-08-22 17:48:39 +01:00
Dev
38d2f88e0c Fixed circle craft not registering correctly 2024-08-22 12:43:30 +01:00
Dev
c6877f998b Updated StartTimestamp to be stored as a string 2024-08-22 12:34:54 +01:00
Dev
47fcff1338 Added further work to circle of sacrifice area 2024-08-22 10:32:35 +01:00
Dev
f24318603f Fixed flea market not showing items 2024-08-21 21:34:50 +01:00
Dev
3d8d09cc18 Expanded implementation of circleOfCultistProductionStart 2024-08-21 19:56:29 +01:00
Dev
7316e6377d Added equipment preset area to addUpdateinventoryItemToProfile blacklist 2024-08-21 17:05:38 +01:00
Dev
471c606e12 Updated production recipe interface to match live 2024-08-21 14:43:19 +01:00
Dev
f4d1ac9097 Added TODO inside circleOfCultistProductionStart 2024-08-21 13:45:03 +01:00
Dev
726e4f4b2c Stubbed out HIDEOUT_CIRCLE_OF_CULTIST_PRODUCTION_START event 2024-08-21 13:36:51 +01:00
Dev
858026b5b9 Handled edge case handling for adding an item to a hideout area 2024-08-21 13:28:30 +01:00
Kaeno
d4cc41d3fc Fix Dev profiles not having access to Weapon wall and Cultist stash 2024-08-21 13:26:10 +01:00
Dev
0839f34b9b Updated addContainerImprovementToProfile to better handle cultist circle 2024-08-21 13:05:59 +01:00
Dev
c45f4c5f4b Added s to Improvement
Updated hideout area enum
2024-08-20 21:19:00 +01:00
a4a3c8c89a Skip items that are listed in the custom blacklist from being set as sellable (!396)
Fixes issue #747

Reviewed-on: SPT/Server#396
Co-authored-by: Archangel <jesse@archangel.wtf>
Co-committed-by: Archangel <jesse@archangel.wtf>
(cherry picked from commit 5017b019388adfddca60856e4596ee90133a3098)
2024-08-15 20:16:09 +01:00
Dev
8014bdd06f Updated water filtering system to correctly check the craft progress against the ProductionTime value stored in the profile instead of the base ProductionTime value in the hideout json.
This is because the base value doesn't take into account any craft bonuses the profile has

After collecting a product from a continious craft, `ProductionTime` in the profiles craft data will be refreshed, this resolves issues with adjusting the `production.json` craft times not applying to continuous crafts
2024-08-09 16:04:43 +01:00
7b835f1501 Fix Bonuses in various Services using Find and not filter. 2024-08-09 15:03:50 +01:00
Cj
967dc15564 ProfileFixerService Refactor (!391)
Refactor to remove legacy code that bloats the `ProfileFixerService` class. Most of which is old profile porting code, some being old profile fixes. Organizes code in the class so that public members are at the top (as they should be). Finally break out some code into their own methods so they're not in the primary method for the class `checkForAndFixPmcProfileIssues`.

I have tested this with a developer profile, an EOD profile and a Standard profile. I've encountered no issues in my own testing.

Co-authored-by: Cj <161484149+CJ-SPT@users.noreply.github.com>
Reviewed-on: SPT/Server#391
Co-authored-by: Cj <cj@noreply.dev.sp-tarkov.com>
Co-committed-by: Cj <cj@noreply.dev.sp-tarkov.com>
2024-08-08 17:09:52 +00:00
Dev
8f67f75930 Improved how generateMultipleBotsAndCache() and returnSingleBotFromCache() handles missing raid settings from AppContext 2024-07-30 12:09:28 +01:00
e295cda571 Fix issue in BotLevelGenerator when high level (!388)
Previously `highestValue` could be lower than `lowestValue`, resulting in an exception. These values are now generated in the same method and clamped

Add a catch to the botgen promise await so we get more useful errors if botgen fails

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: SPT/Server#388
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
(cherry picked from commit ee1eb7d690c5ebd3d1aa4229d3a15d1050f84b5a)
2024-07-30 08:29:04 +01:00
Dev
0cb179f8e1 Make use of SideType.SAVAGE enum 2024-07-25 19:12:26 +01:00
Dev
7be6b47e23 Fixed various Biome issues 2024-07-23 17:30:20 +01:00
5740774a46
Apply Biome Formatting
This is the result of running `npm run format` which applies the Biome formatting rules. Rejoice!
2024-07-23 11:12:53 -04:00
Dev
951655e846 Removed redundant rating check now it has been moved to ProfileFixerService 2024-07-23 13:16:54 +01:00
Dev
3820b97531 Added null protected to playerLevelFulfillsQuestRequirement()
(cherry picked from commit c90b8670f2c2f170669c3e93cd0da5f4fafbcc5e)
2024-07-23 09:07:26 +01:00
ed8dbbd195 Adds Biome - Removes ESLint & Prettier (!383)
Boogidy, boogidy, boogidy. Let's go racing! 🏎️

Removes the over-complicated and super-slow setup we had with ESLint & Prettier in favour of Biome. The largest change with the formatting is moving from Allman braces to 1TBS braces. Other than that, it's *pretty much* the same. Ah, and that Biome runs formatting and linting on the entire project about x10 faster than the old system ran formatting on one file. Seriously, the guy who came up with that last solution should be fired. :runs:

I've kept all of the formatting and linting commands the same as before, with the main mamma-jamma being: `npm run format`, which applies formatting and linting changes to the entire project.

Formatting-on-save works (quickly!) by (1) ensuring that you're working within the VSC workspace (as you should be), and (2) have the recommended Biome VSC extension installed. The link to the Biome extension is in the README.

This limits our options on code formatting going forward; Biome, like prettier, is very opinionated with very few formatting options available. But I see this as a good thing. I'd rather spend my time arguing about which gun in Tarkov is the best, rather than coding brace styles...

...It's the TOZ, and it always will be. Don't DM me.

Co-authored-by: chomp <chomp@noreply.dev.sp-tarkov.com>
Reviewed-on: SPT/Server#383
Co-authored-by: Refringe <me@refringe.com>
Co-committed-by: Refringe <me@refringe.com>
2024-07-22 21:15:57 +00:00
CWX
0e85e55ced add missing props on models, add additional info to miniprofiles 2024-07-21 20:41:46 +01:00
Dev
9df6357f62 Improved formatting of repeatable charisma bonus application
(cherry picked from commit 9af480f6253fb25dd96fa73b2b88c717313ffbee)
2024-07-21 16:24:55 +01:00
Dev
cd803c8e8b Refactored new offer checking code 2024-07-21 16:16:57 +01:00
f555c24709 Complete issues #667 (Possible issue with flea buying) (!382)
Now when a profile create a new offer and another profile buy it, it can work correctly(For example profile A create a offer and profile B buy this offer, now A will receive money from profile B)
and set RagfairOfferHelper.completeOffer to public because TradeHelper now use it to resolve trade between 2 profiles on ragfair

Reviewed-on: SPT/Server#382
Co-authored-by: HiddenCirno <2301697863@qq.com>
Co-committed-by: HiddenCirno <2301697863@qq.com>
2024-07-21 15:05:48 +00:00