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.

Sign up for GitHub

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

Jump to bottom

Triffid and Mycus don't get along #51624

Merged
merged 1 commit into from
Sep 15, 2021
Merged

Triffid and Mycus don't get along #51624

merged 1 commit into from
Sep 15, 2021

Conversation

actual-nh
Copy link
Contributor

Summary

None

Purpose of change

Triffid and Mycus do not get along. See https://discord.com/channels/598523535169945603/598529174302490644/887453720185548820.

Describe the solution

Change their relationship to "hate" so they'll attack each other even if anger isn't 10+.

Testing

CI for JSON.

@actual-nh actual-nh added <Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Monsters Monsters both friendly and unfriendly. labels Sep 14, 2021
Maleclypse
Maleclypse approved these changes Sep 14, 2021
View reviewed changes
Copy link
Member

@Maleclypse Maleclypse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Hate was written fairly recently so I imagine there are a number of places it's missing in the older monster factions.

@kevingranade kevingranade merged commit 6470ad4 into CleverRaven:master Sep 15, 2021
@actual-nh actual-nh deleted the patch-5 branch September 15, 2021 00:21
Venera3 pushed a commit to Venera3/Cataclysm-DDA that referenced this pull request Sep 21, 2021
@actual-nh @Venera3
Triffid and Mycus don't get along (CleverRaven#51624)
0aa8922 
See <https://discord.com/channels/598523535169945603/598529174302490644/887453720185548820>.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Maleclypse Maleclypse Maleclypse approved these changes

@I-am-Erk I-am-Erk Awaiting requested review from I-am-Erk

@Mom-Bun Mom-Bun Awaiting requested review from Mom-Bun

Assignees
No one assigned
Labels
<Enhancement / Feature> New features, or enhancements on existing [JSON] Changes (can be) made in JSON Monsters Monsters both friendly and unfriendly.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@actual-nh @Maleclypse @kevingranade