From 4b43bb1cad328327c08f73b50b5d20d804f085ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Thu, 2 Jan 2014 18:04:03 +0100 Subject: [PATCH] replace misleading Underwater bool with what it really does --- OpenRA.Game/GameRules/WeaponInfo.cs | 2 +- OpenRA.Mods.RA/Effects/Bullet.cs | 2 +- OpenRA.Mods.RA/Effects/Missile.cs | 2 +- mods/ra/weapons.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/GameRules/WeaponInfo.cs b/OpenRA.Game/GameRules/WeaponInfo.cs index 38c4730488..2aa17decf3 100644 --- a/OpenRA.Game/GameRules/WeaponInfo.cs +++ b/OpenRA.Game/GameRules/WeaponInfo.cs @@ -105,7 +105,7 @@ namespace OpenRA.GameRules public readonly int ROF = 1; public readonly int Burst = 1; public readonly bool Charges = false; - public readonly bool Underwater = false; + public readonly string Palette = "effect"; public readonly string[] ValidTargets = { "Ground", "Water" }; public readonly string[] InvalidTargets = { }; public readonly int BurstDelay = 5; diff --git a/OpenRA.Mods.RA/Effects/Bullet.cs b/OpenRA.Mods.RA/Effects/Bullet.cs index d8bce96716..28ef4a1139 100755 --- a/OpenRA.Mods.RA/Effects/Bullet.cs +++ b/OpenRA.Mods.RA/Effects/Bullet.cs @@ -143,7 +143,7 @@ namespace OpenRA.Mods.RA.Effects yield return r; } - var palette = wr.Palette(args.Weapon.Underwater ? "shadow" : "effect"); + var palette = wr.Palette(args.Weapon.Palette); foreach (var r in anim.Render(pos, palette)) yield return r; } diff --git a/OpenRA.Mods.RA/Effects/Missile.cs b/OpenRA.Mods.RA/Effects/Missile.cs index 4e55632ad1..6525ea01d3 100755 --- a/OpenRA.Mods.RA/Effects/Missile.cs +++ b/OpenRA.Mods.RA/Effects/Missile.cs @@ -184,7 +184,7 @@ namespace OpenRA.Mods.RA.Effects if (!args.SourceActor.World.FogObscures(pos.ToCPos())) { - var palette = wr.Palette(args.Weapon.Underwater ? "shadow" : "effect"); + var palette = wr.Palette(args.Weapon.Palette); foreach (var r in anim.Render(pos, palette)) yield return r; } diff --git a/mods/ra/weapons.yaml b/mods/ra/weapons.yaml index 621cb343d6..390fa5ab9a 100644 --- a/mods/ra/weapons.yaml +++ b/mods/ra/weapons.yaml @@ -820,7 +820,7 @@ TorpTube: Range: 9c0 Report: TORPEDO1.AUD ValidTargets: Water, Underwater - Underwater: yes + Palette: shadow Burst: 2 BurstDelay: 20 Projectile: Missile