mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-08 01:12:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename frenzy to nonstop and add rollout/iceball logic into nonstop

Browse Source
This commit is contained in:
allen 2024-08-23 13:04:10 -07:00 committed by allen925
parent aae4d6933c
commit f5a6a34d5a
4 changed files with 57 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/data/battler-tags.ts
View File

@ -599,15 +599,27 @@ export class NightmareTag extends BattlerTag {
} }
} }
export class FrenzyTag extends BattlerTag { export class NonStopTag extends BattlerTag {
constructor(turnCount: number, sourceMove: Moves, sourceId: number) { public frenzy: boolean;
super(BattlerTagType.FRENZY, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
constructor(tagtype: BattlerTagType, turnCount: number, sourceMove: Moves, sourceId: number, frenzy: boolean = true) {
super(tagtype, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId);
this.frenzy = frenzy;
}
/**
* When given a battler tag or json representing one, load the data for it.
* @param {BattlerTag | any} source A battler tag
*/
loadTag(source: BattlerTag | any): void {
super.loadTag(source);
this.frenzy = source.frenzy as boolean;
} }
onRemove(pokemon: Pokemon): void { onRemove(pokemon: Pokemon): void {
super.onRemove(pokemon); super.onRemove(pokemon);
if (this.turnCount < 2) { // Only add CONFUSED tag if a disruption occurs on the final confusion-inducing turn of FRENZY if (this.turnCount < 2 && this.frenzy) { // Only add CONFUSED tag if a disruption occurs on the final confusion-inducing turn of FRENZY
pokemon.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 4)); pokemon.addTag(BattlerTagType.CONFUSED, pokemon.randSeedIntRange(2, 4));
} }
} }
@ -1885,7 +1897,9 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: number, source
case BattlerTagType.NIGHTMARE: case BattlerTagType.NIGHTMARE:
return new NightmareTag(); return new NightmareTag();
case BattlerTagType.FRENZY: case BattlerTagType.FRENZY:
return new FrenzyTag(turnCount, sourceMove, sourceId); return new NonStopTag(tagType, turnCount, sourceMove, sourceId, true);
case BattlerTagType.NONSTOP:
return new NonStopTag(tagType, turnCount, sourceMove, sourceId, false);
case BattlerTagType.CHARGING: case BattlerTagType.CHARGING:
return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, 1, sourceMove, sourceId); return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, 1, sourceMove, sourceId);
case BattlerTagType.ENCORE: case BattlerTagType.ENCORE:

57
src/data/move.ts
View File

@ -4380,9 +4380,13 @@ export class DisableMoveAttr extends MoveEffectAttr {
} }
} }
export class FrenzyAttr extends MoveEffectAttr { export class nonStopAttr extends MoveEffectAttr {
constructor() { public tagType: BattlerTagType;
private rounds: number;
constructor(tagType: BattlerTagType, rounds:number = 0) {
super(true, MoveEffectTrigger.HIT, false, true); super(true, MoveEffectTrigger.HIT, false, true);
this.tagType = tagType;
this.rounds = rounds;
} }
canApply(user: Pokemon, target: Pokemon, move: Move, args: any[]) { canApply(user: Pokemon, target: Pokemon, move: Move, args: any[]) {
@ -4394,24 +4398,29 @@ export class FrenzyAttr extends MoveEffectAttr {
return false; return false;
} }
if (!user.getTag(BattlerTagType.FRENZY) && !user.getMoveQueue().length) { if (!user.getTag(this.tagType) && !user.getMoveQueue().length) {
const turnCount = user.randSeedIntRange(1, 2); let turnCount = this.rounds;
if (!this.rounds) {
turnCount = user.randSeedIntRange(1, 2);
}
new Array(turnCount).fill(null).map(() => user.getMoveQueue().push({ move: move.id, targets: [ target.getBattlerIndex() ], ignorePP: true })); new Array(turnCount).fill(null).map(() => user.getMoveQueue().push({ move: move.id, targets: [ target.getBattlerIndex() ], ignorePP: true }));
user.addTag(BattlerTagType.FRENZY, turnCount, move.id, user.id); user.addTag(this.tagType, turnCount, move.id, user.id);
} else { } else {
applyMoveAttrs(AddBattlerTagAttr, user, target, move, args); applyMoveAttrs(AddBattlerTagAttr, user, target, move, args);
user.lapseTag(BattlerTagType.FRENZY); // if FRENZY is already in effect (moveQueue.length > 0), lapse the tag user.lapseTag(this.tagType); // if NONSTOP/FRENZY is already in effect (moveQueue.length > 0), lapse the tag
} }
return true; return true;
} }
} }
export const frenzyMissFunc: UserMoveConditionFunc = (user: Pokemon, move: Move) => { export const nonStopMissFunc: UserMoveConditionFunc = (user: Pokemon, move: Move) => {
while (user.getMoveQueue().length && user.getMoveQueue()[0].move === move.id) { while (user.getMoveQueue().length && user.getMoveQueue()[0].move === move.id) {
user.getMoveQueue().shift(); user.getMoveQueue().shift();
} }
user.removeTag(BattlerTagType.FRENZY); // FRENZY tag should be disrupted on miss/no effect // NONSTOP/FRENZY tag should be disrupted on miss/no effect
user.removeTag(BattlerTagType.FRENZY);
user.removeTag(BattlerTagType.NONSTOP);
return true; return true;
}; };
@ -6513,9 +6522,9 @@ export function initMoves() {
.attr(RecoilAttr) .attr(RecoilAttr)
.recklessMove(), .recklessMove(),
new AttackMove(Moves.THRASH, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 1) new AttackMove(Moves.THRASH, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 1)
.attr(FrenzyAttr) .attr(nonStopAttr, BattlerTagType.FRENZY)
.attr(MissEffectAttr, frenzyMissFunc) .attr(MissEffectAttr, nonStopMissFunc)
.attr(NoEffectAttr, frenzyMissFunc) .attr(NoEffectAttr, nonStopMissFunc)
.target(MoveTarget.RANDOM_NEAR_ENEMY), .target(MoveTarget.RANDOM_NEAR_ENEMY),
new AttackMove(Moves.DOUBLE_EDGE, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 1) new AttackMove(Moves.DOUBLE_EDGE, Type.NORMAL, MoveCategory.PHYSICAL, 120, 100, 15, -1, 0, 1)
.attr(RecoilAttr, false, 0.33) .attr(RecoilAttr, false, 0.33)
@ -6633,9 +6642,9 @@ export function initMoves() {
.attr(StatusEffectAttr, StatusEffect.SLEEP) .attr(StatusEffectAttr, StatusEffect.SLEEP)
.powderMove(), .powderMove(),
new AttackMove(Moves.PETAL_DANCE, Type.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1) new AttackMove(Moves.PETAL_DANCE, Type.GRASS, MoveCategory.SPECIAL, 120, 100, 10, -1, 0, 1)
.attr(FrenzyAttr) .attr(nonStopAttr, BattlerTagType.FRENZY)
.attr(MissEffectAttr, frenzyMissFunc) .attr(MissEffectAttr, nonStopMissFunc)
.attr(NoEffectAttr, frenzyMissFunc) .attr(NoEffectAttr, nonStopMissFunc)
.makesContact() .makesContact()
.danceMove() .danceMove()
.target(MoveTarget.RANDOM_NEAR_ENEMY), .target(MoveTarget.RANDOM_NEAR_ENEMY),
@ -6977,9 +6986,9 @@ export function initMoves() {
new StatusMove(Moves.LOCK_ON, Type.NORMAL, -1, 5, -1, 0, 2) new StatusMove(Moves.LOCK_ON, Type.NORMAL, -1, 5, -1, 0, 2)
.attr(IgnoreAccuracyAttr), .attr(IgnoreAccuracyAttr),
new AttackMove(Moves.OUTRAGE, Type.DRAGON, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 2) new AttackMove(Moves.OUTRAGE, Type.DRAGON, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 2)
.attr(FrenzyAttr) .attr(nonStopAttr, BattlerTagType.FRENZY)
.attr(MissEffectAttr, frenzyMissFunc) .attr(MissEffectAttr, nonStopMissFunc)
.attr(NoEffectAttr, frenzyMissFunc) .attr(NoEffectAttr, nonStopMissFunc)
.target(MoveTarget.RANDOM_NEAR_ENEMY), .target(MoveTarget.RANDOM_NEAR_ENEMY),
new StatusMove(Moves.SANDSTORM, Type.ROCK, -1, 10, -1, 0, 2) new StatusMove(Moves.SANDSTORM, Type.ROCK, -1, 10, -1, 0, 2)
.attr(WeatherChangeAttr, WeatherType.SANDSTORM) .attr(WeatherChangeAttr, WeatherType.SANDSTORM)
@ -6992,7 +7001,10 @@ export function initMoves() {
new StatusMove(Moves.CHARM, Type.FAIRY, 100, 20, -1, 0, 2) new StatusMove(Moves.CHARM, Type.FAIRY, 100, 20, -1, 0, 2)
.attr(StatChangeAttr, BattleStat.ATK, -2), .attr(StatChangeAttr, BattleStat.ATK, -2),
new AttackMove(Moves.ROLLOUT, Type.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 2) new AttackMove(Moves.ROLLOUT, Type.ROCK, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 2)
.attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL), .attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL)
.attr(nonStopAttr, BattlerTagType.NONSTOP, 4)
.attr(MissEffectAttr, nonStopMissFunc)
.attr(NoEffectAttr, nonStopMissFunc),
new AttackMove(Moves.FALSE_SWIPE, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 2) new AttackMove(Moves.FALSE_SWIPE, Type.NORMAL, MoveCategory.PHYSICAL, 40, 100, 40, -1, 0, 2)
.attr(SurviveDamageAttr), .attr(SurviveDamageAttr),
new StatusMove(Moves.SWAGGER, Type.NORMAL, 85, 15, -1, 0, 2) new StatusMove(Moves.SWAGGER, Type.NORMAL, 85, 15, -1, 0, 2)
@ -7275,6 +7287,9 @@ export function initMoves() {
.target(MoveTarget.BOTH_SIDES), .target(MoveTarget.BOTH_SIDES),
new AttackMove(Moves.ICE_BALL, Type.ICE, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 3) new AttackMove(Moves.ICE_BALL, Type.ICE, MoveCategory.PHYSICAL, 30, 90, 20, -1, 0, 3)
.attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL) .attr(ConsecutiveUseDoublePowerAttr, 5, true, true, Moves.DEFENSE_CURL)
.attr(nonStopAttr, BattlerTagType.NONSTOP, 4)
.attr(MissEffectAttr, nonStopMissFunc)
.attr(NoEffectAttr, nonStopMissFunc)
.ballBombMove(), .ballBombMove(),
new AttackMove(Moves.NEEDLE_ARM, Type.GRASS, MoveCategory.PHYSICAL, 60, 100, 15, 30, 0, 3) new AttackMove(Moves.NEEDLE_ARM, Type.GRASS, MoveCategory.PHYSICAL, 60, 100, 15, 30, 0, 3)
.attr(FlinchAttr), .attr(FlinchAttr),
@ -8836,9 +8851,9 @@ export function initMoves() {
.attr(StatChangeAttr, BattleStat.SPATK, 1, true), .attr(StatChangeAttr, BattleStat.SPATK, 1, true),
new AttackMove(Moves.RAGING_FURY, Type.FIRE, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8) new AttackMove(Moves.RAGING_FURY, Type.FIRE, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8)
.makesContact(false) .makesContact(false)
.attr(FrenzyAttr) .attr(nonStopAttr, BattlerTagType.FRENZY)
.attr(MissEffectAttr, frenzyMissFunc) .attr(MissEffectAttr, nonStopMissFunc)
.attr(NoEffectAttr, frenzyMissFunc) .attr(NoEffectAttr, nonStopMissFunc)
.target(MoveTarget.RANDOM_NEAR_ENEMY), .target(MoveTarget.RANDOM_NEAR_ENEMY),
new AttackMove(Moves.WAVE_CRASH, Type.WATER, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8) new AttackMove(Moves.WAVE_CRASH, Type.WATER, MoveCategory.PHYSICAL, 120, 100, 10, -1, 0, 8)
.attr(RecoilAttr, false, 0.33) .attr(RecoilAttr, false, 0.33)

1
src/enums/battler-tag-type.ts
View File

@ -9,6 +9,7 @@ export enum BattlerTagType {
SEEDED = "SEEDED", SEEDED = "SEEDED",
NIGHTMARE = "NIGHTMARE", NIGHTMARE = "NIGHTMARE",
FRENZY = "FRENZY", FRENZY = "FRENZY",
NONSTOP = "NONSTOP",
CHARGING = "CHARGING", CHARGING = "CHARGING",
ENCORE = "ENCORE", ENCORE = "ENCORE",
HELPING_HAND = "HELPING_HAND", HELPING_HAND = "HELPING_HAND",

2
src/phases/check-switch-phase.ts
View File

@ -41,7 +41,7 @@ export class CheckSwitchPhase extends BattlePhase {
return; return;
} }
if (pokemon.getTag(BattlerTagType.FRENZY)) { if (pokemon.getTag(BattlerTagType.FRENZY) || pokemon.getTag(BattlerTagType.NONSTOP)) {
super.end(); super.end();
return; return;
} }