Give lava orcs a heat halo that causes fire damage to nearby enemies.

1 files changed, 53 insertions, 1 deletions

diff --git a/crawl-ref/source/areas.cc b/crawl-ref/source/areas.cc
index a2082aae38..0fdf728e96 100644
--- a/crawl-ref/source/areas.cc
+++ b/crawl-ref/source/areas.cc
@@ -43,6 +43,7 @@ enum areaprop_flag
     APROP_SUPPRESSION   = (1 << 8),
     APROP_QUAD          = (1 << 9),
     APROP_DISJUNCTION   = (1 << 10),
+    APROP_HOT           = (1 << 11),
 };
 
 struct area_centre
@@ -86,7 +87,7 @@ void areas_actor_moved(const actor* act, const coord_def& oldpos)
         (you.entering_level
          || act->halo_radius2() > -1 || act->silence_radius2() > -1
          || act->liquefying_radius2() > -1 || act->umbra_radius2() > -1
-         || act->suppression_radius2() > -1))
+         || act->suppression_radius2() > -1 || act->heat_radius2() > -1))
     {
         // Not necessarily new, but certainly potentially interesting.
         invalidate_agrid(true);
@@ -170,6 +171,18 @@ static void _update_agrid()
             no_areas = false;
         }
 
+        if ((r = ai->heat_radius2()) >= 0)
+        {
+            _agrid_centres.push_back(area_centre(AREA_HOT, ai->pos(), r));
+
+            for (radius_iterator ri(ai->pos(),r, C_CIRCLE, ai->get_los());
+                ri; ++ri)
+            {
+                _set_agrid_flag(*ri, APROP_HOT);
+            }
+            no_areas = false;
+        }
+
     }
 
     if (you.char_direction == GDT_ASCENDING && !you.duration[DUR_TIME_STEP])
@@ -232,6 +245,8 @@ static area_centre_type _get_first_area(const coord_def& f)
         return AREA_SANCTUARY;
     if (a & APROP_SILENCE)
         return AREA_SILENCE;
+    if (a & APROP_HOT)
+        return AREA_HOT;
     if (a & APROP_HALO)
         return AREA_HALO;
     if (a & APROP_UMBRA)
@@ -785,3 +800,40 @@ int player::suppression_radius2() const
 {
     return -1;
 }
+
+/////////////
+// Heat aura (lava orcs).
+
+// Player radius
+int player::heat_radius2() const
+{
+    if (you.species != SP_LAVA_ORC)
+        return (-1);
+
+    if (!temperature_effect(LORC_HEAT_AURA))
+        return (-1);
+
+    return (2); // Surrounds you to radius of 1.
+}
+
+// Stub for monster radius
+int monster::heat_radius2() const
+{
+    return (-1);
+}
+
+bool heated(const coord_def& p)
+{
+    if (!map_bounds(p))
+        return (false);
+
+    if (!_agrid_valid)
+        _update_agrid();
+
+    return (_check_agrid_flag(p, APROP_HOT));
+}
+
+bool actor::heated() const
+{
+    return (::heated(pos()));
+}