From 01c1e08bd8dbaca3a6b683bad17d91ca580eb280 Mon Sep 17 00:00:00 2001 From: Mustafa Alperen Seki Date: Mon, 30 Oct 2017 18:06:54 +0300 Subject: [PATCH] Add Original Remap Palette for RA Mod Campaign and Shellmap --- mods/ra/maps/allies-01/map.yaml | 2 +- mods/ra/maps/allies-02/allies02.lua | 6 +- mods/ra/maps/allies-02/map.yaml | 12 +- mods/ra/maps/allies-03a/map.yaml | 2 +- mods/ra/maps/allies-03b/map.yaml | 8 +- mods/ra/maps/allies-04/map.yaml | 2 +- mods/ra/maps/allies-05a/map.yaml | 2 +- mods/ra/maps/allies-06a/map.yaml | 2 +- mods/ra/maps/desert-shellmap/map.yaml | 2 +- mods/ra/maps/desert-shellmap/rules.yaml | 6 + mods/ra/maps/evacuation/map.yaml | 2 +- mods/ra/maps/evacuation/rules.yaml | 8 + mods/ra/maps/exodus/map.yaml | 2 +- mods/ra/maps/exodus/rules.yaml | 8 + mods/ra/maps/infiltration/map.yaml | 2 +- mods/ra/maps/infiltration/rules.yaml | 6 + mods/ra/maps/intervention/map.yaml | 2 +- mods/ra/maps/intervention/rules.yaml | 8 + mods/ra/maps/monster-tank-madness/map.yaml | 2 +- mods/ra/maps/monster-tank-madness/rules.yaml | 7 + mods/ra/maps/soviet-01/map.yaml | 2 +- mods/ra/maps/soviet-02a/map.yaml | 126 ++++++------- mods/ra/maps/soviet-02a/soviet02a.lua | 14 +- mods/ra/maps/soviet-02b/map.yaml | 102 +++++------ mods/ra/maps/soviet-02b/soviet02b.lua | 2 +- mods/ra/maps/soviet-03/map.yaml | 180 +++++++++---------- mods/ra/maps/soviet-03/soviet03.lua | 10 +- mods/ra/maps/soviet-04a/map.yaml | 2 +- mods/ra/maps/soviet-04b/map.yaml | 2 +- mods/ra/maps/soviet-05/map.yaml | 16 +- mods/ra/maps/soviet-05/rules.yaml | 4 +- mods/ra/maps/soviet-05/soviet05.lua | 3 +- mods/ra/maps/soviet-06a/map.yaml | 2 +- mods/ra/maps/soviet-06b/map.yaml | 2 +- mods/ra/maps/soviet-07/map.yaml | 2 +- mods/ra/maps/survival01/map.yaml | 2 +- mods/ra/maps/survival01/rules.yaml | 6 + mods/ra/maps/survival02/map.yaml | 2 +- mods/ra/maps/survival02/rules.yaml | 6 + mods/ra/rules/campaign-palettes.yaml | 24 +++ 40 files changed, 346 insertions(+), 254 deletions(-) create mode 100644 mods/ra/rules/campaign-palettes.yaml diff --git a/mods/ra/maps/allies-01/map.yaml b/mods/ra/maps/allies-01/map.yaml index 46e4740b34..94b37b7af9 100644 --- a/mods/ra/maps/allies-01/map.yaml +++ b/mods/ra/maps/allies-01/map.yaml @@ -440,6 +440,6 @@ Actors: Location: 68,76 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/allies-02/allies02.lua b/mods/ra/maps/allies-02/allies02.lua index 9929ad8756..6e86347053 100644 --- a/mods/ra/maps/allies-02/allies02.lua +++ b/mods/ra/maps/allies-02/allies02.lua @@ -209,13 +209,13 @@ SendTrucks = function() Media.PlaySpeechNotification(player, "ConvoyApproaching") Trigger.AfterDelay(DateTime.Seconds(3), function() ConvoyUnharmed = true - local trucks = Reinforcements.Reinforce(france, TruckReinforcements, TruckPath, DateTime.Seconds(1), + local trucks = Reinforcements.Reinforce(england, TruckReinforcements, TruckPath, DateTime.Seconds(1), function(truck) Trigger.OnIdle(truck, function() truck.Move(TruckExitPoint.Location) end) end) count = 0 Trigger.OnEnteredFootprint( { TruckExitPoint.Location }, function(a, id) - if a.Owner == france then + if a.Owner == england then count = count + 1 a.Destroy() if count == 3 then @@ -249,7 +249,7 @@ end WorldLoaded = function() player = Player.GetPlayer("Greece") - france = Player.GetPlayer("France") + england = Player.GetPlayer("England") ussr = Player.GetPlayer("USSR") Trigger.OnObjectiveAdded(player, function(p, id) diff --git a/mods/ra/maps/allies-02/map.yaml b/mods/ra/maps/allies-02/map.yaml index 8ec29b6efb..3825f6e2bb 100644 --- a/mods/ra/maps/allies-02/map.yaml +++ b/mods/ra/maps/allies-02/map.yaml @@ -23,12 +23,12 @@ Players: Name: USSR Faction: soviet Color: FE1100 - Enemies: Greece, France - PlayerReference@France: - Name: France + Enemies: Greece, England + PlayerReference@England: + Name: England NonCombatant: True Faction: allies - Color: 5CC1A3 + Color: A1EF8C Allies: Greece Enemies: USSR PlayerReference@Neutral: @@ -47,7 +47,7 @@ Players: Color: ABB7E4 LockSpawn: True LockTeam: True - Allies: France + Allies: England Enemies: USSR Actors: @@ -669,4 +669,4 @@ Actors: Location: 89,51 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/allies-03a/map.yaml b/mods/ra/maps/allies-03a/map.yaml index 2e93807ae2..873f7be417 100644 --- a/mods/ra/maps/allies-03a/map.yaml +++ b/mods/ra/maps/allies-03a/map.yaml @@ -1307,6 +1307,6 @@ Actors: Location: 59,72 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/allies-03b/map.yaml b/mods/ra/maps/allies-03b/map.yaml index 82d6fd3132..ad847ad4b4 100644 --- a/mods/ra/maps/allies-03b/map.yaml +++ b/mods/ra/maps/allies-03b/map.yaml @@ -38,6 +38,10 @@ Players: LockColor: True Color: E2E6F5 Enemies: USSR + PlayerReference@England: + Name: England + Color: A1EF8C + Faction: allies Actors: Actor0: cycl @@ -1032,7 +1036,7 @@ Actors: Owner: USSR Jeep: jeep.mission Location: 101,97 - Owner: Neutral + Owner: England Facing: 32 Heavy1: 3tnk Location: 96,66 @@ -1202,6 +1206,6 @@ Actors: Location: 83,94 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/allies-04/map.yaml b/mods/ra/maps/allies-04/map.yaml index 99ddc4778a..856750cea9 100644 --- a/mods/ra/maps/allies-04/map.yaml +++ b/mods/ra/maps/allies-04/map.yaml @@ -535,4 +535,4 @@ Actors: Location: 88,52 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/allies-05a/map.yaml b/mods/ra/maps/allies-05a/map.yaml index d734c014fd..3a2a358e62 100644 --- a/mods/ra/maps/allies-05a/map.yaml +++ b/mods/ra/maps/allies-05a/map.yaml @@ -1561,7 +1561,7 @@ Actors: Owner: Neutral Location: 63,63 -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/allies-06a/map.yaml b/mods/ra/maps/allies-06a/map.yaml index 7f598b33bf..fa3306f231 100644 --- a/mods/ra/maps/allies-06a/map.yaml +++ b/mods/ra/maps/allies-06a/map.yaml @@ -637,4 +637,4 @@ Actors: Owner: Neutral Location: 73,90 -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/desert-shellmap/map.yaml b/mods/ra/maps/desert-shellmap/map.yaml index 7601193771..92f61068aa 100644 --- a/mods/ra/maps/desert-shellmap/map.yaml +++ b/mods/ra/maps/desert-shellmap/map.yaml @@ -1264,6 +1264,6 @@ Actors: Location: 1,28 Owner: Neutral -Rules: rules.yaml +Rules: ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/desert-shellmap/rules.yaml b/mods/ra/maps/desert-shellmap/rules.yaml index 3988c41e73..5896256e1a 100644 --- a/mods/ra/maps/desert-shellmap/rules.yaml +++ b/mods/ra/maps/desert-shellmap/rules.yaml @@ -14,6 +14,12 @@ World: Scripts: desert-shellmap.lua -StartGameNotification: +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + Allies: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 + ^Vehicle: GivesBounty: Percentage: 0 diff --git a/mods/ra/maps/evacuation/map.yaml b/mods/ra/maps/evacuation/map.yaml index 8b56cb2fa4..828dd0664f 100644 --- a/mods/ra/maps/evacuation/map.yaml +++ b/mods/ra/maps/evacuation/map.yaml @@ -1754,4 +1754,4 @@ Actors: Owner: Soviets ScriptTags: TownAttacker -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/evacuation/rules.yaml b/mods/ra/maps/evacuation/rules.yaml index 7161ddf741..def3814002 100644 --- a/mods/ra/maps/evacuation/rules.yaml +++ b/mods/ra/maps/evacuation/rules.yaml @@ -17,6 +17,14 @@ World: normal: Normal Default: normal +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 + Allies1: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 + Allies2: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 + ^Tanks: Demolishable: diff --git a/mods/ra/maps/exodus/map.yaml b/mods/ra/maps/exodus/map.yaml index 233e661f0a..585ae88373 100644 --- a/mods/ra/maps/exodus/map.yaml +++ b/mods/ra/maps/exodus/map.yaml @@ -1426,4 +1426,4 @@ Actors: Owner: Soviets Location: 130, 45 -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/exodus/rules.yaml b/mods/ra/maps/exodus/rules.yaml index 4b60d0e24c..943320a3da 100644 --- a/mods/ra/maps/exodus/rules.yaml +++ b/mods/ra/maps/exodus/rules.yaml @@ -16,6 +16,14 @@ World: hard: Hard Default: normal +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 + Allies1: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 + Allies2: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 + powerproxy.paratroopers: ParatroopersPower: DropItems: E1,E1,E3,E3,E4 diff --git a/mods/ra/maps/infiltration/map.yaml b/mods/ra/maps/infiltration/map.yaml index fe2b73c738..7b4d3876ce 100644 --- a/mods/ra/maps/infiltration/map.yaml +++ b/mods/ra/maps/infiltration/map.yaml @@ -1785,4 +1785,4 @@ Actors: Owner: Soviets Location: 43,50 -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/infiltration/rules.yaml b/mods/ra/maps/infiltration/rules.yaml index 2bf693e254..d0065c30ca 100644 --- a/mods/ra/maps/infiltration/rules.yaml +++ b/mods/ra/maps/infiltration/rules.yaml @@ -22,6 +22,12 @@ World: Name: truk-soviets RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95 Color: FE1100 + IndexedPlayerPalette: + PlayerIndex: + Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 + Allies1: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 + Allies2: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 MISS: Targetable: diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml index 28abf31b71..8c55ddce4c 100644 --- a/mods/ra/maps/intervention/map.yaml +++ b/mods/ra/maps/intervention/map.yaml @@ -2199,6 +2199,6 @@ Actors: Location: 129,57 Owner: Soviets -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/intervention/rules.yaml b/mods/ra/maps/intervention/rules.yaml index 0a6d9233a2..1237a8445c 100644 --- a/mods/ra/maps/intervention/rules.yaml +++ b/mods/ra/maps/intervention/rules.yaml @@ -15,6 +15,14 @@ World: hard: Hard Default: normal +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + Allies: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 + Allies1: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 + Allies2: 208, 208, 144, 145, 146, 147, 148, 149, 150, 151, 152, 153, 154, 154, 155, 143 + CAMERA: RevealsShroud: Range: 18c0 diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index cc907a5a4f..46e850f53c 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2087,7 +2087,7 @@ Actors: Location: 65,78 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index 58f7852367..94622c29fd 100644 --- a/mods/ra/maps/monster-tank-madness/rules.yaml +++ b/mods/ra/maps/monster-tank-madness/rules.yaml @@ -11,6 +11,13 @@ World: WinVideo: sovbatl.vqa LossVideo: sovtstar.vqa +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + BadGuy: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + FriendlyMadTanks: 200, 200, 201, 202, 203, 203, 204, 205, 206, 206, 207, 221, 222, 222, 223, 223 + Outpost: 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143 + ^Building: AnnounceOnSeen: diff --git a/mods/ra/maps/soviet-01/map.yaml b/mods/ra/maps/soviet-01/map.yaml index 53e11a826c..aef703a4c5 100644 --- a/mods/ra/maps/soviet-01/map.yaml +++ b/mods/ra/maps/soviet-01/map.yaml @@ -585,4 +585,4 @@ Actors: Location: 51,84 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/soviet-02a/map.yaml b/mods/ra/maps/soviet-02a/map.yaml index f758f900ae..4b388a37e2 100644 --- a/mods/ra/maps/soviet-02a/map.yaml +++ b/mods/ra/maps/soviet-02a/map.yaml @@ -30,9 +30,9 @@ Players: Color: FE1100 LockSpawn: True LockTeam: True - Enemies: Germany - PlayerReference@Germany: - Name: Germany + Enemies: Greece + PlayerReference@Greece: + Name: Greece Faction: allies Color: E2E6F5 Enemies: USSR @@ -150,106 +150,106 @@ Actors: Owner: USSR Actor35: weap Location: 41,50 - Owner: Germany + Owner: Greece Actor37: fact Location: 39,54 - Owner: Germany + Owner: Greece Actor39: powr Location: 36,55 - Owner: Germany + Owner: Greece Actor40: powr Location: 36,52 - Owner: Germany + Owner: Greece Actor41: tent Location: 41,58 - Owner: Germany + Owner: Greece Actor42: gun Location: 39,61 - Owner: Germany + Owner: Greece Facing: 96 Actor44: powr Location: 36,49 - Owner: Germany + Owner: Greece Actor45: gun Location: 50,55 - Owner: Germany + Owner: Greece Facing: 96 Actor46: gun Location: 50,59 - Owner: Germany + Owner: Greece Facing: 32 Actor47: brl3 Location: 38,48 - Owner: Germany + Owner: Greece Actor48: v19 Location: 39,48 - Owner: Germany + Owner: Greece Actor49: v19 Location: 40,46 - Owner: Germany + Owner: Greece Actor50: brl3 Location: 40,47 - Owner: Germany + Owner: Greece Actor51: barl Location: 39,49 - Owner: Germany + Owner: Greece Actor52: brl3 Location: 40,48 - Owner: Germany + Owner: Greece Actor53: barl Location: 38,49 - Owner: Germany + Owner: Greece Actor54: brl3 Location: 39,50 - Owner: Germany + Owner: Greece Actor55: barl Location: 38,51 - Owner: Germany + Owner: Greece Actor56: barl Location: 38,52 - Owner: Germany + Owner: Greece Actor57: brl3 Location: 39,53 - Owner: Germany + Owner: Greece Actor58: barl Location: 38,54 - Owner: Germany + Owner: Greece Actor59: brl3 Location: 38,53 - Owner: Germany + Owner: Greece Actor60: brl3 Location: 41,45 - Owner: Germany + Owner: Greece Actor61: barl Location: 41,46 - Owner: Germany + Owner: Greece Actor62: brl3 Location: 58,54 - Owner: Germany + Owner: Greece Actor63: v19 Location: 59,53 - Owner: Germany + Owner: Greece Actor64: barl Location: 58,52 - Owner: Germany + Owner: Greece Actor66: barl Location: 60,53 - Owner: Germany + Owner: Greece Actor67: brl3 Location: 58,53 - Owner: Germany + Owner: Greece Actor68: barl Location: 59,51 - Owner: Germany + Owner: Greece Actor70: barl Location: 60,59 - Owner: Germany + Owner: Greece Actor71: v19 Location: 61,59 - Owner: Germany + Owner: Greece Actor73: barl Location: 60,61 - Owner: Germany + Owner: Greece Actor74: powr Location: 79,52 Owner: USSR @@ -267,15 +267,15 @@ Actors: Owner: USSR Actor80: jeep Location: 57,43 - Owner: Germany + Owner: Greece Facing: 96 Actor81: jeep Location: 46,70 - Owner: Germany + Owner: Greece Facing: 96 Actor82: jeep Location: 42,48 - Owner: Germany + Owner: Greece Facing: 32 Actor83: e1 Location: 70,52 @@ -289,7 +289,7 @@ Actors: SubCell: 3 Actor86: e1 Location: 44,67 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 0 Actor87: e1 @@ -339,37 +339,37 @@ Actors: SubCell: 1 Actor98: e3 Location: 47,44 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 0 Actor99: e3 Location: 49,57 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 1 Actor100: e3 Location: 44,49 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 0 Actor101: e3 Location: 39,51 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 4 Actor102: e3 Location: 43,60 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 0 Actor103: e3 Location: 42,56 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 3 Actor104: e1 Location: 48,43 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 1 Actor113: e1 @@ -493,19 +493,19 @@ Actors: Owner: USSR AlliedDome: dome Location: 45,50 - Owner: Germany + Owner: Greece AlliedProc: proc Location: 43,53 - Owner: Germany + Owner: Greece Barrel: brl3 Location: 60,60 - Owner: Germany + Owner: Greece BridgeBarrel1: brl3 Location: 61,58 - Owner: Germany + Owner: Greece BridgeBarrel2: brl3 Location: 59,54 - Owner: Germany + Owner: Greece Follower: e1 Location: 69,53 Owner: USSR @@ -513,49 +513,49 @@ Actors: SubCell: 2 Fleeing1: e1 Location: 62,52 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 4 Fleeing2: e1 Location: 63,53 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 4 Attacker1: e1 Location: 59,44 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 4 Attacker2: e1 Location: 60,44 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 1 Attacker3: e1 Location: 59,43 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 4 Attacker4: e1 Location: 59,44 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 1 Hunter1: e3 Location: 74,67 - Owner: Germany + Owner: Greece SubCell: 3 Hunter2: e1 Location: 73,68 - Owner: Germany + Owner: Greece SubCell: 3 Hunter3: e1 Location: 72,67 - Owner: Germany + Owner: Greece SubCell: 4 Hunter4: e1 Location: 54,74 - Owner: Germany + Owner: Greece SubCell: 2 -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/soviet-02a/soviet02a.lua b/mods/ra/maps/soviet-02a/soviet02a.lua index 523538cb61..7c14b3b24e 100644 --- a/mods/ra/maps/soviet-02a/soviet02a.lua +++ b/mods/ra/maps/soviet-02a/soviet02a.lua @@ -15,7 +15,7 @@ HuntingUnits = { Hunter1, Hunter2, Hunter3, Hunter4 } WorldLoaded = function() player = Player.GetPlayer("USSR") - germany = Player.GetPlayer("Germany") + greece = Player.GetPlayer("Greece") Trigger.OnObjectiveAdded(player, function(p, id) Media.DisplayMessage(p.GetObjectiveDescription(id), "New " .. string.lower(p.GetObjectiveType(id)) .. " objective") @@ -44,14 +44,14 @@ WorldLoaded = function() end) Trigger.AfterDelay(0, function() - local buildings = Utils.Where(Map.ActorsInWorld, function(self) return self.Owner == germany and self.HasProperty("StartBuildingRepairs") end) + local buildings = Utils.Where(Map.ActorsInWorld, function(self) return self.Owner == greece and self.HasProperty("StartBuildingRepairs") end) Utils.Do(buildings, function(actor) Trigger.OnDamaged(actor, function(building, attacker) - if building.Owner == germany and building.Health < building.MaxHealth * 0.8 then + if building.Owner == greece and building.Health < building.MaxHealth * 0.8 then building.StartBuildingRepairs() if attacker.Type ~= "yak" and not AlreadyHunting then AlreadyHunting = true - Utils.Do(germany.GetGroundAttackers(), function(unit) + Utils.Do(greece.GetGroundAttackers(), function(unit) Trigger.OnIdle(unit, unit.Hunt) end) end @@ -130,7 +130,7 @@ WorldLoaded = function() end Tick = function() - if germany.HasNoRequiredUnits() then + if greece.HasNoRequiredUnits() then player.MarkCompletedObjective(CommandCenterIntact) player.MarkCompletedObjective(DestroyAllAllied) end @@ -139,7 +139,7 @@ Tick = function() player.MarkFailedObjective(DestroyAllAllied) end - if germany.Resources > germany.ResourceCapacity / 2 then - germany.Resources = germany.ResourceCapacity / 2 + if greece.Resources > greece.ResourceCapacity / 2 then + greece.Resources = greece.ResourceCapacity / 2 end end diff --git a/mods/ra/maps/soviet-02b/map.yaml b/mods/ra/maps/soviet-02b/map.yaml index 21d4b25daf..94e7168ccc 100644 --- a/mods/ra/maps/soviet-02b/map.yaml +++ b/mods/ra/maps/soviet-02b/map.yaml @@ -28,8 +28,8 @@ Players: Name: Creeps NonCombatant: True Enemies: USSR - PlayerReference@Germany: - Name: Germany + PlayerReference@Greece: + Name: Greece Faction: allies Color: E2E6F5 Enemies: USSR @@ -44,63 +44,63 @@ Players: Color: FE1100 LockSpawn: True LockTeam: True - Enemies: Germany, Creeps + Enemies: Greece, Creeps Actors: Actor0: sbag Location: 53,52 - Owner: Germany + Owner: Greece Actor1: sbag Location: 54,52 - Owner: Germany + Owner: Greece Actor2: sbag Location: 53,53 Owner: Neutral Actor3: sbag Location: 54,53 - Owner: Germany + Owner: Greece Actor4: sbag Location: 53,56 - Owner: Germany + Owner: Greece Actor5: sbag Location: 54,56 - Owner: Germany + Owner: Greece Actor6: sbag Location: 53,57 - Owner: Germany + Owner: Greece Actor7: sbag Location: 54,57 - Owner: Germany + Owner: Greece Actor8: sbag Location: 81,68 - Owner: Germany + Owner: Greece Actor9: sbag Location: 83,68 - Owner: Germany + Owner: Greece Actor10: sbag Location: 87,68 - Owner: Germany + Owner: Greece Actor11: sbag Location: 89,68 - Owner: Germany + Owner: Greece Actor12: sbag Location: 81,69 - Owner: Germany + Owner: Greece Actor13: sbag Location: 82,69 - Owner: Germany + Owner: Greece Actor14: sbag Location: 83,69 - Owner: Germany + Owner: Greece Actor15: sbag Location: 87,69 - Owner: Germany + Owner: Greece Actor16: sbag Location: 88,69 - Owner: Germany + Owner: Greece Actor17: sbag Location: 89,69 - Owner: Germany + Owner: Greece Actor18: v14 Location: 87,84 Owner: Neutral @@ -187,22 +187,22 @@ Actors: Owner: Neutral Actor46: weap Location: 84,59 - Owner: Germany + Owner: Greece Actor47: dome Location: 72,55 - Owner: Germany + Owner: Greece Actor50: fact Location: 75,55 - Owner: Germany + Owner: Greece Actor51: proc Location: 80,59 - Owner: Germany + Owner: Greece Actor52: powr Location: 83,55 - Owner: Germany + Owner: Greece Actor53: powr Location: 85,55 - Owner: Germany + Owner: Greece Actor54: brl3 Location: 69,64 Owner: Creeps @@ -262,22 +262,22 @@ Actors: Owner: USSR Actor78: brl3 Location: 82,70 - Owner: Germany + Owner: Greece Actor79: brl3 Location: 83,70 - Owner: Germany + Owner: Greece Actor80: brl3 Location: 88,70 - Owner: Germany + Owner: Greece Actor81: barl Location: 87,70 - Owner: Germany + Owner: Greece Actor82: barl Location: 84,69 - Owner: Germany + Owner: Greece Actor83: tent Location: 70,57 - Owner: Germany + Owner: Greece Actor84: barl Location: 74,55 Owner: Creeps @@ -286,15 +286,15 @@ Actors: Owner: USSR Actor86: jeep Location: 85,66 - Owner: Germany + Owner: Greece Facing: 128 Actor89: jeep Location: 55,56 - Owner: Germany + Owner: Greece Facing: 224 Actor90: jeep Location: 79,54 - Owner: Germany + Owner: Greece Facing: 128 Actor92: e1 Location: 47,75 @@ -338,22 +338,22 @@ Actors: SubCell: 1 Actor100: e3 Location: 88,68 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 3 Actor103: e1 Location: 79,64 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 3 Actor104: e1 Location: 79,64 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 4 Actor105: e3 Location: 78,57 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 4 Actor106: e2 @@ -378,27 +378,27 @@ Actors: SubCell: 3 Actor110: e1 Location: 72,61 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 0 Actor111: e1 Location: 40,54 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 0 Actor112: e1 Location: 83,85 - Owner: Germany + Owner: Greece Facing: 224 SubCell: 3 Actor113: e1 Location: 82,68 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 4 Actor114: e1 Location: 69,55 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 0 BarrelBase: brl3 @@ -439,25 +439,25 @@ Actors: Owner: USSR BridgeGun1: gun Location: 68,64 - Owner: Germany + Owner: Greece Facing: 160 BridgeGun2: gun Location: 74,64 - Owner: Germany + Owner: Greece Facing: 160 IntroSoldier1: e1 Location: 71,65 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 3 IntroSoldier2: e1 Location: 71,60 - Owner: Germany + Owner: Greece Facing: 128 SubCell: 3 IntroSoldier3: e1 Location: 70,60 - Owner: Germany + Owner: Greece Facing: 128 SubCell: 4 ParachuteBase1: waypoint @@ -471,7 +471,7 @@ Actors: Owner: Neutral TransportTruck: truk Location: 75,58 - Owner: Germany + Owner: Greece Facing: 192 TransportWaypoint1: waypoint Location: 75,58 @@ -483,4 +483,4 @@ Actors: Location: 67,75 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/soviet-02b/soviet02b.lua b/mods/ra/maps/soviet-02b/soviet02b.lua index e2d05c9cbf..4ec70ad73d 100644 --- a/mods/ra/maps/soviet-02b/soviet02b.lua +++ b/mods/ra/maps/soviet-02b/soviet02b.lua @@ -129,7 +129,7 @@ end) WorldLoaded = function() player = Player.GetPlayer("USSR") - enemy = Player.GetPlayer("Germany") + enemy = Player.GetPlayer("Greece") Utils.Do(IntroAttackers, function(actor) if not actor.IsDead then Trigger.OnIdle(actor, actor.Hunt) diff --git a/mods/ra/maps/soviet-03/map.yaml b/mods/ra/maps/soviet-03/map.yaml index b1011b90c8..1dcbe10556 100644 --- a/mods/ra/maps/soviet-03/map.yaml +++ b/mods/ra/maps/soviet-03/map.yaml @@ -27,23 +27,23 @@ Players: PlayerReference@Creeps: Name: Creeps NonCombatant: True - Enemies: Germany, USSR + Enemies: Greece, USSR PlayerReference@England: Name: England Faction: allies Color: E2E6F5 - Allies: Germany, Soviet + Allies: Greece, BadGuy Enemies: USSR - PlayerReference@Soviet: - Name: Soviet + PlayerReference@BadGuy: + Name: BadGuy Faction: soviet Color: FE1100 - Allies: England, Germany, USSR - PlayerReference@Germany: - Name: Germany + Allies: England, Greece, USSR + PlayerReference@Greece: + Name: Greece Faction: allies Color: E2E6F5 - Allies: England, Soviet + Allies: England, BadGuy Enemies: USSR, Creeps PlayerReference@USSR: Name: USSR @@ -56,7 +56,7 @@ Players: Color: FE1100 LockSpawn: True LockTeam: True - Enemies: Germany, England, Creeps + Enemies: Greece, England, Creeps Actors: Actor0: wood @@ -403,14 +403,14 @@ Actors: Owner: Neutral Actor117: v03 Location: 42,66 - Owner: Germany + Owner: Greece Actor118: v04 Location: 45,62 - Owner: Germany + Owner: Greece Health: 47 Actor120: v07 Location: 42,37 - Owner: Germany + Owner: Greece Actor122: brl3 Location: 43,38 Owner: Creeps @@ -434,7 +434,7 @@ Actors: Owner: Creeps Actor136: v06 Location: 90,39 - Owner: Germany + Owner: Greece Actor138: barl Location: 81,49 Owner: Creeps @@ -449,18 +449,18 @@ Actors: Owner: Creeps Actor143: v04 Location: 81,53 - Owner: Germany + Owner: Greece Health: 39 Actor145: v02 Location: 62,38 - Owner: Germany + Owner: Greece Actor146: v04 Location: 56,39 - Owner: Germany + Owner: Greece Health: 41 Actor148: v08 Location: 62,41 - Owner: Germany + Owner: Greece Actor150: brl3 Location: 58,43 Owner: Creeps @@ -517,177 +517,177 @@ Actors: Owner: Creeps Actor169: v13 Location: 63,36 - Owner: Germany + Owner: Greece Actor171: brl3 Location: 81,31 Owner: Creeps Actor172: e1 Location: 16,31 - Owner: Germany + Owner: Greece Facing: 128 SubCell: 4 Actor173: e1 Location: 16,31 - Owner: Germany + Owner: Greece Facing: 192 SubCell: 0 Actor174: e1 Location: 17,33 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 1 Actor175: e1 Location: 17,33 - Owner: Germany + Owner: Greece Facing: 128 SubCell: 4 Actor176: e3 Location: 17,33 - Owner: Germany + Owner: Greece Facing: 128 SubCell: 2 Actor177: e3 Location: 17,31 - Owner: Germany + Owner: Greece SubCell: 1 Actor183: e1 Location: 77,61 - Owner: Germany + Owner: Greece SubCell: 2 Actor184: e1 Location: 64,41 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 3 Actor185: e1 Location: 64,42 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 0 Actor186: e1 Location: 63,42 - Owner: Germany + Owner: Greece Facing: 128 SubCell: 0 Actor187: e1 Location: 59,45 - Owner: Germany + Owner: Greece Facing: 32 SubCell: 2 Actor188: e1 Location: 56,44 - Owner: Germany + Owner: Greece Facing: 32 SubCell: 4 Actor191: e1 Location: 56,45 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 4 Actor192: e1 Location: 57,44 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 2 Actor193: e1 Location: 60,44 - Owner: Germany + Owner: Greece Facing: 32 SubCell: 1 Actor194: e1 Location: 56,46 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 4 Actor195: e1 Location: 53,37 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 2 Actor196: e1 Location: 52,38 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 3 Actor197: e1 Location: 52,37 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 4 Actor264: fenc - Owner: Soviet + Owner: BadGuy Location: 89,32 Actor265: fenc - Owner: Soviet + Owner: BadGuy Location: 88,32 Actor266: fenc - Owner: Soviet + Owner: BadGuy Location: 87,32 Actor267: fenc - Owner: Soviet + Owner: BadGuy Location: 86,32 Actor268: fenc - Owner: Soviet + Owner: BadGuy Location: 85,32 Actor269: fenc - Owner: Soviet + Owner: BadGuy Location: 84,32 Actor270: fenc - Owner: Soviet + Owner: BadGuy Location: 83,32 Actor271: fenc - Owner: Soviet + Owner: BadGuy Location: 82,32 Actor272: fenc - Owner: Soviet + Owner: BadGuy Location: 81,32 Actor273: fenc - Owner: Soviet + Owner: BadGuy Location: 80,32 Actor274: fenc - Owner: Soviet + Owner: BadGuy Location: 70,22 Actor275: fenc - Owner: Soviet + Owner: BadGuy Location: 70,23 Actor276: fenc - Owner: Soviet + Owner: BadGuy Location: 70,24 Actor277: fenc - Owner: Soviet + Owner: BadGuy Location: 70,25 Actor278: fenc - Owner: Soviet + Owner: BadGuy Location: 70,26 Actor279: fenc - Owner: Soviet + Owner: BadGuy Location: 70,27 Actor280: fenc - Owner: Soviet + Owner: BadGuy Location: 70,28 Actor281: fenc - Owner: Soviet + Owner: BadGuy Location: 70,29 Actor282: fenc - Owner: Soviet + Owner: BadGuy Location: 70,30 Actor283: fenc - Owner: Soviet + Owner: BadGuy Location: 70,31 Actor284: fenc - Owner: Soviet + Owner: BadGuy Location: 70,32 Actor285: fenc - Owner: Soviet + Owner: BadGuy Location: 71,32 Actor286: fenc - Owner: Soviet + Owner: BadGuy Location: 72,32 Actor287: fenc - Owner: Soviet + Owner: BadGuy Location: 73,32 Actor288: fenc - Owner: Soviet + Owner: BadGuy Location: 74,32 Actor289: fenc Owner: Neutral @@ -925,32 +925,32 @@ Actors: Owner: Neutral BarrierSoldier1: e1 Location: 63,49 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 4 BarrierSoldier2: e1 Location: 64,50 - Owner: Germany + Owner: Greece Facing: 128 SubCell: 0 BarrierSoldier3: e1 Location: 64,49 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 4 BarrierSoldier4: e1 Location: 66,50 - Owner: Germany + Owner: Greece Facing: 96 SubCell: 4 BarrierSoldier5: e1 Location: 65,49 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 3 BarrierSoldier6: e1 Location: 66,49 - Owner: Germany + Owner: Greece Facing: 128 SubCell: 3 BaseBarrel1: barl @@ -961,22 +961,22 @@ Actors: Owner: Creeps BaseBuilding1: ftur Location: 75,32 - Owner: Soviet + Owner: BadGuy BaseBuilding2: ftur Location: 79,32 - Owner: Soviet + Owner: BadGuy BaseBuilding3: apwr Location: 71,23 - Owner: Soviet + Owner: BadGuy BaseBuilding4: apwr Location: 86,27 - Owner: Soviet + Owner: BadGuy BaseBuilding5: barl Location: 74,24 Owner: Creeps BaseBuilding6: miss Location: 78,27 - Owner: Soviet + Owner: BadGuy CameraBarrier: waypoint Location: 64,51 Owner: Neutral @@ -1033,15 +1033,15 @@ Actors: Owner: Neutral Farmer1: c7 Location: 88,39 - Owner: Germany + Owner: Greece SubCell: 4 Farmer2: c6 Location: 90,38 - Owner: Germany + Owner: Greece SubCell: 3 Farmer3: e3 Location: 89,37 - Owner: Germany + Owner: Greece Facing: 160 SubCell: 2 FarmSpawn: waypoint @@ -1061,7 +1061,7 @@ Actors: Owner: Creeps Hideout1PBox: pbox Location: 76,47 - Owner: Germany + Owner: Greece Hideout3Barrel: brl3 Location: 60,42 Owner: Creeps @@ -1073,15 +1073,15 @@ Actors: Owner: Neutral RedBuilding1: v05 Location: 37,67 - Owner: Germany + Owner: Greece Health: 39 RedBuilding2: v05 Location: 56,37 - Owner: Germany + Owner: Greece Health: 39 RedBuilding3: v05 Location: 72,53 - Owner: Germany + Owner: Greece Health: 43 ReinforcementDropOff: waypoint Location: 63,61 @@ -1094,20 +1094,20 @@ Actors: Owner: Neutral RSoldier1: e3 Location: 73,35 - Owner: Germany + Owner: Greece SubCell: 1 RSoldier2: e3 Location: 80,35 - Owner: Germany + Owner: Greece SubCell: 2 RSoldier3: e3 Location: 36,37 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 1 RSoldier4: e3 Location: 36,37 - Owner: Germany + Owner: Greece Facing: 64 SubCell: 4 RSoldierTrap: barl @@ -1121,16 +1121,16 @@ Actors: Owner: Neutral SpyHideout1: v01 Location: 77,52 - Owner: Germany + Owner: Greece SpyHideout2: v01 Location: 37,63 - Owner: Germany + Owner: Greece SpyHideout3: v01 Location: 61,36 - Owner: Germany + Owner: Greece SpyHideout4: v01 Location: 36,32 - Owner: Germany + Owner: Greece SpyWaypoint1: waypoint Location: 76,42 Owner: Neutral @@ -1149,7 +1149,7 @@ Actors: SubCell: 1 Transport: lst Location: 28,65 - Owner: Germany + Owner: Greece TransportPath1: waypoint Location: 31,65 Owner: Neutral @@ -1163,6 +1163,6 @@ Actors: Location: 47,50 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Notifications: notifications.yaml diff --git a/mods/ra/maps/soviet-03/soviet03.lua b/mods/ra/maps/soviet-03/soviet03.lua index a2c485271f..6cfed53ec7 100644 --- a/mods/ra/maps/soviet-03/soviet03.lua +++ b/mods/ra/maps/soviet-03/soviet03.lua @@ -116,7 +116,7 @@ SpyHelicopterEscape = function() spyHelicopterEscape = true SpyFinalSequency() Actor.Create("camera", true, { Owner = player, Location = CameraFinalArea.Location }) - ExtractionHeli = Reinforcements.ReinforceWithTransport(germany, ExtractionHeliType, nil, ExtractionPath)[1] + ExtractionHeli = Reinforcements.ReinforceWithTransport(greece, ExtractionHeliType, nil, ExtractionPath)[1] local exitPos = CPos.New(ExtractionPath[1].X, ExtractionPath[2].Y) Trigger.AfterDelay(DateTime.Seconds(5), function() if not TheSpy.IsDead and not ExtractionHeli.IsDead then @@ -179,8 +179,8 @@ end) Trigger.OnEnteredFootprint(SpyHideout2Trigger, function(a, id) if not spyHideout2Trigger and a.Owner == player then spyHideout2Trigger = true - SpyGuards1 = Reinforcements.Reinforce(germany, EnemyReinforcements1SpyHideout2, { EnemyReinforcements1.Location, EnemyReinforcements1Goal.Location }, 0) - SpyGuards2 = Reinforcements.Reinforce(germany, EnemyReinforcements2SpyHideout2, { EnemyReinforcements2.Location, EnemyReinforcements2Goal.Location }, 0) + SpyGuards1 = Reinforcements.Reinforce(greece, EnemyReinforcements1SpyHideout2, { EnemyReinforcements1.Location, EnemyReinforcements1Goal.Location }, 0) + SpyGuards2 = Reinforcements.Reinforce(greece, EnemyReinforcements2SpyHideout2, { EnemyReinforcements2.Location, EnemyReinforcements2Goal.Location }, 0) Utils.Do(SpyGuards1, function(actor) if not actor.IsDead then Trigger.OnIdle(actor, actor.Hunt) @@ -228,7 +228,7 @@ Trigger.OnEnteredFootprint(SpyTransport1CheckpointTrigger, function(a, id) end) Trigger.OnEnteredFootprint(SpyTransport2CheckpointTrigger, function(a, id) - if not spyTransport2CheckpointTrigger and a.Owner == germany then + if not spyTransport2CheckpointTrigger and a.Owner == greece then spyTransport2CheckpointTrigger = true Transport.UnloadPassengers() Trigger.AfterDelay(DateTime.Seconds(1), function() @@ -334,7 +334,7 @@ end) WorldLoaded = function() player = Player.GetPlayer("USSR") enemy = Player.GetPlayer("England") - germany = Player.GetPlayer("Germany") + greece = Player.GetPlayer("Greece") Camera.Position = Playerbase.CenterPosition IntroSequence() Trigger.OnObjectiveAdded(player, function(p, id) diff --git a/mods/ra/maps/soviet-04a/map.yaml b/mods/ra/maps/soviet-04a/map.yaml index c272314018..63238164ef 100644 --- a/mods/ra/maps/soviet-04a/map.yaml +++ b/mods/ra/maps/soviet-04a/map.yaml @@ -614,4 +614,4 @@ Actors: Location: 84,83 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/soviet-04b/map.yaml b/mods/ra/maps/soviet-04b/map.yaml index 939b3daa7c..a9012a18b3 100644 --- a/mods/ra/maps/soviet-04b/map.yaml +++ b/mods/ra/maps/soviet-04b/map.yaml @@ -645,4 +645,4 @@ Actors: Location: 33,88 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/soviet-05/map.yaml b/mods/ra/maps/soviet-05/map.yaml index a5528b69d4..5195653b73 100644 --- a/mods/ra/maps/soviet-05/map.yaml +++ b/mods/ra/maps/soviet-05/map.yaml @@ -28,7 +28,7 @@ Players: Name: Greece Faction: allies Color: E2E6F5 - Allies: GoodGuy + Allies: GoodGuy, France Enemies: USSR PlayerReference@USSR: Name: USSR @@ -41,12 +41,18 @@ Players: Color: FE1100 LockSpawn: True LockTeam: True - Enemies: Greece, GoodGuy + Enemies: Greece, GoodGuy, France PlayerReference@GoodGuy: Name: GoodGuy Faction: allies Color: E2E6F5 - Allies: Greece + Allies: Greece, France + Enemies: USSR + PlayerReference@France: + Name: France + Faction: allies + Color: 0CF7B2 + Allies: Greece, GoodGuy Enemies: USSR Actors: @@ -221,7 +227,7 @@ Actors: Facing: 32 Radar: dome Location: 70,45 - Owner: Greece + Owner: France Actor57: fact Location: 67,42 Owner: Greece @@ -596,4 +602,4 @@ Actors: Location: 21,80 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/soviet-05/rules.yaml b/mods/ra/maps/soviet-05/rules.yaml index cef5ffb2ac..b3d88b8633 100644 --- a/mods/ra/maps/soviet-05/rules.yaml +++ b/mods/ra/maps/soviet-05/rules.yaml @@ -84,7 +84,9 @@ APC: DOME: ExternalCondition@lua: - Condition: captured + Condition: french + WithColoredOverlay@IDISABLE: + RequiresCondition: !french && disabled powerproxy.paratroopers: ParatroopersPower: diff --git a/mods/ra/maps/soviet-05/soviet05.lua b/mods/ra/maps/soviet-05/soviet05.lua index 0f7b72d96c..09c4e6a65f 100644 --- a/mods/ra/maps/soviet-05/soviet05.lua +++ b/mods/ra/maps/soviet-05/soviet05.lua @@ -223,6 +223,7 @@ WorldLoaded = function() end end) + Radar.GrantCondition("french") Trigger.OnCapture(Radar, function() HoldObjective = player.AddPrimaryObjective("Defend the Radar Dome.") player.MarkCompletedObjective(CaptureObjective) @@ -234,7 +235,7 @@ WorldLoaded = function() Reinforcements.Reinforce(Greece, ArmorReinfGreece, AlliedCrossroadsToRadarPath , 0, IdleHunt) - Radar.GrantCondition("captured") + Radar.RevokeCondition(1) Trigger.ClearAll(Radar) Trigger.AfterDelay(0, function() Trigger.OnRemovedFromWorld(Radar, function() diff --git a/mods/ra/maps/soviet-06a/map.yaml b/mods/ra/maps/soviet-06a/map.yaml index 5893f4a641..f8113efd49 100644 --- a/mods/ra/maps/soviet-06a/map.yaml +++ b/mods/ra/maps/soviet-06a/map.yaml @@ -825,4 +825,4 @@ Actors: Location: 22,15 Owner: Greece -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/soviet-06b/map.yaml b/mods/ra/maps/soviet-06b/map.yaml index df8195c89a..1a10521ee7 100644 --- a/mods/ra/maps/soviet-06b/map.yaml +++ b/mods/ra/maps/soviet-06b/map.yaml @@ -517,4 +517,4 @@ Actors: Location: 67,41 Owner: Greece -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/soviet-07/map.yaml b/mods/ra/maps/soviet-07/map.yaml index 43f4374300..921adb21b0 100644 --- a/mods/ra/maps/soviet-07/map.yaml +++ b/mods/ra/maps/soviet-07/map.yaml @@ -790,6 +790,6 @@ Actors: Owner: Neutral Location: 45,52 -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/survival01/map.yaml b/mods/ra/maps/survival01/map.yaml index ea155278e1..09c3e280b0 100644 --- a/mods/ra/maps/survival01/map.yaml +++ b/mods/ra/maps/survival01/map.yaml @@ -1193,4 +1193,4 @@ Actors: Location: 58,61 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml diff --git a/mods/ra/maps/survival01/rules.yaml b/mods/ra/maps/survival01/rules.yaml index 78f84b1d83..9da2349cfb 100644 --- a/mods/ra/maps/survival01/rules.yaml +++ b/mods/ra/maps/survival01/rules.yaml @@ -16,6 +16,12 @@ World: hard: Hard Default: easy +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 + powerproxy.paratroopers: ParatroopersPower: DropItems: E1,E1,E1,E2,E2 diff --git a/mods/ra/maps/survival02/map.yaml b/mods/ra/maps/survival02/map.yaml index 250de3a030..1939e32bdd 100644 --- a/mods/ra/maps/survival02/map.yaml +++ b/mods/ra/maps/survival02/map.yaml @@ -1006,6 +1006,6 @@ Actors: Location: 39,37 Owner: Neutral -Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, rules.yaml +Rules: ra|rules/campaign-rules.yaml, ra|rules/campaign-tooltips.yaml, ra|rules/campaign-palettes.yaml, rules.yaml Weapons: weapons.yaml diff --git a/mods/ra/maps/survival02/rules.yaml b/mods/ra/maps/survival02/rules.yaml index 43cc4b65f5..848d339f37 100644 --- a/mods/ra/maps/survival02/rules.yaml +++ b/mods/ra/maps/survival02/rules.yaml @@ -8,6 +8,12 @@ World: MissionData: Briefing: INCOMING REPORT:\n\nCommander! The Soviets have rendered us useless...\nReports indicate Soviet reinforcements are coming to finish us off... The situation looks bleak...\n +^Palettes: + IndexedPlayerPalette: + PlayerIndex: + Soviets: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + Allies: 224, 224, 225, 225, 226, 184, 185, 186, 187, 188, 188, 189, 190, 190, 191, 191 + SovietSquad: Inherits: powerproxy.paratroopers ParatroopersPower: diff --git a/mods/ra/rules/campaign-palettes.yaml b/mods/ra/rules/campaign-palettes.yaml new file mode 100644 index 0000000000..c215288703 --- /dev/null +++ b/mods/ra/rules/campaign-palettes.yaml @@ -0,0 +1,24 @@ +^Palettes: + -PlayerColorPalette: + -PaletteFromPlayerPaletteWithAlpha@cloak: + IndexedPlayerPalette: + BasePalette: player + BaseName: player + RemapIndex: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95 + PlayerIndex: + 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 + 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 + Spain: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95 + Turkey: 200, 200, 201, 202, 203, 203, 204, 205, 206, 206, 207, 221, 222, 222, 223, 223 + Neutral: 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143 + Creeps: 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143 + GoodGuy: 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175 + BadGuy: 229, 230, 231, 232, 233, 234, 235, 8, 236, 237, 238, 239, 221, 222, 223, 223 + PaletteFromPlayerPaletteWithAlpha@Cloak: + BaseName: cloak + BasePalette: player + Alpha: 0.55