diff --git a/src/bot/commands/lobby.rs b/src/bot/commands/lobby.rs index d324459..3762a8f 100644 --- a/src/bot/commands/lobby.rs +++ b/src/bot/commands/lobby.rs @@ -267,8 +267,8 @@ impl LobbyCommand { .collect::>(); let slots = vec![ Role::Tank, - Role::DPS, - Role::DPS, + Role::Dps, + Role::Dps, Role::Support, Role::Support, ]; diff --git a/src/bot/commands/settings.rs b/src/bot/commands/settings.rs index e860594..e484b0e 100644 --- a/src/bot/commands/settings.rs +++ b/src/bot/commands/settings.rs @@ -79,8 +79,8 @@ impl SettingsCommand { let roles: HashMap<_, _, RandomState> = HashMap::from_iter( [ ("support", Role::Support), - ("damage", Role::DPS), - ("dps", Role::DPS), + ("damage", Role::Dps), + ("dps", Role::Dps), ("tank", Role::Tank), ] .into_iter(), diff --git a/src/database/models/role.rs b/src/database/models/role.rs index 9cf6552..ba2c043 100644 --- a/src/database/models/role.rs +++ b/src/database/models/role.rs @@ -6,7 +6,7 @@ pub enum Role { #[sea_orm(string_value = "tank")] Tank, #[sea_orm(string_value = "dps")] - DPS, + Dps, #[sea_orm(string_value = "support")] Support, } @@ -15,7 +15,7 @@ impl From for String { fn from(role: Role) -> Self { match role { Role::Tank => "tank".to_string(), - Role::DPS => "dps".to_string(), + Role::Dps => "dps".to_string(), Role::Support => "support".to_string(), } } @@ -27,7 +27,7 @@ impl TryFrom<&str> for Role { fn try_from(role: &str) -> Result { match role { "tank" => Ok(Role::Tank), - "dps" => Ok(Role::DPS), + "dps" => Ok(Role::Dps), "support" => Ok(Role::Support), _ => Err(()), } @@ -38,7 +38,7 @@ impl From for i32 { fn from(role: Role) -> Self { match role { Role::Tank => 0, - Role::DPS => 1, + Role::Dps => 1, Role::Support => 2, } } diff --git a/src/database/queries/player.rs b/src/database/queries/player.rs index 79a9cb9..7460779 100644 --- a/src/database/queries/player.rs +++ b/src/database/queries/player.rs @@ -73,7 +73,7 @@ impl Query { player.tank_rd = Set(rating.rd); player.tank_volatility = Set(rating.volatility); } - Role::DPS => { + Role::Dps => { player.dps_rating = Set(rating.value); player.dps_rd = Set(rating.rd); player.dps_volatility = Set(rating.volatility); diff --git a/src/mixer/mixer.rs b/src/mixer/mixer.rs index 75b13a9..77cbc28 100644 --- a/src/mixer/mixer.rs +++ b/src/mixer/mixer.rs @@ -30,7 +30,7 @@ fn get_role_entries( let (tanks, rest) = entries .into_iter() .partition::, _>(|e| e.role == Role::Tank); - let (dps, supports) = rest.into_iter().partition(|e| e.role == Role::DPS); + let (dps, supports) = rest.into_iter().partition(|e| e.role == Role::Dps); (tanks, dps, supports) } @@ -55,7 +55,7 @@ pub fn mix_players(players: &[Player], slots: Vec) -> Option<(Team, Team)> let tank_count = slots.iter().filter(|r| **r == Role::Tank).count(); let support_count = slots.iter().filter(|r| **r == Role::Support).count(); - let dps_count = slots.iter().filter(|r| **r == Role::DPS).count(); + let dps_count = slots.iter().filter(|r| **r == Role::Dps).count(); let tank_combos = get_combinations(&tanks, tank_count); let dps_combos = get_combinations(&dps, dps_count); diff --git a/src/mixer/player.rs b/src/mixer/player.rs index ba98a8c..d4caaf3 100644 --- a/src/mixer/player.rs +++ b/src/mixer/player.rs @@ -36,7 +36,7 @@ impl Player { Rating::new(model.tank_rating, model.tank_rd, model.tank_volatility), ), ( - Role::DPS, + Role::Dps, Rating::new(model.dps_rating, model.dps_rd, model.dps_volatility), ), (