X-Git-Url: https://plomlompom.com/repos/berlin_corona.txt?a=blobdiff_plain;f=client.py;h=b10ba90d22c6f7931a75ce430e16eb54d81bee58;hb=c88e9e1fffbdf892548fdd69b2ad532c06c17e90;hp=c9958be1637a9fba9891666444995fbffbbd1589;hpb=956b2469d5537f1d0863e5a2811d37fa5220b0f9;p=plomrogue2-experiments

diff --git a/client.py b/client.py
index c9958be..b10ba90 100755
--- a/client.py
+++ b/client.py
@@ -4,42 +4,46 @@ import plom_socket_io
 import socket
 import threading
 from parser import ArgError, Parser
+from game import World
 
 
+class Thing:
+    def __init__(self, id_, position, symbol):
+        self.id_ = id_
+        self.symbol = symbol
+        self.position = position
+
 class Game:
-    turn = 0
+    world = World()
     log_text = ''
-    map_size = (5, 5)
-    terrain_map = ('?'*5+'\n')*4+'?'*5
-    things = []
-
-    class Thing:
-        def __init__(self, position, symbol):
-            self.position = position
-            self.symbol = symbol
 
     def log(self, msg):
         """Prefix msg plus newline to self.log_text."""
         self.log_text = msg + '\n' + self.log_text
 
-    def cmd_THING(self, type_, yx):
-        """Add to self.things at .position yx with .symbol defined by type_."""
+    def cmd_THING_TYPE(self, i, type_):
+        t = self.world.get_thing(i)
         symbol = '?'
-        if type_ == 'TYPE:human':
+        if type_ == 'human':
             symbol = '@'
-        elif type_ == 'TYPE:monster':
+        elif type_ == 'monster':
             symbol = 'm'
-        self.things += [self.Thing(yx, symbol)]
-    cmd_THING.argtypes = 'string yx_tuple:nonneg'
+        t.symbol = symbol
+    cmd_THING_TYPE.argtypes = 'int:nonneg string'
+
+    def cmd_THING_POS(self, i, yx):
+        t = self.world.get_thing(i)
+        t.position = list(yx)
+    cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
+
+    def cmd_THING_POS(self, i, yx):
+        t = self.world.get_thing(i)
+        t.position = list(yx)
+    cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
 
     def cmd_MAP_SIZE(self, yx):
         """Set self.map_size to yx, redraw self.terrain_map as '?' cells."""
-        y, x = yx
-        self.map_size = (y, x)
-        self.terrain_map = ''
-        for y in range(self.map_size[0]):
-            self.terrain_map += '?' * self.map_size[1] + '\n'
-        self.terrain_map = self.terrain_map[:-1]
+        self.world.set_map_size(yx)
     cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
 
     def cmd_TURN_FINISHED(self, n):
@@ -49,20 +53,13 @@ class Game:
 
     def cmd_NEW_TURN(self, n):
         """Set self.turn to n, empty self.things."""
-        self.turn = n
-        self.things = []
+        self.world.turn = n
+        self.world.things = []
     cmd_NEW_TURN.argtypes = 'int:nonneg'
 
-    def cmd_TERRAIN(self, terrain_map):
-        """Reset self.terrain_map from terrain_map."""
-        lines = terrain_map.split('\n')
-        if len(lines) != self.map_size[0]:
-            raise ArgError('wrong map height')
-        for line in lines:
-            if len(line) != self.map_size[1]:
-                raise ArgError('wrong map width')
-        self.terrain_map = terrain_map
-    cmd_TERRAIN.argtypes = 'string'
+    def cmd_TERRAIN_LINE(self, y, terrain_line):
+        self.world.set_map_line(y, terrain_line)
+    cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
 
 
 class WidgetManager:
@@ -81,17 +78,22 @@ class WidgetManager:
 
     def draw_map(self):
         """Draw map view from .game.terrain_map, .game.things."""
-        whole_map = []
-        for c in self.game.terrain_map:
-            whole_map += [c]
-        for t in self.game.things:
-            pos_i = t.position[0] * (self.game.map_size[1] + 1) + t.position[1]
-            whole_map[pos_i] = t.symbol
-        return ''.join(whole_map)
+        map_lines = []
+        map_size = len(self.game.world.terrain_map)
+        start_cut = 0
+        while start_cut < map_size:
+            limit = start_cut + self.game.world.map_size[1]
+            map_lines += [self.game.world.terrain_map[start_cut:limit]]
+            start_cut = limit
+        for t in self.game.world.things:
+            line_as_list = list(map_lines[t.position[0]])
+            line_as_list[t.position[1]] = t.symbol
+            map_lines[t.position[0]] = ''.join(line_as_list)
+        return "\n".join(map_lines)
 
     def update(self):
         """Redraw all non-edit widgets."""
-        self.turn_widget.set_text('TURN: ' + str(self.game.turn))
+        self.turn_widget.set_text('TURN: ' + str(self.game.world.turn))
         self.log_widget.set_text(self.game.log_text)
         self.map_widget.set_text(self.draw_map())