Mantis 0001077:

o Reduced the handgrenade research coost: 20 -> 10
o Reduce the time from throw till detonation: 2.0s -> 0.75s.
o Grenades can now be thrown before the prime grenade animation has finished, allowing faster throws
o Number of handgrenades equipped upon spawn has been increased: 1 -> 2

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@260 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
tankefugl 2005-07-11 17:40:13 +00:00
parent 14b10493b3
commit 505ab77679
3 changed files with 15 additions and 11 deletions

View file

@ -129,12 +129,12 @@
#define kGorgeCost 10
#define kGorgeGestateTime 10
#define kGorgeHealth 150
#define kGrenDetonateTime 2
#define kGrenDetonateTime 0.75
#define kGrenadeDamage 125
#define kGrenadeForce 800
#define kGrenadeLauncherCost 15
#define kGrenadeRadius 350
#define kGrenadesResearchCost 20
#define kGrenadesResearchCost 10
#define kGrenadesResearchTime 45
#define kHGDamage 20
#define kHGMaxAmmo 30
@ -144,7 +144,7 @@
#define kHMGMaxAmmo 250
#define kHMGMaxClip 125
#define kHandGrenadeDamage 100
#define kHandGrenadeMaxAmmo 1
#define kHandGrenadeMaxAmmo 2
#define kHealingSprayBuildableScalar 5
#define kHealingSprayDamage 13
#define kHealingSprayPlayerPercent 4
@ -389,7 +389,7 @@
#define kGrenadeLauncherGrenadeReloadTime 1.10
#define kHGROF 0.20
#define kHMGROF 0.10
#define kHandGrenadePrimeTime 1.00
#define kHandGrenadePrimeTime 0.00
#define kHealingSprayEnergyCost 0.15
#define kHealingSprayROF 1.60
#define kHeavySpeedMultiplier 0.95

View file

@ -56,7 +56,7 @@ const float kGrenadeParentVelocityScalar = .4f;
const float kGrenadeGravity = .8f;
const float kGrenadeElasticity = 0.6f;
const float kGrenadePrimeAnimationLength = 2.3f;
const float kGrenadePrimeAnimationLength = 0.0f; //2.3f;
const float kGrenadeThrowTimeBeforeRelease = .3f;
const float kGrenadeThrowAnimationLength = 1.5f;
@ -267,6 +267,10 @@ void AvHGrenade::PrimaryAttack(void)
m_flTimeWeaponIdle = UTIL_WeaponTimeBase() + kGrenadePrimeAnimationLength;
}
}
else
{
int a = 0;
}
}
void AvHGrenade::FireProjectiles(void)
@ -323,7 +327,7 @@ void AvHGrenade::Spawn()
Precache();
this->m_iId = AVH_WEAPON_GRENADE;
this->m_iDefaultAmmo = 1;
this->m_iDefaultAmmo = BALANCE_VAR(kHandGrenadeMaxAmmo);
// Set our class name
this->pev->classname = MAKE_STRING(kwsGrenade);

View file

@ -177,8 +177,8 @@ int AvHKnife::iItemSlot(void)
int AvHMine::GetItemInfo(ItemInfo *p) const
{
p->iSlot = AVH_FOURTH_SLOT;
p->iPosition = 0;
p->iSlot = AVH_FIFTH_SLOT;
p->iPosition = 1;
p->pszName = STRING(pev->classname);
p->pszAmmo1 = "MineAmmo";
@ -205,7 +205,7 @@ int AvHMine::GetItemInfo(ItemInfo *p) const
int AvHMine::iItemSlot(void)
{
return AVH_FOURTH_SLOT + 1;
return AVH_FIFTH_SLOT + 1;
}
@ -684,14 +684,14 @@ int AvHParasiteGun::iItemSlot(void)
int AvHGrenade::GetItemInfo(ItemInfo *p) const
{
p->iSlot = AVH_FOURTH_SLOT;
p->iPosition = 2;
p->iPosition = 0;
p->pszName = STRING(pev->classname);
p->pszAmmo1 = "HandGrenadeAmmo";
p->iMaxAmmo1 = BALANCE_VAR(kHandGrenadeMaxAmmo);
p->pszAmmo2 = NULL;
p->iMaxAmmo2 = BALANCE_VAR(kHandGrenadeDamage);
p->iMaxClip = 1;
p->iMaxClip = BALANCE_VAR(kHandGrenadeMaxAmmo);;
p->iFlags = ITEM_FLAG_EXHAUSTIBLE;
p->iId = AVH_WEAPON_GRENADE;
p->iWeight = kGrenadeWeaponWeight;