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

2893 Commits

Author SHA1 Message Date
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
4c9e5c258f Removed unnecessary scope 
(cherry picked from commit 201df756a9)
 2024-07-21 22:59:01 +01:00
Dev
2be14850a9 Fixed bad injection caps 
(cherry picked from commit 8e17673d0d)
 2024-07-21 20:40:04 +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
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
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
Dev
776a41499f Added nullguard to showQuestItemHandoverMatchError() 
(cherry picked from commit 014826e683)
 2024-07-21 00:14:51 +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
d0d10ac15c Updated package json version 2024-07-19 17:26:36 +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
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
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
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
59ffc9d886 Added comments to functions 2024-07-16 16:54:39 +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
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
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
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
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
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
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
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
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
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
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
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
5c716afb34 Updated sandbox raid times to match live 
(cherry picked from commit 49006b6065)
 2024-07-12 10:34:41 +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
5260b16a18 Added ability to blacklist profile from being created in launcher 2024-07-11 09:58:54 +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
4f636d3061 Set Skier event boss to 4% on customs 2024-07-10 15:31:26 +01:00
Dev
ef24256e0d Added reward data for Unlocked valuables сrate common/rare/epic 2024-07-10 14:22:15 +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
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
0ab1395355 Increased stash row command limit to 15 2024-07-10 10:32:01 +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
7a0f0e8297 Add missing bot types to presetBatch 
(cherry picked from commit f8f0f1fdb0)
 2024-07-08 14:48:41 +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
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
Kaeno
f6c0b877b7 Fix Valens gift 
(cherry picked from commit 831bc58b6a)
 2024-07-07 17:08:44 +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
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
b794ace544 Updated streets raid time based on feedback 2024-07-06 17:55:31 +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
6ff7408a9c Updated flea prices 2024-07-06 08:43:22 +01:00
Dev
2febdb2c41 Update map loot JSONs 2024-07-05 21:47:01 +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
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