summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/godconduct.cc
diff options
context:
space:
mode:
authorBrendan Hickey <brendan@bhickey.net>2013-11-19 22:02:59 -0800
committerBrendan Hickey <brendan@bhickey.net>2013-11-19 22:14:20 -0800
commit752d673ba7d8b477c9f077dc0868bfda3f372214 (patch)
tree70380eb2ddf7d509433810092991481966ee14ee /crawl-ref/source/godconduct.cc
parent2c70c214a8b9b3cb52df227a291d54ca5afa39e2 (diff)
downloadcrawl-ref-752d673ba7d8b477c9f077dc0868bfda3f372214.tar.gz
crawl-ref-752d673ba7d8b477c9f077dc0868bfda3f372214.zip
Remove ally death penalty for Zin and Okie
This is a tedious conduct. It isn't particularly fun, limits playstyles and penalizes players frivolously: Oh no, my butterfly died! Neither of these gods is overpowered within our pantheon. I expect balance implications to be negligible, while allowing combinations that were previously foolhardy: Summoner of Zin, for example.
Diffstat (limited to 'crawl-ref/source/godconduct.cc')
-rw-r--r--crawl-ref/source/godconduct.cc15
1 files changed, 0 insertions, 15 deletions
diff --git a/crawl-ref/source/godconduct.cc b/crawl-ref/source/godconduct.cc
index 6adbdf4591..51ef038f44 100644
--- a/crawl-ref/source/godconduct.cc
+++ b/crawl-ref/source/godconduct.cc
@@ -306,21 +306,6 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
retval = true;
break;
- case GOD_ZIN:
- // Converted allies (marked as TSOites) can be martyrs.
- if (victim && victim->god == GOD_SHINING_ONE)
- break;
-
- // Zin only cares about the deaths of those with souls.
- if (thing_done == DID_FRIEND_DIED)
- break;
- // fall through
-
- case GOD_OKAWARU:
- piety_change = -level;
- retval = true;
- break;
-
default:
break;
}