X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=0dced0da0a612b1c10248c3ba8f9eef52e057a72;hb=cd0fee3d91d70525d7d4f434985abad6ea73faf0;hp=70d9994d1d5782152b9d563b8db1cb1697b85b3b;hpb=a789724e6b1b5eb514f82ac4d7092f7575180c31;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 70d9994..0dced0d 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -20,7 +20,9 @@ class ThingBase:
class Thing(ThingBase):
- blocking = False
+ blocks_movement = False
+ blocks_sound = False
+ blocks_light = False
portable = False
protection = '.'
commandable = False
@@ -68,11 +70,11 @@ class Thing(ThingBase):
return lowered_msg
largest_audible_distance = 20
- # player's don't block sound (or should they?)
- things = [t for t in self.game.things if t.type_ != 'Player']
+ obstacles = [t.position for t in self.game.things if t.blocks_sound]
sound_blockers = self.game.get_sound_blockers()
- dijkstra_map = DijkstraMap(sound_blockers, things, self.game.maps, self.position,
- largest_audible_distance, self.game.get_map)
+ dijkstra_map = DijkstraMap(sound_blockers, obstacles, self.game.maps,
+ self.position, largest_audible_distance,
+ self.game.get_map)
url_limits = []
for m in re.finditer('https?://[^\s]+', msg):
url_limits += [m.start(), m.end()]
@@ -117,7 +119,6 @@ class ThingSpawner(Thing):
if t != self and t.position == self.position]:
return
self.game.add_thing(self.child_type, self.position)
- # self.game.changed = True handled by add_thing
@@ -145,16 +146,20 @@ class Thing_DoorSpawner(ThingSpawner):
class Thing_Door(Thing):
symbol_hint = 'D'
- blocking = False
+ blocks_movement = False
portable = True
installable = True
def open(self):
- self.blocking = False
+ self.blocks_movement = False
+ self.blocks_light = False
+ self.blocks_sound = False
del self.thing_char
def close(self):
- self.blocking = True
+ self.blocks_movement = True
+ self.blocks_light = True
+ self.blocks_sound = True
self.thing_char = '#'
def install(self):
@@ -184,7 +189,8 @@ class Thing_Bottle(Thing):
fov_map_class = self.game.map_geometry.fov_map_class
fov_radius = 12
light_blockers = self.game.get_light_blockers()
- fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
+ obstacles = [t.position for t in self.game.things if t.blocks_light]
+ fov = fov_map_class(light_blockers, obstacles, self.game.maps,
self.position, fov_radius, self.game.get_map)
fov.init_terrain()
visible_players = []
@@ -246,8 +252,7 @@ class Thing_HatRemixer(Thing):
hat.design = new_design
self.sound('HAT REMIXER', 'remixing a hat â¦')
self.game.changed = True
- # FIXME: pseudo-FOV-change actually
- self.game.record_fov_change(self.thing.position)
+ self.game.record_change(self.position, 'other')
@@ -373,7 +378,6 @@ class Thing_BottleDeposit(Thing):
elif choice == 'Hat':
msg += 'pick it up and then use "(un-)wear" on it!'
self.sound('BOTTLE DEPOSITOR', msg)
- # self.game.changed = True done by game.add_thing
def accept(self):
self.bottle_counter += 1
@@ -383,22 +387,48 @@ class Thing_BottleDeposit(Thing):
+class Thing_Cookie(Thing):
+ symbol_hint = 'c'
+ portable = True
+
+ def __init__(self, *args, **kwargs):
+ import string
+ super().__init__(*args, **kwargs)
+ legal_chars = string.ascii_letters + string.digits + string.punctuation + ' '
+ self.thing_char = random.choice(list(legal_chars))
+
+
+
+class Thing_CookieSpawner(Thing):
+ symbol_hint = 'O'
+
+ def accept(self, thing):
+ self.sound('OVEN', '*heat* *brrzt* here\'s a cookie!')
+ self.game.add_thing('Cookie', self.position)
+
+
class ThingAnimate(Thing):
- blocking = True
+ blocks_movement = True
drunk = 0
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.next_task = [None]
self.task = None
- self.invalidate_map_view()
-
- def invalidate_map_view(self):
- self._fov = None
- self._visible_terrain = None
- self._visible_control = None
- self._seen_things = None
+ self.invalidate('fov')
+ self.invalidate('other') # currently redundant though
+
+ def invalidate(self, type_):
+ if type_ == 'fov':
+ self._fov = None
+ self._visible_terrain = None
+ self._visible_control = None
+ self.invalidate('other')
+ elif type_ == 'other':
+ self._seen_things = None
+ self._seen_annotation_positions = None
+ self._seen_portal_positions = None
def set_next_task(self, task_name, args=()):
task_class = self.game.tasks[task_name]
@@ -419,9 +449,7 @@ class ThingAnimate(Thing):
# TODO: refactor with self.send_msg
self.game.io.send('DEFAULT_COLORS', c_id)
self.game.io.send('CHAT "You sober up."', c_id)
- #self.invalidate_map_view()
- # FIXME: pseudo-FOV-change actually
- self.game.record_fov_change(self.thing.position)
+ self.invalidate('fov')
break
self.game.changed = True
if self.task is None:
@@ -442,7 +470,8 @@ class ThingAnimate(Thing):
fov_map_class = self.game.map_geometry.fov_map_class
fov_radius = 3 if self.drunk > 0 else 12
light_blockers = self.game.get_light_blockers()
- self._fov = fov_map_class(light_blockers, self.game.things, self.game.maps,
+ obstacles = [t.position for t in self.game.things if t.blocks_light]
+ self._fov = fov_map_class(light_blockers, obstacles, self.game.maps,
self.position, fov_radius, self.game.get_map)
def multiprocessible_fov_stencil(self):
@@ -501,6 +530,31 @@ class ThingAnimate(Thing):
if self.fov_test(*t.position)]
return self._seen_things
+ @property
+ def seen_annotation_positions(self):
+ if self._seen_annotation_positions is not None:
+ return self._seen_annotation_positions
+ self._seen_annotation_positions = []
+ for big_yx in self.game.annotations:
+ for little_yx in [little_yx for little_yx
+ in self.game.annotations[big_yx]
+ if self.fov_test(big_yx, little_yx)]:
+ self._seen_annotation_positions += [(big_yx, little_yx)]
+ return self._seen_annotation_positions
+
+ @property
+ def seen_portal_positions(self):
+ if self._seen_portal_positions is not None:
+ return self._seen_portal_positions
+ self._seen_portal_positions = []
+ for big_yx in self.game.portals:
+ for little_yx in [little_yx for little_yx
+ in self.game.portals[big_yx]
+ if self.fov_test(big_yx, little_yx)]:
+ self._seen_portal_positions += [(big_yx, little_yx)]
+ return self._seen_portal_positions
+
+
class Thing_Player(ThingAnimate):
symbol_hint = '@'
@@ -520,3 +574,14 @@ class Thing_Player(ThingAnimate):
t.carried = False
self.carrying = None
return t
+
+ def add_cookie_char(self, c):
+ if not self.name in self.game.players_hat_chars:
+ self.game.players_hat_chars[self.name] = ' #' # default
+ if not c in self.game.players_hat_chars[self.name]:
+ self.game.players_hat_chars[self.name] += c
+
+ def get_cookie_chars(self):
+ if self.name in self.game.players_hat_chars:
+ return self.game.players_hat_chars[self.name]
+ return ' #' # default