diff --git a/locales/index.d.ts b/locales/index.d.ts index 74b830764f..f8136844e3 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -10257,9 +10257,9 @@ export interface Locale extends ILocale { */ "churen": string; /** - * 純正九連宝灯 + * 九連宝灯九面待 */ - "pure-churen": string; + "churen-9": string; /** * 天和 */ diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts index 3e55913097..a05798b542 100644 --- a/packages/misskey-js/src/autogen/endpoint.ts +++ b/packages/misskey-js/src/autogen/endpoint.ts @@ -1343,4 +1343,7 @@ export const endpointReqTypes: Record t === target).length; } -export const NORAML_YAKU_DEFINITIONS: YakuDefiniyion[] = [{ +export const NORMAL_YAKU_DEFINITIONS: YakuDefiniyion[] = [{ name: 'tsumo', fan: 1, isYakuman: false, @@ -766,6 +766,8 @@ export const YAKUMAN_DEFINITIONS: YakuDefiniyion[] = [{ }, }]; +export const YAKU_DEFINITIONS = NORMAL_YAKU_DEFINITIONS.concat(YAKUMAN_DEFINITIONS); + export function calcYakus(state: EnvForCalcYaku): YakuName[] { const oneHeadFourMentsuPatterns: (FourMentsuOneJyantou | null)[] = analyzeFourMentsuOneJyantou(state.handTiles); if (oneHeadFourMentsuPatterns.length === 0) oneHeadFourMentsuPatterns.push(null); @@ -787,7 +789,7 @@ export function calcYakus(state: EnvForCalcYaku): YakuName[] { } const yakuPatterns = oneHeadFourMentsuPatterns.map(fourMentsuOneJyantou => { - return NORAML_YAKU_DEFINITIONS.map(yakuDef => { + return NORMAL_YAKU_DEFINITIONS.map(yakuDef => { const result = yakuDef.calc(state, fourMentsuOneJyantou); return result ? yakuDef : null; }).filter(yaku => yaku != null) as YakuDefiniyion[]; diff --git a/packages/misskey-mahjong/src/engine.master.ts b/packages/misskey-mahjong/src/engine.master.ts index 1dc14c292e..45c10cfc74 100644 --- a/packages/misskey-mahjong/src/engine.master.ts +++ b/packages/misskey-mahjong/src/engine.master.ts @@ -7,6 +7,7 @@ import CRC32 from 'crc-32'; import { TileType, House, Huro, TileId } from './common.js'; import * as Common from './common.js'; import { PlayerState } from './engine.player.js'; +import { YAKU_DEFINITIONS } from "./common.yaku.js"; //#region syntax suger function $(tid: TileId): Common.TileInstance { diff --git a/packages/misskey-mahjong/src/engine.player.ts b/packages/misskey-mahjong/src/engine.player.ts index cc5acab8a0..c16d81b046 100644 --- a/packages/misskey-mahjong/src/engine.player.ts +++ b/packages/misskey-mahjong/src/engine.player.ts @@ -6,6 +6,7 @@ import CRC32 from 'crc-32'; import { TileType, House, Huro, TileId } from './common.js'; import * as Common from './common.js'; +import { YAKU_DEFINITIONS } from './common.yaku.js'; //#region syntax suger function $(tid: TileId): Common.TileInstance {