Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
syuilo 2024-02-07 20:52:11 +09:00
parent 166aeb631e
commit 894f65f754
2 changed files with 289 additions and 243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
packages/misskey-mahjong/src/common.ts
View file

@ -104,6 +104,9 @@ export function findTileById(tid: TileId): TileInstance | null {
export type House = 'e' | 's' | 'w' | 'n'; export type House = 'e' | 's' | 'w' | 'n';
/**
* 暗槓を含む
*/
export type Huro = { export type Huro = {
type: 'pon'; type: 'pon';
tiles: [TileId, TileId, TileId]; tiles: [TileId, TileId, TileId];
@ -121,6 +124,8 @@ export type Huro = {
from: House | null; // null で加槓 from: House | null; // null で加槓
}; };
export const CALL_HURO_TYPES = ['pon', 'cii', 'minkan'] as const;
export const NEXT_TILE_FOR_DORA_MAP: Record<TileType, TileType> = { export const NEXT_TILE_FOR_DORA_MAP: Record<TileType, TileType> = {
m1: 'm2', m1: 'm2',
m2: 'm3', m2: 'm3',
@ -460,7 +465,7 @@ export const YAKU_DEFINITIONS = [{
isYakuman: false, isYakuman: false,
calc: (state: EnvForCalcYaku) => { calc: (state: EnvForCalcYaku) => {
// 面前じゃないとダメ // 面前じゃないとダメ
if (state.huros.length !== 0) return false; if (state.huros.some(huro => CALL_HURO_TYPES.includes(huro.type))) return false;
// 三元牌はダメ // 三元牌はダメ
if (state.handTiles.some(t => ['haku', 'hatsu', 'chun'].includes(t))) return false; if (state.handTiles.some(t => ['haku', 'hatsu', 'chun'].includes(t))) return false;
@ -476,6 +481,36 @@ export const YAKU_DEFINITIONS = [{
if (horaSet.mentsus.some((mentsu) => mentsu[0] === mentsu[1])) return false; if (horaSet.mentsus.some((mentsu) => mentsu[0] === mentsu[1])) return false;
}); });
}, },
}, {
name: 'iipeko',
fan: 1,
isYakuman: false,
calc: (state: EnvForCalcYaku) => {
// 面前じゃないとダメ
if (state.huros.some(huro => CALL_HURO_TYPES.includes(huro.type))) return false;
const horaSets = getHoraSets(state.handTiles.concat(state.tsumoTile ?? state.ronTile));
return horaSets.some(horaSet => {
// 同じ順子が2つあるか？
return horaSet.mentsus.some((mentsu) =>
horaSet.mentsus.filter((mentsu2) =>
mentsu2[0] === mentsu[0] && mentsu2[1] === mentsu[1] && mentsu2[2] === mentsu[2]).length >= 2);
});
},
}, {
name: 'toitoi',
fan: 2,
isYakuman: false,
calc: (state: EnvForCalcYaku) => {
if (state.huros.length > 0) {
if (state.huros.some(huro => huro.type === 'cii')) return false;
}
const horaSets = getHoraSets(state.handTiles.concat(state.tsumoTile ?? state.ronTile));
return horaSets.some(horaSet => {
// 全て刻子か？
if (!horaSet.mentsus.every((mentsu) => mentsu[0] === mentsu[1])) return false;
});
},
}]; }];
export function fanToPoint(fan: number, isParent: boolean): number { export function fanToPoint(fan: number, isParent: boolean): number {

495
packages/misskey-mahjong/src/engine.master.ts
View file

@ -18,72 +18,89 @@ function $type(tid: TileId): TileType {
} }
//#endregion //#endregion
class StateManager { function shuffle<T extends unknown[]>(array: T): T {
public state: MasterState; let currentIndex = array.length, randomIndex;
private commitCallback: (state: MasterState) => void;
constructor(state: MasterState, commitCallback: (state: MasterState) => void) { // While there remain elements to shuffle.
this.state = structuredClone(state); while (currentIndex > 0) {
// Pick a remaining element.
randomIndex = Math.floor(Math.random() * currentIndex);
currentIndex--;
// And swap it with the current element.
[array[currentIndex], array[randomIndex]] = [
array[randomIndex], array[currentIndex]];
}
return array;
}
class StateManager {
public $state: MasterState;
private commitCallback?: (state: MasterState) => void;
constructor(state: MasterState, commitCallback?: (state: MasterState) => void) {
this.$state = structuredClone(state);
this.commitCallback = commitCallback; this.commitCallback = commitCallback;
} }
public commit() { public $commit() {
this.commitCallback(this.state); if (this.commitCallback) this.commitCallback(this.$state);
} }
public get doras(): TileType[] { public get doras(): TileType[] {
return this.state.kingTiles.slice(0, this.state.activatedDorasCount) return this.$state.kingTiles.slice(0, this.$state.activatedDorasCount)
.map(id => Common.nextTileForDora($type(id))); .map(id => Common.nextTileForDora($type(id)));
} }
public get handTiles(): Record<House, TileId[]> { public get handTiles(): Record<House, TileId[]> {
return this.state.handTiles; return this.$state.handTiles;
} }
public get handTileTypes(): Record<House, TileType[]> { public get handTileTypes(): Record<House, TileType[]> {
return { return {
e: this.state.handTiles.e.map(id => $type(id)), e: this.$state.handTiles.e.map(id => $type(id)),
s: this.state.handTiles.s.map(id => $type(id)), s: this.$state.handTiles.s.map(id => $type(id)),
w: this.state.handTiles.w.map(id => $type(id)), w: this.$state.handTiles.w.map(id => $type(id)),
n: this.state.handTiles.n.map(id => $type(id)), n: this.$state.handTiles.n.map(id => $type(id)),
}; };
} }
public get hoTileTypes(): Record<House, TileType[]> { public get hoTileTypes(): Record<House, TileType[]> {
return { return {
e: this.state.hoTiles.e.map(id => $type(id)), e: this.$state.hoTiles.e.map(id => $type(id)),
s: this.state.hoTiles.s.map(id => $type(id)), s: this.$state.hoTiles.s.map(id => $type(id)),
w: this.state.hoTiles.w.map(id => $type(id)), w: this.$state.hoTiles.w.map(id => $type(id)),
n: this.state.hoTiles.n.map(id => $type(id)), n: this.$state.hoTiles.n.map(id => $type(id)),
}; };
} }
public get riichis(): Record<House, boolean> { public get riichis(): Record<House, boolean> {
return this.state.riichis; return this.$state.riichis;
} }
public get askings(): MasterState['askings'] { public get askings(): MasterState['askings'] {
return this.state.askings; return this.$state.askings;
} }
public get user1House(): House { public get user1House(): House {
return this.state.user1House; return this.$state.user1House;
} }
public get user2House(): House { public get user2House(): House {
return this.state.user2House; return this.$state.user2House;
} }
public get user3House(): House { public get user3House(): House {
return this.state.user3House; return this.$state.user3House;
} }
public get user4House(): House { public get user4House(): House {
return this.state.user4House; return this.$state.user4House;
} }
public get turn(): House | null { public get turn(): House | null {
return this.state.turn; return this.$state.turn;
} }
public canRon(house: House, tid: TileId): boolean { public canRon(house: House, tid: TileId): boolean {
@ -118,10 +135,10 @@ class StateManager {
} }
public tsumo(): TileId { public tsumo(): TileId {
const tile = this.state.tiles.pop(); const tile = this.$state.tiles.pop();
if (tile == null) throw new Error('No tiles left'); if (tile == null) throw new Error('No tiles left');
if (this.state.turn == null) throw new Error('Not your turn'); if (this.$state.turn == null) throw new Error('Not your turn');
this.state.handTiles[this.state.turn].push(tile); this.$state.handTiles[this.$state.turn].push(tile);
return tile; return tile;
} }
} }
@ -233,80 +250,72 @@ export type MasterState = {
}; };
export class MasterGameEngine { export class MasterGameEngine {
private state: MasterState; private stateManager: StateManager;
constructor(state: MasterState) { constructor(state: MasterState) {
this.state = state; this.stateManager = new StateManager(state);
}
public get $state() {
return this.stateManager.$state;
} }
public get doras(): TileType[] { public get doras(): TileType[] {
return this.state.kingTiles.slice(0, this.state.activatedDorasCount) return this.stateManager.doras;
.map(id => Common.nextTileForDora($type(id)));
} }
public get handTiles(): Record<House, TileId[]> { public get handTiles(): Record<House, TileId[]> {
return this.state.handTiles; return this.stateManager.handTiles;
} }
public get handTileTypes(): Record<House, TileType[]> { public get handTileTypes(): Record<House, TileType[]> {
return { return this.stateManager.handTileTypes;
e: this.state.handTiles.e.map(id => $type(id)),
s: this.state.handTiles.s.map(id => $type(id)),
w: this.state.handTiles.w.map(id => $type(id)),
n: this.state.handTiles.n.map(id => $type(id)),
};
} }
public get hoTileTypes(): Record<House, TileType[]> { public get hoTileTypes(): Record<House, TileType[]> {
return { return this.stateManager.hoTileTypes;
e: this.state.hoTiles.e.map(id => $type(id)),
s: this.state.hoTiles.s.map(id => $type(id)),
w: this.state.hoTiles.w.map(id => $type(id)),
n: this.state.hoTiles.n.map(id => $type(id)),
};
} }
public get riichis(): Record<House, boolean> { public get riichis(): Record<House, boolean> {
return this.state.riichis; return this.stateManager.riichis;
} }
public get askings(): MasterState['askings'] { public get askings(): MasterState['askings'] {
return this.state.askings; return this.stateManager.askings;
} }
public get user1House(): House { public get user1House(): House {
return this.state.user1House; return this.stateManager.user1House;
} }
public get user2House(): House { public get user2House(): House {
return this.state.user2House; return this.stateManager.user2House;
} }
public get user3House(): House { public get user3House(): House {
return this.state.user3House; return this.stateManager.user3House;
} }
public get user4House(): House { public get user4House(): House {
return this.state.user4House; return this.stateManager.user4House;
} }
public get turn(): House | null { public get turn(): House | null {
return this.state.turn; return this.stateManager.turn;
} }
public static createInitialState(): MasterState { public static createInitialState(): MasterState {
const ikasama: TileId[] = [125, 129, 9, 56, 57, 61, 77, 81, 85, 133, 134, 135, 121, 122]; const ikasama: TileId[] = [125, 129, 9, 56, 57, 61, 77, 81, 85, 133, 134, 135, 121, 122];
const tiles = [...Common.TILE_ID_MAP.keys()]; const tiles = shuffle([...Common.TILE_ID_MAP.keys()]);
tiles.sort(() => Math.random() - 0.5);
for (const tile of ikasama) { //for (const tile of ikasama) {
const index = tiles.indexOf(tile); // const index = tiles.indexOf(tile);
tiles.splice(index, 1); // tiles.splice(index, 1);
} //}
//const eHandTiles = tiles.splice(0, 14); const eHandTiles = tiles.splice(0, 14);
const eHandTiles = ikasama; //const eHandTiles = ikasama;
const sHandTiles = tiles.splice(0, 13); const sHandTiles = tiles.splice(0, 13);
const wHandTiles = tiles.splice(0, 13); const wHandTiles = tiles.splice(0, 13);
const nHandTiles = tiles.splice(0, 13); const nHandTiles = tiles.splice(0, 13);
@ -372,56 +381,58 @@ export class MasterGameEngine {
public getHouse(index: 1 | 2 | 3 | 4): House { public getHouse(index: 1 | 2 | 3 | 4): House {
switch (index) { switch (index) {
case 1: return this.state.user1House; case 1: return this.stateManager.user1House;
case 2: return this.state.user2House; case 2: return this.stateManager.user2House;
case 3: return this.state.user3House; case 3: return this.stateManager.user3House;
case 4: return this.state.user4House; case 4: return this.stateManager.user4House;
} }
} }
public startTransaction() { public startTransaction() {
return new StateManager(this.state, (newState) => { return new StateManager(this.stateManager.$state, (newState) => {
this.state = newState; this.stateManager = new StateManager(newState);
}); });
} }
public commit_nextKyoku() { public commit_nextKyoku() {
const tx = this.startTransaction();
const newState = MasterGameEngine.createInitialState(); const newState = MasterGameEngine.createInitialState();
newState.kyoku = this.state.kyoku + 1; newState.kyoku = tx.$state.kyoku + 1;
newState.points = this.state.points; newState.points = tx.$state.points;
newState.turn = 'e'; newState.turn = 'e';
newState.user1House = Common.nextHouse(this.state.user1House); newState.user1House = Common.nextHouse(tx.$state.user1House);
newState.user2House = Common.nextHouse(this.state.user2House); newState.user2House = Common.nextHouse(tx.$state.user2House);
newState.user3House = Common.nextHouse(this.state.user3House); newState.user3House = Common.nextHouse(tx.$state.user3House);
newState.user4House = Common.nextHouse(this.state.user4House); newState.user4House = Common.nextHouse(tx.$state.user4House);
this.state = newState; tx.$state = newState;
tx.$commit();
} }
public commit_dahai(house: House, tid: TileId, riichi = false) { public commit_dahai(house: House, tid: TileId, riichi = false) {
const tx = this.startTransaction(); const tx = this.startTransaction();
if (tx.state.turn !== house) throw new Error('Not your turn'); if (tx.$state.turn !== house) throw new Error('Not your turn');
if (riichi) { if (riichi) {
if (tx.state.riichis[house]) throw new Error('Already riichi'); if (tx.$state.riichis[house]) throw new Error('Already riichi');
const tempHandTiles = [...tx.handTileTypes[house]]; const tempHandTiles = [...tx.handTileTypes[house]];
tempHandTiles.splice(tempHandTiles.indexOf($type(tid)), 1); tempHandTiles.splice(tempHandTiles.indexOf($type(tid)), 1);
if (Common.getHoraTiles(tempHandTiles).length === 0) throw new Error('Not tenpai'); if (Common.getHoraTiles(tempHandTiles).length === 0) throw new Error('Not tenpai');
if (tx.state.points[house] < 1000) throw new Error('Not enough points'); if (tx.$state.points[house] < 1000) throw new Error('Not enough points');
} }
const handTiles = tx.state.handTiles[house]; const handTiles = tx.$state.handTiles[house];
if (!handTiles.includes(tid)) throw new Error('No such tile in your hand'); if (!handTiles.includes(tid)) throw new Error('No such tile in your hand');
handTiles.splice(handTiles.indexOf(tid), 1); handTiles.splice(handTiles.indexOf(tid), 1);
tx.state.hoTiles[house].push(tid); tx.$state.hoTiles[house].push(tid);
if (tx.state.riichis[house]) { if (tx.$state.riichis[house]) {
tx.state.ippatsus[house] = false; tx.$state.ippatsus[house] = false;
} }
if (riichi) { if (riichi) {
tx.state.riichis[house] = true; tx.$state.riichis[house] = true;
tx.state.ippatsus[house] = true; tx.$state.ippatsus[house] = true;
} }
const canRonHouses: House[] = []; const canRonHouses: House[] = [];
@ -474,32 +485,32 @@ export class MasterGameEngine {
if (canRonHouses.length > 0 || canKanHouse != null || canPonHouse != null || canCiiHouse != null) { if (canRonHouses.length > 0 || canKanHouse != null || canPonHouse != null || canCiiHouse != null) {
if (canRonHouses.length > 0) { if (canRonHouses.length > 0) {
tx.state.askings.ron = { tx.$state.askings.ron = {
callee: house, callee: house,
callers: canRonHouses, callers: canRonHouses,
}; };
} }
if (canKanHouse != null) { if (canKanHouse != null) {
tx.state.askings.kan = { tx.$state.askings.kan = {
callee: house, callee: house,
caller: canKanHouse, caller: canKanHouse,
}; };
} }
if (canPonHouse != null) { if (canPonHouse != null) {
tx.state.askings.pon = { tx.$state.askings.pon = {
callee: house, callee: house,
caller: canPonHouse, caller: canPonHouse,
}; };
} }
if (canCiiHouse != null) { if (canCiiHouse != null) {
tx.state.askings.cii = { tx.$state.askings.cii = {
callee: house, callee: house,
caller: canCiiHouse, caller: canCiiHouse,
}; };
} }
tx.state.turn = null; tx.$state.turn = null;
tx.state.nextTurnAfterAsking = Common.nextHouse(house); tx.$state.nextTurnAfterAsking = Common.nextHouse(house);
tx.commit(); tx.$commit();
return { return {
asking: true as const, asking: true as const,
@ -511,9 +522,9 @@ export class MasterGameEngine {
} }
// 流局 // 流局
if (tx.state.tiles.length === 0) { if (tx.$state.tiles.length === 0) {
tx.state.turn = null; tx.$state.turn = null;
tx.commit(); tx.$commit();
return { return {
asking: false as const, asking: false as const,
@ -521,38 +532,38 @@ export class MasterGameEngine {
}; };
} }
tx.state.turn = Common.nextHouse(house); tx.$state.turn = Common.nextHouse(house);
const tsumoTile = tx.tsumo(); const tsumoTile = tx.tsumo();
tx.commit(); tx.$commit();
return { return {
asking: false as const, asking: false as const,
tsumoTile: tsumoTile, tsumoTile: tsumoTile,
next: tx.state.turn, next: tx.$state.turn,
}; };
} }
public commit_kakan(house: House, tid: TileId) { public commit_kakan(house: House, tid: TileId) {
const tx = this.startTransaction(); const tx = this.startTransaction();
const pon = tx.state.huros[house].find(h => h.type === 'pon' && $type(h.tiles[0]) === $type(tid)); const pon = tx.$state.huros[house].find(h => h.type === 'pon' && $type(h.tiles[0]) === $type(tid));
if (pon == null) throw new Error('No such pon'); if (pon == null) throw new Error('No such pon');
tx.state.handTiles[house].splice(tx.state.handTiles[house].indexOf(tid), 1); tx.$state.handTiles[house].splice(tx.$state.handTiles[house].indexOf(tid), 1);
const tiles = [tid, ...pon.tiles]; const tiles = [tid, ...pon.tiles];
tx.state.huros[house].push({ type: 'minkan', tiles: tiles, from: pon.from }); tx.$state.huros[house].push({ type: 'minkan', tiles: tiles, from: pon.from });
tx.state.ippatsus.e = false; tx.$state.ippatsus.e = false;
tx.state.ippatsus.s = false; tx.$state.ippatsus.s = false;
tx.state.ippatsus.w = false; tx.$state.ippatsus.w = false;
tx.state.ippatsus.n = false; tx.$state.ippatsus.n = false;
tx.state.activatedDorasCount++; tx.$state.activatedDorasCount++;
const rinsyan = tx.tsumo(); const rinsyan = tx.tsumo();
tx.commit(); tx.$commit();
return { return {
rinsyan, rinsyan,
@ -564,31 +575,31 @@ export class MasterGameEngine {
public commit_ankan(house: House, tid: TileId) { public commit_ankan(house: House, tid: TileId) {
const tx = this.startTransaction(); const tx = this.startTransaction();
const t1 = tx.state.handTiles[house].filter(t => $type(t) === $type(tid)).at(0); const t1 = tx.$state.handTiles[house].filter(t => $type(t) === $type(tid)).at(0);
if (t1 == null) throw new Error('No such tile'); if (t1 == null) throw new Error('No such tile');
const t2 = tx.state.handTiles[house].filter(t => $type(t) === $type(tid)).at(1); const t2 = tx.$state.handTiles[house].filter(t => $type(t) === $type(tid)).at(1);
if (t2 == null) throw new Error('No such tile'); if (t2 == null) throw new Error('No such tile');
const t3 = tx.state.handTiles[house].filter(t => $type(t) === $type(tid)).at(2); const t3 = tx.$state.handTiles[house].filter(t => $type(t) === $type(tid)).at(2);
if (t3 == null) throw new Error('No such tile'); if (t3 == null) throw new Error('No such tile');
const t4 = tx.state.handTiles[house].filter(t => $type(t) === $type(tid)).at(3); const t4 = tx.$state.handTiles[house].filter(t => $type(t) === $type(tid)).at(3);
if (t4 == null) throw new Error('No such tile'); if (t4 == null) throw new Error('No such tile');
tx.state.handTiles[house].splice(tx.state.handTiles[house].indexOf(t1), 1); tx.$state.handTiles[house].splice(tx.$state.handTiles[house].indexOf(t1), 1);
tx.state.handTiles[house].splice(tx.state.handTiles[house].indexOf(t2), 1); tx.$state.handTiles[house].splice(tx.$state.handTiles[house].indexOf(t2), 1);
tx.state.handTiles[house].splice(tx.state.handTiles[house].indexOf(t3), 1); tx.$state.handTiles[house].splice(tx.$state.handTiles[house].indexOf(t3), 1);
tx.state.handTiles[house].splice(tx.state.handTiles[house].indexOf(t4), 1); tx.$state.handTiles[house].splice(tx.$state.handTiles[house].indexOf(t4), 1);
const tiles = [t1, t2, t3, t4]; const tiles = [t1, t2, t3, t4];
tx.state.huros[house].push({ type: 'ankan', tiles: tiles }); tx.$state.huros[house].push({ type: 'ankan', tiles: tiles });
tx.state.ippatsus.e = false; tx.$state.ippatsus.e = false;
tx.state.ippatsus.s = false; tx.$state.ippatsus.s = false;
tx.state.ippatsus.w = false; tx.$state.ippatsus.w = false;
tx.state.ippatsus.n = false; tx.$state.ippatsus.n = false;
tx.state.activatedDorasCount++; tx.$state.activatedDorasCount++;
const rinsyan = tx.tsumo(); const rinsyan = tx.tsumo();
tx.commit(); tx.$commit();
return { return {
rinsyan, rinsyan,
@ -603,33 +614,33 @@ export class MasterGameEngine {
public commit_tsumoHora(house: House) { public commit_tsumoHora(house: House) {
const tx = this.startTransaction(); const tx = this.startTransaction();
if (tx.state.turn !== house) throw new Error('Not your turn'); if (tx.$state.turn !== house) throw new Error('Not your turn');
const yakus = YAKU_DEFINITIONS.filter(yaku => yaku.calc({ const yakus = YAKU_DEFINITIONS.filter(yaku => yaku.calc({
house: house, house: house,
handTiles: tx.handTileTypes[house], handTiles: tx.handTileTypes[house],
huros: tx.state.huros[house], huros: tx.$state.huros[house],
tsumoTile: tx.handTileTypes[house].at(-1)!, tsumoTile: tx.handTileTypes[house].at(-1)!,
ronTile: null, ronTile: null,
riichi: tx.state.riichis[house], riichi: tx.$state.riichis[house],
ippatsu: tx.state.ippatsus[house], ippatsu: tx.$state.ippatsus[house],
})); }));
const doraCount = const doraCount =
Common.calcOwnedDoraCount(tx.handTileTypes[house], tx.state.huros[house], tx.doras) + Common.calcOwnedDoraCount(tx.handTileTypes[house], tx.$state.huros[house], tx.doras) +
Common.calcRedDoraCount(tx.state.handTiles[house], tx.state.huros[house]); Common.calcRedDoraCount(tx.$state.handTiles[house], tx.$state.huros[house]);
const fans = yakus.map(yaku => yaku.fan).reduce((a, b) => a + b, 0) + doraCount; const fans = yakus.map(yaku => yaku.fan).reduce((a, b) => a + b, 0) + doraCount;
const pointDeltas = Common.calcTsumoHoraPointDeltas(house, fans); const pointDeltas = Common.calcTsumoHoraPointDeltas(house, fans);
tx.state.points.e += pointDeltas.e; tx.$state.points.e += pointDeltas.e;
tx.state.points.s += pointDeltas.s; tx.$state.points.s += pointDeltas.s;
tx.state.points.w += pointDeltas.w; tx.$state.points.w += pointDeltas.w;
tx.state.points.n += pointDeltas.n; tx.$state.points.n += pointDeltas.n;
console.log('yakus', house, yakus); console.log('yakus', house, yakus);
tx.commit(); tx.$commit();
return { return {
handTiles: tx.state.handTiles[house], handTiles: tx.$state.handTiles[house],
tsumoTile: tx.state.handTiles[house].at(-1)!, tsumoTile: tx.$state.handTiles[house].at(-1)!,
}; };
} }
@ -641,17 +652,17 @@ export class MasterGameEngine {
}) { }) {
const tx = this.startTransaction(); const tx = this.startTransaction();
if (tx.state.askings.pon == null && tx.state.askings.cii == null && tx.state.askings.kan == null && tx.state.askings.ron == null) throw new Error(); if (tx.$state.askings.pon == null && tx.$state.askings.cii == null && tx.$state.askings.kan == null && tx.$state.askings.ron == null) throw new Error();
const pon = tx.state.askings.pon; const pon = tx.$state.askings.pon;
const cii = tx.state.askings.cii; const cii = tx.$state.askings.cii;
const kan = tx.state.askings.kan; const kan = tx.$state.askings.kan;
const ron = tx.state.askings.ron; const ron = tx.$state.askings.ron;
tx.state.askings.pon = null; tx.$state.askings.pon = null;
tx.state.askings.cii = null; tx.$state.askings.cii = null;
tx.state.askings.kan = null; tx.$state.askings.kan = null;
tx.state.askings.ron = null; tx.$state.askings.ron = null;
if (ron != null && answers.ron.length > 0) { if (ron != null && answers.ron.length > 0) {
const callers = answers.ron; const callers = answers.ron;
@ -661,24 +672,24 @@ export class MasterGameEngine {
const yakus = YAKU_DEFINITIONS.filter(yaku => yaku.calc({ const yakus = YAKU_DEFINITIONS.filter(yaku => yaku.calc({
house: house, house: house,
handTiles: tx.handTileTypes[house], handTiles: tx.handTileTypes[house],
huros: tx.state.huros[house], huros: tx.$state.huros[house],
tsumoTile: null, tsumoTile: null,
ronTile: tx.hoTileTypes[callee].at(-1)!, ronTile: tx.hoTileTypes[callee].at(-1)!,
riichi: tx.state.riichis[house], riichi: tx.$state.riichis[house],
ippatsu: tx.state.ippatsus[house], ippatsu: tx.$state.ippatsus[house],
})); }));
const doraCount = const doraCount =
Common.calcOwnedDoraCount(tx.handTileTypes[house], tx.state.huros[house], tx.doras) + Common.calcOwnedDoraCount(tx.handTileTypes[house], tx.$state.huros[house], tx.doras) +
Common.calcRedDoraCount(tx.state.handTiles[house], tx.state.huros[house]); Common.calcRedDoraCount(tx.$state.handTiles[house], tx.$state.huros[house]);
const fans = yakus.map(yaku => yaku.fan).reduce((a, b) => a + b, 0) + doraCount; const fans = yakus.map(yaku => yaku.fan).reduce((a, b) => a + b, 0) + doraCount;
const point = Common.fanToPoint(fans, house === 'e'); const point = Common.fanToPoint(fans, house === 'e');
tx.state.points[callee] -= point; tx.$state.points[callee] -= point;
tx.state.points[house] += point; tx.$state.points[house] += point;
console.log('fans point', fans, point); console.log('fans point', fans, point);
console.log('yakus', house, yakus); console.log('yakus', house, yakus);
} }
tx.commit(); tx.$commit();
return { return {
type: 'ronned' as const, type: 'ronned' as const,
@ -689,33 +700,33 @@ export class MasterGameEngine {
} else if (kan != null && answers.kan) { } else if (kan != null && answers.kan) {
// 大明槓 // 大明槓
const tile = tx.state.hoTiles[kan.callee].pop()!; const tile = tx.$state.hoTiles[kan.callee].pop()!;
const t1 = tx.state.handTiles[kan.caller].filter(t => $type(t) === $type(tile)).at(0); const t1 = tx.$state.handTiles[kan.caller].filter(t => $type(t) === $type(tile)).at(0);
if (t1 == null) throw new Error('No such tile'); if (t1 == null) throw new Error('No such tile');
const t2 = tx.state.handTiles[kan.caller].filter(t => $type(t) === $type(tile)).at(1); const t2 = tx.$state.handTiles[kan.caller].filter(t => $type(t) === $type(tile)).at(1);
if (t2 == null) throw new Error('No such tile'); if (t2 == null) throw new Error('No such tile');
const t3 = tx.state.handTiles[kan.caller].filter(t => $type(t) === $type(tile)).at(2); const t3 = tx.$state.handTiles[kan.caller].filter(t => $type(t) === $type(tile)).at(2);
if (t3 == null) throw new Error('No such tile'); if (t3 == null) throw new Error('No such tile');
tx.state.handTiles[kan.caller].splice(tx.state.handTiles[kan.caller].indexOf(t1), 1); tx.$state.handTiles[kan.caller].splice(tx.$state.handTiles[kan.caller].indexOf(t1), 1);
tx.state.handTiles[kan.caller].splice(tx.state.handTiles[kan.caller].indexOf(t2), 1); tx.$state.handTiles[kan.caller].splice(tx.$state.handTiles[kan.caller].indexOf(t2), 1);
tx.state.handTiles[kan.caller].splice(tx.state.handTiles[kan.caller].indexOf(t3), 1); tx.$state.handTiles[kan.caller].splice(tx.$state.handTiles[kan.caller].indexOf(t3), 1);
const tiles = [tile, t1, t2, t3]; const tiles = [tile, t1, t2, t3];
tx.state.huros[kan.caller].push({ type: 'minkan', tiles: tiles, from: kan.callee }); tx.$state.huros[kan.caller].push({ type: 'minkan', tiles: tiles, from: kan.callee });
tx.state.ippatsus.e = false; tx.$state.ippatsus.e = false;
tx.state.ippatsus.s = false; tx.$state.ippatsus.s = false;
tx.state.ippatsus.w = false; tx.$state.ippatsus.w = false;
tx.state.ippatsus.n = false; tx.$state.ippatsus.n = false;
tx.state.activatedDorasCount++; tx.$state.activatedDorasCount++;
const rinsyan = tx.tsumo(); const rinsyan = tx.tsumo();
tx.state.turn = kan.caller; tx.$state.turn = kan.caller;
tx.commit(); tx.$commit();
return { return {
type: 'kanned' as const, type: 'kanned' as const,
@ -723,39 +734,39 @@ export class MasterGameEngine {
callee: kan.callee, callee: kan.callee,
tiles: tiles, tiles: tiles,
rinsyan, rinsyan,
turn: tx.state.turn, turn: tx.$state.turn,
}; };
} else if (pon != null && answers.pon) { } else if (pon != null && answers.pon) {
const tile = tx.state.hoTiles[pon.callee].pop()!; const tile = tx.$state.hoTiles[pon.callee].pop()!;
const t1 = tx.state.handTiles[pon.caller].filter(t => $type(t) === $type(tile)).at(0); const t1 = tx.$state.handTiles[pon.caller].filter(t => $type(t) === $type(tile)).at(0);
if (t1 == null) throw new Error('No such tile'); if (t1 == null) throw new Error('No such tile');
const t2 = tx.state.handTiles[pon.caller].filter(t => $type(t) === $type(tile)).at(1); const t2 = tx.$state.handTiles[pon.caller].filter(t => $type(t) === $type(tile)).at(1);
if (t2 == null) throw new Error('No such tile'); if (t2 == null) throw new Error('No such tile');
tx.state.handTiles[pon.caller].splice(tx.state.handTiles[pon.caller].indexOf(t1), 1); tx.$state.handTiles[pon.caller].splice(tx.$state.handTiles[pon.caller].indexOf(t1), 1);
tx.state.handTiles[pon.caller].splice(tx.state.handTiles[pon.caller].indexOf(t2), 1); tx.$state.handTiles[pon.caller].splice(tx.$state.handTiles[pon.caller].indexOf(t2), 1);
const tiles = [tile, t1, t2]; const tiles = [tile, t1, t2];
tx.state.huros[pon.caller].push({ type: 'pon', tiles: tiles, from: pon.callee }); tx.$state.huros[pon.caller].push({ type: 'pon', tiles: tiles, from: pon.callee });
tx.state.ippatsus.e = false; tx.$state.ippatsus.e = false;
tx.state.ippatsus.s = false; tx.$state.ippatsus.s = false;
tx.state.ippatsus.w = false; tx.$state.ippatsus.w = false;
tx.state.ippatsus.n = false; tx.$state.ippatsus.n = false;
tx.state.turn = pon.caller; tx.$state.turn = pon.caller;
tx.commit(); tx.$commit();
return { return {
type: 'ponned' as const, type: 'ponned' as const,
caller: pon.caller, caller: pon.caller,
callee: pon.callee, callee: pon.callee,
tiles: tiles, tiles: tiles,
turn: tx.state.turn, turn: tx.$state.turn,
}; };
} else if (cii != null && answers.cii) { } else if (cii != null && answers.cii) {
const tile = tx.state.hoTiles[cii.callee].pop()!; const tile = tx.$state.hoTiles[cii.callee].pop()!;
let tiles: [TileId, TileId, TileId]; let tiles: [TileId, TileId, TileId];
switch (answers.cii) { switch (answers.cii) {
@ -764,12 +775,12 @@ export class MasterGameEngine {
if (a == null) throw new Error(); if (a == null) throw new Error();
const b = Common.NEXT_TILE_FOR_SHUNTSU[a]; const b = Common.NEXT_TILE_FOR_SHUNTSU[a];
if (b == null) throw new Error(); if (b == null) throw new Error();
const aTile = tx.state.handTiles[cii.caller].find(t => $type(t) === a); const aTile = tx.$state.handTiles[cii.caller].find(t => $type(t) === a);
if (aTile == null) throw new Error(); if (aTile == null) throw new Error();
const bTile = tx.state.handTiles[cii.caller].find(t => $type(t) === b); const bTile = tx.$state.handTiles[cii.caller].find(t => $type(t) === b);
if (bTile == null) throw new Error(); if (bTile == null) throw new Error();
tx.state.handTiles[cii.caller].splice(tx.state.handTiles[cii.caller].indexOf(aTile), 1); tx.$state.handTiles[cii.caller].splice(tx.$state.handTiles[cii.caller].indexOf(aTile), 1);
tx.state.handTiles[cii.caller].splice(tx.state.handTiles[cii.caller].indexOf(bTile), 1); tx.$state.handTiles[cii.caller].splice(tx.$state.handTiles[cii.caller].indexOf(bTile), 1);
tiles = [tile, aTile, bTile]; tiles = [tile, aTile, bTile];
break; break;
} }
@ -778,12 +789,12 @@ export class MasterGameEngine {
if (a == null) throw new Error(); if (a == null) throw new Error();
const b = Common.NEXT_TILE_FOR_SHUNTSU[$type(tile)]; const b = Common.NEXT_TILE_FOR_SHUNTSU[$type(tile)];
if (b == null) throw new Error(); if (b == null) throw new Error();
const aTile = tx.state.handTiles[cii.caller].find(t => $type(t) === a); const aTile = tx.$state.handTiles[cii.caller].find(t => $type(t) === a);
if (aTile == null) throw new Error(); if (aTile == null) throw new Error();
const bTile = tx.state.handTiles[cii.caller].find(t => $type(t) === b); const bTile = tx.$state.handTiles[cii.caller].find(t => $type(t) === b);
if (bTile == null) throw new Error(); if (bTile == null) throw new Error();
tx.state.handTiles[cii.caller].splice(tx.state.handTiles[cii.caller].indexOf(aTile), 1); tx.$state.handTiles[cii.caller].splice(tx.$state.handTiles[cii.caller].indexOf(aTile), 1);
tx.state.handTiles[cii.caller].splice(tx.state.handTiles[cii.caller].indexOf(bTile), 1); tx.$state.handTiles[cii.caller].splice(tx.$state.handTiles[cii.caller].indexOf(bTile), 1);
tiles = [aTile, tile, bTile]; tiles = [aTile, tile, bTile];
break; break;
} }
@ -792,59 +803,59 @@ export class MasterGameEngine {
if (a == null) throw new Error(); if (a == null) throw new Error();
const b = Common.PREV_TILE_FOR_SHUNTSU[a]; const b = Common.PREV_TILE_FOR_SHUNTSU[a];
if (b == null) throw new Error(); if (b == null) throw new Error();
const aTile = tx.state.handTiles[cii.caller].find(t => $type(t) === a); const aTile = tx.$state.handTiles[cii.caller].find(t => $type(t) === a);
if (aTile == null) throw new Error(); if (aTile == null) throw new Error();
const bTile = tx.state.handTiles[cii.caller].find(t => $type(t) === b); const bTile = tx.$state.handTiles[cii.caller].find(t => $type(t) === b);
if (bTile == null) throw new Error(); if (bTile == null) throw new Error();
tx.state.handTiles[cii.caller].splice(tx.state.handTiles[cii.caller].indexOf(aTile), 1); tx.$state.handTiles[cii.caller].splice(tx.$state.handTiles[cii.caller].indexOf(aTile), 1);
tx.state.handTiles[cii.caller].splice(tx.state.handTiles[cii.caller].indexOf(bTile), 1); tx.$state.handTiles[cii.caller].splice(tx.$state.handTiles[cii.caller].indexOf(bTile), 1);
tiles = [bTile, aTile, tile]; tiles = [bTile, aTile, tile];
break; break;
} }
} }
tx.state.huros[cii.caller].push({ type: 'cii', tiles: tiles, from: cii.callee }); tx.$state.huros[cii.caller].push({ type: 'cii', tiles: tiles, from: cii.callee });
tx.state.ippatsus.e = false; tx.$state.ippatsus.e = false;
tx.state.ippatsus.s = false; tx.$state.ippatsus.s = false;
tx.state.ippatsus.w = false; tx.$state.ippatsus.w = false;
tx.state.ippatsus.n = false; tx.$state.ippatsus.n = false;
tx.state.turn = cii.caller; tx.$state.turn = cii.caller;
tx.commit(); tx.$commit();
return { return {
type: 'ciied' as const, type: 'ciied' as const,
caller: cii.caller, caller: cii.caller,
callee: cii.callee, callee: cii.callee,
tiles: tiles, tiles: tiles,
turn: tx.state.turn, turn: tx.$state.turn,
}; };
} else if (tx.state.tiles.length === 0) { } else if (tx.$state.tiles.length === 0) {
// 流局 // 流局
tx.state.turn = null; tx.$state.turn = null;
tx.state.nextTurnAfterAsking = null; tx.$state.nextTurnAfterAsking = null;
tx.commit(); tx.$commit();
return { return {
type: 'ryuukyoku' as const, type: 'ryuukyoku' as const,
}; };
} else { } else {
tx.state.turn = tx.state.nextTurnAfterAsking!; tx.$state.turn = tx.$state.nextTurnAfterAsking!;
tx.state.nextTurnAfterAsking = null; tx.$state.nextTurnAfterAsking = null;
const tile = tx.tsumo(); const tile = tx.tsumo();
tx.commit(); tx.$commit();
return { return {
type: 'tsumo' as const, type: 'tsumo' as const,
house: tx.state.turn, house: tx.$state.turn,
tile, tile,
turn: tx.state.turn, turn: tx.$state.turn,
}; };
} }
} }
@ -853,53 +864,53 @@ export class MasterGameEngine {
const house = this.getHouse(index); const house = this.getHouse(index);
return { return {
user1House: this.state.user1House, user1House: this.$state.user1House,
user2House: this.state.user2House, user2House: this.$state.user2House,
user3House: this.state.user3House, user3House: this.$state.user3House,
user4House: this.state.user4House, user4House: this.$state.user4House,
round: this.state.round, round: this.$state.round,
kyoku: this.state.kyoku, kyoku: this.$state.kyoku,
turnCount: this.state.turnCount, turnCount: this.$state.turnCount,
tilesCount: this.state.tiles.length, tilesCount: this.$state.tiles.length,
doraIndicateTiles: this.state.kingTiles.slice(0, this.state.activatedDorasCount), doraIndicateTiles: this.$state.kingTiles.slice(0, this.$state.activatedDorasCount),
handTiles: { handTiles: {
e: house === 'e' ? this.state.handTiles.e : this.state.handTiles.e.map(() => 0), e: house === 'e' ? this.$state.handTiles.e : this.$state.handTiles.e.map(() => 0),
s: house === 's' ? this.state.handTiles.s : this.state.handTiles.s.map(() => 0), s: house === 's' ? this.$state.handTiles.s : this.$state.handTiles.s.map(() => 0),
w: house === 'w' ? this.state.handTiles.w : this.state.handTiles.w.map(() => 0), w: house === 'w' ? this.$state.handTiles.w : this.$state.handTiles.w.map(() => 0),
n: house === 'n' ? this.state.handTiles.n : this.state.handTiles.n.map(() => 0), n: house === 'n' ? this.$state.handTiles.n : this.$state.handTiles.n.map(() => 0),
}, },
hoTiles: { hoTiles: {
e: this.state.hoTiles.e, e: this.$state.hoTiles.e,
s: this.state.hoTiles.s, s: this.$state.hoTiles.s,
w: this.state.hoTiles.w, w: this.$state.hoTiles.w,
n: this.state.hoTiles.n, n: this.$state.hoTiles.n,
}, },
huros: { huros: {
e: this.state.huros.e, e: this.$state.huros.e,
s: this.state.huros.s, s: this.$state.huros.s,
w: this.state.huros.w, w: this.$state.huros.w,
n: this.state.huros.n, n: this.$state.huros.n,
}, },
riichis: { riichis: {
e: this.state.riichis.e, e: this.$state.riichis.e,
s: this.state.riichis.s, s: this.$state.riichis.s,
w: this.state.riichis.w, w: this.$state.riichis.w,
n: this.state.riichis.n, n: this.$state.riichis.n,
}, },
ippatsus: { ippatsus: {
e: this.state.ippatsus.e, e: this.$state.ippatsus.e,
s: this.state.ippatsus.s, s: this.$state.ippatsus.s,
w: this.state.ippatsus.w, w: this.$state.ippatsus.w,
n: this.state.ippatsus.n, n: this.$state.ippatsus.n,
}, },
points: { points: {
e: this.state.points.e, e: this.$state.points.e,
s: this.state.points.s, s: this.$state.points.s,
w: this.state.points.w, w: this.$state.points.w,
n: this.state.points.n, n: this.$state.points.n,
}, },
latestDahaiedTile: null, latestDahaiedTile: null,
turn: this.state.turn, turn: this.$state.turn,
}; };
} }
@ -920,7 +931,7 @@ export class MasterGameEngine {
} }
public getState(): MasterState { public getState(): MasterState {
return structuredClone(this.state); return structuredClone(this.$state);
} }
} }