X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=rogue_chat.py;h=f4bc7cdeafba10a6cba5e87ae7459c41a455dd25;hb=7385c037c0acb54c06fc7919b5b85548c09f8d65;hp=4a9c56f923ead32b655da4811a1bd94ba2e7a051;hpb=e67306357a830cabdd5ce86b2b333499d99da325;p=plomrogue2

diff --git a/rogue_chat.py b/rogue_chat.py
index 4a9c56f..f4bc7cd 100755
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -1,21 +1,19 @@
 #!/usr/bin/env python3
 from plomrogue.game import Game
-from plomrogue.io_websocket import PlomWebSocketServer
-from plomrogue.io_tcp import PlomTCPServer
-from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING,
+from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THING,
                                 cmd_MAP, cmd_TURN, cmd_MAP_LINE, cmd_GET_ANNOTATION,
                                 cmd_ANNOTATE, cmd_PORTAL, cmd_GET_GAMESTATE,
                                 cmd_TASKS, cmd_MAP_CONTROL_LINE, cmd_MAP_CONTROL_PW,
-                                cmd_GOD_ANNOTATE, cmd_GOD_PORTAL)
-from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE,
-                             Task_FLATTEN_SURROUNDINGS)
-import sys
+                                cmd_GOD_ANNOTATE, cmd_GOD_PORTAL, cmd_THING_TYPES,
+                                cmd_THING_NAME, cmd_TERRAINS, cmd_ADMIN_PASSWORD,
+                                cmd_BECOME_ADMIN, cmd_SET_TILE_CONTROL,
+                                cmd_SET_MAP_CONTROL_PASSWORD, cmd_SPAWN_POINT)
+from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_PICK_UP,
+                             Task_DROP, Task_FLATTEN_SURROUNDINGS)
+from plomrogue.things import Thing_Player, Thing_Item
 
-if len(sys.argv) != 2:
-    print('wrong number of arguments, expected one (save file)')
-    exit(1)
-savefile = sys.argv[1]
-game = Game(savefile)
+from plomrogue.config import config
+game = Game(config['savefile'])
 game.register_command(cmd_PING)
 game.register_command(cmd_ALL)
 game.register_command(cmd_LOGIN)
@@ -32,11 +30,25 @@ game.register_command(cmd_GOD_ANNOTATE)
 game.register_command(cmd_GOD_PORTAL)
 game.register_command(cmd_GET_GAMESTATE)
 game.register_command(cmd_TASKS)
+game.register_command(cmd_THING_TYPES)
+game.register_command(cmd_TERRAINS)
+game.register_command(cmd_THING)
+game.register_command(cmd_THING_NAME)
+game.register_command(cmd_ADMIN_PASSWORD)
+game.register_command(cmd_SET_TILE_CONTROL)
+game.register_command(cmd_SET_MAP_CONTROL_PASSWORD)
+game.register_command(cmd_BECOME_ADMIN)
+game.register_command(cmd_SPAWN_POINT)
 game.register_task(Task_WAIT)
 game.register_task(Task_MOVE)
 game.register_task(Task_WRITE)
 game.register_task(Task_FLATTEN_SURROUNDINGS)
+game.register_task(Task_PICK_UP)
+game.register_task(Task_DROP)
+game.register_thing_type(Thing_Player)
+game.register_thing_type(Thing_Item)
 game.read_savefile()
 game.io.start_loop()
-game.io.start_server(8000, PlomWebSocketServer)
-game.io.start_server(5000, PlomTCPServer)
+for port in config['servers']:
+    game.io.start_server(port, config['servers'][port],
+                         config['certfile'], config['keyfile'])