X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=rogue_chat.py;h=5c5e657d149faae4625bce198e8a6cc1f12527db;hb=e6a3ab3471ae5a2be10bd64d694eef462d7f7cf6;hp=18fc91bf2b7a0f707b8b65640054ac1ecfb0ca27;hpb=750eb29e8a84e9846bb6b568745b8de453788f58;p=plomrogue2
diff --git a/rogue_chat.py b/rogue_chat.py
index 18fc91b..5c5e657 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,15 @@ 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_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
+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)
@@ -39,11 +35,15 @@ 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_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)
@@ -52,8 +52,8 @@ game.register_task(Task_PICK_UP)
game.register_task(Task_DROP)
game.register_thing_type(Thing_Player)
game.register_thing_type(Thing_Item)
-game.register_thing_type(Thing_Furniture)
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'])