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

Merge branch 'main' of https://github.com/ArchipelagoMW/Archipelago into main

This commit is contained in:
Chris Wilson 2021-09-07 19:22:18 -04:00
parent 6352056528 279ab89a61
commit 14dc450631
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WebHost.py
View File

@ -36,7 +36,11 @@ if __name__ == "__main__":
multiprocessing.freeze_support() multiprocessing.freeze_support()
multiprocessing.set_start_method('spawn') multiprocessing.set_start_method('spawn')
logging.basicConfig(format='[%(asctime)s] %(message)s', level=logging.INFO) logging.basicConfig(format='[%(asctime)s] %(message)s', level=logging.INFO)
update_sprites_lttp() try:
update_sprites_lttp()
except Exception as e:
logging.exception(e)
logging.warning("Could not update LttP sprites.")
app = get_app() app = get_app()
create_options_files() create_options_files()
if app.config["SELFLAUNCH"]: if app.config["SELFLAUNCH"]:

2
docs/network protocol.md
View File

@ -229,7 +229,7 @@ Requests the data package from the server. Does not require client authenticatio
#### Arguments #### Arguments
| Name | Type | Notes | | Name | Type | Notes |
| ------ | ----- | ------ | | ------ | ----- | ------ |
| exlusions | list[str] | Optional. If specified, will not send back the specified data. Such as, ["Factorio"] -> Datapackage without Factorio data.| | exclusions | list[str] | Optional. If specified, will not send back the specified data. Such as, ["Factorio"] -> Datapackage without Factorio data.|
### Bounce ### Bounce
Send this message to the server, tell it which clients should receive the message and Send this message to the server, tell it which clients should receive the message and

3
worlds/ror2/__init__.py
View File

@ -62,7 +62,8 @@ class RiskOfRainWorld(World):
"itemPickupStep": self.world.item_pickup_step[self.player].value, "itemPickupStep": self.world.item_pickup_step[self.player].value,
"seed": "".join(self.world.slot_seeds[self.player].choice(string.digits) for i in range(16)), "seed": "".join(self.world.slot_seeds[self.player].choice(string.digits) for i in range(16)),
"totalLocations": self.world.total_locations[self.player].value, "totalLocations": self.world.total_locations[self.player].value,
"totalRevivals": self.world.total_revivals[self.player].value "totalRevivals": self.world.total_revivals[self.player].value,
"startWithDio": self.world.start_with_revive[self.player].value
} }
def create_item(self, name: str) -> Item: def create_item(self, name: str) -> Item: