mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-10 03:35:10 +00:00
Working Dough Fixes (#223)
* make intervals be set at the correct time clear queued balls lists while playback is stopped queue sounds in advance to prevent mistiming * clear tambourine queued inputs while playback is stopped * clear queued inputs OnDestroy
This commit is contained in:
minenice55
GitHub
parent
c3a85d2f7e
commit
97f775fd25
2 changed files with 68 additions and 17 deletions
|
|
@ -138,8 +138,17 @@ namespace HeavenStudio.Games
|
|||
monkeyAnimator.Play("MonkeyIdle", 0, 0);
|
||||
}
|
||||
|
||||
void OnDestroy()
|
||||
{
|
||||
if (queuedInputs.Count > 0) queuedInputs.Clear();
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
if (!Conductor.instance.isPlaying || Conductor.instance.isPaused)
|
||||
{
|
||||
if (queuedInputs.Count > 0) queuedInputs.Clear();
|
||||
}
|
||||
if (!Conductor.instance.isPlaying && !Conductor.instance.isPaused && intervalStarted)
|
||||
{
|
||||
intervalStarted = false;
|
||||
|
|
|
|||
|
|
@ -15,36 +15,39 @@ namespace HeavenStudio.Games.Loaders
|
|||
{
|
||||
new GameAction("beat intervals", "Start Interval")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; WorkingDough.instance.SetIntervalStart(e.beat, e.length); },
|
||||
preFunction = delegate { var e = eventCaller.currentEntity; WorkingDough.PreSetIntervalStart(e.beat, e.length); },
|
||||
defaultLength = 8f,
|
||||
resizable = true,
|
||||
priority = 1
|
||||
priority = 2
|
||||
},
|
||||
new GameAction("small ball", "Small Ball")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; WorkingDough.instance.OnSpawnBall(e.beat, false); },
|
||||
preFunction = delegate { var e = eventCaller.currentEntity; WorkingDough.PreSpawnBall(e.beat, false); },
|
||||
defaultLength = 0.5f,
|
||||
priority = 2
|
||||
priority = 1
|
||||
},
|
||||
new GameAction("big ball", "Big Ball")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; WorkingDough.instance.OnSpawnBall(e.beat, true); },
|
||||
preFunction = delegate { var e = eventCaller.currentEntity; WorkingDough.PreSpawnBall(e.beat, true); },
|
||||
defaultLength = 0.5f,
|
||||
priority = 2
|
||||
priority = 1
|
||||
},
|
||||
new GameAction("launch spaceship", "Launch Spaceship")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; WorkingDough.instance.LaunchShip(e.beat, e.length); },
|
||||
defaultLength = 4f,
|
||||
resizable = true,
|
||||
priority = 3
|
||||
priority = 0
|
||||
},
|
||||
new GameAction("rise spaceship", "Rise Up Spaceship")
|
||||
{
|
||||
function = delegate { var e = eventCaller.currentEntity; WorkingDough.instance.RiseUpShip(e.beat, e.length); },
|
||||
defaultLength = 4f,
|
||||
resizable = true,
|
||||
priority = 3
|
||||
priority = 0
|
||||
},
|
||||
new GameAction("lift dough dudes", "Lift Dough Dudes")
|
||||
{
|
||||
|
|
@ -55,7 +58,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("toggle", false, "Go Up?", "Toggle to go Up or Down.")
|
||||
},
|
||||
resizable = true,
|
||||
priority = 3
|
||||
priority = 0
|
||||
},
|
||||
new GameAction("instant lift", "Instant Lift")
|
||||
{
|
||||
|
|
@ -65,7 +68,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("toggle", true, "Go Up?", "Toggle to go Up or Down.")
|
||||
},
|
||||
defaultLength = 0.5f,
|
||||
priority = 3
|
||||
priority = 0
|
||||
},
|
||||
new GameAction("mr game and watch enter or exit", "Mr. G&W Enter or Exit")
|
||||
{
|
||||
|
|
@ -76,7 +79,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("toggle", false, "Should exit?", "Toggle to make him leave or enter.")
|
||||
},
|
||||
resizable = true,
|
||||
priority = 3
|
||||
priority = 0
|
||||
},
|
||||
new GameAction("instant game and watch", "Instant Mr. G&W Enter or Exit")
|
||||
{
|
||||
|
|
@ -86,7 +89,7 @@ namespace HeavenStudio.Games.Loaders
|
|||
new Param("toggle", false, "Exit?", "Toggle to make him leave or enter.")
|
||||
},
|
||||
defaultLength = 0.5f,
|
||||
priority = 3
|
||||
priority = 0
|
||||
},
|
||||
});
|
||||
}
|
||||
|
|
@ -137,7 +140,7 @@ namespace HeavenStudio.Games
|
|||
float risingStartBeat;
|
||||
float liftingLength = 4f;
|
||||
float liftingStartBeat;
|
||||
public float beatInterval = 8f;
|
||||
public static float beatInterval = 8f;
|
||||
float gandMovingLength = 4f;
|
||||
float gandMovingStartBeat;
|
||||
public bool bigMode;
|
||||
|
|
@ -211,6 +214,7 @@ namespace HeavenStudio.Games
|
|||
Debug.Log("Start Interval");
|
||||
if (!intervalStarted)
|
||||
{
|
||||
instance.ballTriggerSetInterval = false;
|
||||
intervalStarted = true;
|
||||
bigMode = false;
|
||||
BeatAction.New(ballTransporterLeftNPC, new List<BeatAction.Action>()
|
||||
|
|
@ -278,13 +282,16 @@ namespace HeavenStudio.Games
|
|||
bigMode = true;
|
||||
}
|
||||
|
||||
MultiSound.Play(new MultiSound.Sound[] {
|
||||
new MultiSound.Sound(isBig ? "workingDough/NPCBigBall" : "workingDough/NPCSmallBall", beat + 1f),
|
||||
});
|
||||
|
||||
arrowSRLeftNPC.sprite = redArrowSprite;
|
||||
BeatAction.New(doughDudesNPC, new List<BeatAction.Action>()
|
||||
{
|
||||
//Jump and play sound
|
||||
new BeatAction.Action(beat + 0.1f, delegate { arrowSRLeftNPC.sprite = whiteArrowSprite; }),
|
||||
new BeatAction.Action(beat + 1f, delegate { doughDudesNPC.GetComponent<Animator>().Play(isBig ? "BigDoughJump" :"SmallDoughJump", 0, 0); }),
|
||||
new BeatAction.Action(beat + 1f, delegate { Jukebox.PlayOneShotGame(isBig ? "workingDough/NPCBigBall" : "workingDough/NPCSmallBall"); }),
|
||||
new BeatAction.Action(beat + 1f, delegate { npcImpact.SetActive(true); }),
|
||||
new BeatAction.Action(beat + 1.1f, delegate { npcImpact.SetActive(false); }),
|
||||
new BeatAction.Action(beat + 1.9f, delegate { arrowSRRightNPC.sprite = redArrowSprite; }),
|
||||
|
|
@ -309,12 +316,18 @@ namespace HeavenStudio.Games
|
|||
{
|
||||
bigMode = true;
|
||||
}
|
||||
|
||||
if (beat >= Conductor.instance.songPositionInBeatsAsDouble)
|
||||
{
|
||||
MultiSound.Play(new MultiSound.Sound[] {
|
||||
new MultiSound.Sound(isBig ? "workingDough/NPCBigBall" : "workingDough/NPCSmallBall", beat),
|
||||
});
|
||||
}
|
||||
|
||||
BeatAction.New(doughDudesNPC, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(beat - offSet, delegate { spawnedBall.SetActive(true); }),
|
||||
new BeatAction.Action(beat, delegate { doughDudesNPC.GetComponent<Animator>().Play(isBig ? "BigDoughJump" : "SmallDoughJump", 0, 0); } ),
|
||||
new BeatAction.Action(beat, delegate { Jukebox.PlayOneShotGame(isBig ? "workingDough/NPCBigBall" : "workingDough/NPCSmallBall"); } ),
|
||||
new BeatAction.Action(beat, delegate { npcImpact.SetActive(true); } ),
|
||||
new BeatAction.Action(beat + 0.1f, delegate { npcImpact.SetActive(false); }),
|
||||
new BeatAction.Action(beat + 0.9f, delegate { arrowSRRightNPC.sprite = redArrowSprite; }),
|
||||
|
|
@ -340,7 +353,7 @@ namespace HeavenStudio.Games
|
|||
}
|
||||
}),
|
||||
new BeatAction.Action(spawnBeat, delegate { if (instance != null) instance.SpawnBall(beat, isBig); }),
|
||||
new BeatAction.Action(spawnBeat + instance.beatInterval, delegate { instance.SpawnPlayerBall(beat + instance.beatInterval, isBig); }),
|
||||
// new BeatAction.Action(spawnBeat + instance.beatInterval, delegate { instance.SpawnPlayerBall(beat + instance.beatInterval, isBig); }),
|
||||
});
|
||||
}
|
||||
else
|
||||
|
|
@ -353,6 +366,24 @@ namespace HeavenStudio.Games
|
|||
}
|
||||
}
|
||||
|
||||
public void OnSpawnBall(float beat, bool isBig)
|
||||
{
|
||||
beat -= 1f;
|
||||
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(beat + beatInterval, delegate { instance.SpawnPlayerBall(beat + beatInterval, isBig); }),
|
||||
});
|
||||
}
|
||||
|
||||
public void OnSpawnBallInactive(float beat, bool isBig)
|
||||
{
|
||||
queuedBalls.Add(new QueuedBall()
|
||||
{
|
||||
beat = beat + 1f,
|
||||
isBig = isBig,
|
||||
});
|
||||
}
|
||||
|
||||
public void SpawnPlayerBall(float beat, bool isBig)
|
||||
{
|
||||
var objectToSpawn = isBig ? playerEnterBigBall : playerEnterSmallBall;
|
||||
|
|
@ -412,8 +443,8 @@ namespace HeavenStudio.Games
|
|||
beat -= 1f;
|
||||
if (GameManager.instance.currentGame == "workingDough")
|
||||
{
|
||||
instance.ballTriggerSetInterval = false;
|
||||
instance.beatInterval = interval;
|
||||
// instance.ballTriggerSetInterval = false;
|
||||
// beatInterval = interval;
|
||||
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(beat, delegate
|
||||
|
|
@ -425,7 +456,7 @@ namespace HeavenStudio.Games
|
|||
if (instance.gandwHasEntered) instance.gandwAnim.Play("GANDWLeverUp", 0, 0);
|
||||
}
|
||||
}),
|
||||
new BeatAction.Action(beat + 1, delegate { if (instance != null) instance.SetIntervalStart(beat + 1, interval); }),
|
||||
// new BeatAction.Action(beat + 1, delegate { if (instance != null) instance.SetIntervalStart(beat + 1, interval); }),
|
||||
});
|
||||
}
|
||||
else
|
||||
|
|
@ -438,10 +469,21 @@ namespace HeavenStudio.Games
|
|||
}
|
||||
}
|
||||
|
||||
void OnDestroy()
|
||||
{
|
||||
if (queuedIntervals.Count > 0) queuedIntervals.Clear();
|
||||
if (queuedBalls.Count > 0) queuedBalls.Clear();
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
Conductor cond = Conductor.instance;
|
||||
if (!cond.isPlaying || cond.isPaused) return;
|
||||
if (!cond.isPlaying || cond.isPaused)
|
||||
{
|
||||
if (queuedIntervals.Count > 0) queuedIntervals.Clear();
|
||||
if (queuedBalls.Count > 0) queuedBalls.Clear();
|
||||
}
|
||||
|
||||
if (spaceshipRising) spaceshipAnimator.DoScaledAnimation("RiseSpaceship", risingStartBeat, risingLength);
|
||||
if (liftingDoughDudes) doughDudesHolderAnim.DoScaledAnimation(liftingAnimName, liftingStartBeat, liftingLength);
|
||||
if (gandwMoving) gandwAnim.DoScaledAnimation(gandwMovingAnimName, gandMovingStartBeat, gandMovingLength);
|
||||
|
|
|
|||
Loading…
Reference in a new issue