O Hand grenade damage reduced from 100 to 80

O Hand grenade damage reduced from 2x vs. structures to 1x
O Gorge healspray now heals Gorge that triggers it as well
O Increased Gorge armor from 50 to 70 (test this to make sure gorge doesn't die with armor left and that it doesn't cause big problems)

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@370 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2005-11-28 18:14:39 +00:00
parent 73a03548a7
commit bb58d18d8c
3 changed files with 6 additions and 6 deletions

View file

@ -124,7 +124,7 @@
#define kGestateBaseArmor 150 #define kGestateBaseArmor 150
#define kGestateHealth 200 #define kGestateHealth 200
#define kGorgeArmorUpgrade 50 #define kGorgeArmorUpgrade 50
#define kGorgeBaseArmor 50 #define kGorgeBaseArmor 70
#define kGorgeBaseSpeed 170 #define kGorgeBaseSpeed 170
#define kGorgeCost 10 #define kGorgeCost 10
#define kGorgeGestateTime 10 #define kGorgeGestateTime 10
@ -144,7 +144,7 @@
#define kHMGDamage 20 #define kHMGDamage 20
#define kHMGMaxAmmo 250 #define kHMGMaxAmmo 250
#define kHMGMaxClip 125 #define kHMGMaxClip 125
#define kHandGrenadeDamage 100 #define kHandGrenadeDamage 80
#define kHandGrenadeMaxAmmo 2 #define kHandGrenadeMaxAmmo 2
#define kHealingSprayBuildableScalar 5 #define kHealingSprayBuildableScalar 5
#define kHealingSprayDamage 13 #define kHealingSprayDamage 13

View file

@ -166,8 +166,8 @@ void AvHHealingSpray::FireProjectiles(void)
while((theCurrentEntity = UTIL_FindEntityInSphere(theCurrentEntity, theOriginatingPosition, kHealingSprayRange)) != NULL) while((theCurrentEntity = UTIL_FindEntityInSphere(theCurrentEntity, theOriginatingPosition, kHealingSprayRange)) != NULL)
{ {
// Can't affect self // Can't affect self
if(theCurrentEntity != this->m_pPlayer) // if(theCurrentEntity != this->m_pPlayer)
{ // {
// If entity is in view cone, and within range // If entity is in view cone, and within range
if(this->m_pPlayer->FInViewCone(&theCurrentEntity->pev->origin)) if(this->m_pPlayer->FInViewCone(&theCurrentEntity->pev->origin))
{ {
@ -240,7 +240,7 @@ void AvHHealingSpray::FireProjectiles(void)
} }
} }
} }
} // }
} }
#endif #endif

View file

@ -1076,7 +1076,7 @@ CBaseEntity* AvHSUGetEntityFromIndex(int inEntityIndex)
CGrenade* AvHSUShootServerGrenade(entvars_t* inOwner, Vector inOrigin, Vector inVelocity, float inTime, bool inHandGrenade) CGrenade* AvHSUShootServerGrenade(entvars_t* inOwner, Vector inOrigin, Vector inVelocity, float inTime, bool inHandGrenade)
{ {
CGrenade* theGrenade = CGrenade::ShootExplosiveTimed(inOwner, inOrigin, inVelocity, inTime, NS_DMG_BLAST); // inHandGrenade ? NS_DMG_NORMAL : NS_DMG_BLAST ); CGrenade* theGrenade = CGrenade::ShootExplosiveTimed(inOwner, inOrigin, inVelocity, inTime, inHandGrenade ? NS_DMG_NORMAL : NS_DMG_BLAST );
ASSERT(theGrenade); ASSERT(theGrenade);
theGrenade->pev->team = inOwner->team; theGrenade->pev->team = inOwner->team;