Initial pbox pax changes

This commit is contained in:
Curtis Shmyr
2012-04-29 18:07:11 -06:00
committed by Chris Forbes
parent e0bfa287ee
commit 9185dc65d5
6 changed files with 176 additions and 31 deletions

View File

@@ -21,6 +21,7 @@ namespace OpenRA.Mods.RA.Activities
public int Facing = 96;
public string[] Sounds = {};
public int ForceHealthPercentage = 0;
public bool SkipMakeAnims = false;
public Transform(Actor self, string toActor)
{
@@ -45,6 +46,9 @@ namespace OpenRA.Mods.RA.Activities
new OwnerInit( self.Owner ),
new FacingInit( Facing ),
};
if (SkipMakeAnims) init.Add(new SkipMakeAnimsInit());
var health = self.TraitOrDefault<Health>();
if (health != null)
{

View File

@@ -0,0 +1,33 @@
#region Copyright & License Information
/*
* Copyright 2007-2011 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System.Linq;
using OpenRA.FileFormats;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
// for some reason i get yelled at for pbox.e1 not having Cargo, but that's a lie?
class EmitCargoOnSellInfo : TraitInfo<EmitCargoOnSell>//, Requires<Cargo>
{
}
class EmitCargoOnSell : INotifySold
{
void Emit(Actor self)
{
// todo.
// would like to spill all actors out similar to how we call Unload
}
public void Selling(Actor self) { Emit(self); }
public void Sold(Actor self) { }
}
}

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -186,6 +186,7 @@
<Compile Include="Effects\SatelliteLaunch.cs" />
<Compile Include="Effects\Smoke.cs" />
<Compile Include="Effects\TeslaZap.cs" />
<Compile Include="EmitCargoOnSell.cs" />
<Compile Include="EmitInfantryOnSell.cs" />
<Compile Include="EngineerRepair.cs" />
<Compile Include="Explodes.cs" />

View File

@@ -20,6 +20,7 @@ namespace OpenRA.Mods.RA
[ActorReference] public readonly string[] PassengerTypes = {};
[ActorReference] public readonly string OnEnter = null;
[ActorReference] public readonly string OnExit = null;
public readonly bool SkipMakeAnims = false;
public object Create(ActorInitializer init) { return new TransformOnPassenger(this); }
}
@@ -36,8 +37,12 @@ namespace OpenRA.Mods.RA
{
self.World.AddFrameEndTask( w =>
{
var facing = self.TraitOrDefault<IFacing>();
var transform = new Transform(self, transformTo) { SkipMakeAnims = info.SkipMakeAnims };
if (facing != null) transform.Facing = facing.Facing;
self.CancelActivity();
self.QueueActivity( new Transform(self, transformTo) { Facing = self.Trait<IFacing>().Facing } );
self.QueueActivity(transform);
});
}
}