Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: don't give even more holdout missions to starter NPCs, actually hand over mission targets for drive belt and blanket missions #4758

Merged
merged 5 commits into from
Jun 8, 2024

Conversation

chaosvolt
Copy link
Member

@chaosvolt chaosvolt commented Jun 8, 2024

Purpose of change

I found a logger camp and in the process ran into some issues with the mission chain I figured I'd fix.

Describe the solution

  1. Once again fixed missions having ORIGIN_OPENER_NPC instead of ORIGIN_SECONDARY.
  2. Set the drivebelts mission to an itemgroup mission instead of condition, so that they actually take the drive belts from you instead of you waving them in their face and them deciding that's close enough to giving you them to count. Done via defining a new itemgroup for drive belts and makeshift belts.
  3. Likewise fixed the blanket mission to use a new itemgroup to give them instead of conditional goal, also fixes fur blankets being on the list of targets twice for some reason. Removed references to quilts since we never mainlined them? Odd, we have wool pillows so we should've mainlined quilts too.

Describe alternatives you've considered

The mission chain having two "we need nails lol" missions in a row is kinda mid to be honest, especially with the second one needing a whopping 6800 of them, but the comment indicates why the amount is so high. Thinking up some excuse to lower them would be nice, maybe via having the mapgen updates for the walls also remove all the crates from the storage room. I'd have to estimate how many nails we could cut out of that mission requirement beforehand but ech, merging the two nail missions into one and just handwaving the question of exactly how many nails they used to fortify would work too.

I feel we can fuck with that in a later PR and focus on actually fixing the major problems for now though.

Testing

  1. Checked affected files for syntax and lint errors.
  2. Ported file changes to playthrough release.
  3. Load-tested and quickly slapped the intro mission onto one of the filler NPCs, confirmed that count is indeed valid for itemgroup missions.

Additional context

Checklist

…hand over mission targets for drive belt and blanket missions
@chaosvolt chaosvolt enabled auto-merge (squash) June 8, 2024 15:36
@github-actions github-actions bot added the JSON related to game datas in JSON format. label Jun 8, 2024
Copy link
Contributor

autofix-ci bot commented Jun 8, 2024

Autofix has formatted code style violation in this PR.

I edit commits locally (e.g: git, github desktop) and want to keep autofix
  1. Run git pull. this will merge the automated commit into your local copy of the PR branch.
  2. Continue working.
I do not want the automated commit
  1. Format your code locally, then commit it.
  2. Run git push --force to force push your branch. This will overwrite the automated commit on remote with your local one.
  3. Continue working.

If you don't do this, your following commits will be based on the old commit, and cause MERGE CONFLICT.

@chaosvolt chaosvolt merged commit b7f0f5f into cataclysmbnteam:main Jun 8, 2024
10 checks passed
@chaosvolt chaosvolt deleted the logger-npc-fixes branch June 8, 2024 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JSON related to game datas in JSON format.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants