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

Lots of tweaks, fixes and small additions + bop fixes and bop parity across almost all games with bops. (#331)

Browse Source 
* Rhythm rally and cheer readers improvements

* Autobop for fan club

* Implemented new bop parity for fan club, rhythm rally and ssds

* Air rally easing improvements

* Fixed drumming practice stuff

* Tap trial has been unjankified yet again

* Cheer readers and catchy tune bops

* More bop parity

* MORE!!!!

* That should be all of them except space dance and dj school

---------

Co-authored-by: minenice55 <star.elementa@gmail.com>
This commit is contained in:
Rapandrasmus
2023-03-07 18:22:32 +01:00
committed by GitHub
parent f590bd8ff9
commit 182d9fc88c
26 changed files with 814 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
Assets/Scripts/Games/CheerReaders/CheerReaders.cs
View File

@ -45,7 +45,7 @@ namespace HeavenStudio.Games.Loaders
new Param("solo", CheerReaders.WhoSpeaks.Both, "Who Speaks", "Who should say the voice line?")
}
},
new GameAction("rahRahSisBoomBaBoom", "Rah Rah Sis Boom Ba Boom!")
new GameAction("rahRahSisBoomBaBoom", "Rah-Rah Sis Boom Bah-Boom!")
{
function = delegate {var e = eventCaller.currentEntity; CheerReaders.instance.RahRahSisBoomBaBoom(e.beat, e["solo"], e["consecutive"]); CheerReaders.instance.SetIsDoingCue(e.beat, e.length);},
defaultLength = 4f,
@ -82,16 +82,21 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("yay", "Yay")
{
function = delegate {CheerReaders.instance.Yay(); },
defaultLength = 0.5f
},
new GameAction("bop", "Bop")
{
function = delegate {var e = eventCaller.currentEntity; CheerReaders.instance.BopToggle(e["toggle"]); },
function = delegate {CheerReaders.instance.Yay(eventCaller.currentEntity["solo"]); },
defaultLength = 0.5f,
parameters = new List<Param>()
{
new Param("toggle", false, "Should bop?", "Should the nerds bop?")
new Param("solo", CheerReaders.WhoSpeaks.Both, "Who Speaks", "Who should say the voice line?"),
}
},
new GameAction("bop", "Bop")
{
function = delegate {var e = eventCaller.currentEntity; CheerReaders.instance.BopToggle(e.beat, e.length, e["toggle"], e["toggle2"]); },
resizable = true,
parameters = new List<Param>()
{
new Param("toggle", true, "Should bop?", "Should the nerds bop?"),
new Param("toggle2", false, "Should auto bop?", "Should the nerds auto bop?")
}
},
new GameAction("resetPose", "Reset Pose")
@ -214,21 +219,9 @@ namespace HeavenStudio.Games
void Update()
{
var cond = Conductor.instance;
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1) && shouldBop && canBop)
if (cond.ReportBeat(ref bop.lastReportedBeat, bop.startBeat % 1) && shouldBop)
{
foreach (var nerd in firstRow)
{
nerd.Bop();
}
foreach (var nerd in secondRow)
{
nerd.Bop();
}
foreach (var nerd in thirdRow)
{
nerd.Bop();
}
player.Bop();
BopSingle();
}
if (cond.isPlaying && !cond.isPaused)
@ -370,7 +363,7 @@ namespace HeavenStudio.Games
}
}
public void Yay()
public void Yay(int whoSpeaks)
{
if (!shouldYay) return;
if (shouldBeBlack)
@ -381,11 +374,6 @@ namespace HeavenStudio.Games
{
whiteYayParticle.Play();
}
foreach (var nerd in allGirls)
{
nerd.Yay();
}
player.Yay();
playerMask.SetActive(false);
missPoster.SetActive(false);
foreach (var mask in topMasks)
@ -400,12 +388,71 @@ namespace HeavenStudio.Games
{
mask.SetActive(false);
}
Jukebox.PlayOneShotGame("cheerReaders/All/yay");
switch (whoSpeaks)
{
case (int)WhoSpeaks.Solo:
Jukebox.PlayOneShotGame("cheerReaders/Solo/yayS");
player.Yay(true);
foreach (var nerd in allGirls)
{
nerd.Yay(true);
}
break;
case (int)WhoSpeaks.Girls:
Jukebox.PlayOneShotGame("cheerReaders/Girls/yayGirls");
foreach (var nerd in allGirls)
{
nerd.Yay(true);
}
player.Yay(false);
break;
default:
Jukebox.PlayOneShotGame("cheerReaders/All/yay");
foreach (var nerd in allGirls)
{
nerd.Yay(true);
}
player.Yay(true);
break;
}
}
public void BopToggle(bool startBop)
public void BopToggle(float beat, float length, bool startBop, bool bopAuto)
{
shouldBop = startBop;
shouldBop = bopAuto;
if (startBop)
{
for (int i = 0; i < length; i++)
{
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{
new BeatAction.Action(beat + i, delegate
{
BopSingle();
})
});
}
}
}
void BopSingle()
{
if (canBop)
{
foreach (var nerd in firstRow)
{
nerd.Bop();
}
foreach (var nerd in secondRow)
{
nerd.Bop();
}
foreach (var nerd in thirdRow)
{
nerd.Bop();
}
player.Bop();
}
}
public void SetIsDoingCue(float beat, float length, bool shouldSwitchColor = true)
@ -418,7 +465,7 @@ namespace HeavenStudio.Games
player.ResetFace();
doingCue = true;
cueBeat = beat;
cueLength = length;
cueLength = length - 1f;
if (!shouldSwitchColor) return;
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
{
@ -547,7 +594,7 @@ namespace HeavenStudio.Games
break;
}
}),
new BeatAction.Action(beat + 2.99f, delegate
new BeatAction.Action(beat + 2.5f, delegate
{
if (!doingCue) canBop = true;
})
@ -705,7 +752,7 @@ namespace HeavenStudio.Games
break;
}
}),
new BeatAction.Action(beat + 2.99f, delegate
new BeatAction.Action(beat + 2.5f, delegate
{
if (!doingCue) canBop = true;
})
@ -891,7 +938,7 @@ namespace HeavenStudio.Games
break;
}
}),
new BeatAction.Action(beat + 2.99f, delegate
new BeatAction.Action(beat + 2.5f, delegate
{
if (!doingCue) canBop = true;
})
@ -1101,7 +1148,7 @@ namespace HeavenStudio.Games
break;
}
}),
new BeatAction.Action(beat + 2.99f, delegate
new BeatAction.Action(beat + 3.5f, delegate
{
if (!doingCue) canBop = true;
})