From b44a9ab5fc8fe32c425d0dc870de8bf27d1464a0 Mon Sep 17 00:00:00 2001 From: Smittytron Date: Tue, 22 Dec 2020 16:09:02 -0600 Subject: [PATCH] Fix palettes in Fall of Greece 1 --- .../fall-of-greece-1-personal-war/map.yaml | 110 +++++++++--------- .../personal-war.lua | 24 ++-- mods/ra/rules/campaign-palettes.yaml | 1 + 3 files changed, 68 insertions(+), 67 deletions(-) diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml b/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml index 3ff7ed2ef6..1f03d5b23d 100644 --- a/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml +++ b/mods/ra/maps/fall-of-greece-1-personal-war/map.yaml @@ -24,8 +24,8 @@ Players: OwnsWorld: True NonCombatant: True Faction: allies - PlayerReference@Greece: - Name: Greece + PlayerReference@England: + Name: England Faction: allies Color: A0F08C Allies: GreekCivilians, Allies @@ -41,87 +41,87 @@ Players: Color: ABB7E4 LockSpawn: True LockTeam: True - Allies: Greece + Allies: England Enemies: USSR, BadGuy PlayerReference@GreekCivilians: Name: GreekCivilians NonCombatant: True Faction: allies - Allies: Greece + Allies: England PlayerReference@USSR: Name: USSR Faction: soviet Color: FF1400 Allies: BadGuy - Enemies: Greece, GreekCivilians, Allies + Enemies: England, GreekCivilians, Allies PlayerReference@BadGuy: Name: BadGuy Faction: soviet Color: FF1400 Allies: USSR - Enemies: Greece, GreekCivilians, Allies + Enemies: England, GreekCivilians, Allies Actors: Actor0: brik Location: 97,44 - Owner: Greece + Owner: England Actor1: brik Location: 98,44 - Owner: Greece + Owner: England Actor2: brik Location: 101,44 - Owner: Greece + Owner: England Actor3: brik Location: 102,44 - Owner: Greece + Owner: England Actor4: brik Location: 97,45 - Owner: Greece + Owner: England Actor5: brik Location: 98,45 - Owner: Greece + Owner: England Actor6: brik Location: 99,45 - Owner: Greece + Owner: England Actor7: brik Location: 100,45 - Owner: Greece + Owner: England Actor8: brik Location: 101,45 - Owner: Greece + Owner: England Actor9: brik Location: 102,45 - Owner: Greece + Owner: England Actor10: brik Location: 82,49 - Owner: Greece + Owner: England Actor11: brik Location: 83,49 - Owner: Greece + Owner: England Actor12: brik Location: 86,49 - Owner: Greece + Owner: England Actor13: brik Location: 87,49 - Owner: Greece + Owner: England Actor16: brik Location: 82,50 - Owner: Greece + Owner: England Actor17: brik Location: 83,50 - Owner: Greece + Owner: England Actor18: brik Location: 84,50 - Owner: Greece + Owner: England Actor19: brik Location: 85,50 - Owner: Greece + Owner: England Actor20: brik Location: 86,50 - Owner: Greece + Owner: England Actor21: brik Location: 87,50 - Owner: Greece + Owner: England Actor14: brik Location: 27,50 Owner: USSR @@ -535,65 +535,65 @@ Actors: Owner: Neutral Actor391: flare Location: 81,41 - Owner: Greece + Owner: England Actor157: apwr Location: 89,40 - Owner: Greece + Owner: England Actor158: tent Location: 89,43 - Owner: Greece + Owner: England Actor159: pbox Location: 88,50 - Owner: Greece + Owner: England Actor160: pbox Location: 96,45 - Owner: Greece + Owner: England Actor161: gun Location: 92,47 - Owner: Greece + Owner: England Facing: 636 Actor162: v19 Location: 101,42 - Owner: Greece + Owner: England Actor163: brl3 Location: 102,41 - Owner: Greece + Owner: England Actor164: brl3 Location: 101,41 - Owner: Greece + Owner: England Actor165: barl Location: 100,40 - Owner: Greece + Owner: England Actor166: brl3 Location: 99,39 - Owner: Greece + Owner: England Actor167: barl Location: 98,39 - Owner: Greece + Owner: England Actor168: v19 Location: 97,39 - Owner: Greece + Owner: England Actor169: brl3 Location: 96,39 - Owner: Greece + Owner: England Actor170: barl Location: 95,40 - Owner: Greece + Owner: England Actor171: barl Location: 102,43 - Owner: Greece + Owner: England Actor172: brl3 Location: 100,44 - Owner: Greece + Owner: England Actor173: brl3 Location: 97,40 - Owner: Greece + Owner: England Actor174: brl3 Location: 98,40 - Owner: Greece + Owner: England Actor175: barl Location: 102,42 - Owner: Greece + Owner: England Church: v01 Location: 93,70 Owner: GreekCivilians @@ -656,16 +656,16 @@ Actors: Owner: USSR Actor193: brl3 Location: 99,43 - Owner: Greece + Owner: England Actor194: barl Location: 98,43 - Owner: Greece + Owner: England CivBarrel: barl Location: 94,40 - Owner: Greece + Owner: England Actor196: brl3 Location: 101,43 - Owner: Greece + Owner: England SovFact: fact Location: 31,59 Owner: USSR @@ -734,16 +734,16 @@ Actors: Owner: USSR Actor218: apwr Location: 80,46 - Owner: Greece + Owner: England Actor219: dome Location: 84,47 - Owner: Greece + Owner: England BridgeBarrel1: brl3 Location: 85,42 - Owner: Greece + Owner: England Actor221: barl Location: 85,41 - Owner: Greece + Owner: England Actor222: v19 Location: 68,57 Owner: Neutral @@ -882,7 +882,7 @@ Actors: Facing: 508 FlareBoy: e1 Location: 75,87 - Owner: Greece + Owner: England Facing: 380 SubCell: 2 Actor268: e1 diff --git a/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua b/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua index d86231f036..4736cade71 100644 --- a/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua +++ b/mods/ra/maps/fall-of-greece-1-personal-war/personal-war.lua @@ -59,7 +59,7 @@ MissionStart = function() FlareBoy.Move(LightFlare.Location) Trigger.OnEnteredFootprint({ LightFlare.Location }, function(actor, id) - if actor.Owner == Greece then + if actor.Owner == England then Trigger.RemoveFootprintTrigger(id) local insertionFlare = Actor.Create("flare", true, { Owner = Allies, Location = LightFlare.Location }) Trigger.AfterDelay(DateTime.Seconds(2), function() @@ -117,7 +117,7 @@ FootprintTriggers = function() end end) - DoomedHeli = Reinforcements.ReinforceWithTransport(Greece, ExtractionHelicopterType, nil, DoomedHeliPath)[1] + DoomedHeli = Reinforcements.ReinforceWithTransport(England, ExtractionHelicopterType, nil, DoomedHeliPath)[1] end end) @@ -152,7 +152,7 @@ FootprintTriggers = function() end) 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(SafePath2.Location) guide.Move(CivilianRally.Location) @@ -174,8 +174,8 @@ FootprintTriggers = function() foot4Triggered = true Trig4House.Owner = Civilians - Reinforcements.Reinforce(Greece, CivilianSquad1, { CivFlee1.Location, CivilianRally.Location }, 0) - Reinforcements.Reinforce(Greece, CivilianSquad2, { CivFlee2.Location, CivilianRally.Location }, 0) + Reinforcements.Reinforce(England, CivilianSquad1, { CivFlee1.Location, CivilianRally.Location }, 0) + Reinforcements.Reinforce(England, CivilianSquad2, { CivFlee2.Location, CivilianRally.Location }, 0) end end) @@ -208,7 +208,7 @@ FootprintTriggers = function() Trigger.AfterDelay(DateTime.Seconds(20), function() Media.PlaySoundNotification(Allies, "AlertBuzzer") 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) if Map.LobbyOption("difficulty") == "hard" then Trigger.AfterDelay(DateTime.Seconds(30), function() @@ -276,10 +276,10 @@ FootprintTriggers = function() end) Trigger.AfterDelay(DateTime.Seconds(26), function() - Reinforcements.Reinforce(Greece, CivilianSquad1, { House1.Location, TacticalNuke3.Location }, 0) - Reinforcements.Reinforce(Greece, CivilianSquad2, { House2.Location, TacticalNuke3.Location }, 0) - Reinforcements.Reinforce(Greece, CivilianSquad1, { House3.Location, TacticalNuke3.Location }, 0) - Reinforcements.Reinforce(Greece, CivilianSquad2, { House4.Location, TacticalNuke3.Location }, 0) + Reinforcements.Reinforce(England, CivilianSquad1, { House1.Location, TacticalNuke3.Location }, 0) + Reinforcements.Reinforce(England, CivilianSquad2, { House2.Location, TacticalNuke3.Location }, 0) + Reinforcements.Reinforce(England, CivilianSquad1, { House3.Location, TacticalNuke3.Location }, 0) + Reinforcements.Reinforce(England, CivilianSquad2, { House4.Location, TacticalNuke3.Location }, 0) end) Trigger.AfterDelay(DateTime.Seconds(15), function() @@ -404,7 +404,7 @@ end ChurchAttack = function() 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) a.Move(a.Location + CVec.New(-1,-1)) a.Panic() @@ -489,7 +489,7 @@ WorldLoaded = function() Allies = Player.GetPlayer("Allies") USSR = Player.GetPlayer("USSR") BadGuy = Player.GetPlayer("BadGuy") - Greece = Player.GetPlayer("Greece") + England = Player.GetPlayer("England") Civilians = Player.GetPlayer("GreekCivilians") Trigger.OnObjectiveAdded(Allies, function(p, id) diff --git a/mods/ra/rules/campaign-palettes.yaml b/mods/ra/rules/campaign-palettes.yaml index 3c4c1530f4..7775ed160f 100644 --- a/mods/ra/rules/campaign-palettes.yaml +++ b/mods/ra/rules/campaign-palettes.yaml @@ -10,6 +10,7 @@ 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 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 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