X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=new%2Fplomrogue%2Fgame.py;h=d1c9c665ffb18649f5819831ef2193e48a0b3cdf;hb=796f6c0c96e3ad88ced605609fff540b280fbf81;hp=f86383d552ba2daa9b73eb4989af439b399a95cf;hpb=be4473640666bbdb9e7c002945699ed54a2546ed;p=plomrogue2-experiments diff --git a/new/plomrogue/game.py b/new/plomrogue/game.py index f86383d..d1c9c66 100755 --- a/new/plomrogue/game.py +++ b/new/plomrogue/game.py @@ -4,19 +4,36 @@ 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_THING_HEALTH, cmd_SEED, + cmd_GET_PICKABLE_ITEMS, cmd_MAP_SIZE, cmd_TERRAIN_LINE, cmd_PLAYER_ID, cmd_TURN, cmd_SWITCH_PLAYER, cmd_SAVE) -from plomrogue.mapping import MapHex +from plomrogue.mapping import MapHex, YX from plomrogue.parser import Parser from plomrogue.io import GameIO -from plomrogue.misc import quote, stringify_yx +from plomrogue.misc import quote from plomrogue.things import Thing, ThingMonster, ThingHuman, ThingFood import random +class PRNGod(random.Random): + + def seed(self, seed): + self.prngod_seed = seed + + def getstate(self): + return self.prngod_seed + + def setstate(seed): + self.seed(seed) + + def random(self): + self.prngod_seed = ((self.prngod_seed * 1103515245) + 12345) % 2**32 + return (self.prngod_seed >> 16) / (2**16 - 1) + + + class WorldBase: def __init__(self, game): @@ -50,6 +67,8 @@ class World(WorldBase): self.player_id = 0 self.player_is_alive = True self.maps = {} + self.map_size = YX(1,1) + self.rand = PRNGod(0) @property def player(self): @@ -60,8 +79,8 @@ class World(WorldBase): return 0 return self.things[-1].id_ + 1 - def new_map(self, map_pos, size): - self.maps[map_pos] = self.game.map_type(size) + def new_map(self, map_pos): + self.maps[map_pos] = self.game.map_type(self.map_size) def proceed_to_next_player_turn(self): """Run game world turns until player can decide their next step. @@ -82,11 +101,11 @@ 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 pos in self.maps[YX(0,0)]: + if self.maps[YX(0,0)][pos] == '.' and \ + len(self.things_at_pos((YX(0,0), pos))) == 0 and \ + self.rand.random() > 0.999: + self.add_thing_at('food', (YX(0,0), pos)) for thing in self.things[:player_i]: thing.proceed() self.player.proceed(is_AI=False) @@ -103,9 +122,9 @@ class World(WorldBase): def add_thing_at_random(type_): while True: - new_pos = ((0,0), - (random.randint(0, yx[0] -1), - random.randint(0, yx[1] -1))) + new_pos = (YX(0,0), + YX(self.rand.randint(0, yx.y - 1), + self.rand.randint(0, yx.x - 1))) if self.maps[new_pos[0]][new_pos[1]] != '.': continue if len(self.things_at_pos(new_pos)) > 0: @@ -113,23 +132,24 @@ class World(WorldBase): return self.add_thing_at(type_, new_pos) self.things = [] - random.seed(seed) + self.rand.seed(seed) self.turn = 0 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) + self.map_size = yx + self.new_map(YX(0,0)) + self.new_map(YX(0,1)) + self.new_map(YX(1,1)) + self.new_map(YX(1,0)) + self.new_map(YX(1,-1)) + self.new_map(YX(0,-1)) + self.new_map(YX(-1,-1)) + self.new_map(YX(-1,0)) + self.new_map(YX(-1,1)) for map_pos in self.maps: map_ = self.maps[map_pos] - if (0,0) == map_pos: + if YX(0,0) == map_pos: for pos in map_: - map_[pos] = random.choice(('.', '.', '.', '.', 'x')) + map_[pos] = self.rand.choice(('.', '.', '.', '.', 'x')) else: for pos in map_: map_[pos] = '~' @@ -157,6 +177,8 @@ class Game: 'DROP': Task_DROP} self.commands = {'GEN_WORLD': cmd_GEN_WORLD, 'GET_GAMESTATE': cmd_GET_GAMESTATE, + 'SEED': cmd_SEED, + 'MAP_SIZE': cmd_MAP_SIZE, 'MAP': cmd_MAP, 'THING_TYPE': cmd_THING_TYPE, 'THING_POS': cmd_THING_POS, @@ -177,7 +199,7 @@ class Game: def get_string_options(self, string_option_type): if string_option_type == 'direction': - return self.world.maps[(0,0)].get_directions() + return self.map_type().get_directions() elif string_option_type == 'thingtype': return list(self.thing_types.keys()) return None @@ -186,16 +208,14 @@ class Game: """Send out game state data relevant to clients.""" def send_thing(offset, thing): - offset_pos = (thing.position[1][0] - offset[0], - thing.position[1][1] - offset[1]) + offset_pos = (thing.position[1] - offset) self.io.send('THING_TYPE %s %s' % (thing.id_, thing.type_)) - self.io.send('THING_POS %s %s' % (thing.id_, - stringify_yx(offset_pos))) + self.io.send('THING_POS %s %s' % (thing.id_, offset_pos)) self.io.send('TURN ' + str(self.world.turn)) visible_map = self.world.player.get_visible_map() offset = self.world.player.get_surroundings_offset() - self.io.send('VISIBLE_MAP ' + stringify_yx(offset) + ' ' + stringify_yx(visible_map.size)) + self.io.send('VISIBLE_MAP %s %s' % (offset, 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()