epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace misleading Underwater bool with what it really does

Browse Source
This commit is contained in:
Matthias Mailänder
2014-01-02 18:04:03 +01:00
parent 3a6989ce24
commit 4b43bb1cad
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/GameRules/WeaponInfo.cs
View File

@@ -105,7 +105,7 @@ namespace OpenRA.GameRules
public readonly int ROF = 1; public readonly int ROF = 1;
public readonly int Burst = 1; public readonly int Burst = 1;
public readonly bool Charges = false; public readonly bool Charges = false;
public readonly bool Underwater = false; public readonly string Palette = "effect";
public readonly string[] ValidTargets = { "Ground", "Water" }; public readonly string[] ValidTargets = { "Ground", "Water" };
public readonly string[] InvalidTargets = { }; public readonly string[] InvalidTargets = { };
public readonly int BurstDelay = 5; public readonly int BurstDelay = 5;

2
OpenRA.Mods.RA/Effects/Bullet.cs
View File

@@ -143,7 +143,7 @@ namespace OpenRA.Mods.RA.Effects
yield return r; 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)) foreach (var r in anim.Render(pos, palette))
yield return r; yield return r;
} }

2
OpenRA.Mods.RA/Effects/Missile.cs
View File

@@ -184,7 +184,7 @@ namespace OpenRA.Mods.RA.Effects
if (!args.SourceActor.World.FogObscures(pos.ToCPos())) 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)) foreach (var r in anim.Render(pos, palette))
yield return r; yield return r;
} }

2
mods/ra/weapons.yaml
View File

@@ -820,7 +820,7 @@ TorpTube:
Range: 9c0 Range: 9c0
Report: TORPEDO1.AUD Report: TORPEDO1.AUD
ValidTargets: Water, Underwater ValidTargets: Water, Underwater
Underwater: yes Palette: shadow
Burst: 2 Burst: 2
BurstDelay: 20 BurstDelay: 20
Projectile: Missile Projectile: Missile