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

Changing option name to commandCursorMemory

Browse Source
This commit is contained in:
Wlowscha 2024-12-22 23:24:09 +01:00
parent d9e789f30a
commit b556d19448
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle-scene.ts
View File

@ -147,7 +147,7 @@ export default class BattleScene extends SceneBase {
public damageNumbersMode: integer = 0; public damageNumbersMode: integer = 0;
public reroll: boolean = false; public reroll: boolean = false;
public shopCursorTarget: number = ShopCursorTarget.REWARDS; public shopCursorTarget: number = ShopCursorTarget.REWARDS;
public commandCursorReset: boolean = true; public commandCursorMemory: boolean = false;
public showMovesetFlyout: boolean = true; public showMovesetFlyout: boolean = true;
public showArenaFlyout: boolean = true; public showArenaFlyout: boolean = true;
public showTimeOfDayWidget: boolean = true; public showTimeOfDayWidget: boolean = true;

4
src/phases/command-phase.ts
View File

@ -37,12 +37,12 @@ export class CommandPhase extends FieldPhase {
const commandUiHandler = this.scene.ui.handlers[Mode.COMMAND]; const commandUiHandler = this.scene.ui.handlers[Mode.COMMAND];
// If one of these conditions is true, we always reset the cursor to Command.FIGHT // If one of these conditions is true, we always reset the cursor to Command.FIGHT
const cursorResetBattle = this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER || const cursorResetEvent = this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER ||
this.scene.currentBattle.battleType === BattleType.TRAINER || this.scene.currentBattle.battleType === BattleType.TRAINER ||
this.scene.arena.biomeType === Biome.END; this.scene.arena.biomeType === Biome.END;
if (commandUiHandler) { if (commandUiHandler) {
if ((this.scene.currentBattle.turn === 1 && (this.scene.commandCursorReset || cursorResetBattle)) || commandUiHandler.getCursor() === Command.POKEMON) { if ((this.scene.currentBattle.turn === 1 && (!this.scene.commandCursorMemory || cursorResetEvent)) || commandUiHandler.getCursor() === Command.POKEMON) {
commandUiHandler.setCursor(Command.FIGHT); commandUiHandler.setCursor(Command.FIGHT);
} else { } else {
commandUiHandler.setCursor(commandUiHandler.getCursor()); commandUiHandler.setCursor(commandUiHandler.getCursor());

12
src/system/settings/settings.ts
View File

@ -157,7 +157,7 @@ export const SettingKeys = {
Move_Animations: "MOVE_ANIMATIONS", Move_Animations: "MOVE_ANIMATIONS",
Show_Stats_on_Level_Up: "SHOW_LEVEL_UP_STATS", Show_Stats_on_Level_Up: "SHOW_LEVEL_UP_STATS",
Shop_Cursor_Target: "SHOP_CURSOR_TARGET", Shop_Cursor_Target: "SHOP_CURSOR_TARGET",
Command_Cursor_Reset: "COMMAND_CURSOR_RESET", Command_Cursor_Memory: "Command_Cursor_Memory",
Candy_Upgrade_Notification: "CANDY_UPGRADE_NOTIFICATION", Candy_Upgrade_Notification: "CANDY_UPGRADE_NOTIFICATION",
Candy_Upgrade_Display: "CANDY_UPGRADE_DISPLAY", Candy_Upgrade_Display: "CANDY_UPGRADE_DISPLAY",
Move_Info: "MOVE_INFO", Move_Info: "MOVE_INFO",
@ -683,10 +683,10 @@ export const Setting: Array<Setting> = [
type: SettingType.DISPLAY type: SettingType.DISPLAY
}, },
{ {
key: SettingKeys.Command_Cursor_Reset, key: SettingKeys.Command_Cursor_Memory,
label: i18next.t("settings:commandCursorReset"), label: i18next.t("settings:commandCursorMemory"),
options: OFF_ON, options: OFF_ON,
default: 1, default: 0,
type: SettingType.DISPLAY type: SettingType.DISPLAY
}, },
{ {
@ -835,8 +835,8 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
const selectedValue = shopCursorTargetIndexMap[value]; const selectedValue = shopCursorTargetIndexMap[value];
scene.shopCursorTarget = selectedValue; scene.shopCursorTarget = selectedValue;
break; break;
case SettingKeys.Command_Cursor_Reset: case SettingKeys.Command_Cursor_Memory:
scene.commandCursorReset = Setting[index].options[value].value === "On"; scene.commandCursorMemory = Setting[index].options[value].value === "On";
break; break;
case SettingKeys.EXP_Gains_Speed: case SettingKeys.EXP_Gains_Speed:
scene.expGainsSpeed = value; scene.expGainsSpeed = value;