omg so much has changed idk

crates/guardian_commands/src/call.rs

@@ -83,6 +83,35 @@ pub enum Squadron {
     Wild,
     Ninja,
     Jedi,
+    Hawg,
+    Boar,
+    Pig,
+    Tusk,
+    ArmyAir,
+    Apache,
+    Crow,
+    Chaos,
+    Sioux,
+    Gatling,
+    Gunslinger,
+    Hammerhead,
+    Bootleg,
+    Palehorse,
+    Carnivore,
+    Saber,
+    Hornet,
+    Squid,
+    Ragin,
+    Roman,
+    Sting,
+    Jury,
+    Joker,
+    Ram,
+    Hawk,
+    Devil,
+    Check,
+    Snake,
+    Custom(String),
 }
 
 impl ToString for Squadron {
@@ -95,6 +124,7 @@ impl ToString for Squadron {
             Squadron::Dodge => "Dodge".to_string(),
             Squadron::Ford => "Ford".to_string(),
             Squadron::Chevy => "Chevy".to_string(),
+            Squadron::Hornet => "Hornet".to_string(),
             Squadron::Pontiac => "Pontiac".to_string(),
             Squadron::Viper => "Viper".to_string(),
             Squadron::Venom => "Venom".to_string(),
@@ -108,6 +138,34 @@ impl ToString for Squadron {
             Squadron::Wild => "Wild".to_string(),
             Squadron::Ninja => "Ninja".to_string(),
             Squadron::Jedi => "Jedi".to_string(),
+            Squadron::Hawg => "Hawg".to_string(),
+            Squadron::Boar => "Boar".to_string(),
+            Squadron::Pig => "Pig".to_string(),
+            Squadron::Tusk => "Tusk".to_string(),
+            Squadron::ArmyAir => "ArmyAir".to_string(),
+            Squadron::Apache => "Apache".to_string(),
+            Squadron::Crow => "Crow".to_string(),
+            Squadron::Chaos => "Chaos".to_string(),
+            Squadron::Sioux => "Sioux".to_string(),
+            Squadron::Gatling => "Gatling".to_string(),
+            Squadron::Gunslinger => "Gunslinger".to_string(),
+            Squadron::Hammerhead => "Hammerhead".to_string(),
+            Squadron::Bootleg => "Bootleg".to_string(),
+            Squadron::Palehorse => "Palehorse".to_string(),
+            Squadron::Carnivore => "Carnivore".to_string(),
+            Squadron::Saber => "Saber".to_string(),
+            Squadron::Squid => "Squid".to_string(),
+            Squadron::Ragin => "Ragin".to_string(),
+            Squadron::Roman => "Roman".to_string(),
+            Squadron::Sting => "Sting".to_string(),
+            Squadron::Jury => "Jury".to_string(),
+            Squadron::Joker => "Joker".to_string(),
+            Squadron::Ram => "Ram".to_string(),
+            Squadron::Hawk => "Hawk".to_string(),
+            Squadron::Devil => "Devil".to_string(),
+            Squadron::Check => "Check".to_string(),
+            Squadron::Snake => "Snake".to_string(),
+            Squadron::Custom(c) => c.to_string(),
         }
     }
 }
@@ -124,6 +182,7 @@ impl std::str::FromStr for Squadron {
             "Dodge" => Ok(Squadron::Dodge),
             "Ford" => Ok(Squadron::Ford),
             "Chevy" => Ok(Squadron::Chevy),
+            "Hornet" => Ok(Squadron::Hornet),
             "Pontiac" => Ok(Squadron::Pontiac),
             "Viper" => Ok(Squadron::Viper),
             "Venom" => Ok(Squadron::Venom),
@@ -137,7 +196,34 @@ impl std::str::FromStr for Squadron {
             "Wild" => Ok(Squadron::Wild),
             "Ninja" => Ok(Squadron::Ninja),
             "Jedi" => Ok(Squadron::Jedi),
-            _ => Err("Invalid squadron".into()),
+            "Hawg" => Ok(Squadron::Hawg),
+            "Boar" => Ok(Squadron::Boar),
+            "Pig" => Ok(Squadron::Pig),
+            "Tusk" => Ok(Squadron::Tusk),
+            "ArmyAir" => Ok(Squadron::ArmyAir),
+            "Apache" => Ok(Squadron::Apache),
+            "Crow" => Ok(Squadron::Crow),
+            "Chaos" => Ok(Squadron::Chaos),
+            "Sioux" => Ok(Squadron::Sioux),
+            "Gatling" => Ok(Squadron::Gatling),
+            "Gunslinger" => Ok(Squadron::Gunslinger),
+            "Hammerhead" => Ok(Squadron::Hammerhead),
+            "Bootleg" => Ok(Squadron::Bootleg),
+            "Palehorse" => Ok(Squadron::Palehorse),
+            "Carnivore" => Ok(Squadron::Carnivore),
+            "Saber" => Ok(Squadron::Saber),
+            "Squid" => Ok(Squadron::Squid),
+            "Ragin" => Ok(Squadron::Ragin),
+            "Roman" => Ok(Squadron::Roman),
+            "Sting" => Ok(Squadron::Sting),
+            "Jury" => Ok(Squadron::Jury),
+            "Joker" => Ok(Squadron::Joker),
+            "Ram" => Ok(Squadron::Ram),
+            "Hawk" => Ok(Squadron::Hawk),
+            "Devil" => Ok(Squadron::Devil),
+            "Check" => Ok(Squadron::Check),
+            "Snake" => Ok(Squadron::Snake),
+            c => Ok(Squadron::Custom(c.to_string())),
         }
     }
 }
@@ -225,6 +311,7 @@ fn parse_element(input: &str) -> IResult<&str, Element> {
         "dodge" => Squadron::Dodge,
         "ford" => Squadron::Ford,
         "chevy" => Squadron::Chevy,
+        "hornet" => Squadron::Hornet,
         "pontiac" => Squadron::Pontiac,
         "viper" => Squadron::Viper,
         "venom" => Squadron::Venom,
@@ -238,13 +325,41 @@ fn parse_element(input: &str) -> IResult<&str, Element> {
         "wild" => Squadron::Wild,
         "ninja" => Squadron::Ninja,
         "jedi" => Squadron::Jedi,
-        _ => {
-            return Err(NomError::Error(nom::error::Error {
-                input: squadron_str,
-                code: ErrorKind::Alpha,
-            }))
-        }
+        "hawg" => Squadron::Hawg,
+        "boar" => Squadron::Boar,
+        "pig" => Squadron::Pig,
+        "tusk" => Squadron::Tusk,
+        "armyair" => Squadron::ArmyAir,
+        "apache" => Squadron::Apache,
+        "crow" => Squadron::Crow,
+        "chaos" => Squadron::Chaos,
+        "sioux" => Squadron::Sioux,
+        "gatling" => Squadron::Gatling,
+        "gunslinger" => Squadron::Gunslinger,
+        "hammerhead" => Squadron::Hammerhead,
+        "bootleg" => Squadron::Bootleg,
+        "palehorse" => Squadron::Palehorse,
+        "carnivore" => Squadron::Carnivore,
+        "saber" => Squadron::Saber,
+        "squid" => Squadron::Squid,
+        "ragin" => Squadron::Ragin,
+        "roman" => Squadron::Roman,
+        "sting" => Squadron::Sting,
+        "jury" => Squadron::Jury,
+        "joker" => Squadron::Joker,
+        "ram" => Squadron::Ram,
+        "hawk" => Squadron::Hawk,
+        "devil" => Squadron::Devil,
+        "check" => Squadron::Check,
+        "snake" => Squadron::Snake,
+        c => Squadron::Custom(c.to_string()),
     };
+    // _ => {
+    //     return Err(NomError::Error(nom::error::Error {
+    //         input: squadron_str,
+    //         code: ErrorKind::Alpha,
+    //     }))
+    // }
 
     let group = group_str.unwrap_or((None, 0, None)).1;
     let unit = unit_str.unwrap_or((None, 0, None)).1;

crates/guardian_commands/src/console.rs

@@ -8,7 +8,7 @@ use bevy::{
         system::{ResMut, Resource, SystemMeta, SystemParam},
         world::{unsafe_world_cell::UnsafeWorldCell, World},
     },
-    log::{debug, warn},
+    log::warn,
 };
 // use bevy::{input::keyboard::KeyboardInput, prelude::*};
 // use bevy_egui::egui::{self, Align, ScrollArea, TextEdit};
@@ -118,8 +118,6 @@ unsafe impl<T: Command> SystemParam for ConsoleCommand<T> {
                     let clap_command = T::command().no_binary_name(true);
                     let arg_matches = clap_command.try_get_matches_from(command.args.iter());
 
-                    debug!("Trying to parse as `{}`.", command.command_name);
-
                     match arg_matches {
                         Ok(matches) => match T::from_arg_matches(&matches) {
                             Ok(from_arg_matches) => {