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

New bar enconters for the Ancilla Bar #64745

Merged
merged 2 commits into from
Apr 4, 2023

Conversation

John-Candlebury
Copy link
Member

@John-Candlebury John-Candlebury commented Apr 1, 2023

Summary

Content "New bar encounters for the Ancilla Bar"

Purpose of change

The bar needs more random visitors to actually feel like a lived on space. And this PR adds two extra generic mercs to the rotation.

Describe the solution

The two mercs are:

  • The pill pusher: Who sells mostly medical drugs and some recreational ones.

  • The traumatized traveler: Who can be interacted with to get a single quest to kill a Jabberwock. The jabberwock is meant to be temporary, once we have a framework for scarier zombie evolutions, we can put one of these here.

Testing

Loaded into the bar, saw both mercenaries spawn and interacted with them.

Additional context

I'll probably add Makayla as a visitor next time I revisit the Ancilla Bar.

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON NPC / Factions NPCs, AI, Speech, Factions, Ownership labels Apr 1, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Apr 1, 2023

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

Click to expand
  • &Continued prodding manages to extract a baffling response from your interlocutor "I- I-ve seen it, the god of our new world, a god of flesh and bone. says with a maddened glare, as if this where some sort of shocking revelation."

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 added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Apr 1, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Apr 1, 2023
@Fris0uman Fris0uman merged commit 0d9ad8e into CleverRaven:master Apr 4, 2023
Maleclypse pushed a commit to Maleclypse/Cataclysm-DDA that referenced this pull request Apr 6, 2023
* New bar enconters for the Ancilla Bar

* Text editing pass.
@John-Candlebury John-Candlebury deleted the hub-new-bems branch June 24, 2023 21:28
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 NPC / Factions NPCs, AI, Speech, Factions, Ownership
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants