X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=rogue_chat.py;h=c4a44008c4b20bf78df8148ba38b3bebf2191286;hb=e91c0688ee0d273d7f106e837e1ad52009d79350;hp=18fc91bf2b7a0f707b8b65640054ac1ecfb0ca27;hpb=750eb29e8a84e9846bb6b568745b8de453788f58;p=plomrogue2

diff --git a/rogue_chat.py b/rogue_chat.py
index 18fc91b..c4a4400 100755
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -1,7 +1,5 @@
 #!/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, cmd_THING,
                                 cmd_MAP, cmd_TURN, cmd_MAP_LINE, cmd_GET_ANNOTATION,
                                 cmd_ANNOTATE, cmd_PORTAL, cmd_GET_GAMESTATE,
@@ -9,17 +7,17 @@ from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THIN
                                 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_GOD_THING_NAME, cmd_THING_DOOR_CLOSED,
+                                cmd_GOD_THING_PROTECTION, cmd_THING_PROTECTION,
+                                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, Thing_Furniture
-import sys
+                             Task_DROP, Task_FLATTEN_SURROUNDINGS, Task_DOOR)
+from plomrogue.things import (Thing_Player, Thing_Item, Thing_ItemSpawner,
+                              Thing_SpawnPoint, Thing_SpawnPointSpawner,
+                              Thing_Door, Thing_DoorSpawner)
 
-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)
@@ -39,21 +37,32 @@ 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_PROTECTION)
+game.register_command(cmd_GOD_THING_PROTECTION)
 game.register_command(cmd_THING_NAME)
+game.register_command(cmd_THING_DOOR_CLOSED)
+game.register_command(cmd_GOD_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_task(Task_DOOR)
 game.register_thing_type(Thing_Player)
 game.register_thing_type(Thing_Item)
-game.register_thing_type(Thing_Furniture)
+game.register_thing_type(Thing_ItemSpawner)
+game.register_thing_type(Thing_SpawnPoint)
+game.register_thing_type(Thing_SpawnPointSpawner)
+game.register_thing_type(Thing_Door)
+game.register_thing_type(Thing_DoorSpawner)
 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'])