Commit Graph

2967 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