Add cpu auto to checkmate trials.

This commit is contained in:
yukirij 2025-01-23 00:39:58 -08:00
parent 56eecdf6f5
commit 2c7854f2d2
3 changed files with 34 additions and 18 deletions

View File

@ -11,6 +11,7 @@ class GameConfig {
this.rules = { this.rules = {
reverse:0, reverse:0,
turn:true, turn:true,
cpu:false,
}; };
//this.actions = [ ]; //this.actions = [ ];

View File

@ -337,7 +337,8 @@ const GAME_CONFIGS = {
.add_piece(0, 1, false, new MATH.Vec2(4, 4)) .add_piece(0, 1, false, new MATH.Vec2(4, 4))
.add_piece(2, 1, false, new MATH.Vec2(5, 6)) .add_piece(2, 1, false, new MATH.Vec2(5, 6))
), )
.set_rule("cpu", true),
Guide_Check2: new GameConfig() Guide_Check2: new GameConfig()
.set_pieces(CONFIG_PIECES_STANDARD) .set_pieces(CONFIG_PIECES_STANDARD)
.set_pool(new Uint8Array([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])) .set_pool(new Uint8Array([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]))
@ -349,7 +350,8 @@ const GAME_CONFIGS = {
.add_piece(1, 1, false, new MATH.Vec2(4, 4)) .add_piece(1, 1, false, new MATH.Vec2(4, 4))
.add_piece(6, 1, true, new MATH.Vec2(7, 3)) .add_piece(6, 1, true, new MATH.Vec2(7, 3))
.add_piece(1, 1, true, new MATH.Vec2(2, 0)) .add_piece(1, 1, true, new MATH.Vec2(2, 0))
), )
.set_rule("cpu", true),
Guide_Check3: new GameConfig() Guide_Check3: new GameConfig()
.set_pieces(CONFIG_PIECES_STANDARD) .set_pieces(CONFIG_PIECES_STANDARD)
.set_pool(new Uint8Array([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0])) .set_pool(new Uint8Array([1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]))
@ -361,7 +363,8 @@ const GAME_CONFIGS = {
.add_piece(5, 1, false, new MATH.Vec2(1, 4)) .add_piece(5, 1, false, new MATH.Vec2(1, 4))
.add_piece(1, 1, false, new MATH.Vec2(5, 5)) .add_piece(1, 1, false, new MATH.Vec2(5, 5))
.add_piece(6, 1, true, new MATH.Vec2(4, 4)) .add_piece(6, 1, true, new MATH.Vec2(4, 4))
), )
.set_rule("cpu", true),
// Checkmate // Checkmate
Guide_Checkmate: new GameConfig() Guide_Checkmate: new GameConfig()
@ -388,7 +391,8 @@ const GAME_CONFIGS = {
.add_piece(3, 0, true, new MATH.Vec2(2, 6)) .add_piece(3, 0, true, new MATH.Vec2(2, 6))
.add_piece(6, 0, true, new MATH.Vec2(1, 5)) .add_piece(6, 0, true, new MATH.Vec2(1, 5))
.add_piece(2, 0, true, new MATH.Vec2(7, 7)) .add_piece(2, 0, true, new MATH.Vec2(7, 7))
), )
.set_rule("cpu", true),
Guide_Trial2: new GameConfig() Guide_Trial2: new GameConfig()
.set_pieces(CONFIG_PIECES_STANDARD) .set_pieces(CONFIG_PIECES_STANDARD)
@ -402,7 +406,8 @@ const GAME_CONFIGS = {
.add_piece(2, 0, true, new MATH.Vec2(6, 7)) .add_piece(2, 0, true, new MATH.Vec2(6, 7))
.add_piece(6, 0, false, new MATH.Vec2(4, 4)) .add_piece(6, 0, false, new MATH.Vec2(4, 4))
.add_piece(5, 0, false, new MATH.Vec2(4, 2)) .add_piece(5, 0, false, new MATH.Vec2(4, 2))
), )
.set_rule("cpu", true),
Guide_Trial3: new GameConfig() Guide_Trial3: new GameConfig()
.set_pieces(CONFIG_PIECES_STANDARD) .set_pieces(CONFIG_PIECES_STANDARD)
@ -429,5 +434,6 @@ const GAME_CONFIGS = {
.add_piece(2, 0, false, new MATH.Vec2(6, 5)) .add_piece(2, 0, false, new MATH.Vec2(6, 5))
.add_piece(0, 1, false, new MATH.Vec2(1, 4)) .add_piece(0, 1, false, new MATH.Vec2(1, 4))
.add_piece(2, 0, true, new MATH.Vec2(0, 3)) .add_piece(2, 0, true, new MATH.Vec2(0, 3))
), )
.set_rule("cpu", true),
}; };

View File

@ -1405,7 +1405,7 @@ const INTERFACE = {
board_state: [ ], board_state: [ ],
history: [ ], history: [ ],
history_begin: [ ], history_begin: [ ],
auto: 0, auto: false,
}, },
Ui: { Ui: {
@ -1497,7 +1497,7 @@ const INTERFACE = {
}, },
reset() { reset() {
INTERFACE_DATA.Game.auto = 0; INTERFACE_DATA.Game.auto = (GAME_DATA.config.rules.cpu)? 2 : false;
INTERFACE_DATA.Game.history = [ ]; INTERFACE_DATA.Game.history = [ ];
for(let i = 0; i < INTERFACE_DATA.Game.history_begin.length; ++i) { for(let i = 0; i < INTERFACE_DATA.Game.history_begin.length; ++i) {
@ -1511,12 +1511,20 @@ const INTERFACE = {
undo() { undo() {
switch(INTERFACE_DATA.mode) { switch(INTERFACE_DATA.mode) {
case INTERFACE.Mode.Local: { case INTERFACE.Mode.Local: {
INTERFACE_DATA.Game.auto = 0; let back = 1;
if(INTERFACE_DATA.Game.auto != 0 && INTERFACE_DATA.rotate != INTERFACE_DATA.Game.auto) {
back = 2;
}
for(let i = 0; i < back; ++i) {
if(INTERFACE_DATA.Game.history.length > 0) { if(INTERFACE_DATA.Game.history.length > 0) {
INTERFACE_DATA.Replay.turn = INTERFACE_DATA.Game.history.length + 1; INTERFACE_DATA.Replay.turn = INTERFACE_DATA.Game.history.length + 1;
INTERFACE_DATA.Game.history.pop(); INTERFACE_DATA.Game.history.pop();
INTERFACE.replay_jump(INTERFACE_DATA.Game.history.length, false);
} }
}
INTERFACE.replay_jump(INTERFACE_DATA.Game.history.length, false);
} break; } break;
case INTERFACE.Mode.Player: { case INTERFACE.Mode.Player: {
@ -1982,21 +1990,22 @@ const INTERFACE = {
} }
// Get move scores. // Get move scores.
for(let i = 0; i < moves.length; ++i) { for(let mv = 0; mv < moves.length; ++mv) {
let st = state.clone(); let st = state.clone();
st.process(moves[i].play); st.process(moves[mv].play);
moves[i].score = state_score(st, player); moves[mv].score = state_score(st, player);
} }
// Select move. // Select move.
if(moves.length > 0) { if(moves.length > 0) {
moves.sort((a, b) => { return b.score - a.score }); moves.sort((a, b) => { return b.score - a.score });
if(depth == 0) { /*if(depth == 0) {
// Get move scores for search player. // Get move scores for search player.
for(let i = 0; i < moves.length; ++i) { for(let i = 0; i < moves.length; ++i) {
let st = state.clone(); let st = state.clone();
st.process(moves[i].play); st.process(moves[i].play);
console.log("B");
moves[i].score = state_score(st, search_player); moves[i].score = state_score(st, search_player);
} }
} else { } else {
@ -2009,7 +2018,7 @@ const INTERFACE = {
moves[i].score = result.score; moves[i].score = result.score;
} }
} }
} }*/
// Select random from ties. // Select random from ties.
let selection = 0; let selection = 0;