X-Git-Url: https://plomlompom.com/repos/?p=plomrogue2-experiments;a=blobdiff_plain;f=new%2Fplomrogue%2Fgame.py;h=2e780928cd073d6e23d2248ff30307abfcc2b40e;hp=51bb37271f31bbb6db66787ddc9cbc38025fcd7b;hb=6c37a16df7e55754ca89a9de0aaf49c3c778155e;hpb=599f48bd1d9270cf154e885cf276adb05727507a diff --git a/new/plomrogue/game.py b/new/plomrogue/game.py index 51bb372..2e78092 100755 --- a/new/plomrogue/game.py +++ b/new/plomrogue/game.py @@ -1,9 +1,12 @@ 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_TERRAIN_LINE, cmd_PLAYER_ID, cmd_TURN, - cmd_SWITCH_PLAYER, cmd_SAVE) +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 @@ -36,6 +39,11 @@ 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): + return self.get_thing(self.player_id) def new_thing_id(self): if len(self.things) == 0: @@ -55,30 +63,28 @@ 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 = 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 or not self.player_is_alive: 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 @@ -116,7 +122,10 @@ class Game: '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, 'PLAYER_ID': cmd_PLAYER_ID, 'TURN': cmd_TURN, 'SWITCH_PLAYER': cmd_SWITCH_PLAYER, @@ -140,19 +149,23 @@ class Game: 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))) - self.io.send('PLAYER_INVENTORY %s' % ','.join([str(i) for i in - player.inventory])) - for id_ in player.inventory: + 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])) + else: + self.io.send('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_, @@ -167,7 +180,7 @@ class Game: """ 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() @@ -180,7 +193,9 @@ class Game: return p def cmd_TASK_colon(task_name, game, *args): - game.world.get_player().set_task(task_name, args) + if not game.world.player_is_alive: + raise GameError('You are dead.') + game.world.player.set_task(task_name, args) game.proceed() def cmd_SET_TASK_colon(task_name, game, thing_id, todo, *args):