diff --git a/BaseClasses.py b/BaseClasses.py index 498f3e3c..1e50bfa9 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -187,7 +187,7 @@ class World(object): if self.goal[player] == 'completionist': self.accessibility[player] = 'locations' if self.trolls[player]: - self.can_take_damage[player] = False + self.can_take_damage = False def get_name_string_for_object(self, obj): return obj.name if self.players == 1 else f'{obj.name} ({self.get_player_names(obj.player)})' diff --git a/ItemList.py b/ItemList.py index d893c0d9..8e2570ea 100644 --- a/ItemList.py +++ b/ItemList.py @@ -1127,7 +1127,6 @@ def get_pool_core(world, player, progressive, shuffle, difficulty, treasure_hunt pool.extend(['Rupees (20)'] * 12) if world.trolls[player]: - pool.remove('Rupees (20)') pool.extend(['Magic Upgrade (1/2)']) if bombbag: diff --git a/Main.py b/Main.py index 48f9f32d..d814e8e1 100644 --- a/Main.py +++ b/Main.py @@ -166,6 +166,7 @@ def main(args, seed=None, fish=None): world.restrict_boss_items = args.restrict_boss_items.copy() world.collection_rate = args.collection_rate.copy() world.colorizepots = args.colorizepots.copy() + world.trolls = args.trolls.copy() world.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)} world.finish_init() @@ -539,6 +540,7 @@ def copy_world(world): ret.prizes = world.prizes.copy() ret.restrict_boss_items = world.restrict_boss_items.copy() ret.inaccessible_regions = world.inaccessible_regions.copy() + ret.trolls = world.trolls.copy() for player in range(1, world.players + 1): create_regions(ret, player) @@ -715,6 +717,7 @@ def copy_world_premature(world, player): ret.prizes = world.prizes.copy() ret.restrict_boss_items = world.restrict_boss_items.copy() ret.key_logic = world.key_logic.copy() + ret.trolls = world.trolls.copy() ret.is_copied_world = True diff --git a/Rom.py b/Rom.py index 6a25893e..1736c14c 100644 --- a/Rom.py +++ b/Rom.py @@ -2726,7 +2726,7 @@ def write_strings(rom, world, player, team): tt['telepathic_tile_swamp_entrance'] = "Please take your boots off before entering my room.\n\n - Arrghus" tt['telepathic_tile_thieves_town_upstairs'] = "Secret power is said to be in the shovel." tt['blind_by_the_light'] = "I'd really dig it if you didn't bring a shovel." - tt['telepathic_tile_ice_entrace'] = "Kholdstare's hypnotic eyes can be confusing..." + tt['telepathic_tile_ice_entrance'] = "Kholdstare's hypnotic eyes can be confusing..." tt['telepathic_tile_ice_stalfos_knights_room'] = "Bomb fuses may be shorter or longer than they appear." tt['telepathic_tile_ice_large_room'] = "Does your sword feel heavier than usual?" tt['telepathic_tile_misery_mire'] = "Vitreous' small eyes require explosives to defeat."