ra Category fixes

mods/ra/defaults.yaml

@@ -1,5 +1,4 @@
 ^Vehicle:
-	Category: Vehicle
 	AppearsOnRadar:
 	Mobile:
 		Crushes: atmine, crate
@@ -10,6 +9,8 @@
 		Voice: VehicleVoice
 	Targetable:
 		TargetTypes: Ground
+	Buildable:
+		Queue: Vehicle
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
@@ -23,7 +24,6 @@
 		Notification: unitlst1.aud
 
 ^Tank:
-	Category: Vehicle
 	AppearsOnRadar:
 	Mobile:
 		Crushes: wall, atmine, crate
@@ -34,6 +34,8 @@
 		Voice: VehicleVoice
 	Targetable:
 		TargetTypes: Ground
+	Buildable:
+		Queue: Vehicle
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
@@ -47,7 +49,6 @@
 		Notification: unitlst1.aud
 
 ^Infantry:
-	Category: Infantry
 	AppearsOnRadar:
 	Health:
 		Armor: none
@@ -61,6 +62,8 @@
 		Voice: GenericVoice
 	Targetable:
 		TargetTypes: Ground
+	Buildable:
+		Queue: Infantry
 	RenderInfantry:
 	AutoTarget:
 	Passenger:
@@ -74,7 +77,6 @@
 		Notification: unitlst1.aud
 
 ^Ship:
-	Category: Ship
 	AppearsOnRadar:
 	Mobile:
 		Crushes: crate
@@ -84,6 +86,8 @@
 		Voice: ShipVoice
 	Targetable:
 		TargetTypes: Ground, Water
+	Buildable:
+		Queue: Ship
 	DetectCloaked:
 		Range: 3
 	HiddenUnderFog:
@@ -94,7 +98,6 @@
 		Notification: navylst1.aud
 
 ^Plane:
-	Category: Plane
 	AppearsOnRadar:
 	Selectable:
 		Voice: GenericVoice
@@ -108,7 +111,6 @@
 		Notification: aunitl1.aud
 
 ^Building:
-	Category: Building
 	AppearsOnRadar:
 	Selectable:
 		Priority: 3
@@ -121,6 +123,8 @@
 	RepairableBuilding:
 	EmitInfantryOnSell:
 		ActorTypes: e1,e1,e1,c1,c2,e6
+	Buildable:
+		Queue: Building
 	MustBeDestroyed:
 	GivesExperience:
 	FrozenUnderFog:
@@ -128,7 +132,6 @@
 		Notification: strucap1.aud
 
 ^Wall:
-	Category: Building
 	AppearsOnRadar:
 	Building:
 		Dimensions: 1,1
@@ -154,6 +157,7 @@
 
 ^CivBuilding:
 	Inherits: ^Building
+	-Buildable:
 	-RepairableBuilding:
 	Health:
 		HP: 400
@@ -168,7 +172,6 @@
 		Description: Field
 
 ^Tree:
-	Category: Building
 	Valued:
 		Description: Tree
 	RenderBuilding:
@@ -181,7 +184,6 @@
 		Terrain: Tree
 
 ^Husk:
-	Category: Vehicle
 	Health:
 		HP: 140
 		Armor: Heavy
@@ -193,7 +195,6 @@
 	Burns:
 
 ^Bridge:
-	Category: Building
 	Valued:
 		Description: Bridge
 	BelowUnits:

mods/ra/structures.yaml

@@ -1,10 +1,10 @@
 MSLO:
-	Category: Defense
 	NukeSilo:
 		MissileWeapon: atomic
 		SpawnOffset: 10,0
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 130
 		Prerequisites: @Tech Center
 		Owner: soviet,allies
@@ -24,7 +24,6 @@ MSLO:
 	IronCurtainable:
 	
 GAP:
-	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
@@ -126,11 +125,11 @@ SYRD:
 	RallyPoint:
 
 IRON:
-	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 120
 		Prerequisites: stek
 		Owner: soviet
@@ -153,11 +152,11 @@ IRON:
 	IronCurtain:
 
 PDOX:
-	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 120
 		Prerequisites: atek
 		Owner: allies
@@ -182,11 +181,11 @@ PDOX:
 	IronCurtainable:
 
 TSLA:
-	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 70
 		Prerequisites: weap
 		Owner: soviet
@@ -213,11 +212,11 @@ TSLA:
 	RenderRangeCircle:
 
 AGUN:
-	Category: Defense
 	RequiresPower:
 	CanPowerDown:
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 50
 		Prerequisites: dome
 		Owner: allies
@@ -273,9 +272,9 @@ DOME:
 	IronCurtainable:
 
 PBOX:
-	Category: Defense
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 20
 		Prerequisites: tent
 		Owner: allies
@@ -297,9 +296,9 @@ PBOX:
 	RenderRangeCircle:
 
 HBOX:
-	Category: Defense
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 30
 		Prerequisites: tent
 		Owner: allies
@@ -321,9 +320,9 @@ HBOX:
 	RenderRangeCircle:
 
 GUN:
-	Category: Defense
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 40
 		Prerequisites: tent
 		Owner: allies
@@ -350,9 +349,9 @@ GUN:
 	RenderRangeCircle:
 
 FTUR:
-	Category: Defense
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 20
 		Prerequisites: barr
 		Owner: soviet
@@ -375,9 +374,9 @@ FTUR:
 	RenderRangeCircle:
 
 SAM:
-	Category: Defense
 	Inherits: ^Building
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 90
 		Prerequisites: dome
 		Owner: soviet
@@ -462,6 +461,7 @@ WEAP:
 
 FACT:
 	Inherits: ^Building
+	-Buildable:
 	Building:
 		Power: 0
 		Footprint: xxx xxx xxx
@@ -927,9 +927,9 @@ DOMF:
 	-EmitInfantryOnSell:
 
 SBAG:
-	Category: Defense
 	Inherits: ^Wall
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 1000
 		Prerequisites: fact
 		Owner: allies
@@ -942,9 +942,9 @@ SBAG:
 		Armor: none
 
 FENC:
-	Category: Defense
 	Inherits: ^Wall
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 1000
 		Prerequisites: fact
 		Owner: soviet
@@ -957,9 +957,9 @@ FENC:
 		Armor: none
 
 BRIK:
-	Category: Defense
 	Inherits: ^Wall
 	Buildable:
+		Queue: Defense
 		BuildPaletteOrder: 1000
 		Prerequisites: fact
 		Owner: allies,soviet

mods/ra/system.yaml

@@ -191,7 +191,6 @@ MINP:
 	RenderUnit:
 	BelowUnits:
 	InvisibleToOthers:
-	Category: Building
 
 MINV:
 	Mine:
@@ -203,7 +202,6 @@ MINV:
 	RenderUnit:
 	BelowUnits:
 	InvisibleToOthers:
-	Category: Building
 
 CRATE:
 	Valued:

mods/ra/vehicles.yaml

@@ -564,6 +564,7 @@ PT:
 MIG:
 	Inherits: ^Plane
 	Buildable:
+		Queue: Plane
 		BuildPaletteOrder: 100
 		Prerequisites: afld
 		BuiltAt: afld
@@ -596,6 +597,7 @@ MIG:
 YAK:
 	Inherits: ^Plane
 	Buildable:
+		Queue: Plane
 		BuildPaletteOrder: 50
 		Prerequisites: afld
 		BuiltAt: afld
@@ -627,6 +629,7 @@ YAK:
 TRAN:
 	Inherits: ^Plane
 	Buildable:
+		Queue: Plane
 		BuildPaletteOrder: 110
 		Prerequisites: hpad
 		BuiltAt: hpad
@@ -656,6 +659,7 @@ TRAN:
 HELI:
 	Inherits: ^Plane
 	Buildable:
+		Queue: Plane
 		BuildPaletteOrder: 90
 		Prerequisites: hpad
 		BuiltAt: hpad
@@ -689,6 +693,7 @@ HELI:
 HIND:
 	Inherits: ^Plane
 	Buildable:
+		Queue: Plane
 		BuildPaletteOrder: 90
 		Prerequisites: hpad
 		BuiltAt: hpad