etc/HeavenStudioPlus
0
0
Fork 0
mirror of https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git synced 2024-11-09 19:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix (#696)

Browse source
This commit is contained in:
AstrlJelly 2024-02-13 09:36:06 -05:00 committed by GitHub
parent ea09e6ca4e
commit 487e23bfd7
1 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Assets/Scripts/Games/Manzai/Manzai.cs
View file

@ -9,10 +9,22 @@ using TMPro;
namespace HeavenStudio.Games.Loaders namespace HeavenStudio.Games.Loaders
{ {
using static Minigames; using static Minigames;
using Jukebox;
public static class RvlManzaiLoader public static class RvlManzaiLoader
{ {
public static Minigame AddGame(EventCaller eventCaller) public static Minigame AddGame(EventCaller eventCaller)
{ {
RiqEntity BoingUpdater(string datamodel, RiqEntity e)
{
if (datamodel == "manzai/pun" && (e["boing"] == 1))
{
e.datamodel = "manzai/boing";
return e;
}
return null;
}
RiqBeatmap.OnUpdateEntity += BoingUpdater;
return new Minigame("manzai", "Manzai", "72003D", false, false, new List<GameAction>() return new Minigame("manzai", "Manzai", "72003D", false, false, new List<GameAction>()
{ {
new GameAction("bop", "Bop") new GameAction("bop", "Bop")
@ -239,11 +251,11 @@ namespace HeavenStudio.Games
public enum Puns public enum Puns
{ {
AichiniAichinna, AichiniAichinna = 0,
AmmeteAmena, AmmeteAmena = 1,
/*ChainaniNichaina, /*ChainaniNichaina,
DenwariDenwa,*/ //short animation DenwariDenwa,*/ //short animation
FutongaFuttonda, FutongaFuttonda = 4,
/*HiromegaHirameida, /*HiromegaHirameida,
IkagariKatta, IkagariKatta,
IkugawaIkura, //short animation (boing unused) IkugawaIkura, //short animation (boing unused)
@ -252,18 +264,18 @@ namespace HeavenStudio.Games
KouchagaKouchou, KouchagaKouchou,
KusagaKusai, //short animation (boing unused) KusagaKusai, //short animation (boing unused)
MegaminiwaMegane,*/ MegaminiwaMegane,*/
MikangaMikannai, MikangaMikannai = 13,
/*NekogaNekoronda,*/ /*NekogaNekoronda,*/
OkanewaOkkane, OkanewaOkkane = 15,
/*OkurezeKitteOkure, /*OkurezeKitteOkure,
OmochinoKimochi, OmochinoKimochi,
OmoinoHokaOmoi, OmoinoHokaOmoi,
PuringaTappurin,*/ PuringaTappurin,*/
RakudawaRakugana, RakudawaRakugana = 20,
/*RoukadaKatarouka, /*RoukadaKatarouka,
SaiyoMinasai, SaiyoMinasai,
SakanaKanaMasakana,*/ SakanaKanaMasakana,*/
SarugaSaru, //short animation (boing unused) SarugaSaru = 24, //short animation (boing unused)
/*ShaiinniNanariNashain_Unused, //fully unused /*ShaiinniNanariNashain_Unused, //fully unused
SuikawaYasuika, SuikawaYasuika,
TaigaTabetaina, TaigaTabetaina,
@ -273,7 +285,7 @@ namespace HeavenStudio.Games
TonakaiyoOtonokoi, TonakaiyoOtonokoi,
TorinikugaTorininkui, TorinikugaTorininkui,
UmetteUmena,*/ UmetteUmena,*/
Muted, Muted = 34,
} }
static readonly Dictionary<string, int> boingLengths = new() { static readonly Dictionary<string, int> boingLengths = new() {
@ -411,7 +423,8 @@ namespace HeavenStudio.Games
public static void PunSFX(double beat, int whichPun, bool isPitched, int isBoing, int crowdSounds, bool random) public static void PunSFX(double beat, int whichPun, bool isPitched, int isBoing, int crowdSounds, bool random)
{ {
if (random) whichPun = UnityEngine.Random.Range(0, 7); // you don't need to use this once all the puns are in but this makes everything automatic for now 👍 -AJ
if (random) whichPun = (int)Enum.GetValues(typeof(Puns)).GetValue(UnityEngine.Random.Range(0, 7)); // just replace 7 with the max
var punName= Enum.GetName(typeof(Puns), whichPun); var punName= Enum.GetName(typeof(Puns), whichPun);
float pitch = isPitched ? (Conductor.instance.GetBpmAtBeat(beat)/98)*Conductor.instance.TimelinePitch : 1; float pitch = isPitched ? (Conductor.instance.GetBpmAtBeat(beat)/98)*Conductor.instance.TimelinePitch : 1;
double offset = isPitched ? (0.05/(Conductor.instance.GetBpmAtBeat(beat)/98)) : 0.05; double offset = isPitched ? (0.05/(Conductor.instance.GetBpmAtBeat(beat)/98)) : 0.05;