From a1a0fc03dc98fb345a3a6345aef9004b980aa3b1 Mon Sep 17 00:00:00 2001
From: zkldi <ddhitone@gmail.com>
Date: Fri, 9 Apr 2021 11:39:16 +0100
Subject: [PATCH] Fix incorrect lamp defs

---
 common/js/types.d.ts | 10 ++++++----
 common/src/types.ts  | 24 ++++++++++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/common/js/types.d.ts b/common/js/types.d.ts
index d3656c867..5b73894b2 100644
--- a/common/js/types.d.ts
+++ b/common/js/types.d.ts
@@ -86,14 +86,16 @@ export interface Grades {
 }
 declare type IIDXLamps = "NO PLAY" | "FAILED" | "ASSIST CLEAR" | "EASY CLEAR" | "CLEAR" | "HARD CLEAR" | "EX HARD CLEAR" | "FULL COMBO";
 declare type GitadoraLamps = "FAILED" | "CLEAR" | "FULL COMBO" | "EXCELLENT";
+declare type SDVXLamps = "FAILED" | "CLEAR" | "EXCESSIVE CLEAR" | "ULTIMATE CHAIN" | "PERFECT ULTIMATE CHAIN";
+declare type DDRLamps = "FAILED" | "CLEAR" | "LIFE4" | "FULL COMBO" | "GREAT FULL COMBO" | "PERFECT FULL COMBO" | "MARVELOUS FULL COMBO";
 export interface Lamps {
     "iidx:SP": IIDXLamps;
     "iidx:DP": IIDXLamps;
     "popn:9B": "FAILED" | "CLEAR" | "FULL COMBO" | "PERFECT";
-    "sdvx:Single": SDVXGrades;
-    "usc:Single": SDVXGrades;
-    "ddr:SP": DDRGrades;
-    "ddr:DP": DDRGrades;
+    "sdvx:Single": SDVXLamps;
+    "usc:Single": SDVXLamps;
+    "ddr:SP": DDRLamps;
+    "ddr:DP": DDRLamps;
     "maimai:Single": "FAILED" | "CLEAR" | "FULL COMBO" | "ALL PERFECT" | "ALL PERFECT+";
     "jubeat:Single": "FAILED" | "CLEAR" | "FULL COMBO" | "EXCELLENT";
     "museca:Single": "FAILED" | "CLEAR" | "CONNECT ALL" | "PERFECT CONNECT ALL";
diff --git a/common/src/types.ts b/common/src/types.ts
index 0b31ef907..7e7a82f09 100644
--- a/common/src/types.ts
+++ b/common/src/types.ts
@@ -179,15 +179,31 @@ type IIDXLamps =
 
 type GitadoraLamps = "FAILED" | "CLEAR" | "FULL COMBO" | "EXCELLENT";
 
+type SDVXLamps =
+    | "FAILED"
+    | "CLEAR"
+    | "EXCESSIVE CLEAR"
+    | "ULTIMATE CHAIN"
+    | "PERFECT ULTIMATE CHAIN";
+
+type DDRLamps =
+    | "FAILED"
+    | "CLEAR"
+    | "LIFE4"
+    | "FULL COMBO"
+    | "GREAT FULL COMBO"
+    | "PERFECT FULL COMBO"
+    | "MARVELOUS FULL COMBO";
+
 export interface Lamps {
     "iidx:SP": IIDXLamps;
     "iidx:DP": IIDXLamps;
     // THIS ONE IS WRONG!
     "popn:9B": "FAILED" | "CLEAR" | "FULL COMBO" | "PERFECT";
-    "sdvx:Single": SDVXGrades;
-    "usc:Single": SDVXGrades;
-    "ddr:SP": DDRGrades;
-    "ddr:DP": DDRGrades;
+    "sdvx:Single": SDVXLamps;
+    "usc:Single": SDVXLamps;
+    "ddr:SP": DDRLamps;
+    "ddr:DP": DDRLamps;
     "maimai:Single": "FAILED" | "CLEAR" | "FULL COMBO" | "ALL PERFECT" | "ALL PERFECT+";
     "jubeat:Single": "FAILED" | "CLEAR" | "FULL COMBO" | "EXCELLENT";
     "museca:Single": "FAILED" | "CLEAR" | "CONNECT ALL" | "PERFECT CONNECT ALL";