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

Fixed missed lines in commit

This commit is contained in:
pepperpow 2020-12-15 17:19:04 -06:00
parent 767c84a581
commit c5ced75983
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ItemPool.py
View File

@ -470,11 +470,7 @@ def create_dynamic_shop_locations(world, player):
if item is None: if item is None:
continue continue
if item['create_location']: if item['create_location']:
<<<<<<< HEAD
loc = Location(player, "{} Slot Item {}".format(shop.region.name, i+1), parent=shop.region)
=======
loc = Location(player, "{} Shop Slot {}".format(shop.region.name, i+1), parent=shop.region) loc = Location(player, "{} Shop Slot {}".format(shop.region.name, i+1), parent=shop.region)
>>>>>>> ffe5b4b1a1d806c09a1be91a283dd3a6cdbcaafa
shop.region.locations.append(loc) shop.region.locations.append(loc)
world.dynamic_locations.append(loc) world.dynamic_locations.append(loc)

8
host.yaml
View File

@ -13,13 +13,13 @@ general_options:
# Null means nothing, for the server this means to default the value # Null means nothing, for the server this means to default the value
# These overwrite command line arguments! # These overwrite command line arguments!
server_options: server_options:
host: 0.0.0.0 host: null
port: 38281 port: 38281
password: null password: null
multidata: null multidata: null
savefile: null savefile: null
disable_save: false disable_save: false
loglevel: "debug" loglevel: "info"
# Allows for clients to log on and manage the server. If this is null, no remote administration is possible. # Allows for clients to log on and manage the server. If this is null, no remote administration is possible.
server_password: null server_password: null
# Automatically forward the port that is used, then close that port after 24 hours # Automatically forward the port that is used, then close that port after 24 hours
@ -28,9 +28,9 @@ server_options:
disable_item_cheat: false disable_item_cheat: false
# Client hint system # Client hint system
# Points given to a player for each acquired item in their world # Points given to a player for each acquired item in their world
location_check_points: 50 location_check_points: 1
# Point cost to receive a hint via !hint for players # Point cost to receive a hint via !hint for players
hint_cost: 0 # Set to 0 if you want free hints hint_cost: 1000 # Set to 0 if you want free hints
# Forfeit modes # Forfeit modes
# "disabled" -> clients can't forfeit, # "disabled" -> clients can't forfeit,
# "enabled" -> clients can always forfeit # "enabled" -> clients can always forfeit