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

hit effect start, kick charge

Browse Source
This commit is contained in:
minenice55
2022-07-29 22:25:48 -04:00
parent 463ae454d0
commit 1b5288f7e9
11 changed files with 1997 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,12 @@ namespace HeavenStudio.Games.Scripts_KarateMan
public int GetComboId() { return inComboId; }
public int GetShouldComboId() { return shouldComboId; }
public bool wantKick = false;
public bool inKick = false;
float lastChargeTime = Single.MinValue;
bool inSpecial { get { return inCombo || inKick; } }
private void Awake()
{
@ -44,6 +50,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
if (missProg >= 0f && missProg < 1f)
{
anim.DoScaledAnimation("LowKickMiss", lastComboMissTime, 3f);
bop.startBeat = lastComboMissTime + 3f;
}
else if (missProg >= 1f)
{
@ -56,7 +63,24 @@ namespace HeavenStudio.Games.Scripts_KarateMan
}
}
if (PlayerInput.Pressed(true) && !inCombo)
if (inKick)
{
float chargeProg = cond.GetPositionFromBeat(lastChargeTime, 2.75f);
if (chargeProg >= 0f && chargeProg < 1f)
{
anim.DoScaledAnimation("ManCharge", lastChargeTime, 2.75f);
bop.startBeat = lastChargeTime + 2.75f;
}
else if (chargeProg >= 1f)
{
anim.speed = 1f;
bop.startBeat = lastChargeTime + 2.75f;
lastChargeTime = Single.MinValue;
inKick = false;
}
}
if (PlayerInput.Pressed(true) && !inSpecial)
{
if (!KarateMan.instance.IsExpectingInputNow())
{
@ -64,7 +88,7 @@ namespace HeavenStudio.Games.Scripts_KarateMan
Jukebox.PlayOneShotGame("karateman/swingNoHit", forcePlay: true);
}
}
else if (PlayerInput.AltPressed() && !inCombo)
else if (PlayerInput.AltPressed() && !inSpecial)
{
if (!KarateMan.instance.IsExpectingInputNow())
{
@ -82,6 +106,12 @@ namespace HeavenStudio.Games.Scripts_KarateMan
}
}
}
if ((!GameManager.instance.autoplay) && (PlayerInput.PressedUp(true) && wantKick && !PlayerInput.Pressing(true)))
{
//stopped holding, don't charge
wantKick = false;
}
}
public bool Punch(int forceHand = 0)
@ -95,20 +125,20 @@ namespace HeavenStudio.Games.Scripts_KarateMan
if (cond.songPositionInBeats - lastPunchTime < 0.25f + (Minigame.LateTime() - 1f))
{
lastPunchTime = Single.MinValue;
anim.Play("Straight", -1, 0);
anim.DoScaledAnimationAsync("Straight", 0.5f);
straight = true;
}
else
{
lastPunchTime = cond.songPositionInBeats;
anim.Play("Jab", -1, 0);
anim.DoScaledAnimationAsync("Jab", 0.5f);
}
break;
case 1:
anim.Play("Jab", -1, 0);
anim.DoScaledAnimationAsync("Jab", 0.5f);
break;
case 2:
anim.Play("Straight", -1, 0);
anim.DoScaledAnimationAsync("Straight", 0.5f);
straight = true;
break;
}
@ -172,5 +202,29 @@ namespace HeavenStudio.Games.Scripts_KarateMan
new MultiSound.Sound("karateman/comboMiss", beat + 0.75f),
}, forcePlay: true);
}
public void StartKickCharge(float beat)
{
wantKick = true;
BeatAction.New(gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate {
if (wantKick)
{
wantKick = false;
inKick = true;
lastChargeTime = beat;
bop.startBeat = beat + 2.75f;
}
})
});
}
public void Kick(float beat)
{
if (!inKick) return;
inKick = false;
bop.startBeat = beat + 2f;
}
}
}