ra buildable/tooltip/valued fixes

2010-08-28 00:34:14 +12:00
parent d4aeb157cc
commit 29d03fb133
7 changed files with 395 additions and 215 deletions
--- a/mods/ra/civilian.yaml
+++ b/mods/ra/civilian.yaml
@@ -17,8 +17,8 @@ V01:
 	Building:
 		Footprint: xx xx
 		Dimensions: 2,2
-	Valued:
-		Description: Church
+	Tooltip:
+		Name: Church
 V02:
 	Inherits: ^CivBuilding
 	Building:
@@ -99,8 +99,8 @@ BARL:
 	Health:
 		HP: 10
 	Explodes:
-	Valued:
-		Description: Explosive Barrel
+	Tooltip:
+		Name: Explosive Barrel

 BRL3:
 	Inherits: ^Building
@@ -113,8 +113,8 @@ BRL3:
 	Health:
 		HP: 10
 	Explodes:
-	Valued:
-		Description: Explosive Barrel
+	Tooltip:
+		Name: Explosive Barrel

 MISS:
 	Inherits: ^CivBuilding
--- a/mods/ra/defaults.yaml
+++ b/mods/ra/defaults.yaml
@@ -9,8 +9,6 @@
 		Voice: VehicleVoice
 	Targetable:
 		TargetTypes: Ground
-	Buildable:
-		Queue: Vehicle
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
@@ -34,8 +32,6 @@
 		Voice: VehicleVoice
 	Targetable:
 		TargetTypes: Ground
-	Buildable:
-		Queue: Vehicle
 	Repairable: 
 	Chronoshiftable: 
 	Passenger: 
@@ -62,8 +58,6 @@
 		Voice: GenericVoice
 	Targetable:
 		TargetTypes: Ground
-	Buildable:
-		Queue: Infantry
 	RenderInfantry:
 	AutoTarget:
 	Passenger:
@@ -86,8 +80,6 @@
 		Voice: ShipVoice
 	Targetable:
 		TargetTypes: Ground, Water
-	Buildable:
-		Queue: Ship
 	DetectCloaked:
 		Range: 3
 	HiddenUnderFog:
@@ -123,8 +115,6 @@
 	RepairableBuilding:
 	EmitInfantryOnSell:
 		ActorTypes: e1,e1,e1,c1,c2,e6
-	Buildable:
-		Queue: Building
 	MustBeDestroyed:
 	GivesExperience:
 	FrozenUnderFog:
@@ -157,23 +147,22 @@

 ^CivBuilding:
 	Inherits: ^Building
-	-Buildable:
 	-RepairableBuilding:
 	Health:
 		HP: 400
 		Armor: wood
-	Valued:
-		Description: Civilian Building
+	Tooltip:
+		Name: Civilian Building

 ^CivField:
 	Inherits: ^CivBuilding
 	-Selectable:
-	Valued:
-		Description: Field
+	Tooltip:
+		Name: Field

 ^Tree:
-	Valued:
-		Description: Tree
+	Tooltip:
+		Name: Tree
 	RenderBuilding:
 		Palette: terrain
 	Building:
@@ -195,8 +184,8 @@
 	Burns:

 ^Bridge:
-	Valued:
-		Description: Bridge
+	Tooltip:
+		Name: Bridge
 	BelowUnits:
 	Targetable:
 		TargetTypes: Ground, Water
--- a/mods/ra/infantry.yaml
+++ b/mods/ra/infantry.yaml
@@ -1,13 +1,16 @@
 DOG:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 30
 		Prerequisites: kenn
 		BuiltAt: KENN
 		Owner: soviet
+	Valued:
 		Cost: 200
-		Description: Attack Dog
-		LongDesc: Anti-infantry unit. Not fooled by the \nSpy's disguise.\n  Strong vs Infantry\n  Weak vs Vehicles
+	Tooltip:
+		Name: Attack Dog
+		Description: Anti-infantry unit. Not fooled by the \nSpy's disguise.\n  Strong vs Infantry\n  Weak vs Vehicles
 	Selectable:
 		Voice: DogVoice
 		Bounds: 12,17,-1,-4
@@ -24,13 +27,16 @@ DOG:
 E1:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 10
 		Prerequisites: @Barracks
 		Owner: allies,soviet
-		Cost: 100
-		Description: Rifle Infantry
-		LongDesc: General-purpose infantry.\n  Strong vs Infantry\n  Weak vs Vehicles
 		BuiltAt: barr,tent
+	Valued:
+		Cost: 100
+	Tooltip:
+		Name: Rifle Infantry
+		Description: General-purpose infantry.\n  Strong vs Infantry\n  Weak vs Vehicles
 	Selectable:
 		Bounds: 12,17,0,-9
 	Health:
@@ -44,13 +50,16 @@ E1:
 E2:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 10
 		Owner: soviet
-		Cost: 160
-		Description: Grenadier
-		LongDesc: Infantry armed with grenades. \n  Strong vs Buildings, Infantry\n  Weak vs Vehicles
 		Prerequisites: barr
 		BuiltAt: barr
+	Valued:
+		Cost: 160
+	Tooltip:
+		Name: Grenadier
+		Description: Infantry armed with grenades. \n  Strong vs Buildings, Infantry\n  Weak vs Vehicles
 	Selectable:
 		Bounds: 12,17,0,-9
 	Health:
@@ -66,13 +75,16 @@ E2:
 E3:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 20
 		Owner: allies,soviet
-		Cost: 300
-		Description: Rocket Soldier
-		LongDesc: Anti-tank/Anti-aircraft infantry.\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry
 		Prerequisites: @Barracks
 		BuiltAt: barr,tent
+	Valued:
+		Cost: 300
+	Tooltip:
+		Name: Rocket Soldier
+		Description: Anti-tank/Anti-aircraft infantry.\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry
 	Selectable:
 		Bounds: 12,17,0,-9
 	Health:
@@ -88,13 +100,16 @@ E3:
 E4:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 60
 		Prerequisites: stek, @Barracks
 		Owner: soviet
-		Cost: 300
-		Description: Flamethrower
-		LongDesc: Advanced Anti-infantry unit.\n  Strong vs Infantry, Buildings\n  Weak vs Vehicles
 		BuiltAt: barr,tent
+	Valued:
+		Cost: 300
+	Tooltip:
+		Name: Flamethrower
+		Description: Advanced Anti-infantry unit.\n  Strong vs Infantry, Buildings\n  Weak vs Vehicles
 	Selectable:
 		Bounds: 12,17,0,-9
 	Health:
@@ -110,13 +125,16 @@ E4:
 E6:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 50
 		Owner: soviet,allies
-		Cost: 500
-		Description: Engineer
-		LongDesc: Infiltrates and captures enemy structures.\n  Strong vs Nothing\n  Weak vs Everything
 		Prerequisites: @Barracks
 		BuiltAt: barr,tent
+	Valued:
+		Cost: 500
+	Tooltip:
+		Name: Engineer
+		Description: Infiltrates and captures enemy structures.\n  Strong vs Nothing\n  Weak vs Everything
 	Selectable:
 		Voice: EngineerVoice
 		Bounds: 12,17,0,-9
@@ -134,13 +152,16 @@ E6:
 SPY:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 60
 		Prerequisites: dome, tent
 		Owner: allies
-		Cost: 500
-		Description: Spy
-		LongDesc: Infiltrates enemy structures to gather \nintelligence. Exact effect depends on the \nbuilding infiltrated.\n  Strong vs Nothing\n  Weak vs Everything\n  Special Ability: Disguised
 		BuiltAt: tent
+	Valued:
+		Cost: 500
+	Tooltip:
+		Name: Spy
+		Description: Infiltrates enemy structures to gather \nintelligence. Exact effect depends on the \nbuilding infiltrated.\n  Strong vs Nothing\n  Weak vs Everything\n  Special Ability: Disguised
 	Selectable:
 		Voice: SpyVoice
 		Bounds: 12,17,0,-9
@@ -161,13 +182,16 @@ SPY:
 E7:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 110
 		Prerequisites: @Tech Center, @Barracks
 		Owner: allies,soviet
-		Cost: 1200
-		Description: Tanya
-		LongDesc: Elite commando infantry, armed with \ndual pistols and C4.\n  Strong vs Infantry, Buildings\n  Weak vs Vehicles\n  Special Ability: Destroy Building with C4
 		BuiltAt: barr,tent
+	Valued:
+		Cost: 1200
+	Tooltip:
+		Name: Tanya
+		Description: Elite commando infantry, armed with \ndual pistols and C4.\n  Strong vs Infantry, Buildings\n  Weak vs Vehicles\n  Special Ability: Destroy Building with C4
 	Selectable:
 		Voice: TanyaVoice
 		Bounds: 12,17,0,-9
@@ -187,13 +211,16 @@ E7:
 MEDI:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		BuildPaletteOrder: 20
 		Owner: allies
-		Cost: 800
-		Description: Medic
-		LongDesc: Heals nearby infantry.\n  Strong vs Nothing\n  Weak vs Everything
 		Prerequisites: tent
 		BuiltAt: tent
+	Valued:
+		Cost: 800
+	Tooltip:
+		Name: Medic
+		Description: Heals nearby infantry.\n  Strong vs Nothing\n  Weak vs Everything
 	Selectable:
 		Voice: MedicVoice
 		Bounds: 12,17,0,-9
@@ -218,7 +245,8 @@ C1:
 		Bounds: 12,17,0,-9
 	Valued:
 		Cost: 70
-		Description: Technician
+	Tooltip:
+		Name: Technician
 	Health:
 		HP: 20
 	Mobile:
@@ -235,7 +263,8 @@ C2:
 		Bounds: 12,17,0,-9
 	Valued:
 		Cost: 70
-		Description: Technician
+	Tooltip:
+		Name: Technician
 	Health:
 		HP: 20
 	Mobile:
@@ -248,10 +277,14 @@ C2:
 SHOK:
 	Inherits: ^Infantry
 	Buildable:
+		Queue: Infantry
 		Prerequisites: stek,tsla
 		Owner: soviet
+	Valued:
 		Cost: 900
-		Description: Tesla Trooper
+	Tooltip:
+		Name: Tesla Trooper
+		Description: TODO
 	Selectable:
 		Voice: ShokVoice
 		Bounds: 12,17,0,-9
--- a/mods/ra/structures.yaml
+++ b/mods/ra/structures.yaml
@@ -3,15 +3,16 @@ MSLO:
 		MissileWeapon: atomic
 		SpawnOffset: 10,0
 	Inherits: ^Building
+	Valued:
+		Cost: 2500
+	Tooltip:
+		Name: Missile Silo
+		Description: Launches a devastating nuclear strike.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks\n  Special Ability: Nuclear Missile
 	Buildable:
 		Queue: Defense
 		BuildPaletteOrder: 130
 		Prerequisites: @Tech Center
 		Owner: soviet,allies
-		Cost: 2500
-		Description: Missile Silo
-		LongDesc: Launches a devastating nuclear strike.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks\n  Special Ability: Nuclear Missile
-		Hotkey: m
 	Building:
 		Power: -100
 		Footprint: xx
@@ -29,14 +30,14 @@ GAP:
 	Inherits: ^Building
 	Valued:
 		Cost: 500
-		Description: Gap Generator
+	Tooltip:
+		Name: Gap Generator
+		Description: Regenerates the Fog of War nearby, \nobscuring the area.\n  Unarmed
 #	Buildable:
 #		BuildPaletteOrder: 100
 #		Prerequisites: atek
 #		Owner: allies
 #		Cost: 500
-#		Description: Gap Generator
-#		LongDesc: Regenerates the Fog of War nearby, \nobscuring the area.\n  Unarmed
 #		Hotkey: g
 	Building:
 		Power: -60
@@ -54,13 +55,16 @@ SPEN:
 	InfiltrateForSupportPower:
 		Power: SonarPulsePower
 	Inherits: ^Building
+	Valued:
+		Cost: 650
+	Tooltip:
+		Name: Sub Pen
+		Description: Produces and repairs submarines and \ntransports
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 30
 		Prerequisites: @Power Plant
 		Owner: soviet
-		Cost: 650
-		Description: Sub Pen
-		LongDesc: Produces and repairs submarines and \ntransports
 		Hotkey: s
 	Targetable:
 		TargetTypes: Ground, Water
@@ -92,13 +96,16 @@ SYRD:
 		Power: SonarPulsePower
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 40
 		Prerequisites: @Power Plant
 		Owner: allies
-		Cost: 650
-		Description: Shipyard
-		LongDesc: Produces and repairs ships
 		Hotkey: s
+	Valued:
+		Cost: 650
+	Tooltip:
+		Name: Shipyard
+		Description: Produces and repairs ships
 	Targetable:
 		TargetTypes: Ground, Water
 	Building:
@@ -133,10 +140,12 @@ IRON:
 		BuildPaletteOrder: 120
 		Prerequisites: stek
 		Owner: soviet
-		Cost: 1500
-		Description: Iron Curtain
-		LongDesc: Makes a group of units invulnerable for a \nshort time.\n  Special Ability: Invulnerability
 		Hotkey: c
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Iron Curtain
+		Description: Makes a group of units invulnerable for a \nshort time.\n  Special Ability: Invulnerability
 	Building:
 		Power: -200
 		Footprint: xx xx
@@ -160,10 +169,12 @@ PDOX:
 		BuildPaletteOrder: 120
 		Prerequisites: atek
 		Owner: allies
-		Cost: 1500
-		Description: Chronosphere
-		LongDesc: Teleports a unit from one place \nto another, for a limited time.\n  Special Ability: Chronoshift
 		Hotkey: o
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Chronosphere
+		Description: Teleports a unit from one place \nto another, for a limited time.\n  Special Ability: Chronoshift
 	Building:
 		Power: -200
 		Footprint: xx xx
@@ -189,10 +200,12 @@ TSLA:
 		BuildPaletteOrder: 70
 		Prerequisites: weap
 		Owner: soviet
-		Cost: 1500
-		Description: Tesla Coil
-		LongDesc: Advanced base defense. Requires power\nto operate.\n  Strong vs Tanks, Infantry\n  Weak vs Aircraft
 		Hotkey: t
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Tesla Coil
+		Description: Advanced base defense. Requires power\nto operate.\n  Strong vs Tanks, Infantry\n  Weak vs Aircraft
 	Building:
 		Power: -150
 		Footprint: _ x
@@ -220,10 +233,12 @@ AGUN:
 		BuildPaletteOrder: 50
 		Prerequisites: dome
 		Owner: allies
-		Cost: 600
-		Description: AA Gun
-		LongDesc: Anti-Air base defense.\n  Strong vs Aircraft\n  Weak vs Infantry, Tanks
 		Hotkey: a
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: AA Gun
+		Description: Anti-Air base defense.\n  Strong vs Aircraft\n  Weak vs Infantry, Tanks
 	Building:
 		Power: -50
 		Footprint: _ x
@@ -250,13 +265,16 @@ DOME:
 	CanPowerDown:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 60
 		Prerequisites: proc
 		Owner: allies,soviet
-		Cost: 1000
-		Description: Radar Dome
-		LongDesc: Provides an overview of the battlefield.\n  Requires power to operate.
 		Hotkey: r
+	Valued:
+		Cost: 1000
+	Tooltip:
+		Name: Radar Dome
+		Description: Provides an overview of the battlefield.\n  Requires power to operate.
 	Building:
 		Power: -40
 		Footprint: xx xx
@@ -278,10 +296,12 @@ PBOX:
 		BuildPaletteOrder: 20
 		Prerequisites: tent
 		Owner: allies
-		Cost: 400
-		Description: Pillbox
-		LongDesc: Basic defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
 		Hotkey: x
+	Valued:
+		Cost: 400
+	Tooltip:
+		Name: Pillbox
+		Description: Basic defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
 	Building:
 		Power: -15
 	Health:
@@ -302,10 +322,12 @@ HBOX:
 		BuildPaletteOrder: 30
 		Prerequisites: tent
 		Owner: allies
-		Cost: 600
-		Description: Camo Pillbox
-		LongDesc: Hidden defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
 		Hotkey: c
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: Camo Pillbox
+		Description: Hidden defensive structure.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
 	Building:
 		Power: -15
 	Health:
@@ -326,10 +348,12 @@ GUN:
 		BuildPaletteOrder: 40
 		Prerequisites: tent
 		Owner: allies
-		Cost: 600
-		Description: Turret
-		LongDesc: Anti-Armor base defense.\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft
 		Hotkey: t
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: Turret
+		Description: Anti-Armor base defense.\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft
 	Building:
 		Power: -40
 	Health:
@@ -355,10 +379,12 @@ FTUR:
 		BuildPaletteOrder: 20
 		Prerequisites: barr
 		Owner: soviet
-		Cost: 600
-		Description: Flame Turret
-		LongDesc: Anti-Infantry base defense.\n  Strong vs Infantry\n  Weak vs Aircraft
 		Hotkey: f
+	Valued:
+		Cost: 600
+	Tooltip:
+		Name: Flame Turret
+		Description: Anti-Infantry base defense.\n  Strong vs Infantry\n  Weak vs Aircraft
 	Building:
 		Power: -20
 	Health:
@@ -380,10 +406,12 @@ SAM:
 		BuildPaletteOrder: 90
 		Prerequisites: dome
 		Owner: soviet
-		Cost: 750
-		Description: SAM Site
-		LongDesc: Anti-Air base defense.\n  Strong vs Aircraft\n  Weak vs Infantry, Tanks
 		Hotkey: s
+	Valued:
+		Cost: 750
+	Tooltip:
+		Name: SAM Site
+		Description: Anti-Air base defense.\n  Strong vs Aircraft\n  Weak vs Infantry, Tanks
 	Building:
 		Power: -20
 		Footprint: xx
@@ -407,14 +435,17 @@ SAM:
 ATEK:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 100
 		Prerequisites: weap,dome
 		Owner: allies
-		Cost: 1500
-		Description: Allied Tech Center
-		LongDesc: Provides Allied advanced technologies.\n  Special Ability: GPS Satellite
-		AlternateName: @Tech Center
 		Hotkey: t
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Allied Tech Center
+		Description: Provides Allied advanced technologies.\n  Special Ability: GPS Satellite
+		AlternateName: @Tech Center
 	Building:
 		Power: -200
 		Footprint: xx xx
@@ -432,13 +463,16 @@ ATEK:
 WEAP:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 50
 		Prerequisites: proc
 		Owner: soviet,allies
-		Cost: 2000
-		Description: War Factory
-		LongDesc: Produces tanks & light vehicles.
 		Hotkey: w
+	Valued:
+		Cost: 2000
+	Tooltip:
+		Name: War Factory
+		Description: Produces tanks & light vehicles.
 	Building:
 		Power: -30
 		Footprint: xxx xxx
@@ -461,7 +495,6 @@ WEAP:

 FACT:
 	Inherits: ^Building
-	-Buildable:
 	Building:
 		Power: 0
 		Footprint: xxx xxx xxx
@@ -478,7 +511,8 @@ FACT:
 	IronCurtainable: 
 	Valued:
 		Cost: 2500
-		Description: Construction Yard
+	Tooltip:
+		Name: Construction Yard
 	CustomSellValue:
 		Value: 2500
 	BaseBuilding:
@@ -490,13 +524,16 @@ FACT:
 PROC:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 10
 		Prerequisites: @Power Plant
 		Owner: allies,soviet
-		Cost: 1400
-		Description: Ore Refinery
-		LongDesc: Converts Ore and Gems into money
 		Hotkey: e
+	Valued:
+		Cost: 1400
+	Tooltip:
+		Name: Ore Refinery
+		Description: Converts Ore and Gems into money
 	Building:
 		Power: -30
 		Footprint: _x_ xxx x==
@@ -525,13 +562,16 @@ PROC:
 SILO:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 40
 		Prerequisites: proc
 		Owner: allies,soviet
-		Cost: 150
-		Description: Silo
-		LongDesc: Stores excess harvested Ore
 		Hotkey: o
+	Valued:
+		Cost: 150
+	Tooltip:
+		Name: Silo
+		Description: Stores excess harvested Ore
 	Building:
 		Power: -10
 		Capturable: true
@@ -551,13 +591,16 @@ SILO:
 HPAD:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 90
 		Prerequisites: dome
 		Owner: allies
-		Cost: 1500
-		Description: Helipad
-		LongDesc: Produces and reloads helicopters
 		Hotkey: i
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Helipad
+		Description: Produces and reloads helicopters
 	Building:
 		Power: -10
 		Footprint: xx xx
@@ -581,13 +624,16 @@ HPAD:
 AFLD:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 50
 		Prerequisites: dome
 		Owner: soviet
-		Cost: 1100
-		Description: Airstrip
-		LongDesc: Provides radar and off-map support\n  Special Ability: Paratroopers\n  Special Ability: Spy Plane
 		Hotkey: a
+	Valued:
+		Cost: 1100
+	Tooltip:
+		Name: Airstrip
+		Description: Provides radar and off-map support\n  Special Ability: Paratroopers\n  Special Ability: Spy Plane
 	Building:
 		Power: -50
 		Footprint: xxx xxx
@@ -610,13 +656,16 @@ AFLD:
 POWR:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 0
 		Owner: allies,soviet
-		Cost: 300
-		Description: Power Plant
-		LongDesc: Provides power for other structures
-		AlternateName: @Power Plant
 		Hotkey: p
+	Valued:
+		Cost: 300
+	Tooltip:
+		Name: Power Plant
+		Description: Provides power for other structures
+		AlternateName: @Power Plant
 	Building:
 		Power: 100
 		Footprint: xx xx
@@ -633,13 +682,16 @@ POWR:
 APWR:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 20
 		Prerequisites: dome
 		Owner: allies,soviet
-		Cost: 500
-		Description: Advanced Power Plant
-		LongDesc: Provides more power, cheaper than the \nstandard Power Plant
 		Hotkey: l
+	Valued:
+		Cost: 500
+	Tooltip:
+		Name: Advanced Power Plant
+		Description: Provides more power, cheaper than the \nstandard Power Plant
 		AlternateName: @Power Plant
 	Building:
 		Power: 200
@@ -657,14 +709,17 @@ APWR:
 STEK:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 60
 		Prerequisites: weap,dome
 		Owner: soviet
-		Cost: 1500
-		Description: Soviet Tech Center
-		LongDesc: Provides Soviet advanced technologies
-		AlternateName: @Tech Center
 		Hotkey: t
+	Valued:
+		Cost: 1500
+	Tooltip:
+		Name: Soviet Tech Center
+		Description: Provides Soviet advanced technologies
+		AlternateName: @Tech Center
 	Building:
 		Power: -100
 		Footprint: xxx xxx
@@ -681,13 +736,16 @@ STEK:
 BARR:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 30
 		Prerequisites: @Power Plant
 		Owner: soviet
-		Cost: 400
-		Description: Soviet Barracks
-		LongDesc: Produces infantry
 		Hotkey: b
+	Valued:
+		Cost: 400
+	Tooltip:
+		Name: Soviet Barracks
+		Description: Produces infantry
 		AlternateName: @Barracks
 	Building:
 		Power: -20
@@ -711,13 +769,16 @@ BARR:
 TENT:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 30
 		Prerequisites: @Power Plant
 		Owner: allies
-		Cost: 400
-		Description: Allied Barracks
-		LongDesc: Produces infantry
 		Hotkey: b
+	Valued:
+		Cost: 400
+	Tooltip:
+		Name: Allied Barracks
+		Description: Produces infantry
 		AlternateName: @Barracks
 	Building:
 		Power: -20
@@ -741,13 +802,16 @@ TENT:
 KENN:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 30
 		Prerequisites: @Power Plant
 		Owner: soviet
-		Cost: 200
-		Description: Kennel
-		LongDesc: Produces attack dogs
 		Hotkey: k
+	Valued:
+		Cost: 200
+	Tooltip:
+		Name: Kennel
+		Description: Produces attack dogs
 	Building:
 		Power: -10
 	Health:
@@ -767,13 +831,16 @@ KENN:
 FIX:
 	Inherits: ^Building
 	Buildable:
+		Queue: Building
 		BuildPaletteOrder: 30
 		Prerequisites: weap
 		Owner: allies,soviet
-		Cost: 700
-		Description: Service Depot
-		LongDesc: Repairs vehicles, reloads minelayers, and \nallows the construction of additional bases.
 		Hotkey: d
+	Valued:
+		Cost: 700
+	Tooltip:
+		Name: Service Depot
+		Description: Repairs vehicles, reloads minelayers, and \nallows the construction of additional bases.
 	Building:
 		Power: -30
 		Footprint: _x_ xxx _x_
@@ -848,7 +915,8 @@ SYRF:
 	Inherits: ^Building
 	Valued:
 		Cost: 50
-		Description: Fake Shipyard
+	Tooltip:
+		Name: Fake Shipyard
 #	Buildable:
 #		BuildPaletteOrder: 900
 #		Prerequisites: @Power Plant
@@ -901,7 +969,8 @@ DOMF:
 	Inherits: ^Building
 	Valued:
 		Cost: 50
-		Description: Fake Radar Dome
+	Tooltip:
+		Name: Fake Radar Dome
 #	Buildable:
 #		BuildPaletteOrder: 900
 #		Prerequisites: proc
@@ -933,10 +1002,12 @@ SBAG:
 		BuildPaletteOrder: 1000
 		Prerequisites: fact
 		Owner: allies
-		Cost: 25
-		Description: Sandbag Wall
-		LongDesc: Stops infantry and blocks enemy fire.\nCan be crushed by tanks.
 		Hotkey: b
+	Valued:
+		Cost: 25
+	Tooltip:
+		Name: Sandbag Wall
+		Description: Stops infantry and blocks enemy fire.\nCan be crushed by tanks.
 	Health:
 		HP: 300
 		Armor: none
@@ -948,10 +1019,12 @@ FENC:
 		BuildPaletteOrder: 1000
 		Prerequisites: fact
 		Owner: soviet
-		Cost: 25
-		Description: Wire Fence
-		LongDesc: Stops infantry and blocks enemy fire.\nCan be crushed by tanks.
 		Hotkey: n
+	Valued:
+		Cost: 25
+	Tooltip:
+		Name: Wire Fence
+		Description: Stops infantry and blocks enemy fire.\nCan be crushed by tanks.
 	Health:
 		HP: 300
 		Armor: none
@@ -963,10 +1036,12 @@ BRIK:
 		BuildPaletteOrder: 1000
 		Prerequisites: fact
 		Owner: allies,soviet
-		Cost: 100
-		Description: Concrete Wall
-		LongDesc: Stop units and blocks enemy fire.
 		Hotkey: w
+	Valued:
+		Cost: 100
+	Tooltip:
+		Name: Concrete Wall
+		Description: Stop units and blocks enemy fire.
 	Building:
 		DamagedSound: crmble2.aud
 		DestroyedSound: kaboom30.aud
--- a/mods/ra/system.yaml
+++ b/mods/ra/system.yaml
@@ -1,9 +1,26 @@
 Player:
-	ProductionQueue:
+	TechTreeCache:
+	ProductionQueue@Building:
+		Type: Building
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	ProductionQueue@Vehicle:
+		Type: Vehicle
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	ProductionQueue@Infantry:
+		Type: Infantry
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	ProductionQueue@Ship:
+		Type: Ship
+		BuildSpeed: .4
+		LowPowerSlowdown: 3
+	ProductionQueue@Plane:
+		Type: Plane
 		BuildSpeed: .4
 		LowPowerSlowdown: 3
 	PlaceBuilding:
-	TechTreeCache:
 	GpsPower:
 		Image: gpssicon
 		OneShot: yes
@@ -204,9 +221,8 @@ MINV:
 	InvisibleToOthers:

 CRATE:
-	Valued:
-		Cost: 0
-		Description: Crate
+	Tooltip:
+		Name: Crate
 	Crate:
 		Lifetime: 120
 		TerrainTypes: Clear, Rough, Road, Water, Ore, Beach
--- a/mods/ra/trees.yaml
+++ b/mods/ra/trees.yaml
@@ -122,8 +122,8 @@ TC05:

 MINE:
 	Inherits: ^Tree
-	Valued:
-		Description: Ore Mine
+	Tooltip:
+		Name: Ore Mine
 	SeedsResource:
 	RadarColorFromTerrain:
 		Terrain: Ore
--- a/mods/ra/vehicles.yaml
+++ b/mods/ra/vehicles.yaml
@@ -40,12 +40,15 @@ BADR.bomber:
 V2RL:
 	Inherits: ^Vehicle
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 40
 		Prerequisites: weap,dome
 		Owner: soviet
+	Valued:
 		Cost: 700
-		Description: V2 Rocket
-		LongDesc: Long-range rocket artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
+	Tooltip:
+		Name: V2 Rocket
+		Description: Long-range rocket artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
 	Health:
 		HP: 150
 		Armor: light
@@ -64,12 +67,15 @@ V2RL:
 1TNK:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 40
 		Prerequisites: weap
 		Owner: allies
+	Valued:
 		Cost: 700
-		Description: Light Tank
-		LongDesc: Light Tank, good for scouting.\n  Strong vs Light Vehicles\n  Weak vs Tanks, Aircraft
+	Tooltip:
+		Name: Light Tank
+		Description: Light Tank, good for scouting.\n  Strong vs Light Vehicles\n  Weak vs Tanks, Aircraft
 	Health:
 		HP: 300
 		Armor: heavy
@@ -93,12 +99,15 @@ V2RL:
 2TNK:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 60
 		Prerequisites: weap
 		Owner: allies
+	Valued:
 		Cost: 800
-		Description: Medium Tank
-		LongDesc: Allied Main Battle Tank.\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
+	Tooltip:
+		Name: Medium Tank
+		Description: Allied Main Battle Tank.\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
 	Health:
 		HP: 400
 		Armor: heavy
@@ -122,12 +131,15 @@ V2RL:
 3TNK:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 40
 		Prerequisites: weap
 		Owner: soviet
+	Valued:
 		Cost: 1200
-		Description: Heavy Tank
-		LongDesc: Soviet Main Battle Tank, with dual cannons\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
+	Tooltip:
+		Name: Heavy Tank
+		Description: Soviet Main Battle Tank, with dual cannons\n  Strong vs Tanks, Light Vehicles\n  Weak vs Infantry, Aircraft
 	Health:
 		HP: 550
 		Armor: heavy
@@ -151,12 +163,15 @@ V2RL:
 4TNK:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 100
 		Prerequisites: weap,stek
 		Owner: soviet
+	Valued:
 		Cost: 1800
-		Description: Mammoth Tank
-		LongDesc: Big and slow tank, with anti-air capability.\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry
+	Tooltip:
+		Name: Mammoth Tank
+		Description: Big and slow tank, with anti-air capability.\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry
 	Health:
 		HP: 750
 		Armor: heavy
@@ -187,12 +202,15 @@ V2RL:
 ARTY:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 80
 		Prerequisites: weap
 		Owner: allies
+	Valued:
 		Cost: 600
-		Description: Artillery
-		LongDesc: Long-range artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
+	Tooltip:
+		Name: Artillery
+		Description: Long-range artillery.\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
 	Health:
 		HP: 75
 		Armor: light
@@ -210,12 +228,15 @@ ARTY:
 HARV:
 	Inherits: ^Vehicle
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 10
 		Prerequisites: weap,proc
 		Owner: allies,soviet
+	Valued:
 		Cost: 1100
-		Description: Ore Truck
-		LongDesc: Collects Ore and Gems for processing.\n  Unarmed
+	Tooltip:
+		Name: Ore Truck
+		Description: Collects Ore and Gems for processing.\n  Unarmed
 	Selectable:
 		Priority: 7
 	Harvester:
@@ -233,12 +254,15 @@ HARV:
 MCV:
 	Inherits: ^Vehicle
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 110
 		Prerequisites: weap,fix
 		Owner: allies,soviet
+	Valued:
 		Cost: 2000
-		Description: Mobile Construction Vehicle
-		LongDesc: Deploys into another Construction Yard.\n  Unarmed
+	Tooltip:
+		Name: Mobile Construction Vehicle
+		Description: Deploys into another Construction Yard.\n  Unarmed
 	Selectable:
 		Priority: 3
 	Health:
@@ -261,12 +285,15 @@ MCV:
 JEEP:
 	Inherits: ^Vehicle
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Prerequisites: weap
 		Owner: allies,soviet
+	Valued:
 		Cost: 500
-		Description: Ranger
-		LongDesc: Fast scout & anti-infantry vehicle.\n  Strong vs Infantry\n  Weak vs Tanks, Aircraft
+	Tooltip:
+		Name: Ranger
+		Description: Fast scout & anti-infantry vehicle.\n  Strong vs Infantry\n  Weak vs Tanks, Aircraft
 	Health:
 		HP: 150
 		Armor: light
@@ -287,12 +314,15 @@ JEEP:
 APC:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 50
 		Prerequisites: weap,tent
 		Owner: allies
+	Valued:
 		Cost: 800
-		Description: Armored Personnel Carrier
-		LongDesc: Tough infantry transport.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
+	Tooltip:
+		Name: Armored Personnel Carrier
+		Description: Tough infantry transport.\n  Strong vs Infantry, Light Vehicles\n  Weak vs Tanks, Aircraft
 	Health:
 		HP: 200
 		Armor: heavy
@@ -315,13 +345,16 @@ APC:
 MNLY.AP:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Prerequisites: weap,fix
 		Owner: soviet
+	Valued:
 		Cost: 800
+	Tooltip:
+		Name: Minelayer (Anti-Personnel)
 		Icon: MNLYICON
-		Description: Minelayer (Anti-Personnel)
-		LongDesc: Lays mines to destroy unwary enemy units.\n  Unarmed
+		Description: Lays mines to destroy unwary enemy units.\n  Unarmed
 	Health:
 		HP: 100
 		Armor: heavy
@@ -340,13 +373,16 @@ MNLY.AP:
 MNLY.AT:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		BuildPaletteOrder: 30
 		Prerequisites: weap,fix
 		Owner: allies
+	Valued:
 		Cost: 800
+	Tooltip:
+		Name: Minelayer (Anti-Tank)
 		Icon: MNLYICON
-		Description: Minelayer (Anti-Tank)
-		LongDesc: Lays mines to destroy unwary enemy units.\n  Unarmed
+		Description: Lays mines to destroy unwary enemy units.\n  Unarmed
 	Health:
 		HP: 100
 		Armor: heavy
@@ -376,13 +412,16 @@ TRUK:
 SS:
 	Inherits: ^Ship
 	Buildable:
+		Queue: Ship
 		BuildPaletteOrder: 50
 		Prerequisites: spen
 		BuiltAt: spen
 		Owner: soviet
+	Valued:
 		Cost: 950
-		Description: Submarine
-		LongDesc: Submerged anti-ship unit armed with \ntorpedoes.\n  Strong vs Ships\n  Weak vs Everything\n  Special Ability: Submerge
+	Tooltip:
+		Name: Submarine
+		Description: Submerged anti-ship unit armed with \ntorpedoes.\n  Strong vs Ships\n  Weak vs Everything\n  Special Ability: Submerge
 	Health:
 		HP: 250
 		Armor: light
@@ -412,13 +451,16 @@ SS:
 MSUB:
 	Inherits: ^Ship
 	Buildable:
+		Queue: Ship
 		BuildPaletteOrder: 60
 		Prerequisites: spen,stek
 		BuiltAt: spen
 		Owner: soviet
+	Valued:
 		Cost: 2400
-		Description: Missile Submarine
-		LongDesc: Submerged anti-ground unit armed with \nlong-range ballistic missiles.\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: Submerge
+	Tooltip:
+		Name: Missile Submarine
+		Description: Submerged anti-ground unit armed with \nlong-range ballistic missiles.\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: Submerge
 	Health:
 		HP: 400
 		Armor: light
@@ -447,13 +489,16 @@ MSUB:
 DD:
 	Inherits: ^Ship
 	Buildable:
+		Queue: Ship
 		BuildPaletteOrder: 70
 		Prerequisites: syrd
 		BuiltAt: syrd
 		Owner: allies
+	Valued:
 		Cost: 1000
-		Description: Destroyer
-		LongDesc: Fast multi-role ship. \n  Strong vs Submarines, Aircraft\n  Weak vs Infantry, Tanks
+	Tooltip:
+		Name: Destroyer
+		Description: Fast multi-role ship. \n  Strong vs Submarines, Aircraft\n  Weak vs Infantry, Tanks
 	Health:
 		HP: 400
 		Armor: heavy
@@ -477,13 +522,16 @@ DD:
 CA:
 	Inherits: ^Ship
 	Buildable:
+		Queue: Ship
 		BuildPaletteOrder: 100
 		Prerequisites: syrd,atek
 		BuiltAt: syrd
 		Owner: allies
+	Valued:
 		Cost: 3200
-		Description: Cruiser
-		LongDesc: Very slow long-range ship. \n  Strong vs Buildings\n  Weak vs Ships, Submarines
+	Tooltip:
+		Name: Cruiser
+		Description: Very slow long-range ship. \n  Strong vs Buildings\n  Weak vs Ships, Submarines
 	Health:
 		HP: 800
 		Armor: heavy
@@ -511,11 +559,14 @@ CA:
 LST:
 	Inherits: ^Ship
 	Buildable:
+		Queue: Ship
 		BuildPaletteOrder: 30
 		Owner: allies,soviet
+	Valued:
 		Cost: 700
-		Description: Transport
-		LongDesc: General-purpose naval transport.\nCan carry infantry and tanks.\n  Unarmed
+	Tooltip:
+		Name: Transport
+		Description: General-purpose naval transport.\nCan carry infantry and tanks.\n  Unarmed
 	Health:
 		HP: 350
 		Armor: heavy
@@ -534,13 +585,16 @@ LST:
 PT:
 	Inherits: ^Ship
 	Buildable:
+		Queue: Ship
 		BuildPaletteOrder: 50
 		Prerequisites: syrd
 		BuiltAt: syrd
 		Owner: allies
+	Valued:
 		Cost: 500
-		Description: Gunboat
-		LongDesc: Light scout & support ship. \n  Strong vs Ships, Submarines\n  Weak vs Aircraft
+	Tooltip:
+		Name: Gunboat
+		Description: Light scout & support ship. \n  Strong vs Ships, Submarines\n  Weak vs Aircraft
 	Health:
 		HP: 200
 		Armor: heavy
@@ -569,9 +623,11 @@ MIG:
 		Prerequisites: afld
 		BuiltAt: afld
 		Owner: soviet
+	Valued:
 		Cost: 1200
-		Description: Mig Attack Plane
-		LongDesc: Fast Ground-Attack Plane.\n  Strong vs Buildings\n  Weak vs Infantry, Light Vehicles
+	Tooltip:
+		Name: Mig Attack Plane
+		Description: Fast Ground-Attack Plane.\n  Strong vs Buildings\n  Weak vs Infantry, Light Vehicles
 	Health:
 		HP: 70
 		Armor: light
@@ -602,9 +658,11 @@ YAK:
 		Prerequisites: afld
 		BuiltAt: afld
 		Owner: soviet
+	Valued:
 		Cost: 800
-		Description: Yak Attack Plane
-		LongDesc: Anti-Tanks & Anti-Infantry Plane.\n  Strong vs Infantry, Tanks\n  Weak vs Buildings
+	Tooltip:
+		Name: Yak Attack Plane
+		Description: Anti-Tanks & Anti-Infantry Plane.\n  Strong vs Infantry, Tanks\n  Weak vs Buildings
 	Health:
 		HP: 60
 		Armor: light
@@ -634,9 +692,11 @@ TRAN:
 		Prerequisites: hpad
 		BuiltAt: hpad
 		Owner: allies
+	Valued:
 		Cost: 1200
-		Description: Transport Helicopter
-		LongDesc: Fast Infantry Transport Helicopter.\n  Unarmed
+	Tooltip:
+		Name: Transport Helicopter
+		Description: Fast Infantry Transport Helicopter.\n  Unarmed
 	Health:
 		HP: 90
 		Armor: light
@@ -664,9 +724,11 @@ HELI:
 		Prerequisites: hpad
 		BuiltAt: hpad
 		Owner: allies
+	Valued:
 		Cost: 1200
-		Description: Longbow
-		LongDesc: Helicopter Gunship with AG Missiles.\n  Strong vs Buildings, Tanks\n  Weak vs Infantry
+	Tooltip:
+		Name: Longbow
+		Description: Helicopter Gunship with AG Missiles.\n  Strong vs Buildings, Tanks\n  Weak vs Infantry
 	Health:
 		HP: 120
 		Armor: light
@@ -698,9 +760,11 @@ HIND:
 		Prerequisites: hpad
 		BuiltAt: hpad
 		Owner: allies
+	Valued:
 		Cost: 1200
-		Description: Hind
-		LongDesc: Helicopter Gunship with Chainguns.\n  Strong vs Infantry, Light Vehicles.\n  Weak vs Tanks
+	Tooltip:
+		Name: Hind
+		Description: Helicopter Gunship with Chainguns.\n  Strong vs Infantry, Light Vehicles.\n  Weak vs Tanks
 	Health:
 		HP: 120
 		Armor: light
@@ -738,8 +802,8 @@ U2:

 1TNK.Husk:
 	Inherits: ^Husk
-	Valued:
-		Description: Husk (Light Tank)
+	Tooltip:
+		Name: Husk (Light Tank)
 	RenderUnit:
 		Image: 1tnk
 	ThrowsParticle@turret:
@@ -750,8 +814,8 @@ U2:

 2TNK.Husk:
 	Inherits: ^Husk
-	Valued:
-		Description: Husk (Medium Tank)
+	Tooltip:
+		Name: Husk (Medium Tank)
 	RenderUnit:
 		Image: 2tnk
 	ThrowsParticle@turret:
@@ -762,8 +826,8 @@ U2:

 3TNK.Husk:
 	Inherits: ^Husk
-	Valued:
-		Description: Husk (Heavy Tank)
+	Tooltip:
+		Name: Husk (Heavy Tank)
 	RenderUnit:
 		Image: 3tnk
 	ThrowsParticle@turret:
@@ -774,8 +838,8 @@ U2:

 4TNK.Husk:
 	Inherits: ^Husk
-	Valued:
-		Description: Husk (Mammoth Tank)
+	Tooltip:
+		Name: Husk (Mammoth Tank)
 	RenderUnit:
 		Image: 4tnk
 	ThrowsParticle@turret:
@@ -787,11 +851,14 @@ U2:
 TTNK:
 	Inherits: ^Tank
 	Buildable:
+		Queue: Vehicle
 		Prerequisites: stek,tsla
 		Owner: soviet
+	Valued:
 		Cost: 1800
-		Description: Tesla Tank
-		LongDesc: TODO
+	Tooltip:
+		Name: Tesla Tank
+		Description: TODO
 	Health:
 		HP: 110
 		Armor: light