diff --git a/OpenRA.Game/Map/Map.cs b/OpenRA.Game/Map/Map.cs index d500a52a35..24089e2ff0 100644 --- a/OpenRA.Game/Map/Map.cs +++ b/OpenRA.Game/Map/Map.cs @@ -327,6 +327,7 @@ namespace OpenRA "Title", "Description", "Author", + "PreviewVideo", "Tileset", "MapSize", "Bounds", diff --git a/mods/cnc/maps/Instant_Karma.oramap b/mods/cnc/maps/Instant_Karma.oramap index 1f5b9761f7..c1e6baa42c 100644 Binary files a/mods/cnc/maps/Instant_Karma.oramap and b/mods/cnc/maps/Instant_Karma.oramap differ diff --git a/mods/cnc/maps/Nullpeter.oramap b/mods/cnc/maps/Nullpeter.oramap index 7769c41a0e..9498368a22 100644 Binary files a/mods/cnc/maps/Nullpeter.oramap and b/mods/cnc/maps/Nullpeter.oramap differ diff --git a/mods/cnc/maps/break_of_day.oramap b/mods/cnc/maps/break_of_day.oramap index 0a81ace2b6..89d4995675 100644 Binary files a/mods/cnc/maps/break_of_day.oramap and b/mods/cnc/maps/break_of_day.oramap differ diff --git a/mods/cnc/maps/chokepoint.oramap b/mods/cnc/maps/chokepoint.oramap index a0900186b2..236dd362c6 100644 Binary files a/mods/cnc/maps/chokepoint.oramap and b/mods/cnc/maps/chokepoint.oramap differ diff --git a/mods/cnc/maps/chord_simple.oramap b/mods/cnc/maps/chord_simple.oramap index a7c48f0bc8..e457f409c1 100644 Binary files a/mods/cnc/maps/chord_simple.oramap and b/mods/cnc/maps/chord_simple.oramap differ diff --git a/mods/cnc/maps/dead_in_motion_2.oramap b/mods/cnc/maps/dead_in_motion_2.oramap index cb2e5661fd..ddb155256f 100644 Binary files a/mods/cnc/maps/dead_in_motion_2.oramap and b/mods/cnc/maps/dead_in_motion_2.oramap differ diff --git a/mods/cnc/maps/deterring_democracy.oramap b/mods/cnc/maps/deterring_democracy.oramap index b702457d92..f099270a3b 100644 Binary files a/mods/cnc/maps/deterring_democracy.oramap and b/mods/cnc/maps/deterring_democracy.oramap differ diff --git a/mods/cnc/maps/deterring_democracy_plus.oramap b/mods/cnc/maps/deterring_democracy_plus.oramap index 1d1940ca95..0045923878 100644 Binary files a/mods/cnc/maps/deterring_democracy_plus.oramap and b/mods/cnc/maps/deterring_democracy_plus.oramap differ diff --git a/mods/cnc/maps/eastwest3.oramap b/mods/cnc/maps/eastwest3.oramap index 8ecd410b88..281aa6793f 100644 Binary files a/mods/cnc/maps/eastwest3.oramap and b/mods/cnc/maps/eastwest3.oramap differ diff --git a/mods/cnc/maps/garden2.oramap b/mods/cnc/maps/garden2.oramap index 2e5ee0045d..844609de50 100644 Binary files a/mods/cnc/maps/garden2.oramap and b/mods/cnc/maps/garden2.oramap differ diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml index 4abcb14ee8..b6d18695f1 100644 --- a/mods/cnc/maps/gdi01/map.yaml +++ b/mods/cnc/maps/gdi01/map.yaml @@ -8,10 +8,10 @@ Title: Storm the Beachhead Description: Use the units provided to protect the Mobile Construction Vehicle. (MCV)\n\nYou should then deploy the MCV by double clicking on it.\n\nThen you can begin to build up a base. Start with a Power Plant.\n\nFinally, search out and destroy all enemy Nod units in the surrounding area. -PreviewVideo: gdi1.vqa - Author: Westwood Studios +PreviewVideo: gdi1.vqa + Tileset: TEMPERAT MapSize: 64,64 @@ -37,7 +37,7 @@ Players: Race: nod ColorRamp: 3,255,127 Allies: Nod - Enemies: GDI,Creeps + Enemies: GDI, Creeps PlayerReference@GDI: Name: GDI Playable: True @@ -50,7 +50,7 @@ Players: LockSpawn: True LockTeam: True Allies: GDI - Enemies: Nod,Creeps + Enemies: Nod, Creeps PlayerReference@Neutral: Name: Neutral OwnsWorld: True @@ -60,7 +60,7 @@ Players: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI + Enemies: Nod, GDI Actors: Actor0: sbag diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml index a260b3af29..bfc132e38d 100644 --- a/mods/cnc/maps/gdi02/map.yaml +++ b/mods/cnc/maps/gdi02/map.yaml @@ -8,10 +8,10 @@ Title: Knock out the Refinery Description: Defend your position, deploy the MCV, then build a sizable force to search out and destroy the Nod base in the area.\n\nAll Nod units and structures must be either destroyed or captured to complete objective. -PreviewVideo: gdi2.vqa - Author: Westwood Studios +PreviewVideo: gdi2.vqa + Tileset: TEMPERAT MapSize: 64,64 @@ -60,7 +60,7 @@ Players: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI + Enemies: Nod, GDI Actors: Actor0: sbag diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml index f22a87fd52..b428def1a7 100644 --- a/mods/cnc/maps/gdi04a/map.yaml +++ b/mods/cnc/maps/gdi04a/map.yaml @@ -8,10 +8,10 @@ Title: Get the Rods back (a) Description: Nod has captured classified GDI property.\n\nYou must find and retrieve the stolen equipment.\n\nIt is being transported in a shipping crate.\n\nUse the new APC to strategically transport infantry through Nod forces. -PreviewVideo: gdi4b.vqa - Author: Westwood Studios +PreviewVideo: gdi4b.vqa + Tileset: TEMPERAT MapSize: 64,64 @@ -61,7 +61,7 @@ Players: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI + Enemies: Nod, GDI Actors: Actor0: cycl diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml index 88b73b290b..3c712d87ca 100644 --- a/mods/cnc/maps/gdi04b/map.yaml +++ b/mods/cnc/maps/gdi04b/map.yaml @@ -6,10 +6,10 @@ RequiresMod: cnc Title: Get the Rods back (b) -Author: Westwood Studios - Description: Nod has captured classified GDI property.\n\nYou must find and retrieve the stolen equipment.\n\nIt is being transported in a shipping crate.\n\nUse the new APC to strategically transport infantry through Nod forces. +Author: Westwood Studios + PreviewVideo: gdi4b.vqa Tileset: TEMPERAT @@ -60,7 +60,7 @@ Players: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI + Enemies: Nod, GDI Actors: Actor0: sbag @@ -688,4 +688,3 @@ Voices: Notifications: Translations: - diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml index 608b51b8ce..f9e7abc682 100644 --- a/mods/cnc/maps/gdi04c/map.yaml +++ b/mods/cnc/maps/gdi04c/map.yaml @@ -6,10 +6,10 @@ RequiresMod: cnc Title: Take Białystok -Author: Westwood Studios - Description: Nod is moving to capture and hold a civilian town.\n\nYour mission is to reach the town first and hold off invading Nod units until GDI reinforcements can arrive.\n\nAll invading Nod units must be destroyed. +Author: Westwood Studios + PreviewVideo: gdi4a.vqa Tileset: TEMPERAT @@ -37,13 +37,13 @@ Players: OwnsWorld: True NonCombatant: True Race: gdi - Enemies: Nod,GDI + Enemies: Nod, GDI PlayerReference@Nod: Name: Nod Race: nod ColorRamp: 3,255,127 Allies: Nod - Enemies: GDI,Civillians + Enemies: GDI, Civillians PlayerReference@GDI: Name: GDI Playable: True @@ -59,14 +59,14 @@ Players: Enemies: Nod PlayerReference@Civillians: Name: Civillians + NonCombatant: True Race: gdi Enemies: Nod - NonCombatant: True PlayerReference@Creeps: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI + Enemies: Nod, GDI Actors: Actor0: v17 diff --git a/mods/cnc/maps/haos_ridges_cnc.oramap b/mods/cnc/maps/haos_ridges_cnc.oramap index e5d166f300..8a48d88973 100644 Binary files a/mods/cnc/maps/haos_ridges_cnc.oramap and b/mods/cnc/maps/haos_ridges_cnc.oramap differ diff --git a/mods/cnc/maps/hegemony_or_survival.oramap b/mods/cnc/maps/hegemony_or_survival.oramap index 1dc10572ba..0234a669e4 100644 Binary files a/mods/cnc/maps/hegemony_or_survival.oramap and b/mods/cnc/maps/hegemony_or_survival.oramap differ diff --git a/mods/cnc/maps/hegemony_or_survival_8p.oramap b/mods/cnc/maps/hegemony_or_survival_8p.oramap index 0a1829b537..5aa8a8f825 100644 Binary files a/mods/cnc/maps/hegemony_or_survival_8p.oramap and b/mods/cnc/maps/hegemony_or_survival_8p.oramap differ diff --git a/mods/cnc/maps/into_the_river_below.oramap b/mods/cnc/maps/into_the_river_below.oramap index 965c430b56..15eb34df45 100644 Binary files a/mods/cnc/maps/into_the_river_below.oramap and b/mods/cnc/maps/into_the_river_below.oramap differ diff --git a/mods/cnc/maps/lessons_from_kosovo.oramap b/mods/cnc/maps/lessons_from_kosovo.oramap index 189df343db..18aae75777 100644 Binary files a/mods/cnc/maps/lessons_from_kosovo.oramap and b/mods/cnc/maps/lessons_from_kosovo.oramap differ diff --git a/mods/cnc/maps/letters_from_lexington.oramap b/mods/cnc/maps/letters_from_lexington.oramap index 060ce5ef3b..ed4d61a8f4 100644 Binary files a/mods/cnc/maps/letters_from_lexington.oramap and b/mods/cnc/maps/letters_from_lexington.oramap differ diff --git a/mods/cnc/maps/llamas.oramap b/mods/cnc/maps/llamas.oramap index 1634dc8e89..6d870b5eb6 100644 Binary files a/mods/cnc/maps/llamas.oramap and b/mods/cnc/maps/llamas.oramap differ diff --git a/mods/cnc/maps/llamas2.oramap b/mods/cnc/maps/llamas2.oramap index bb9ce461ec..f68866d20c 100644 Binary files a/mods/cnc/maps/llamas2.oramap and b/mods/cnc/maps/llamas2.oramap differ diff --git a/mods/cnc/maps/manufacturing_consent.oramap b/mods/cnc/maps/manufacturing_consent.oramap index fee3408894..34babc92ae 100644 Binary files a/mods/cnc/maps/manufacturing_consent.oramap and b/mods/cnc/maps/manufacturing_consent.oramap differ diff --git a/mods/cnc/maps/minus_two.oramap b/mods/cnc/maps/minus_two.oramap index f8465c3d2f..0acc2a1639 100644 Binary files a/mods/cnc/maps/minus_two.oramap and b/mods/cnc/maps/minus_two.oramap differ diff --git a/mods/cnc/maps/necessary_illusions.oramap b/mods/cnc/maps/necessary_illusions.oramap index be5d71ceb9..4914320f23 100644 Binary files a/mods/cnc/maps/necessary_illusions.oramap and b/mods/cnc/maps/necessary_illusions.oramap differ diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml index 0a49beab55..725c04d359 100644 --- a/mods/cnc/maps/nod01/map.yaml +++ b/mods/cnc/maps/nod01/map.yaml @@ -8,10 +8,10 @@ Title: Nikoomba's Demise Description: In order for the Brotherhood to gain a foothold, we must begin by eliminating certain elements.\n\nNikoomba, the nearby village's leader, is one such element.\n\nHis views and ours do not coincide.\n\nHe and his whole group must be eliminated. -PreviewVideo: nod1.vqa - Author: Westwood Studios +PreviewVideo: nod1.vqa + Tileset: DESERT MapSize: 64,64 @@ -58,12 +58,12 @@ Players: ColorRamp: 3,255,127 LockSpawn: True LockTeam: True - Enemies: GDI,Villagers + Enemies: GDI, Villagers PlayerReference@Creeps: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI + Enemies: Nod, GDI Actors: Actor46: e1 @@ -367,6 +367,7 @@ Rules: ShowOwnerRow: false HARV: -MustBeDestroyed: + Sequences: VoxelSequences: diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml index 010bb8dbf0..7aa1e12145 100644 --- a/mods/cnc/maps/nod03a/map.yaml +++ b/mods/cnc/maps/nod03a/map.yaml @@ -8,10 +8,10 @@ Title: Sudanese Prison Break (a) Description: GDI has established a prison camp, where they are detaining some of the local political leaders.\n\nKane wishes to liberate these victims.\n\nDestroy the GDI forces and capture the prison, do not destroy it. -PreviewVideo: nod3.vqa - Author: Westwood Studios +PreviewVideo: nod3.vqa + Tileset: DESERT MapSize: 64,64 @@ -62,7 +62,7 @@ Players: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI + Enemies: Nod, GDI Actors: Actor0: sbag diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml index 406cb2e317..14d01b130e 100644 --- a/mods/cnc/maps/nod03b/map.yaml +++ b/mods/cnc/maps/nod03b/map.yaml @@ -8,10 +8,10 @@ Title: Sudanese Prison Break (b) Description: GDI has established a prison camp, where they are detaining some of the local political leaders.\n\nKane wishes to liberate these victims.\n\nDestroy the GDI forces and capture the prison, do not destroy it. -PreviewVideo: nod3.vqa - Author: Westwood Studios +PreviewVideo: nod3.vqa + Tileset: DESERT MapSize: 64,64 @@ -62,7 +62,7 @@ Players: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI + Enemies: Nod, GDI Actors: Actor117: e1 diff --git a/mods/cnc/maps/pirates_and_emperors.oramap b/mods/cnc/maps/pirates_and_emperors.oramap index a90155a32b..bbd03f940c 100644 Binary files a/mods/cnc/maps/pirates_and_emperors.oramap and b/mods/cnc/maps/pirates_and_emperors.oramap differ diff --git a/mods/cnc/maps/pressure_cnc.oramap b/mods/cnc/maps/pressure_cnc.oramap index 150ab84064..51e23daff4 100644 Binary files a/mods/cnc/maps/pressure_cnc.oramap and b/mods/cnc/maps/pressure_cnc.oramap differ diff --git a/mods/cnc/maps/profit_over_people.oramap b/mods/cnc/maps/profit_over_people.oramap index d36afb8d6f..63b1205e71 100644 Binary files a/mods/cnc/maps/profit_over_people.oramap and b/mods/cnc/maps/profit_over_people.oramap differ diff --git a/mods/cnc/maps/rogue_states.oramap b/mods/cnc/maps/rogue_states.oramap index 77253f91fb..39574caf2d 100644 Binary files a/mods/cnc/maps/rogue_states.oramap and b/mods/cnc/maps/rogue_states.oramap differ diff --git a/mods/cnc/maps/rubicon.oramap b/mods/cnc/maps/rubicon.oramap index fc6a035a65..55ecb63418 100644 Binary files a/mods/cnc/maps/rubicon.oramap and b/mods/cnc/maps/rubicon.oramap differ diff --git a/mods/cnc/maps/sea_and_cake.oramap b/mods/cnc/maps/sea_and_cake.oramap index aa80c57ae0..47de25f486 100644 Binary files a/mods/cnc/maps/sea_and_cake.oramap and b/mods/cnc/maps/sea_and_cake.oramap differ diff --git a/mods/cnc/maps/shellmap/map.yaml b/mods/cnc/maps/shellmap/map.yaml index 36873c7bb0..e54e063d3b 100644 --- a/mods/cnc/maps/shellmap/map.yaml +++ b/mods/cnc/maps/shellmap/map.yaml @@ -28,13 +28,13 @@ Players: Race: nod ColorRamp: 3,255,127 Allies: Nod - Enemies: GDI,Creeps + Enemies: GDI, Creeps PlayerReference@GDI: Name: GDI Race: gdi ColorRamp: 31,222,183 Allies: GDI - Enemies: Nod,Creeps + Enemies: Nod, Creeps PlayerReference@Neutral: Name: Neutral OwnsWorld: True @@ -74,7 +74,7 @@ Players: Name: Creeps NonCombatant: True Race: Random - Enemies: Nod,GDI,Multi0,Multi1,Multi2,Multi3,Multi4,Multi5 + Enemies: Nod, GDI, Multi0, Multi1, Multi2, Multi3, Multi4, Multi5 Actors: boat1: boat diff --git a/mods/cnc/maps/the-hot-box/map.yaml b/mods/cnc/maps/the-hot-box/map.yaml index 0953efc9e6..8cf19a448e 100644 --- a/mods/cnc/maps/the-hot-box/map.yaml +++ b/mods/cnc/maps/the-hot-box/map.yaml @@ -40,66 +40,66 @@ Players: Playable: True LockRace: True Race: nod - Enemies: Multi9,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7,Multi8 + Enemies: Multi9, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7, Multi8 PlayerReference@Multi1: Name: Multi1 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7,Multi8,Multi9 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7, Multi8, Multi9 PlayerReference@Multi2: Name: Multi2 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi1,Multi3,Multi4,Multi5,Multi6,Multi7,Multi8,Multi9 + Enemies: Multi0, Multi1, Multi3, Multi4, Multi5, Multi6, Multi7, Multi8, Multi9 PlayerReference@Multi3: Name: Multi3 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi1,Multi2,Multi4,Multi5,Multi6,Multi7,Multi8,Multi9 + Enemies: Multi0, Multi1, Multi2, Multi4, Multi5, Multi6, Multi7, Multi8, Multi9 PlayerReference@Multi4: Name: Multi4 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi1,Multi2,Multi3,Multi5,Multi6,Multi7,Multi8,Multi9 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi5, Multi6, Multi7, Multi8, Multi9 PlayerReference@Multi5: Name: Multi5 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi6,Multi7,Multi8,Multi9 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi6, Multi7, Multi8, Multi9 PlayerReference@Multi6: Name: Multi6 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi7,Multi8,Multi9 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi7, Multi8, Multi9 PlayerReference@Multi7: Name: Multi7 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi8,Multi9 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi8, Multi9 PlayerReference@Multi8: Name: Multi8 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7,Multi9 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7, Multi9 PlayerReference@Multi9: Name: Multi9 Playable: True LockRace: True Race: nod - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7,Multi8 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7, Multi8 PlayerReference@Creeps: Name: Creeps NonCombatant: True Race: gdi - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7,Multi8,Multi9 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7, Multi8, Multi9 Actors: Actor0: apc diff --git a/mods/cnc/maps/the_hourglass.oramap b/mods/cnc/maps/the_hourglass.oramap index cfd96a7c01..18c6161aab 100644 Binary files a/mods/cnc/maps/the_hourglass.oramap and b/mods/cnc/maps/the_hourglass.oramap differ diff --git a/mods/cnc/maps/thesentinel.oramap b/mods/cnc/maps/thesentinel.oramap index 0664267521..d0e7ea1f25 100644 Binary files a/mods/cnc/maps/thesentinel.oramap and b/mods/cnc/maps/thesentinel.oramap differ diff --git a/mods/cnc/maps/tiberium-oasis-cluster.oramap b/mods/cnc/maps/tiberium-oasis-cluster.oramap index d2a6d275ba..411418a690 100644 Binary files a/mods/cnc/maps/tiberium-oasis-cluster.oramap and b/mods/cnc/maps/tiberium-oasis-cluster.oramap differ diff --git a/mods/cnc/maps/white_acres.oramap b/mods/cnc/maps/white_acres.oramap index a5ee7c99f9..28ca656345 100644 Binary files a/mods/cnc/maps/white_acres.oramap and b/mods/cnc/maps/white_acres.oramap differ diff --git a/mods/cnc/maps/year_501.oramap b/mods/cnc/maps/year_501.oramap index dc67ff753d..ace9d766c4 100644 Binary files a/mods/cnc/maps/year_501.oramap and b/mods/cnc/maps/year_501.oramap differ diff --git a/mods/cnc/rules/ai.yaml b/mods/cnc/rules/ai.yaml index 8540edd123..29dc60baba 100644 --- a/mods/cnc/rules/ai.yaml +++ b/mods/cnc/rules/ai.yaml @@ -355,3 +355,4 @@ Player: Attractiveness: -10 TargetMetric: Value CheckRadius: 7c0 + diff --git a/mods/d2k/maps/brimstone/map.yaml b/mods/d2k/maps/brimstone/map.yaml index 1c163fefde..32f141db78 100644 --- a/mods/d2k/maps/brimstone/map.yaml +++ b/mods/d2k/maps/brimstone/map.yaml @@ -77,7 +77,7 @@ Players: Name: Creeps NonCombatant: True Race: atreides - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7,Multi8 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7, Multi8 Actors: Actor1: spicebloom diff --git a/mods/d2k/maps/death-depths.oramap b/mods/d2k/maps/death-depths.oramap index aaad8e38aa..1603fe195f 100644 Binary files a/mods/d2k/maps/death-depths.oramap and b/mods/d2k/maps/death-depths.oramap differ diff --git a/mods/d2k/maps/imperial-basin.oramap b/mods/d2k/maps/imperial-basin.oramap index 51132b9b37..cc03971e8d 100644 Binary files a/mods/d2k/maps/imperial-basin.oramap and b/mods/d2k/maps/imperial-basin.oramap differ diff --git a/mods/d2k/maps/mount-idaho.oramap b/mods/d2k/maps/mount-idaho.oramap index 8434de4c61..529d952d61 100644 Binary files a/mods/d2k/maps/mount-idaho.oramap and b/mods/d2k/maps/mount-idaho.oramap differ diff --git a/mods/d2k/maps/pasty-mesa.oramap b/mods/d2k/maps/pasty-mesa.oramap index e4b60e015a..c53f1c3969 100644 Binary files a/mods/d2k/maps/pasty-mesa.oramap and b/mods/d2k/maps/pasty-mesa.oramap differ diff --git a/mods/d2k/maps/the-duell.oramap b/mods/d2k/maps/the-duell.oramap index 9fd36ab69e..43560a80e0 100644 Binary files a/mods/d2k/maps/the-duell.oramap and b/mods/d2k/maps/the-duell.oramap differ diff --git a/mods/d2k/maps/tucks-sietch.oramap b/mods/d2k/maps/tucks-sietch.oramap index 94bb1b4295..2cb96356d6 100644 Binary files a/mods/d2k/maps/tucks-sietch.oramap and b/mods/d2k/maps/tucks-sietch.oramap differ diff --git a/mods/d2k/maps/venac-ditch.oramap b/mods/d2k/maps/venac-ditch.oramap index 49e5082b91..b8b02ac28a 100644 Binary files a/mods/d2k/maps/venac-ditch.oramap and b/mods/d2k/maps/venac-ditch.oramap differ diff --git a/mods/d2k/rules/ai.yaml b/mods/d2k/rules/ai.yaml index 3a095fc2e4..0daaaa3e00 100644 --- a/mods/d2k/rules/ai.yaml +++ b/mods/d2k/rules/ai.yaml @@ -476,3 +476,4 @@ Player: Attractiveness: -10 TargetMetric: Value CheckRadius: 7c0 + diff --git a/mods/d2k/rules/player.yaml b/mods/d2k/rules/player.yaml index b2fa0825c1..aa08ed5a58 100644 --- a/mods/d2k/rules/player.yaml +++ b/mods/d2k/rules/player.yaml @@ -72,3 +72,4 @@ Player: ProvidesTechPrerequisite@all: Name: Unrestricted Prerequisites: techlevel.low, techlevel.medium, techlevel.high, techlevel.superweapons + diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index d11237ff82..91a3ca9f29 100644 --- a/mods/d2k/rules/structures.yaml +++ b/mods/d2k/rules/structures.yaml @@ -773,3 +773,4 @@ POWER: REFINERY: Tooltip: Name: Spice Refinery + diff --git a/mods/ra/maps/Sahara.oramap b/mods/ra/maps/Sahara.oramap index 3e353cf4ac..6e5b3ccd02 100644 Binary files a/mods/ra/maps/Sahara.oramap and b/mods/ra/maps/Sahara.oramap differ diff --git a/mods/ra/maps/a-path-beyond.oramap b/mods/ra/maps/a-path-beyond.oramap index a467a874ed..136693134d 100644 Binary files a/mods/ra/maps/a-path-beyond.oramap and b/mods/ra/maps/a-path-beyond.oramap differ diff --git a/mods/ra/maps/alaska-anarchy-redux.oramap b/mods/ra/maps/alaska-anarchy-redux.oramap index 46ae7ad629..a23322fce7 100644 Binary files a/mods/ra/maps/alaska-anarchy-redux.oramap and b/mods/ra/maps/alaska-anarchy-redux.oramap differ diff --git a/mods/ra/maps/all-connected.oramap b/mods/ra/maps/all-connected.oramap index 7859eab282..886c3ef8ad 100644 Binary files a/mods/ra/maps/all-connected.oramap and b/mods/ra/maps/all-connected.oramap differ diff --git a/mods/ra/maps/allies-01-classic/map.yaml b/mods/ra/maps/allies-01-classic/map.yaml index 9d2ac96690..d0ce34ba0e 100644 --- a/mods/ra/maps/allies-01-classic/map.yaml +++ b/mods/ra/maps/allies-01-classic/map.yaml @@ -8,10 +8,10 @@ Title: Allies 01: In the thick of it Description: Rescue Einstein from the Headquarters inside this Soviet complex.\n\nOnce found, evacuate him via the helicopter at the signal flare.\n\nEinstein and Tanya must be kept alive at all costs.\n\nBeware the Soviet's Tesla Coils.\n\nDirect Tanya to destroy the westmost power plants to take them off-line. -PreviewVideo: ally1.vqa - Author: Westwood Studios +PreviewVideo: ally1.vqa + Tileset: SNOW MapSize: 128,128 @@ -36,13 +36,13 @@ Players: Name: USSR Race: soviet ColorRamp: 3,255,127 - Enemies: Greece,England + Enemies: Greece, England PlayerReference@Neutral: Name: Neutral OwnsWorld: True NonCombatant: True Race: allies - Enemies: USSR,Greece,England + Enemies: USSR, Greece, England PlayerReference@Greece: Name: Greece Playable: True @@ -55,7 +55,7 @@ Players: LockSpawn: True LockTeam: True Allies: England - Enemies: Neutral,USSR + Enemies: Neutral, USSR PlayerReference@England: Name: England Race: allies diff --git a/mods/ra/maps/allies-02-classic/map.yaml b/mods/ra/maps/allies-02-classic/map.yaml index b2cf3f5303..612763c882 100644 --- a/mods/ra/maps/allies-02-classic/map.yaml +++ b/mods/ra/maps/allies-02-classic/map.yaml @@ -8,10 +8,10 @@ Title: Allies 02: Five to one Description: A critical supply convoy is due through this area in 10 minutes, but Soviet forces have blocked the road in several places.\n\nUnless you can clear them out, those supplies will never make it to the front.\n\nThe convoy will come from the northwest, and time is short so work quickly. -PreviewVideo: ally2.vqa - Author: Westwood Studios +PreviewVideo: ally2.vqa + Tileset: SNOW MapSize: 128,128 @@ -40,8 +40,8 @@ Players: Enemies: Greece, France PlayerReference@France: Name: France - Race: allies NonCombatant: True + Race: allies ColorRamp: 115,115,143 Allies: Greece, France Enemies: USSR, Ukraine diff --git a/mods/ra/maps/apollo/map.yaml b/mods/ra/maps/apollo/map.yaml index 56f0352106..48b28d4f2f 100644 --- a/mods/ra/maps/apollo/map.yaml +++ b/mods/ra/maps/apollo/map.yaml @@ -74,7 +74,7 @@ Players: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6 Actors: Actor1: mpspawn diff --git a/mods/ra/maps/arctic-triangle-affair.oramap b/mods/ra/maps/arctic-triangle-affair.oramap index b4842acedf..ac33759820 100644 Binary files a/mods/ra/maps/arctic-triangle-affair.oramap and b/mods/ra/maps/arctic-triangle-affair.oramap differ diff --git a/mods/ra/maps/artemis/map.yaml b/mods/ra/maps/artemis/map.yaml index 9ec2cc0700..52e89da387 100644 --- a/mods/ra/maps/artemis/map.yaml +++ b/mods/ra/maps/artemis/map.yaml @@ -68,7 +68,7 @@ Players: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5 Actors: Actor1: oilb diff --git a/mods/ra/maps/asymetric-battle.oramap b/mods/ra/maps/asymetric-battle.oramap index 8b3b162c5b..997279afef 100644 Binary files a/mods/ra/maps/asymetric-battle.oramap and b/mods/ra/maps/asymetric-battle.oramap differ diff --git a/mods/ra/maps/bad-neighbors.oramap b/mods/ra/maps/bad-neighbors.oramap index 10fb9eef46..424569ce05 100644 Binary files a/mods/ra/maps/bad-neighbors.oramap and b/mods/ra/maps/bad-neighbors.oramap differ diff --git a/mods/ra/maps/black-gold.oramap b/mods/ra/maps/black-gold.oramap index 400fbb87b6..f435e4b496 100644 Binary files a/mods/ra/maps/black-gold.oramap and b/mods/ra/maps/black-gold.oramap differ diff --git a/mods/ra/maps/blitzkrieg.oramap b/mods/ra/maps/blitzkrieg.oramap index 67cddb47c3..4051c9f2b4 100644 Binary files a/mods/ra/maps/blitzkrieg.oramap and b/mods/ra/maps/blitzkrieg.oramap differ diff --git a/mods/ra/maps/bloody-delta.oramap b/mods/ra/maps/bloody-delta.oramap index 5fd86e78df..9f5af1d0e0 100644 Binary files a/mods/ra/maps/bloody-delta.oramap and b/mods/ra/maps/bloody-delta.oramap differ diff --git a/mods/ra/maps/bombardment-islands.oramap b/mods/ra/maps/bombardment-islands.oramap index 687c7a569c..3d899a88ba 100644 Binary files a/mods/ra/maps/bombardment-islands.oramap and b/mods/ra/maps/bombardment-islands.oramap differ diff --git a/mods/ra/maps/breaking-point.oramap b/mods/ra/maps/breaking-point.oramap index 54800dbd4e..365defb030 100644 Binary files a/mods/ra/maps/breaking-point.oramap and b/mods/ra/maps/breaking-point.oramap differ diff --git a/mods/ra/maps/burlesca/map.yaml b/mods/ra/maps/burlesca/map.yaml index 4c18b4bad4..7e85557efc 100644 --- a/mods/ra/maps/burlesca/map.yaml +++ b/mods/ra/maps/burlesca/map.yaml @@ -29,20 +29,20 @@ Players: PlayerReference@Multi0: Name: Multi0 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi1: Name: Multi1 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Creeps: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1 + Enemies: Multi0, Multi1 Actors: Actor2: mpspawn diff --git a/mods/ra/maps/caffeinated.oramap b/mods/ra/maps/caffeinated.oramap index 6e3d89628c..57dd2d1fad 100644 Binary files a/mods/ra/maps/caffeinated.oramap and b/mods/ra/maps/caffeinated.oramap differ diff --git a/mods/ra/maps/calm-before-storm.oramap b/mods/ra/maps/calm-before-storm.oramap index cde8f60863..a4474c4716 100644 Binary files a/mods/ra/maps/calm-before-storm.oramap and b/mods/ra/maps/calm-before-storm.oramap differ diff --git a/mods/ra/maps/center-of-attention-redux-2/map.yaml b/mods/ra/maps/center-of-attention-redux-2/map.yaml index c0efc0452e..eaddc3c145 100644 --- a/mods/ra/maps/center-of-attention-redux-2/map.yaml +++ b/mods/ra/maps/center-of-attention-redux-2/map.yaml @@ -30,7 +30,7 @@ Players: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi0: Name: Multi0 Playable: True diff --git a/mods/ra/maps/central-conflict.oramap b/mods/ra/maps/central-conflict.oramap index 172fe7168c..191e68b8df 100644 Binary files a/mods/ra/maps/central-conflict.oramap and b/mods/ra/maps/central-conflict.oramap differ diff --git a/mods/ra/maps/chaos-canyon.oramap b/mods/ra/maps/chaos-canyon.oramap index 70a6afdf3c..9782965b25 100644 Binary files a/mods/ra/maps/chaos-canyon.oramap and b/mods/ra/maps/chaos-canyon.oramap differ diff --git a/mods/ra/maps/chokepoint.oramap b/mods/ra/maps/chokepoint.oramap index eac71d53ad..4cc2ea6982 100644 Binary files a/mods/ra/maps/chokepoint.oramap and b/mods/ra/maps/chokepoint.oramap differ diff --git a/mods/ra/maps/coastal-influence.oramap b/mods/ra/maps/coastal-influence.oramap index 6e83763da1..9929786dea 100644 Binary files a/mods/ra/maps/coastal-influence.oramap and b/mods/ra/maps/coastal-influence.oramap differ diff --git a/mods/ra/maps/contact.oramap b/mods/ra/maps/contact.oramap index 5e4acfffb1..f9ccea049a 100644 Binary files a/mods/ra/maps/contact.oramap and b/mods/ra/maps/contact.oramap differ diff --git a/mods/ra/maps/convergence.oramap b/mods/ra/maps/convergence.oramap index 4ecadfb20f..dfa1d687f5 100644 Binary files a/mods/ra/maps/convergence.oramap and b/mods/ra/maps/convergence.oramap differ diff --git a/mods/ra/maps/dionysus/map.yaml b/mods/ra/maps/dionysus/map.yaml index 6c896c1f85..44d15f148a 100644 --- a/mods/ra/maps/dionysus/map.yaml +++ b/mods/ra/maps/dionysus/map.yaml @@ -72,7 +72,7 @@ Players: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7 Actors: Actor0: v10 diff --git a/mods/ra/maps/doubles.oramap b/mods/ra/maps/doubles.oramap index b72b711963..eeb5d1279d 100644 Binary files a/mods/ra/maps/doubles.oramap and b/mods/ra/maps/doubles.oramap differ diff --git a/mods/ra/maps/doughnut.oramap b/mods/ra/maps/doughnut.oramap index 8dab309bb2..992dbe1e3a 100644 Binary files a/mods/ra/maps/doughnut.oramap and b/mods/ra/maps/doughnut.oramap differ diff --git a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml index 22a26fae85..32e7a54354 100644 --- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml +++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml @@ -45,56 +45,56 @@ Players: AllowBots: False LockRace: True Race: soviet - Enemies: Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi1: Name: Multi1 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi2: Name: Multi2 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi1,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi3: Name: Multi3 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi1,Multi2,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi2, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi4: Name: Multi4 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi1,Multi2,Multi3,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi5, Multi6, Multi7 PlayerReference@Multi5: Name: Multi5 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi2,Multi3,Multi4,Multi1,Multi6,Multi7 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi1, Multi6, Multi7 PlayerReference@Multi6: Name: Multi6 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi1,Multi7 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi5, Multi1, Multi7 PlayerReference@Multi7: Name: Multi7 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi1 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi5, Multi6, Multi1 Actors: Actor0: apc diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml index 9afebecc76..4cbefad4e4 100644 --- a/mods/ra/maps/drop-zone-w/map.yaml +++ b/mods/ra/maps/drop-zone-w/map.yaml @@ -39,7 +39,7 @@ Players: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi0: Name: Multi0 Playable: True diff --git a/mods/ra/maps/drop-zone/map.yaml b/mods/ra/maps/drop-zone/map.yaml index a187d99fb3..0d57ecd47c 100644 --- a/mods/ra/maps/drop-zone/map.yaml +++ b/mods/ra/maps/drop-zone/map.yaml @@ -45,56 +45,56 @@ Players: AllowBots: False LockRace: True Race: soviet - Enemies: Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi1: Name: Multi1 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi2: Name: Multi2 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi1,Multi3,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi3, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi3: Name: Multi3 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi1,Multi2,Multi4,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi2, Multi4, Multi5, Multi6, Multi7 PlayerReference@Multi4: Name: Multi4 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi1,Multi2,Multi3,Multi5,Multi6,Multi7 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi5, Multi6, Multi7 PlayerReference@Multi5: Name: Multi5 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi2,Multi3,Multi4,Multi1,Multi6,Multi7 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi1, Multi6, Multi7 PlayerReference@Multi6: Name: Multi6 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi1,Multi7 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi5, Multi1, Multi7 PlayerReference@Multi7: Name: Multi7 Playable: True AllowBots: False LockRace: True Race: soviet - Enemies: Multi0,Multi2,Multi3,Multi4,Multi5,Multi6,Multi1 + Enemies: Multi0, Multi2, Multi3, Multi4, Multi5, Multi6, Multi1 Actors: Actor0: apc diff --git a/mods/ra/maps/east-vs-west.oramap b/mods/ra/maps/east-vs-west.oramap index 18d48c175a..b0c48c8294 100644 Binary files a/mods/ra/maps/east-vs-west.oramap and b/mods/ra/maps/east-vs-west.oramap differ diff --git a/mods/ra/maps/encounter.oramap b/mods/ra/maps/encounter.oramap index bbdeaee92d..71e47b5f6d 100644 Binary files a/mods/ra/maps/encounter.oramap and b/mods/ra/maps/encounter.oramap differ diff --git a/mods/ra/maps/engagement.oramap b/mods/ra/maps/engagement.oramap index 48922c501d..c04d4373dc 100644 Binary files a/mods/ra/maps/engagement.oramap and b/mods/ra/maps/engagement.oramap differ diff --git a/mods/ra/maps/equal-opportunity.oramap b/mods/ra/maps/equal-opportunity.oramap index 8de2519344..88dc5919fd 100644 Binary files a/mods/ra/maps/equal-opportunity.oramap and b/mods/ra/maps/equal-opportunity.oramap differ diff --git a/mods/ra/maps/first-come-first-served.oramap b/mods/ra/maps/first-come-first-served.oramap index 80da4bd470..eac4a037ca 100644 Binary files a/mods/ra/maps/first-come-first-served.oramap and b/mods/ra/maps/first-come-first-served.oramap differ diff --git a/mods/ra/maps/forest-path.oramap b/mods/ra/maps/forest-path.oramap index 13f0025ae1..73a72da9f5 100644 Binary files a/mods/ra/maps/forest-path.oramap and b/mods/ra/maps/forest-path.oramap differ diff --git a/mods/ra/maps/ghost-town.oramap b/mods/ra/maps/ghost-town.oramap index 5d97d06a61..50acfb3ddb 100644 Binary files a/mods/ra/maps/ghost-town.oramap and b/mods/ra/maps/ghost-town.oramap differ diff --git a/mods/ra/maps/haos-ridges.oramap b/mods/ra/maps/haos-ridges.oramap index 798e6d466c..78aaa1f201 100644 Binary files a/mods/ra/maps/haos-ridges.oramap and b/mods/ra/maps/haos-ridges.oramap differ diff --git a/mods/ra/maps/hasselhoff.oramap b/mods/ra/maps/hasselhoff.oramap index 792834f4a3..1b8fc946e6 100644 Binary files a/mods/ra/maps/hasselhoff.oramap and b/mods/ra/maps/hasselhoff.oramap differ diff --git a/mods/ra/maps/hectic.oramap b/mods/ra/maps/hectic.oramap index 5787f5e121..21d36f9502 100644 Binary files a/mods/ra/maps/hectic.oramap and b/mods/ra/maps/hectic.oramap differ diff --git a/mods/ra/maps/high-and-low-extended.oramap b/mods/ra/maps/high-and-low-extended.oramap index ff5d24458b..ef9c026c4a 100644 Binary files a/mods/ra/maps/high-and-low-extended.oramap and b/mods/ra/maps/high-and-low-extended.oramap differ diff --git a/mods/ra/maps/high-and-low.oramap b/mods/ra/maps/high-and-low.oramap index a9844bc03a..c9e7d925a4 100644 Binary files a/mods/ra/maps/high-and-low.oramap and b/mods/ra/maps/high-and-low.oramap differ diff --git a/mods/ra/maps/island-hoppers.oramap b/mods/ra/maps/island-hoppers.oramap index bebf02c2a8..fbed338715 100644 Binary files a/mods/ra/maps/island-hoppers.oramap and b/mods/ra/maps/island-hoppers.oramap differ diff --git a/mods/ra/maps/keep-off-the-grass-2.oramap b/mods/ra/maps/keep-off-the-grass-2.oramap index bfa3d5723b..1d1922a404 100644 Binary files a/mods/ra/maps/keep-off-the-grass-2.oramap and b/mods/ra/maps/keep-off-the-grass-2.oramap differ diff --git a/mods/ra/maps/koth-crossroads/map.yaml b/mods/ra/maps/koth-crossroads/map.yaml index 71e684ce8e..0d29d176b8 100644 --- a/mods/ra/maps/koth-crossroads/map.yaml +++ b/mods/ra/maps/koth-crossroads/map.yaml @@ -52,7 +52,7 @@ Players: Name: Creeps NonCombatant: True Race: Random - Enemies: Multi0,Multi1,Multi2,Multi3 + Enemies: Multi0, Multi1, Multi2, Multi3 Actors: Actor0: miss diff --git a/mods/ra/maps/man-to-man.oramap b/mods/ra/maps/man-to-man.oramap index c3cbaade84..8dc825a472 100644 Binary files a/mods/ra/maps/man-to-man.oramap and b/mods/ra/maps/man-to-man.oramap differ diff --git a/mods/ra/maps/marooned-2.oramap b/mods/ra/maps/marooned-2.oramap index 2b87ce43be..cde635a98e 100644 Binary files a/mods/ra/maps/marooned-2.oramap and b/mods/ra/maps/marooned-2.oramap differ diff --git a/mods/ra/maps/mass-confliction.oramap b/mods/ra/maps/mass-confliction.oramap index 9fdb852e97..c241b2d608 100644 Binary files a/mods/ra/maps/mass-confliction.oramap and b/mods/ra/maps/mass-confliction.oramap differ diff --git a/mods/ra/maps/north-by-northwest.oramap b/mods/ra/maps/north-by-northwest.oramap index 5cea88adc3..2d0f83243f 100644 Binary files a/mods/ra/maps/north-by-northwest.oramap and b/mods/ra/maps/north-by-northwest.oramap differ diff --git a/mods/ra/maps/pearly-wastelands.oramap b/mods/ra/maps/pearly-wastelands.oramap index b5613a55c8..fcb9ef49ce 100644 Binary files a/mods/ra/maps/pearly-wastelands.oramap and b/mods/ra/maps/pearly-wastelands.oramap differ diff --git a/mods/ra/maps/poland-raid/map.yaml b/mods/ra/maps/poland-raid/map.yaml index 8b1ee5d4a2..e9f3f73f97 100644 --- a/mods/ra/maps/poland-raid/map.yaml +++ b/mods/ra/maps/poland-raid/map.yaml @@ -31,38 +31,38 @@ Players: PlayerReference@Multi0: Name: Multi0 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi1: Name: Multi1 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi2: Name: Multi2 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi3: Name: Multi3 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Multi4: Name: Multi4 Playable: True + AllowBots: False Race: Random Enemies: Creeps - AllowBots: False PlayerReference@Creeps: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4 Actors: Actor1: v16 diff --git a/mods/ra/maps/pressure.oramap b/mods/ra/maps/pressure.oramap index 9429770571..25ab1d247d 100644 Binary files a/mods/ra/maps/pressure.oramap and b/mods/ra/maps/pressure.oramap differ diff --git a/mods/ra/maps/puddles-redux.oramap b/mods/ra/maps/puddles-redux.oramap index 44b1532f51..e49f1b2d10 100644 Binary files a/mods/ra/maps/puddles-redux.oramap and b/mods/ra/maps/puddles-redux.oramap differ diff --git a/mods/ra/maps/raraku.oramap b/mods/ra/maps/raraku.oramap index 03cbc67b24..0ecab19381 100644 Binary files a/mods/ra/maps/raraku.oramap and b/mods/ra/maps/raraku.oramap differ diff --git a/mods/ra/maps/regeneration-basin.oramap b/mods/ra/maps/regeneration-basin.oramap index 07ae6e180a..7a20a1d6da 100644 Binary files a/mods/ra/maps/regeneration-basin.oramap and b/mods/ra/maps/regeneration-basin.oramap differ diff --git a/mods/ra/maps/ring-of-fire.oramap b/mods/ra/maps/ring-of-fire.oramap index cdd7e0547f..8efb6904df 100644 Binary files a/mods/ra/maps/ring-of-fire.oramap and b/mods/ra/maps/ring-of-fire.oramap differ diff --git a/mods/ra/maps/river-war-2.oramap b/mods/ra/maps/river-war-2.oramap index 62fab8d120..05beda8299 100644 Binary files a/mods/ra/maps/river-war-2.oramap and b/mods/ra/maps/river-war-2.oramap differ diff --git a/mods/ra/maps/room-convergence/map.yaml b/mods/ra/maps/room-convergence/map.yaml index 3f1999f8c3..cc25955e1c 100644 --- a/mods/ra/maps/room-convergence/map.yaml +++ b/mods/ra/maps/room-convergence/map.yaml @@ -62,7 +62,7 @@ Players: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5 Actors: Actor0: oilb diff --git a/mods/ra/maps/room-warzone.oramap b/mods/ra/maps/room-warzone.oramap index b472edf99a..e029511436 100644 Binary files a/mods/ra/maps/room-warzone.oramap and b/mods/ra/maps/room-warzone.oramap differ diff --git a/mods/ra/maps/seaside-2.oramap b/mods/ra/maps/seaside-2.oramap index 37e43d1730..06f81dc7e2 100644 Binary files a/mods/ra/maps/seaside-2.oramap and b/mods/ra/maps/seaside-2.oramap differ diff --git a/mods/ra/maps/seven-stairs.oramap b/mods/ra/maps/seven-stairs.oramap index 9f6d5dacf8..4234c85c9c 100644 Binary files a/mods/ra/maps/seven-stairs.oramap and b/mods/ra/maps/seven-stairs.oramap differ diff --git a/mods/ra/maps/singles.oramap b/mods/ra/maps/singles.oramap index f02e12b858..6c52fdb898 100644 Binary files a/mods/ra/maps/singles.oramap and b/mods/ra/maps/singles.oramap differ diff --git a/mods/ra/maps/snow town.oramap b/mods/ra/maps/snow town.oramap index 1a0995441a..28f6fb438f 100644 Binary files a/mods/ra/maps/snow town.oramap and b/mods/ra/maps/snow town.oramap differ diff --git a/mods/ra/maps/snowy-island.oramap b/mods/ra/maps/snowy-island.oramap index 4748e30b59..f2ec7781f7 100644 Binary files a/mods/ra/maps/snowy-island.oramap and b/mods/ra/maps/snowy-island.oramap differ diff --git a/mods/ra/maps/snowyridge.oramap b/mods/ra/maps/snowyridge.oramap index 97b8afb56a..d47d166903 100644 Binary files a/mods/ra/maps/snowyridge.oramap and b/mods/ra/maps/snowyridge.oramap differ diff --git a/mods/ra/maps/styrian-mountains.oramap b/mods/ra/maps/styrian-mountains.oramap index 16e072be6c..566f63edc1 100644 Binary files a/mods/ra/maps/styrian-mountains.oramap and b/mods/ra/maps/styrian-mountains.oramap differ diff --git a/mods/ra/maps/suffrage.oramap b/mods/ra/maps/suffrage.oramap index 91a56b4470..4f37260bd1 100644 Binary files a/mods/ra/maps/suffrage.oramap and b/mods/ra/maps/suffrage.oramap differ diff --git a/mods/ra/maps/synergy.oramap b/mods/ra/maps/synergy.oramap index 27a6506078..64f03753da 100644 Binary files a/mods/ra/maps/synergy.oramap and b/mods/ra/maps/synergy.oramap differ diff --git a/mods/ra/maps/tainted-peak.oramap b/mods/ra/maps/tainted-peak.oramap index 01f1615525..383fdf5c34 100644 Binary files a/mods/ra/maps/tainted-peak.oramap and b/mods/ra/maps/tainted-peak.oramap differ diff --git a/mods/ra/maps/temperal.oramap b/mods/ra/maps/temperal.oramap index 778f379462..d70ab30a02 100644 Binary files a/mods/ra/maps/temperal.oramap and b/mods/ra/maps/temperal.oramap differ diff --git a/mods/ra/maps/the-white-pentagon.oramap b/mods/ra/maps/the-white-pentagon.oramap index 9c01bafa57..e1c8b7440a 100644 Binary files a/mods/ra/maps/the-white-pentagon.oramap and b/mods/ra/maps/the-white-pentagon.oramap differ diff --git a/mods/ra/maps/tournament-island.oramap b/mods/ra/maps/tournament-island.oramap index cdeced5773..fcbe9a1065 100644 Binary files a/mods/ra/maps/tournament-island.oramap and b/mods/ra/maps/tournament-island.oramap differ diff --git a/mods/ra/maps/vegetation.oramap b/mods/ra/maps/vegetation.oramap index 57b945ffb5..75a98ea2f9 100644 Binary files a/mods/ra/maps/vegetation.oramap and b/mods/ra/maps/vegetation.oramap differ diff --git a/mods/ra/maps/winter-warzone.oramap b/mods/ra/maps/winter-warzone.oramap index 41b9176986..87cf52262b 100644 Binary files a/mods/ra/maps/winter-warzone.oramap and b/mods/ra/maps/winter-warzone.oramap differ diff --git a/mods/ra/maps/zeus/map.yaml b/mods/ra/maps/zeus/map.yaml index 96a79e191c..0a3c657802 100644 --- a/mods/ra/maps/zeus/map.yaml +++ b/mods/ra/maps/zeus/map.yaml @@ -128,7 +128,7 @@ Players: Name: Creeps NonCombatant: True Race: allies - Enemies: Multi0,Multi1,Multi2,Multi3,Multi4,Multi5,Multi6,Multi7,Multi8,Multi9,Multi10,Multi11,Multi12,Multi13,Multi14,Multi15 + Enemies: Multi0, Multi1, Multi2, Multi3, Multi4, Multi5, Multi6, Multi7, Multi8, Multi9, Multi10, Multi11, Multi12, Multi13, Multi14, Multi15 Actors: Actor0: mpspawn diff --git a/mods/ra/rules/player.yaml b/mods/ra/rules/player.yaml index de6c0616b3..34b56d4772 100644 --- a/mods/ra/rules/player.yaml +++ b/mods/ra/rules/player.yaml @@ -73,3 +73,4 @@ Player: Name: Unrestricted Prerequisites: techlevel.infonly, techlevel.low, techlevel.medium, techlevel.unrestricted GlobalUpgradeManager: + diff --git a/mods/ts/maps/blank-conquest/map.yaml b/mods/ts/maps/blank-conquest/map.yaml index f4d45558ea..448a443777 100644 --- a/mods/ts/maps/blank-conquest/map.yaml +++ b/mods/ts/maps/blank-conquest/map.yaml @@ -52,7 +52,7 @@ Players: Name: Creeps NonCombatant: True Race: gdi - Enemies: Multi0,Multi1,Multi2,Multi3 + Enemies: Multi0, Multi1, Multi2, Multi3 Actors: Actor0: mpspawn diff --git a/mods/ts/rules/ai.yaml b/mods/ts/rules/ai.yaml index 80ff87d9ac..59eb706660 100644 --- a/mods/ts/rules/ai.yaml +++ b/mods/ts/rules/ai.yaml @@ -50,3 +50,4 @@ Player: ttnk: 45% stnk: 8% SquadSize: 20 + diff --git a/mods/ts/rules/vehicles.yaml b/mods/ts/rules/vehicles.yaml index aa6ff225e8..6d9daaffd2 100644 --- a/mods/ts/rules/vehicles.yaml +++ b/mods/ts/rules/vehicles.yaml @@ -124,7 +124,7 @@ HVR: Buildable: Queue: Vehicle BuildPaletteOrder: 50 - Prerequisites: gaweap, garadr + Prerequisites: gaweap, garadr Owner: gdi Hothey: v Mobile: diff --git a/mods/ts/tilesets/temperat.yaml b/mods/ts/tilesets/temperat.yaml index b40d14e778..ddca5bda57 100644 --- a/mods/ts/tilesets/temperat.yaml +++ b/mods/ts/tilesets/temperat.yaml @@ -6626,4 +6626,5 @@ Templates: 8: Cliff 9: Clear 10: Clear - 11: Clear \ No newline at end of file + 11: Clear +