teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-24 21:11:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-instated force level 3 saber throw enemy seek from JKO in JKA

Browse source
This commit is contained in:
Simon 2023-07-10 23:36:19 +01:00
parent 5cffb00cd4
commit bda2e7e3f1
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Projects/Android/jni/OpenJK/code/game/wp_saber.cpp
View file

@ -6526,6 +6526,24 @@ void WP_RunSaber( gentity_t *self, gentity_t *saber )
VectorCopy( self->client->renderInfo.handRPoint, saberHome ); VectorCopy( self->client->renderInfo.handRPoint, saberHome );
VectorMA( saberHome, self->client->ps.saberEntityDist, forward, saberDest ); VectorMA( saberHome, self->client->ps.saberEntityDist, forward, saberDest );
/*
* This is JKO's saber level 3 enemy seek code, just seems to work better, especially in VR
* so have re-instated this
*/
if ( self->client->ps.forcePowerLevel[FP_SABERTHROW] > FORCE_LEVEL_2 && self->client->ps.saberEntityState == SES_LEAVING )
{//max level
//pick an enemy
enemy = WP_SaberFindEnemy( self, saber );
if ( enemy )
{//home in on enemy
float enemyDist = Distance( self->client->renderInfo.handRPoint, enemy->currentOrigin );
VectorCopy( enemy->currentOrigin, saberDest );
saberDest[2] += enemy->maxs[2]/2.0f;//FIXME: when in a knockdown anim, the saber float above them... do we care?
self->client->ps.saberEntityDist = enemyDist;
}
}
/*
if ( self->client->ps.forcePowerLevel[FP_SABERTHROW] > FORCE_LEVEL_2 if ( self->client->ps.forcePowerLevel[FP_SABERTHROW] > FORCE_LEVEL_2
&& self->client->ps.saberEntityState == SES_LEAVING ) && self->client->ps.saberEntityState == SES_LEAVING )
{//max level {//max level
@ -6549,6 +6567,7 @@ void WP_RunSaber( gentity_t *self, gentity_t *saber )
} }
} }
} }
*/
//Make the saber head there //Make the saber head there