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

Cleaned up move info overlay

Browse Source
This commit is contained in:
Wlowscha 2025-08-17 13:27:11 +02:00
parent a4b7bd8b22
commit 96bc26880b
No known key found for this signature in database
GPG Key ID: 3C8F1AD330565D04
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/ui/move-info-overlay.ts
View File

@ -37,7 +37,6 @@ const EFF_HEIGHT = 48;
const EFF_WIDTH = 82; const EFF_WIDTH = 82;
const DESC_HEIGHT = 48; const DESC_HEIGHT = 48;
const BORDER = 8; const BORDER = 8;
const GLOBAL_SCALE = 6;
export class MoveInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle { export class MoveInfoOverlay extends Phaser.GameObjects.Container implements InfoToggle {
public active = false; public active = false;
@ -65,14 +64,15 @@ export class MoveInfoOverlay extends Phaser.GameObjects.Container implements Inf
this.setScale(1); this.setScale(1);
this.options = options || {}; this.options = options || {};
const descBoxX = options?.onSide && !options?.right ? EFF_WIDTH : 0;
const descBoxY = options?.top ? EFF_HEIGHT : 0;
// we always want this to be half a window wide
const width = options?.width || MoveInfoOverlay.getWidth();
const descBoxWidth = width - (options?.onSide ? EFF_WIDTH : 0);
const descBoxHeight = DESC_HEIGHT;
// prepare the description box // prepare the description box
const width = options?.width || MoveInfoOverlay.getWidth(); // we always want this to be half a window wide this.descBg = addWindow(descBoxX, descBoxY, descBoxWidth, descBoxHeight);
this.descBg = addWindow(
options?.onSide && !options?.right ? EFF_WIDTH : 0,
options?.top ? EFF_HEIGHT : 0,
width - (options?.onSide ? EFF_WIDTH : 0),
DESC_HEIGHT,
);
this.descBg.setOrigin(0, 0); this.descBg.setOrigin(0, 0);
this.add(this.descBg); this.add(this.descBg);
@ -81,14 +81,13 @@ export class MoveInfoOverlay extends Phaser.GameObjects.Container implements Inf
const descX = (options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER; const descX = (options?.onSide && !options?.right ? EFF_WIDTH : 0) + BORDER;
const descY = (options?.top ? EFF_HEIGHT : 0) + BORDER - 2; const descY = (options?.top ? EFF_HEIGHT : 0) + BORDER - 2;
const visibleX = x < 0 ? x + globalScene.game.canvas.width / GLOBAL_SCALE : x; const visibleX = x < 0 ? x + globalScene.scaledCanvas.width : x;
const visibleY = y < 0 ? y + globalScene.scaledCanvas.height : y;
const visibleY = y < 0 ? y + globalScene.game.canvas.height / GLOBAL_SCALE : y;
const globalMaskX = visibleX + descX; const globalMaskX = visibleX + descX;
const globalMaskY = visibleY + descY; const globalMaskY = visibleY + descY;
const wrapWidth = (width - (BORDER - 2) * 2 - (options?.onSide ? EFF_WIDTH : 0)) * GLOBAL_SCALE; const wrapWidth = (descBoxWidth - (BORDER - 2) * 2) * 6;
const visibleWidth = width - (BORDER - 2) * 2 - (options?.onSide ? EFF_WIDTH : 0); const visibleWidth = descBoxWidth - (BORDER - 2) * 2;
const visibleHeight = DESC_HEIGHT - (BORDER - 2) * 2; const visibleHeight = DESC_HEIGHT - (BORDER - 2) * 2;
// set up the description; wordWrap uses true pixels, unaffected by any scaling, while other values are affected // set up the description; wordWrap uses true pixels, unaffected by any scaling, while other values are affected

1
src/ui/scrolling-text.ts
View File

@ -27,6 +27,7 @@ export default class ScrollingText extends Phaser.GameObjects.Container {
extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle, extraStyleOptions?: Phaser.Types.GameObjects.Text.TextStyle,
) { ) {
super(scene, x, y); super(scene, x, y);
this.text = addTextObject(0, 0, content, style, extraStyleOptions); this.text = addTextObject(0, 0, content, style, extraStyleOptions);
this.maxLineCount = maxLineCount; this.maxLineCount = maxLineCount;
this.scale_property = scale_property; this.scale_property = scale_property;