Update to closer match the Tarkov Wiki + Tooling improvements #1

Merged
chomp merged 5 commits from DrakiaXYZ/ChompQuestVerifier:master into master 2023-05-11 04:59:46 -04:00
Contributor

Just a heads up that I will be opening a PR on the server with an updated quests.json created using these updates, so you don't need to worry about that side of things either :)

While working on implementing the latest updates to quests to match the Tarkov Wiki, I ran into some shortcomings of the quest generator. I've done my best to fix them in a way that should be future proof, and allow for easier importing of quest dumps for future releases.

  • Requirements can now be removed from quests (This allows quests.json to have requirements removed without needing to hand-edit it first)
  • Make random ID generation deterministic when it's required, but prefer to copy the random IDs from the existing quest.json if possible. This allows for much smaller diffs when re-generating quests.json

The following quest changes were made to make SPT closer match the wiki:

  • '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'

  • 'Hunstman 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)

Just a heads up that I will be opening a PR on the server with an updated quests.json created using these updates, so you don't need to worry about that side of things either :) While working on implementing the latest updates to quests to match the Tarkov Wiki, I ran into some shortcomings of the quest generator. I've done my best to fix them in a way that should be future proof, and allow for easier importing of quest dumps for future releases. - Requirements can now be removed from quests (This allows quests.json to have requirements removed without needing to hand-edit it first) - Make random ID generation deterministic when it's required, but prefer to copy the random IDs from the existing quest.json if possible. This allows for much smaller diffs when re-generating quests.json The following quest changes were made to make SPT closer match the wiki: - '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' - 'Hunstman 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)
DrakiaXYZ added 4 commits 2023-05-11 01:46:47 -04:00
- Explicitly call x._props.value.ToString, as the (string) cast was failing for me
- Switch QuestRewardItem.upd to a 'QuestRewardUpd' type instead of 'object'
- Fix some quest names (Woods Cleaning, Revision P1/P2, Gunsmith P6/P8)
- Update quest requirements to be closer to wiki
- Add Sellout requirement to Stylish One as per the wiki
- Make quest diffs more deterministic by copying IDs from previous quest.json files where possible, and generating deterministic random IDs when we need new ones
- Include counter ID comparison for condition copy, so we don't copy the wrong ID for counters
DrakiaXYZ added 1 commit 2023-05-11 02:05:53 -04:00
chomp merged commit d2015be152 into master 2023-05-11 04:59:46 -04:00
Sign in to join this conversation.
No Reviewers
No Label
No Milestone
No project
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: chomp/ChompQuestVerifier#1
No description provided.