From 140e759486f90dc5796093ef774c436c1c5565f9 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Fri, 28 Apr 2023 16:35:03 -0400 Subject: [PATCH] Repurpose Oval Charm for multiple participant EXP bonus --- public/images/items.json | 3177 ++++++++++++------------ public/images/items.png | Bin 21858 -> 22209 bytes public/images/items/catching_charm.png | Bin 0 -> 454 bytes public/images/items/shed_shell.png | Bin 0 -> 298 bytes public/images/items/stick.png | Bin 0 -> 230 bytes src/battle-phases.ts | 7 +- src/battle-scene.ts | 7 +- src/modifier/modifier-type.ts | 12 +- src/modifier/modifier.ts | 43 +- 9 files changed, 1643 insertions(+), 1603 deletions(-) create mode 100644 public/images/items/catching_charm.png create mode 100644 public/images/items/shed_shell.png create mode 100644 public/images/items/stick.png diff --git a/public/images/items.json b/public/images/items.json index 51a8847ba73..7a3dde0e1a2 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -4,8 +4,8 @@ "image": "items.png", "format": "RGBA8888", "size": { - "w": 260, - "h": 260 + "w": 259, + "h": 259 }, "scale": 1, "frames": [ @@ -325,7 +325,7 @@ } }, { - "filename": "elixir", + "filename": "catching_charm", "rotated": false, "trimmed": true, "sourceSize": { @@ -333,57 +333,15 @@ "h": 32 }, "spriteSourceSize": { - "x": 7, + "x": 5, "y": 4, - "w": 18, + "w": 21, "h": 24 }, "frame": { "x": 0, "y": 79, - "w": 18, - "h": 24 - } - }, - { - "filename": "ether", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 0, - "y": 103, - "w": 18, - "h": 24 - } - }, - { - "filename": "full_restore", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 0, - "y": 127, - "w": 18, + "w": 21, "h": 24 } }, @@ -403,7 +361,7 @@ }, "frame": { "x": 0, - "y": 151, + "y": 103, "w": 23, "h": 24 } @@ -424,7 +382,7 @@ }, "frame": { "x": 0, - "y": 175, + "y": 127, "w": 23, "h": 24 } @@ -445,7 +403,7 @@ }, "frame": { "x": 0, - "y": 199, + "y": 151, "w": 23, "h": 23 } @@ -466,158 +424,11 @@ }, "frame": { "x": 0, - "y": 222, + "y": 174, "w": 22, "h": 24 } }, - { - "filename": "rare_candy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 18, - "y": 72, - "w": 23, - "h": 23 - } - }, - { - "filename": "rarer_candy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 23, - "h": 23 - }, - "frame": { - "x": 18, - "y": 95, - "w": 23, - "h": 23 - } - }, - { - "filename": "twisted_spoon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 24, - "h": 23 - }, - "frame": { - "x": 18, - "y": 118, - "w": 24, - "h": 23 - } - }, - { - "filename": "apicot_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 51, - "y": 31, - "w": 19, - "h": 20 - } - }, - { - "filename": "exp_balance", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 24, - "h": 22 - }, - "frame": { - "x": 70, - "y": 24, - "w": 24, - "h": 22 - } - }, - { - "filename": "exp_share", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 5, - "w": 24, - "h": 22 - }, - "frame": { - "x": 94, - "y": 24, - "w": 24, - "h": 22 - } - }, - { - "filename": "healing_charm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 23, - "h": 22 - }, - "frame": { - "x": 118, - "y": 24, - "w": 23, - "h": 22 - } - }, { "filename": "black_belt", "rotated": false, @@ -633,8 +444,8 @@ "h": 23 }, "frame": { - "x": 141, - "y": 24, + "x": 0, + "y": 198, "w": 22, "h": 23 } @@ -654,14 +465,14 @@ "h": 23 }, "frame": { - "x": 163, - "y": 24, + "x": 0, + "y": 221, "w": 22, "h": 23 } }, { - "filename": "focus_sash", + "filename": "silver_powder", "rotated": false, "trimmed": true, "sourceSize": { @@ -669,79 +480,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 22, - "h": 23 + "x": 4, + "y": 11, + "w": 24, + "h": 15 }, "frame": { - "x": 41, - "y": 51, - "w": 22, - "h": 23 - } - }, - { - "filename": "never_melt_ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 41, - "y": 74, - "w": 22, - "h": 23 - } - }, - { - "filename": "deep_sea_tooth", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 21 - }, - "frame": { - "x": 41, - "y": 97, - "w": 22, - "h": 21 - } - }, - { - "filename": "dragon_fang", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 42, - "y": 118, - "w": 21, - "h": 23 + "x": 0, + "y": 244, + "w": 24, + "h": 15 } }, { @@ -759,8 +507,8 @@ "h": 24 }, "frame": { - "x": 23, - "y": 141, + "x": 21, + "y": 72, "w": 21, "h": 24 } @@ -781,13 +529,34 @@ }, "frame": { "x": 23, - "y": 165, + "y": 96, "w": 21, "h": 24 } }, { - "filename": "lansat_berry", + "filename": "dragon_fang", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 23, + "y": 120, + "w": 21, + "h": 23 + } + }, + { + "filename": "focus_sash", "rotated": false, "trimmed": true, "sourceSize": { @@ -797,161 +566,14 @@ "spriteSourceSize": { "x": 5, "y": 4, - "w": 21, + "w": 22, "h": 23 }, "frame": { "x": 23, - "y": 189, - "w": 21, - "h": 23 - } - }, - { - "filename": "leaf_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 44, - "y": 141, - "w": 21, - "h": 23 - } - }, - { - "filename": "petaya_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, + "y": 143, "w": 22, "h": 23 - }, - "frame": { - "x": 44, - "y": 164, - "w": 22, - "h": 23 - } - }, - { - "filename": "reaper_cloth", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 44, - "y": 187, - "w": 22, - "h": 23 - } - }, - { - "filename": "binding_band", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 23, - "h": 20 - }, - "frame": { - "x": 23, - "y": 212, - "w": 23, - "h": 20 - } - }, - { - "filename": "charcoal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 46, - "y": 210, - "w": 22, - "h": 22 - } - }, - { - "filename": "choice_specs", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 24, - "h": 18 - }, - "frame": { - "x": 22, - "y": 232, - "w": 24, - "h": 18 - } - }, - { - "filename": "deep_sea_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 20 - }, - "frame": { - "x": 46, - "y": 232, - "w": 22, - "h": 20 } }, { @@ -969,8 +591,8 @@ "h": 24 }, "frame": { - "x": 63, - "y": 51, + "x": 41, + "y": 48, "w": 16, "h": 24 } @@ -990,14 +612,14 @@ "h": 24 }, "frame": { - "x": 63, - "y": 75, + "x": 42, + "y": 72, "w": 16, "h": 24 } }, { - "filename": "hp_up", + "filename": "black_glasses", "rotated": false, "trimmed": true, "sourceSize": { @@ -1005,18 +627,396 @@ "h": 32 }, "spriteSourceSize": { - "x": 8, + "x": 4, + "y": 8, + "w": 23, + "h": 17 + }, + "frame": { + "x": 51, + "y": 31, + "w": 23, + "h": 17 + } + }, + { + "filename": "elixir", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, "y": 4, - "w": 16, + "w": 18, "h": 24 }, "frame": { - "x": 63, - "y": 99, - "w": 16, + "x": 57, + "y": 48, + "w": 18, "h": 24 } }, + { + "filename": "ether", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 58, + "y": 72, + "w": 18, + "h": 24 + } + }, + { + "filename": "twisted_spoon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 24, + "h": 23 + }, + "frame": { + "x": 44, + "y": 96, + "w": 24, + "h": 23 + } + }, + { + "filename": "exp_balance", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 24, + "h": 22 + }, + "frame": { + "x": 44, + "y": 119, + "w": 24, + "h": 22 + } + }, + { + "filename": "rare_candy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 45, + "y": 141, + "w": 23, + "h": 23 + } + }, + { + "filename": "exp_share", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 24, + "h": 22 + }, + "frame": { + "x": 74, + "y": 24, + "w": 24, + "h": 22 + } + }, + { + "filename": "healing_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 23, + "h": 22 + }, + "frame": { + "x": 98, + "y": 24, + "w": 23, + "h": 22 + } + }, + { + "filename": "rarer_candy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 121, + "y": 24, + "w": 23, + "h": 23 + } + }, + { + "filename": "stick", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 23, + "h": 23 + }, + "frame": { + "x": 144, + "y": 24, + "w": 23, + "h": 23 + } + }, + { + "filename": "lansat_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 21, + "h": 23 + }, + "frame": { + "x": 167, + "y": 24, + "w": 21, + "h": 23 + } + }, + { + "filename": "never_melt_ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 188, + "y": 23, + "w": 22, + "h": 23 + } + }, + { + "filename": "petaya_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 210, + "y": 23, + "w": 22, + "h": 23 + } + }, + { + "filename": "reaper_cloth", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 232, + "y": 23, + "w": 22, + "h": 23 + } + }, + { + "filename": "charcoal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 75, + "y": 46, + "w": 22, + "h": 22 + } + }, + { + "filename": "sacred_ash", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 97, + "y": 46, + "w": 24, + "h": 20 + } + }, + { + "filename": "soft_sand", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 121, + "y": 47, + "w": 24, + "h": 20 + } + }, + { + "filename": "binding_band", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 23, + "h": 20 + }, + "frame": { + "x": 145, + "y": 47, + "w": 23, + "h": 20 + } + }, + { + "filename": "dawn_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 21 + }, + "frame": { + "x": 168, + "y": 47, + "w": 20, + "h": 21 + } + }, { "filename": "dire_hit", "rotated": false, @@ -1032,7 +1032,7 @@ "h": 22 }, "frame": { - "x": 79, + "x": 188, "y": 46, "w": 22, "h": 22 @@ -1053,8 +1053,8 @@ "h": 22 }, "frame": { - "x": 79, - "y": 68, + "x": 210, + "y": 46, "w": 22, "h": 22 } @@ -1074,12 +1074,33 @@ "h": 22 }, "frame": { - "x": 101, + "x": 232, "y": 46, "w": 22, "h": 22 } }, + { + "filename": "leaf_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 76, + "y": 68, + "w": 21, + "h": 23 + } + }, { "filename": "ganlon_berry", "rotated": false, @@ -1095,12 +1116,222 @@ "h": 22 }, "frame": { - "x": 79, - "y": 90, + "x": 97, + "y": 66, "w": 22, "h": 22 } }, + { + "filename": "moon_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 6, + "w": 23, + "h": 21 + }, + "frame": { + "x": 119, + "y": 67, + "w": 23, + "h": 21 + } + }, + { + "filename": "deep_sea_tooth", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 142, + "y": 67, + "w": 22, + "h": 21 + } + }, + { + "filename": "shell_bell", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 23, + "h": 20 + }, + "frame": { + "x": 164, + "y": 68, + "w": 23, + "h": 20 + } + }, + { + "filename": "choice_specs", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 24, + "h": 18 + }, + "frame": { + "x": 187, + "y": 68, + "w": 24, + "h": 18 + } + }, + { + "filename": "dragon_scale", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 24, + "h": 18 + }, + "frame": { + "x": 211, + "y": 68, + "w": 24, + "h": 18 + } + }, + { + "filename": "apicot_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 20 + }, + "frame": { + "x": 235, + "y": 68, + "w": 19, + "h": 20 + } + }, + { + "filename": "full_restore", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 68, + "y": 96, + "w": 18, + "h": 24 + } + }, + { + "filename": "max_elixir", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 68, + "y": 120, + "w": 18, + "h": 24 + } + }, + { + "filename": "candy_jar", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 20 + }, + "frame": { + "x": 68, + "y": 144, + "w": 19, + "h": 20 + } + }, + { + "filename": "deep_sea_scale", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 20 + }, + "frame": { + "x": 23, + "y": 166, + "w": 22, + "h": 20 + } + }, { "filename": "guard_spec", "rotated": false, @@ -1116,8 +1347,8 @@ "h": 22 }, "frame": { - "x": 101, - "y": 68, + "x": 45, + "y": 164, "w": 22, "h": 22 } @@ -1137,33 +1368,12 @@ "h": 22 }, "frame": { - "x": 101, - "y": 90, + "x": 22, + "y": 186, "w": 22, "h": 22 } }, - { - "filename": "max_elixir", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 123, - "y": 46, - "w": 18, - "h": 24 - } - }, { "filename": "magmarizer", "rotated": false, @@ -1179,8 +1389,8 @@ "h": 22 }, "frame": { - "x": 141, - "y": 47, + "x": 22, + "y": 208, "w": 22, "h": 22 } @@ -1200,96 +1410,12 @@ "h": 22 }, "frame": { - "x": 163, - "y": 47, + "x": 44, + "y": 186, "w": 22, "h": 22 } }, - { - "filename": "max_ether", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 123, - "y": 70, - "w": 18, - "h": 24 - } - }, - { - "filename": "moon_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 23, - "h": 21 - }, - "frame": { - "x": 141, - "y": 69, - "w": 23, - "h": 21 - } - }, - { - "filename": "dusk_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 21, - "h": 21 - }, - "frame": { - "x": 164, - "y": 69, - "w": 21, - "h": 21 - } - }, - { - "filename": "candy_jar", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 123, - "y": 94, - "w": 19, - "h": 20 - } - }, { "filename": "protector", "rotated": false, @@ -1305,54 +1431,12 @@ "h": 22 }, "frame": { - "x": 142, - "y": 90, + "x": 44, + "y": 208, "w": 22, "h": 22 } }, - { - "filename": "sharp_beak", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 164, - "y": 90, - "w": 21, - "h": 23 - } - }, - { - "filename": "dragon_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 24, - "h": 18 - }, - "frame": { - "x": 63, - "y": 123, - "w": 24, - "h": 18 - } - }, { "filename": "mystic_water", "rotated": false, @@ -1368,161 +1452,14 @@ "h": 23 }, "frame": { - "x": 65, - "y": 141, - "w": 20, - "h": 23 - } - }, - { - "filename": "max_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 66, + "x": 67, "y": 164, - "w": 18, - "h": 24 - } - }, - { - "filename": "metal_coat", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 19, - "h": 22 - }, - "frame": { - "x": 66, - "y": 188, - "w": 19, - "h": 22 - } - }, - { - "filename": "hyper_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 68, - "y": 210, - "w": 17, + "w": 20, "h": 23 } }, { - "filename": "dawn_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 21 - }, - "frame": { - "x": 68, - "y": 233, - "w": 20, - "h": 21 - } - }, - { - "filename": "sacred_ash", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 24, - "h": 20 - }, - "frame": { - "x": 87, - "y": 112, - "w": 24, - "h": 20 - } - }, - { - "filename": "silver_powder", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 11, - "w": 24, - "h": 15 - }, - "frame": { - "x": 87, - "y": 132, - "w": 24, - "h": 15 - } - }, - { - "filename": "soft_sand", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 24, - "h": 20 - }, - "frame": { - "x": 85, - "y": 147, - "w": 24, - "h": 20 - } - }, - { - "filename": "liechi_berry", + "filename": "sharp_beak", "rotated": false, "trimmed": true, "sourceSize": { @@ -1531,17 +1468,80 @@ }, "spriteSourceSize": { "x": 5, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 66, + "y": 187, + "w": 21, + "h": 23 + } + }, + { + "filename": "dusk_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, "y": 6, - "w": 22, + "w": 21, "h": 21 }, "frame": { - "x": 84, - "y": 167, - "w": 22, + "x": 66, + "y": 210, + "w": 21, "h": 21 } }, + { + "filename": "hp_up", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 86, + "y": 91, + "w": 16, + "h": 24 + } + }, + { + "filename": "shed_shell", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 102, + "y": 88, + "w": 22, + "h": 22 + } + }, { "filename": "starf_berry", "rotated": false, @@ -1557,8 +1557,8 @@ "h": 22 }, "frame": { - "x": 85, - "y": 188, + "x": 124, + "y": 88, "w": 22, "h": 22 } @@ -1578,8 +1578,155 @@ "h": 22 }, "frame": { - "x": 85, - "y": 210, + "x": 146, + "y": 88, + "w": 22, + "h": 22 + } + }, + { + "filename": "metal_coat", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 19, + "h": 22 + }, + "frame": { + "x": 168, + "y": 88, + "w": 19, + "h": 22 + } + }, + { + "filename": "tm_bug", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 187, + "y": 86, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_dark", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 209, + "y": 86, + "w": 22, + "h": 22 + } + }, + { + "filename": "iron", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 86, + "y": 115, + "w": 16, + "h": 24 + } + }, + { + "filename": "tm_dragon", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 102, + "y": 110, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_electric", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 124, + "y": 110, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_fairy", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 146, + "y": 110, "w": 22, "h": 22 } @@ -1599,306 +1746,12 @@ "h": 22 }, "frame": { - "x": 88, - "y": 232, + "x": 168, + "y": 110, "w": 20, "h": 22 } }, - { - "filename": "tm_bug", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 111, - "y": 114, - "w": 22, - "h": 22 - } - }, - { - "filename": "black_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 111, - "y": 136, - "w": 23, - "h": 17 - } - }, - { - "filename": "shell_bell", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 23, - "h": 20 - }, - "frame": { - "x": 109, - "y": 153, - "w": 23, - "h": 20 - } - }, - { - "filename": "leftovers", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 15, - "h": 22 - }, - "frame": { - "x": 133, - "y": 114, - "w": 15, - "h": 22 - } - }, - { - "filename": "iron", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 148, - "y": 112, - "w": 16, - "h": 24 - } - }, - { - "filename": "tm_dark", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 164, - "y": 113, - "w": 22, - "h": 22 - } - }, - { - "filename": "wise_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 134, - "y": 136, - "w": 23, - "h": 17 - } - }, - { - "filename": "tm_dragon", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 132, - "y": 153, - "w": 22, - "h": 22 - } - }, - { - "filename": "prism_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 9, - "y": 8, - "w": 15, - "h": 15 - }, - "frame": { - "x": 106, - "y": 173, - "w": 15, - "h": 15 - } - }, - { - "filename": "pp_max", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 107, - "y": 188, - "w": 16, - "h": 24 - } - }, - { - "filename": "gb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 107, - "y": 212, - "w": 20, - "h": 20 - } - }, - { - "filename": "tm_electric", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 108, - "y": 232, - "w": 22, - "h": 22 - } - }, - { - "filename": "pp_up", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 185, - "y": 24, - "w": 16, - "h": 24 - } - }, - { - "filename": "tm_fairy", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 201, - "y": 23, - "w": 22, - "h": 22 - } - }, { "filename": "tm_fighting", "rotated": false, @@ -1914,54 +1767,12 @@ "h": 22 }, "frame": { - "x": 223, - "y": 23, + "x": 188, + "y": 108, "w": 22, "h": 22 } }, - { - "filename": "full_heal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 15, - "h": 23 - }, - "frame": { - "x": 245, - "y": 23, - "w": 15, - "h": 23 - } - }, - { - "filename": "protein", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 185, - "y": 48, - "w": 16, - "h": 24 - } - }, { "filename": "tm_fire", "rotated": false, @@ -1977,281 +1788,8 @@ "h": 22 }, "frame": { - "x": 201, - "y": 45, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_flying", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 223, - "y": 45, - "w": 22, - "h": 22 - } - }, - { - "filename": "zinc", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 185, - "y": 72, - "w": 16, - "h": 24 - } - }, - { - "filename": "tm_ghost", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 201, - "y": 67, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_grass", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 223, - "y": 67, - "w": 22, - "h": 22 - } - }, - { - "filename": "everstone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 17 - }, - "frame": { - "x": 185, - "y": 96, - "w": 20, - "h": 17 - } - }, - { - "filename": "tm_ground", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 186, - "y": 113, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 205, - "y": 89, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_normal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 227, - "y": 89, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_poison", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 208, - "y": 111, - "w": 22, - "h": 22 - } - }, - { - "filename": "tm_psychic", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 230, - "y": 111, - "w": 22, - "h": 22 - } - }, - { - "filename": "revive", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 10, - "y": 8, - "w": 12, - "h": 17 - }, - "frame": { - "x": 245, - "y": 46, - "w": 12, - "h": 17 - } - }, - { - "filename": "metronome", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 154, - "y": 153, - "w": 17, - "h": 22 - } - }, - { - "filename": "tm_rock", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 171, - "y": 135, + "x": 210, + "y": 108, "w": 22, "h": 22 } @@ -2271,12 +1809,243 @@ "h": 19 }, "frame": { - "x": 171, - "y": 157, + "x": 231, + "y": 88, "w": 22, "h": 19 } }, + { + "filename": "tm_flying", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 232, + "y": 107, + "w": 22, + "h": 22 + } + }, + { + "filename": "max_ether", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 87, + "y": 139, + "w": 18, + "h": 24 + } + }, + { + "filename": "max_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 87, + "y": 163, + "w": 18, + "h": 24 + } + }, + { + "filename": "hyper_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 87, + "y": 187, + "w": 17, + "h": 23 + } + }, + { + "filename": "liechi_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 22, + "h": 21 + }, + "frame": { + "x": 87, + "y": 210, + "w": 22, + "h": 21 + } + }, + { + "filename": "tm_ghost", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 105, + "y": 132, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_grass", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 105, + "y": 154, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_ground", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 127, + "y": 132, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_ice", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 127, + "y": 154, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_normal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 149, + "y": 132, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_poison", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 149, + "y": 154, + "w": 22, + "h": 22 + } + }, { "filename": "potion", "rotated": false, @@ -2292,12 +2061,54 @@ "h": 23 }, "frame": { - "x": 193, - "y": 135, + "x": 171, + "y": 132, "w": 17, "h": 23 } }, + { + "filename": "tm_psychic", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 188, + "y": 130, + "w": 22, + "h": 22 + } + }, + { + "filename": "tm_rock", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 210, + "y": 130, + "w": 22, + "h": 22 + } + }, { "filename": "tm_steel", "rotated": false, @@ -2313,12 +2124,33 @@ "h": 22 }, "frame": { - "x": 210, - "y": 133, + "x": 232, + "y": 129, "w": 22, "h": 22 } }, + { + "filename": "metronome", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 5, + "w": 17, + "h": 22 + }, + "frame": { + "x": 171, + "y": 155, + "w": 17, + "h": 22 + } + }, { "filename": "tm_water", "rotated": false, @@ -2334,33 +2166,12 @@ "h": 22 }, "frame": { - "x": 232, - "y": 133, + "x": 188, + "y": 152, "w": 22, "h": 22 } }, - { - "filename": "golden_egg", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 17, - "h": 20 - }, - "frame": { - "x": 193, - "y": 158, - "w": 17, - "h": 20 - } - }, { "filename": "water_stone", "rotated": false, @@ -2377,7 +2188,7 @@ }, "frame": { "x": 210, - "y": 155, + "y": 152, "w": 22, "h": 22 } @@ -2398,11 +2209,53 @@ }, "frame": { "x": 232, - "y": 155, + "y": 151, "w": 22, "h": 22 } }, + { + "filename": "wise_glasses", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 8, + "w": 23, + "h": 17 + }, + "frame": { + "x": 105, + "y": 176, + "w": 23, + "h": 17 + } + }, + { + "filename": "everstone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 8, + "w": 20, + "h": 17 + }, + "frame": { + "x": 104, + "y": 193, + "w": 20, + "h": 17 + } + }, { "filename": "upgrade", "rotated": false, @@ -2418,12 +2271,54 @@ "h": 19 }, "frame": { - "x": 210, - "y": 177, + "x": 128, + "y": 176, "w": 22, "h": 19 } }, + { + "filename": "poison_barb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 150, + "y": 176, + "w": 21, + "h": 21 + } + }, + { + "filename": "gb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 171, + "y": 177, + "w": 20, + "h": 20 + } + }, { "filename": "x_attack", "rotated": false, @@ -2439,8 +2334,8 @@ "h": 22 }, "frame": { - "x": 232, - "y": 177, + "x": 191, + "y": 174, "w": 22, "h": 22 } @@ -2460,8 +2355,8 @@ "h": 22 }, "frame": { - "x": 123, - "y": 175, + "x": 213, + "y": 174, "w": 22, "h": 22 } @@ -2481,12 +2376,33 @@ "h": 22 }, "frame": { - "x": 145, - "y": 175, + "x": 235, + "y": 173, "w": 22, "h": 22 } }, + { + "filename": "full_heal", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 4, + "w": 15, + "h": 23 + }, + "frame": { + "x": 109, + "y": 210, + "w": 15, + "h": 23 + } + }, { "filename": "x_sp_def", "rotated": false, @@ -2502,33 +2418,12 @@ "h": 22 }, "frame": { - "x": 167, - "y": 176, + "x": 124, + "y": 195, "w": 22, "h": 22 } }, - { - "filename": "poison_barb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 21, - "h": 21 - }, - "frame": { - "x": 189, - "y": 178, - "w": 21, - "h": 21 - } - }, { "filename": "x_speed", "rotated": false, @@ -2544,33 +2439,12 @@ "h": 22 }, "frame": { - "x": 127, - "y": 197, + "x": 124, + "y": 217, "w": 22, "h": 22 } }, - { - "filename": "razor_fang", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 18, - "h": 20 - }, - "frame": { - "x": 149, - "y": 197, - "w": 18, - "h": 20 - } - }, { "filename": "shiny_stone", "rotated": false, @@ -2586,8 +2460,8 @@ "h": 21 }, "frame": { - "x": 167, - "y": 198, + "x": 146, + "y": 197, "w": 21, "h": 21 } @@ -2607,33 +2481,12 @@ "h": 21 }, "frame": { - "x": 188, - "y": 199, + "x": 146, + "y": 218, "w": 21, "h": 21 } }, - { - "filename": "spell_tag", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 19, - "h": 21 - }, - "frame": { - "x": 130, - "y": 219, - "w": 19, - "h": 21 - } - }, { "filename": "magnet", "rotated": false, @@ -2649,33 +2502,12 @@ "h": 20 }, "frame": { - "x": 130, - "y": 240, + "x": 167, + "y": 197, "w": 20, "h": 20 } }, - { - "filename": "super_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 149, - "y": 217, - "w": 17, - "h": 23 - } - }, { "filename": "mb", "rotated": false, @@ -2691,8 +2523,8 @@ "h": 20 }, "frame": { - "x": 150, - "y": 240, + "x": 167, + "y": 217, "w": 20, "h": 20 } @@ -2712,33 +2544,12 @@ "h": 20 }, "frame": { - "x": 166, - "y": 219, + "x": 24, + "y": 239, "w": 20, "h": 20 } }, - { - "filename": "lum_berry", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 20, - "h": 19 - }, - "frame": { - "x": 186, - "y": 220, - "w": 20, - "h": 19 - } - }, { "filename": "pb_gold", "rotated": false, @@ -2754,7 +2565,28 @@ "h": 20 }, "frame": { - "x": 170, + "x": 44, + "y": 239, + "w": 20, + "h": 20 + } + }, + { + "filename": "ub", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 64, "y": 239, "w": 20, "h": 20 @@ -2775,14 +2607,14 @@ "h": 20 }, "frame": { - "x": 190, + "x": 84, "y": 239, "w": 19, "h": 20 } }, { - "filename": "miracle_seed", + "filename": "razor_fang", "rotated": false, "trimmed": true, "sourceSize": { @@ -2790,16 +2622,37 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 19, - "h": 19 + "x": 7, + "y": 6, + "w": 18, + "h": 20 }, "frame": { - "x": 206, - "y": 220, - "w": 19, - "h": 19 + "x": 103, + "y": 239, + "w": 18, + "h": 20 + } + }, + { + "filename": "golden_egg", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 17, + "h": 20 + }, + "frame": { + "x": 121, + "y": 239, + "w": 17, + "h": 20 } }, { @@ -2817,12 +2670,159 @@ "h": 20 }, "frame": { - "x": 209, + "x": 138, "y": 239, "w": 17, "h": 20 } }, + { + "filename": "leftovers", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 15, + "h": 22 + }, + "frame": { + "x": 167, + "y": 237, + "w": 15, + "h": 22 + } + }, + { + "filename": "revive", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 10, + "y": 8, + "w": 12, + "h": 17 + }, + "frame": { + "x": 155, + "y": 239, + "w": 12, + "h": 17 + } + }, + { + "filename": "pp_max", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 187, + "y": 197, + "w": 16, + "h": 24 + } + }, + { + "filename": "pp_up", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 203, + "y": 196, + "w": 16, + "h": 24 + } + }, + { + "filename": "protein", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 219, + "y": 196, + "w": 16, + "h": 24 + } + }, + { + "filename": "spell_tag", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 19, + "h": 21 + }, + "frame": { + "x": 235, + "y": 195, + "w": 19, + "h": 21 + } + }, + { + "filename": "lum_berry", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 20, + "h": 19 + }, + "frame": { + "x": 187, + "y": 221, + "w": 20, + "h": 19 + } + }, { "filename": "razor_claw", "rotated": false, @@ -2838,14 +2838,14 @@ "h": 19 }, "frame": { - "x": 210, - "y": 196, + "x": 182, + "y": 240, "w": 20, "h": 19 } }, { - "filename": "ub", + "filename": "miracle_seed", "rotated": false, "trimmed": true, "sourceSize": { @@ -2854,15 +2854,15 @@ }, "spriteSourceSize": { "x": 6, - "y": 6, - "w": 20, - "h": 20 + "y": 7, + "w": 19, + "h": 19 }, "frame": { - "x": 230, - "y": 199, - "w": 20, - "h": 20 + "x": 202, + "y": 240, + "w": 19, + "h": 19 } }, { @@ -2880,11 +2880,74 @@ "h": 19 }, "frame": { - "x": 225, - "y": 219, + "x": 207, + "y": 220, "w": 18, "h": 19 } + }, + { + "filename": "super_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 225, + "y": 220, + "w": 17, + "h": 23 + } + }, + { + "filename": "zinc", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 242, + "y": 216, + "w": 16, + "h": 24 + } + }, + { + "filename": "prism_scale", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 9, + "y": 8, + "w": 15, + "h": 15 + }, + "frame": { + "x": 221, + "y": 243, + "w": 15, + "h": 15 + } } ] } @@ -2892,6 +2955,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:41bf6d9499c8bd7156738e3e3233837c:3b34fb7b770a7b49ade0c723b2c5be2b:110e074689c9edd2c54833ce2e4d9270$" + "smartupdate": "$TexturePacker:SmartUpdate:9ee62f4ff0cb3da044310024fda7549e:36d3a4957da33b9f21c8a6580149ca76:110e074689c9edd2c54833ce2e4d9270$" } } diff --git a/public/images/items.png b/public/images/items.png index 4038d7d09875385f1e1590aa73a4389c01055723..19c18f89b6d11936f406a7e507aff0f43e6a393c 100644 GIT binary patch literal 22209 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%0DW%f5?!#1+`Q%}K9+vL(p* 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 literal 21858 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%0D7DA-VR6Y1kcaH2qlhz$ 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 diff --git a/public/images/items/catching_charm.png b/public/images/items/catching_charm.png new file mode 100644 index 0000000000000000000000000000000000000000..9d72fe465e3f1322e38b724e6ec333797e79f5fb GIT binary patch literal 454 zcmV;%0XhDOP) zy-UO}7{>c2bQg!fDF!;&{T5djp<_o^7f&coZce)TfpB=ch>L@Z2qNcl;OOY6W5*5- zuXzJ+Nprn6*EBtc79J=~$@9zmMLYoTR;iVm_W=JJpzfjn_<(~heV^6==pTQZ1G_yf z7)B=vc*78I%~=G9&V2|yW$iFvCj&{N?Ipb+Xn7;P1G@Q_KFm@f^Wo)XQEFE3zte+|3ohZMf!nhH=A ztwsP$Y`ihrhwym}(a*ck6te773f~a|BjIEe699i9^LYS_1Oe35OCtaZ{oePqRL%hi zViACvf>r_aR`W+O#Ivv5m{Nk#K|pJOsvd{mRGK4%3V?-4=GFjZ7mf8Z5#E47G)rOf z_ykO8M=VV24z>O40p7;B&>XdMbtfU1GHB#L8t}q5YXCn8AwEiA?fgb6hcOwihGV<7 w1`uNNbt0wT_m+7Y15{l!I|1lIJwOle2P$@x_vw_td;kCd07*qoM6N<$f>Ox6O#lD@ literal 0 HcmV?d00001 diff --git a/public/images/items/shed_shell.png b/public/images/items/shed_shell.png new file mode 100644 index 0000000000000000000000000000000000000000..a0570cf29c42c79823101c362a5a1e52650414e8 GIT binary patch literal 298 zcmV+_0oDGAP)%B;Z%l(dwTlv#n2lGf-W{pfV^*&v@?Ab;sgBno*icAR9I zMn*<{Ob8)b?E-$j4r_IqiAeA_ag`vv6g@I75+%5Vrdlmw36#Jt0)#*A$9O(%)?!;i zu$^kP1pbHsdb{l6a@~GPksMq~xCjs~JI{Mlg2&)@l>h-6juAmE2^RrNf^bWM$G8Yc z2|{uLoEplyJ&TXrS6|-BO`y4H?)}_kXp-T9smFU07*qoM6N<$f>DlmGXMYp literal 0 HcmV?d00001 diff --git a/public/images/items/stick.png b/public/images/items/stick.png new file mode 100644 index 0000000000000000000000000000000000000000..7ef3fb989a4c2ada712a784fdfa7bc24bf905a00 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJwVp1HArXh)PTR=a?7-u?{)~kA z`QC$4l8U)*JEu)DQq>MvwxsmO0)0sr$=kjAzqlT+Zs=V%#YgS)@+(oSyv_Cdnr)7| z_pmIe&AW6jb^U6VhZR-23$pbJn)uy6dTOL;IW}4w96iHgGRJ|}Y(D25i3aN(KY0p% ze9^w1F#V+Z9PJmI>Kb%Tmo)AE+rS|n`CVIz>;2!UA6lf}{bX~#`!JmG+TR5WRh{~y e5 m instanceof ExpShareModifier) as ExpShareModifier; const expBalanceModifier = this.scene.findModifier(m => m instanceof ExpBalanceModifier) as ExpBalanceModifier; + const multipleParticipantExpBonusModifier = this.scene.findModifier(m => m instanceof MultipleParticipantExpBonusModifier) as MultipleParticipantExpBonusModifier; const expValue = this.scene.getEnemyPokemon().getExpValue(); const expPartyMembers = party.filter(p => p.hp && p.level < 100); const partyMemberExp = []; @@ -1499,8 +1500,10 @@ export class VictoryPhase extends PokemonPhase { let expMultiplier = 0; if (participated) expMultiplier += (1 / participantIds.size); + if (participantIds.size > 1 && multipleParticipantExpBonusModifier) + expMultiplier += (multipleParticipantExpBonusModifier.getStackCount() * 0.1); if (expShareModifier) - expMultiplier += expShareModifier.stackCount * 0.1; + expMultiplier += expShareModifier.getStackCount() * 0.1; const pokemonExp = new Utils.NumberHolder(expValue * expMultiplier); this.scene.applyModifiers(PokemonExpBoosterModifier, true, partyMember, pokemonExp); partyMemberExp.push(Math.floor(pokemonExp.value)); diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 06273453d93..a2715811458 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -1,11 +1,11 @@ import Phaser from 'phaser'; import { Biome } from './data/biome'; import UI from './ui/ui'; -import { EncounterPhase, SummonPhase, CommandPhase, NextEncounterPhase, NewBiomeEncounterPhase, SelectBiomePhase, SelectStarterPhase, MessagePhase, CheckLoadPhase } from './battle-phases'; +import { EncounterPhase, SummonPhase, CommandPhase, NextEncounterPhase, NewBiomeEncounterPhase, SelectBiomePhase, MessagePhase, CheckLoadPhase } from './battle-phases'; import Pokemon, { PlayerPokemon, EnemyPokemon } from './pokemon'; import PokemonSpecies, { allSpecies, getPokemonSpecies, initSpecies } from './data/pokemon-species'; import * as Utils from './utils'; -import { Modifier, ModifierBar, ConsumablePokemonModifier, ConsumableModifier, PartyShareModifier, PokemonHpRestoreModifier, HealingBoosterModifier, PersistentModifier, PokemonHeldItemModifier, ModifierPredicate } from './modifier/modifier'; +import { Modifier, ModifierBar, ConsumablePokemonModifier, ConsumableModifier, PokemonHpRestoreModifier, HealingBoosterModifier, PersistentModifier, PokemonHeldItemModifier, ModifierPredicate } from './modifier/modifier'; import { PokeballType } from './data/pokeball'; import { Species } from './data/species'; import { initAutoPlay } from './system/auto-play'; @@ -838,9 +838,6 @@ export default class BattleScene extends Phaser.Scene { (modifier as PersistentModifier).virtualStackCount = 0; } - if (player) - this.applyModifiers(PartyShareModifier, true, this, modifiers); - const modifiersClone = modifiers.slice(0); for (let modifier of modifiersClone) { if (!modifier.getStackCount()) diff --git a/src/modifier/modifier-type.ts b/src/modifier/modifier-type.ts index ea3f7f69071..25f3f75b51f 100644 --- a/src/modifier/modifier-type.ts +++ b/src/modifier/modifier-type.ts @@ -580,6 +580,9 @@ const modifierTypes = { EXP_BALANCE: () => new ModifierType('EXP. BALANCE', 'All EXP. Points received from battles are split between the lower leveled party members', (type, _args) => new Modifiers.ExpBalanceModifier(type), 'exp_balance'), + OVAL_CHARM: () => new ModifierType('OVAL CHARM', 'When multiple POKéMON participate in a battle, each gets an extra 10% of the total EXP', + (type, _args) => new Modifiers.MultipleParticipantExpBonusModifier(type), 'oval_charm'), + EXP_CHARM: () => new ExpBoosterModifierType('EXP CHARM', 25), GOLDEN_EXP_CHARM: () => new ExpBoosterModifierType('GOLDEN EXP CHARM', 100), @@ -588,10 +591,6 @@ const modifierTypes = { HEALING_CHARM: () => new ModifierType('HEALING CHARM', 'Doubles the effectiveness of HP restoring moves and items (excludes revives)', (type, _args) => new Modifiers.HealingBoosterModifier(type, 2), 'healing_charm'), - - OVAL_CHARM: () => new ModifierType('OVAL CHARM', 'For every X (no. of party members) items in a POKéMON\'s held item stack, give one to each other party member', - (type, _args) => new Modifiers.PartyShareModifier(type), 'oval_charm'), - CANDY_JAR: () => new ModifierType('CANDY JAR', 'Increases the number of levels added by RARE CANDY items by 1', (type, _args) => new Modifiers.LevelIncrementBoosterModifier(type)), BERRY_POUCH: () => new ModifierType('BERRY POUCH', 'Adds a 25% chance that a used berry will not be consumed', @@ -684,7 +683,6 @@ const modifierPool = { new WeightedModifierType(modifierTypes.EVOLUTION_ITEM, 12), new WeightedModifierType(modifierTypes.ATTACK_TYPE_BOOSTER, 5), new WeightedModifierType(modifierTypes.CANDY_JAR, 3), - //new WeightedModifierType(modifierTypes.OVAL_CHARM, 1), new WeightedModifierType(modifierTypes.HEALING_CHARM, 1), new WeightedModifierType(modifierTypes.FOCUS_BAND, 3), new WeightedModifierType(modifierTypes.KINGS_ROCK, 2), @@ -692,8 +690,10 @@ const modifierPool = { new WeightedModifierType(modifierTypes.SHELL_BELL, 2), new WeightedModifierType(modifierTypes.BERRY_POUCH, 3), new WeightedModifierType(modifierTypes.EXP_CHARM, (party: Pokemon[]) => party.filter(p => p.level < 100).length ? 4 : 0), + new WeightedModifierType(modifierTypes.OVAL_CHARM, (party: Pokemon[]) => party.filter(p => p.level < 100).length ? 2 : 0), new WeightedModifierType(modifierTypes.LUCKY_EGG, (party: Pokemon[]) => party.filter(p => p.level < 100).length ? 3 : 0), - new WeightedModifierType(modifierTypes.EXP_BALANCE, (party: Pokemon[]) => party.filter(p => p.level < 100).length ? 1 : 0) + new WeightedModifierType(modifierTypes.EXP_BALANCE, + (party: Pokemon[]) => party.filter(p => p.level < 100).length && !party[0].scene.findModifier(m => m instanceof Modifiers.ExpBalanceModifier) ? 1 : 0) ].map(m => { m.setTier(ModifierTier.ULTRA); return m; }), [ModifierTier.MASTER]: [ new WeightedModifierType(modifierTypes.MASTER_BALL, 3), diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts index 613d475f08c..add70aced74 100644 --- a/src/modifier/modifier.ts +++ b/src/modifier/modifier.ts @@ -780,48 +780,25 @@ export class EvolutionItemModifier extends ConsumablePokemonModifier { } } -export class PartyShareModifier extends PersistentModifier { +export class MultipleParticipantExpBonusModifier extends PersistentModifier { constructor(type: ModifierType, stackCount?: integer) { super(type, stackCount); } - match(modifier: Modifier) { - return modifier instanceof PartyShareModifier; + match(modifier: Modifier): boolean { + return modifier instanceof MultipleParticipantExpBonusModifier; } - clone(): PartyShareModifier { - return new PartyShareModifier(this.type, this.stackCount); - } - - shouldApply(args: any[]): boolean { - return super.shouldApply(args) && args.length === 2 && args[0] instanceof BattleScene && args[1] instanceof Array; - } - - apply(args: any[]): boolean { - const scene = args[0] as BattleScene; - const modifiers = args[1] as Modifier[]; - const party = scene.getParty(); - for (let modifier of modifiers) { - if (modifier instanceof PokemonHeldItemModifier) { - const heldItemModifier = modifier as PokemonHeldItemModifier; - const extraStacks = Math.floor(modifier.stackCount / Math.max(party.length - (this.stackCount - 1), 1)); - for (let s = 0; s < extraStacks; s++) { - for (let p of party) { - if (p.id === heldItemModifier.pokemonId) - continue; - const newHeldItemModifier = heldItemModifier.clone() as PokemonHeldItemModifier; - newHeldItemModifier.pokemonId = p.id; - scene.addModifier(newHeldItemModifier, false, true); - } - } - } - } - + apply(_args: any[]): boolean { return true; } - getMaxStackCount(): number { - return 6; + clone(): MultipleParticipantExpBonusModifier { + return new MultipleParticipantExpBonusModifier(this.type, this.stackCount); + } + + getMaxStackCount(): integer { + return 5; } }