diff --git a/OpenRA.Mods.RA/Scripting/Global/DateTimeGlobal.cs b/OpenRA.Mods.RA/Scripting/Global/DateTimeGlobal.cs index c87e7239d2..6be80cb4ae 100644 --- a/OpenRA.Mods.RA/Scripting/Global/DateTimeGlobal.cs +++ b/OpenRA.Mods.RA/Scripting/Global/DateTimeGlobal.cs @@ -14,7 +14,7 @@ using OpenRA.Scripting; namespace OpenRA.Mods.RA.Scripting { - [ScriptGlobal("Date")] + [ScriptGlobal("DateTime")] public class DateGlobal : ScriptGlobal { public DateGlobal(ScriptContext context) @@ -25,18 +25,23 @@ namespace OpenRA.Mods.RA.Scripting { get { return DateTime.Today.Month == 10 && DateTime.Today.Day == 31; } } - } - - [ScriptGlobal("Time")] - public class TimeGlobal : ScriptGlobal - { - public TimeGlobal(ScriptContext context) - : base(context) { } [Desc("Get the current game time (in ticks)")] public int GameTime { get { return context.World.WorldTick; } } + + [Desc("Converts the number of seconds into game time (ticks).")] + public int Seconds(int seconds) + { + return seconds * 25; + } + + [Desc("Converts the number of minutes into game time (ticks).")] + public int Minutes(int minutes) + { + return Seconds(minutes * 60); + } } } diff --git a/OpenRA.Mods.RA/Scripting/Global/UtilsGlobal.cs b/OpenRA.Mods.RA/Scripting/Global/UtilsGlobal.cs index 2b9056c40c..1530011bf5 100644 --- a/OpenRA.Mods.RA/Scripting/Global/UtilsGlobal.cs +++ b/OpenRA.Mods.RA/Scripting/Global/UtilsGlobal.cs @@ -95,17 +95,5 @@ namespace OpenRA.Mods.RA.Scripting { return context.World.Map.CenterOfCell(cell); } - - [Desc("Converts the number of seconds into game time (ticks).")] - public int Seconds(int seconds) - { - return seconds * 25; - } - - [Desc("Converts the number of minutes into game time (ticks).")] - public int Minutes(int minutes) - { - return Seconds(minutes * 60); - } } } diff --git a/mods/cnc/maps/gdi01/gdi01.lua b/mods/cnc/maps/gdi01/gdi01.lua index 705a060c9a..63203f3e74 100644 --- a/mods/cnc/maps/gdi01/gdi01.lua +++ b/mods/cnc/maps/gdi01/gdi01.lua @@ -76,10 +76,10 @@ WorldLoaded = function() SendNodPatrol() - Trigger.AfterDelay(Utils.Seconds(5), function() Reinforce(InfantryReinforcements) end) - Trigger.AfterDelay(Utils.Seconds(15), function() Reinforce(InfantryReinforcements) end) - Trigger.AfterDelay(Utils.Seconds(30), function() Reinforce(VehicleReinforcements) end) - Trigger.AfterDelay(Utils.Seconds(60), function() Reinforce(VehicleReinforcements) end) + Trigger.AfterDelay(DateTime.Seconds(5), function() Reinforce(InfantryReinforcements) end) + Trigger.AfterDelay(DateTime.Seconds(15), function() Reinforce(InfantryReinforcements) end) + Trigger.AfterDelay(DateTime.Seconds(30), function() Reinforce(VehicleReinforcements) end) + Trigger.AfterDelay(DateTime.Seconds(60), function() Reinforce(VehicleReinforcements) end) end tick = 0 @@ -94,7 +94,7 @@ Tick = function() enemy.MarkCompletedObjective(nodObjective) end - if not baseEstablished and tick % Utils.Seconds(1) == 0 and CheckForBase() then + if not baseEstablished and tick % DateTime.Seconds(1) == 0 and CheckForBase() then baseEstablished = true player.MarkCompletedObjective(gdiObjective2) end diff --git a/mods/cnc/maps/gdi02/gdi02.lua b/mods/cnc/maps/gdi02/gdi02.lua index 0bad2e71ed..3229f25725 100644 --- a/mods/cnc/maps/gdi02/gdi02.lua +++ b/mods/cnc/maps/gdi02/gdi02.lua @@ -12,9 +12,9 @@ end BridgeheadSecured = function() Reinforce(MobileConstructionVehicle) - Trigger.AfterDelay(Utils.Seconds(15), NodAttack) - Trigger.AfterDelay(Utils.Seconds(30), function() Reinforce(EngineerReinforcements) end) - Trigger.AfterDelay(Utils.Seconds(120), function() Reinforce(VehicleReinforcements) end) + Trigger.AfterDelay(DateTime.Seconds(15), NodAttack) + Trigger.AfterDelay(DateTime.Seconds(30), function() Reinforce(EngineerReinforcements) end) + Trigger.AfterDelay(DateTime.Seconds(120), function() Reinforce(VehicleReinforcements) end) end NodAttack = function() @@ -25,7 +25,7 @@ NodAttack = function() unit.AttackMove(waypoint2.Location) Trigger.OnIdle(unit, unit.Hunt) end) - Trigger.OnAllKilled(attackers, function() Trigger.AfterDelay(Utils.Seconds(15), NodAttack) end) + Trigger.OnAllKilled(attackers, function() Trigger.AfterDelay(DateTime.Seconds(15), NodAttack) end) end end @@ -45,14 +45,14 @@ WorldLoaded = function() Trigger.OnPlayerWon(player, function() Media.PlaySpeechNotification(player, "Win") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("flag.vqa") end) end) Trigger.OnPlayerLost(player, function() Media.PlaySpeechNotification(player, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("gameover.vqa") end) end) diff --git a/mods/cnc/maps/gdi04a/gdi04a.lua b/mods/cnc/maps/gdi04a/gdi04a.lua index 2a867efe21..8de8688be0 100644 --- a/mods/cnc/maps/gdi04a/gdi04a.lua +++ b/mods/cnc/maps/gdi04a/gdi04a.lua @@ -11,9 +11,9 @@ GDIReinforcements = { "e2", "e2", "e2", "e2", "e2" } GDIReinforcementsWaypoints = { GDIReinforcementsEntry.Location, GDIReinforcementsWP1.Location } NodHelis = { - { Utils.Seconds(HeliDelay[1]), { NodHeliEntry.Location, NodHeliLZ1.Location }, { "e1", "e1", "e3" } }, - { Utils.Seconds(HeliDelay[2]), { NodHeliEntry.Location, NodHeliLZ2.Location }, { "e1", "e1", "e1", "e1" } }, - { Utils.Seconds(HeliDelay[3]), { NodHeliEntry.Location, NodHeliLZ3.Location }, { "e1", "e1", "e3" } } + { DateTime.Seconds(HeliDelay[1]), { NodHeliEntry.Location, NodHeliLZ1.Location }, { "e1", "e1", "e3" } }, + { DateTime.Seconds(HeliDelay[2]), { NodHeliEntry.Location, NodHeliLZ2.Location }, { "e1", "e1", "e1", "e1" } }, + { DateTime.Seconds(HeliDelay[3]), { NodHeliEntry.Location, NodHeliLZ3.Location }, { "e1", "e1", "e3" } } } SendHeli = function(heli) @@ -30,7 +30,7 @@ SendGDIReinforcements = function() Media.PlaySpeechNotification(gdi, "Reinforce") Reinforcements.ReinforceWithTransport(gdi, "apc", GDIReinforcements, GDIReinforcementsWaypoints, nil, function(apc, team) table.insert(team, apc) - Trigger.OnAllKilled(team, function() Trigger.AfterDelay(Utils.Seconds(5), SendGDIReinforcements) end) + Trigger.OnAllKilled(team, function() Trigger.AfterDelay(DateTime.Seconds(5), SendGDIReinforcements) end) Utils.Do(team, function(unit) unit.Stance = "Defend" end) end) end @@ -49,7 +49,7 @@ BuildNod1 = function() end if not HandOfNod.Build(Nod1Units, func) then - Trigger.AfterDelay(Utils.Seconds(5), BuildNod1) + Trigger.AfterDelay(DateTime.Seconds(5), BuildNod1) end end @@ -66,7 +66,7 @@ BuildAuto1 = function() end if not HandOfNod.IsDead and HandOfNod.Build(Auto1Units, func) then - Trigger.AfterDelay(Utils.Seconds(5), BuildAuto1) + Trigger.AfterDelay(DateTime.Seconds(5), BuildAuto1) end end @@ -84,7 +84,7 @@ Tick = function() end if gdi.HasNoRequiredUnits() then - Trigger.AfterDelay(Utils.Seconds(1), function() gdi.MarkFailedObjective(gdiObjective) end) + Trigger.AfterDelay(DateTime.Seconds(1), function() gdi.MarkFailedObjective(gdiObjective) end) end end @@ -121,14 +121,14 @@ WorldLoaded = function() Trigger.OnPlayerWon(gdi, function() Media.PlaySpeechNotification(gdi, "Win") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("burdet1.vqa") end) end) Trigger.OnPlayerLost(gdi, function() Media.PlaySpeechNotification(gdi, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("gameover.vqa") end) end) diff --git a/mods/cnc/maps/gdi04b/gdi04b.lua b/mods/cnc/maps/gdi04b/gdi04b.lua index bafbfd97d9..86f6d67458 100644 --- a/mods/cnc/maps/gdi04b/gdi04b.lua +++ b/mods/cnc/maps/gdi04b/gdi04b.lua @@ -28,7 +28,7 @@ SendGDIReinforcements = function() Media.PlaySpeechNotification(gdi, "Reinforce") Reinforcements.ReinforceWithTransport(gdi, "apc", GDIReinforcements, GDIReinforcementsWaypoints, nil, function(apc, team) table.insert(team, apc) - Trigger.OnAllKilled(team, function() Trigger.AfterDelay(Utils.Seconds(5), SendGDIReinforcements) end) + Trigger.OnAllKilled(team, function() Trigger.AfterDelay(DateTime.Seconds(5), SendGDIReinforcements) end) Utils.Do(team, function(unit) unit.Stance = "Defend" end) end) end @@ -48,7 +48,7 @@ Build = function(unitTypes, repeats, func) end if not HandOfNod.Build(unitTypes, innerFunc) then - Trigger.AfterDelay(Utils.Seconds(5), function() + Trigger.AfterDelay(DateTime.Seconds(5), function() Build(unitTypes, repeats, func) end) end @@ -90,7 +90,7 @@ Tick = function() end if gdi.HasNoRequiredUnits() then - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() gdi.MarkFailedObjective(gdiObjective) end) end @@ -126,14 +126,14 @@ WorldLoaded = function() Trigger.OnPlayerWon(gdi, function() Media.PlaySpeechNotification(gdi, "Win") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("burdet1.vqa") end) end) Trigger.OnPlayerLost(gdi, function() Media.PlaySpeechNotification(gdi, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("gameover.vqa") end) end) @@ -177,7 +177,7 @@ WorldLoaded = function() autoTrigger = true Trigger.RemoveFootprintTrigger(id) BuildAuto() - Trigger.AfterDelay(Utils.Seconds(4), function() + Trigger.AfterDelay(DateTime.Seconds(4), function() tank.Hunt() end) end diff --git a/mods/cnc/maps/gdi04c/gdi04c.lua b/mods/cnc/maps/gdi04c/gdi04c.lua index 8b69a6f7fa..df7692bed7 100644 --- a/mods/cnc/maps/gdi04c/gdi04c.lua +++ b/mods/cnc/maps/gdi04c/gdi04c.lua @@ -15,7 +15,7 @@ Civvie2Wpts = { waypoint26, waypoint3, waypoint9, waypoint4, waypoint5, waypoint FollowCivvieWpts = function(actor, wpts) Utils.Do(wpts, function(wpt) actor.Move(wpt.Location, 2) - actor.Wait(Utils.Seconds(2)) + actor.Wait(DateTime.Seconds(2)) end) end @@ -36,22 +36,22 @@ TownAttackAction = function(actor) end AttackTown = function() - Reinforcements.Reinforce(nod, TownAttackWave1, { NodReinfEntry.Location, waypoint0.Location }, Utils.Seconds(0.25), TownAttackAction) - Trigger.AfterDelay(Utils.Seconds(2), function() - Reinforcements.Reinforce(nod, TownAttackWave2, { NodReinfEntry.Location, waypoint0.Location }, Utils.Seconds(1), TownAttackAction) + Reinforcements.Reinforce(nod, TownAttackWave1, { NodReinfEntry.Location, waypoint0.Location }, DateTime.Seconds(0.25), TownAttackAction) + Trigger.AfterDelay(DateTime.Seconds(2), function() + Reinforcements.Reinforce(nod, TownAttackWave2, { NodReinfEntry.Location, waypoint0.Location }, DateTime.Seconds(1), TownAttackAction) end) - Trigger.AfterDelay(Utils.Seconds(4), function() - Reinforcements.Reinforce(nod, TownAttackWave3, { NodReinfEntry.Location, waypoint0.Location }, Utils.Seconds(1), TownAttackAction) + Trigger.AfterDelay(DateTime.Seconds(4), function() + Reinforcements.Reinforce(nod, TownAttackWave3, { NodReinfEntry.Location, waypoint0.Location }, DateTime.Seconds(1), TownAttackAction) end) end SendGDIReinforcements = function() - Reinforcements.Reinforce(player, GDIReinforcementsPart1, { GDIReinfEntry1.Location, waypoint12.Location }, Utils.Seconds(1), function(actor) + Reinforcements.Reinforce(player, GDIReinforcementsPart1, { GDIReinfEntry1.Location, waypoint12.Location }, DateTime.Seconds(1), function(actor) Media.PlaySpeechNotification(player, "Reinforce") actor.Move(waypoint10.Location) actor.Stance = "Defend" end) - Trigger.AfterDelay(Utils.Seconds(5), function() + Trigger.AfterDelay(DateTime.Seconds(5), function() Reinforcements.ReinforceWithTransport(player, "apc", GDIReinforcementsPart2, { GDIReinfEntry2.Location, waypoint13.Location }, nil, function(apc, team) Media.PlaySpeechNotification(player, "Reinforce") apc.Move(GDIUnloadWpt.Location) @@ -81,14 +81,14 @@ WorldLoaded = function() Trigger.OnPlayerWon(player, function() Media.PlaySpeechNotification(player, "Win") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("burdet1.vqa") end) end) Trigger.OnPlayerLost(player, function() Media.PlaySpeechNotification(player, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("gameover.vqa") end) end) diff --git a/mods/cnc/maps/nod01/nod01.lua b/mods/cnc/maps/nod01/nod01.lua index 72a25292d7..344d6290fd 100644 --- a/mods/cnc/maps/nod01/nod01.lua +++ b/mods/cnc/maps/nod01/nod01.lua @@ -37,7 +37,7 @@ WorldLoaded = function() Trigger.OnPlayerLost(nod, function() Media.PlaySpeechNotification(nod, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("nodlose.vqa") end) end) @@ -49,13 +49,13 @@ WorldLoaded = function() Trigger.OnKilled(Nikoomba, function() nod.MarkCompletedObjective(NodObjective1) - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() SendLastInfantryReinforcements() end) end) - Trigger.AfterDelay(Utils.Seconds(30), SendFirstInfantryReinforcements) - Trigger.AfterDelay(Utils.Seconds(60), SendSecondInfantryReinforcements) + Trigger.AfterDelay(DateTime.Seconds(30), SendFirstInfantryReinforcements) + Trigger.AfterDelay(DateTime.Seconds(60), SendSecondInfantryReinforcements) end Tick = function() diff --git a/mods/cnc/maps/nod03a/nod03a.lua b/mods/cnc/maps/nod03a/nod03a.lua index d340c7c1bc..f0fa1f1d93 100644 --- a/mods/cnc/maps/nod03a/nod03a.lua +++ b/mods/cnc/maps/nod03a/nod03a.lua @@ -3,14 +3,14 @@ FirstAttackWave = { "e1", "e1", "e1", "e2", } SecondThirdAttackWave = { "e1", "e1", "e2", } SendAttackWave = function(units, spawnPoint) - Reinforcements.Reinforce(enemy, units, { spawnPoint }, Utils.Seconds(1), function(actor) + Reinforcements.Reinforce(enemy, units, { spawnPoint }, DateTime.Seconds(1), function(actor) actor.AttackMove(PlayerBase.Location) end) end InsertNodUnits = function() Reinforcements.Reinforce(player, NodUnits, { NodEntry.Location, NodRallyPoint.Location }) - Trigger.AfterDelay(Utils.Seconds(9), function() + Trigger.AfterDelay(DateTime.Seconds(9), function() Reinforcements.Reinforce(player, { "mcv" }, { NodEntry.Location, PlayerBase.Location }) end) end @@ -31,14 +31,14 @@ WorldLoaded = function() Trigger.OnPlayerWon(player, function() Media.PlaySpeechNotification(player, "Win") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("desflees.vqa") end) end) Trigger.OnPlayerLost(player, function() Media.PlaySpeechNotification(player, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("flag.vqa") end) end) @@ -48,7 +48,7 @@ WorldLoaded = function() nodObjective2 = player.AddSecondaryObjective("Destroy all GDI forces") Trigger.OnCapture(TechCenter, function() - Trigger.AfterDelay(Utils.Seconds(2), function() + Trigger.AfterDelay(DateTime.Seconds(2), function() player.MarkCompletedObjective(nodObjective1) end) end) @@ -58,9 +58,9 @@ WorldLoaded = function() end) InsertNodUnits() - Trigger.AfterDelay(Utils.Seconds(20), function() SendAttackWave(FirstAttackWave, AttackWaveSpawnA.Location) end) - Trigger.AfterDelay(Utils.Seconds(50), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnB.Location) end) - Trigger.AfterDelay(Utils.Seconds(100), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnC.Location) end) + Trigger.AfterDelay(DateTime.Seconds(20), function() SendAttackWave(FirstAttackWave, AttackWaveSpawnA.Location) end) + Trigger.AfterDelay(DateTime.Seconds(50), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnB.Location) end) + Trigger.AfterDelay(DateTime.Seconds(100), function() SendAttackWave(SecondThirdAttackWave, AttackWaveSpawnC.Location) end) end Tick = function() diff --git a/mods/cnc/maps/nod03b/nod03b.lua b/mods/cnc/maps/nod03b/nod03b.lua index e9efa6fb7b..3a92617799 100644 --- a/mods/cnc/maps/nod03b/nod03b.lua +++ b/mods/cnc/maps/nod03b/nod03b.lua @@ -26,7 +26,7 @@ end InsertNodUnits = function() Reinforcements.Reinforce(player, { "mcv" }, { McvEntry.Location, McvDeploy.Location }) Reinforcements.Reinforce(player, NodUnits, { NodEntry.Location, NodRallypoint.Location }) - Trigger.AfterDelay(Utils.Seconds(15), function() + Trigger.AfterDelay(DateTime.Seconds(15), function() Reinforcements.Reinforce(player, Engineers, { McvEntry.Location, PlayerBase.Location }) end) end @@ -47,14 +47,14 @@ WorldLoaded = function() Trigger.OnPlayerWon(player, function() Media.PlaySpeechNotification(player, "Win") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("desflees.vqa") end) end) Trigger.OnPlayerLost(player, function() Media.PlaySpeechNotification(player, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("flag.vqa") end) end) @@ -65,15 +65,15 @@ WorldLoaded = function() Trigger.OnKilled(TechCenter, function() player.MarkFailedObjective(nodObjective1) end) Trigger.OnCapture(TechCenter, function() - Trigger.AfterDelay(Utils.Seconds(2), function() + Trigger.AfterDelay(DateTime.Seconds(2), function() player.MarkCompletedObjective(nodObjective1) end) end) InsertNodUnits() - Trigger.AfterDelay(Utils.Seconds(40), function() SendAttackWave(FirstAttackWaveUnits, FirstAttackWave) end) - Trigger.AfterDelay(Utils.Seconds(80), function() SendAttackWave(SecondAttackWaveUnits, SecondAttackWave) end) - Trigger.AfterDelay(Utils.Seconds(140), function() SendAttackWave(ThirdAttackWaveUnits, FirstAttackWave) end) + Trigger.AfterDelay(DateTime.Seconds(40), function() SendAttackWave(FirstAttackWaveUnits, FirstAttackWave) end) + Trigger.AfterDelay(DateTime.Seconds(80), function() SendAttackWave(SecondAttackWaveUnits, SecondAttackWave) end) + Trigger.AfterDelay(DateTime.Seconds(140), function() SendAttackWave(ThirdAttackWaveUnits, FirstAttackWave) end) end diff --git a/mods/ra/maps/allies-01-classic/allies01.lua b/mods/ra/maps/allies-01-classic/allies01.lua index c218fb8773..9a1317f814 100644 --- a/mods/ra/maps/allies-01-classic/allies01.lua +++ b/mods/ra/maps/allies-01-classic/allies01.lua @@ -17,7 +17,7 @@ SendInsertionHelicopter = function() end SendJeeps = function() - Reinforcements.Reinforce(player, JeepReinforcements, InsertionPath, Utils.Seconds(2)) + Reinforcements.Reinforce(player, JeepReinforcements, InsertionPath, DateTime.Seconds(2)) Media.PlaySpeechNotification(player, "ReinforcementsArrived") end @@ -28,8 +28,8 @@ RunInitialActivities = function() Patrol3.Hunt() Patrol4.Hunt() Harvester.FindResources() - Civilian1.Wait(Utils.Seconds(6)) - Civilian2.Wait(Utils.Seconds(6)) + Civilian1.Wait(DateTime.Seconds(6)) + Civilian2.Wait(DateTime.Seconds(6)) Civilian1.Hunt() Civilian2.Hunt() end @@ -37,21 +37,21 @@ end LabGuardsKilled = function() CreateEinstein() - Trigger.AfterDelay(Utils.Seconds(2), function() + Trigger.AfterDelay(DateTime.Seconds(2), function() Actor.Create(FlareType, true, { Owner = england, Location = ExtractionFlarePoint.Location }) Media.PlaySpeechNotification(player, "SignalFlareNorth") SendExtractionHelicopter() end) - Trigger.AfterDelay(Utils.Seconds(10), function() + Trigger.AfterDelay(DateTime.Seconds(10), function() Media.PlaySpeechNotification(player, "AlliedReinforcementsArrived") Actor.Create("camera", true, { Owner = player, Location = CruiserCameraPoint.Location }) SendCruisers() end) - Trigger.AfterDelay(Utils.Seconds(12), function() + Trigger.AfterDelay(DateTime.Seconds(12), function() for i = 0, 2 do - Trigger.AfterDelay(Utils.Seconds(i), function() + Trigger.AfterDelay(DateTime.Seconds(i), function() Media.PlaySoundNotification(player, "AlertBuzzer") end) end @@ -100,7 +100,7 @@ RescueFailed = function() end OilPumpDestroyed = function() - Trigger.AfterDelay(Utils.Seconds(5), SendJeeps) + Trigger.AfterDelay(DateTime.Seconds(5), SendJeeps) end CiviliansKilled = function() @@ -116,13 +116,13 @@ CreateEinstein = function() einstein.Scatter() Trigger.OnKilled(einstein, RescueFailed) ExtractObjective = player.AddPrimaryObjective("Wait for the helicopter and extract Einstein.") - Trigger.AfterDelay(Utils.Seconds(1), function() Media.PlaySpeechNotification(player, "TargetFreed") end) + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlaySpeechNotification(player, "TargetFreed") end) end HelicopterGone = function() if not heli.IsDead then Media.PlaySpeechNotification(player, "TargetRescued") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() player.MarkCompletedObjective(ExtractObjective) player.MarkCompletedObjective(SurviveObjective) ussr.MarkFailedObjective(DefendObjective) @@ -135,14 +135,14 @@ end MissionAccomplished = function() Media.PlaySpeechNotification(player, "Win") - --Trigger.AfterDelay(Utils.Seconds(1), function() + --Trigger.AfterDelay(DateTime.Seconds(1), function() --Media.PlayMovieFullscreen("snowbomb.vqa") -- https://github.com/OpenRA/OpenRA/issues/4224 --end) end MissionFailed = function() Media.PlaySpeechNotification(player, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() Media.PlayMovieFullscreen("bmap.vqa") end) + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("bmap.vqa") end) end SetUnitStances = function() @@ -197,7 +197,7 @@ WorldLoaded = function() SetUnitStances() - Trigger.AfterDelay(Utils.Seconds(5), function() Actor.Create("camera", true, { Owner = player, Location = BaseCameraPoint.Location }) end) + Trigger.AfterDelay(DateTime.Seconds(5), function() Actor.Create("camera", true, { Owner = player, Location = BaseCameraPoint.Location }) end) Camera.Position = InsertionLZ.CenterPosition diff --git a/mods/ra/maps/allies-02-classic/allies02.lua b/mods/ra/maps/allies-02-classic/allies02.lua index b57a7e0319..2dbb12ff0d 100644 --- a/mods/ra/maps/allies-02-classic/allies02.lua +++ b/mods/ra/maps/allies-02-classic/allies02.lua @@ -13,7 +13,7 @@ end SendJeepReinforcements = function() Media.PlaySpeechNotification(player, "ReinforcementsArrived") - Reinforcements.Reinforce(player, JeepReinforcements, JeepPath, Utils.Seconds(1)) + Reinforcements.Reinforce(player, JeepReinforcements, JeepPath, DateTime.Seconds(1)) end RunInitialActivities = function() @@ -22,14 +22,14 @@ end MissionAccomplished = function() Media.PlaySpeechNotification(player, "Win") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("montpass.vqa") end) end MissionFailed = function() Media.PlaySpeechNotification(player, "Lose") - Trigger.AfterDelay(Utils.Seconds(1), function() + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlayMovieFullscreen("frozen.vqa") end) end @@ -53,9 +53,9 @@ SendTrucks = function() ConvoyOnSite = true ConvoyObjective = player.AddPrimaryObjective("Escort the convoy") Media.PlaySpeechNotification(player, "ConvoyApproaching") - Trigger.AfterDelay(Utils.Seconds(3), function() + Trigger.AfterDelay(DateTime.Seconds(3), function() ConvoyUnharmed = true - local trucks = Reinforcements.Reinforce(france, TruckReinforcements, TruckPath, Utils.Seconds(1), + local trucks = Reinforcements.Reinforce(france, TruckReinforcements, TruckPath, DateTime.Seconds(1), function(truck) Trigger.OnIdle(truck, function() truck.Move(TruckExitPoint.Location) end) end) @@ -79,7 +79,7 @@ ConvoyCasualites = function() Media.PlaySpeechNotification(player, "ConvoyUnitLost") if ConvoyUnharmed then ConvoyUnharmed = false - Trigger.AfterDelay(Utils.Seconds(1), function() player.MarkFailedObjective(ConvoyObjective) end) + Trigger.AfterDelay(DateTime.Seconds(1), function() player.MarkFailedObjective(ConvoyObjective) end) end end @@ -116,19 +116,19 @@ WorldLoaded = function() RunInitialActivities() SendConstructionVehicleReinforcements() - Trigger.AfterDelay(Utils.Seconds(5), SendJeepReinforcements) - Trigger.AfterDelay(Utils.Seconds(10), SendJeepReinforcements) + Trigger.AfterDelay(DateTime.Seconds(5), SendJeepReinforcements) + Trigger.AfterDelay(DateTime.Seconds(10), SendJeepReinforcements) - Trigger.AfterDelay(Utils.Minutes(10), SendTrucks) + Trigger.AfterDelay(DateTime.Minutes(10), SendTrucks) Camera.Position = ReinforcementsEntryPoint.CenterPosition Media.PlayMovieFullscreen("mcv.vqa") - ConvoyTimer(Utils.Seconds(3), "TenMinutesRemaining") - ConvoyTimer(Utils.Minutes(5), "WarningFiveMinutesRemaining") - ConvoyTimer(Utils.Minutes(6), "WarningFourMinutesRemaining") - ConvoyTimer(Utils.Minutes(7), "WarningThreeMinutesRemaining") - ConvoyTimer(Utils.Minutes(8), "WarningTwoMinutesRemaining") - ConvoyTimer(Utils.Minutes(9), "WarningOneMinuteRemaining") + ConvoyTimer(DateTime.Seconds(3), "TenMinutesRemaining") + ConvoyTimer(DateTime.Minutes(5), "WarningFiveMinutesRemaining") + ConvoyTimer(DateTime.Minutes(6), "WarningFourMinutesRemaining") + ConvoyTimer(DateTime.Minutes(7), "WarningThreeMinutesRemaining") + ConvoyTimer(DateTime.Minutes(8), "WarningTwoMinutesRemaining") + ConvoyTimer(DateTime.Minutes(9), "WarningOneMinuteRemaining") end diff --git a/mods/ra/maps/desert-shellmap/desert-shellmap.lua b/mods/ra/maps/desert-shellmap/desert-shellmap.lua index 404ad46fc6..00d804d6aa 100644 --- a/mods/ra/maps/desert-shellmap/desert-shellmap.lua +++ b/mods/ra/maps/desert-shellmap/desert-shellmap.lua @@ -1,4 +1,4 @@ -if Date.IsHalloween then +if DateTime.IsHalloween then UnitTypes = { "ant", "ant", "ant" } BeachUnitTypes = { "ant", "ant" } ParadropUnitTypes = { "zombie", "zombie", "zombie", "zombie", "zombie" } @@ -68,7 +68,7 @@ ShipAlliedUnits = function() BindActorTriggers(unit) end) - Trigger.AfterDelay(Utils.Seconds(60), ShipAlliedUnits) + Trigger.AfterDelay(DateTime.Seconds(60), ShipAlliedUnits) end InsertAlliedChinookReinforcements = function(entry, hpad) @@ -79,7 +79,7 @@ InsertAlliedChinookReinforcements = function(entry, hpad) BindActorTriggers(unit) end) - Trigger.AfterDelay(Utils.Seconds(60), function() InsertAlliedChinookReinforcements(entry, hpad) end) + Trigger.AfterDelay(DateTime.Seconds(60), function() InsertAlliedChinookReinforcements(entry, hpad) end) end ParadropSovietUnits = function() @@ -94,7 +94,7 @@ ParadropSovietUnits = function() end) transport.Paradrop(lz) - Trigger.AfterDelay(Utils.Seconds(35), ParadropSovietUnits) + Trigger.AfterDelay(DateTime.Seconds(35), ParadropSovietUnits) end ProduceUnits = function(t) @@ -131,7 +131,7 @@ ChronoshiftAlliedUnits = function() units[unit] = cells[i] end Chronosphere.Chronoshift(units) - Trigger.AfterDelay(Utils.Seconds(60), ChronoshiftAlliedUnits) + Trigger.AfterDelay(DateTime.Seconds(60), ChronoshiftAlliedUnits) end ticks = 0 @@ -155,7 +155,7 @@ WorldLoaded = function() InsertAlliedChinookReinforcements(Chinook1Entry, HeliPad1) InsertAlliedChinookReinforcements(Chinook2Entry, HeliPad2) ParadropSovietUnits() - Trigger.AfterDelay(Utils.Seconds(5), ChronoshiftAlliedUnits) + Trigger.AfterDelay(DateTime.Seconds(5), ChronoshiftAlliedUnits) Utils.Do(ProducedUnitTypes, ProduceUnits) SendSovietUnits(Entry1.Location, UnitTypes, 50) @@ -165,4 +165,4 @@ WorldLoaded = function() SendSovietUnits(Entry5.Location, UnitTypes, 50) SendSovietUnits(Entry6.Location, UnitTypes, 50) SendSovietUnits(Entry7.Location, BeachUnitTypes, 15) -end \ No newline at end of file +end diff --git a/mods/ra/maps/intervention/intervention.lua b/mods/ra/maps/intervention/intervention.lua index 4aa893ab01..fdb66f0c19 100644 --- a/mods/ra/maps/intervention/intervention.lua +++ b/mods/ra/maps/intervention/intervention.lua @@ -9,14 +9,14 @@ BeachheadTrigger = CPos.New(137, 104), CPos.New(137, 105), CPos.New(137, 106), CPos.New(136, 106), CPos.New(136, 107) } -BaseRaidInterval = Utils.Minutes(3) -BaseFrontAttackInterval = Utils.Minutes(3) + Utils.Seconds(30) -BaseRearAttackInterval = Utils.Minutes(8) -UBoatPatrolDelay = Utils.Minutes(2) + Utils.Seconds(30) +BaseRaidInterval = DateTime.Minutes(3) +BaseFrontAttackInterval = DateTime.Minutes(3) + DateTime.Seconds(30) +BaseRearAttackInterval = DateTime.Minutes(8) +UBoatPatrolDelay = DateTime.Minutes(2) + DateTime.Seconds(30) BaseFrontAttackWpts = { PatrolWpt1.Location, BaseRaidWpt1.Location } Village = { FarmHouse1, FarmHouse2, FarmHouse3, FarmHouse4, FarmHouse5, FarmHouse6, FarmHouse7, FarmHouse8, FarmHouse9, Church } -VillageRaidInterval = Utils.Minutes(3) +VillageRaidInterval = DateTime.Minutes(3) VillageRaidAircraft = { "mig", "mig" } VillageRaidWpts = { VillageRaidEntrypoint.Location, VillageRaidWpt1.Location, VillageRaidWpt2.Location } @@ -65,7 +65,7 @@ AirRaid = function(planeTypes, ingress, egress, target) end for i = 1, #planeTypes do - Trigger.AfterDelay((i - 1) * Utils.Seconds(1), function() + Trigger.AfterDelay((i - 1) * DateTime.Seconds(1), function() local start = Utils.CenterOfCell(ingress[1]) + WVec.New(0, 0, Actor.CruiseAltitude(planeTypes[i])) local plane = Actor.Create(planeTypes[i], true, { CenterPosition = start, Owner = soviets, Facing = (Utils.CenterOfCell(ingress[2]) - start).Facing }) @@ -116,7 +116,7 @@ SendUboatPatrol = function(team) Utils.Do(team, function(uboat) if not uboat.IsDead then uboat.PatrolUntil(UboatPatrolWpts1, function() - return Time.GameTime > Utils.Minutes(2) + UBoatPatrolDelay + return DateTime.GameTime > DateTime.Minutes(2) + UBoatPatrolDelay end) uboat.Patrol(UboatPatrolWpts2) end @@ -125,7 +125,7 @@ SendUboatPatrol = function(team) end SendGroundPatrol = function(team) - Utils.Do(team, function(unit) unit.Patrol(GroundPatrolWpts, true, Utils.Seconds(3)) end) + Utils.Do(team, function(unit) unit.Patrol(GroundPatrolWpts, true, DateTime.Seconds(3)) end) Utils.Do(team, function(unit) Trigger.OnIdle(unit, function(actor) actor.Hunt() end) end) @@ -152,7 +152,7 @@ end Build = function(units, action) if not soviets.Build(units, action) then - Trigger.AfterDelay(Utils.Seconds(15), function() + Trigger.AfterDelay(DateTime.Seconds(15), function() Build(units, action) end) end @@ -235,7 +235,7 @@ WorldLoaded = function() captureObjective = player.AddPrimaryObjective("Locate and capture the enemy's Air Force HQ.") Trigger.OnCapture(AirForceHQ, function() - Trigger.AfterDelay(Utils.Seconds(3), function() + Trigger.AfterDelay(DateTime.Seconds(3), function() player.MarkCompletedObjective(captureObjective) player.MarkCompletedObjective(villageObjective) end) @@ -275,5 +275,5 @@ WorldLoaded = function() end) Camera.Position = CameraSpot.CenterPosition - Trigger.AfterDelay(Utils.Seconds(5), function() CameraSpot.Destroy() end) + Trigger.AfterDelay(DateTime.Seconds(5), function() CameraSpot.Destroy() end) end diff --git a/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua b/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua index 2479d4d270..c6e5cbdff3 100644 --- a/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua +++ b/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua @@ -1,8 +1,8 @@ AlliedUnits = { { 0, { "1tnk", "1tnk", "2tnk", "2tnk" } }, - { Utils.Seconds(3), { "e1", "e1", "e1", "e3", "e3" } }, - { Utils.Seconds(7), { "e6" } } + { DateTime.Seconds(3), { "e1", "e1", "e1", "e3", "e3" } }, + { DateTime.Seconds(7), { "e6" } } } ReinforceBaseUnits = { "1tnk", "1tnk", "2tnk", "arty", "arty" } CivilianEvacuees = { "c1", "c2", "c5", "c7", "c8" } @@ -66,11 +66,11 @@ SetupAlliedBase = function() DefendOutpost = player.AddSecondaryObjective("Defend and repair our outpost.") player.MarkCompletedObjective(FindOutpost) - Trigger.AfterDelay(Utils.Seconds(1), function() -- don't fail the Objective instantly + Trigger.AfterDelay(DateTime.Seconds(1), function() -- don't fail the Objective instantly Trigger.OnAllRemovedFromWorld(alliedOutpost, function() player.MarkFailedObjective(DefendOutpost) end) end) - Trigger.AfterDelay(Utils.Minutes(1) + Utils.Seconds(40), function() + Trigger.AfterDelay(DateTime.Minutes(1) + DateTime.Seconds(40), function() if not SuperTankDomeIsInfiltrated then SuperTankAttack = true Utils.Do(SuperTanks, function(tnk) @@ -101,7 +101,7 @@ SendAlliedUnits = function() Actor.Create("camera" ,true , { Owner = player, Location = ProvingGroundsCameraPoint.Location }) Actor.Create("camera" ,true , { Owner = ussr, Location = USSRSpen.Location }) - Trigger.AfterDelay(Utils.Seconds(1), function() Media.PlaySpeechNotification(player, "ReinforcementsArrived") end) + Trigger.AfterDelay(DateTime.Seconds(1), function() Media.PlaySpeechNotification(player, "ReinforcementsArrived") end) --To avoid overlapping "battlecontrol initialized" and "reinforcements have arrived" Utils.Do(AlliedUnits, function(table) Trigger.AfterDelay(table[1], function() @@ -109,7 +109,7 @@ SendAlliedUnits = function() end) end) - Trigger.AfterDelay(Utils.Seconds(1), function() InitialUnitsArrived = true end) + Trigger.AfterDelay(DateTime.Seconds(1), function() InitialUnitsArrived = true end) end SuperTankDomeInfiltrated = function() @@ -145,12 +145,12 @@ SuperTankDomeInfiltrated = function() end) player.MarkCompletedObjective(InfiltrateRadarDome) - Trigger.AfterDelay(Utils.Minutes(3), SuperTanksDestruction) + Trigger.AfterDelay(DateTime.Minutes(3), SuperTanksDestruction) - Trigger.AfterDelay(Utils.Seconds(2), function() + Trigger.AfterDelay(DateTime.Seconds(2), function() Media.PlaySpeechNotification(player, "ControlCenterDeactivated") - Trigger.AfterDelay(Utils.Seconds(3), function() + Trigger.AfterDelay(DateTime.Seconds(3), function() Media.DisplayMessage("In 3 minutes the super tanks will self destruct.") Media.PlaySpeechNotification(player, "WarningThreeMinutesRemaining") end) @@ -185,7 +185,7 @@ CreateDemitri = function() local flarepos = CPos.New(DemitriLZ.Location.X, DemitriLZ.Location.Y - 1) local demitriLZFlare = Actor.Create("flare", true, { Owner = player, Location = flarepos }) - Trigger.AfterDelay(Utils.Seconds(3), function() Media.PlaySpeechNotification(player, "SignalFlareNorth") end) + Trigger.AfterDelay(DateTime.Seconds(3), function() Media.PlaySpeechNotification(player, "SignalFlareNorth") end) local demitriChinook = Reinforcements.ReinforceWithTransport(player, ExtractionHeli, nil, { ExtractionWaypoint, ExtractionLZ })[1] @@ -196,8 +196,8 @@ CreateDemitri = function() Trigger.OnRemovedFromWorld(demitriChinook, function() if not demitriChinook.IsDead then Media.PlaySpeechNotification(player, "TargetRescued") - Trigger.AfterDelay(Utils.Seconds(1), function() player.MarkCompletedObjective(EvacuateDemitri) end) - Trigger.AfterDelay(Utils.Seconds(3), SpawnAndMoveAlliedBaseUnits) + Trigger.AfterDelay(DateTime.Seconds(1), function() player.MarkCompletedObjective(EvacuateDemitri) end) + Trigger.AfterDelay(DateTime.Seconds(3), SpawnAndMoveAlliedBaseUnits) end end) Trigger.OnRemovedFromWorld(demitri, function() @@ -280,7 +280,7 @@ end InitTriggers = function() Trigger.OnAllKilled(SuperTanks, function() - Trigger.AfterDelay(Utils.Seconds(3), function() player.MarkCompletedObjective(EliminateSuperTanks) end) + Trigger.AfterDelay(DateTime.Seconds(3), function() player.MarkCompletedObjective(EliminateSuperTanks) end) end) Trigger.OnKilled(SuperTankDome, function()