diff --git a/releases/3.1.2/Balance.txt b/releases/3.1.2/Balance.txt index 5acd08cd..08af0c99 100644 --- a/releases/3.1.2/Balance.txt +++ b/releases/3.1.2/Balance.txt @@ -124,7 +124,7 @@ #define kGestateBaseArmor 150 #define kGestateHealth 200 #define kGorgeArmorUpgrade 50 -#define kGorgeBaseArmor 50 +#define kGorgeBaseArmor 70 #define kGorgeBaseSpeed 170 #define kGorgeCost 10 #define kGorgeGestateTime 10 @@ -144,7 +144,7 @@ #define kHMGDamage 20 #define kHMGMaxAmmo 250 #define kHMGMaxClip 125 -#define kHandGrenadeDamage 100 +#define kHandGrenadeDamage 80 #define kHandGrenadeMaxAmmo 2 #define kHealingSprayBuildableScalar 5 #define kHealingSprayDamage 13 diff --git a/releases/3.1.2/source/mod/AvHHealingSpray.cpp b/releases/3.1.2/source/mod/AvHHealingSpray.cpp index e1ed54ea..91009aa0 100644 --- a/releases/3.1.2/source/mod/AvHHealingSpray.cpp +++ b/releases/3.1.2/source/mod/AvHHealingSpray.cpp @@ -166,8 +166,8 @@ void AvHHealingSpray::FireProjectiles(void) while((theCurrentEntity = UTIL_FindEntityInSphere(theCurrentEntity, theOriginatingPosition, kHealingSprayRange)) != NULL) { // Can't affect self - if(theCurrentEntity != this->m_pPlayer) - { +// if(theCurrentEntity != this->m_pPlayer) +// { // If entity is in view cone, and within range if(this->m_pPlayer->FInViewCone(&theCurrentEntity->pev->origin)) { @@ -240,7 +240,7 @@ void AvHHealingSpray::FireProjectiles(void) } } } - } +// } } #endif diff --git a/releases/3.1.2/source/mod/AvHServerUtil.cpp b/releases/3.1.2/source/mod/AvHServerUtil.cpp index 5f7c91bb..190138d3 100644 --- a/releases/3.1.2/source/mod/AvHServerUtil.cpp +++ b/releases/3.1.2/source/mod/AvHServerUtil.cpp @@ -1076,7 +1076,7 @@ CBaseEntity* AvHSUGetEntityFromIndex(int inEntityIndex) 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); theGrenade->pev->team = inOwner->team;