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

Merge pull request #8979 from penev92/bleed_production

Browse Source 
Remove producer-is-in-world assumptions from Production
This commit is contained in:
Matthias Mailänder
2015-08-09 21:29:29 +02:00
parent 021b344532 3cb707ad3c
commit 4d360a66ed
1 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenRA.Mods.Common/Traits/Production.cs
View File

@@ -35,39 +35,50 @@ namespace OpenRA.Mods.Common.Traits
public ProductionInfo Info; public ProductionInfo Info;
public string Faction { get; private set; } public string Faction { get; private set; }
readonly bool occupiesSpace;
public Production(ActorInitializer init, ProductionInfo info) public Production(ActorInitializer init, ProductionInfo info)
{ {
Info = info; Info = info;
occupiesSpace = init.Self.Info.Traits.WithInterface<IOccupySpaceInfo>().Any();
rp = Exts.Lazy(() => init.Self.IsDead ? null : init.Self.TraitOrDefault<RallyPoint>()); rp = Exts.Lazy(() => init.Self.IsDead ? null : init.Self.TraitOrDefault<RallyPoint>());
Faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName; Faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : init.Self.Owner.Faction.InternalName;
} }
public void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo, string factionVariant) public void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo, string factionVariant)
{ {
var exit = self.Location + exitinfo.ExitCell; var exit = CPos.Zero;
var spawn = self.CenterPosition + exitinfo.SpawnOffset; var exitLocation = CPos.Zero;
var to = self.World.Map.CenterOfCell(exit); var target = Target.Invalid;
var fi = producee.Traits.GetOrDefault<IFacingInfo>();
var initialFacing = exitinfo.Facing < 0 ? Util.GetFacing(to - spawn, fi == null ? 0 : fi.GetInitialFacing()) : exitinfo.Facing;
var exitLocation = rp.Value != null ? rp.Value.Location : exit;
var target = Target.FromCell(self.World, exitLocation);
var bi = producee.Traits.GetOrDefault<BuildableInfo>(); var bi = producee.Traits.GetOrDefault<BuildableInfo>();
if (bi != null && bi.ForceFaction != null) if (bi != null && bi.ForceFaction != null)
factionVariant = bi.ForceFaction; factionVariant = bi.ForceFaction;
var td = new TypeDictionary
{
new OwnerInit(self.Owner),
};
if (occupiesSpace)
{
exit = self.Location + exitinfo.ExitCell;
var spawn = self.CenterPosition + exitinfo.SpawnOffset;
var to = self.World.Map.CenterOfCell(exit);
var fi = producee.Traits.GetOrDefault<IFacingInfo>();
var initialFacing = exitinfo.Facing < 0 ? Util.GetFacing(to - spawn, fi == null ? 0 : fi.GetInitialFacing()) : exitinfo.Facing;
exitLocation = rp.Value != null ? rp.Value.Location : exit;
target = Target.FromCell(self.World, exitLocation);
td.Add(new LocationInit(exit));
td.Add(new CenterPositionInit(spawn));
td.Add(new FacingInit(initialFacing));
}
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
var td = new TypeDictionary
{
new OwnerInit(self.Owner),
new LocationInit(exit),
new CenterPositionInit(spawn),
new FacingInit(initialFacing)
};
if (factionVariant != null) if (factionVariant != null)
td.Add(new FactionInit(factionVariant)); td.Add(new FactionInit(factionVariant));
@@ -107,7 +118,13 @@ namespace OpenRA.Mods.Common.Traits
if (Reservable.IsReserved(self)) if (Reservable.IsReserved(self))
return false; return false;
// pick a spawn/exit point pair if (!occupiesSpace)
{
DoProduction(self, producee, null, factionVariant);
return true;
}
// Pick a spawn/exit point pair
var exit = self.Info.Traits.WithInterface<ExitInfo>().Shuffle(self.World.SharedRandom) var exit = self.Info.Traits.WithInterface<ExitInfo>().Shuffle(self.World.SharedRandom)
.FirstOrDefault(e => CanUseExit(self, producee, e)); .FirstOrDefault(e => CanUseExit(self, producee, e));