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

Fix D2k objectives, alerts in Ha2, Or4, At5

Browse Source
This commit is contained in:
JovialFeline
2023-12-09 15:35:50 -05:00
committed by Gustas
parent da507b2eed
commit adf515d50b
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mods/d2k/maps/atreides-05/atreides05.lua
View File

@@ -251,7 +251,7 @@ Tick = function()
end end
if LastHarkonnenArrived and not Atreides.IsObjectiveCompleted(KillHarkonnen) and Harkonnen.HasNoRequiredUnits() then if LastHarkonnenArrived and not Atreides.IsObjectiveCompleted(KillHarkonnen) and Harkonnen.HasNoRequiredUnits() then
Media.DisplayMessage(UserInterface.Translate("atreides-05"), Mentat) Media.DisplayMessage(UserInterface.Translate("harkonnen-annihilated"), Mentat)
Atreides.MarkCompletedObjective(KillHarkonnen) Atreides.MarkCompletedObjective(KillHarkonnen)
end end
@@ -330,8 +330,8 @@ WorldLoaded = function()
Atreides.MarkFailedObjective(DefendStarport) Atreides.MarkFailedObjective(DefendStarport)
end end
end) end)
Trigger.OnDamaged(Starport, function() Trigger.OnDamaged(Starport, function(_, attacker)
if Starport.Owner ~= Smuggler then if Starport.Owner ~= Smuggler or attacker.IsDead or attacker.Owner ~= Atreides then
return return
end end

2
mods/d2k/maps/harkonnen-02a/harkonnen02a.lua
View File

@@ -81,7 +81,7 @@ WorldLoaded = function()
InitObjectives(Harkonnen) InitObjectives(Harkonnen)
KillHarkonnen = AddPrimaryObjective(Atreides, "") KillHarkonnen = AddPrimaryObjective(Atreides, "")
KillAtreides = AddSecondaryObjective(Harkonnen, "destroy-atreides-forces") KillAtreides = AddPrimaryObjective(Harkonnen, "destroy-atreides-forces")
Camera.Position = HConyard.CenterPosition Camera.Position = HConyard.CenterPosition

2
mods/d2k/maps/harkonnen-02b/harkonnen02b.lua
View File

@@ -81,7 +81,7 @@ WorldLoaded = function()
InitObjectives(Harkonnen) InitObjectives(Harkonnen)
KillHarkonnen = AddPrimaryObjective(Atreides, "") KillHarkonnen = AddPrimaryObjective(Atreides, "")
KillAtreides = AddSecondaryObjective(Harkonnen, "destroy-atreides-forces") KillAtreides = AddPrimaryObjective(Harkonnen, "destroy-atreides-forces")
Camera.Position = HConyard.CenterPosition Camera.Position = HConyard.CenterPosition

8
mods/d2k/maps/ordos-04/map.yaml
View File

@@ -318,16 +318,16 @@ Actors:
Actor92: spicebloom.spawnpoint Actor92: spicebloom.spawnpoint
Location: 23,24 Location: 23,24
Owner: Neutral Owner: Neutral
HGunTurret3: wind_trap HPower3: wind_trap
Location: 44,24 Location: 44,24
Owner: Harkonnen Owner: Harkonnen
HPower3: wind_trap HPower4: wind_trap
Location: 46,24 Location: 46,24
Owner: Harkonnen Owner: Harkonnen
Actor95: wall Actor95: wall
Location: 46,29 Location: 46,29
Owner: Harkonnen Owner: Harkonnen
HGunTurret4: medium_gun_turret HGunTurret3: medium_gun_turret
Location: 47,29 Location: 47,29
Owner: Harkonnen Owner: Harkonnen
Actor97: wall Actor97: wall
@@ -345,7 +345,7 @@ Actors:
Actor101: wall Actor101: wall
Location: 10,32 Location: 10,32
Owner: Harkonnen Owner: Harkonnen
HGunTurret5: medium_gun_turret HGunTurret4: medium_gun_turret
Location: 11,32 Location: 11,32
Owner: Harkonnen Owner: Harkonnen
Actor103: light_inf Actor103: light_inf

6
mods/d2k/maps/ordos-04/ordos04.lua
View File

@@ -9,7 +9,7 @@
Base = Base =
{ {
Harkonnen = { HConyard, HRefinery, HHeavyFactory, HLightFactory, HGunTurret1, HGunTurret2, HGunTurret3, HGunTurret4, HGunTurret5, HBarracks, HPower1, HPower2, HPower3, HPower4 }, Harkonnen = { HConyard, HRefinery, HHeavyFactory, HLightFactory, HGunTurret1, HGunTurret2, HGunTurret3, HGunTurret4, HBarracks, HPower1, HPower2, HPower3, HPower4 },
Smugglers = { SOutpost, SHeavyFactory, SLightFactory, SGunTurret1, SGunTurret2, SGunTurret3, SGunTurret4, SBarracks, SPower1, SPower2, SPower3 } Smugglers = { SOutpost, SHeavyFactory, SLightFactory, SGunTurret1, SGunTurret2, SGunTurret3, SGunTurret4, SBarracks, SPower1, SPower2, SPower3 }
} }
@@ -139,8 +139,8 @@ WorldLoaded = function()
Smuggler.MarkFailedObjective(DefendOutpost) Smuggler.MarkFailedObjective(DefendOutpost)
end) end)
end) end)
Trigger.OnDamaged(SOutpost, function() Trigger.OnDamaged(SOutpost, function(_, attacker)
if SOutpost.Owner ~= Smuggler then if SOutpost.Owner ~= Smuggler or attacker.IsDead or attacker.Owner ~= Ordos then
return return
end end