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

[Xedra Evolved] Add Time Related Monsters #78579

Merged
merged 6 commits into from
Dec 15, 2024

Conversation

b3brodie
Copy link
Contributor

@b3brodie b3brodie commented Dec 15, 2024

Summary

Mods "[Xedra Evolved] Add Time Related Monsters"

Purpose of change

Sub PR of #78366
Adds a couple of time related enemies for for time content and to also add enemies for chronomancers to kill to gain insight.

Describe the solution

Adds 3 time related zombies

  • Monochrome Zombie: Equal stats to baseline zombie, but resets health every 10 seconds.
  • Destabilized Zombie: Equal stats to baseline zombie other than 1.5x speed and health. Also, it is immune to time freezes and can travel through frozen time. Finally, its health resets every 5 seconds.
  • Zombie Timewound: Adds zombie timewound. Equal stats to baseline zombie other than 2x speed and health. In addition to time freeze immunity, its attacks apply a dot if they connect. Finally, its health resets every 2 seconds.

Distributes STABILIZED_TIMELINE flag to a couple of other monsters, such as hounds of tindalos.

Infrastructure:

  • Allows monsters to have hit_you and hit_me enchantment effects
  • Allows monsters to move through impassable fields if they have the immunity data
  • Adds has_flag method for monsters that checks for flag_ids rather than the prior specific monster_flag_id, which allows for more dynamic checking.

Describe alternatives you've considered

One big PR

Testing

Tested that zombies correctly restore their HP
Tested that monsters with the STABILIZED_TIMELINE flag correctly path through fields they are immune to
Tested that monsters apply the spell for their hit_you enchants
Tested that monsters apply the spell for their hit_me enchants
Teleported around a bit and confirmed that the monsters were actually appearing

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Vehicles Vehicles, parts, mechanics & interactions Spawn Creatures, items, vehicles, locations appearing on map [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Melee Melee weapons, tactics, techniques, reach attack Mechanics: Enchantments / Spells Enchantments and spells Mods: Xedra Evolved Anything to do with Xedra Evolved labels Dec 15, 2024
@github-actions github-actions bot added Mods Issues related to mods or modding astyled astyled PR, label is assigned by github actions labels Dec 15, 2024
Copy link
Contributor

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

Click to expand
  • zombie timewound
  • zombie timewounds

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.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Dec 15, 2024
@Standing-Storm
Copy link
Contributor

Allows monsters to have hit_you and hit_me enchantment effects

Oh, the hell which I shall now unleash

@github-actions github-actions bot added BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Dec 15, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 15, 2024
@Maleclypse
Copy link
Member

Weird is that clang failure related to this PR or something in master?

@b3brodie
Copy link
Contributor Author

b3brodie commented Dec 15, 2024

Weird is that clang failure related to this PR or something in master?

I dont believe that is this pr. Currently #78565 has the same clang failures, which I believe means the cause is in naster

@Maleclypse Maleclypse merged commit 5fa6a6c into CleverRaven:master Dec 15, 2024
24 of 26 checks passed
@b3brodie b3brodie deleted the xedra_timelord_monster branch December 15, 2024 21:06
b3brodie added a commit to b3brodie/Cataclysm-DDA that referenced this pull request Dec 16, 2024
* Xedra: Add time zombies, distribute STABILIZED_TIME, and allow monster him_me, hit_you, and ignore impassable fields

* fixes highest tier zombies upgrading out of their path

* Update data/mods/Xedra_Evolved/monsters/zombies.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Lint and code review

* clang fixes

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
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 [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mechanics: Enchantments / Spells Enchantments and spells Melee Melee weapons, tactics, techniques, reach attack Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly. Spawn Creatures, items, vehicles, locations appearing on map Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants