Merge pull request #82 from Hamsda:dev

update to version 2.9.1.0
Hamsda · May 18, 2020 · 6dc844b · 6dc844b
2 parents c5d64a8 + 64676bb
commit 6dc844b
Show file tree

Hide file tree

Showing 72 changed files with 1,367 additions and 416 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.9.1.0
+
+- added available/in logic skulltula counters
+- added more logic tricks
+
 ## 2.9.0.0
 
 - replaced ice traps with triforce pieces

diff --git a/ootrando_overworldmap_hamsda.zip b/ootrando_overworldmap_hamsda.zip
diff --git a/ootrando_overworldmap_hamsda/images/agony.png b/ootrando_overworldmap_hamsda/images/agony.png
diff --git a/ootrando_overworldmap_hamsda/images/boss_key.png b/ootrando_overworldmap_hamsda/images/boss_key.png
diff --git a/ootrando_overworldmap_hamsda/images/compass.png b/ootrando_overworldmap_hamsda/images/compass.png
diff --git a/ootrando_overworldmap_hamsda/images/gerudocard.png b/ootrando_overworldmap_hamsda/images/gerudocard.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_adult_kokiri_gs.png b/ootrando_overworldmap_hamsda/images/logic_adult_kokiri_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_botw_basement.png b/ootrando_overworldmap_hamsda/images/logic_botw_basement.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_botw_cage_gs.png b/ootrando_overworldmap_hamsda/images/logic_botw_cage_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_colossus_gs.png b/ootrando_overworldmap_hamsda/images/logic_colossus_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_crater_bean_poh_with_hovers.png b/ootrando_overworldmap_hamsda/images/logic_crater_bean_poh_with_hovers.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_jump.png b/ootrando_overworldmap_hamsda/images/logic_dc_jump.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_scarecrow_gs.png b/ootrando_overworldmap_hamsda/images/logic_dc_scarecrow_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_dc_staircase.png b/ootrando_overworldmap_hamsda/images/logic_dc_staircase.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_deku_basement_gs.png b/ootrando_overworldmap_hamsda/images/logic_deku_basement_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_dmt_bombable.png b/ootrando_overworldmap_hamsda/images/logic_dmt_bombable.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_fire_boss_door_jump.png b/ootrando_overworldmap_hamsda/images/logic_fire_boss_door_jump.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_fire_flame_maze.png b/ootrando_overworldmap_hamsda/images/logic_fire_flame_maze.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_forest_outdoors_ledge.png b/ootrando_overworldmap_hamsda/images/logic_forest_outdoors_ledge.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_gerudo_kitchen.png b/ootrando_overworldmap_hamsda/images/logic_gerudo_kitchen.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_goron_city_pot.png b/ootrando_overworldmap_hamsda/images/logic_goron_city_pot.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_goron_city_pot_with_strength.png b/ootrando_overworldmap_hamsda/images/logic_goron_city_pot_with_strength.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_kakariko_tower_gs.png b/ootrando_overworldmap_hamsda/images/logic_kakariko_tower_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lab_diving.png b/ootrando_overworldmap_hamsda/images/logic_lab_diving.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lab_wall_gs.png b/ootrando_overworldmap_hamsda/images/logic_lab_wall_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_lost_woods_gs_bean.png b/ootrando_overworldmap_hamsda/images/logic_lost_woods_gs_bean.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_mido_backflip.png b/ootrando_overworldmap_hamsda/images/logic_mido_backflip.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_reverse_wasteland.png b/ootrando_overworldmap_hamsda/images/logic_reverse_wasteland.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_shadow_freestanding_key.png b/ootrando_overworldmap_hamsda/images/logic_shadow_freestanding_key.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_child_bombchu.png b/ootrando_overworldmap_hamsda/images/logic_spirit_child_bombchu.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_lobby_gs.png b/ootrando_overworldmap_hamsda/images/logic_spirit_lobby_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_map_chest.png b/ootrando_overworldmap_hamsda/images/logic_spirit_map_chest.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_sun_chest.png b/ootrando_overworldmap_hamsda/images/logic_spirit_sun_chest.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_spirit_wall.png b/ootrando_overworldmap_hamsda/images/logic_spirit_wall.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_trail_gs_lower_bean.png b/ootrando_overworldmap_hamsda/images/logic_trail_gs_lower_bean.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_trail_gs_lower_hookshot.png b/ootrando_overworldmap_hamsda/images/logic_trail_gs_lower_hookshot.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_trail_gs_upper.png b/ootrando_overworldmap_hamsda/images/logic_trail_gs_upper.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_wasteland_crossing.png b/ootrando_overworldmap_hamsda/images/logic_wasteland_crossing.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_bk_chest.png b/ootrando_overworldmap_hamsda/images/logic_water_bk_chest.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_bk_jump_dive.png b/ootrando_overworldmap_hamsda/images/logic_water_bk_jump_dive.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_boss_key_region.png b/ootrando_overworldmap_hamsda/images/logic_water_boss_key_region.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_central_bow.png b/ootrando_overworldmap_hamsda/images/logic_water_central_bow.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_cracked_wall_hovers.png b/ootrando_overworldmap_hamsda/images/logic_water_cracked_wall_hovers.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_cracked_wall_nothing.png b/ootrando_overworldmap_hamsda/images/logic_water_cracked_wall_nothing.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_dragon_bombchu.png b/ootrando_overworldmap_hamsda/images/logic_water_dragon_bombchu.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_dragon_jump_dive.png b/ootrando_overworldmap_hamsda/images/logic_water_dragon_jump_dive.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_falling_platform_gs.png b/ootrando_overworldmap_hamsda/images/logic_water_falling_platform_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_hookshot_entry.png b/ootrando_overworldmap_hamsda/images/logic_water_hookshot_entry.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_north_basement_ledge_jump.png b/ootrando_overworldmap_hamsda/images/logic_water_north_basement_ledge_jump.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_river_gs.png b/ootrando_overworldmap_hamsda/images/logic_water_river_gs.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_water_temple_torch_longshot.png b/ootrando_overworldmap_hamsda/images/logic_water_temple_torch_longshot.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_zora_river_lower.png b/ootrando_overworldmap_hamsda/images/logic_zora_river_lower.png
diff --git a/ootrando_overworldmap_hamsda/images/logic_zora_with_cucco.png b/ootrando_overworldmap_hamsda/images/logic_zora_with_cucco.png
diff --git a/ootrando_overworldmap_hamsda/images/map.png b/ootrando_overworldmap_hamsda/images/map.png
diff --git a/ootrando_overworldmap_hamsda/images/skulltula_available.png b/ootrando_overworldmap_hamsda/images/skulltula_available.png
diff --git a/ootrando_overworldmap_hamsda/images/skulltula_logic.png b/ootrando_overworldmap_hamsda/images/skulltula_logic.png
diff --git a/ootrando_overworldmap_hamsda/images/small_key.png b/ootrando_overworldmap_hamsda/images/small_key.png
diff --git a/ootrando_overworldmap_hamsda/images/small_key_check.png b/ootrando_overworldmap_hamsda/images/small_key_check.png
diff --git a/ootrando_overworldmap_hamsda/items/counters.json b/ootrando_overworldmap_hamsda/items/counters.json
@@ -33,5 +33,19 @@
     "img": "images/entrance_house_shop.png",
     "codes": "counter_shops",
     "max_quantity": 8
+  },
+  {
+    "name": "Skulltulas: Available",
+    "type": "consumable",
+    "img": "images/skulltula_available.png",
+    "codes": "counter_gs_available",
+    "max_quantity": 100
+  },
+  {
+    "name": "Skulltulas: In Logic",
+    "type": "consumable",
+    "img": "images/skulltula_logic.png",
+    "codes": "counter_gs_logic",
+    "max_quantity": 100
   }
 ]
diff --git a/ootrando_overworldmap_hamsda/items/tricks.json b/ootrando_overworldmap_hamsda/items/tricks.json
@@ -27,20 +27,55 @@
     "img": "images/logic_man_on_roof.png",
     "codes": "logic_man_on_roof"
   },
+  {
+    "name": "Dodongo's Cavern Staircase with Bow",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_dc_staircase.png",
+    "codes": "logic_dc_staircase"
+  },
   {
     "name": "Dodongo's Cavern Spike Trap Room Jump without Hover Boots",
     "type": "toggle",
     "initial_active_state": true,
     "img": "images/logic_dc_jump.png",
     "codes": "logic_dc_jump"
   },
+  {
+    "name": "Gerudo Fortress \"Kitchen\" with No Additional Items",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_gerudo_kitchen.png",
+    "codes": "logic_gerudo_kitchen"
+  },
+  {
+    "name": "Deku Tree Basement Vines GS with Jump Slash",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_deku_basement_gs.png",
+    "codes": "logic_deku_basement_gs"
+  },
   {
     "name": "Hammer Rusted Switches Through Walls",
     "type": "toggle",
     "initial_active_state": true,
     "img": "images/logic_rusted_switches.png",
     "codes": "logic_rusted_switches"
   },
+  {
+    "name": "Bottom of the Well Basement Chest with Strength & Sticks",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_botw_basement.png",
+    "codes": "logic_botw_basement"
+  },
+  {
+    "name": "Spirit Temple Child Side Bridge with Bombchu",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_spirit_child_bombchu.png",
+    "codes": "logic_spirit_child_bombchu"
+  },
   {
     "name": "Windmill PoH as Adult with Nothing",
     "type": "toggle",
@@ -55,11 +90,291 @@
     "img": "images/logic_crater_bean_poh_with_hovers.png",
     "codes": "logic_crater_bean_poh_with_hovers"
   },
+  {
+    "name": "Zora's Domain Entry with Cucco",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_zora_with_cucco.png",
+    "codes": "logic_zora_with_cucco"
+  },
   {
     "name": "Forest Temple East Courtyard Vines with Hookshot",
     "type": "toggle",
     "initial_active_state": true,
     "img": "images/logic_forest_vines.png",
     "codes": "logic_forest_vines"
+  },
+  {
+    "name": "Death Mountain Trail Bombable Chest with Strength",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_dmt_bombable.png",
+    "codes": "logic_dmt_bombable"
+  },
+  {
+    "name": "Goron City Spinning Pot PoH with Strength",
+    "type": "toggle",
+    "initial_active_state": true,
+    "img": "images/logic_goron_city_pot_with_strength.png",
+    "codes": "logic_goron_city_pot_with_strength"
+  },
+  {
+    "name": "Water Temple Boss Key Chest with Iron Boots",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_bk_chest.png",
+    "codes": "logic_water_bk_chest"
+  },
+  {
+    "name": "Adult Kokiri Forest GS with Hover Boots",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_adult_kokiri_gs.png",
+    "codes": "logic_adult_kokiri_gs"
+  },
+  {
+    "name": "Spirit Temple Shifting Wall with No Additional Items",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_spirit_wall.png",
+    "codes": "logic_spirit_wall"
+  },
+  {
+    "name": "Spirit Temple Main Room GS with Boomerang",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_spirit_lobby_gs.png",
+    "codes": "logic_spirit_lobby_gs"
+  },
+  {
+    "name": "Bottom of the Well Cage GS without Boomerang",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_botw_cage_gs.png",
+    "codes": "logic_botw_cage_gs"
+  },
+  {
+    "name": "Fire Temple Flame Wall Maze Skip",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_fire_flame_maze.png",
+    "codes": "logic_fire_flame_maze"
+  },
+  {
+    "name": "Zora's River Lower Freestanding PoH as Adult with Nothing",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_zora_river_lower.png",
+    "codes": "logic_zora_river_lower"
+  },
+  {
+    "name": "Water Temple Cracked Wall with Hover Boots",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_cracked_wall_hovers.png",
+    "codes": "logic_water_cracked_wall_hovers"
+  },
+  {
+    "name": "Shadow Temple Freestanding Key with Bombchu",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_shadow_freestanding_key.png",
+    "codes": "logic_shadow_freestanding_key"
+  },
+  {
+    "name": "Backflip over Mido as Adult",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_mido_backflip.png",
+    "codes": "logic_mido_backflip"
+  },
+  {
+    "name": "Fire Temple Boss Door without Hover Boots or Pillar",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_fire_boss_door_jump.png",
+    "codes": "logic_fire_boss_door_jump"
+  },
+  {
+    "name": "Diving in the Lab without Gold Scale",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_lab_diving.png",
+    "codes": "logic_lab_diving"
+  },
+  {
+    "name": "Wasteland Crossing without Hover Boots or Longshot",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_wasteland_crossing.png",
+    "codes": "logic_wasteland_crossing"
+  },
+  {
+    "name": "Desert Colossus Hill GS with Hookshot",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_colossus_gs.png",
+    "codes": "logic_colossus_gs"
+  },
+  {
+    "name": "Dodongo's Cavern Scarecrow GS with Armos Statue",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_dc_scarecrow_gs.png",
+    "codes": "logic_dc_scarecrow_gs"
+  },
+  {
+    "name": "Kakariko Tower GS with Jump Slash",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_kakariko_tower_gs.png",
+    "codes": "logic_kakariko_tower_gs"
+  },
+  {
+    "name": "Lake Hylia Lab Wall GS with Jump Slash",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_lab_wall_gs.png",
+    "codes": "logic_lab_wall_gs"
+  },
+  {
+    "name": "Spirit Temple Map Chest with Bow",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_spirit_map_chest.png",
+    "codes": "logic_spirit_map_chest"
+  },
+  {
+    "name": "Spirit Temple Sun Block Room Chest with Bow",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_spirit_sun_chest.png",
+    "codes": "logic_spirit_sun_chest"
+  },
+  {
+    "name": "Forest Temple NE Outdoors Ledge with Hover Boots",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_forest_outdoors_ledge.png",
+    "codes": "logic_forest_outdoors_ledge"
+  },
+  {
+    "name": "Water Temple Boss Key Region with Hover Boots",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_boss_key_region.png",
+    "codes": "logic_water_boss_key_region"
+  },
+  {
+    "name": "Water Temple Falling Platform Room GS with Hookshot",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_falling_platform_gs.png",
+    "codes": "logic_water_falling_platform_gs"
+  },
+  {
+    "name": "Water Temple Serpent River GS without Iron Boots",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_river_gs.png",
+    "codes": "logic_water_river_gs"
+  },
+  {
+    "name": "Water Temple Entry without Iron Boots using Hookshot",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_hookshot_entry.png",
+    "codes": "logic_water_hookshot_entry"
+  },
+  {
+    "name": "Death Mountain Trail Upper Red Rock GS without Hammer",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_trail_gs_upper.png",
+    "codes": "logic_trail_gs_upper"
+  },
+  {
+    "name": "Death Mountain Trail Lower Red Rock GS with Hookshot",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_trail_gs_lower_hookshot.png",
+    "codes": "logic_trail_gs_lower_hookshot"
+  },
+  {
+    "name": "Death Mountain Trail Lower Red Rock GS with Magic Bean",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_trail_gs_lower_bean.png",
+    "codes": "logic_trail_gs_lower_bean"
+  },
+  {
+    "name": "Reverse Wasteland",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_reverse_wasteland.png",
+    "codes": "logic_reverse_wasteland"
+  },
+  {
+    "name": "Lost Woods Adult GS without Bean",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_lost_woods_gs_bean.png",
+    "codes": "logic_lost_woods_gs_bean"
+  },
+  {
+    "name": "Water Temple Cracked Wall with No Additional Items",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_cracked_wall_nothing.png",
+    "codes": "logic_water_cracked_wall_nothing"
+  },
+  {
+    "name": "Water Temple North Basement Ledge with Precise Jump",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_north_basement_ledge_jump.png",
+    "codes": "logic_water_north_basement_ledge_jump"
+  },
+  {
+    "name": "Water Temple Torch Longshot",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_temple_torch_longshot.png",
+    "codes": "logic_water_temple_torch_longshot"
+  },
+  {
+    "name": "Water Temple Boss Key Jump Dive",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_bk_jump_dive.png",
+    "codes": "logic_water_bk_jump_dive"
+  },
+  {
+    "name": "Water Temple Dragon Statue Jump Dive",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_dragon_jump_dive.png",
+    "codes": "logic_water_dragon_jump_dive"
+  },
+  {
+    "name": "Water Temple Dragon Statue with Bombchu",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_dragon_bombchu.png",
+    "codes": "logic_water_dragon_bombchu"
+  },
+  {
+    "name": "Goron City Spinning Pot PoH with Bombchu",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_goron_city_pot.png",
+    "codes": "logic_goron_city_pot"
+  },
+  {
+    "name": "Water Temple Central Bow Target without Longshot or Hover Boots",
+    "type": "toggle",
+    "initial_active_state": false,
+    "img": "images/logic_water_central_bow.png",
+    "codes": "logic_water_central_bow"
   }
 ]