Merge pull request #3886 from nemaara/trow

[TRoW] Small bugfixes

changelog.md

@@ -141,6 +141,10 @@
    * Northern Rebirth:
      * Fix loyal units obtained in S7 costing upkeep (introduced in 1.14.5)
      * S13: Improvement to the AIs
+   * The Rise of Wesnoth:
+     * S15: victory text is not used upon hero death
+     * S17d: enemy units are killed upon victory except for bats
+     * S22: cuttlefish now have the loyal icon
    * The South Guard:
      * Revised scenario and story dialogue.
      * Reworked and rebalanced all scenario and map designs.

data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg

@@ -419,6 +419,11 @@
 
     [event]
         name=die
+        [filter]
+            [not]
+                id=Lady Jessene,Prince Haldric,Lord Typhon
+            [/not]
+        [/filter]
 
         [move_unit_fake]
             type=Elvish Shyde

data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg

@@ -418,6 +418,7 @@
         {CLEAR_VARIABLE queen_awake}
         [kill]
             side=2,3
+            race=undead
             fire_event=no
         [/kill]
         [endlevel]

data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg

@@ -963,7 +963,7 @@
                     [modifications]
                         {TRAIT_LOYAL}
                     [/modifications]
-                    # Omitting {IS_LOYAL} deliberately
+                    {IS_LOYAL}
                 [/unit]
 
                 [message]
@@ -1092,7 +1092,7 @@
                     [modifications]
                         {TRAIT_LOYAL}
                     [/modifications]
-                    # Omitting {IS_LOYAL} deliberately
+                    {IS_LOYAL}
                 [/unit]
 
                 [message]
@@ -1221,7 +1221,7 @@
                     [modifications]
                         {TRAIT_LOYAL}
                     [/modifications]
-                    # Omitting {IS_LOYAL} deliberately
+                    {IS_LOYAL}
                 [/unit]
 
                 [scroll_to_unit]