fix rage hammer detection

Author: snoww

src-tauri/src/live/encounter_state.rs

@@ -1151,8 +1151,7 @@ impl EncounterState {
 
             // add rdps_contributed to the support's skill
             if let Some(contributor_entity) = self.encounter.entities.get_mut(&contributor_name) {
-                if let Some(contributor_skill) =
-                    contributor_entity.skills.get_mut(&event.skill_id)
+                if let Some(contributor_skill) = contributor_entity.skills.get_mut(&event.skill_id)
                 {
                     *contributor_skill
                         .rdps_contributed
@@ -1177,10 +1176,9 @@ impl EncounterState {
                 if matches!(event.event_type, 1 | 3 | 5) {
                     source_entity.damage_stats.buffed_damage += event.value;
                 }
-                source_entity.damage_stats.unbuffed_damage = source_entity
-                    .damage_stats
-                    .damage_dealt
-                    - source_entity.damage_stats.buffed_damage;
+                source_entity.damage_stats.unbuffed_damage =
+                    source_entity.damage_stats.damage_dealt
+                        - source_entity.damage_stats.buffed_damage;
             }
         }
     }

src-tauri/src/utils.rs

@@ -251,18 +251,16 @@ pub fn get_player_spec(
             }
         }
         "Destroyer" => {
-            // chain strike or vortex gravity or basic attack is highest dps
-            if player.skills.contains_key(&18260)
-                || player.skills.contains_key(&18011)
-                || player
-                    .skills
-                    .values()
-                    .max_by(|a, b| a.total_damage.cmp(&b.total_damage))
-                    .is_some_and(|s| s.name == "Basic Attack")
+            // perfect swing is highest dps or supernova is highest dps
+            if player
+                .skills
+                .values()
+                .max_by(|a, b| a.total_damage.cmp(&b.total_damage))
+                .is_some_and(|s| s.id == 18170 || s.id == 18270)
             {
-                "Gravity Training"
-            } else {
                 "Rage Hammer"
+            } else {
+                "Gravity Training"
             }
         }
         "Gunlancer" => {
@@ -347,9 +345,18 @@ pub fn get_player_spec(
         }
         "Bard" => {
             // dps if tempest skill has damage
-            if (player.skills.get(&21147).is_some_and(|s| s.total_damage > 0)
-                || player.skills.get(&21148).is_some_and(|s| s.total_damage > 0)
-                || player.skills.get(&21149).is_some_and(|s| s.total_damage > 0))
+            if (player
+                .skills
+                .get(&21147)
+                .is_some_and(|s| s.total_damage > 0)
+                || player
+                    .skills
+                    .get(&21148)
+                    .is_some_and(|s| s.total_damage > 0)
+                || player
+                    .skills
+                    .get(&21149)
+                    .is_some_and(|s| s.total_damage > 0))
             {
                 return "True Courage".to_string();
             } else if player
@@ -498,7 +505,10 @@ pub fn get_player_spec(
         }
         "Artist" => {
             // dps if has shattering strike damage or rising moon damage
-            if player.skills.get(&31060).is_some_and(|s| s.total_damage > 0)
+            if player
+                .skills
+                .get(&31060)
+                .is_some_and(|s| s.total_damage > 0)
                 || player
                     .skills
                     .get(&31145)
@@ -537,7 +547,7 @@ pub fn get_player_spec(
             } else {
                 "Hellfire Successor"
             }
-        },
+        }
         _ => "Unknown",
     }
     .to_string()