Fix Lua error in Har8 when Merc HFac is captured after Palace is killed.

Inq8 · Apr 13, 2021 · a9661a2 · a9661a2
1 parent 2d05e10
commit a9661a2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/mods/d2k/maps/harkonnen-08/harkonnen08.lua b/mods/d2k/maps/harkonnen-08/harkonnen08.lua
@@ -281,7 +281,7 @@ WorldLoaded = function()
 	Trigger.OnCapture(MHeavyFactory, function()
 		player.MarkCompletedObjective(AllyWithMercenaries)
 		Media.DisplayMessage("Leader Captured. Mercenaries have been persuaded to fight with House Harkonnen.", "Mentat")
-		MercenaryAttackLocation = OPalace.Location
+		MercenaryAttackLocation = MercenaryAttackPoint.Location
 
 		ChangeOwner(mercenary_enemy, mercenary_ally)
 		SendStarportReinforcements(mercenary_ally)

diff --git a/mods/d2k/maps/harkonnen-08/map.yaml b/mods/d2k/maps/harkonnen-08/map.yaml
@@ -649,5 +649,8 @@ Actors:
 	SaboteurWaypoint6: waypoint
 		Owner: Neutral
 		Location: 64,91
+	MercenaryAttackPoint: waypoint
+		Owner: Neutral
+		Location: 53,38
 
 Rules: d2k|rules/campaign-rules.yaml, d2k|rules/campaign-tooltips.yaml, d2k|rules/campaign-palettes.yaml, rules.yaml