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

Push fixes

Browse Source
This commit is contained in:
RedstonewolfX 2024-07-14 12:24:47 -04:00
parent 6947d137fc
commit e0d20f309c
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/data/nature.ts
View File

@ -87,7 +87,7 @@ export function getNatureIncrease(nature: Nature): string {
case Nature.HASTY:
case Nature.JOLLY:
case Nature.NAIVE:
return "speed"
return "spe"
case Nature.HARDY:
//return "atk"
case Nature.DOCILE:
@ -97,7 +97,7 @@ export function getNatureIncrease(nature: Nature): string {
case Nature.BASHFUL:
//return "spdef"
case Nature.QUIRKY:
//return "speed"
//return "spe"
default:
return ""
}
@ -128,7 +128,7 @@ export function getNatureDecrease(nature: Nature): string {
case Nature.RELAXED:
case Nature.QUIET:
case Nature.SASSY:
return "speed"
return "spe"
case Nature.HARDY:
//return "atk"
case Nature.DOCILE:
@ -138,7 +138,7 @@ export function getNatureDecrease(nature: Nature): string {
case Nature.BASHFUL:
//return "spdef"
case Nature.QUIRKY:
//return "speed"
//return "spe"
default:
return ""
}

4
src/logger.ts
View File

@ -828,6 +828,8 @@ export function logPokemon(scene: BattleScene, floor: integer = undefined, slot:
var pk: PokeData = exportPokemon(pokemon, encounterRarity)
pk.source = pokemon
pokemon.partyslot = slot;
if (wv.pokemon == undefined)
wv.pokemon = []
if (wv.pokemon[slot] != undefined) {
if (encounterRarity == "" || encounterRarity == undefined) {
if (wv.pokemon[slot].rarity != undefined && wv.pokemon[slot].rarity != "???") pk.rarity = wv.pokemon[slot].rarity
@ -1278,7 +1280,7 @@ function printIV(inData: string, indent: string, iv: IVData) {
inData += ",\n" + indent + " \"def\": " + iv.def
inData += ",\n" + indent + " \"spatk\": " + iv.spatk
inData += ",\n" + indent + " \"spdef\": " + iv.spdef
inData += ",\n" + indent + " \"speed\": " + iv.speed
inData += ",\n" + indent + " \"spe\": " + iv.speed
inData += "\n" + indent + "}"
return inData;
}

4
src/phases.ts
View File

@ -5140,10 +5140,10 @@ export class SwitchPhase extends BattlePhase {
this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.FAINT_SWITCH : PartyUiMode.POST_BATTLE_SWITCH, fieldIndex, (slotIndex: integer, option: PartyOption) => {
if (slotIndex >= this.scene.currentBattle.getBattlerCount() && slotIndex < 6) {
if (LoggerTools.isPreSwitch.value) {
LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, "Pre-switch " + (option == PartyOption.PASS_BATON ? "+ Baton" : "") + " to " + LoggerTools.playerPokeName(this.scene, slotIndex))
LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, "Pre-switch " + (option == PartyOption.PASS_BATON ? "+ Baton" : "") + " " + LoggerTools.playerPokeName(this.scene, fieldIndex) + " to " + LoggerTools.playerPokeName(this.scene, slotIndex))
}
if (LoggerTools.isFaintSwitch.value) {
LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, (option == PartyOption.PASS_BATON ? "Baton" : "Switch") + " in " + LoggerTools.playerPokeName(this.scene, slotIndex))
LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, (option == PartyOption.PASS_BATON ? "Baton" : "Send") + " in " + LoggerTools.playerPokeName(this.scene, slotIndex))
}
this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, fieldIndex, slotIndex, this.doReturn, option === PartyOption.PASS_BATON));
}