Skip to content

Commit

Permalink
Lua spaces to tabs.
Browse files Browse the repository at this point in the history
  • Loading branch information
darkademic committed Dec 14, 2023
1 parent 98072ae commit 34fd0ea
Show file tree
Hide file tree
Showing 27 changed files with 1,785 additions and 1,785 deletions.
592 changes: 296 additions & 296 deletions mods/ca/maps/ca-composition-tester/composition-tester.lua

Large diffs are not rendered by default.

776 changes: 388 additions & 388 deletions mods/ca/maps/ca-composition-tournament/composition-tournament.lua

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mods/ca/maps/ca-prologue-03/ca-prologue-03.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ WorldLoaded = function()
ObjectiveLocateForces = GDI.AddObjective("Locate all GDI forces.")
ObjectiveExit = GDI.AddObjective("Find a safe exit route.")

SetupReveals({ Reveal1, Reveal3, Reveal4 })
SetupReveals({ Reveal1, Reveal3, Reveal4 })

TroopGroups = {
{ Waypoint = Group1, Id = 1 },
Expand Down
16 changes: 8 additions & 8 deletions mods/ca/maps/ca-prologue-04/ca-prologue-04.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,16 @@ WorldLoaded = function()

local aaGuns = GDI.GetActorsByType("cram")
Trigger.OnAllKilled(aaGuns, function()
local frigates = GDI.GetActorsByType("dd2")
ObjectiveDestroyFrigates = Nod.AddObjective("Destroy GDI naval blockade.")
local frigates = GDI.GetActorsByType("dd2")
ObjectiveDestroyFrigates = Nod.AddObjective("Destroy GDI naval blockade.")

Trigger.AfterDelay(DateTime.Seconds(6), function()
WarpInBanshees()
end)
Trigger.AfterDelay(DateTime.Seconds(6), function()
WarpInBanshees()
end)

Trigger.OnAllKilled(frigates, function()
Nod.MarkCompletedObjective(ObjectiveDestroyFrigates)
end)
Trigger.OnAllKilled(frigates, function()
Nod.MarkCompletedObjective(ObjectiveDestroyFrigates)
end)

Nod.MarkCompletedObjective(ObjectiveDestroyAA)
end)
Expand Down
8 changes: 4 additions & 4 deletions mods/ca/maps/ca08-salvation/ca08.lua
Original file line number Diff line number Diff line change
Expand Up @@ -271,10 +271,10 @@ SpawnWormholeUnits = function(wormhole)
end

ShuffleInPlace = function(t)
for i = #t, 2, -1 do
local j = Utils.RandomInteger(1, i)
t[i], t[j] = t[j], t[i]
end
for i = #t, 2, -1 do
local j = Utils.RandomInteger(1, i)
t[i], t[j] = t[j], t[i]
end
end

UpdateScrinCounter = function()
Expand Down
2 changes: 1 addition & 1 deletion mods/ca/maps/ca11-abasement/ca11.lua
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ WorldLoaded = function()
USSR = Player.GetPlayer("USSR")
Nod = Player.GetPlayer("Nod")
NodAbandoned = Player.GetPlayer("NodAbandoned")
Scrin = Player.GetPlayer("Scrin")
Scrin = Player.GetPlayer("Scrin")
MissionPlayer = USSR
TimerTicks = 0

Expand Down
2 changes: 1 addition & 1 deletion mods/ca/maps/ca12-treachery/ca12.lua
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Squads = {

WorldLoaded = function()
USSR = Player.GetPlayer("USSR")
Greece = Player.GetPlayer("Greece")
Greece = Player.GetPlayer("Greece")
Traitor = Player.GetPlayer("Traitor")
USSRAbandoned = Player.GetPlayer("USSRAbandoned")
MissionPlayer = USSR
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca13-ironclad/ca13.lua
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ AutoAttackStartTime = {
WorldLoaded = function()
USSR = Player.GetPlayer("USSR")
GDI = Player.GetPlayer("GDI")
Greece = Player.GetPlayer("Greece")
Greece = Player.GetPlayer("Greece")
MissionPlayer = USSR
TimerTicks = 0
SiegeLosses = 0
Expand All @@ -110,7 +110,7 @@ WorldLoaded = function()

InitObjectives(USSR)
InitGDI()
InitGreece()
InitGreece()

ObjectiveDestroyBases = USSR.AddObjective("Break the siege and destroy the enemy bases.")
EngineerDrop()
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca16-proliferation/ca16.lua
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ Squads = {
}

WorldLoaded = function()
Scrin = Player.GetPlayer("Scrin")
Nod = Player.GetPlayer("Nod")
Scrin = Player.GetPlayer("Scrin")
Nod = Player.GetPlayer("Nod")
MissionPlayer = Scrin
TimerTicks = MaintenanceDuration[Difficulty]
FieldsClearedAndBeingHarvested = 0
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca17-encroachment/ca17.lua
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ Squads = {
}

WorldLoaded = function()
Scrin = Player.GetPlayer("Scrin")
Greece = Player.GetPlayer("Greece")
Scrin = Player.GetPlayer("Scrin")
Greece = Player.GetPlayer("Greece")
GDI = Player.GetPlayer("GDI")
MissionPlayer = Scrin

Expand Down
6 changes: 3 additions & 3 deletions mods/ca/maps/ca18-incapacitation/ca18.lua
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ GroundedAircraft = {
}

WorldLoaded = function()
Scrin = Player.GetPlayer("Scrin")
Greece = Player.GetPlayer("Greece")
GDI = Player.GetPlayer("GDI")
Scrin = Player.GetPlayer("Scrin")
Greece = Player.GetPlayer("Greece")
GDI = Player.GetPlayer("GDI")
MissionPlayer = Scrin
TimerTicks = 0
StormsEnded = false
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca19-decimation/ca19.lua
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ Squads = {
}

WorldLoaded = function()
Scrin = Player.GetPlayer("Scrin")
USSR = Player.GetPlayer("USSR")
Scrin = Player.GetPlayer("Scrin")
USSR = Player.GetPlayer("USSR")
USSRUnmanned = Player.GetPlayer("USSRUnmanned")
MissionPlayer = Scrin
IslandAirfieldsEliminated = false
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca20-subjugation/ca20.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ TibFacilities = { NTibFacility, STibFacility, ETibFacility }
HindPatrolPath = { HindPatrol1.Location, HindPatrol2.Location, HindPatrol3.Location, HindPatrol4.Location, HindPatrol5.Location, HindPatrol6.Location, HindPatrol7.Location, HindPatrol8.Location, HindPatrol9.Location }

WorldLoaded = function()
Scrin = Player.GetPlayer("Scrin")
USSR = Player.GetPlayer("USSR")
Scrin = Player.GetPlayer("Scrin")
USSR = Player.GetPlayer("USSR")
MissionPlayer = Scrin
TimerTicks = 0
TibFacilitiesCaptured = 0
Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca21-enmity/ca21.lua
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@ Squads = {
}

WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
GDI = Player.GetPlayer("GDI")
Nod = Player.GetPlayer("Nod")
MissionPlayer = GDI
EnforceAiBuildRadius = true

Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca22-capitulation/ca22.lua
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ Squads = {
}

WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
USSR = Player.GetPlayer("USSR")
GDI = Player.GetPlayer("GDI")
USSR = Player.GetPlayer("USSR")
MissionPlayer = GDI
TimerTicks = MaxReactorFuelTime
CurrentDelivery = 1
Expand Down
6 changes: 3 additions & 3 deletions mods/ca/maps/ca23-emancipation/ca23.lua
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ Squads = {
}

WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Scrin = Player.GetPlayer("Scrin")
GDISlaves = Player.GetPlayer("GDISlaves")
GDI = Player.GetPlayer("GDI")
Scrin = Player.GetPlayer("Scrin")
GDISlaves = Player.GetPlayer("GDISlaves")
MissionPlayer = GDI
EnslavedUnitsKilled = 0

Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca24-duality/ca24.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ ScrinReinforcementInterval = {
}

WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Scrin = Player.GetPlayer("Scrin")
GDI = Player.GetPlayer("GDI")
Scrin = Player.GetPlayer("Scrin")
MissionPlayer = GDI
TimerTicks = 0

Expand Down
4 changes: 2 additions & 2 deletions mods/ca/maps/ca25-singularity/ca25.lua
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@ HackersDelay = {
}

WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
GDI = Player.GetPlayer("GDI")
Greece = Player.GetPlayer("Greece")
USSR = Player.GetPlayer("USSR")
Nod = Player.GetPlayer("Nod")
Scrin = Player.GetPlayer("Scrin")
Scrin = Player.GetPlayer("Scrin")
AlliedSlaves = Player.GetPlayer("AlliedSlaves")
SovietSlaves = Player.GetPlayer("SovietSlaves")
NodSlaves = Player.GetPlayer("NodSlaves")
Expand Down
64 changes: 32 additions & 32 deletions mods/ca/maps/ca26-foothold/ca26.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ Squads = {
ProducerTypes = { Infantry = { "port" }, Vehicles = { "wsph" }, Aircraft = { "grav" } },
Units = UnitCompositions.Scrin.Main,
AttackPaths = {
{ ScrinAttack1.Location, ScrinAttack2.Location, ScrinAttack3.Location, ScrinAttack4.Location }
},
{ ScrinAttack1.Location, ScrinAttack2.Location, ScrinAttack3.Location, ScrinAttack4.Location }
},
},
ScrinWater = {
Delay = {
Expand Down Expand Up @@ -74,10 +74,10 @@ Squads = {
{ Vehicles = { "lace", "lace", "seek", "seek" }, },
{ Vehicles = { "devo", "intl.ai2", "ruin" }, MinTime = DateTime.Minutes(7) },
}
},
},
AttackPaths = {
{ ScrinAttack1.Location, ScrinAttack2b.Location, ScrinAttack4.Location }
},
{ ScrinAttack1.Location, ScrinAttack2b.Location, ScrinAttack4.Location }
},
},
ScrinAir = {
Delay = {
Expand Down Expand Up @@ -113,9 +113,9 @@ Squads = {
}

WorldLoaded = function()
GDI = Player.GetPlayer("GDI")
Scrin = Player.GetPlayer("Scrin")
TibLifeforms = Player.GetPlayer("TibLifeforms")
GDI = Player.GetPlayer("GDI")
Scrin = Player.GetPlayer("Scrin")
TibLifeforms = Player.GetPlayer("TibLifeforms")
GatewayOwner = Player.GetPlayer("GatewayOwner")
MissionPlayer = GDI
TimerTicks = 0
Expand All @@ -127,10 +127,10 @@ WorldLoaded = function()
InitScrin()
InitTibLifeforms()

ObjectiveDeploySensorArrays = GDI.AddObjective("Deploy Sensor Arrays at target locations.")
ObjectiveDeploySensorArrays = GDI.AddObjective("Deploy Sensor Arrays at target locations.")
ObjectiveCaptureNerveCenter = GDI.AddObjective("Capture Scrin Nerve Center.")
SetupReveals({ Reveal1, Reveal2 })
CheckSensors()
CheckSensors()

if Difficulty ~= "easy" then
Trigger.AfterDelay(DateTime.Seconds(10), function()
Expand Down Expand Up @@ -240,7 +240,7 @@ OncePerSecondChecks = function()
GDI.MarkCompletedObjective(ObjectiveDestroyScrinBase)
end

CheckSensors()
CheckSensors()
end
end

Expand All @@ -251,36 +251,36 @@ OncePerFiveSecondChecks = function()
end

CheckSensors = function()
if GDI.IsObjectiveCompleted(ObjectiveDeploySensorArrays) then
return
end
if GDI.IsObjectiveCompleted(ObjectiveDeploySensorArrays) then
return
end

NumSensorsDeployed = 0
NumSensorsDeployed = 0

Utils.Do(SensorZones, function(z)
Utils.Do(SensorZones, function(z)
local deployedSensors = Map.ActorsInCircle(z.CenterPosition, WDist.New(10 * 1024), function(a)
return a.Type == "deployedsensortoken"
end)

if #deployedSensors > 0 then
NumSensorsDeployed = NumSensorsDeployed + 1
end
end)
if #deployedSensors > 0 then
NumSensorsDeployed = NumSensorsDeployed + 1
end
end)

if NumSensorsDeployed == 4 then
UserInterface.SetMissionText("")
GDI.MarkCompletedObjective(ObjectiveDeploySensorArrays)
if NumSensorsDeployed == 4 then
UserInterface.SetMissionText("")
GDI.MarkCompletedObjective(ObjectiveDeploySensorArrays)
SensorZone1.Destroy()
SensorZone2.Destroy()
SensorZone3.Destroy()
SensorZone4.Destroy()

Trigger.AfterDelay(DateTime.Seconds(2), function()
Trigger.AfterDelay(DateTime.Seconds(2), function()

local nerveCenterCamera = Actor.Create("camera", true, { Owner = GDI, Location = NerveCenter1.Location })
Trigger.AfterDelay(DateTime.Seconds(10), function()
nerveCenterCamera.Destroy()
end)
local nerveCenterCamera = Actor.Create("camera", true, { Owner = GDI, Location = NerveCenter1.Location })
Trigger.AfterDelay(DateTime.Seconds(10), function()
nerveCenterCamera.Destroy()
end)

Beacon.New(GDI, NerveCenter1.CenterPosition)
MediaCA.PlaySound("c_nervecenterlocated.aud", 2)
Expand Down Expand Up @@ -316,10 +316,10 @@ CheckSensors = function()
end)
end
end)
end)
else
UserInterface.SetMissionText("Sensor arrays deployed: " .. NumSensorsDeployed .. "/4", HSLColor.Yellow)
end
end)
else
UserInterface.SetMissionText("Sensor arrays deployed: " .. NumSensorsDeployed .. "/4", HSLColor.Yellow)
end
end

InitScrin = function()
Expand Down
Loading

0 comments on commit 34fd0ea

Please sign in to comment.