Merge pull request #115 from Hamsda:ootr

update to version 3.4.2.0
Hamsda · May 8, 2021 · 45da11e · 45da11e
2 parents 9be8a25 + 2cbb9aa
commit 45da11e
Show file tree

Hide file tree

Showing 11 changed files with 302 additions and 206 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
@@ -197,6 +197,22 @@ This setting determines if Medigoron and Carpet Salesman items are shuffled.
 - ![Medigoron and Carpet Salesman not shuffled](images/setting_merchants_off.png "Medigoron and Carpet Salesman not shuffled") Medigoron and Carpet Salesman items are not shuffled.
 - ![Medigoron and Carpet Salesman shuffled](images/setting_merchants_shuffle.png "Medigoron and Carpet Salesman shuffled") Medigoron and Carpet Salesman items are shuffled and the merchants sell one randomized item for 200 rupees each.
 
+#### LACS Condition
+
+This setting determines what is needed to trigger the Light Arrow cutscene in the Temple of Time.
+
+- ![Vanilla](images/setting_lacs_vanilla.png "Vanilla") Shadow medallion and spirit medallion required
+- ![Stones](images/setting_lacs_stones.png "Stones") Variable amount of stones required
+- ![Medallions](images/setting_lacs_medallions.png "Medallions") Variable amount of medallions required
+- ![Dungeons](images/setting_lacs_dungeons.png "Dungeons") Variable amount of medallions and stones required
+- ![GS tokens](images/setting_lacs_gs.png "GS tokens") Variable amount of Gold Skulltula tokens required
+
+#### LACS Amount
+
+This setting determines how many (if any) of the items specified in `LACS Condition` are needed.
+
+![LACS Condition](images/setting_lacs_amount.png "LACS Condition") Increment or decrement the number required.
+
 #### Skip Child Zelda
 
 This setting determines if visiting Zelda in the Hyrule Castle Gardens is skipped.
@@ -254,13 +270,12 @@ This tab also contains a list of (some of) the logic tricks that can be enabled
 
 ## Entrance Randomizer variants
 
-The entrance randomizer variants are very different from the regular map tracker variants. There aren't two different maps for child and adult, but rather three maps in total:
+The entrance randomizer variants are very different from the regular map tracker variants:
 
-- `Overworld`: randomized checks in the overworld
-- `Entrances`: randomized or otherwise important grottos, houses, and dungeons
-- `Connectors`: connections between different overworld areas
+- `Locations`: checks in the overworld and checks from non randomized `Exits`
+- `Exits`: randomized grottos, houses, dungeons, and overworld connections
 
-All `Entrances` and `Connectors` have a capture spot, where you can mark what is at that location. Later you can see what led where by simply hovering over the locations with your mouse. If the location is useless, just mark off the icon to clean up the map. Some important locations should not be cleared, because they might be relevant to logic as pathways:
+All locations on the `Exits` map have a capture spot, where you can mark what is at that location. Later you can see what led where by simply hovering over the locations with your mouse. If the location is useless, just mark off the icon to clean up the map. Some important locations should not be cleared, because they might be relevant to logic as pathways:
 
 - Links House
 - Temple of Time
@@ -271,11 +286,11 @@ All `Entrances` and `Connectors` have a capture spot, where you can mark what is
 
 There are two variants, one for keysanity and one without. The keysanity variant uses the keys you mark for logic, while the other variant just assumes you have all keys at all times.
 
-I made a [quick explanation](https://youtu.be/4l8gDPkovAc) on how to use the ER variant. Excuse the poor sounds quality, I don't have a great microphone.
+I made a [quick explanation](https://youtu.be/4l8gDPkovAc) on how to use the ER variant, based on the previous split, but it still works basically the same. Excuse the poor sound quality, I don't have a great microphone.
 
 ### Settings (Entrance Randomizer only)
 
-The settings allow you to select which pools are actually shuffled (split based on Dev-R branch, since it is the most popular for ER). If they are not shuffled, the appropriate captures are placed at (almost) all locations and certain locations are hidden since they are useless regardless of any other settings.
+The settings allow you to select which pools are actually shuffled (split based on Dev-R branch, since it is the most popular for ER). If they are not shuffled, the locations that still remain useful will appear on the `Locations` map instead, just like they would for the regular map tracker.
 
 #### Shuffle Interior Entrances
 

diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 3.4.2.0
+
+- fixed big poes in ER
+- improved reg Deku basement logic in ER
+- added hintable overworld and dungeon locations in ER
+- improved hintable overworld and dungeon locations in non ER
+- fixed Wasteland GS showing in logic incorrectly
+
 ## 3.4.1.0
 
 - fixed missing LACS condition setting in ER

diff --git a/ootrando_overworldmap_hamsda/locations/dungeons.json b/ootrando_overworldmap_hamsda/locations/dungeons.json
@@ -864,11 +864,13 @@
         "short_name": "Song of Time",
         "access_rules": [
           "@Dodongos Cavern MQ/Lobby,ocarina,time,$can_child_attack",
-          "@Dodongos Cavern MQ/Lobby,ocarina,time,$has_age|adult"
+          "@Dodongos Cavern MQ/Lobby,ocarina,time,$has_age|adult",
+          "{$hintable}"
         ],
         "visibility_rules": [
           "setting_tokens_dungeons"
         ],
+        "capture_item": true,
         "chest_unopened_img": "images/skulltula.png",
         "chest_opened_img": "images/skulltula_token.png",
         "item_count": 1
@@ -1024,8 +1026,10 @@
         "name": "Boomerang Chest",
         "short_name": "Boomerang",
         "access_rules": [
-          "@Jabu Jabus Belly/Main"
+          "@Jabu Jabus Belly/Main",
+          "{$hintable}"
         ],
+        "capture_item": true,
         "item_count": 1
       },
       {
@@ -1257,11 +1261,13 @@
       {
         "name": "Cow",
         "access_rules": [
-          "@Jabu Jabus Belly MQ/Boss Area,ocarina,epona"
+          "@Jabu Jabus Belly MQ/Boss Area,ocarina,epona",
+          "{$hintable}"
         ],
         "visibility_rules": [
           "setting_cowsanity_yes"
         ],
+        "capture_item": true,
         "chest_unopened_img": "images/cow.png",
         "chest_opened_img": "images/bottle_milk.png",
         "item_count": 1
@@ -1754,10 +1760,8 @@
         "name": "Floormaster Chest",
         "short_name": "Floormaster",
         "access_rules": [
-          "@Forest Temple/Outside Upper Ledge",
-          "{$hintable}"
+          "@Forest Temple/Outside Upper Ledge"
         ],
-        "capture_item": true,
         "chest_unopened_img": "images/chest_brown_small_key.png",
         "item_count": 1
       },
@@ -2654,11 +2658,13 @@
         "access_rules": [
           "@Fire Temple MQ/Upper Maze,ocarina,time,hookshot,$has_explosives",
           "@Fire Temple MQ/Upper Maze,ocarina,time,hookshot,[logic_rusted_switches]",
-          "@Fire Temple MQ/Upper Maze,longshot"
+          "@Fire Temple MQ/Upper Maze,longshot",
+          "{$hintable}"
         ],
         "visibility_rules": [
           "setting_tokens_dungeons"
         ],
+        "capture_item": true,
         "chest_unopened_img": "images/skulltula.png",
         "chest_opened_img": "images/skulltula_token.png",
         "item_count": 1
@@ -2719,13 +2725,11 @@
         "short_name": "Above Fire Maze",
         "access_rules": [
           "@Fire Temple MQ/West Top,hookshot,fire_small_keys:4,[fire_small_keys:5]",
-          "@Fire Temple MQ/West Top,[logic_fire_mq_above_maze_gs],longshot",
-          "{$hintable}"
+          "@Fire Temple MQ/West Top,[logic_fire_mq_above_maze_gs],longshot"
         ],
         "visibility_rules": [
           "setting_tokens_dungeons"
         ],
-        "capture_item": true,
         "chest_unopened_img": "images/skulltula.png",
         "chest_opened_img": "images/skulltula_token.png",
         "item_count": 1
@@ -2884,11 +2888,13 @@
           "@Water Temple/Dive,hookshot,$has_explosives,ocarina,lullaby,ironboots",
           "@Water Temple/Dive,hookshot,$has_explosives,ocarina,lullaby,scale",
           "@Water Temple/Dive,hoverboots,$has_explosives,ocarina,lullaby,ironboots",
-          "@Water Temple/Dive,hoverboots,$has_explosives,ocarina,lullaby,scale"
+          "@Water Temple/Dive,hoverboots,$has_explosives,ocarina,lullaby,scale",
+          "{$hintable}"
         ],
         "visibility_rules": [
           "setting_tokens_dungeons"
         ],
+        "capture_item": true,
         "chest_unopened_img": "images/skulltula.png",
         "chest_opened_img": "images/skulltula_token.png",
         "item_count": 1
@@ -3199,10 +3205,8 @@
         "access_rules": [
           "@Water Temple MQ/Dark Link Region,$FTR_or_zora,dinsfire,magic,[logic_water_dragon_jump_dive]",
           "@Water Temple MQ/Dark Link Region,$FTR_or_zora,dinsfire,magic,scale",
-          "@Water Temple MQ/Dark Link Region,$FTR_or_zora,dinsfire,magic,ironboots",
-          "{$hintable}"
+          "@Water Temple MQ/Dark Link Region,$FTR_or_zora,dinsfire,magic,ironboots"
         ],
-        "capture_item": true,
         "chest_unopened_img": "images/chest_golden_closed.png",
         "chest_opened_img": "images/chest_golden_open.png",
         "item_count": 1
@@ -3244,11 +3248,13 @@
         "short_name": "South Basement",
         "access_rules": [
           "@Water Temple MQ/Basement Gated Areas,bow,firearrow,magic,hoverboots",
-          "@Water Temple MQ/Basement Gated Areas,bow,firearrow,magic,ocarina,scarecrow"
+          "@Water Temple MQ/Basement Gated Areas,bow,firearrow,magic,ocarina,scarecrow",
+          "{$hintable}"
         ],
         "visibility_rules": [
           "setting_tokens_dungeons"
         ],
+        "capture_item": true,
         "chest_unopened_img": "images/skulltula.png",
         "chest_opened_img": "images/skulltula_token.png",
         "item_count": 1
@@ -4888,7 +4894,8 @@
         "short_name": "Dead Hand",
         "access_rules": [
           "ocarina,lullaby,sword1",
-          "ocarina,lullaby,sticks,[logic_child_deadhand]"
+          "ocarina,lullaby,sticks,[logic_child_deadhand]",
+          "{$hintable}"
         ],
         "capture_item": true,
         "item_count": 1