Merge pull request #131 from Hamsda:ootr

update to version 3.8.0.0
Hamsda · May 4, 2023 · 41a62ce · 41a62ce
2 parents 62ff08c + 872ab76
commit 41a62ce
Show file tree

Hide file tree

Showing 56 changed files with 3,097 additions and 1,209 deletions.
diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/README.md b/ootrando_overworldmap_hamsda/README.md
@@ -14,20 +14,26 @@ The pack offers 7 different variants:
 6. Entrance Randomizer
 7. Entrance Randomizer (Keysanity)
 
-## Vanilla vs Master Quest Dungeons
+## Dungeon Labels
+
+The small labels with the dungeon names serve two purposes in regards to logic.
+
+### 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 their current status:
+To accomodate for this, you can left click on the dungeon labels to change their current status:
 
 - ![Vanilla](images/label_deku.png "Vanilla") The dungeons vanilla checks will be shown.
 - ![Master Quest](images/label_deku_mq.png "Master Quest") The dungeons MQ checks will be shown.
 - ![Unknown](images/label_deku_red.png "Unknown") Both versions of the dungeon will be shown.
 
-You can use this in the non map variants as a reminder.
-
 The small key maximum amounts in the keysanity variants will dynamically update according to what you selected for the corresponding dungeon.
 If you have a dungeon marked as unknown in non-keysanity, some of the checks in the dungeon might not show up correctly until you pick either vanilla or MQ.
 
+### Dungeon Boss Shortcuts
+
+The randomizer also has the option to activate certain shortcuts to reach the boss faster in dungeons with blue warps. To mark that one of these is active, right clicking e.g. ![Label](images/label_deku.png "Label") will overlay it with ![Boss Shortcut](images/overlay_boss_icon.png "Boss Shortcut").
+
 ## Special items
 
 Some of this functionality might not be immediately obvious:

diff --git a/ootrando_overworldmap_hamsda/SETTINGS.md b/ootrando_overworldmap_hamsda/SETTINGS.md
@@ -129,9 +129,10 @@ If you have selected ![Open Door](images/setting_door_open.png "Open Door") or c
 
 ### Randomize Overworld Spawns
 
-- ![Spawn Shuffle Off](images/setting_entrance_spawn_off.png "Spawn Shuffle Off") Spawns are not shuffled.
-- ![Spawn Shuffled](images/setting_entrance_spawn_shuffle.png "Spawn Shuffled") Spawns are shuffled.
-
+- ![Randomize Spawns: Off](images/setting_entrance_spawn_off.png "Randomize Spawns: Off") Spawns are not shuffled.
+- ![Randomize Spawns: Child](images/setting_entrance_spawn_child.png "Randomize Spawns: Child") Child spawn is shuffled.
+- ![Randomize Spawns: Adult](images/setting_entrance_spawn_adult.png "Randomize Spawns: Adult") Adult spawn is shuffled.
+- ![Randomize Spawns: Both](images/setting_entrance_spawn_both.png "Randomize Spawns: Both") Both spawns are shuffled.
 
 ### Bombchus Are Considered in Logic
 
@@ -209,12 +210,19 @@ This setting determines if Magic Beans are shuffled.
 - ![Magic Beans not shuffled](images/setting_shuffle_beans_no.png "Magic Beans not shuffled") Magic Beans are not shuffled and will be captured in the corresponding chest by default.
 - ![Magic Beans shuffled](images/setting_shuffle_beans_yes.png "Magic Beans shuffled") The Magic Beans are shuffled into the item pool and will not be captured.
 
-### Shuffle Medigoron & Carpet Salesman
+### Shuffle Expensive Merchants
+
+This setting determines if Medigoron, Granny's Potion Shop, and Carpet Salesman items are shuffled.
+
+- ![Expensive Merchants not shuffled](images/setting_shuffle_merchants_no.png "Expensive Merchants not shuffled") Expensive Merchants are not shuffled.
+- ![Expensive Merchants shuffled](images/setting_shuffle_merchants_yes.png "Expensive Merchants shuffled") Expensive Merchants are shuffled and the merchants sell one randomized item each.
+
+### Shuffle Frog Song Rupees
 
-This setting determines if Medigoron and Carpet Salesman items are shuffled.
+This setting determines if the rewards for the five grey note songs (besides Song of Storms) are shuffled.
 
-- ![Medigoron and Carpet Salesman not shuffled](images/setting_shuffle_merchants_no.png "Medigoron and Carpet Salesman not shuffled") Medigoron and Carpet Salesman items are not shuffled.
-- ![Medigoron and Carpet Salesman shuffled](images/setting_shuffle_merchants_yes.png "Medigoron and Carpet Salesman shuffled") Medigoron and Carpet Salesman items are shuffled and the merchants sell one randomized item for 200 rupees each.
+- ![Frog Song Rupees not shuffled](images/setting_shuffle_frogs_no.png "Frog Song Rupees not shuffled") Frog Song Rupees are not shuffled.
+- ![Frog Song Rupees shuffled](images/setting_shuffle_frogs_yes.png "Frog Song Rupees shuffled") Frog Song Rupees are shuffled and playing the songs rewards one randomized item each.
 
 ## Main Rules: Shuffle Dungeon Items
 
@@ -270,6 +278,10 @@ This setting determines if all masks will be available once the Happy Mask Shop
 - ![Mask Quest not complete](images/setting_masks_off.png "Mask Quest not complete") The mask quest has to be completed step by step like in the vanilla game.
 - ![Mask Quest complete](images/setting_masks_complete.png "Mask Quest complete") All the masks will be available once the Happy Mask Shop is open.
 
+### Plant Magic Beans
+
+- ![Plant Magic Beans](images/setting_plant_beans.png "Plant Magic Beans") Plants all 10 magic beans in their soft soil spots and allows adult to ride them.
+
 ### Hints
 
 This setting determines when hintable locations will show up on the map ([see wiki](https://wiki.ootrandomizer.com/index.php?title=Readme#Other)).
@@ -289,6 +301,10 @@ This setting determines how much damage you take ([see wiki](https://wiki.ootran
 - ![Damage x4](images/setting_damage_quadruple.png "Damage x4") Damage is quadrupled.
 - ![OHKO](images/setting_damage_ohko.png "OHKO") Damage kills you in one hit.
 
+### Blue Fire Arrows
+
+- ![Blue Fire Arrows](images/setting_blue_fire_arrows.png "Blue Fire Arrows") Changes Ice Arrows to Blue Fire Arrows and allows them to melt red ice (and mud walls out of logic).
+
 ### Nighttime Skulltulas Expect Sun's Song
 
 This setting determines if logic expects the player to have an ocarina and the Sun’s Song to get Gold Skulltula locations that are only found at nighttime.

diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 3.8.0.0
+
+- fixed closed DoT logic for `DMT Freestanding PoH`
+- changed `Randomize Spawns` setting to have separate options for child/adult/both
+- added `Shuffle Frog Song Rupees` setting
+- added `Blue Fire Arrows` setting
+- added granny's blue potion to `Shuffle Expensive Merchants` setting
+- added `Dungeon Boss Shortcuts` setting
+- changed layouts to accomodate smaller resolutions better
+  - moved pinned locations between items and map in horizontal layout
+  - added scrollbar to pinned locations in horizontal layout
+- added `Plant Magic Beans` setting and removed bean planting `user_setting`
+- updated `user_presets`
+
 ## 3.7.3.0
 
 - updated `user_presets`

diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_mq_child_back.png b/ootrando_overworldmap_hamsda/images/logic_dc_mq_child_back.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_mq_eyes.png b/ootrando_overworldmap_hamsda/images/logic_dc_mq_eyes.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_mq_eyes_adult.png b/ootrando_overworldmap_hamsda/images/logic_dc_mq_eyes_adult.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_mq_eyes_child.png b/ootrando_overworldmap_hamsda/images/logic_dc_mq_eyes_child.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_mq_hammer_floor.png b/ootrando_overworldmap_hamsda/images/logic_dc_mq_hammer_floor.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_jabu_alcove_jump_dive.png b/ootrando_overworldmap_hamsda/images/logic_jabu_alcove_jump_dive.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_jabu_mq_rang_jump.png b/ootrando_overworldmap_hamsda/images/logic_jabu_mq_rang_jump.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_jabu_scrub_jump_dive.png b/ootrando_overworldmap_hamsda/images/logic_jabu_scrub_jump_dive.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lens_shadow_back.png b/ootrando_overworldmap_hamsda/images/logic_lens_shadow_back.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lens_shadow_mq_back.png b/ootrando_overworldmap_hamsda/images/logic_lens_shadow_mq_back.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lens_shadow_mq_dead_hand.png b/ootrando_overworldmap_hamsda/images/logic_lens_shadow_mq_dead_hand.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lens_shadow_mq_invisible_blades.png b/ootrando_overworldmap_hamsda/images/logic_lens_shadow_mq_invisible_blades.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lens_shadow_mq_platform.png b/ootrando_overworldmap_hamsda/images/logic_lens_shadow_mq_platform.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lens_shadow_platform.png b/ootrando_overworldmap_hamsda/images/logic_lens_shadow_platform.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_shadow_bongo.png b/ootrando_overworldmap_hamsda/images/logic_shadow_bongo.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_shadow_mq_after_wind_gs.png b/ootrando_overworldmap_hamsda/images/logic_shadow_mq_after_wind_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_shadow_mq_windy_walkway.png b/ootrando_overworldmap_hamsda/images/logic_shadow_mq_windy_walkway.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_platform_hookshot.png b/ootrando_overworldmap_hamsda/images/logic_spirit_platform_hookshot.png
diff --git a/ootrando_overworldmap_hamsda/images/overlay_boss_icon.png b/ootrando_overworldmap_hamsda/images/overlay_boss_icon.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_blue_fire_arrows.png b/ootrando_overworldmap_hamsda/images/setting_blue_fire_arrows.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_adult.png b/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_adult.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_both.png b/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_both.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_child.png b/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_child.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_spawn_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_plant_beans.png b/ootrando_overworldmap_hamsda/images/setting_plant_beans.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_frogs_no.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_frogs_no.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_shuffle_frogs_yes.png b/ootrando_overworldmap_hamsda/images/setting_shuffle_frogs_yes.png
diff --git a/ootrando_overworldmap_hamsda/items/dungeons.json b/ootrando_overworldmap_hamsda/items/dungeons.json
@@ -27,6 +27,13 @@
       }
     ]
   },
+  {
+    "name": "Deku Tree Shortcut",
+    "type": "toggle_badged",
+    "base_item": "deku_label",
+    "img": "images/overlay_boss_icon.png",
+    "codes": "deku_shortcuts,deku_tree_shortcuts"
+  },
   {
     "name": "Dodongos Cavern Label",
     "type": "progressive",
@@ -49,6 +56,13 @@
       }
     ]
   },
+  {
+    "name": "Dodongos Cavern Shortcut",
+    "type": "toggle_badged",
+    "base_item": "dodongo_label",
+    "img": "images/overlay_boss_icon.png",
+    "codes": "dodongo_shortcuts,dodongos_cavern_shortcuts"
+  },
   {
     "name": "Jabu Jabu Label",
     "type": "progressive",
@@ -71,6 +85,13 @@
       }
     ]
   },
+  {
+    "name": "Jabu Jabu Shortcut",
+    "type": "toggle_badged",
+    "base_item": "jabu_label",
+    "img": "images/overlay_boss_icon.png",
+    "codes": "jabu_shortcuts"
+  },
   {
     "name": "Forest Temple Label",
     "type": "progressive",
@@ -93,6 +114,13 @@
       }
     ]
   },
+  {
+    "name": "Forest Temple Shortcut",
+    "type": "toggle_badged",
+    "base_item": "forest_label",
+    "img": "images/overlay_boss_icon.png",
+    "codes": "forest_shortcuts,forest_temple_shortcuts"
+  },
   {
     "name": "Forest Temple Small Keys",
     "type": "consumable",
@@ -128,6 +156,13 @@
       }
     ]
   },
+  {
+    "name": "Fire Temple Shortcut",
+    "type": "toggle_badged",
+    "base_item": "fire_label",
+    "img": "images/overlay_boss_icon.png",
+    "codes": "fire_shortcuts,fire_temple_shortcuts"
+  },
   {
     "name": "Fire Temple Small Keys",
     "type": "consumable",
@@ -198,6 +233,13 @@
       }
     ]
   },
+  {
+    "name": "Spirit Temple Shortcut",
+    "type": "toggle_badged",
+    "base_item": "spirit_label",
+    "img": "images/overlay_boss_icon.png",
+    "codes": "spirit_shortcuts,spirit_temple_shortcuts"
+  },
   {
     "name": "Spirit Temple Small Keys",
     "type": "consumable",
@@ -233,6 +275,13 @@
       }
     ]
   },
+  {
+    "name": "Shadow Temple Shortcut",
+    "type": "toggle_badged",
+    "base_item": "shadow_label",
+    "img": "images/overlay_boss_icon.png",
+    "codes": "shadow_shortcuts,shadow_temple_shortcuts"
+  },
   {
     "name": "Shadow Temple Small Keys",
     "type": "consumable",

diff --git a/ootrando_overworldmap_hamsda/items/items.json b/ootrando_overworldmap_hamsda/items/items.json
@@ -678,11 +678,5 @@
         "codes": "rutominimal"
       }
     ]
-  },
-  {
-    "name": "Dummy",
-    "type": "toggle",
-    "img": "images/rupee.png",
-    "codes": "dummy"
   }
 ]