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

#2354 fixed - multiple collection of crates

Browse Source
This commit is contained in:
Chris Forbes
2012-08-09 10:25:45 +12:00
parent 063191b09e
commit 82eddfdf98
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Mods.RA/Crate.cs
View File

@@ -30,6 +30,7 @@ namespace OpenRA.Mods.RA
[Sync] int ticks; [Sync] int ticks;
[Sync] public CPos Location; [Sync] public CPos Location;
CrateInfo Info; CrateInfo Info;
bool collected;
public Crate(ActorInitializer init, CrateInfo info) public Crate(ActorInitializer init, CrateInfo info)
{ {
@@ -46,12 +47,16 @@ namespace OpenRA.Mods.RA
public void OnCrush(Actor crusher) public void OnCrush(Actor crusher)
{ {
if (collected) return;
var shares = self.TraitsImplementing<CrateAction>().Select( var shares = self.TraitsImplementing<CrateAction>().Select(
a => Pair.New(a, a.GetSelectionSharesOuter(crusher))); a => Pair.New(a, a.GetSelectionSharesOuter(crusher)));
var totalShares = shares.Sum(a => a.Second); var totalShares = shares.Sum(a => a.Second);
var n = self.World.SharedRandom.Next(totalShares); var n = self.World.SharedRandom.Next(totalShares);
self.Destroy(); self.Destroy();
collected = true;
foreach (var s in shares) foreach (var s in shares)
if (n < s.Second) if (n < s.Second)
{ {