Merge pull request massif-press#2034 from msprijatelj/fix/heatfallOve…

…rcharge fix(Active Mode): dynamically determine overcharge pips
Tidomann · Jun 27, 2022 · 3942df4 · 3942df4
2 parents 3ed343e + c44e5fe
commit 3942df4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/features/encounters/mission/runner/components/PlayerCard.vue b/src/features/encounters/mission/runner/components/PlayerCard.vue
@@ -266,7 +266,7 @@
             <cc-tick-bar
               :key="mech.CurrentOvercharge"
               :current="mech.CurrentOvercharge"
-              :max="3"
+              :max="mech.OverchargeTrack.length-1"
               large
               no-input
               clearable

diff --git a/src/features/pilot_management/ActiveSheet/layout/MedPipLayout.vue b/src/features/pilot_management/ActiveSheet/layout/MedPipLayout.vue
@@ -155,7 +155,7 @@
         <cc-tick-bar
           :key="mech.CurrentOvercharge"
           :current="mech.CurrentOvercharge"
-          :max="3"
+          :max="mech.OverchargeTrack.length-1"
           large
           no-input
           clearable
@@ -169,7 +169,7 @@
           </span>
         </cc-tick-bar>
         <div class="caption overcharge--text font-weight-bold">
-          {{ overcharge[mech.CurrentOvercharge] }}
+          +{{ mech.OverchargeTrack[mech.CurrentOvercharge] }}
         </div>
       </v-col>
     </v-row>
@@ -190,12 +190,5 @@ export default Vue.extend({
     stressRollover: { type: Boolean },
     hpResistance: { type: Boolean },
   },
-  computed: {
-    overcharge(): string[] {
-      return this.mech.Pilot.has('corebonus', 'cb_heatfall_coolant_system')
-        ? [' +1 ', ' +1d3 ', ' +1d6 ', '+1d6']
-        : [' +1 ', ' +1d3 ', ' +1d6 ', '+1d6+4']
-    },
-  },
 })
 </script>
diff --git a/src/features/pilot_management/ActiveSheet/layout/PipLayout.vue b/src/features/pilot_management/ActiveSheet/layout/PipLayout.vue
@@ -323,7 +323,7 @@
             <cc-tick-bar
               :key="mech.CurrentOvercharge"
               :current="mech.CurrentOvercharge"
-              :max="3"
+              :max="mech.OverchargeTrack.length-1"
               large
               no-input
               clearable