Fixed Rupee/Bomb logic in playthru
This commit is contained in:
28
ItemList.py
28
ItemList.py
@@ -552,19 +552,23 @@ def create_farm_locations(world, player):
|
|||||||
# and hopefully access to more permanent farm locations
|
# and hopefully access to more permanent farm locations
|
||||||
|
|
||||||
def create_and_fill_location(region_name, loc_description, item_name):
|
def create_and_fill_location(region_name, loc_description, item_name):
|
||||||
region = world.get_region(region_name, player)
|
loc = world.get_location_unsafe(f'{region_name} {loc_description}', player)
|
||||||
loc = Location(player, f'{region_name} {loc_description}', 0, region)
|
if loc:
|
||||||
loc.type = LocationType.Logical
|
loc.access_rule = lambda state: True
|
||||||
loc.parent_region = region
|
world.spoiler.suppress_spoiler_locations.append(loc.name)
|
||||||
loc.event = True
|
else:
|
||||||
loc.locked = True
|
region = world.get_region(region_name, player)
|
||||||
loc.address = None
|
loc = Location(player, f'{region_name} {loc_description}', 0, region)
|
||||||
|
loc.type = LocationType.Logical
|
||||||
world.push_item(loc, ItemFactory(item_name, player), False)
|
loc.parent_region = region
|
||||||
|
loc.event = True
|
||||||
region.locations.append(loc)
|
loc.locked = True
|
||||||
world.dynamic_locations.append(loc)
|
loc.address = None
|
||||||
|
|
||||||
|
world.push_item(loc, ItemFactory(item_name, player), False)
|
||||||
|
|
||||||
|
region.locations.append(loc)
|
||||||
|
world.dynamic_locations.append(loc)
|
||||||
return loc
|
return loc
|
||||||
|
|
||||||
from Rules import set_rule, add_rule, add_bunny_rule
|
from Rules import set_rule, add_rule, add_bunny_rule
|
||||||
|
|||||||
1
Main.py
1
Main.py
@@ -554,6 +554,7 @@ def copy_world(world):
|
|||||||
from OverworldShuffle import categorize_world_regions
|
from OverworldShuffle import categorize_world_regions
|
||||||
for player in range(1, world.players + 1):
|
for player in range(1, world.players + 1):
|
||||||
categorize_world_regions(ret, player)
|
categorize_world_regions(ret, player)
|
||||||
|
create_farm_locations(ret, player)
|
||||||
set_rules(ret, player)
|
set_rules(ret, player)
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|||||||
Reference in New Issue
Block a user