mika/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2025-07-03 23:12:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge main

Browse Source
This commit is contained in:
Flashfyre 2024-04-02 12:37:37 -04:00
parent 8743057693
commit 1ee275b944
5 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/images/items.json
View File

@ -6987,6 +6987,6 @@
"meta": { "meta": {
"app": "https://www.codeandweb.com/texturepacker", "app": "https://www.codeandweb.com/texturepacker",
"version": "3.0", "version": "3.0",
"smartupdate": "$TexturePacker:SmartUpdate:8673592d6865d9cdfbb0111f18c94fc1:ea0c9509975a3e104a1e26f20b76d070:110e074689c9edd2c54833ce2e4d9270$" "smartupdate": "$TexturePacker:SmartUpdate:584bee7ab6a26f2fe898751773fcf091:35c932b6e469c017a9daa551701f1da4:110e074689c9edd2c54833ce2e4d9270$"
} }
} }

BIN
public/images/items.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

BIN
public/images/items/linking_cord.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 571 B

After

Width:  |  Height:  |  Size: 795 B

BIN
public/images/items/rb.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 914 B

After

Width:  |  Height:  |  Size: 869 B

2
src/data/move.ts
View File

@ -2143,7 +2143,7 @@ export class AddArenaTagAttr extends MoveEffectAttr {
private failOnOverlap: boolean; private failOnOverlap: boolean;
constructor(tagType: ArenaTagType, turnCount?: integer, failOnOverlap: boolean = false) { constructor(tagType: ArenaTagType, turnCount?: integer, failOnOverlap: boolean = false) {
super(true); super(true, MoveEffectTrigger.POST_APPLY, true);
this.tagType = tagType; this.tagType = tagType;
this.turnCount = turnCount; this.turnCount = turnCount;