Refactoring about motion notes

Assets/MotionNotes/Clap.cs

@@ -15,6 +15,7 @@ public class Clap : MotionNote
 
     public Clap(string key, float start, float end = 0f) : this(start, end)
     {
+        MotionName = "Clap";
     }
     public Clap(float start, float end = 0f) : base(start, end)
     {

Assets/MotionNotes/Guard.cs

@@ -29,6 +29,7 @@ public class Guard : MotionNote
                 | MotionState.HAND_MOVE_DOWN_LEFT | MotionState.HAND_MOVE_DOWN_RIGHT;
                 done = MotionState.GUARD_BASE_LEFT | MotionState.GUARD_BASE_RIGHT
                 | MotionState.HAND_MOVE_UP_LEFT | MotionState.HAND_MOVE_UP_RIGHT;
+                MotionName = "GuardBoth";
                 break;
             case "LG":
                 hand = Hand.Left;
@@ -37,6 +38,7 @@ public class Guard : MotionNote
                 | MotionState.HAND_MOVE_DOWN_LEFT;
                 done = MotionState.GUARD_BASE_LEFT
                 | MotionState.HAND_MOVE_UP_LEFT;
+                MotionName = "GuardLeft";
                 break;
             case "RG":
                 hand = Hand.Right;
@@ -45,6 +47,7 @@ public class Guard : MotionNote
                 | MotionState.HAND_MOVE_DOWN_RIGHT;
                 done = MotionState.GUARD_BASE_RIGHT
                 | MotionState.HAND_MOVE_UP_RIGHT;
+                MotionName = "GuardRight";
                 break;
         }
     }

Assets/MotionNotes/HandDown.cs

@@ -26,16 +26,19 @@ public class HandDown : MotionNote
                 hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BD.png");
                 done = MotionState.HAND_DOWN_LEFT | MotionState.HAND_DOWN_RIGHT;
+                MotionName = "HandDownBoth";
                 break;
             case "LD":
                 hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LD.png");
                 done = MotionState.HAND_DOWN_LEFT;
+                MotionName = "HandDownLeft";
                 break;
             case "RD":
                 hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RD.png");
                 done = MotionState.HAND_DOWN_RIGHT;
+                MotionName = "HandDownRight";
                 break;
         }
     }

Assets/MotionNotes/HandUp.cs

@@ -26,16 +26,19 @@ public class HandUp : MotionNote
                 hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BU.png");
                 done = MotionState.HAND_UP_LEFT | MotionState.HAND_UP_RIGHT;
+                MotionName = "HandUpBoth";
                 break;
             case "LU":
                 hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LU.png");
                 done = MotionState.HAND_UP_LEFT;
+                MotionName = "HandUpLeft";
                 break;
             case "RU":
                 hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RU.png");
                 done = MotionState.HAND_UP_RIGHT;
+                MotionName = "HandUpRight";
                 break;
         }
     }

Assets/MotionNotes/Headphone.cs

@@ -26,16 +26,19 @@ public class Headphone : MotionNote
                 hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BH.png");
                 done = MotionState.HEADPHONE_LEFT | MotionState.HEADPHONE_RIGHT;
+                MotionName = "HeadphoneBoth";
                 break;
             case "LH":
                 hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LH.png");
                 done = MotionState.HEADPHONE_LEFT;
+                MotionName = "HeadphoneLeft";
                 break;
             case "RH":
                 hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RH.png");
                 done = MotionState.HEADPHONE_RIGHT;
+                MotionName = "HeadphoneRight";
                 break;
         }
     }

Assets/MotionNotes/Jesus.cs

@@ -15,6 +15,7 @@ public class Jesus : MotionNote
 
     public Jesus(string key, float start, float end = 0f) : this(start, end)
     {
+        MotionName = "Jesus";
     }
     public Jesus(float start, float end = 0f) : base(start, end)
     {

Assets/MotionNotes/Jump.cs

@@ -15,6 +15,7 @@ public class Jump : MotionNote
 
     public Jump(string key, float start, float end = 0f) : this(start, end)
     {
+        MotionName = "Jump";
     }
     public Jump(float start, float end = 0f) : base(start, end)
     {

Assets/MotionNotes/OnTheTable.cs

@@ -15,6 +15,7 @@ public class OnTheTable : MotionNote
 
     public OnTheTable(string key, float start, float end = 0f) : this(start, end)
     {
+        MotionName = "OnTheTable";
     }
     public OnTheTable(float start, float end = 0f) : base(start, end)
     {

Assets/MotionNotes/PushUp.cs

@@ -27,36 +27,42 @@ public class PushUp : MotionNote
                 image = LoadNewSprite("Assets/MotionNotes/BP.png");
                 prepare = MotionState.HAND_MOVE_UP_LEFT | MotionState.HAND_MOVE_UP_RIGHT;
                 done = MotionState.HAND_MOVE_DOWN_LEFT | MotionState.HAND_MOVE_DOWN_RIGHT;
+                MotionName = "PushUpBoth";
                 break;
             case "LP":
                 hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LP.png");
                 prepare = MotionState.HAND_MOVE_UP_LEFT;
                 done = MotionState.HAND_MOVE_DOWN_LEFT;
+                MotionName = "PushUpLeft";
                 break;
             case "RP":
                 hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RP.png");
                 prepare = MotionState.HAND_MOVE_UP_RIGHT;
                 done = MotionState.HAND_MOVE_DOWN_RIGHT;
+                MotionName = "PushUpRight";
                 break;
             case "BK":
                 hand = Hand.Both;
                 image = LoadNewSprite("Assets/MotionNotes/BK.png");
                 prepare = MotionState.HAND_MOVE_UP_LEFT | MotionState.HAND_MOVE_UP_RIGHT | MotionState.JUMP_PREPARE;
                 done = MotionState.HAND_MOVE_DOWN_LEFT | MotionState.HAND_MOVE_DOWN_RIGHT | MotionState.JUMP_DONE;
+                MotionName = "JumpPushUpBoth";
                 break;
             case "LK":
                 hand = Hand.Left;
                 image = LoadNewSprite("Assets/MotionNotes/LK.png");
                 prepare = MotionState.HAND_MOVE_UP_LEFT | MotionState.JUMP_PREPARE;
                 done = MotionState.HAND_MOVE_DOWN_LEFT | MotionState.JUMP_DONE;
+                MotionName = "JumpPushUpLeft";
                 break;
             case "RK":
                 hand = Hand.Right;
                 image = LoadNewSprite("Assets/MotionNotes/RK.png");
                 prepare = MotionState.HAND_MOVE_UP_RIGHT | MotionState.JUMP_PREPARE;
                 done = MotionState.HAND_MOVE_DOWN_RIGHT | MotionState.JUMP_DONE;
+                MotionName = "JumpPushUpRight";
                 break;
         }
     }

Assets/Script/JudgeManager.cs

@@ -266,7 +266,7 @@ public class JudgeManager : MonoBehaviour
 
     private class NoteCondition
     {
-        public static Dictionary<string, InputStatus> JudgeInput(Note note)
+        public static Dictionary<string, InputStatus> WrongInput(Note note)
         {
             if (note is MotionNote)
                 return new Dictionary<string, InputStatus>
@@ -281,6 +281,21 @@ public class JudgeManager : MonoBehaviour
             };
         }
 
+        public static Dictionary<string, InputStatus> JudgeInput(Note note)
+        {
+            if (note is MotionNote)
+                return new Dictionary<string, InputStatus>
+                {
+                    { "short", InputManager.Instance.ShortMotionToInput((note as MotionNote).MotionName) },
+                    { "long",  InputManager.Instance.LongMotionToInput((note as MotionNote).MotionName)  }
+                };
+            return new Dictionary<string, InputStatus>
+            {
+                { "short", InputManager.Instance.ShortButtonStat },
+                { "long",  InputManager.Instance.LongButtonStat  }
+            };
+        }
+
         public static bool IsShortNoteEntered(Note note)
         {
             return JudgeInput(note)["short"] == InputStatus.Entered;
@@ -321,7 +336,7 @@ public class JudgeManager : MonoBehaviour
 
         public static bool IsWrongInput(Note note)
         {
-            var stat = JudgeInput(note);
+            var stat = WrongInput(note);
             return stat["short"] == InputStatus.Entered ||
                    stat["long"] == InputStatus.Entered ||
                    stat["long"] == InputStatus.Continuing;

Assets/Script/MotionNote.cs

@@ -20,6 +20,8 @@ public abstract class MotionNote : Note
 
     public MotionSampleDisplay MotionSampleDisplay { get; set; }
 
+    public string MotionName { get; protected set; }
+
     public static readonly Dictionary<string, Type> keymap
         = new Dictionary<string, Type>
         {