diff options
Diffstat (limited to 'src/entities.rs')
| -rw-r--r-- | src/entities.rs | 19 |
1 files changed, 7 insertions, 12 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;
|