mirror/misskey
1
0
Fork 1
mirror of https://github.com/misskey-dev/misskey.git synced 2025-01-15 01:31:14 +09:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
syuilo 2024-01-30 11:34:57 +09:00
parent ce65e9dd69
commit 4183fec4ab
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/backend/src/core/MahjongService.ts
View File

@ -519,14 +519,9 @@ export class MahjongService implements OnApplicationShutdown, OnModuleInit {
const engine = new Mahjong.MasterGameEngine(room.gameState); const engine = new Mahjong.MasterGameEngine(room.gameState);
const myHouse = getHouseOfUserId(room, engine, user.id); const myHouse = getHouseOfUserId(room, engine, user.id);
if (riichi) {
if (Mahjong.Utils.getHoraTiles(engine.state.handTiles[myHouse]).length === 0) return;
if (engine.state.points[myHouse] < 1000) return;
}
await this.clearTurnWaitingTimer(room.id); await this.clearTurnWaitingTimer(room.id);
await this.dahai(room, engine, myHouse, tile); await this.dahai(room, engine, myHouse, tile, riichi);
} }
@bindThis @bindThis

5
packages/misskey-mahjong/src/engine.master.ts
View File

@ -238,6 +238,11 @@ export class MasterGameEngine {
public commit_dahai(house: House, tile: Tile, riichi = false) { public commit_dahai(house: House, tile: Tile, riichi = false) {
if (this.state.turn !== house) throw new Error('Not your turn'); if (this.state.turn !== house) throw new Error('Not your turn');
if (riichi) {
if (Utils.getHoraTiles(this.state.handTiles[house]).length === 0) throw new Error('Not tenpai');
if (this.state.points[house] < 1000) throw new Error('Not enough points');
}
const handTiles = this.state.handTiles[house]; const handTiles = this.state.handTiles[house];
if (!handTiles.includes(tile)) throw new Error('No such tile in your hand'); if (!handTiles.includes(tile)) throw new Error('No such tile in your hand');
handTiles.splice(handTiles.indexOf(tile), 1); handTiles.splice(handTiles.indexOf(tile), 1);