From b7e5273627c1b6db9faf8e29e2445bdbba802453 Mon Sep 17 00:00:00 2001
From: Justin Worthe <justin@worthe-it.co.za>
Date: Wed, 26 Jun 2019 20:31:04 +0200
Subject: Passing bomb count through from the json

---
 src/game/player.rs | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'src/game/player.rs')

diff --git a/src/game/player.rs b/src/game/player.rs
index 32e45bf..38d78d0 100644
--- a/src/game/player.rs
+++ b/src/game/player.rs
@@ -16,6 +16,7 @@ pub struct Worm {
     pub position: Point2d<i8>,
     pub weapon_damage: i32,
     pub weapon_range: u8,
+    pub bombs: u8
 }
 
 impl Player {
@@ -94,21 +95,24 @@ mod test {
             health: 50,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         worms.push(Worm {
             id: 2,
             health: 10,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         worms.push(Worm {
             id: 3,
             health: -2,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         let mut player = Player {
             active_worm: 1,
@@ -134,21 +138,24 @@ mod test {
             health: 0,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         worms.push(Worm {
             id: 2,
             health: 10,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         worms.push(Worm {
             id: 3,
             health: 2,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         let mut player = Player {
             active_worm: 1,
@@ -174,27 +181,30 @@ mod test {
             health: 0,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         worms.push(Worm {
             id: 2,
             health: 10,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         worms.push(Worm {
             id: 3,
             health: 2,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         let mut player = Player {
             active_worm: 0,
             moves_score: 0,
             worms,
-            select_moves: 0,
+            select_moves: 0
         };
 
         player.clear_dead_worms();
@@ -214,7 +224,8 @@ mod test {
             health: -10,
             position: Point2d::new(0, 0),
             weapon_damage: 5,
-            weapon_range: 5
+            weapon_range: 5,
+            bombs: 0
         });
         let mut player = Player {
             active_worm: 0,
-- 
cgit v1.2.3