фикс энциклопедии

gru2007 · Nov 3, 2024 · 7b1d117 · 7b1d117
1 parent 8c376fc
commit 7b1d117
Show file tree

Hide file tree

Showing 65 changed files with 237 additions and 62 deletions.
diff --git a/mods/cnc_cw/chrome.yaml b/mods/cnc_cw/chrome.yaml
@@ -1,3 +1,4 @@
+
 ^Chrome:
 	Image: chrome.png
 	Image2x: chrome-2x.png
@@ -762,3 +763,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
diff --git a/mods/cnc_cw/chrome/encyclopedia.yaml b/mods/cnc_cw/chrome/encyclopedia.yaml
@@ -3,24 +3,26 @@ Container@ENCYCLOPEDIA_PANEL:
 	X: (WINDOW_WIDTH - WIDTH) / 2
 	Y: (WINDOW_HEIGHT - HEIGHT) / 2
 	Width: 900
-	Height: 600
+	Height: 540
 	Children:
-		Container@ENCYCLOPEDIA_CONTENT:
-			Width: PARENT_WIDTH - 40
-			Height: PARENT_HEIGHT - 80
-			X: 20
-			Y: 20
+		Label@ENCYCLOPEDIA_TITLE:
+			Width: PARENT_WIDTH
+			Height: 25
+			Y: 0 - 34
+			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
-					Width: 190
-					Height: PARENT_HEIGHT - 25
+					X: 15
+					Y: 15
+					Width: 255
+					Height: PARENT_HEIGHT - 30
 					Children:
 						ScrollItem@HEADER:
 							Background: scrollheader
@@ -46,40 +48,96 @@ Container@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
-					Y: 30
-					Width: PARENT_WIDTH - 190 - 10
-					Height: PARENT_HEIGHT - 25
+					X: 285
+					Y: 350
+					Width: PARENT_WIDTH - 195 - 45
+					Height: PARENT_HEIGHT - 30
 					Children:
 						Background@ACTOR_BG:
-							Width: 150
-							Height: 170
-							Background: dialog3
+							Width: 170
+							Height: 175
+							Background: scrollpanel-bg
 							Children:
 								ActorPreview@ACTOR_PREVIEW:
 									X: 1
 									Y: 1
 									Width: PARENT_WIDTH - 2
 									Height: PARENT_HEIGHT - 2
 						ScrollPanel@ACTOR_DESCRIPTION_PANEL:
-							X: 150 + 10
-							Width: PARENT_WIDTH - 150 - 10
-							Height: 170
+							X: 185
+							Width: 580 - 165
+							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 - 45
-			Width: 160
-			Height: 25
+			Y: PARENT_HEIGHT - 1
+			Width: 140
+			Height: 35
 			Text: button-back
-			Font: Bold
 			Key: escape
 		TooltipContainer@TOOLTIP_CONTAINER:
diff --git a/mods/cnc_cw/languages/chrome/en.ftl b/mods/cnc_cw/languages/chrome/en.ftl
@@ -922,7 +922,7 @@ button-production-types-aircraft-tooltip = Авиация
 
 productionpalette-player-widgets-production-palette =
    .ready = Готово
-   .hold = На Удержании
+   .hold = Ожидание
 
 ## lobby-kickdialogs.yaml
 label-kick-client-dialog-texta = Вы также можете выдать временный бан, предотвращая

diff --git a/mods/cnc_cw/languages/common/en.ftl b/mods/cnc_cw/languages/common/en.ftl
@@ -522,7 +522,7 @@ label-loading-player-profile = Загрузка профиля игрока...
 label-loading-player-profile-failed = Не удалось получить профиль.
 
 ## ProductionTooltipLogic
-label-requires = Нужно { $prequisites }
+label-requires = Нужно { $prerequisites }
 
 ## ReplayBrowserLogic
 label-duration = Длительность: { $time }

diff --git a/mods/cnc_cw/mod.yaml b/mods/cnc_cw/mod.yaml
@@ -155,6 +155,7 @@ ChromeLayout:
 	cnc_cw|chrome/settings-hotkeys.yaml
 	cnc_cw|chrome/settings-advanced.yaml
 	cnc_cw|chrome/credits.yaml
+	cnc_cw|chrome/encyclopedia.yaml
 	cnc_cw|chrome/dialogs.yaml
 	cnc_cw|chrome/tooltips.yaml
 	cnc_cw|chrome/assetbrowser.yaml

diff --git a/mods/cnc_cw/rules/aircraft.yaml b/mods/cnc_cw/rules/aircraft.yaml
@@ -23,6 +23,12 @@ TRAN:
 	RevealsShroud:
 		Range: 10c0
 		Type: GroundPosition
+	Encyclopedia:
+		Description: actor-tran.encyclopedia
+		Order: 230
+		Scale: 3
+		Category: Aircraft
+		PreviewOwner: GDI
 	Cargo:
 		Types: Infantry
 		MaxWeight: 10
@@ -121,7 +127,9 @@ HELI:
 	Encyclopedia:
 		Description: actor-heli.encyclopedia
 		Order: 240
-		Category: Units
+		Scale: 3
+		Category: Aircraft
+		PreviewOwner: NodUnits
 	AttackMove:
 		Voice: Attack
 	AutoTarget:
@@ -192,7 +200,9 @@ ORCA:
 	Encyclopedia:
 		Description: actor-orca.encyclopedia
 		Order: 250
-		Category: Units
+		Scale: 3
+		Category: Aircraft
+		PreviewOwner: GDI
 	AttackMove:
 		Voice: Attack
 	AutoTarget:

diff --git a/mods/cnc_cw/rules/infantry.yaml b/mods/cnc_cw/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
@@ -297,7 +311,7 @@ PVICE:
 		Queue: Infantry.GDI, Infantry.Nod
 		BuildPaletteOrder: 50
 		Prerequisites: ~disabled
-		Description: actor-pvice-description
+		Description: actor-pvice.description
 	Tooltip:
 	UpdatesPlayerStatistics:
 		AddToArmyValue: true
@@ -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