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

Moving quadrupedally through acid or fire damages both your hands and feet #74639

Merged
merged 5 commits into from
Jun 18, 2024

Conversation

GalacticApple
Copy link
Contributor

@GalacticApple GalacticApple commented Jun 17, 2024

Summary

Bugfixes "updates ench_quadruped_movement_full and the map::player_in_field function to consider quadrupedal movement."

Purpose of change

When you're moving on your hands and feet through a hazard, damage should also be applied to your hands.

Describe the solution

I updated ench_quadruped_movement_full in enchantments.json to call the "quadruped_full" effect when you meet the right conditions (this also fixes a bug related to you being able to see over objects while running on all-fours).

Then I updated the map::player_in_field function in map_field.cpp so that you burn your hands when moving through acid while quadrupedal. You also receive damage to all your body parts when moving through fire.

Describe alternatives you've considered

Testing

Compiled and tested on my copy of CDDA.

Additional context

I removed

"ench_effects": [ { "effect": "natural_stance", "intensity": 1 } ]

from the Digitigrade mutation in mutations.json since this is also called by ench_quadruped_movement_full (and thus redundant).

@github-actions github-actions bot added new contributor <Bugfix> This is a fix for a bug (or closes open issue) [JSON] Changes (can be) made in JSON Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Mechanics: Enchantments / Spells Enchantments and spells labels Jun 17, 2024
src/map_field.cpp Outdated Show resolved Hide resolved
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@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 Jun 17, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 17, 2024
@Maleclypse Maleclypse merged commit 08a9ab4 into CleverRaven:master Jun 18, 2024
27 checks passed
@gitelitko
Copy link

What about moving through hazards while prone?

@GalacticApple
Copy link
Contributor Author

That was already accounted for by the game. If you're moving through acid while prone, you get covered in acid. If you move through fire while prone, you're consumed by fire.

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 <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mechanics: Enchantments / Spells Enchantments and spells Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies new contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants