-from plomrogue.tasks import Task_WAIT, Task_MOVE, Task_PICKUP, Task_DROP
+from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_PICKUP,
+ Task_DROP, Task_EAT)
from plomrogue.errors import ArgError, GameError
from plomrogue.commands import (cmd_GEN_WORLD, cmd_GET_GAMESTATE,
cmd_MAP, cmd_MAP, cmd_THING_TYPE,
from plomrogue.parser import Parser
from plomrogue.io import GameIO
from plomrogue.misc import quote, stringify_yx
-from plomrogue.things import Thing, ThingMonster, ThingHuman, ThingItem
+from plomrogue.things import Thing, ThingMonster, ThingHuman, ThingFood
return t
return None
+ def things_at_pos(self, yx):
+ things = []
+ for t in self.things:
+ if t.position == yx:
+ things += [t]
+ return things
+
class World(WorldBase):
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))
+ while True:
+ new_pos = (random.randint(0, yx[0] -1),
+ random.randint(0, yx[1] - 1))
+ if self.map_[new_pos] != '.':
+ continue
+ if len(self.things_at_pos(new_pos)) > 0:
+ continue
+ break
+ t.position = new_pos
self.things += [t]
return t
self.player_id = player.id_
add_thing('monster')
add_thing('monster')
- add_thing('item')
- add_thing('item')
+ add_thing('food')
+ add_thing('food')
+ add_thing('food')
+ add_thing('food')
return 'success'
self.tasks = {'WAIT': Task_WAIT,
'MOVE': Task_MOVE,
'PICKUP': Task_PICKUP,
+ 'EAT': Task_EAT,
'DROP': Task_DROP}
self.commands = {'GEN_WORLD': cmd_GEN_WORLD,
'GET_GAMESTATE': cmd_GET_GAMESTATE,
self.thing_type = Thing
self.thing_types = {'human': ThingHuman,
'monster': ThingMonster,
- 'item': ThingItem}
+ 'food': ThingFood}
def get_string_options(self, string_option_type):
if string_option_type == 'direction':