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

Merge branch 'beta' into midturnab

Browse Source
This commit is contained in:
Dean 2025-02-17 13:31:55 -08:00 committed by GitHub
commit 8a482fecc7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/battle-scene.ts
View File

@ -2605,7 +2605,7 @@ export default class BattleScene extends SceneBase {
} }
} else if (!virtual) { } else if (!virtual) {
const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier); const defaultModifierType = getDefaultModifierTypeForTier(modifier.type.tier);
this.queueMessage(i18next.t("battle:itemStackFull", { fullItemName: modifier.type.name, itemName: defaultModifierType.name }), undefined, true); this.queueMessage(i18next.t("battle:itemStackFull", { fullItemName: modifier.type.name, itemName: defaultModifierType.name }), undefined, false, 3000);
return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound, false, instant).then(success => resolve(success)); return this.addModifier(defaultModifierType.newModifier(), ignoreUpdate, playSound, false, instant).then(success => resolve(success));
} }

28
src/ui/settings/move-touch-controls-handler.ts
View File

@ -1,6 +1,7 @@
import { globalScene } from "#app/global-scene"; import { globalScene } from "#app/global-scene";
import type TouchControl from "#app/touch-controls"; import type TouchControl from "#app/touch-controls";
import type UI from "#app/ui/ui"; import type UI from "#app/ui/ui";
import i18next from "i18next";
export const TOUCH_CONTROL_POSITIONS_LANDSCAPE = "touchControlPositionsLandscape"; export const TOUCH_CONTROL_POSITIONS_LANDSCAPE = "touchControlPositionsLandscape";
export const TOUCH_CONTROL_POSITIONS_PORTRAIT = "touchControlPositionsPortrait"; export const TOUCH_CONTROL_POSITIONS_PORTRAIT = "touchControlPositionsPortrait";
@ -71,7 +72,7 @@ export default class MoveTouchControlsHandler {
if (this.inConfigurationMode) { if (this.inConfigurationMode) {
const orientation = document.querySelector("#touchControls #orientation"); const orientation = document.querySelector("#touchControls #orientation");
if (orientation) { if (orientation) {
orientation.textContent = this.isLandscapeMode ? "Landscape" : "Portrait"; orientation.textContent = this.isLandscapeMode ? i18next.t("settings:landscape") : i18next.t("settings:portrait");
} }
} }
const positions = this.getSavedPositionsOfCurrentOrientation() ?? []; const positions = this.getSavedPositionsOfCurrentOrientation() ?? [];
@ -90,19 +91,22 @@ export default class MoveTouchControlsHandler {
const toolbar = document.createElement("div"); const toolbar = document.createElement("div");
toolbar.id = "configToolbar"; toolbar.id = "configToolbar";
toolbar.innerHTML = ` toolbar.innerHTML = `
<div class="column"> <div class="column">
<div class="button-row"> <div class="button-row">
<div id="resetButton" class="button">Reset</div> <div id="resetButton" class="button">${i18next.t("settings:reset")}</div>
<div id="saveButton" class="button">Save & close</div> <div id="saveButton" class="button">${i18next.t("settings:saveClose")}</div>
<div id="cancelButton" class="button">Cancel</div> <div id="cancelButton" class="button">${i18next.t("settings:cancel")}</div>
</div> </div>
<div class="info-row"> <div class="info-row">
<div class="orientation-label"> <div class="orientation-label">
Orientation: <span id="orientation">${this.isLandscapeMode ? "Landscape" : "Portrait"}</span> ${i18next.t("settings:orientation")}
</div> <span id="orientation">
${this.isLandscapeMode ? i18next.t("settings:landscape") : i18next.t("settings:portrait")}
</span>
</div> </div>
</div> </div>
`; </div>
`;
return toolbar; return toolbar;
} }