3117 Commits

Author SHA1 Message Date
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 201df756a9d247779991d5ba5379b502ca60b346)
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
5569bb6124 Merge branch '310-dev' of https://dev.sp-tarkov.com/SPT/Server into 310-dev 2024-07-21 20:41:49 +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 8e17673d0db7ab10867df57a28b1cc58f8b7987b)
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 9af480f6253fb25dd96fa73b2b88c717313ffbee)
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 cd803c8e8b1796437c07084344afc9008af9b1aa)
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 f555c24709bd4ed9b294c1e008ce3229be4190e1)
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 130b12879e4bbc4e9b11b4d6d38bafda7a21df5a)
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 7e06517c8c7c4350ba0c7c79cebf7d67ba1de94e)
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 335806bfd8e9c4d84818a978f7fcd9b5f6f41750)
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 dcb98f7d1b21ccde76d0a6c26514a718290b19b6)
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 014826e683d585894b8a628645a59caf0ae36d11)
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 ec76a8897fda32ab938bd758025bafdad1e956da)
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% 3.9.3 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 3.9.3-BEM-20240719 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 59ffc9d8860ced97377718d37569b7f90b75e93c)
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 78f6fad21be14579901d0a5a787d723bb474801c)
2024-07-18 09:25:23 +01:00
Dev
665778eaf1 Safely exit returnPlayerOffer() when no profile is found
(cherry picked from commit af6d138f3cfcfca742f8b38e5f66780c4c0970f2)
2024-07-18 09:25:13 +01:00
Dev
3f7f357bff Improved getTotalStackCountSize
(cherry picked from commit bd5e7b1e62e86b426392d6be4c209c8b9e45095f)
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 f406918bb8bf418ad32daabb947e1004282c1f0b)
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 13abd077dda1d817afa672052cbde60766a0307c)
3.9.2
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 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
59ffc9d886 Added comments to functions 2024-07-16 16:54:39 +01:00