mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-26 17:29:30 +02:00
Add log label field
This commit is contained in:
parent
607db5d091
commit
e3272af46e
@ -1189,7 +1189,7 @@ function printItemNoNewline(inData: string, indent: string, item: ItemData) {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region 12 Manage Logs
|
//#region 12 Ingame Menu
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the name, author, and [todo] label for a file.
|
* Sets the name, author, and [todo] label for a file.
|
||||||
@ -1263,7 +1263,8 @@ export function generateEditOption(scene: BattleScene, i: integer, saves: any, p
|
|||||||
scene.ui.setMode(Mode.NAME_LOG, {
|
scene.ui.setMode(Mode.NAME_LOG, {
|
||||||
autofillfields: [
|
autofillfields: [
|
||||||
(JSON.parse(localStorage.getItem(logs[i][1])) as DRPD).title,
|
(JSON.parse(localStorage.getItem(logs[i][1])) as DRPD).title,
|
||||||
(JSON.parse(localStorage.getItem(logs[i][1])) as DRPD).authors.join(", ")
|
(JSON.parse(localStorage.getItem(logs[i][1])) as DRPD).authors.join(", "),
|
||||||
|
(JSON.parse(localStorage.getItem(logs[i][1])) as DRPD).label,
|
||||||
],
|
],
|
||||||
buttonActions: [
|
buttonActions: [
|
||||||
() => {
|
() => {
|
||||||
|
@ -873,7 +873,7 @@ export class TitlePhase extends Phase {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region 04 Unavailable
|
//#region 04 UnavailablePhase
|
||||||
export class UnavailablePhase extends Phase {
|
export class UnavailablePhase extends Phase {
|
||||||
constructor(scene: BattleScene) {
|
constructor(scene: BattleScene) {
|
||||||
super(scene);
|
super(scene);
|
||||||
@ -892,7 +892,7 @@ export class UnavailablePhase extends Phase {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region 05 ReloadSession
|
//#region 05 ReloadSessionPhase
|
||||||
export class ReloadSessionPhase extends Phase {
|
export class ReloadSessionPhase extends Phase {
|
||||||
private systemDataStr: string;
|
private systemDataStr: string;
|
||||||
|
|
||||||
@ -949,7 +949,7 @@ export class OutdatedPhase extends Phase {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region 07 SelectGender
|
//#region 07 SelectGenderPhase
|
||||||
export class SelectGenderPhase extends Phase {
|
export class SelectGenderPhase extends Phase {
|
||||||
constructor(scene: BattleScene) {
|
constructor(scene: BattleScene) {
|
||||||
super(scene);
|
super(scene);
|
||||||
@ -995,7 +995,7 @@ export class SelectGenderPhase extends Phase {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region 08 SelectChallenge
|
//#region 08 SelectChallengePhase
|
||||||
export class SelectChallengePhase extends Phase {
|
export class SelectChallengePhase extends Phase {
|
||||||
constructor(scene: BattleScene) {
|
constructor(scene: BattleScene) {
|
||||||
super(scene);
|
super(scene);
|
||||||
@ -1015,7 +1015,7 @@ export class SelectChallengePhase extends Phase {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
//#region 09 SelectStarter
|
//#region 09 SelectStarterPhase
|
||||||
export class SelectStarterPhase extends Phase {
|
export class SelectStarterPhase extends Phase {
|
||||||
|
|
||||||
constructor(scene: BattleScene) {
|
constructor(scene: BattleScene) {
|
||||||
@ -5907,8 +5907,11 @@ export class PokemonHealPhase extends CommonAnimPhase {
|
|||||||
|
|
||||||
//#region 69 AttemptCapturePhase
|
//#region 69 AttemptCapturePhase
|
||||||
export class AttemptCapturePhase extends PokemonPhase {
|
export class AttemptCapturePhase extends PokemonPhase {
|
||||||
|
/** The Pokeball being used. */
|
||||||
private pokeballType: PokeballType;
|
private pokeballType: PokeballType;
|
||||||
|
/** The Pokeball sprite. */
|
||||||
private pokeball: Phaser.GameObjects.Sprite;
|
private pokeball: Phaser.GameObjects.Sprite;
|
||||||
|
/** The sprite's original Y position. */
|
||||||
private originalY: number;
|
private originalY: number;
|
||||||
|
|
||||||
constructor(scene: BattleScene, targetIndex: integer, pokeballType: PokeballType) {
|
constructor(scene: BattleScene, targetIndex: integer, pokeballType: PokeballType) {
|
||||||
@ -6080,29 +6083,26 @@ export class AttemptCapturePhase extends PokemonPhase {
|
|||||||
}
|
}
|
||||||
|
|
||||||
catch() {
|
catch() {
|
||||||
|
/** The Pokemon being caught. */
|
||||||
const pokemon = this.getPokemon() as EnemyPokemon;
|
const pokemon = this.getPokemon() as EnemyPokemon;
|
||||||
this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex));
|
this.scene.unshiftPhase(new VictoryPhase(this.scene, this.battlerIndex));
|
||||||
|
|
||||||
|
/** Used for achievements. */
|
||||||
const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm();
|
const speciesForm = !pokemon.fusionSpecies ? pokemon.getSpeciesForm() : pokemon.getFusionSpeciesForm();
|
||||||
|
|
||||||
if (speciesForm.abilityHidden && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1) {
|
// Achievements
|
||||||
|
if (speciesForm.abilityHidden && (pokemon.fusionSpecies ? pokemon.fusionAbilityIndex : pokemon.abilityIndex) === speciesForm.getAbilityCount() - 1)
|
||||||
this.scene.validateAchv(achvs.HIDDEN_ABILITY);
|
this.scene.validateAchv(achvs.HIDDEN_ABILITY);
|
||||||
}
|
if (pokemon.species.subLegendary)
|
||||||
|
|
||||||
if (pokemon.species.subLegendary) {
|
|
||||||
this.scene.validateAchv(achvs.CATCH_SUB_LEGENDARY);
|
this.scene.validateAchv(achvs.CATCH_SUB_LEGENDARY);
|
||||||
}
|
if (pokemon.species.legendary)
|
||||||
|
|
||||||
if (pokemon.species.legendary) {
|
|
||||||
this.scene.validateAchv(achvs.CATCH_LEGENDARY);
|
this.scene.validateAchv(achvs.CATCH_LEGENDARY);
|
||||||
}
|
if (pokemon.species.mythical)
|
||||||
|
|
||||||
if (pokemon.species.mythical) {
|
|
||||||
this.scene.validateAchv(achvs.CATCH_MYTHICAL);
|
this.scene.validateAchv(achvs.CATCH_MYTHICAL);
|
||||||
}
|
|
||||||
|
|
||||||
|
// Show its info
|
||||||
this.scene.pokemonInfoContainer.show(pokemon, true);
|
this.scene.pokemonInfoContainer.show(pokemon, true);
|
||||||
|
// Update new IVs
|
||||||
this.scene.gameData.updateSpeciesDexIvs(pokemon.species.getRootSpeciesId(true), pokemon.ivs);
|
this.scene.gameData.updateSpeciesDexIvs(pokemon.species.getRootSpeciesId(true), pokemon.ivs);
|
||||||
|
|
||||||
this.scene.ui.showText(i18next.t("battle:pokemonCaught", { pokemonName: pokemon.name }), null, () => {
|
this.scene.ui.showText(i18next.t("battle:pokemonCaught", { pokemonName: pokemon.name }), null, () => {
|
||||||
@ -6139,9 +6139,13 @@ export class AttemptCapturePhase extends PokemonPhase {
|
|||||||
Promise.all([pokemon.hideInfo(), this.scene.gameData.setPokemonCaught(pokemon)]).then(() => {
|
Promise.all([pokemon.hideInfo(), this.scene.gameData.setPokemonCaught(pokemon)]).then(() => {
|
||||||
if (this.scene.getParty().length === 6) {
|
if (this.scene.getParty().length === 6) {
|
||||||
const promptRelease = () => {
|
const promptRelease = () => {
|
||||||
|
// Say that your party is full
|
||||||
this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.name }), null, () => {
|
this.scene.ui.showText(i18next.t("battle:partyFull", { pokemonName: pokemon.name }), null, () => {
|
||||||
|
// Ask if you want to make room
|
||||||
this.scene.pokemonInfoContainer.makeRoomForConfirmUi();
|
this.scene.pokemonInfoContainer.makeRoomForConfirmUi();
|
||||||
this.scene.ui.setMode(Mode.CONFIRM, () => {
|
this.scene.ui.setMode(Mode.CONFIRM, () => {
|
||||||
|
// YES
|
||||||
|
// Open up the party menu on the RELEASE setting
|
||||||
this.scene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, this.fieldIndex, (slotIndex: integer, _option: PartyOption) => {
|
this.scene.ui.setMode(Mode.PARTY, PartyUiMode.RELEASE, this.fieldIndex, (slotIndex: integer, _option: PartyOption) => {
|
||||||
this.scene.ui.setMode(Mode.MESSAGE).then(() => {
|
this.scene.ui.setMode(Mode.MESSAGE).then(() => {
|
||||||
if (slotIndex < 6) {
|
if (slotIndex < 6) {
|
||||||
@ -6152,7 +6156,8 @@ export class AttemptCapturePhase extends PokemonPhase {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
}, () => {
|
}, () => {
|
||||||
LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, "Do Not Keep")
|
// NO
|
||||||
|
LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, "Don't keep " + pokemon.name)
|
||||||
this.scene.ui.setMode(Mode.MESSAGE).then(() => {
|
this.scene.ui.setMode(Mode.MESSAGE).then(() => {
|
||||||
removePokemon();
|
removePokemon();
|
||||||
end();
|
end();
|
||||||
@ -6162,12 +6167,14 @@ export class AttemptCapturePhase extends PokemonPhase {
|
|||||||
};
|
};
|
||||||
promptRelease();
|
promptRelease();
|
||||||
} else {
|
} else {
|
||||||
|
//LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, `${pokemon.name} added to party`)
|
||||||
addToParty();
|
addToParty();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}, 0, true);
|
}, 0, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Remove the Poke Ball from the scene. */
|
||||||
removePb() {
|
removePb() {
|
||||||
this.scene.tweens.add({
|
this.scene.tweens.add({
|
||||||
targets: this.pokeball,
|
targets: this.pokeball,
|
||||||
@ -6730,3 +6737,4 @@ export class TestMessagePhase extends MessagePhase {
|
|||||||
super(scene, message, null, true);
|
super(scene, message, null, true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
//#endregion
|
@ -10,11 +10,11 @@ export default class LogNameFormUiHandler extends FormModalUiHandler {
|
|||||||
name: string;
|
name: string;
|
||||||
|
|
||||||
getModalTitle(config?: ModalConfig): string {
|
getModalTitle(config?: ModalConfig): string {
|
||||||
return "Manage " + (this.name ? this.name : "Log");
|
return (this.name ? this.name : "Manage Log");
|
||||||
}
|
}
|
||||||
|
|
||||||
getFields(config?: ModalConfig): string[] {
|
getFields(config?: ModalConfig): string[] {
|
||||||
return [ "Name", "Author(s)" ];
|
return [ "Name", "Author(s)", "Label" ];
|
||||||
}
|
}
|
||||||
|
|
||||||
getWidth(config?: ModalConfig): number {
|
getWidth(config?: ModalConfig): number {
|
||||||
@ -67,6 +67,7 @@ export default class LogNameFormUiHandler extends FormModalUiHandler {
|
|||||||
const originalLoginAction = this.submitAction;
|
const originalLoginAction = this.submitAction;
|
||||||
this.inputs[0].setText(args[0].autofillfields[0])
|
this.inputs[0].setText(args[0].autofillfields[0])
|
||||||
this.inputs[1].setText(args[0].autofillfields[1])
|
this.inputs[1].setText(args[0].autofillfields[1])
|
||||||
|
this.inputs[2].setText(args[0].autofillfields[2])
|
||||||
this.submitAction = (_) => {
|
this.submitAction = (_) => {
|
||||||
console.log("submitAction")
|
console.log("submitAction")
|
||||||
// Prevent overlapping overrides on action modification
|
// Prevent overlapping overrides on action modification
|
||||||
|
@ -407,6 +407,7 @@ export default class PartyUiHandler extends MessageUiHandler {
|
|||||||
this.showText(i18next.t("partyUiHandler:releaseConfirmation", { pokemonName: pokemon.name }), null, () => {
|
this.showText(i18next.t("partyUiHandler:releaseConfirmation", { pokemonName: pokemon.name }), null, () => {
|
||||||
ui.setModeWithoutClear(Mode.CONFIRM, () => {
|
ui.setModeWithoutClear(Mode.CONFIRM, () => {
|
||||||
ui.setMode(Mode.PARTY);
|
ui.setMode(Mode.PARTY);
|
||||||
|
LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, `Add ${pokemon.name} to party, replacing ${this.scene.getParty()[this.cursor].name} (Slot ${this.cursor + 1})`)
|
||||||
this.doRelease(this.cursor);
|
this.doRelease(this.cursor);
|
||||||
}, () => {
|
}, () => {
|
||||||
ui.setMode(Mode.PARTY);
|
ui.setMode(Mode.PARTY);
|
||||||
@ -933,7 +934,6 @@ export default class PartyUiHandler extends MessageUiHandler {
|
|||||||
this.clearPartySlots();
|
this.clearPartySlots();
|
||||||
this.scene.removePartyMemberModifiers(slotIndex);
|
this.scene.removePartyMemberModifiers(slotIndex);
|
||||||
const releasedPokemon = this.scene.getParty().splice(slotIndex, 1)[0];
|
const releasedPokemon = this.scene.getParty().splice(slotIndex, 1)[0];
|
||||||
LoggerTools.logActions(this.scene, this.scene.currentBattle.waveIndex, `Release ${releasedPokemon.name} (Slot ${slotIndex + 1})`)
|
|
||||||
releasedPokemon.destroy();
|
releasedPokemon.destroy();
|
||||||
this.populatePartySlots();
|
this.populatePartySlots();
|
||||||
if (this.cursor >= this.scene.getParty().length) {
|
if (this.cursor >= this.scene.getParty().length) {
|
||||||
|
Loading…
Reference in New Issue
Block a user