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

Adjust force powers for custom started map

Browse source
This commit is contained in:
Petr Bartos 2023-11-28 18:25:12 +01:00 committed by Simon
parent 7a5d972992
commit 0846f98023
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14727,24 +14727,24 @@ void WP_InitForcePowers( gentity_t *ent )
else else
{ {
ent->client->ps.forcePowersKnown = ( 1 << FP_HEAL )|( 1 << FP_LEVITATION )|( 1 << FP_SPEED )|( 1 << FP_PUSH )|( 1 << FP_PULL )|( 1 << FP_TELEPATHY )|( 1 << FP_GRIP )|( 1 << FP_LIGHTNING)|( 1 << FP_SABERTHROW)|( 1 << FP_SABER_DEFENSE )|( 1 << FP_SABER_OFFENSE )|( 1<< FP_RAGE )|( 1<< FP_DRAIN )|( 1<< FP_PROTECT )|( 1<< FP_ABSORB )|( 1<< FP_SEE ); ent->client->ps.forcePowersKnown = ( 1 << FP_HEAL )|( 1 << FP_LEVITATION )|( 1 << FP_SPEED )|( 1 << FP_PUSH )|( 1 << FP_PULL )|( 1 << FP_TELEPATHY )|( 1 << FP_GRIP )|( 1 << FP_LIGHTNING)|( 1 << FP_SABERTHROW)|( 1 << FP_SABER_DEFENSE )|( 1 << FP_SABER_OFFENSE )|( 1<< FP_RAGE )|( 1<< FP_DRAIN )|( 1<< FP_PROTECT )|( 1<< FP_ABSORB )|( 1<< FP_SEE );
ent->client->ps.forcePowerLevel[FP_HEAL] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_HEAL] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_LEVITATION] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_LEVITATION] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_PUSH] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_PUSH] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_PULL] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_PULL] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_SABERTHROW] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_SABERTHROW] = FORCE_LEVEL_2;
ent->client->ps.forcePowerLevel[FP_SPEED] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_SPEED] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_LIGHTNING] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_LIGHTNING] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_TELEPATHY] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_TELEPATHY] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_RAGE] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_RAGE] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_PROTECT] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_PROTECT] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_ABSORB] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_ABSORB] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_DRAIN] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_DRAIN] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_SEE] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_SEE] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_SABER_DEFENSE] = FORCE_LEVEL_3; ent->client->ps.forcePowerLevel[FP_SABER_DEFENSE] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_SABER_OFFENSE] = FORCE_LEVEL_3; ent->client->ps.forcePowerLevel[FP_SABER_OFFENSE] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_GRIP] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_GRIP] = FORCE_LEVEL_3;
} }
} }
} }

16
Projects/Android/jni/OpenJK/codeJK2/game/wp_saber.cpp
View file

@ -8677,14 +8677,14 @@ void WP_InitForcePowers( gentity_t *ent )
ent->client->ps.forcePowersKnown = ( 1 << FP_HEAL )|( 1 << FP_LEVITATION )|( 1 << FP_SPEED )|( 1 << FP_PUSH )|( 1 << FP_PULL )|( 1 << FP_TELEPATHY )|( 1 << FP_GRIP )|( 1 << FP_LIGHTNING)|( 1 << FP_SABERTHROW)|( 1 << FP_SABER_DEFENSE )|( 1 << FP_SABER_OFFENSE ); ent->client->ps.forcePowersKnown = ( 1 << FP_HEAL )|( 1 << FP_LEVITATION )|( 1 << FP_SPEED )|( 1 << FP_PUSH )|( 1 << FP_PULL )|( 1 << FP_TELEPATHY )|( 1 << FP_GRIP )|( 1 << FP_LIGHTNING)|( 1 << FP_SABERTHROW)|( 1 << FP_SABER_DEFENSE )|( 1 << FP_SABER_OFFENSE );
ent->client->ps.forcePower = ent->client->ps.forcePowerMax = FORCE_POWER_MAX; ent->client->ps.forcePower = ent->client->ps.forcePowerMax = FORCE_POWER_MAX;
ent->client->ps.forcePowerRegenDebounceTime = 0; ent->client->ps.forcePowerRegenDebounceTime = 0;
ent->client->ps.forcePowerLevel[FP_HEAL] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_HEAL] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_LEVITATION] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_LEVITATION] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_PUSH] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_PUSH] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_PULL] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_PULL] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_SABERTHROW] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_SABERTHROW] = FORCE_LEVEL_2;
ent->client->ps.forcePowerLevel[FP_SPEED] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_SPEED] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_LIGHTNING] = FORCE_LEVEL_1; ent->client->ps.forcePowerLevel[FP_LIGHTNING] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_TELEPATHY] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_TELEPATHY] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_SABER_DEFENSE] = FORCE_LEVEL_3; ent->client->ps.forcePowerLevel[FP_SABER_DEFENSE] = FORCE_LEVEL_3;
ent->client->ps.forcePowerLevel[FP_SABER_OFFENSE] = FORCE_LEVEL_3; ent->client->ps.forcePowerLevel[FP_SABER_OFFENSE] = FORCE_LEVEL_3;
if ( ent->NPC ) if ( ent->NPC )
@ -8693,7 +8693,7 @@ void WP_InitForcePowers( gentity_t *ent )
} }
else else
{ {
ent->client->ps.forcePowerLevel[FP_GRIP] = FORCE_LEVEL_2; ent->client->ps.forcePowerLevel[FP_GRIP] = FORCE_LEVEL_3;
} }
ent->client->ps.forceGripEntityNum = ENTITYNUM_NONE; ent->client->ps.forceGripEntityNum = ENTITYNUM_NONE;
ent->client->ps.forceGripEntityInitialDist = ENTITYNUM_NONE; ent->client->ps.forceGripEntityInitialDist = ENTITYNUM_NONE;