Changes related to material hatred/searing #204
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
entrez
commented
Dec 13, 2023
entrez
commented
- Fix: mon_hates_material and player race
- Assess iron material damage for spiked pits
mon_hates_material(mondata.c) was not evaluating the hero's race correctly due to upstream changes in 580c5a6, which removed the attempt to assess the hero's race from is_elf, is_dwarf, etc macros (for reasons described in that commit message). However, mon_hates_material was just passing gy.permonst.data to hates_material and relying on those macros to include the hero's race in the equation, so it was no longer working properly for an unpolymorphed hero after those changes. Make it explicitly check material hatred of the hero's race if not polymorphed. I had to remove the 'const' qualifier on raceptr to use it here, because keeping it would have led to a cascading requirement to add 'const' on all sorts of other functions (hates_material -> dmgtype -> dmgtype_fromattack...) -- and those really _should_ have const parameters, but I think that would have to be an upstream change to avoid risking a bunch of merge conflicts in subsequent merges.
The spikes in spiked pits are described as iron, so apply the additional iron damage when the hero or a monster is harmed by them.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.