feat: orbs of mayhem (nicolae)

The mayhem ego for orbs causes monsters who see the wielder kill something to go frenzy. It only hits one monster per kill with a coinflip for now. This could be adjusted up or down based on power, but we definitely don't want to give out free Discord casts for a single kill.
crawl · Dec 27, 2021 · ecb9636 · ecb9636
1 parent acce00e
commit ecb9636
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 2 deletions.
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc
@@ -1801,6 +1801,8 @@ static const char* _item_ego_desc(special_armour_type ego)
         return "it lights the dungeon around the wearer.";
     case SPARM_RAGE:
         return "it berserks the wearer when making melee attacks (20% chance).";
+    case SPARM_MAYHEM:
+        return "it causes witnesses of the wearer's kills to go into a frenzy.";
     default:
         return "it makes the wearer crave the taste of eggplant.";
     }

diff --git a/crawl-ref/source/item-name.cc b/crawl-ref/source/item-name.cc
@@ -569,6 +569,7 @@ const char* armour_ego_name(const item_def& item, bool terse)
         case SPARM_INFUSION:          return "infusion";
         case SPARM_LIGHT:             return "light";
         case SPARM_RAGE:              return "wrath";
+        case SPARM_MAYHEM:            return "mayhem";
         default:                      return "bugginess";
         }
     }
@@ -613,6 +614,7 @@ const char* armour_ego_name(const item_def& item, bool terse)
         case SPARM_INFUSION:          return "infuse";
         case SPARM_LIGHT:             return "light";
         case SPARM_RAGE:              return "*Rage";
+        case SPARM_MAYHEM:            return "mayhem";
         default:                      return "buggy";
         }
     }

diff --git a/crawl-ref/source/item-prop-enum.h b/crawl-ref/source/item-prop-enum.h
@@ -486,6 +486,8 @@ enum special_armour_type
     SPARM_RAMPAGING,
     SPARM_INFUSION,
     SPARM_LIGHT,
+    SPARM_RAGE,
+    SPARM_MAYHEM,
     NUM_REAL_SPECIAL_ARMOURS,
     NUM_SPECIAL_ARMOURS,
 };

diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc
@@ -779,7 +779,8 @@ static special_armour_type _generate_armour_type_ego(armour_type type)
     case ARM_ORB:
         return random_choose_weighted(1, SPARM_PONDEROUSNESS,
                                       1, SPARM_LIGHT,
-                                      1, SPARM_RAGE);
+                                      1, SPARM_RAGE,
+                                      1, SPARM_MAYHEM);
 
     case ARM_SCARF:
         return random_choose_weighted(1, SPARM_RESISTANCE,
@@ -984,6 +985,7 @@ bool is_armour_brand_ok(int type, int brand, bool strict)
 
     case SPARM_LIGHT:
     case SPARM_RAGE:
+    case SPARM_MAYHEM:
         return type == ARM_ORB;
 
     case NUM_SPECIAL_ARMOURS:

diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc
@@ -4948,6 +4948,7 @@ int str_to_ego(object_class_type item_type, string ego_str)
         "infusion",
         "light",
         "wrath",
+        "mayhem",
         nullptr
     };
     COMPILE_CHECK(ARRAYSZ(armour_egos) == NUM_REAL_SPECIAL_ARMOURS);

diff --git a/crawl-ref/source/mon-death.cc b/crawl-ref/source/mon-death.cc
@@ -1284,6 +1284,17 @@ static void _druid_final_boon(const monster* mons)
     }
 }
 
+static void _orb_of_mayhem(actor& maniac, const monster& victim)
+{
+    vector<monster *> witnesses;
+    for (monster_near_iterator mi(&victim, LOS_NO_TRANS); mi; ++mi)
+        if (mi->can_see(maniac) && mi->can_go_frenzy())
+            witnesses.push_back(*mi);
+
+    if (coinflip() && !witnesses.empty())
+        (*random_iterator(witnesses))->go_frenzy(&maniac);
+}
+
 static bool _mons_reaped(actor &killer, monster& victim)
 {
     beh_type beh;
@@ -2005,6 +2016,13 @@ item_def* monster_die(monster& mons, killer_type killer,
             {
                 bless_follower();
             }
+
+            if (gives_player_xp
+                && !mons_is_object(mons.type)
+                && you.wearing_ego(EQ_ALL_ARMOUR, SPARM_MAYHEM))
+            {
+                _orb_of_mayhem(you, mons);
+            }
             break;
         }
 
@@ -2045,6 +2063,8 @@ item_def* monster_die(monster& mons, killer_type killer,
             {
                 // Randomly bless the follower who killed.
                 bless_follower(killer_mon);
+                if (killer_mon->wearing_ego(EQ_ALL_ARMOUR, SPARM_MAYHEM))
+                    _orb_of_mayhem(*killer_mon, mons);
             }
             break;
         }

diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
@@ -539,7 +539,8 @@ i-shadows BRAND_ARM_SHADOWS
 i-lunging BRAND_ARM_LUNGING
 i-infusion BRAND_ARM_INFUSION
 i-light BRAND_ARM_LIGHT
-i-rage BRAND_ARM_RAGE BRAND_ARM_LAST
+i-rage BRAND_ARM_RAGE
+i-mayhem BRAND_ARM_MAYHEM BRAND_ARM_LAST
 %rim 1
 
 ###########OBJ_WANDS

diff --git a/crawl-ref/source/rltiles/item/armour/brands/i-mayhem.png b/crawl-ref/source/rltiles/item/armour/brands/i-mayhem.png
diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc
@@ -365,6 +365,7 @@ unsigned int item_value(item_def item, bool ident)
             case SPARM_SPIRIT_SHIELD:
             case SPARM_HARM:
             case SPARM_RAGE:
+            case SPARM_MAYHEM:
                 valued += 20;
                 break;