Overhaul TD EVA Database.

mods/cnc/chrome.yaml

@@ -1,3 +1,4 @@
+
 ^Chrome:
 	Image: chrome.png
 	Image2x: chrome-2x.png
@@ -761,3 +762,8 @@ editor:
 		tools: 904, 68, 16, 16
 		history: 904, 51, 16, 16
 		erase: 818, 170, 16, 16
+
+encyclopedia:
+	Image: encyclopedia/scanlines.png
+	Regions:
+		scanlines: 0, 0, 600, 320

mods/cnc/chrome/encyclopedia.yaml

@@ -1,26 +1,28 @@
-Background@ENCYCLOPEDIA_PANEL:
+Container@ENCYCLOPEDIA_PANEL:
 	Logic: EncyclopediaLogic
 	X: (WINDOW_WIDTH - WIDTH) / 2
 	Y: (WINDOW_HEIGHT - HEIGHT) / 2
 	Width: 900
-	Height: 600
+	Height: 540
 	Children:
-		Container@ENCYCLOPEDIA_CONTENT:
+		Label@ENCYCLOPEDIA_TITLE:
-			Width: PARENT_WIDTH - 40
+			Width: PARENT_WIDTH
-			Height: PARENT_HEIGHT - 80
+			Height: 25
-			X: 20
+			Y: 0 - 34
-			Y: 20
+			Font: BigBold
+			Contrast: true
+			Align: Center
+			Text: label-encyclopedia-title
+		Background@ENCYCLOPEDIA_CONTENT:
+			Width: PARENT_WIDTH
+			Height: PARENT_HEIGHT
+			Background: panel-black
 			Children:
-				Label@ENCYCLOPEDIA_TITLE:
-					Width: PARENT_WIDTH
-					Height: 25
-					Text: label-encyclopedia-title
-					Align: Center
-					Font: Bold
 				ScrollPanel@ACTOR_LIST:
-					Y: 30
+					X: 15
-					Width: 190
+					Y: 15
-					Height: PARENT_HEIGHT - 25
+					Width: 255
+					Height: PARENT_HEIGHT - 30
 					Children:
 						ScrollItem@HEADER:
 							Background: scrollheader
@@ -46,16 +48,31 @@ Background@ENCYCLOPEDIA_PANEL:
 									Height: 25
 									TooltipContainer: TOOLTIP_CONTAINER
 									TooltipTemplate: SIMPLE_TOOLTIP
+				Background@PORTRAIT_CONTAINER:
+					X: 285
+					Y: 15
+					Width: 600
+					Height: 320
+					Background: scrollpanel-bg
+					Children:
+						Sprite@ACTOR_PORTRAIT:
+							X: 1
+							Y: 1
+							Width: PARENT_WIDTH - 2
+							Height: PARENT_HEIGHT - 2
+						Image@PORTRAIT_GRID:
+							ImageCollection: encyclopedia
+							ImageName: scanlines
 				Container@ACTOR_INFO:
-					X: PARENT_WIDTH - WIDTH
+					X: 285
-					Y: 30
+					Y: 350
-					Width: PARENT_WIDTH - 190 - 10
+					Width: PARENT_WIDTH - 195 - 45
-					Height: PARENT_HEIGHT - 25
+					Height: PARENT_HEIGHT - 30
 					Children:
 						Background@ACTOR_BG:
-							Width: 150
+							Width: 170
-							Height: 170
+							Height: 175
-							Background: dialog3
+							Background: scrollpanel-bg
 							Children:
 								ActorPreview@ACTOR_PREVIEW:
 									X: 1
@@ -63,23 +80,64 @@ Background@ENCYCLOPEDIA_PANEL:
 									Width: PARENT_WIDTH - 2
 									Height: PARENT_HEIGHT - 2
 						ScrollPanel@ACTOR_DESCRIPTION_PANEL:
-							X: 150 + 10
+							X: 185
-							Width: PARENT_WIDTH - 150 - 10
+							Width: 580 - 165
-							Height: 170
+							Height: 175
 							TopBottomSpacing: 8
+							CollapseHiddenChildren: true
 							Children:
+								Label@ACTOR_TITLE:
+									X: 8
+									Width: PARENT_WIDTH - 40
+									Height: 18
+									VAlign: Top
+									Font: Bold
+								Container@ACTOR_PRODUCTION:
+									X: 8
+									Width: PARENT_WIDTH - 40
+									Height: 24
+									Children:
+										Image@COST_ICON:
+											Y: 1
+											Width: 16
+											Height: 16
+											ImageCollection: sidebar-bits
+											ImageName: production-tooltip-cost
+										Label@COST:
+											X: 17
+											Height: 16
+											Font: Bold
+										Image@TIME_ICON:
+											X: 75
+											Y: 1
+											Width: 16
+											Height: 16
+											ImageCollection: sidebar-bits
+											ImageName: production-tooltip-time
+										Label@TIME:
+											X: 95
+											Height: 16
+											Font: Bold
+										Image@POWER_ICON:
+											X: 150
+											Y: 1
+											Width: 16
+											Height: 16
+											ImageCollection: sidebar-bits
+											ImageName: production-tooltip-power
+										Label@POWER:
+											X: 167
+											Height: 16
+											Font: Bold
 								Label@ACTOR_DESCRIPTION:
 									X: 8
-									Y: 8
 									Width: PARENT_WIDTH - 40
 									VAlign: Top
 									Font: Regular
 		Button@BACK_BUTTON:
-			X: PARENT_WIDTH - 180
+			Y: PARENT_HEIGHT - 1
-			Y: PARENT_HEIGHT - 45
+			Width: 140
-			Width: 160
+			Height: 35
-			Height: 25
 			Text: button-back
-			Font: Bold
 			Key: escape
 		TooltipContainer@TOOLTIP_CONTAINER:

mods/cnc/fluent/chrome.ftl

@@ -108,7 +108,7 @@ button-select-categories-buttons-none = None
 label-tool-marker-tiles = Marker Tiles
 
 ## encyclopedia.yaml, mainmenu.yaml
-label-encyclopedia-title = Database
+label-encyclopedia-title = EVA Database
 
 ## gamesave-browser.yaml
 label-gamesave-browser-panel-load-title = Load game

mods/cnc/maps/blank-shellmap/map.yaml

@@ -22,6 +22,22 @@ Players:
 		OwnsWorld: True
 		NonCombatant: True
 		Faction: Random
+	# Used for rendering the EVA Database previews
+	PlayerReference@Nod:
+		Name: Nod
+		Faction: nod
+		Color: FE1100
+		NonCombatant: True
+	PlayerReference@Nod:
+		Name: NodUnits
+		Faction: nod
+		Color: FE1100
+		NonCombatant: True
+	PlayerReference@GDI:
+		Name: GDI
+		Faction: gdi
+		Color: F5D378
+		NonCombatant: True
 
 Actors:
 
@@ -34,3 +50,13 @@ Rules:
 			BackgroundMusic: map1
 			AllowMuteBackgroundMusic: true
 			DisableWorldSounds: true
+	# Used for rendering the EVA Database previews
+	^Palettes:
+		-PlayerColorPalette:
+		IndexedPlayerPalette:
+			BasePalette: terrain
+			RemapIndex: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+			PlayerIndex:
+				GDI: 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191
+				Nod: 127, 126, 125, 124, 122, 46, 120, 47, 125, 124, 123, 122, 42, 121, 120, 120
+				NodUnits: 161, 200, 201, 202, 204, 205, 206, 12, 201, 202, 203, 204, 205, 115, 198, 114

mods/cnc/rules/aircraft.yaml

@@ -26,7 +26,9 @@ TRAN:
 	Encyclopedia:
 		Description: actor-tran.encyclopedia
 		Order: 230
-		Category: Units
+		Scale: 3
+		Category: Aircraft
+		PreviewOwner: GDI
 	WithIdleOverlay@ROTOR1AIR:
 		Offset: 597,0,85
 		Sequence: rotor
@@ -92,7 +94,9 @@ HELI:
 	Encyclopedia:
 		Description: actor-heli.encyclopedia
 		Order: 240
-		Category: Units
+		Scale: 3
+		Category: Aircraft
+		PreviewOwner: NodUnits
 	AttackMove:
 		Voice: Attack
 	AutoTarget:
@@ -164,7 +168,9 @@ ORCA:
 	Encyclopedia:
 		Description: actor-orca.encyclopedia
 		Order: 250
-		Category: Units
+		Scale: 3
+		Category: Aircraft
+		PreviewOwner: GDI
 	AttackMove:
 		Voice: Attack
 	AutoTarget:

mods/cnc/rules/infantry.yaml

@@ -25,7 +25,9 @@ E1:
 	Encyclopedia:
 		Description: actor-e1.encyclopedia
 		Order: 0
-		Category: Units
+		Scale: 3
+		Category: Infantry
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		Voice: Attack
 		FacingTolerance: 0
@@ -63,7 +65,9 @@ E2:
 		FireDelay: 15
 	Encyclopedia:
 		Description: actor-e2.encyclopedia
-		Category: Units
+		Scale: 3
+		Category: Infantry
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		Voice: Attack
 		FacingTolerance: 0
@@ -107,7 +111,9 @@ E3:
 	Encyclopedia:
 		Description: actor-e3.encyclopedia
 		Order: 20
-		Category: Units
+		Scale: 3
+		Category: Infantry
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		Voice: Attack
 		FacingTolerance: 0
@@ -148,7 +154,9 @@ E4:
 	Encyclopedia:
 		Description: actor-e4.encyclopedia
 		Order: 30
-		Category: Units
+		Scale: 3
+		Category: Infantry
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		Voice: Attack
 		FacingTolerance: 0
@@ -191,7 +199,9 @@ E5:
 	Encyclopedia:
 		Description: actor-e5.encyclopedia
 		Order: 40
-		Category: Units
+		Scale: 3
+		Category: Infantry
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		Voice: Attack
 		FacingTolerance: 0
@@ -225,7 +235,9 @@ E6:
 	Encyclopedia:
 		Description: actor-e6.encyclopedia
 		Order: 50
-		Category: Units
+		Scale: 3
+		Category: Infantry
+		PreviewOwner: NodUnits
 	Passenger:
 		CustomPipType: yellow
 	InstantlyRepairs:
@@ -278,7 +290,9 @@ RMBO:
 	Encyclopedia:
 		Description: actor-rmbo.encyclopedia
 		Order: 60
-		Category: Units
+		Scale: 3
+		Category: Infantry
+		PreviewOwner: GDI
 	WithInfantryBody:
 		DefaultAttackSequence: shoot
 		IdleSequences: idle1,idle2,idle3
@@ -306,7 +320,10 @@ PVICE:
 	Encyclopedia:
 		Description: actor-pvice.encyclopedia
 		Order: 70
-		Category: Units
+		Scale: 3
+		Category: Civilian
+		HideBuildable: true
+		PreviewOwner: NodUnits
 
 STEG:
 	Inherits: ^DINO

mods/cnc/rules/structures.yaml

@@ -15,6 +15,8 @@ FACT:
 		Description: actor-fact.encyclopedia
 		Category: Buildings
 		Order: 0
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 210000
 	Armor:
@@ -180,6 +182,8 @@ NUKE:
 		Description: actor-nuke.encyclopedia
 		Category: Buildings
 		Order: 40
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 55000
 	RevealsShroud:
@@ -215,6 +219,8 @@ NUK2:
 		Description: actor-nuk2.encyclopedia
 		Category: Buildings
 		Order: 190
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 70000
 	RevealsShroud:
@@ -252,6 +258,8 @@ PROC:
 		Description: actor-proc.encyclopedia
 		Category: Buildings
 		Order: 80
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 100000
 	RevealsShroud:
@@ -303,6 +311,8 @@ SILO:
 		Description: actor-silo.encyclopedia
 		Category: Buildings
 		Order: 90
+		Scale: 2
+		PreviewOwner: GDI
 	-GivesBuildableArea:
 	Health:
 		HP: 50000
@@ -352,6 +362,8 @@ PYLE:
 		Description: actor-pyle.encyclopedia
 		Category: Buildings
 		Order: 50
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 60000
 	RevealsShroud:
@@ -417,6 +429,8 @@ HAND:
 		Description: actor-hand.encyclopedia
 		Category: Buildings
 		Order: 60
+		Scale: 2
+		PreviewOwner: Nod
 	Health:
 		HP: 60000
 	RevealsShroud:
@@ -485,6 +499,8 @@ AFLD:
 		Description: actor-afld.encyclopedia
 		Category: Buildings
 		Order: 110
+		Scale: 1.5
+		PreviewOwner: Nod
 	Health:
 		HP: 110000
 	RevealsShroud:
@@ -554,6 +570,8 @@ WEAP:
 		Description: actor-weap.encyclopedia
 		Category: Buildings
 		Order: 100
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 110000
 	RevealsShroud:
@@ -619,6 +637,8 @@ HPAD:
 		Description: actor-hpad.encyclopedia
 		Category: Buildings
 		Order: 120
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 60000
 	RevealsShroud:
@@ -709,6 +729,8 @@ HQ:
 		Description: actor-hq.encyclopedia
 		Category: Buildings
 		Order: 130
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 80000
 	RevealsShroud:
@@ -775,6 +797,8 @@ FIX:
 		Description: actor-fix.encyclopedia
 		Category: Buildings
 		Order: 180
+		Scale: 2
+		PreviewOwner: GDI
 	Selectable:
 		Bounds: 2730, 1450, 0, 128
 		DecorationBounds: 3072, 2048
@@ -827,6 +851,8 @@ EYE:
 		Description: actor-eye.encyclopedia
 		Category: Buildings
 		Order: 200
+		Scale: 2
+		PreviewOwner: GDI
 	Selectable:
 		Bounds: 2048, 1706, 0, 384
 		DecorationBounds: 2048, 2261, 0, -170
@@ -897,6 +923,8 @@ TMPL:
 		Description: actor-tmpl.encyclopedia
 		Category: Buildings
 		Order: 210
+		Scale: 2
+		PreviewOwner: Nod
 	Health:
 		HP: 210000
 	RevealsShroud:
@@ -967,6 +995,8 @@ GUN:
 		Description: actor-gun.encyclopedia
 		Category: Buildings
 		Order: 160
+		Scale: 2
+		PreviewOwner: Nod
 	Health:
 		HP: 41000
 	Armor:
@@ -1028,6 +1058,8 @@ SAM:
 		Description: actor-sam.encyclopedia
 		Category: Buildings
 		Order: 161
+		Scale: 2
+		PreviewOwner: Nod
 	Health:
 		HP: 40000
 	Armor:
@@ -1078,6 +1110,8 @@ OBLI:
 		Description: actor-obli.encyclopedia
 		Category: Buildings
 		Order: 220
+		Scale: 2
+		PreviewOwner: Nod
 	Health:
 		HP: 75000
 	Armor:
@@ -1127,6 +1161,8 @@ GTWR:
 		Description: actor-gtwr.encyclopedia
 		Category: Buildings
 		Order: 150
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 40000
 	Armor:
@@ -1172,6 +1208,8 @@ ATWR:
 		Description: actor-atwr.encyclopedia
 		Category: Buildings
 		Order: 170
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 55000
 	Armor:
@@ -1222,6 +1260,8 @@ SBAG:
 		Description: actor-sbag.encyclopedia
 		Category: Buildings
 		Order: 10
+		Scale: 2
+		PreviewOwner: GDI
 	Armor:
 		Type: Light
 	LineBuild:
@@ -1248,6 +1288,8 @@ CYCL:
 		Description: actor-cycl.encyclopedia
 		Category: Buildings
 		Order: 20
+		Scale: 2
+		PreviewOwner: GDI
 	Armor:
 		Type: Light
 	LineBuild:
@@ -1275,6 +1317,8 @@ BRIK:
 		Description: actor-brik.encyclopedia
 		Category: Buildings
 		Order: 30
+		Scale: 2
+		PreviewOwner: GDI
 	Health:
 		HP: 20000
 	Armor:

mods/cnc/rules/tech.yaml

@@ -14,6 +14,8 @@ V19:
 		Description: actor-v19.encyclopedia
 		Order: 0
 		Category: Civilian
+		Scale: 2
+		PreviewOwner: GDI
 	Tooltip:
 		Name: actor-v19.name
 	TooltipDescription@ally:
@@ -56,6 +58,8 @@ HOSP:
 		Description: actor-hosp.encyclopedia
 		Order: 10
 		Category: Civilian
+		Scale: 2
+		PreviewOwner: GDI
 	Tooltip:
 		Name: actor-hosp.name
 	TooltipDescription@ally:
@@ -96,6 +100,8 @@ BIO:
 		Description: actor-bio.encyclopedia
 		Order: 10
 		Category: Civilian
+		Scale: 2
+		PreviewOwner: GDI
 	Tooltip:
 		Name: actor-bio.name
 	TooltipDescription@ally:
@@ -143,6 +149,9 @@ MISS:
 		Description: actor-miss.encyclopedia
 		Order: 20
 		Category: Civilian
+		Scale: 2
+		HideBuildable: true
+		PreviewOwner: GDI
 	RevealsShroud:
 		Range: 13c0
 	TooltipDescription@ally:

mods/cnc/rules/vehicles.yaml

@@ -19,7 +19,9 @@ MCV:
 	Encyclopedia:
 		Description: actor-mcv.encyclopedia
 		Order: 80
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: GDI
 	Repairable:
 		HpPerStep: 1819
 	Armor:
@@ -77,7 +79,9 @@ HARV:
 	Encyclopedia:
 		Description: actor-harv.encyclopedia
 		Order: 90
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: GDI
 	Repairable:
 		HpPerStep: 2584
 	Armor:
@@ -134,7 +138,9 @@ APC:
 	Encyclopedia:
 		Description: actor-apc.encyclopedia
 		Order: 100
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: GDI
 	Repairable:
 		HpPerStep: 1440
 	Armor:
@@ -226,7 +232,9 @@ ARTY:
 	Encyclopedia:
 		Description: actor-arty.encyclopedia
 		Order: 110
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		TargetFrozenActors: True
 		ForceFireIgnoresActors: True
@@ -279,7 +287,9 @@ FTNK:
 	Encyclopedia:
 		Description: actor-ftnk.encyclopedia
 		Order: 120
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		Voice: Attack
 		FacingTolerance: 0
@@ -331,7 +341,9 @@ BGGY:
 	Encyclopedia:
 		Description: actor-bggy.encyclopedia
 		Order: 130
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: NodUnits
 	AttackMove:
 		Voice: Attack
 	AttackTurreted:
@@ -378,7 +390,9 @@ BIKE:
 	Encyclopedia:
 		Description: actor-bike.encyclopedia
 		Order: 140
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		Voice: Attack
 		FacingTolerance: 0
@@ -426,7 +440,9 @@ JEEP:
 	Encyclopedia:
 		Description: actor-jeep.encyclopedia
 		Order: 150
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: GDI
 	AttackMove:
 		Voice: Attack
 	AttackTurreted:
@@ -476,7 +492,9 @@ LTNK:
 	Encyclopedia:
 		Description: actor-ltnk.encyclopedia
 		Order: 160
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: NodUnits
 	AttackMove:
 		Voice: Attack
 	AttackTurreted:
@@ -525,7 +543,9 @@ MTNK:
 	Encyclopedia:
 		Description: actor-mtnk.encyclopedia
 		Order: 170
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: GDI
 	AttackMove:
 		Voice: Attack
 	AttackTurreted:
@@ -589,7 +609,9 @@ HTNK:
 	Encyclopedia:
 		Description: actor-htnk.encyclopedia
 		Order: 180
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: GDI
 	AttackMove:
 		Voice: Attack
 	AttackTurreted:
@@ -650,7 +672,9 @@ MSAM:
 	Encyclopedia:
 		Description: actor-msam.encyclopedia
 		Order: 190
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: GDI
 	AttackFrontal:
 		TargetFrozenActors: True
 		ForceFireIgnoresActors: True
@@ -706,7 +730,9 @@ MLRS:
 	Encyclopedia:
 		Description: actor-mlrs.encyclopedia
 		Order: 200
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: NodUnits
 	AmmoPool:
 		Ammo: 2
 		AmmoCondition: ammo
@@ -780,7 +806,9 @@ STNK:
 	Encyclopedia:
 		Description: actor-stnk.encyclopedia
 		Order: 210
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: NodUnits
 	AttackFrontal:
 		Voice: Attack
 		FacingTolerance: 0
@@ -842,7 +870,9 @@ TRUCK:
 	Encyclopedia:
 		Description: actor-truck.encyclopedia
 		Order: 220
-		Category: Units
+		Category: Vehicles
+		Scale: 3
+		PreviewOwner: GDI
 	DeliversCash:
 		Payload: 1000
 		PlayerExperience: 10