Add PP to move summary
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1.3 KiB |
|
@ -4,7 +4,7 @@
|
||||||
"image": "summary_moves_cursor.png",
|
"image": "summary_moves_cursor.png",
|
||||||
"format": "RGBA8888",
|
"format": "RGBA8888",
|
||||||
"size": {
|
"size": {
|
||||||
"w": 156,
|
"w": 208,
|
||||||
"h": 32
|
"h": 32
|
||||||
},
|
},
|
||||||
"scale": 1,
|
"scale": 1,
|
||||||
|
@ -14,19 +14,19 @@
|
||||||
"rotated": false,
|
"rotated": false,
|
||||||
"trimmed": false,
|
"trimmed": false,
|
||||||
"sourceSize": {
|
"sourceSize": {
|
||||||
"w": 146,
|
"w": 208,
|
||||||
"h": 16
|
"h": 16
|
||||||
},
|
},
|
||||||
"spriteSourceSize": {
|
"spriteSourceSize": {
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
"w": 156,
|
"w": 208,
|
||||||
"h": 16
|
"h": 16
|
||||||
},
|
},
|
||||||
"frame": {
|
"frame": {
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
"w": 156,
|
"w": 208,
|
||||||
"h": 16
|
"h": 16
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -35,19 +35,19 @@
|
||||||
"rotated": false,
|
"rotated": false,
|
||||||
"trimmed": false,
|
"trimmed": false,
|
||||||
"sourceSize": {
|
"sourceSize": {
|
||||||
"w": 156,
|
"w": 208,
|
||||||
"h": 16
|
"h": 16
|
||||||
},
|
},
|
||||||
"spriteSourceSize": {
|
"spriteSourceSize": {
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 0,
|
"y": 0,
|
||||||
"w": 156,
|
"w": 208,
|
||||||
"h": 16
|
"h": 16
|
||||||
},
|
},
|
||||||
"frame": {
|
"frame": {
|
||||||
"x": 0,
|
"x": 0,
|
||||||
"y": 16,
|
"y": 16,
|
||||||
"w": 156,
|
"w": 208,
|
||||||
"h": 16
|
"h": 16
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 154 B After Width: | Height: | Size: 166 B |
Before Width: | Height: | Size: 205 B After Width: | Height: | Size: 209 B |
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.5 KiB |
|
@ -322,10 +322,10 @@ export default class SummaryUiHandler extends UiHandler {
|
||||||
this.moveCursorObj.setVisible(true);
|
this.moveCursorObj.setVisible(true);
|
||||||
this.moveCursorBlinkTimer = this.scene.time.addEvent({
|
this.moveCursorBlinkTimer = this.scene.time.addEvent({
|
||||||
loop: true,
|
loop: true,
|
||||||
delay: 600,
|
delay: new Utils.FixedInt(600) as unknown as integer,
|
||||||
callback: () => {
|
callback: () => {
|
||||||
this.moveCursorObj.setVisible(false);
|
this.moveCursorObj.setVisible(false);
|
||||||
this.scene.time.delayedCall(100, () => {
|
this.scene.time.delayedCall(new Utils.FixedInt(100) as unknown as integer, () => {
|
||||||
if (!this.moveCursorObj)
|
if (!this.moveCursorObj)
|
||||||
return;
|
return;
|
||||||
this.moveCursorObj.setVisible(true);
|
this.moveCursorObj.setVisible(true);
|
||||||
|
@ -414,6 +414,15 @@ export default class SummaryUiHandler extends UiHandler {
|
||||||
const newMoveTypeIcon = this.scene.add.sprite(0, 0, 'types', Type[this.newMove.type].toLowerCase());
|
const newMoveTypeIcon = this.scene.add.sprite(0, 0, 'types', Type[this.newMove.type].toLowerCase());
|
||||||
newMoveTypeIcon.setOrigin(0, 1);
|
newMoveTypeIcon.setOrigin(0, 1);
|
||||||
this.extraMoveRowContainer.add(newMoveTypeIcon);
|
this.extraMoveRowContainer.add(newMoveTypeIcon);
|
||||||
|
|
||||||
|
const ppOverlay = this.scene.add.image(163, -1, 'summary_moves_overlay_pp');
|
||||||
|
ppOverlay.setOrigin(0, 1);
|
||||||
|
this.extraMoveRowContainer.add(ppOverlay);
|
||||||
|
|
||||||
|
const pp = Utils.padInt(this.newMove.pp, 2, ' ');
|
||||||
|
const ppText = addTextObject(this.scene, 173, 1, `${pp}/${pp}`, TextStyle.WINDOW);
|
||||||
|
ppText.setOrigin(0, 1);
|
||||||
|
this.extraMoveRowContainer.add(ppText);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.moveRowsContainer = this.scene.add.container(0, 0);
|
this.moveRowsContainer = this.scene.add.container(0, 0);
|
||||||
|
@ -433,16 +442,31 @@ export default class SummaryUiHandler extends UiHandler {
|
||||||
const moveText = addTextObject(this.scene, 35, 0, move ? move.getName() : '-', TextStyle.SUMMARY);
|
const moveText = addTextObject(this.scene, 35, 0, move ? move.getName() : '-', TextStyle.SUMMARY);
|
||||||
moveText.setOrigin(0, 1);
|
moveText.setOrigin(0, 1);
|
||||||
moveRowContainer.add(moveText);
|
moveRowContainer.add(moveText);
|
||||||
|
|
||||||
|
const ppOverlay = this.scene.add.image(163, -1, 'summary_moves_overlay_pp');
|
||||||
|
ppOverlay.setOrigin(0, 1);
|
||||||
|
moveRowContainer.add(ppOverlay);
|
||||||
|
|
||||||
|
const ppText = addTextObject(this.scene, 173, 1, '--/--', TextStyle.WINDOW);
|
||||||
|
ppText.setOrigin(0, 1);
|
||||||
|
|
||||||
|
if (move) {
|
||||||
|
const maxPP = move.getMove().pp + move.ppUp;
|
||||||
|
const pp = maxPP - move.ppUsed;
|
||||||
|
ppText.setText(`${Utils.padInt(pp, 2, ' ')}/${Utils.padInt(maxPP, 2, ' ')}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.moveDescriptionText = addTextObject(this.scene, 2, 84, '', TextStyle.WINDOW, { wordWrap: { width: 900 } });
|
moveRowContainer.add(ppText);
|
||||||
|
}
|
||||||
|
|
||||||
|
this.moveDescriptionText = addTextObject(this.scene, 2, 84, '', TextStyle.WINDOW, { wordWrap: { width: 1212 } });
|
||||||
this.movesContainer.add(this.moveDescriptionText);
|
this.movesContainer.add(this.moveDescriptionText);
|
||||||
|
|
||||||
const maskRect = this.scene.make.graphics({});
|
const maskRect = this.scene.make.graphics({});
|
||||||
maskRect.setScale(6);
|
maskRect.setScale(6);
|
||||||
maskRect.fillStyle(0xFFFFFF);
|
maskRect.fillStyle(0xFFFFFF);
|
||||||
maskRect.beginPath();
|
maskRect.beginPath();
|
||||||
maskRect.fillRect(112, 130, 150, 46);
|
maskRect.fillRect(112, 130, 202, 46);
|
||||||
|
|
||||||
const moveDescriptionTextMask = maskRect.createGeometryMask();
|
const moveDescriptionTextMask = maskRect.createGeometryMask();
|
||||||
|
|
||||||
|
|