From e5a1a8a70608f51f23767a63dae3999fee3a8f1e Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 10 Jun 2020 22:14:52 +0100 Subject: [PATCH] Replace deprecated API usage. --- mods/cnc/bits/scripts/campaign-global.lua | 2 +- mods/cnc/maps/gdi09/gdi09.lua | 2 +- mods/cnc/maps/nod05/nod05.lua | 2 +- mods/cnc/maps/nod06a/nod06a.lua | 2 +- mods/cnc/maps/nod07a/nod07a.lua | 2 +- mods/cnc/maps/nod07b/nod07b.lua | 2 +- mods/cnc/maps/nod08a/nod08a.lua | 4 ++-- mods/cnc/maps/nod08b/nod08b.lua | 4 ++-- mods/cnc/maps/nod09/nod09.lua | 2 +- mods/d2k/maps/harkonnen-07/harkonnen07.lua | 2 +- mods/d2k/maps/harkonnen-08/harkonnen08.lua | 2 +- mods/d2k/maps/harkonnen-09a/harkonnen09a.lua | 2 +- mods/d2k/maps/harkonnen-09b/harkonnen09b.lua | 2 +- mods/ra/maps/allies-03a/allies03a.lua | 4 ++-- mods/ra/maps/allies-03b/allies03b.lua | 8 ++++---- mods/ra/maps/allies-04/allies04.lua | 2 +- mods/ra/maps/allies-06a/allies06a.lua | 2 +- mods/ra/maps/allies-07/allies07-AI.lua | 2 +- mods/ra/maps/allies-08a/allies08a-AI.lua | 4 ++-- mods/ra/maps/allies-08a/allies08a.lua | 2 +- mods/ra/maps/allies-08b/allies08b-AI.lua | 4 ++-- mods/ra/maps/allies-08b/allies08b.lua | 2 +- mods/ra/maps/desert-shellmap/desert-shellmap.lua | 4 ++-- mods/ra/maps/evacuation/evacuation.lua | 6 +++--- mods/ra/maps/exodus/exodus.lua | 2 +- mods/ra/maps/fort-lonestar/fort-lonestar.lua | 2 +- mods/ra/maps/intervention/intervention.lua | 2 +- mods/ra/maps/soviet-02a/soviet02a.lua | 4 ++-- mods/ra/maps/soviet-02b/soviet02b.lua | 6 +++--- mods/ra/maps/soviet-03/soviet03.lua | 2 +- .../soviet-05/soviet05-reinforcements_teams.lua | 4 ++-- mods/ra/maps/soviet-08a/soviet08a.lua | 2 +- .../soviet-soldier-volkov-n-chitzkoi.lua | 2 +- mods/ra/maps/survival01/survival01.lua | 14 +++++++------- mods/ra/maps/survival02/survival02.lua | 8 ++++---- mods/ra/maps/top-o-the-world/scu36ea.lua | 4 ++-- 36 files changed, 61 insertions(+), 61 deletions(-) diff --git a/mods/cnc/bits/scripts/campaign-global.lua b/mods/cnc/bits/scripts/campaign-global.lua index 51be0dccca..6ed54b11b2 100644 --- a/mods/cnc/bits/scripts/campaign-global.lua +++ b/mods/cnc/bits/scripts/campaign-global.lua @@ -40,7 +40,7 @@ InitObjectives = function(player) end ReinforceWithLandingCraft = function(player, units, transportStart, transportUnload, rallypoint) - local transport = Actor.Create("oldlst", true, { Owner = player, Facing = 0, Location = transportStart }) + local transport = Actor.Create("oldlst", true, { Owner = player, Facing = Angle.North, Location = transportStart }) local subcell = 0 Utils.Do(units, function(a) transport.LoadPassenger(Actor.Create(a, false, { Owner = transport.Owner, Facing = transport.Facing, Location = transportUnload, SubCell = subcell })) diff --git a/mods/cnc/maps/gdi09/gdi09.lua b/mods/cnc/maps/gdi09/gdi09.lua index bf165af607..f682d76879 100644 --- a/mods/cnc/maps/gdi09/gdi09.lua +++ b/mods/cnc/maps/gdi09/gdi09.lua @@ -100,7 +100,7 @@ end SpawnGunboat = function() Media.PlaySpeechNotification(GDI, "Reinforce") - Actor.Create("boat", true, { Owner = GDI, Facing = 0, Location = CPos.New(62,37) }) + Actor.Create("boat", true, { Owner = GDI, Facing = Angle.North, Location = CPos.New(62,37) }) end WorldLoaded = function() diff --git a/mods/cnc/maps/nod05/nod05.lua b/mods/cnc/maps/nod05/nod05.lua index fe92471518..7b5f0d1395 100644 --- a/mods/cnc/maps/nod05/nod05.lua +++ b/mods/cnc/maps/nod05/nod05.lua @@ -46,7 +46,7 @@ SendGDIAirstrike = function() local target = GetAirstrikeTarget(Nod) if target then - CommCenter.SendAirstrike(target, false, Facing.NorthEast + 4) + CommCenter.TargetAirstrike(target, Angle.NorthEast + Angle.New(16)) Trigger.AfterDelay(AirstrikeDelay, SendGDIAirstrike) else Trigger.AfterDelay(AirstrikeDelay/4, SendGDIAirstrike) diff --git a/mods/cnc/maps/nod06a/nod06a.lua b/mods/cnc/maps/nod06a/nod06a.lua index b12da0e54d..b23df5f29e 100644 --- a/mods/cnc/maps/nod06a/nod06a.lua +++ b/mods/cnc/maps/nod06a/nod06a.lua @@ -81,7 +81,7 @@ Atk3TriggerFunction = function() local target = targets[DateTime.GameTime % #targets + 1].CenterPosition if target then - CommCenter.SendAirstrike(target, false, Facing.NorthEast + 4) + CommCenter.TargetAirstrike(target, Angle.NorthEast + Angle.New(16)) end end end diff --git a/mods/cnc/maps/nod07a/nod07a.lua b/mods/cnc/maps/nod07a/nod07a.lua index 75ebe01e9c..26e717038e 100644 --- a/mods/cnc/maps/nod07a/nod07a.lua +++ b/mods/cnc/maps/nod07a/nod07a.lua @@ -76,7 +76,7 @@ SendGDIAirstrike = function(hq, delay) local target = GetAirstrikeTarget(Nod) if target then - hq.SendAirstrike(target, false, Facing.NorthEast + 4) + hq.TargetAirstrike(target, Angle.NorthEast + Angle.New(16)) Trigger.AfterDelay(delay, function() SendGDIAirstrike(hq, delay) end) else Trigger.AfterDelay(delay/4, function() SendGDIAirstrike(hq, delay) end) diff --git a/mods/cnc/maps/nod07b/nod07b.lua b/mods/cnc/maps/nod07b/nod07b.lua index 3e35dba05f..fc97f11d52 100644 --- a/mods/cnc/maps/nod07b/nod07b.lua +++ b/mods/cnc/maps/nod07b/nod07b.lua @@ -83,7 +83,7 @@ SendGDIAirstrike = function(hq, delay) local target = GetAirstrikeTarget(Nod) if target then - hq.SendAirstrike(target, false, Facing.NorthEast + 4) + hq.TargetAirstrike(target, Angle.NorthEast + Angle.New(16)) Trigger.AfterDelay(delay, function() SendGDIAirstrike(hq, delay) end) else Trigger.AfterDelay(delay/4, function() SendGDIAirstrike(hq, delay) end) diff --git a/mods/cnc/maps/nod08a/nod08a.lua b/mods/cnc/maps/nod08a/nod08a.lua index df38dbbe4a..8efa664f18 100644 --- a/mods/cnc/maps/nod08a/nod08a.lua +++ b/mods/cnc/maps/nod08a/nod08a.lua @@ -71,7 +71,7 @@ SendGDIAirstrike = function(hq, delay) local target = GetAirstrikeTarget(Nod) if target then - hq.SendAirstrike(target, false, Facing.NorthEast + 4) + hq.TargetAirstrike(target, Angle.NorthEast + Angle.New(16)) Trigger.AfterDelay(delay, function() SendGDIAirstrike(hq, delay) end) else Trigger.AfterDelay(delay/4, function() SendGDIAirstrike(hq, delay) end) @@ -104,7 +104,7 @@ Trigger.OnAllKilledOrCaptured(Outpost, function() Trigger.AfterDelay(DateTime.Minutes(1), function() if not GDIHQ.IsDead and (not NodHand.IsDead or not NodNuke.IsDead) then local airstrikeproxy = Actor.Create("airstrike.proxy", false, { Owner = GDI }) - airstrikeproxy.SendAirstrike(AirstrikeTarget.CenterPosition, false, Facing.NorthEast + 4) + airstrikeproxy.TargetAirstrike(AirstrikeTarget.CenterPosition, Angle.NorthEast + Angle.New(16)) airstrikeproxy.Destroy() end end) diff --git a/mods/cnc/maps/nod08b/nod08b.lua b/mods/cnc/maps/nod08b/nod08b.lua index 584aa2fc28..e28c1feecd 100644 --- a/mods/cnc/maps/nod08b/nod08b.lua +++ b/mods/cnc/maps/nod08b/nod08b.lua @@ -63,7 +63,7 @@ SendGDIAirstrike = function(hq, delay) local target = GetAirstrikeTarget(Nod) if target then - hq.SendAirstrike(target, false, Facing.NorthEast + 4) + hq.TargetAirstrike(target, Angle.NorthEast + Angle.New(16)) Trigger.AfterDelay(delay, function() SendGDIAirstrike(hq, delay) end) else Trigger.AfterDelay(delay/4, function() SendGDIAirstrike(hq, delay) end) @@ -99,7 +99,7 @@ Trigger.OnAllKilledOrCaptured(Outpost, function() Trigger.AfterDelay(DateTime.Minutes(1), function() if not GDIHQ.IsDead and (not NodHand.IsDead or not NodNuke.IsDead) then local airstrikeproxy = Actor.Create("airstrike.proxy", false, { Owner = GDI }) - airstrikeproxy.SendAirstrike(AirstrikeTarget.CenterPosition, false, Facing.NorthEast + 4) + airstrikeproxy.TargetAirstrike(AirstrikeTarget.CenterPosition, Angle.NorthEast + Angle.New(16)) airstrikeproxy.Destroy() end end) diff --git a/mods/cnc/maps/nod09/nod09.lua b/mods/cnc/maps/nod09/nod09.lua index 3361666a8d..2e9be965d2 100644 --- a/mods/cnc/maps/nod09/nod09.lua +++ b/mods/cnc/maps/nod09/nod09.lua @@ -56,7 +56,7 @@ SendGDIAirstrike = function(hq, delay) local target = GetAirstrikeTarget(Nod) if target then - hq.SendAirstrike(target, false, Facing.NorthEast + 4) + hq.TargetAirstrike(target, Angle.NorthEast + Angle.New(16)) Trigger.AfterDelay(delay, function() SendGDIAirstrike(hq, delay) end) else Trigger.AfterDelay(delay/4, function() SendGDIAirstrike(hq, delay) end) diff --git a/mods/d2k/maps/harkonnen-07/harkonnen07.lua b/mods/d2k/maps/harkonnen-07/harkonnen07.lua index e49f42625e..cd0beea19e 100644 --- a/mods/d2k/maps/harkonnen-07/harkonnen07.lua +++ b/mods/d2k/maps/harkonnen-07/harkonnen07.lua @@ -163,7 +163,7 @@ SendAirStrike = function() end) if #targets > 0 then - AHiTechFactory.SendAirstrike(Utils.Random(targets).CenterPosition, true, 0) + AHiTechFactory.TargetAirstrike(Utils.Random(targets).CenterPosition) end Trigger.AfterDelay(DateTime.Minutes(5), SendAirStrike) diff --git a/mods/d2k/maps/harkonnen-08/harkonnen08.lua b/mods/d2k/maps/harkonnen-08/harkonnen08.lua index 737ad3a7f9..ecbeb9d551 100644 --- a/mods/d2k/maps/harkonnen-08/harkonnen08.lua +++ b/mods/d2k/maps/harkonnen-08/harkonnen08.lua @@ -133,7 +133,7 @@ SendAirStrike = function() end) if #targets > 0 then - AHiTechFactory.SendAirstrike(Utils.Random(targets).CenterPosition, true, 0) + AHiTechFactory.TargetAirstrike(Utils.Random(targets).CenterPosition) end Trigger.AfterDelay(DateTime.Minutes(5), SendAirStrike) diff --git a/mods/d2k/maps/harkonnen-09a/harkonnen09a.lua b/mods/d2k/maps/harkonnen-09a/harkonnen09a.lua index beb4e2f4f3..c1b2ac5ae3 100644 --- a/mods/d2k/maps/harkonnen-09a/harkonnen09a.lua +++ b/mods/d2k/maps/harkonnen-09a/harkonnen09a.lua @@ -178,7 +178,7 @@ SendAirStrike = function() end) if #targets > 0 then - AHiTechFactory.SendAirstrike(Utils.Random(targets).CenterPosition, true, 0) + AHiTechFactory.TargetAirstrike(Utils.Random(targets).CenterPosition) end Trigger.AfterDelay(DateTime.Minutes(5), SendAirStrike) diff --git a/mods/d2k/maps/harkonnen-09b/harkonnen09b.lua b/mods/d2k/maps/harkonnen-09b/harkonnen09b.lua index 0397f7eb1c..15cff44003 100644 --- a/mods/d2k/maps/harkonnen-09b/harkonnen09b.lua +++ b/mods/d2k/maps/harkonnen-09b/harkonnen09b.lua @@ -184,7 +184,7 @@ SendAirStrike = function() end) if #targets > 0 then - AHiTechFactory.SendAirstrike(Utils.Random(targets).CenterPosition, true, 0) + AHiTechFactory.TargetAirstrike(Utils.Random(targets).CenterPosition) end Trigger.AfterDelay(DateTime.Minutes(5), SendAirStrike) diff --git a/mods/ra/maps/allies-03a/allies03a.lua b/mods/ra/maps/allies-03a/allies03a.lua index 03190ac86d..5fa3a4e4e3 100644 --- a/mods/ra/maps/allies-03a/allies03a.lua +++ b/mods/ra/maps/allies-03a/allies03a.lua @@ -73,14 +73,14 @@ end SendUSSRParadrops = function() local powerproxy = Actor.Create("powerproxy.paratroopers", false, { Owner = ussr }) - local aircraftA = powerproxy.ActivateParatroopers(ParadropLZ.CenterPosition, 128 + 32) + local aircraftA = powerproxy.TargetParatroopers(ParadropLZ.CenterPosition, Angle.SouthEast) Utils.Do(aircraftA, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) end) end) - local aircraftB = powerproxy.ActivateParatroopers(ParadropLZ.CenterPosition, 128 - 32) + local aircraftB = powerproxy.TargetParatroopers(ParadropLZ.CenterPosition, Angle.SouthWest) Utils.Do(aircraftB, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) diff --git a/mods/ra/maps/allies-03b/allies03b.lua b/mods/ra/maps/allies-03b/allies03b.lua index 439db1e9b6..69460ba801 100644 --- a/mods/ra/maps/allies-03b/allies03b.lua +++ b/mods/ra/maps/allies-03b/allies03b.lua @@ -68,7 +68,7 @@ ProduceUnits = function(factory, count) end SetupAlliedUnits = function() - Tanya = Actor.Create(TanyaType, true, { Owner = player, Location = TanyaWaypoint.Location, Facing = 128 }) + Tanya = Actor.Create(TanyaType, true, { Owner = player, Location = TanyaWaypoint.Location, Facing = Angle.South }) if TanyaType == "e7.noautotarget" then Trigger.AfterDelay(DateTime.Seconds(2), function() @@ -89,13 +89,13 @@ SetupTopRightIsland = function() player.MarkCompletedObjective(FindAllies) Media.PlaySpeechNotification(player, "AlliedReinforcementsArrived") Reinforcements.Reinforce(player, AlliedIslandReinforcements, { AlliedIslandReinforcementsEntry.Location, IslandParadropReinforcementsDropzone.Location }) - SendUSSRParadrops(128 + 52, IslandParadropReinforcementsDropzone) + SendUSSRParadrops(Angle.New(720), IslandParadropReinforcementsDropzone) end SendUSSRParadrops = function(facing, dropzone) local paraproxy = Actor.Create("powerproxy.paratroopers", false, { Owner = ussr }) - local aircraft = paraproxy.ActivateParatroopers(dropzone.CenterPosition, facing) + local aircraft = paraproxy.TargetParatroopers(dropzone.CenterPosition, facing) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) @@ -336,7 +336,7 @@ InitTriggers = function() if a.Owner == player and a.Type ~= "jeep.mission" and not paradropsTriggered then paradropsTriggered = true Trigger.RemoveFootprintTrigger(id) - SendUSSRParadrops(54, ParadropReinforcementsDropzone) + SendUSSRParadrops(Angle.New(216), ParadropReinforcementsDropzone) end end) Trigger.OnEnteredFootprint(ReinforcementsTriggerArea, function(a, id) diff --git a/mods/ra/maps/allies-04/allies04.lua b/mods/ra/maps/allies-04/allies04.lua index a58a929ae8..5c31b755af 100644 --- a/mods/ra/maps/allies-04/allies04.lua +++ b/mods/ra/maps/allies-04/allies04.lua @@ -57,7 +57,7 @@ ParadropLZs = { ParadropPoint1.CenterPosition, ParadropPoint2.CenterPosition, Pa Paradropped = 0 Paradrop = function() Trigger.AfterDelay(Utils.RandomInteger(ParadropDelay[1], ParadropDelay[2]), function() - local aircraft = PowerProxy.ActivateParatroopers(Utils.Random(ParadropLZs)) + local aircraft = PowerProxy.TargetParatroopers(Utils.Random(ParadropLZs)) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) diff --git a/mods/ra/maps/allies-06a/allies06a.lua b/mods/ra/maps/allies-06a/allies06a.lua index ce8577667d..dbd542050b 100644 --- a/mods/ra/maps/allies-06a/allies06a.lua +++ b/mods/ra/maps/allies-06a/allies06a.lua @@ -146,7 +146,7 @@ InfiltrateTechCenter = function() local Proxy = Actor.Create("powerproxy.paratroopers", false, { Owner = ussr }) Utils.Do(ParadropWaypoints[Map.LobbyOption("difficulty")], function(waypoint) - Proxy.ActivateParatroopers(waypoint.CenterPosition, Facing.South) + Proxy.TargetParatroopers(waypoint.CenterPosition, Angle.South) end) Proxy.Destroy() end) diff --git a/mods/ra/maps/allies-07/allies07-AI.lua b/mods/ra/maps/allies-07/allies07-AI.lua index 27189dae0c..a247ec3946 100644 --- a/mods/ra/maps/allies-07/allies07-AI.lua +++ b/mods/ra/maps/allies-07/allies07-AI.lua @@ -37,7 +37,7 @@ Paradropped = 0 Paradrop = function() Trigger.AfterDelay(Utils.RandomInteger(ParadropDelay[1], ParadropDelay[2]), function() - local aircraft = PowerProxy.ActivateParatroopers(Utils.Random(ParadropLZs)) + local aircraft = PowerProxy.TargetParatroopers(Utils.Random(ParadropLZs)) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) diff --git a/mods/ra/maps/allies-08a/allies08a-AI.lua b/mods/ra/maps/allies-08a/allies08a-AI.lua index 366efbc43f..74f61f0c29 100644 --- a/mods/ra/maps/allies-08a/allies08a-AI.lua +++ b/mods/ra/maps/allies-08a/allies08a-AI.lua @@ -189,7 +189,7 @@ WTransWaves = function() end Paradrop = function() - local aircraft = PowerProxy.ActivateParatroopers(Utils.Random(ParadropLZs)) + local aircraft = PowerProxy.TargetParatroopers(Utils.Random(ParadropLZs)) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) @@ -218,7 +218,7 @@ SendParabombs = function() end) if #targets > 0 then - airfield.SendAirstrike(Utils.Random(targets).CenterPosition, true, 0) + airfield.TargetAirstrike(Utils.Random(targets).CenterPosition) end Trigger.AfterDelay(DateTime.Minutes(BombDelays), SendParabombs) diff --git a/mods/ra/maps/allies-08a/allies08a.lua b/mods/ra/maps/allies-08a/allies08a.lua index efeeffd2a6..94f743fe59 100644 --- a/mods/ra/maps/allies-08a/allies08a.lua +++ b/mods/ra/maps/allies-08a/allies08a.lua @@ -90,7 +90,7 @@ DefendChronosphereCompleted = function() local cells = Utils.ExpandFootprint({ ChronoshiftLocation.Location }, false) local units = { } for i = 1, #cells do - local unit = Actor.Create("2tnk", true, { Owner = greece, Facing = 0 }) + local unit = Actor.Create("2tnk", true, { Owner = greece, Facing = Angle.North }) units[unit] = cells[i] end Chronosphere.Chronoshift(units) diff --git a/mods/ra/maps/allies-08b/allies08b-AI.lua b/mods/ra/maps/allies-08b/allies08b-AI.lua index 83067f728e..ab92d5965e 100644 --- a/mods/ra/maps/allies-08b/allies08b-AI.lua +++ b/mods/ra/maps/allies-08b/allies08b-AI.lua @@ -188,7 +188,7 @@ WTransWaves = function() end Paradrop = function() - local aircraft = PowerProxy.ActivateParatroopers(Utils.Random(ParadropLZs)) + local aircraft = PowerProxy.TargetParatroopers(Utils.Random(ParadropLZs)) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) @@ -218,7 +218,7 @@ SendParabombs = function() end) if #targets > 0 then - airfield.SendAirstrike(Utils.Random(targets).CenterPosition, true, 0) + airfield.TargetAirstrike(Utils.Random(targets).CenterPosition) end Trigger.AfterDelay(DateTime.Minutes(BombDelays), SendParabombs) diff --git a/mods/ra/maps/allies-08b/allies08b.lua b/mods/ra/maps/allies-08b/allies08b.lua index 5b7557b105..e9324da06a 100644 --- a/mods/ra/maps/allies-08b/allies08b.lua +++ b/mods/ra/maps/allies-08b/allies08b.lua @@ -90,7 +90,7 @@ DefendChronosphereCompleted = function() local cells = Utils.ExpandFootprint({ ChronoshiftLocation.Location }, false) local units = { } for i = 1, #cells do - local unit = Actor.Create("2tnk", true, { Owner = greece, Facing = 0 }) + local unit = Actor.Create("2tnk", true, { Owner = greece, Facing = Angle.North }) units[unit] = cells[i] end Chronosphere.Chronoshift(units) diff --git a/mods/ra/maps/desert-shellmap/desert-shellmap.lua b/mods/ra/maps/desert-shellmap/desert-shellmap.lua index 4d302b1ea5..caf6500701 100644 --- a/mods/ra/maps/desert-shellmap/desert-shellmap.lua +++ b/mods/ra/maps/desert-shellmap/desert-shellmap.lua @@ -119,7 +119,7 @@ end ParadropSovietUnits = function() local lz = Utils.Random(ParadropWaypoints) - local aircraft = powerproxy.ActivateParatroopers(lz.CenterPosition) + local aircraft = powerproxy.TargetParatroopers(lz.CenterPosition) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) @@ -159,7 +159,7 @@ ChronoshiftAlliedUnits = function() local cells = Utils.ExpandFootprint({ ChronoshiftLocation.Location }, false) local units = { } for i = 1, #cells do - local unit = Actor.Create("2tnk", true, { Owner = allies, Facing = 0 }) + local unit = Actor.Create("2tnk", true, { Owner = allies, Facing = Angle.North }) BindActorTriggers(unit) units[unit] = cells[i] end diff --git a/mods/ra/maps/evacuation/evacuation.lua b/mods/ra/maps/evacuation/evacuation.lua index f5690bc1bf..44d0415f5a 100644 --- a/mods/ra/maps/evacuation/evacuation.lua +++ b/mods/ra/maps/evacuation/evacuation.lua @@ -115,8 +115,8 @@ end SendParabombs = function() local proxy = Actor.Create("powerproxy.parabombs", false, { Owner = soviets }) - proxy.SendAirstrikeFrom(BadgerEntryPoint2.Location, ParabombPoint1.Location) - proxy.SendAirstrikeFrom(BadgerEntryPoint2.Location + CVec.New(0, 3), ParabombPoint2.Location) + proxy.TargetAirstrike(ParabombPoint1.CenterPosition, (BadgerEntryPoint2.CenterPosition - ParabombPoint1.CenterPosition).Facing) + proxy.TargetAirstrike(ParabombPoint2.CenterPosition, (Map.CenterOfCell(BadgerEntryPoint2.Location + CVec.New(0, 3)) - ParabombPoint2.CenterPosition).Facing) proxy.Destroy() end @@ -126,7 +126,7 @@ SendParatroopers = function() local target = Map.CenterOfCell(para.drop) local dir = target - Map.CenterOfCell(para.entry) - local aircraft = proxy.ActivateParatroopers(target, dir.Facing) + local aircraft = proxy.TargetParatroopers(target, dir.Facing) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) diff --git a/mods/ra/maps/exodus/exodus.lua b/mods/ra/maps/exodus/exodus.lua index 02bb0f6d55..738b4aa858 100644 --- a/mods/ra/maps/exodus/exodus.lua +++ b/mods/ra/maps/exodus/exodus.lua @@ -185,7 +185,7 @@ SendSovietParadrop = function() local lz = Map.CenterOfCell(randomParadropCell) local powerproxy = Actor.Create("powerproxy.paratroopers", false, { Owner = soviets }) - powerproxy.ActivateParatroopers(lz) + powerproxy.TargetParatroopers(lz) powerproxy.Destroy() Trigger.AfterDelay(sovietParadropTicks, SendSovietParadrop) diff --git a/mods/ra/maps/fort-lonestar/fort-lonestar.lua b/mods/ra/maps/fort-lonestar/fort-lonestar.lua index e7c015e266..0482a8bd71 100644 --- a/mods/ra/maps/fort-lonestar/fort-lonestar.lua +++ b/mods/ra/maps/fort-lonestar/fort-lonestar.lua @@ -146,7 +146,7 @@ SendWave = function() if (Wave < #Waves) then if Utils.RandomInteger(1, 100) < ParaChance then - local aircraft = ParaProxy.ActivateParatroopers(Utils.Random(ParadropWaypoints).CenterPosition) + local aircraft = ParaProxy.TargetParatroopers(Utils.Random(ParadropWaypoints).CenterPosition) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) diff --git a/mods/ra/maps/intervention/intervention.lua b/mods/ra/maps/intervention/intervention.lua index e45a27b65e..4130983bb2 100644 --- a/mods/ra/maps/intervention/intervention.lua +++ b/mods/ra/maps/intervention/intervention.lua @@ -72,7 +72,7 @@ end ParadropSovietUnits = function() local powerproxy = Actor.Create("powerproxy.paratroopers", false, { Owner = soviets }) - local aircraft = powerproxy.ActivateParatroopers(MCVDeployLocation.CenterPosition, 256 - 53) + local aircraft = powerproxy.TargetParatroopers(MCVDeployLocation.CenterPosition, Angle.New(812)) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) diff --git a/mods/ra/maps/soviet-02a/soviet02a.lua b/mods/ra/maps/soviet-02a/soviet02a.lua index 5097a82b2c..b1757dab87 100644 --- a/mods/ra/maps/soviet-02a/soviet02a.lua +++ b/mods/ra/maps/soviet-02a/soviet02a.lua @@ -123,8 +123,8 @@ WorldLoaded = function() -- When destroying the allied radar dome or the refinery drop 2 badgers with 5 grenadiers each Trigger.OnAnyKilled({ AlliedDome, AlliedProc }, function() local powerproxy = Actor.Create("powerproxy.paratroopers", true, { Owner = player }) - powerproxy.ActivateParatroopers(ParadropLZ.CenterPosition, Facing.South) - powerproxy.ActivateParatroopers(ParadropLZ.CenterPosition, Facing.SouthEast) + powerproxy.TargetParatroopers(ParadropLZ.CenterPosition, Angle.South) + powerproxy.TargetParatroopers(ParadropLZ.CenterPosition, Angle.SouthEast) powerproxy.Destroy() end) end diff --git a/mods/ra/maps/soviet-02b/soviet02b.lua b/mods/ra/maps/soviet-02b/soviet02b.lua index 9911887750..3b15cee9d5 100644 --- a/mods/ra/maps/soviet-02b/soviet02b.lua +++ b/mods/ra/maps/soviet-02b/soviet02b.lua @@ -17,16 +17,16 @@ EnemyBaseEntranceShroudTrigger = { CPos.New(80, 73), CPos.New(81, 73), CPos.New( SendUSSRParadrops = function() paraproxy1 = Actor.Create("powerproxy.paratroopers", false, { Owner = player }) - paraproxy1.ActivateParatroopers(ParachuteBaseEntrance.CenterPosition, Facing.North) + paraproxy1.TargetParatroopers(ParachuteBaseEntrance.CenterPosition, Angle.North) paraproxy1.Destroy() end SendUSSRParadropsBase = function() paraproxy2 = Actor.Create("powerproxy.paratroopers2", false, { Owner = player }) - paraproxy2.ActivateParatroopers(ParachuteBase1.CenterPosition, Facing.East) + paraproxy2.TargetParatroopers(ParachuteBase1.CenterPosition, Angle.East) paraproxy2.Destroy() paraproxy3 = Actor.Create("powerproxy.paratroopers3", false, { Owner = player }) - paraproxy3.ActivateParatroopers(ParachuteBase2.CenterPosition, Facing.East) + paraproxy3.TargetParatroopers(ParachuteBase2.CenterPosition, Angle.East) paraproxy3.Destroy() end diff --git a/mods/ra/maps/soviet-03/soviet03.lua b/mods/ra/maps/soviet-03/soviet03.lua index 2c4e8b5c96..c17f64baac 100644 --- a/mods/ra/maps/soviet-03/soviet03.lua +++ b/mods/ra/maps/soviet-03/soviet03.lua @@ -96,7 +96,7 @@ end SendUSSRParadrops = function() paraproxy = Actor.Create("powerproxy.paratroopers", false, { Owner = player }) - paraproxy.ActivateParatroopers(ReinforcementDropOff.CenterPosition, 0) + paraproxy.TargetParatroopers(ReinforcementDropOff.CenterPosition, Angle.North) paraproxy.Destroy() end diff --git a/mods/ra/maps/soviet-05/soviet05-reinforcements_teams.lua b/mods/ra/maps/soviet-05/soviet05-reinforcements_teams.lua index e1dba6786e..d98a630e71 100644 --- a/mods/ra/maps/soviet-05/soviet05-reinforcements_teams.lua +++ b/mods/ra/maps/soviet-05/soviet05-reinforcements_teams.lua @@ -47,13 +47,13 @@ TanksGGWaypoints = { PatrolPoint2, BetweenBasesPoint, PrepGGArmyPoint } Para = function() local powerproxy = Actor.Create("powerproxy.paratroopers", false, { Owner = player }) - powerproxy.ActivateParatroopers(ParaPoint.CenterPosition, 28) + powerproxy.TargetParatroopers(ParaPoint.CenterPosition, Angle.New(112)) powerproxy.Destroy() end Para2 = function() local powerproxy = Actor.Create("powerproxy.paratroopers", false, { Owner = player }) - powerproxy.ActivateParatroopers(USSRExpansionPoint.CenterPosition, 28) + powerproxy.TargetParatroopers(USSRExpansionPoint.CenterPosition, Angle.New(112)) powerproxy.Destroy() end diff --git a/mods/ra/maps/soviet-08a/soviet08a.lua b/mods/ra/maps/soviet-08a/soviet08a.lua index e4242fc6d7..277e3d20da 100644 --- a/mods/ra/maps/soviet-08a/soviet08a.lua +++ b/mods/ra/maps/soviet-08a/soviet08a.lua @@ -53,7 +53,7 @@ end AddParadropReinforcementTrigger = function() Trigger.AfterDelay(DateTime.Seconds(90), function() Media.PlaySpeechNotification(ussr, "ReinforcementsArrived") - scripteddrop.ActivateParatroopers(ScriptedParadrop.CenterPosition, 10) + scripteddrop.TargetParatroopers(ScriptedParadrop.CenterPosition, Angle.New(40)) end) end diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua index 3eeca93867..b8ec9289aa 100644 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua +++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/soviet-soldier-volkov-n-chitzkoi.lua @@ -332,7 +332,7 @@ WorldLoaded = function() Trigger.OnEnteredFootprint(ParaTrigger, function(unit, id) if unit.Owner == player then local powerproxy = Actor.Create("powerproxy.pararifles", true, { Owner = greece }) - local aircraft = powerproxy.ActivateParatroopers(waypoint89.CenterPosition, Facing.South) + local aircraft = powerproxy.TargetParatroopers(waypoint89.CenterPosition, Angle.South) local prtcamera = Actor.Create("camera", true, { Owner = player, Location = waypoint89.Location }) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) diff --git a/mods/ra/maps/survival01/survival01.lua b/mods/ra/maps/survival01/survival01.lua index 357c02660c..84cf6d207b 100644 --- a/mods/ra/maps/survival01/survival01.lua +++ b/mods/ra/maps/survival01/survival01.lua @@ -53,10 +53,10 @@ FactoryClearRange = 10 ParadropTicks = DateTime.Seconds(30) ParadropWaypoints = { - { 192 + 4, ParaDrop1}, - { 192 - 4, ParaDrop2}, - { 192 + 4, Alliesbase2}, - { 192 - 4, Alliesbase1} + { Angle.East + Angle.New(16), ParaDrop1}, + { Angle.East - Angle.New(16), ParaDrop2}, + { Angle.East + Angle.New(16), Alliesbase2}, + { Angle.East - Angle.New(16), Alliesbase1} } NavalTransportPassengers = { "e1", "e1", "e2", "e4", "e4" } NavalReinforcementsWaypoints = { NavalWaypoint1, NavalWaypoint2, NavalWaypoint2, NavalWaypoint3 } @@ -191,7 +191,7 @@ IdleHunt = function(unit) end SendSovietParadrops = function(table) - local aircraft = powerproxy.ActivateParatroopers(table[2].CenterPosition, table[1]) + local aircraft = powerproxy.TargetParatroopers(table[2].CenterPosition, table[1]) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) @@ -290,7 +290,7 @@ end DropAlliedArtillery = function(facing, dropzone) local proxy = Actor.Create("powerproxy.allied", true, { Owner = allies }) - proxy.ActivateParatroopers(dropzone, facing) + proxy.TargetParatroopers(dropzone, facing) proxy.Destroy() end @@ -300,7 +300,7 @@ SendLongBowReinforcements = function() Reinforcements.Reinforce(allies, LongBowReinforcements, AlliedAirReinforcementsWaypoints[2]) if ParadropArtillery then - local facing = Utils.RandomInteger(Facing.NorthWest, Facing.SouthWest) + local facing = Angle.New(Utils.RandomInteger(128, 384)) DropAlliedArtillery(facing, Alliesbase.CenterPosition) end end diff --git a/mods/ra/maps/survival02/survival02.lua b/mods/ra/maps/survival02/survival02.lua index 74e1b24ae1..0af7aca0ed 100644 --- a/mods/ra/maps/survival02/survival02.lua +++ b/mods/ra/maps/survival02/survival02.lua @@ -129,7 +129,7 @@ end SendSovietParadrops = function(table) local paraproxy = Actor.Create(table.type, false, { Owner = soviets }) - local aircraft = paraproxy.ActivateParatroopers(table.target.CenterPosition) + local aircraft = paraproxy.TargetParatroopers(table.target.CenterPosition) Utils.Do(aircraft, function(a) Trigger.OnPassengerExited(a, function(t, p) IdleHunt(p) @@ -185,9 +185,9 @@ FrenchReinforcements = function() end powerproxy = Actor.Create("powerproxy.parabombs", false, { Owner = allies }) - powerproxy.SendAirstrike(drum1.CenterPosition, false, Facing.NorthEast + 4) - powerproxy.SendAirstrike(drum2.CenterPosition, false, Facing.NorthEast) - powerproxy.SendAirstrike(drum3.CenterPosition, false, Facing.NorthEast - 4) + powerproxy.TargetAirstrike(drum1.CenterPosition, Angle.NorthEast + Angle.New(16)) + powerproxy.TargetAirstrike(drum2.CenterPosition, Angle.NorthEast) + powerproxy.TargetAirstrike(drum3.CenterPosition, Angle.NorthEast - Angle.New(16)) powerproxy.Destroy() Trigger.AfterDelay(DateTime.Seconds(3), function() diff --git a/mods/ra/maps/top-o-the-world/scu36ea.lua b/mods/ra/maps/top-o-the-world/scu36ea.lua index e88855eba7..6838485125 100644 --- a/mods/ra/maps/top-o-the-world/scu36ea.lua +++ b/mods/ra/maps/top-o-the-world/scu36ea.lua @@ -216,7 +216,7 @@ WorldLoaded = function() Trigger.AfterDelay(DateTime.Minutes(9), function() local powerproxy01 = Actor.Create("powerproxy.paratroopers", true, { Owner = greece }) - local aircraft01 = powerproxy01.ActivateParatroopers(AlliedParadropLZ01.CenterPosition, Facing.SouthWest) + local aircraft01 = powerproxy01.TargetParatroopers(AlliedParadropLZ01.CenterPosition, Angle.SouthWest) Utils.Do(aircraft01, function(a) Trigger.OnPassengerExited(a, function(t, p) HuntObjectiveTruck(p) @@ -224,7 +224,7 @@ WorldLoaded = function() end) local powerproxy02 = Actor.Create("powerproxy.paratroopers", true, { Owner = goodguy }) - local aircraft02 = powerproxy02.ActivateParatroopers(AlliedParadropLZ02.CenterPosition, Facing.SouthWest) + local aircraft02 = powerproxy02.TargetParatroopers(AlliedParadropLZ02.CenterPosition, Angle.SouthWest) Utils.Do(aircraft02, function(a) Trigger.OnPassengerExited(a, function(t, p) HuntObjectiveTruck(p)