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

Fix/Update the patrols on nod07c

Browse Source
This commit is contained in:
abcdefg30
2019-09-29 00:23:02 +02:00
committed by reaperrr
parent 54e2aad1cd
commit c4ab5d4561
2 changed files with 57 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
mods/cnc/maps/nod07c/map.yaml
View File

@@ -398,24 +398,24 @@ Actors:
Owner: Civilians Owner: Civilians
Health: 51 Health: 51
ScriptTags: Village ScriptTags: Village
Actor111: jeep JeepGuard1: jeep
Location: 40,57 Location: 40,57
Owner: GDI Owner: GDI
Actor112: jeep JeepGuard2: jeep
Location: 39,57 Location: 39,57
Owner: GDI Owner: GDI
Actor113: mtnk MediumTank1: mtnk
Location: 54,52 Location: 54,52
Owner: GDI Owner: GDI
Actor114: mtnk MediumTank3: mtnk
Location: 44,45 Location: 44,45
Owner: GDI Owner: GDI
Facing: 32 Facing: 32
Actor115: mtnk MediumTank2: mtnk
Location: 34,34 Location: 34,34
Owner: GDI Owner: GDI
Facing: 224 Facing: 224
Actor117: jeep Jeep: jeep
Location: 30,41 Location: 30,41
Owner: GDI Owner: GDI
Facing: 224 Facing: 224
@@ -423,43 +423,43 @@ Actors:
Location: 26,43 Location: 26,43
Owner: GDI Owner: GDI
Facing: 224 Facing: 224
Actor125: e2 Guard1: e2
Location: 46,57 Location: 46,57
Owner: GDI Owner: GDI
SubCell: 3 SubCell: 3
Actor126: e2 Guard2: e2
Location: 46,58 Location: 46,58
Owner: GDI Owner: GDI
SubCell: 1 SubCell: 1
Actor127: e2 Guard3: e2
Location: 45,58 Location: 45,58
Owner: GDI Owner: GDI
SubCell: 2 SubCell: 2
Actor128: e2 Guard4: e2
Location: 45,57 Location: 45,57
Owner: GDI Owner: GDI
SubCell: 4 SubCell: 4
Actor129: e1 Guard5: e1
Location: 43,58 Location: 43,58
Owner: GDI Owner: GDI
SubCell: 2 SubCell: 2
Actor130: e1 Guard6: e1
Location: 44,58 Location: 44,58
Owner: GDI Owner: GDI
SubCell: 1 SubCell: 1
Actor131: e1 Guard7: e1
Location: 44,57 Location: 44,57
Owner: GDI Owner: GDI
SubCell: 4 SubCell: 4
Actor132: e1 Guard8: e1
Location: 44,58 Location: 44,58
Owner: GDI Owner: GDI
SubCell: 2 SubCell: 2
Actor133: e1 Guard9: e1
Location: 44,57 Location: 44,57
Owner: GDI Owner: GDI
SubCell: 3 SubCell: 3
Actor134: e1 Guard10: e1
Location: 43,57 Location: 43,57
Owner: GDI Owner: GDI
SubCell: 4 SubCell: 4
@@ -585,43 +585,43 @@ Actors:
Location: 45,7 Location: 45,7
Owner: GDI Owner: GDI
SubCell: 4 SubCell: 4
Actor179: e1 SideGuard1: e1
Location: 51,52 Location: 51,52
Owner: GDI Owner: GDI
SubCell: 2 SubCell: 2
Actor180: e1 SideGuard2: e1
Location: 52,52 Location: 52,52
Owner: GDI Owner: GDI
SubCell: 1 SubCell: 1
Actor181: e1 SideGuard3: e1
Location: 52,52 Location: 52,52
Owner: GDI Owner: GDI
SubCell: 3 SubCell: 3
Actor182: e1 SideGuard4: e1
Location: 51,52 Location: 51,52
Owner: GDI Owner: GDI
SubCell: 4 SubCell: 4
Actor183: e2 SideGuard5: e2
Location: 53,52 Location: 53,52
Owner: GDI Owner: GDI
SubCell: 1 SubCell: 1
Actor184: e2 SideGuard6: e2
Location: 53,52 Location: 53,52
Owner: GDI Owner: GDI
SubCell: 2 SubCell: 2
Actor185: e2 SideGuard7: e2
Location: 53,52 Location: 53,52
Owner: GDI Owner: GDI
SubCell: 4 SubCell: 4
Actor186: e2 SideGuard8: e2
Location: 53,52 Location: 53,52
Owner: GDI Owner: GDI
SubCell: 3 SubCell: 3
Actor187: e1 InfantryPatrol1: e1
Location: 48,57 Location: 48,57
Owner: GDI Owner: GDI
SubCell: 3 SubCell: 3
Actor188: e1 InfantryPatrol2: e1
Location: 47,57 Location: 47,57
Owner: GDI Owner: GDI
SubCell: 4 SubCell: 4
@@ -644,7 +644,7 @@ Actors:
Location: 37,55 Location: 37,55
Owner: Neutral Owner: Neutral
waypoint14: waypoint waypoint14: waypoint
Location: 54,46 Location: 53,46
Owner: Neutral Owner: Neutral
waypoint13: waypoint waypoint13: waypoint
Location: 12,7 Location: 12,7
@@ -655,9 +655,6 @@ Actors:
waypoint11: waypoint waypoint11: waypoint
Location: 52,24 Location: 52,24
Owner: Neutral Owner: Neutral
waypoint10: waypoint
Location: 27,33
Owner: Neutral
waypoint9: waypoint waypoint9: waypoint
Location: 21,37 Location: 21,37
Owner: Neutral Owner: Neutral

59
mods/cnc/maps/nod07c/nod07c.lua
View File

@@ -14,23 +14,16 @@ NodUnitsRockets = { "e3", "e3", "e3", "e3" }
NodUnitsGunners = { "e1", "e1", "e1", "e1" } NodUnitsGunners = { "e1", "e1", "e1", "e1" }
NodUnitsFlamers = { "e4", "e4", "e4", "e4" } NodUnitsFlamers = { "e4", "e4", "e4", "e4" }
GDI1 = { units = { "e1", "e1" }, waypoints = { waypoint0.Location, waypoint1.Location, waypoint2.Location, waypoint8.Location, waypoint2.Location, waypoint9.Location, waypoint2.Location } } MainEntranceGuards = { JeepGuard1, JeepGuard2, MediumTank1, SideGuard1, SideGuard2, SideGuard6, SideGuard7, Guard1, Guard2, Guard3, Guard4, Guard5, Guard6, Guard7, Guard8, Guard9, Guard10 }
GDI2 = { units = { "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e1", "e2", "e2", "e2", "e2", "e2", "e2", "e2", "e2", "mtnk", "jeep" }, waypoints = { waypoint12.Location, waypoint15.Location, waypoint0.Location } } InfantryPatrol = { InfantryPatrol1, InfantryPatrol2 }
GDI3 = { units = { "jeep" }, waypoints = { waypoint0.Location, waypoint1.Location, waypoint3.Location, waypoint4.Location, waypoint3.Location, waypoint2.Location, waypoint5.Location, waypoint6.Location, waypoint2.Location, waypoint7.Location } }
MTANK = { units = { "mtnk" }, waypoints = { waypoint14.Location, waypoint5.Location } } MainEntrancePatrolPath = { waypoint0.Location, waypoint1.Location, waypoint15.Location, waypoint12.Location }
InfantryPatrolPath = { waypoint0.Location, waypoint1.Location, waypoint2.Location, waypoint8.Location, waypoint2.Location, waypoint9.Location, waypoint2.Location }
JeepPatrolPath = { waypoint0.Location, waypoint1.Location, waypoint3.Location, waypoint4.Location, waypoint3.Location, waypoint2.Location, waypoint5.Location, waypoint6.Location, waypoint2.Location, waypoint7.Location }
MediumTankPatrolPath = { waypoint14.Location, waypoint5.Location }
TargetsKilled = 0 TargetsKilled = 0
AutoGuard = function(guards)
Utils.Do(guards, function(guard)
Trigger.OnDamaged(guard, function()
if not guard.IsDead then
IdleHunt(guard)
end
end)
end)
end
InsertNodUnits = function() InsertNodUnits = function()
Media.PlaySpeechNotification(Nod, "Reinforce") Media.PlaySpeechNotification(Nod, "Reinforce")
Reinforcements.Reinforce(Nod, { "ltnk" }, { ReinforcementsTopSpawn.Location, ReinforcementsTankRally.Location }, 1) Reinforcements.Reinforce(Nod, { "ltnk" }, { ReinforcementsTopSpawn.Location, ReinforcementsTankRally.Location }, 1)
@@ -65,14 +58,9 @@ DiscoveredMainEntrance = function()
Nod.MarkCompletedObjective(DistractGuardsObjective) Nod.MarkCompletedObjective(DistractGuardsObjective)
Trigger.AfterDelay(DateTime.Seconds(3), function() Utils.Do(MainEntranceGuards, function(guard)
for type, amount in pairs(GDI2.units) do if not guard.IsDead then
local actors = Utils.Take(amount, GDI.GetActorsByType(type)) guard.Patrol(MainEntrancePatrolPath)
Utils.Do(actors, function(actor)
if actor.IsIdle then
actor.AttackMove(waypoint0.Location)
end
end)
end end
end) end)
end end
@@ -90,12 +78,19 @@ Trigger.OnKilled(GDIOrca, function()
end) end)
Trigger.OnDamaged(GuardTower3, function() Trigger.OnDamaged(GuardTower3, function()
SendGuards(MTANK) if not MediumTank3.IsDead then
MediumTank3.Patrol(MediumTankPatrolPath)
end
end) end)
Utils.Do(Map.ActorsWithTag("Village"), function(actor) Utils.Do(Map.ActorsWithTag("Village"), function(actor)
Trigger.OnKilled(actor, function() Trigger.OnKilled(actor, function()
TargetsKilled = TargetsKilled + 1 TargetsKilled = TargetsKilled + 1
if TargetsKilled >= 15 then
Nod.MarkCompletedObjective(NoCaptureObjective)
Nod.MarkCompletedObjective(UseOrcaObjective)
end
end) end)
end) end)
@@ -123,7 +118,18 @@ WorldLoaded = function()
InsertNodUnits() InsertNodUnits()
AutoGuard(GDI.GetGroundAttackers()) Jeep.Patrol(JeepPatrolPath)
Utils.Do(InfantryPatrol, function(unit)
unit.Patrol(InfantryPatrolPath)
end)
Utils.Do(GDI.GetGroundAttackers(), function(guard)
Trigger.OnDamaged(guard, function()
if not guard.IsDead then
IdleHunt(guard)
end
end)
end)
InitObjectives(Nod) InitObjectives(Nod)
@@ -147,11 +153,6 @@ Tick = function()
GDI.MarkCompletedObjective(GDIObjective) GDI.MarkCompletedObjective(GDIObjective)
end end
if TargetsKilled >= 15 then
Nod.MarkCompletedObjective(NoCaptureObjective)
Nod.MarkCompletedObjective(UseOrcaObjective)
end
if GDI.Resources >= GDI.ResourceCapacity * 0.75 then if GDI.Resources >= GDI.ResourceCapacity * 0.75 then
GDI.Resources = GDI.ResourceCapacity * 0.25 GDI.Resources = GDI.ResourceCapacity * 0.25
end end