Reapply "SDVX: add MAXXIVE CLEAR lamp (#1288)

This reverts commit 2005c42.

Author: zkldi

client/src/components/tables/cells/VF6Cell.tsx

@@ -16,6 +16,7 @@ type VF6GPTString = "sdvx:Single" | "usc:Keyboard" | "usc:Controller";
 const SHORT_LAMPS = {
 	CLEAR: "CLR",
 	"EXCESSIVE CLEAR": "EXC",
+	"MAXXIVE CLEAR": "MXV",
 	"ULTIMATE CHAIN": "UC",
 } as const;
 
@@ -99,7 +100,7 @@ export default function VF6Cell({
 
 function InverseVF6(
 	vf6: number,
-	lamp: "CLEAR" | "EXCESSIVE CLEAR" | "ULTIMATE CHAIN",
+	lamp: "CLEAR" | "EXCESSIVE CLEAR" | "MAXXIVE CLEAR" | "ULTIMATE CHAIN",
 	level: number
 ) {
 	try {

client/src/lib/games/sdvx-usc.tsx

@@ -31,6 +31,7 @@ const SDVXLIKE_ENUM_COLOURS: GPTClientImplementation<SDVXLikes>["enumColours"] =
 		FAILED: COLOUR_SET.red,
 		CLEAR: COLOUR_SET.green,
 		"EXCESSIVE CLEAR": COLOUR_SET.purple,
+		"MAXXIVE CLEAR": COLOUR_SET.white,
 		"ULTIMATE CHAIN": COLOUR_SET.teal,
 		"PERFECT ULTIMATE CHAIN": COLOUR_SET.gold,
 	},

common/src/config/game-support/sdvx.ts

@@ -85,6 +85,7 @@ export const SDVX_SINGLE_CONF = {
 				"FAILED",
 				"CLEAR",
 				"EXCESSIVE CLEAR",
+				"MAXXIVE CLEAR",
 				"ULTIMATE CHAIN",
 				"PERFECT ULTIMATE CHAIN",
 			],

common/src/constants/game.ts

@@ -26,6 +26,15 @@ export enum CHUNITHM_NOTE_LAMPS {
 }
 
 export enum SDVX_LAMPS {
+	FAILED = 0,
+	CLEAR = 1,
+	EXCESSIVE_CLEAR = 2,
+	MAXXIVE_CLEAR = 3,
+	ULTIMATE_CHAIN = 4,
+	PERFECT_ULTIMATE_CHAIN = 5,
+}
+
+export enum USC_LAMPS {
 	FAILED = 0,
 	CLEAR = 1,
 	EXCESSIVE_CLEAR = 2,

server/src/game-implementations/games/usc.test.ts

@@ -2,7 +2,7 @@ import { USC_CONTROLLER_IMPL, USC_KEYBOARD_IMPL } from "./usc";
 import db from "external/mongo/db";
 import CreateLogCtx from "lib/logger/logger";
 import { CreatePBDoc } from "lib/score-import/framework/pb/create-pb-doc";
-import { GetGPTString, SDVX_GRADES, SDVX_LAMPS } from "tachi-common";
+import { GetGPTString, SDVX_GRADES, USC_LAMPS } from "tachi-common";
 import t from "tap";
 import { dmf, mkMockPB, mkMockScore } from "test-utils/misc";
 import ResetDBState from "test-utils/resets";
@@ -24,7 +24,7 @@ const scoreData: ScoreData<GPTStrings["usc"]> = {
 	optional: { enumIndexes: {} },
 	enumIndexes: {
 		grade: SDVX_GRADES.AAA,
-		lamp: SDVX_LAMPS.CLEAR,
+		lamp: USC_LAMPS.CLEAR,
 	},
 };
 
@@ -142,7 +142,7 @@ for (const [playtype, impl] of [
 
 				f("grade", { grade: "AAA+", score: 9_817_342 }, SDVX_GRADES.S, "S-83K");
 				f("score", { score: 9_820_123 }, 1_000_000, "9,820,123");
-				f("lamp", { lamp: "CLEAR" }, SDVX_LAMPS.CLEAR, "CLEAR");
+				f("lamp", { lamp: "CLEAR" }, USC_LAMPS.CLEAR, "CLEAR");
 
 				t.end();
 			});
@@ -168,7 +168,7 @@ for (const [playtype, impl] of [
 						scoreData: {
 							score: 0,
 							lamp: "ULTIMATE CHAIN",
-							enumIndexes: { lamp: SDVX_LAMPS.ULTIMATE_CHAIN },
+							enumIndexes: { lamp: USC_LAMPS.ULTIMATE_CHAIN },
 						},
 					})
 				);
@@ -183,7 +183,7 @@ for (const [playtype, impl] of [
 						scoreData: {
 							score: mockScore.scoreData.score,
 							lamp: "ULTIMATE CHAIN",
-							enumIndexes: { lamp: SDVX_LAMPS.ULTIMATE_CHAIN },
+							enumIndexes: { lamp: USC_LAMPS.ULTIMATE_CHAIN },
 						},
 					}
 				);

server/src/lib/migration/migrations.ts

@@ -17,6 +17,8 @@ import RemoveMultifolderStats from "./migrations/remove-multifolder-stats";
 import RemoveRandom from "./migrations/remove-random";
 import RemoveSessionViews from "./migrations/remove-session-views";
 import RmHot from "./migrations/rm-hot";
+// import SdvxMaxxiveGoals from "./migrations/sdvx-maxxive-goals";
+// import SdvxMaxxiveLampRearrange from "./migrations/sdvx-maxxive-lamp-rearrange";
 import SessionsToScoreIDs from "./migrations/sessions-to-scoreIDs";
 import UpdateJubeatPreferredTables from "./migrations/update-jubeat-preferred-tables";
 import V3PropsMigration from "./migrations/v3-props";
@@ -72,6 +74,8 @@ if (Environment.nodeEnv !== "test") {
 			RemoveIIDX2dxtraBeginners,
 			RmHot,
 			ChunithmLampSplit
+			// SdvxMaxxiveLampRearrange,
+			// SdvxMaxxiveGoals
 		);
 	}
 

server/src/lib/migration/migrations/sdvx-maxxive-goals.ts

@@ -0,0 +1,39 @@
+import db from "external/mongo/db";
+import type { Migration } from "utils/types";
+
+const migration: Migration = {
+	id: "sdvx-maxxive-lamp-rearrange",
+	up: async () => {
+		await db.goals.update(
+			{
+				game: "sdvx",
+				"criteria.key": "lamp",
+				"criteria.value": 4,
+				name: /PERFECT ULTIMATE CHAIN/u,
+			},
+			{
+				$set: {
+					"criteria.value": 5,
+				},
+			}
+		);
+
+		await db.goals.update(
+			{
+				game: "sdvx",
+				"criteria.key": "lamp",
+				"criteria.value": 3,
+			},
+			{
+				$set: {
+					"criteria.value": 4,
+				},
+			}
+		);
+	},
+	down: () => {
+		throw new Error("not doing this");
+	},
+};
+
+export default migration;

server/src/lib/migration/migrations/sdvx-maxxive-lamp-rearrange.ts

@@ -0,0 +1,58 @@
+import db from "external/mongo/db";
+import type { Migration } from "utils/types";
+
+const migration: Migration = {
+	id: "sdvx-maxxive-lamp-rearrange",
+	up: async () => {
+		await db.scores.update(
+			{
+				game: "sdvx",
+				"scoreData.lamp": "ULTIMATE CHAIN",
+			},
+			{
+				$set: {
+					"scoreData.enumIndexes.lamp": 4,
+				},
+			}
+		);
+
+		await db.scores.update(
+			{
+				game: "sdvx",
+				"scoreData.lamp": "PERFECT ULTIMATE CHAIN",
+			},
+			{
+				$set: {
+					"scoreData.enumIndexes.lamp": 5,
+				},
+			}
+		);
+	},
+	down: async () => {
+		await db.scores.update(
+			{
+				game: "sdvx",
+				"scoreData.lamp": "ULTIMATE CHAIN",
+			},
+			{
+				$set: {
+					"scoreData.enumIndexes.lamp": 3,
+				},
+			}
+		);
+
+		await db.scores.update(
+			{
+				game: "sdvx",
+				"scoreData.lamp": "PERFECT ULTIMATE CHAIN",
+			},
+			{
+				$set: {
+					"scoreData.enumIndexes.lamp": 4,
+				},
+			}
+		);
+	},
+};
+
+export default migration;

server/src/lib/score-import/import-types/common/api-cg/sdvx/converter.ts

@@ -121,6 +121,8 @@ function ConvertCGSDVXLamp(clearType: number): GetEnumValue<"sdvx:Single", "lamp
 			return "ULTIMATE CHAIN";
 		case 5:
 			return "PERFECT ULTIMATE CHAIN";
+		case 6:
+			return "MAXXIVE CLEAR";
 	}
 
 	throw new InvalidScoreFailure(`Invalid lamp of ${clearType} - Could not convert.`);

server/src/lib/score-import/import-types/common/api-kai/sdvx/converter.test.ts

@@ -145,7 +145,8 @@ t.test("#ResolveKaiLamp", (t) => {
 	t.equal(ResolveKaiLamp(3), "EXCESSIVE CLEAR");
 	t.equal(ResolveKaiLamp(4), "ULTIMATE CHAIN");
 	t.equal(ResolveKaiLamp(5), "PERFECT ULTIMATE CHAIN");
-	t.throws(() => ResolveKaiLamp(6));
+	t.equal(ResolveKaiLamp(6), "MAXXIVE CLEAR");
+	t.throws(() => ResolveKaiLamp(7));
 	t.throws(() => ResolveKaiLamp(0));
 
 	t.end();