X-Git-Url: https://plomlompom.com/repos/?p=plomrogue2-experiments;a=blobdiff_plain;f=new%2Fplomrogue%2Fgame.py;h=eda54ae6db68a2ace43c7def87bea8b1f73a09f7;hp=25cb3e74fa72b5693c167af0fcee31a14eab2fcf;hb=298e8d0b4c7529ee4ad35005ad9bb9295def1086;hpb=073618f45f297b21e90390be06cafcd430cd4d62 diff --git a/new/plomrogue/game.py b/new/plomrogue/game.py index 25cb3e7..eda54ae 100755 --- a/new/plomrogue/game.py +++ b/new/plomrogue/game.py @@ -13,6 +13,7 @@ from plomrogue.parser import Parser from plomrogue.io import GameIO from plomrogue.misc import quote, stringify_yx from plomrogue.things import Thing, ThingMonster, ThingHuman, ThingFood +import random @@ -33,6 +34,13 @@ class WorldBase: return t return None + def things_at_pos(self, pos): + things = [] + for t in self.things: + if t.position == pos: + things += [t] + return things + class World(WorldBase): @@ -41,6 +49,7 @@ class World(WorldBase): super().__init__(*args, **kwargs) self.player_id = 0 self.player_is_alive = True + self.maps = {} @property def player(self): @@ -51,8 +60,8 @@ class World(WorldBase): return 0 return self.things[-1].id_ + 1 - def new_map(self, yx): - self.map_ = self.game.map_type(yx) + def new_map(self, map_pos, size): + self.maps[map_pos] = self.game.map_type(size) def proceed_to_next_player_turn(self): """Run game world turns until player can decide their next step. @@ -73,40 +82,65 @@ class World(WorldBase): for thing in self.things[player_i+1:]: thing.proceed() self.turn += 1 + for pos in self.maps[(0,0)]: + if self.maps[(0,0)][pos] == '.' and \ + len(self.things_at_pos(((0,0), pos))) == 0 and \ + random.random() > 0.999: + self.add_thing_at('food', ((0,0), pos)) for thing in self.things[:player_i]: thing.proceed() self.player.proceed(is_AI=False) 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 = ((0,0), + (random.randint(0, yx[0] -1), + random.randint(0, yx[1] -1))) + if self.maps[new_pos[0]][new_pos[1]] != '.': + continue + if len(self.things_at_pos(new_pos)) > 0: + continue + return self.add_thing_at(type_, new_pos) self.things = [] random.seed(seed) self.turn = 0 - self.new_map(yx) - for pos in self.map_: - if 0 in pos or (yx[0] - 1) == pos[0] or (yx[1] - 1) == pos[1]: - self.map_[pos] = '#' - continue - self.map_[pos] = random.choice(('.', '.', '.', '.', 'x')) - - player = add_thing('human') + self.maps = {} + self.new_map((0,0), yx) + self.new_map((0,1), yx) + self.new_map((1,1), yx) + self.new_map((1,0), yx) + self.new_map((1,-1), yx) + self.new_map((0,-1), yx) + self.new_map((-1,-1), yx) + self.new_map((-1,0), yx) + self.new_map((-1,1), yx) + for map_pos in self.maps: + map_ = self.maps[map_pos] + if (0,0) == map_pos: + for pos in map_: + map_[pos] = random.choice(('.', '.', '.', '.', 'x')) + else: + for pos in map_: + map_[pos] = '~' + player = add_thing_at_random('human') self.player_id = player.id_ - add_thing('monster') - add_thing('monster') - add_thing('food') - add_thing('food') - add_thing('food') - add_thing('food') + 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' @@ -143,7 +177,7 @@ class Game: def get_string_options(self, string_option_type): if string_option_type == 'direction': - return self.world.map_.get_directions() + return self.world.maps[(0,0)].get_directions() elif string_option_type == 'thingtype': return list(self.thing_types.keys()) return None @@ -152,15 +186,18 @@ class Game: """Send out game state data relevant to clients.""" self.io.send('TURN ' + str(self.world.turn)) - self.io.send('MAP ' + stringify_yx(self.world.map_.size)) visible_map = self.world.player.get_visible_map() + self.io.send('MAP ' + stringify_yx([0,0]) + ' ' + stringify_yx(visible_map.size)) for y, line in visible_map.lines(): self.io.send('VISIBLE_MAP_LINE %5s %s' % (y, quote(line))) - visible_things = self.world.player.get_visible_things() + visible_things, offset = self.world.player.get_visible_things() for thing in visible_things: + offset_pos = (thing.position[1][0] - offset[0], + thing.position[1][1] - offset[1]) 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('THING_POS %s %s %s' % (thing.id_, + stringify_yx(thing.position[0]), + stringify_yx(offset_pos))) if hasattr(thing, 'health'): self.io.send('THING_HEALTH %s %s' % (thing.id_, thing.health)) @@ -172,8 +209,9 @@ class Game: 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_, - stringify_yx(thing.position))) + self.io.send('THING_POS %s %s %s' % (thing.id_, + stringify_yx(thing.position[0]), + stringify_yx(thing.position[1]))) self.io.send('GAME_STATE_COMPLETE') def proceed(self):