Add retire implementation.
This commit is contained in:
yukirij
parent
f81e9343ce
commit
aca4e7acb1
@ -48,6 +48,7 @@ impl Game {
|
||||
{
|
||||
let player = (self.turn & 1) as u8;
|
||||
|
||||
if self.complete { return Err(()); }
|
||||
|
||||
//
|
||||
// TODO:
|
||||
@ -58,7 +59,8 @@ impl Game {
|
||||
|
||||
|
||||
// Move piece on board.
|
||||
if if play.source == 0 {
|
||||
if match play.source {
|
||||
0 => {
|
||||
if let Some(pid) = self.board.tiles[play.from as usize].piece {
|
||||
if let Some(mut piece) = self.board.pieces[pid as usize] {
|
||||
let mut swap = false;
|
||||
@ -106,21 +108,33 @@ impl Game {
|
||||
piece.promoted = true;
|
||||
}
|
||||
}
|
||||
|
||||
self.turn += 1;
|
||||
true
|
||||
} else { false }
|
||||
} else { false }
|
||||
}
|
||||
|
||||
// Place piece from pool.
|
||||
else {
|
||||
1 => {
|
||||
if self.pool[player as usize][play.from as usize] > 0 && self.board.tiles[play.to as usize].piece.is_none() {
|
||||
self.pool[player as usize][play.from as usize] -= 1;
|
||||
let piece = Piece::new(play.from, player);
|
||||
self.board.set_piece(piece, play.to);
|
||||
|
||||
self.turn += 1;
|
||||
true
|
||||
} else { false }
|
||||
}
|
||||
|
||||
// Player retired.
|
||||
2 => {
|
||||
self.complete = true;
|
||||
true
|
||||
}
|
||||
|
||||
_ => false,
|
||||
} {
|
||||
self.turn += 1;
|
||||
self.history.push(*play);
|
||||
Ok(())
|
||||
} else { Err(()) }
|
||||
|
||||
@ -483,10 +483,36 @@ pub async fn thread_system(mut app:App, bus:Bus<protocol::QRPacket>)
|
||||
|
||||
// SessionRetire
|
||||
QRPacketData::QSessionRetire(request) => {
|
||||
use game::history::Play;
|
||||
println!("Request: Session Retire");
|
||||
|
||||
if let Some(_session) = app.sessions.get_mut(&request.token) {
|
||||
let mut packets = Vec::<QRPacket>::new();
|
||||
|
||||
let play = Play {
|
||||
source: 2,
|
||||
from: 0,
|
||||
to: 0,
|
||||
};
|
||||
|
||||
if let Some(session) = app.sessions.get_mut(&request.token) {
|
||||
if !session.game.complete {
|
||||
session.game.process(&play).ok();
|
||||
|
||||
for (cid, _) in session.get_connections() {
|
||||
packets.push(QRPacket::new(
|
||||
cid,
|
||||
QRPacketData::QGamePlay(PacketGamePlay {
|
||||
status: STATUS_OK,
|
||||
turn: session.game.turn,
|
||||
play,
|
||||
}),
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for packet in packets {
|
||||
app.send_response(packet).await;
|
||||
}
|
||||
|
||||
Some(QRPacket::new(0, QRPacketData::None))
|
||||
@ -537,7 +563,7 @@ pub async fn thread_system(mut app:App, bus:Bus<protocol::QRPacket>)
|
||||
|
||||
if let Some(sid) = session_id {
|
||||
if let Some(session) = app.sessions.get_mut(&sid) {
|
||||
if session.p_dawn.user.is_some() && session.p_dusk.user.is_some() {
|
||||
if !session.game.complete && (session.p_dawn.user.is_some() && session.p_dusk.user.is_some()) {
|
||||
if (user_id == session.p_dawn.user && session.game.turn & 1 == 0)
|
||||
|| (user_id == session.p_dusk.user && session.game.turn & 1 == 1) {
|
||||
|
||||
|
||||
@ -204,6 +204,7 @@ GAME.Game = class {
|
||||
];
|
||||
|
||||
this.state = {
|
||||
code:0,
|
||||
check:false,
|
||||
checkmate:false,
|
||||
};
|
||||
@ -285,10 +286,13 @@ GAME.Game = class {
|
||||
// - Improve data safety validation.
|
||||
//
|
||||
|
||||
if(this.state.code != 0) { return false; }
|
||||
|
||||
let player = this.turn & 1;
|
||||
|
||||
// Move piece on board.
|
||||
if(play.source == 0) {
|
||||
switch(play.source) {
|
||||
case 0: {
|
||||
let piece_id = this.board.tiles[play.from].piece;
|
||||
let piece = this.board.pieces[piece_id];
|
||||
piece.tile = play.to;
|
||||
@ -326,19 +330,25 @@ GAME.Game = class {
|
||||
if(!piece.promoted && piece.has_promotion() && !HEX.is_valid(hex)) {
|
||||
piece.promoted = true;
|
||||
}
|
||||
}
|
||||
this.turn++;
|
||||
} break;
|
||||
|
||||
// Place piece from pool.
|
||||
else {
|
||||
case 1: {
|
||||
this.board.set_piece(
|
||||
play.from,
|
||||
player,
|
||||
play.to
|
||||
);
|
||||
this.pools[this.turn & 1].pieces[play.from] -= 1;
|
||||
}
|
||||
|
||||
this.turn++;
|
||||
} break;
|
||||
|
||||
// Play retired.
|
||||
case 2: {
|
||||
this.state.code = 2;
|
||||
} break;
|
||||
}
|
||||
|
||||
// Recalculate new board state.
|
||||
this.update_board();
|
||||
@ -550,6 +560,12 @@ GAME.Const = {
|
||||
Pool: 1,
|
||||
},
|
||||
|
||||
State: {
|
||||
Ongoing: 0,
|
||||
Complete: 1,
|
||||
Retire: 2,
|
||||
},
|
||||
|
||||
Direction: [
|
||||
new MATH.Vec2(0, 1),
|
||||
new MATH.Vec2(1, 1),
|
||||
|
||||
@ -563,7 +563,10 @@ const INTERFACE = {
|
||||
let message = null;
|
||||
ctx.fillStyle = INTERFACE.Color.Text;
|
||||
|
||||
if(GAME_DATA.state.check) {
|
||||
if(GAME_DATA.state.code == GAME.Const.State.Retire) {
|
||||
ctx.fillStyle = INTERFACE.Color.HintCheck;
|
||||
message = "Retire";
|
||||
} else if(GAME_DATA.state.check) {
|
||||
ctx.fillStyle = INTERFACE.Color.HintCheck;
|
||||
if(GAME_DATA.state.checkmate) {
|
||||
message = "Checkmate";
|
||||
@ -716,6 +719,7 @@ const INTERFACE = {
|
||||
handles: [null, null],
|
||||
board_state: [ ],
|
||||
play: null,
|
||||
retire:false,
|
||||
|
||||
Ui: {
|
||||
scale: 0,
|
||||
@ -778,6 +782,10 @@ const INTERFACE = {
|
||||
GAME_DATA.turn = data.turn;
|
||||
INTERFACE_DATA.play = data.play;
|
||||
|
||||
if(INTERFACE_DATA.play.source == 2) {
|
||||
GAME_DATA.state.code = 2;
|
||||
}
|
||||
|
||||
if(data.dawn.length > 0) { INTERFACE_DATA.handles[0] = data.dawn; }
|
||||
if(data.dusk.length > 0) { INTERFACE_DATA.handles[1] = data.dusk; }
|
||||
|
||||
|
||||
@ -13,6 +13,9 @@ LANGUAGE.Terms = {
|
||||
Handle: new LANGUAGE.Term( "Handle", "" ),
|
||||
Secret: new LANGUAGE.Term( "Secret", "" ),
|
||||
|
||||
Browse: new LANGUAGE.Term( "Resume", "" ),
|
||||
Browse: new LANGUAGE.Term( "Browse", "" ),
|
||||
Resume: new LANGUAGE.Term( "Resume", "" ),
|
||||
|
||||
Check: new LANGUAGE.Term( "Check", "王手" ),
|
||||
Checkmate: new LANGUAGE.Term( "Checkmate", "詰み" ),
|
||||
};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user