home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve Map class design.
[plomrogue2-experiments]
/
client.py
diff --git
a/client.py
b/client.py
index 0a25e4513bd0687b5731651b40de51bb585ec125..07d59c235c5a2b21f9b3ff7ba90c6f29b75a86e2 100755
(executable)
--- a/
client.py
+++ b/
client.py
@@
-4,10
+4,10
@@
import plom_socket_io
import socket
import threading
from parser import ArgError, Parser
import socket
import threading
from parser import ArgError, Parser
-from game_common import World, Comm
ander
+from game_common import World, Comm
onCommandsMixin
-class Game(Comm
ander
):
+class Game(Comm
onCommandsMixin
):
world = World()
log_text = ''
world = World()
log_text = ''
@@
-23,6
+23,11
@@
class Game(Commander):
symbol = 'm'
return symbol
symbol = 'm'
return symbol
+ def cmd_LAST_PLAYER_TASK_RESULT(self, msg):
+ if msg != "success":
+ self.log_text = msg + '\n' + self.log_text
+ cmd_LAST_PLAYER_TASK_RESULT.argtypes = 'string'
+
def cmd_TURN_FINISHED(self, n):
"""Do nothing. (This may be extended later.)"""
pass
def cmd_TURN_FINISHED(self, n):
"""Do nothing. (This may be extended later.)"""
pass
@@
-34,6
+39,10
@@
class Game(Commander):
self.world.things = []
cmd_NEW_TURN.argtypes = 'int:nonneg'
self.world.things = []
cmd_NEW_TURN.argtypes = 'int:nonneg'
+ def cmd_VISIBLE_MAP_LINE(self, y, terrain_line):
+ self.world.map_.set_line(y, terrain_line)
+ cmd_VISIBLE_MAP_LINE.argtypes = 'int:nonneg string'
+
class WidgetManager:
class WidgetManager:
@@
-50,13
+59,13
@@
class WidgetManager:
self.top = urwid.Filler(widget_pile, valign='top')
def draw_map(self):
self.top = urwid.Filler(widget_pile, valign='top')
def draw_map(self):
- """Draw map view from .game.
terrain_map
, .game.things."""
+ """Draw map view from .game.
map_.terrain
, .game.things."""
map_lines = []
map_lines = []
- map_size = len(self.game.world.
terrain_map
)
+ map_size = len(self.game.world.
map_.terrain
)
start_cut = 0
while start_cut < map_size:
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]]
+ limit = start_cut + self.game.world.map_
.
size[1]
+ map_lines += [self.game.world.
map_.terrain
[start_cut:limit]]
start_cut = limit
for t in self.game.world.things:
line_as_list = list(map_lines[t.position[0]])
start_cut = limit
for t in self.game.world.things:
line_as_list = list(map_lines[t.position[0]])