diff --git a/Assets/Scripts/Games/CoinToss/CoinToss.cs b/Assets/Scripts/Games/CoinToss/CoinToss.cs index 535a310f..e87cfbe6 100644 --- a/Assets/Scripts/Games/CoinToss/CoinToss.cs +++ b/Assets/Scripts/Games/CoinToss/CoinToss.cs @@ -19,9 +19,10 @@ namespace HeavenStudio.Games.Loaders new Param("toggle", false, "Audience Reaction", "Enable Audience Reaction"), }), - new GameAction("set background color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.ChangeBackgroundColor(e.colorA, 0f); }, 0.5f, false, new List() + new GameAction("set background color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.ChangeBackgroundColor(e.colorA, 0f); CoinToss.instance.ChangeBackgroundColor(e.colorB, 0f, true); }, 0.5f, false, new List() { - new Param("colorA", CoinToss.defaultBgColor, "Background Color", "The background color to change to") + new Param("colorA", CoinToss.defaultBgColor, "Background Color", "The background color to change to"), + new Param("colorB", CoinToss.defaultFgColor, "Foreground Color", "The foreground color to change to") } ), new GameAction("fade background color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length); }, 1f, true, new List() { @@ -29,15 +30,21 @@ namespace HeavenStudio.Games.Loaders new Param("colorB", CoinToss.defaultBgColor, "End Color", "The ending color in the fade") } ), - new GameAction("set foreground color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.ChangeBackgroundColor(e.colorA, 0f, true); }, 0.5f, false, new List() - { - new Param("colorA", CoinToss.defaultFgColor, "Background Color", "The background color to change to") - } ), new GameAction("fade foreground color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.FadeBackgroundColor(e.colorA, e.colorB, e.length, true); }, 1f, true, new List() { new Param("colorA", Color.white, "Start Color", "The starting color in the fade"), new Param("colorB", CoinToss.defaultFgColor, "End Color", "The ending color in the fade") } ), + + //left in for backwards-compatibility, but cannot be placed + + new GameAction("set foreground color", delegate { var e = eventCaller.currentEntity; CoinToss.instance.ChangeBackgroundColor(e.colorA, 0f, true); }, 0.5f, false, new List + + { + new Param("colorA", CoinToss.defaultFgColor, "Foreground Color", "The foreground color to change to") + }, + hidden: true + ) }, new List() {"ntr", "aim"}, "ntrcoin", "en", diff --git a/Assets/Scripts/Games/KarateMan/KarateMan.cs b/Assets/Scripts/Games/KarateMan/KarateMan.cs index e44dd538..1b8365ab 100644 --- a/Assets/Scripts/Games/KarateMan/KarateMan.cs +++ b/Assets/Scripts/Games/KarateMan/KarateMan.cs @@ -32,7 +32,7 @@ namespace HeavenStudio.Games.Loaders }), new GameAction("kick", delegate { KarateMan.instance.Shoot(eventCaller.currentEntity.beat, 4); }, 4.5f), new GameAction("combo", delegate { KarateMan.instance.Combo(eventCaller.currentEntity.beat); }, 4f), - new GameAction("hit3", delegate + new GameAction("hitX", delegate { var e = eventCaller.currentEntity; switch ((KarateMan.HitThree)e.type)