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

Removed TeslaInstantKills

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -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" />

OpenRA.Mods.RA/TeslaInstantKills.cs

@@ -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;
-		}
-	}
-}

OpenRA.Utility/UpgradeRules.cs

@@ -249,6 +249,12 @@ namespace OpenRA.Utility
 						node.Value.Nodes.Add(new MiniYamlNode("ScriptTriggers", ""));
 				}
 
+				if (engineVersion < 20140517)
+				{
+					if (depth == 0)
+						node.Value.Nodes.RemoveAll(n => n.Key == "TeslaInstantKills");
+				}
+
 				UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}

mods/cnc/mod.yaml

@@ -66,7 +66,7 @@ Cursors:
 
 Chrome:
 	mods/cnc/chrome.yaml
-	
+
 Assemblies:
 	mods/ra/OpenRA.Mods.RA.dll
 	mods/cnc/OpenRA.Mods.Cnc.dll

mods/cnc/rules/ai.yaml

@@ -1,6 +1,6 @@
 Player:
 	HackyAI@Cabal:
-		Name:Cabal
+		Name: Cabal
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -62,7 +62,7 @@ Player:
 			orca: 5%
 		SquadSize: 15
 	HackyAI@Watson:
-		Name:Watson
+		Name: Watson
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -124,7 +124,7 @@ Player:
 			mtnk: 50%
 		SquadSize: 15
 	HackyAI@HAL9001:
-		Name:HAL 9001
+		Name: HAL 9001
 		BuildingCommonNames:
 			ConstructionYard: fact
 			Refinery: proc
@@ -187,3 +187,4 @@ Player:
 			htnk: 50%
 			orca: 10%
 		SquadSize: 8
+

mods/cnc/rules/aircraft.yaml

@@ -210,7 +210,7 @@ A10:
 		Weapon: Napalm
 		LocalOffset: 0,-256,-43, 0,256,-43
 	-Selectable:
-	-TargetableUnit:	
+	-TargetableUnit:
 	-GainsExperience:
 	FlyAwayOnIdle:
 	RejectsOrders:

mods/cnc/rules/defaults.yaml

@@ -597,3 +597,4 @@
 	BodyOrientation:
 	LuaScriptEvents:
 	ScriptTriggers:
+

mods/cnc/rules/trees.yaml

@@ -24,7 +24,7 @@ ROCK1:
 	Inherits: ^Rock
 	Building:
 		Footprint: __ xx
-		
+
 ROCK2:
 	Inherits: ^Rock
 	Building:

mods/cnc/weapons.yaml

@@ -202,7 +202,7 @@ HeliAAGun:
 Pistol:
 	ROF: 7
 	Range: 3c0
-	InvalidTargets: Wall	
+	InvalidTargets: Wall
 	Report: GUN18.AUD
 	Projectile: Bullet
 		Speed: 1c682
@@ -220,7 +220,7 @@ Pistol:
 M16:
 	ROF: 20
 	Range: 4c0
-	InvalidTargets: Wall	
+	InvalidTargets: Wall
 	Report: MGUN2.AUD
 	Projectile: Bullet
 		Speed: 1c682
@@ -360,7 +360,7 @@ OrcaAAMissiles:
 Flamethrower:
 	ROF: 55
 	Range: 2c512
-	InvalidTargets: Wall	
+	InvalidTargets: Wall
 	Report: FLAMER2.AUD
 	Projectile: Bullet
 		Speed: 1c682
@@ -380,7 +380,7 @@ Flamethrower:
 BigFlamer:
 	ROF: 50
 	Range: 3c512
-	InvalidTargets: Wall	
+	InvalidTargets: Wall
 	Report: FLAMER2.AUD
 	Projectile: Bullet
 		Speed: 341
@@ -668,7 +668,7 @@ ArtilleryShell:
 MachineGun:
 	ROF: 20
 	Burst: 5
-	InvalidTargets: Wall	
+	InvalidTargets: Wall
 	Range: 4c0
 	Report: MGUN11.AUD
 	Projectile: Bullet

mods/d2k/rules/misc.yaml

@@ -123,3 +123,4 @@ CAMERA:
 	RevealsShroud:
 		Range: 8c0
 	BodyOrientation:
+

mods/d2k/rules/structures.yaml

@@ -21,7 +21,7 @@ CONCRETEA:
 		Dimensions: 2,2
 	Buildable:
 		Queue: Building
-		BuildPaletteOrder:10
+		BuildPaletteOrder: 10
 		Owner: atreides, harkonnen, ordos
 	Valued:
 		Cost: 20

mods/d2k/tilesets/arrakis.yaml

@@ -6362,3 +6362,4 @@ Templates:
 		PickAny: False
 		Tiles:
 			0: Rock
+

mods/d2k/weapons.yaml

@@ -625,7 +625,7 @@ Weathering:
 	ROF: 100
 	Warhead:
 		Damage: 5
-		
+
 Shrapnel:
 	ROF: 60
 	Range: 4c0
@@ -647,4 +647,5 @@ Shrapnel:
 		InfDeath: 3
 		SmudgeType: SandCrater
 		Damage: 60
-		ImpactSound: EXPLLG5.WAV
+		ImpactSound: EXPLLG5.WAV
+

mods/ra/mod.yaml

@@ -62,7 +62,7 @@ Cursors:
 
 Chrome:
 	mods/ra/chrome.yaml
-	
+
 Assemblies:
 	mods/ra/OpenRA.Mods.RA.dll
 	mods/cnc/OpenRA.Mods.Cnc.dll

mods/ra/rules/ai.yaml

@@ -232,3 +232,4 @@ Player:
 			ca: 20%
 			pt: 10%
 		SquadSize: 1
+

mods/ra/rules/defaults.yaml

@@ -140,7 +140,6 @@
 	Passenger:
 		CargoType: Infantry
 	HiddenUnderFog:
-	TeslaInstantKills:
 	GainsExperience:
 	GivesExperience:
 	DrawLineToTarget:

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

mods/ts/rules/structures.yaml

@@ -733,3 +733,4 @@ TECH:
 	Tooltip:
 		Name: Tech Center
 		Description: Tech Center
+

mods/ts/weapons.yaml

@@ -700,3 +700,4 @@ Tiberium:
 		InfDeath: 6
 		Damage: 2
 		PreventProne: yes
+