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

Merge branch 'beta' into no-array-fill-movesets

Browse Source
This commit is contained in:
Sirz Benjie 2025-06-01 17:43:44 -05:00 committed by GitHub
commit d21095486b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/locales

@ -1 +1 @@
Subproject commit 88c60b6f8d5babfb0c157b31ceff22486712295c Subproject commit 4dab23d6a78b6cf32db43c9953e3c2000f448007

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

@ -193,35 +193,35 @@ export const Setting: Array<Setting> = [
options: [ options: [
{ {
value: "1", value: "1",
label: "1x", label: i18next.t("settings:gameSpeed1x"),
}, },
{ {
value: "1.25", value: "1.25",
label: "1.25x", label: i18next.t("settings:gameSpeed1_25x"),
}, },
{ {
value: "1.5", value: "1.5",
label: "1.5x", label: i18next.t("settings:gameSpeed1_5x"),
}, },
{ {
value: "2", value: "2",
label: "2x", label: i18next.t("settings:gameSpeed2x"),
}, },
{ {
value: "2.5", value: "2.5",
label: "2.5x", label: i18next.t("settings:gameSpeed2_5x"),
}, },
{ {
value: "3", value: "3",
label: "3x", label: i18next.t("settings:gameSpeed3x"),
}, },
{ {
value: "4", value: "4",
label: "4x", label: i18next.t("settings:gameSpeed4x"),
}, },
{ {
value: "5", value: "5",
label: "5x", label: i18next.t("settings:gameSpeed5x"),
}, },
], ],
default: 3, default: 3,

4
src/ui/fight-ui-handler.ts
View File

@ -292,7 +292,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
this.accuracyText.setVisible(hasMove); this.accuracyText.setVisible(hasMove);
this.moveCategoryIcon.setVisible(hasMove); this.moveCategoryIcon.setVisible(hasMove);
this.cursorObj.setPosition(13 + (cursor % 2 === 1 ? 100 : 0), -31 + (cursor >= 2 ? 15 : 0)); this.cursorObj.setPosition(13 + (cursor % 2 === 1 ? 114 : 0), -31 + (cursor >= 2 ? 15 : 0));
return changed; return changed;
} }
@ -322,7 +322,7 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
const moveset = pokemon.getMoveset(); const moveset = pokemon.getMoveset();
for (let moveIndex = 0; moveIndex < 4; moveIndex++) { for (let moveIndex = 0; moveIndex < 4; moveIndex++) {
const moveText = addTextObject(moveIndex % 2 === 0 ? 0 : 100, moveIndex < 2 ? 0 : 16, "-", TextStyle.WINDOW); const moveText = addTextObject(moveIndex % 2 === 0 ? 0 : 114, moveIndex < 2 ? 0 : 16, "-", TextStyle.WINDOW);
moveText.setName("text-empty-move"); moveText.setName("text-empty-move");
if (moveIndex < moveset.length) { if (moveIndex < moveset.length) {