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

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

@@ -144,13 +144,14 @@ namespace OpenRA.GameRules
return true; return true;
} }
public void Impact(WPos pos, Actor firedBy, IEnumerable<int> damageModifiers) ///<summary>Applies all the weapon's warheads to the target.</summary>
public void Impact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
{ {
foreach (var wh in Warheads) foreach (var wh in Warheads)
{ {
Action a; Action a;
a = () => wh.DoImpact(Target.FromPos(pos), firedBy, damageModifiers); a = () => wh.DoImpact(target, firedBy, damageModifiers);
if (wh.Delay > 0) if (wh.Delay > 0)
firedBy.World.AddFrameEndTask( firedBy.World.AddFrameEndTask(
w => w.Add(new DelayedAction(wh.Delay, a))); w => w.Add(new DelayedAction(wh.Delay, a)));

2
OpenRA.Mods.Cnc/Effects/IonCannon.cs
View File

@@ -46,7 +46,7 @@ namespace OpenRA.Mods.Cnc.Effects
if (!impacted && weaponDelay-- <= 0) if (!impacted && weaponDelay-- <= 0)
{ {
var weapon = world.Map.Rules.Weapons[this.weapon.ToLowerInvariant()]; var weapon = world.Map.Rules.Weapons[this.weapon.ToLowerInvariant()];
weapon.Impact(target.CenterPosition, firedBy.PlayerActor, Enumerable.Empty<int>()); weapon.Impact(target, firedBy.PlayerActor, Enumerable.Empty<int>());
impacted = true; impacted = true;
} }
} }

3
OpenRA.Mods.Cnc/PoisonedByTiberium.cs
View File

@@ -43,7 +43,8 @@ namespace OpenRA.Mods.Cnc
if (!info.Resources.Contains(r.Info.Name)) return; if (!info.Resources.Contains(r.Info.Name)) return;
var weapon = self.World.Map.Rules.Weapons[info.Weapon.ToLowerInvariant()]; var weapon = self.World.Map.Rules.Weapons[info.Weapon.ToLowerInvariant()];
weapon.Impact(self.CenterPosition, self.World.WorldActor, Enumerable.Empty<int>());
weapon.Impact(Target.FromActor(self), self.World.WorldActor, Enumerable.Empty<int>());
poisonTicks = weapon.ReloadDelay; poisonTicks = weapon.ReloadDelay;
} }
} }

2
OpenRA.Mods.D2k/DamagedWithoutFoundation.cs
View File

@@ -65,7 +65,7 @@ namespace OpenRA.Mods.D2k
if (health.HP <= damageThreshold || --damageTicks > 0) if (health.HP <= damageThreshold || --damageTicks > 0)
return; return;
weapon.Impact(self.CenterPosition, self.World.WorldActor, Enumerable.Empty<int>()); weapon.Impact(Target.FromActor(self), self.World.WorldActor, Enumerable.Empty<int>());
damageTicks = weapon.ReloadDelay; damageTicks = weapon.ReloadDelay;
} }
} }

3
OpenRA.Mods.RA/Air/FallsToEarth.cs
View File

@@ -55,7 +55,8 @@ namespace OpenRA.Mods.RA.Air
if (info.Explosion != null) if (info.Explosion != null)
{ {
var weapon = self.World.Map.Rules.Weapons[info.Explosion.ToLowerInvariant()]; var weapon = self.World.Map.Rules.Weapons[info.Explosion.ToLowerInvariant()];
weapon.Impact(self.CenterPosition, self, Enumerable.Empty<int>()); // Use .FromPos since this actor is killed. Cannot use Target.FromActor
weapon.Impact(Target.FromPos(self.CenterPosition), self, Enumerable.Empty<int>());
} }
self.Destroy(); self.Destroy();

4
OpenRA.Mods.RA/Bridge.cs
View File

@@ -299,7 +299,9 @@ namespace OpenRA.Mods.RA
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
var weapon = saboteur.World.Map.Rules.Weapons[Info.DemolishWeapon.ToLowerInvariant()]; var weapon = saboteur.World.Map.Rules.Weapons[Info.DemolishWeapon.ToLowerInvariant()];
weapon.Impact(self.CenterPosition, saboteur, Enumerable.Empty<int>()); // Use .FromPos since this actor is killed. Cannot use Target.FromActor
weapon.Impact(Target.FromPos(self.CenterPosition), saboteur, Enumerable.Empty<int>());
self.World.WorldActor.Trait<ScreenShaker>().AddEffect(15, self.CenterPosition, 6); self.World.WorldActor.Trait<ScreenShaker>().AddEffect(15, self.CenterPosition, 6);
self.Kill(saboteur); self.Kill(saboteur);
}); });

2
OpenRA.Mods.RA/Crates/ExplodeCrateAction.cs
View File

@@ -31,7 +31,7 @@ namespace OpenRA.Mods.RA
public override void Activate(Actor collector) public override void Activate(Actor collector)
{ {
var weapon = self.World.Map.Rules.Weapons[((ExplodeCrateActionInfo)info).Weapon.ToLowerInvariant()]; var weapon = self.World.Map.Rules.Weapons[((ExplodeCrateActionInfo)info).Weapon.ToLowerInvariant()];
weapon.Impact(collector.CenterPosition, self, Enumerable.Empty<int>()); weapon.Impact(Target.FromPos(collector.CenterPosition), self, Enumerable.Empty<int>());
base.Activate(collector); base.Activate(collector);
} }
} }

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

@@ -172,7 +172,7 @@ namespace OpenRA.Mods.RA.Effects
world.AddFrameEndTask(w => w.Remove(this)); 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.Effects;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Effects namespace OpenRA.Mods.RA.Effects
{ {
@@ -56,7 +57,7 @@ namespace OpenRA.Mods.RA.Effects
{ {
pos += new WVec(0, 0, args.PassiveTarget.Z - pos.Z); pos += new WVec(0, 0, args.PassiveTarget.Z - pos.Z);
world.AddFrameEndTask(w => w.Remove(this)); 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(); anim.Tick();

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

@@ -13,6 +13,7 @@ using System.Drawing;
using OpenRA.Effects; using OpenRA.Effects;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits;
using OpenRA.Mods.RA.Graphics; using OpenRA.Mods.RA.Graphics;
namespace OpenRA.Mods.RA.Effects namespace OpenRA.Mods.RA.Effects
@@ -69,7 +70,7 @@ namespace OpenRA.Mods.RA.Effects
if (hitanim != null) if (hitanim != null)
hitanim.PlayThen("idle", () => animationComplete = true); 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; doneDamage = true;
} }

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

@@ -180,7 +180,7 @@ namespace OpenRA.Mods.RA.Effects
if (ticks <= info.Arm) if (ticks <= info.Arm)
return; 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) 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)); world.AddFrameEndTask(w => w.Remove(this));
var weapon = world.Map.Rules.Weapons[this.weapon.ToLowerInvariant()]; 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); world.WorldActor.Trait<ScreenShaker>().AddEffect(20, pos, 5);
foreach (var a in world.ActorsWithTrait<NukePaletteEffect>()) 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.Effects;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Graphics; using OpenRA.Graphics;
using OpenRA.Traits;
namespace OpenRA.Mods.RA.Effects namespace OpenRA.Mods.RA.Effects
{ {
@@ -47,7 +48,7 @@ namespace OpenRA.Mods.RA.Effects
if (!doneDamage) if (!doneDamage)
{ {
var pos = Args.GuidedTarget.IsValidFor(Args.SourceActor) ? Args.GuidedTarget.CenterPosition : Args.PassiveTarget; 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; doneDamage = true;
} }
} }

3
OpenRA.Mods.RA/Explodes.cs
View File

@@ -51,7 +51,8 @@ namespace OpenRA.Mods.RA
if (weapon.Report != null && weapon.Report.Any()) if (weapon.Report != null && weapon.Report.Any())
Sound.Play(weapon.Report.Random(e.Attacker.World.SharedRandom), self.CenterPosition); Sound.Play(weapon.Report.Random(e.Attacker.World.SharedRandom), self.CenterPosition);
weapon.Impact(self.CenterPosition, e.Attacker, Enumerable.Empty<int>()); // Use .FromPos since this actor is killed. Cannot use Target.FromActor
weapon.Impact(Target.FromPos(self.CenterPosition), e.Attacker, Enumerable.Empty<int>());
} }
} }

6
OpenRA.Mods.RA/MadTank.cs
View File

@@ -72,7 +72,8 @@ namespace OpenRA.Mods.RA
if (info.ThumpDamageWeapon != null) if (info.ThumpDamageWeapon != null)
{ {
var weapon = self.World.Map.Rules.Weapons[info.ThumpDamageWeapon.ToLowerInvariant()]; var weapon = self.World.Map.Rules.Weapons[info.ThumpDamageWeapon.ToLowerInvariant()];
weapon.Impact(self.CenterPosition, self, Enumerable.Empty<int>()); // Use .FromPos since this weapon needs to affect more than just the MadTank actor
weapon.Impact(Target.FromPos(self.CenterPosition), self, Enumerable.Empty<int>());
} }
screenShaker.AddEffect(info.ThumpShakeTime, self.CenterPosition, info.ThumpShakeIntensity, info.ThumpShakeMultiplier); screenShaker.AddEffect(info.ThumpShakeTime, self.CenterPosition, info.ThumpShakeIntensity, info.ThumpShakeMultiplier);
tick = 0; tick = 0;
@@ -111,7 +112,8 @@ namespace OpenRA.Mods.RA
if (info.DetonationWeapon != null) if (info.DetonationWeapon != null)
{ {
var weapon = self.World.Map.Rules.Weapons[info.DetonationWeapon.ToLowerInvariant()]; var weapon = self.World.Map.Rules.Weapons[info.DetonationWeapon.ToLowerInvariant()];
weapon.Impact(self.CenterPosition, self, Enumerable.Empty<int>()); // Use .FromPos since this actor is killed. Cannot use Target.FromActor
weapon.Impact(Target.FromPos(self.CenterPosition), self, Enumerable.Empty<int>());
} }
self.Kill(self); self.Kill(self);
}); });