Merge pull request #5339 from Mailaender/tesla-instant-kill-hack-removal

Removed TeslaInstantKills
This commit is contained in:
Paul Chote
2014-05-20 11:49:07 +12:00
19 changed files with 34 additions and 54 deletions

View File

@@ -375,7 +375,6 @@
<Compile Include="TargetableBuilding.cs" />
<Compile Include="TargetableSubmarine.cs" />
<Compile Include="TargetableUnit.cs" />
<Compile Include="TeslaInstantKills.cs" />
<Compile Include="ThrowsParticle.cs" />
<Compile Include="TraitsInterfaces.cs" />
<Compile Include="TransformOnCapture.cs" />

View File

@@ -1,37 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 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 OpenRA.GameRules;
using OpenRA.Traits;
namespace OpenRA.Mods.RA
{
public class TeslaInstantKillsInfo : ITraitInfo
{
[Desc("InfDeath that leads to instant kill.")]
public readonly string InfDeath = "6";
public object Create(ActorInitializer init) { return new TeslaInstantKills(this); }
}
public class TeslaInstantKills : IDamageModifier
{
TeslaInstantKillsInfo info;
public TeslaInstantKills(TeslaInstantKillsInfo info) { this.info = info; }
public float GetDamageModifier(Actor attacker, WarheadInfo warhead)
{
if( warhead != null && warhead.InfDeath == info.InfDeath )
return 1000f;
return 1f;
}
}
}