Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-13 00:57:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

change operation order for input checks

Browse Source
This commit is contained in:
minenice55
2024-01-25 15:11:43 -05:00
parent 9f0a48e9ff
commit 9be16564a0
12 changed files with 81 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Assets/Scripts/Games/KarateMan/KarateManJoe.cs
View File

@ -39,7 +39,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
double lastChargeTime = double.MinValue;
double unPrepareTime = double.MinValue;
double noNuriJabTime = double.MinValue;
bool canEmote = false;
bool canEmote = false, justPunched = false;
public int wantFace = 0;
public bool inSpecial
@ -137,7 +137,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
}
}
if (PlayerInput.GetIsAction(KarateMan.InputAction_Press) && !inSpecial)
if (PlayerInput.GetIsAction(KarateMan.InputAction_Press) && !(inSpecial || justPunched))
{
if (!KarateMan.instance.IsExpectingInputNow(KarateMan.InputAction_Press))
{
@ -204,7 +204,11 @@ namespace HeavenStudio.Games.Scripts_KarateMan
}
}
}
}
void LateUpdate()
{
justPunched = false;
}
public void Bop()
@ -230,19 +234,6 @@ namespace HeavenStudio.Games.Scripts_KarateMan
switch (forceHand)
{
case 0:
if (cond.songPositionInBeatsAsDouble - lastPunchTime < 0.25f + (Minigame.JustLateTime() - 1f))
{
lastPunchTime = double.MinValue;
anim.DoScaledAnimationAsync("Straight", 0.5f);
straight = true;
}
else
{
lastPunchTime = cond.songPositionInBeatsAsDouble;
anim.DoScaledAnimationAsync("Jab", 0.5f);
}
break;
case 1:
anim.DoScaledAnimationAsync("Jab", 0.5f);
break;
@ -255,6 +246,19 @@ namespace HeavenStudio.Games.Scripts_KarateMan
anim.DoNormalizedAnimation("JabNoNuri");
noNuriJabTime = cond.songPositionInBeatsAsDouble;
break;
default:
if (cond.songPositionInBeatsAsDouble <= cond.GetBeatFromSongPos(lastPunchTime + Minigame.NgLateTime() - 1) + 0.25)
{
lastPunchTime = double.MinValue;
anim.DoScaledAnimationAsync("Straight", 0.5f);
straight = true;
}
else
{
lastPunchTime = cond.songPositionAsDouble;
anim.DoScaledAnimationAsync("Jab", 0.5f);
}
break;
}
if (touchCharge)
{
@ -265,6 +269,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
{
bop.startBeat = cond.songPositionInBeatsAsDouble + 0.5f;
}
justPunched = true;
return straight; //returns what hand was used to punch the object
}