diff --git a/Assets/Scripts/Games/Airboarder/Airboarder.cs b/Assets/Scripts/Games/Airboarder/Airboarder.cs index 5cd4cf116..2d10421b2 100644 --- a/Assets/Scripts/Games/Airboarder/Airboarder.cs +++ b/Assets/Scripts/Games/Airboarder/Airboarder.cs @@ -132,14 +132,11 @@ namespace HeavenStudio.Games.Loaders new Param("additive", true, "Additive Rotation", "Toggle if the above rotation should be added to the current angle instead of setting the target angle to travel to.") } }, - - - - }, - - new List() {"ntr", "normal"}, - "ntrAirboarder", "en", - new List() { } + } + // , + // new List() {"ntr", "normal"}, + // "ntrAirboarder", "en", + // new List() { } ); } } @@ -233,25 +230,20 @@ namespace HeavenStudio.Games //lists arch and wall events List blockEvents = gameManager.Beatmap.Entities.FindAll(e => e.datamodel is "airboarder/duck" or "airboarder/crouch" or "airboarder/jump" && e.beat >= beat && e.beat < endBeat); - foreach (var e in entities.FindAll(e => e.beat >= beat && e.beat < endBeat && e.datamodel is "airboarder/duck" or "airboarder/crouch" or "airboarder/jump")) - { + foreach (var e in blockEvents) + { switch (e.datamodel) { case "airboarder/duck": - // do the stuff - RequestArch(e.beat-25); - archBasic.CueDuck(e.beat); + RequestArch(e.beat - 25, false); break; case "airboarder/crouch": - // do the stuff - RequestArch(e.beat-25); - archBasic.CueCrouch(e.beat); + RequestArch(e.beat - 25, true); break; case "airboarder/jump": - RequestWall(e.beat-25); - wallBasic.CueJump(e.beat); + RequestWall(e.beat - 25); break; } - } + } PersistColor (beat); } @@ -275,7 +267,7 @@ namespace HeavenStudio.Games if (lastGameSwitch == null) return; List cameraEntities = prevEntities.FindAll(c => c.beat >= lastGameSwitch.beat && c.datamodel == "airboarder/camera"); - foreach (var entity in cameraEntities) + foreach (var entity in cameraEntities) { ChangeCamera(entity.beat, entity["valA"], entity["valB"], entity.length, (Util.EasingFunction.Ease)entity["type"], entity["additive"]); } @@ -283,8 +275,6 @@ namespace HeavenStudio.Games UpdateCamera(beat); } - - public override void OnPlay(double beat) { EntityPreCheck(beat); @@ -308,8 +298,6 @@ namespace HeavenStudio.Games GameCamera.AdditionalFoV = cameraFOV; } - - public void Update() { var cond = Conductor.instance; @@ -506,11 +494,16 @@ namespace HeavenStudio.Games }); } - public void RequestArch(double beat) + public void RequestArch(double beat, bool crouch) { Arch newArch = Instantiate(archBasic, transform); newArch.appearBeat = beat; newArch.gameObject.SetActive(true); + if (crouch) { + archBasic.CueCrouch(beat); + } else { + newArch.CueDuck(beat); + } } public void RequestWall(double beat) @@ -518,6 +511,7 @@ namespace HeavenStudio.Games Wall newWall = Instantiate(wallBasic, transform); newWall.appearBeat = beat; newWall.gameObject.SetActive(true); + newWall.CueJump(beat); } diff --git a/Assets/Scripts/Games/Airboarder/Arch.cs b/Assets/Scripts/Games/Airboarder/Arch.cs index e9a0cfb37..ae3640cc3 100644 --- a/Assets/Scripts/Games/Airboarder/Arch.cs +++ b/Assets/Scripts/Games/Airboarder/Arch.cs @@ -6,10 +6,8 @@ using UnityEngine; namespace HeavenStudio.Games.Scripts_Airboarder { - public class Arch : MonoBehaviour { - [Header("Components")] [SerializeField] private GameObject archBasic; [SerializeField] Animator anim; @@ -21,67 +19,51 @@ namespace HeavenStudio.Games.Scripts_Airboarder public float normalizedStart; - - - - - - - - - private bool isCrouch; - // Start is called before the first frame update + private void Awake() { game = Airboarder.instance; - - // archBasic.transform.position = new Vector3(-140, -1, 0.8f); - } public void CueDuck(double duckBeat) { - - game.ScheduleInput(duckBeat, 3f, Minigame.InputAction_BasicPress, DuckSuccess, DuckMiss, DuckEmpty); + game.ScheduleInput(duckBeat, 3f, Minigame.InputAction_BasicPress, DuckSuccess, DuckMiss, null); BeatAction.New(game, new List() { - new BeatAction.Action(duckBeat, delegate { game.wantsCrouch = false; game.cpu1CantBop = true; game.CPU1.DoScaledAnimationAsync("letsgo", 1f, 0, 1); - } ), - new BeatAction.Action(duckBeat+ 1, delegate { + }), + new BeatAction.Action(duckBeat + 1, delegate { game.cpu2CantBop = true; game.CPU1.DoScaledAnimationAsync("duck", 1f, 0, 1); game.CPU2.DoScaledAnimationAsync("letsgo", 1f, 0, 1); SoundByte.PlayOneShotGame("airboarder/crouch"); SoundByte.PlayOneShotGame("airboarder/crouchvox"); - } ), - new BeatAction.Action(duckBeat+ 2, delegate { + }), + new BeatAction.Action(duckBeat + 2, delegate { game.playerCantBop = true; game.CPU2.DoScaledAnimationAsync("duck", 1f, 0, 1); game.Player.DoScaledAnimationAsync("letsgo", 1f, 0, 1); SoundByte.PlayOneShotGame("airboarder/crouch"); SoundByte.PlayOneShotGame("airboarder/crouchvox"); - } ), - new BeatAction.Action(duckBeat+ 2.5, delegate {game.cpu1CantBop = false;} ), - new BeatAction.Action(duckBeat+3.5, delegate {game.cpu2CantBop = false;} ), - new BeatAction.Action(duckBeat+4.5, delegate {game.playerCantBop = false;}) - }); - + }), + new BeatAction.Action(duckBeat + 2.5, delegate { game.cpu1CantBop = false; } ), + new BeatAction.Action(duckBeat + 3.5, delegate { game.cpu2CantBop = false; } ), + new BeatAction.Action(duckBeat + 4.5, delegate { game.playerCantBop = false; }) + }); } public void CueCrouch(double crouchBeat) { - - game.ScheduleInput(crouchBeat, 3f, Minigame.InputAction_BasicPress, CrouchSuccess, CrouchMiss, CrouchEmpty); + game.ScheduleInput(crouchBeat, 3f, Minigame.InputAction_BasicPress, CrouchSuccess, CrouchMiss, null); BeatAction.New(game, new List() { new BeatAction.Action(crouchBeat, delegate { game.wantsCrouch = true; game.cpu1CantBop = true; game.CPU1.DoScaledAnimationAsync("letsgo", 1f, 0, 1); - }), + }), new BeatAction.Action(crouchBeat+1, delegate { game.cpu2CantBop = true; SoundByte.PlayOneShotGame("airboarder/crouch"); @@ -89,32 +71,22 @@ namespace HeavenStudio.Games.Scripts_Airboarder SoundByte.PlayOneShotGame("airboarder/crouchvox"); game.CPU1.DoScaledAnimationAsync("charge", 1f, 0, 1); game.CPU2.DoScaledAnimationAsync("letsgo", 1f, 0, 1); - }), + }), new BeatAction.Action(crouchBeat + 2, delegate { - SoundByte.PlayOneShotGame("airboarder/crouch"); - game.playerCantBop = true; - game.CPU2.DoScaledAnimationAsync("charge", 1f, 0, 1); - game.Player.DoScaledAnimationAsync("letsgo", 1f, 0, 1); + SoundByte.PlayOneShotGame("airboarder/crouch"); + game.playerCantBop = true; + game.CPU2.DoScaledAnimationAsync("charge", 1f, 0, 1); + game.Player.DoScaledAnimationAsync("letsgo", 1f, 0, 1); SoundByte.PlayOneShotGame("airboarder/crouchCharge"); SoundByte.PlayOneShotGame("airboarder/crouchvox"); - }) - }); - - - + }) + }); } - - - - - // Update is called once per frame void Update() { - var cond = Conductor.instance; - var currentBeat = cond.songPositionInBeatsAsDouble; - float normalizedStart = Conductor.instance.GetPositionFromBeat(appearBeat, 40f); - anim.DoNormalizedAnimation("move", normalizedStart, animLayer:0); + float normalizedStart = game.conductor.GetPositionFromBeat(appearBeat, 40f); + anim.DoNormalizedAnimation("move", normalizedStart, animLayer: 0); if (normalizedStart > 1) Destroy(gameObject); } @@ -123,22 +95,21 @@ namespace HeavenStudio.Games.Scripts_Airboarder game.Player.DoScaledAnimationAsync("duck", 1f, 0, animLayer:1); double beat = caller.startBeat + caller.timer; BeatAction.New(this, new() { - new(beat, ()=>game.playerCantBop = true), - new(beat+1.5f, ()=>game.playerCantBop = false)}); + new(beat, () => game.playerCantBop = true), + new(beat + 1.5f, () => game.playerCantBop = false) + }); + if (state is >= 1 or <= -1) { - anim.DoScaledAnimationAsync("shake", 1f, 0f, animLayer:1); + anim.DoScaledAnimationAsync("shake", 1f, 0f, animLayer: 1); SoundByte.PlayOneShotGame("airboarder/barely"); SoundByte.PlayOneShotGame("airboarder/barelyvox"); } - else { - SoundByte.PlayOneShotGame("airboarder/crouch"); - SoundByte.PlayOneShotGame("airboarder/crouchvox"); + SoundByte.PlayOneShotGame("airboarder/crouch"); + SoundByte.PlayOneShotGame("airboarder/crouchvox"); } - - } public void DuckMiss(PlayerActionEvent caller) @@ -148,15 +119,9 @@ namespace HeavenStudio.Games.Scripts_Airboarder double beat = caller.startBeat + caller.timer; game.MissSound(beat); BeatAction.New(this, new() { - new(beat, ()=>game.playerCantBop = true), - new(beat+1.5f, ()=>game.playerCantBop = false)}); - - } - - public void DuckEmpty(PlayerActionEvent caller) - { - - + new(beat, () => game.playerCantBop = true), + new(beat + 1.5f, () => game.playerCantBop = false) + }); } public void CrouchSuccess(PlayerActionEvent caller, float state) @@ -170,28 +135,23 @@ namespace HeavenStudio.Games.Scripts_Airboarder } else { - SoundByte.PlayOneShotGame("airboarder/crouch"); - SoundByte.PlayOneShotGame("airboarder/crouchCharge"); - SoundByte.PlayOneShotGame("airboarder/crouchvox"); + SoundByte.PlayOneShotGame("airboarder/crouch"); + SoundByte.PlayOneShotGame("airboarder/crouchCharge"); + SoundByte.PlayOneShotGame("airboarder/crouchvox"); } game.playerCantBop = true; } - public void CrouchMiss(PlayerActionEvent caller){ - game.Player.DoScaledAnimationAsync("hit1",1.5f, 0, 1); - anim.DoScaledAnimationAsync("break", 1f, 0, animLayer:1); + public void CrouchMiss(PlayerActionEvent caller) { + game.Player.DoScaledAnimationAsync("hit1", 1.5f, 0, 1); + anim.DoScaledAnimationAsync("break", 1f, 0, animLayer: 1); double beat = caller.startBeat + caller.timer; game.MissSound(beat); BeatAction.New(this, new() { new(beat, ()=>game.playerCantBop = true), - new(beat+1.5f, ()=>game.playerCantBop = false)}); + new(beat+1.5f, ()=>game.playerCantBop = false) + }); } - - public void CrouchEmpty(PlayerActionEvent caller){ - - } - - } } diff --git a/Assets/Scripts/Games/Airboarder/Scrollng_Floor.cs b/Assets/Scripts/Games/Airboarder/ScrollingFloor.cs similarity index 100% rename from Assets/Scripts/Games/Airboarder/Scrollng_Floor.cs rename to Assets/Scripts/Games/Airboarder/ScrollingFloor.cs diff --git a/Assets/Scripts/Games/Airboarder/Scrollng_Floor.cs.meta b/Assets/Scripts/Games/Airboarder/ScrollingFloor.cs.meta similarity index 100% rename from Assets/Scripts/Games/Airboarder/Scrollng_Floor.cs.meta rename to Assets/Scripts/Games/Airboarder/ScrollingFloor.cs.meta diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index e69bebf0f..7c33548cb 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -13,7 +13,16 @@ namespace HeavenStudio Minigames.Minigame game; - Debug.Log("Running game loader RvlBadmintonLoader"); + game = NtrAirboarderLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader NtrAirboarderLoader failed!"); + } + game = RvlBadmintonLoader.AddGame(eventCaller); if (game != null) { @@ -24,7 +33,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlBadmintonLoader failed!"); } - Debug.Log("Running game loader CtrBearLoader"); game = CtrBearLoader.AddGame(eventCaller); if (game != null) { @@ -35,7 +43,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader CtrBearLoader failed!"); } - Debug.Log("Running game loader RvlBoardMeetingLoader"); game = RvlBoardMeetingLoader.AddGame(eventCaller); if (game != null) { @@ -46,7 +53,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlBoardMeetingLoader failed!"); } - Debug.Log("Running game loader AgbBonOdoriLoader"); game = AgbBonOdoriLoader.AddGame(eventCaller); if (game != null) { @@ -57,7 +63,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbBonOdoriLoader failed!"); } - Debug.Log("Running game loader NtrFlickLoader"); game = NtrFlickLoader.AddGame(eventCaller); if (game != null) { @@ -68,7 +73,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrFlickLoader failed!"); } - Debug.Log("Running game loader CtrCatchLoader"); + game = PcoCanneryLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader PcoCanneryLoader failed!"); + } + game = CtrCatchLoader.AddGame(eventCaller); if (game != null) { @@ -79,7 +93,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader CtrCatchLoader failed!"); } - Debug.Log("Running game loader RvlBookLoader"); game = RvlBookLoader.AddGame(eventCaller); if (game != null) { @@ -90,7 +103,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlBookLoader failed!"); } - Debug.Log("Running game loader AgbClapLoader"); game = AgbClapLoader.AddGame(eventCaller); if (game != null) { @@ -101,7 +113,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbClapLoader failed!"); } - Debug.Log("Running game loader NtrCoinLoader"); + game = RvlClapTrapLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader RvlClapTrapLoader failed!"); + } + game = NtrCoinLoader.AddGame(eventCaller); if (game != null) { @@ -112,7 +133,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrCoinLoader failed!"); } - Debug.Log("Running game loader NtrCropLoader"); game = NtrCropLoader.AddGame(eventCaller); if (game != null) { @@ -123,7 +143,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrCropLoader failed!"); } - Debug.Log("Running game loader NtrDjLoader"); game = NtrDjLoader.AddGame(eventCaller); if (game != null) { @@ -134,7 +153,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrDjLoader failed!"); } - Debug.Log("Running game loader NtrDogNinjaLoader"); game = NtrDogNinjaLoader.AddGame(eventCaller); if (game != null) { @@ -145,7 +163,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrDogNinjaLoader failed!"); } - Debug.Log("Running game loader RvlDoubleDateLoader"); game = RvlDoubleDateLoader.AddGame(eventCaller); if (game != null) { @@ -156,7 +173,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlDoubleDateLoader failed!"); } - Debug.Log("Running game loader CtrDrummingLoader"); game = CtrDrummingLoader.AddGame(eventCaller); if (game != null) { @@ -167,7 +183,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader CtrDrummingLoader failed!"); } - Debug.Log("Running game loader NtrIdolLoader"); game = NtrIdolLoader.AddGame(eventCaller); if (game != null) { @@ -178,7 +193,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrIdolLoader failed!"); } - Debug.Log("Running game loader AgbFireworkLoader"); game = AgbFireworkLoader.AddGame(eventCaller); if (game != null) { @@ -189,7 +203,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbFireworkLoader failed!"); } - Debug.Log("Running game loader CtrFirstContact"); game = CtrFirstContact.AddGame(eventCaller); if (game != null) { @@ -200,7 +213,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader CtrFirstContact failed!"); } - Debug.Log("Running game loader RvlFlipperFlopLoader"); game = RvlFlipperFlopLoader.AddGame(eventCaller); if (game != null) { @@ -211,7 +223,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlFlipperFlopLoader failed!"); } - Debug.Log("Running game loader RvlForkLoader"); game = RvlForkLoader.AddGame(eventCaller); if (game != null) { @@ -222,7 +233,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlForkLoader failed!"); } - Debug.Log("Running game loader NtrGleeClubLoader"); game = NtrGleeClubLoader.AddGame(eventCaller); if (game != null) { @@ -233,7 +243,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrGleeClubLoader failed!"); } - Debug.Log("Running game loader RvlNewKarateLoader"); game = RvlNewKarateLoader.AddGame(eventCaller); if (game != null) { @@ -244,7 +253,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlNewKarateLoader failed!"); } - Debug.Log("Running game loader CtrTeppanLoader"); game = CtrTeppanLoader.AddGame(eventCaller); if (game != null) { @@ -255,7 +263,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader CtrTeppanLoader failed!"); } - Debug.Log("Running game loader RvlRocketLoader"); game = RvlRocketLoader.AddGame(eventCaller); if (game != null) { @@ -266,7 +273,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlRocketLoader failed!"); } - Debug.Log("Running game loader NtrBackbeatLoader"); game = NtrBackbeatLoader.AddGame(eventCaller); if (game != null) { @@ -277,7 +283,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrBackbeatLoader failed!"); } - Debug.Log("Running game loader AgbMannequinFactoryLoader"); + game = CtrLumBEARjackLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader CtrLumBEARjackLoader failed!"); + } + game = AgbMannequinFactoryLoader.AddGame(eventCaller); if (game != null) { @@ -288,7 +303,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbMannequinFactoryLoader failed!"); } - Debug.Log("Running game loader RvlManzaiLoader"); game = RvlManzaiLoader.AddGame(eventCaller); if (game != null) { @@ -299,7 +313,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlManzaiLoader failed!"); } - Debug.Log("Running game loader AgbMarcherLoader"); game = AgbMarcherLoader.AddGame(eventCaller); if (game != null) { @@ -310,7 +323,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbMarcherLoader failed!"); } - Debug.Log("Running game loader PcoMeatLoader"); game = PcoMeatLoader.AddGame(eventCaller); if (game != null) { @@ -321,7 +333,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader PcoMeatLoader failed!"); } - Debug.Log("Running game loader RvlMonkeyWatchLoader"); game = RvlMonkeyWatchLoader.AddGame(eventCaller); if (game != null) { @@ -332,7 +343,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlMonkeyWatchLoader failed!"); } - Debug.Log("Running game loader AgbUpbeatLoader"); game = AgbUpbeatLoader.AddGame(eventCaller); if (game != null) { @@ -343,7 +353,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbUpbeatLoader failed!"); } - Debug.Log("Running game loader ntrMunchyMonkLoader"); game = ntrMunchyMonkLoader.AddGame(eventCaller); if (game != null) { @@ -354,7 +363,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader ntrMunchyMonkLoader failed!"); } - Debug.Log("Running game loader AgbNightWalkLoader"); + game = PcoNailLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader PcoNailLoader failed!"); + } + game = AgbNightWalkLoader.AddGame(eventCaller); if (game != null) { @@ -365,7 +383,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbNightWalkLoader failed!"); } - Debug.Log("Running game loader NtrOctopusMachineLoader"); game = NtrOctopusMachineLoader.AddGame(eventCaller); if (game != null) { @@ -376,7 +393,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrOctopusMachineLoader failed!"); } - Debug.Log("Running game loader CtrPillowLoader"); game = CtrPillowLoader.AddGame(eventCaller); if (game != null) { @@ -387,7 +403,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader CtrPillowLoader failed!"); } - Debug.Log("Running game loader AgbQuizShowLoader"); game = AgbQuizShowLoader.AddGame(eventCaller); if (game != null) { @@ -398,7 +413,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbQuizShowLoader failed!"); } - Debug.Log("Running game loader NtrPingpongLoader"); game = NtrPingpongLoader.AddGame(eventCaller); if (game != null) { @@ -409,7 +423,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrPingpongLoader failed!"); } - Debug.Log("Running game loader PcoSomenLoader"); game = PcoSomenLoader.AddGame(eventCaller); if (game != null) { @@ -420,7 +433,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader PcoSomenLoader failed!"); } - Debug.Log("Running game loader AgbHairLoader"); + game = AgbRhythmTestGBALoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader AgbRhythmTestGBALoader failed!"); + } + game = AgbHairLoader.AddGame(eventCaller); if (game != null) { @@ -431,7 +453,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbHairLoader failed!"); } - Debug.Log("Running game loader RvlRingsideLoader"); game = RvlRingsideLoader.AddGame(eventCaller); if (game != null) { @@ -442,7 +463,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlRingsideLoader failed!"); } - Debug.Log("Running game loader NtrRockersLoader"); game = NtrRockersLoader.AddGame(eventCaller); if (game != null) { @@ -453,7 +473,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrRockersLoader failed!"); } - Debug.Log("Running game loader NtrSamuraiLoader"); game = NtrSamuraiLoader.AddGame(eventCaller); if (game != null) { @@ -464,7 +483,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrSamuraiLoader failed!"); } - Debug.Log("Running game loader RvlSeeSawLoader"); game = RvlSeeSawLoader.AddGame(eventCaller); if (game != null) { @@ -475,7 +493,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlSeeSawLoader failed!"); } - Debug.Log("Running game loader AgbGhostLoader"); + game = NtrSlotMonsterLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader NtrSlotMonsterLoader failed!"); + } + game = AgbGhostLoader.AddGame(eventCaller); if (game != null) { @@ -486,7 +513,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbGhostLoader failed!"); } - Debug.Log("Running game loader AgbBatterLoader"); game = AgbBatterLoader.AddGame(eventCaller); if (game != null) { @@ -497,7 +523,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbBatterLoader failed!"); } - Debug.Log("Running game loader AgbSpaceDanceLoader"); game = AgbSpaceDanceLoader.AddGame(eventCaller); if (game != null) { @@ -508,7 +533,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbSpaceDanceLoader failed!"); } - Debug.Log("Running game loader NtrSoccerLoader"); game = NtrSoccerLoader.AddGame(eventCaller); if (game != null) { @@ -519,7 +543,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrSoccerLoader failed!"); } - Debug.Log("Running game loader NtrSplashdownLoader"); game = NtrSplashdownLoader.AddGame(eventCaller); if (game != null) { @@ -530,7 +553,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrSplashdownLoader failed!"); } - Debug.Log("Running game loader RvlTambourineLoader"); + game = CtrSumouLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader CtrSumouLoader failed!"); + } + game = RvlTambourineLoader.AddGame(eventCaller); if (game != null) { @@ -541,7 +573,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlTambourineLoader failed!"); } - Debug.Log("Running game loader AgbTapLoader"); game = AgbTapLoader.AddGame(eventCaller); if (game != null) { @@ -552,7 +583,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbTapLoader failed!"); } - Debug.Log("Running game loader RvlTapTroupeLoader"); game = RvlTapTroupeLoader.AddGame(eventCaller); if (game != null) { @@ -563,7 +593,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader RvlTapTroupeLoader failed!"); } - Debug.Log("Running game loader NtrDazzlesLoader"); game = NtrDazzlesLoader.AddGame(eventCaller); if (game != null) { @@ -574,7 +603,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrDazzlesLoader failed!"); } - Debug.Log("Running game loader AgbTossBoysLoader"); game = AgbTossBoysLoader.AddGame(eventCaller); if (game != null) { @@ -585,7 +613,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbTossBoysLoader failed!"); } - Debug.Log("Running game loader TotemClimbLoader"); game = TotemClimbLoader.AddGame(eventCaller); if (game != null) { @@ -596,7 +623,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader TotemClimbLoader failed!"); } - Debug.Log("Running game loader AgbTramLoader"); game = AgbTramLoader.AddGame(eventCaller); if (game != null) { @@ -607,7 +633,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbTramLoader failed!"); } - Debug.Log("Running game loader MobTrickLoader"); game = MobTrickLoader.AddGame(eventCaller); if (game != null) { @@ -618,7 +643,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader MobTrickLoader failed!"); } - Debug.Log("Running game loader NtrTunnelLoader"); game = NtrTunnelLoader.AddGame(eventCaller); if (game != null) { @@ -629,7 +653,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader NtrTunnelLoader failed!"); } - Debug.Log("Running game loader AgbWaltzLoader"); game = AgbWaltzLoader.AddGame(eventCaller); if (game != null) { @@ -640,7 +663,6 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbWaltzLoader failed!"); } - Debug.Log("Running game loader RvlWorkingDoughLoader"); game = RvlWorkingDoughLoader.AddGame(eventCaller); if (game != null) {