diff options
| -rw-r--r-- | src/entities.rs | 19 | ||||
| -rw-r--r-- | src/main.rs | 15 | ||||
| -rw-r--r-- | src/state.rs | 16 | ||||
| -rw-r--r-- | src/tiling.rs | 21 | ||||
| -rw-r--r-- | src/world.rs | 16 |
5 files changed, 53 insertions, 34 deletions
diff --git a/src/entities.rs b/src/entities.rs index 145741c..2d3078c 100644 --- a/src/entities.rs +++ b/src/entities.rs @@ -1,6 +1,6 @@ use std::cmp;
-use crate::world::{Point, Direction};
+use crate::world::{Point};
use crate::tiling::TileType;
pub trait Entity {
@@ -13,12 +13,13 @@ pub struct Character { pub name: String,
pub class: String,
pub health: i32,
+ pub level: i32,
+ pub location: Point,
max_health: i32,
attack: i32,
dodge: i32,
luck: i32,
xp: i32,
- location: Point,
tile_type: TileType
}
@@ -43,6 +44,7 @@ pub trait Player { attack: i32,
dodge: i32,
luck: i32,
+ level: i32,
location: Point
) -> Self;
fn damage(&mut self, damage_amount: i32);
@@ -50,7 +52,6 @@ pub trait Player { fn attack(&self) -> i32;
fn dodge(&self) -> i32;
fn stats(&self) -> String;
- fn walk(&mut self, dir: Direction);
}
impl Entity for Character {
@@ -83,6 +84,7 @@ impl Enemy for Character { attack,
dodge,
luck,
+ level: 0,
xp: 0,
location: location,
tile_type: TileType::Character
@@ -102,6 +104,7 @@ impl Player for Character { attack: i32,
dodge: i32,
luck: i32,
+ level: i32,
location: Point
) -> Character {
Character {
@@ -113,20 +116,12 @@ impl Player for Character { dodge: dodge,
luck: luck,
xp: 0,
+ level: 0,
location: location,
tile_type: TileType::Player
}
}
- fn walk(&mut self, dir: Direction) {
- match dir {
- Direction::North => { (); },
- Direction::South => { (); },
- Direction::East => { (); },
- Direction::West => { (); }
- }
- }
-
fn damage(&mut self, damage_amount: i32) {
self.health = cmp::max(0, self.health - damage_amount);
self.xp += 2;
diff --git a/src/main.rs b/src/main.rs index 12e92c9..11cac4d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,7 +17,7 @@ use pancurses::{ noecho }; use state::State; -use world::Dungeon; +use world::{Dungeon}; fn main() { @@ -31,6 +31,7 @@ fn main() { 10, 10, 20, + 1, (0, 0) ), Dungeon::new(window.get_max_x() as usize, window.get_max_y() as usize, 5), @@ -41,16 +42,17 @@ fn main() { // Dump the whole dungeon structure in terminal for debugging state.debug(); - state.render_level(&window); - window.keypad(true); noecho(); - + loop { // update actors - // update character - window.refresh(); + + state.render_level(&window); + // update character + state.show_character(&window); + // get input and execute it match window.getch() { @@ -63,6 +65,7 @@ fn main() { Some(_) => (), None => (), } + // actors actions (normally attack / interact if on same location as the character) } endwin(); } diff --git a/src/state.rs b/src/state.rs index 20b49d7..6dad58e 100644 --- a/src/state.rs +++ b/src/state.rs @@ -40,6 +40,22 @@ impl State { self.current_level().render(window); } + pub fn show_character(&self, window: &Window) { + self.character.render(window); + + // window.mv(window.get_max_y() - 2, 0); + // window.clrtoeol(); + + // window.refresh(); + + // window.addstr(self.character.info() + "\n"); + + // window.mv(self.character.location.1 as i32,self.character.location.0 as i32); + // window.refresh(); + // draw_block(&window, self.character.tile_type); + // window.refresh(); + } + fn current_level(&self) -> &Level { &self.dungeon.levels[self.level] } diff --git a/src/tiling.rs b/src/tiling.rs index 139af24..3e33de1 100644 --- a/src/tiling.rs +++ b/src/tiling.rs @@ -1,3 +1,8 @@ +extern crate pancurses; + +use pancurses::{Window}; + + pub struct TileGrid { grid: Vec<Vec<TileType>> } @@ -36,6 +41,22 @@ impl<'a> TileGrid { } } +fn tile_to_str(tile: &TileType) -> &str { + match tile { + TileType::Floor => ".", + TileType::Wall => "#", + TileType::Empty => " ", + TileType::StairsDown => ">", + TileType::StairsUp => "<", + TileType::Player => "@", + _ => "?" + } +} + +fn draw_block(window: &Window, block: &TileType) { + window.printw(tile_to_str(block)); +} + pub trait Tileable { fn tile(&self, grid: &mut TileGrid) -> Result<(), String>; } diff --git a/src/world.rs b/src/world.rs index bf8b498..42e4d7c 100644 --- a/src/world.rs +++ b/src/world.rs @@ -194,10 +194,6 @@ impl Dungeon { }
}
- fn draw_block(window: &Window, block: &TileType) {
- window.printw(Dungeon::tile_to_str(block));
- }
-
fn debug_level(level: &Level) {
let grid = level.to_tilegrid().unwrap();
@@ -208,18 +204,6 @@ impl Dungeon { print!("\n");
}
}
-
- fn tile_to_str(tile: &TileType) -> &str {
- match tile {
- TileType::Floor => ".",
- TileType::Wall => "#",
- TileType::Empty => " ",
- TileType::StairsDown => ">",
- TileType::StairsUp => "<",
- TileType::Player => "@",
- _ => "?"
- }
- }
}
impl Generatable for Dungeon {
|