From d84906ec92e45ed2cf2611c2f646d72ef5f1bb64 Mon Sep 17 00:00:00 2001
From: Iago Garrido <iago086@gmail.com>
Date: Tue, 12 Nov 2019 14:28:58 +0100
Subject: add state

---
 src/character.rs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'src/character.rs')

diff --git a/src/character.rs b/src/character.rs
index 3e6c4a7..ded4fa4 100644
--- a/src/character.rs
+++ b/src/character.rs
@@ -11,6 +11,7 @@ pub struct Character {
     dodge: i32,
     luck: i32,
     xp: i32,
+    gold: i32,
     location: Point
 }
 
@@ -22,7 +23,6 @@ pub trait Player {
         attack: i32,
         dodge: i32,
         luck: i32,
-        location: Point
     ) -> Character;
 
     fn place(&mut self, location: Point);
@@ -42,6 +42,8 @@ pub trait Player {
     fn stats(&self) -> String;
 
     fn walk(&mut self, dir: Direction);
+
+    fn get_gold(&self) -> i32;
 }
 
 pub enum Direction {
@@ -59,7 +61,6 @@ impl Player for Character {
         attack: i32,
         dodge: i32,
         luck: i32,
-        location: Point
     ) -> Character {
         Character {
             name: name,
@@ -70,7 +71,8 @@ impl Player for Character {
             dodge: dodge,
             luck: luck,
             xp: 0,
-            location: location
+            gold: 0,
+            location: (0, 0),
         }
     }
 
@@ -86,7 +88,6 @@ impl Player for Character {
             self.attack,
             self.dodge,
             self.luck + player_luck,
-            (0,0)
         )
     }
 
@@ -128,10 +129,14 @@ impl Player for Character {
 
     fn stats(&self) -> String {
         format!(
-            "{} - hp: {} attack: {} dodge: {} luck: {} experience: {}",
-            self.class, self.health, self.attack, self.dodge, self.luck, self.xp
+            "{} - hp: {}/{} attack: {} dodge: {} luck: {} experience: {} gold: {}",
+            self.class, self.health, self.max_health, self.attack, self.dodge, self.luck, self.xp, self.gold
         )
     }
+
+    fn get_gold(&self) -> i32 {
+        self.gold
+    }
 }
 
 #[cfg(test)]
@@ -139,7 +144,7 @@ mod tests {
     use super::*;
 
     fn test_attack() {
-        let player = Character::new("".to_string(), "Rogue".to_string(), 1, 4, 1, 4, (0,0));
+        let player = Character::new("".to_string(), "Rogue".to_string(), 1, 4, 1, 4);
 
         assert_eq!(player.attack(), 6);
     }
-- 
cgit v1.2.3