diff --git a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs index 06d8812c..244090be 100644 --- a/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs +++ b/Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs @@ -20,7 +20,7 @@ namespace HeavenStudio.Games.Loaders }), new GameAction("change lion count", delegate { ClappyTrio.instance.ChangeLionCount((int)eventCaller.currentEntity.valA); }, 0.5f, false, new List() { - new Param("valA", new EntityTypes.Integer(1, 8, 3), "Lion Count", "The amount of lions") + new Param("valA", new EntityTypes.Integer(3, 8, 3), "Lion Count", "The amount of lions") }), // This is still here for backwards-compatibility but is hidden in the editor new GameAction("prepare_alt", delegate { ClappyTrio.instance.Prepare(3); }, hidden: true), diff --git a/Assets/Scripts/Games/Spaceball/Spaceball.cs b/Assets/Scripts/Games/Spaceball/Spaceball.cs index 48ef7863..4b6cd9d0 100644 --- a/Assets/Scripts/Games/Spaceball/Spaceball.cs +++ b/Assets/Scripts/Games/Spaceball/Spaceball.cs @@ -12,9 +12,15 @@ namespace HeavenStudio.Games.Loaders public static Minigame AddGame(EventCaller eventCaller) { return new Minigame("spaceball", "Spaceball", "00A518", false, false, new List() { - new GameAction("shoot", delegate { Spaceball.instance.Shoot(eventCaller.currentEntity.beat, false, eventCaller.currentEntity.type); }, 2, false), - new GameAction("shootHigh", delegate { Spaceball.instance.Shoot(eventCaller.currentEntity.beat, true, eventCaller.currentEntity.type); }, 3), - new GameAction("costume", delegate { Spaceball.instance.Costume(eventCaller.currentEntity.type); }, 1f, false, new List() + new GameAction("shoot", delegate { Spaceball.instance.Shoot(eventCaller.currentEntity.beat, false, eventCaller.currentEntity.type); }, 2, false, new List() + { + new Param("type", Spaceball.BallType.Baseball, "Type", "The type of ball/object to shoot") + } ), + new GameAction("shootHigh", delegate { Spaceball.instance.Shoot(eventCaller.currentEntity.beat, true, eventCaller.currentEntity.type); }, 3, false, new List() + { + new Param("type", Spaceball.BallType.Baseball, "Type", "The type of ball/object to shoot") + } ), + new GameAction("costume", delegate { Spaceball.instance.Costume(eventCaller.currentEntity.type); }, 1f, false, new List() { new Param("type", Spaceball.CostumeType.Standard, "Type", "The costume to change to") } ), @@ -36,6 +42,11 @@ namespace HeavenStudio.Games public class Spaceball : Minigame { + public enum BallType { + Baseball, + Onigiri + } + public enum CostumeType { Standard, Bunny,