fixed some inverted logic for death mountain. including climbing DM, …

…bumper cave access, bottom right dropdown got missed, etc

locations/darkworld.json

@@ -38,7 +38,7 @@
             {
                 "name": "Bumper Cave",
                 "access_rules": [
-                    "^$CanReach|dark_bumper_cave_ledge"
+                    // "^$CanReach|dark_bumper_cave_ledge"
                 ],
                 "visibility_rules": ["$openOrStandard"],
                 "sections": [

locations/lightworld.json

@@ -902,7 +902,7 @@
             {
                 "name": "Bumper Cave",
                 "access_rules": [
-                    "^$CanReach|light_bumper_cave_ledge"
+                    // "^$CanReach|light_bumper_cave_ledge"
                 ],
                 "visibility_rules": ["inverted"],
                 "sections": [
@@ -916,10 +916,16 @@
                 ],
                 "map_locations": [
                     {
-                        "map": "Lightworld",
-                        "x": 713,
-                        "y": 352,
+                        "map": "Darkworld",
+                        "x": 670,
+                        "y": 295,
                         "size": 32
+                    // },
+                    // {
+                    //     "map": "Lightworld",
+                    //     "x": 705,
+                    //     "y": 345,
+                    //     "size": 32
                     }
                 ]
             },

scripts/logic/darkworld.lua

@@ -467,6 +467,17 @@ red_shield_shop:connect_one_way("Red Shield Shop Right")
 dark_lumpberjacks:connect_two_ways_entrance("Dark Lumberjacks Shop", dark_lumpberjacks_shop)
 dark_lumpberjacks:connect_two_ways_entrance("Red Shield Shop", red_shield_shop)
 dark_lumpberjacks:connect_two_ways_entrance("Bumper Cave", dark_bumper_cave, function() return all(openOrStandard(), has("glove"), can_interact("dark",1 )) end)
+dark_lumpberjacks:connect_one_way("Bumper Cave Item", function() return AccessibilityLevel.Inspect end)
+dark_lumpberjacks:connect_one_way(dark_death_mountain_ascent_ledge, function() 
+    return all(
+        inverted(),
+        has("glove")
+    )
+end)
+dark_death_mountain_ascent_ledge:connect_one_way(dark_lumpberjacks)
+dark_death_mountain_ascent_ledge:connect_one_way(dark_death_mountain_ascent, function() return darkRooms() end)
+dark_death_mountain_ascent:connect_two_ways_entrance("Upper Dark Death Mountain Ascent", dark_death_mountain_left_bottom, function() return darkRooms() end)
+
 dark_bumper_cave:connect_one_way_entrance("Normal Bumpercave", dark_bumper_cave_ledge,function() return all(openOrStandard(), has("cape"), can_interact("dark",1 )) end)
 dark_bumper_cave_ledge:connect_one_way_entrance("Reverse Bumpercave", dark_bumper_cave, function() 
     return all(
@@ -793,7 +804,8 @@ tr_eye_bridge_entrance:connect_two_ways_entrance("Light Eyebridge Connector", li
         canChangeWorldWithMirror()
     ) 
 end)
-dark_death_mountain_right_top:connect_one_way(tr_eye_bridge_entrance, function() return inverted() end)
+-- dark_death_mountain_lonely_ledge:connect_one_way(tr_eye_bridge_entrance, function() return inverted() end)
+dark_death_mountain_right_top:connect_one_way(dark_death_mountain_right_bottom)
 
 
 -- dark_death_mountain_left_bottom

scripts/logic/lightworld.lua

@@ -576,7 +576,7 @@ lumberjacks_hole:connect_one_way(lumberjacks_item)
 lumberjacks_item:connect_one_way(lumberjacks_cave)
 lumberjacks_item:connect_one_way("Lumberjacks Item")
 
-lumberjacks_area:connect_two_ways_entrance("Lower Light Death Mountain Ascent Ledge", death_mountain_ascent_ledge, function() 
+lumberjacks_area:connect_two_ways_entrance("Lower Light Death Mountain Ascent Ledge", light_death_mountain_ascent_ledge, function() 
     return all(
         has("glove"), 
         can_interact("light",1 )
@@ -585,11 +585,15 @@ end)
 
  -- rescue old man
 
-lumberjacks_area:connect_two_ways(light_bumper_cave_ledge, function() return inverted() end)
-
+inverted_bumper_cave:connect_one_way(light_bumper_cave_ledge, function() 
+    print(inverted())
+    print(has("cape"))
+    print(can_interact("light",1 )) 
+    print(all(inverted(), has("cape"), can_interact("light",1 )))
+    return all(inverted(), has("cape"), can_interact("light",1 )) end)
 light_bumper_cave_ledge:connect_one_way(lumberjacks_area)
 
-light_bumper_cave_ledge:connect_two_ways_entrance("Light Bumper Cave", light_bumper_cave)
+-- light_bumper_cave_ledge:connect_one_way_entrance("Light Bumper Cave", inverted_bumper_cave, function() return inverted() end)
 light_bumper_cave_ledge:connect_one_way(dark_bumper_cave_ledge, function() 
     return all(
         canChangeWorldWithMirror(),
@@ -687,7 +691,8 @@ icerod_cave:connect_one_way("Icerod Chest", function() return can_interact("ligh
 light_lake_hylia:connect_two_ways(lake_hylia_island, function()
     return all(
         inverted(),
-        canSwim()
+        canSwim(),
+        has("pearl")
     )
 end)
 
@@ -970,7 +975,17 @@ light_death_mountain_left_bottom:connect_one_way(light_flute_map, function()
     ) 
 end)
 -- light_death_mountain_left_bottom:connect_one_way()
-death_mountain_ascent_ledge:connect_one_way(light_death_mountain_ascent, function() return darkRooms() end)
+light_death_mountain_ascent_ledge:connect_one_way(light_death_mountain_ascent, function() 
+    return all(
+        darkRooms(), 
+        openOrStandard()
+    )
+end)
+light_death_mountain_ascent_ledge:connect_one_way(inverted_bumper_cave, function() 
+    return all(
+        inverted()
+    )
+end)
 light_death_mountain_ascent:connect_two_ways_entrance("Upper Light Death Mountain Ascent", light_death_mountain_left_bottom, function() return darkRooms() end)
 
 light_death_mountain_left_bottom:connect_two_ways_entrance("Old Man Cave Entrance", old_man_cave)
@@ -1121,16 +1136,23 @@ light_death_mountain_right_top:connect_one_way(light_death_mountain_left_top, fu
 light_death_mountain_right_top:connect_two_ways_entrance("Paradox Cave Top Entrance", paradox_cave_top_entrance)
 light_death_mountain_right_top:connect_two_ways_entrance("Spiral Cave Top Entrance", spiral_cave_top)
 light_death_mountain_right_top:connect_one_way(mimic_cave_ledge, function() return inverted() end)
+light_death_mountain_right_top:connect_one_way(light_eyebridge_fairy, function() return inverted() end)
 
 tr_eye_bridge_entrance:connect_one_way_entrance("Light Eyebridge Fairy", light_eyebridge_fairy, function() 
     return all(
         canChangeWorldWithMirror(), 
         openOrStandard()
     ) 
 end)
+light_eyebridge_fairy:connect_one_way(tr_eye_bridge_entrance, function() 
+    return all(
+        inverted(), 
+        canChangeWorldWithMirror()
+    )
+end)
 
 spiral_cave_top:connect_one_way(spiral_cave_bottom)
-spiral_cave_top:connect_one_way("Spiral Cave Item")
+spiral_cave_top:connect_one_way("Spiral Cave Item", function() return can_interact("light",1 ) end)
 
 mimic_cave_ledge:connect_two_ways_entrance("Mimic Cave Entrance", mimic_cave)
 mimic_cave:connect_one_way("Mimic Cave Chest", function() 

scripts/logic/location_definition.lua

@@ -17,8 +17,10 @@ darf_smiths = alttp_location.new("darf_smiths")
 darkworld_teleport_desert_area = alttp_location.new("darkworld_teleport_desert_area")
 darkworld_teleport_kakariko_village = alttp_location.new("darkworld_teleport_kakariko_village")
 darkworld_teleport_turtle_rock = alttp_location.new("darkworld_teleport_turtle_rock")
-death_mountain_ascent = alttp_location.new("death_mountain_ascent")
-death_mountain_ascent_ledge = alttp_location.new("death_mountain_ascent_ledge")
+light_death_mountain_ascent = alttp_location.new("light_death_mountain_ascent")
+dark_death_mountain_ascent = alttp_location.new("dark_death_mountain_ascent")
+light_death_mountain_ascent_ledge = alttp_location.new("light_death_mountain_ascent_ledge") 
+dark_death_mountain_ascent_ledge = alttp_location.new("dark_death_mountain_ascent_ledge") 
 desert_area = alttp_location.new("desert_area")
 desert_ledge = alttp_location.new("desert_ledge")
 desert_palace = alttp_location.new("desert_palace")
@@ -67,6 +69,7 @@ kings_tomb_inside = alttp_location.new("kings_tomb_inside")
 lake_hylia_island = alttp_location.new("lake_hylia_island")
 library = alttp_location.new("library")
 light_activate_flute = alttp_location.new("light_activate_flute")
+inverted_bumper_cave = alttp_location.new("inverted_bumper_cave")
 light_bumper_cave = alttp_location.new("light_bumper_cave")
 light_bumper_cave_ledge = alttp_location.new("light_bumper_cave_ledge")
 light_death_mountain = alttp_location.new("light_death_mountain")
@@ -182,6 +185,7 @@ dark_death_mountain_left_top = alttp_location.new("dark_death_mountain_left_top"
 dark_death_mountain_right_bottom = alttp_location.new("dark_death_mountain_right_bottom")
 dark_death_mountain_right_top = alttp_location.new("dark_death_mountain_right_top")
 dark_death_mountain_shop = alttp_location.new("dark_death_mountain_shop")
+-- dark_death_mountain_lonely_ledge = alttp_location.new("dark_death_mountain_lonely_ledge")
 dark_flute_map = alttp_location.new("dark_flute_map")
 dark_icerod_area = alttp_location.new("dark_icerod_area")
 dark_icerod_cave = alttp_location.new("dark_icerod_cave")