NR S5a: more bugfixes

* now the situation can appear that spiders can attack Malifor, this handles it. * add *^Xo Terrain to the filter. While there is no bug to fix, it looks like it belongs there too. * work around a tile glitching with an [item] at 22,4 * remove code referring to removed variables * and run wmlindent [ci skip] (cherry-picked from commit fc427ce)
wesnoth · Oct 7, 2018 · 8d282c9 · 8d282c9
1 parent 72775f4
commit 8d282c9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/data/campaigns/Northern_Rebirth/lua/respawn_utils.lua b/data/campaigns/Northern_Rebirth/lua/respawn_utils.lua
@@ -26,7 +26,7 @@ function wesnoth.wml_actions.find_respawn_point(cfg)
 				}
 			},
 			T["not"] {
-				terrain = "Wo,*^Xm,X*,Q*"
+				terrain = "Wo,*^Xm,*^Xo,X*,Q*"
 			}
 		})
 

diff --git a/data/campaigns/Northern_Rebirth/maps/05a_01_The_Pursuit.map b/data/campaigns/Northern_Rebirth/maps/05a_01_The_Pursuit.map
@@ -2,8 +2,8 @@ Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xu, Xos, Xu, Xos, Xu, Xu, X
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Xu, Rd, Xu, Re, Xu, Xu, Xu, Uh^Uf, Xu, Xu, Xu, Xu, Xu, Xos, Qxu, Xos, Xu, Xu, Xu, Wog^Xo, Wog^Xo, Wog^Xo, Xu, Xos, Xu, Xu, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Uu, Kh, Cud, Xu, Uu, Xu, Re^Edb, Rd^Edb, Re^Edb, Rd^Edb, Re, Re^Es, Re^Edb, Rd^Edb, Re^Edb, Xu, Uu^Es, Uu^Uf, Uh, Xu, Xos, Xos, Urb, Urb, Cud, Xos, Xos, Xu, Xuc, Wog, Wog, Wog^Xo, Wog^Xo, Xos, Xos, Xu, Xu, Xu
 Xu, Xu, Xu, Xu, Xu, Cud, Uu, Xu, Uu, Xu, Re, Chr^Eb, Re^Edb, Re, Ch, Re^Edb, Rd, Chr^Eb, Re, Xu, Uu, Uu^Es, Uu, Xu, Cud, Cud, Urb, Urb, Urb, Cud, Xuc, Xuc, Cud, Wwg, Wwg, Wog, Wog, Wog^Xo, Wog^Xo, Xos, Xu, Xu
-Xu, Xu, Xu, Xu, Xu, Cud, Uu, Uu, Uu, Xu, Rd, Re^Es, Re^Es, Chr^Edb, Kh, Chr, Re, Rd^Edb, Re, Xu, Xu, Xu, Xuc, Xu, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Cud, Cud, Cud, Cud, Wwg, Wwg, Wog, Wog^Xo, Xos, Xos, Xu
-Xu, Xu, Xu, Xu, Xu, Cud, Xu, Xu, Xu, Xu, Re, Rd^Edb, Re^Edb, Chr, Ch, Chr, Re^Edb, Re, Rd, Xu, Xu, Xu, Xuc, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Cud^Ebn, Cud, 2 Kud, Cud, Cud, Cud, Xuc, Wog, Xos, Xos, Xu
+Xu, Xu, Xu, Xu, Xu, Cud, Uu, Uu, Uu, Xu, Rd, Re^Es, Re^Es, Chr^Edb, Kh, Chr, Re, Rd^Edb, Re, Xu, Xu, Xu, Xu, Xu, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Cud, Cud, Cud, Cud, Wwg, Wwg, Wog, Wog^Xo, Xos, Xos, Xu
+Xu, Xu, Xu, Xu, Xu, Cud, Xu, Xu, Xu, Xu, Re, Rd^Edb, Re^Edb, Chr, Ch, Chr, Re^Edb, Re, Rd, Xu, Xu, Xu, Xu, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Urb, Cud^Ebn, Cud, 2 Kud, Cud, Cud, Cud, Xuc, Wog, Xos, Xos, Xu
 Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Re, Chr^Eb, Re, Re, Re, Rd^Edb, Re, Chr^Eb, Re, Xu, Xu, Xu, Xuc, Cud^Eb, Urb, Urb, Urb, Urb, Urb, Urb, Rr, Rr, Urb, Cud^Ebn, Urb, Cud, Xuc, Xuc, Wwg, Wog, Xos, Xu
 Xu, Xu, Xu, Xu, Qxu, Xu, Xu, Cud, Rd, Uu, Uu, Re^Edb, Xu, Rd, Re^Es, Re^Es, Xu, Re, Xu, Xu, Xu, Xu, Xu, Xu, Urb, Urb, Urb, Urb, Rr, Rr, Urb, Urb, Urb, Urb, Urb, Urb, Xu, Xu, Wwg, Wog, Xos, Xos
 Xu, Xu, Qxu, Qxu, Uh^Vu, Uh, Re, Rd, Uu, Urb, Cud, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xu, Xos, Xos, Urb, Urb, Rr, Rr, Urb, Urb, Urb, Urb, Urb, Urb, Xu, Cud, Xu, Xu, Wwg^Xo, Wwg, Xos, Xos

diff --git a/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg b/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
@@ -760,7 +760,7 @@
             side=2,3,5,6,7,8
             x=24-31
             y=21-27
-            # exclude the ZoC of the unit guarding the entrance 
+            # exclude the ZoC of the unit guarding the entrance
             [not]
                 x=30,31
                 y=27,27

diff --git a/data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg b/data/campaigns/Northern_Rebirth/scenarios/05a_01_The_Pursuit.cfg
@@ -232,6 +232,17 @@
         team_name=monsters
         user_team_name= _ "Monsters"
         no_leader=yes
+
+        # If the players opens the other door, the spiders attack the undead too
+        # They can't harm Malifor, but they should not gather around him either
+        [ai]
+            [avoid]
+                [filter]
+                    id=Malifor
+                [/filter]
+                radius=3
+            [/avoid]
+        [/ai]
     [/side]
 
     # Whole lot of doors
@@ -2309,7 +2320,7 @@
             [/option]
         [/message]
     [/event]
-	
+
     #main gates from inside
     [event]
         name=moveto
@@ -2333,7 +2344,7 @@
         [sound]
             name=gate-fall.ogg
         [/sound]
-		
+
         [remove_item]
             x=23,24,25
             y=9,9,10
@@ -2525,7 +2536,7 @@
             [/option]
         [/message]
     [/event]
-	
+
     #flooded passage from inside
     [event]
         name=moveto
@@ -2557,7 +2568,6 @@
         [/terrain]
 
         {VARIABLE back_door_opened yes}
-
     [/event]
 
 #define MALIFOR_GUARD TYPE X Y
@@ -2651,7 +2661,7 @@
 
     # Don't allow anyone but Morvin and Thera to damage Malifor
     {FORCE_CHANCE_TO_HIT (
-        side=1
+        side=1,8
         [not]
             id=Father Morvin,Sister Thera
         [/not]
@@ -2846,7 +2856,6 @@
     [event]
         name=scenario_end
 
-        {CLEAR_VARIABLE malifor_respawn_point,malifor_died_by}
         {CLEAR_VARIABLE back_door_opened,main_door_opened,spider_door_opened,got_rod_of_justice}
     [/event]