diff options
Diffstat (limited to 'src/entities.rs')
| -rw-r--r-- | src/entities.rs | 39 |
1 files changed, 13 insertions, 26 deletions
diff --git a/src/entities.rs b/src/entities.rs index a01d86a..50841ab 100644 --- a/src/entities.rs +++ b/src/entities.rs @@ -7,6 +7,8 @@ use crate::tiling::TileType; pub trait Entity {
fn info(&self) -> String;
fn place(&mut self, location: Point);
+ fn get_tiletype(&self) -> &TileType;
+ fn get_location(&self) -> &Point;
}
#[derive(Clone)]
@@ -24,10 +26,6 @@ pub struct Character { tile_type: TileType
}
-pub trait Render {
- fn render(&self, window: &Window);
-}
-
pub trait Enemy {
fn new(
class: String,
@@ -49,8 +47,7 @@ pub trait Player { attack: i32,
dodge: i32,
luck: i32,
- level: i32,
- location: Point
+ level: i32
) -> Self;
fn damage(&mut self, damage_amount: i32);
fn heal(&mut self, heal_amount: i32);
@@ -59,23 +56,6 @@ pub trait Player { fn stats(&self) -> String;
}
-impl Render for Character {
- fn render(&self, window: &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();
-
- }
-}
-
impl Entity for Character {
fn place(&mut self, location: Point) {
self.location = location;
@@ -87,6 +67,14 @@ impl Entity for Character { self.class, self.health, self.attack, self.dodge, self.luck
)
}
+
+ fn get_tiletype(&self) -> &TileType {
+ &self.tile_type
+ }
+
+ fn get_location(&self) -> &Point {
+ &self.location
+ }
}
impl Enemy for Character {
@@ -126,8 +114,7 @@ impl Player for Character { attack: i32,
dodge: i32,
luck: i32,
- level: i32,
- location: Point
+ level: i32
) -> Character {
Character {
name: name,
@@ -139,7 +126,7 @@ impl Player for Character { luck: luck,
xp: 0,
level: 0,
- location: location,
+ location: (0, 0),
tile_type: TileType::Player
}
}
|