Commit Graph

3084 Commits

Author SHA1 Message Date
Refringe
7c76342ee2
Merge remote-tracking branch 'origin/310-dev' 2024-07-23 11:03:32 -04:00
Dev
8e31cd9950 Added locations formatted to ignore 2024-07-23 14:32:56 +01:00
Dev
951655e846 Removed redundant rating check now it has been moved to ProfileFixerService 2024-07-23 13:16:54 +01:00
Dev
6d1bde60ca Adjusted EDITPROFILE gift to have 50 uses 2024-07-23 09:57:27 +01:00
Dev
3820b97531 Added null protected to playerLevelFulfillsQuestRequirement()
(cherry picked from commit c90b8670f2)
2024-07-23 09:07:26 +01:00
Dev
8c23a32755 Merge branch '310-dev'
# Conflicts:
#	project/.eslintrc.json
#	project/assets/configs/core.json
#	project/assets/configs/ragfair.json
#	project/assets/database/locations/bigmap/base.json
#	project/assets/database/locations/factory4_day/base.json
#	project/assets/database/locations/interchange/base.json
#	project/assets/database/locations/lighthouse/base.json
#	project/assets/database/locations/sandbox/base.json
#	project/assets/database/locations/sandbox_high/base.json
#	project/assets/database/locations/shoreline/base.json
#	project/assets/database/locations/tarkovstreets/base.json
#	project/assets/database/locations/woods/base.json
#	project/package.json
#	project/src/controllers/BotController.ts
#	project/src/controllers/GameController.ts
#	project/src/routers/static/InraidStaticRouter.ts
2024-07-22 23:14:47 +01:00
Dev
8895e2e82f Added DB to biome ignore list 2024-07-22 22:42:09 +01:00
Refringe
ed8dbbd195 Adds Biome - Removes ESLint & Prettier (!383)
Boogidy, boogidy, boogidy. Let's go racing! 🏎️

Removes the over-complicated and super-slow setup we had with ESLint & Prettier in favour of Biome. The largest change with the formatting is moving from Allman braces to 1TBS braces. Other than that, it's *pretty much* the same. Ah, and that Biome runs formatting and linting on the entire project about x10 faster than the old system ran formatting on one file. Seriously, the guy who came up with that last solution should be fired. :runs:

I've kept all of the formatting and linting commands the same as before, with the main mamma-jamma being: `npm run format`, which applies formatting and linting changes to the entire project.

Formatting-on-save works (quickly!) by (1) ensuring that you're working within the VSC workspace (as you should be), and (2) have the recommended Biome VSC extension installed. The link to the Biome extension is in the README.

This limits our options on code formatting going forward; Biome, like prettier, is very opinionated with very few formatting options available. But I see this as a good thing. I'd rather spend my time arguing about which gun in Tarkov is the best, rather than coding brace styles...

...It's the TOZ, and it always will be. Don't DM me.

Co-authored-by: chomp <chomp@noreply.dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/383
Co-authored-by: Refringe <me@refringe.com>
Co-committed-by: Refringe <me@refringe.com>
2024-07-22 21:15:57 +00:00
Dev
4c1de3682c Blacklisted Mark of The Unheard from reward items pool
(cherry picked from commit 5771f1f567)
2024-07-22 15:09:35 +01:00
Dev
5771f1f567 Blacklisted Mark of The Unheard from reward items pool 2024-07-22 15:08:21 +01:00
Dev
817d339104 Updated PMC names
(cherry picked from commit 416780d9f9)
2024-07-22 13:34:04 +01:00
Dev
416780d9f9 Updated PMC names 2024-07-22 13:33:51 +01:00
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
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
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 201df756a9)
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 8e17673d0d)
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 9af480f625)
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 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
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
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
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 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
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 014826e683)
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 ec76a8897f)
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% 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