alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix setting troll in world

Browse Source
This commit is contained in:
karafruit
2023-06-14 19:38:47 -05:00
parent d79427431e
commit 679cecbe28
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@@ -187,7 +187,7 @@ class World(object):
if self.goal[player] == 'completionist': if self.goal[player] == 'completionist':
self.accessibility[player] = 'locations' self.accessibility[player] = 'locations'
if self.trolls[player]: if self.trolls[player]:
self.can_take_damage[player] = False self.can_take_damage = False
def get_name_string_for_object(self, obj): 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)})' return obj.name if self.players == 1 else f'{obj.name} ({self.get_player_names(obj.player)})'

1
ItemList.py
View File

@@ -1127,7 +1127,6 @@ def get_pool_core(world, player, progressive, shuffle, difficulty, treasure_hunt
pool.extend(['Rupees (20)'] * 12) pool.extend(['Rupees (20)'] * 12)
if world.trolls[player]: if world.trolls[player]:
pool.remove('Rupees (20)')
pool.extend(['Magic Upgrade (1/2)']) pool.extend(['Magic Upgrade (1/2)'])
if bombbag: if bombbag:

3
Main.py
View File

@@ -166,6 +166,7 @@ def main(args, seed=None, fish=None):
world.restrict_boss_items = args.restrict_boss_items.copy() world.restrict_boss_items = args.restrict_boss_items.copy()
world.collection_rate = args.collection_rate.copy() world.collection_rate = args.collection_rate.copy()
world.colorizepots = args.colorizepots.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.rom_seeds = {player: random.randint(0, 999999999) for player in range(1, world.players + 1)}
world.finish_init() world.finish_init()
@@ -539,6 +540,7 @@ def copy_world(world):
ret.prizes = world.prizes.copy() ret.prizes = world.prizes.copy()
ret.restrict_boss_items = world.restrict_boss_items.copy() ret.restrict_boss_items = world.restrict_boss_items.copy()
ret.inaccessible_regions = world.inaccessible_regions.copy() ret.inaccessible_regions = world.inaccessible_regions.copy()
ret.trolls = world.trolls.copy()
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
create_regions(ret, player) create_regions(ret, player)
@@ -715,6 +717,7 @@ def copy_world_premature(world, player):
ret.prizes = world.prizes.copy() ret.prizes = world.prizes.copy()
ret.restrict_boss_items = world.restrict_boss_items.copy() ret.restrict_boss_items = world.restrict_boss_items.copy()
ret.key_logic = world.key_logic.copy() ret.key_logic = world.key_logic.copy()
ret.trolls = world.trolls.copy()
ret.is_copied_world = True ret.is_copied_world = True

2
Rom.py
View File

@@ -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_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['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['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_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_ice_large_room'] = "Does your sword feel heavier than usual?"
tt['telepathic_tile_misery_mire'] = "Vitreous' small eyes require explosives to defeat." tt['telepathic_tile_misery_mire'] = "Vitreous' small eyes require explosives to defeat."