From 4ca42f6e8340a8871b30dee2690bf373ac8f37bb Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sun, 6 Oct 2019 12:09:24 +0200 Subject: [PATCH] Remove $/min from the basic stats --- .../Logic/Ingame/ObserverStatsLogic.cs | 1 - mods/cnc/chrome/ingame.yaml | 48 ++++++------------ mods/common/chrome/ingame-observer.yaml | 48 ++++++------------ mods/ra/chrome/ingame-observer.yaml | 50 +++++++------------ mods/ts/chrome/ingame-observer.yaml | 48 ++++++------------ 5 files changed, 65 insertions(+), 130 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs index 0db9114b5a..038b9becce 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs @@ -383,7 +383,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic var res = player.PlayerActor.Trait(); template.Get("CASH").GetText = () => "$" + (res.Cash + res.Resources); - template.Get("EARNED_MIN").GetText = () => AverageEarnedPerMinute(res.Earned); var powerRes = player.PlayerActor.TraitOrDefault(); if (powerRes != null) diff --git a/mods/cnc/chrome/ingame.yaml b/mods/cnc/chrome/ingame.yaml index e8d448b9aa..ffffbbc632 100644 --- a/mods/cnc/chrome/ingame.yaml +++ b/mods/cnc/chrome/ingame.yaml @@ -288,7 +288,7 @@ Container@OBSERVER_WIDGETS: Container@BASIC_STATS_HEADERS: X: 0 Y: 0 - Width: 765 + Width: 705 Height: PARENT_BOTTOM Children: ColorBlock@HEADER_COLOR: @@ -322,17 +322,8 @@ Container@OBSERVER_WIDGETS: Text: Cash Align: Right Shadow: True - Label@EARNED_MIN_HEADER: - X: 240 - Y: 0 - Width: 60 - Height: PARENT_BOTTOM - Font: Bold - Text: $/min - Align: Right - Shadow: True Label@POWER_HEADER: - X: 300 + X: 240 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -341,7 +332,7 @@ Container@OBSERVER_WIDGETS: Align: Center Shadow: True Label@KILLS_HEADER: - X: 380 + X: 320 Y: 0 Width: 40 Height: PARENT_BOTTOM @@ -350,7 +341,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@DEATHS_HEADER: - X: 420 + X: 360 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -359,7 +350,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ASSETS_DESTROYED_HEADER: - X: 480 + X: 420 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -368,7 +359,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ASSETS_LOST_HEADER: - X: 560 + X: 500 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -377,7 +368,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@EXPERIENCE_HEADER: - X: 640 + X: 580 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -386,7 +377,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ACTIONS_MIN_HEADER: - X: 700 + X: 640 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -679,7 +670,7 @@ Container@OBSERVER_WIDGETS: ScrollItem@BASIC_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: 765 + Width: 705 Height: 24 BaseName: scrollitem-nohover Children: @@ -714,57 +705,50 @@ Container@OBSERVER_WIDGETS: Height: PARENT_BOTTOM Align: Right Shadow: True - Label@EARNED_MIN: - X: 240 - Y: 0 - Width: 60 - Height: PARENT_BOTTOM - Align: Right - Shadow: True Label@POWER: - X: 300 + X: 240 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Center Shadow: True Label@KILLS: - X: 380 + X: 320 Y: 0 Width: 40 Height: PARENT_BOTTOM Align: Right Shadow: True Label@DEATHS: - X: 420 + X: 360 Y: 0 Width: 60 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ASSETS_DESTROYED: - X: 480 + X: 420 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ASSETS_LOST: - X: 560 + X: 500 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Right Shadow: True Label@EXPERIENCE: - X: 640 + X: 580 Y: 0 Width: 60 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ACTIONS_MIN: - X: 700 + X: 640 Y: 0 Width: 60 Height: PARENT_BOTTOM diff --git a/mods/common/chrome/ingame-observer.yaml b/mods/common/chrome/ingame-observer.yaml index c60c2f012f..7958ecdb18 100644 --- a/mods/common/chrome/ingame-observer.yaml +++ b/mods/common/chrome/ingame-observer.yaml @@ -192,7 +192,7 @@ Container@OBSERVER_WIDGETS: Container@BASIC_STATS_HEADERS: X: 0 Y: 0 - Width: 760 + Width: 700 Height: PARENT_BOTTOM Children: ColorBlock@HEADER_COLOR: @@ -226,17 +226,8 @@ Container@OBSERVER_WIDGETS: Text: Cash Align: Right Shadow: True - Label@EARNED_MIN_HEADER: - X: 235 - Y: 0 - Width: 60 - Height: PARENT_BOTTOM - Font: Bold - Text: $/min - Align: Right - Shadow: True Label@POWER_HEADER: - X: 295 + X: 235 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -245,7 +236,7 @@ Container@OBSERVER_WIDGETS: Align: Center Shadow: True Label@KILLS_HEADER: - X: 375 + X: 315 Y: 0 Width: 40 Height: PARENT_BOTTOM @@ -254,7 +245,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@DEATHS_HEADER: - X: 415 + X: 355 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -263,7 +254,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ASSETS_DESTROYED_HEADER: - X: 475 + X: 415 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -272,7 +263,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ASSETS_LOST_HEADER: - X: 555 + X: 495 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -281,7 +272,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@EXPERIENCE_HEADER: - X: 635 + X: 575 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -290,7 +281,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ACTIONS_MIN_HEADER: - X: 695 + X: 635 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -575,7 +566,7 @@ Container@OBSERVER_WIDGETS: ScrollItem@BASIC_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: 760 + Width: 700 Height: 25 BaseName: scrollitem-nohover Children: @@ -608,57 +599,50 @@ Container@OBSERVER_WIDGETS: Height: PARENT_BOTTOM Align: Right Shadow: True - Label@EARNED_MIN: - X: 235 - Y: 0 - Width: 60 - Height: PARENT_BOTTOM - Align: Right - Shadow: True Label@POWER: - X: 295 + X: 235 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Center Shadow: True Label@KILLS: - X: 375 + X: 315 Y: 0 Width: 40 Height: PARENT_BOTTOM Align: Right Shadow: True Label@DEATHS: - X: 415 + X: 355 Y: 0 Width: 60 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ASSETS_DESTROYED: - X: 475 + X: 415 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ASSETS_LOST: - X: 555 + X: 495 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Right Shadow: True Label@EXPERIENCE: - X: 635 + X: 575 Y: 0 Width: 60 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ACTIONS_MIN: - X: 695 + X: 635 Y: 0 Width: 60 Height: PARENT_BOTTOM diff --git a/mods/ra/chrome/ingame-observer.yaml b/mods/ra/chrome/ingame-observer.yaml index 71829dddb6..2b69e80395 100644 --- a/mods/ra/chrome/ingame-observer.yaml +++ b/mods/ra/chrome/ingame-observer.yaml @@ -224,7 +224,7 @@ Container@OBSERVER_WIDGETS: Container@BASIC_STATS_HEADERS: X: 0 Y: 0 - Width: 765 + Width: 705 Height: PARENT_BOTTOM Children: ColorBlock@HEADER_COLOR: @@ -258,17 +258,8 @@ Container@OBSERVER_WIDGETS: Text: Cash Align: Right Shadow: True - Label@EARNED_MIN_HEADER: - X: 240 - Y: 0 - Width: 60 - Height: PARENT_BOTTOM - Font: Bold - Text: $/min - Align: Right - Shadow: True Label@POWER_HEADER: - X: 300 + X: 240 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -277,7 +268,7 @@ Container@OBSERVER_WIDGETS: Align: Center Shadow: True Label@KILLS_HEADER: - X: 380 + X: 320 Y: 0 Width: 40 Height: PARENT_BOTTOM @@ -286,7 +277,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@DEATHS_HEADER: - X: 420 + X: 360 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -295,7 +286,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ASSETS_DESTROYED_HEADER: - X: 480 + X: 420 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -304,7 +295,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ASSETS_LOST_HEADER: - X: 560 + X: 500 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -313,7 +304,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@EXPERIENCE_HEADER: - X: 640 + X: 580 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -322,7 +313,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ACTIONS_MIN_HEADER: - X: 700 + X: 640 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -591,7 +582,7 @@ Container@OBSERVER_WIDGETS: ScrollItem@TEAM_TEMPLATE: X: 0 Y: 0 - Width: 650 #PARENT_RIGHT - 35 + Width: 650 Height: 24 Children: ColorBlock@TEAM_COLOR: @@ -617,7 +608,7 @@ Container@OBSERVER_WIDGETS: ScrollItem@BASIC_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: 765 + Width: 705 Height: 24 BaseName: scrollitem-nohover Children: @@ -652,57 +643,50 @@ Container@OBSERVER_WIDGETS: Height: PARENT_BOTTOM Align: Right Shadow: True - Label@EARNED_MIN: - X: 240 - Y: 0 - Width: 60 - Height: PARENT_BOTTOM - Align: Right - Shadow: True Label@POWER: - X: 300 + X: 240 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Center Shadow: True Label@KILLS: - X: 380 + X: 320 Y: 0 Width: 40 Height: PARENT_BOTTOM Align: Right Shadow: True Label@DEATHS: - X: 420 + X: 360 Y: 0 Width: 60 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ASSETS_DESTROYED: - X: 480 + X: 420 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ASSETS_LOST: - X: 560 + X: 500 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Right Shadow: True Label@EXPERIENCE: - X: 640 + X: 580 Y: 0 Width: 60 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ACTIONS_MIN: - X: 700 + X: 640 Y: 0 Width: 60 Height: PARENT_BOTTOM diff --git a/mods/ts/chrome/ingame-observer.yaml b/mods/ts/chrome/ingame-observer.yaml index 3bfb06a11a..1e7272d47d 100644 --- a/mods/ts/chrome/ingame-observer.yaml +++ b/mods/ts/chrome/ingame-observer.yaml @@ -192,7 +192,7 @@ Container@OBSERVER_WIDGETS: Container@BASIC_STATS_HEADERS: X: 0 Y: 0 - Width: 765 + Width: 705 Height: PARENT_BOTTOM Children: ColorBlock@HEADER_COLOR: @@ -226,17 +226,8 @@ Container@OBSERVER_WIDGETS: Text: Cash Align: Right Shadow: True - Label@EARNED_MIN_HEADER: - X: 240 - Y: 0 - Width: 60 - Height: PARENT_BOTTOM - Font: Bold - Text: $/min - Align: Right - Shadow: True Label@POWER_HEADER: - X: 300 + X: 240 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -245,7 +236,7 @@ Container@OBSERVER_WIDGETS: Align: Center Shadow: True Label@KILLS_HEADER: - X: 380 + X: 320 Y: 0 Width: 40 Height: PARENT_BOTTOM @@ -254,7 +245,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@DEATHS_HEADER: - X: 420 + X: 360 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -263,7 +254,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ASSETS_DESTROYED_HEADER: - X: 480 + X: 420 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -272,7 +263,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ASSETS_LOST_HEADER: - X: 560 + X: 500 Y: 0 Width: 80 Height: PARENT_BOTTOM @@ -281,7 +272,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@EXPERIENCE_HEADER: - X: 640 + X: 580 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -290,7 +281,7 @@ Container@OBSERVER_WIDGETS: Align: Right Shadow: True Label@ACTIONS_MIN_HEADER: - X: 700 + X: 640 Y: 0 Width: 60 Height: PARENT_BOTTOM @@ -575,7 +566,7 @@ Container@OBSERVER_WIDGETS: ScrollItem@BASIC_PLAYER_TEMPLATE: X: 0 Y: 0 - Width: 765 + Width: 705 Height: 24 BaseName: scrollitem-nohover Children: @@ -610,57 +601,50 @@ Container@OBSERVER_WIDGETS: Height: PARENT_BOTTOM Align: Right Shadow: True - Label@EARNED_MIN: - X: 240 - Y: 0 - Width: 60 - Height: PARENT_BOTTOM - Align: Right - Shadow: True Label@POWER: - X: 300 + X: 240 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Center Shadow: True Label@KILLS: - X: 380 + X: 320 Y: 0 Width: 40 Height: PARENT_BOTTOM Align: Right Shadow: True Label@DEATHS: - X: 420 + X: 360 Y: 0 Width: 60 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ASSETS_DESTROYED: - X: 480 + X: 420 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ASSETS_LOST: - X: 560 + X: 500 Y: 0 Width: 80 Height: PARENT_BOTTOM Align: Right Shadow: True Label@EXPERIENCE: - X: 640 + X: 580 Y: 0 Width: 60 Height: PARENT_BOTTOM Align: Right Shadow: True Label@ACTIONS_MIN: - X: 700 + X: 640 Y: 0 Width: 60 Height: PARENT_BOTTOM