IAmChrisAMA
/
pokerogue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge dcecd4fab7 into a5bafe5c47

pull/783/merge
DustinLin 2024-05-16 01:09:03 +02:00 committed by GitHub
parent a5bafe5c47 dcecd4fab7
commit 5d03144842
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 117 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/battle-scene.ts
View File

@ -126,6 +126,7 @@ export default class BattleScene extends SceneBase {
public gameData: GameData;
public sessionSlotId: integer;
// can debug phases using "phase.constructor.name"
private phaseQueue: Phase[];
private phaseQueuePrepend: Phase[];
private phaseQueuePrependSpliceIndex: integer;
@ -1503,22 +1504,41 @@ export default class BattleScene extends SceneBase {
getStandbyPhase(): Phase {
return this.standbyPhase;
}
/**
* PhaseQueuePrepend: is a temp storage of what will be added to PhaseQueue
* PhaseQueue: dequeue/remove the first element to get the next phase
* queues are moved around during shiftPhase() below
*/
// adds a phase to "nextCommandPhaseQueue", as long as boolean passed in is false
pushPhase(phase: Phase, defer: boolean = false): void {
(!defer ? this.phaseQueue : this.nextCommandPhaseQueue).push(phase);
}
// adds phase to the end, or at some specified index
unshiftPhase(phase: Phase): void {
if (this.phaseQueuePrependSpliceIndex === -1)
// .push() adds to end of array
this.phaseQueuePrepend.push(phase);
else
// .splice(index, num elements to remove, what to add)
// modifies array by inserting at index, removing num of elements after index
this.phaseQueuePrepend.splice(this.phaseQueuePrependSpliceIndex, 0, phase);
/**
* debugging queues via printing, may be helpful in the future
console.log(`State of the phaseQueuePrepend (will be moved over to phaseQeueu)`)
this.phaseQueuePrepend.forEach(p => console.log(p.constructor.name));
console.log(`State of the phaseQueue, what is going to be called next `)
this.phaseQueue.forEach(p => console.log(p.constructor.name));
*/
}
clearPhaseQueue(): void {
this.phaseQueue.splice(0, this.phaseQueue.length);
}
// combo with unshiftPhase(), want to start inserting at current length instead of the "end", useful if phaseQueuePrepend gets longer with Phases
setPhaseQueueSplice(): void {
this.phaseQueuePrependSpliceIndex = this.phaseQueuePrepend.length;
}
@ -1527,6 +1547,10 @@ export default class BattleScene extends SceneBase {
this.phaseQueuePrependSpliceIndex = -1;
}
/**
* is called by each Phase implementations "end()" by default
* dumps everything from phaseQueuePrepend to the start of of phaseQueue, then starts the first one
*/
shiftPhase(): void {
if (this.standbyPhase) {
this.currentPhase = this.standbyPhase;
@ -1534,14 +1558,28 @@ export default class BattleScene extends SceneBase {
return;
}
// shifting phase (with no standby phase) will move everything from prepend to actual PhaseQueue?
// resets the index, if it was changed via setPhaseQueueSplice()
if (this.phaseQueuePrependSpliceIndex > -1)
this.clearPhaseQueueSplice();
if (this.phaseQueuePrepend.length) {
while (this.phaseQueuePrepend.length)
// appends phaseQueuePrepend to phaseQueue
// eg: phaseQueue = [4,5,6], phaseQUeuePrepend = [1,2,3]
// -> [1,2,3,4,5,6]
this.phaseQueue.unshift(this.phaseQueuePrepend.pop());
}
// then starts from PhaseQueue, .shift() removes first elm of array
// populatePhaseQueue() adds a turnInit Phase at the end of phaseQueue (if the queue is emtpy)
if (!this.phaseQueue.length)
this.populatePhaseQueue();
/** debugging
*
console.log(`SHIFT PHASE: State of the phaseQueue, what is going to be called next`)
this.phaseQueue.forEach(p => console.log(p.constructor.name));
*/
this.currentPhase = this.phaseQueue.shift();
this.currentPhase.start();
}
@ -1592,11 +1630,14 @@ export default class BattleScene extends SceneBase {
queueMessage(message: string, callbackDelay?: integer, prompt?: boolean, promptDelay?: integer, defer?: boolean) {
const phase = new MessagePhase(this, message, callbackDelay, prompt, promptDelay);
if (!defer)
// adds to the end of PhaseQueuePrepend
this.unshiftPhase(phase);
else
//remember that pushPhase adds it to nextCommandPhaseQueue
this.pushPhase(phase);
}
// moves everyhting from nextCommandPhaseQueue
populatePhaseQueue(): void {
if (this.nextCommandPhaseQueue.length) {
this.phaseQueue.push(...this.nextCommandPhaseQueue);

74
src/field/pokemon.ts
View File

@ -1607,6 +1607,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
console.log('damage', damage.value, move.name, power.value, sourceAtk, targetDef);
if (damage.value) {
if (this.getHpRatio() === 1)
applyPreDefendAbAttrs(PreDefendFullHpEndureAbAttr, this, source, battlerMove, cancelled, damage);
@ -1614,26 +1615,20 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
this.scene.applyModifiers(EnemyEndureChanceModifier, false, this);
const oneHitKo = result === HitResult.ONE_HIT_KO;
// damageAndUpdate: will queue potential messages for critical hit, effectiveness, fainted - in that order
damage.value = this.damageAndUpdate(damage.value, result as DamageResult, isCritical, oneHitKo, oneHitKo);
this.turnData.damageTaken += damage.value;
// queue critical message before effectiveness
if (isCritical)
this.scene.queueMessage(i18next.t('battle:hitResultCriticalHit'));
this.scene.setPhaseQueueSplice();
if (source.isPlayer()) {
this.scene.validateAchvs(DamageAchv, damage);
if (damage.value > this.scene.gameData.gameStats.highestDamage)
this.scene.gameData.gameStats.highestDamage = damage.value;
}
source.turnData.damageDealt += damage.value;
this.battleData.hitCount++;
const attackResult = { move: move.id, result: result as DamageResult, damage: damage.value, critical: isCritical, sourceId: source.id };
this.turnData.attacksReceived.unshift(attackResult);
if (source.isPlayer() && !this.isPlayer())
this.scene.applyModifiers(DamageMoneyRewardModifier, true, source, damage)
}
if (source.turnData.hitsLeft === 1) {
switch (result) {
// hitsLeft: for multi-hit moves, only want to render effectiveness text at end.
// also want to render if a pokemon fainted
//console.log(`the number of hits left for this turn for ${this.name} is ${source.turnData.hitsLeft}`)
if (source.turnData.hitsLeft === 1 || this.isFainted()) {
switch (result as HitResult) {
case HitResult.SUPER_EFFECTIVE:
this.scene.queueMessage(i18next.t('battle:hitResultSuperEffective'));
break;
@ -1652,9 +1647,48 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
}
if (damage)
if (source.isPlayer()) {
this.scene.validateAchvs(DamageAchv, damage);
if (damage.value > this.scene.gameData.gameStats.highestDamage)
this.scene.gameData.gameStats.highestDamage = damage.value;
}
source.turnData.damageDealt += damage.value;
this.battleData.hitCount++;
// create attack result and push to turnData
const attackResult = { move: move.id, result: result as DamageResult, damage: damage.value, critical: isCritical, sourceId: source.id };
this.turnData.attacksReceived.unshift(attackResult);
if (source.isPlayer() && !this.isPlayer())
this.scene.applyModifiers(DamageMoneyRewardModifier, true, source, damage)
// finally checks and adds Fainted scene
if (this.isFainted()) {
/**
* when adding the FaintPhase, want to toggle future unshiftPhase() and queueMessage() calls
* to appear before the FaintPhase (as FaintPhase will potentially end the encounter and add Phases such as
* GameOverPhase, VictoryPhase, etc.. that will interfere with anything else that happens during this MoveEffectPhase)
*
* once the MoveEffectPhase is over (and calls it's .end() function, shiftPhase() will reset the PhaseQueueSplice via clearPhaseQueueSplice() )
*/
this.scene.setPhaseQueueSplice();
this.scene.unshiftPhase(new FaintPhase(this.scene, this.getBattlerIndex(), oneHitKo));
this.resetSummonData();
}
/**
* since damage is an object, I don't see how this would ever by false?
* i think the motivation was to have this here to counter setPhaseQueueSplice()
* not sure the original motivation
*
* It would be bad to run both the top if block and the one below commented out without changing the later's condition
*/
/*
if (damage){
this.scene.clearPhaseQueueSplice();
}
*/
}
}
break;
case MoveCategory.STATUS:
if (!typeless)
@ -1689,19 +1723,15 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
}
damage = Math.min(damage, this.hp);
this.hp = this.hp - damage;
if (this.isFainted()) {
this.scene.unshiftPhase(new FaintPhase(this.scene, this.getBattlerIndex(), preventEndure));
this.resetSummonData();
}
return damage;
}
damageAndUpdate(damage: integer, result?: DamageResult, critical: boolean = false, ignoreSegments: boolean = false, preventEndure: boolean = false): integer {
damageAndUpdate(damage: integer, result?: DamageResult, critical: boolean = false, ignoreSegments: boolean = false, preventEndure: boolean = false ): integer {
const damagePhase = new DamagePhase(this.scene, this.getBattlerIndex(), damage, result as DamageResult, critical);
this.scene.unshiftPhase(damagePhase);
damage = this.damage(damage, ignoreSegments, preventEndure);
// Damage amount may have changed, but needed to be queued before calling damage function
damagePhase.updateAmount(damage);

11
src/overrides.ts
View File

@ -47,12 +47,13 @@ export const POKEBALL_OVERRIDE: { active: boolean, pokeballs: PokeballCounts } =
// forms can be found in pokemon-species.ts
export const STARTER_FORM_OVERRIDE: integer = 0;
// default 5 or 20 for Daily
export const STARTING_LEVEL_OVERRIDE: integer = 0;
export const STARTING_LEVEL_OVERRIDE: integer = 10;
export const ABILITY_OVERRIDE: Abilities = Abilities.NONE;
export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
export const MOVESET_OVERRIDE: Array<Moves> = [];
export const SHINY_OVERRIDE: boolean = false;
export const VARIANT_OVERRIDE: Variant = 0;
// eg: Moves.TACKLE
export const MOVESET_OVERRIDE: Array<Moves> = []
/**
* OPPONENT / ENEMY OVERRIDES
@ -60,7 +61,7 @@ export const VARIANT_OVERRIDE: Variant = 0;
export const OPP_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
export const OPP_PASSIVE_ABILITY_OVERRIDE = Abilities.NONE;
export const OPP_MOVESET_OVERRIDE: Array<Moves> = [];
export const OPP_MOVESET_OVERRIDE: Array<Moves> = []
export const OPP_SHINY_OVERRIDE: boolean = false;
export const OPP_VARIANT_OVERRIDE: Variant = 0;
@ -70,8 +71,8 @@ export const OPP_VARIANT_OVERRIDE: Variant = 0;
* default is 0 to not override
* @example SPECIES_OVERRIDE = Species.Bulbasaur;
*/
export const STARTER_SPECIES_OVERRIDE: Species | integer = 0;
export const OPP_SPECIES_OVERRIDE: Species | integer = 0;
export const STARTER_SPECIES_OVERRIDE: Species | integer = 0
export const OPP_SPECIES_OVERRIDE: Species | integer = 0
/**
* MODIFIER / ITEM OVERRIDES

14
src/phases.ts
View File

@ -2060,6 +2060,11 @@ export class TurnStartPhase extends FieldPhase {
this.scene.pushPhase(new TurnEndPhase(this.scene));
/**
* this.end() will call shiftPhase(), which dumps everything from PrependQueue (aka everything that is unshifted()) to the front
* of the queue and dequeues to start the next phase
* this is important since stuff like SwitchSummon, AttemptRun, AttemptCapture Phases break the "flow" and should take precedence
*/
this.end();
}
}
@ -2279,6 +2284,7 @@ export class MovePhase extends BattlePhase {
return false;
});
// Readability?: this function declaration honestly gets in the way of readability of what start() is doing , move either to beginning or end
const doMove = () => {
this.pokemon.turnData.acted = true; // Record that the move was attempted, even if it fails
@ -2565,11 +2571,15 @@ export class MoveEffectPhase extends PokemonPhase {
const user = this.getUserPokemon();
if (user) {
if (--user.turnData.hitsLeft >= 1 && this.getTarget()?.isActive())
this.scene.unshiftPhase(this.getNewHitPhase());
this.scene.unshiftPhase(this.getNewHitPhase()); // adds another MoveAffectPhase
else {
// queue message for number of hits made by multi-move
// BUG: when fainting occurs, the resulting message isn't rendered - has to do with FaintPhase
// temp fix in pokemon.ts apply() that checks, but ideally want to fix it here at the source
const hitsTotal = user.turnData.hitCount - Math.max(user.turnData.hitsLeft, 0);
if (hitsTotal > 1)
if (hitsTotal > 1 || user.turnData.hitsLeft > 0){
this.scene.queueMessage(i18next.t('battle:attackHitsCount', { count: hitsTotal }));
}
this.scene.applyModifiers(HitHealModifier, this.player, user);
}
}