diff --git a/src/components/HitgroupPuppet.vue b/src/components/HitgroupPuppet.vue
index ce0a48a..911b60f 100644
--- a/src/components/HitgroupPuppet.vue
+++ b/src/components/HitgroupPuppet.vue
@@ -25,8 +25,6 @@
       </select>
     </div>
 
-    <div v-show="false" :key="data.selectWeapon || data.selectPlayer">{{ processDmg() }}</div>
-
     <div id="hitgroup-puppet"></div>
   </div>
 </template>
@@ -144,7 +142,9 @@ export default {
       unique.forEach(w => {
         for (let weapon in props.equipment_map) {
           if (parseInt(w) === parseInt(weapon)) {
-            arr2.push({w: props.equipment_map[weapon]})
+            let obj = {}
+            obj[w] = props.equipment_map[weapon]
+            arr2.push(obj)
           }
         }
       })
@@ -165,7 +165,7 @@ export default {
                     // 1: hitgroup
                     // 2: dmg
                     if (weapon) {
-                      if (weapon[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+                      if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
                         let obj = {}
                         obj[weapon[1]] = weapon[2]
                         arr.push(obj)
@@ -192,7 +192,7 @@ export default {
                         // 1: hitgroup
                         // 2: dmg
                         if (weapon) {
-                          if (weapon[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+                          if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
                             let obj = {}
                             obj[weapon[1]] = weapon[2]
                             arr.push(obj)
@@ -220,7 +220,7 @@ export default {
                         // 1: hitgroup
                         // 2: dmg
                         if (weapon) {
-                          if (weapon[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+                          if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
                             let obj = {}
                             obj[weapon[1]] = weapon[2]
                             arr.push(obj)
@@ -247,7 +247,7 @@ export default {
                       // 1: hitgroup
                       // 2: dmg
                       if (weapon) {
-                        if (weapon[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
+                        if (Object.values(weapon)[0] === parseInt(Object.keys(data.selectWeapon).toString())) {
                           let obj = {}
                           obj[weapon[1]] = weapon[2]
                           arr.push(obj)
@@ -391,9 +391,16 @@ export default {
       buildCharts()
     }
 
-    watch(() => data.selectPlayer, processPlayerWeapon)
+    watch(() => data.selectPlayer, () => {
+      data.selectWeapon = ''
+      processPlayerWeapon()
+    })
 
-    return {props, data, store, processDmg, processPlayerWeapon}
+    watch(() => data.selectWeapon, () => {
+      processDmg()
+    })
+
+    return {props, data, store, processPlayerWeapon}
   }
 }
 </script>