From cb2b0df071868ea0ae2fe7d31a0d15be33140f8f Mon Sep 17 00:00:00 2001
From: tillvit <lucas.j.tan@gmail.com>
Date: Wed, 27 Dec 2023 18:29:06 -0800
Subject: [PATCH] Fix threepanel id & add threedouble

---
 app/src/chart/gameTypes/GameTypeRegistry.ts   | 16 ++++++++++-
 .../dance/default/DanceDefaultNoteskin.ts     |  3 +-
 app/src/data/GameplayKeybindData.ts           | 28 ++++++++++++++++++-
 app/src/util/Options.ts                       |  6 ++--
 4 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/app/src/chart/gameTypes/GameTypeRegistry.ts b/app/src/chart/gameTypes/GameTypeRegistry.ts
index c09472f7..b155a50d 100644
--- a/app/src/chart/gameTypes/GameTypeRegistry.ts
+++ b/app/src/chart/gameTypes/GameTypeRegistry.ts
@@ -117,7 +117,7 @@ GameTypeRegistry.register({
 })
 
 GameTypeRegistry.register({
-  id: "dance-3panel",
+  id: "dance-threepanel",
   numCols: 3,
   columnWidths: [64, 64, 64],
   columnRotations: [45, -90, 135],
@@ -129,3 +129,17 @@ GameTypeRegistry.register({
     vertical: [0, 1, 2],
   },
 })
+
+GameTypeRegistry.register({
+  id: "dance-threedouble",
+  numCols: 6,
+  columnWidths: [64, 64, 64, 64, 64, 64],
+  columnRotations: [45, -90, 135, 45, -90, 135],
+  gameLogic: new BasicGameLogic(),
+  parser: new BasicNotedataParser(),
+  editNoteTypes: ["Tap", "Mine", "Fake", "Lift"],
+  flipColumns: {
+    horizontal: [2, 1, 0, 5, 4, 3],
+    vertical: [0, 1, 2, 3, 4, 5],
+  },
+})
diff --git a/app/src/chart/gameTypes/dance/default/DanceDefaultNoteskin.ts b/app/src/chart/gameTypes/dance/default/DanceDefaultNoteskin.ts
index f8a0aa57..071b10ce 100644
--- a/app/src/chart/gameTypes/dance/default/DanceDefaultNoteskin.ts
+++ b/app/src/chart/gameTypes/dance/default/DanceDefaultNoteskin.ts
@@ -46,7 +46,8 @@ export const DanceDefaultNoteskin: NoteSkinOptions = {
     "dance-couple",
     "dance-solo",
     "dance-solodouble",
-    "dance-3panel",
+    "dance-threepanel",
+    "dance-threedouble",
   ],
   rotateColumns: true,
 }
diff --git a/app/src/data/GameplayKeybindData.ts b/app/src/data/GameplayKeybindData.ts
index a2e3f13e..ee20abbb 100644
--- a/app/src/data/GameplayKeybindData.ts
+++ b/app/src/data/GameplayKeybindData.ts
@@ -166,7 +166,7 @@ export const GAMEPLAY_KEYBINDS: { [key: string]: GameplayKeybind[] } = {
       keys: ["L"],
     },
   ],
-  "dance-3panel": [
+  "dance-threepanel": [
     {
       label: "UpLeft",
       keys: ["Left", "Q"],
@@ -180,4 +180,30 @@ export const GAMEPLAY_KEYBINDS: { [key: string]: GameplayKeybind[] } = {
       keys: ["Right", "E"],
     },
   ],
+  "dance-threedouble": [
+    {
+      label: "P1 UpLeft",
+      keys: ["Left"],
+    },
+    {
+      label: "P1 Down",
+      keys: ["Down"],
+    },
+    {
+      label: "P1 UpRight",
+      keys: ["Right"],
+    },
+    {
+      label: "P2 UpLeft",
+      keys: ["Q"],
+    },
+    {
+      label: "P2 Down",
+      keys: ["S"],
+    },
+    {
+      label: "P2 UpRight",
+      keys: ["E"],
+    },
+  ],
 }
diff --git a/app/src/util/Options.ts b/app/src/util/Options.ts
index a6b9b4a7..e450ded9 100644
--- a/app/src/util/Options.ts
+++ b/app/src/util/Options.ts
@@ -86,7 +86,8 @@ export class DefaultOptions {
       "dance-couple": "default",
       "dance-solo": "default",
       "dance-solodouble": "default",
-      "dance-3panel": "default",
+      "dance-threepanel": "default",
+      "dance-threedouble": "default",
     } as Record<string, string>,
   }
   static audio = {
@@ -110,7 +111,8 @@ export class DefaultOptions {
     defaultTimingCollection: {
       "dance-single": "ITG",
       "dance-double": "ITG",
-      "dance-3panel": "ITG",
+      "dance-threepanel": "ITG",
+      "dance-threedouble": "ITG",
       "dance-solo": "ITG",
       "dance-solodouble": "ITG",
     } as { [key: string]: string },