Add buy max commands

Tweak the incrementing rate.
Update UI for buy max.

Author: geno

src/commands.rs

@@ -121,6 +121,12 @@ pub fn read_inputs(
         // Purchase notification updates
         for (k, p) in upgrades.iter() {
             let t: DateTime<Local> = Local::now();
+
+            // Skip if nothing was purchased
+            if p.cost == 0 {
+                continue;
+            }
+
             match k {
                 PurchaseType::Boost => msg.insert(
                     0,
@@ -174,6 +180,12 @@ pub fn boost_cost(cps: u64) -> u64 {
     1u64.checked_shl(v).unwrap_or(0)
 }
 
+pub fn boost_max_cost(cps: u64, boost: u64) -> u64 {
+    let cost = boost_cost(cps);
+    let left = (u16::MAX as u64 - boost) / 128;
+    cost * left
+}
+
 fn buy_boost(
     connection: &mut Connection,
     wallet: &mut Wallet,
@@ -184,7 +196,7 @@ fn buy_boost(
             "You need at least 1024 Cps to be able to purchase boost\n",
         ));
     }
-    if connection.miner.boost > u16::MAX as u64 {
+    if connection.miner.boost >= u16::MAX as u64 - 128 {
         return Err(Error::new(
             ErrorKind::InvalidData,
             "You cannot purchase any more boost right now\n",
@@ -199,6 +211,9 @@ fn buy_boost(
     }
     let bought: usize = 128;
     connection.miner.boost = connection.miner.boost.saturating_add(bought as u64);
+    if connection.miner.boost > u16::MAX as u64 {
+        connection.miner.boost = u16::MAX as u64;
+    }
 
     Ok((
         PurchaseType::Boost,
@@ -233,6 +248,20 @@ pub fn miner_cost(max_miners: u64) -> u64 {
     }
 }
 
+pub fn miner_max_cost(max_miners: u64) -> u128 {
+    let mut max = max_miners;
+    let mut cost = 0u128;
+    loop {
+        if max <= ABS_MAX_MINERS {
+            cost += miner_cost(max) as u128;
+            max += 1;
+        } else {
+            break;
+        }
+    }
+    cost
+}
+
 fn buy_miner(mut wallet: &mut Wallet) -> Result<(PurchaseType, Purchase), Error> {
     if wallet.max_miners >= ABS_MAX_MINERS {
         return Err(Error::new(
@@ -276,6 +305,10 @@ pub fn time_cost() -> u64 {
     1000
 }
 
+pub fn time_max_cost(chrono: u64) -> u64 {
+    (chrono / 1000) * 1000
+}
+
 fn buy_time(
     connection: &mut Connection,
     wallet: &mut Wallet,
@@ -287,8 +320,7 @@ fn buy_time(
         ));
     }
 
-    let bought = 60 * 60;
-    let mut c = bought;
+    let mut c = 60 * 60;
     loop {
         miner_session(&mut connection.miner);
         c -= 1;
@@ -300,7 +332,7 @@ fn buy_time(
     Ok((
         PurchaseType::Chrono,
         Purchase {
-            bought,
+            bought: 1,
             cost: time_cost() as u128,
         },
     ))

src/main.rs

@@ -395,8 +395,11 @@ fn print_wallets(
                     if c.miner.cps > 1024 {
                         c.purchases.push(
                             format!(
-                                "'b'<enter>\tPurchase 128 seconds of Miner Boost for {} idlecoin\n",
-                                commands::boost_cost(c.miner.cps)
+                                "{}b{}: Purchase 128 seconds of Miner Boost for {} idlecoin / {}B{}: Purchase Max for {} idlecoin\n",
+                                RED, RST,
+                                commands::boost_cost(c.miner.cps),
+                                RED, RST,
+                                commands::boost_max_cost(c.miner.cps, c.miner.boost),
                             )
                             .to_string(),
                         );
@@ -405,13 +408,13 @@ fn print_wallets(
                     if g.max_miners < ABS_MAX_MINERS && (g.idlecoin > miner_cost || g.supercoin > 1)
                     {
                         c.purchases.push(format!(
-                            "'m'<enter>\tPurchase 1 Miner License for {} idlecoin\n",
-                            miner_cost
+                            "{}m{}: Purchase 1 Miner License for {} idlecoin\n",
+                            RED, RST, miner_cost
                         ));
                     }
                 }
                 if g.chronocoin > commands::time_cost() {
-                    c.purchases.push(format!("'c'<enter>\tPurchase 60m of time travel for this miner for {} chronocoins\n", commands::time_cost()));
+                    c.purchases.push(format!("{}c{}: Purchase 1 hour of time travel for this miner for {} chronocoin / {}C{}: Purchase Max for {} chronocoin\n", RED, RST,commands::time_cost(), RED, RST,commands::time_max_cost(g.chronocoin)));
                 }
 
                 // Build miner display

src/miner.rs

@@ -166,11 +166,11 @@ pub fn miner_session(mut miner: &mut Miner) {
     }
 
     // Increment cps
-    let increase = if miner.boost > 0 {
+    miner.inc = if miner.boost > 0 {
         miner.boost -= 1;
-        (miner.inc + miner.level) * 3
+        miner.inc.saturating_add(miner.level * 3)
     } else {
-        miner.inc + miner.level
+        miner.inc.saturating_add(miner.level)
     };
-    miner.cps = miner.cps.saturating_add(increase);
+    miner.cps = miner.cps.saturating_add(miner.inc);
 }