epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix idling aircraft on Intervention

Browse Source
This commit is contained in:
Oliver Brakmann
2019-09-09 22:24:25 +02:00
committed by reaperrr
parent 0462cfa507
commit 6e18de4370
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mods/ra/maps/intervention/intervention.lua
View File

@@ -35,10 +35,10 @@ end
Village = { FarmHouse1, FarmHouse2, FarmHouse3, FarmHouse4, FarmHouse5, FarmHouse6, FarmHouse7, FarmHouse8, FarmHouse9, Church } Village = { FarmHouse1, FarmHouse2, FarmHouse3, FarmHouse4, FarmHouse5, FarmHouse6, FarmHouse7, FarmHouse8, FarmHouse9, Church }
VillageRaidInterval = DateTime.Minutes(3) VillageRaidInterval = DateTime.Minutes(3)
VillageRaidAircraft = { "mig", "mig" } VillageRaidAircraft = { "mig.scripted", "mig.scripted" }
VillageRaidWpts = { VillageRaidEntrypoint.Location, VillageRaidWpt1.Location, VillageRaidWpt2.Location } VillageRaidWpts = { VillageRaidEntrypoint.Location, VillageRaidWpt1.Location, VillageRaidWpt2.Location }
BaseRaidAircraft = { "mig", "mig" } BaseRaidAircraft = { "mig.scripted", "mig.scripted" }
BaseRaidWpts = { BaseRaidEntrypoint.Location, UboatPatrolWpt1.Location, BaseRaidWpt2.Location } BaseRaidWpts = { BaseRaidEntrypoint.Location, UboatPatrolWpt1.Location, BaseRaidWpt2.Location }
BaseFrontAttackUnits = { "e3", "e3", "e1", "e1", "e1", "3tnk", "3tnk", "apc" } BaseFrontAttackUnits = { "e3", "e3", "e1", "e1", "e1", "3tnk", "3tnk", "apc" }
@@ -77,7 +77,7 @@ ParadropSovietUnits = function()
powerproxy.Destroy() powerproxy.Destroy()
end end
AirRaid = function(planeTypes, ingress, egress, target) AirRaid = function(planeTypes, ingress, target)
if target == nil then if target == nil then
return return
end end
@@ -89,8 +89,6 @@ AirRaid = function(planeTypes, ingress, egress, target)
Utils.Do(ingress, function(wpt) plane.Move(wpt) end) Utils.Do(ingress, function(wpt) plane.Move(wpt) end)
plane.Attack(target) plane.Attack(target)
Utils.Do(egress, function(wpt) plane.Move(wpt) end)
plane.Destroy()
end) end)
end end
end end
@@ -106,7 +104,7 @@ BaseRaid = function()
local target = Utils.Random(targets) local target = Utils.Random(targets)
AirRaid(BaseRaidAircraft, BaseRaidWpts, { VillageRaidEntrypoint.Location }, target) AirRaid(BaseRaidAircraft, BaseRaidWpts, target)
Trigger.AfterDelay(BaseRaidInterval, BaseRaid) Trigger.AfterDelay(BaseRaidInterval, BaseRaid)
end end
@@ -124,7 +122,7 @@ VillageRaid = function()
return return
end end
AirRaid(VillageRaidAircraft, VillageRaidWpts, { BaseRaidEntrypoint.Location }, target) AirRaid(VillageRaidAircraft, VillageRaidWpts, target)
Trigger.AfterDelay(VillageRaidInterval, VillageRaid) Trigger.AfterDelay(VillageRaidInterval, VillageRaid)
end end

9
mods/ra/maps/intervention/rules.yaml
View File

@@ -71,11 +71,16 @@ GIVEFIX:
Tooltip: Tooltip:
Name: Weapons Factory or Helipad Name: Weapons Factory or Helipad
MIG: MIG.SCRIPTED:
Inherits: MIG
Buildable: Buildable:
Prerequisites: ~afld Prerequisites: ~disabled
RenderSprites:
Image: mig
AmmoPool: AmmoPool:
Ammo: 2 Ammo: 2
Aircraft:
IdleBehavior: LeaveMap
HELI: HELI:
Buildable: Buildable: