diff --git a/README.md b/README.md index 242ee8bd..8bcb0bb7 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ The pack offers 4 different variants: ## Vanilla vs Master Quest Dungeons The Randomizer has the option to switch some or all dungeons to their Master Quest equivalents. -To accomodate for this, you can click on the dungeon labels to change them from vanilla ![vanilla deku](ootrando_overworldmap_hamsda/images/deku.png) to Master Quest ![mq deku](ootrando_overworldmap_hamsda/images/deku_mq.png). You can use this in the non map variants as well as a reminder. +To accomodate for this, you can click on the dungeon labels to change them from vanilla ![vanilla deku](ootrando_overworldmap_hamsda/images/label_deku.png) to Master Quest ![mq deku](ootrando_overworldmap_hamsda/images/label_deku_mq.png). You can use this in the non map variants as well as a reminder. This also means that the key counts for the dungeons in the Keysanity variants will always go up to the maximum of vanilla and Master Quest: Forest Temple goes up to 6 small keys, because MQ Forest Temple has 6 small keys instead of 5 in vanilla; Water Temple also goes up to 6 small keys, because vanilla Water Temple has 6 small keys unlike the 2 it has in MQ. ## Special items diff --git a/TODO b/TODO deleted file mode 100644 index e69de29b..00000000 diff --git a/changelog.md b/changelog.md index 78a6ae4c..3fb88e0f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,15 @@ # Changelog +## 2.1.3.4 + +- fixed SFM Storms grotto visibility +- fixed child Goron City entrance with Dins +- added Goron City left boulder maze sequence break with explosives and hoverboots +- added Water Temple boss key chest sequence breaks with only hoverboots or only longshot +- changed the bottle for minimal layout to only have 2 stages (bottle and letter) +- changed the compact items for boots and tunics when only one half is obtained +- improved chathud commands for dungeon prizes with secondary codes + ## 2.1.3.3 - changed Biggoron to be visible with just Stone of Agony (so you can mark him off without access) diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip index cdf435b9..3bfe3446 100644 Binary files a/ootrando_overworldmap_hamsda.zip and b/ootrando_overworldmap_hamsda.zip differ diff --git a/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png b/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png deleted file mode 100644 index 53229011..00000000 Binary files a/ootrando_overworldmap_hamsda/images/bluetunic-disabled.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/bomb1.png b/ootrando_overworldmap_hamsda/images/bomb1.png deleted file mode 100644 index aae51842..00000000 Binary files a/ootrando_overworldmap_hamsda/images/bomb1.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/bomb2.png b/ootrando_overworldmap_hamsda/images/bomb2.png deleted file mode 100644 index 767c4289..00000000 Binary files a/ootrando_overworldmap_hamsda/images/bomb2.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/bomb3.png b/ootrando_overworldmap_hamsda/images/bomb3.png deleted file mode 100644 index a332235e..00000000 Binary files a/ootrando_overworldmap_hamsda/images/bomb3.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/bomb4.png b/ootrando_overworldmap_hamsda/images/bomb4.png deleted file mode 100644 index 3eea4f7e..00000000 Binary files a/ootrando_overworldmap_hamsda/images/bomb4.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/bow3.png b/ootrando_overworldmap_hamsda/images/bow3.png deleted file mode 100644 index e89ddbc7..00000000 Binary files a/ootrando_overworldmap_hamsda/images/bow3.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/bow4.png b/ootrando_overworldmap_hamsda/images/bow4.png deleted file mode 100644 index f0f62c9a..00000000 Binary files a/ootrando_overworldmap_hamsda/images/bow4.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/bow5.png b/ootrando_overworldmap_hamsda/images/bow5.png deleted file mode 100644 index 8673c9e7..00000000 Binary files a/ootrando_overworldmap_hamsda/images/bow5.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_dc.png b/ootrando_overworldmap_hamsda/images/firemedallion_dc.png deleted file mode 100644 index 70c606a5..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_dc.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_deku.png b/ootrando_overworldmap_hamsda/images/firemedallion_deku.png deleted file mode 100644 index d78576e8..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_deku.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_fit.png b/ootrando_overworldmap_hamsda/images/firemedallion_fit.png deleted file mode 100644 index 72904c4b..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_fit.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_ft.png b/ootrando_overworldmap_hamsda/images/firemedallion_ft.png deleted file mode 100644 index cc66f83b..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_ft.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_jabu.png b/ootrando_overworldmap_hamsda/images/firemedallion_jabu.png deleted file mode 100644 index a9d3ea7e..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_jabu.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_sht.png b/ootrando_overworldmap_hamsda/images/firemedallion_sht.png deleted file mode 100644 index 7b74d987..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_sht.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_st.png b/ootrando_overworldmap_hamsda/images/firemedallion_st.png deleted file mode 100644 index 0bb0a503..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_st.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_unknown.png b/ootrando_overworldmap_hamsda/images/firemedallion_unknown.png deleted file mode 100644 index e2eb656c..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_unknown.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/firemedallion_wt.png b/ootrando_overworldmap_hamsda/images/firemedallion_wt.png deleted file mode 100644 index 6cd347bb..00000000 Binary files a/ootrando_overworldmap_hamsda/images/firemedallion_wt.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_dc.png b/ootrando_overworldmap_hamsda/images/forestmedallion_dc.png deleted file mode 100644 index 8e6c14df..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_dc.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_deku.png b/ootrando_overworldmap_hamsda/images/forestmedallion_deku.png deleted file mode 100644 index d5ca7297..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_deku.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_fit.png b/ootrando_overworldmap_hamsda/images/forestmedallion_fit.png deleted file mode 100644 index 1d4cb620..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_fit.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_ft.png b/ootrando_overworldmap_hamsda/images/forestmedallion_ft.png deleted file mode 100644 index 96813459..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_ft.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_jabu.png b/ootrando_overworldmap_hamsda/images/forestmedallion_jabu.png deleted file mode 100644 index 4b8e7365..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_jabu.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_sht.png b/ootrando_overworldmap_hamsda/images/forestmedallion_sht.png deleted file mode 100644 index bed6a364..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_sht.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_st.png b/ootrando_overworldmap_hamsda/images/forestmedallion_st.png deleted file mode 100644 index 6b723bba..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_st.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_unknown.png b/ootrando_overworldmap_hamsda/images/forestmedallion_unknown.png deleted file mode 100644 index 07fcfff0..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_unknown.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/forestmedallion_wt.png b/ootrando_overworldmap_hamsda/images/forestmedallion_wt.png deleted file mode 100644 index d202c7ca..00000000 Binary files a/ootrando_overworldmap_hamsda/images/forestmedallion_wt.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_dc.png b/ootrando_overworldmap_hamsda/images/lightmedallion_dc.png deleted file mode 100644 index bf20c8d8..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_dc.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_deku.png b/ootrando_overworldmap_hamsda/images/lightmedallion_deku.png deleted file mode 100644 index ef71155c..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_deku.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_fit.png b/ootrando_overworldmap_hamsda/images/lightmedallion_fit.png deleted file mode 100644 index c10a33c3..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_fit.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_ft.png b/ootrando_overworldmap_hamsda/images/lightmedallion_ft.png deleted file mode 100644 index b31e0616..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_ft.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_jabu.png b/ootrando_overworldmap_hamsda/images/lightmedallion_jabu.png deleted file mode 100644 index 7813b7fd..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_jabu.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_sht.png b/ootrando_overworldmap_hamsda/images/lightmedallion_sht.png deleted file mode 100644 index ed39eae3..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_sht.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_st.png b/ootrando_overworldmap_hamsda/images/lightmedallion_st.png deleted file mode 100644 index a77faf0f..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_st.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_unknown.png b/ootrando_overworldmap_hamsda/images/lightmedallion_unknown.png deleted file mode 100644 index 4619ac1c..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_unknown.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/lightmedallion_wt.png b/ootrando_overworldmap_hamsda/images/lightmedallion_wt.png deleted file mode 100644 index ace9cb60..00000000 Binary files a/ootrando_overworldmap_hamsda/images/lightmedallion_wt.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/nut2.png b/ootrando_overworldmap_hamsda/images/nut2.png deleted file mode 100644 index 977988bf..00000000 Binary files a/ootrando_overworldmap_hamsda/images/nut2.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/nut3.png b/ootrando_overworldmap_hamsda/images/nut3.png deleted file mode 100644 index 954c3775..00000000 Binary files a/ootrando_overworldmap_hamsda/images/nut3.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/nut4.png b/ootrando_overworldmap_hamsda/images/nut4.png deleted file mode 100644 index 3bd850ed..00000000 Binary files a/ootrando_overworldmap_hamsda/images/nut4.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/overlay_10.png b/ootrando_overworldmap_hamsda/images/overlay_10.png new file mode 100644 index 00000000..639ee3af Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/overlay_10.png differ diff --git a/ootrando_overworldmap_hamsda/images/overlay_20.png b/ootrando_overworldmap_hamsda/images/overlay_20.png new file mode 100644 index 00000000..07777d12 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/overlay_20.png differ diff --git a/ootrando_overworldmap_hamsda/images/overlay_30.png b/ootrando_overworldmap_hamsda/images/overlay_30.png new file mode 100644 index 00000000..22ec59a5 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/overlay_30.png differ diff --git a/ootrando_overworldmap_hamsda/images/overlay_30_green.png b/ootrando_overworldmap_hamsda/images/overlay_30_green.png new file mode 100644 index 00000000..7ac989a3 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/overlay_30_green.png differ diff --git a/ootrando_overworldmap_hamsda/images/overlay_40.png b/ootrando_overworldmap_hamsda/images/overlay_40.png new file mode 100644 index 00000000..adcdfecd Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/overlay_40.png differ diff --git a/ootrando_overworldmap_hamsda/images/overlay_40_green.png b/ootrando_overworldmap_hamsda/images/overlay_40_green.png new file mode 100644 index 00000000..24c93b16 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/overlay_40_green.png differ diff --git a/ootrando_overworldmap_hamsda/images/overlay_50_green.png b/ootrando_overworldmap_hamsda/images/overlay_50_green.png new file mode 100644 index 00000000..5950df48 Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/overlay_50_green.png differ diff --git a/ootrando_overworldmap_hamsda/images/redtunic-disabled.png b/ootrando_overworldmap_hamsda/images/redtunic-disabled.png deleted file mode 100644 index e9e292c5..00000000 Binary files a/ootrando_overworldmap_hamsda/images/redtunic-disabled.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_dc.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_dc.png deleted file mode 100644 index a4662d27..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_dc.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_deku.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_deku.png deleted file mode 100644 index e1f8f243..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_deku.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_fit.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_fit.png deleted file mode 100644 index 01866978..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_fit.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_ft.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_ft.png deleted file mode 100644 index 6533c8e3..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_ft.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_jabu.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_jabu.png deleted file mode 100644 index a1f9a850..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_jabu.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_sht.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_sht.png deleted file mode 100644 index eabf2591..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_sht.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_st.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_st.png deleted file mode 100644 index 344261b4..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_st.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_unknown.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_unknown.png deleted file mode 100644 index cb7d5f6e..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_unknown.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/shadowmedallion_wt.png b/ootrando_overworldmap_hamsda/images/shadowmedallion_wt.png deleted file mode 100644 index 09946b88..00000000 Binary files a/ootrando_overworldmap_hamsda/images/shadowmedallion_wt.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/sling3.png b/ootrando_overworldmap_hamsda/images/sling3.png deleted file mode 100644 index 77697d9e..00000000 Binary files a/ootrando_overworldmap_hamsda/images/sling3.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/sling4.png b/ootrando_overworldmap_hamsda/images/sling4.png deleted file mode 100644 index c6a7e27f..00000000 Binary files a/ootrando_overworldmap_hamsda/images/sling4.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/sling5.png b/ootrando_overworldmap_hamsda/images/sling5.png deleted file mode 100644 index 7e71b28e..00000000 Binary files a/ootrando_overworldmap_hamsda/images/sling5.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_dc.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_dc.png deleted file mode 100644 index 5553d4d3..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_dc.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_deku.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_deku.png deleted file mode 100644 index 39eceb4f..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_deku.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_fit.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_fit.png deleted file mode 100644 index cdce7cf6..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_fit.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_ft.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_ft.png deleted file mode 100644 index 88dd39df..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_ft.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_jabu.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_jabu.png deleted file mode 100644 index 96451b94..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_jabu.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_sht.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_sht.png deleted file mode 100644 index 086c7cb4..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_sht.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_st.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_st.png deleted file mode 100644 index cc172dc9..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_st.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_unknown.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_unknown.png deleted file mode 100644 index ab95f889..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_unknown.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/spiritmedallion_wt.png b/ootrando_overworldmap_hamsda/images/spiritmedallion_wt.png deleted file mode 100644 index 1b7924a9..00000000 Binary files a/ootrando_overworldmap_hamsda/images/spiritmedallion_wt.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/stick1.png b/ootrando_overworldmap_hamsda/images/stick1.png deleted file mode 100644 index bad23088..00000000 Binary files a/ootrando_overworldmap_hamsda/images/stick1.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/stick2.png b/ootrando_overworldmap_hamsda/images/stick2.png deleted file mode 100644 index 9eb5270d..00000000 Binary files a/ootrando_overworldmap_hamsda/images/stick2.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/stick3.png b/ootrando_overworldmap_hamsda/images/stick3.png deleted file mode 100644 index 7e4acc18..00000000 Binary files a/ootrando_overworldmap_hamsda/images/stick3.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/unknown-small.png b/ootrando_overworldmap_hamsda/images/unknown-small.png deleted file mode 100644 index e59ea5dc..00000000 Binary files a/ootrando_overworldmap_hamsda/images/unknown-small.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/unknown.png b/ootrando_overworldmap_hamsda/images/unknown.png new file mode 100644 index 00000000..42d0082b Binary files /dev/null and b/ootrando_overworldmap_hamsda/images/unknown.png differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_dc.png b/ootrando_overworldmap_hamsda/images/watermedallion_dc.png deleted file mode 100644 index 0e7f0f3d..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_dc.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_deku.png b/ootrando_overworldmap_hamsda/images/watermedallion_deku.png deleted file mode 100644 index 72d8e076..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_deku.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_fit.png b/ootrando_overworldmap_hamsda/images/watermedallion_fit.png deleted file mode 100644 index 8552ee01..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_fit.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_ft.png b/ootrando_overworldmap_hamsda/images/watermedallion_ft.png deleted file mode 100644 index f147509d..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_ft.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_jabu.png b/ootrando_overworldmap_hamsda/images/watermedallion_jabu.png deleted file mode 100644 index 0f019be4..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_jabu.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_sht.png b/ootrando_overworldmap_hamsda/images/watermedallion_sht.png deleted file mode 100644 index 3c5c5bd4..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_sht.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_st.png b/ootrando_overworldmap_hamsda/images/watermedallion_st.png deleted file mode 100644 index 859ebddc..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_st.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_unknown.png b/ootrando_overworldmap_hamsda/images/watermedallion_unknown.png deleted file mode 100644 index 96c92a23..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_unknown.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/images/watermedallion_wt.png b/ootrando_overworldmap_hamsda/images/watermedallion_wt.png deleted file mode 100644 index ef42ab2f..00000000 Binary files a/ootrando_overworldmap_hamsda/images/watermedallion_wt.png and /dev/null differ diff --git a/ootrando_overworldmap_hamsda/items/dungeons.json b/ootrando_overworldmap_hamsda/items/dungeons.json index 619958ce..4ab98ae8 100644 --- a/ootrando_overworldmap_hamsda/items/dungeons.json +++ b/ootrando_overworldmap_hamsda/items/dungeons.json @@ -12,7 +12,7 @@ "allow_disabled": false, "stages": [ { - "img": "images/unknown-small.png", + "img": "images/unknown.png", "codes": "free" }, { @@ -65,33 +65,34 @@ "loop": true, "stages": [ { - "img": "images/unknown-small.png", - "codes": "deku" + "img": "images/unknown.png", + "codes": "deku", + "secondary_codes": "unknown" }, { "img": "images/stones.png", "codes": "deku,stones", - "inherit_codes": false + "secondary_codes": "stones,stone" }, { "img": "images/forestmedallion.png", "codes": "deku,forestmed", - "inherit_codes": false + "secondary_codes": "forest,forestmed" }, { "img": "images/nocturne_medallions.png", "codes": "deku,noct_meds", - "inherit_codes": false + "secondary_codes": "noct_meds,nocturne" }, { "img": "images/lacs_medallions.png", "codes": "deku,lacs_meds", - "inherit_codes": false + "secondary_codes": "lacs_meds,lacs,lightarrow" }, { "img": "images/lightmedallion.png", "codes": "deku,lightmed", - "inherit_codes": false + "secondary_codes": "light,lightmed" } ] }, @@ -118,33 +119,34 @@ "loop": true, "stages": [ { - "img": "images/unknown-small.png", - "codes": "dodongo,dc" + "img": "images/unknown.png", + "codes": "dodongo,dc", + "secondary_codes": "unknown" }, { "img": "images/stones.png", - "codes": "dodongo,stones", - "inherit_codes": false + "codes": "dodongo,dc,stones", + "secondary_codes": "stones,stone" }, { "img": "images/forestmedallion.png", - "codes": "dodongo,forestmed", - "inherit_codes": false + "codes": "dodongo,dc,forestmed", + "secondary_codes": "forest,forestmed" }, { "img": "images/nocturne_medallions.png", - "codes": "dodongo,noct_meds", - "inherit_codes": false + "codes": "dodongo,dc,noct_meds", + "secondary_codes": "noct_meds,nocturne" }, { "img": "images/lacs_medallions.png", - "codes": "dodongo,lacs_meds", - "inherit_codes": false + "codes": "dodongo,dc,lacs_meds", + "secondary_codes": "lacs_meds,lacs,lightarrow" }, { "img": "images/lightmedallion.png", - "codes": "dodongo,lightmed", - "inherit_codes": false + "codes": "dodongo,dc,lightmed", + "secondary_codes": "light,lightmed" } ] }, @@ -171,33 +173,34 @@ "loop": true, "stages": [ { - "img": "images/unknown-small.png", - "codes": "jabu" + "img": "images/unknown.png", + "codes": "jabu", + "secondary_codes": "unknown" }, { "img": "images/stones.png", "codes": "jabu,stones", - "inherit_codes": false + "secondary_codes": "stones,stone" }, { "img": "images/forestmedallion.png", "codes": "jabu,forestmed", - "inherit_codes": false + "secondary_codes": "forest,forestmed" }, { "img": "images/nocturne_medallions.png", "codes": "jabu,noct_meds", - "inherit_codes": false + "secondary_codes": "noct_meds,nocturne" }, { "img": "images/lacs_medallions.png", "codes": "jabu,lacs_meds", - "inherit_codes": false + "secondary_codes": "lacs_meds,lacs,lightarrow" }, { "img": "images/lightmedallion.png", "codes": "jabu,lightmed", - "inherit_codes": false + "secondary_codes": "light,lightmed" } ] }, @@ -237,33 +240,34 @@ "loop": true, "stages": [ { - "img": "images/unknown-small.png", - "codes": "forest" + "img": "images/unknown.png", + "codes": "forest", + "secondary_codes": "unknown" }, { "img": "images/stones.png", "codes": "forest,stones", - "inherit_codes": false + "secondary_codes": "stones,stone" }, { "img": "images/forestmedallion.png", "codes": "forest,forestmed", - "inherit_codes": false + "secondary_codes": "forest,forestmed" }, { "img": "images/nocturne_medallions.png", "codes": "forest,noct_meds", - "inherit_codes": false + "secondary_codes": "noct_meds,nocturne" }, { "img": "images/lacs_medallions.png", "codes": "forest,lacs_meds", - "inherit_codes": false + "secondary_codes": "lacs_meds,lacs,lightarrow" }, { "img": "images/lightmedallion.png", "codes": "forest,lightmed", - "inherit_codes": false + "secondary_codes": "light,lightmed" } ] }, @@ -303,33 +307,34 @@ "loop": true, "stages": [ { - "img": "images/unknown-small.png", - "codes": "fire" + "img": "images/unknown.png", + "codes": "fire", + "secondary_codes": "unknown" }, { "img": "images/stones.png", "codes": "fire,stones", - "inherit_codes": false + "secondary_codes": "stones,stone" }, { "img": "images/forestmedallion.png", "codes": "fire,forestmed", - "inherit_codes": false + "secondary_codes": "forest,forestmed" }, { "img": "images/nocturne_medallions.png", "codes": "fire,noct_meds", - "inherit_codes": false + "secondary_codes": "noct_meds,nocturne" }, { "img": "images/lacs_medallions.png", "codes": "fire,lacs_meds", - "inherit_codes": false + "secondary_codes": "lacs_meds,lacs,lightarrow" }, { "img": "images/lightmedallion.png", "codes": "fire,lightmed", - "inherit_codes": false + "secondary_codes": "light,lightmed" } ] }, @@ -369,33 +374,34 @@ "loop": true, "stages": [ { - "img": "images/unknown-small.png", - "codes": "water" + "img": "images/unknown.png", + "codes": "water", + "secondary_codes": "unknown" }, { "img": "images/stones.png", "codes": "water,stones", - "inherit_codes": false + "secondary_codes": "stones,stone" }, { "img": "images/forestmedallion.png", "codes": "water,forestmed", - "inherit_codes": false + "secondary_codes": "forest,forestmed" }, { "img": "images/nocturne_medallions.png", "codes": "water,noct_meds", - "inherit_codes": false + "secondary_codes": "noct_meds,nocturne" }, { "img": "images/lacs_medallions.png", "codes": "water,lacs_meds", - "inherit_codes": false + "secondary_codes": "lacs_meds,lacs,lightarrow" }, { "img": "images/lightmedallion.png", "codes": "water,lightmed", - "inherit_codes": false + "secondary_codes": "light,lightmed" } ] }, @@ -435,33 +441,34 @@ "loop": true, "stages": [ { - "img": "images/unknown-small.png", - "codes": "spirit" + "img": "images/unknown.png", + "codes": "spirit", + "secondary_codes": "unknown" }, { "img": "images/stones.png", "codes": "spirit,stones", - "inherit_codes": false + "secondary_codes": "stones,stone" }, { "img": "images/forestmedallion.png", "codes": "spirit,forestmed", - "inherit_codes": false + "secondary_codes": "forest,forestmed" }, { "img": "images/nocturne_medallions.png", "codes": "spirit,noct_meds", - "inherit_codes": false + "secondary_codes": "noct_meds,nocturne" }, { "img": "images/lacs_medallions.png", "codes": "spirit,lacs_meds", - "inherit_codes": false + "secondary_codes": "lacs_meds,lacs,lightarrow" }, { "img": "images/lightmedallion.png", "codes": "spirit,lightmed", - "inherit_codes": false + "secondary_codes": "light,lightmed" } ] }, @@ -501,33 +508,34 @@ "loop": true, "stages": [ { - "img": "images/unknown-small.png", - "codes": "shadow" + "img": "images/unknown.png", + "codes": "shadow", + "secondary_codes": "unknown" }, { "img": "images/stones.png", "codes": "shadow,stones", - "inherit_codes": false + "secondary_codes": "stones,stone" }, { "img": "images/forestmedallion.png", "codes": "shadow,forestmed", - "inherit_codes": false + "secondary_codes": "forest,forestmed" }, { "img": "images/nocturne_medallions.png", "codes": "shadow,noct_meds", - "inherit_codes": false + "secondary_codes": "noct_meds,nocturne" }, { "img": "images/lacs_medallions.png", "codes": "shadow,lacs_meds", - "inherit_codes": false + "secondary_codes": "lacs_meds,lacs,lightarrow" }, { "img": "images/lightmedallion.png", "codes": "shadow,lightmed", - "inherit_codes": false + "secondary_codes": "light,lightmed" } ] }, diff --git a/ootrando_overworldmap_hamsda/items/equipment.json b/ootrando_overworldmap_hamsda/items/equipment.json index 91123f34..aa5e0611 100644 --- a/ootrando_overworldmap_hamsda/items/equipment.json +++ b/ootrando_overworldmap_hamsda/items/equipment.json @@ -69,12 +69,12 @@ { "left": true, "right": false, - "img": "images/redtunic-disabled.png" + "img": "images/redtunic.png" }, { "left": false, "right": true, - "img": "images/bluetunic-disabled.png" + "img": "images/bluetunic.png" }, { "left": true, @@ -117,12 +117,12 @@ { "left": true, "right": false, - "img": "images/ironboots-disabled.png" + "img": "images/ironboots.png" }, { "left": false, "right": true, - "img": "images/hoverboots-disabled.png" + "img": "images/hoverboots.png" }, { "left": true, diff --git a/ootrando_overworldmap_hamsda/items/items.json b/ootrando_overworldmap_hamsda/items/items.json index 0e6c1ddb..f3311be7 100644 --- a/ootrando_overworldmap_hamsda/items/items.json +++ b/ootrando_overworldmap_hamsda/items/items.json @@ -9,14 +9,17 @@ "img_mods": "@disabled" }, { - "img": "images/bow3.png", + "img": "images/bow.png", + "img_mods": "overlay|images/overlay_30.png", "codes": "bow" }, { - "img": "images/bow4.png" + "img": "images/bow.png", + "img_mods": "overlay|images/overlay_40.png" }, { - "img": "images/bow5.png" + "img": "images/bow.png", + "img_mods": "overlay|images/overlay_50_green.png" } ] }, @@ -30,14 +33,17 @@ "img_mods": "@disabled" }, { - "img": "images/sling3.png", + "img": "images/slingshot.png", + "img_mods": "overlay|images/overlay_30.png", "codes": "slingshot,sling,ss" }, { - "img": "images/sling4.png" + "img": "images/slingshot.png", + "img_mods": "overlay|images/overlay_40.png" }, { - "img": "images/sling5.png" + "img": "images/slingshot.png", + "img_mods": "overlay|images/overlay_50_green.png" } ] }, @@ -51,14 +57,17 @@ "img_mods": "@disabled" }, { - "img": "images/nut2.png", + "img": "images/nut.png", + "img_mods": "overlay|images/overlay_20.png", "codes": "nuts,dekunuts,dn" }, { - "img": "images/nut3.png" + "img": "images/nut.png", + "img_mods": "overlay|images/overlay_30.png" }, { - "img": "images/nut4.png" + "img": "images/nut.png", + "img_mods": "overlay|images/overlay_40_green.png" } ] }, @@ -97,14 +106,17 @@ "img_mods": "@disabled" }, { - "img": "images/stick1.png", + "img": "images/stick.png", + "img_mods": "overlay|images/overlay_10.png", "codes": "sticks,dekusticks,ds" }, { - "img": "images/stick2.png" + "img": "images/stick.png", + "img_mods": "overlay|images/overlay_20.png" }, { - "img": "images/stick3.png" + "img": "images/stick.png", + "img_mods": "overlay|images/overlay_30_green.png" } ] }, @@ -118,14 +130,17 @@ "img_mods": "@disabled" }, { - "img": "images/bomb2.png", + "img": "images/bomb.png", + "img_mods": "overlay|images/overlay_20.png", "codes": "bombs,bombbag" }, { - "img": "images/bomb3.png" + "img": "images/bomb.png", + "img_mods": "overlay|images/overlay_30.png" }, { - "img": "images/bomb4.png" + "img": "images/bomb.png", + "img_mods": "overlay|images/overlay_40_green.png" } ] }, @@ -643,5 +658,19 @@ "inherit_codes": false } ] + }, + { + "name": "Bottle Minimal", + "type": "progressive", + "stages": [ + { + "img": "images/bottle.png", + "codes": "bottleminimal,bottle", + }, + { + "img": "images/bottle_letter.png", + "codes": "ruto,rutosletter", + } + ], } ] \ No newline at end of file diff --git a/ootrando_overworldmap_hamsda/layouts/broadcast.json b/ootrando_overworldmap_hamsda/layouts/broadcast.json index b02f303f..9e711129 100644 --- a/ootrando_overworldmap_hamsda/layouts/broadcast.json +++ b/ootrando_overworldmap_hamsda/layouts/broadcast.json @@ -5,7 +5,7 @@ "content": [ { "type": "layout", - "key": "item_grid_tall" + "key": "item_grid_wide" } ] } diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json index 509123b4..f3b670e2 100644 --- a/ootrando_overworldmap_hamsda/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/locations/dungeons.json @@ -896,6 +896,9 @@ "access_rules": [ "longshot,hoverboots", "longshot,@logic/explosives,lift1", + "hoverboots,[longshot]", + "longshot,[hoverboots]", + "longshot,[@logic/explosives],[lift1]", "{agony}" ], "capture_item": true, diff --git a/ootrando_overworldmap_hamsda/locations/overworld.json b/ootrando_overworldmap_hamsda/locations/overworld.json index 3ec5ad37..3910134c 100644 --- a/ootrando_overworldmap_hamsda/locations/overworld.json +++ b/ootrando_overworldmap_hamsda/locations/overworld.json @@ -645,17 +645,14 @@ "map_locations": [ { "map": "child", - "visibility_rules": [ - "@logic/explosives", - "scale1" - ], "x": 2190, "y": 635 }, { "map": "adult", "visibility_rules": [ - "sword2" + "sword2,[ocarina],[minuet]", + "sword2,[ocarina],[saria]" ], "x": 2190, "y": 635 @@ -1960,7 +1957,8 @@ "postzelda", "open_kak", "sword2", - "@logic/explosives" + "@logic/explosives", + "dinsfire,magic" ], "children": [ { @@ -1982,7 +1980,8 @@ { "map": "child", "visibility_rules": [ - "@logic/explosives" + "@logic/explosives", + "dinsfire,magic" ], "x": 1606, "y": 98 @@ -4070,6 +4069,8 @@ "access_rules": [ "lift2", "hammer", + "@logic/explosives,hoverboots,[lift2]", + "@logic/explosives,hoverboots,[hammer]", "{agony}" ], "capture_item": true, diff --git a/ootrando_overworldmap_hamsda/manifest.json b/ootrando_overworldmap_hamsda/manifest.json index 754096ef..46b13739 100644 --- a/ootrando_overworldmap_hamsda/manifest.json +++ b/ootrando_overworldmap_hamsda/manifest.json @@ -1,7 +1,7 @@ { "name": "OoT Randomizer - Map and Item Tracker", "game_name": "Ocarina of Time Randomizer", - "package_version": "2.1.3.3", + "package_version": "2.1.3.4", "package_uid": "ootrando_overworldmap_hamsda", "author": "Hamsda", "variants": { diff --git a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json index 87fcf6ed..20b612ea 100644 --- a/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json +++ b/ootrando_overworldmap_hamsda/var_keysanity/locations/dungeons.json @@ -906,6 +906,9 @@ "access_rules": [ "water_small_keys:2,longshot,hoverboots", "water_small_keys:2,longshot,@logic/explosives,lift1", + "water_small_keys:2,hoverboots,[longshot]", + "water_small_keys:2,longshot,[hoverboots]", + "water_small_keys:2,longshot,[@logic/explosives],[lift1]", "{agony}" ], "capture_item": true, diff --git a/ootrando_overworldmap_hamsda/var_minimalist/layouts/shared.json b/ootrando_overworldmap_hamsda/var_minimalist/layouts/shared.json index 73227a67..5cf4bfed 100644 --- a/ootrando_overworldmap_hamsda/var_minimalist/layouts/shared.json +++ b/ootrando_overworldmap_hamsda/var_minimalist/layouts/shared.json @@ -191,13 +191,13 @@ "boomerang", "hookshot", "dinsfire", - "bottle1" + "bottleminimal" ], [ "scale1", "shield3", - "ironboots", - "hoverboots", + "tunics", + "boots", "adulttrade", "kidtrade" ] diff --git a/repository.json b/repository.json index ad469f24..bee1fcbd 100644 --- a/repository.json +++ b/repository.json @@ -10,7 +10,7 @@ "pins", "chathud" ], - "version": "2.1.3.3", + "version": "2.1.3.4", "uid": "ootrando_overworldmap_hamsda", "link": "https://hamsda.github.io/OoTRMapTracker/ootrando_overworldmap_hamsda.zip", "variants": [