almost done frogge

This commit is contained in:
ThePurpleAnon 2024-04-28 20:35:16 -05:00
parent 1abd7c391b
commit 8e30add281
4 changed files with 8 additions and 6 deletions

Binary file not shown.

View file

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 228840bbcd5fe2d4ebe42fdbdf33044b guid: 3c803bb5171fceb44bcc1765bc47690b
AudioImporter: AudioImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 6 serializedVersion: 6

View file

@ -659,11 +659,11 @@ namespace HeavenStudio.Games
public void ThankYou(double beat, bool stretchToTempo) public void ThankYou(double beat, bool stretchToTempo)
{ {
float pitch = stretchToTempo ? globalPitch * Conductor.instance.TimelinePitch : 1; float pitch = stretchToTempo ? globalPitch * Conductor.instance.TimelinePitch : 1;
double offset = stretchToTempo ? (0.17 / (Conductor.instance.GetBpmAtBeat(beat) / 98)) : 0.17; double offset = stretchToTempo ? (.2 / ((Conductor.instance.GetBpmAtBeat(beat) * Conductor.instance.TimelinePitch) / 156)) : .2;
MultiSound.Play(new MultiSound.Sound[] MultiSound.Play(new MultiSound.Sound[]
{ {
new MultiSound.Sound("frogHop/thankYou", beat, pitch: pitch, offset: offset), new MultiSound.Sound("frogHop/tyvm", beat, pitch: pitch, offset: offset),
}); });
var actions = new List<BeatAction.Action>(); var actions = new List<BeatAction.Action>();
@ -674,11 +674,13 @@ namespace HeavenStudio.Games
actions.Add(new(beat + (0.00 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"thank" actions.Add(new(beat + (0.00 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"thank"
actions.Add(new(beat + (0.50 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"you" actions.Add(new(beat + (0.50 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"you"
actions.Add(new(beat + (2.00 / stretch), delegate { Talk(BlueFrog, "Wide", beat + (3.75 / stretch)); })); //"verrry" actions.Add(new(beat + (2.00 / stretch), delegate { Talk(BlueFrog, "Wide", beat + (4.00 / stretch)); })); //"verrry"
actions.Add(new(beat + (4.25 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"much" actions.Add(new(beat + (4.50 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"much"
actions.Add(new(beat + (5.00 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"-a!" actions.Add(new(beat + (5.50 / stretch), delegate { Talk(BlueFrog, "Narrow", beat); })); //"-a!"
BeatAction.New(this, actions); BeatAction.New(this, actions);
Debug.Log(offset);
} }
public void Talk(List<ntrFrog> FrogsToTalk, string syllable, double animEnd) public void Talk(List<ntrFrog> FrogsToTalk, string syllable, double animEnd)