Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-07 06:18:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #544 from TNG-dev/zkldi/issue-528

Browse Source
This commit is contained in:
zkldi
2021-12-06 23:01:34 +00:00
committed by GitHub
parent a648c8ddaa 9d88a1ec22
commit be19d1f64e
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/package.json
+1 -1
View File
@@ -83,7 +83,7 @@
"rimraf": "3.0.2",
"safe-json-stringify": "1.2.0",
"seq-logging": "^1.1.1",
"tachi-common": "0.3.11",
"tachi-common": "0.3.12",
"ts-node": "10.0.0",
"typescript": "4.3.4",
"winston": "3.3.3",
server/pnpm-lock.yaml
Generated
+4 -4
View File
@@ -63,7 +63,7 @@ specifiers:
safe-json-stringify: 1.2.0
seq-logging: ^1.1.1
supertest: 6.1.3
tachi-common: 0.3.11
tachi-common: 0.3.12
tap: 15.0.9
ts-node: 10.0.0
tsconfig-paths: 3.10.1
@@ -107,7 +107,7 @@ dependencies:
rimraf: 3.0.2
safe-json-stringify: 1.2.0
seq-logging: 1.1.1
tachi-common: 0.3.11
tachi-common: 0.3.12
ts-node: 10.0.0_83f53b0a0c5616d3fa00ed4e30b9ce1b
typescript: 4.3.4
winston: 3.3.3
@@ -5387,8 +5387,8 @@ packages:
strip-ansi: 6.0.0
dev: true
/tachi-common/0.3.11:
resolution: {integrity: sha512-GLfNGtxq1lukxOyu2dW7pCAYJPwhgCmt0w9YpJHfYUEsDHJBnoQeu53dAUcd0eJXPiXCNjgKrYAdP9MbAaLWjA==}
/tachi-common/0.3.12:
resolution: {integrity: sha512-7A2MsDfzjwI4YeZ/61kd41QGxVQxsrXWyoeSHjD27CXTZJexF9PKPAU0wq8mkcLsm6EwAB7NY4P6/0N+Avap3g==}
dependencies:
monk: 7.3.4
transitivePeerDependencies:
server/src/external/mongo/schemas.ts
Vendored
+1 -1
View File
@@ -209,7 +209,7 @@ const GetScoreMeta = (game: Game, playtype: Playtypes[Game]): PrudenceSchema =>
} else if (game === "usc") {
return {
noteMod: optNull(p.isIn("NORMAL", "MIRROR", "RANDOM", "MIR-RAN")),
gaugeMod: optNull(p.isIn("NORMAL", "HARD")),
gaugeMod: optNull(p.isIn("NORMAL", "HARD", "PERMISSIVE")),
};
} else if (game === "bms" && playtype === "7K") {
return {
server/src/lib/score-import/import-types/common/batch-manual/parser.ts
+1 -1
View File
@@ -65,7 +65,7 @@ const PR_ScoreMeta = (game: Game, playtype: Playtypes[Game]): PrudenceSchema =>
} else if (game === "usc") {
return {
noteMod: optNull(p.isIn("NORMAL", "MIRROR", "RANDOM", "MIR-RAN")),
gaugeMod: optNull(p.isIn("NORMAL", "HARD")),
gaugeMod: optNull(p.isIn("NORMAL", "HARD", "PERMISSIVE")),
};
} else if (game === "sdvx") {
return {
server/src/lib/score-import/import-types/ir/usc/converter.ts
+6 -1
View File
@@ -128,7 +128,12 @@ export const ConverterIRUSC: ConverterFunction<USCClientScore, IRUSCContext> = a
},
},
scoreMeta: {
gaugeMod: data.options.gaugeType === 0 ? "NORMAL" : "HARD",
gaugeMod:
data.options.gaugeType === 0
? "NORMAL"
: data.options.gaugeType === 1
? "HARD"
: "PERMISSIVE",
noteMod: DeriveNoteMod(data),
},
};
server/src/server/router/ir/usc/_playtype/types.ts
+1 -1
View File
@@ -8,7 +8,7 @@ export interface USCServerScore {
near: integer;
error: integer;
ranking: integer;
gaugeMod: "NORMAL" | "HARD";
gaugeMod: "NORMAL" | "HARD" | "PERMISSIVE";
noteMod: "NORMAL" | "MIRROR" | "RANDOM" | "MIR-RAN";
username: string;
}