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

6
OpenRA.Mods.RA/Combat.cs Executable file → Normal file
View File

@@ -71,14 +71,14 @@ namespace OpenRA.Mods.RA
throw new NotImplementedException("Unknown smudge type `{0}`".F(smudgeType));
smudgeLayer.AddSmudge(sc);
if (warhead.Ore)
if (warhead.DestroyResources)
resLayer.Destroy(sc);
}
// Destroy all resources in range, not just the outer shell:
foreach (var cell in allCells)
{
if (warhead.Ore)
if (warhead.DestroyResources)
resLayer.Destroy(cell);
}
}
@@ -95,7 +95,7 @@ namespace OpenRA.Mods.RA
}
}
if (warhead.Ore)
if (warhead.DestroyResources)
world.WorldActor.Trait<ResourceLayer>().Destroy(targetTile);
switch (warhead.DamageModel)

2
OpenRA.Mods.RA/InfiltrateForCash.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.RA
var targetResources = self.Owner.PlayerActor.Trait<PlayerResources>();
var spyResources = infiltrator.Owner.PlayerActor.Trait<PlayerResources>();
var toTake = (targetResources.Cash + targetResources.Ore) * info.Percentage / 100;
var toTake = (targetResources.Cash + targetResources.Resources) * info.Percentage / 100;
var toGive = Math.Max(toTake, info.Minimum);
targetResources.TakeCash(toTake);

2
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -358,7 +358,7 @@
<Compile Include="SpawnMPUnits.cs" />
<Compile Include="SpawnMapActors.cs" />
<Compile Include="Disguise.cs" />
<Compile Include="StoresOre.cs" />
<Compile Include="StoresResources.cs" />
<Compile Include="StrategicVictoryConditions.cs" />
<Compile Include="SupplyTruck.cs" />
<Compile Include="SupportPowers\AirstrikePower.cs" />

4
OpenRA.Mods.RA/OreRefinery.cs
View File

@@ -63,11 +63,11 @@ namespace OpenRA.Mods.RA
.Where(a => a.Trait.LinkedProc == self);
}
public bool CanGiveOre(int amount) { return PlayerResources.CanGiveOre(amount); }
public bool CanGiveOre(int amount) { return PlayerResources.CanGiveResources(amount); }
public void GiveOre(int amount)
{
PlayerResources.GiveOre(amount);
PlayerResources.GiveResources(amount);
if (Info.ShowTicks)
currentDisplayValue += amount;
}

5
OpenRA.Mods.RA/Render/RenderBuildingSilo.cs Executable file → Normal file
View File

@@ -30,9 +30,10 @@ namespace OpenRA.Mods.RA.Render
public void BuildingComplete(Actor self)
{
var animation = (self.GetDamageState() >= DamageState.Heavy) ? "damaged-idle" : "idle";
DefaultAnimation.PlayFetchIndex(animation,
() => playerResources.OreCapacity != 0
? ((10 * DefaultAnimation.CurrentSequence.Length - 1) * playerResources.Ore) / (10 * playerResources.OreCapacity)
() => playerResources.ResourceCapacity != 0
? ((10 * DefaultAnimation.CurrentSequence.Length - 1) * playerResources.Resources) / (10 * playerResources.ResourceCapacity)
: 0);
}

4
OpenRA.Mods.RA/Render/WithResources.cs Executable file → Normal file
View File

@@ -37,8 +37,8 @@ namespace OpenRA.Mods.RA.Render
anim = new Animation(self.World, rs.GetImage(self));
anim.PlayFetchIndex(info.Sequence,
() => playerResources.OreCapacity != 0
? ((10 * anim.CurrentSequence.Length - 1) * playerResources.Ore) / (10 * playerResources.OreCapacity)
() => playerResources.ResourceCapacity != 0
? ((10 * anim.CurrentSequence.Length - 1) * playerResources.Resources) / (10 * playerResources.ResourceCapacity)
: 0);
rs.Add("resources_{0}".F(info.Sequence), new AnimationWithOffset(

6
OpenRA.Mods.RA/Scripting/Properties/ResourceProperties.cs
View File

@@ -28,12 +28,12 @@ namespace OpenRA.Mods.RA.Scripting
[Desc("The amount of harvestable resources held by the player.")]
public int Resources
{
get { return pr.Ore; }
set { pr.Ore = value.Clamp(0, pr.OreCapacity); }
get { return pr.Resources; }
set { pr.Resources = value.Clamp(0, pr.ResourceCapacity); }
}
[Desc("The maximum resource storage of the player.")]
public int ResourceCapacity { get { return pr.OreCapacity; } }
public int ResourceCapacity { get { return pr.ResourceCapacity; } }
[Desc("The amount of cash held by the player.")]
public int Cash

28
OpenRA.Mods.RA/StoresOre.cs → OpenRA.Mods.RA/StoresResources.cs
View File

@@ -1,6 +1,6 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
@@ -13,23 +13,23 @@ using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
class StoresOreInfo : ITraitInfo
class StoresResourcesInfo : ITraitInfo
{
[Desc("Number of little squares used to display how filled unit is.")]
public readonly int PipCount = 0;
public readonly PipType PipColor = PipType.Yellow;
public readonly int Capacity = 0;
public object Create(ActorInitializer init) { return new StoresOre(init.self, this); }
public object Create(ActorInitializer init) { return new StoresResources(init.self, this); }
}
class StoresOre : IPips, INotifyCapture, INotifyKilled, IExplodeModifier, IStoreOre, ISync
class StoresResources : IPips, INotifyCapture, INotifyKilled, IExplodeModifier, IStoreResources, ISync
{
readonly StoresOreInfo Info;
readonly StoresResourcesInfo Info;
[Sync] public int Stored { get { return Player.OreCapacity == 0 ? 0 : Info.Capacity * Player.Ore / Player.OreCapacity; } }
[Sync] public int Stored { get { return Player.ResourceCapacity == 0 ? 0 : Info.Capacity * Player.Resources / Player.ResourceCapacity; } }
PlayerResources Player;
public StoresOre(Actor self, StoresOreInfo info)
public StoresResources(Actor self, StoresResourcesInfo info)
{
Player = self.Owner.PlayerActor.Trait<PlayerResources>();
Info = info;
@@ -39,22 +39,22 @@ namespace OpenRA.Mods.RA
public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner)
{
var ore = Stored;
Player.TakeOre(ore);
var resources = Stored;
Player.TakeResources(resources);
Player = newOwner.PlayerActor.Trait<PlayerResources>();
Player.GiveOre(ore);
Player.GiveResources(resources);
}
public void Killed(Actor self, AttackInfo e)
{
Player.TakeOre(Stored); // Lose the stored ore
Player.TakeResources(Stored); // lose the stored resources
}
public IEnumerable<PipType> GetPips(Actor self)
{
return Exts.MakeArray( Info.PipCount,
i => ( Player.Ore * Info.PipCount > i * Player.OreCapacity )
? Info.PipColor : PipType.Transparent );
return Exts.MakeArray(Info.PipCount,
i => (Player.Resources * Info.PipCount > i * Player.ResourceCapacity)
? Info.PipColor : PipType.Transparent);
}
public bool ShouldExplode(Actor self) { return Stored > 0; }

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())