Merge pull request #94 from Hamsda:ootr

update to version 3.0.0.0
Hamsda · Oct 20, 2020 · 215b5df · 215b5df
2 parents 338655e + 6f8bd61
commit 215b5df
Show file tree

Hide file tree

Showing 97 changed files with 8,556 additions and 1,997 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
@@ -35,7 +35,7 @@ Some of this functionality might not be immediately obvious:
 - Right clicking ![Fairy Ocarina](images/fairyocarina.png "Fairy Ocarina")/![Ocarina of Time](images/ocarina.png "Ocarina of Time") will overlay it with ![Scarecrow](images/overlay_scarecrow.png "Scarecrow") indicating that you have confirmed the scarecrow song or started with free scarecrow. Locations that make use of the scarecrow will not show up unless this is turned on. The location of the scarecrow in Lake Hylia will automatically mark this when cleared first as child and then as adult.
 - ![Triforce Piece](images/triforce_piece.png "Triforce Piece") is used as a counter for Triforce pieces in the Triforce Hunt mode.
 
-## Settings (for non Entrance Randomizer variants with a map)
+## Settings (for map variants)
 
 There is a variety of toggles available to accomodate the different settings the randomizer offers. The settings are arranged to mimic the current GUI of the randomizer. The default for all of these should match the settings used for the weekly races (check out the OoTR discord for more info).
 
@@ -88,10 +88,16 @@ This setting determines what is needed to trigger the rainbow bridge in front of
 
 - ![Always Open](images/setting_bridge_open.png "Always Open") Nothing required, bridge is always open
 - ![Vanilla](images/setting_bridge_vanilla.png "Vanilla") Light arrows, shadow medallion, and spirit medallion required
-- ![All Stones](images/setting_bridge_stones.png "All Stones") All 3 stones required
-- ![All Medallions](images/setting_bridge_medallions.png "All Medallions") All 6 medallions required
-- ![All Dungeons](images/setting_bridge_dungeons.png "All Dungeons") All 6 medallions and 3 stones required
-- ![100 GS tokens](images/setting_bridge_100gs.png "100 GS tokens") Gold skulltula tokens required (always assumes all 100 are required)
+- ![Stones](images/setting_bridge_stones.png "Stones") Variable amount of stones required
+- ![Medallions](images/setting_bridge_medallions.png "Medallions") Variable amount of medallions required
+- ![Dungeons](images/setting_bridge_dungeons.png "Dungeons") Variable amount of medallions and stones required
+- ![GS tokens](images/setting_bridge_gs.png "GS tokens") Variable amount of Gold Skulltula tokens required
+
+#### Rainbow Bridge Amount
+
+This setting determines how many (if any) of the items specified in `Rainbow Bridge Requirement` are needed.
+
+![Bridge Amount](images/setting_bridge_amount.png "Bridge Amount") Increment or decrement the number required.
 
 #### Number of Trials
 
@@ -184,6 +190,13 @@ 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
+
+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.
+
 #### Complete Mask Quest
 
 This setting determines if all masks will be available once the Happy Mask Shop is open.
@@ -234,20 +247,60 @@ 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. The map does not include any item locations to be checked, because that would result in way too many spots on the map, but instead has locations for the randomized entrances. They are split between `Entrances` (grottos, houses, dungeons, etc) and `Connectors` (connections between different overworld areas).
+The entrance randomizer variants are very different from the regular map tracker variants. The map does not include any item locations to be checked (yet) but instead has locations for the randomized entrances. They are split between `Entrances` (grottos, houses, dungeons, etc) and `Connectors` (connections between different overworld areas).
+
+There are two variants, one for keysanity and one without, but none of the keys are actually used for logic (yet).
 
 All locations have a capture spot, where you can mark what is at that location. If the location is useless, just mark off the icon to clean up the map. Later you can see what led where by simply hovering over the locations.
 
+I made a [quick explanation](https://www.twitch.tv/videos/429980574) on how to use the ER variant (slightly outdated but the general principle still is the same).
+
+### 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.
 
-There are two variants, one for keysanity and one without, but none of the items are actually used for "logic" (to show/hide entrances).
+#### Shuffle Interior Entrances
+
+- ![Interior Shuffle Off](images/setting_entrance_interiors_off.png "Interior Shuffle Off") No interiors are shuffled.
+- ![Simple Interiors Shuffled](images/setting_entrance_interiors_simple.png "Simple Interiors Shuffled") Interiors except Link's House, Temple of Time, Kak Potion Shop, and Windmill are shuffled.
+- ![All Interiors Shuffled](images/setting_entrance_interiors_all.png "All Interiors Shuffled") All interiors are shuffled.
+
+#### Shuffle Grotto Entrances
+
+- ![Grotto Shuffle Off](images/setting_entrance_grottos_off.png "Grotto Shuffle Off") Grottos and graves are not shuffled.
+- ![Grottos Shuffled](images/setting_entrance_grottos_shuffle.png "Grottos Shuffled") Grottos and graves are shuffled.
+
+#### Shuffle Dungeon Entrances
+
+- ![Dungeon Shuffle Off](images/setting_entrance_dungeons_off.png "Dungeon Shuffle Off") Dungeons are not shuffled.
+- ![Dungeons Shuffled](images/setting_entrance_dungeons_shuffle.png "Dungeons Shuffled") Dungeons are shuffled.
+
+#### Shuffle Overworld Entrances
+
+- ![Overworld Entrance Shuffle Off](images/setting_entrance_overworld_off.png "Overworld Entrance Shuffle Off") Overworld entrances are not shuffled.
+- ![Overworld Entrances Shuffled](images/setting_entrance_overworld_shuffle.png "Overworld Entrances Shuffled") Overworld entrances are shuffled.
+
+#### Randomize Owl Drops
+
+- ![Owl Drop Shuffle Off](images/setting_entrance_owl_off.png "Owl Drop Shuffle Off") Owl drops are not shuffled.
+- ![Owl Drops Shuffled](images/setting_entrance_owl_shuffle.png "Owl Drops Shuffled") Owl drops are shuffled.
+
+#### Randomize Warp Song Destinations
+
+- ![Warp Song Shuffle Off](images/setting_entrance_warpsong_off.png "Warp Song Shuffle Off") Warp song destinations are not shuffled.
+- ![Warp Songs Shuffled](images/setting_entrance_warpsong_shuffle.png "Warp Songs Shuffled") Warp song destinations are shuffled.
+
+#### 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.
+
+### Counters
 
 Additionally there are counters for the useful indoors entrances, so you can evaluate how much focus to put on exploring more entrances:
 
 - ![Counter: Generic Grottos](images/entrance_grotto_generic.png "Counter: Generic Grottos") 9 generic grottos (1 chest, 1 gossip stone).
 - ![Counter: Scrubs](images/entrance_grotto_scrub.png "Counter: Scrubs") 10 grottos that contain 2 or 3 scrubs each. Only 2 of these are relevant if `Shuffle Scrubs` is off.
 - ![Counter: Cows](images/entrance_grotto_cow.png "Counter: Cows") 4 grottos/houses that only have a cow (Impas House Back, Ingo Barn, Lon Lon Corner Tower, Mountain Bombable Grotto). The other cow spots have their own markers (![Links House](images/entrance_house_link.png) and ![Field Valley Grotto](images/entrance_grotto_field_valley.png))
 - ![Counter: Great Fairies](images/entrance_house_fairy.png "Counter: Great Fairies") 6 Great Fairy Fountains.
-- ![Counter: Shops](images/entrance_house_shop.png "Counter: Shops") 8 randomized shops (Kakariko Potion Shop has 2 separate entrances, only counted once).
-
-I made a [quick explanation](https://www.twitch.tv/videos/429980574) on how to use the ER variant (slightly outdated but the general principle still is the same).
+- ![Counter: Shops](images/entrance_house_shop.png "Counter: Shops") 7 randomized shops (Kakariko Potion Shop has 2 separate icons for capture).
diff --git a/ootrando_overworldmap_hamsda/changelog.md b/ootrando_overworldmap_hamsda/changelog.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 3.0.0.0
+
+- reworked the Entrance Randomizer variants entirely:
+  - added logic
+  - added settings for other ER options
+  - changed captures to match required in-game regions
+- fixed GS reward names
+- added bridge amount setting
+- added free Zelda setting
+- added expensive merchants setting
+- removed `Move King Zora`
+- added wallets to tunic logic in non ER
+
 ## 2.10.0.0
 
 - removed Gossip Stone map

diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_potion_back.png b/ootrando_overworldmap_hamsda/images/entrance_house_potion_back.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_house_potion_front.png b/ootrando_overworldmap_hamsda/images/entrance_house_potion_front.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_bridge.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_bridge.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_cg.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_cg.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_col.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_col.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_ct.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_ct.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_cte.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_cte.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dm_smt.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dm_smt.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc_ctr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc_ctr.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc_lwr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc_lwr.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc_upr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmc_upr.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_dmt.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_dmt.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gc.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gc.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gc_drn.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gc_drn.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gc_lw.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gc_lw.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gf.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gf_gate.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gf_gate.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gv.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gv.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gv_fort.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gv_fort.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gy.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gy.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_gy_pad.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_gy_pad.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_hf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_hf.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kak.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kak.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kak_gate.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kak_gate.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kak_impa.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kak_impa.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kf.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_kf_tree.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_kf_tree.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lh.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lh.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_llr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_llr.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lw.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lw.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lw_brg.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lw_brg.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lw_brg2.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lw_brg2.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_lw_mido.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_lw_mido.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_mkt.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_mkt.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_mkt_ent.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_mkt_ent.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm_ent.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_sfm_ent.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_tot_ent.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_tot_ent.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_wl.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_wl.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_wl_col.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_wl_col.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_wl_fort.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_wl_fort.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zd.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zd.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zd_kz.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zd_kz.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zf.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zf.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zr.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zr.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zr_fall.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zr_fall.png
diff --git a/ootrando_overworldmap_hamsda/images/entrance_overworld_zr_frnt.png b/ootrando_overworldmap_hamsda/images/entrance_overworld_zr_frnt.png
diff --git a/ootrando_overworldmap_hamsda/images/king_zora.png b/ootrando_overworldmap_hamsda/images/king_zora.png
diff --git a/ootrando_overworldmap_hamsda/images/overworld_entrance.png b/ootrando_overworldmap_hamsda/images/overworld_entrance.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_amount.png b/ootrando_overworldmap_hamsda/images/setting_bridge_amount.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_dungeons.png b/ootrando_overworldmap_hamsda/images/setting_bridge_dungeons.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_bridge_gs.png b/ootrando_overworldmap_hamsda/images/setting_bridge_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_overworld_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_overworld_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_overworld_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_overworld_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_owl_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_owl_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_owl_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_owl_shuffle.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_entrance_warpsong_off.png b/ootrando_overworldmap_hamsda/images/setting_entrance_warpsong_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_entrance_warpsong_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_entrance_warpsong_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_merchants_off.png b/ootrando_overworldmap_hamsda/images/setting_merchants_off.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_merchants_shuffle.png b/ootrando_overworldmap_hamsda/images/setting_merchants_shuffle.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_zelda_free.png b/ootrando_overworldmap_hamsda/images/setting_zelda_free.png
diff --git a/ootrando_overworldmap_hamsda/images/setting_zelda_off.png b/ootrando_overworldmap_hamsda/images/setting_zelda_off.png
diff --git a/ootrando_overworldmap_hamsda/items/cap_dungeons.json b/ootrando_overworldmap_hamsda/items/cap_dungeons.json
@@ -1,66 +1,66 @@
 [
   {
-    "name": "Deku",
+    "name": "Deku Tree",
     "type": "toggle",
     "img": "images/entrance_dungeon_deku.png",
     "codes": "entrance_dungeon_deku"
   },
   {
-    "name": "DC",
+    "name": "Dodongos Cavern",
     "type": "toggle",
     "img": "images/entrance_dungeon_dodongo.png",
     "codes": "entrance_dungeon_dodongo"
   },
   {
-    "name": "Jabu",
+    "name": "Jabu Jabus Belly",
     "type": "toggle",
     "img": "images/entrance_dungeon_jabu.png",
     "codes": "entrance_dungeon_jabu"
   },
   {
-    "name": "Forest",
+    "name": "Forest Temple",
     "type": "toggle",
     "img": "images/entrance_dungeon_forest.png",
     "codes": "entrance_dungeon_forest"
   },
   {
-    "name": "Fire",
+    "name": "Fire Temple",
     "type": "toggle",
     "img": "images/entrance_dungeon_fire.png",
     "codes": "entrance_dungeon_fire"
   },
   {
-    "name": "Water",
+    "name": "Water Temple",
     "type": "toggle",
     "img": "images/entrance_dungeon_water.png",
     "codes": "entrance_dungeon_water"
   },
   {
-    "name": "Spirit",
+    "name": "Spirit Temple",
     "type": "toggle",
     "img": "images/entrance_dungeon_spirit.png",
     "codes": "entrance_dungeon_spirit"
   },
   {
-    "name": "Shadow",
+    "name": "Shadow Temple",
     "type": "toggle",
     "img": "images/entrance_dungeon_shadow.png",
     "codes": "entrance_dungeon_shadow"
   },
   {
-    "name": "Well",
+    "name": "Bottom of the Well",
     "type": "toggle",
     "img": "images/entrance_dungeon_botw.png",
     "codes": "entrance_dungeon_botw"
   },
   {
-    "name": "IC",
+    "name": "Ice Cavern",
     "type": "toggle",
     "img": "images/entrance_dungeon_ice.png",
     "codes": "entrance_dungeon_ice"
   },
   {
-    "name": "GTG",
+    "name": "Gerudo Training Grounds",
     "type": "toggle",
     "img": "images/entrance_dungeon_gtg.png",
     "codes": "entrance_dungeon_gtg"

diff --git a/ootrando_overworldmap_hamsda/items/cap_grottos.json b/ootrando_overworldmap_hamsda/items/cap_grottos.json
@@ -60,7 +60,7 @@
     "codes": "entrance_grotto_comp"
   },
   {
-    "name": "Dampes Grave",
+    "name": "Graveyard Dampes Grave",
     "type": "toggle",
     "img": "images/entrance_grotto_dampe.png",
     "codes": "entrance_grotto_dampe"

diff --git a/ootrando_overworldmap_hamsda/items/cap_houses.json b/ootrando_overworldmap_hamsda/items/cap_houses.json
@@ -11,6 +11,18 @@
     "img": "images/entrance_house_shop.png",
     "codes": "entrance_house_shop"
   },
+  {
+    "name": "Kak Potion Shop Front",
+    "type": "toggle",
+    "img": "images/entrance_house_potion_front.png",
+    "codes": "entrance_house_potion_front"
+  },
+  {
+    "name": "Kak Potion Shop Back",
+    "type": "toggle",
+    "img": "images/entrance_house_potion_back.png",
+    "codes": "entrance_house_potion_back"
+  },
   {
     "name": "Cow",
     "type": "toggle",
@@ -48,7 +60,7 @@
     "codes": "entrance_house_tot"
   },
   {
-    "name": "Windmill",
+    "name": "Kak Windmill",
     "type": "toggle",
     "img": "images/entrance_house_windmill.png",
     "codes": "entrance_house_windmill"