Kirisame/dzura
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases Wiki Activity

Fix handling of alt move plays.

Browse Source
This commit is contained in:
yukirij 2024-09-08 00:58:50 -07:00
parent 1dbe02966b
commit c39c05969e
15 changed files with 154 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/src/board/mod.rs
View File

@ -23,6 +23,9 @@ impl Column {
pub struct Tile {
pub piece:Option<u8>,
pub threat:[bool; 2],
pub check:bool,
pub hex:Hex,
}
impl Tile {
pub fn new() -> Self
@ -30,6 +33,9 @@ impl Tile {
Self {
piece:None,
threat:[false; 2],
check:false,
hex:Hex::new(),
}
}
}
@ -81,7 +87,7 @@ impl Board {
(Piece::new(PIECE_DRAGON, PLAYER_DAWN), Hex::from_hex(4, 2)),
(Piece::new(PIECE_BEHEMOTH, PLAYER_DAWN), Hex::from_hex(4, 1)),
(Piece::new(PIECE_OMEN, PLAYER_DAWN), Hex::from_hex(4, 0)),
(Piece::new(PIECE_SOURCE, PLAYER_DAWN), Hex::from_hex(4, 0)),
];
for (piece, hex) in &layout {

2
game/src/consts.rs
View File

@ -11,4 +11,4 @@ pub const PIECE_TOWER :u8 = 3;
pub const PIECE_CASTLE :u8 = 4;
pub const PIECE_DRAGON :u8 = 5;
pub const PIECE_BEHEMOTH :u8 = 6;
pub const PIECE_OMEN :u8 = 7;
pub const PIECE_SOURCE :u8 = 7;

12
game/src/game/mod.rs
View File

@ -50,6 +50,8 @@ impl Game {
if self.complete { return Err(()); }
let valid = true;
//
// TODO:
// - Check for piece promotion.
@ -58,9 +60,11 @@ impl Game {
//
if valid {
// Move piece on board.
if match play.source {
0 => {
0 | 3 => {
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;
@ -138,5 +142,11 @@ impl Game {
self.history.push(*play);
Ok(())
} else { Err(()) }
} else { Err(()) }
}
fn get_moves(_piece:&Piece) -> Vec<Play>
{
Vec::new()
}
}

2
game/src/piece/mod.rs
View File

@ -104,7 +104,7 @@ pub const PIECES :[PieceClass; PIECES_COUNT] = [
},
},
PieceClass {
name: "Omen",
name: "Source",
moves: MoveSet {
direction:0,
stride:0,

1
game/src/util/hex.rs
View File

@ -1,5 +1,6 @@
const ROWS :[u8; 10] = [ 0, 5, 11, 18, 26, 35, 43, 50, 56, 61 ];
#[derive(Clone, Copy)]
pub struct Hex {
pub x:u8,
pub y:u8,

4
server/src/main.rs
View File

@ -211,7 +211,7 @@ async fn main()
}
}
let about_path = std::path::Path::new("www/about");
let about_path = std::path::Path::new("www/pages/about");
for doc in [
"main",
] {
@ -220,7 +220,7 @@ async fn main()
}
}
let guide_path = std::path::Path::new("www/guide");
let guide_path = std::path::Path::new("www/pages/guide");
for doc in [
"game",
"pieces",

6
server/src/protocol/packet/game_play.rs
View File

@ -36,9 +36,9 @@ impl Packet for PacketGamePlay {
result.turn = unpack_u16(data, index);
let play = unpack_u16(data, index) as u32;
result.play.source = (play & mask(1, 0)) as u8;
result.play.from = ((play & mask(6, 1)) >> 1) as u8;
result.play.to = ((play & mask(6, 7)) >> 7) as u8;
result.play.source = (play & mask(4, 0)) as u8;
result.play.from = ((play & mask(6, 4)) >> 4) as u8;
result.play.to = ((play & mask(6, 10)) >> 10) as u8;
Ok(result)
}

8
www/js/game.js
View File

@ -151,11 +151,10 @@ GAME.MovementTile = class {
};
GAME.Play = class {
constructor(source, from, to, alt=false) {
constructor(source, from, to) {
this.source = source;
this.from = from;
this.to = to;
this.alt = alt;
}
};
@ -347,7 +346,8 @@ GAME.Game = class {
// Move piece on board.
switch(play.source) {
case 0: {
case 0:
case 3: {
let piece_id = this.board.tiles[play.from].piece;
let piece = this.board.pieces[piece_id];
piece.tile = play.to;
@ -387,7 +387,7 @@ GAME.Game = class {
}
// Handle alt moves.
if(play.alt) {
if(play.source == 3) {
switch(piece.piece) {
case GAME.Const.PieceId.Knight: {
piece.promoted = false;

31
www/js/interface.js
View File

@ -241,8 +241,13 @@ const INTERFACE = {
// Handle player action.
switch(result) {
case 1: {
let source = INTERFACE_DATA.select.source;
if(source == 0 && INTERFACE_DATA.alt_mode) {
source = 3;
}
let play = new GAME.Play(
INTERFACE_DATA.select.source,
source,
INTERFACE_DATA.select.tile,
INTERFACE_DATA.hover.tile,
INTERFACE_DATA.alt_mode
@ -386,7 +391,7 @@ const INTERFACE = {
let draw_piece = true;
if(INTERFACE_DATA.Animate.play !== null) {
let play = INTERFACE_DATA.Animate.play;
draw_piece = draw_piece && !(play.source == 0 && (play.from == i || play.to == i));
draw_piece = draw_piece && !((play.source == 0 || play.source == 3) && (play.from == i || play.to == i));
draw_piece = draw_piece && !(play.source == 1 && play.to == i);
}
@ -425,7 +430,7 @@ const INTERFACE = {
case 1: ctx.fillStyle = INTERFACE.Color.TileLight; break;
case 2: ctx.fillStyle = INTERFACE.Color.TileDark; break;
}
if(GAME_DATA.turn > 0 && play.source < 2 && (play.to == i || (play.source == 0 && play.from == i))) {
if(GAME_DATA.turn > 0 && (play.source < 2 || play.source == 3) && (play.to == i || ((play.source == 0 || play.source == 3) && play.from == i))) {
ctx.fillStyle = INTERFACE.Color.HintPlay;
} else if(GAME_DATA.state.check != 0 && piece !== null && piece.piece == GAME.Const.PieceId.Source && piece.player == (GAME_DATA.turn & 1)) {
ctx.fillStyle = INTERFACE.Color.HintCheck;
@ -655,7 +660,8 @@ const INTERFACE = {
let from_y = 0;
switch(play.source) {
// Lerp between board positions.
case 0: {
case 0:
case 3: {
let coord_from = HEX.tile_to_hex(play.from);
if((INTERFACE_DATA.player & 1) ^ INTERFACE_DATA.rotate == 1) {
coord_from.x = 8 - coord_from.x;
@ -1100,7 +1106,8 @@ const INTERFACE = {
let valid = true;
switch(play.source) {
case 0: {
case 0:
case 3: {
let piece_id = GAME_DATA.board.tiles[play.from].piece;
let piece = GAME_DATA.board.pieces[piece_id];
valid = piece.player == (GAME_DATA.turn & 1);
@ -1134,7 +1141,7 @@ const INTERFACE = {
// Send action to server for validation.
case INTERFACE.Mode.Player: {
let move_data = play.source | (play.from << 1) | (play.to << 7);
let move_data = play.source | (play.from << 4) | (play.to << 10);
MESSAGE_COMPOSE([
PACK.u16(OpCode.GamePlay),
PACK.u16(0),
@ -1211,8 +1218,11 @@ const INTERFACE = {
let target = null;
while(INTERFACE_DATA.replay_turn < turn) {
play = INTERFACE_DATA.history[INTERFACE_DATA.replay_turn];
if(play.source < 2) {
if(play.source == 0) {
switch(play.source) {
case 0:
case 1:
case 3: {
if(play.source == 0 || play.source == 3) {
let piece_id = GAME_DATA.board.tiles[play.from].piece;
if(piece_id !== null) { piece = GAME_DATA.board.pieces[piece_id].clone(); }
@ -1228,10 +1238,13 @@ const INTERFACE = {
if(piece_id !== null) { piece = GAME_DATA.board.pieces[piece_id].clone(); }
target = null;
}
} else {
} break;
default: {
GAME_DATA.process(play);
play = null;
}
}
INTERFACE_DATA.replay_turn++;
}
if(animate && play !== null) {

11
www/js/scene.js
View File

@ -557,6 +557,17 @@ const SCENES = {
}
},
Extras:class{
constructor() { }
load() {
UI.mainmenu("extras");
UI.mainnav([], []);
history.pushState(null, "Dzura - About", "/extras/");
return true;
}
},
Game:class{
constructor() {
this.game = null;

2
www/js/ui.js
View File

@ -165,7 +165,7 @@ const UI = {
top.push(UI.button(LANG("guide"), () => { LOAD(SCENES.Guide); }, page == "guide"));
top.push(UI.button(LANG("about"), () => { LOAD(SCENES.About); }, page == "about"));
bottom.push(UI.button(LANG("extras"), () => { }));
bottom.push(UI.button(LANG("extras"), () => { LOAD(SCENES.Extras) }, page == "extras"));
if(sessionStorage.getItem("auth") !== null) {
bottom.push(UI.button(LANG("account"), () => { }));

11
www/about/main.md → www/pages/about/main.md
View File

@ -11,6 +11,17 @@ Dzura is a work of [Project Kirisame](https://kirisame.com).
© 2024 Yukiri Corporation
## Guidelines
1. Be polite, respectful, and honorable.
### Bots
1. Bots are generally permitted, provided they abide by these rules.
2. While not manidatory, we prefer that bots be labeled as such (e.g. in their handles).
3. Bots should not initiate games or send challenges.
## User Privacy
This website does not collect any information beyond that used to implement user accounts and gameplay.

0
www/guide/game.md → www/pages/guide/game.md
View File

0
www/guide/interface.md → www/pages/guide/interface.md
View File

0
www/guide/pieces.md → www/pages/guide/pieces.md
View File