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

Format all, finally

Browse Source
This commit is contained in:
Adrián 2024-08-21 02:02:17 -04:00
parent eee0b6a2af
commit 779b84c786
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,8 +69,8 @@ export default class CommandUiHandler extends UiHandler {
const messageMaxWidth = this.scene.game.canvas.width - messageHandler.commandWindow.getBounds().width - messageHandler.message.getBounds().x;
messageHandler.message.setWordWrapWidth(messageMaxWidth);
const commandMessage = i18next.t("commandUiHandler:actionMessage", {pokemonName: getPokemonNameWithAffix(commandPhase.getPokemon())});
messageHandler.adjustText(commandMessage, messageHandler.message, messageMaxWidth, { ignoreTextBalance:"all" });
const commandMessage = i18next.t("commandUiHandler:actionMessage", { pokemonName: getPokemonNameWithAffix(commandPhase.getPokemon()) });
messageHandler.adjustText(commandMessage, messageHandler.message, messageMaxWidth, { ignoreTextBalance: "all" });
messageHandler.showText(commandMessage, 0);
this.setCursor(this.getCursor());

18
src/ui/message-ui-handler.ts
View File

@ -5,9 +5,9 @@ import * as Utils from "../utils";
import i18next from "i18next";
type argsAjustText = {
padding?:number;
ignoreTextBalance?:Array<string>|"all";
ignoreLanguages?:Array<string>;
padding?: number;
ignoreTextBalance?: Array<string> | "all";
ignoreLanguages?: Array<string>;
};
export default abstract class MessageUiHandler extends AwaitableUiHandler {
@ -207,18 +207,18 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
* @param textObject
* @param maxWidth
* @param opts options additional
@argument ignoreLanguages ignore adjust for some language.
@argument ignoreBalanceText ignore Text Balance for some languages or for all.
@argument padding default 0.
* @argument ignoreLanguages ignore adjust for some language.
* @argument ignoreBalanceText ignore Text Balance for some languages or for all.
* @argument padding default 0.
*/
adjustText(text:string, textObject:Phaser.GameObjects.Text, maxWidth:number, opts:argsAjustText={}): void {
adjustText(text: string, textObject: Phaser.GameObjects.Text, maxWidth: number, opts: argsAjustText = {}): void {
const currentLanguage = i18next.resolvedLanguage!;
if (opts.ignoreLanguages && opts.ignoreLanguages[0] && !opts.ignoreLanguages.some(localKey => localKey === currentLanguage)) {
return;
}
const fontSizeToNumber = (FS: number|string):number => {
const fontSizeToNumber = (FS: number | string): number => {
return parseInt(FS.toString().replace("px", ""));
};
@ -229,7 +229,7 @@ export default abstract class MessageUiHandler extends AwaitableUiHandler {
const textWrapped = () => textObject.getWrappedText(text);
const textSize = () => Phaser.GameObjects.GetTextSize(textObject, textObject.style.getTextMetrics(), textWrapped());
const balanceText = typeof opts.ignoreTextBalance === "string" ? opts.ignoreTextBalance === "all" : (opts.ignoreTextBalance && opts.ignoreTextBalance[0] && opts.ignoreTextBalance.some(localKey=> localKey === currentLanguage));
const balanceText = typeof opts.ignoreTextBalance === "string" ? opts.ignoreTextBalance === "all" : (opts.ignoreTextBalance && opts.ignoreTextBalance[0] && opts.ignoreTextBalance.some(localKey => localKey === currentLanguage));
// Text Balance
if (!balanceText && textWrapped()[1] && textWrapped().length <= textObject.style.maxLines && textWrapped()[0].length * 0.25 > textWrapped()[1].length) {