From 51c0eb0725d5e7d23d4d3554089d794a44e6a840 Mon Sep 17 00:00:00 2001
From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com>
Date: Sat, 9 Jul 2022 21:20:30 -0500
Subject: [PATCH] Combined Coin Toss's "Set XXXXground color" into one

also renamed "Hit3" to "HitX"
---
 Assets/Scripts/Games/CoinToss/CoinToss.cs   | 19 +++++++++++++------
 Assets/Scripts/Games/KarateMan/KarateMan.cs |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

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<Param>()
+                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<Param>()
                 {
-                    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<Param>()
                 {
@@ -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<Param>()
-                {
-                    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<Param>()
                 {
                     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<Param>
+           
+                {
+                    new Param("colorA", CoinToss.defaultFgColor, "Foreground Color", "The foreground color to change to")
+                },
+                    hidden: true
+                )
             },
             new List<string>() {"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)