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

nuke damage generalized (DamageModel=PerCell)

Browse Source
This commit is contained in:
Chris Forbes
2010-04-02 11:24:15 +13:00
parent c63697e181
commit 03a037a84f
6 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenRA.Game/Combat.cs
View File

@@ -61,12 +61,30 @@ namespace OpenRA
.Select(a => a.GetFirepowerModifier())
.Product();
var maxSpread = warhead.Spread * (float)Math.Log(Math.Abs(warhead.Damage), 2);
var hitActors = world.FindUnitsInCircle(args.dest, maxSpread);
switch (warhead.DamageModel)
{
case DamageModel.Normal:
{
var maxSpread = warhead.Spread * (float)Math.Log(Math.Abs(warhead.Damage), 2);
var hitActors = world.FindUnitsInCircle(args.dest, maxSpread);
foreach (var victim in hitActors)
victim.InflictDamage(args.firedBy,
(int)GetDamageToInflict(victim, args, warhead, firepowerModifier), warhead);
foreach (var victim in hitActors)
victim.InflictDamage(args.firedBy,
(int)GetDamageToInflict(victim, args, warhead, firepowerModifier), warhead);
} break;
case DamageModel.PerCell:
{
foreach (var t in world.FindTilesInCircle(targetTile, warhead.SmudgeSize[0]))
{
var x = Util.CenterOfCell(t);
foreach (var unit in world.FindUnits(x, x))
unit.InflictDamage(args.firedBy,
(int)(warhead.Damage * warhead.EffectivenessAgainst(
unit.Info.Traits.Get<OwnedActorInfo>().Armor)), warhead);
}
} break;
}
}
public static void DoImpacts(ProjectileArgs args, int2 visualLocation)

3
OpenRA.Game/Effects/NukeLaunch.cs
View File

@@ -76,8 +76,7 @@ namespace OpenRA.Effects
void Explode(World world)
{
world.AddFrameEndTask(w => w.Remove(this));
//var warhead = Rules.WarheadInfo[weapon.Warhead];
//Combat.DoImpact(pos.ToInt2(), pos.ToInt2(), weapon, Rules.ProjectileInfo[weapon.Projectile], warhead, silo, true);
Combat.DoExplosion(silo, "Atomic", pos.ToInt2(), 0);
world.WorldActor.traits.Get<ScreenShaker>().AddEffect(20, pos, 5);
}

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

@@ -27,19 +27,20 @@ namespace OpenRA.GameRules
{
public class WarheadInfo
{
public readonly int Spread = 1;
public readonly float[] Verses = { 1, 1, 1, 1, 1 };
public readonly bool Wall = false;
public readonly bool Wood = false;
public readonly bool Ore = false;
public readonly int Explosion = 0;
public readonly SmudgeType SmudgeType = SmudgeType.None;
public readonly int[] SmudgeSize = { 0, 0 };
public readonly int InfDeath = 0;
public readonly string ImpactSound = null;
public readonly string WaterImpactSound = null;
public readonly int Damage = 0; // for new weapons infrastructure
public readonly int Delay = 0; // delay in ticks before dealing the damage. 0=instant
public readonly int Spread = 1; // distance (in pixels) from the explosion center at which damage is 1/2.
public readonly float[] Verses = { 1, 1, 1, 1, 1 }; // damage vs each armortype
public readonly bool Wall = false; // can this damage walls?
public readonly bool Wood = false; // can this damage wood?
public readonly bool Ore = false; // can this damage ore?
public readonly int Explosion = 0; // explosion effect to use
public readonly SmudgeType SmudgeType = SmudgeType.None; // type of smudge to apply
public readonly int[] SmudgeSize = { 0, 0 }; // bounds of the smudge. first value is the outer radius; second value is the inner radius.
public readonly int InfDeath = 0; // infantry death animation to use
public readonly string ImpactSound = null; // sound to play on impact
public readonly string WaterImpactSound = null; // sound to play on impact with water
public readonly int Damage = 0; // how much (raw) damage to deal
public readonly int Delay = 0; // delay in ticks before dealing the damage. 0=instant (old model)
public readonly DamageModel DamageModel = DamageModel.Normal; //
public float EffectivenessAgainst(ArmorType at) { return Verses[(int)at]; }
}
@@ -60,6 +61,12 @@ namespace OpenRA.GameRules
Scorch = 2,
}
public enum DamageModel
{
Normal, // classic RA damage model: point actors, distance-based falloff
PerCell, // like RA's "nuke damage"
}
public class ProjectileArgs
{
public WeaponInfo weapon;