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

Add a fallback to InternalOwner if the victim was defeated

Browse Source
This commit is contained in:
abcdefg30
2017-08-08 14:32:42 +02:00
committed by reaperrr
parent d4d9959159
commit b9987dcbda
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenRA.Mods.Common/Traits/SpawnActorOnDeath.cs
View File

@@ -28,11 +28,13 @@ namespace OpenRA.Mods.Common.Traits
public readonly int Probability = 100; public readonly int Probability = 100;
[Desc("Owner of the spawned actor. Allowed keywords:" + [Desc("Owner of the spawned actor. Allowed keywords:" +
"'Victim', 'Killer' and 'InternalName'.")] "'Victim', 'Killer' and 'InternalName'. " +
"Falls back to 'InternalName' if 'Victim' is used " +
"and the victim is defeated (see 'SpawnAfterDefeat').")]
public readonly OwnerType OwnerType = OwnerType.Victim; public readonly OwnerType OwnerType = OwnerType.Victim;
[Desc("Map player to use when 'InternalName' is defined on 'OwnerType'.")] [Desc("Map player to use when 'InternalName' is defined on 'OwnerType'.")]
public readonly string InternalOwner = null; public readonly string InternalOwner = "Neutral";
[Desc("DeathType that triggers the actor spawn. " + [Desc("DeathType that triggers the actor spawn. " +
"Leave empty to spawn an actor ignoring the DeathTypes.")] "Leave empty to spawn an actor ignoring the DeathTypes.")]
@@ -89,7 +91,11 @@ namespace OpenRA.Mods.Common.Traits
// Don't add the new actor to the world before all RemovedFromWorld callbacks have run // Don't add the new actor to the world before all RemovedFromWorld callbacks have run
void INotifyRemovedFromWorld.RemovedFromWorld(Actor self) void INotifyRemovedFromWorld.RemovedFromWorld(Actor self)
{ {
if (attackingPlayer == null || (!info.SpawnAfterDefeat && self.Owner.WinState != WinState.Undefined)) if (attackingPlayer == null)
return;
var defeated = self.Owner.WinState == WinState.Lost;
if (defeated && !Info.SpawnAfterDefeat)
return; return;
var td = new TypeDictionary var td = new TypeDictionary
@@ -101,7 +107,17 @@ namespace OpenRA.Mods.Common.Traits
}; };
if (Info.OwnerType == OwnerType.Victim) if (Info.OwnerType == OwnerType.Victim)
td.Add(new OwnerInit(self.Owner)); {
// Fall back to InternalOwner if the Victim was defeated,
// but only if InternalOwner is defined
if (!defeated || string.IsNullOrEmpty(Info.InternalOwner))
td.Add(new OwnerInit(self.Owner));
else
{
td.Add(new OwnerInit(self.World.Players.First(p => p.InternalName == Info.InternalOwner)));
td.Add(new EffectiveOwnerInit(self.Owner));
}
}
else if (Info.OwnerType == OwnerType.Killer) else if (Info.OwnerType == OwnerType.Killer)
td.Add(new OwnerInit(attackingPlayer)); td.Add(new OwnerInit(attackingPlayer));
else else