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

Merge pull request #9415 from atlimit8/SpawnActorOnDeath_to_Common

Browse Source 
Move SpawnActorOnDeath to OpenRA.Mods.Common
This commit is contained in:
Matthias Mailänder
2015-11-08 19:07:07 +01:00
parent 3941bc441f 7352290c94
commit ab739c8446
9 changed files with 69 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -701,6 +701,7 @@
<Compile Include="Lint\CheckRevealFootprint.cs" />
<Compile Include="Traits\ThrowsShrapnel.cs" />
<Compile Include="Traits\World\MusicPlaylist.cs" />
<Compile Include="Traits\SpawnActorOnDeath.cs" />
<Compile Include="Scripting\Global\LightingGlobal.cs" />
<Compile Include="Traits\SupportPowers\ProduceActorPower.cs" />
<Compile Include="Widgets\Logic\GlobalChatLogic.cs" />

7
OpenRA.Mods.Common/Traits/Air/Aircraft.cs
View File

@@ -82,7 +82,7 @@ namespace OpenRA.Mods.Common.Traits
bool IOccupySpaceInfo.SharesCell { get { return false; } }
}
public class Aircraft : ITick, ISync, IFacing, IPositionable, IMove, IIssueOrder, IResolveOrder, IOrderVoice,
public class Aircraft : ITick, ISync, IFacing, IPositionable, IMove, IIssueOrder, IResolveOrder, IOrderVoice, IDeathActorInitModifier,
INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyActorDisposing
{
static readonly Pair<CPos, SubCell>[] NoCells = { };
@@ -328,6 +328,11 @@ namespace OpenRA.Mods.Common.Traits
yield return new Repair(a);
}
public void ModifyDeathActorInit(Actor self, TypeDictionary init)
{
init.Add(new FacingInit(Facing));
}
#region Implement IPositionable
public bool IsLeavingCell(CPos location, SubCell subCell = SubCell.Any) { return false; } // TODO: Handle landing

7
OpenRA.Mods.Common/Traits/Husk.cs
View File

@@ -34,7 +34,7 @@ namespace OpenRA.Mods.Common.Traits
bool IOccupySpaceInfo.SharesCell { get { return false; } }
}
public class Husk : IPositionable, IFacing, ISync, INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld, IDisable
public class Husk : IPositionable, IFacing, ISync, INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld, IDisable, IDeathActorInitModifier
{
readonly HuskInfo info;
readonly Actor self;
@@ -127,6 +127,11 @@ namespace OpenRA.Mods.Common.Traits
{
get { return true; }
}
public void ModifyDeathActorInit(Actor self, TypeDictionary init)
{
init.Add(new FacingInit(Facing));
}
}
public class HuskSpeedInit : IActorInit<int>

12
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -304,7 +304,8 @@ namespace OpenRA.Mods.Common.Traits
bool IOccupySpaceInfo.SharesCell { get { return SharesCell; } }
}
public class Mobile : IIssueOrder, IResolveOrder, IOrderVoice, IPositionable, IMove, IFacing, ISync, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove
public class Mobile : IIssueOrder, IResolveOrder, IOrderVoice, IPositionable, IMove, IFacing, ISync, IDeathActorInitModifier,
INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyBlockingMove
{
const int AverageTicksBeforePathing = 5;
const int SpreadTicksBeforePathing = 5;
@@ -793,5 +794,14 @@ namespace OpenRA.Mods.Common.Traits
var facing = Util.GetFacing(toPos - fromPos, Facing);
return Util.SequenceActivities(new Turn(self, facing), new Drag(self, fromPos, toPos, length));
}
public void ModifyDeathActorInit(Actor self, TypeDictionary init)
{
init.Add(new FacingInit(facing));
// Allows the husk to drag to its final position
if (CanEnterCell(self.Location, self, false))
init.Add(new HuskSpeedInit(MovementSpeedForCell(self, self.Location)));
}
}
}

33
OpenRA.Mods.RA/Traits/SpawnActorOnDeath.cs → OpenRA.Mods.Common/Traits/SpawnActorOnDeath.cs
View File

@@ -10,12 +10,11 @@
using System.Collections.Generic;
using System.Linq;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.Common.Warheads;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
namespace OpenRA.Mods.Common.Traits
{
public enum OwnerType { Victim, Killer, InternalName }
@@ -96,34 +95,8 @@ namespace OpenRA.Mods.RA.Traits
if (info.SkipMakeAnimations)
td.Add(new SkipMakeAnimsInit());
// Allows the husk to drag to its final position
var mobile = self.TraitOrDefault<Mobile>();
if (mobile != null)
{
if (!mobile.CanEnterCell(self.Location, self, false)) return;
td.Add(new HuskSpeedInit(mobile.MovementSpeedForCell(self, self.Location)));
}
var facing = self.TraitOrDefault<IFacing>();
if (facing != null)
td.Add(new FacingInit(facing.Facing));
var turreted = self.TraitsImplementing<Turreted>();
if (turreted.Any())
{
var turretFacings = new Dictionary<string, int>();
foreach (var t in turreted)
turretFacings.Add(t.Name, t.TurretFacing);
td.Add(new TurretFacingsInit(turretFacings));
}
// TODO: untie this and move to Mods.Common
var chronoshiftable = self.TraitOrDefault<Chronoshiftable>();
if (chronoshiftable != null && chronoshiftable.ReturnTicks > 0)
{
td.Add(new ChronoshiftOriginInit(chronoshiftable.Origin));
td.Add(new ChronoshiftReturnInit(chronoshiftable.ReturnTicks));
}
foreach (var modifier in self.TraitsImplementing<IDeathActorInitModifier>())
modifier.ModifyDeathActorInit(self, td);
var huskActor = self.TraitsImplementing<IHuskModifier>()
.Select(ihm => ihm.HuskActor(self))

15
OpenRA.Mods.Common/Traits/Turreted.cs
View File

@@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
@@ -30,7 +31,7 @@ namespace OpenRA.Mods.Common.Traits
public virtual object Create(ActorInitializer init) { return new Turreted(init, this); }
}
public class Turreted : ITick, ISync, INotifyCreated
public class Turreted : ITick, ISync, INotifyCreated, IDeathActorInitModifier
{
readonly TurretedInfo info;
AttackTurreted attack;
@@ -135,6 +136,18 @@ namespace OpenRA.Mods.Common.Traits
var facing = Util.QuantizeFacing(local.Yaw.Angle / 4, QuantizedFacings) * (256 / QuantizedFacings);
return new WRot(WAngle.Zero, WAngle.Zero, WAngle.FromFacing(facing));
}
public void ModifyDeathActorInit(Actor self, TypeDictionary init)
{
var facings = init.GetOrDefault<TurretFacingsInit>();
if (facings == null)
{
facings = new TurretFacingsInit();
init.Add(facings);
}
facings.Value(self.World).Add(Name, facing.Facing);
}
}
public class TurretFacingInit : IActorInit<int>

6
OpenRA.Mods.Common/TraitsInterfaces.cs
View File

@@ -14,6 +14,7 @@ using OpenRA.Activities;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Activities;
using OpenRA.Mods.Common.Graphics;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.Common.Traits
@@ -115,4 +116,9 @@ namespace OpenRA.Mods.Common.Traits
void MovementCancelled(Actor self);
void RequestTransport(CPos destination, Activity afterLandActivity);
}
public interface IDeathActorInitModifier
{
void ModifyDeathActorInit(Actor self, TypeDictionary init);
}
}

1
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -111,7 +111,6 @@
<Compile Include="Traits\SupportPowers\ChronoshiftPower.cs" />
<Compile Include="Traits\SupportPowers\GpsPower.cs" />
<Compile Include="Traits\SupportPowers\ParatroopersPower.cs" />
<Compile Include="Traits\SpawnActorOnDeath.cs" />
<Compile Include="Scripting\Properties\ChronosphereProperties.cs" />
<Compile Include="Scripting\Properties\ParadropProperties.cs" />
<Compile Include="Scripting\Properties\ParatroopersProperties.cs" />

23
OpenRA.Mods.RA/Traits/Chronoshiftable.cs
View File

@@ -11,6 +11,7 @@
using System.Drawing;
using OpenRA.Mods.Common.Traits;
using OpenRA.Mods.RA.Activities;
using OpenRA.Primitives;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Traits
@@ -24,7 +25,7 @@ namespace OpenRA.Mods.RA.Traits
public object Create(ActorInitializer init) { return new Chronoshiftable(init, this); }
}
public class Chronoshiftable : ITick, ISync, ISelectionBar
public class Chronoshiftable : ITick, ISync, ISelectionBar, IDeathActorInitModifier
{
readonly ChronoshiftableInfo info;
readonly Actor self;
@@ -46,6 +47,9 @@ namespace OpenRA.Mods.RA.Traits
if (init.Contains<ChronoshiftOriginInit>())
Origin = init.Get<ChronoshiftOriginInit, CPos>();
if (init.Contains<ChronoshiftChronosphereInit>())
chronosphere = init.Get<ChronoshiftChronosphereInit, Actor>();
}
public void Tick(Actor self)
@@ -107,6 +111,16 @@ namespace OpenRA.Mods.RA.Traits
}
public Color GetColor() { return Color.White; }
public void ModifyDeathActorInit(Actor self, TypeDictionary init)
{
if (ReturnTicks <= 0)
return;
init.Add(new ChronoshiftOriginInit(Origin));
init.Add(new ChronoshiftReturnInit(ReturnTicks));
if (chronosphere != self)
init.Add(new ChronoshiftChronosphereInit(chronosphere));
}
}
public class ChronoshiftReturnInit : IActorInit<int>
@@ -123,4 +137,11 @@ namespace OpenRA.Mods.RA.Traits
public ChronoshiftOriginInit(CPos init) { value = init; }
public CPos Value(World world) { return value; }
}
public class ChronoshiftChronosphereInit : IActorInit<Actor>
{
readonly Actor value;
public ChronoshiftChronosphereInit(Actor init) { value = init; }
public Actor Value(World world) { return value; }
}
}