Improve multihit move support #590

ShivaD173 · 2023-12-11T02:20:50Z

Combine TimesUsed and Multihit to use the same between move function previously used by parental bond
New/Fixed Effects
- Stamina (fixed)
- Weak Armor (fixed)
- Luminous Moss
- Kee/Maranga Berry
- Water Compaction
- Mummy/Wandering Spirit/Lingering Aroma
- Seed Sower
- Sand Spit

thejetou · 2023-12-15T19:28:38Z

calc/src/mechanics/gen789.ts

@@ -621,18 +596,16 @@ export function calculateSMSSSV(
            times
          );
          const newFinalMod = chainMods(newFinalMods, 41, 131072);
-          const newBaseDamage = calculateBaseDamageSMSSSV(
+          const basePower = calculateBasePowerSMSSSV(


This is shadowing the basePower defined above.

thejetou · 2023-12-15T19:30:40Z

calc/src/mechanics/gen789.ts

          );
+          const newBaseDamage = getBaseDamage(attacker.level, basePower, newAttack, newDefense);


Why is this not using calculateBaseDamage?

thejetou · 2023-12-15T19:33:58Z

calc/src/mechanics/util.ts

+    (defender.hasItem('Luminous Moss') && move.hasType('Water')) ||
+    (defender.hasItem('Maranga Berry') && move.category === 'Special') ||
+    (defender.hasItem('Kee Berry') && move.category === 'Physical')) {
+    const defStat = defender.hasAbility('Kee Berry') ? 'def' : 'spd';


Suggested change

const defStat = defender.hasAbility('Kee Berry') ? 'def' : 'spd';

const defStat = defender.hasItem('Kee Berry') ? 'def' : 'spd';

thejetou · 2023-12-15T19:36:16Z

calc/src/mechanics/util.ts

+        defender.boosts[defStat] = Math.max(-6, defender.boosts[defStat] - defSimple);
+      } else {
+        defender.boosts[defStat] = Math.min(6, defender.boosts[defStat] + defSimple);
+        if (atkSimple > 1) desc.attackerAbility = attacker.ability;


Why is this condition in the else block? Shouldn't it be in the description regardless if the ability is Contrary or not? Also, it should just be an equality check.

… moves

thejetou · 2024-01-25T12:42:06Z

This implementation should also accordingly be in the other mechanics/ files as needed.

Also, can you write unit tests? Multihit code is pretty finicky in the Honko engine so having unit tests would be great for sanity sake.

ShivaD173 · 2024-01-30T06:02:02Z

Updated gen3-9 mechanics files for multihit/multiturn accuracy
Modularized code similar to gen789 file to make it easier to do this.
Fixed a few more bugs with displaying abilities, especially with niche items/abilities.
Created tests for multi-hit interactions.

thejetou

I fully read through this diff and grokked it so after these are addressed I'll be able to merge after a quick look through. Sorry for the delay.

thejetou · 2024-02-24T15:13:33Z

calc/src/mechanics/util.ts

+    field.weather = 'Sand';
+  }
+
+  if (defender.hasAbility('Stamina') && !move.isCrit) {


Why does the move being a critical hit matter here?

Being a critical hit means that the stamina boosts ignore the defense boosts, and therefore stamina should not be showed in the description. Though now I realize that this doesn't work if they start with negative boosts, Will fix.

thejetou · 2024-02-24T15:18:55Z

calc/src/mechanics/gen789.ts

@@ -1231,7 +1196,7 @@ export function calculateAttackSMSSSV(
    attack = attackSource.rawStats[attackStat];
    desc.defenderAbility = defender.ability;
  } else {
-    attack = attackSource.stats[attackStat];
+    attack = getModifiedStat(attackSource.rawStats[attackStat]!, attackSource.boosts[attackStat]!);


I don't understand this line change.

Original code gets attack stat modified by on screen boost, new code gets attack modified by boost mid calculation, which would include stuff like superpower drops or PuP boosts.

thejetou · 2024-02-24T15:20:56Z

calc/src/mechanics/gen56.ts

+      usedItems = checkMultihitBoost(gen, attacker, defender, move,
+        field, desc, usedItems[0], usedItems[1]);
+      const newAtk = calculateAttackBWXY(gen, attacker, defender, move, field, desc, isCritical);
+      const newDef = calculateDefenseBWXY(gen, attacker, defender, move, field, desc, isCritical);


You have to recalculate calculateFinalModsBWXY too so Multiscale works.

thejetou · 2024-02-24T20:24:42Z

calc/src/mechanics/gen789.ts

+        // Hack to make Tera Shell with multihit moves, but not over multiple turns
+        typeEffectiveness = turn2typeEffectiveness;
+      }
+      // Stellar damage boost drops off after first hit, even on multihit moves


This seems to be wrong: https://www.smogon.com/forums/threads/tera-stellar-and-multihit-moves.3737292/

Thanks, I was implementing it how it was on showdown. Will fix.

ShivaD173 · 2024-02-25T02:06:21Z

Fixed the critical hit problem.
Fixed the hit input in gen56, and added a test for Multiscale
Changed the Tera stellar interaction with multihit moves.

thejetou

Ready for merge. I'll merge tomorrow though so any unexpected bugs don't happen on SPL Sunday since this is a decently large diff.

thejetou · 2024-02-26T15:21:38Z

Great work. Thank you!

Fixes bugs related to Stamina & Weak Armor, and general multihit/multiturn interactions. Also supports the following abilities/items now too: - Luminous Moss - Kee/Maranga Berry - Water Compaction - Mummy/Wandering Spirit/Lingering Aroma - Seed Sower - Sand Spit

thejetou reviewed Dec 15, 2023

View reviewed changes

thejetou changed the title ~~Combine timesUsed and multihit moves with effects.~~ Improve multihit move support Dec 15, 2023

ShivaD173 added 3 commits December 18, 2023 21:39

Combine timesUsed and multihit to properly encode all effects between…

ee09372

… moves

Use CalcBaseDmg and Fix between hit boosts

50ca0f6

Fix multihit interactions with tera stellar and tera shell

05df464

ShivaD173 force-pushed the calc_effects_in_multihit branch from 539f5a7 to 05df464 Compare December 31, 2023 19:11

ShivaD173 added 3 commits January 29, 2024 23:23

Modularize gen3-6 to allow for multihit support

e26c72a

Speed up multihit calculation

e889352

Add Tests for multihit moves

133d4ae

thejetou reviewed Feb 24, 2024

View reviewed changes

Fix Multiscale and add test, fix stellar on multihit

5746233

thejetou approved these changes Feb 25, 2024

View reviewed changes

Merge branch 'master' into calc_effects_in_multihit

cfa0e61

thejetou merged commit 718d832 into smogon:master Feb 26, 2024
2 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve multihit move support #590

Improve multihit move support #590

ShivaD173 commented Dec 11, 2023 •

edited

Loading

thejetou Dec 15, 2023

thejetou Dec 15, 2023

thejetou Dec 15, 2023

thejetou Dec 15, 2023

thejetou commented Jan 25, 2024

ShivaD173 commented Jan 30, 2024

thejetou left a comment

thejetou Feb 24, 2024

ShivaD173 Feb 25, 2024

thejetou Feb 24, 2024

ShivaD173 Feb 25, 2024

thejetou Feb 24, 2024

thejetou Feb 24, 2024

ShivaD173 Feb 25, 2024

ShivaD173 commented Feb 25, 2024

thejetou left a comment

thejetou commented Feb 26, 2024

		);
		const newBaseDamage = getBaseDamage(attacker.level, basePower, newAttack, newDefense);

	const defStat = defender.hasAbility('Kee Berry') ? 'def' : 'spd';
	const defStat = defender.hasItem('Kee Berry') ? 'def' : 'spd';

Improve multihit move support #590

Improve multihit move support #590

Conversation

ShivaD173 commented Dec 11, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

thejetou commented Jan 25, 2024

ShivaD173 commented Jan 30, 2024

thejetou left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ShivaD173 commented Feb 25, 2024

thejetou left a comment

Choose a reason for hiding this comment

thejetou commented Feb 26, 2024

ShivaD173 commented Dec 11, 2023 •

edited

Loading