Skip to content

Commit 9db6938

Browse files
committed
Push changes
1 parent 77da97e commit 9db6938

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

worlds/dk64/__init__.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
from worlds.dk64.DK64R.randomizer.Settings import Settings
2828
from worlds.dk64.DK64R.randomizer.Patching.ApplyRandomizer import patching_response
2929
from worlds.dk64.DK64R import version
30+
from worlds.dk64.DK64R.randomizer.Patching.EnemyRando import randomize_enemies_0
31+
from worlds.dk64.DK64R.randomizer.Fill import ShuffleItems
3032

3133
class DK64Web(WebWorld):
3234
theme = "jungle"
@@ -63,7 +65,7 @@ class DK64World(World):
6365
def __init__(self, multiworld: MultiWorld, player: int):
6466
self.rom_name_available_event = threading.Event()
6567
super().__init__(multiworld, player)
66-
self.settings_string = "fjNPxAMxDIUx0QSpbHPUlZlBLg5gPQ+oBwRDIhKlsa58Iz8fiNEpEtiFKi4bVAhMF6AAd+AAOCAAGGAAGKAAAdm84FBiMhjoStwFIKW2wLcBJIBpkzVRCjFIKUUwGTLK/BQBuAIMAN4CBwBwAYQAOIECQByAoUAOYGCwB0A4YeXIITIagOrIrwAZTiU1QwkoSjuq1ZLEjQ0gRydoVFtRl6KiLAImIoArFljkbsl4u8igch2MvacgZ5GMGQBlU4IhAALhQALhgAJhwAJiAAHrQAHiQAFigADiwAHjAAFjQADrgALT5XoElypbPZZDCOZJ6Nh8Zq7WBgM5dVhVFZoKZUWjHFKAFBWDReUAnFRaJIuIZiTxrSyDSIjXR2AB0AvCoICQoLDA0OEBESFBUWGBkaHB0eICEiIyQlJicoKSorLC0uLzAxMjM0Nay+AMAAwgDEAJ0AsgBRAA"
68+
self.settings_string = "fjNPxAMxDIUx0QSpbHPUlZlBLg5gPQ+oBwRDIhKlsa58Iz8fiNEpEtiFKC4bVAhMF6AAd+AAOCAAGGAAGKAAAdm84FBiMhjoStwFIKW2wLcBJIBpkzVRCjFIKUUwGTLK/BQBuAIMAN4CBwBwAYQAOIECQByAoUAOYGCwB0A4YeXIITIagOrIrwAZTiU1QwkoSjuq1ZLEjQ0gRydoVFtRl6KiLAImIoArFljkbsl4u8igch2MvacgZ5GMGQBlU4IhAALhQALhgAJhwAJiAAHrQAHiQAFigADiwAHjAAFjQADrgALT5XoElypbPZZDCOZJ6Nh8Zq7WBgM5dVhVFZoKZUWjHFKAFBWDReUAnFRaJIuIZiTxrSyDSIjXR2AB0AvCoICQoLDA0OEBESFBUWGBkaHB0eICEiIyQlJicoKSorLC0uLzAxMjM0Nay+AMAAwgDEAJ0AsgBRAA"
6769
settings_dict = decrypt_settings_string_enum(self.settings_string)
6870
settings = Settings(settings_dict)
6971
spoiler = Spoiler(settings)
@@ -82,8 +84,12 @@ def _get_slot_data(self):
8284
}
8385

8486
def generate_early(self):
85-
# handle starting moves?
86-
pass
87+
# Handle enemy rando
88+
self.logic_holder.spoiler.enemy_rando_data = {}
89+
self.logic_holder.spoiler.pkmn_snap_data = []
90+
if self.logic_holder.spoiler.settings.enemy_rando:
91+
randomize_enemies_0(self.logic_holder.spoiler)
92+
ShuffleItems(self.logic_holder.spoiler)
8793

8894
def create_regions(self) -> None:
8995
create_regions(self.multiworld, self.player, self.logic_holder)

0 commit comments

Comments
 (0)