X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=rogue_chat.py;h=3ace6307ed4b777764c3d099983d96cb0f4dab61;hb=904563ed3077b2ce6cc884c8e1f66b68a0d292b5;hp=d2e41177049c8ed6371e79b3d8ec75169796d430;hpb=8c5624db0c2b463a490a425fc0f8baf2761d7d23;p=plomrogue2
diff --git a/rogue_chat.py b/rogue_chat.py
index d2e4117..3ace630 100755
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -1,37 +1,63 @@
#!/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_QUERY, 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)
-from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE,
- Task_FLATTEN_SURROUNDINGS)
-import sys
+ cmd_TASKS, cmd_MAP_CONTROL_LINE, cmd_MAP_CONTROL_PW,
+ 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_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_ItemSpawner,
+ Thing_SpawnPoint, Thing_SpawnPointSpawner)
-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)
game.register_command(cmd_NICK)
-game.register_command(cmd_QUERY)
game.register_command(cmd_TURN)
game.register_command(cmd_MAP)
game.register_command(cmd_MAP_LINE)
+game.register_command(cmd_MAP_CONTROL_LINE)
+game.register_command(cmd_MAP_CONTROL_PW)
game.register_command(cmd_GET_ANNOTATION)
game.register_command(cmd_ANNOTATE)
game.register_command(cmd_PORTAL)
+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_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)
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.register_thing_type(Thing_ItemSpawner)
+game.register_thing_type(Thing_SpawnPoint)
+game.register_thing_type(Thing_SpawnPointSpawner)
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'])