home
·
contact
·
privacy
projects
/
plomrogue2-experiments
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
58bc835
)
Refactoring and removal of unused code.
author
Christian Heller
<c.heller@plomlompom.de>
Wed, 12 Dec 2018 00:49:48 +0000
(
01:49
+0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Wed, 12 Dec 2018 00:49:48 +0000
(
01:49
+0100)
client.py
patch
|
blob
|
history
diff --git
a/client.py
b/client.py
index cc0b05c62d340b86e7c77ae96d7cf8307fe8264d..fa5d9c42a82d08f10b98a22f198f0d382fa79b3d 100755
(executable)
--- a/
client.py
+++ b/
client.py
@@
-7,12
+7,6
@@
from parser import ArgError, Parser
from game_common import World
from game_common import World
-class Thing:
- def __init__(self, id_, position, symbol):
- self.id_ = id_
- self.symbol = symbol
- self.position = position
-
class Game:
world = World()
log_text = ''
class Game:
world = World()
log_text = ''
@@
-21,14
+15,26
@@
class Game:
"""Prefix msg plus newline to self.log_text."""
self.log_text = msg + '\n' + self.log_text
"""Prefix msg plus newline to self.log_text."""
self.log_text = msg + '\n' + self.log_text
- def cmd_THING_TYPE(self, i, type_):
- t = self.world.get_thing(i)
+ def symbol_for_type(self, type_):
symbol = '?'
if type_ == 'human':
symbol = '@'
elif type_ == 'monster':
symbol = 'm'
symbol = '?'
if type_ == 'human':
symbol = '@'
elif type_ == 'monster':
symbol = 'm'
- t.symbol = symbol
+ return symbol
+
+ def cmd_MAP_SIZE(self, yx):
+ """Set self.map_size to yx, redraw self.terrain_map as '?' cells."""
+ self.world.set_map_size(yx)
+ cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
+
+ def cmd_TERRAIN_LINE(self, y, terrain_line):
+ self.world.set_map_line(y, terrain_line)
+ cmd_TERRAIN_LINE.argtypes = 'int:nonneg string'
+
+ def cmd_THING_TYPE(self, i, type_):
+ t = self.world.get_thing(i)
+ t.type_ = type_
cmd_THING_TYPE.argtypes = 'int:nonneg string'
def cmd_THING_POS(self, i, yx):
cmd_THING_TYPE.argtypes = 'int:nonneg string'
def cmd_THING_POS(self, i, yx):
@@
-36,11
+42,6
@@
class Game:
t.position = list(yx)
cmd_THING_POS.argtypes = 'int:nonneg yx_tuple:nonneg'
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."""
- self.world.set_map_size(yx)
- cmd_MAP_SIZE.argtypes = 'yx_tuple:nonneg'
-
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
@@
-52,10
+53,6
@@
class Game:
self.world.things = []
cmd_NEW_TURN.argtypes = 'int:nonneg'
self.world.things = []
cmd_NEW_TURN.argtypes = 'int:nonneg'
- 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:
class WidgetManager:
@@
-82,7
+79,7
@@
class WidgetManager:
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]])
- line_as_list[t.position[1]] =
t.symbol
+ line_as_list[t.position[1]] =
self.game.symbol_for_type(t.type_)
map_lines[t.position[0]] = ''.join(line_as_list)
return "\n".join(map_lines)
map_lines[t.position[0]] = ''.join(line_as_list)
return "\n".join(map_lines)