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

Fix palettes in Fall of Greece 1

Browse Source
This commit is contained in:
Smittytron
2020-12-22 16:09:02 -06:00
committed by Matthias Mailänder
parent e34255b0b2
commit b44a9ab5fc
3 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
mods/ra/maps/fall-of-greece-1-personal-war/map.yaml
View File

@@ -24,8 +24,8 @@ Players:
OwnsWorld: True OwnsWorld: True
NonCombatant: True NonCombatant: True
Faction: allies Faction: allies
PlayerReference@Greece: PlayerReference@England:
Name: Greece Name: England
Faction: allies Faction: allies
Color: A0F08C Color: A0F08C
Allies: GreekCivilians, Allies Allies: GreekCivilians, Allies
@@ -41,87 +41,87 @@ Players:
Color: ABB7E4 Color: ABB7E4
LockSpawn: True LockSpawn: True
LockTeam: True LockTeam: True
Allies: Greece Allies: England
Enemies: USSR, BadGuy Enemies: USSR, BadGuy
PlayerReference@GreekCivilians: PlayerReference@GreekCivilians:
Name: GreekCivilians Name: GreekCivilians
NonCombatant: True NonCombatant: True
Faction: allies Faction: allies
Allies: Greece Allies: England
PlayerReference@USSR: PlayerReference@USSR:
Name: USSR Name: USSR
Faction: soviet Faction: soviet
Color: FF1400 Color: FF1400
Allies: BadGuy Allies: BadGuy
Enemies: Greece, GreekCivilians, Allies Enemies: England, GreekCivilians, Allies
PlayerReference@BadGuy: PlayerReference@BadGuy:
Name: BadGuy Name: BadGuy
Faction: soviet Faction: soviet
Color: FF1400 Color: FF1400
Allies: USSR Allies: USSR
Enemies: Greece, GreekCivilians, Allies Enemies: England, GreekCivilians, Allies
Actors: Actors:
Actor0: brik Actor0: brik
Location: 97,44 Location: 97,44
Owner: Greece Owner: England
Actor1: brik Actor1: brik
Location: 98,44 Location: 98,44
Owner: Greece Owner: England
Actor2: brik Actor2: brik
Location: 101,44 Location: 101,44
Owner: Greece Owner: England
Actor3: brik Actor3: brik
Location: 102,44 Location: 102,44
Owner: Greece Owner: England
Actor4: brik Actor4: brik
Location: 97,45 Location: 97,45
Owner: Greece Owner: England
Actor5: brik Actor5: brik
Location: 98,45 Location: 98,45
Owner: Greece Owner: England
Actor6: brik Actor6: brik
Location: 99,45 Location: 99,45
Owner: Greece Owner: England
Actor7: brik Actor7: brik
Location: 100,45 Location: 100,45
Owner: Greece Owner: England
Actor8: brik Actor8: brik
Location: 101,45 Location: 101,45
Owner: Greece Owner: England
Actor9: brik Actor9: brik
Location: 102,45 Location: 102,45
Owner: Greece Owner: England
Actor10: brik Actor10: brik
Location: 82,49 Location: 82,49
Owner: Greece Owner: England
Actor11: brik Actor11: brik
Location: 83,49 Location: 83,49
Owner: Greece Owner: England
Actor12: brik Actor12: brik
Location: 86,49 Location: 86,49
Owner: Greece Owner: England
Actor13: brik Actor13: brik
Location: 87,49 Location: 87,49
Owner: Greece Owner: England
Actor16: brik Actor16: brik
Location: 82,50 Location: 82,50
Owner: Greece Owner: England
Actor17: brik Actor17: brik
Location: 83,50 Location: 83,50
Owner: Greece Owner: England
Actor18: brik Actor18: brik
Location: 84,50 Location: 84,50
Owner: Greece Owner: England
Actor19: brik Actor19: brik
Location: 85,50 Location: 85,50
Owner: Greece Owner: England
Actor20: brik Actor20: brik
Location: 86,50 Location: 86,50
Owner: Greece Owner: England
Actor21: brik Actor21: brik
Location: 87,50 Location: 87,50
Owner: Greece Owner: England
Actor14: brik Actor14: brik
Location: 27,50 Location: 27,50
Owner: USSR Owner: USSR
@@ -535,65 +535,65 @@ Actors:
Owner: Neutral Owner: Neutral
Actor391: flare Actor391: flare
Location: 81,41 Location: 81,41
Owner: Greece Owner: England
Actor157: apwr Actor157: apwr
Location: 89,40 Location: 89,40
Owner: Greece Owner: England
Actor158: tent Actor158: tent
Location: 89,43 Location: 89,43
Owner: Greece Owner: England
Actor159: pbox Actor159: pbox
Location: 88,50 Location: 88,50
Owner: Greece Owner: England
Actor160: pbox Actor160: pbox
Location: 96,45 Location: 96,45
Owner: Greece Owner: England
Actor161: gun Actor161: gun
Location: 92,47 Location: 92,47
Owner: Greece Owner: England
Facing: 636 Facing: 636
Actor162: v19 Actor162: v19
Location: 101,42 Location: 101,42
Owner: Greece Owner: England
Actor163: brl3 Actor163: brl3
Location: 102,41 Location: 102,41
Owner: Greece Owner: England
Actor164: brl3 Actor164: brl3
Location: 101,41 Location: 101,41
Owner: Greece Owner: England
Actor165: barl Actor165: barl
Location: 100,40 Location: 100,40
Owner: Greece Owner: England
Actor166: brl3 Actor166: brl3
Location: 99,39 Location: 99,39
Owner: Greece Owner: England
Actor167: barl Actor167: barl
Location: 98,39 Location: 98,39
Owner: Greece Owner: England
Actor168: v19 Actor168: v19
Location: 97,39 Location: 97,39
Owner: Greece Owner: England
Actor169: brl3 Actor169: brl3
Location: 96,39 Location: 96,39
Owner: Greece Owner: England
Actor170: barl Actor170: barl
Location: 95,40 Location: 95,40
Owner: Greece Owner: England
Actor171: barl Actor171: barl
Location: 102,43 Location: 102,43
Owner: Greece Owner: England
Actor172: brl3 Actor172: brl3
Location: 100,44 Location: 100,44
Owner: Greece Owner: England
Actor173: brl3 Actor173: brl3
Location: 97,40 Location: 97,40
Owner: Greece Owner: England
Actor174: brl3 Actor174: brl3
Location: 98,40 Location: 98,40
Owner: Greece Owner: England
Actor175: barl Actor175: barl
Location: 102,42 Location: 102,42
Owner: Greece Owner: England
Church: v01 Church: v01
Location: 93,70 Location: 93,70
Owner: GreekCivilians Owner: GreekCivilians
@@ -656,16 +656,16 @@ Actors:
Owner: USSR Owner: USSR
Actor193: brl3 Actor193: brl3
Location: 99,43 Location: 99,43
Owner: Greece Owner: England
Actor194: barl Actor194: barl
Location: 98,43 Location: 98,43
Owner: Greece Owner: England
CivBarrel: barl CivBarrel: barl
Location: 94,40 Location: 94,40
Owner: Greece Owner: England
Actor196: brl3 Actor196: brl3
Location: 101,43 Location: 101,43
Owner: Greece Owner: England
SovFact: fact SovFact: fact
Location: 31,59 Location: 31,59
Owner: USSR Owner: USSR
@@ -734,16 +734,16 @@ Actors:
Owner: USSR Owner: USSR
Actor218: apwr Actor218: apwr
Location: 80,46 Location: 80,46
Owner: Greece Owner: England
Actor219: dome Actor219: dome
Location: 84,47 Location: 84,47
Owner: Greece Owner: England
BridgeBarrel1: brl3 BridgeBarrel1: brl3
Location: 85,42 Location: 85,42
Owner: Greece Owner: England
Actor221: barl Actor221: barl
Location: 85,41 Location: 85,41
Owner: Greece Owner: England
Actor222: v19 Actor222: v19
Location: 68,57 Location: 68,57
Owner: Neutral Owner: Neutral
@@ -882,7 +882,7 @@ Actors:
Facing: 508 Facing: 508
FlareBoy: e1 FlareBoy: e1
Location: 75,87 Location: 75,87
Owner: Greece Owner: England
Facing: 380 Facing: 380
SubCell: 2 SubCell: 2
Actor268: e1 Actor268: e1

24
mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua
View File

@@ -59,7 +59,7 @@ MissionStart = function()
FlareBoy.Move(LightFlare.Location) FlareBoy.Move(LightFlare.Location)
Trigger.OnEnteredFootprint({ LightFlare.Location }, function(actor, id) Trigger.OnEnteredFootprint({ LightFlare.Location }, function(actor, id)
if actor.Owner == Greece then if actor.Owner == England then
Trigger.RemoveFootprintTrigger(id) Trigger.RemoveFootprintTrigger(id)
local insertionFlare = Actor.Create("flare", true, { Owner = Allies, Location = LightFlare.Location }) local insertionFlare = Actor.Create("flare", true, { Owner = Allies, Location = LightFlare.Location })
Trigger.AfterDelay(DateTime.Seconds(2), function() Trigger.AfterDelay(DateTime.Seconds(2), function()
@@ -117,7 +117,7 @@ FootprintTriggers = function()
end end
end) end)
DoomedHeli = Reinforcements.ReinforceWithTransport(Greece, ExtractionHelicopterType, nil, DoomedHeliPath)[1] DoomedHeli = Reinforcements.ReinforceWithTransport(England, ExtractionHelicopterType, nil, DoomedHeliPath)[1]
end end
end) end)
@@ -152,7 +152,7 @@ FootprintTriggers = function()
end) end)
if not GuideHut.IsDead then if not GuideHut.IsDead then
local guide = Actor.Create("c6", true, { Owner = Greece, Location = GuideSpawn.Location }) local guide = Actor.Create("c6", true, { Owner = England, Location = GuideSpawn.Location })
guide.Move(SafePath1.Location) guide.Move(SafePath1.Location)
guide.Move(SafePath2.Location) guide.Move(SafePath2.Location)
guide.Move(CivilianRally.Location) guide.Move(CivilianRally.Location)
@@ -174,8 +174,8 @@ FootprintTriggers = function()
foot4Triggered = true foot4Triggered = true
Trig4House.Owner = Civilians Trig4House.Owner = Civilians
Reinforcements.Reinforce(Greece, CivilianSquad1, { CivFlee1.Location, CivilianRally.Location }, 0) Reinforcements.Reinforce(England, CivilianSquad1, { CivFlee1.Location, CivilianRally.Location }, 0)
Reinforcements.Reinforce(Greece, CivilianSquad2, { CivFlee2.Location, CivilianRally.Location }, 0) Reinforcements.Reinforce(England, CivilianSquad2, { CivFlee2.Location, CivilianRally.Location }, 0)
end end
end) end)
@@ -208,7 +208,7 @@ FootprintTriggers = function()
Trigger.AfterDelay(DateTime.Seconds(20), function() Trigger.AfterDelay(DateTime.Seconds(20), function()
Media.PlaySoundNotification(Allies, "AlertBuzzer") Media.PlaySoundNotification(Allies, "AlertBuzzer")
Media.DisplayMessage("Extraction point is compromised. Evacuate the base!", "Headquarters") Media.DisplayMessage("Extraction point is compromised. Evacuate the base!", "Headquarters")
local defenders = Reinforcements.Reinforce(Greece, TentTeam, { Tent.Location, TentMove.Location }, 0) local defenders = Reinforcements.Reinforce(England, TentTeam, { Tent.Location, TentMove.Location }, 0)
Utils.Do(defenders, IdleHunt) Utils.Do(defenders, IdleHunt)
if Map.LobbyOption("difficulty") == "hard" then if Map.LobbyOption("difficulty") == "hard" then
Trigger.AfterDelay(DateTime.Seconds(30), function() Trigger.AfterDelay(DateTime.Seconds(30), function()
@@ -276,10 +276,10 @@ FootprintTriggers = function()
end) end)
Trigger.AfterDelay(DateTime.Seconds(26), function() Trigger.AfterDelay(DateTime.Seconds(26), function()
Reinforcements.Reinforce(Greece, CivilianSquad1, { House1.Location, TacticalNuke3.Location }, 0) Reinforcements.Reinforce(England, CivilianSquad1, { House1.Location, TacticalNuke3.Location }, 0)
Reinforcements.Reinforce(Greece, CivilianSquad2, { House2.Location, TacticalNuke3.Location }, 0) Reinforcements.Reinforce(England, CivilianSquad2, { House2.Location, TacticalNuke3.Location }, 0)
Reinforcements.Reinforce(Greece, CivilianSquad1, { House3.Location, TacticalNuke3.Location }, 0) Reinforcements.Reinforce(England, CivilianSquad1, { House3.Location, TacticalNuke3.Location }, 0)
Reinforcements.Reinforce(Greece, CivilianSquad2, { House4.Location, TacticalNuke3.Location }, 0) Reinforcements.Reinforce(England, CivilianSquad2, { House4.Location, TacticalNuke3.Location }, 0)
end) end)
Trigger.AfterDelay(DateTime.Seconds(15), function() Trigger.AfterDelay(DateTime.Seconds(15), function()
@@ -404,7 +404,7 @@ end
ChurchAttack = function() ChurchAttack = function()
if not ChurchDamaged then if not ChurchDamaged then
local churchPanicTeam = Reinforcements.Reinforce(Greece, CivilianSquad1, { ChurchSpawn.Location }, 0) local churchPanicTeam = Reinforcements.Reinforce(England, CivilianSquad1, { ChurchSpawn.Location }, 0)
Utils.Do(churchPanicTeam, function(a) Utils.Do(churchPanicTeam, function(a)
a.Move(a.Location + CVec.New(-1,-1)) a.Move(a.Location + CVec.New(-1,-1))
a.Panic() a.Panic()
@@ -489,7 +489,7 @@ WorldLoaded = function()
Allies = Player.GetPlayer("Allies") Allies = Player.GetPlayer("Allies")
USSR = Player.GetPlayer("USSR") USSR = Player.GetPlayer("USSR")
BadGuy = Player.GetPlayer("BadGuy") BadGuy = Player.GetPlayer("BadGuy")
Greece = Player.GetPlayer("Greece") England = Player.GetPlayer("England")
Civilians = Player.GetPlayer("GreekCivilians") Civilians = Player.GetPlayer("GreekCivilians")
Trigger.OnObjectiveAdded(Allies, function(p, id) Trigger.OnObjectiveAdded(Allies, function(p, id)

1
mods/ra/rules/campaign-palettes.yaml
View File

@@ -10,6 +10,7 @@
USSR: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 USSR: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223
Ukraine: 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223 Ukraine: 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223
Greece: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 Greece: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175
Allies: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175
England: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 England: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143
Germany: 128, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 121, 122, 122, 123, 123 Germany: 128, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 121, 122, 122, 123, 123
France: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 France: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191