mirror of
https://github.com/RHeavenStudio/HeavenStudio.git
synced 2025-06-12 16:47:39 +02:00
Lots of tweaks, fixes and small additions + bop fixes and bop parity across almost all games with bops. (#331)
* 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:
@ -40,12 +40,12 @@ namespace HeavenStudio.Games.Loaders
|
||||
|
||||
new GameAction("bop", "Bop")
|
||||
{
|
||||
function = delegate {var e = eventCaller.currentEntity; CatchyTune.instance.Bop(e.beat, e["left"], e["right"]); },
|
||||
defaultLength = 1f,
|
||||
function = delegate {var e = eventCaller.currentEntity; CatchyTune.instance.Bop(e.beat, e.length, e["bop"], e["bopAuto"]); },
|
||||
resizable = true,
|
||||
parameters = new List<Param>()
|
||||
{
|
||||
new Param("left" , true, "Left", "Plalin bops head"),
|
||||
new Param("right", true, "Right", "Alalin bops head")
|
||||
new Param("bop", CatchyTune.WhoBops.Both, "Bop", "Should Plalin and Alalin bop?"),
|
||||
new Param("bopAuto", CatchyTune.WhoBops.None, "Bop", "Should Plalin and Alalin auto bop?"),
|
||||
},
|
||||
},
|
||||
new GameAction("background", "Background")
|
||||
@ -80,6 +80,14 @@ namespace HeavenStudio.Games
|
||||
Both
|
||||
}
|
||||
|
||||
public enum WhoBops
|
||||
{
|
||||
Alalin,
|
||||
Plalin,
|
||||
Both,
|
||||
None
|
||||
}
|
||||
|
||||
public enum Background
|
||||
{
|
||||
Short,
|
||||
@ -265,10 +273,51 @@ namespace HeavenStudio.Games
|
||||
newFruit.SetActive(true);
|
||||
}
|
||||
|
||||
public void Bop(float beat, bool left, bool right)
|
||||
public void Bop(float beat, float length, int whoBops, int whoBopsAuto)
|
||||
{
|
||||
bopLeft = left;
|
||||
bopRight = right;
|
||||
bopLeft = whoBopsAuto == (int)WhoBops.Plalin || whoBopsAuto == (int)WhoBops.Both;
|
||||
bopRight = whoBopsAuto == (int)WhoBops.Alalin || whoBopsAuto == (int)WhoBops.Both;
|
||||
for (int i = 0; i < length; i++)
|
||||
{
|
||||
BeatAction.New(instance.gameObject, new List<BeatAction.Action>()
|
||||
{
|
||||
new BeatAction.Action(beat + i, delegate
|
||||
{
|
||||
BopSingle(whoBops);
|
||||
})
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void BopSingle(int whoBops)
|
||||
{
|
||||
switch (whoBops)
|
||||
{
|
||||
case (int)WhoBops.Plalin:
|
||||
if (stopCatchLeft == 0)
|
||||
{
|
||||
plalinAnim.Play("bop", 0, 0);
|
||||
}
|
||||
break;
|
||||
case (int)WhoBops.Alalin:
|
||||
if (stopCatchRight == 0)
|
||||
{
|
||||
alalinAnim.Play("bop", 0, 0);
|
||||
}
|
||||
break;
|
||||
case (int)WhoBops.Both:
|
||||
if (stopCatchRight == 0)
|
||||
{
|
||||
alalinAnim.Play("bop", 0, 0);
|
||||
}
|
||||
if (stopCatchLeft == 0)
|
||||
{
|
||||
plalinAnim.Play("bop", 0, 0);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public void changeBG(int bg)
|
||||
|
Reference in New Issue
Block a user