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

Changes Weapon.Impact() to use Target (from WPos).

Browse Source
This commit is contained in:
UberWaffe
2014-08-19 21:32:05 +02:00
parent c25c3441fb
commit 76ccb0cf00
15 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,7 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this));
args.Weapon.Impact(pos, args.SourceActor, args.DamageModifiers);
args.Weapon.Impact(Target.FromPos(pos), args.SourceActor, args.DamageModifiers);
}
}
}

3
OpenRA.Mods.RA/Effects/GravityBomb.cs
View File

@@ -12,6 +12,7 @@ using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Effects
{
@@ -56,7 +57,7 @@ namespace OpenRA.Mods.RA.Effects
{
pos += new WVec(0, 0, args.PassiveTarget.Z - pos.Z);
world.AddFrameEndTask(w => w.Remove(this));
args.Weapon.Impact(pos, args.SourceActor, args.DamageModifiers);
args.Weapon.Impact(Target.FromPos(pos), args.SourceActor, args.DamageModifiers);
}
anim.Tick();

3
OpenRA.Mods.RA/Effects/LaserZap.cs
View File

@@ -13,6 +13,7 @@ using System.Drawing;
using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Mods.RA.Graphics;
namespace OpenRA.Mods.RA.Effects
@@ -69,7 +70,7 @@ namespace OpenRA.Mods.RA.Effects
if (hitanim != null)
hitanim.PlayThen("idle", () => animationComplete = true);
args.Weapon.Impact(target, args.SourceActor, args.DamageModifiers);
args.Weapon.Impact(Target.FromPos(target), args.SourceActor, args.DamageModifiers);
doneDamage = true;
}

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

@@ -180,7 +180,7 @@ namespace OpenRA.Mods.RA.Effects
if (ticks <= info.Arm)
return;
args.Weapon.Impact(pos, args.SourceActor, args.DamageModifiers);
args.Weapon.Impact(Target.FromPos(pos), args.SourceActor, args.DamageModifiers);
}
public IEnumerable<IRenderable> Render(WorldRenderer wr)

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

@@ -81,7 +81,7 @@ namespace OpenRA.Mods.RA.Effects
{
world.AddFrameEndTask(w => w.Remove(this));
var weapon = world.Map.Rules.Weapons[this.weapon.ToLowerInvariant()];
weapon.Impact(pos, firedBy.PlayerActor, Enumerable.Empty<int>());
weapon.Impact(Target.FromPos(pos), firedBy.PlayerActor, Enumerable.Empty<int>());
world.WorldActor.Trait<ScreenShaker>().AddEffect(20, pos, 5);
foreach (var a in world.ActorsWithTrait<NukePaletteEffect>())

3
OpenRA.Mods.RA/Effects/TeslaZap.cs
View File

@@ -12,6 +12,7 @@ using System.Collections.Generic;
using OpenRA.Effects;
using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Effects
{
@@ -47,7 +48,7 @@ namespace OpenRA.Mods.RA.Effects
if (!doneDamage)
{
var pos = Args.GuidedTarget.IsValidFor(Args.SourceActor) ? Args.GuidedTarget.CenterPosition : Args.PassiveTarget;
Args.Weapon.Impact(pos, Args.SourceActor, Args.DamageModifiers);
Args.Weapon.Impact(Target.FromPos(pos), Args.SourceActor, Args.DamageModifiers);
doneDamage = true;
}
}