666 Commits

Author SHA1 Message Date
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
TetrisGG
7b835f1501 Fix Bonuses in various Services using Find and not filter. 2024-08-09 15:03:50 +01:00
Dev
2a52af1275 Improved logic of getBonusValueFromProfile() 2024-08-08 22:36:32 +01:00
Dev
1066a138ac Added function getBonusValueFromProfile to profileHelper
(cherry picked from commit d97e717f7645d42c00e3f84b6d08b53109fef71b)
2024-08-08 18:31:04 +01:00
Dev
fc8769ba30 Basic implementation of pocket tpl quest reward handling 2024-08-03 23:10:54 +01:00
Dev
18158bb4dc Fixed FiR status persisting after death for items inside secure container 2024-08-02 15:54:39 +01:00
Dev
c114d4285f Removed redundant function 2024-07-28 13:19:52 +01:00
Dev
2f412641b2 Further improvements to weapon mod generation 2024-07-28 11:42:45 +01:00
Dev
af33625a5c Improved pickWeaponModTplForSlotFromPool(), now pre-sorts mod pool prior to adding it to exhaustableModPool and processing 2024-07-28 00:12:04 +01:00
Dev
0c42a38306 Add null protection to playerHasRecievedMaxNumberOfGift() 2024-07-25 23:18:28 +01:00
Dev
7be6b47e23 Fixed various Biome issues 2024-07-23 17:30:20 +01:00
Refringe
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
8c23a32755 Merge branch '310-dev'
# Conflicts:
#	project/.eslintrc.json
#	project/assets/configs/core.json
#	project/assets/configs/ragfair.json
#	project/assets/database/locations/bigmap/base.json
#	project/assets/database/locations/factory4_day/base.json
#	project/assets/database/locations/interchange/base.json
#	project/assets/database/locations/lighthouse/base.json
#	project/assets/database/locations/sandbox/base.json
#	project/assets/database/locations/sandbox_high/base.json
#	project/assets/database/locations/shoreline/base.json
#	project/assets/database/locations/tarkovstreets/base.json
#	project/assets/database/locations/woods/base.json
#	project/package.json
#	project/src/controllers/BotController.ts
#	project/src/controllers/GameController.ts
#	project/src/routers/static/InraidStaticRouter.ts
2024-07-22 23:14:47 +01:00
Refringe
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: https://dev.sp-tarkov.com/SPT/Server/pulls/383
Co-authored-by: Refringe <me@refringe.com>
Co-committed-by: Refringe <me@refringe.com>
2024-07-22 21:15:57 +00:00
Dev
4c9e5c258f Removed unnecessary scope
(cherry picked from commit 201df756a9d247779991d5ba5379b502ca60b346)
2024-07-21 22:59:01 +01:00
Dev
201df756a9 Removed unnecessary scope 2024-07-21 22:08:36 +01:00
HiddenCirno
4144fccbd1 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: https://dev.sp-tarkov.com/SPT/Server/pulls/382
Co-authored-by: HiddenCirno <2301697863@qq.com>
Co-committed-by: HiddenCirno <2301697863@qq.com>
(cherry picked from commit f555c24709bd4ed9b294c1e008ce3229be4190e1)
2024-07-21 16:17:29 +01:00
HiddenCirno
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: https://dev.sp-tarkov.com/SPT/Server/pulls/382
Co-authored-by: HiddenCirno <2301697863@qq.com>
Co-committed-by: HiddenCirno <2301697863@qq.com>
2024-07-21 15:05:48 +00:00
Dev
3f43e3f118 Localised error message
(cherry picked from commit 335806bfd8e9c4d84818a978f7fcd9b5f6f41750)
2024-07-21 09:10:24 +01:00
Dev
335806bfd8 Localised error message 2024-07-20 13:44:48 +01:00
Dev
3f7f357bff Improved getTotalStackCountSize
(cherry picked from commit bd5e7b1e62e86b426392d6be4c209c8b9e45095f)
2024-07-18 09:25:04 +01:00
Dev
bd5e7b1e62 Improved getTotalStackCountSize 2024-07-17 20:17:12 +01:00
Dev
5e3899c426 Improved fillMagazineWithRandomCartridge() logging
(cherry picked from commit f406918bb8bf418ad32daabb947e1004282c1f0b)
2024-07-17 12:44:24 +01:00
Dev
f406918bb8 Improved fillMagazineWithRandomCartridge() logging 2024-07-17 11:48:57 +01:00
Dev
373f194a25 Fixed items with a stack count > 1 not selling as expected
(cherry picked from commit fd34e7bc8412b0ce0503691b984256b57a14383e)
2024-07-16 21:09:08 +01:00
Dev
fd34e7bc84 Fixed items with a stack count > 1 not selling as expected 2024-07-16 21:08:43 +01:00
Dev
bf8a403372 Removed redundant check on unlocking hideout crafts
(cherry picked from commit 433ea6566ac562bc5cca16b5082fa6d76a0ee86b)
2024-07-16 11:59:01 +01:00
Dev
433ea6566a Removed redundant check on unlocking hideout crafts 2024-07-16 11:32:46 +01:00
DrakiaXYZ
c46cdaeb18 Don't allow production timers to be reduced below 5 seconds (!375)
This should avoid potential issues when mods drastically increase the crafting skill level, or otherwise modify the profile in ways that cause negative production times

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/375
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2024-07-15 19:33:38 +00:00
chomp
50bafeb100 Fix flea selling issues (!374)
Co-authored-by: Dev <dev@dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/374
(cherry picked from commit 4fd113d00dda4a5e9e3f26d551bd8904156d1086)
2024-07-15 19:24:53 +01:00
chomp
4fd113d00d Fix flea selling issues (!374)
Co-authored-by: Dev <dev@dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/374
2024-07-15 18:24:23 +00:00
Dev
2ea6b658fd Fixed getBTC() failing when Production area cannot be found
(cherry picked from commit 77b42bfb2f0540c0fcb4c60fb84cdbcacd0965ad)
2024-07-13 10:59:03 +01:00
Dev
77b42bfb2f Fixed getBTC() failing when Production area cannot be found 2024-07-13 10:58:46 +01:00
Dev
61313dce25 Remove deprecated registerCommandoCommand()
(cherry picked from commit c705127007f0e2f6c501a9ae7f84cd3e824a919d)
2024-07-12 22:21:15 +01:00
Dev
bf507a766c Removed deprecated ICommandoCommand
(cherry picked from commit 28593d3e9b82d89c3ae60b8cbba8c69c4e78f09e)
2024-07-12 22:21:01 +01:00
Dev
c705127007 Remove deprecated registerCommandoCommand() 2024-07-12 22:19:57 +01:00
Dev
28593d3e9b Removed deprecated ICommandoCommand 2024-07-12 22:19:04 +01:00
CWX
4eeedc4257 Removed unused code and repurposed save endpoint for scav profile saving 2024-07-12 16:29:21 +01:00
Dev
b0a65cac7f Fixed server build errors from previously merged PR
(cherry picked from commit e1ca9dedc99e846d9355255935c8688dfa6815b0)
2024-07-11 09:29:16 +01:00
Dev
e1ca9dedc9 Fixed server build errors from previously merged PR 2024-07-11 09:28:37 +01:00
Dev
007bdccd6c Improved pack + multi-item player flea offer handling
(cherry picked from commit e9d8c02ac2d15ae80ab8b22d5db5ac22597b05e7)
2024-07-10 11:40:12 +01:00
Dev
e9d8c02ac2 Improved pack + multi-item player flea offer handling 2024-07-10 11:39:11 +01:00
Dev
2050880c91 Cleanup of getOwnerInventoryItems() 2024-07-09 09:56:18 +01:00
Kaeno
bb50998e04 Skip moving item if item cannot be found. 2024-07-09 09:52:58 +01:00
Dev
007b1d4789 Fixed accepting a quest bringing in blacklisted event quests
(cherry picked from commit fe614ad73f69e5f74407bb8ea840e836510237cd)
2024-07-08 09:56:34 +01:00
Dev
fe614ad73f Fixed accepting a quest bringing in blacklisted event quests 2024-07-08 09:55:56 +01:00
Dev
3288c04a25 Improved post-raid handling of scav raids + btr item service 2024-07-07 21:51:24 +01:00
Dev
6cac4394c1 Depreciated functions 2024-07-07 21:17:10 +01:00
Dev
bda69a5563 Added getMoneyTpls() 2024-07-07 19:43:32 +01:00
CWX
b4a5556d14 Fix health saving 2024-07-05 14:39:21 +01:00