diff --git a/Assets/Resources/Games/flockstep.prefab b/Assets/Resources/Games/flockstep.prefab index 009edd801..b945001fe 100644 --- a/Assets/Resources/Games/flockstep.prefab +++ b/Assets/Resources/Games/flockstep.prefab @@ -217,7 +217,7 @@ SpriteRenderer: m_Size: {x: 19.2, y: 10.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &7415742817949127273 @@ -677,6 +677,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2083661237789383229, guid: 30af0541f981c784594ccc782dfe60e0, type: 3} + propertyPath: mainBody.a + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2083661237789383229, guid: 30af0541f981c784594ccc782dfe60e0, type: 3} propertyPath: mainBody.b value: 1 diff --git a/Assets/Scripts/Flockstep/Flockstep.cs b/Assets/Scripts/Flockstep/Flockstep.cs index c02af0c66..b58b4685b 100644 --- a/Assets/Scripts/Flockstep/Flockstep.cs +++ b/Assets/Scripts/Flockstep/Flockstep.cs @@ -30,12 +30,23 @@ namespace HeavenStudio.Games.Loaders /// Fill in the loader class label, "*prefab name*", and "*Display Name*" with the relevant information /// For help, feel free to reach out to us on our discord, in the #development channel. - public static class RvlLockstepLoader + public static class RvlFlockstepLoader { public static Minigame AddGame(EventCaller eventCaller) { return new Minigame("flockstep", "Flock-Step", "ffffff", false, false, new List() { + + new GameAction("bop", "Bop") + { + function = delegate { var e = eventCaller.currentEntity; Flockstep.instance.Bop(e.beat, e.length, e["toggle2"], e["toggle"]); }, + resizable = true, + parameters = new List() + { + new Param("toggle2", true, "Bop", "Toggle if the the Hue Birds should bop for the duration of this event."), + new Param("toggle", false, "Bop (Auto)", "Toggle if the Hue Birds should automatically bop until another Bop event is reached.") + } + }, new GameAction("march", "Stepping") { defaultLength = 1, @@ -64,5 +75,18 @@ namespace HeavenStudio.Games /// Minigame inherits directly from MonoBehaviour, and adds Heaven Studio specific methods to override. public class Flockstep : Minigame { + public static Flockstep instance; + public GameEvent bop = new GameEvent(); + public void Bop(double beat, float length, bool bop, bool autoBop) + { + + } + + // Start is called before the first frame update + void Awake() + { + instance = this; + SetupBopRegion("flockstep", "bop", "toggle"); + } } } \ No newline at end of file diff --git a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs index a86b849fc..4d9d11c8d 100644 --- a/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs +++ b/Assets/Scripts/USG.g/LoadMinigames.Minigames.MinigameLoaderGenerator.g.cs @@ -13,16 +13,6 @@ namespace HeavenStudio Minigames.Minigame game; - game = RvlLockstepLoader.AddGame(eventCaller); - if (game != null) - { - eventCaller.minigames.Add(game.name, game); - } - else - { - Debug.LogWarning("Game loader RvlLockstepLoader failed!"); - } - game = RvlBadmintonLoader.AddGame(eventCaller); if (game != null) { @@ -583,6 +573,16 @@ namespace HeavenStudio Debug.LogWarning("Game loader AgbWaltzLoader failed!"); } + game = RvlFlockstepLoader.AddGame(eventCaller); + if (game != null) + { + eventCaller.minigames.Add(game.name, game); + } + else + { + Debug.LogWarning("Game loader RvlFlockstepLoader Fucking failed!"); + } + game = RvlWorkingDoughLoader.AddGame(eventCaller); if (game != null) {