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

Remove thief; transfer ore along with stolen silo/proc.

Browse Source
This commit is contained in:
Paul Chote
2010-06-14 20:58:40 +12:00
parent 283512f314
commit 24edba34a7
7 changed files with 28 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,6 +146,14 @@ namespace OpenRA.Traits
}
}
public bool TakeOre(int num)
{
if (Ore < num) return false;
Ore -= num;
return true;
}
public void GiveCash(int num)
{
Cash += num;

27
OpenRA.Game/Traits/StoresOre.cs
View File

@@ -19,7 +19,7 @@
#endregion
using System.Collections.Generic;
namespace OpenRA.Traits
{
class StoresOreInfo : TraitInfo<StoresOre>
@@ -28,17 +28,20 @@ namespace OpenRA.Traits
public readonly int Capacity = 0;
}
class StoresOre : IPips, IAcceptThief
{
public void OnSteal(Actor self, Actor thief)
class StoresOre : IPips, INotifyCapture
{
public void OnCapture(Actor self, Actor captor)
{
// Steal half the cash the building holds
var toSteal = self.Info.Traits.Get<StoresOreInfo>().Capacity / 2;
self.Owner.PlayerActor.traits.Get<PlayerResources>().TakeCash(toSteal);
thief.Owner.PlayerActor.traits.Get<PlayerResources>().GiveCash(toSteal);
var eva = thief.World.WorldActor.Info.Traits.Get<EvaAlertsInfo>();
Sound.PlayToPlayer(thief.Owner, eva.CreditsStolen);
var ore = Stored(self);
self.Owner.PlayerActor.traits.Get<PlayerResources>().TakeOre(ore);
captor.Owner.PlayerActor.traits.Get<PlayerResources>().GiveOre(ore);
}
int Stored(Actor self)
{
var use = self.Owner.PlayerActor.traits.Get<PlayerResources>().GetSiloFullness();
var capacity = self.Info.Traits.Get<StoresOreInfo>().Capacity;
return (int)use*capacity;
}
public IEnumerable<PipType> GetPips(Actor self)
@@ -46,7 +49,7 @@ namespace OpenRA.Traits
var numPips = self.Info.Traits.Get<StoresOreInfo>().Pips;
return Graphics.Util.MakeArray( numPips,
i => (self.World.LocalPlayer.PlayerActor.traits.Get<PlayerResources>().GetSiloFullness() > i * 1.0f / numPips)
i => (self.Owner.PlayerActor.traits.Get<PlayerResources>().GetSiloFullness() > i * 1.0f / numPips)
? PipType.Yellow : PipType.Transparent );
}
}

2
OpenRA.Game/Traits/TraitsInterfaces.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Traits
public interface INotifyDamage { void Damaged(Actor self, AttackInfo e); }
public interface INotifyBuildComplete { void BuildingComplete(Actor self); }
public interface INotifyProduction { void UnitProduced(Actor self, Actor other); }
public interface IAcceptThief { void OnSteal(Actor self, Actor thief); }
public interface INotifyCapture { void OnCapture(Actor self, Actor captor); }
public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); }
public interface INotifyEnterCell { void OnEnterCell(Actor self, int2 cell); }