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

Prepper NPC quest follow-up #59515

Merged
merged 14 commits into from
Aug 19, 2022
Merged

Conversation

onura46
Copy link
Contributor

@onura46 onura46 commented Jul 23, 2022

Summary

Content "Prepper NPC quest follow-up"

Purpose of change

Continues #59165, adds NPC dialog

Describe the solution

This PR is a follow-up to discussion in #59165, where we talked about adding a more satisfying conclusion to the "prepper_1" quest line. Mild spoilers: this quest will now lead you to the prepper's personal LMOE, which is a new, locked, globally unique variant based off an extant LMOE design with slightly buffed loot spawns (a fridge full of non-perishables, a few more guns, more books, etc.). There are also some fun dialog options you can uncover after the completion of the quest to learn more about how some of the more professional LMOEs got built, and also to troll this paranoid prepper into starting a fight with you for a lol.

Describe alternatives you've considered

Testing

Tested on my own compiled version.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Lore Game lore, in-game communication. Also the Lore tab. NPC / Factions NPCs, AI, Speech, Factions, Ownership json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Jul 23, 2022
@github-actions github-actions bot added Map / Mapgen Overmap, Mapgen, Map extras, Map display and removed json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Aug 3, 2022
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Aug 8, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Aug 8, 2022

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • What, like some secret Batcave? Pull back the curtain and it turns out I'm the communist <name_b> who opened a portal to netherfuck in their basement? I just gave you food, all the tools in my workshop, and the safest hole in the ground in the county. If I've got any secrets left, they're mine to keep.

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Aug 9, 2022
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Aug 9, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 12, 2022
@onura46 onura46 marked this pull request as ready for review August 12, 2022 22:38
@dseguin dseguin merged commit f65b2bc into CleverRaven:master Aug 19, 2022
pjf added a commit to pjf/Cataclysm-DDA that referenced this pull request Aug 21, 2022
* origin/master:
  Prepper NPC quest follow-up (CleverRaven#59515)
  Adds a new widget for th structured sidebar with all midsize bodygraphs (i.e. the ones structured uses for "Health + Status" et al) side by side with nothing else, for use with Health + Overmap because I like the way the midsize bodygraphs look and don't want to have to choose just one of them to display (CleverRaven#60244)
  [DinoMod] slower zombie dino upgrades (CleverRaven#60311)
  [Xedra Evolved] Adds itemgroups for spell items (CleverRaven#60296)
  Update mutations.json (CleverRaven#60295)
  Fix typos (CleverRaven#60269)
  Wooden pulley fixes (CleverRaven#60285)
  Update landscaping.json (CleverRaven#60299)
  Update martialarts.json (CleverRaven#60305)
  fix: 'person' monster silently vanishes after touching character (CleverRaven#60270)
  fix: prevent use of non valid creature pointer (CleverRaven#60272)
  Nested Recipes - Ropes, Bundles, Shelled Nuts (CleverRaven#60297)
  Nested Recipes - Chain Armor (CleverRaven#60268)
  Nerf isherwood dandelion quest rewards (CleverRaven#60273)
  Animal ports from TropiCata to Mainline + egg density fixes for insects and birds (CleverRaven#60234)
  Modular Defense Anchor is SOFT (CleverRaven#60279)
Hirmuolio pushed a commit to Hirmuolio/Cataclysm-DDA that referenced this pull request Aug 27, 2022
* initial commit

* add locked LMOE, specials, and new item group

* rename overmap special for clarity

* more conversation

* linting and spellcheck fixes

* add lmoe sign and dialog touchup

* lint json

* add space

* add space

* test kicking

* switch LMOE door ascii

* fill_ter set and trial difficulty change

* move metal door to mapgen

* fix prepper's headcanon; almost forgot
@onura46 onura46 deleted the prepper-quest-followup branch September 11, 2022 18:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Lore Game lore, in-game communication. Also the Lore tab. Map / Mapgen Overmap, Mapgen, Map extras, Map display NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants