from plomrogue.errors import ArgError
from plomrogue.commands import (cmd_GEN_WORLD, cmd_GET_GAMESTATE, cmd_MAP,
cmd_MAP, cmd_THING_TYPE, cmd_THING_POS,
+ cmd_THING_INVENTORY,
cmd_TERRAIN_LINE, cmd_PLAYER_ID, cmd_TURN,
cmd_SWITCH_PLAYER, cmd_SAVE)
from plomrogue.mapping import MapHex
super().__init__(*args, **kwargs)
self.player_id = 0
+ @property
+ def player(self):
+ return self.get_thing(self.player_id)
+
def new_thing_id(self):
if len(self.things) == 0:
return 0
the player's task is finished, the loop breaks.
"""
while True:
- player = self.get_player()
- player_i = self.things.index(player)
+ player_i = self.things.index(self.player)
for thing in self.things[player_i+1:]:
thing.proceed()
self.turn += 1
for thing in self.things[:player_i]:
thing.proceed()
- player.proceed(is_AI=False)
- if player.task is None:
+ self.player.proceed(is_AI=False)
+ if self.player.task is None:
break
- def get_player(self):
- return self.get_thing(self.player_id)
-
def make_new(self, yx, seed):
import random
def add_thing(type_):
t = self.game.thing_types[type_](self)
- t.position = [random.randint(0, yx[0] -1),
- random.randint(0, yx[1] - 1)]
+ t.position = (random.randint(0, yx[0] -1),
+ random.randint(0, yx[1] - 1))
self.things += [t]
return t
'MAP': cmd_MAP,
'THING_TYPE': cmd_THING_TYPE,
'THING_POS': cmd_THING_POS,
+ 'THING_INVENTORY': cmd_THING_INVENTORY,
'TERRAIN_LINE': cmd_TERRAIN_LINE,
'PLAYER_ID': cmd_PLAYER_ID,
'TURN': cmd_TURN,
self.io.send('TURN ' + str(self.world.turn))
self.io.send('MAP ' + stringify_yx(self.world.map_.size))
- visible_map = self.world.get_player().get_visible_map()
+ visible_map = self.world.player.get_visible_map()
for y, line in visible_map.lines():
self.io.send('VISIBLE_MAP_LINE %5s %s' % (y, quote(line)))
- visible_things = self.world.get_player().get_visible_things()
+ visible_things = self.world.player.get_visible_things()
for thing in visible_things:
self.io.send('THING_TYPE %s %s' % (thing.id_, thing.type_))
self.io.send('THING_POS %s %s' % (thing.id_,
stringify_yx(thing.position)))
- player = self.world.get_player()
- self.io.send('PLAYER_POS %s' % (stringify_yx(player.position)))
- if len(player.inventory) > 0:
- self.io.send('PLAYER_INVENTORY %s' % ','.join([str(i) for i in
- player.inventory]))
+ if len(self.world.player.inventory) > 0:
+ self.io.send('PLAYER_INVENTORY %s' %
+ ','.join([str(i) for i in self.world.player.inventory]))
else:
self.io.send('PLAYER_INVENTORY ,')
- for id_ in player.inventory:
+ for id_ in self.world.player.inventory:
thing = self.world.get_thing(id_)
self.io.send('THING_TYPE %s %s' % (thing.id_, thing.type_))
self.io.send('THING_POS %s %s' % (thing.id_,
"""
self.io.send('TURN_FINISHED ' + str(self.world.turn))
self.world.proceed_to_next_player_turn()
- msg = str(self.world.get_player()._last_task_result)
+ msg = str(self.world.player._last_task_result)
self.io.send('LAST_PLAYER_TASK_RESULT ' + quote(msg))
self.send_gamestate()
return p
def cmd_TASK_colon(task_name, game, *args):
- game.world.get_player().set_task(task_name, args)
+ game.world.player.set_task(task_name, args)
game.proceed()
def cmd_SET_TASK_colon(task_name, game, thing_id, todo, *args):