mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-26 09:19:31 +02:00
More text fixes
"Plumage" has been removed from Squawkabilly form names "Style" has been removed from Oricorio form names Nature details are hidden if the text is still overlapping after these overrides
This commit is contained in:
parent
6b73e3ba87
commit
b03320f81c
@ -323,9 +323,23 @@ export class ArenaFlyout extends Phaser.GameObjects.Container {
|
||||
if (poke[i].species.speciesId == Species.MINIOR) {
|
||||
formtext = " (" + poke[i].species.forms?.[poke[i].formIndex]?.formName.split(" ")[0] + ")"
|
||||
}
|
||||
if (poke[i].species.speciesId == Species.SQUAWKABILLY) {
|
||||
formtext = " (" + poke[i].species.forms?.[poke[i].formIndex]?.formName.substring(0, poke[i].species.forms?.[poke[i].formIndex]?.formName.length - " Plumage".length) + ")"
|
||||
}
|
||||
if (poke[i].species.speciesId == Species.ORICORIO) {
|
||||
formtext = " (" + poke[i].species.forms?.[poke[i].formIndex]?.formName.substring(0, poke[i].species.forms?.[poke[i].formIndex]?.formName.length - " Style".length) + ")"
|
||||
}
|
||||
}
|
||||
this.flyoutTextPlayer.text += poke[i].name + formtext + " " + (poke[i].gender == Gender.MALE ? "♂" : (poke[i].gender == Gender.FEMALE ? "♀" : "-")) + " " + poke[i].level + "\n"
|
||||
this.flyoutTextEnemy.text += poke[i].getAbility().name + " / " + (poke[i].isBoss() ? poke[i].getPassiveAbility().name + " / " : "") + getNatureName(poke[i].nature) + (getNatureIncrease(poke[i].nature) != "" ? " (+" + getNatureIncrease(poke[i].nature) + " -" + getNatureDecrease(poke[i].nature) + ")" : "") + "\n\n\n"
|
||||
const beforeText1 = this.flyoutTextPlayer.text
|
||||
const beforeText2 = this.flyoutTextEnemy.text
|
||||
this.flyoutTextPlayer.text = poke[i].name + formtext + " " + (poke[i].gender == Gender.MALE ? "♂" : (poke[i].gender == Gender.FEMALE ? "♀" : "-")) + " " + poke[i].level
|
||||
this.flyoutTextEnemy.text = poke[i].getAbility().name + (poke[i].isBoss() ? ", " + poke[i].getPassiveAbility().name : "") + " / " + getNatureName(poke[i].nature) + (getNatureIncrease(poke[i].nature) != "" ? " (+" + getNatureIncrease(poke[i].nature) + " -" + getNatureDecrease(poke[i].nature) + ")" : "")
|
||||
if (this.flyoutTextEnemy.width + this.flyoutTextPlayer.width > this.flyoutWidth * 6 - 120) {
|
||||
this.flyoutTextEnemy.text = poke[i].getAbility().name + (poke[i].isBoss() ? ", " + poke[i].getPassiveAbility().name : "") + " / " + getNatureName(poke[i].nature)
|
||||
}
|
||||
//console.log(this.flyoutTextEnemy.width + this.flyoutTextPlayer.width, this.flyoutWidth * 6 - 120)
|
||||
this.flyoutTextPlayer.text = beforeText1 + this.flyoutTextPlayer.text + "\n"
|
||||
this.flyoutTextEnemy.text = beforeText2 + this.flyoutTextEnemy.text + "\n\n\n"
|
||||
}
|
||||
this.flyoutTextPlayer.text += "HP: " + poke[i].ivs[0]
|
||||
this.flyoutTextPlayer.text += ", Atk: " + poke[i].ivs[1]
|
||||
|
Loading…
Reference in New Issue
Block a user