Refactor.

[plomrogue2-experiments] / server_ / game.py

diff --git a/server_/game.py b/server_/game.py
index f9492896102895738b6705cec7bded3c9fb87ba9..148c5c7c8fd9db3909df52eea4213ce6284476df 100644 (file)
--- a/server_/game.py
+++ b/server_/game.py
@@ -1,3 +1,8 @@
+import sys
+sys.path.append('../')
+import game_common
+
+
 class GameError(Exception):
     pass
 
@@ -13,18 +18,12 @@ def move_pos(direction, pos_yx):
         pos_yx[1] -= 1
 
 
-class World:
+class World(game_common.World):
 
     def __init__(self):
-        self.turn = 0
-        self.map_size = (0, 0)
-        self.map_ = ''
-        self.things = []
-#            Thing(self, 'human', [3, 3]),
-#            Thing(self, 'monster', [1, 1])
-#        ]
+        super().__init__()
+        self.Thing = Thing  # use local Thing class instead of game_common's
         self.player_id = 0
-#        self.player = self.things[self.player_i]
 
     def proceed_to_next_player_turn(self):
         """Run game world turns until player can decide their next step.
@@ -39,40 +38,19 @@ class World:
         the player's task is finished, the loop breaks.
         """
         while True:
-            for thing in self.things[self.player_id+1:]:
+            player = self.get_player()
+            player_i = self.things.index(player)
+            for thing in self.things[player_i+1:]:
                 thing.proceed()
             self.turn += 1
-            for thing in self.things[:self.player_id]:
+            for thing in self.things[:player_i]:
                 thing.proceed()
-            player = self.get_thing(self.player_id)
             player.proceed(is_AI=False)
             if player.task is None:
                 break
 
-    def set_map_size(self, yx):
-        y, x = yx
-        self.map_size = (y, x)
-        self.map_ = ''
-        for y in range(self.map_size[0]):
-            self.map_ += '?' * self.map_size[1]
-
-    def set_map_line(self, y, line):
-        width_map = self.map_size[1]
-        if y >= self.map_size[0]:
-            raise ArgError('too large row number %s' % y)
-        width_line = len(line)
-        if width_line > width_map:
-            raise ArgError('too large map line width %s' % width_line)
-        self.map_ = self.map_[:y * width_map] + line + \
-                    self.map_[(y + 1) * width_map:]
-
-    def get_thing(self, i):
-        for thing in self.things:
-            if i == thing.id_:
-                return thing
-        t = Thing(self, i, '?', [0,0])
-        self.things += [t]
-        return t
+    def get_player(self):
+        return self.get_thing(self.player_id)
 
 
 class Task:
@@ -97,18 +75,15 @@ class Task:
                test_pos[1] >= self.thing.world.map_size[1]:
                 raise GameError('would move outside map bounds')
             pos_i = test_pos[0] * self.thing.world.map_size[1] + test_pos[1]
-            map_tile = self.thing.world.map_[pos_i]
+            map_tile = self.thing.world.terrain_map[pos_i]
             if map_tile != '.':
                 raise GameError('would move into illegal terrain')
 
 
-class Thing:
+class Thing(game_common.Thing):
 
-    def __init__(self, world, id_, type_, position):
-        self.world = world
-        self.id_ = id_
-        self.type_ = type_
-        self.position = position
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
         self.task = Task(self, 'wait')
 
     def task_wait(self):