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

3258 Commits

Author SHA1 Message Date
Dev
8e31cd9950 Added locations formatted to ignore 2024-07-23 14:32:56 +01:00
Dev
951655e846 Removed redundant rating check now it has been moved to ProfileFixerService 2024-07-23 13:16:54 +01:00
Dev
6d1bde60ca Adjusted EDITPROFILE gift to have 50 uses 2024-07-23 09:57:27 +01:00
Dev
3820b97531 Added null protected to playerLevelFulfillsQuestRequirement() 
(cherry picked from commit c90b8670f2)
 2024-07-23 09:07:26 +01: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
Dev
8895e2e82f Added DB to biome ignore list 2024-07-22 22:42:09 +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
4c1de3682c Blacklisted Mark of The Unheard from reward items pool 
(cherry picked from commit 5771f1f567)
 2024-07-22 15:09:35 +01:00
Dev
5771f1f567 Blacklisted Mark of The Unheard from reward items pool 2024-07-22 15:08:21 +01:00
Dev
817d339104 Updated PMC names 
(cherry picked from commit 416780d9f9)
 2024-07-22 13:34:04 +01:00
Dev
416780d9f9 Updated PMC names 2024-07-22 13:33:51 +01:00
Dev
b5416ceba7 Added missing localization message 
(cherry picked from commit 18e0deb109)
 2024-07-22 13:26:15 +01:00
Dev
4a4d65ee4c Added guard against missing trader insuranceStart mesages inside sendInsuredItems() 
(cherry picked from commit 0d9bd9a6d3)
 2024-07-22 13:26:09 +01:00
Dev
18e0deb109 Added missing localization message 2024-07-22 13:25:45 +01:00
Dev
0d9bd9a6d3 Added guard against missing trader insuranceStart mesages inside sendInsuredItems() 2024-07-22 13:24:00 +01:00
Dev
c1c74c726a Added GP coin limits to airdrops - this prevents mods that override the stack limit adding 100s of thousands of coins to airdrops 
(cherry picked from commit 7d57a80e20)
 2024-07-22 09:40:55 +01:00
Dev
7d57a80e20 Added GP coin limits to airdrops - this prevents mods that override the stack limit adding 100s of thousands of coins to airdrops 2024-07-22 09:39:46 +01:00
Dev
4c9e5c258f Removed unnecessary scope 
(cherry picked from commit 201df756a9)
 2024-07-21 22:59:01 +01:00
Dev
bdc167a10e Merge branch '310-dev' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-21 22:09:12 +01:00
Dev
201df756a9 Removed unnecessary scope 2024-07-21 22:08:36 +01:00
CWX
0e85e55ced add missing props on models, add additional info to miniprofiles 2024-07-21 20:41:46 +01:00
Dev
2be14850a9 Fixed bad injection caps 
(cherry picked from commit 8e17673d0d)
 2024-07-21 20:40:04 +01:00
Dev
8e17673d0d Fixed bad injection caps 2024-07-21 20:39:47 +01:00
Dev
9df6357f62 Improved formatting of repeatable charisma bonus application 
(cherry picked from commit 9af480f625)
 2024-07-21 16:24:55 +01:00
Dev
9af480f625 Improved formatting of repeatable charisma bonus application 2024-07-21 16:24:05 +01:00
Dev
10b8cedc42 Refactored new offer checking code 
(cherry picked from commit cd803c8e8b)
 2024-07-21 16:17:40 +01:00
Dev
632a5f3656 Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server 2024-07-21 16:17:33 +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 f555c24709)
 2024-07-21 16:17:29 +01:00
Dev
cd803c8e8b Refactored new offer checking code 2024-07-21 16:16:57 +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
Alex
85bef99608 removed null style check that was slowing down file processing (!381) 
Co-authored-by: clodan <clodan@clodan.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/381
Co-authored-by: Alex <clodan@noreply.dev.sp-tarkov.com>
Co-committed-by: Alex <clodan@noreply.dev.sp-tarkov.com>
(cherry picked from commit 130b12879e)
 2024-07-21 15:19:54 +01:00
Alex
130b12879e removed null style check that was slowing down file processing (!381) 
Co-authored-by: clodan <clodan@clodan.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/381
Co-authored-by: Alex <clodan@noreply.dev.sp-tarkov.com>
Co-committed-by: Alex <clodan@noreply.dev.sp-tarkov.com>
 2024-07-21 14:18:43 +00:00
HiddenCirno
8ff9f6f945 Fix that charisma skill cannot deduct repeatable quest change cost (!380) 
add discount caculation for repeatable quest change, not it can deduct cost with player's charisma skil level(per level 0.1%)

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/380
Co-authored-by: HiddenCirno <2301697863@qq.com>
Co-committed-by: HiddenCirno <2301697863@qq.com>
(cherry picked from commit 7e06517c8c)
 2024-07-21 13:02:05 +01:00
HiddenCirno
7e06517c8c Fix that charisma skill cannot deduct repeatable quest change cost (!380) 
add discount caculation for repeatable quest change, not it can deduct cost with player's charisma skil level(per level 0.1%)

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/380
Co-authored-by: HiddenCirno <2301697863@qq.com>
Co-committed-by: HiddenCirno <2301697863@qq.com>
 2024-07-21 12:01:12 +00:00
Dev
3f43e3f118 Localised error message 
(cherry picked from commit 335806bfd8)
 2024-07-21 09:10:24 +01:00
HiddenCirno
7a05acacdd fix free change still deduct trader standing (!379) 
Fix that free change repeatable chance quest still deduct trader standing, now it will deduct when player have no access to free change or have no free change counts

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/379
Co-authored-by: HiddenCirno <2301697863@qq.com>
Co-committed-by: HiddenCirno <2301697863@qq.com>
(cherry picked from commit dcb98f7d1b)
 2024-07-21 09:03:12 +01:00
HiddenCirno
dcb98f7d1b fix free change still deduct trader standing (!379) 
Fix that free change repeatable chance quest still deduct trader standing, now it will deduct when player have no access to free change or have no free change counts

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/379
Co-authored-by: HiddenCirno <2301697863@qq.com>
Co-committed-by: HiddenCirno <2301697863@qq.com>
 2024-07-21 08:02:44 +00:00
Dev
776a41499f Added nullguard to showQuestItemHandoverMatchError() 
(cherry picked from commit 014826e683)
 2024-07-21 00:14:51 +01:00
Dev
014826e683 Added nullguard to showQuestItemHandoverMatchError() 2024-07-21 00:14:33 +01:00
Tyfon
ed3e16a94f Add support for flea market dogtag barter requirements (!378) 
Trader offers with dogtag barter requirements are currently missing the `level` and `side` properties necessary to qualify them. This data already exists in the assorts, just needed to be sent along with the offer.

I considered updating the `side` property of `Requirement` in `IAddOfferRequestData.ts`, but that field is never used, and the client appears to pass 0 for both (even though 0 is not a valid `side`).

Not sure if this should be going to `master` or `310-dev`?

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/378
Co-authored-by: Tyfon <tyfon7@outlook.com>
Co-committed-by: Tyfon <tyfon7@outlook.com>
(cherry picked from commit ec76a8897f)
 2024-07-20 23:41:39 +01:00
Tyfon
ec76a8897f Add support for flea market dogtag barter requirements (!378) 
Trader offers with dogtag barter requirements are currently missing the `level` and `side` properties necessary to qualify them. This data already exists in the assorts, just needed to be sent along with the offer.

I considered updating the `side` property of `Requirement` in `IAddOfferRequestData.ts`, but that field is never used, and the client appears to pass 0 for both (even though 0 is not a valid `side`).

Not sure if this should be going to `master` or `310-dev`?

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/378
Co-authored-by: Tyfon <tyfon7@outlook.com>
Co-committed-by: Tyfon <tyfon7@outlook.com>
 2024-07-20 21:45:42 +00:00
Dev
335806bfd8 Localised error message 2024-07-20 13:44:48 +01:00
Dev
d0d10ac15c Updated package json version 2024-07-19 17:26:36 +01:00
Dev
804e973124 Added quest Import Control 2024-07-19 16:10:37 +01:00
Dev
a00a810f0e Reduced pack chance to 9% 2024-07-19 14:05:51 +01:00
Dev
fb56aa914a Updated flea prices 2024-07-19 14:00:04 +01:00
Dev
dd185be7a9 Updated version 2024-07-19 13:50:03 +01:00
Dev
ccc4974fa2 Improved accuracy when creating flea offer - store single item price in `` property 
Made `unlimited` property optional as its only used by traders
Slightly reduced pack offer chance + made them have more items
 2024-07-19 13:47:30 +01:00
Dev
727ba83273 Improved accuracy when creating flea offer - store single item price in `` property 
Made `unlimited` property optional as its only used by traders
Slightly reduced pack offer chance + made them have more items
 2024-07-19 13:45:34 +01:00
Dev
e5a5bf2ee2 Added comments to functions 
(cherry picked from commit 59ffc9d886)
 2024-07-18 15:54:11 +01:00
Dev
5447203bf4 Added check for stack count below 1 and resets to 1 when handling single items being passed into unstackOfferItems() 
(cherry picked from commit 78f6fad21b)
 2024-07-18 09:25:23 +01:00
Dev
665778eaf1 Safely exit returnPlayerOffer() when no profile is found 
(cherry picked from commit af6d138f3c)
 2024-07-18 09:25:13 +01:00
Dev
3f7f357bff Improved getTotalStackCountSize 
(cherry picked from commit bd5e7b1e62)
 2024-07-18 09:25:04 +01:00
Dev
78f6fad21b Added check for stack count below 1 and resets to 1 when handling single items being passed into unstackOfferItems() 2024-07-18 09:19:44 +01:00
Dev
af6d138f3c Safely exit returnPlayerOffer() when no profile is found 2024-07-18 09:18:33 +01:00
Dev
bd5e7b1e62 Improved getTotalStackCountSize 2024-07-17 20:17:12 +01:00
Dev
4b8b3b77a7 Remove unsued properties + improved how user data is stored/generated 2024-07-17 19:30:17 +01:00
Dev
43d7e05f21 31124 2024-07-17 15:45:32 +01:00
Dev
5e3899c426 Improved fillMagazineWithRandomCartridge() logging 
(cherry picked from commit f406918bb8)
 2024-07-17 12:44:24 +01:00
Dev
f406918bb8 Improved fillMagazineWithRandomCartridge() logging 2024-07-17 11:48:57 +01:00
Dev
63420f7a7b Removed debug data 
(cherry picked from commit 13abd077dd)
 2024-07-16 21:31:48 +01:00
Dev
13abd077dd Removed debug data 2024-07-16 21:31:23 +01:00
Dev
373f194a25 Fixed items with a stack count > 1 not selling as expected 
(cherry picked from commit fd34e7bc84)
 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
59ffc9d886 Added comments to functions 2024-07-16 16:54:39 +01:00
Kaeno
fcdf537c3b Update JSONs 2024-07-16 15:49:49 +01:00
Kaeno
5bc9a81e0a Update raid times for maps (!377) 
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/377
 2024-07-16 13:48:53 +00:00
Dev
bf8a403372 Removed redundant check on unlocking hideout crafts 
(cherry picked from commit 433ea6566a)
 2024-07-16 11:59:01 +01:00
Dev
b72e6da22e increased GP coin rewards for daily/weeklies 
(cherry picked from commit fe5099883a)
 2024-07-16 11:58:48 +01:00
Dev
fe5099883a increased GP coin rewards for daily/weeklies 2024-07-16 11:36:19 +01:00
Dev
433ea6566a Removed redundant check on unlocking hideout crafts 2024-07-16 11:32:46 +01:00
Dev
8781c595fa Added quest icon for Gendarmerie District Patrol 
(cherry picked from commit 9b216c2a00)
 2024-07-16 11:27:30 +01:00
Dev
9b216c2a00 Added quest icon for Gendarmerie District Patrol 2024-07-16 11:27:15 +01:00
Cj
00fffa7845 Add method for capping skill progress (!376) 
Adds a check to the `ProfileFixerService` to cap skill progress at 5100. This prevents users from going over the cap with applications like profile editor, resulting in potential negative crafting times and other oddities.

Co-authored-by: Cj <161484149+CJ-SPT@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/376
Co-authored-by: Cj <cj@noreply.dev.sp-tarkov.com>
Co-committed-by: Cj <cj@noreply.dev.sp-tarkov.com>
 2024-07-15 19:34:26 +00: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
Dev
3dcb65cf41 Updated version string 2024-07-15 19:25:48 +01: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 4fd113d00d)
 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
trippy
6f3a674fd8 Change methods to public (!373) 
Change generateBotsFirstTime and returnSingleBotFromCache methods to public.

The generate method that call these methods is overridden in Fika.

Co-authored-by: trippyone <137233897+trippyone@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/373
Co-authored-by: trippy <trippy@noreply.dev.sp-tarkov.com>
Co-committed-by: trippy <trippy@noreply.dev.sp-tarkov.com>
 2024-07-15 15:29:33 +00:00
Dev
77da49bb9e Added common weapon crate 
(cherry picked from commit 9e1c3304f0)
 2024-07-15 11:31:28 +01:00
Dev
815e6e238c Expanded weapon crate fix to include common/rare creates 
(cherry picked from commit 111b75d1ab)
 2024-07-15 11:31:20 +01:00
Dev
9e1c3304f0 Added common weapon crate 2024-07-15 11:30:58 +01:00
Dev
111b75d1ab Expanded weapon crate fix to include common/rare creates 2024-07-15 11:30:03 +01:00
Dev
1762f1637d Added exit when flea offer type is not found 
(cherry picked from commit c2ccadf110)
 2024-07-14 19:49:41 +01:00
Dev
0629958b92 Added getOfferType() to ragfairController 
(cherry picked from commit e67f000602)
 2024-07-14 19:49:34 +01:00
Dev
c2ccadf110 Added exit when flea offer type is not found 2024-07-14 19:48:52 +01:00
Dev
e67f000602 Added getOfferType() to ragfairController 2024-07-14 19:21:11 +01:00
Dev
d4164d05c3 Added null protection around RagfairInfo on game start 2024-07-14 17:23:20 +01:00
Dev
35daf8710f Added null protected around RagfairInfo on profile login 2024-07-14 17:21:12 +01:00
Kaeno
b101cd8eed Update Difficulty settings to ignore Loyality. PMC's will no longer be friendly to scavs with +6 rep (!372) 
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/372
(cherry picked from commit 83b4ecc176)
 2024-07-14 09:06:58 +01:00
Kaeno
83b4ecc176 Update Difficulty settings to ignore Loyality. PMC's will no longer be friendly to scavs with +6 rep (!372) 
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/372
 2024-07-14 08:04:34 +00:00
Dev
22e5da9e61 Update package.json 2024-07-13 18:23:00 +01:00
Dev
dc84ee5d80 Adjusted GP Coin values inside currencyStackSize 
(cherry picked from commit 1fd66bafe8)
 2024-07-13 14:23:52 +01:00
Dev
1fd66bafe8 Adjusted GP Coin values inside currencyStackSize 2024-07-13 14:23:12 +01:00
Dev
073797a294 Fixed issue with itemFitsInto1By2Slot() classifying all items as unsuitable for a 1x2 slot 
(cherry picked from commit d92ec20e9c)
 2024-07-13 12:57:40 +01:00
Dev
d92ec20e9c Fixed issue with itemFitsInto1By2Slot() classifying all items as unsuitable for a 1x2 slot 2024-07-13 12:54:34 +01:00
Dev
2ea6b658fd Fixed getBTC() failing when Production area cannot be found 
(cherry picked from commit 77b42bfb2f)
 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
92eb0478bd Removed dupe keys from bot JSONs 
(cherry picked from commit 28fb1a2fc9)
 2024-07-13 10:00:41 +01:00
Dev
6823858020 Blacklisted Decrypted flash drive from PMC loot pools 
(cherry picked from commit 93bd7543e7)
 2024-07-13 10:00:12 +01:00
Dev
11837c05a2 Changes from master 2024-07-13 09:59:11 +01:00
Dev
11278b8930 Updated server locales with data from Crowdin 
(cherry picked from commit fb52594f8b)
 2024-07-13 09:57:47 +01:00
Dev
28fb1a2fc9 Removed dupe keys from bot JSONs 2024-07-13 09:53:02 +01:00
Dev
93bd7543e7 Blacklisted Decrypted flash drive from PMC loot pools 2024-07-13 09:48:13 +01:00
Dev
6a348fa5c9 Added additional PMC names of contributors 2024-07-13 09:44:39 +01:00
Dev
fb52594f8b Updated server locales with data from Crowdin 2024-07-13 09:39:49 +01:00
Dev
b4a6ee682c Added workaround for Ref repeatables not having any description text - force him to use Prapor text instead 
(cherry picked from commit 034c7142fc)
 2024-07-13 09:33:27 +01:00
Dev
034c7142fc Added workaround for Ref repeatables not having any description text - force him to use Prapor text instead 2024-07-13 09:33:04 +01:00
Dev
61313dce25 Remove deprecated registerCommandoCommand() 
(cherry picked from commit c705127007)
 2024-07-12 22:21:15 +01:00
Dev
bf507a766c Removed deprecated ICommandoCommand 
(cherry picked from commit 28593d3e9b)
 2024-07-12 22:21:01 +01:00
Dev
c705127007 Remove deprecated registerCommandoCommand() 2024-07-12 22:19:57 +01:00
Dev
731295b4b4 Updated spt version 2024-07-12 22:19:18 +01:00
Dev
28593d3e9b Removed deprecated ICommandoCommand 2024-07-12 22:19:04 +01:00
Dev
537819dda0 Fixed invalid json 2024-07-12 21:47:28 +01:00
Dev
1298022600 Fixed endpoint casing 2024-07-12 21:16:33 +01:00
Dev
442d00c959 Fixed minor typo 2024-07-12 17:20:54 +01:00
Dev
0412a8285d Fixed ravangezryachiyevent missing soft inserts 
(cherry picked from commit baba8d16d6)
 2024-07-12 17:16:56 +01:00
Dev
baba8d16d6 Fixed ravangezryachiyevent missing soft inserts 2024-07-12 17:16:30 +01:00
Dev
ddabe22e4f Fixed comma 2024-07-12 16:37:28 +01:00
CWX
4eeedc4257 Removed unused code and repurposed save endpoint for scav profile saving 2024-07-12 16:29:21 +01:00
Dev
124e23b8f6 Cleaned up scavRaidTimeSettings data to reduce the scav raid times slight less + added sandbox_high 
(cherry picked from commit c44f5b2ca9)
 2024-07-12 16:10:11 +01:00
Dev
c44f5b2ca9 Cleaned up scavRaidTimeSettings data to reduce the scav raid times slight less + added sandbox_high 2024-07-12 16:09:08 +01:00
Dev
9bee5a377d Added missing bots to ItemSpawnLimits 
(cherry picked from commit d3c20624a7)
 2024-07-12 13:19:47 +01:00
Dev
d3c20624a7 Added missing bots to ItemSpawnLimits 2024-07-12 13:19:02 +01:00
Dev
4af74ebc86 Added DSP to usec dev profile 2024-07-12 11:18:29 +01:00
Dev
5c716afb34 Updated sandbox raid times to match live 
(cherry picked from commit 49006b6065)
 2024-07-12 10:34:41 +01:00
Dev
49006b6065 Updated sandbox raid times to match live 2024-07-12 10:34:14 +01:00
Dev
0eab5ea561 31073 2024-07-12 09:58:35 +01:00
Dev
a3b97ff3ef Added nullguards to giveProfileMoney() 
(cherry picked from commit f7a617d621)
 2024-07-12 09:49:11 +01:00
Dev
f7a617d621 Added nullguards to giveProfileMoney() 2024-07-12 09:48:30 +01:00
Dev
de4b3ac180 Protected randomiseArmorInsertsDurabilities() from missing mod errors 
(cherry picked from commit 64f8e7b7e8)
 2024-07-11 12:11:45 +01:00
Dev
648bce9529 Added pmcUSEC/pmcBEAR roles to possible pmc types 
(cherry picked from commit 201684d200)
 2024-07-11 11:41:03 +01:00
Dev
201684d200 Added pmcUSEC/pmcBEAR roles to possible pmc types 2024-07-11 11:40:48 +01:00
Dev
64f8e7b7e8 Protected randomiseArmorInsertsDurabilities() from missing mod errors 2024-07-11 11:11:09 +01:00
Dev
e88521fe54 Added ability to blacklist profile from being created in launcher 
(cherry picked from commit 5260b16a18)
 2024-07-11 09:59:14 +01:00
Dev
5260b16a18 Added ability to blacklist profile from being created in launcher 2024-07-11 09:58:54 +01:00
Dev
0b9e61dcdc Added comments 2024-07-11 09:45:59 +01:00
Dev
f15a0e6f17 Add type to selectedMemberCategory 2024-07-11 09:35:27 +01:00
静穏靄
d31c5f6f09 Add missing property to IUserDialogDetails (!371) 
The property is used for Unheard edition accounts to retain their icon on reloading the dialog.

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/371
Co-authored-by: 静穏靄 <seionmoya@noreply.dev.sp-tarkov.com>
Co-committed-by: 静穏靄 <seionmoya@noreply.dev.sp-tarkov.com>
(cherry picked from commit d0f11fd073)
 2024-07-11 09:30:10 +01:00
Dev
b0a65cac7f Fixed server build errors from previously merged PR 
(cherry picked from commit e1ca9dedc9)
 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
静穏靄
d0f11fd073 Add missing property to IUserDialogDetails (!371) 
The property is used for Unheard edition accounts to retain their icon on reloading the dialog.

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/371
Co-authored-by: 静穏靄 <seionmoya@noreply.dev.sp-tarkov.com>
Co-committed-by: 静穏靄 <seionmoya@noreply.dev.sp-tarkov.com>
 2024-07-10 23:11:23 +00:00
Dev
6a12a3f04d Fixed incorrect starting hp value inside getLowestHpBody() 2024-07-10 16:46:53 +01:00
Dev
392d3bd8aa updated to 31020 2024-07-10 15:34:03 +01:00
Dev
a916f60c56 Set Skier event boss to 4% on customs 2024-07-10 15:31:49 +01:00
Dev
4f636d3061 Set Skier event boss to 4% on customs 2024-07-10 15:31:26 +01:00
Dev
cdb523be6b Added reward data for Unlocked valuables сrate common/rare/epic 2024-07-10 14:23:11 +01:00
Dev
ef24256e0d Added reward data for Unlocked valuables сrate common/rare/epic 2024-07-10 14:22:15 +01:00
Dev
134a4a1ff7 Fixed unlocked weapon reward box from hideout craft returning an error when opened 2024-07-10 14:20:35 +01:00
Dev
44e6735f80 Fixed unlocked weapon reward box from hideout craft returning an error when opened 2024-07-10 14:19:48 +01:00
Dev
a53eea239c FIx 
Fixed `openRandomLootContainer()` failing when no config values are found for desired random container
 2024-07-10 13:48:00 +01:00
Dev
49e5e8413a FIx 
Fixed `openRandomLootContainer()` failing when no config values are found for desired random container
 2024-07-10 13:46:09 +01:00
Dev
007bdccd6c Improved pack + multi-item player flea offer handling 
(cherry picked from commit e9d8c02ac2)
 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
4e047c48ec Increased stash row command limit to 15 
(cherry picked from commit 0ab1395355)
 2024-07-10 10:32:46 +01:00
Dev
0ab1395355 Increased stash row command limit to 15 2024-07-10 10:32:01 +01:00
Dev
ec6c4b05d9 Updated ItemTpl overrides and regenerated enum 2024-07-09 15:11:18 +01:00
Dev
c218051ff3 Cleaned up JSONs 2024-07-09 14:55:30 +01:00
Kaeno
96a40eb301 Enable Quest saving when leaving raid as pmc. Modify maxbotpve caps instead of maxbot cap 2024-07-09 14:52:35 +01:00
Dev
121387aa69 Deleted unused endpoints + code 2024-07-09 14:51:57 +01:00
Dev
1c601cc33e Removed unused endpoint + related service 2024-07-09 14:22:01 +01:00
Dev
08c955aa8a Updated scav difficulty values 2024-07-09 14:06:48 +01:00
Dev
177f7cd5d8 Updated shooterBTR bot to use correct gear 2024-07-09 14:06:28 +01:00
Dev
5333048579 Updated PMCs to use additional difficulty values 2024-07-09 13:38:37 +01:00
Dev
dd56749ae1 Generate player scav with lowest Hp bodyparts 2024-07-09 12:35:37 +01:00
Kaeno
18af98e86d Remove trailing spaces and fix isPlayerScav check to generate correct health pool 2024-07-09 10:25:24 +01:00
Dev
28b3afef8a Renamed function to improve readability insuranceDictionaryExists() 2024-07-09 10:19:08 +01:00
Dev
82330f17be Removed dupe PMC names 2024-07-09 09:56:37 +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
e662020f9a Removed debug bot logging 2024-07-08 21:13:53 +01:00
Dev
d956400315 Added missing bot equipment settings for skier/peacemaker 
(cherry picked from commit 1d407f8787)
 2024-07-08 21:12:40 +01:00
Dev
1d407f8787 Added missing bot equipment settings for skier/peacemaker 2024-07-08 21:12:23 +01:00
Dev
2941ae10e0 Implemented mongoid-js for hashUtil.generate() 2024-07-08 21:11:58 +01:00
Dev
a0a9b4cf29 Updated itemTpl enum 2024-07-08 19:08:57 +01:00
Dev
02fbc4f044 Added reputation saving to post raid code 2024-07-08 16:06:59 +01:00
Dev
872212f651 Removed unused endpoint + config 2024-07-08 15:15:48 +01:00
Dev
7a0f0e8297 Add missing bot types to presetBatch 
(cherry picked from commit f8f0f1fdb0)
 2024-07-08 14:48:41 +01:00
Dev
f8f0f1fdb0 Add missing bot types to presetBatch 2024-07-08 14:47:18 +01:00
Dev
007b1d4789 Fixed accepting a quest bringing in blacklisted event quests 
(cherry picked from commit fe614ad73f)
 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
ac4c8ff0b3 Implemented insurance returns 2024-07-07 20:57:41 +01:00
Dev
bda69a5563 Added getMoneyTpls() 2024-07-07 19:43:32 +01:00
Dev
6378ee5ee7 Fixed dynamic loot code choosing blacklisted items - credit to Drakia for solution 
(cherry picked from commit 7497f0d40f)
 2024-07-07 18:57:15 +01:00
Dev
7497f0d40f Fixed dynamic loot code choosing blacklisted items - credit to Drakia for solution 2024-07-07 18:55:36 +01:00
Kaeno
f6c0b877b7 Fix Valens gift 
(cherry picked from commit 831bc58b6a)
 2024-07-07 17:08:44 +01:00
Dev
ef5d72f06b Implemented coop and car extract handling 2024-07-07 17:06:45 +01:00
Kaeno
831bc58b6a Fix Valens gift 2024-07-07 16:53:39 +01:00
Dev
aa90d8fa52 Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-07 16:36:49 +01:00
Kaeno
c3de305175 Prevent Enabling Block group invites from bricking profile from loading. (!370) 
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/370
 2024-07-07 15:34:31 +00:00
Dev
57100544c9 Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 
# Conflicts:
#	project/assets/database/globals.json
 2024-07-07 14:13:35 +01:00
Dev
7377a68a9e Added missing type to iTemplateItem 2024-07-07 14:07:53 +01:00
Kaeno
fba0f4703a Setup route to allow switching of profile icon. (!369) 
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/369
 2024-07-07 13:07:36 +00:00
Dev
291edbb75b Added ability to choose to show as EoD when using unheard edition 2024-07-07 14:05:34 +01:00
Dev
c765cc688e Fixed maxinraid value inside globals JSON 2024-07-07 09:39:31 +01:00
Dev
87947bedd3 Regenerated loot 2024-07-06 21:37:59 +01:00
Dev
002209a992 Added Key to salvation to event blacklist 2024-07-06 19:39:42 +01:00
Dev
b760b35aaf Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-06 17:56:56 +01:00
Dev
b794ace544 Updated streets raid time based on feedback 2024-07-06 17:55:31 +01:00
Dev
0991572eff Further improvements to bot caching 2024-07-06 16:58:48 +01:00
Dev
4d167568fb Added bot cache count when generating. Will only add more bots to cache when below desired amount 2024-07-06 16:42:47 +01:00
Dev
47edbbcd98 Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-06 15:01:57 +01:00
Dev
2c57f2d1a7 Updated map times to 40 mins 2024-07-06 15:01:13 +01:00
Dev
665580a5c4 Adjusted woods/streets raid times 2024-07-06 14:45:19 +01:00
Dev
d0d3685da0 Add Hustle to event quest list 2024-07-06 14:38:52 +01:00
Dev
ca52f6d549 Created new LocationLifecycleServiceservice. Moved raid start/end code into it. 
Created temp `LegacyLocationLifecycleService` class to hold old raid start/end code until we can safely delete it
 2024-07-06 14:36:48 +01:00
Dev
1c3fb5f926 Move location generation code into matchcontroller 2024-07-06 14:04:51 +01:00
Dev
494fd66f51 Renamed LocationGenerator to LocationLootGenerator 2024-07-06 13:54:04 +01:00
Dev
d71bf2c2c0 Removed dead endpoints 2024-07-06 13:47:56 +01:00
Dev
1f76ce5d10 Refactored airdrop loot code 2024-07-06 13:39:56 +01:00
Dev
4cf1c10c51 Added IGetAirdropLootResponse 2024-07-06 12:59:47 +01:00
Dev
cdcc105f6a Added quests: 
Invisible hand
The Good Times - Part 1
Establish Contact
 2024-07-06 11:41:18 +01:00
Dev
0017a100b2 30985 2024-07-06 10:46:40 +01:00
Dev
27daac3145 Adjusted btr bot to have no visible gear 2024-07-06 10:17:12 +01:00
Dev
0ac8fbfe8e Regenerated pscav data on raid end 
Moved pmc code into own function
 2024-07-06 09:41:40 +01:00
Dev
61da90f33d Merge branch '310-dev' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-06 09:21:14 +01:00
Dev
cfb1cb3e39 Stubbed out handlePostRaidPlayerScav() 2024-07-06 09:21:00 +01:00
CWX
7d6721d47b update comment for airdrop enum, allow airdrop loot to work 2024-07-06 09:17:32 +01:00
Dev
6ff7408a9c Updated flea prices 2024-07-06 08:43:22 +01:00
Dev
ad1d481069 Remove unused interface 2024-07-05 22:39:24 +01:00
Dev
2febdb2c41 Update map loot JSONs 2024-07-05 21:47:01 +01:00
Dev
5e4fec3aa3 Stubbed out insurance code 2024-07-05 20:39:38 +01:00
Dev
8392bc97cf Moved call to clearStoredBots() to start raid function 2024-07-05 20:10:24 +01:00
CWX
264a8a06bd Merge branch '310-dev' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-05 19:21:25 +01:00
CWX
f7dce85e0b update endpoint for airdrop loot 2024-07-05 19:21:21 +01:00
Dev
66e5a78eee Updated ragmans clothing 2024-07-05 19:12:50 +01:00
Dev
31ba17a327 Added handling of BTR item delivery 2024-07-05 19:02:02 +01:00
Dev
21d8a5fe10 Set BTR to 100% spawn 2024-07-05 18:01:24 +01:00
Dev
ed152caa1e Merge branch 'master' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-05 17:48:58 +01:00
Kaeno
4b2f42a406 Add routes for Modules to get Bosses that are allowed to be converted (!368) 
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/368
 2024-07-05 16:46:51 +00:00
Dev
541264af73 Fixed bad description 
(cherry picked from commit 2f6f09c51a)
 2024-07-05 16:56:50 +01:00
Dev
daeae9687a Fixed getLocation() not getting location correctly 
(cherry picked from commit d7798d3afa)
 2024-07-05 16:55:47 +01:00
Dev
2f6f09c51a Fixed bad description 2024-07-05 16:39:40 +01:00
Dev
d7798d3afa Fixed getLocation() not getting location correctly 2024-07-05 16:37:17 +01:00
Dev
5b9d3fb075 left is now considered 'dead' on raid end 2024-07-05 16:03:16 +01:00
Dev
17486eba81 Updated JSON 2024-07-05 15:15:00 +01:00
Dev
ce0123efd3 Implemented new wishlist system 2024-07-05 15:06:43 +01:00
CWX
b4a5556d14 Fix health saving 2024-07-05 14:39:21 +01:00
CWX
83a35cbc8c implement localweather for pve mode 2024-07-05 14:21:30 +01:00
Dev
79612a6c85 Handle when player dies in raid - 
Send killer messages
Send killed messages
remove equipment\\
 2024-07-05 14:16:50 +01:00
Dev
a28ff5f660 Added missing file 2024-07-05 13:39:12 +01:00
Dev
7e64a4be66 Further improvements to post-raid event handling 2024-07-05 13:32:46 +01:00
Dev
85e86b969d Expanded request object + method info 2024-07-05 10:48:13 +01:00
Dev
daf748e8fb Added first attempt at client/match/local/start implementation 2024-07-05 09:39:41 +01:00
Dev
5f280612c4 Update interface to correct naming scheme 2024-07-05 09:39:01 +01:00
Dev
5cd919a7d7 Add location services json 2024-07-05 09:38:27 +01:00
Dev
d3357be9e6 Updated map jsons 2024-07-05 08:50:32 +01:00
Dev
97c7c536dc Updated woods+factory json 2024-07-05 00:27:12 +01:00
CWX
1e804ce11e expirementing with using existing PVE logic 2024-07-04 23:57:15 +01:00
CWX
5ba0de5b80 add routes for start and end of local raid 2024-07-04 22:40:39 +01:00
CWX
bc52883fdf Merge branch '310-dev' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-04 21:45:24 +01:00
CWX
136dc111f4 move dummy endpoint 2024-07-04 21:45:19 +01:00
Dev
48e443c341 Updated core json to reflect new game client 2024-07-04 21:43:29 +01:00
CWX
7982f85e63 add dummy endpoint 2024-07-04 21:33:00 +01:00
Dev
b84795b56e Update JSONs + included new properties 
Add endpoint stubs for:

client/match/local/start
client/match/local/end
 2024-07-04 21:01:37 +01:00
Dev
c3e9236759 Fixed repeatables breaking when using free refreshes 
Refactored `changeRepeatableQuest()` to reduce looping and indentation
 2024-07-03 21:41:31 +01:00
Dev
6ef6ae5020 Updated server locales 2024-07-03 10:32:24 +01:00
Tyfon
e58ddac0cc Fix InventoryHelper.canPlaceItemInContainer being backwards (!367) 
For whatever reason, `InventoryHelper.canPlaceItemInContainer()` currently returns:
`true` if the item CANNOT be placed in the container
`undefined` if the item CAN be placed
`false` if the function thought it could but then failed when trying to (never happens?)

This didn't cause problems because the only two places that call it also treat the return value backwards - both of which are also fixed in this PR.

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/367
Co-authored-by: Tyfon <tyfon7@outlook.com>
Co-committed-by: Tyfon <tyfon7@outlook.com>
 2024-07-02 22:05:32 +00:00
Dev
32fc93592a Updated PMC names 2024-07-02 15:15:49 +01:00
Dev
c8f08ff2bc Fixed edge case where rigs with no soft inserts or plates is listed on flea, resulting on a sell chance of NaN 2024-07-01 16:37:14 +01:00
Dev
014c67b0f2 Archived event quest removed by BSG 2024-07-01 10:42:52 +01:00
Dev
a63d2307df Fixed free refreshes still costing roubles/rep to replace 
Refactor of `useFreeRefreshIfAvailable()` to improve readability
 2024-07-01 10:42:16 +01:00
Dev
bd28cbca57 Feature, plates in armors listed by fence now have individual chances to be removed before listing based on plate protection level 2024-06-30 23:20:49 +01:00
Dev
843455602d FIxed plate removal code not actually removing plates 2024-06-30 23:02:17 +01:00
Dev
1ba6cbf2bd Cleaned up randomiseArmorModDurability() 2024-06-30 22:52:55 +01:00
Dev
8517e46ccb Refactored various functions to improve readability 2024-06-30 21:39:58 +01:00
Dev
15eb6eb69f Cleaned up various functions to improve readability 
Removed unused function `splitStackIntoSmallerChildStacks()`
 2024-06-30 20:38:23 +01:00
Dev
625bb1aebd Updated tournament gift data 2024-06-29 15:22:14 +01:00
Dev
f440355b48 Updated bot JSONs 2024-06-28 19:59:07 +01:00
Dev
f70af145df Added new quest icon images 2024-06-28 14:33:30 +01:00
Dev
3b9e29bad0 Add quests + add barter to Ref 
`Easy Money part 2`
`Balancing Part 1`
`Balancing Part 2`
`A Key to Salvation`
 2024-06-28 13:46:36 +01:00
chomp
da955f0a4e Added ability to convert assault scavs to bosses (!366) 
Co-authored-by: Kaeno <kaeno@noreply.dev.sp-tarkov.com>
Co-authored-by: Dev <dev@dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/366
 2024-06-27 14:09:26 +00:00
Dev
5f6cee3f8b Updated JSONs 2024-06-27 11:11:58 +01:00
Dev
836df0ce9d Updated findAndAddHideoutProductionIdToProfile() to also compare the quest id when finding the relevant craft - should fix craft unlock error with Network Provider - Part 2 2024-06-24 22:29:01 +01:00
Dev
5d40c36215 Update location loot data 2024-06-24 18:41:09 +01:00
Dev
2a750a9989 Fixed regression where sellchance because NaN due to a divide by 0 error 2024-06-22 20:40:13 +01:00
Dev
e65b75261f Added additional event names to NotificationEventType 2024-06-22 13:17:47 +01:00
Dev
d5dd8270ab Allowed Ref to give repeatable dailies 2024-06-21 20:47:02 +01:00
Dev
f141fd92ac Improved insurance-unable_to_find_trader_by_id locale 2024-06-21 19:39:38 +01:00
Dev
2edd1e6824 Semi-reverted last commit as Drak already resolved this and i forgot 2024-06-20 22:43:01 +01:00
Dev
77ca7c74fe Expanded http server port already in use message logging + throw exception to prevent second server running 2024-06-20 22:27:27 +01:00
Dev
b7082ff9dc Removed redundant logic as we've reset the data in previous line 2024-06-20 16:17:07 +01:00
Dev
785d6a3589 Fixed free repeatables not refreshing their count after expiry 2024-06-20 16:12:34 +01:00
Dev
bc31d47efa Fixed non-stackable items being stacked for gift PraporGiftDay2 2024-06-20 15:51:49 +01:00
Dev
7891db84de Updated createRandomLoot() to make use of rewardItemBlacklist black list 2024-06-20 13:37:38 +01:00
Dev
bf276c54a0 Improved comment 2024-06-19 20:52:08 +01:00
Dev
b17b0e119e Updated locales 2024-06-19 20:51:55 +01:00
Dev
01d3864105 Added additional skill type values 2024-06-19 18:55:17 +01:00
Dev
cf5411336f Adjusted how item quality % is calculated for player flea offers. Now excludes items without any quality modifier from calculation instead of assuming 100% (slightly lowers sell chance of things like armors) 
Renamed `getItemQualityModifierForOfferItems()` to `getItemQualityModifierForItems()`
 2024-06-19 14:27:58 +01:00
Dev
43a09c29c2 Improved import consistency + comment improvements 
Moved `IGenerateEquipmentProperties` into own file
 2024-06-19 11:11:28 +01:00
Dev
f7e42cae5d Improved comments inside BotEquipmentModGenerator class 2024-06-19 10:41:55 +01:00
Dev
416ef74902 Refactored mergeCamoraPool() 2024-06-19 10:40:59 +01:00
Dev
8a46d2c33d Reduced chance rusted key appears on PScavs to 3% 2024-06-18 21:42:49 +01:00
Dev
24fec34132 Updated quest + assort data 2024-06-18 21:34:19 +01:00
Dev
8db8eb4a4a Updated locales 2024-06-18 20:50:32 +01:00
Dev
57f0b8b49e Ensure SelectedMemberCategory matches MemberCategory when generating EoD or UhD PMCs 
(cherry picked from commit 44434b3278)
 2024-06-18 16:06:28 +01:00
Dev
d15150f138 Added nullguard to getMiniProfile() when profile has been edited and is now corrupt 2024-06-18 11:27:57 +01:00
Dev
5d0cfd7971 Fixed prapor starting gift being sent 5 times 2024-06-17 22:00:38 +01:00