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

Prevent special attack being triggered when throwing saber in JKA

Browse source
This commit is contained in:
Simon 2023-04-24 22:18:09 +01:00
parent ec9aab5f6f
commit 7c5184592f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Projects/Android/jni/JKXR/VrInputDefault.cpp
View file

@ -550,14 +550,16 @@ void HandleInput_Default( ovrInputStateTrackedRemote *pDominantTrackedRemoteNew,
} }
bool triggered = vr.primaryVelocityTriggeredAttack || (vr.dualsabers && vr.secondaryVelocityTriggeredAttack); bool triggered = vr.primaryVelocityTriggeredAttack || (vr.dualsabers && vr.secondaryVelocityTriggeredAttack);
if (fired != triggered) if (fired != triggered &&
//Don't trigger regular attack if the trigger is held down as this can cause a special attack to occur in JKA
!(pDominantTrackedRemoteNew->Buttons & xrButton_Trigger))
{ {
ALOGV("**WEAPON EVENT** veocity triggered %s", ALOGV("**WEAPON EVENT** veocity triggered %s",
triggered ? "+attack" : "-attack"); triggered ? "+attack" : "-attack");
//normal attack is a punch with the left hand //normal attack is a punch with the left hand
sendButtonAction("+attack", triggered); sendButtonAction("+attack", triggered);
fired = triggered;
} }
fired = triggered;
} else if (vr.primaryVelocityTriggeredAttack || vr.secondaryVelocityTriggeredAttack) { } else if (vr.primaryVelocityTriggeredAttack || vr.secondaryVelocityTriggeredAttack) {
//send a stop attack as we have an unfinished velocity attack //send a stop attack as we have an unfinished velocity attack
vr.primaryVelocityTriggeredAttack = false; vr.primaryVelocityTriggeredAttack = false;