diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 1358ef9ef4..5ae4ce36ea 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -192,15 +192,17 @@ namespace OpenRA Owner.Deaths++; if (RemoveOnDeath) - World.AddFrameEndTask(w => w.Remove(this)); + World.AddFrameEndTask(w => w.Remove(this)); + + Log.Write("{0} #{1} killed by {2} #{3}", Info.Name, ActorID, attacker.Info.Name, attacker.ActorID); } var maxHP = this.GetMaxHP(); if (Health > maxHP) Health = maxHP; - Log.Write("InflictDamage: {0} #{1} -> {2} #{3} raw={4} adj={5} hp={6} mod={7}", - attacker.Info.Name, attacker.ActorID, Info.Name, ActorID, rawDamage, damage, Health, modifier); +// Log.Write("InflictDamage: {0} #{1} -> {2} #{3} raw={4} adj={5} hp={6} mod={7}", +// attacker.Info.Name, attacker.ActorID, Info.Name, ActorID, rawDamage, damage, Health, modifier); var newState = GetDamageState(); diff --git a/OpenRA.Game/Traits/Production.cs b/OpenRA.Game/Traits/Production.cs index 848f5ff292..d4f609feb6 100755 --- a/OpenRA.Game/Traits/Production.cs +++ b/OpenRA.Game/Traits/Production.cs @@ -35,10 +35,7 @@ namespace OpenRA.Traits } public class Production : IIssueOrder, IResolveOrder, ITags - { - bool isPrimary = false; - public bool IsPrimary { get { return isPrimary; } } - + { public Production( Actor self ) { } public virtual int2? CreationLocation( Actor self, ActorInfo producee ) @@ -96,9 +93,16 @@ namespace OpenRA.Traits foreach (var t in self.traits.WithInterface()) t.UnitProduced(self, newUnit); + Log.Write("{0} #{1} produced by {2} #{3}", newUnit.Info.Name, newUnit.ActorID, self.Info.Name, self.ActorID); + return true; } + // "primary building" crap - perhaps this should be split? + + bool isPrimary = false; + public bool IsPrimary { get { return isPrimary; } } + public IEnumerable GetTags() { yield return (isPrimary) ? TagType.Primary : TagType.None;