Commit Graph

715 Commits

Author SHA1 Message Date
Dev
2f919c795c Fix issue with scav case rewards failing + made function reward level handling more robust 2023-05-22 12:25:19 +01:00
Dev
682e87e446 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into 23122 2023-05-20 18:38:05 +01:00
Dev
17afc9e460 Add endpoint stubs and improve request/response objects 2023-05-20 18:37:39 +01:00
chomp
65bcee7500 Update to EFT.23122 and increment version to 3.5.7 (!95)
Co-authored-by: Dev <dev@noreply.dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/95
2023-05-19 16:47:24 +00:00
Dev
08f2bdb27e Refactor ScavCaseRewardGenerator.getScavCaseRewardCountsAndPrices() 2023-05-19 17:40:06 +01:00
Dev
dcd1da28a6 Refactor InsuranceController.processReturn() 2023-05-19 17:39:26 +01:00
Dev
52f9dbefa9 Add new properties to location data 2023-05-19 17:38:38 +01:00
Dev
f3b28d532c Refactor convertBotDifficultyDropdownToBotDifficulty() ot use switch statement 2023-05-18 17:23:28 +01:00
Dev
90d8b52a41 23122 2023-05-18 15:51:22 +01:00
Dev
65ba6c1080 Update JSONs to match live
Inertia lowered
Hideout craft changes
Handbook price changes
Recoil adjustments
heat adjustments
Updated flea prices
2023-05-16 18:40:54 +01:00
Dev
4d27efd9d1 Additional fix when purchasing clothing 2023-05-15 19:18:42 +01:00
Dev
ce63d5418b Fix error on purchasing clothing from ragman 2023-05-15 18:37:09 +01:00
Dev
9f3954cbb2 23043 2023-05-15 17:22:54 +01:00
DrakiaXYZ
b3aabf0539 Add 'Green Corridor' and 'Special Equipment' (!94)
Re-generate quests.json using a dump containing a hand written 'Green Corridor' and 'Special Equipment' quest, and my latest changes to the quest generator

There are a few cases where an 'index' was updated, this is due to my prior changes now depending on the last index in the list, and my previous changes removing some requirements. The 'index' changes should be minimal after this commit though

Custom modified quest dump:
1f7ebc2ced/0000000000resp.client.quest.list_2023-02-26_14-26-26_newquests.json

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/94
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2023-05-12 09:39:57 +00:00
DrakiaXYZ
b1cf5df2eb Update quests to closer match the Tarkov Wiki (!93)
This is a quests.json generated using my latest changes to the Quest Generator, along with some hand changed reward values (Since those are pulled from the dump). Sorry about Gitea's web interface freaking out around the Collector part of the diff.

The following are the changes applied via the Quest Generator + manual modification:
- 'Sanitary Standards - Part 2' now also requires 'Operation Aquarius - Part 2'
- 'Stirrup' now requires 'Supplier' instead of 'The Extortionist'
- 'Loyalty Buyout' now only depends on failing 'Chemical - Part 4'
- 'The Cult Part 1' now requires 'Friend from the West - Part 2' instead of 'Eagle Eye'
- 'Gunsmith Part 8' no longer requires 'Gunsmith Part 6'
- 'Gunsmith Part 8' and 'Gunsmith Part 6' names reversed
- 'The Blood of War - Part 1' now also requires 'Make ULTRA Great Again'
- 'Database - Part 1' now also requires 'Big Sale'
- 'Lend-Lease - Part 1' now requires 'Humanitarian Supplies' instead of 'Friend from the West - Part 2'
- 'Tarkov Shooter - Part 1' now requires 'Acquaintance' instead of 'Survivalist Path - Unprotected'
- 'Decontamination Service' now also requires 'Health Care Privacy - Part 5'
- 'Huntsman Path - Woods Cleaning' renamed to 'Hunstman Path - Forest Cleaning'
- 'Nostalgia' now also requires 'Spa Tour - Part 3'
- 'Survivalist Path - Junkie' now requires 'Survivalist Path - Combat Medic' instead of 'Survivalist Path - Cold Blooded'
- 'Samples' now also requires 'Friend From the West - Part 2', and has no level requirement
- 'Chemistry Closet' now also requires 'Anesthesia'
- 'Hunter' now also depends on 'Hunstman Path - Secured Perimeter', and has no level requirement
- Fixed names of 'Revision' tasks
- 'Revision - Reserve' now depends on 'Humanitarian Supplues' and 'Friend from the West - Part 2' instead of 'Eagle Eye'
- 'Documents' no longer requires 'Ice cream cones', and has no level requirement
- 'No place for renegades' no longer requires 'Ice cream cones'
- 'Back Door' now requires 'Scout' instead of 'Surplus Goods'
- 'Pest Control' now requires 'Reserve'
- 'Trophies' now requires 'The Guide' instead of 'Hunstman Path - Forest Cleaning' and level 55
- 'Energy Crisis' no longer requires 'Postman Pat Part 2' and now requires level 25
- 'Revision - Lighthouse' no longer requires 'Eagle Eye'
- 'Cease Fire!' now requires 'The Delicious Sausage'
- 'Huntsman Path - Eraser - Part 2' no longer requires 'Huntsman path Secured perimeter'
- 'Information Source' now requires 'Getting Acquainted' instead of 'Knock Knock'
- 'Getting Acquainted' now requires 'Knock Knock'
- 'The Stylish One' now requires accepting 'The Huntsman Path - Sellout'
- 'Season Vacation' no longer requires 'Pharmacist', and now requires level 17
- 'Collector' quest is implemented with the requirements listed on the wiki

- 'Silent Caliber' now requires level 30
- 'Regulated Material' now requires level 25
- 'Anesthesia' now requires level 21
- 'Colleagues Part 1' now requires level 21
- 'Rigged Game' no longer has a level requirement
- 'Bunker Part 1' now requires level 10
- 'Bunker Part 2' now requires level 11
- 'Safe Corridor' now requires level 15
- 'Escort' now requires level 60
- 'Capturing Outposts' now requires level 42
- 'Intimidator' now requires level 45
- 'Crisis' now requires level 48
- 'The Cleaner' now requires level 45
- 'Calibration' now requires level 47
- 'The Courier' now requires level 52
- 'Long Line' now requires level 45
- 'The Choice' now requires level 50
- 'Corporate Secrets' now requires level 17
- 'Long Road' now requires level 20
- Remove level requirement from 'Textile Part 2' and 'Textile Part 1', as it's implicitly level locked via loyalty requirement from 'Textile Part 1' (As per dump)

- 'No offence' no longer has a fail reward
- Update 'Huntsman Path - Trophy' XP 7100 -> 15300
- Update 'Huntsman Path - Sell-out' XP 7200 -> 18000
- Update 'Huntsman Path - Woods Keeper' XP 7300 -> 18000
- Update 'Huntsman Path - Justice' XP 7200 -> 12300
- Update 'Huntsman Path - Eraser Part 1' XP 8900 -> 18300
- Update 'Textile Part 1 - Bear' XP 0 -> 32000
- Update 'Textile Part 2 - Bear' XP 0 -> 34800
- Update 'Pest Control' XP 7400 -> 15300
- Update 'The Courier' XP 115000 -> 137000
- Update 'Stray Dogs' XP 12000 -> 30500
- Update 'Road Closed' Roubles 64000 -> 62300

Co-authored-by: DrakiaXYZ <565558+TheDgtl@users.noreply.github.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/93
Co-authored-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
Co-committed-by: DrakiaXYZ <drakiaxyz@noreply.dev.sp-tarkov.com>
2023-05-11 13:13:03 +00:00
Dev
c969a3cb87 Allow labs access cards to be listed on flea to match live 2023-05-10 13:06:04 +01:00
Dev
5c1fd7519c Made taiga knife much rarer on cultists 2023-05-10 12:43:05 +01:00
Dev
f08ac4d2ac Fixed bug that casued bot skills to lack an Id, this could be the cause of Cultists having footsteps 2023-05-08 11:14:32 +01:00
Dev
2073efcfce Update Fr translations 2023-05-04 12:18:32 +01:00
Dev
407c319641 Merge branch 'master' of https://dev.sp-tarkov.com/SPT-AKI/Server into Fix 2023-05-03 12:53:38 +01:00
Dev
de5f64e5ba Update flea prices 2023-05-03 12:52:57 +01:00
Morphine
57bb8e9cd6 Update 'project/assets/database/locales/server/fr.json' (!91)
Correction of mistakes/typos/missing words/weird formulation without adding any new lines.
New lines probably added and translated to copycat the Eng version in next commit (PMC chat dialogues will be funny to do ^^)

Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/91
Co-authored-by: Morphine <morphine@noreply.dev.sp-tarkov.com>
Co-committed-by: Morphine <morphine@noreply.dev.sp-tarkov.com>
2023-05-02 17:57:47 +00:00
Dev
f340e55924 Skip adding items to mod pool if item has no _props property instead of just showing error 2023-05-01 15:27:33 +01:00
Dev
8b192d26bb Quest changes:
Surplus Goods requires completion of Back Door
TerraGroup Employee requires completion of Colleagues P3 OR Sadist
2023-05-01 10:29:05 +01:00
Dev
eb6905967f Refactor of hideouthelper 2023-04-26 22:29:08 +01:00
Dev
685859d57f Refactor addOrIncrementCategory() 2023-04-24 14:19:42 +01:00
Dev
8076ed9b29 Refactor storeLostGear() 2023-04-24 14:03:41 +01:00
Dev
463e33d1b7 Refactor getNumberOfItemsNeededToFillGap 2023-04-24 13:34:40 +01:00
Dev
b563dd3f78 Refactor addPaymentToOutput() 2023-04-24 13:23:50 +01:00
Dev
cbf06fcece Refactor removeSecureContainer() 2023-04-24 12:47:29 +01:00
Dev
08be8654e4 Refactor isNicknameTaken() 2023-04-24 12:47:19 +01:00
Dev
2c3e61b413 Refactor endOfflineRaid() 2023-04-24 11:57:19 +01:00
Dev
1f5359bde4 Fix typo 2023-04-23 23:47:16 +01:00
Dev
60a11b28f2 Refactor updateWaterFilters() 2023-04-23 21:23:44 +01:00
Dev
833f17ecdb Refactor updateProductionProgress() 2023-04-23 19:47:39 +01:00
Dev
b1605b20fe Centralise time elapsed code in hideouthelper into one function 2023-04-23 19:40:42 +01:00
Dev
f52c42e8b7 Fixed bug when enabling generator for long-running generator-off crafts gaining a burst of progress as if generator was on the whole time
Refactor updateProductionProgress() to get seconds between `sptUpdateLastRunTimestamp` and now instead of crafts `StartTimestamp` and now

Store hideout craft progress as decimal for better accuracy when crafting without generator

Added code to EventOutputHolder to ensure we continue to return progress as an int
2023-04-23 19:24:00 +01:00
Dev
d411f5ce1d Refactor updateWaterFilters() 2023-04-23 14:02:46 +01:00
Dev
9fff59f464 FIx typo, no more pies 2023-04-23 13:44:15 +01:00
Dev
9f8bfae75d Refactor of buyClothing() 2023-04-23 12:17:18 +01:00
Dev
d284ca47d4 Refactor wearClothing() 2023-04-23 11:38:57 +01:00
Dev
31eb470a08 Make LocalisationService get keys directly from database server 2023-04-23 11:26:11 +01:00
Dev
c20a9d6e36 FIx getFleaPriceForItem() not logging when price was not found 2023-04-23 11:25:42 +01:00
Dev
9ddfeb629e Fix incorrect reference to Set data structure 2023-04-23 11:13:53 +01:00
Aria Adair
eb9af28c1b Make it possible to dynamically add bundles. (!87)
I'm experimenting around with this to allow for loading bundles from ZIP files to help with texture pack distribution, wanted to get it out in front of folks for review.

Co-authored-by: Ari <a@silversupre.me>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/87
Co-authored-by: Aria Adair <gaylatea@noreply.dev.sp-tarkov.com>
Co-committed-by: Aria Adair <gaylatea@noreply.dev.sp-tarkov.com>
2023-04-23 09:50:52 +00:00
chomp
7974e4531b Refactor functions (!90)
(cherry picked from commit f6fc6e41c0)

Co-authored-by: Dev <dev@noreply.dev.sp-tarkov.com>
Reviewed-on: https://dev.sp-tarkov.com/SPT-AKI/Server/pulls/90
2023-04-22 22:41:04 +00:00
Dev
2bc582d65c Refactor handbookhelper to use a set instead of record for handbook price values 2023-04-22 19:33:47 +01:00
Dev
95fbd07473 Refactor addSpawnedInSessionPropertyToitems() 2023-04-22 18:36:34 +01:00
Dev
8c3924baab Refactor calculateFenceStandingChangeFromKills() 2023-04-22 16:41:00 +01:00
Dev
c45c9185a6 Refactor inRaidHelper.removeSpawnedInSessionProeprtyFromitems() 2023-04-22 16:30:57 +01:00