From 637994690a700c0179cc41d2844f6cbd343f3193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Severin=20Gl=C3=B6ckner?=
 <severin.gloeckner@stud.htwk-leipzig.de>
Date: Sat, 12 May 2018 20:52:13 +0200
Subject: [PATCH] NR S2: better conditional for victory event

previousl one could trigger victory while being at
the other side of the cave wall

[ci skip]

(cherry-picked from commit 41298d76c7c659ce318a3584413c8ecb6dd49da9)
---
 .../scenarios/02_01_Infested_Caves.cfg                | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg b/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
index 16bc642419d1..518ca32c7203 100644
--- a/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
+++ b/data/campaigns/Northern_Rebirth/scenarios/02_01_Infested_Caves.cfg
@@ -218,7 +218,7 @@
                 [/show_if]
             [/objective]
             [objective]
-                description= _ "Move Tallin within five hexes of Hamel to speak with him"
+                description= _ "Move Tallin to the Dwarvish area to meet with Lord Hamel"
                 condition=win
                 [show_if]
                     [variable]
@@ -718,7 +718,7 @@
         [/message]
     [/event]
 
-    # When the eastern trolls are defeated the undead wii get their villages (not much)
+    # When the eastern trolls are defeated the undead wii get their villages (not many)
     # and focus on the player and the dwarves. The player is probably otherwise busy.
     [event]
         name=die
@@ -728,7 +728,7 @@
         [/filter]
         [filter_second]
             race=undead
-        [filter_second]
+        [/filter_second]
         [gold]
             side=4
             amount=50
@@ -833,6 +833,9 @@
     # TODO: it's possible (but unlikely) that this could result in an unwinnable
     # scenario if all hexes near Hamel are full. Aagin, though, unlikely. Still,
     # it might be worth coming up with an even better victory condition.
+    # TODO: Due to the radius also taking into account hexes on the other side
+    # of the wall the area has been further restricted to the cave area. Ideally
+    # the filter should know when Hammel would be in Tallins vision area.
     [event]
         name=moveto
         [filter]
@@ -843,6 +846,8 @@
                 [/filter]
                 radius=5
             [/filter_location]
+            x=24-34
+            y=21-30
         [/filter]
 
         [message]