mirrors/HeavenStudio
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update monkey input temp results for clarity

Browse source
This commit is contained in:
blank3times 2024-01-26 17:55:12 -08:00
parent 33265d8af6
commit a663a9e7d8
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
Assets/Scripts/Games/HoleInOne/HoleInOne.cs
View file

@ -18,7 +18,7 @@ namespace HeavenStudio.Games.Loaders
{
return new Minigame("holeInOne", "Hole in One", "6ab99e", false, false, new List<GameAction>()
{
new GameAction("testanims", "Test Animation")
new GameAction("testanims", "Test Animation") // Delete this one when the game is more competent
{
function = delegate { HoleInOne.instance.DoTestAnim(eventCaller.currentEntity.beat); },
},
@ -27,7 +27,7 @@ namespace HeavenStudio.Games.Loaders
function = delegate { HoleInOne.instance.DoMandrill(eventCaller.currentEntity.beat); },
defaultLength = 4.0f,
},
new GameAction("monkey", "Monkey (sound only)")
new GameAction("monkey", "Monkey")
{
function = delegate { HoleInOne.instance.DoMonkey(eventCaller.currentEntity.beat); },
defaultLength = 3.0f,
@ -51,12 +51,12 @@ namespace HeavenStudio.Games
public static HoleInOne instance;
// Start is called before the first frame update
void Awake()
{
HoleInOne.instance = this;
}
// Delete this one when the game is more competent
public void DoTestAnim(double beat)
{
SoundByte.PlayOneShotGame("holeInOne/whale");
@ -66,7 +66,7 @@ namespace HeavenStudio.Games
public void DoMandrill(double beat)
{
//Mandrill Multisound
ScheduleInput(beat, 3f, InputAction_BasicPress, CatchSuccess, CatchSuccess1, CatchSuccess2);
// ScheduleInput(beat, 3f, InputAction_BasicPress, CatchSuccess, CatchSuccess1, CatchSuccess2);
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("holeInOne/mandrill1", beat),
new MultiSound.Sound("holeInOne/mandrill2", beat + 1f),
@ -86,35 +86,36 @@ namespace HeavenStudio.Games
public void DoMonkey(double beat)
{
//Monkey Multisound
ScheduleInput(beat, 2f, InputAction_BasicPress, CatchSuccess, CatchSuccess1, CatchSuccess2);
ScheduleInput(beat, 2f, InputAction_BasicPress, MonkeySuccess, MonkeyMiss, MonkeyWhiff);
MultiSound.Play(new MultiSound.Sound[] {
new MultiSound.Sound("holeInOne/monkey1", beat),
new MultiSound.Sound("holeInOne/monkey2", beat + 1f),
new MultiSound.Sound("holeInOne/hole1", beat + 2f),
new MultiSound.Sound("holeInOne/monkey2", beat + 1f)
});
// BeatAction.New(instance, new List<BeatAction.Action>()
// {
// new BeatAction.Action(beat, delegate { FarCrane.DoScaledAnimationAsync("Drop", 0.5f);}),
// new BeatAction.Action(beat + 1.0f, delegate { FarCrane.DoScaledAnimationAsync("Open", 0.5f);}),
// new BeatAction.Action(beat + 1.5f, delegate { FarCrane.DoScaledAnimationAsync("Lift", 0.5f);}),
// });
BeatAction.New(instance, new List<BeatAction.Action>()
{
new BeatAction.Action(beat, delegate { MonkeyAnim.Play("MonkeyPrepare");}),
new BeatAction.Action(beat + 1.0f, delegate { MonkeyAnim.Play("MonkeyThrow");}),
});
}
public void CatchSuccess(PlayerActionEvent caller, float state)
public void MonkeySuccess(PlayerActionEvent caller, float state)
{
SoundByte.PlayOneShotGame("holeInOne/monkey3");
MonkeyAnim.Play("MonkeySpin");
}
public void MonkeyMiss(PlayerActionEvent caller)
{
SoundByte.PlayOneShotGame("holeInOne/whale");
MonkeyAnim.Play("MonkeySpin");
}
public void CatchSuccess1(PlayerActionEvent caller)
public void MonkeyWhiff(PlayerActionEvent caller)
{
SoundByte.PlayOneShotGame("holeInOne/whale");
}
public void CatchSuccess2(PlayerActionEvent caller)
{
SoundByte.PlayOneShotGame("holeInOne/whale");
SoundByte.PlayOneShotGame("holeInOne/mandrill4");
MonkeyAnim.Play("MonkeyBop");
}
}
}