-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Make Dith hate all fire spells (bepbepimjep, #10969) #590
Conversation
ffd08df
to
d111ce5
Compare
I don't think this is quite ready yet, but wanted to get some comments. DONE: verified that all fire spells now cause Dith to apply penance/wrath DONE: Question: bepbepimjep got credit in the mantis item for reporting this issue. How am I supposed to handle this in my PR? Should I have added (bepbepimjep) in my commit title? |
crawl-ref/source/spl-cast.cc
Outdated
@@ -920,6 +920,10 @@ static void _spellcasting_god_conduct(spell_type spell) | |||
if (is_corpse_violating_spell(spell)) | |||
did_god_conduct(DID_CORPSE_VIOLATION, conduct_level); | |||
|
|||
// need to handle ignite_poison as a DID_FIRE |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reviewing this, I think I should use a comment similar to SPELL_SWIFTNESS below.
// not is_fiery_spell since the other ones handle the conduct themselves
Yes, it would be polite to put |
d111ce5
to
6649dbc
Compare
I can't find any monsters who use Inner Flame, Ignite Poison, and Ignition. Also, I tweaked the comment I mentioned above. |
6649dbc
to
c52c9e7
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks fine to me stylistically. I don't have any context on the actual logic you've changed, but if you've tested that it makes the intended changes and doesn't break anything obvious seems like a good merge.
If it breaks something non-obvious, I'm sure players will be excited to report it.
See: https://crawl.develz.org/mantis/view.php?id=10969
Currently, not all fire spells are causing Dith to dish out
penance/wrath.
inner flame
ignite poison
bolt of magma
ignition
firestorm
Had to add some extra BEAMS to apply_beam_conducts() and then point
cast_ignition and cast_fire_storm to the same function.
Ignite_poison is handled similar to how SPELL_SWIFTNESS is handled for
the is_hasty conduct (check for the spell and send a DID_FIRE to
did_god_conduct).