epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename ore to the more generic name resources everywhere

Browse Source
This commit is contained in:
Matthias Mailänder
2014-05-17 14:38:07 +02:00
parent 30fa8f35d8
commit 3e627d2eba
24 changed files with 107 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs
View File

@@ -489,7 +489,7 @@ namespace OpenRA.Mods.RA.Widgets
var power = pl.PlayerActor.Trait<PowerManager>();
DrawRightAligned("${0}".F(cost), pos + new int2(-5, 5),
(resources.DisplayCash + resources.DisplayOre >= cost ? Color.White : Color.Red));
(resources.DisplayCash + resources.DisplayResources >= cost ? Color.White : Color.Red));
var lowpower = power.PowerState != PowerState.Normal;
var time = CurrentQueue.GetBuildTime(info.Name)

4
OpenRA.Mods.RA/Widgets/Logic/ObserverStatsLogic.cs
View File

@@ -226,7 +226,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var stats = player.PlayerActor.TraitOrDefault<PlayerStatistics>();
if (stats == null) return template;
template.Get<LabelWidget>("CASH").GetText = () => "$" + (res.DisplayCash + res.DisplayOre);
template.Get<LabelWidget>("CASH").GetText = () => "$" + (res.DisplayCash + res.DisplayResources);
template.Get<LabelWidget>("EARNED_MIN").GetText = () => AverageEarnedPerMinute(res.Earned);
template.Get<LabelWidget>("EARNED_THIS_MIN").GetText = () => "$" + stats.EarnedThisMinute;
template.Get<LabelWidget>("EARNED").GetText = () => "$" + res.Earned;
@@ -251,7 +251,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
LobbyUtils.AddPlayerFlagAndName(template, player);
var res = player.PlayerActor.Trait<PlayerResources>();
template.Get<LabelWidget>("CASH").GetText = () => "$" + (res.DisplayCash + res.DisplayOre);
template.Get<LabelWidget>("CASH").GetText = () => "$" + (res.DisplayCash + res.DisplayResources);
template.Get<LabelWidget>("EARNED_MIN").GetText = () => AverageEarnedPerMinute(res.Earned);
var powerRes = player.PlayerActor.Trait<PowerManager>();

2
OpenRA.Mods.RA/Widgets/MoneyBinWidget.cs Executable file → Normal file
View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.RA.Widgets
new float2(Bounds.Left, 0));
// Cash
var cashDigits = (playerResources.DisplayCash + playerResources.DisplayOre).ToString();
var cashDigits = (playerResources.DisplayCash + playerResources.DisplayResources).ToString();
var x = Bounds.Right - 65;
foreach (var d in cashDigits.Reverse())