Demonspawn warmongers: Grand Avatar.

Listed in the proposal as Icon of Greatness.

A grand avatar behaves similarly to both a spectral weapon and a
battlesphere in that it attacks targets the caster and its nearby allies
either attack in melee or by battlesphere-triggered conjurations; it
is only guaranteed to attack if the triggerer does at least 15 damage,
though it may trigger randomly below that threshold.

1 files changed, 17 insertions, 0 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 164ad9fd08..72ad30ed24 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -53,6 +53,7 @@
  */
 bool fight_melee(actor *attacker, actor *defender, bool *did_hit, bool simu)
 {
+    const int orig_hp = defender->stat_hp();
     if (defender->is_player())
     {
         ASSERT(!crawl_state.game_is_arena());
@@ -137,6 +138,11 @@ bool fight_melee(actor *attacker, actor *defender, bool *did_hit, bool simu)
         // so the weapon doesn't advance unecessarily.
         return true;
     }
+    else if (attacker->type == MONS_GRAND_AVATAR
+             && !grand_avatar_check_melee(attacker->as_monster(), defender))
+    {
+        return true;
+    }
 
     const int nrounds = attacker->as_monster()->has_hydra_multi_attack() ?
         attacker->as_monster()->number : 4;
@@ -213,6 +219,17 @@ bool fight_melee(actor *attacker, actor *defender, bool *did_hit, bool simu)
     // A spectral weapon attacks whenever the player does
     if (!simu && attacker->props.exists("spectral_weapon"))
         trigger_spectral_weapon(attacker, defender);
+    else if (!simu
+             && attacker->is_monster()
+             && attacker->as_monster()->has_ench(ENCH_GRAND_AVATAR)
+             && orig_hp - defender->stat_hp()
+                >= random2(GRAND_AVATAR_DAMAGE))
+    {
+        actor* avatar = attacker->as_monster()->get_ench(ENCH_GRAND_AVATAR)
+                                                .agent();
+        if (avatar)
+            trigger_grand_avatar(avatar->as_monster(), defender, SPELL_MELEE);
+    }
 
     return true;
 }