diff --git a/OpenRA.Mods.RA/Buildable.cs b/OpenRA.Mods.RA/Buildable.cs index a7b50097b3..ff3e2a5a74 100755 --- a/OpenRA.Mods.RA/Buildable.cs +++ b/OpenRA.Mods.RA/Buildable.cs @@ -15,9 +15,6 @@ namespace OpenRA.Mods.RA public class BuildableInfo : TraitInfo { public readonly string[] Prerequisites = { }; - [ActorReference] - public readonly string[] BuiltAt = { }; - public readonly string[] Owner = { }; public readonly string Queue; diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index 92234e33fb..98d683c365 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/mods/cnc/rules/aircraft.yaml @@ -9,7 +9,6 @@ TRAN: Buildable: BuildPaletteOrder: 10 Prerequisites: hpad - BuiltAt: hpad Owner: gdi,nod Selectable: Bounds: 41,41 @@ -53,7 +52,6 @@ HELI: Buildable: BuildPaletteOrder: 20 Prerequisites: hpad, anyhq - BuiltAt: hpad Owner: nod Selectable: Bounds: 30,24 @@ -104,7 +102,6 @@ ORCA: Buildable: BuildPaletteOrder: 20 Prerequisites: hpad, anyhq - BuiltAt: hpad Owner: gdi Selectable: Bounds: 30,24 diff --git a/mods/d2k/rules/atreides.yaml b/mods/d2k/rules/atreides.yaml index f470788e63..d62f871944 100644 --- a/mods/d2k/rules/atreides.yaml +++ b/mods/d2k/rules/atreides.yaml @@ -77,7 +77,6 @@ MCVA: Inherits: ^MCV Buildable: Owner: atreides - BuiltAt: heavya Transforms: Facing: 16 IntoActor: conyarda @@ -90,7 +89,6 @@ MCVA.starport: Inherits: MCVA Buildable: Queue: Starport - BuiltAt: starporta Valued: Cost: 2500 @@ -98,7 +96,6 @@ TRIKEA: Inherits: ^TRIKE Buildable: Owner: atreides, harkonnen - BuiltAt: lighta, lighth RenderUnit: Image: TRIKE @@ -107,7 +104,6 @@ TRIKEA.starport: Buildable: Owner: atreides, harkonnen, ordos Queue: Starport - BuiltAt: starporta, starporth, starporto Valued: Cost: 315 @@ -127,7 +123,6 @@ COMBATA: Icon: combataicon Buildable: Owner: atreides - BuiltAt: heavya RevealsShroud: Range: 8 Turreted: @@ -155,7 +150,6 @@ COMBATA.starport: Inherits: COMBATA Buildable: Queue: Starport - BuiltAt: starporta Valued: Cost: 875 @@ -166,7 +160,6 @@ SONICTANK: BuildPaletteOrder: 100 Prerequisites: heavya,research Owner: atreides - BuiltAt: heavya Hotkey: o Valued: Cost: 1250 diff --git a/mods/d2k/rules/harkonnen.yaml b/mods/d2k/rules/harkonnen.yaml index 3438615f23..0bc3b78092 100644 --- a/mods/d2k/rules/harkonnen.yaml +++ b/mods/d2k/rules/harkonnen.yaml @@ -82,7 +82,6 @@ MCVH: Inherits: ^MCV Buildable: Owner: harkonnen - BuiltAt: heavyh Transforms: Facing: 16 IntoActor: conyardh @@ -95,7 +94,6 @@ MCVH.starport: Inherits: MCVH Buildable: Queue: Starport - BuiltAt: starporth Valued: Cost: 2500 @@ -103,7 +101,6 @@ MCVH.starport: # Inherits: ^TRIKE # Buildable: # Owner: harkonnen -# BuiltAt: lighth # Valued: # Cost: 250 # Tooltip: @@ -127,7 +124,6 @@ MCVH.starport: # Buildable: # Owner: harkonnen # Queue: Starport -# BuiltAt: starporth # Valued: # Cost: 149 # RenderUnit: @@ -155,7 +151,6 @@ COMBATH: Icon: combathicon Buildable: Owner: harkonnen - BuiltAt: heavyh Mobile: Speed: 5 ROT: 4 @@ -180,7 +175,6 @@ COMBATH.starport: Inherits: COMBATH Buildable: Queue: Starport - BuiltAt: starporth Valued: Cost: 875 @@ -191,7 +185,6 @@ DEVAST: BuildPaletteOrder: 100 Prerequisites: Ix Owner: harkonnen - BuiltAt: heavyh Hotkey: d Valued: Cost: 1200 diff --git a/mods/d2k/rules/ordos.yaml b/mods/d2k/rules/ordos.yaml index f03cf78b55..f3c40c0a16 100644 --- a/mods/d2k/rules/ordos.yaml +++ b/mods/d2k/rules/ordos.yaml @@ -76,7 +76,6 @@ MCVO: Inherits: ^MCV Buildable: Owner: ordos - BuiltAt: heavyo Transforms: Facing: 16 IntoActor: conyardo @@ -89,7 +88,6 @@ MCVO.starport: Inherits: MCVO Buildable: Queue: Starport - BuiltAt: starporto Valued: Cost: 2500 @@ -99,7 +97,6 @@ COMBATO: Icon: combatoicon Buildable: Owner: ordos - BuiltAt: heavyo RevealsShroud: Range: 8 Turreted: @@ -125,7 +122,6 @@ COMBATO.starport: Inherits: COMBATO Buildable: Queue: Starport - BuiltAt: starporto Valued: Cost: 875 @@ -133,7 +129,6 @@ TRIKEO: Inherits: ^TRIKE Buildable: Owner: ordos - BuiltAt: lighto Valued: Cost: 300 Tooltip: @@ -157,7 +152,6 @@ STEALTHTRIKE: Buildable: Prerequisites: Hitech Owner: ordos - BuiltAt: lighto BuildPaletteOrder: 30 Valued: Cost: 400 @@ -189,7 +183,6 @@ STEALTHTRIKE: # Buildable: # Queue: Starport # Owner: ordos -# BuiltAt: starporto # RenderUnit: # Image: TRIKE # Valued: @@ -218,7 +211,6 @@ DEVIATORTANK: BuildPaletteOrder: 50 Prerequisites: heavyo,research # Owner: ordos - BuiltAt: heavyo Hotkey: d Mobile: ROT: 3 diff --git a/mods/d2k/rules/vehicles.yaml b/mods/d2k/rules/vehicles.yaml index a7135c8e1c..e36fb7a29e 100644 --- a/mods/d2k/rules/vehicles.yaml +++ b/mods/d2k/rules/vehicles.yaml @@ -50,7 +50,6 @@ HARVESTER: Queue: Armor Prerequisites: Heavy,Refinery Owner: atreides, harkonnen, ordos - BuiltAt: heavya, heavyh, heavyo BuildPaletteOrder: 10 Hotkey: h Valued: @@ -104,7 +103,6 @@ HARVESTER.starport: Buildable: Prerequisites: Starport Queue: Starport - BuiltAt: starporta, starporth, starporto Valued: Cost: 1500 @@ -153,7 +151,6 @@ QUAD: Queue: Vehicle Prerequisites: Light,Outpost Owner: atreides, ordos - BuiltAt: lighta, lighto BuildPaletteOrder: 20 Hotkey: q Valued: @@ -189,7 +186,6 @@ QUAD.starport: Buildable: Prerequisites: Starport Queue: Starport - BuiltAt: starporta, starporth, starporto Valued: Cost: 500 @@ -245,7 +241,6 @@ SIEGETANK: Queue: Armor Prerequisites: Outpost Owner: atreides, harkonnen, ordos - BuiltAt: heavya, heavyh, heavyo BuildPaletteOrder: 50 Hotkey: t Valued: @@ -299,7 +294,6 @@ SIEGETANK.starport: Inherits: SIEGETANK Buildable: Queue: Starport - BuiltAt: starporta, starporth, starporto Valued: Cost: 1075 @@ -315,7 +309,6 @@ MISSILETANK: Queue: Armor Prerequisites: Hitech Owner: atreides, harkonnen, ordos - BuiltAt: heavya, heavyh BuildPaletteOrder: 60 Hotkey: r Mobile: @@ -357,6 +350,5 @@ MISSILETANK.starport: Prerequisites: Hitech Queue: Starport Owner: atreides, harkonnen, ordos - BuiltAt: starporta, starporth, starporto Valued: Cost: 1250 diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml index ac6678f750..f0986f1599 100644 --- a/mods/ra/rules/aircraft.yaml +++ b/mods/ra/rules/aircraft.yaml @@ -77,7 +77,6 @@ MIG: Queue: Plane BuildPaletteOrder: 100 Prerequisites: afld, stek - BuiltAt: afld Owner: soviet Hotkey: m Valued: @@ -127,7 +126,6 @@ YAK: Queue: Plane BuildPaletteOrder: 50 Prerequisites: afld - BuiltAt: afld Owner: soviet Hotkey: y Valued: @@ -178,7 +176,6 @@ TRAN: Queue: Plane BuildPaletteOrder: 110 Prerequisites: hpad - BuiltAt: hpad Owner: allies Hotkey: t Valued: @@ -233,7 +230,6 @@ HELI: Queue: Plane BuildPaletteOrder: 90 Prerequisites: hpad, atek - BuiltAt: hpad Owner: allies Hotkey: l Valued: @@ -279,7 +275,6 @@ HIND: Queue: Plane BuildPaletteOrder: 90 Prerequisites: hpad - BuiltAt: hpad Owner: allies Hotkey: h Valued: diff --git a/mods/ra/rules/ships.yaml b/mods/ra/rules/ships.yaml index 6a0e1cc4ad..347e014d10 100644 --- a/mods/ra/rules/ships.yaml +++ b/mods/ra/rules/ships.yaml @@ -4,7 +4,6 @@ SS: Queue: Ship BuildPaletteOrder: 50 Prerequisites: spen - BuiltAt: spen Owner: soviet Hotkey: u Valued: @@ -52,7 +51,6 @@ MSUB: Queue: Ship BuildPaletteOrder: 60 Prerequisites: spen,stek - BuiltAt: spen Owner: soviet Hotkey: m Valued: @@ -99,7 +97,6 @@ DD: Queue: Ship BuildPaletteOrder: 70 Prerequisites: syrd,dome - BuiltAt: syrd Owner: allies Hotkey: r Valued: @@ -146,7 +143,6 @@ CA: Queue: Ship BuildPaletteOrder: 100 Prerequisites: syrd,atek - BuiltAt: syrd Owner: allies Hotkey: c Valued: @@ -233,7 +229,6 @@ PT: Queue: Ship BuildPaletteOrder: 50 Prerequisites: syrd - BuiltAt: syrd Owner: allies Hotkey: b Valued: