summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorAdam Borowski <kilobyte@angband.pl>2009-10-22 01:25:48 +0200
committerAdam Borowski <kilobyte@angband.pl>2009-10-22 01:25:48 +0200
commite4e5306b41baf7dc13f40dbf29efa8247e06f0ad (patch)
tree146a5fb37cc6cb37c9ff9ae2250ebb48a3637247 /crawl-ref/source
parent4acb670639a7a537e8e70bc4c07a92156f70ca80 (diff)
downloadcrawl-ref-e4e5306b41baf7dc13f40dbf29efa8247e06f0ad.tar.gz
crawl-ref-e4e5306b41baf7dc13f40dbf29efa8247e06f0ad.zip
Amulet of resist slowing docks some Cronos piety when it triggers.
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/acr.cc1
-rw-r--r--crawl-ref/source/goditem.cc3
-rw-r--r--crawl-ref/source/player.cc1
3 files changed, 3 insertions, 2 deletions
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 93a6b4f235..8e46be80e6 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -2391,6 +2391,7 @@ static void _decrement_durations()
mpr("You feel yourself slow down.", MSGCH_DURATION);
you.duration[DUR_HASTE] = 0;
}
+ did_god_conduct(DID_HASTY, 3, true);
}
else
{
diff --git a/crawl-ref/source/goditem.cc b/crawl-ref/source/goditem.cc
index a654efef5c..7ff8497a30 100644
--- a/crawl-ref/source/goditem.cc
+++ b/crawl-ref/source/goditem.cc
@@ -187,8 +187,7 @@ bool is_hasty_item(const item_def& item)
return (true);
break;
case OBJ_JEWELLERY:
- // should this include AMU_RESIST_SLOWING?
- if (item.sub_type == AMU_RAGE)
+ if (item.sub_type == AMU_RAGE || item.sub_type == AMU_RESIST_SLOW)
return (true);
break;
default:
diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc
index 31236b4ff4..bd46ae0f69 100644
--- a/crawl-ref/source/player.cc
+++ b/crawl-ref/source/player.cc
@@ -5647,6 +5647,7 @@ bool slow_player(int amount)
// Identify amulet.
item_def *amulet = you.slot_item(EQ_AMULET);
+ did_god_conduct(DID_HASTY, 5, !amulet || item_type_known(*amulet));
if (amulet && !item_type_known(*amulet))
set_ident_type(*amulet, ID_KNOWN_TYPE);