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

2996 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dev
b5416ceba7 Added missing localization message 
(cherry picked from commit 18e0deb109)
 2024-07-22 13:26:15 +01:00
Dev
4a4d65ee4c Added guard against missing trader insuranceStart mesages inside sendInsuredItems() 
(cherry picked from commit 0d9bd9a6d3)
 2024-07-22 13:26:09 +01:00
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
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
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 9af480f625)
 2024-07-21 16:24:55 +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 130b12879e)
 2024-07-21 15:19:54 +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
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
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 ec76a8897f)
 2024-07-20 23:41:39 +01:00
Dev
335806bfd8 Localised error message 2024-07-20 13:44:48 +01:00
Dev
804e973124 Added quest Import Control 2024-07-19 16:10:37 +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 59ffc9d886)
 2024-07-18 15:54:11 +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 f406918bb8)
 2024-07-17 12:44:24 +01:00
Dev
13abd077dd Removed debug data 2024-07-16 21:31:23 +01:00
Dev
fd34e7bc84 Fixed items with a stack count > 1 not selling as expected 2024-07-16 21:08:43 +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 433ea6566a)
 2024-07-16 11:59:01 +01:00
Dev
b72e6da22e increased GP coin rewards for daily/weeklies 
(cherry picked from commit fe5099883a)
 2024-07-16 11:58:48 +01:00
Dev
9b216c2a00 Added quest icon for Gendarmerie District Patrol 2024-07-16 11:27:15 +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
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
Dev
77da49bb9e Added common weapon crate 
(cherry picked from commit 9e1c3304f0)
 2024-07-15 11:31:28 +01:00
Dev
815e6e238c Expanded weapon crate fix to include common/rare creates 
(cherry picked from commit 111b75d1ab)
 2024-07-15 11:31:20 +01:00
Dev
1762f1637d Added exit when flea offer type is not found 
(cherry picked from commit c2ccadf110)
 2024-07-14 19:49:41 +01:00
Dev
0629958b92 Added getOfferType() to ragfairController 
(cherry picked from commit e67f000602)
 2024-07-14 19:49:34 +01:00
Dev
35daf8710f Added null protected around RagfairInfo on profile login 2024-07-14 17:21:12 +01:00
Kaeno
b101cd8eed 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
(cherry picked from commit 83b4ecc176)
 2024-07-14 09:06:58 +01:00
Dev
1fd66bafe8 Adjusted GP Coin values inside currencyStackSize 2024-07-13 14:23:12 +01:00
Dev
073797a294 Fixed issue with itemFitsInto1By2Slot() classifying all items as unsuitable for a 1x2 slot 
(cherry picked from commit d92ec20e9c)
 2024-07-13 12:57:40 +01:00
Dev
77b42bfb2f Fixed getBTC() failing when Production area cannot be found 2024-07-13 10:58:46 +01:00
Dev
92eb0478bd Removed dupe keys from bot JSONs 
(cherry picked from commit 28fb1a2fc9)
 2024-07-13 10:00:41 +01:00
Dev
6823858020 Blacklisted Decrypted flash drive from PMC loot pools 
(cherry picked from commit 93bd7543e7)
 2024-07-13 10:00:12 +01:00
Dev
11837c05a2 Changes from master 2024-07-13 09:59:11 +01:00
Dev
11278b8930 Updated server locales with data from Crowdin 
(cherry picked from commit fb52594f8b)
 2024-07-13 09:57:47 +01:00
Dev
034c7142fc Added workaround for Ref repeatables not having any description text - force him to use Prapor text instead 2024-07-13 09:33:04 +01:00
Dev
61313dce25 Remove deprecated registerCommandoCommand() 
(cherry picked from commit c705127007)
 2024-07-12 22:21:15 +01:00
Dev
bf507a766c Removed deprecated ICommandoCommand 
(cherry picked from commit 28593d3e9b)
 2024-07-12 22:21:01 +01:00