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

Reapply "Simpler Shop"

Browse Source 
This reverts commit b4d069db4b.
This commit is contained in:
RedstonewolfX 2024-07-24 12:13:20 -04:00
parent b4d069db4b
commit 5263b84378
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/logger.ts
View File

@ -759,7 +759,10 @@ export function getWave(drpd: DRPD, floor: integer, scene: BattleScene): Wave {
} }
} }
if (wv == undefined) { if (wv == undefined) {
if (scene.gameMode.modeId != GameModes.DAILY) { if (scene.gameMode.modeId != GameModes.DAILY || true) {
if (scene.gameMode.modeId == GameModes.DAILY) {
console.log(";-;")
}
drpd.waves.push({ drpd.waves.push({
id: floor, id: floor,
reload: false, reload: false,

2
src/phases.ts
View File

@ -703,7 +703,6 @@ export class TitlePhase extends Phase {
handler: () => { handler: () => {
this.scene.biomeChangeMode = false this.scene.biomeChangeMode = false
//return this.logRenameMenu() //return this.logRenameMenu()
//
this.scene.ui.setOverlayMode(Mode.LOG_HANDLER, this.scene.ui.setOverlayMode(Mode.LOG_HANDLER,
(k: string) => { (k: string) => {
if (k === undefined) { if (k === undefined) {
@ -715,7 +714,6 @@ export class TitlePhase extends Phase {
this.showOptions(); this.showOptions();
}); });
return true; return true;
//
} }
}) })
options.push({ options.push({

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

@ -671,6 +671,15 @@ export default class FightUiHandler extends UiHandler {
} }
dmgLow = out[0] * minHits dmgLow = out[0] * minHits
dmgHigh = out[1] * maxHits dmgHigh = out[1] * maxHits
var qSuffix = ""
if (target.isBoss()) {
var bossSegs = (target as EnemyPokemon).bossSegments
//dmgLow /= bossSegs
//dmgHigh /= bossSegs
//qSuffix = "?"
}
var dmgLowP = Math.round((dmgLow)/target.getBattleStat(Stat.HP)*100)
var dmgHighP = Math.round((dmgHigh)/target.getBattleStat(Stat.HP)*100)
/* /*
if (user.hasAbility(Abilities.PARENTAL_BOND)) { if (user.hasAbility(Abilities.PARENTAL_BOND)) {
// Second hit deals 0.25x damage // Second hit deals 0.25x damage
@ -689,13 +698,11 @@ export default class FightUiHandler extends UiHandler {
return "---" return "---"
} }
if (scene.damageDisplay == "Value") if (scene.damageDisplay == "Value")
return target.getMoveEffectiveness(user, move) + "x - " + (Math.round(dmgLow) == Math.round(dmgHigh) ? Math.round(dmgLow).toString() : Math.round(dmgLow) + "-" + Math.round(dmgHigh)) + koText return target.getMoveEffectiveness(user, move) + "x - " + (Math.round(dmgLow) == Math.round(dmgHigh) ? Math.round(dmgLow).toString() + qSuffix : Math.round(dmgLow) + "-" + Math.round(dmgHigh) + qSuffix) + koText
dmgLow = Math.round((dmgLow)/target.getBattleStat(Stat.HP)*100)
dmgHigh = Math.round((dmgHigh)/target.getBattleStat(Stat.HP)*100)
if (scene.damageDisplay == "Percent") if (scene.damageDisplay == "Percent")
return target.getMoveEffectiveness(user, move) + "x - " + (dmgLow == dmgHigh ? dmgLow + "%" : dmgLow + "%-" + dmgHigh + "%") + koText return target.getMoveEffectiveness(user, move) + "x - " + (dmgLowP == dmgHighP ? dmgLowP + "%" + qSuffix : dmgLowP + "%-" + dmgHighP + "%" + qSuffix) + koText
if (scene.damageDisplay == "Off") if (scene.damageDisplay == "Off")
return target.getMoveEffectiveness(user, move) + "x" return target.getMoveEffectiveness(user, move) + "x" + ((Math.floor(dmgLow) >= target.hp) ? " (KO)" : "")
} }
setCursor(cursor: integer): boolean { setCursor(cursor: integer): boolean {

3
src/ui/log-select-ui-handler.ts
View File

@ -310,7 +310,6 @@ class SessionSlot extends Phaser.GameObjects.Container {
return; return;
const iconContainer = this.scene.add.container(26 * i, 0); const iconContainer = this.scene.add.container(26 * i, 0);
iconContainer.setScale(0.75); iconContainer.setScale(0.75);
console.log(p.id, Utils.getEnumKeys(Species)[Utils.getEnumValues(Species).indexOf(p.id)])
//if (Utils.getEnumValues(Species)[p.id] == undefined) //if (Utils.getEnumValues(Species)[p.id] == undefined)
//return; //return;
@ -318,7 +317,7 @@ class SessionSlot extends Phaser.GameObjects.Container {
//if (getPokemonSpecies(Utils.getEnumValues(Species)[p.id]) == undefined) //if (getPokemonSpecies(Utils.getEnumValues(Species)[p.id]) == undefined)
//return; //return;
const icon = this.scene.addPkIcon(allSpecies[Utils.getEnumValues(Species).indexOf(p.id)], 0, 0, 0, 0, 0); const icon = this.scene.addPkIcon(getPokemonSpecies(Utils.getEnumValues(Species)[allSpecies[Utils.getEnumValues(Species).indexOf(p.id)].speciesId]), 0, 0, 0, 0, 0);
const text = addTextObject(this.scene, 32, 20, ``, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" }); const text = addTextObject(this.scene, 32, 20, ``, TextStyle.PARTY, { fontSize: "54px", color: "#f8f8f8" });
text.setShadow(0, 0, null); text.setShadow(0, 0, null);