diff --git a/OpenRA.Game/Traits/World/Country.cs b/OpenRA.Game/Traits/World/Country.cs index f7b94d516e..2921e04fc1 100644 --- a/OpenRA.Game/Traits/World/Country.cs +++ b/OpenRA.Game/Traits/World/Country.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, @@ -12,8 +12,12 @@ namespace OpenRA.Traits { public class CountryInfo : TraitInfo { + [Desc("This is the name exposed to the players.")] public readonly string Name = null; + + [Desc("This is the internal name for owner checks.")] public readonly string Race = null; + public readonly bool Selectable = true; } diff --git a/OpenRA.Mods.RA/Buildable.cs b/OpenRA.Mods.RA/Buildable.cs index 3d29c40313..c8002105fc 100755 --- a/OpenRA.Mods.RA/Buildable.cs +++ b/OpenRA.Mods.RA/Buildable.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, @@ -14,10 +14,20 @@ namespace OpenRA.Mods.RA { public class BuildableInfo : TraitInfo { + [Desc("The prerequisite names that must be available before this can be built.", + "This can be prefixed with ! to invert the prerequisite (disabling production if the prerequisite is available)", + "and/or ~ to hide the actor from the production palette if the prerequisite is not available.", + "Prerequisites are granted by actors with the Building trait (with a prerequisite string given by the lower case actor name)", + "and by the ProvidesCustomPrerequisite trait.")] public readonly string[] Prerequisites = { }; + + [Desc("Restrict production to a specific race(s). **Deprecated**: Use race-specific prerequisites instead.")] public readonly string[] Owner = { }; + [Desc("Production queue(s) that can produce this.")] public readonly string[] Queue = { }; + + [Desc("Disable production when there are more than this many of this actor on the battlefield. Set to 0 to disable.")] public readonly int BuildLimit = 0; // TODO: UI fluff; doesn't belong here diff --git a/OpenRA.Mods.RA/SelfHealing.cs b/OpenRA.Mods.RA/SelfHealing.cs index 50876e86a3..6a97d0e9f8 100644 --- a/OpenRA.Mods.RA/SelfHealing.cs +++ b/OpenRA.Mods.RA/SelfHealing.cs @@ -1,6 +1,6 @@ #region Copyright & License Information /* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * Copyright 2007-2014 The OpenRA Developers (see AUTHORS) * This file is part of OpenRA, which is free software. It is made * available to you under the terms of the GNU General Public License * as published by the Free Software Foundation. For more information, @@ -13,12 +13,15 @@ using OpenRA.Traits; namespace OpenRA.Mods.RA { + [Desc("Attach this to actors which should be able to regenerate their health points.")] class SelfHealingInfo : ITraitInfo, Requires { public readonly int Step = 5; public readonly int Ticks = 5; public readonly float HealIfBelow = .5f; public readonly int DamageCooldown = 0; + + [Desc("The Type defined by SelfHealingTech required to enable this.")] public readonly string RequiresTech = null; public virtual object Create(ActorInitializer init) { return new SelfHealing(this); } @@ -65,6 +68,7 @@ namespace OpenRA.Mods.RA } } + [Desc("Attach this to an actor required as prerequisite for all owned units to regenerate health.")] class SelfHealingTechInfo : ITraitInfo { public readonly string Type = null; diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs index db0837a582..907471c3e9 100644 --- a/OpenRA.Utility/Command.cs +++ b/OpenRA.Utility/Command.cs @@ -334,7 +334,7 @@ namespace OpenRA.Utility doc.Append("{0}{1}{2}".F(f.Name, defaultValue, fieldType)); doc.Append(""); foreach (var line in fieldDescLines) - doc.Append(line); + doc.Append(line + " "); doc.AppendLine(""); } doc.AppendLine(""); diff --git a/mods/ra/maps/allies-02-classic/map.yaml b/mods/ra/maps/allies-02-classic/map.yaml index 626301ef1c..873b9996da 100644 --- a/mods/ra/maps/allies-02-classic/map.yaml +++ b/mods/ra/maps/allies-02-classic/map.yaml @@ -883,58 +883,64 @@ Rules: MustBeDestroyed: APWR: Buildable: - Owner: None + Prerequisites: ~disabled FIX: Buildable: - Owner: None + Prerequisites: ~disabled SYRD: Buildable: - Owner: None + Prerequisites: ~disabled WEAP: Buildable: - Owner: None + Prerequisites: ~disabled DOME: Buildable: - Owner: None + Prerequisites: ~disabled HPAD: Buildable: - Owner: None + Prerequisites: ~disabled ATEK: Buildable: - Owner: None + Prerequisites: ~disabled BRIK: Buildable: - Owner: None - HBOX.E1: + Prerequisites: ~disabled + HBOX: Buildable: - Owner: None + Prerequisites: ~disabled + PBOX: + Buildable: + Prerequisites: ~disabled GUN: Buildable: - Owner: None + Prerequisites: ~disabled AGUN: Buildable: - Owner: None + Prerequisites: ~disabled GAP: Buildable: - Owner: None + Prerequisites: ~disabled PDOX: Buildable: - Owner: None + Prerequisites: ~disabled MSLO: Buildable: - Owner: None + Prerequisites: ~disabled E6: Buildable: - Owner: None + Prerequisites: ~disabled SPY: Buildable: - Owner: None + Prerequisites: ~disabled MECH: Buildable: - Owner: None + Prerequisites: ~disabled E7: Buildable: - Owner: None + Prerequisites: ~disabled + HIJACKER: + Buildable: + Prerequisites: ~disabled Sequences: diff --git a/mods/ra/maps/bomber-john/map.yaml b/mods/ra/maps/bomber-john/map.yaml index 3b97c56c3f..609d8b586b 100644 --- a/mods/ra/maps/bomber-john/map.yaml +++ b/mods/ra/maps/bomber-john/map.yaml @@ -773,37 +773,37 @@ Rules: -SpawnMPUnits: APWR: Buildable: - Owner: a + Prerequisites: ~disabled STEK: Buildable: - Owner: a + Prerequisites: ~disabled BARR: Buildable: - Owner: a + Prerequisites: ~disabled FIX: Buildable: - Owner: a + Prerequisites: ~disabled POWR: Buildable: - Owner: a + Prerequisites: ~disabled AFLD: Buildable: - Owner: a + Prerequisites: ~disabled PROC: Buildable: - Owner: a + Prerequisites: ~disabled WEAP: Buildable: - Owner: a + Prerequisites: ~disabled DOME: Buildable: - Owner: a + Prerequisites: ~disabled SPEN: Buildable: - Owner: a + Prerequisites: ~disabled SILO: Buildable: - Owner: a + Prerequisites: ~disabled Player: ClassicProductionQueue@Building: BuildSpeed: 0.4 diff --git a/mods/ra/maps/intervention/map.yaml b/mods/ra/maps/intervention/map.yaml index 1209e74c1f..14d9f6c6dd 100644 --- a/mods/ra/maps/intervention/map.yaml +++ b/mods/ra/maps/intervention/map.yaml @@ -2278,52 +2278,52 @@ Rules: MustBeDestroyed: ATEK: Buildable: - Owner: None + Prerequisites: ~disabled GAP: Buildable: - Owner: None + Prerequisites: ~disabled MSLO: Buildable: - Owner: None + Prerequisites: ~disabled PDOX: Buildable: - Owner: None + Prerequisites: ~disabled E7: Buildable: - Owner: None + Prerequisites: ~disabled 2TNK: Buildable: - Owner: None + Prerequisites: ~disabled ARTY: Buildable: - Owner: None + Prerequisites: ~disabled CTNK: Buildable: - Owner: None + Prerequisites: ~disabled MGG: Buildable: - Owner: None + Prerequisites: ~disabled MNLY.AT: Buildable: - Owner: None + Prerequisites: ~disabled MRJ: Buildable: - Owner: None + Prerequisites: ~disabled TRUK: Buildable: - Owner: None + Prerequisites: ~disabled HIND: Buildable: - Owner: None + Prerequisites: ~disabled CA: Buildable: - Owner: None + Prerequisites: ~disabled DD: Buildable: - Owner: None + Prerequisites: ~disabled STNK: Buildable: - Owner: None + Prerequisites: ~disabled Sequences: diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index 52feade711..c228237611 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -78,7 +78,6 @@ MIG: Queue: Plane BuildPaletteOrder: 100 Prerequisites: afld, stek - Owner: soviet Hotkey: m Valued: Cost: 2000 @@ -131,7 +130,6 @@ YAK: Queue: Plane BuildPaletteOrder: 50 Prerequisites: afld - Owner: soviet Hotkey: y Valued: Cost: 1000 @@ -190,7 +188,6 @@ TRAN: Queue: Helicopter BuildPaletteOrder: 110 Prerequisites: hpad - Owner: allies Hotkey: t Valued: Cost: 900 @@ -232,7 +229,6 @@ HELI: Queue: Helicopter BuildPaletteOrder: 90 Prerequisites: hpad, atek - Owner: allies Hotkey: l Valued: Cost: 2000 @@ -283,7 +279,6 @@ HIND: Queue: Helicopter BuildPaletteOrder: 90 Prerequisites: hpad - Owner: allies Hotkey: h Valued: Cost: 1000 diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index b8f3d653f9..3d63dba9e2 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -3,8 +3,7 @@ DOG: Buildable: Queue: Infantry BuildPaletteOrder: 30 - Prerequisites: barr - Owner: soviet + Prerequisites: ~barr Hotkey: o Valued: Cost: 200 @@ -34,7 +33,6 @@ E1: Buildable: Queue: Infantry BuildPaletteOrder: 10 - Owner: allies,soviet Hotkey: i Valued: Cost: 100 @@ -65,8 +63,7 @@ E2: Buildable: Queue: Infantry BuildPaletteOrder: 10 - Owner: soviet - Prerequisites: barr + Prerequisites: ~barr Hotkey: g Valued: Cost: 160 @@ -102,7 +99,6 @@ E3: Buildable: Queue: Infantry BuildPaletteOrder: 20 - Owner: allies,soviet Hotkey: r Valued: Cost: 300 @@ -136,8 +132,7 @@ E4: Buildable: Queue: Infantry BuildPaletteOrder: 60 - Prerequisites: ftur - Owner: soviet + Prerequisites: ~barr, ftur Hotkey: t Valued: Cost: 300 @@ -169,7 +164,6 @@ E6: Buildable: Queue: Infantry BuildPaletteOrder: 50 - Owner: soviet,allies Hotkey: e Valued: Cost: 500 @@ -201,8 +195,7 @@ SPY: Buildable: Queue: Infantry BuildPaletteOrder: 60 - Prerequisites: dome, tent - Owner: allies + Prerequisites: dome, ~tent Hotkey: p Valued: Cost: 500 @@ -239,7 +232,6 @@ E7: Queue: Infantry BuildPaletteOrder: 110 Prerequisites: techcenter - Owner: allies Hotkey: y BuildLimit: 1 Valued: @@ -279,8 +271,7 @@ MEDI: Buildable: Queue: Infantry BuildPaletteOrder: 20 - Owner: allies - Prerequisites: tent + Prerequisites: ~tent Hotkey: m Valued: Cost: 200 @@ -315,8 +306,7 @@ MECH: Buildable: Queue: Infantry BuildPaletteOrder: 70 - Owner: allies - Prerequisites: fix + Prerequisites: ~tent, fix Hotkey: c Valued: Cost: 500 @@ -432,8 +422,7 @@ HIJACKER: Buildable: Queue: Infantry BuildPaletteOrder: 90 - Owner: soviet - Prerequisites: fix + Prerequisites: ~tent, fix Hotkey: j Valued: Cost: 500 @@ -460,8 +449,7 @@ SHOK: Buildable: Queue: Infantry BuildPaletteOrder: 70 - Prerequisites: stek,tsla - Owner: soviet + Prerequisites: ~barr, stek, tsla Hotkey: l Valued: Cost: 400 @@ -500,8 +488,7 @@ SNIPER: Buildable: Queue: Infantry BuildPaletteOrder: 80 - Owner: soviet - Prerequisites: dome + Prerequisites: ~barr, dome Hotkey: h Selectable: Bounds: 12,17,0,-6 @@ -550,8 +537,7 @@ Zombie: Buildable: Queue: Infantry BuildPaletteOrder: 200 - Owner: Umbrella - Prerequisites: bio + Prerequisites: ~bio Selectable: Voice: AntVoice Bounds: 12,17,0,-9 @@ -575,8 +561,7 @@ Ant: Buildable: Queue: Infantry BuildPaletteOrder: 1954 - Owner: Them - Prerequisites: bio + Prerequisites: ~bio Selectable: Voice: AntVoice Bounds: 30,30,0,-2 diff --git a/mods/ra/rules/player.yaml b/mods/ra/rules/player.yaml index b58265e0de..a9fa7ece49 100644 --- a/mods/ra/rules/player.yaml +++ b/mods/ra/rules/player.yaml @@ -7,6 +7,7 @@ Player: QueuedAudio: Building ReadyAudio: ConstructionComplete SpeedUp: True + RequireOwner: false ClassicProductionQueue@Defense: Type: Defense BuildSpeed: .4 @@ -14,31 +15,37 @@ Player: QueuedAudio: Building ReadyAudio: ConstructionComplete SpeedUp: True + RequireOwner: false ClassicProductionQueue@Vehicle: Type: Vehicle BuildSpeed: .4 LowPowerSlowdown: 3 SpeedUp: True + RequireOwner: false ClassicProductionQueue@Infantry: Type: Infantry BuildSpeed: .4 LowPowerSlowdown: 3 SpeedUp: True + RequireOwner: false ClassicProductionQueue@Ship: Type: Ship BuildSpeed: .4 LowPowerSlowdown: 3 SpeedUp: True + RequireOwner: false ClassicProductionQueue@Plane: Type: Plane BuildSpeed: .4 LowPowerSlowdown: 3 SpeedUp: True + RequireOwner: false ClassicProductionQueue@Helicopter: Type: Helicopter BuildSpeed: .4 LowPowerSlowdown: 3 SpeedUp: True + RequireOwner: false PlaceBuilding: SupportPowerManager: ConquestVictoryConditions: diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 89f19e1caa..3eb3ae0dd0 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -3,8 +3,7 @@ SS: Buildable: Queue: Ship BuildPaletteOrder: 50 - Prerequisites: spen - Owner: soviet + Prerequisites: ~spen Hotkey: u Valued: Cost: 950 @@ -56,8 +55,7 @@ MSUB: Buildable: Queue: Ship BuildPaletteOrder: 60 - Prerequisites: spen,stek - Owner: soviet + Prerequisites: ~spen, stek Hotkey: m Valued: Cost: 2400 @@ -109,8 +107,7 @@ DD: Buildable: Queue: Ship BuildPaletteOrder: 70 - Prerequisites: syrd,dome - Owner: allies + Prerequisites: ~syrd, dome Hotkey: r Valued: Cost: 1000 @@ -159,8 +156,7 @@ CA: Buildable: Queue: Ship BuildPaletteOrder: 100 - Prerequisites: syrd,atek - Owner: allies + Prerequisites: ~syrd, atek Hotkey: c Valued: Cost: 2400 @@ -221,7 +217,6 @@ LST: Buildable: Queue: Ship BuildPaletteOrder: 30 - Owner: allies,soviet Hotkey: t Valued: Cost: 700 @@ -254,8 +249,7 @@ PT: Buildable: Queue: Ship BuildPaletteOrder: 50 - Prerequisites: syrd - Owner: allies + Prerequisites: ~syrd Hotkey: b Valued: Cost: 500 diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index f9d3db2917..c2f5f9d5c8 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -9,7 +9,6 @@ MSLO: Queue: Defense BuildPaletteOrder: 130 Prerequisites: techcenter - Owner: soviet,allies BuildLimit: 1 Hotkey: m Building: @@ -57,8 +56,7 @@ GAP: Buildable: Queue: Defense BuildPaletteOrder: 100 - Prerequisites: atek - Owner: allies + Prerequisites: atek, ~structures.allies Hotkey: g Building: Power: -60 @@ -96,8 +94,7 @@ SPEN: Buildable: Queue: Building BuildPaletteOrder: 50 - Prerequisites: anypower - Owner: soviet + Prerequisites: anypower, ~structures.soviet Hotkey: y TargetableBuilding: TargetTypes: Ground, Water @@ -148,8 +145,7 @@ SYRD: Buildable: Queue: Building BuildPaletteOrder: 50 - Prerequisites: anypower - Owner: allies + Prerequisites: anypower, ~structures.allies Hotkey: y Valued: Cost: 1000 @@ -201,8 +197,7 @@ IRON: Buildable: Queue: Defense BuildPaletteOrder: 120 - Prerequisites: stek - Owner: soviet + Prerequisites: stek, ~structures.soviet BuildLimit: 1 Hotkey: c Valued: @@ -247,7 +242,6 @@ PDOX: Queue: Defense BuildPaletteOrder: 120 Prerequisites: atek - Owner: allies BuildLimit: 1 Hotkey: o Valued: @@ -291,8 +285,7 @@ TSLA: Buildable: Queue: Defense BuildPaletteOrder: 70 - Prerequisites: weap - Owner: soviet + Prerequisites: weap, ~structures.soviet Hotkey: u Valued: Cost: 1200 @@ -335,8 +328,7 @@ AGUN: Buildable: Queue: Defense BuildPaletteOrder: 50 - Prerequisites: dome - Owner: allies + Prerequisites: dome, ~structures.allies Hotkey: y Valued: Cost: 800 @@ -383,7 +375,6 @@ DOME: Queue: Building BuildPaletteOrder: 80 Prerequisites: proc - Owner: allies,soviet Hotkey: r Valued: Cost: 1800 @@ -423,8 +414,7 @@ PBOX: Buildable: Queue: Defense BuildPaletteOrder: 20 - Prerequisites: tent - Owner: allies + Prerequisites: tent, ~structures.allies Hotkey: p -GivesBuildableArea: Valued: @@ -469,8 +459,7 @@ HBOX: Buildable: Queue: Defense BuildPaletteOrder: 20 - Prerequisites: tent - Owner: allies + Prerequisites: tent, ~structures.allies Hotkey: l -GivesBuildableArea: Valued: @@ -513,8 +502,7 @@ GUN: Buildable: Queue: Defense BuildPaletteOrder: 40 - Prerequisites: tent - Owner: allies + Prerequisites: tent, ~structures.allies Hotkey: t Valued: Cost: 600 @@ -554,8 +542,7 @@ FTUR: Buildable: Queue: Defense BuildPaletteOrder: 20 - Prerequisites: barr - Owner: soviet + Prerequisites: barr, ~structures.soviet Hotkey: t Valued: Cost: 600 @@ -593,8 +580,7 @@ SAM: Buildable: Queue: Defense BuildPaletteOrder: 90 - Prerequisites: dome - Owner: soviet + Prerequisites: dome, ~structures.soviet Hotkey: y Valued: Cost: 750 @@ -639,8 +625,7 @@ ATEK: Buildable: Queue: Building BuildPaletteOrder: 100 - Prerequisites: weap,dome - Owner: allies + Prerequisites: weap, dome, ~structures.allies Hotkey: t Valued: Cost: 1500 @@ -680,7 +665,6 @@ WEAP: Queue: Building BuildPaletteOrder: 70 Prerequisites: proc - Owner: soviet,allies Hotkey: w Valued: Cost: 2000 @@ -706,6 +690,12 @@ WEAP: ExitCell: 1,2 Production: Produces: Vehicle + ProvidesCustomPrerequisite@allies: + Race: allies + Prerequisite: vehicles.allies + ProvidesCustomPrerequisite@soviet: + Race: soviet + Prerequisite: vehicles.soviet PrimaryBuilding: IronCurtainable: ProductionBar: @@ -719,7 +709,13 @@ FACT: Buildable: Queue: Building BuildPaletteOrder: 1000 - Owner: None + Prerequisites: ~disabled + ProvidesCustomPrerequisite@allies: + Race: allies + Prerequisite: structures.allies + ProvidesCustomPrerequisite@soviet: + Race: soviet + Prerequisite: structures.soviet Health: HP: 1500 Armor: @@ -757,7 +753,6 @@ PROC: Queue: Building BuildPaletteOrder: 10 Prerequisites: anypower - Owner: allies,soviet Hotkey: e Valued: Cost: 1400 @@ -804,7 +799,6 @@ SILO: Queue: Building BuildPaletteOrder: 60 Prerequisites: proc - Owner: allies,soviet Hotkey: o Valued: Cost: 150 @@ -835,8 +829,7 @@ HPAD: Buildable: Queue: Building BuildPaletteOrder: 90 - Prerequisites: dome - Owner: allies + Prerequisites: dome, ~structures.allies Hotkey: i Valued: Cost: 500 @@ -871,8 +864,7 @@ AFLD: Buildable: Queue: Building BuildPaletteOrder: 90 - Prerequisites: dome - Owner: soviet + Prerequisites: dome, ~structures.soviet Hotkey: i Valued: Cost: 500 @@ -922,7 +914,6 @@ POWR: Buildable: Queue: Building BuildPaletteOrder: 0 - Owner: allies,soviet Hotkey: p Valued: Cost: 300 @@ -951,7 +942,6 @@ APWR: Queue: Building BuildPaletteOrder: 20 Prerequisites: dome - Owner: allies,soviet Hotkey: l Valued: Cost: 500 @@ -979,8 +969,7 @@ STEK: Buildable: Queue: Building BuildPaletteOrder: 100 - Prerequisites: weap,dome - Owner: soviet + Prerequisites: weap, dome, ~structures.soviet Hotkey: t Valued: Cost: 1500 @@ -1007,8 +996,7 @@ BARR: Buildable: Queue: Building BuildPaletteOrder: 30 - Prerequisites: anypower - Owner: soviet + Prerequisites: anypower, ~structures.soviet Hotkey: b Valued: Cost: 400 @@ -1044,8 +1032,7 @@ TENT: Buildable: Queue: Building BuildPaletteOrder: 30 - Prerequisites: anypower - Owner: allies + Prerequisites: anypower, ~structures.allies Hotkey: b Valued: Cost: 400 @@ -1099,7 +1086,6 @@ FIX: Queue: Building BuildPaletteOrder: 40 Prerequisites: weap - Owner: allies,soviet Hotkey: m Valued: Cost: 1200 @@ -1131,9 +1117,8 @@ FACF: Cost: 50 Buildable: BuildPaletteOrder: 900 - Owner: None - Hotkey: c Queue: Defense + Prerequisites: ~disabled Tooltip: Icon: fake-icon Name: Fake Construction Yard @@ -1160,9 +1145,7 @@ WEAF: Cost: 50 Buildable: BuildPaletteOrder: 900 - Prerequisites: proc - Owner: None - Hotkey: x + Prerequisites: ~disabled Queue: Defense Tooltip: Icon: fake-icon @@ -1191,10 +1174,8 @@ SYRF: Cost: 50 Buildable: BuildPaletteOrder: 900 - Prerequisites: anypower - Owner: None - Hotkey: z Queue: Defense + Prerequisites: ~disabled Tooltip: Icon: fake-icon Name: Fake Shipyard @@ -1225,10 +1206,8 @@ SPEF: TargetTypes: Ground, Water Buildable: BuildPaletteOrder: 900 - Prerequisites: anypower - Owner: None - Hotkey: z Queue: Defense + Prerequisites: ~disabled Tooltip: Icon: fake-icon Name: Fake Sub Pen @@ -1259,10 +1238,8 @@ DOMF: Description: Looks like a Radar Dome. Buildable: BuildPaletteOrder: 900 - Prerequisites: proc - Owner: None - Hotkey: v Queue: Defense + Prerequisites: ~disabled Building: Power: -2 Footprint: xx xx @@ -1283,8 +1260,7 @@ SBAG: Buildable: Queue: Defense BuildPaletteOrder: 1000 - Prerequisites: fact - Owner: allies + Prerequisites: fact, ~structures.allies Hotkey: b Valued: Cost: 25 @@ -1310,8 +1286,7 @@ FENC: Buildable: Queue: Defense BuildPaletteOrder: 1000 - Prerequisites: fact - Owner: soviet + Prerequisites: fact, ~structures.soviet Hotkey: n Valued: Cost: 25 @@ -1338,7 +1313,6 @@ BRIK: Queue: Defense BuildPaletteOrder: 1000 Prerequisites: fact - Owner: allies,soviet Hotkey: w Valued: Cost: 100 @@ -1390,11 +1364,6 @@ BARRACKS: Name: Infantry Production Description: Infantry Production -VEHICLEPRODUCTION: - Tooltip: - Name: Vehicle Production - Description: Vehicle Production - TECHCENTER: Tooltip: Name: Tech Center diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml index e21411aac0..dea9dc837e 100644 --- a/mods/ra/rules/vehicles.yaml +++ b/mods/ra/rules/vehicles.yaml @@ -3,8 +3,7 @@ V2RL: Buildable: Queue: Vehicle BuildPaletteOrder: 40 - Prerequisites: dome - Owner: soviet + Prerequisites: dome, ~vehicles.soviet Hotkey: v Valued: Cost: 900 @@ -33,7 +32,7 @@ V2RL: Buildable: Queue: Vehicle BuildPaletteOrder: 40 - Owner: allies + Prerequisites: ~vehicles.allies Hotkey: l Valued: Cost: 700 @@ -72,8 +71,7 @@ V2RL: Buildable: Queue: Vehicle BuildPaletteOrder: 60 - Prerequisites: fix - Owner: allies + Prerequisites: fix, ~vehicles.allies Hotkey: m Valued: Cost: 850 @@ -115,8 +113,7 @@ V2RL: Buildable: Queue: Vehicle BuildPaletteOrder: 40 - Prerequisites: fix - Owner: soviet + Prerequisites: fix, ~vehicles.soviet Hotkey: h Valued: Cost: 1150 @@ -158,8 +155,7 @@ V2RL: Buildable: Queue: Vehicle BuildPaletteOrder: 100 - Prerequisites: fix,stek - Owner: soviet + Prerequisites: fix, stek, ~vehicles.soviet Hotkey: m Valued: Cost: 2000 @@ -215,8 +211,7 @@ ARTY: Buildable: Queue: Vehicle BuildPaletteOrder: 80 - Prerequisites: dome - Owner: allies + Prerequisites: dome, ~vehicles.allies Hotkey: r Valued: Cost: 800 @@ -250,7 +245,6 @@ HARV: Queue: Vehicle BuildPaletteOrder: 10 Prerequisites: proc - Owner: allies,soviet Hotkey: e Valued: Cost: 1100 @@ -294,7 +288,6 @@ MCV: Queue: Vehicle BuildPaletteOrder: 110 Prerequisites: fix - Owner: allies,soviet Hotkey: b CustomBuildTimeValue: Value: 2000 @@ -335,7 +328,7 @@ JEEP: Buildable: Queue: Vehicle BuildPaletteOrder: 30 - Owner: allies + Prerequisites: ~vehicles.allies Hotkey: n Valued: Cost: 500 @@ -375,8 +368,8 @@ APC: Buildable: Queue: Vehicle BuildPaletteOrder: 50 - Owner: soviet Hotkey: c + Prerequisites: ~vehicles.soviet Valued: Cost: 850 Tooltip: @@ -411,8 +404,7 @@ MNLY.AP: Buildable: Queue: Vehicle BuildPaletteOrder: 30 - Prerequisites: fix - Owner: soviet + Prerequisites: fix, ~vehicles.soviet Hotkey: i Valued: Cost: 800 @@ -446,8 +438,7 @@ MNLY.AT: Buildable: Queue: Vehicle BuildPaletteOrder: 30 - Prerequisites: fix - Owner: allies + Prerequisites: fix, ~vehicles.allies Hotkey: i Valued: Cost: 800 @@ -482,7 +473,6 @@ TRUK: Queue: Vehicle BuildPaletteOrder: 120 Prerequisites: weap - Owner: allies, soviet Hotkey: u Valued: Cost: 500 @@ -509,8 +499,7 @@ MGG: Buildable: Queue: Vehicle BuildPaletteOrder: 160 - Prerequisites: atek - Owner: allies + Prerequisites: atek, ~vehicles.allies Hotkey: y Valued: Cost: 1200 @@ -548,8 +537,7 @@ MRJ: Buildable: Queue: Vehicle BuildPaletteOrder: 150 - Prerequisites: atek - Owner: allies + Prerequisites: atek, ~vehicles.allies Hotkey: k Health: HP: 220 @@ -580,8 +568,7 @@ TTNK: Buildable: Queue: Vehicle BuildPaletteOrder: 130 - Prerequisites: tsla,stek - Owner: soviet + Prerequisites: tsla, stek, ~vehicles.soviet Hotkey: t Valued: Cost: 1350 @@ -616,8 +603,8 @@ FTRK: Buildable: Queue: Vehicle BuildPaletteOrder: 30 - Owner: soviet Hotkey: k + Prerequisites: ~vehicles.soviet Valued: Cost: 600 Tooltip: @@ -656,8 +643,7 @@ DTRK: Buildable: Queue: Vehicle BuildPaletteOrder: 140 - Prerequisites: stek - Owner: soviet + Prerequisites: stek, ~vehicles.soviet Hotkey: o Valued: Cost: 2500 @@ -686,8 +672,7 @@ CTNK: Buildable: Queue: Vehicle BuildPaletteOrder: 140 - Prerequisites: atek,pdox - Owner: allies + Prerequisites: atek, pdox, ~vehicles.allies Hotkey: j Valued: Cost: 1350 @@ -726,8 +711,7 @@ QTNK: Buildable: Queue: Vehicle BuildPaletteOrder: 150 - Prerequisites: fix,stek - Owner: soviet + Prerequisites: fix, stek, ~vehicles.soviet Hotkey: q Valued: Cost: 2500 @@ -758,8 +742,7 @@ STNK: Buildable: Queue: Vehicle BuildPaletteOrder: 170 - Prerequisites: atek - Owner: allies + Prerequisites: atek, ~vehicles.allies Hotkey: p Valued: Cost: 1350