diff --git a/images/items/hm01_cut.png b/images/items/hm01_cut.png new file mode 100644 index 0000000..f7d22bf Binary files /dev/null and b/images/items/hm01_cut.png differ diff --git a/images/items/hm02_fly.png b/images/items/hm02_fly.png new file mode 100644 index 0000000..fa15fdc Binary files /dev/null and b/images/items/hm02_fly.png differ diff --git a/images/items/hm03_surf.png b/images/items/hm03_surf.png new file mode 100644 index 0000000..6898406 Binary files /dev/null and b/images/items/hm03_surf.png differ diff --git a/images/items/hm04_strength.png b/images/items/hm04_strength.png new file mode 100644 index 0000000..85a9954 Binary files /dev/null and b/images/items/hm04_strength.png differ diff --git a/images/items/hm05_flash.png b/images/items/hm05_flash.png new file mode 100644 index 0000000..59e06d8 Binary files /dev/null and b/images/items/hm05_flash.png differ diff --git a/images/overlays/boulder.png b/images/overlays/boulder.png index bd4829b..b4dfcdc 100644 Binary files a/images/overlays/boulder.png and b/images/overlays/boulder.png differ diff --git a/images/overlays/boulderextra.png b/images/overlays/boulderextra.png new file mode 100644 index 0000000..14d81dd Binary files /dev/null and b/images/overlays/boulderextra.png differ diff --git a/images/overlays/cascade.png b/images/overlays/cascade.png index 17e7e54..2a3f41c 100644 Binary files a/images/overlays/cascade.png and b/images/overlays/cascade.png differ diff --git a/images/overlays/cascadeextra.png b/images/overlays/cascadeextra.png new file mode 100644 index 0000000..7880aac Binary files /dev/null and b/images/overlays/cascadeextra.png differ diff --git a/images/overlays/earth.png b/images/overlays/earth.png index 931a204..f349938 100644 Binary files a/images/overlays/earth.png and b/images/overlays/earth.png differ diff --git a/images/overlays/earthextra.png b/images/overlays/earthextra.png new file mode 100644 index 0000000..2834da7 Binary files /dev/null and b/images/overlays/earthextra.png differ diff --git a/images/overlays/marsh.png b/images/overlays/marsh.png index 056d5e8..4d0ac01 100644 Binary files a/images/overlays/marsh.png and b/images/overlays/marsh.png differ diff --git a/images/overlays/marshextra.png b/images/overlays/marshextra.png new file mode 100644 index 0000000..129d32b Binary files /dev/null and b/images/overlays/marshextra.png differ diff --git a/images/overlays/rainbow.png b/images/overlays/rainbow.png index 20738b0..3a03ed7 100644 Binary files a/images/overlays/rainbow.png and b/images/overlays/rainbow.png differ diff --git a/images/overlays/rainbowextra.png b/images/overlays/rainbowextra.png new file mode 100644 index 0000000..29faf79 Binary files /dev/null and b/images/overlays/rainbowextra.png differ diff --git a/images/overlays/soul.png b/images/overlays/soul.png index 2d4345f..56af177 100644 Binary files a/images/overlays/soul.png and b/images/overlays/soul.png differ diff --git a/images/overlays/soulextra.png b/images/overlays/soulextra.png new file mode 100644 index 0000000..3e7c81d Binary files /dev/null and b/images/overlays/soulextra.png differ diff --git a/images/overlays/thunder.png b/images/overlays/thunder.png index 1a0d76f..b2c66ef 100644 Binary files a/images/overlays/thunder.png and b/images/overlays/thunder.png differ diff --git a/images/overlays/thunderextra.png b/images/overlays/thunderextra.png new file mode 100644 index 0000000..d05a99e Binary files /dev/null and b/images/overlays/thunderextra.png differ diff --git a/images/overlays/volcano.png b/images/overlays/volcano.png index 3964560..66f6e2d 100644 Binary files a/images/overlays/volcano.png and b/images/overlays/volcano.png differ diff --git a/images/overlays/volcanoextra.png b/images/overlays/volcanoextra.png new file mode 100644 index 0000000..50daf94 Binary files /dev/null and b/images/overlays/volcanoextra.png differ diff --git a/items/items.json b/items/items.json index ff528e0..e85d600 100644 --- a/items/items.json +++ b/items/items.json @@ -9,55 +9,70 @@ { "name": "HM01 Cut", "codes": "cut,cut_noextra", - "img": "images/items/hm_normal.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png" }, { "name": "HM01 Cut - Extra: Boulder Badge", "codes": "cut,cut_boulder", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/boulder.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png,overlay|images/overlays/boulderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png,overlay|images/overlays/boulderextra.png" }, { "name": "HM01 Cut - Extra: Cascade Badge", "codes": "cut,cut_cascade", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/cascade.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png,overlay|images/overlays/cascadeextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png,overlay|images/overlays/cascadeextra.png" }, { "name": "HM01 Cut - Extra: Thunder Badge", "codes": "cut,cut_thunder", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/thunder.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png,overlay|images/overlays/thunderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png,overlay|images/overlays/thunderextra.png" }, { "name": "HM01 Cut - Extra: Rainbow Badge", "codes": "cut,cut_rainbow", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/rainbow.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png,overlay|images/overlays/rainbowextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png,overlay|images/overlays/rainbowextra.png" }, { "name": "HM01 Cut - Extra: Soul Badge", "codes": "cut,cut_soul", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/soul.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png,overlay|images/overlays/soulextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png,overlay|images/overlays/soulextra.png" }, { "name": "HM01 Cut - Extra: Marsh Badge", "codes": "cut,cut_marsh", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/marsh.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png,overlay|images/overlays/marshextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png,overlay|images/overlays/marshextra.png" }, { "name": "HM01 Cut - Extra: Volcano Badge", "codes": "cut,cut_volcano", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/volcano.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png,overlay|images/overlays/volcanoextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png,overlay|images/overlays/volcanoextra.png" }, { "name": "HM01 Cut - Extra: Earth Badge", "codes": "cut,cut_earth", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/earth.png" + "img": "images/items/hm01_cut.png", + "img_mods": "overlay|images/overlays/cascade.png,overlay|images/overlays/earthextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/cascade.png,overlay|images/overlays/earthextra.png" + }, + { + "name": "HM01 Cut - Free", + "codes": "cut,cut_free", + "img": "images/items/hm01_cut.png" } ] }, @@ -70,55 +85,70 @@ { "name": "HM02 Fly", "codes": "fly,fly_noextra", - "img": "images/items/hm_flying.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png" }, { "name": "HM02 Fly - Extra: Boulder Badge", "codes": "fly,fly_boulder", - "img": "images/items/hm_flying.png", - "img_mods": "overlay|images/overlays/boulder.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png,overlay|images/overlays/boulderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png,overlay|images/overlays/boulderextra.png" }, { "name": "HM02 Fly - Extra: Cascade Badge", "codes": "fly,fly_cascade", - "img": "images/items/hm_flying.png", - "img_mods": "overlay|images/overlays/cascade.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png,overlay|images/overlays/cascadeextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png,overlay|images/overlays/cascadeextra.png" }, { "name": "HM02 Fly - Extra: Thunder Badge", "codes": "fly,fly_thunder", - "img": "images/items/hm_flying.png", - "img_mods": "overlay|images/overlays/thunder.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png,overlay|images/overlays/thunderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png,overlay|images/overlays/thunderextra.png" }, { "name": "HM02 Fly - Extra: Rainbow Badge", "codes": "fly,fly_rainbow", - "img": "images/items/hm_flying.png", - "img_mods": "overlay|images/overlays/rainbow.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png,overlay|images/overlays/rainbowextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png,overlay|images/overlays/rainbowextra.png" }, { "name": "HM02 Fly - Extra: Soul Badge", "codes": "fly,fly_soul", - "img": "images/items/hm_flying.png", - "img_mods": "overlay|images/overlays/soul.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png,overlay|images/overlays/soulextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png,overlay|images/overlays/soulextra.png" }, { "name": "HM02 Fly - Extra: Marsh Badge", "codes": "fly,fly_marsh", - "img": "images/items/hm_flying.png", - "img_mods": "overlay|images/overlays/marsh.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png, overlay|images/overlays/marshextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png,overlay|images/overlays/marshextra.png" }, { "name": "HM02 Fly - Extra: Volcano Badge", "codes": "fly,fly_volcano", - "img": "images/items/hm_flying.png", - "img_mods": "overlay|images/overlays/volcano.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png,overlay|images/overlays/volcanoextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png,overlay|images/overlays/volcanoextra.png" }, { "name": "HM02 Fly - Extra: Earth Badge", "codes": "fly,fly_earth", - "img": "images/items/hm_flying.png", - "img_mods": "overlay|images/overlays/earth.png" + "img": "images/items/hm02_fly.png", + "img_mods": "overlay|images/overlays/thunder.png,overlay|images/overlays/earthextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/thunder.png,overlay|images/overlays/earthextra.png" + }, + { + "name": "HM02 Fly - Free", + "codes": "fly,fly_free", + "img": "images/items/hm02_fly.png" } ] }, @@ -131,55 +161,70 @@ { "name": "HM03 Surf", "codes": "surf,surf_noextra", - "img": "images/items/hm_water.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png" }, { "name": "HM03 Surf - Extra: Boulder Badge", "codes": "surf,surf_boulder", - "img": "images/items/hm_water.png", - "img_mods": "overlay|images/overlays/boulder.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png,overlay|images/overlays/boulderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png,overlay|images/overlays/boulderextra.png" }, { "name": "HM03 Surf - Extra: Cascade Badge", "codes": "surf,surf_cascade", - "img": "images/items/hm_water.png", - "img_mods": "overlay|images/overlays/cascade.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png,overlay|images/overlays/cascadeextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png,overlay|images/overlays/cascadeextra.png" }, { "name": "HM03 Surf - Extra: Thunder Badge", "codes": "surf,surf_thunder", - "img": "images/items/hm_water.png", - "img_mods": "overlay|images/overlays/thunder.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png,overlay|images/overlays/thunderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png,overlay|images/overlays/thunderextra.png" }, { "name": "HM03 Surf - Extra: Rainbow Badge", "codes": "surf,surf_rainbow", - "img": "images/items/hm_water.png", - "img_mods": "overlay|images/overlays/rainbow.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png,overlay|images/overlays/rainbowextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png,overlay|images/overlays/rainbowextra.png" }, { "name": "HM03 Surf - Extra: Soul Badge", "codes": "surf,surf_soul", - "img": "images/items/hm_water.png", - "img_mods": "overlay|images/overlays/soul.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png,overlay|images/overlays/soulextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png,overlay|images/overlays/soulextra.png" }, { "name": "HM03 Surf - Extra: Marsh Badge", "codes": "surf,surf_marsh", - "img": "images/items/hm_water.png", - "img_mods": "overlay|images/overlays/marsh.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png,overlay|images/overlays/marshextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png,overlay|images/overlays/marshextra.png" }, { "name": "HM03 Surf - Extra: Volcano Badge", "codes": "surf,surf_volcano", - "img": "images/items/hm_water.png", - "img_mods": "overlay|images/overlays/volcano.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png,overlay|images/overlays/volcanoextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png,overlay|images/overlays/volcanoextra.png" }, { "name": "HM03 Surf - Extra: Earth Badge", "codes": "surf,surf_earth", - "img": "images/items/hm_water.png", - "img_mods": "overlay|images/overlays/earth.png" + "img": "images/items/hm03_surf.png", + "img_mods": "overlay|images/overlays/soul.png,overlay|images/overlays/earthextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/soul.png,overlay|images/overlays/earthextra.png" + }, + { + "name": "HM03 Surf - Free", + "codes": "surf,surf_free", + "img": "images/items/hm03_surf.png" } ] }, @@ -192,55 +237,70 @@ { "name": "HM04 Strength", "codes": "strength,strength_noextra", - "img": "images/items/hm_normal.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png" }, { "name": "HM04 Strength - Extra: Boulder Badge", "codes": "strength,strength_boulder", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/boulder.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png,overlay|images/overlays/boulderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png,overlay|images/overlays/boulderextra.png" }, { "name": "HM04 Strength - Extra: Cascade Badge", "codes": "strength,strength_cascade", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/cascade.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png,overlay|images/overlays/cascadeextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png,overlay|images/overlays/cascadeextra.png" }, { "name": "HM04 Strength - Extra: Thunder Badge", "codes": "strength,strength_thunder", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/thunder.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png,overlay|images/overlays/thunderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png,overlay|images/overlays/thunderextra.png" }, { "name": "HM04 Strength - Extra: Rainbow Badge", "codes": "strength,strength_rainbow", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/rainbow.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png,overlay|images/overlays/rainbowextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png,overlay|images/overlays/rainbowextra.png" }, { "name": "HM04 Strength - Extra: Soul Badge", "codes": "strength,strength_soul", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/soul.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png,overlay|images/overlays/soulextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png,overlay|images/overlays/soulextra.png" }, { "name": "HM04 Strength - Extra: Marsh Badge", "codes": "strength,strength_marsh", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/marsh.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png,overlay|images/overlays/marshextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png,overlay|images/overlays/marshextra.png" }, { "name": "HM04 Strength - Extra: Volcano Badge", "codes": "strength,strength_volcano", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/volcano.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png,overlay|images/overlays/volcanoextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png,overlay|images/overlays/volcanoextra.png" }, { "name": "HM04 Strength - Extra: Earth Badge", "codes": "strength,strength_earth", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/earth.png" + "img": "images/items/hm04_strength.png", + "img_mods": "overlay|images/overlays/rainbow.png,overlay|images/overlays/earthextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/rainbow.png,overlay|images/overlays/earthextra.png" + }, + { + "name": "HM04 Strength - Free", + "codes": "strength,strength_free", + "img": "images/items/hm04_strength.png" } ] }, @@ -253,55 +313,70 @@ { "name": "HM05 Flash", "codes": "flash,flash_noextra", - "img": "images/items/hm_normal.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png" }, { "name": "HM05 Flash - Extra: Boulder Badge", "codes": "flash,flash_boulder", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/boulder.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png,overlay|images/overlays/boulderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png,overlay|images/overlays/boulderextra.png" }, { "name": "HM05 Flash - Extra: Cascade Badge", "codes": "flash,flash_cascade", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/cascade.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png,overlay|images/overlays/cascadeextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png,overlay|images/overlays/cascadeextra.png" }, { "name": "HM05 Flash - Extra: Thunder Badge", "codes": "flash,flash_thunder", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/thunder.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png,overlay|images/overlays/thunderextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png,overlay|images/overlays/thunderextra.png" }, { "name": "HM05 Flash - Extra: Rainbow Badge", "codes": "flash,flash_rainbow", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/rainbow.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png,overlay|images/overlays/rainbowextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png,overlay|images/overlays/rainbowextra.png" }, { "name": "HM05 Flash - Extra: Soul Badge", "codes": "flash,flash_soul", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/soul.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png,overlay|images/overlays/soulextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png,overlay|images/overlays/soulextra.png" }, { "name": "HM05 Flash - Extra: Marsh Badge", "codes": "flash,flash_marsh", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/marsh.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png,overlay|images/overlays/marshextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png,overlay|images/overlays/marshextra.png" }, { "name": "HM05 Flash - Extra: Volcano Badge", "codes": "flash,flash_volcano", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/volcano.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png,overlay|images/overlays/volcanoextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png,overlay|images/overlays/volcanoextra.png" }, { "name": "HM05 Flash - Extra: Earth Badge", "codes": "flash,flash_earth", - "img": "images/items/hm_normal.png", - "img_mods": "overlay|images/overlays/earth.png" + "img": "images/items/hm05_flash.png", + "img_mods": "overlay|images/overlays/boulder.png,overlay|images/overlays/earthextra.png", + "disabled_img_mods": "@disabled,overlay|images/overlays/boulder.png,overlay|images/overlays/earthextra.png" + }, + { + "name": "HM05 Flash - Free", + "codes": "flash,flash_free", + "img": "images/items/hm05_flash.png" } ] }, diff --git a/scripts/autotracking/slot_options.lua b/scripts/autotracking/slot_options.lua index beb1d2e..f323454 100644 --- a/scripts/autotracking/slot_options.lua +++ b/scripts/autotracking/slot_options.lua @@ -129,7 +129,23 @@ function get_slot_options(slot_data) ones.CurrentStage = val % 10 end end - + + if slot_data["badges_needed_for_hm_moves"] then + local cut = Tracker:FindObjectForCode("cut") + local fly = Tracker:FindObjectForCode("fly") + local surf = Tracker:FindObjectForCode("surf") + local strength = Tracker:FindObjectForCode("strength") + local flash = Tracker:FindObjectForCode("flash") + local val = slot_data["badges_needed_for_hm_moves"] + if val == 0 then + cut.CurrentStage = 9 + fly.CurrentStage = 9 + surf.CurrentStage = 9 + strength.CurrentStage = 9 + flash.CurrentStage = 9 + end + end + if slot_data["extra_badges"] then hm_list = {"Cut", "Fly", "Surf", "Strength", "Flash"} stages = { boulder=1, cascade=2, thunder=3, rainbow=4, soul=5, marsh=6, volcano=7, earth=8}