Context Navigation

← Previous Change
Next Change →

weapons

Timestamp:

Mar 1, 2015, 10:06:17 PM (10 years ago)

Author:

landauf

Message:

don't add the pawn's velocity to the projectile's velocity. this makes no sense if the pawn's velocity is perpendicular to the projectile's velocity (e.g. for side turrets or when the pawn is 'strafing'). if at all, only the part of the pawn's velocity which has the same direction like the projectile should be considered. but this still makes projectiles unpredictable because they have changing speed. so better don't do it at all.

Location:

code/trunk/src/modules/weapons/weaponmodes

Files:

: 6 edited

EnergyDrink.cc (modified) (1 diff)
FusionFire.cc (modified) (1 diff)
HsW01.cc (modified) (1 diff)
LaserFire.cc (modified) (1 diff)
LightningGun.cc (modified) (1 diff)
RocketFire.cc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

code/trunk/src/modules/weapons/weaponmodes/EnergyDrink.cc

r10294	r10296
110	110	projectile->setOrientation(this->getMuzzleOrientation());
111	111	projectile->setPosition(this->getMuzzlePosition());
112		projectile->setVelocity(this->get~~Weapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->get~~MuzzleDirection() * this->speed_);
	112	projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
113	113
114	114	projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc

r10294	r10296
70	70	projectile->setOrientation(this->getMuzzleOrientation());
71	71	projectile->setPosition(this->getMuzzlePosition());
72		projectile->setVelocity(this->get~~Weapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->get~~MuzzleDirection() * this->speed_);
	72	projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
73	73	projectile->scale(5);
74	74

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

r10294	r10296
121	121	projectile->setOrientation(this->getMuzzleOrientation());
122	122	projectile->setPosition(this->getMuzzlePosition());
123		projectile->setVelocity(this->get~~Weapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->get~~MuzzleDirection() * this->speed_);
	123	projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
124	124
125	125	projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

code/trunk/src/modules/weapons/weaponmodes/LaserFire.cc

r10294	r10296
68	68	projectile->setOrientation(this->getMuzzleOrientation());
69	69	projectile->setPosition(this->getMuzzlePosition());
70		projectile->setVelocity(this->get~~Weapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->get~~MuzzleDirection() * this->speed_);
	70	projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
71	71
72	72	projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc

r10294	r10296
74	74	projectile->setOrientation(this->getMuzzleOrientation());
75	75	projectile->setPosition(this->getMuzzlePosition());
76		projectile->setVelocity(this->get~~Weapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->get~~MuzzleDirection() * this->speed_);
	76	projectile->setVelocity(this->getMuzzleDirection() * this->speed_);
77	77
78	78	projectile->setShooter(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());

code/trunk/src/modules/weapons/weaponmodes/RocketFire.cc

r9667	r10296
76	76	rocket->setOrientation(this->getMuzzleOrientation());
77	77	rocket->setPosition(this->getMuzzlePosition());
78		rocket->setVelocity(this->get~~Weapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getVelocity() + this->get~~MuzzleDirection() * this->speed_);
	78	rocket->setVelocity(this->getMuzzleDirection() * this->speed_);
79	79	rocket->scale(2);
80	80

Note: See TracChangeset for help on using the changeset viewer.