Add Dash2

VampireFlower · Mar 30, 2018 · bfb4abe · bfb4abe
1 parent c2d077a
commit bfb4abe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/Game/InputController.cs b/Game/InputController.cs
@@ -150,6 +150,7 @@ private void SetInputs() {
 					(Current.HasActions(Actions.Jump) ? Buttons.A : (Buttons)0)
 					| (Current.HasActions(Actions.Jump2) ? Buttons.Y : (Buttons)0)
 					| (Current.HasActions(Actions.Dash) ? Buttons.B : (Buttons)0)
+					| (Current.HasActions(Actions.Dash2) ? Buttons.X : (Buttons)0)
 					| (Current.HasActions(Actions.Grab) ? Buttons.RightShoulder : (Buttons)0)
 					| (Current.HasActions(Actions.Start) ? Buttons.Start : (Buttons)0)
 					| (Current.HasActions(Actions.Restart) ? Buttons.LeftShoulder : (Buttons)0)

diff --git a/Game/InputRecord.cs b/Game/InputRecord.cs
@@ -15,7 +15,8 @@ public enum Actions {
 		Restart = 256,
 		Feather = 512,
 		Journal = 1024,
-		Jump2 = 2048
+		Jump2 = 2048,
+		Dash2 = 4096
 	}
 	public class InputRecord {
 		public int Line { get; set; }
@@ -53,6 +54,7 @@ public InputRecord(int number, string line) {
 					case 'Q': Actions ^= Actions.Restart; break;
 					case 'N': Actions ^= Actions.Journal; break;
 					case 'K': Actions ^= Actions.Jump2; break;
+					case 'C': Actions ^= Actions.Dash2; break;
 					case 'F':
 						Actions ^= Actions.Feather;
 						index++;
@@ -171,6 +173,7 @@ public string ActionsToString() {
 			if (HasActions(Actions.Jump)) { sb.Append(",J"); }
 			if (HasActions(Actions.Jump2)) { sb.Append(",K"); }
 			if (HasActions(Actions.Dash)) { sb.Append(",X"); }
+			if (HasActions(Actions.Dash2)) { sb.Append(",C"); }
 			if (HasActions(Actions.Grab)) { sb.Append(",G"); }
 			if (HasActions(Actions.Start)) { sb.Append(",S"); }
 			if (HasActions(Actions.Restart)) { sb.Append(",Q"); }

diff --git a/README.md b/README.md
@@ -30,7 +30,9 @@ ie) 123,R,J (For 123 frames, hold Right and Jump)
 - U = Up
 - D = Down
 - J = Jump
+- K = Jump Bind 2
 - X = Dash
+- C = Dash Bind 2
 - G = Grab
 - S = Start
 - Q = Quick Reset

diff --git a/Tools/Entities/InputRecord.cs b/Tools/Entities/InputRecord.cs
@@ -15,7 +15,8 @@ public enum Actions {
 		Restart = 256,
 		Feather = 512,
 		Journal = 1024,
-		Jump2 = 2048
+		Jump2 = 2048,
+		Dash2 = 4096
 	}
 	public class InputRecord {
 		public static char Delimiter = ',';
@@ -59,6 +60,7 @@ public InputRecord(string line) {
 					case 'Q': Actions ^= Actions.Restart; break;
 					case 'N': Actions ^= Actions.Journal; break;
 					case 'K': Actions ^= Actions.Jump2; break;
+					case 'C': Actions ^= Actions.Dash2; break;
 					case 'F':
 						Actions ^= Actions.Feather;
 						index++;
@@ -179,6 +181,7 @@ public string ActionsToString() {
 			if (HasActions(Actions.Jump)) { sb.Append(Delimiter).Append('J'); }
 			if (HasActions(Actions.Jump2)) { sb.Append(Delimiter).Append('K'); }
 			if (HasActions(Actions.Dash)) { sb.Append(Delimiter).Append('X'); }
+			if (HasActions(Actions.Dash2)) { sb.Append(Delimiter).Append('C'); }
 			if (HasActions(Actions.Grab)) { sb.Append(Delimiter).Append('G'); }
 			if (HasActions(Actions.Start)) { sb.Append(Delimiter).Append('S'); }
 			if (HasActions(Actions.Restart)) { sb.Append(Delimiter).Append('Q'); }