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

shuffle exits

Browse Source
This commit is contained in:
Chris Forbes
2010-12-27 19:43:32 +13:00
parent 888fe35f08
commit d8eaa7c841
2 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Game/Traits/Util.cs
View File

@@ -13,6 +13,7 @@ using System.Drawing;
using System.Linq; using System.Linq;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Support; using OpenRA.Support;
using System.Collections.Generic;
namespace OpenRA.Traits namespace OpenRA.Traits
{ {
@@ -132,5 +133,18 @@ namespace OpenRA.Traits
public static Color ArrayToColor(int[] x) { return Color.FromArgb(x[0], x[1], x[2]); } public static Color ArrayToColor(int[] x) { return Color.FromArgb(x[0], x[1], x[2]); }
public static int2 CellContaining(float2 pos) { return (1f / Game.CellSize * pos).ToInt2(); } public static int2 CellContaining(float2 pos) { return (1f / Game.CellSize * pos).ToInt2(); }
/* pretty crap */
public static IEnumerable<T> Shuffle<T>(this IEnumerable<T> ts, Thirdparty.Random random)
{
var items = ts.ToList();
while (items.Count > 0)
{
var t = items.Random(random);
yield return t;
items.Remove(t);
}
}
} }
} }

33
OpenRA.Mods.RA/Production.cs
View File

@@ -82,26 +82,21 @@ namespace OpenRA.Mods.RA
//Log.Write("debug", "{0} #{1} produced by {2} #{3}", newUnit.Info.Name, newUnit.ActorID, self.Info.Name, self.ActorID); //Log.Write("debug", "{0} #{1} produced by {2} #{3}", newUnit.Info.Name, newUnit.ActorID, self.Info.Name, self.ActorID);
} }
public virtual bool Produce( Actor self, ActorInfo producee )
{
// Todo: remove assumption on Mobile;
// required for 3-arg CanEnterCell
//var mobile = newUnit.Trait<Mobile>();
var mobileInfo = producee.Traits.Get<MobileInfo>();
var uim = self.World.WorldActor.Trait<UnitInfluence>();
// Pick a spawn/exit point pair
// Todo: Reorder in a synced random way
foreach (var s in self.Info.Traits.WithInterface<ExitInfo>())
if( mobileInfo.CanEnterCell( self.World, uim, self.Location + s.ExitCell,self,true ) )
{
DoProduction(self, producee, s);
return true;
}
return false;
}
public virtual bool Produce(Actor self, ActorInfo producee)
{
// todo: remove Mobile requirement.
var mobileInfo = producee.Traits.Get<MobileInfo>();
var uim = self.World.WorldActor.Trait<UnitInfluence>();
// pick a spawn/exit point pair
foreach (var s in self.Info.Traits.WithInterface<ExitInfo>().Shuffle(self.World.SharedRandom))
if (mobileInfo.CanEnterCell(self.World, uim, self.Location + s.ExitCell, self, true))
{
DoProduction(self, producee, s);
return true;
}
return false;
}
} }
} }