Merged 14632 14637 14638 into trunk

data/campaigns/The_South_Guard/scenarios/7a.Into_The_Depths.cfg

@@ -408,7 +408,6 @@
 					speaker=Grée
 					message= _ "Bah! Grind their bones!"
 				[/message]
-				victory_when_enemies_defeated=yes
 			[/command]
 		[/option]
 	[/message]
@@ -493,12 +492,26 @@
 	[filter]
 		description=Mal M'Brin
 	[/filter]
-
+	[set_variable]
+		name=undead_dead
+		value=true
+	[/set_variable]
 	[message]
 		speaker=M'Brin
 		message= _ "Nooo! This cannot be. The elves I once lead have destroyed me. After all I have sacrificed, I still die...."
 	[/message]
-
+        [if]
+                [variable]
+                        name=troll_dead
+			equals=true
+                [/variable]
+                [then]
+                        [endlevel]
+                                result=victory
+                                bonus=no
+                        [/endlevel]
+                [/then]
+        [/it]
 	[if]
 		[variable]
 			name=troll_allies
@@ -566,15 +579,38 @@
 						side=3
 						team_name=trolls
 					[/modify_side]
-					victory_when_enemies_defeated=yes
 				[/else]
 			[/if]
 		[/then]
 	[/if]
-
 	{CLEAR_VARIABLE bomb_placed}
 	{CLEAR_VARIABLE troll_allies}
 
 [/event]
 
+[event]
+        name=die
+        [filter]
+                description=Grée
+        [/filter]
+	[set_variable]
+		name=troll_dead
+		value=true
+	[/set_variable]
+	[if]
+		[variable]
+			name=undead_dead
+			value=true
+		[/variable]
+		[then]
+			[endlevel]
+				result=victory
+				bonus=no
+			[/endlevel]
+		[/then]
+	[/if]
+	{CLEAR_VARIABLE bomb_placed}
+	{CLEAR_VARIABLE troll_allies}
+[/event]
+
 [/scenario]