From 0dc5090f0b1a8c5f5487c6a9deb0796a8d995f83 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sat, 8 Oct 2016 17:52:48 +0200 Subject: [PATCH] Fix yak attacks in Evacuation --- mods/ra/maps/evacuation/evacuation.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/mods/ra/maps/evacuation/evacuation.lua b/mods/ra/maps/evacuation/evacuation.lua index 44db3d3ec6..bcafc6125e 100644 --- a/mods/ra/maps/evacuation/evacuation.lua +++ b/mods/ra/maps/evacuation/evacuation.lua @@ -73,16 +73,16 @@ SpawnAlliedReinforcements = function() end Yak = nil -YakAttack = function(yak) +YakAttack = function() local targets = Map.ActorsInCircle(YakAttackPoint.CenterPosition, WDist.FromCells(10), function(a) - return a.Owner == allies1 and not a.IsDead and a ~= Einstein and a ~= Tanya and a ~= Engineer and yak.CanTarget(a) + return a.Owner == allies1 and not a.IsDead and a ~= Einstein and a ~= Tanya and a ~= Engineer and Yak.CanTarget(a) end) if (#targets > 0) then - yak.Attack(Utils.Random(targets)) + Yak.Attack(Utils.Random(targets)) end - yak.Move(Map.ClosestEdgeCell(yak.Location)) - yak.Destroy() + Yak.Move(Map.ClosestEdgeCell(Yak.Location)) + Yak.Destroy() Trigger.OnRemovedFromWorld(Yak, function() Yak = nil end) @@ -269,7 +269,9 @@ SetupTriggers = function() return end - Yak = Reinforcements.Reinforce(soviets, { "yak" }, { YakEntryPoint.Location, YakAttackPoint.Location + CVec.New(0, -10) }, 0, YakAttack)[1] + Yak = Actor.Create("yak", true, { Owner = soviets, Location = YakEntryPoint.Location, CenterPosition = YakEntryPoint.CenterPosition + WVec.New(0, 0, Actor.CruiseAltitude("yak")) }) + Yak.Move(YakAttackPoint.Location + CVec.New(0, -10)) + Yak.CallFunc(YakAttack) end) Trigger.AfterDelay(ParabombDelay, SendParabombs)