o kHiveSightRange 1500 -> 3000

o Maximum of 20 friendly blips and 25 enemy blips
o HG do NS_DMG_BLAST

git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@355 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
puzl 2005-11-19 01:25:38 +00:00
parent 50114acc4e
commit 536bee14d0
3 changed files with 8 additions and 5 deletions

View File

@ -135,7 +135,7 @@
#define kGrenadeLauncherCost 15 #define kGrenadeLauncherCost 15
#define kGrenadeRadius 350 #define kGrenadeRadius 350
#define kGrenadesResearchCost 10 #define kGrenadesResearchCost 10
#define kGrenadesResearchTime 90 #define kGrenadesResearchTime 45
#define kHandGrenDetonateTime 0.75 #define kHandGrenDetonateTime 0.75
#define kHGDamage 20 #define kHGDamage 20
#define kHGMaxAmmo 30 #define kHGMaxAmmo 30
@ -161,7 +161,7 @@
#define kHiveHealRadius 500 #define kHiveHealRadius 500
#define kHiveHealth 7000 #define kHiveHealth 7000
#define kHiveRegenerationAmount 2 #define kHiveRegenerationAmount 2
#define kHiveSightRange 1500 #define kHiveSightRange 3000
#define kInfantryPortalBuildTime 10 #define kInfantryPortalBuildTime 10
#define kInfantryPortalCost 20 #define kInfantryPortalCost 20
#define kInfantryPortalHealth 2500 #define kInfantryPortalHealth 2500

View File

@ -1162,9 +1162,12 @@ union float_converter
#else #else
void NetMsg_BlipList( entvars_t* const pev, const bool friendly_blips, const AvHVisibleBlipList& list ) void NetMsg_BlipList( entvars_t* const pev, const bool friendly_blips, const AvHVisibleBlipList& list )
{ {
int maxBlips = friendly_blips ? 20 : 25;
maxBlips = min ( list.mNumBlips, maxBlips );
MESSAGE_BEGIN( MSG_ONE_UNRELIABLE, g_msgBlipList, NULL, pev ); MESSAGE_BEGIN( MSG_ONE_UNRELIABLE, g_msgBlipList, NULL, pev );
//pack header - 7 bits for blip count (doesn't go over 40 in practice), 1 bit for Friend or Foe //pack header - 7 bits for blip count (doesn't go over 40 in practice), 1 bit for Friend or Foe
unsigned char list_info = list.mNumBlips | (friendly_blips ? 0x80 : 0); unsigned char list_info = maxBlips | (friendly_blips ? 0x80 : 0);
WRITE_BYTE( list_info ); WRITE_BYTE( list_info );
//pack each blip - this could be optimized as follows once bit packer is implemented: //pack each blip - this could be optimized as follows once bit packer is implemented:
// convert X, Y to integer values ranging from 0 to 2047 (11 bits each) based on map extents // convert X, Y to integer values ranging from 0 to 2047 (11 bits each) based on map extents
@ -1176,7 +1179,7 @@ union float_converter
// blip precision would be equal to double large minimap precision, with worst case of 4 unit X,Y separation for MT. // blip precision would be equal to double large minimap precision, with worst case of 4 unit X,Y separation for MT.
// because maps are much smaller vertically than horizontally as a rule, the worst case of 16 unit Z separation // because maps are much smaller vertically than horizontally as a rule, the worst case of 16 unit Z separation
// will very rarely occur. // will very rarely occur.
for( int counter = 0; counter < list.mNumBlips; counter++ ) for( int counter = 0; counter < maxBlips; counter++ )
{ {
WRITE_COORD( list.mBlipPositions[counter][0] ); WRITE_COORD( list.mBlipPositions[counter][0] );
WRITE_COORD( list.mBlipPositions[counter][1] ); WRITE_COORD( list.mBlipPositions[counter][1] );

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, inHandGrenade ? NS_DMG_NORMAL : NS_DMG_BLAST ); CGrenade* theGrenade = CGrenade::ShootExplosiveTimed(inOwner, inOrigin, inVelocity, inTime, NS_DMG_BLAST); // inHandGrenade ? NS_DMG_NORMAL : NS_DMG_BLAST );
ASSERT(theGrenade); ASSERT(theGrenade);
theGrenade->pev->team = inOwner->team; theGrenade->pev->team = inOwner->team;