(Merge)

Fix trock entrances when intensity < 3
Fix outputpath setting in settings.json

Rom.py

@@ -16,6 +16,7 @@ from DoorShuffle import compass_data, DROptions, boss_indicator
 from Dungeons import dungeon_music_addresses
 from KeyDoorShuffle import count_locations_exclude_logic
 from Regions import location_table
+from RoomData import DoorKind
 from Text import MultiByteTextMapper, CompressedTextMapper, text_addresses, Credits, TextTable
 from Text import Uncle_texts, Ganon1_texts, TavernMan_texts, Sahasrahla2_texts, Triforce_texts, Blind_texts, BombShop2_texts, junk_texts
 from Text import KingsReturn_texts, Sanctuary_texts, Kakariko_texts, Blacksmiths_texts, DeathMountain_texts, LostWoods_texts, WishingWell_texts, DesertPalace_texts, MountainTower_texts, LinksHouse_texts, Lumberjacks_texts, SickKid_texts, FluteBoy_texts, Zora_texts, MagicShop_texts, Sahasrahla_names
@@ -1414,13 +1415,11 @@ def patch_rom(world, rom, player, team, enemized):
 
     # fix trock doors for reverse entrances
     if world.fix_trock_doors[player]:
+        # do this unconditionally
+        world.get_room(0x23, player).change(0, DoorKind.CaveEntrance)
+        world.get_room(0xd5, player).change(0, DoorKind.CaveEntrance)
         rom.write_byte(0xFED31, 0x0E)  # preopen bombable exit
         rom.write_byte(0xFEE41, 0x0E)  # preopen bombable exit
-        # included unconditionally in base2current
-        #rom.write_byte(0xFE465, 0x1E)  # remove small key door on backside of big key door
-    else:
-        rom.write_byte(0xFED31, 0x2A)  # preopen bombable exit
-        rom.write_byte(0xFEE41, 0x2A)  # preopen bombable exit
 
     if world.doorShuffle[player] != 'vanilla' or world.keydropshuffle[player]:
         for room in world.rooms: