mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-08-26 09:19:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update fight-ui-handler.ts

Browse Source
This commit is contained in:
RedstonewolfX 2024-09-08 16:06:59 -04:00
parent 01152314f0
commit e39f33bd4f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ui/fight-ui-handler.ts
View File

@ -331,32 +331,35 @@ export default class FightUiHandler extends UiHandler {
dmgHigh = out.damageHigh; dmgHigh = out.damageHigh;
dmgLow = out.damageLow; dmgLow = out.damageLow;
var minHits = 1 var minHits = 1
var maxHits = 1 var maxHits = -1
var mh = move.getMove().getAttrs(MoveData.MultiHitAttr) var mh = move.getMove().getAttrs(MoveData.MultiHitAttr)
for (var i = 0; i < mh.length; i++) { for (var i = 0; i < mh.length; i++) {
var mh2 = mh[i] as MoveData.MultiHitAttr var mh2 = mh[i] as MoveData.MultiHitAttr
switch (mh2.multiHitType) { switch (mh2.multiHitType) {
case MoveData.MultiHitType._2: case MoveData.MultiHitType._2:
minHits = 2; minHits = 2;
maxHits = 2; //maxHits = 2;
case MoveData.MultiHitType._2_TO_5: case MoveData.MultiHitType._2_TO_5:
minHits = 2; minHits = 2;
maxHits = 5; //maxHits = 5;
case MoveData.MultiHitType._3: case MoveData.MultiHitType._3:
minHits = 3; minHits = 3;
maxHits = 3; //maxHits = 3;
case MoveData.MultiHitType._10: case MoveData.MultiHitType._10:
minHits = 10; minHits = 10;
maxHits = 10; //maxHits = 10;
case MoveData.MultiHitType.BEAT_UP: case MoveData.MultiHitType.BEAT_UP:
const party = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty(); const party = user.isPlayer() ? user.scene.getParty() : user.scene.getEnemyParty();
// No status means the ally pokemon can contribute to Beat Up // No status means the ally pokemon can contribute to Beat Up
minHits = party.reduce((total, pokemon) => { minHits = party.reduce((total, pokemon) => {
return total + (pokemon.id === user.id ? 1 : pokemon?.status && pokemon.status.effect !== StatusEffect.NONE ? 0 : 1); return total + (pokemon.id === user.id ? 1 : pokemon?.status && pokemon.status.effect !== StatusEffect.NONE ? 0 : 1);
}, 0); }, 0);
maxHits = minHits //maxHits = minHits
} }
} }
if (maxHits == -1) {
maxHits = minHits
}
var h = user.getHeldItems() var h = user.getHeldItems()
for (var i = 0; i < h.length; i++) { for (var i = 0; i < h.length; i++) {
if (h[i].type instanceof PokemonMultiHitModifierType) { if (h[i].type instanceof PokemonMultiHitModifierType) {