X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=072f2513ce9a11a56e86c92828cbfde3cb1f594b;hb=9f83e41901f23e282737e7344c84e8a692d05ef0;hp=0d17d3c029469713ed25305d20433467a847b6d2;hpb=9c9475a01bbbd18b69056a9564768df6bff36539;p=plomrogue2
diff --git a/plomrogue/things.py b/plomrogue/things.py
index 0d17d3c..072f251 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,9 +70,7 @@ class Thing(ThingBase):
return lowered_msg
largest_audible_distance = 20
- # player's don't block sound
- obstacles = [t.position for t in self.game.things
- if t.blocking and 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, obstacles, self.game.maps,
self.position, largest_audible_distance,
@@ -146,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):
@@ -166,6 +170,18 @@ class Thing_Door(Thing):
+class Thing_Psychedelic(Thing):
+ symbol_hint = 'P'
+ portable = True
+
+
+
+class Thing_PsychedelicSpawner(ThingSpawner):
+ symbol_hint = 'P'
+ child_type = 'Psychedelic'
+
+
+
class Thing_Bottle(Thing):
symbol_hint = 'B'
portable = True
@@ -185,7 +201,7 @@ class Thing_Bottle(Thing):
fov_map_class = self.game.map_geometry.fov_map_class
fov_radius = 12
light_blockers = self.game.get_light_blockers()
- obstacles = [t.position for t in self.game.things if t.blocking]
+ 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()
@@ -405,8 +421,9 @@ class Thing_CookieSpawner(Thing):
class ThingAnimate(Thing):
- blocking = True
+ blocks_movement = True
drunk = 0
+ tripping = 0
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -438,16 +455,6 @@ class ThingAnimate(Thing):
return task
def proceed(self):
- self.drunk -= 1
- if self.drunk == 0:
- for c_id in self.game.sessions:
- if self.game.sessions[c_id]['thing_id'] == self.id_:
- # 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('fov')
- break
- self.game.changed = True
if self.task is None:
self.task = self.get_next_task()
return
@@ -466,7 +473,7 @@ 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()
- obstacles = [t.position for t in self.game.things if t.blocking]
+ 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)
@@ -559,6 +566,22 @@ class Thing_Player(ThingAnimate):
super().__init__(*args, **kwargs)
self.carrying = None
+ def proceed(self):
+ super().proceed()
+ self.drunk -= 1
+ if self.drunk == 0:
+ self.send_msg('CHAT "You sober up."')
+ self.invalidate('fov')
+ self.game.changed = True
+ self.tripping -= 1
+ if self.tripping == 0:
+ self.send_msg('DEFAULT_COLORS')
+ self.send_msg('CHAT "You sober up."')
+ self.game.changed = True
+ elif self.tripping > 0 and self.tripping % 250 == 0:
+ self.send_msg('RANDOM_COLORS')
+ self.game.changed = True
+
def send_msg(self, msg):
for c_id in self.game.sessions:
if self.game.sessions[c_id]['thing_id'] == self.id_: