Adrien/Riichi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Much more yakus

Browse source
This commit is contained in:
Didictateur 2025-04-11 20:54:49 +02:00
parent 5c5522d46c
commit 15a6341879
6 changed files with 192 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/dp0.js
View file

File diff suppressed because one or more lines are too long

4
build/test.js
View file

File diff suppressed because one or more lines are too long

4
build/test_yakus.js
View file

File diff suppressed because one or more lines are too long

1
src/display/dp0.ts
View file

@ -45,7 +45,6 @@ function drawFrame(deltaTime: number) {
staticCtx.fillRect(BG_RECT.x, BG_RECT.y, BG_RECT.w, BG_RECT.h);
// Dessin de la pluie
console.log("draw")
RAIN.drawRain(staticCtx);
// Copier le buffer au canvas principal

52
src/tests/test_yakus.ts
View file

@ -1,6 +1,7 @@
import { assert } from "./assert"
import { yakus } from "../yakus/yaku"
import { Hand } from "../hand"
import { Group } from "../group";
let count = 0;
let total = 0;
@ -18,6 +19,12 @@ let h10 = new Hand("m1m2m3 p6p6 d1d1d1 d2d2d2 d3d3d3");
let h11 = new Hand("m1m2m3 w1w1w1 w2w2w2 w3w3w3 w4w4");
let h12 = new Hand("m1m1 w1w1w1 w2w2w2 w3w3w3 w4w4w4");
let h13 = new Hand("d1d1 w1w1w1 w2w2w2 w3w3w3 w4w4w4");
let h14 = new Hand("m1m1 m9m9m9 p1p1p1 p9p9p9 s1s1s1");
let h15 = new Hand("m1m9m9 p1p9 s1s9 w1w2w3w4 d1d2d3");
let h16 = new Hand("m1m1 m2m2 m3m3 m4m4 m5m5 m6m6 m7m7");
let h17 = new Hand("m1m1 m2m2 m3m3 m4m4 m5m5 m6m6 m6m6");
let h18 = new Hand("m1m2m3 m4m4m4 m7m7m7 p1p1p1 p5p5");
let h19 = new Hand("m1m2m3 m7m7m7 p1p1p1 p5p5");
// lipeikou
count += assert(yakus.lipekou(h5, [], 0) === 1, "m123 m123 p789 p789 w33 is Lipeikou");
@ -90,5 +97,50 @@ count += assert(yakus.junchan(h7, [], 0) === 3, "m123 p123 s123 m789 p99 is Junc
count += assert(yakus.junchan(h10, [], 0) === 0, "m123 p66 d111 d222 d333 is not Junchan");
total += 2;
// honroutou
count += assert(yakus.honroutou(h14, [], 0) === 2, "m11 m999 p111 p999 s111 is Honroutou");
count += assert(yakus.honroutou(h3, [], 0) === 2, "m111 p999 s111 w222 d11 is Honroutou");
count += assert(yakus.honroutou(h10, [], 0) === 0, "m123 p66 d111 d222 d333 is not Honroutou");
total += 3;
// chinroutou
count += assert(yakus.chinroutou(h14, [], 0) === 13, "m11 m999 p111 p999 s111 is Chinroutou");
count += assert(yakus.chinroutou(h3, [], 0) === 0, "m111 p999 s111 w222 d11 is not Chinroutou");
count += assert(yakus.chinroutou(h10, [], 0) === 0, "m123 p66 d111 d222 d333 is not Chinroutou");
total += 3;
// tsuuisou
count += assert(yakus.tsuuiisou(h13, [], 0) === 13, "d11 w111 w222 w333 w444 is Tsuuisou");
count += assert(yakus.tsuuiisou(h3, [], 0) === 0, "m111 p999 s111 w222 d11 is not Tsuuisou");
total += 2;
// kokushiMusou
count += assert(yakus.kokushiMusou(h15, [], 0) === 13, "m1m9m9 p1p9 s1s9 w1w2w3w4 d1d2d3 is Kokushi Musou");
count += assert(yakus.kokushiMusou(h3, [], 0) === 0, "m111 p999 s111 w222 d11 is not Kokushi Musou");
total += 2;
// chiitoitsu
count += assert(yakus.chiitoitsu(h16, [], 0) === 2, "m11 m22 m33 m44 m55 m66 m77 is Chiitoitsu");
count += assert(yakus.chiitoitsu(h17, [], 0) === 0, "m11 m22 m33 m44 m55 m66 m66 is not Chiitoitsu");
count += assert(yakus.chiitoitsu(h3, [], 0) === 0, "m111 p999 s111 w222 d11 is not Chiitoitsu");
total += 3;
// toitoi
count += assert(yakus.toitoi(h2, [], 0) === 2, "m111 m444 m777 p111 p55 is Toitoi");
count += assert(yakus.toitoi(h7, [], 0) === 0, "m123 p123 s123 m789 p99 is not Toitoi");
total += 2;
// sanankou
count += assert(yakus.sanankou(h18, [], 0) === 2, "m123 m444 m777 p111 p55 is Sanankou");
count += assert(yakus.sanankou(h2, [], 0) === 0, "m111 m444 m777 p111 p55 is not Sanankou");
count += assert(yakus.sanankou(h7, [], 0) === 0, "m123 p123 s123 m789 p99 is not Sanankou");
total += 3;
// sanankou
count += assert(yakus.suuankou(h2, [], 0) === 13, "m111 m444 m777 p111 p55 is Sanankou");
count += assert(yakus.suuankou(h18, [], 0) === 0, "m123 m444 m777 p111 p55 is not Sanankou");
count += assert(yakus.suuankou(h7, [], 0) === 0, "m123 p123 s123 m789 p99 is not Sanankou");
total += 3;
// total
console.log("Succès: " + count.toString() + "/" + total.toString());

241
src/yakus/yaku.ts
View file

@ -11,10 +11,10 @@ function ord(g: Group): boolean {
function term(g: Group): boolean {
return g.getTiles().every(
t =>
t => {
t.getFamily() < 4 &&
(t.getValue() === 0 ||
t.getValue() === 9)
(t.getValue() === 1 ||
t.getValue() === 9)}
);
}
@ -41,15 +41,15 @@ function pon(g: Group): boolean {
export const yakus = {
/**
* double suite pure
* 0/1
*/
lipekou: function (
/**
* double suite pure
* 0/1
*/
hand: Hand,
groups: Array<Group>,
wind: number
): number {
): number {
if (groups.length > 0 && !yakus.ryanpeikou(hand, groups, wind)) { // ouvert
return 0;
}
@ -68,11 +68,11 @@ lipekou: function (
return 0;
},
/**
* deux doubles suites pures
* 0/3
*/
ryanpeikou: function (
/**
* deux doubles suites pures
* 0/3
*/
hand: Hand,
groups: Array<Group>,
wind: number
@ -99,11 +99,11 @@ ryanpeikou: function (
return 0;
},
pinfu: function(
/**
* tout suite
* 0/1
*/
/**
* tout suite
* 0/1
*/
pinfu: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -126,11 +126,11 @@ pinfu: function(
return 0;
},
/**
* triple suite
* 1/2
*/
sanshokuDoujun: function(
/**
* triple suite
* 1/2
*/
hand: Hand,
groups: Array<Group>,
wind: number
@ -185,11 +185,11 @@ sanshokuDoujun: function(
}
},
ittsuu: function(
/**
* grande suite pure
* 1/2
*/
/**
* grande suite pure
* 1/2
*/
ittsuu: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -238,11 +238,11 @@ ittsuu: function(
return 0;
},
tanyao: function(
/**
* tout ordinaire
* 1/1
*/
/**
* tout ordinaire
* 1/1
*/
tanyao: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -260,11 +260,11 @@ tanyao: function(
return 0;
},
yakuhai: function(
/**
* brelan de valeur
* 1/1
*/
/**
* brelan de valeur
* 1/1
*/
yakuhai: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -291,11 +291,11 @@ yakuhai: function(
return han;
},
shousangen: function(
/**
* trois petits dragons
* 2/2
*/
/**
* trois petits dragons
* 2/2
*/
shousangen: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -322,11 +322,11 @@ shousangen: function(
return 0;
},
daisangen: function(
/**
* trois grands dragons
* 13/13
*/
/**
* trois grands dragons
* 13/13
*/
daisangen: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -343,11 +343,11 @@ daisangen: function(
return 0;
},
shousuushii: function(
/**
* quatre petits vents
* 13/13
*/
/**
* quatre petits vents
* 13/13
*/
shousuushii: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -374,11 +374,11 @@ shousuushii: function(
return 0;
},
daisuushi: function(
/**
* quatre grands vents
* 13/13
*/
/**
* quatre grands vents
* 13/13
*/
daisuushi: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -405,11 +405,11 @@ daisuushi: function(
return 0;
},
chanta: function(
/**
* terminales et honneurs partout
* 1/2
*/
/**
* terminales et honneurs partout
* 1/2
*/
chanta: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -430,11 +430,11 @@ chanta: function(
return groups.length > 0 ? 1 : 2;
},
/**
* terminales partout
* 2/3
*/
junchan: function(
/**
* terminales partout
* 2/3
*/
hand: Hand,
groups: Array<Group>,
wind: number
@ -455,23 +455,35 @@ junchan: function(
return groups.length > 0 ? 2 : 3;
},
honroutou: function( //TODO
/**
* tout terminale et honneur
* 2/2
*/
/**
* tout terminale et honneur
* 2/2
*/
honroutou: function(
hand: Hand,
groups: Array<Group>,
wind: number
): number {
return 0;
let gr = groups.concat(hand.toGroup() as NonNullable<Array<Group>>);
gr = gr.filter(
g => {
let tiles = g.getTiles();
let f = tiles[0].getFamily();
let v = tiles[1].getValue();
return f < 4 && v !== 1 && v !== 9
}
);
if (gr.length > 0) {
return 0;
}
return 2;
},
chinroutou: function(
/**
* tout terminale
* 13/13
*/
/**
* tout terminale
* 13/13
*/
chinroutou: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -489,11 +501,11 @@ chinroutou: function(
return 0;
},
tsuuiisou: function(
/**
* tout honneur
* 13/13
*/
/**
* tout honneur
* 13/13
*/
tsuuiisou: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -511,11 +523,11 @@ tsuuiisou: function(
return 0;
},
/**
* treize orphelins
* 0/13
*/
kokushiMusou: function(
/**
* treize orphelins
* 0/13
*/
hand: Hand,
groups: Array<Group>,
wind: number
@ -523,10 +535,16 @@ kokushiMusou: function(
if (groups.length > 0) {
return 0;
}
if (yakus.honroutou(hand, groups, wind) === 0) {
let h = hand.getTiles();
if (
h.some(t =>
t.getFamily() < 4 &&
t.getValue() > 1 &&
t.getValue() < 9
)
) {
return 0;
}
let h = hand.getTiles();
let count = 0;
for (let i = 0; i < h.length - 1; i++) {
if (h[i].isEqual(h[i+1].getFamily(), h[i+1].getValue())) {
@ -542,27 +560,38 @@ kokushiMusou: function(
return 0;
},
/**
* sept paires
* 0/2
*/
chiitoitsu: function(
/**
* sept paires
* 0/2
*/
hand: Hand,
groups: Array<Group>,
wind: number
): number {
return 0;
if (groups.length > 0) {
return 0;
}
//TODO
let h = hand.getTiles();
if (h.length !== 14) {
return 0;
}
for (let i = 0; i < 14; i += 2) {
if (
h[i].compare(h[i+1]) !== 0 ||
(i > 0 && h[i].compare(h[i-1]) === 0)
) {
return 0
}
}
return 2;
},
/**
* tout brelans
* 2/2
*/
toitoi: function(
/**
* tout brelans
* 2/2
*/
hand: Hand,
groups: Array<Group>,
wind: number
@ -577,11 +606,11 @@ toitoi: function(
return 0;
},
sanankou: function(
/**
* trois brelan cachés
* 2/2
*/
/**
* trois brelan cachés
* 2/2
*/
sanankou: function(
hand: Hand,
groups: Array<Group>,
wind: number
@ -601,11 +630,11 @@ sanankou: function(
return 0;
},
/**
* quatre brelans cachés
* 0/13
*/
suuankou: function(
/**
* quatre brelans cachés
* 0/13
*/
hand: Hand,
groups: Array<Group>,
wind: number