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

Rid Transforms and Transform of "race"

Browse Source
This commit is contained in:
Pavel Penev
2015-08-05 18:15:11 +03:00
parent faf0da6994
commit 10aee9ffa9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Activities/Transform.cs
View File

@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Common.Activities
public string Notification = null; public string Notification = null;
public int ForceHealthPercentage = 0; public int ForceHealthPercentage = 0;
public bool SkipMakeAnims = false; public bool SkipMakeAnims = false;
public string Race = null; public string Faction = null;
public Transform(Actor self, string toActor) public Transform(Actor self, string toActor)
{ {
@@ -64,8 +64,8 @@ namespace OpenRA.Mods.Common.Activities
if (SkipMakeAnims) if (SkipMakeAnims)
init.Add(new SkipMakeAnimsInit()); init.Add(new SkipMakeAnimsInit());
if (Race != null) if (Faction != null)
init.Add(new FactionInit(Race)); init.Add(new FactionInit(Faction));
var health = self.TraitOrDefault<Health>(); var health = self.TraitOrDefault<Health>();
if (health != null) if (health != null)

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

@@ -55,14 +55,14 @@ namespace OpenRA.Mods.Common.Traits
readonly Actor self; readonly Actor self;
readonly TransformsInfo info; readonly TransformsInfo info;
readonly BuildingInfo buildingInfo; readonly BuildingInfo buildingInfo;
readonly string race; readonly string faction;
public Transforms(ActorInitializer init, TransformsInfo info) public Transforms(ActorInitializer init, TransformsInfo info)
{ {
self = init.Self; self = init.Self;
this.info = info; this.info = info;
buildingInfo = self.World.Map.Rules.Actors[info.IntoActor].Traits.GetOrDefault<BuildingInfo>(); buildingInfo = self.World.Map.Rules.Actors[info.IntoActor].Traits.GetOrDefault<BuildingInfo>();
race = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : self.Owner.Faction.InternalName; faction = init.Contains<FactionInit>() ? init.Get<FactionInit, string>() : self.Owner.Faction.InternalName;
} }
public string VoicePhraseForOrder(Actor self, Order order) public string VoicePhraseForOrder(Actor self, Order order)
@@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Traits
Facing = info.Facing, Facing = info.Facing,
Sounds = info.TransformSounds, Sounds = info.TransformSounds,
Notification = info.TransformNotification, Notification = info.TransformNotification,
Race = race Faction = faction
}; };
var makeAnimation = self.TraitOrDefault<WithMakeAnimation>(); var makeAnimation = self.TraitOrDefault<WithMakeAnimation>();