Add message for continued multiturn eating. (FR 1878123)

Add a variety of humourous attack verbs for killer klowns. (FR 1855567)


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3393 c06c8d41-db1a-0410-9941-cceddc491573

3 files changed, 35 insertions, 2 deletions

diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc
index 6877e9b598..5eb3b5f504 100644
--- a/crawl-ref/source/delay.cc
+++ b/crawl-ref/source/delay.cc
@@ -663,6 +663,9 @@ void handle_delay( void )
                        items_for_multidrop.size() == 1 );
             items_for_multidrop.erase( items_for_multidrop.begin() );
             break;
+        case DELAY_EAT:
+            mpr("You continue eating.", MSGCH_MULTITURN_ACTION);
+            break;
         default:
             break;
         }
diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index e7c875ae05..9e8da364e8 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -3106,8 +3106,38 @@ int melee_attack::mons_apply_defender_ac(int damage, int damage_max)
     return damage;
 }
 
+static const char *klown_attack[] =
+{
+    "hit",
+    "poke",
+    "prod",
+    "flog",
+    "pound",
+    "slap",
+    "tickle",
+    "defenestrate",
+    "sucker-punch",
+    "elbow",
+    "pinch",
+    "strangle-hug",
+    "squeeze",
+    "tease",
+    "eye-gouge",
+    "karate-kick",
+    "headlock",
+    "wrestle",
+    "trip-wire",
+    "kneecap"
+};
+
 std::string melee_attack::mons_attack_verb(const mon_attack_def &attk)
 {
+    if (attacker->id() == MONS_KILLER_KLOWN && attk.type == AT_HIT)
+    {
+        const int num_attacks = sizeof(klown_attack) / sizeof(klown_attack[0]);
+        return klown_attack[random2(num_attacks)];
+    }
+
     static const char *attack_types[] =
     {
         "",
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc
index 463d10a27a..b929bf1e9d 100644
--- a/crawl-ref/source/item_use.cc
+++ b/crawl-ref/source/item_use.cc
@@ -4455,8 +4455,8 @@ void tile_use_item(int idx, InvAction act)
     else if (act == INV_USE_FLOOR)
     {
         if (mitm[idx].base_type == OBJ_CORPSES
-            && you.inv[idx].sub_type != CORPSE_SKELETON
-            && !food_is_rotten(you.inv[idx]))
+            && mitm[idx].sub_type != CORPSE_SKELETON
+            && !food_is_rotten(mitm[idx]))
         {
             butchery(idx);
         }