Fix trock entrances when intensity < 3
Fix outputpath setting in settings.json
This commit is contained in:
2
Main.py
2
Main.py
@@ -24,7 +24,7 @@ from Fill import distribute_items_cutoff, distribute_items_staleness, distribute
|
|||||||
from ItemList import generate_itempool, difficulties, fill_prizes, fill_specific_items
|
from ItemList import generate_itempool, difficulties, fill_prizes, fill_specific_items
|
||||||
from Utils import output_path, parse_player_names
|
from Utils import output_path, parse_player_names
|
||||||
|
|
||||||
__version__ = '0.2.0.10u'
|
__version__ = '0.2.0.11u'
|
||||||
|
|
||||||
class EnemizerError(RuntimeError):
|
class EnemizerError(RuntimeError):
|
||||||
pass
|
pass
|
||||||
|
|||||||
@@ -36,6 +36,9 @@ otherwise unconnected logically can be reach using these glitches. To prevent th
|
|||||||
|
|
||||||
# Bug Fixes
|
# Bug Fixes
|
||||||
|
|
||||||
|
* 2.0.11u
|
||||||
|
* Fix output path setting in settings.json
|
||||||
|
* Fix trock entrances when intensity <= 2
|
||||||
* 2.0.10u
|
* 2.0.10u
|
||||||
* Fix POD, TR, GT and SKULL 3 entrance if sanc ends up in that dungeon in crossed ER+
|
* Fix POD, TR, GT and SKULL 3 entrance if sanc ends up in that dungeon in crossed ER+
|
||||||
* TR Lobbies that need a bomb and can be entered before bombing should be pre-opened
|
* TR Lobbies that need a bomb and can be entered before bombing should be pre-opened
|
||||||
|
|||||||
9
Rom.py
9
Rom.py
@@ -15,6 +15,7 @@ from BaseClasses import CollectionState, ShopType, Region, Location, DoorType, R
|
|||||||
from DoorShuffle import compass_data, DROptions, boss_indicator
|
from DoorShuffle import compass_data, DROptions, boss_indicator
|
||||||
from Dungeons import dungeon_music_addresses
|
from Dungeons import dungeon_music_addresses
|
||||||
from Regions import location_table
|
from Regions import location_table
|
||||||
|
from RoomData import DoorKind
|
||||||
from Text import MultiByteTextMapper, CompressedTextMapper, text_addresses, Credits, TextTable
|
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 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
|
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
|
||||||
@@ -1391,13 +1392,11 @@ def patch_rom(world, rom, player, team, enemized):
|
|||||||
|
|
||||||
# fix trock doors for reverse entrances
|
# fix trock doors for reverse entrances
|
||||||
if world.fix_trock_doors[player]:
|
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(0xFED31, 0x0E) # preopen bombable exit
|
||||||
rom.write_byte(0xFEE41, 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]:
|
if world.doorShuffle[player] != 'vanilla' or world.keydropshuffle[player]:
|
||||||
for room in world.rooms:
|
for room in world.rooms:
|
||||||
|
|||||||
@@ -268,7 +268,7 @@ def create_guiargs(parent):
|
|||||||
guiargs.randomSprite = parent.randomSprite.get()
|
guiargs.randomSprite = parent.randomSprite.get()
|
||||||
|
|
||||||
# Get output path
|
# Get output path
|
||||||
guiargs.outputpath = parent.outputPath.get()
|
guiargs.outputpath = parent.settings["outputpath"]
|
||||||
|
|
||||||
guiargs = update_deprecated_args(guiargs)
|
guiargs = update_deprecated_args(guiargs)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user