Allow all moves to have multihit option (#672)

smogon · Jan 22, 2025 · e3756f5 · e3756f5
1 parent 41ce33a
commit e3756f5
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 50 deletions.
diff --git a/calc/src/mechanics/gen3.ts b/calc/src/mechanics/gen3.ts
@@ -166,7 +166,7 @@ export function calculateADV(
     result.damage[i - 85] = Math.max(1, Math.floor((baseDamage * i) / 100));
   }
 
-  if ((move.dropsStats && move.timesUsed! > 1) || move.hits > 1) {
+  if (move.timesUsed! > 1 || move.hits > 1) {
     // store boosts so intermediate boosts don't show.
     const origDefBoost = desc.defenseBoost;
     const origAtkBoost = desc.attackBoost;

diff --git a/calc/src/mechanics/gen4.ts b/calc/src/mechanics/gen4.ts
@@ -279,7 +279,7 @@ export function calculateDPP(
   }
   result.damage = damage;
 
-  if ((move.dropsStats && move.timesUsed! > 1) || move.hits > 1) {
+  if (move.timesUsed! > 1 || move.hits > 1) {
     // store boosts so intermediate boosts don't show.
     const origDefBoost = desc.defenseBoost;
     const origAtkBoost = desc.attackBoost;

diff --git a/calc/src/mechanics/gen56.ts b/calc/src/mechanics/gen56.ts
@@ -371,12 +371,12 @@ export function calculateBWXY(
   desc.attackBoost =
     move.named('Foul Play') ? defender.boosts[attackStat] : attacker.boosts[attackStat];
 
-  if ((move.dropsStats && move.timesUsed! > 1) || move.hits > 1) {
+  if (move.timesUsed! > 1 || move.hits > 1) {
     // store boosts so intermediate boosts don't show.
     const origDefBoost = desc.defenseBoost;
     const origAtkBoost = desc.attackBoost;
     let numAttacks = 1;
-    if (move.dropsStats && move.timesUsed! > 1) {
+    if (move.timesUsed! > 1) {
       desc.moveTurns = `over ${move.timesUsed} turns`;
       numAttacks = move.timesUsed!;
     } else {
@@ -393,7 +393,7 @@ export function calculateBWXY(
       hasAteAbilityTypeChange = hasAteAbilityTypeChange &&
       attacker.hasAbility('Aerilate', 'Galvanize', 'Pixilate', 'Refrigerate');
 
-      if ((move.dropsStats && move.timesUsed! > 1)) {
+      if (move.timesUsed! > 1) {
         // Adaptability does not change between hits of a multihit, only between turns
         stabMod = getStabMod(attacker, move, desc);
       }
@@ -600,7 +600,8 @@ export function calculateBasePowerBWXY(
     desc,
     basePower,
     hasAteAbilityTypeChange,
-    turnOrder
+    turnOrder,
+    hit
   );
 
   basePower = OF16(Math.max(1, pokeRound((basePower * chainMods(bpMods, 41, 2097152)) / 4096)));
@@ -616,7 +617,8 @@ export function calculateBPModsBWXY(
   desc: RawDesc,
   basePower: number,
   hasAteAbilityTypeChange: boolean,
-  turnOrder: string
+  turnOrder: string,
+  hit: number
 ) {
   const bpMods = [];
 
@@ -637,6 +639,11 @@ export function calculateBPModsBWXY(
     resistedKnockOffDamage = !!(item.megaEvolves && defender.name.includes(item.megaEvolves));
   }
 
+  // Resist knock off damage if your item was already knocked off
+  if (!resistedKnockOffDamage && hit > 1 && !defender.hasAbility('Sticky Hold')) {
+    resistedKnockOffDamage = true;
+  }
+
 
   // Use BasePower after moves with custom BP to determine if Technician should boost
   if ((attacker.hasAbility('Technician') && basePower <= 60) ||

diff --git a/calc/src/mechanics/gen789.ts b/calc/src/mechanics/gen789.ts
@@ -676,13 +676,13 @@ export function calculateSMSSSV(
   desc.attackBoost =
     move.named('Foul Play') ? defender.boosts[attackStat] : attacker.boosts[attackStat];
 
-  if ((move.dropsStats && move.timesUsed! > 1) || move.hits > 1) {
+  if (move.timesUsed! > 1 || move.hits > 1) {
     // store boosts so intermediate boosts don't show.
     const origDefBoost = desc.defenseBoost;
     const origAtkBoost = desc.attackBoost;
 
     let numAttacks = 1;
-    if (move.dropsStats && move.timesUsed! > 1) {
+    if (move.timesUsed! > 1) {
       desc.moveTurns = `over ${move.timesUsed} turns`;
       numAttacks = move.timesUsed!;
     } else {
@@ -701,7 +701,7 @@ export function calculateSMSSSV(
       hasAteAbilityTypeChange = hasAteAbilityTypeChange &&
         attacker.hasAbility('Aerilate', 'Galvanize', 'Pixilate', 'Refrigerate', 'Normalize');
 
-      if ((move.dropsStats && move.timesUsed! > 1)) {
+      if (move.timesUsed! > 1) {
         // Adaptability does not change between hits of a multihit, only between turns
         preStellarStabMod = getStabMod(attacker, move, desc);
         // Hack to make Tera Shell with multihit moves, but not over multiple turns
@@ -1004,7 +1004,8 @@ export function calculateBasePowerSMSSSV(
     desc,
     basePower,
     hasAteAbilityTypeChange,
-    turnOrder
+    turnOrder,
+    hit
   );
   basePower = OF16(Math.max(1, pokeRound((basePower * chainMods(bpMods, 41, 2097152)) / 4096)));
   if (
@@ -1028,7 +1029,8 @@ export function calculateBPModsSMSSSV(
   desc: RawDesc,
   basePower: number,
   hasAteAbilityTypeChange: boolean,
-  turnOrder: string
+  turnOrder: string,
+  hit: number
 ) {
   const bpMods = [];
 
@@ -1061,6 +1063,11 @@ export function calculateBPModsSMSSSV(
     resistedKnockOffDamage = !!item.megaEvolves && defender.name.includes(item.megaEvolves);
   }
 
+  // Resist knock off damage if your item was already knocked off
+  if (!resistedKnockOffDamage && hit > 1 && !defender.hasAbility('Sticky Hold')) {
+    resistedKnockOffDamage = true;
+  }
+
   if ((move.named('Facade') && attacker.hasStatus('brn', 'par', 'psn', 'tox')) ||
     (move.named('Brine') && defender.curHP() <= defender.maxHP() / 2) ||
     (move.named('Venoshock') && defender.hasStatus('psn', 'tox')) ||

diff --git a/calc/src/move.ts b/calc/src/move.ts
@@ -133,7 +133,7 @@ export class Move implements State.Move {
     if (data.self?.boosts && data.self.boosts[stat] && data.self.boosts[stat]! < 0) {
       this.dropsStats = Math.abs(data.self.boosts[stat]!);
     }
-    this.timesUsed = (this.dropsStats && options.timesUsed) || 1;
+    this.timesUsed = options.timesUsed || 1;
     this.secondaries = data.secondaries;
     // For the purposes of the damage formula only 'allAdjacent' and 'allAdjacentFoes' matter, so we
     // simply default to 'any' for the others even though they may not actually be 'any'-target

diff --git a/src/honkalculate.template.html b/src/honkalculate.template.html
@@ -509,7 +509,7 @@
                             <option value="4">4 hits</option>
                             <option value="5">5 hits</option>
                         </select>
-                        <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                        <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                             <option value="1">Once</option>
                             <option value="2">Twice</option>
                             <option value="3">3 times</option>
@@ -545,7 +545,7 @@
                             <option value="4">4 hits</option>
                             <option value="5">5 hits</option>
                         </select>
-                        <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                        <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                             <option value="1">Once</option>
                             <option value="2">Twice</option>
                             <option value="3">3 times</option>
@@ -581,7 +581,7 @@
                             <option value="4">4 hits</option>
                             <option value="5">5 hits</option>
                         </select>
-                        <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                        <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                             <option value="1">Once</option>
                             <option value="2">Twice</option>
                             <option value="3">3 times</option>
@@ -617,7 +617,7 @@
                             <option value="4">4 hits</option>
                             <option value="5">5 hits</option>
                         </select>
-                        <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                        <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                           <option value="1">Once</option>
                           <option value="2">Twice</option>
                           <option value="3">3 times</option>

diff --git a/src/index.template.html b/src/index.template.html
@@ -570,7 +570,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -606,7 +606,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -642,7 +642,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -678,7 +678,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -1488,7 +1488,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -1524,7 +1524,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -1560,7 +1560,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -1596,7 +1596,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>

diff --git a/src/js/shared_controls.js b/src/js/shared_controls.js
@@ -521,10 +521,8 @@ $(".move-selector").change(function () {
 	moveGroupObj.children(".move-crit").prop("checked", move.willCrit === true);
 
 	var stat = move.category === 'Special' ? 'spa' : 'atk';
-	var dropsStats =
-		move.self && move.self.boosts && move.self.boosts[stat] && move.self.boosts[stat] < 0;
 	if (Array.isArray(move.multihit) || (!isNaN(move.multihit) && move.multiaccuracy)) {
-		moveGroupObj.children(".stat-drops").hide();
+		moveGroupObj.children(".move-times").hide();
 		moveGroupObj.children(".move-hits").empty();
 		if (!isNaN(move.multihit)) {
 			for (var i = 1; i <= move.multihit; i++) {
@@ -548,12 +546,9 @@ $(".move-selector").change(function () {
 		}
 
 		moveGroupObj.children(".move-hits").val(moveHits);
-	} else if (dropsStats) {
-		moveGroupObj.children(".move-hits").hide();
-		moveGroupObj.children(".stat-drops").show();
 	} else {
 		moveGroupObj.children(".move-hits").hide();
-		moveGroupObj.children(".stat-drops").hide();
+		moveGroupObj.children(".move-times").show();
 	}
 	moveGroupObj.children(".move-z").prop("checked", false);
 });
@@ -1135,7 +1130,7 @@ function getMoveDetails(moveInfo, opts) {
 	var isCrit = moveInfo.find(".move-crit").prop("checked");
 	var isStellarFirstUse = moveInfo.find(".move-stellar").prop("checked");
 	var hits = +moveInfo.find(".move-hits").val();
-	var timesUsed = +moveInfo.find(".stat-drops").val();
+	var timesUsed = +moveInfo.find(".move-times").val();
 	var timesUsedWithMetronome = moveInfo.find(".metronome").is(':visible') ? +moveInfo.find(".metronome").val() : 1;
 	var overrides = {
 		basePower: +moveInfo.find(".move-bp").val(),
@@ -1144,7 +1139,7 @@ function getMoveDetails(moveInfo, opts) {
 	if (moveName === 'Tera Blast') {
 		// custom logic for stellar type tera blast
 		var isStellar = opts.teraType === 'Stellar';
-		var statDrops = moveInfo.find('.stat-drops');
+		var statDrops = moveInfo.find('.move-times');
 		var dropsStats = statDrops.is(':visible');
 		if (isStellar !== dropsStats) {
 			// update stat drop dropdown here

diff --git a/src/oms.template.html b/src/oms.template.html
@@ -568,7 +568,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -604,7 +604,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -640,7 +640,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -676,7 +676,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -1485,7 +1485,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -1521,7 +1521,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -1557,7 +1557,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>
@@ -1593,7 +1593,7 @@
                     <option value="4">4 hits</option>
                     <option value="5">5 hits</option>
                 </select>
-                <select class="stat-drops calc-trigger hide" title="How many times was this move used in a row?">>
+                <select class="move-times calc-trigger hide" title="How many times was this move used in a row?">>
                     <option value="1">Once</option>
                     <option value="2">Twice</option>
                     <option value="3">3 times</option>