src/main.rs

@@ -7,7 +7,9 @@ use idmangler_lib::{
     StartData, TypeData,
 };
 
+use serde_json;
 use std::collections::HashMap;
+use std::env;
 use std::fs;
 use std::panic;
 use std::string::ToString;
@@ -101,11 +103,15 @@ fn main() {
     let mut powdervec = Vec::new();
     for eachpowder in json_config.powders {
         let powdertier = eachpowder.tier; // get the powder tier
-        let powderamount: u8 = eachpowder.amount.unwrap_or_else(|| 1);
+        let powderamount: u8 = match eachpowder.amount {
+            // get amount of powder if exists, otherwise 1
+            Some(amount) => amount, // good,
+            None => 1,              // bad,
+        };
         // match for the powder type
         // no need to return to variable or i'll need to rematch AGAIN
-        match eachpowder.r#type.to_ascii_lowercase() {
-            'e' => {
+        match eachpowder.r#type {
+            'E' | 'e' => {
                 for _i in 0..powderamount {
                     powdervec.push((Powders::EARTH, powdertier))
                 }
@@ -113,7 +119,7 @@ fn main() {
                     println!("Powder type: Earth");
                 }
             }
-            't' => {
+            'T' | 't' => {
                 for _i in 0..powderamount {
                     powdervec.push((Powders::THUNDER, powdertier))
                 }
@@ -121,7 +127,7 @@ fn main() {
                     println!("Powder type: Thunder");
                 }
             }
-            'w' => {
+            'W' | 'w' => {
                 for _i in 0..powderamount {
                     powdervec.push((Powders::WATER, powdertier))
                 }
@@ -129,7 +135,7 @@ fn main() {
                     println!("Powder type: Water");
                 }
             }
-            'f' => {
+            'F' | 'f' => {
                 for _i in 0..powderamount {
                     powdervec.push((Powders::FIRE, powdertier))
                 }
@@ -137,7 +143,7 @@ fn main() {
                     println!("Powder type: Fire");
                 }
             }
-            'a' => {
+            'A' | 'a' => {
                 for _i in 0..powderamount {
                     powdervec.push((Powders::AIR, powdertier))
                 }
@@ -188,7 +194,6 @@ fn main() {
     if let Some(shiny) = json_config.shiny {
         if let ref shinykey = shiny.key {
             if let shinyvalue = shiny.value {
-
                 realshinykey = 1;
                 for i in json_shiny {
                     if i.key == shiny.key {
@@ -210,7 +215,6 @@ fn main() {
                 }
                 .encode(ver, &mut out)
                 .unwrap();
-
             }
         }
     }