X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fgame.py;h=1ffbf1acfa186f900d96a8252bd5db58dd5fa0a8;hb=6cc83951670f2022bd22cbf0728ebb4c25479c4d;hp=0c17977f2d6e2014570332db5e7ffd202e361edc;hpb=e67306357a830cabdd5ce86b2b333499d99da325;p=plomrogue2
diff --git a/plomrogue/game.py b/plomrogue/game.py
index 0c17977..1ffbf1a 100755
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -3,7 +3,6 @@ from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE,
from plomrogue.errors import GameError, PlayError
from plomrogue.io import GameIO
from plomrogue.misc import quote
-from plomrogue.things import Thing, ThingPlayer
from plomrogue.mapping import YX, MapGeometrySquare, Map
@@ -16,24 +15,21 @@ class GameBase:
self.map_geometry = MapGeometrySquare(YX(24, 40))
self.commands = {}
- def get_thing(self, id_, create_unfound):
- # No default for create_unfound because every call to get_thing
- # should be accompanied by serious consideration whether to use it.
+ def get_thing(self, id_):
for thing in self.things:
if id_ == thing.id_:
return thing
- if create_unfound:
- t = self.thing_type(self, id_)
- self.things += [t]
- return t
return None
+ def _register_object(self, obj, obj_type_desc, prefix):
+ if not obj.__name__.startswith(prefix):
+ raise GameError('illegal %s object name: %s' % (obj_type_desc, obj.__name__))
+ obj_name = obj.__name__[len(prefix):]
+ d = getattr(self, obj_type_desc + 's')
+ d[obj_name] = obj
+
def register_command(self, command):
- prefix = 'cmd_'
- if not command.__name__.startswith(prefix):
- raise GameError('illegal command object name: %s' % command.__name__)
- command_name = command.__name__[len(prefix):]
- self.commands[command_name] = command
+ self._register_object(command, 'command', 'cmd_')
@@ -45,8 +41,7 @@ class Game(GameBase):
self.changed = True
self.io = GameIO(self, save_file)
self.tasks = {}
- self.thing_type = Thing
- self.thing_types = {'player': ThingPlayer}
+ self.thing_types = {}
self.sessions = {}
self.map = Map(self.map_geometry.size)
self.map_control = Map(self.map_geometry.size)
@@ -57,12 +52,11 @@ class Game(GameBase):
if not os.path.isfile(self.io.save_file):
raise GameError('save file path refers to non-file')
+ def register_thing_type(self, thing_type):
+ self._register_object(thing_type, 'thing_type', 'Thing_')
+
def register_task(self, task):
- prefix = 'Task_'
- if not task.__name__.startswith(prefix):
- raise GameError('illegal task object name: %s' % task.__name__)
- task_name = task.__name__[len(prefix):]
- self.tasks[task_name] = task
+ self._register_object(task, 'task', 'Task_')
def read_savefile(self):
if os.path.exists(self.io.save_file):
@@ -90,6 +84,8 @@ class Game(GameBase):
string.digits + string.ascii_letters + string.punctuation + ' ']
elif string_option_type == 'map_geometry':
return ['Hex', 'Square']
+ elif string_option_type == 'thing_type':
+ return self.thing_types.keys()
return None
def get_map_geometry_shape(self):
@@ -100,7 +96,7 @@ class Game(GameBase):
self.io.send('TURN ' + str(self.turn))
for c_id in self.sessions:
- player = self.get_thing(self.sessions[c_id], create_unfound = False)
+ player = self.get_thing(self.sessions[c_id])
visible_terrain = player.fov_stencil_map(self.map)
self.io.send('FOV %s' % quote(player.fov_stencil.terrain), c_id)
self.io.send('MAP %s %s %s' % (self.get_map_geometry_shape(),
@@ -110,7 +106,7 @@ class Game(GameBase):
self.io.send('MAP_CONTROL %s' % quote(visible_control), c_id)
for t in [t for t in self.things
if player.fov_stencil[t.position] == '.']:
- self.io.send('THING_POS %s %s' % (t.id_, t.position), c_id)
+ self.io.send('THING %s %s %s' % (t.position, t.type_, t.id_), c_id)
if hasattr(t, 'nickname'):
self.io.send('THING_NAME %s %s' % (t.id_,
quote(t.nickname)), c_id)
@@ -128,7 +124,7 @@ class Game(GameBase):
connection_id_found = True
break
if not connection_id_found:
- t = self.get_thing(self.sessions[connection_id], create_unfound=False)
+ t = self.get_thing(self.sessions[connection_id])
if hasattr(t, 'nickname'):
self.io.send('CHAT ' + quote(t.nickname + ' left the map.'))
self.things.remove(t)
@@ -165,7 +161,7 @@ class Game(GameBase):
def cmd_TASK_colon(task_name, game, *args, connection_id):
if connection_id not in game.sessions:
raise GameError('Not registered as player.')
- t = game.get_thing(game.sessions[connection_id], create_unfound=False)
+ t = game.get_thing(game.sessions[connection_id])
t.set_next_task(task_name, args)
def task_prefixed(command_name, task_prefix, task_command):
@@ -188,14 +184,8 @@ class Game(GameBase):
def new_thing_id(self):
if len(self.things) == 0:
- return 0
- # DANGEROUS â if anywhere we append a thing to the list of lower
- # ID than the highest-value ID, this might lead to re-using an
- # already active ID. This condition /should/ not be fulfilled
- # anywhere in the code, but if it does, trouble here is one of
- # the more obvious indicators that it does â that's why there's
- # no safeguard here against this.
- return self.things[-1].id_ + 1
+ return 1
+ return max([t.id_ for t in self.things]) + 1
def save(self):
@@ -218,6 +208,8 @@ class Game(GameBase):
for tile_class in self.map_control_passwords:
write(f, 'MAP_CONTROL_PW %s %s' % (tile_class,
self.map_control_passwords[tile_class]))
+ for t in [t for t in self.things if not t.type_ == 'Player']:
+ write(f, 'THING %s %s %s' % (t.position, t.type_, t.id_))
def new_world(self, map_geometry):
self.map_geometry = map_geometry