diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs index 9e4d611812..2c5e2a2ef2 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs @@ -200,8 +200,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic var stats = player.PlayerActor.TraitOrDefault(); if (stats == null) return template; - template.Get("KILLS_COST").GetText = () => "$" + stats.KillsCost; - template.Get("DEATHS_COST").GetText = () => "$" + stats.DeathsCost; + template.Get("ASSETS_DESTROYED").GetText = () => "$" + stats.KillsCost; + template.Get("ASSETS_LOST").GetText = () => "$" + stats.DeathsCost; template.Get("UNITS_KILLED").GetText = () => stats.UnitsKilled.ToString(); template.Get("UNITS_DEAD").GetText = () => stats.UnitsDead.ToString(); template.Get("BUILDINGS_KILLED").GetText = () => stats.BuildingsKilled.ToString(); @@ -271,7 +271,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic if (stats == null) return template; template.Get("KILLS").GetText = () => (stats.UnitsKilled + stats.BuildingsKilled).ToString(); template.Get("DEATHS").GetText = () => (stats.UnitsDead + stats.BuildingsDead).ToString(); - template.Get("KD_RATIO").GetText = () => KillDeathRatio(stats.UnitsKilled + stats.BuildingsKilled, stats.UnitsDead + stats.BuildingsDead); + template.Get("ASSETS_DESTROYED").GetText = () => "$" + stats.KillsCost; + template.Get("ASSETS_LOST").GetText = () => "$" + stats.DeathsCost; template.Get("ACTIONS_MIN").GetText = () => AverageOrdersPerMinute(stats.OrderCount); return template; diff --git a/mods/cnc/chrome/ingame-observerstats.yaml b/mods/cnc/chrome/ingame-observerstats.yaml index 0bd3ca3211..ae890bb166 100644 --- a/mods/cnc/chrome/ingame-observerstats.yaml +++ b/mods/cnc/chrome/ingame-observerstats.yaml @@ -74,16 +74,24 @@ Background@INGAME_OBSERVERSTATS_BG: Font: Bold Text: Deaths Align: Right - Label@KD_RATIO_HEADER: - X: 615 + Label@ASSETS_DESTROYED_HEADER: + X: 625 Y: 40 - Width: 80 + Width: 60 Height: 25 Font: Bold - Text: Kills/Deaths + Text: Destroyed + Align: Right + Label@ASSETS_LOST_HEADER: + X: 685 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Lost Align: Right Label@ACTIONS_MIN_HEADER: - X: 745 + X: 805 Y: 40 Width: 40 Height: 25 @@ -193,20 +201,20 @@ Background@INGAME_OBSERVERSTATS_BG: Height: 25 Font: Bold Text: Player - Label@KILLS_COST_HEADER: - X: 235 + Label@ASSETS_DESTROYED_HEADER: + X: 230 Y: 40 Width: 60 Height: 25 Font: Bold - Text: Kills - Label@DEATHS_COST_HEADER: - X: 315 + Text: Destroyed + Label@ASSETS_LOST_HEADER: + X: 325 Y: 40 Width: 60 Height: 25 Font: Bold - Text: Deaths + Text: Lost Label@UNITS_KILLED_HEADER: X: 415 Y: 40 @@ -319,14 +327,20 @@ Background@INGAME_OBSERVERSTATS_BG: Width: 40 Height: PARENT_BOTTOM Align: Right - Label@KD_RATIO: + Label@ASSETS_DESTROYED: X: 595 Y: 0 - Width: 80 + Width: 60 + Height: PARENT_BOTTOM + Align: Right + Label@ASSETS_LOST: + X: 660 + Y: 0 + Width: 60 Height: PARENT_BOTTOM Align: Right Label@ACTIONS_MIN: - X: 725 + X: 775 Y: 0 Width: 40 Height: PARENT_BOTTOM @@ -434,12 +448,12 @@ Background@INGAME_OBSERVERSTATS_BG: Width: 160 Height: PARENT_BOTTOM Font: Bold - Label@KILLS_COST: + Label@ASSETS_DESTROYED: X: 215 Y: 0 Width: 60 Height: PARENT_BOTTOM - Label@DEATHS_COST: + Label@ASSETS_LOST: X: 295 Y: 0 Width: 60 diff --git a/mods/ra/chrome/ingame-observerstats.yaml b/mods/ra/chrome/ingame-observerstats.yaml index 4d82713e24..97c4d7bf1a 100644 --- a/mods/ra/chrome/ingame-observerstats.yaml +++ b/mods/ra/chrome/ingame-observerstats.yaml @@ -74,16 +74,24 @@ Background@INGAME_OBSERVERSTATS_BG: Font: Bold Text: Deaths Align: Right - Label@KD_RATIO_HEADER: + Label@ASSETS_DESTROYED_HEADER: X: 625 Y: 40 - Width: 80 + Width: 60 Height: 25 Font: Bold - Text: Kills/Deaths + Text: Destroyed + Align: Right + Label@ASSETS_LOST_HEADER: + X: 685 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Lost Align: Right Label@ACTIONS_MIN_HEADER: - X: 755 + X: 805 Y: 40 Width: 40 Height: 25 @@ -193,20 +201,20 @@ Background@INGAME_OBSERVERSTATS_BG: Height: 25 Font: Bold Text: Player - Label@KILLS_COST_HEADER: - X: 245 + Label@ASSETS_DESTROYED_HEADER: + X: 230 Y: 40 Width: 60 Height: 25 Font: Bold - Text: Kills - Label@DEATHS_COST_HEADER: + Text: Destroyed + Label@ASSETS_LOST_HEADER: X: 325 Y: 40 Width: 60 Height: 25 Font: Bold - Text: Deaths + Text: Lost Label@UNITS_KILLED_HEADER: X: 425 Y: 40 @@ -319,14 +327,20 @@ Background@INGAME_OBSERVERSTATS_BG: Width: 40 Height: PARENT_BOTTOM Align: Right - Label@KD_RATIO: + Label@ASSETS_DESTROYED: X: 595 Y: 0 - Width: 80 + Width: 60 + Height: PARENT_BOTTOM + Align: Right + Label@ASSETS_LOST: + X: 660 + Y: 0 + Width: 60 Height: PARENT_BOTTOM Align: Right Label@ACTIONS_MIN: - X: 725 + X: 775 Y: 0 Width: 40 Height: PARENT_BOTTOM @@ -434,12 +448,12 @@ Background@INGAME_OBSERVERSTATS_BG: Width: 160 Height: PARENT_BOTTOM Font: Bold - Label@KILLS_COST: + Label@ASSETS_DESTROYED: X: 215 Y: 0 Width: 60 Height: PARENT_BOTTOM - Label@DEATHS_COST: + Label@ASSETS_LOST: X: 295 Y: 0 Width: 60 diff --git a/mods/ts/chrome/ingame-observerstats.yaml b/mods/ts/chrome/ingame-observerstats.yaml index b7853bac20..7372b21194 100644 --- a/mods/ts/chrome/ingame-observerstats.yaml +++ b/mods/ts/chrome/ingame-observerstats.yaml @@ -74,16 +74,24 @@ Background@INGAME_OBSERVERSTATS_BG: Font: Bold Text: Deaths Align: Right - Label@KD_RATIO_HEADER: + Label@ASSETS_DESTROYED_HEADER: X: 625 Y: 40 - Width: 80 + Width: 60 Height: 25 Font: Bold - Text: Kills/Deaths + Text: Destroyed + Align: Right + Label@ASSETS_LOST_HEADER: + X: 685 + Y: 40 + Width: 60 + Height: 25 + Font: Bold + Text: Lost Align: Right Label@ACTIONS_MIN_HEADER: - X: 755 + X: 805 Y: 40 Width: 40 Height: 25 @@ -193,20 +201,20 @@ Background@INGAME_OBSERVERSTATS_BG: Height: 25 Font: Bold Text: Player - Label@KILLS_COST_HEADER: - X: 245 + Label@ASSETS_DESTROYED_HEADER: + X: 230 Y: 40 Width: 60 Height: 25 Font: Bold - Text: Kills - Label@DEATHS_COST_HEADER: + Text: Destroyed + Label@ASSETS_LOST_HEADER: X: 325 Y: 40 Width: 60 Height: 25 Font: Bold - Text: Deaths + Text: Lost Label@UNITS_KILLED_HEADER: X: 425 Y: 40 @@ -319,14 +327,20 @@ Background@INGAME_OBSERVERSTATS_BG: Width: 40 Height: PARENT_BOTTOM Align: Right - Label@KD_RATIO: + Label@ASSETS_DESTROYED: X: 595 Y: 0 - Width: 80 + Width: 60 + Height: PARENT_BOTTOM + Align: Right + Label@ASSETS_LOST: + X: 660 + Y: 0 + Width: 60 Height: PARENT_BOTTOM Align: Right Label@ACTIONS_MIN: - X: 725 + X: 775 Y: 0 Width: 40 Height: PARENT_BOTTOM @@ -436,12 +450,12 @@ Background@INGAME_OBSERVERSTATS_BG: Width: 160 Height: PARENT_BOTTOM Font: Bold - Label@KILLS_COST: + Label@ASSETS_DESTROYED: X: 215 Y: 0 Width: 60 Height: PARENT_BOTTOM - Label@DEATHS_COST: + Label@ASSETS_LOST: X: 295 Y: 0 Width: 60