mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2024-11-25 08:16:04 +00:00
Revert "Add togglable stat change display"
This reverts commit 718585062b.
This commit is contained in:
Flashfyre
parent
718585062b
commit
8a54e862fc
@ -150,10 +150,6 @@ body {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#touchControls:not([data-ui-mode='COMMAND']):not([data-ui-mode='FIGHT']):not([data-ui-mode='BALL']):not([data-ui-mode='TARGET_SELECT']) #apad #apadStats {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#apad .apadRectBtnContainer + .apadSqBtnContainer {
|
||||
top: calc(var(--controls-size) * -1.9);
|
||||
left: calc(var(--controls-size) * -0.9);
|
||||
|
||||
@ -74,9 +74,6 @@
|
||||
<div id="apadCycleVariant" class="apadSqBtn apadBtn" data-key="CYCLE_VARIANT">
|
||||
<text class="apadLabel apadLabelSmall">V</text>
|
||||
</div>
|
||||
<div id="apadStats" class="apadRectBtn apadBtn" data-key="STATS">
|
||||
<text class="apadLabel apadLabelSmall">Shift</text>
|
||||
</div>
|
||||
<div id="apadMenu" class="apadRectBtn apadBtn" data-key="MENU">
|
||||
<text class="apadLabel apadLabelSmall">Menu</text>
|
||||
</div>
|
||||
|
||||
@ -1,293 +0,0 @@
|
||||
{
|
||||
"textures": [
|
||||
{
|
||||
"image": "pbinfo_stat_numbers.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {
|
||||
"w": 117,
|
||||
"h": 8
|
||||
},
|
||||
"scale": 1,
|
||||
"frames": [
|
||||
{
|
||||
"filename": "+1",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+2",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 9,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+3",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 18,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+4",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 27,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+5",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 36,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+6",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 45,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-1",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 54,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-2",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 63,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-3",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 72,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-4",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 81,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-5",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 90,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-6",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 99,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "0",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 108,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"meta": {
|
||||
"app": "https://www.codeandweb.com/texturepacker",
|
||||
"version": "3.0",
|
||||
"smartupdate": "$TexturePacker:SmartUpdate:794aa4af3291db5abd8a2667626c1998:1a6706ad557b92f9bf099c23e02af4a6:6537c634087637bb27e8a1edb1ee2e35$"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 435 B |
Binary file not shown.
|
Before Width: | Height: | Size: 666 B |
Binary file not shown.
|
Before Width: | Height: | Size: 674 B |
Binary file not shown.
|
Before Width: | Height: | Size: 285 B |
@ -1,188 +0,0 @@
|
||||
{
|
||||
"textures": [
|
||||
{
|
||||
"image": "pbinfo_stat.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {
|
||||
"w": 112,
|
||||
"h": 6
|
||||
},
|
||||
"scale": 1,
|
||||
"frames": [
|
||||
{
|
||||
"filename": "SPATK",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 19,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 1,
|
||||
"y": 2,
|
||||
"w": 18,
|
||||
"h": 6
|
||||
},
|
||||
"frame": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 18,
|
||||
"h": 6
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "SPDEF",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 19,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 1,
|
||||
"y": 2,
|
||||
"w": 18,
|
||||
"h": 6
|
||||
},
|
||||
"frame": {
|
||||
"x": 18,
|
||||
"y": 0,
|
||||
"w": 18,
|
||||
"h": 6
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "CRIT",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 17,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 1,
|
||||
"y": 2,
|
||||
"w": 16,
|
||||
"h": 6
|
||||
},
|
||||
"frame": {
|
||||
"x": 36,
|
||||
"y": 0,
|
||||
"w": 16,
|
||||
"h": 6
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "ACC",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 1,
|
||||
"y": 2,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
},
|
||||
"frame": {
|
||||
"x": 52,
|
||||
"y": 0,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "ATK",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 1,
|
||||
"y": 2,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
},
|
||||
"frame": {
|
||||
"x": 64,
|
||||
"y": 0,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "DEF",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 1,
|
||||
"y": 2,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
},
|
||||
"frame": {
|
||||
"x": 76,
|
||||
"y": 0,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "EVA",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 1,
|
||||
"y": 2,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
},
|
||||
"frame": {
|
||||
"x": 88,
|
||||
"y": 0,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "SPD",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 1,
|
||||
"y": 2,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
},
|
||||
"frame": {
|
||||
"x": 100,
|
||||
"y": 0,
|
||||
"w": 12,
|
||||
"h": 6
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"meta": {
|
||||
"app": "https://www.codeandweb.com/texturepacker",
|
||||
"version": "3.0",
|
||||
"smartupdate": "$TexturePacker:SmartUpdate:40d30205ce8efd40dfa86cd11b0491d6:7076db6ed74199dcfb38fc8cd4d4a0e8:05882267d3999884e0491134e98b1b53$"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 263 B |
@ -1,293 +0,0 @@
|
||||
{
|
||||
"textures": [
|
||||
{
|
||||
"image": "pbinfo_stat_numbers.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {
|
||||
"w": 117,
|
||||
"h": 8
|
||||
},
|
||||
"scale": 1,
|
||||
"frames": [
|
||||
{
|
||||
"filename": "+1",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+2",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 9,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+3",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 18,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+4",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 27,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+5",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 36,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "+6",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 45,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-1",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 54,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-2",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 63,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-3",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 72,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-4",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 81,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-5",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 90,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-6",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 99,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "0",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 108,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"meta": {
|
||||
"app": "https://www.codeandweb.com/texturepacker",
|
||||
"version": "3.0",
|
||||
"smartupdate": "$TexturePacker:SmartUpdate:1f22b7cb085faf9e9764273fa5e70c28:afc5587ebacca78d178ac7e0c434591b:6537c634087637bb27e8a1edb1ee2e35$"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 392 B |
Binary file not shown.
|
Before Width: | Height: | Size: 526 B After Width: | Height: | Size: 554 B |
Binary file not shown.
|
Before Width: | Height: | Size: 257 B |
Binary file not shown.
|
Before Width: | Height: | Size: 851 B After Width: | Height: | Size: 888 B |
Binary file not shown.
|
Before Width: | Height: | Size: 642 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 619 B After Width: | Height: | Size: 654 B |
Binary file not shown.
|
Before Width: | Height: | Size: 860 B After Width: | Height: | Size: 898 B |
Binary file not shown.
|
Before Width: | Height: | Size: 648 B |
Binary file not shown.
|
Before Width: | Height: | Size: 312 B |
Binary file not shown.
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 1.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 1.3 KiB |
@ -1,188 +0,0 @@
|
||||
{
|
||||
"textures": [
|
||||
{
|
||||
"image": "pbinfo_stat.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {
|
||||
"w": 120,
|
||||
"h": 7
|
||||
},
|
||||
"scale": 1,
|
||||
"frames": [
|
||||
{
|
||||
"filename": "SPATK",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 19,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 1,
|
||||
"w": 19,
|
||||
"h": 7
|
||||
},
|
||||
"frame": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 19,
|
||||
"h": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "SPDEF",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 19,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 1,
|
||||
"w": 19,
|
||||
"h": 7
|
||||
},
|
||||
"frame": {
|
||||
"x": 19,
|
||||
"y": 0,
|
||||
"w": 19,
|
||||
"h": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "CRIT",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 17,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 1,
|
||||
"w": 17,
|
||||
"h": 7
|
||||
},
|
||||
"frame": {
|
||||
"x": 38,
|
||||
"y": 0,
|
||||
"w": 17,
|
||||
"h": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "ACC",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 1,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
},
|
||||
"frame": {
|
||||
"x": 55,
|
||||
"y": 0,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "ATK",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 1,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
},
|
||||
"frame": {
|
||||
"x": 68,
|
||||
"y": 0,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "DEF",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 1,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
},
|
||||
"frame": {
|
||||
"x": 81,
|
||||
"y": 0,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "EVA",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 1,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
},
|
||||
"frame": {
|
||||
"x": 94,
|
||||
"y": 0,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "SPD",
|
||||
"rotated": false,
|
||||
"trimmed": true,
|
||||
"sourceSize": {
|
||||
"w": 13,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 1,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
},
|
||||
"frame": {
|
||||
"x": 107,
|
||||
"y": 0,
|
||||
"w": 13,
|
||||
"h": 7
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"meta": {
|
||||
"app": "https://www.codeandweb.com/texturepacker",
|
||||
"version": "3.0",
|
||||
"smartupdate": "$TexturePacker:SmartUpdate:86fbd1b45d46271597a7d9de482aaa74:df702dd9d88db50369f1a096f82fd915:05882267d3999884e0491134e98b1b53$"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 278 B |
@ -1,293 +0,0 @@
|
||||
{
|
||||
"textures": [
|
||||
{
|
||||
"image": "pbinfo_stat_numbers.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {
|
||||
"w": 117,
|
||||
"h": 8
|
||||
},
|
||||
"scale": 1,
|
||||
"frames": [
|
||||
{
|
||||
"filename": "1",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "2",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 9,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "3",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 18,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "4",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 27,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "5",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 36,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "6",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 45,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-1",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 54,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-2",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 63,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-3",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 72,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-4",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 81,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-5",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 90,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "-6",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 99,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
},
|
||||
{
|
||||
"filename": "0",
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"sourceSize": {
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"spriteSourceSize": {
|
||||
"x": 0,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
},
|
||||
"frame": {
|
||||
"x": 108,
|
||||
"y": 0,
|
||||
"w": 9,
|
||||
"h": 8
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"meta": {
|
||||
"app": "https://www.codeandweb.com/texturepacker",
|
||||
"version": "3.0",
|
||||
"smartupdate": "$TexturePacker:SmartUpdate:b0719fae0d9b670a727148cdc7202249:afc5587ebacca78d178ac7e0c434591b:4825a9f02f72f1fe28a724c6c5dffb37$"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 430 B |
@ -85,7 +85,6 @@ export enum Button {
|
||||
ACTION,
|
||||
CANCEL,
|
||||
MENU,
|
||||
STATS,
|
||||
CYCLE_SHINY,
|
||||
CYCLE_FORM,
|
||||
CYCLE_GENDER,
|
||||
@ -205,8 +204,7 @@ export default class BattleScene extends SceneBase {
|
||||
[Button.SUBMIT]: 17, // touchpad
|
||||
[Button.ACTION]: 0, // X
|
||||
[Button.CANCEL]: 1, // O
|
||||
[Button.MENU]: 8, // share
|
||||
[Button.STATS]: 9, // options
|
||||
[Button.MENU]: 9, // options
|
||||
[Button.CYCLE_SHINY]: 5, // RB
|
||||
[Button.CYCLE_FORM]: 4, // LB
|
||||
[Button.CYCLE_GENDER]: 6, // LT
|
||||
@ -617,7 +615,6 @@ export default class BattleScene extends SceneBase {
|
||||
[Button.ACTION]: [keyCodes.SPACE, keyCodes.ENTER, keyCodes.Z],
|
||||
[Button.CANCEL]: [keyCodes.BACKSPACE, keyCodes.X],
|
||||
[Button.MENU]: [keyCodes.ESC, keyCodes.M],
|
||||
[Button.STATS]: [keyCodes.SHIFT],
|
||||
[Button.CYCLE_SHINY]: [keyCodes.R],
|
||||
[Button.CYCLE_FORM]: [keyCodes.F],
|
||||
[Button.CYCLE_GENDER]: [keyCodes.G],
|
||||
@ -1435,16 +1432,8 @@ export default class BattleScene extends SceneBase {
|
||||
if (this.ui?.getMode() === Mode.SETTINGS)
|
||||
(this.ui.getHandler() as SettingsUiHandler).show([]);
|
||||
}
|
||||
} else {
|
||||
let pressed = false;
|
||||
if (this.buttonJustReleased(Button.STATS) || (pressed = this.buttonJustPressed(Button.STATS))) {
|
||||
for (let p of this.getField().filter(p => p))
|
||||
p.toggleStats(pressed);
|
||||
if (pressed)
|
||||
this.setLastProcessedMovementTime(Button.STATS);
|
||||
} else
|
||||
return;
|
||||
}
|
||||
if (inputSuccess && this.enableVibration && typeof navigator.vibrate !== 'undefined')
|
||||
navigator.vibrate(vibrationLength || 10);
|
||||
}
|
||||
@ -1474,23 +1463,6 @@ export default class BattleScene extends SceneBase {
|
||||
return this.buttonKeys[button].some(k => Phaser.Input.Keyboard.JustDown(k)) || this.gamepadButtonJustDown(gamepad?.buttons[this.gamepadKeyConfig[button]]);
|
||||
}
|
||||
|
||||
/**
|
||||
* gamepadButtonJustUp returns true if @param button has just been released
|
||||
* or not. It will only return true once, until the key is released and pressed down
|
||||
* again.
|
||||
*/
|
||||
gamepadButtonJustUp(button: Phaser.Input.Gamepad.Button): boolean {
|
||||
if (!button || !this.gamepadSupport)
|
||||
return false;
|
||||
|
||||
return !this.gamepadButtonStates[button.index];
|
||||
}
|
||||
|
||||
buttonJustReleased(button: Button): boolean {
|
||||
const gamepad = this.input.gamepad?.gamepads[0];
|
||||
return this.buttonKeys[button].some(k => Phaser.Input.Keyboard.JustUp(k)) || this.gamepadButtonJustUp(gamepad?.buttons[this.gamepadKeyConfig[button]]);
|
||||
}
|
||||
|
||||
/**
|
||||
* repeatInputDurationJustPassed returns true if @param button has been held down long
|
||||
* enough to fire a repeated input. A button must claim the movementButtonLock before
|
||||
|
||||
@ -33,5 +33,6 @@ splashMessages.push(...[
|
||||
'Also Try Emerald Rogue!',
|
||||
'Also Try Radical Red!',
|
||||
'Eevee Expo!',
|
||||
'YNOproject!'
|
||||
'YNOproject!',
|
||||
'Shh, don\'t tell Sam!'
|
||||
]);
|
||||
@ -1179,10 +1179,6 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container {
|
||||
return this.battleInfo.updateInfo(this, instant);
|
||||
}
|
||||
|
||||
toggleStats(visible: boolean): void {
|
||||
this.battleInfo.toggleStats(visible);
|
||||
}
|
||||
|
||||
addExp(exp: integer) {
|
||||
const maxExpLevel = this.scene.getMaxExpLevel();
|
||||
const initialExp = this.exp;
|
||||
|
||||
@ -39,21 +39,15 @@ export class LoadingScene extends SceneBase {
|
||||
}
|
||||
this.loadAtlas('namebox', 'ui');
|
||||
this.loadImage('pbinfo_player', 'ui');
|
||||
this.loadImage('pbinfo_player_stats', 'ui');
|
||||
this.loadImage('pbinfo_player_mini', 'ui');
|
||||
this.loadImage('pbinfo_player_mini_stats', 'ui');
|
||||
this.loadAtlas('pbinfo_player_type', 'ui');
|
||||
this.loadAtlas('pbinfo_player_type1', 'ui');
|
||||
this.loadAtlas('pbinfo_player_type2', 'ui');
|
||||
this.loadImage('pbinfo_enemy_mini', 'ui');
|
||||
this.loadImage('pbinfo_enemy_mini_stats', 'ui');
|
||||
this.loadImage('pbinfo_enemy_boss', 'ui');
|
||||
this.loadImage('pbinfo_enemy_boss_stats', 'ui');
|
||||
this.loadAtlas('pbinfo_enemy_type', 'ui');
|
||||
this.loadAtlas('pbinfo_enemy_type1', 'ui');
|
||||
this.loadAtlas('pbinfo_enemy_type2', 'ui');
|
||||
this.loadAtlas('pbinfo_stat', 'ui');
|
||||
this.loadAtlas('pbinfo_stat_numbers', 'ui');
|
||||
this.loadImage('overlay_lv', 'ui');
|
||||
this.loadAtlas('numbers', 'ui');
|
||||
this.loadAtlas('numbers_red', 'ui');
|
||||
|
||||
@ -20,10 +20,6 @@ export const tutorial: SimpleTranslationEntries = {
|
||||
"pokerus": `A daily random 3 selectable starters have a purple border.
|
||||
$If you see a starter you own with one of these,\ntry adding it to your party. Be sure to check its summary!`,
|
||||
|
||||
"statChange": `Stat changes persist across battles as long as your Pokémon aren't recalled.
|
||||
$Your Pokémon are recalled before a trainer battle and before entering a new biome.
|
||||
$You can also view the stat changes for the Pokémon on the field by holding shift.`,
|
||||
|
||||
"selectItem": `After every battle, you are given a choice of 3 random items.\nYou may only pick one.
|
||||
$These range from consumables, to Pokémon held items, to passive permanent items.
|
||||
$Most non-consumable item effects will stack in various ways.
|
||||
|
||||
@ -20,10 +20,6 @@ export const tutorial: SimpleTranslationEntries = {
|
||||
"pokerus": `A daily random 3 selectable starters have a purple border.
|
||||
$If you see a starter you own with one of these,\ntry adding it to your party. Be sure to check its summary!`,
|
||||
|
||||
"statChange": `Stat changes persist across battles as long as your Pokémon aren't recalled.
|
||||
$Your Pokémon are recalled before a trainer battle and before entering a new biome.
|
||||
$You can also view the stat changes for the Pokémon on the field by holding shift.`,
|
||||
|
||||
"selectItem": `After every battle, you are given a choice of 3 random items.\nYou may only pick one.
|
||||
$These range from consumables, to Pokémon held items, to passive permanent items.
|
||||
$Most non-consumable item effects will stack in various ways.
|
||||
|
||||
@ -20,10 +20,6 @@ export const tutorial: SimpleTranslationEntries = {
|
||||
"pokerus": `A daily random 3 selectable starters have a purple border.
|
||||
$If you see a starter you own with one of these,\ntry adding it to your party. Be sure to check its summary!`,
|
||||
|
||||
"statChange": `Stat changes persist across battles as long as your Pokémon aren't recalled.
|
||||
$Your Pokémon are recalled before a trainer battle and before entering a new biome.
|
||||
$You can also view the stat changes for the Pokémon on the field by holding shift.`,
|
||||
|
||||
"selectItem": `After every battle, you are given a choice of 3 random items.\nYou may only pick one.
|
||||
$These range from consumables, to Pokémon held items, to passive permanent items.
|
||||
$Most non-consumable item effects will stack in various ways.
|
||||
|
||||
@ -25,10 +25,6 @@ export const tutorial: SimpleTranslationEntries = {
|
||||
$violet. Si un starter que vous possédez l’a, essayez de
|
||||
$ l’ajouter à votre équipe. Vérifiez bien son résumé !`,
|
||||
|
||||
"statChange": `Stat changes persist across battles as long as your Pokémon aren't recalled.
|
||||
$Your Pokémon are recalled before a trainer battle and before entering a new biome.
|
||||
$You can also view the stat changes for the Pokémon on the field by holding shift.`,
|
||||
|
||||
"selectItem": `Après chaque combat, vous avez le choix entre 3 objets\ntirés au sort. Vous ne pouvez en prendre qu’un.
|
||||
$Cela peut être des objets consommables, des objets à\nfaire tenir, ou des objets passifs aux effets permanents.
|
||||
$La plupart des effets des objets non-consommables se cumuleront de diverses manières.
|
||||
|
||||
@ -20,10 +20,6 @@ export const tutorial: SimpleTranslationEntries = {
|
||||
"pokerus": `A daily random 3 selectable starters have a purple border.
|
||||
$If you see a starter you own with one of these,\ntry adding it to your party. Be sure to check its summary!`,
|
||||
|
||||
"statChange": `Stat changes persist across battles as long as your Pokémon aren't recalled.
|
||||
$Your Pokémon are recalled before a trainer battle and before entering a new biome.
|
||||
$You can also view the stat changes for the Pokémon on the field by holding shift.`,
|
||||
|
||||
"selectItem": `After every battle, you are given a choice of 3 random items.\nYou may only pick one.
|
||||
$These range from consumables, to Pokémon held items, to passive permanent items.
|
||||
$Most non-consumable item effects will stack in various ways.
|
||||
|
||||
@ -2671,6 +2671,7 @@ export class StatChangePhase extends PokemonPhase {
|
||||
|
||||
let random = false;
|
||||
|
||||
const allStats = Utils.getEnumValues(BattleStat);
|
||||
if (this.stats.length === 1 && this.stats[0] === BattleStat.RAND) {
|
||||
this.stats[0] = this.getRandomStat();
|
||||
random = true;
|
||||
@ -2711,11 +2712,8 @@ export class StatChangePhase extends PokemonPhase {
|
||||
for (let stat of filteredStats)
|
||||
pokemon.summonData.battleStats[stat] = Math.max(Math.min(pokemon.summonData.battleStats[stat] + levels.value, 6), -6);
|
||||
|
||||
applyPostStatChangeAbAttrs(PostStatChangeAbAttr, pokemon, filteredStats, this.levels, this.selfTarget);
|
||||
|
||||
pokemon.updateInfo();
|
||||
|
||||
handleTutorial(this.scene, Tutorial.Stat_Change).then(() => super.end());
|
||||
applyPostStatChangeAbAttrs(PostStatChangeAbAttr, pokemon, filteredStats, this.levels, this.selfTarget)
|
||||
this.end();
|
||||
};
|
||||
|
||||
if (relLevels.filter(l => l).length && this.scene.moveAnimations) {
|
||||
@ -3339,7 +3337,7 @@ export class TrainerVictoryPhase extends BattlePhase {
|
||||
const trainerType = this.scene.currentBattle.trainer.config.trainerType;
|
||||
if (vouchers.hasOwnProperty(TrainerType[trainerType])) {
|
||||
if (!this.scene.validateVoucher(vouchers[TrainerType[trainerType]]) && this.scene.currentBattle.trainer.config.isBoss)
|
||||
this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [ modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
|
||||
this.scene.pushPhase(new ModifierRewardPhase(this.scene, modifierTypes.VOUCHER));
|
||||
}
|
||||
|
||||
this.scene.ui.showText(i18next.t('menu:trainerDefeated', { trainerName: this.scene.currentBattle.trainer.getName(TrainerSlot.NONE, true) }), null, () => {
|
||||
|
||||
@ -9,7 +9,6 @@ export enum Tutorial {
|
||||
Menu = "MENU",
|
||||
Starter_Select = "STARTER_SELECT",
|
||||
Pokerus = "POKERUS",
|
||||
Stat_Change = "STAT_CHANGE",
|
||||
Select_Item = "SELECT_ITEM",
|
||||
Egg_Gacha = "EGG_GACHA"
|
||||
}
|
||||
@ -43,11 +42,6 @@ const tutorialHandlers = {
|
||||
scene.ui.showText(i18next.t("tutorial:pokerus"), null, () => scene.ui.showText('', null, () => resolve()), null, true);
|
||||
});
|
||||
},
|
||||
[Tutorial.Stat_Change]: (scene: BattleScene) => {
|
||||
return new Promise<void>(resolve => {
|
||||
scene.showFieldOverlay(1000).then(() => scene.ui.showText(i18next.t("tutorial:statChange"), null, () => scene.ui.showText('', null, () => scene.hideFieldOverlay(1000).then(() => resolve())), null, true));
|
||||
});
|
||||
},
|
||||
[Tutorial.Select_Item]: (scene: BattleScene) => {
|
||||
return new Promise<void>(resolve => {
|
||||
scene.ui.setModeWithoutClear(Mode.MESSAGE).then(() => {
|
||||
|
||||
@ -7,9 +7,6 @@ import { StatusEffect } from '../data/status-effect';
|
||||
import BattleScene from '../battle-scene';
|
||||
import { Type, getTypeRgb } from '../data/type';
|
||||
import { getVariantTint } from '#app/data/variant';
|
||||
import { BattleStat } from '#app/data/battle-stat';
|
||||
|
||||
const battleStatOrder = [ BattleStat.ATK, BattleStat.DEF, BattleStat.SPATK, BattleStat.SPDEF, BattleStat.ACC, BattleStat.EVA, BattleStat.SPD ];
|
||||
|
||||
export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
private player: boolean;
|
||||
@ -27,7 +24,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
private lastLevelExp: integer;
|
||||
private lastLevel: integer;
|
||||
private lastLevelCapped: boolean;
|
||||
private lastBattleStats: string;
|
||||
|
||||
private box: Phaser.GameObjects.Sprite;
|
||||
private nameText: Phaser.GameObjects.Text;
|
||||
@ -50,11 +46,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
|
||||
public expMaskRect: Phaser.GameObjects.Graphics;
|
||||
|
||||
private statsContainer: Phaser.GameObjects.Container;
|
||||
private statsBox: Phaser.GameObjects.Sprite;
|
||||
private statValuesContainer: Phaser.GameObjects.Container;
|
||||
private statNumbers: Phaser.GameObjects.Sprite[];
|
||||
|
||||
constructor(scene: Phaser.Scene, x: number, y: number, player: boolean) {
|
||||
super(scene, x, y);
|
||||
this.player = player;
|
||||
@ -147,6 +138,18 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
this.levelNumbersContainer = this.scene.add.container(9.5, (this.scene as BattleScene).uiTheme ? 0 : -0.5);
|
||||
this.levelContainer.add(this.levelNumbersContainer);
|
||||
|
||||
this.type1Icon = this.scene.add.sprite(player ? -139 : -15, player ? -17 : -15.5, `pbinfo_${player ? 'player' : 'enemy'}_type1`);
|
||||
this.type1Icon.setOrigin(0, 0);
|
||||
this.add(this.type1Icon);
|
||||
|
||||
this.type2Icon = this.scene.add.sprite(player ? -139 : -15, player ? -1 : -2.5, `pbinfo_${player ? 'player' : 'enemy'}_type2`);
|
||||
this.type2Icon.setOrigin(0, 0);
|
||||
this.add(this.type2Icon);
|
||||
|
||||
this.type3Icon = this.scene.add.sprite(player ? -154 : 0, player ? -17 : -15.5, `pbinfo_${player ? 'player' : 'enemy'}_type`);
|
||||
this.type3Icon.setOrigin(0, 0);
|
||||
this.add(this.type3Icon);
|
||||
|
||||
if (this.player) {
|
||||
this.hpNumbersContainer = this.scene.add.container(-15, 10);
|
||||
this.add(this.hpNumbersContainer);
|
||||
@ -168,46 +171,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
this.expBar = expBar;
|
||||
this.expMaskRect = expMaskRect;
|
||||
}
|
||||
|
||||
this.statsContainer = this.scene.add.container(0, 0);
|
||||
this.statsContainer.setAlpha(0);
|
||||
this.add(this.statsContainer);
|
||||
|
||||
this.statsBox = this.scene.add.sprite(0, 0, `${this.getTextureName()}_stats`);
|
||||
this.statsBox.setOrigin(1, 0.5);
|
||||
this.statsContainer.add(this.statsBox);
|
||||
|
||||
const statLabels: Phaser.GameObjects.Sprite[] = [];
|
||||
this.statNumbers = [];
|
||||
|
||||
this.statValuesContainer = this.scene.add.container(0, 0);
|
||||
this.statsContainer.add(this.statValuesContainer);
|
||||
|
||||
battleStatOrder.map((s, i) => {
|
||||
const statX = i > 1 ? this.statNumbers[i - 2].x + this.statNumbers[i - 2].width + 4 : -this.statsBox.width + 8;
|
||||
const statY = -this.statsBox.height / 2 + 4 + (i < battleStatOrder.length - 1 ? (i % 2 ? 10 : 0) : 5);
|
||||
const statLabel = this.scene.add.sprite(statX, statY, 'pbinfo_stat', BattleStat[s]);
|
||||
statLabel.setOrigin(0, 0);
|
||||
statLabels.push(statLabel);
|
||||
this.statValuesContainer.add(statLabel);
|
||||
|
||||
const statNumber = this.scene.add.sprite(statX + statLabel.width, statY, 'pbinfo_stat_numbers', '3');
|
||||
statNumber.setOrigin(0, 0);
|
||||
this.statNumbers.push(statNumber);
|
||||
this.statValuesContainer.add(statNumber);
|
||||
});
|
||||
|
||||
this.type1Icon = this.scene.add.sprite(player ? -139 : -15, player ? -17 : -15.5, `pbinfo_${player ? 'player' : 'enemy'}_type1`);
|
||||
this.type1Icon.setOrigin(0, 0);
|
||||
this.add(this.type1Icon);
|
||||
|
||||
this.type2Icon = this.scene.add.sprite(player ? -139 : -15, player ? -1 : -2.5, `pbinfo_${player ? 'player' : 'enemy'}_type2`);
|
||||
this.type2Icon.setOrigin(0, 0);
|
||||
this.add(this.type2Icon);
|
||||
|
||||
this.type3Icon = this.scene.add.sprite(player ? -154 : 0, player ? -17 : -15.5, `pbinfo_${player ? 'player' : 'enemy'}_type`);
|
||||
this.type3Icon.setOrigin(0, 0);
|
||||
this.add(this.type3Icon);
|
||||
}
|
||||
|
||||
initInfo(pokemon: Pokemon) {
|
||||
@ -295,14 +258,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
this.expMaskRect.x = (pokemon.levelExp / getLevelTotalExp(pokemon.level, pokemon.species.growthRate)) * 510;
|
||||
this.lastExp = pokemon.exp;
|
||||
this.lastLevelExp = pokemon.levelExp;
|
||||
|
||||
this.statValuesContainer.setPosition(8, 7)
|
||||
}
|
||||
|
||||
const battleStats = battleStatOrder.map(() => 0);
|
||||
|
||||
this.lastBattleStats = battleStats.join('');
|
||||
this.updateBattleStats(battleStats);
|
||||
}
|
||||
|
||||
getTextureName(): string {
|
||||
@ -316,7 +272,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
this.mini = mini;
|
||||
|
||||
this.box.setTexture(this.getTextureName());
|
||||
this.statsBox.setTexture(`${this.getTextureName()}_stats`);
|
||||
|
||||
if (this.player)
|
||||
this.y -= 12 * (mini ? 1 : -1);
|
||||
@ -329,34 +284,21 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
el.y += -8 * (mini ? 1 : -1);
|
||||
});
|
||||
|
||||
this.statValuesContainer.x += 2 * (mini ? 1 : -1);
|
||||
this.statValuesContainer.y += -7 * (mini ? 1 : -1);
|
||||
|
||||
const toggledElements = [ this.hpNumbersContainer, this.expBar ];
|
||||
toggledElements.forEach(el => el.setVisible(!mini));
|
||||
}
|
||||
|
||||
toggleStats(visible: boolean): void {
|
||||
this.scene.tweens.add({
|
||||
targets: this.statsContainer,
|
||||
duration: Utils.fixedInt(125),
|
||||
ease: 'Sine.easeInOut',
|
||||
alpha: visible ? 1 : 0
|
||||
});
|
||||
}
|
||||
|
||||
updateBossSegments(pokemon: EnemyPokemon): void {
|
||||
const boss = !!pokemon.bossSegments;
|
||||
|
||||
if (boss !== this.boss) {
|
||||
this.boss = boss;
|
||||
|
||||
[ this.nameText, this.genderText, this.teraIcon, this.splicedIcon, this.shinyIcon, this.ownedIcon, this.statusIndicator, this.levelContainer, this.statValuesContainer ].map(e => e.x += 48 * (boss ? -1 : 1));
|
||||
[ this.nameText, this.genderText, this.teraIcon, this.splicedIcon, this.shinyIcon, this.ownedIcon, this.statusIndicator, this.levelContainer ].map(e => e.x += 48 * (boss ? -1 : 1));
|
||||
this.hpBar.x += 38 * (boss ? -1 : 1);
|
||||
this.hpBar.y += 2 * (this.boss ? -1 : 1);
|
||||
this.hpBar.setTexture(`overlay_hp${boss ? '_boss' : ''}`);
|
||||
this.box.setTexture(this.getTextureName());
|
||||
this.statsBox.setTexture(`${this.getTextureName()}_stats`);
|
||||
}
|
||||
|
||||
this.bossSegments = boss ? pokemon.bossSegments : 0;
|
||||
@ -375,7 +317,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
const divider = this.scene.add.rectangle(0, 0, 1, this.hpBar.height - (uiTheme ? 0 : 1), pokemon.bossSegmentIndex >= s ? 0xFFFFFF : 0x404040)
|
||||
divider.setOrigin(0.5, 0);
|
||||
this.add(divider);
|
||||
this.moveBelow(divider as Phaser.GameObjects.GameObject, this.statsContainer);
|
||||
|
||||
divider.setPositionRelative(this.hpBar, dividerX, uiTheme ? 0 : 1);
|
||||
this.hpBarSegmentDividers.push(divider);
|
||||
@ -498,11 +439,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
this.lastLevel = pokemon.level;
|
||||
}
|
||||
|
||||
const battleStats = pokemon.summonData.battleStats.join('');
|
||||
|
||||
if (this.lastBattleStats !== battleStats)
|
||||
this.updateBattleStats(pokemon.summonData.battleStats);
|
||||
|
||||
this.shinyIcon.setVisible(pokemon.isShiny());
|
||||
|
||||
resolve();
|
||||
@ -577,7 +513,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
});
|
||||
}
|
||||
|
||||
setLevel(level: integer): void {
|
||||
setLevel(level: integer) {
|
||||
const isCapped = level >= (this.scene as BattleScene).getMaxExpLevel();
|
||||
this.levelNumbersContainer.removeAll(true);
|
||||
const levelStr = level.toString();
|
||||
@ -586,7 +522,7 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
this.levelContainer.setX((this.player ? -41 : -50) - 8 * Math.max(levelStr.length - 3, 0));
|
||||
}
|
||||
|
||||
setHpNumbers(hp: integer, maxHp: integer): void {
|
||||
setHpNumbers(hp: integer, maxHp: integer) {
|
||||
if (!this.player || !this.scene)
|
||||
return;
|
||||
this.hpNumbersContainer.removeAll(true);
|
||||
@ -599,12 +535,6 @@ export default class BattleInfo extends Phaser.GameObjects.Container {
|
||||
for (let i = hpStr.length - 1; i >= 0; i--)
|
||||
this.hpNumbersContainer.add(this.scene.add.image(offset++ * -8, 0, 'numbers', hpStr[i]));
|
||||
}
|
||||
|
||||
updateBattleStats(battleStats: integer[]): void {
|
||||
battleStatOrder.map((s, i) => {
|
||||
this.statNumbers[i].setFrame(battleStats[s].toString());
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
export class PlayerBattleInfo extends BattleInfo {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user