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

weapon stuff

Browse Source
This commit is contained in:
Chris Forbes
2010-01-11 22:13:44 +13:00
parent 10a5b40e16
commit 889828aa02
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRa.Game/Effects/Bullet.cs
View File

@@ -23,8 +23,12 @@ namespace OpenRa.Game.Effects
const int BaseBulletSpeed = 100; /* pixels / 40ms frame */
public Bullet(string weapon, Player owner, Actor firedBy,
int2 src, int2 dest, int srcAltitude, int destAltitude)
: this(Rules.WeaponInfo[weapon], owner, firedBy, src, dest, srcAltitude, destAltitude) { }
/* src, dest are *pixel* coords */
public Bullet(string weapon, Player owner, Actor firedBy,
public Bullet(WeaponInfo weapon, Player owner, Actor firedBy,
int2 src, int2 dest, int srcAltitude, int destAltitude)
{
Owner = owner;
@@ -36,7 +40,7 @@ namespace OpenRa.Game.Effects
VisualDest = Dest + new int2(
Game.CosmeticRandom.Next(-10, 10),
Game.CosmeticRandom.Next(-10, 10));
Weapon = Rules.WeaponInfo[weapon];
Weapon = weapon;
Projectile = Rules.ProjectileInfo[Weapon.Projectile];
Warhead = Rules.WarheadInfo[Weapon.Warhead];

4
OpenRa.Game/Effects/Missile.cs
View File

@@ -20,10 +20,10 @@ namespace OpenRa.Game.Effects
int t;
int Altitude;
public Missile(string weapon, Player owner, Actor firedBy,
public Missile(WeaponInfo weapon, Player owner, Actor firedBy,
int2 src, Actor target, int altitude, int facing)
{
Weapon = Rules.WeaponInfo[weapon];
Weapon = weapon;
Projectile = Rules.ProjectileInfo[Weapon.Projectile];
Warhead = Rules.WarheadInfo[Weapon.Warhead];
FiredBy = firedBy;

4
OpenRa.Game/Traits/AttackBase.cs
View File

@@ -157,11 +157,11 @@ namespace OpenRa.Game.Traits
var fireFacing = thisLocalOffset.ElementAtOrDefault(2) +
(self.traits.Contains<Turreted>() ? self.traits.Get<Turreted>().turretFacing : unit.Facing);
Game.world.Add(new Missile(weaponName, self.Owner, self,
Game.world.Add(new Missile(weapon, self.Owner, self,
firePos, thisTarget, srcAltitude, fireFacing));
}
else
Game.world.Add(new Bullet(weaponName, self.Owner, self,
Game.world.Add(new Bullet(weapon, self.Owner, self,
firePos, thisTarget.CenterLocation.ToInt2(), srcAltitude, destAltitude));
if (!string.IsNullOrEmpty(weapon.Report))