diff --git a/public/images/items.json b/public/images/items.json index 0afac3bbe..26498d845 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -4,8 +4,8 @@ "image": "items.png", "format": "RGBA8888", "size": { - "w": 234, - "h": 234 + "w": 237, + "h": 237 }, "scale": 1, "frames": [ @@ -51,6 +51,48 @@ "h": 24 } }, + { + "filename": "exp_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 17, + "h": 31 + }, + "frame": { + "x": 0, + "y": 50, + "w": 17, + "h": 31 + } + }, + { + "filename": "golden_exp_charm", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 1, + "w": 17, + "h": 31 + }, + "frame": { + "x": 0, + "y": 81, + "w": 17, + "h": 31 + } + }, { "filename": "muscle_band", "rotated": false, @@ -87,8 +129,8 @@ "h": 24 }, "frame": { - "x": 0, - "y": 50, + "x": 51, + "y": 0, "w": 24, "h": 24 } @@ -108,7 +150,7 @@ "h": 24 }, "frame": { - "x": 51, + "x": 75, "y": 0, "w": 24, "h": 24 @@ -129,8 +171,8 @@ "h": 24 }, "frame": { - "x": 0, - "y": 74, + "x": 99, + "y": 0, "w": 23, "h": 24 } @@ -150,7 +192,7 @@ "h": 23 }, "frame": { - "x": 75, + "x": 122, "y": 0, "w": 24, "h": 23 @@ -171,33 +213,12 @@ "h": 23 }, "frame": { - "x": 99, + "x": 146, "y": 0, "w": 24, "h": 23 } }, - { - "filename": "kings_rock", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 23, - "h": 24 - }, - "frame": { - "x": 0, - "y": 98, - "w": 23, - "h": 24 - } - }, { "filename": "scope-lens", "rotated": false, @@ -213,7 +234,7 @@ "h": 23 }, "frame": { - "x": 123, + "x": 170, "y": 0, "w": 24, "h": 23 @@ -234,14 +255,14 @@ "h": 23 }, "frame": { - "x": 147, + "x": 194, "y": 0, "w": 24, "h": 23 } }, { - "filename": "exp_share", + "filename": "metal_coat", "rotated": false, "trimmed": true, "sourceSize": { @@ -249,18 +270,102 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, + "x": 6, "y": 5, - "w": 24, + "w": 19, "h": 22 }, "frame": { - "x": 171, + "x": 218, "y": 0, - "w": 24, + "w": 19, "h": 22 } }, + { + "filename": "elixir", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 0, + "y": 112, + "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": 136, + "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": 160, + "w": 18, + "h": 24 + } + }, + { + "filename": "kings_rock", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 23, + "h": 24 + }, + "frame": { + "x": 0, + "y": 184, + "w": 23, + "h": 24 + } + }, { "filename": "max_revive", "rotated": false, @@ -277,13 +382,13 @@ }, "frame": { "x": 0, - "y": 122, + "y": 208, "w": 22, "h": 24 } }, { - "filename": "black_belt", + "filename": "spell_tag", "rotated": false, "trimmed": true, "sourceSize": { @@ -291,100 +396,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 22, - "h": 23 + "x": 7, + "y": 6, + "w": 19, + "h": 21 }, "frame": { - "x": 0, - "y": 146, - "w": 22, - "h": 23 - } - }, - { - "filename": "fire_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 23 - }, - "frame": { - "x": 0, - "y": 169, - "w": 22, - "h": 23 - } - }, - { - "filename": "focus_sash", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 4, - "w": 22, - "h": 23 - }, - "frame": { - "x": 0, - "y": 192, - "w": 22, - "h": 23 - } - }, - { - "filename": "dubious_disc", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 22, - "h": 19 - }, - "frame": { - "x": 0, - "y": 215, - "w": 22, - "h": 19 - } - }, - { - "filename": "healing_charm", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 23, - "h": 22 - }, - "frame": { - "x": 195, - "y": 0, - "w": 23, - "h": 22 + "x": 218, + "y": 22, + "w": 19, + "h": 21 } }, { @@ -402,8 +423,8 @@ "h": 24 }, "frame": { - "x": 218, - "y": 0, + "x": 17, + "y": 50, "w": 16, "h": 24 } @@ -422,6 +443,27 @@ "w": 16, "h": 24 }, + "frame": { + "x": 17, + "y": 74, + "w": 16, + "h": 24 + } + }, + { + "filename": "hp_up", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, "frame": { "x": 24, "y": 26, @@ -429,6 +471,48 @@ "h": 24 } }, + { + "filename": "exp_share", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 5, + "w": 24, + "h": 22 + }, + "frame": { + "x": 40, + "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": 64, + "y": 24, + "w": 23, + "h": 22 + } + }, { "filename": "rare_candy", "rotated": false, @@ -444,14 +528,14 @@ "h": 23 }, "frame": { - "x": 40, + "x": 87, "y": 24, "w": 23, "h": 23 } }, { - "filename": "elixir", + "filename": "black_belt", "rotated": false, "trimmed": true, "sourceSize": { @@ -459,15 +543,141 @@ "h": 32 }, "spriteSourceSize": { - "x": 7, + "x": 5, "y": 4, - "w": 18, + "w": 22, + "h": 23 + }, + "frame": { + "x": 110, + "y": 24, + "w": 22, + "h": 23 + } + }, + { + "filename": "fire_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 23 + }, + "frame": { + "x": 132, + "y": 23, + "w": 22, + "h": 23 + } + }, + { + "filename": "focus_sash", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 4, + "w": 22, + "h": 23 + }, + "frame": { + "x": 154, + "y": 23, + "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": 176, + "y": 23, + "w": 22, + "h": 23 + } + }, + { + "filename": "mystic_water", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 5, + "w": 20, + "h": 23 + }, + "frame": { + "x": 198, + "y": 23, + "w": 20, + "h": 23 + } + }, + { + "filename": "hard_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 19, + "h": 20 + }, + "frame": { + "x": 218, + "y": 43, + "w": 19, + "h": 20 + } + }, + { + "filename": "iron", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, "h": 24 }, "frame": { - "x": 24, + "x": 33, "y": 50, - "w": 18, + "w": 16, "h": 24 } }, @@ -486,14 +696,14 @@ "h": 24 }, "frame": { - "x": 23, - "y": 74, + "x": 49, + "y": 46, "w": 21, "h": 24 } }, { - "filename": "shiny_charm", + "filename": "hyper_potion", "rotated": false, "trimmed": true, "sourceSize": { @@ -501,57 +711,15 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 4, - "w": 21, - "h": 24 - }, - "frame": { - "x": 23, - "y": 98, - "w": 21, - "h": 24 - } - }, - { - "filename": "never_melt_ice", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, + "x": 8, "y": 5, - "w": 22, + "w": 17, "h": 23 }, "frame": { - "x": 22, - "y": 122, - "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": 22, - "y": 145, - "w": 22, + "x": 70, + "y": 46, + "w": 17, "h": 23 } }, @@ -570,8 +738,8 @@ "h": 22 }, "frame": { - "x": 22, - "y": 168, + "x": 87, + "y": 47, "w": 22, "h": 22 } @@ -591,94 +759,10 @@ "h": 22 }, "frame": { - "x": 22, - "y": 190, - "w": 22, - "h": 22 - } - }, - { - "filename": "electirizer", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 22, - "y": 212, - "w": 22, - "h": 22 - } - }, - { - "filename": "dragon_fang", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 21, - "h": 23 - }, - "frame": { - "x": 42, + "x": 109, "y": 47, - "w": 21, - "h": 23 - } - }, - { - "filename": "ether", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 - }, - "frame": { - "x": 44, - "y": 70, - "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": 44, - "y": 94, - "w": 18, - "h": 24 + "w": 22, + "h": 22 } }, { @@ -696,14 +780,14 @@ "h": 24 }, "frame": { - "x": 44, - "y": 118, + "x": 33, + "y": 74, "w": 18, "h": 24 } }, { - "filename": "max_ether", + "filename": "shiny_charm", "rotated": false, "trimmed": true, "sourceSize": { @@ -711,20 +795,20 @@ "h": 32 }, "spriteSourceSize": { - "x": 7, + "x": 6, "y": 4, - "w": 18, + "w": 21, "h": 24 }, "frame": { - "x": 44, - "y": 142, - "w": 18, + "x": 51, + "y": 70, + "w": 21, "h": 24 } }, { - "filename": "max_potion", + "filename": "reaper_cloth", "rotated": false, "trimmed": true, "sourceSize": { @@ -732,16 +816,37 @@ "h": 32 }, "spriteSourceSize": { - "x": 7, - "y": 4, - "w": 18, - "h": 24 + "x": 5, + "y": 5, + "w": 22, + "h": 23 }, "frame": { - "x": 44, - "y": 166, - "w": 18, - "h": 24 + "x": 72, + "y": 69, + "w": 22, + "h": 23 + } + }, + { + "filename": "dragon_fang", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 21, + "h": 23 + }, + "frame": { + "x": 94, + "y": 69, + "w": 21, + "h": 23 } }, { @@ -759,14 +864,14 @@ "h": 23 }, "frame": { - "x": 44, - "y": 190, + "x": 115, + "y": 69, "w": 21, "h": 23 } }, { - "filename": "moon_stone", + "filename": "electirizer", "rotated": false, "trimmed": true, "sourceSize": { @@ -774,37 +879,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 4, - "y": 6, - "w": 23, - "h": 21 + "x": 5, + "y": 5, + "w": 22, + "h": 22 }, "frame": { - "x": 44, - "y": 213, - "w": 23, - "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": 63, - "y": 24, - "w": 16, - "h": 24 + "x": 18, + "y": 98, + "w": 22, + "h": 22 } }, { @@ -822,8 +906,8 @@ "h": 22 }, "frame": { - "x": 79, - "y": 23, + "x": 18, + "y": 120, "w": 22, "h": 22 } @@ -843,117 +927,12 @@ "h": 22 }, "frame": { - "x": 101, - "y": 23, + "x": 18, + "y": 142, "w": 22, "h": 22 } }, - { - "filename": "magmarizer", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 123, - "y": 23, - "w": 22, - "h": 22 - } - }, - { - "filename": "protector", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 5, - "w": 22, - "h": 22 - }, - "frame": { - "x": 145, - "y": 23, - "w": 22, - "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": 63, - "y": 48, - "w": 17, - "h": 23 - } - }, - { - "filename": "sacred_ash", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 7, - "w": 24, - "h": 20 - }, - "frame": { - "x": 80, - "y": 45, - "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": 104, - "y": 45, - "w": 24, - "h": 20 - } - }, { "filename": "binding_band", "rotated": false, @@ -969,14 +948,161 @@ "h": 20 }, "frame": { - "x": 128, - "y": 45, + "x": 18, + "y": 164, "w": 23, "h": 20 } }, { - "filename": "mystic_water", + "filename": "max_ether", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 4, + "w": 18, + "h": 24 + }, + "frame": { + "x": 23, + "y": 184, + "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": 22, + "y": 208, + "w": 18, + "h": 24 + } + }, + { + "filename": "pp_max", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 40, + "y": 98, + "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": 40, + "y": 122, + "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": 56, + "y": 94, + "w": 16, + "h": 24 + } + }, + { + "filename": "magmarizer", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 72, + "y": 92, + "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": 94, + "y": 92, + "w": 23, + "h": 21 + } + }, + { + "filename": "dawn_stone", "rotated": false, "trimmed": true, "sourceSize": { @@ -985,15 +1111,120 @@ }, "spriteSourceSize": { "x": 6, - "y": 5, + "y": 6, "w": 20, - "h": 23 + "h": 21 }, "frame": { - "x": 62, - "y": 71, + "x": 117, + "y": 92, "w": 20, - "h": 23 + "h": 21 + } + }, + { + "filename": "zinc", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 4, + "w": 16, + "h": 24 + }, + "frame": { + "x": 56, + "y": 118, + "w": 16, + "h": 24 + } + }, + { + "filename": "protector", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 5, + "w": 22, + "h": 22 + }, + "frame": { + "x": 72, + "y": 114, + "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": 94, + "y": 113, + "w": 24, + "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": 118, + "y": 113, + "w": 22, + "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": 40, + "y": 146, + "w": 24, + "h": 18 } }, { @@ -1011,12 +1242,33 @@ "h": 23 }, "frame": { - "x": 62, - "y": 94, + "x": 41, + "y": 164, "w": 21, "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": 187, + "w": 22, + "h": 21 + } + }, { "filename": "thunder_stone", "rotated": false, @@ -1032,12 +1284,96 @@ "h": 22 }, "frame": { - "x": 62, - "y": 117, + "x": 40, + "y": 208, "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": 72, + "y": 136, + "w": 23, + "h": 17 + } + }, + { + "filename": "soft_sand", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 7, + "w": 24, + "h": 20 + }, + "frame": { + "x": 95, + "y": 133, + "w": 24, + "h": 20 + } + }, + { + "filename": "dusk_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 21, + "h": 21 + }, + "frame": { + "x": 119, + "y": 133, + "w": 21, + "h": 21 + } + }, + { + "filename": "leftovers", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 15, + "h": 22 + }, + "frame": { + "x": 131, + "y": 47, + "w": 15, + "h": 22 + } + }, { "filename": "tm_bug", "rotated": false, @@ -1053,8 +1389,8 @@ "h": 22 }, "frame": { - "x": 62, - "y": 139, + "x": 146, + "y": 46, "w": 22, "h": 22 } @@ -1074,8 +1410,8 @@ "h": 22 }, "frame": { - "x": 62, - "y": 161, + "x": 168, + "y": 46, "w": 22, "h": 22 } @@ -1095,12 +1431,33 @@ "h": 22 }, "frame": { - "x": 82, - "y": 65, + "x": 190, + "y": 46, "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": 136, + "y": 69, + "w": 15, + "h": 23 + } + }, { "filename": "tm_electric", "rotated": false, @@ -1116,8 +1473,8 @@ "h": 22 }, "frame": { - "x": 104, - "y": 65, + "x": 151, + "y": 68, "w": 22, "h": 22 } @@ -1137,12 +1494,54 @@ "h": 22 }, "frame": { - "x": 126, - "y": 65, + "x": 173, + "y": 68, "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": 195, + "y": 68, + "w": 17, + "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": 137, + "y": 92, + "w": 21, + "h": 21 + } + }, { "filename": "tm_fighting", "rotated": false, @@ -1158,8 +1557,8 @@ "h": 22 }, "frame": { - "x": 83, - "y": 87, + "x": 158, + "y": 90, "w": 22, "h": 22 } @@ -1179,12 +1578,33 @@ "h": 22 }, "frame": { - "x": 105, - "y": 87, + "x": 180, + "y": 90, "w": 22, "h": 22 } }, + { + "filename": "potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 140, + "y": 113, + "w": 17, + "h": 23 + } + }, { "filename": "tm_flying", "rotated": false, @@ -1200,14 +1620,14 @@ "h": 22 }, "frame": { - "x": 127, - "y": 87, + "x": 212, + "y": 63, "w": 22, "h": 22 } }, { - "filename": "dawn_stone", + "filename": "dragon_scale", "rotated": false, "trimmed": true, "sourceSize": { @@ -1215,20 +1635,125 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 21 + "x": 4, + "y": 8, + "w": 24, + "h": 18 }, "frame": { - "x": 151, - "y": 45, - "w": 20, - "h": 21 + "x": 140, + "y": 136, + "w": 24, + "h": 18 } }, { - "filename": "deep_sea_tooth", + "filename": "super_potion", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 8, + "y": 5, + "w": 17, + "h": 23 + }, + "frame": { + "x": 202, + "y": 90, + "w": 17, + "h": 23 + } + }, + { + "filename": "razor_fang", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 18, + "h": 20 + }, + "frame": { + "x": 219, + "y": 85, + "w": 18, + "h": 20 + } + }, + { + "filename": "oval_stone", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 7, + "w": 18, + "h": 19 + }, + "frame": { + "x": 219, + "y": 105, + "w": 18, + "h": 19 + } + }, + { + "filename": "silver_powder", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 4, + "y": 11, + "w": 24, + "h": 15 + }, + "frame": { + "x": 64, + "y": 153, + "w": 24, + "h": 15 + } + }, + { + "filename": "dubious_disc", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 22, + "h": 19 + }, + "frame": { + "x": 62, + "y": 168, + "w": 22, + "h": 19 + } + }, + { + "filename": "shiny_stone", "rotated": false, "trimmed": true, "sourceSize": { @@ -1238,13 +1763,13 @@ "spriteSourceSize": { "x": 5, "y": 6, - "w": 22, + "w": 21, "h": 21 }, "frame": { - "x": 148, - "y": 66, - "w": 22, + "x": 63, + "y": 187, + "w": 21, "h": 21 } }, @@ -1263,12 +1788,33 @@ "h": 22 }, "frame": { - "x": 149, - "y": 87, + "x": 62, + "y": 208, "w": 22, "h": 22 } }, + { + "filename": "shell_bell", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 23, + "h": 20 + }, + "frame": { + "x": 88, + "y": 153, + "w": 23, + "h": 20 + } + }, { "filename": "tm_grass", "rotated": false, @@ -1285,7 +1831,7 @@ }, "frame": { "x": 84, - "y": 109, + "y": 173, "w": 22, "h": 22 } @@ -1306,11 +1852,53 @@ }, "frame": { "x": 84, - "y": 131, + "y": 195, "w": 22, "h": 22 } }, + { + "filename": "gb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 84, + "y": 217, + "w": 20, + "h": 20 + } + }, + { + "filename": "magnet", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 104, + "y": 217, + "w": 20, + "h": 20 + } + }, { "filename": "tm_ice", "rotated": false, @@ -1326,8 +1914,8 @@ "h": 22 }, "frame": { - "x": 106, - "y": 109, + "x": 111, + "y": 154, "w": 22, "h": 22 } @@ -1347,8 +1935,8 @@ "h": 22 }, "frame": { - "x": 84, - "y": 153, + "x": 133, + "y": 154, "w": 22, "h": 22 } @@ -1369,11 +1957,53 @@ }, "frame": { "x": 106, - "y": 131, + "y": 176, "w": 22, "h": 22 } }, + { + "filename": "upgrade", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 5, + "y": 7, + "w": 22, + "h": 19 + }, + "frame": { + "x": 106, + "y": 198, + "w": 22, + "h": 19 + } + }, + { + "filename": "mb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 124, + "y": 217, + "w": 20, + "h": 20 + } + }, { "filename": "tm_psychic", "rotated": false, @@ -1390,11 +2020,74 @@ }, "frame": { "x": 128, - "y": 109, + "y": 176, "w": 22, "h": 22 } }, + { + "filename": "razor_claw", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 20, + "h": 19 + }, + "frame": { + "x": 128, + "y": 198, + "w": 20, + "h": 19 + } + }, + { + "filename": "pb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 144, + "y": 217, + "w": 20, + "h": 20 + } + }, + { + "filename": "miracle_seed", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 7, + "w": 19, + "h": 19 + }, + "frame": { + "x": 148, + "y": 198, + "w": 19, + "h": 19 + } + }, { "filename": "tm_rock", "rotated": false, @@ -1410,8 +2103,8 @@ "h": 22 }, "frame": { - "x": 106, - "y": 153, + "x": 150, + "y": 176, "w": 22, "h": 22 } @@ -1431,12 +2124,33 @@ "h": 22 }, "frame": { - "x": 128, - "y": 131, + "x": 155, + "y": 154, "w": 22, "h": 22 } }, + { + "filename": "pb_gold", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 164, + "y": 217, + "w": 20, + "h": 20 + } + }, { "filename": "tm_water", "rotated": false, @@ -1452,12 +2166,33 @@ "h": 22 }, "frame": { - "x": 128, - "y": 153, + "x": 172, + "y": 176, "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": 167, + "y": 198, + "w": 23, + "h": 17 + } + }, { "filename": "water_stone", "rotated": false, @@ -1473,12 +2208,33 @@ "h": 22 }, "frame": { - "x": 150, - "y": 109, + "x": 184, + "y": 215, "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": 190, + "y": 198, + "w": 20, + "h": 17 + } + }, { "filename": "x_accuracy", "rotated": false, @@ -1494,8 +2250,8 @@ "h": 22 }, "frame": { - "x": 150, - "y": 131, + "x": 206, + "y": 215, "w": 22, "h": 22 } @@ -1515,14 +2271,14 @@ "h": 22 }, "frame": { - "x": 150, - "y": 153, + "x": 158, + "y": 112, "w": 22, "h": 22 } }, { - "filename": "metal_coat", + "filename": "golden_egg", "rotated": false, "trimmed": true, "sourceSize": { @@ -1530,16 +2286,16 @@ "h": 32 }, "spriteSourceSize": { - "x": 6, - "y": 5, - "w": 19, - "h": 22 + "x": 7, + "y": 6, + "w": 17, + "h": 20 }, "frame": { - "x": 65, - "y": 183, - "w": 19, - "h": 22 + "x": 164, + "y": 134, + "w": 17, + "h": 20 } }, { @@ -1557,12 +2313,33 @@ "h": 22 }, "frame": { - "x": 84, - "y": 175, + "x": 180, + "y": 112, "w": 22, "h": 22 } }, + { + "filename": "lucky_egg", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 17, + "h": 20 + }, + "frame": { + "x": 202, + "y": 113, + "w": 17, + "h": 20 + } + }, { "filename": "x_sp_atk", "rotated": false, @@ -1578,12 +2355,33 @@ "h": 22 }, "frame": { - "x": 106, - "y": 175, + "x": 177, + "y": 154, "w": 22, "h": 22 } }, + { + "filename": "ub", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 6, + "y": 6, + "w": 20, + "h": 20 + }, + "frame": { + "x": 181, + "y": 134, + "w": 20, + "h": 20 + } + }, { "filename": "x_sp_def", "rotated": false, @@ -1599,8 +2397,8 @@ "h": 22 }, "frame": { - "x": 128, - "y": 175, + "x": 194, + "y": 176, "w": 22, "h": 22 } @@ -1620,369 +2418,12 @@ "h": 22 }, "frame": { - "x": 150, - "y": 175, + "x": 199, + "y": 154, "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": 84, - "y": 197, - "w": 24, - "h": 18 - } - }, - { - "filename": "upgrade", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 7, - "w": 22, - "h": 19 - }, - "frame": { - "x": 67, - "y": 215, - "w": 22, - "h": 19 - } - }, - { - "filename": "razor_claw", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 20, - "h": 19 - }, - "frame": { - "x": 89, - "y": 215, - "w": 20, - "h": 19 - } - }, - { - "filename": "dragon_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 24, - "h": 18 - }, - "frame": { - "x": 108, - "y": 197, - "w": 24, - "h": 18 - } - }, - { - "filename": "miracle_seed", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 7, - "w": 19, - "h": 19 - }, - "frame": { - "x": 109, - "y": 215, - "w": 19, - "h": 19 - } - }, - { - "filename": "oval_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 7, - "w": 18, - "h": 19 - }, - "frame": { - "x": 128, - "y": 215, - "w": 18, - "h": 19 - } - }, - { - "filename": "black_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 132, - "y": 197, - "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": 146, - "y": 214, - "w": 23, - "h": 20 - } - }, - { - "filename": "everstone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 8, - "w": 20, - "h": 17 - }, - "frame": { - "x": 155, - "y": 197, - "w": 20, - "h": 17 - } - }, - { - "filename": "deep_sea_scale", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 22, - "h": 20 - }, - "frame": { - "x": 169, - "y": 214, - "w": 22, - "h": 20 - } - }, - { - "filename": "metronome", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 5, - "w": 17, - "h": 22 - }, - "frame": { - "x": 167, - "y": 23, - "w": 17, - "h": 22 - } - }, - { - "filename": "dusk_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 21, - "h": 21 - }, - "frame": { - "x": 184, - "y": 22, - "w": 21, - "h": 21 - } - }, - { - "filename": "full_heal", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 9, - "y": 4, - "w": 15, - "h": 23 - }, - "frame": { - "x": 171, - "y": 45, - "w": 15, - "h": 23 - } - }, - { - "filename": "iron", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 186, - "y": 43, - "w": 16, - "h": 24 - } - }, - { - "filename": "wise_glasses", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 4, - "y": 8, - "w": 23, - "h": 17 - }, - "frame": { - "x": 170, - "y": 68, - "w": 23, - "h": 17 - } - }, - { - "filename": "poison_barb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 21, - "h": 21 - }, - "frame": { - "x": 171, - "y": 85, - "w": 21, - "h": 21 - } - }, - { - "filename": "shiny_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 5, - "y": 6, - "w": 21, - "h": 21 - }, - "frame": { - "x": 172, - "y": 106, - "w": 21, - "h": 21 - } - }, { "filename": "zoom_lens", "rotated": false, @@ -1998,96 +2439,12 @@ "h": 21 }, "frame": { - "x": 172, - "y": 127, + "x": 216, + "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": 172, - "y": 148, - "w": 20, - "h": 20 - } - }, - { - "filename": "magnet", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 172, - "y": 168, - "w": 20, - "h": 20 - } - }, - { - "filename": "potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 175, - "y": 188, - "w": 17, - "h": 23 - } - }, - { - "filename": "super_potion", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 5, - "w": 17, - "h": 23 - }, - "frame": { - "x": 191, - "y": 211, - "w": 17, - "h": 23 - } - }, { "filename": "revive", "rotated": false, @@ -2103,306 +2460,12 @@ "h": 17 }, "frame": { - "x": 205, - "y": 22, + "x": 210, + "y": 198, "w": 12, "h": 17 } }, - { - "filename": "golden_egg", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 17, - "h": 20 - }, - "frame": { - "x": 217, - "y": 24, - "w": 17, - "h": 20 - } - }, - { - "filename": "hard_stone", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 19, - "h": 20 - }, - "frame": { - "x": 193, - "y": 67, - "w": 19, - "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": 192, - "y": 87, - "w": 24, - "h": 15 - } - }, - { - "filename": "razor_fang", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 18, - "h": 20 - }, - "frame": { - "x": 216, - "y": 44, - "w": 18, - "h": 20 - } - }, - { - "filename": "mb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 193, - "y": 102, - "w": 20, - "h": 20 - } - }, - { - "filename": "pb", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 193, - "y": 122, - "w": 20, - "h": 20 - } - }, - { - "filename": "pb_gold", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 212, - "y": 64, - "w": 20, - "h": 20 - } - }, - { - "filename": "lucky_egg", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 7, - "y": 6, - "w": 17, - "h": 20 - }, - "frame": { - "x": 216, - "y": 84, - "w": 17, - "h": 20 - } - }, - { - "filename": "pp_max", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 213, - "y": 104, - "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": 213, - "y": 128, - "w": 16, - "h": 24 - } - }, - { - "filename": "ub", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 6, - "y": 6, - "w": 20, - "h": 20 - }, - "frame": { - "x": 193, - "y": 142, - "w": 20, - "h": 20 - } - }, - { - "filename": "protein", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 192, - "y": 162, - "w": 16, - "h": 24 - } - }, - { - "filename": "zinc", - "rotated": false, - "trimmed": true, - "sourceSize": { - "w": 32, - "h": 32 - }, - "spriteSourceSize": { - "x": 8, - "y": 4, - "w": 16, - "h": 24 - }, - "frame": { - "x": 192, - "y": 186, - "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": 208, - "y": 162, - "w": 19, - "h": 21 - } - }, { "filename": "prism_scale", "rotated": false, @@ -2418,8 +2481,8 @@ "h": 15 }, "frame": { - "x": 208, - "y": 183, + "x": 222, + "y": 197, "w": 15, "h": 15 } @@ -2430,6 +2493,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:b7cd9da26f45d03f815f0dd3e58a0e20:36ec8d239bc31067ead6e048a333cd97:110e074689c9edd2c54833ce2e4d9270$" + "smartupdate": "$TexturePacker:SmartUpdate:ea27e295ceff04088e93f7ad1187a1fc:a8cbcb6f7d3be83d92d32173fccbe041:110e074689c9edd2c54833ce2e4d9270$" } } diff --git a/public/images/items.png b/public/images/items.png index 05408871b..373737020 100644 Binary files a/public/images/items.png and b/public/images/items.png differ diff --git a/public/images/items/exp_charm.png b/public/images/items/exp_charm.png new file mode 100644 index 000000000..b42da7330 Binary files /dev/null and b/public/images/items/exp_charm.png differ diff --git a/public/images/items/golden_exp_charm.png b/public/images/items/golden_exp_charm.png new file mode 100644 index 000000000..efc281fe1 Binary files /dev/null and b/public/images/items/golden_exp_charm.png differ diff --git a/public/images/items/leftovers.png b/public/images/items/leftovers.png new file mode 100644 index 000000000..48ff07fbe Binary files /dev/null and b/public/images/items/leftovers.png differ diff --git a/src/battle-phases.ts b/src/battle-phases.ts index 64b33b6e6..1ee4c31c7 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -5,7 +5,7 @@ import { allMoves, applyMoveAttrs, BypassSleepAttr, ChargeAttr, ConditionalMoveA import { Mode } from './ui/ui'; import { Command } from "./ui/command-ui-handler"; import { Stat } from "./pokemon-stat"; -import { ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, HitHealModifier, TempBattleStatBoosterModifier } from "./modifier"; +import { ExpBoosterModifier, ExpShareModifier, ExtraModifierModifier, HitHealModifier, PokemonExpBoosterModifier, TempBattleStatBoosterModifier } from "./modifier"; import PartyUiHandler, { PartyOption, PartyUiMode } from "./ui/party-ui-handler"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getPokeballTintColor, PokeballType } from "./pokeball"; import { CommonAnim, CommonBattleAnim, MoveAnim, initMoveAnim, loadMoveAnimAssets } from "./battle-anims"; @@ -1307,8 +1307,9 @@ export class VictoryPhase extends PokemonPhase { expMultiplier += (1 / participantIds.size); if (expShareModifier) expMultiplier += expShareModifier.stackCount * 0.1; - console.log(pokemon.species.name, expMultiplier) - this.scene.unshiftPhase(new ExpPhase(this.scene, pm, expValue * expMultiplier)); + const pokemonExp = new Utils.NumberHolder(expValue * expMultiplier); + this.scene.applyModifiers(PokemonExpBoosterModifier, pokemon, pokemonExp); + this.scene.unshiftPhase(new ExpPhase(this.scene, pm, Math.floor(pokemonExp.value))); } } diff --git a/src/modifier-type.ts b/src/modifier-type.ts index 8a1958500..6a77a1f1e 100644 --- a/src/modifier-type.ts +++ b/src/modifier-type.ts @@ -285,7 +285,7 @@ export class PokemonBaseStatBoosterModifierType extends PokemonModifierType { private stat: Stat; constructor(name: string, stat: Stat, _iconImage?: string) { - super(name, `Increases one POKéMON's base ${getStatName(stat)} by 20%` , (_type, args) => new Modifiers.PokemonBaseStatModifier(this, (args[0] as PlayerPokemon).id, this.stat)); + super(name, `Increases the holder's base ${getStatName(stat)} by 20%` , (_type, args) => new Modifiers.PokemonBaseStatModifier(this, (args[0] as PlayerPokemon).id, this.stat)); this.stat = stat; } @@ -309,6 +309,12 @@ export class ExpBoosterModifierType extends ModifierType { } } +export class PokemonExpBoosterModifierType extends PokemonModifierType { + constructor(name: string, boostPercent: integer, iconImage?: string) { + super(name, `Increases the holder's gain of EXP. Points by ${boostPercent}%`, (_type, args) => new Modifiers.PokemonExpBoosterModifier(this, (args[0] as PlayerPokemon).id, boostPercent), iconImage); + } +} + export class TmModifierType extends PokemonModifierType { public moveId: Moves; @@ -518,6 +524,7 @@ const modifierPool = { return new TmModifierType(uniqueCompatibleTms[randTmIndex]); }), 4), new WeightedModifierType(new ModifierType('EXP. SHARE', 'All POKéMON in your party gain an additional 10% of a battle\'s EXP. Points', (type, _args) => new Modifiers.ExpShareModifier(type), 'exp_share'), 2), + new WeightedModifierType(new PokemonExpBoosterModifierType('LUCKY EGG', 50), 2), new WeightedModifierType(new ModifierTypeGenerator((party: PlayerPokemon[]) => { const randStat = Utils.randInt(6) as Stat; return new PokemonBaseStatBoosterModifierType(getBaseStatBoosterItemName(randStat), randStat); @@ -531,14 +538,14 @@ const modifierPool = { (type, _args) => new Modifiers.PartyShareModifier(type), 'oval_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'), new WeightedModifierType(new PokemonModifierType('SHELL BELL', 'Heals 1/8 of a POKéMON\'s dealt damage', (type, args) => new Modifiers.HitHealModifier(type, (args[0] as PlayerPokemon).id)), 2), - new WeightedModifierType(new ExpBoosterModifierType('LUCKY EGG', 25), 4) + new WeightedModifierType(new ExpBoosterModifierType('EXP CHARM', 25), 4) ].map(m => { m.setTier(ModifierTier.ULTRA); return m; }), [ModifierTier.MASTER]: [ new AddPokeballModifierType(PokeballType.MASTER_BALL, 1, 'mb'), new WeightedModifierType(new ModifierType('SHINY CHARM', 'Dramatically increases the chance of a wild POKéMON being shiny', (type, _args) => new Modifiers.ShinyRateBoosterModifier(type)), 2) ].map(m => { m.setTier(ModifierTier.MASTER); return m; }), [ModifierTier.LUXURY]: [ - new ExpBoosterModifierType('GOLDEN EGG', 100), + new ExpBoosterModifierType('GOLDEN EXP CHARM', 100), new ModifierType(`GOLDEN ${getPokeballName(PokeballType.POKEBALL)}`, 'Adds 1 extra item option at the end of every battle', (type, _args) => new Modifiers.ExtraModifierModifier(type), 'pb_gold') ].map(m => { m.setTier(ModifierTier.LUXURY); return m; }), }; diff --git a/src/modifier.ts b/src/modifier.ts index bad7f98ca..5ef742aec 100644 --- a/src/modifier.ts +++ b/src/modifier.ts @@ -624,6 +624,37 @@ export class ExpBoosterModifier extends PersistentModifier { } } +export class PokemonExpBoosterModifier extends PokemonHeldItemModifier { + private boostMultiplier: integer; + + constructor(type: ModifierTypes.PokemonExpBoosterModifierType, pokemonId: integer, boostPercent: integer) { + super(type, pokemonId); + this.boostMultiplier = boostPercent * 0.01; + } + + match(modifier: Modifier): boolean { + if (modifier instanceof PokemonExpBoosterModifier) { + const pokemonExpModifier = modifier as PokemonExpBoosterModifier; + return pokemonExpModifier.pokemonId === this.pokemonId && pokemonExpModifier.boostMultiplier === this.boostMultiplier; + } + return false; + } + + clone(): PersistentModifier { + return new PokemonExpBoosterModifier(this.type as ModifierTypes.PokemonExpBoosterModifierType, this.pokemonId, this.boostMultiplier * 100); + } + + shouldApply(args: any[]): boolean { + return super.shouldApply(args) && args.length === 2 && args[1] instanceof Utils.NumberHolder; + } + + apply(args: any[]): boolean { + (args[1] as Utils.NumberHolder).value = Math.floor((args[1] as Utils.NumberHolder).value * (1 + (this.getStackCount() * this.boostMultiplier))); + + return true; + } +} + export class ExpShareModifier extends PersistentModifier { constructor(type: ModifierType) { super(type); diff --git a/src/move.ts b/src/move.ts index 618a5ab2c..26e750b6e 100644 --- a/src/move.ts +++ b/src/move.ts @@ -1207,8 +1207,6 @@ export class DisableMoveAttr extends MoveEffectAttr { const disabledMove = target.moveset[moveIndex]; disabledMove.disableTurns = 4; - console.log(disabledMove); - user.scene.unshiftPhase(new MessagePhase(user.scene, getPokemonMessage(target, `'s ${disabledMove.getName()}\nwas disabled!`))) return true; @@ -1770,7 +1768,7 @@ export const allMoves = [ new AttackMove(Moves.SHOCK_WAVE, "Shock Wave", Type.ELECTRIC, MoveCategory.SPECIAL, 60, -1, 20, -1, "Ignores Accuracy and Evasiveness.", -1, 0, 3), new AttackMove(Moves.WATER_PULSE, "Water Pulse", Type.WATER, MoveCategory.SPECIAL, 60, 100, 20, 11, "May confuse opponent.", 20, 0, 3, new ConfuseAttr()), new AttackMove(Moves.DOOM_DESIRE, "Doom Desire", Type.STEEL, MoveCategory.SPECIAL, 140, 100, 5, -1, "Damage occurs 2 turns later.", -1, 0, 3, - new ChargeAttr(ChargeAnim.DOOM_DESIRE_CHARGING, 'chose\nDOOM DESIRE as its destiny!')), + new ChargeAttr(ChargeAnim.DOOM_DESIRE_CHARGING, 'chose\nDOOM DESIRE as its destiny!')), // Fix this move to work properly new AttackMove(Moves.PSYCHO_BOOST, "Psycho Boost", Type.PSYCHIC, MoveCategory.SPECIAL, 140, 90, 5, -1, "Sharply lowers user's Special Attack.", 100, 0, 3, new StatChangeAttr(BattleStat.SPATK, -2, true)), new SelfStatusMove(Moves.ROOST, "Roost", Type.FLYING, -1, 5, -1, "User recovers half of its max HP and loses the Flying type temporarily.", -1, 0, 4, new HitHealAttr(), new AddTagAttr(BattleTagType.IGNORE_FLYING, true, 1)), new SelfStatusMove(Moves.GRAVITY, "Gravity", Type.PSYCHIC, -1, 5, -1, "Prevents moves like Fly and Bounce and the Ability Levitate for 5 turns.", -1, 0, 4), @@ -1779,7 +1777,7 @@ export const allMoves = [ new AttackMove(Moves.HAMMER_ARM, "Hammer Arm", Type.FIGHTING, MoveCategory.PHYSICAL, 100, 90, 10, -1, "Lowers user's Speed.", 100, 0, 4, new StatChangeAttr(BattleStat.SPD, -1, true)), new AttackMove(Moves.GYRO_BALL, "Gyro Ball", Type.STEEL, MoveCategory.PHYSICAL, -1, 100, 5, -1, "The slower the user, the stronger the attack.", -1, 0, 4), new SelfStatusMove(Moves.HEALING_WISH, "Healing Wish", Type.PSYCHIC, -1, 10, -1, "The user faints and the next Pokémon released is fully healed.", -1, 0, 4, new SacrificialAttr()), // TODO - new AttackMove(Moves.BRINE, "Brine", Type.WATER, MoveCategory.SPECIAL, 65, 100, 10, -1, "Power doubles if opponent's HP is less than 50%.", -1, 0, 4), + new AttackMove(Moves.BRINE, "Brine", Type.WATER, MoveCategory.SPECIAL, 65, 100, 10, -1, "Power doubles if opponent's HP is less than 50%.", -1, 0, 4, new MovePowerMultiplierAttr((user: Pokemon, target: Pokemon, move: Move) => target.getHpRatio() < 0.5 ? 2 : 1)), new AttackMove(Moves.NATURAL_GIFT, "Natural Gift", Type.NORMAL, MoveCategory.PHYSICAL, -1, 100, 15, -1, "Power and type depend on the user's held berry.", -1, 0, 4), new AttackMove(Moves.FEINT, "Feint", Type.NORMAL, MoveCategory.PHYSICAL, 30, 100, 10, -1, "Only hits if opponent uses Protect or Detect in the same turn.", -1, 2, 4, new ConditionalMoveAttr((user: Pokemon, target: Pokemon, move: Move) => !!target.getTag(BattleTagType.PROTECTED))).ignoreProtect(),