chore: 优化定数冲突解决方法

Author: clansty

apps/tools/src/scratch.ts

@@ -4,10 +4,6 @@ import { Song } from '@clansty/maibot-types';
 const result = new Set<number>();
 for (const id of Object.keys(ALL_MUSIC)) {
 	const song = Song.fromId(Number(id));
-	const chart = song.getChart('红', true);
-	if (chart && chart.version === 'BUDDiES') {
-		result.add(song.id % 1e4 + 1e4);
-	}
 }
 
 console.log(Array.from(result));

packages/types/package.json

@@ -7,6 +7,6 @@
   "dependencies": {
     "@clansty/maibot-data": "workspace:^",
     "@clansty/maibot-utils": "workspace:^",
-    "@gekichumai/dxdata": "https://gitpkg.now.sh/gekichumai/dxrating/packages/dxdata?2be5e76ead90ab72ad10217618cabbedb0d227d8"
+    "@gekichumai/dxdata": "https://gitpkg.now.sh/gekichumai/dxrating/packages/dxdata?46acbe693f0d5d95faa6732aaf13693e7b4737c3"
   }
 }

packages/types/src/Chart.ts

@@ -26,11 +26,25 @@ export default class Chart implements Sheet {
 		const dataCopy = { ...data };
 		delete dataCopy.level;
 		Object.assign(this, dataCopy);
+		const level140 = this.multiverInternalLevelValue?.BUDDiES;
+		const level145 = this.multiverInternalLevelValue?.['BUDDiES PLUS'];
+		if (level140 && ver === 140) {
+			this.internalLevelValue = level140;
+		}
+		if (level145 && ver === 145) {
+			this.internalLevelValue = level145;
+		}
 		const valueFromAllMusic = dataFromAllMusic?.notes[LEVEL_EN.indexOf(data.difficulty)]?.lv;
-		if (valueFromAllMusic && this.internalLevelValue !== valueFromAllMusic) {
-			false && console.log('发现了定数错误', dataFromAllMusic.name, data.type, data.difficulty, '来自 DXRating.net 的定数:', data.internalLevelValue, '来自 all-music.json 的定数:', valueFromAllMusic);
+		if (this.regions && !Object.values(this.regions).some(Boolean)) {
+			// 删除曲
 			this.internalLevelValue = valueFromAllMusic;
 		}
+		if (valueFromAllMusic && this.internalLevelValue !== valueFromAllMusic) {
+			this.internalLevelValue = Math.max(valueFromAllMusic, this.internalLevelValue);
+		}
+		// if (this.internalLevelValue !== valueFromAllMusic) {
+		// 	console.log('发现了定数错误', dataFromAllMusic?.name, data.type, data.difficulty, '来自 DXRating.net 的定数:', data.internalLevelValue, '来自 all-music.json 的定数:', valueFromAllMusic);
+		// }
 		if (internalId && !this.internalId) {
 			this.internalId = internalId;
 		}