diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-28 19:03:25 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-28 19:03:25 +0000 |
| commit | 7dee23de061e78fc7a20ed8ef93d31716d82f8de (patch) | |
| tree | b6f55a90166d5e05c0f645e25ef6a347f345e071 /crawl-ref/source/religion.cc | |
| parent | 2b335fe17e827aa4b3d756c5f5340767d002572e (diff) | |
| download | crawl-ref-7dee23de061e78fc7a20ed8ef93d31716d82f8de.tar.gz crawl-ref-7dee23de061e78fc7a20ed8ef93d31716d82f8de.zip | |
Add conducts for undead slaves' killing undead and demons. Currently,
the only difference between these and the conducts for servants' killing
undead and demons are the messages ("slaves' kills" vs. "collateral
kills").
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9288 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 54e0bd70b2..b4ea68054b 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -2772,24 +2772,9 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, } break; - // You shouldn't have undead slaves if you worship a good god, - // but check anyway, just in case. case DID_HOLY_KILLED_BY_UNDEAD_SLAVE: switch (you.religion) { - case GOD_ZIN: - case GOD_SHINING_ONE: - case GOD_ELYVILON: - if (testbits(victim->flags, MF_CREATED_FRIENDLY) - || testbits(victim->flags, MF_WAS_NEUTRAL)) - { - level *= 3; - penance = level; - } - piety_change = -level; - retval = true; - break; - case GOD_YREDELEMNUL: case GOD_KIKUBAAQUDGHA: // note: reapers aren't undead case GOD_MAKHLEB: @@ -2881,6 +2866,23 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, } break; + case DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE: + switch (you.religion) + { + case GOD_VEHUMET: + case GOD_MAKHLEB: + case GOD_BEOGH: + case GOD_LUGONU: + simple_god_message(" accepts your slave's kill."); + retval = true; + if (random2(level + 10 - you.experience_level/3) > 5) + piety_change = 1; + break; + default: + break; + } + break; + case DID_UNDEAD_KILLED_BY_SERVANT: switch (you.religion) { @@ -2902,6 +2904,21 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, } break; + case DID_DEMON_KILLED_BY_UNDEAD_SLAVE: + switch (you.religion) + { + case GOD_MAKHLEB: + case GOD_BEOGH: + simple_god_message(" accepts your slave's kill."); + retval = true; + if (random2(level + 10 - you.experience_level/3) > 5) + piety_change = 1; + break; + default: + break; + } + break; + case DID_DEMON_KILLED_BY_SERVANT: switch (you.religion) { @@ -3096,7 +3113,8 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known, "Kill Demon", "Kill Natural Evil", "Kill Chaotic", "Kill Wizard", "Kill Priest", "Kill Holy", "Undead Slave Kill Living", "Servant Kill Living", - "Servant Kill Undead", "Servant Kill Demon", + "Undead Slave Kill Undead", "Servant Kill Undead", + "Undead Slave Kill Demon", "Servant Kill Demon", "Servant Kill Natural Evil", "Undead Slave Kill Holy", "Servant Kill Holy", "Spell Memorise", "Spell Cast", "Spell Practise", "Spell Nonutility", "Cards", "Stimulants", |