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

Network: remove "SlotAlreadyTaken" from docs and clients, as it was removed from the server in 0.2

This commit is contained in:
Fabian Dill 2022-05-24 05:22:52 +02:00 committed by KonoTyran
parent c661da57d8
commit e8be80ccd7
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CommonClient.py
View File

@ -347,7 +347,7 @@ class CommonContext():
} }
}]) }])
async def update_death_link(self, death_link): async def update_death_link(self, death_link: bool):
old_tags = self.tags.copy() old_tags = self.tags.copy()
if death_link: if death_link:
self.tags.add("DeathLink") self.tags.add("DeathLink")
@ -496,8 +496,6 @@ async def process_server_cmd(ctx: CommonContext, args: dict):
ctx.event_invalid_slot() ctx.event_invalid_slot()
elif 'InvalidGame' in errors: elif 'InvalidGame' in errors:
ctx.event_invalid_game() ctx.event_invalid_game()
elif 'SlotAlreadyTaken' in errors:
raise Exception('Player slot already in use for that team')
elif 'IncompatibleVersion' in errors: elif 'IncompatibleVersion' in errors:
raise Exception('Server reported your client version as incompatible') raise Exception('Server reported your client version as incompatible')
elif 'InvalidItemsHandling' in errors: elif 'InvalidItemsHandling' in errors:
@ -670,7 +668,9 @@ if __name__ == '__main__':
if args.url: if args.url:
url = urllib.parse.urlparse(args.url) url = urllib.parse.urlparse(args.url)
args.connect = url.netloc args.connect = url.netloc
if url.username:
args.name = urllib.parse.unquote(url.username) args.name = urllib.parse.unquote(url.username)
if url.password:
args.password = urllib.parse.unquote(url.password) args.password = urllib.parse.unquote(url.password)
colorama.init() colorama.init()

1
FactorioClient.py
View File

@ -5,7 +5,6 @@ import json
import string import string
import copy import copy
import subprocess import subprocess
import sys
import time import time
import random import random

3
docs/network protocol.md
View File

@ -101,11 +101,10 @@ Sent to clients when the server refuses connection. This is sent during the init
#### Arguments #### Arguments
| Name | Type | Notes | | Name | Type | Notes |
| ---- | ---- | ----- | | ---- | ---- | ----- |
| errors | list\[str\] | Optional. When provided, should contain any one of: `InvalidSlot`, `InvalidGame`, `SlotAlreadyTaken`, `IncompatibleVersion`, `InvalidPassword`, or `InvalidItemsHandling`. | | errors | list\[str\] | Optional. When provided, should contain any one of: `InvalidSlot`, `InvalidGame`, `IncompatibleVersion`, `InvalidPassword`, or `InvalidItemsHandling`. |
InvalidSlot indicates that the sent 'name' field did not match any auth entry on the server. InvalidSlot indicates that the sent 'name' field did not match any auth entry on the server.
InvalidGame indicates that a correctly named slot was found, but the game for it mismatched. InvalidGame indicates that a correctly named slot was found, but the game for it mismatched.
SlotAlreadyTaken indicates a connection with a different uuid is already established.
IncompatibleVersion indicates a version mismatch. IncompatibleVersion indicates a version mismatch.
InvalidPassword indicates the wrong, or no password when it was required, was sent. InvalidPassword indicates the wrong, or no password when it was required, was sent.
InvalidItemsHandling indicates a wrong value type or flag combination was sent. InvalidItemsHandling indicates a wrong value type or flag combination was sent.

1
worlds/meritous/docs/setup_en.md
View File

@ -58,7 +58,6 @@ More in-depth information about the game can be found in the game's help file, a
- `Disconnected`: If the game does not reconnect automatically, you may need to save, quit, and reload the game to reconnect. Keep in mind that the game does not auto-save, and it is only possible to save the game at Save Tiles. - `Disconnected`: If the game does not reconnect automatically, you may need to save, quit, and reload the game to reconnect. Keep in mind that the game does not auto-save, and it is only possible to save the game at Save Tiles.
- `InvalidSlot`, `InvalidGame`: Make sure the `slotname` in `meritous-ap.json` matches the name provided in your Meritous YAML file. - `InvalidSlot`, `InvalidGame`: Make sure the `slotname` in `meritous-ap.json` matches the name provided in your Meritous YAML file.
- `SlotAlreadyTaken`: Make sure Meritous Gaiden is not already running and connected to the server.
- `IncompatibleVersion`: Make sure Meritous Gaiden has been updated to the latest version. - `IncompatibleVersion`: Make sure Meritous Gaiden has been updated to the latest version.
- `InvalidPassword`: Make sure the `password` in `meritous-ap.json` matches the password for your game. If there is no password, either set this to `null` (no quotes) or omit/remove it completely. - `InvalidPassword`: Make sure the `password` in `meritous-ap.json` matches the password for your game. If there is no password, either set this to `null` (no quotes) or omit/remove it completely.
- `InvalidItemsHandling`: This is a bug and shouldn't happen if you downloaded a precompiled copy of the game. If you downloaded a precompiled copy, please let KewlioMZX know over GitHub or the AP Discord. - `InvalidItemsHandling`: This is a bug and shouldn't happen if you downloaded a precompiled copy of the game. If you downloaded a precompiled copy, please let KewlioMZX know over GitHub or the AP Discord.