monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LttP: Do a check for enemizer much earlier in generation. (#875)

This commit is contained in:
CaitSith2 2022-08-10 13:21:52 -07:00 committed by GitHub
parent f2e83c37e9
commit e1e2526322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
worlds/alttp/__init__.py
View File

@ -14,8 +14,8 @@ from .Rules import set_rules
from .ItemPool import generate_itempool, difficulties from .ItemPool import generate_itempool, difficulties
from .Shops import create_shops, ShopSlotFill from .Shops import create_shops, ShopSlotFill
from .Dungeons import create_dungeons from .Dungeons import create_dungeons
from .Rom import LocalRom, patch_rom, patch_race_rom, patch_enemizer, apply_rom_settings, get_hash_string, \ from .Rom import LocalRom, patch_rom, patch_race_rom, check_enemizer, patch_enemizer, apply_rom_settings, \
get_base_rom_path, LttPDeltaPatch get_hash_string, get_base_rom_path, LttPDeltaPatch
import Patch import Patch
from itertools import chain from itertools import chain
@ -156,6 +156,9 @@ class ALTTPWorld(World):
player = self.player player = self.player
world = self.world world = self.world
if self.use_enemizer():
check_enemizer(world.enemizer)
# system for sharing ER layouts # system for sharing ER layouts
self.er_seed = str(world.random.randint(0, 2 ** 64)) self.er_seed = str(world.random.randint(0, 2 ** 64))
@ -341,14 +344,19 @@ class ALTTPWorld(World):
def stage_post_fill(cls, world): def stage_post_fill(cls, world):
ShopSlotFill(world) ShopSlotFill(world)
def use_enemizer(self):
world = self.world
player = self.player
return (world.boss_shuffle[player] != 'none' or world.enemy_shuffle[player]
or world.enemy_health[player] != 'default' or world.enemy_damage[player] != 'default'
or world.pot_shuffle[player] or world.bush_shuffle[player]
or world.killable_thieves[player])
def generate_output(self, output_directory: str): def generate_output(self, output_directory: str):
world = self.world world = self.world
player = self.player player = self.player
try: try:
use_enemizer = (world.boss_shuffle[player] != 'none' or world.enemy_shuffle[player] use_enemizer = self.use_enemizer()
or world.enemy_health[player] != 'default' or world.enemy_damage[player] != 'default'
or world.pot_shuffle[player] or world.bush_shuffle[player]
or world.killable_thieves[player])
rom = LocalRom(get_base_rom_path()) rom = LocalRom(get_base_rom_path())