Added secondary unit filters to sighted events

Added secondary unit filters to all sighted events I found which seemed like they might suffer from the same problem as bug #22466. Fixes bug #22466.
wesnoth · Oct 7, 2014 · 5b1e975 · 5b1e975
1 parent 5c8eb65
commit 5b1e975
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 0 deletions.
diff --git a/data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg b/data/campaigns/Delfadors_Memoirs/scenarios/11_Wasteland.cfg
@@ -131,6 +131,10 @@
             side=3
         [/filter]
 
+        [filter_second]
+            side=1
+        [/filter_second]
+
         [if]
             [not]
                 [have_unit]

diff --git a/data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg b/data/campaigns/Eastern_Invasion/scenarios/13_The_Drowned_Plains.cfg
@@ -452,6 +452,9 @@
         [filter]
             id=Khrakrahs
         [/filter]
+        [filter_second]
+            side=1
+        [/filter_second]
         [fire_event]
             name=KK_spotted
         [/fire_event]

diff --git a/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg b/data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
@@ -642,6 +642,9 @@
         [filter]
             side=2
         [/filter]
+        [filter_second]
+            side=1
+        [/filter_second]
         [music]
             name="northerners.ogg"
             immediate=no
@@ -658,6 +661,9 @@
         [filter]
             side=3
         [/filter]
+        [filter_second]
+            side=1
+        [/filter_second]
         [message]
             speaker=unit
             message= _ "There they are! Charge!"
@@ -683,6 +689,9 @@
                 id=Rholandir
             [/not]
         [/filter]
+        [filter_second]
+            side=1
+        [/filter_second]
         [message]
             speaker=unit
             message= _ "There you are! You must come quickly east to Lintanir!!"

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/12_The_Underlevels.cfg
@@ -516,6 +516,10 @@
             id="Dranath"
         [/filter]
 
+        [filter_second]
+            side=1
+        [/filter_second]
+
         [message]
             speaker="Dranath"
             message= _ "You cannot pass, fools. The doors I guard are sealed by the power of the Hammer itself."
@@ -652,6 +656,10 @@
             id=Karrag
         [/filter]
 
+        [filter_second]
+            side=1
+        [/filter_second]
+
         [message]
             speaker=Karrag
             message= _ "Fresh blood! Exactly what I need to complete the rite."
@@ -1160,6 +1168,10 @@
             id="Aragoth"
         [/filter]
 
+        [filter_second]
+            side=1
+        [/filter_second]
+
         [gold]
             side=4
             amount=300

diff --git a/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg b/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
@@ -305,6 +305,10 @@
             type=Eyestalk
         [/filter]
 
+        [filter_second]
+            side=1
+        [/filter_second]
+
         [redraw]
             side=1
         [/redraw]
@@ -682,6 +686,10 @@
             id="Mal M'Brin"
         [/filter]
 
+        [filter_second]
+            side=1
+        [/filter_second]
+
         [redraw][/redraw]
         [message]
             speaker="Ethiliel"

diff --git a/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg b/data/campaigns/Two_Brothers/scenarios/03_Guarded_Castle.cfg
@@ -368,6 +368,9 @@ Yet for some reason I fear these brothers more. If Mordak were here it would be
         [filter]
             side=3
         [/filter]
+        [filter_second]
+            side=1
+        [/filter_second]
         [message]
             speaker=Knago-Brek
             message= _ "Haha! We not kill people for long time. Weapon wants blood. We now kill humans!!"

diff --git a/data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg b/data/campaigns/Two_Brothers/scenarios/04_Return_to_the_Village.cfg
@@ -178,6 +178,9 @@ But I am still troubled. I wonder... is this sense of foreboding I feel merely a
         [filter]
             id=Tairach
         [/filter]
+        [filter_second]
+            side=1
+        [/filter_second]
         [message]
             speaker=unit
             message= _ "We’re almost there!"
@@ -216,6 +219,9 @@ But I am still troubled. I wonder... is this sense of foreboding I feel merely a
         [filter]
             side=3
         [/filter]
+        [filter_second]
+            side=1
+        [/filter_second]
         [message]
             speaker=Reeve Hoban
             message= _ "I am glad to see you returned."

diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/11_Battle_for_Zocthanol_Isle.cfg
@@ -1078,6 +1078,10 @@
             id=Trapped Merman
         [/filter]
 
+        [filter_second]
+            side=1
+        [/filter_second]
+
         {CHECK_SPEAKER}
         [message]
             speaker=Trapped Merman