diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index 6c7beaaf6b..c60e9d1e60 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/OpenRA.Utility/UpgradeRules.cs b/OpenRA.Utility/UpgradeRules.cs index 6f1fa7a803..bf16b91704 100644 --- a/OpenRA.Utility/UpgradeRules.cs +++ b/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); } } diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index a984034f55..f9d83ecc00 100644 --- a/mods/cnc/mod.yaml +++ b/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 diff --git a/mods/cnc/rules/ai.yaml b/mods/cnc/rules/ai.yaml index 4e36253d7d..2540269624 100644 --- a/mods/cnc/rules/ai.yaml +++ b/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 + diff --git a/mods/cnc/rules/aircraft.yaml b/mods/cnc/rules/aircraft.yaml index cf265f9e75..0e47c0265b 100644 --- a/mods/cnc/rules/aircraft.yaml +++ b/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: diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml index 53a45901e2..a1c49cc874 100644 --- a/mods/cnc/rules/defaults.yaml +++ b/mods/cnc/rules/defaults.yaml @@ -597,3 +597,4 @@ BodyOrientation: LuaScriptEvents: ScriptTriggers: + diff --git a/mods/cnc/rules/trees.yaml b/mods/cnc/rules/trees.yaml index fd712d16b6..910dc558d0 100644 --- a/mods/cnc/rules/trees.yaml +++ b/mods/cnc/rules/trees.yaml @@ -24,7 +24,7 @@ ROCK1: Inherits: ^Rock Building: Footprint: __ xx - + ROCK2: Inherits: ^Rock Building: diff --git a/mods/cnc/weapons.yaml b/mods/cnc/weapons.yaml index b179fedb2a..1f30b8bcaf 100644 --- a/mods/cnc/weapons.yaml +++ b/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 diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml index 44040506e8..3e2d6c50a0 100644 --- a/mods/d2k/rules/misc.yaml +++ b/mods/d2k/rules/misc.yaml @@ -123,3 +123,4 @@ CAMERA: RevealsShroud: Range: 8c0 BodyOrientation: + diff --git a/mods/d2k/rules/structures.yaml b/mods/d2k/rules/structures.yaml index a583d7ee27..2655ddabdc 100644 --- a/mods/d2k/rules/structures.yaml +++ b/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 diff --git a/mods/d2k/tilesets/arrakis.yaml b/mods/d2k/tilesets/arrakis.yaml index d2c40175b2..7f510d6cca 100644 --- a/mods/d2k/tilesets/arrakis.yaml +++ b/mods/d2k/tilesets/arrakis.yaml @@ -6362,3 +6362,4 @@ Templates: PickAny: False Tiles: 0: Rock + diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml index 2ecbf5039a..03d4716eac 100644 --- a/mods/d2k/weapons.yaml +++ b/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 \ No newline at end of file + ImpactSound: EXPLLG5.WAV + diff --git a/mods/ra/mod.yaml b/mods/ra/mod.yaml index 84323c6aed..dd2e5b3e74 100644 --- a/mods/ra/mod.yaml +++ b/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 diff --git a/mods/ra/rules/ai.yaml b/mods/ra/rules/ai.yaml index dd786b174d..12ae61c4f0 100644 --- a/mods/ra/rules/ai.yaml +++ b/mods/ra/rules/ai.yaml @@ -232,3 +232,4 @@ Player: ca: 20% pt: 10% SquadSize: 1 + diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 8c3ddfbcb2..7f23b3980e 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -140,7 +140,6 @@ Passenger: CargoType: Infantry HiddenUnderFog: - TeslaInstantKills: GainsExperience: GivesExperience: DrawLineToTarget: 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 diff --git a/mods/ts/rules/structures.yaml b/mods/ts/rules/structures.yaml index fa19f03cfe..0aa7a1113e 100644 --- a/mods/ts/rules/structures.yaml +++ b/mods/ts/rules/structures.yaml @@ -733,3 +733,4 @@ TECH: Tooltip: Name: Tech Center Description: Tech Center + diff --git a/mods/ts/weapons.yaml b/mods/ts/weapons.yaml index f93c8c355a..427ab893db 100644 --- a/mods/ts/weapons.yaml +++ b/mods/ts/weapons.yaml @@ -700,3 +700,4 @@ Tiberium: InfDeath: 6 Damage: 2 PreventProne: yes +