1990 Commits

Author SHA1 Message Date
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
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
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)
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
Kaeno
fcdf537c3b Update JSONs 2024-07-16 15:49:49 +01:00
Dev
bf8a403372 Removed redundant check on unlocking hideout crafts
(cherry picked from commit 433ea6566ac562bc5cca16b5082fa6d76a0ee86b)
2024-07-16 11:59:01 +01:00
Dev
433ea6566a Removed redundant check on unlocking hideout crafts 2024-07-16 11:32:46 +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
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
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 9e1c3304f0e5c0a83ddb4b3b0cd56d7d1c7419dd)
2024-07-15 11:31:28 +01:00
Dev
815e6e238c Expanded weapon crate fix to include common/rare creates
(cherry picked from commit 111b75d1ababe90614a099eb41d25c6f9c5cab3c)
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 c2ccadf110829904bcd555c8ec22fb6b438b46cf)
2024-07-14 19:49:41 +01:00
Dev
0629958b92 Added getOfferType() to ragfairController
(cherry picked from commit e67f000602dd00cbe22a25c036b647b9daf0d8d6)
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
Dev
073797a294 Fixed issue with itemFitsInto1By2Slot() classifying all items as unsuitable for a 1x2 slot
(cherry picked from commit d92ec20e9ca1ee1a98160b85682547f729d7c428)
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 77b42bfb2f0540c0fcb4c60fb84cdbcacd0965ad)
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
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