1740 Commits

Author SHA1 Message Date
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
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
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
Dev
776a41499f Added nullguard to showQuestItemHandoverMatchError()
(cherry picked from commit 014826e683d585894b8a628645a59caf0ae36d11)
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
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 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
f406918bb8 Improved fillMagazineWithRandomCartridge() logging 2024-07-17 11:48:57 +01:00
Dev
63420f7a7b Removed debug data
(cherry picked from commit 13abd077dda1d817afa672052cbde60766a0307c)
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 fd34e7bc8412b0ce0503691b984256b57a14383e)
2024-07-16 21:09:08 +01:00
Dev
59ffc9d886 Added comments to functions 2024-07-16 16:54:39 +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
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
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 77b42bfb2f0540c0fcb4c60fb84cdbcacd0965ad)
2024-07-13 10:59:03 +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 034c7142fc8de1fe34694eb5925bfb9c43e3ecad)
2024-07-13 09:33:27 +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
Dev
442d00c959 Fixed minor typo 2024-07-12 17:20:54 +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 64f8e7b7e88aea84f4864f078775200178a84a88)
2024-07-11 12:11:45 +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
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 e9d8c02ac2d15ae80ab8b22d5db5ac22597b05e7)
2024-07-10 11:40:12 +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
6378ee5ee7 Fixed dynamic loot code choosing blacklisted items - credit to Drakia for solution
(cherry picked from commit 7497f0d40f22af87766640b9da98287a9fe7b852)
2024-07-07 18:57:15 +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
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 2f6f09c51a36beacbe9a3ede4fb21a4ac3e01b80)
2024-07-05 16:56:50 +01:00
Dev
daeae9687a Fixed getLocation() not getting location correctly
(cherry picked from commit d7798d3afa8028fffb13eb3970062f5ffae9fc6d)
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
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
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
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