diff --git a/game/src/board/mod.rs b/game/src/board/mod.rs index 3815ae0..39bb14e 100644 --- a/game/src/board/mod.rs +++ b/game/src/board/mod.rs @@ -72,11 +72,11 @@ impl Board { (Piece::new(PIECE_KNIGHT, PLAYER_DAWN), Hex::from_hex(1, 0)), (Piece::new(PIECE_KNIGHT, PLAYER_DAWN), Hex::from_hex(7, 3)), - (Piece::new(PIECE_CASTLE, PLAYER_DAWN), Hex::from_hex(2, 0)), - (Piece::new(PIECE_CASTLE, PLAYER_DAWN), Hex::from_hex(6, 2)), + (Piece::new(PIECE_TOWER, PLAYER_DAWN), Hex::from_hex(2, 0)), + (Piece::new(PIECE_TOWER, PLAYER_DAWN), Hex::from_hex(6, 2)), - (Piece::new(PIECE_TOWER, PLAYER_DAWN), Hex::from_hex(3, 0)), - (Piece::new(PIECE_TOWER, PLAYER_DAWN), Hex::from_hex(5, 1)), + (Piece::new(PIECE_CASTLE, PLAYER_DAWN), Hex::from_hex(3, 0)), + (Piece::new(PIECE_CASTLE, PLAYER_DAWN), Hex::from_hex(5, 1)), (Piece::new(PIECE_DRAGON, PLAYER_DAWN), Hex::from_hex(4, 2)), (Piece::new(PIECE_BEHEMOTH, PLAYER_DAWN), Hex::from_hex(4, 1)), diff --git a/www/js/game.js b/www/js/game.js index f96bc86..a44001d 100644 --- a/www/js/game.js +++ b/www/js/game.js @@ -31,11 +31,11 @@ GAME.Board = class { { piece:GAME.Const.PieceId.Knight, hex:new MATH.Vec2(1, 0) }, { piece:GAME.Const.PieceId.Knight, hex:new MATH.Vec2(7, 3) }, - { piece:GAME.Const.PieceId.Castle, hex:new MATH.Vec2(2, 0) }, - { piece:GAME.Const.PieceId.Castle, hex:new MATH.Vec2(6, 2) }, + { piece:GAME.Const.PieceId.Tower, hex:new MATH.Vec2(2, 0) }, + { piece:GAME.Const.PieceId.Tower, hex:new MATH.Vec2(6, 2) }, - { piece:GAME.Const.PieceId.Tower, hex:new MATH.Vec2(3, 0) }, - { piece:GAME.Const.PieceId.Tower, hex:new MATH.Vec2(5, 1) }, + { piece:GAME.Const.PieceId.Castle, hex:new MATH.Vec2(3, 0) }, + { piece:GAME.Const.PieceId.Castle, hex:new MATH.Vec2(5, 1) }, { piece:GAME.Const.PieceId.Dragon, hex:new MATH.Vec2(4, 2) }, { piece:GAME.Const.PieceId.Behemoth, hex:new MATH.Vec2(4, 1) }, diff --git a/www/js/interface.js b/www/js/interface.js index 483619c..f0ae86f 100644 --- a/www/js/interface.js +++ b/www/js/interface.js @@ -759,6 +759,12 @@ const INTERFACE = { } }, + reset() { + GAME.init(); + INTERFACE_DATA.player = 0; + INTERFACE_DATA.rotate = 0; + }, + message(code, data) { switch(code) { case OpCode.GameState: { diff --git a/www/js/scene.js b/www/js/scene.js index 754425e..73472cc 100644 --- a/www/js/scene.js +++ b/www/js/scene.js @@ -541,6 +541,7 @@ const SCENES = { GamePractice:{ load(data) { let buttons_bottom = [ ]; + buttons_bottom.push(UI.button("Reset", () => { INTERFACE.reset(); })); buttons_bottom.push(UI.button("Back", () => { LOAD(SCENES.Browse) })); UI.nav([