From 17690e434ef807ab2eb04a1ad8f20ec43b37535a Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Tue, 11 Dec 2018 13:50:46 +1100
Subject: [PATCH] stats nerfed a bit

---
 server/src/cryp.rs | 21 ++++++++++++++-------
 server/src/game.rs | 10 +++++-----
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/server/src/cryp.rs b/server/src/cryp.rs
index c9167766..375c7a96 100644
--- a/server/src/cryp.rs
+++ b/server/src/cryp.rs
@@ -154,21 +154,28 @@ impl Cryp {
 
     pub fn create(mut self) -> Cryp {
         let mut rng = thread_rng();
-        let max = match self.lvl == 64 {
-            true => u64::max_value(),
+        let stam_max = 2_u64.pow(self.lvl.into());
+
+        let stam_min = match self.lvl == 1 {
+            true => 2_u64,
             false => 2_u64.pow(self.lvl.saturating_sub(1).into()),
         };
 
-        let min = match self.lvl == 1 {
+        let other_max = match self.lvl == 1 {
+            true => 2_u64,
+            false => 2_u64.pow(self.lvl.saturating_sub(1).into()),
+        };
+
+        let other_min = match self.lvl == 1 {
             true => 2_u64,
             false => 2_u64.pow(self.lvl.saturating_sub(2).into()),
         };
 
-        self.xp = max;
+        self.xp = stam_max;
 
-        self.phys_dmg.set(rng.gen_range(min, max));
-        self.spell_dmg.set(rng.gen_range(min, max));
-        self.stamina.set(rng.gen_range(min, max));
+        self.phys_dmg.set(rng.gen_range(other_min, other_max));
+        self.spell_dmg.set(rng.gen_range(other_min, other_max));
+        self.stamina.set(rng.gen_range(stam_min, stam_max));
         self.hp.set(self.stamina.base);
 
         self
diff --git a/server/src/game.rs b/server/src/game.rs
index e1a2c939..902e5c45 100644
--- a/server/src/game.rs
+++ b/server/src/game.rs
@@ -690,14 +690,14 @@ fn generate_mob(lvl: u8) -> Cryp {
     let mut rng = thread_rng();
 
     // rng panics on min == max
-    let mob_lvl: u8 = match lvl {
-      1 => 1,
-      _ => rng.gen_range(lvl.saturating_sub(2), lvl)
-    };
+    // let mob_lvl: u8 = match lvl {
+    //   1 => 1,
+    //   _ => rng.gen_range(lvl.saturating_sub(2), lvl)
+    // };
 
     return Cryp::new()
         .named(&"bamboo basher".to_string())
-        .level(mob_lvl)
+        .level(lvl)
         .create();
 
 }