Persist Thing names, simplify their client info display.

[plomrogue2] / rogue_chat.py

diff --git a/rogue_chat.py b/rogue_chat.py
index d829e5a66ee212eea127d970925f3861ef1e8093..93dee854977223b0bc9c07ea21b9f2aabf611fd6 100755 (executable)
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -2,13 +2,15 @@
 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, 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)
+                                cmd_GOD_ANNOTATE, cmd_GOD_PORTAL, cmd_THING_TYPES,
+                                cmd_THING_NAME)
+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_Stone
 import sys
 
 if len(sys.argv) != 2:
@@ -17,9 +19,9 @@ if len(sys.argv) != 2:
 savefile = sys.argv[1]
 game = Game(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)
@@ -32,10 +34,17 @@ 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_THING)
+game.register_command(cmd_THING_NAME)
 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_Stone)
 game.read_savefile()
 game.io.start_loop()
 game.io.start_server(8000, PlomWebSocketServer)