From a9661a233ac63ed6a0ff25f974151e765a289d9f Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Tue, 13 Apr 2021 14:28:42 +0300 Subject: [PATCH] Fix Lua error in Har8 when Merc HFac is captured after Palace is killed. --- mods/d2k/maps/harkonnen-08/harkonnen08.lua | 2 +- mods/d2k/maps/harkonnen-08/map.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mods/d2k/maps/harkonnen-08/harkonnen08.lua b/mods/d2k/maps/harkonnen-08/harkonnen08.lua index ecbeb9d551..9b6ce5429c 100644 --- 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 index 94d7d2dbeb..8caea6c51c 100644 --- 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