diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 683a94eec1..46d281257b 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -375,7 +375,6 @@ - diff --git a/OpenRA.Mods.RA/TeslaInstantKills.cs b/OpenRA.Mods.RA/TeslaInstantKills.cs deleted file mode 100755 index d2b511b015..0000000000 --- a/OpenRA.Mods.RA/TeslaInstantKills.cs +++ /dev/null @@ -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; - } - } -} diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 956e453f0d..fb287567cb 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -677,6 +677,7 @@ TeslaZap: InfDeath: 6 Damage: 100 Versus: + None: 1000% Wood: 60% Nike: @@ -1222,6 +1223,8 @@ PortaTesla: Spread: 42 InfDeath: 6 Damage: 45 + Versus: + None: 1000% TTankZap: ROF: 120 @@ -1233,6 +1236,8 @@ TTankZap: Spread: 42 InfDeath: 6 Damage: 100 + Versus: + None: 1000% FLAK-23: ROF: 10