S23: Prevent metamorph,summon,collar,Rashti from bypassing heat (#45)

After #38, a third fire elemental obtained from collar
no longer allowed a fourth fire elemental recruited.

This commit prevents a third fire elemental obtained
through normal means to allow a fourth through collar.

macros/abilities.cfg

@@ -43,6 +43,7 @@
 #enddef
 
 #define METAMORPH_FIRE ELEM TRANSFORM_MESSAGE IMAGE
+    {VARIABLE elem {ELEM}}
     [set_menu_item]
         id=metamorph_{ELEM}
         description={TRANSFORM_MESSAGE}
@@ -64,9 +65,26 @@
                     [/filter_wml]
                 [/not]
             [/have_unit]
+            [not]
+                [variable]
+                    name=toohot
+                    equals=yes
+                [/variable]
+                [variable]
+                    name=elem
+                    equals=Fire
+                [/variable]
+            [/not]
         [/show_if]
 
         [command]
+            [fire_event]
+                name=pre metamorph
+                [primary_unit]
+                    x,y=$x1,$y1
+                [/primary_unit]
+            [/fire_event]
+
             [if]
                 [have_unit]
                     type=EoMa_Water_Elemental,EoMa_Fire_Elemental,EoMa_Air_Elemental,EoMa_Earth_Elemental
@@ -99,11 +117,19 @@
                 [/effect]
                 moves=0
             [/modify_unit]
+            [fire_event]
+                name=post metamorph
+                [primary_unit]
+                    x,y=$x1,$y1
+                [/primary_unit]
+            [/fire_event]
         [/command]
     [/set_menu_item]
+    {CLEAR_VARIABLE elem}
 #enddef
 
 #define METAMORPH_FIRE_NO_AIR ELEM TRANSFORM_MESSAGE IMAGE
+    {VARIABLE elem {ELEM}}
     [set_menu_item]
         id=metamorph_{ELEM}
         description={TRANSFORM_MESSAGE}
@@ -131,11 +157,21 @@
                     terrain=Q*,*^Qov,Mv
                 [/not]
             [/have_location]
+            [not]
+                [variable]
+                    name=toohot
+                    equals=yes
+                [/variable]
+                [variable]
+                    name=elem
+                    equals=Fire
+                [/variable]
+            [/not]
         [/show_if]
 
         [command]
             [fire_event]
-                name=pre collar
+                name=pre metamorph
                 [primary_unit]
                     x,y=$x1,$y1
                 [/primary_unit]
@@ -174,13 +210,14 @@
                 moves=0
             [/modify_unit]
             [fire_event]
-                name=post collar
+                name=post metamorph
                 [primary_unit]
                     x,y=$x1,$y1
                 [/primary_unit]
             [/fire_event]
         [/command]
     [/set_menu_item]
+    {CLEAR_VARIABLE elem}
 #enddef
 
 #define METAMORPH_ALL

macros/macros.cfg

@@ -101,6 +101,7 @@
         x,y=$summonerleader.x,$summonerleader.y
         find_vacant=yes
         text= _ "Recalled..."
+        fire_event=yes
         {COLOR_HEAL}
     [/unstore_unit]
     [animate_unit]

scenarios/23_Ruins.cfg

@@ -2221,6 +2221,7 @@ The order in which the spells are cast does not matter."
         {CLEAR_VARIABLE castle_new}
         {CLEAR_VARIABLE keep_new}
         {CLEAR_VARIABLE summoners}
+        {CLEAR_VARIABLE toohot}
         [endlevel]
             result=victory
             carryover_report=no
@@ -2596,7 +2597,7 @@ The order in which the spells are cast does not matter."
 
     #fire elemental limit
     [event]
-        name=recruit,recall,post advance,post summon,post gate,post collar
+        name=unit placed,post advance,post metamorph
         first_time_only=yes
 
         [filter]
@@ -2611,7 +2612,7 @@ The order in which the spells are cast does not matter."
 
     #lock fire elementals
     [event]
-        name=recruit,recall,post advance,post summon,post gate,post collar
+        name=unit placed,post advance,post metamorph
         first_time_only=no
 
         [filter]
@@ -2624,8 +2625,9 @@ The order in which the spells are cast does not matter."
                 count=3-999
             [/have_unit]
             [then]
+                {VARIABLE toohot yes}
                 [disallow_recruit]
-                    side=1
+                    side=1,5
                     type=EoMa_Fire_Avatar,EoMa_Fire_Elemental
                 [/disallow_recruit]
                 [store_unit]
@@ -2644,9 +2646,29 @@ The order in which the spells are cast does not matter."
         [/if]
     [/event]
 
+    [event]
+        name=try summon EoMa_Fire_Elemental
+        first_time_only=no
+
+        [if]
+            [have_unit]
+                type=EoMa_Fire_God,EoMa_Fire_Avatar,EoMa_Fire_Elemental
+                count=3-999
+            [/have_unit]
+            [then]
+                [fire_event]
+                    name=fire_comment
+                [/fire_event]
+                [return][/return]
+            [/then]
+        [/if]
+    [/event]
+
     #unlock fire elementals
     [event]
-        name=die,pre collar
+        # Listen to last breath rather than die, so that unlocking always
+        # happens before possible revivals on a later name=die (e.g. from Collar.)
+        name=last breath,pre metamorph
         first_time_only=no
 
         [filter]
@@ -2655,12 +2677,13 @@ The order in which the spells are cast does not matter."
 
         [if]
             [have_unit]
-                type=EoMa_Fire_Avatar,EoMa_Fire_Elemental
-                count=3-999
+                type=EoMa_Fire_God,EoMa_Fire_Avatar,EoMa_Fire_Elemental
+                count=4-999
             [/have_unit]
             [else]
+                {VARIABLE toohot no}
                 [allow_recruit]
-                    side=1
+                    side=1,5
                     type=EoMa_Fire_Avatar,EoMa_Fire_Elemental
                 [/allow_recruit]
                 [foreach]
@@ -2679,6 +2702,7 @@ The order in which the spells are cast does not matter."
 
     [event]
         name=fire_comment
+        first_time_only=no
 
         [message]
             speaker=Mehir