Commit Graph

3176 Commits

Author SHA1 Message Date
Dev
1066a138ac Added function getBonusValueFromProfile to profileHelper
(cherry picked from commit d97e717f76)
2024-08-08 18:31:04 +01:00
Cj
967dc15564 ProfileFixerService Refactor (!391)
Refactor to remove legacy code that bloats the `ProfileFixerService` class. Most of which is old profile porting code, some being old profile fixes. Organizes code in the class so that public members are at the top (as they should be). Finally break out some code into their own methods so they're not in the primary method for the class `checkForAndFixPmcProfileIssues`.

I have tested this with a developer profile, an EOD profile and a Standard profile. I've encountered no issues in my own testing.

Co-authored-by: Cj <161484149+CJ-SPT@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/391
Co-authored-by: Cj <cj@noreply.dev.sp-tarkov.com>
Co-committed-by: Cj <cj@noreply.dev.sp-tarkov.com>
2024-08-08 17:09:52 +00:00
Dev
2fbcee22bd Fixed container errors due to biome 2024-08-07 22:09:46 +01:00
Dev
23af7e1d9b Updated trader assorts 2024-08-04 16:33:36 +01:00
Dev
bd7e6fecb5 Updated PMC names
(cherry picked from commit e4ba92b4a6)
2024-08-04 09:39:32 +01:00
Dev
fc8769ba30 Basic implementation of pocket tpl quest reward handling 2024-08-03 23:10:54 +01:00
Dev
19d2527e37 Added quests:
Thirsty - Hounds
Circulate
Thirsty - Hounds
Friend among strangers
What's your evidence?
Immunity
Special Offer
Quality Standard
Airmail
The Good Times - Part 2
Minute of Fame
Viewer
Serious Allegations
Camera Action
Proper Comeback
2024-08-03 22:51:43 +01:00
Dev
aa03e5e805 Added quests:
Thirsty - Hounds
Circulate
Thirsty - Hounds
Friend among strangers
What's your evidence?
Immunity
Special Offer
Quality Standard
Airmail
The Good Times - Part 2
Minute of Fame
Viewer
Serious Allegations
Camera Action
Proper Comeback
2024-08-03 22:51:29 +01:00
Dev
6d5f58c9db Added 2 additional flags to compiler options 2024-08-03 22:24:32 +01:00
Dev
e15bf4245b Added quest Test Drive - Part 4
Updated `Counteraction` dogtag requirement

(cherry picked from commit f0b302a119)
2024-08-03 22:24:02 +01:00
Dev
18158bb4dc Fixed FiR status persisting after death for items inside secure container 2024-08-02 15:54:39 +01:00
Dev
f94985f3f2 Updated seasonDates to fix gaps in coverage - extended summer 2 months 2024-08-02 09:55:02 +01:00
Dev
532491bc91 Updated packages 2024-08-01 09:17:24 +01:00
Dev
8b293b29d8 Added fuel to dev profile inventory 2024-08-01 09:01:00 +01:00
Dev
6c4b53f95e Fixed broken tests 2024-08-01 08:45:37 +01:00
静穏靄
45b29731dc Bump server version (!392)
Got confused when I generated types, this fixes NPM reporting 3.9.0.
Before and after:

![image](/attachments/056fdd66-c98f-4be3-bcb2-c3b4cfc5bd01)

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/392
Co-authored-by: 静穏靄 <seionmoya@noreply.dev.sp-tarkov.com>
Co-committed-by: 静穏靄 <seionmoya@noreply.dev.sp-tarkov.com>
2024-08-01 07:12:28 +00:00
Dev
5473f73e2a Reduced mp7/mp9 spawn chances on PMCs + reduced all AK chances 2024-07-31 20:30:02 +01:00
witek
59308604fa Fix logs paths (!390)
When compiled natively to linux, logfiles are saved in main SPT folder instead of default location. It's caused by file paths being hardcoded as text.
This patch fixes logs location on linux build.

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/390
Co-authored-by: witek <falls-toluene.0q@icloud.com>
Co-committed-by: witek <falls-toluene.0q@icloud.com>
(cherry picked from commit 3edf0f2ff9)
2024-07-31 20:14:20 +01:00
MadByte
a52c81e270 Changed mod path for loading bundles from the server to be relative (!389)
**Before merging: Please test on a real Windows installation if possible!**

I tested this on Linux as well as inside a Windows VM hosted on Linux, but wasn't able to test it on a real Windows installation.

This commit fixes an issue with loading bundles from a native Linux server:

When compiling the server natively for Linux & installing some mods, everything works except for mods trying to load bundles from the server. Reason is a malformed path to the bundle:

```ts
2024-07-30 23:48:16.968 +02:00|0.14.9.1.30626|Error|Default|
EXCEPTION: System.IO.DirectoryNotFoundException: Could not find a part of the path "C:\home\USER\Games\escape-from-tarkov\drive_c\SPTarkov\user\mods\Bloody-Bullet-Wounds\bundles\assets\systems\effects\particlesystems\effects.bundle".
```

`process.cwd()` returns the linux-agnostic path of course, but for some reason it also returns `C:`.
Changing the line to `modpath.slice(0, -1).replace(/\\/g, "/");` seems to work and the bundles seem to get loaded without issues (did a quick test raid), even without passing the absolute path to the  mod.

I tried to check why that is, and I think node is able to [get the cwd and resolve the relative path](4d1d88118b/src/path.cc (L101)) by itself..

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/389
Co-authored-by: MadByte <madbyte@noreply.dev.sp-tarkov.com>
Co-committed-by: MadByte <madbyte@noreply.dev.sp-tarkov.com>
(cherry picked from commit 6f010acfca)
2024-07-31 20:14:12 +01:00
Dev
a3935d13a6 Lowered PMC spawn chance of following weapons:
ADAR, MP7,MP9, P226

(cherry picked from commit 52a0373deb)
2024-07-31 20:13:56 +01:00
Dev
a1fe93cab6 Updated PMC max level to match player max 2024-07-30 15:25:08 +01:00
Dev
8f67f75930 Improved how generateMultipleBotsAndCache() and returnSingleBotFromCache() handles missing raid settings from AppContext 2024-07-30 12:09:28 +01:00
Dev
5697bd8783 updated globals json 2024-07-30 11:39:03 +01:00
DrakiaXYZ
e295cda571 Fix issue in BotLevelGenerator when high level (!388)
Previously `highestValue` could be lower than `lowestValue`, resulting in an exception. These values are now generated in the same method and clamped

Add a catch to the botgen promise await so we get more useful errors if botgen fails

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/388
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
(cherry picked from commit ee1eb7d690)
2024-07-30 08:29:04 +01:00
RomanxTheLast
f12c650774 Add async to the handleRequest chain in HttpServer (!387)
The httpListeners are promise based but they aren't awaited when handling the request.

I found this while implementing another version of HttpServer in a mod but couldn't actually find where this would cause an issue so feel free to close this if you think it's not worth it.

Reviewed-on: https://dev.sp-tarkov.com/SPT/Server/pulls/387
Co-authored-by: RomanxTheLast <alex@romanx.co.uk>
Co-committed-by: RomanxTheLast <alex@romanx.co.uk>
(cherry picked from commit 398bf43444)
2024-07-28 14:45:25 +01:00
Dev
c114d4285f Removed redundant function 2024-07-28 13:19:52 +01:00
Dev
852157aabf Fixed an issue where revolvers/rpd/ppsh would not properly filter out cartridges during ammo selection 2024-07-28 13:19:34 +01:00
Dev
2f412641b2 Further improvements to weapon mod generation 2024-07-28 11:42:45 +01:00
Dev
af33625a5c Improved pickWeaponModTplForSlotFromPool(), now pre-sorts mod pool prior to adding it to exhaustableModPool and processing 2024-07-28 00:12:04 +01:00
Dev
0c42a38306 Add null protection to playerHasRecievedMaxNumberOfGift() 2024-07-25 23:18:28 +01:00
Dev
0cb179f8e1 Make use of SideType.SAVAGE enum 2024-07-25 19:12:26 +01:00
Dev
42451c69a4 Adjusted ragfair pack chance and max size values 2024-07-25 13:47:31 +01:00
Dev
4a1a5d924c Added item reward pools for Unlocked supply create (x)
Added item reward pools for `Unlocked equipment create (x)`
Added support for weapon/armor presets inside `getRandomLootContainerLoot()`
Expanded pool for `Unlocked valuables crate (x)",` by 8 items
2024-07-25 12:17:40 +01:00
Dev
797d75fd4f Added a weighting bias to the level chosen for bots, favors the higher value 2024-07-25 10:34:54 +01:00
Dev
adcd0194bf Improved bot generation comments
(cherry picked from commit e7f56edf0c)
2024-07-25 09:38:59 +01:00
Dev
d522e7d5a8 Further changes to locale text
(cherry picked from commit 6cde96a710)
2024-07-24 17:39:44 +01:00
Dev
6569aca2c3 Fixed incorrect english locale text
(cherry picked from commit eb3ba0ef80)
2024-07-24 17:38:07 +01:00
Refringe
a5fa7eb849
Updates README Branch Information 2024-07-24 11:50:07 -04:00
Refringe
170fa7ed51
Removes Drone CI Workflow 2024-07-24 11:35:47 -04:00
Dev
de53abf002 Rounded flea offers requirementsCost to nearest int 2024-07-24 09:26:08 +01:00
Dev
7be6b47e23 Fixed various Biome issues 2024-07-23 17:30:20 +01:00
Refringe
5740774a46
Apply Biome Formatting
This is the result of running `npm run format` which applies the Biome formatting rules. Rejoice!
2024-07-23 11:12:53 -04:00
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