Merge pull request #110 from cooljeanius/fix_issue_23

Fix loyalty check in S02 for issue #23
nemaara · Mar 1, 2023 · 6bfc26b · 6bfc26b · cooljeanius · Jan 28, 2024
2 parents d4c0d74 + d3170a9
commit 6bfc26b
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/scenarios/02_Fighting_for_Passage.cfg b/scenarios/02_Fighting_for_Passage.cfg
@@ -917,33 +917,34 @@
             side=1
         [/filter]
         {MSG_Gawen _"Poor fellow!"}
+        [heal_unit]
+            [filter]
+                id=$unit.id
+            [/filter]
+            amount=1
+        [/heal_unit]
 #ifdef NIGHTMARE
         #po: be terser for NIGHTMARE difficulty:
         {MSG_Reme _"He dies an honorable death. You will have to get used to losing units."}
 #else
         #po: all other difficulties; have this be more advice-like:
         {MSG_Reme _"He dies an honorable death. You cannot let the fear of losing units paralyse you; there are many more clansmen ready to fight for you."}
 #endif
-        # FIXME: This loyalty check doesn't seem to work, even after changing it from a "die" event to a "last breath" event, so I don't know what's wrong:
+        # Getting this loyalty check to work was a pain; see issue 23: https://github.com/nemaara/A_New_Order/issues/23
         [if]
             [have_unit]
                 id=$unit.id
-                [filter_wml]
-                    upkeep="loyal"
-                    [or]
-                        [modifications]
-                            [trait]
-                                id=loyal
-                            [/trait]
-                        [/modifications]
-                    [/or]
-                [/filter_wml]
+                upkeep="loyal"
             [/have_unit]
             [then]
                 {MSG_Gawen _"But he was loyal to our cause though!"}
                 {MSG_Reme _"Well, I suppose you do have a point there. Feel free to be more careful with our most loyal supporters."}
             [/then]
         [/if]
+        [kill]
+            id=$unit.id
+            animate=yes
+        [/kill]
     [/event]
 
     [event]