X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fgame.py;h=103d705b90287ed51a1ab32ddeadacfc743b638a;hb=b8feda3f8948c579b086a9b5559849cd585f9929;hp=e8e80c0f1e8785f00771a3700fce11e5fb0a194e;hpb=729e72408fa1c3180275ad3c0e6689143a0f2f38;p=plomrogue2-experiments diff --git a/new/plomrogue/game.py b/new/plomrogue/game.py index e8e80c0..103d705 100755 --- a/new/plomrogue/game.py +++ b/new/plomrogue/game.py @@ -1,15 +1,19 @@ -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, - cmd_THING_INVENTORY, cmd_GET_PICKABLE_ITEMS, - cmd_TERRAIN_LINE, cmd_PLAYER_ID, cmd_TURN, - cmd_SWITCH_PLAYER, cmd_SAVE) +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, + cmd_THING_POS, cmd_THING_INVENTORY, + cmd_THING_HEALTH, + cmd_GET_PICKABLE_ITEMS, + cmd_TERRAIN_LINE, cmd_PLAYER_ID, + cmd_TURN, cmd_SWITCH_PLAYER, cmd_SAVE) from plomrogue.mapping import MapHex 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 +import random @@ -30,6 +34,13 @@ class WorldBase: 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): @@ -37,6 +48,7 @@ class World(WorldBase): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.player_id = 0 + self.player_is_alive = True @property def player(self): @@ -60,28 +72,43 @@ class World(WorldBase): (after incrementing the world turn) all that come before the player; then the player's .proceed() is run, and if it does not finish his task, the loop starts at the beginning. Once - the player's task is finished, the loop breaks. + the player's task is finished, or the player is dead, the loop + breaks. + """ while True: player_i = self.things.index(self.player) for thing in self.things[player_i+1:]: thing.proceed() self.turn += 1 + for pos in self.map_: + if self.map_[pos] == '.' and \ + len(self.things_at_pos(pos)) == 0 and \ + random.random() > 0.999: + self.add_thing_at('food', pos) for thing in self.things[:player_i]: thing.proceed() self.player.proceed(is_AI=False) - if self.player.task is None: + if self.player.task is None or not self.player_is_alive: break + def add_thing_at(self, type_, pos): + t = self.game.thing_types[type_](self) + t.position = pos + self.things += [t] + return t + 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 + def add_thing_at_random(type_): + 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 + return self.add_thing_at(type_, new_pos) self.things = [] random.seed(seed) @@ -93,12 +120,14 @@ class World(WorldBase): continue self.map_[pos] = random.choice(('.', '.', '.', '.', 'x')) - player = add_thing('human') + player = add_thing_at_random('human') self.player_id = player.id_ - add_thing('monster') - add_thing('monster') - add_thing('item') - add_thing('item') + add_thing_at_random('monster') + add_thing_at_random('monster') + add_thing_at_random('food') + add_thing_at_random('food') + add_thing_at_random('food') + add_thing_at_random('food') return 'success' @@ -111,12 +140,14 @@ class Game: 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, 'MAP': cmd_MAP, 'THING_TYPE': cmd_THING_TYPE, 'THING_POS': cmd_THING_POS, + 'THING_HEALTH': cmd_THING_HEALTH, 'THING_INVENTORY': cmd_THING_INVENTORY, 'TERRAIN_LINE': cmd_TERRAIN_LINE, 'GET_PICKABLE_ITEMS': cmd_GET_PICKABLE_ITEMS, @@ -129,7 +160,7 @@ class Game: 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': @@ -151,6 +182,9 @@ class Game: self.io.send('THING_TYPE %s %s' % (thing.id_, thing.type_)) self.io.send('THING_POS %s %s' % (thing.id_, stringify_yx(thing.position))) + if hasattr(thing, 'health'): + self.io.send('THING_HEALTH %s %s' % (thing.id_, + thing.health)) if len(self.world.player.inventory) > 0: self.io.send('PLAYER_INVENTORY %s' % ','.join([str(i) for i in self.world.player.inventory])) @@ -184,6 +218,8 @@ class Game: return p def cmd_TASK_colon(task_name, game, *args): + if not game.world.player_is_alive: + raise GameError('You are dead.') game.world.player.set_task(task_name, args) game.proceed()