diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/acr.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/goditem.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/player.cc | 1 |
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); |