diff options
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 26 |
2 files changed, 16 insertions, 12 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index e6a0ee2d4c..dc4ded7546 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -328,7 +328,7 @@ static const ability_def Ability_List[] = // Fedhas { ABIL_FEDHAS_FUNGAL_BLOOM, "Decomposition", 0, 0, 0, 0, ABFLAG_NONE }, { ABIL_FEDHAS_SUNLIGHT, "Sunlight", 2, 0, 0, 0, ABFLAG_NONE}, - { ABIL_FEDHAS_PLANT_RING, "Growth", 2, 0, 0, 1, ABFLAG_FRUIT}, + { ABIL_FEDHAS_PLANT_RING, "Growth", 2, 0, 0, 0, ABFLAG_FRUIT}, { ABIL_FEDHAS_RAIN, "Rain", 4, 0, 100, 2, ABFLAG_NONE}, { ABIL_FEDHAS_SPAWN_SPORES, "Reproduction", 4, 0, 50, 2, ABFLAG_NONE}, { ABIL_FEDHAS_EVOLUTION, "Evolution", 4, 0, 0, 2, ABFLAG_FRUIT}, diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index ae6c6c1f4b..25407604c8 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2812,6 +2812,21 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, case DID_FRIEND_DIED: switch (you.religion) { + + case GOD_FEDHAS: + // Toadstools are exempt from this conduct + if (victim && fedhas_protects(victim) + && victim->mons_species() != MONS_TOADSTOOL) + { + // level is (1 + monsterHD/2) for this conduct, + // trying a fixed cost since plant HD aren't that + // meaningful. -cao + piety_change = -1; + retval = true; + break; + } + break; + case GOD_ELYVILON: // healer god cares more about this // Converted allies (marked as TSOites) can be martyrs. if (victim && victim->god == GOD_SHINING_ONE) @@ -2829,17 +2844,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, break; // fall through - case GOD_FEDHAS: - // double-check god because of fall-throughs from other gods - // Toadstools are an exception for this conduct - if (you.religion == GOD_FEDHAS && (!victim - || !fedhas_protects(victim) - || victim->mons_species() == MONS_TOADSTOOL)) - { - break; - } - // fall through - case GOD_OKAWARU: piety_change = -level; retval = true; |