|
@ -36,13 +36,7 @@ pub fn make_grid(ctx: &mut Context, r: u8, c: u8, board: &[Vec<u8>]) -> GameResu |
|
|
0 => Color::WHITE, |
|
|
0 => Color::WHITE, |
|
|
1 => Color::BLACK, |
|
|
1 => Color::BLACK, |
|
|
_ => Color::BLACK, //impossible
|
|
|
_ => Color::BLACK, //impossible
|
|
|
/* 2 => Color::RED,
|
|
|
//2 => Color::RED, 3 => Color::CYAN, 4 => Color::YELLOW, 5 => Color::GREEN, 6 => Color::BLUE, 7 => Color::MAGENTA, _ => Color::BLACK,
|
|
|
3 => Color::CYAN, |
|
|
|
|
|
4 => Color::YELLOW, |
|
|
|
|
|
5 => Color::GREEN, |
|
|
|
|
|
6 => Color::BLUE, |
|
|
|
|
|
7 => Color::MAGENTA, |
|
|
|
|
|
_ => Color::BLACK,*/ |
|
|
|
|
|
}, |
|
|
}, |
|
|
)?; |
|
|
)?; |
|
|
} |
|
|
} |
|
@ -60,17 +54,26 @@ impl Apr { |
|
|
board: board, |
|
|
board: board, |
|
|
should_update_grid: false, |
|
|
should_update_grid: false, |
|
|
|
|
|
|
|
|
actors: vec![actor::Actor { |
|
|
/*actors: vec![actor::Actor {
|
|
|
image: graphics::Image::new(_ctx, "/pawn.png")?, |
|
|
image: graphics::Image::new(_ctx, "/pawn.png")?, |
|
|
posn: actor::ActorPosn::BoardPosn { x: 0, y: 0 }, |
|
|
posn: actor::ActorPosn::BoardPosn { x: 0, y: 0 }, |
|
|
behaviour: 0, |
|
|
behaviour: 0, |
|
|
}], |
|
|
}],*/ |
|
|
|
|
|
actors: vec![Apr::make_actor(_ctx, "/pawn.png", 0, 0, 0)], |
|
|
behaviours: vec![behaviour::Behaviour { |
|
|
behaviours: vec![behaviour::Behaviour { |
|
|
moves: vec![(0, 1)], |
|
|
moves: vec![(0, 1)], |
|
|
}], //the pawn can go ONE forwards
|
|
|
}], //the pawn can go ONE forwards
|
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
pub fn make_actor(ctx: &mut Context, img_path: &str, _x: u8, _y: u8, b: u8) -> actor::Actor { |
|
|
|
|
|
return actor::Actor {
|
|
|
|
|
|
image: graphics::Image::new(ctx, img_path).unwrap(), |
|
|
|
|
|
posn: actor::ActorPosn::BoardPosn { x: _x, y: _y }, |
|
|
|
|
|
behaviour: b, |
|
|
|
|
|
}; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
pub fn set_colour(&mut self, r: usize, c: usize, col: u8) { |
|
|
pub fn set_colour(&mut self, r: usize, c: usize, col: u8) { |
|
|
//You should only modify self.board through this method.
|
|
|
//You should only modify self.board through this method.
|
|
|
self.board.board[r][c] = col; //Making a getter for self.board would sadly break borrowing in the same way that closest_square_coords does.
|
|
|
self.board.board[r][c] = col; //Making a getter for self.board would sadly break borrowing in the same way that closest_square_coords does.
|
|
|