reworked level widget to stateful widget

This commit is contained in:
2023-12-09 20:11:02 +01:00
parent 6e2441aad1
commit 206a49fb08
3 changed files with 161 additions and 185 deletions

View File

@@ -1,5 +1,7 @@
use crate::level::Level;
use crate::artifacts::Artifact;
use crate::level::{Level, StructureElement};
use crate::level_generator::LevelGenerator;
use crate::monster::Monster;
use crate::player::Player;
use crate::position::Position;
@@ -20,11 +22,12 @@ impl Game {
player: p,
levels: v,
};
let mut start = (0,0);
let mut start = (0, 0);
{
start = g.get_level(0).start;
}
g.get_mutable_player().get_position().set(0,start.0, start.1);
g.get_mutable_player().get_position().set(0, start.0, start.1);
g.get_mutable_level(0).discover(&Position::new(0, start.0, start.1));
g
}
@@ -36,6 +39,77 @@ impl Game {
}
pub fn get_level(&self, level: usize) -> &Level { &self.levels[level] }
pub fn get_mutable_level(&mut self, level: usize) -> &mut Level { &mut self.levels[level] }
fn can_move(&mut self, dx: i16, dy: i16) -> bool {
let player_pos = &self.player.get_position();
let new_x: i16 = player_pos.get_x() as i16 + dx;
let new_y: i16 = player_pos.get_y() as i16 + dy;
let level = &mut self.levels[player_pos.get_level()];
match level.get_element(new_x, new_y) {
(None, _, _) => { return false; }
(Some(t), _, _) => {
match t {
StructureElement::Wall => { return false; }
_ => {}
}
}
};
true
}
fn next_start(&self) -> (usize, usize, usize) {
let level = self.player.get_immutable_position().get_level() + 1;
let (x, y) = self.levels[level].start;
(level, x, y)
}
fn next_element(&mut self, dx: i16, dy: i16) -> (Option<StructureElement>, Option<&mut Monster>, Option<&mut Box<(dyn Artifact + 'static)>>) {
let player_pos = &self.player.get_position();
let new_x: i16 = player_pos.get_x() as i16 + dx;
let new_y: i16 = player_pos.get_y() as i16 + dy;
let player_level = player_pos.get_level();
let level = &mut self.levels[player_level];
level.get_element(new_x, new_y)
}
pub fn move_player(&mut self, dx: i16, dy: i16) {
// verify the player can do the move
if !self.can_move(dx, dy) {
return;
}
// // let player_pos = &self.player.get_position();
// // let new_x: i16 = player_pos.get_x() as i16 + dx;
// // let new_y: i16 = player_pos.get_y() as i16 + dy;
// // let player_level = player_pos.get_level();
// // let level = &mut self.levels[player_level];
// let element = self.next_element(dx, dy);
//
// // use stairs if walked onto one
// match element {
// (Some(e), _, _) => {
// match e {
// StructureElement::StairDown => {
// let (next_level, x, y) = self.next_start();
// self.get_mutable_player().get_position().set(next_level, x, y);
// self.levels[next_level].discover(self.player.get_position());
// }
// StructureElement::StairUp => {}
// _ => {}
// }
// }
// (_, _, _) => {}
// }
//
// // interact with monsters / artifacts
// match element {
// (_, _, Some(a)) => {
// // a.collect(&mut self.player);
// // level.remove_artifact(&Position::new(player_level, new_x as usize, new_y as usize)).expect("Could not collect artifact");
// }
// (_, _, _) => {}
// }
// update position and discover area on new position
let (new_x, new_y) = self.get_mutable_player().get_position().change(dx, dy);
self.get_mutable_level(0).discover(&Position::new(0, new_x, new_y));
}
}
#[test]