Some fixes and yaml update.

MustaphaTR · Nov 5, 2023 · 95534be · 95534be
1 parent 698a5d2
commit 95534be
Show file tree

Hide file tree

Showing 8 changed files with 262 additions and 167 deletions.
diff --git a/mods/ss/chrome/ingame.yaml b/mods/ss/chrome/ingame.yaml
@@ -825,7 +825,7 @@ Container@PLAYER_WIDGETS:
 									Bar: progressbar-thumb-green
 						Label@STAT_SPEED:
 							Y: 125
-							Text: label-actor-statsspeed
+							Text: label-actor-stats-speed
 							Children:
 								ProgressBar@STAT_SPEED_BAR:
 									X: 1
@@ -872,21 +872,21 @@ Container@PLAYER_WIDGETS:
 									Y: 1
 									Width: 90
 									Height: 25
-									Text: Player
+									Text: label-stats-name
 									Font: Bold
 								Label@FACTION:
 									X: 91
 									Y: 1
 									Width: 32
 									Height: 25
-									Text: Class
+									Text: label-stats-faction
 									Font: Bold
 								Label@SCORE:
 									X: PARENT_RIGHT - 27
 									Y: 1
 									Width: 25
 									Height: 25
-									Text: Score
+									Text: label-stats-score
 									Font: Bold
 									Align: Right
 						ScrollPanel@PLAYER_LIST:
@@ -896,6 +896,7 @@ Container@PLAYER_WIDGETS:
 							ItemSpacing: 5
 							Children:
 								ScrollItem@TEAM_TEMPLATE:
+									Background: scrollheader
 									Width: PARENT_RIGHT - 27
 									Height: 20
 									X: 2

diff --git a/mods/ss/maps/test.oramap b/mods/ss/maps/test.oramap
diff --git a/mods/ss/rules/civilian.yaml b/mods/ss/rules/civilian.yaml
@@ -244,36 +244,20 @@ V11.Husk:
 		Name: Ludwig's House (Destroyed)
 
 V12:
-	Inherits: ^CivField
+	Inherits: ^CivHaystackOrIgloo
 	SpawnActorOnDeath:
 		Actor: V12.Husk
-	MapEditorData:
-		ExcludeTilesets: DESERT
-	Tooltip:
-		Name: Haystacks
 
 V12.Husk:
-	Inherits: ^CivBuildingHusk
-	MapEditorData:
-		ExcludeTilesets: DESERT
-	Tooltip:
-		Name: Haystacks (Destroyed)
+	Inherits: ^CivHaystackOrIglooHusk
 
 V13:
-	Inherits: ^CivField
+	Inherits: ^CivHaystackOrIgloo
 	SpawnActorOnDeath:
 		Actor: V13.Husk
-	MapEditorData:
-		ExcludeTilesets: DESERT
-	Tooltip:
-		Name: Haystacks
 
 V13.Husk:
-	Inherits: ^CivBuildingHusk
-	MapEditorData:
-		ExcludeTilesets: DESERT
-	Tooltip:
-		Name: Haystacks (Destroyed)
+	Inherits: ^CivHaystackOrIglooHusk
 
 V14:
 	Inherits: ^CivField