mirror of
https://github.com/unknownworlds/NS.git
synced 2024-11-14 00:41:06 +00:00
o Mantis 517: Changed the web render settings to values that work irrespective of alien flashlight setting.
o Aliens can not gestate on steep slopes. o Eggs no longer take fall damage git-svn-id: https://unknownworlds.svn.cloudforge.com/ns1@560 67975925-1194-0748-b3d5-c16f83f1a3a1
This commit is contained in:
parent
d6965e1813
commit
22ba26ba21
4 changed files with 17 additions and 5 deletions
|
@ -2934,7 +2934,7 @@ void CBasePlayer::PostThink()
|
||||||
// EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_wade1.wav", 1, ATTN_NORM);
|
// EMIT_SOUND(ENT(pev), CHAN_BODY, "player/pl_wade1.wav", 1, ATTN_NORM);
|
||||||
}
|
}
|
||||||
// skulks, lerks, fades and jetpackers don't take falling damage
|
// skulks, lerks, fades and jetpackers don't take falling damage
|
||||||
else if ((m_flFallVelocity > PLAYER_MAX_SAFE_FALL_SPEED) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER1) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER3) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER4) && (!GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_7) || !(this->pev->iuser3 == AVH_USER3_MARINE_PLAYER)) )
|
else if ((m_flFallVelocity > PLAYER_MAX_SAFE_FALL_SPEED) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER1) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER3) && (this->pev->iuser3 != AVH_USER3_ALIEN_PLAYER4) && (this->pev->iuser3 != AVH_USER3_ALIEN_EMBRYO) && (!GetHasUpgrade(this->pev->iuser4, MASK_UPGRADE_7) || !(this->pev->iuser3 == AVH_USER3_MARINE_PLAYER)) )
|
||||||
{// after this point, we start doing damage
|
{// after this point, we start doing damage
|
||||||
|
|
||||||
float flFallDamage = g_pGameRules->FlPlayerFallDamage( this );
|
float flFallDamage = g_pGameRules->FlPlayerFallDamage( this );
|
||||||
|
|
|
@ -1700,7 +1700,7 @@ void AvHWebStrand::Setup(const Vector& inPointOne, const Vector& inPointTwo)
|
||||||
this->SetScrollRate( 0 );
|
this->SetScrollRate( 0 );
|
||||||
this->SetFrame(0);
|
this->SetFrame(0);
|
||||||
//this->SetBrightness( 64 );
|
//this->SetBrightness( 64 );
|
||||||
this->SetBrightness( 8 );
|
this->SetBrightness( 12 );
|
||||||
|
|
||||||
this->pev->classname = MAKE_STRING(kesTeamWebStrand);
|
this->pev->classname = MAKE_STRING(kesTeamWebStrand);
|
||||||
this->pev->rendermode = kRenderNormal;
|
this->pev->rendermode = kRenderNormal;
|
||||||
|
|
|
@ -1144,9 +1144,20 @@ bool AvHPlayer::ExecuteAlienMorphMessage(AvHMessageID inMessageID, bool inInstan
|
||||||
{
|
{
|
||||||
int a = 0;
|
int a = 0;
|
||||||
}
|
}
|
||||||
|
TraceResult tr;
|
||||||
this->Evolve(inMessageID, inInstantaneous);
|
Vector vecStart, vecEnd;
|
||||||
theMessageExecuted = true;
|
VectorCopy(this->pev->origin, vecStart);
|
||||||
|
VectorCopy(this->pev->origin, vecEnd);
|
||||||
|
vecEnd[2]-=100;
|
||||||
|
UTIL_TraceLine(vecStart, vecEnd, ignore_monsters, dont_ignore_glass, NULL, &tr);
|
||||||
|
|
||||||
|
if ( tr.vecPlaneNormal[2] > 0.7 ) {
|
||||||
|
this->Evolve(inMessageID, inInstantaneous);
|
||||||
|
theMessageExecuted = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
this->SendMessage(kSurfaceTooSteep);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -81,6 +81,7 @@
|
||||||
#define kMustGestateUp "MustGestateUp"
|
#define kMustGestateUp "MustGestateUp"
|
||||||
#define kMustGestateOnGround "MustGestateOnGround"
|
#define kMustGestateOnGround "MustGestateOnGround"
|
||||||
#define kNotWhileDigesting "NotWhileDigesting"
|
#define kNotWhileDigesting "NotWhileDigesting"
|
||||||
|
#define kSurfaceTooSteep "SurfaceTooSteep"
|
||||||
#define kNoReadyRoomWhileDigested "NoReadyRoomWhileDigested"
|
#define kNoReadyRoomWhileDigested "NoReadyRoomWhileDigested"
|
||||||
#define kNeedMoreRoomToGestate "NeedMoreRoomToGestate"
|
#define kNeedMoreRoomToGestate "NeedMoreRoomToGestate"
|
||||||
#define kNeedOneHiveToGestate "NeedOneHiveToGestate"
|
#define kNeedOneHiveToGestate "NeedOneHiveToGestate"
|
||||||
|
|
Loading…
Reference in a new issue