-from plomrogue.tasks import Task_WAIT, Task_MOVE
+from plomrogue.tasks import Task_WAIT, Task_MOVE, Task_PICKUP, Task_DROP
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,
from plomrogue.parser import Parser
from plomrogue.io import GameIO
from plomrogue.misc import quote, stringify_yx
-from plomrogue.things import Thing, ThingMonster, ThingHuman
+from plomrogue.things import Thing, ThingMonster, ThingHuman, ThingItem
super().__init__(*args, **kwargs)
self.player_id = 0
+ def new_thing_id(self):
+ if len(self.things) == 0:
+ return 0
+ return self.things[-1].id_ + 1
+
def new_map(self, yx):
self.map_ = self.game.map_type(yx)
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)]
+ self.things += [t]
+ return t
+
+ self.things = []
random.seed(seed)
self.turn = 0
self.new_map(yx)
self.map_[pos] = '#'
continue
self.map_[pos] = random.choice(('.', '.', '.', '.', 'x'))
- player = self.game.thing_types['human'](self, 0)
- player.position = [random.randint(0, yx[0] -1),
- random.randint(0, yx[1] - 1)]
- npc = self.game.thing_types['monster'](self, 1)
- npc.position = [random.randint(0, yx[0] -1),
- random.randint(0, yx[1] -1)]
- self.things = [player, npc]
+
+ player = add_thing('human')
+ self.player_id = player.id_
+ add_thing('monster')
+ add_thing('monster')
+ add_thing('item')
+ add_thing('item')
return 'success'
def __init__(self, game_file_name):
self.io = GameIO(game_file_name, self)
self.map_type = MapHex
- self.tasks = {'WAIT': Task_WAIT, 'MOVE': Task_MOVE}
+ self.tasks = {'WAIT': Task_WAIT,
+ 'MOVE': Task_MOVE,
+ 'PICKUP': Task_PICKUP,
+ 'DROP': Task_DROP}
self.commands = {'GEN_WORLD': cmd_GEN_WORLD,
'GET_GAMESTATE': cmd_GET_GAMESTATE,
'MAP': cmd_MAP,
self.world_type = World
self.world = self.world_type(self)
self.thing_type = Thing
- self.thing_types = {'human': ThingHuman, 'monster': ThingMonster}
+ self.thing_types = {'human': ThingHuman,
+ 'monster': ThingMonster,
+ 'item': ThingItem}
def get_string_options(self, string_option_type):
if string_option_type == 'direction':
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]))
+ else:
+ self.io.send('PLAYER_INVENTORY ,')
+ for id_ in 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_,
+ stringify_yx(thing.position)))
self.io.send('GAME_STATE_COMPLETE')
def proceed(self):