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

more fixes

Browse Source
This commit is contained in:
RedstonewolfX 2024-07-12 22:12:32 -04:00
parent 1990b69c18
commit 9e442f2b07
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logger.ts
View File

@ -353,7 +353,7 @@ export function getSize(str: string) {
export function getDRPD(scene: BattleScene): DRPD { export function getDRPD(scene: BattleScene): DRPD {
var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD; var drpd: DRPD = JSON.parse(localStorage.getItem(getLogID(scene))) as DRPD;
drpd = updateLog(drpd); drpd = updateLog(drpd);
scene.arenaFlyout.updateFieldText() //scene.arenaFlyout.updateFieldText()
return drpd; return drpd;
} }

33
src/phases.ts
View File

@ -2368,6 +2368,8 @@ export class TurnInitPhase extends FieldPhase {
}) })
} }
this.scene.arenaFlyout.updateFieldText()
this.scene.setScoreText(txt.join("/")) this.scene.setScoreText(txt.join("/"))
this.end(); this.end();
@ -2876,35 +2878,34 @@ export class TurnStartPhase extends FieldPhase {
if (pokemon.getBattlerIndex() == 1) targIDs = ["Counter", "Ally", "Self", "L", "R"] if (pokemon.getBattlerIndex() == 1) targIDs = ["Counter", "Ally", "Self", "L", "R"]
switch (mv.getMove().moveTarget) { switch (mv.getMove().moveTarget) {
case MoveTarget.USER: case MoveTarget.USER:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.OTHER: case MoveTarget.OTHER:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.ALL_OTHERS: case MoveTarget.ALL_OTHERS:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.NEAR_OTHER: case MoveTarget.NEAR_OTHER:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.ALL_NEAR_OTHERS: case MoveTarget.ALL_NEAR_OTHERS:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.NEAR_ENEMY: case MoveTarget.NEAR_ENEMY:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.ALL_NEAR_ENEMIES: case MoveTarget.ALL_NEAR_ENEMIES:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.RANDOM_NEAR_ENEMY: case MoveTarget.RANDOM_NEAR_ENEMY:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.ALL_ENEMIES: case MoveTarget.ALL_ENEMIES:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.ATTACKER: case MoveTarget.ATTACKER:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break;
break; break;
case MoveTarget.NEAR_ALLY: case MoveTarget.NEAR_ALLY:
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
@ -2916,25 +2917,25 @@ export class TurnStartPhase extends FieldPhase {
LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.USER_AND_ALLIES: case MoveTarget.USER_AND_ALLIES:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.ALL: case MoveTarget.ALL:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.USER_SIDE: case MoveTarget.USER_SIDE:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.ENEMY_SIDE: case MoveTarget.ENEMY_SIDE:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.BOTH_SIDES: case MoveTarget.BOTH_SIDES:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.PARTY: case MoveTarget.PARTY:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
case MoveTarget.CURSE: case MoveTarget.CURSE:
//LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1]) LoggerTools.Actions[pokemon.getBattlerIndex()] += " → " + targets.map(v => targIDs[v+1])
break; break;
} }
} }
@ -3045,6 +3046,8 @@ export class TurnEndPhase extends FieldPhase {
start() { start() {
super.start(); super.start();
this.scene.arenaFlyout.updateFieldText()
this.scene.currentBattle.incrementTurn(this.scene); this.scene.currentBattle.incrementTurn(this.scene);
this.scene.eventTarget.dispatchEvent(new TurnEndEvent(this.scene.currentBattle.turn)); this.scene.eventTarget.dispatchEvent(new TurnEndEvent(this.scene.currentBattle.turn));

4
src/ui/arena-flyout.ts
View File

@ -272,7 +272,7 @@ export default class ArenaFlyout extends Phaser.GameObjects.Container {
this.flyoutTextHeaderField.text = "Stats" this.flyoutTextHeaderField.text = "Stats"
this.flyoutTextHeaderPlayer.text = "" this.flyoutTextHeaderPlayer.text = ""
this.flyoutTextHeaderEnemy.text = "" this.flyoutTextHeaderEnemy.text = ""
this.flyoutTextPlayer.setPosition(6, 5) this.flyoutTextPlayer.setPosition(6, 4)
this.flyoutTextPlayer.setFontSize(30); this.flyoutTextPlayer.setFontSize(30);
var instructions = [] var instructions = []
var drpd = LoggerTools.getDRPD(this.scene as BattleScene); var drpd = LoggerTools.getDRPD(this.scene as BattleScene);
@ -290,7 +290,7 @@ export default class ArenaFlyout extends Phaser.GameObjects.Container {
instructions.push("Reward: " + drpd.waves[i].shop) instructions.push("Reward: " + drpd.waves[i].shop)
} }
} }
for (var i = instructions.length - 8; i < instructions.length; i++) { for (var i = instructions.length - 10; i < instructions.length; i++) {
if (i >= 0) { if (i >= 0) {
this.flyoutTextPlayer.text += instructions[i] this.flyoutTextPlayer.text += instructions[i]
} }