Register game commands and tasks outside of game module.

[plomrogue2-experiments] / server.py

diff --git a/server.py b/server.py
index 9ba6d6fe24fdbf87cec3df148f281e24bc51ff5b..cb9150b8d6e05a00993f6c4073057db350d8f8bc 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -2,14 +2,13 @@
 import sys
 import os
 import server_.game
-import server_.io
 
 
 if len(sys.argv) != 2:
     print('wrong number of arguments, expected one (game file)')
     exit(1)
 game_file_name = sys.argv[1]
-command_handler = server_.game.CommandHandler(game_file_name)
+game = server_.game.Game(game_file_name)
 if os.path.exists(game_file_name):
     if not os.path.isfile(game_file_name):
         print('game file name does not refer to a valid game file')
@@ -18,19 +17,8 @@ if os.path.exists(game_file_name):
             lines = f.readlines()
         for i in range(len(lines)):
             line = lines[i]
-            print("FILE INPUT LINE %s: %s" % (i, line), end='')
-            command_handler.handle_input(line, store=False)
+            print("FILE INPUT LINE %5s: %s" % (i, line), end='')
+            game.io.handle_input(line, store=False)
 else:
-    command_handler.handle_input('MAP_SIZE Y:5,X:5')
-    command_handler.handle_input('TERRAIN_LINE 0 "xxxxx"')
-    command_handler.handle_input('TERRAIN_LINE 1 "x...x"')
-    command_handler.handle_input('TERRAIN_LINE 2 "x.X.x"')
-    command_handler.handle_input('TERRAIN_LINE 3 "x...x"')
-    command_handler.handle_input('TERRAIN_LINE 4 "xxxxx"')
-    command_handler.handle_input('THING_TYPE 0 human')
-    command_handler.handle_input('THING_POS 0 Y:3,X:3')
-    command_handler.handle_input('THING_TYPE 1 monster')
-    command_handler.handle_input('THING_POS 1 Y:1,X:1')
-
-
-server_.io.run_server_with_io_loop(command_handler)
+    game.io.handle_input('GEN_WORLD Hex Y:16,X:16 bar')
+game.io.run_loop_with_server()