mirror of
https://github.com/RHeavenStudioPlus/HeavenStudioPlus.git
synced 2024-11-10 11:45:09 +00:00
Merge pull request #146 from KrispyDotlessI/spaceball-clappy-trio-tweaking
Addition of Spaceball's ball type, Clappy Trio minimum member count r…
This commit is contained in:
commit
775681fe70
2 changed files with 15 additions and 4 deletions
|
@ -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<Param>()
|
new GameAction("change lion count", delegate { ClappyTrio.instance.ChangeLionCount((int)eventCaller.currentEntity.valA); }, 0.5f, false, new List<Param>()
|
||||||
{
|
{
|
||||||
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
|
// This is still here for backwards-compatibility but is hidden in the editor
|
||||||
new GameAction("prepare_alt", delegate { ClappyTrio.instance.Prepare(3); }, hidden: true),
|
new GameAction("prepare_alt", delegate { ClappyTrio.instance.Prepare(3); }, hidden: true),
|
||||||
|
|
|
@ -12,9 +12,15 @@ namespace HeavenStudio.Games.Loaders
|
||||||
public static Minigame AddGame(EventCaller eventCaller) {
|
public static Minigame AddGame(EventCaller eventCaller) {
|
||||||
return new Minigame("spaceball", "Spaceball", "00A518", false, false, new List<GameAction>()
|
return new Minigame("spaceball", "Spaceball", "00A518", false, false, new List<GameAction>()
|
||||||
{
|
{
|
||||||
new GameAction("shoot", delegate { Spaceball.instance.Shoot(eventCaller.currentEntity.beat, false, eventCaller.currentEntity.type); }, 2, false),
|
new GameAction("shoot", delegate { Spaceball.instance.Shoot(eventCaller.currentEntity.beat, false, eventCaller.currentEntity.type); }, 2, false, new List<Param>()
|
||||||
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<Param>()
|
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<Param>()
|
||||||
|
{
|
||||||
|
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<Param>()
|
||||||
{
|
{
|
||||||
new Param("type", Spaceball.CostumeType.Standard, "Type", "The costume to change to")
|
new Param("type", Spaceball.CostumeType.Standard, "Type", "The costume to change to")
|
||||||
} ),
|
} ),
|
||||||
|
@ -36,6 +42,11 @@ namespace HeavenStudio.Games
|
||||||
|
|
||||||
public class Spaceball : Minigame
|
public class Spaceball : Minigame
|
||||||
{
|
{
|
||||||
|
public enum BallType {
|
||||||
|
Baseball,
|
||||||
|
Onigiri
|
||||||
|
}
|
||||||
|
|
||||||
public enum CostumeType {
|
public enum CostumeType {
|
||||||
Standard,
|
Standard,
|
||||||
Bunny,
|
Bunny,
|
||||||
|
|
Loading…
Reference in a new issue