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

Generalize factionVariant to a TypeDictionary of Inits.

Browse Source
This commit is contained in:
Paul Chote
2017-08-18 17:39:20 +00:00
committed by Pavel Penev
parent 315cc966f4
commit cfac996438
10 changed files with 77 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Mods.Cnc/Traits/Buildings/ClonesProducedUnits.cs
View File

@@ -12,6 +12,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using OpenRA.Mods.Common; using OpenRA.Mods.Common;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Cnc.Traits namespace OpenRA.Mods.Cnc.Traits
@@ -49,7 +50,13 @@ namespace OpenRA.Mods.Cnc.Traits
if (ci == null || !info.CloneableTypes.Overlaps(ci.Types)) if (ci == null || !info.CloneableTypes.Overlaps(ci.Types))
return; return;
production.Produce(self, produced.Info, faction); var inits = new TypeDictionary
{
new OwnerInit(self.Owner),
new FactionInit(BuildableInfo.GetInitialFaction(produced.Info, faction))
};
production.Produce(self, produced.Info, inits);
} }
} }
} }

5
OpenRA.Mods.Cnc/Traits/Buildings/ProductionAirdrop.cs
View File

@@ -9,6 +9,7 @@
*/ */
#endregion #endregion
using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Activities; using OpenRA.Activities;
using OpenRA.Mods.Common; using OpenRA.Mods.Common;
@@ -38,7 +39,7 @@ namespace OpenRA.Mods.Cnc.Traits
this.info = info; this.info = info;
} }
public override bool Produce(Actor self, ActorInfo producee, string factionVariant) public override bool Produce(Actor self, ActorInfo producee, TypeDictionary inits)
{ {
var owner = self.Owner; var owner = self.Owner;
var aircraftInfo = self.World.Map.Rules.Actors[info.ActorType].TraitInfo<AircraftInfo>(); var aircraftInfo = self.World.Map.Rules.Actors[info.ActorType].TraitInfo<AircraftInfo>();
@@ -79,7 +80,7 @@ namespace OpenRA.Mods.Cnc.Traits
foreach (var cargo in self.TraitsImplementing<INotifyDelivery>()) foreach (var cargo in self.TraitsImplementing<INotifyDelivery>())
cargo.Delivered(self); cargo.Delivered(self);
self.World.AddFrameEndTask(ww => DoProduction(self, producee, exit, factionVariant)); self.World.AddFrameEndTask(ww => DoProduction(self, producee, exit, inits));
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.ReadyAudio, self.Owner.Faction.InternalName); Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.ReadyAudio, self.Owner.Faction.InternalName);
})); }));

10
OpenRA.Mods.Common/Scripting/Properties/ProductionProperties.cs
View File

@@ -15,6 +15,7 @@ using System.Linq;
using Eluant; using Eluant;
using OpenRA.Mods.Common.Activities; using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Traits; using OpenRA.Mods.Common.Traits;
using OpenRA.Primitives;
using OpenRA.Scripting; using OpenRA.Scripting;
using OpenRA.Traits; using OpenRA.Traits;
@@ -39,7 +40,14 @@ namespace OpenRA.Mods.Common.Scripting
if (!Self.World.Map.Rules.Actors.TryGetValue(actorType, out actorInfo)) if (!Self.World.Map.Rules.Actors.TryGetValue(actorType, out actorInfo))
throw new LuaException("Unknown actor type '{0}'".F(actorType)); throw new LuaException("Unknown actor type '{0}'".F(actorType));
Self.QueueActivity(new WaitFor(() => p.Produce(Self, actorInfo, factionVariant))); var faction = factionVariant ?? BuildableInfo.GetInitialFaction(actorInfo, p.Faction);
var inits = new TypeDictionary
{
new OwnerInit(Self.Owner),
new FactionInit(faction)
};
Self.QueueActivity(new WaitFor(() => p.Produce(Self, actorInfo, inits)));
} }
} }

6
OpenRA.Mods.Common/Traits/Buildable.cs
View File

@@ -51,6 +51,12 @@ namespace OpenRA.Mods.Common.Traits
[Desc("Text shown in the production tooltip.")] [Desc("Text shown in the production tooltip.")]
[Translate] public readonly string Description = ""; [Translate] public readonly string Description = "";
public static string GetInitialFaction(ActorInfo ai, string defaultFaction)
{
var bi = ai.TraitInfoOrDefault<BuildableInfo>();
return bi != null ? bi.ForceFaction ?? defaultFaction : defaultFaction;
}
} }
public class Buildable { } public class Buildable { }

9
OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs
View File

@@ -11,6 +11,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -105,7 +106,13 @@ namespace OpenRA.Mods.Common.Traits
foreach (var p in producers.Where(p => !p.Actor.IsDisabled())) foreach (var p in producers.Where(p => !p.Actor.IsDisabled()))
{ {
if (p.Trait.Produce(p.Actor, unit, p.Trait.Faction)) var inits = new TypeDictionary
{
new OwnerInit(self.Owner),
new FactionInit(BuildableInfo.GetInitialFaction(unit, p.Trait.Faction))
};
if (p.Trait.Produce(p.Actor, unit, inits))
{ {
FinishProduction(); FinishProduction();
return true; return true;

9
OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
View File

@@ -12,6 +12,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -381,8 +382,14 @@ namespace OpenRA.Mods.Common.Traits
return true; return true;
} }
var inits = new TypeDictionary
{
new OwnerInit(self.Owner),
new FactionInit(BuildableInfo.GetInitialFaction(unit, Faction))
};
var sp = self.TraitsImplementing<Production>().FirstOrDefault(p => p.Info.Produces.Contains(Info.Type)); var sp = self.TraitsImplementing<Production>().FirstOrDefault(p => p.Info.Produces.Contains(Info.Type));
if (sp != null && !self.IsDisabled() && sp.Produce(self, unit, Faction)) if (sp != null && !self.IsDisabled() && sp.Produce(self, unit, inits))
{ {
FinishProduction(); FinishProduction();
return true; return true;

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

@@ -49,20 +49,16 @@ namespace OpenRA.Mods.Common.Traits
building = self.TraitOrDefault<Building>(); building = self.TraitOrDefault<Building>();
} }
public virtual void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo, string factionVariant) public virtual void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo, TypeDictionary inits)
{ {
var exit = CPos.Zero; var exit = CPos.Zero;
var exitLocation = CPos.Zero; var exitLocation = CPos.Zero;
var target = Target.Invalid; var target = Target.Invalid;
var bi = producee.TraitInfoOrDefault<BuildableInfo>(); // Clone the initializer dictionary for the new actor
if (bi != null && bi.ForceFaction != null) var td = new TypeDictionary();
factionVariant = bi.ForceFaction; foreach (var init in inits)
td.Add(init);
var td = new TypeDictionary
{
new OwnerInit(self.Owner),
};
if (self.OccupiesSpace != null) if (self.OccupiesSpace != null)
{ {
@@ -93,9 +89,6 @@ namespace OpenRA.Mods.Common.Traits
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (factionVariant != null)
td.Add(new FactionInit(factionVariant));
var newUnit = self.World.CreateActor(producee.Name, td); var newUnit = self.World.CreateActor(producee.Name, td);
var move = newUnit.TraitOrDefault<IMove>(); var move = newUnit.TraitOrDefault<IMove>();
@@ -127,7 +120,7 @@ namespace OpenRA.Mods.Common.Traits
}); });
} }
public virtual bool Produce(Actor self, ActorInfo producee, string factionVariant) public virtual bool Produce(Actor self, ActorInfo producee, TypeDictionary inits)
{ {
if (Reservable.IsReserved(self) || (building != null && building.Locked)) if (Reservable.IsReserved(self) || (building != null && building.Locked))
return false; return false;
@@ -138,7 +131,7 @@ namespace OpenRA.Mods.Common.Traits
if (exit != null || self.OccupiesSpace == null) if (exit != null || self.OccupiesSpace == null)
{ {
DoProduction(self, producee, exit, factionVariant); DoProduction(self, producee, exit, inits);
return true; return true;
} }

17
OpenRA.Mods.Common/Traits/ProductionFromMapEdge.cs
View File

@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Traits
rp = self.TraitOrDefault<RallyPoint>(); rp = self.TraitOrDefault<RallyPoint>();
} }
public override bool Produce(Actor self, ActorInfo producee, string factionVariant) public override bool Produce(Actor self, ActorInfo producee, TypeDictionary inits)
{ {
var aircraftInfo = producee.TraitInfoOrDefault<AircraftInfo>(); var aircraftInfo = producee.TraitInfoOrDefault<AircraftInfo>();
var mobileInfo = producee.TraitInfoOrDefault<MobileInfo>(); var mobileInfo = producee.TraitInfoOrDefault<MobileInfo>();
@@ -74,16 +74,13 @@ namespace OpenRA.Mods.Common.Traits
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
var td = new TypeDictionary var td = new TypeDictionary();
{ foreach (var init in inits)
new OwnerInit(self.Owner), td.Add(init);
new LocationInit(location.Value),
new CenterPositionInit(pos),
new FacingInit(initialFacing)
};
if (factionVariant != null) td.Add(new LocationInit(location.Value));
td.Add(new FactionInit(factionVariant)); td.Add(new CenterPositionInit(pos));
td.Add(new FacingInit(initialFacing));
var newUnit = self.World.CreateActor(producee.Name, td); var newUnit = self.World.CreateActor(producee.Name, td);

22
OpenRA.Mods.Common/Traits/ProductionParadrop.cs
View File

@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
rp = Exts.Lazy(() => init.Self.IsDead ? null : init.Self.TraitOrDefault<RallyPoint>()); rp = Exts.Lazy(() => init.Self.IsDead ? null : init.Self.TraitOrDefault<RallyPoint>());
} }
public override bool Produce(Actor self, ActorInfo producee, string factionVariant) public override bool Produce(Actor self, ActorInfo producee, TypeDictionary inits)
{ {
var owner = self.Owner; var owner = self.Owner;
@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Traits
foreach (var cargo in self.TraitsImplementing<INotifyDelivery>()) foreach (var cargo in self.TraitsImplementing<INotifyDelivery>())
cargo.Delivered(self); cargo.Delivered(self);
self.World.AddFrameEndTask(ww => DoProduction(self, producee, exit, factionVariant)); self.World.AddFrameEndTask(ww => DoProduction(self, producee, exit, inits));
Game.Sound.Play(SoundType.World, info.ChuteSound, self.CenterPosition); Game.Sound.Play(SoundType.World, info.ChuteSound, self.CenterPosition);
Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.ReadyAudio, self.Owner.Faction.InternalName); Game.Sound.PlayNotification(self.World.Map.Rules, self.Owner, "Speech", info.ReadyAudio, self.Owner.Faction.InternalName);
})); }));
@@ -97,7 +97,7 @@ namespace OpenRA.Mods.Common.Traits
return true; return true;
} }
public override void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo, string factionVariant) public override void DoProduction(Actor self, ActorInfo producee, ExitInfo exitinfo, TypeDictionary inits)
{ {
var exit = CPos.Zero; var exit = CPos.Zero;
var exitLocation = CPos.Zero; var exitLocation = CPos.Zero;
@@ -106,15 +106,12 @@ namespace OpenRA.Mods.Common.Traits
var info = (ProductionParadropInfo)Info; var info = (ProductionParadropInfo)Info;
var actorType = info.ActorType; var actorType = info.ActorType;
var bi = producee.TraitInfoOrDefault<BuildableInfo>();
if (bi != null && bi.ForceFaction != null)
factionVariant = bi.ForceFaction;
var altitude = self.World.Map.Rules.Actors[actorType].TraitInfo<AircraftInfo>().CruiseAltitude; var altitude = self.World.Map.Rules.Actors[actorType].TraitInfo<AircraftInfo>().CruiseAltitude;
var td = new TypeDictionary
{ // Clone the initializer dictionary for the new actor
new OwnerInit(self.Owner), var td = new TypeDictionary();
}; foreach (var init in inits)
td.Add(init);
if (self.OccupiesSpace != null) if (self.OccupiesSpace != null)
{ {
@@ -134,9 +131,6 @@ namespace OpenRA.Mods.Common.Traits
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (factionVariant != null)
td.Add(new FactionInit(factionVariant));
var newUnit = self.World.CreateActor(producee.Name, td); var newUnit = self.World.CreateActor(producee.Name, td);
newUnit.QueueActivity(new Parachute(newUnit, newUnit.CenterPosition, self)); newUnit.QueueActivity(new Parachute(newUnit, newUnit.CenterPosition, self));

14
OpenRA.Mods.Common/Traits/SupportPowers/ProduceActorPower.cs
View File

@@ -10,6 +10,7 @@
#endregion #endregion
using System.Linq; using System.Linq;
using OpenRA.Primitives;
using OpenRA.Traits; using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits namespace OpenRA.Mods.Common.Traits
@@ -64,8 +65,19 @@ namespace OpenRA.Mods.Common.Traits
var activated = false; var activated = false;
if (sp != null) if (sp != null)
{
foreach (var name in info.Actors) foreach (var name in info.Actors)
activated |= sp.Produce(self, self.World.Map.Rules.Actors[name], faction); {
var ai = self.World.Map.Rules.Actors[name];
var inits = new TypeDictionary
{
new OwnerInit(self.Owner),
new FactionInit(BuildableInfo.GetInitialFaction(ai, faction))
};
activated |= sp.Produce(self, ai, inits);
}
}
if (activated) if (activated)
Game.Sound.PlayNotification(self.World.Map.Rules, manager.Self.Owner, "Speech", info.ReadyAudio, self.Owner.Faction.InternalName); Game.Sound.PlayNotification(self.World.Map.Rules, manager.Self.Owner, "Speech", info.ReadyAudio, self.Owner.Faction.InternalName);