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

Trial a new resource model in cnc

Browse Source
This commit is contained in:
Paul Chote
2010-06-13 13:22:37 +12:00
parent 19ed7428c4
commit 640ac9b8e6
8 changed files with 112 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/OpenRA.Game.csproj
View File

@@ -200,7 +200,6 @@
<Compile Include="Traits\RallyPoint.cs" />
<Compile Include="Traits\Render\RenderSimple.cs" />
<Compile Include="Traits\Render\RenderUnit.cs" />
<Compile Include="Traits\StoresOre.cs" />
<Compile Include="Traits\Cloak.cs" />
<Compile Include="Traits\TraitsInterfaces.cs" />
<Compile Include="Traits\Turreted.cs" />
@@ -239,6 +238,7 @@
<Compile Include="GameRules\MusicInfo.cs" />
<Compile Include="Widgets\PowerBinWidget.cs" />
<Compile Include="Widgets\ImageWidget.cs" />
<Compile Include="Traits\StoresCash.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">

79
OpenRA.Game/Traits/Player/PlayerResources.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -8,29 +8,28 @@ namespace OpenRA.Traits
class PlayerResourcesInfo : ITraitInfo
{
public readonly int InitialCash = 10000;
public readonly int InitialOre = 0;
public readonly int AdviceInterval = 250;
public object Create(Actor self) { return new PlayerResources(self); }
}
public class PlayerResources : ITick
{
Player Owner;
int AdviceInterval;
int nextSiloAdviceTime = 0;
int nextPowerAdviceTime = 0;
public PlayerResources(Actor self)
{
var p = self.Owner;
Owner = p;
Cash = self.Info.Traits.Get<PlayerResourcesInfo>().InitialCash;
Ore = self.Info.Traits.Get<PlayerResourcesInfo>().InitialOre;
AdviceInterval = self.Info.Traits.Get<PlayerResourcesInfo>().AdviceInterval;
}
[Sync]
public int Cash;
[Sync]
public int Ore;
[Sync]
public int OreCapacity;
public int CashCapacity;
[Sync]
public int DisplayCash;
[Sync]
@@ -58,7 +57,7 @@ namespace OpenRA.Traits
if (PowerProvided - PowerDrained < 0)
if (PowerProvided - PowerDrained != oldBalance)
Owner.GiveAdvice(Rules.Info["world"].Traits.Get<EvaAlertsInfo>().LowPower);
nextPowerAdviceTime = 0;
}
public PowerState GetPowerState()
@@ -68,32 +67,23 @@ namespace OpenRA.Traits
return PowerState.Critical;
}
public float GetSiloFullness() { return (float)Ore / OreCapacity; }
public float GetSiloFullness() { return (float)Cash / CashCapacity; }
public void GiveCash(int num) { Cash += num; }
public void GiveOre(int num)
public void GiveCash(int num)
{
Ore += num;
if (Ore > OreCapacity)
Ore = OreCapacity; // trim off the overflow.
if (Ore > .8 * OreCapacity)
Owner.GiveAdvice(Owner.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>().SilosNeeded);
}
public bool TakeCash(int num)
{
if (Cash + Ore < num) return false;
if (Ore <= num)
Cash += num;
if (Cash > CashCapacity)
{
num -= Ore;
Ore = 0;
Cash -= num;
nextSiloAdviceTime = 0;
Cash = CashCapacity;
}
else
Ore -= num;
}
public bool TakeCash(int num)
{
if (Cash < num) return false;
Cash -= num;
return true;
}
@@ -104,21 +94,36 @@ namespace OpenRA.Traits
{
UpdatePower();
OreCapacity = self.World.Queries.OwnedBy[Owner].WithTrait<StoresOre>()
.Sum(a => a.Actor.Info.Traits.Get<StoresOreInfo>().Capacity);
if (--nextPowerAdviceTime <= 0)
{
if (PowerProvided - PowerDrained < 0)
Owner.GiveAdvice(Rules.Info["world"].Traits.Get<EvaAlertsInfo>().LowPower);
nextPowerAdviceTime = AdviceInterval;
}
CashCapacity = self.World.Queries.OwnedBy[Owner].WithTrait<StoresCash>()
.Sum(a => a.Actor.Info.Traits.Get<StoresCashInfo>().Capacity);
var totalMoney = Cash + Ore;
var diff = Math.Abs(totalMoney - DisplayCash);
if (--nextSiloAdviceTime <= 0)
{
if (Cash > 0.8*CashCapacity)
Owner.GiveAdvice(Owner.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>().SilosNeeded);
nextSiloAdviceTime = AdviceInterval;
}
var diff = Math.Abs(Cash - DisplayCash);
var move = Math.Min(Math.Max((int)(diff * displayCashFracPerFrame),
displayCashDeltaPerFrame), diff);
var eva = self.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
if (DisplayCash < totalMoney)
if (DisplayCash < Cash)
{
DisplayCash += move;
Sound.PlayToPlayer(self.Owner, eva.CashTickUp);
}
else if (DisplayCash > totalMoney)
else if (DisplayCash > Cash)
{
DisplayCash -= move;
Sound.PlayToPlayer(self.Owner, eva.CashTickDown);

10
OpenRA.Game/Traits/StoresOre.cs → OpenRA.Game/Traits/StoresCash.cs
View File

@@ -22,18 +22,18 @@ using System.Collections.Generic;
namespace OpenRA.Traits
{
class StoresOreInfo : TraitInfo<StoresOre>
class StoresCashInfo : TraitInfo<StoresCash>
{
public readonly int Pips = 0;
public readonly int Capacity = 0;
}
class StoresOre : IPips, IAcceptThief
class StoresCash : IPips, IAcceptThief
{
public void OnSteal(Actor self, Actor thief)
{
// Steal half the ore the building holds
var toSteal = self.Info.Traits.Get<StoresOreInfo>().Capacity / 2;
// Steal half the cash the building holds
var toSteal = self.Info.Traits.Get<StoresCashInfo>().Capacity / 2;
self.Owner.PlayerActor.traits.Get<PlayerResources>().TakeCash(toSteal);
thief.Owner.PlayerActor.traits.Get<PlayerResources>().GiveCash(toSteal);
@@ -43,7 +43,7 @@ namespace OpenRA.Traits
public IEnumerable<PipType> GetPips(Actor self)
{
var numPips = self.Info.Traits.Get<StoresOreInfo>().Pips;
var numPips = self.Info.Traits.Get<StoresCashInfo>().Pips;
return Graphics.Util.MakeArray( numPips,
i => (self.World.LocalPlayer.PlayerActor.traits.Get<PlayerResources>().GetSiloFullness() > i * 1.0f / numPips)