X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fthings.py;h=a0db94a0f639907d0cd1d35169c8d77cf3e19b9f;hb=023f991e645730e150bfd2782d16cbb4e440f78c;hp=950a777f0bc951defb35f0f32cefe912f1008e25;hpb=9ac7e8befde463275086945c1ed5399bb8ef3af0;p=plomrogue2

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 950a777..a0db94a 100644
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -26,6 +26,7 @@ class Thing(ThingBase):
     portable = False
     protection = '.'
     commandable = False
+    cookable = False
     carried = False
 
     def __init__(self, *args, **kwargs):
@@ -70,10 +71,11 @@ class Thing(ThingBase):
 
         largest_audible_distance = 20
         obstacles = [t.position for t in self.game.things if t.blocks_sound]
+        targets = [t.position for t in self.game.things if t.type_ == 'Player']
         sound_blockers = self.game.get_sound_blockers()
-        dijkstra_map = DijkstraMap(sound_blockers, obstacles, self.game.maps,
-                                   self.position, largest_audible_distance,
-                                   self.game.get_map)
+        dijkstra_map = DijkstraMap(targets, 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()]
@@ -126,8 +128,8 @@ class ThingSpawner(Thing):
     def proceed(self):
         for t in [t for t in self.game.things
                   if t != self and t.position == self.position]:
-            return
-        self.game.add_thing(self.child_type, self.position)
+            return None
+        return self.game.add_thing(self.child_type, self.position)
 
 
 
@@ -163,16 +165,31 @@ class ThingInstallable(Thing):
 class Thing_DoorSpawner(ThingSpawner):
     child_type = 'Door'
 
+    def proceed(self):
+        door = super().proceed()
+        if door:
+            key = self.game.add_thing('DoorKey', self.position)
+            key.door = door
+
+
+
+class Thing_DoorKey(Thing):
+    portable = True
+    symbol_hint = 'k'
+
+
 
 
 class Thing_Door(ThingInstallable):
     symbol_hint = 'D'
     blocks_movement = False
+    locked = False
 
     def open(self):
         self.blocks_movement = False
         self.blocks_light = False
         self.blocks_sound = False
+        self.locked = False
         del self.thing_char
 
     def close(self):
@@ -181,11 +198,16 @@ class Thing_Door(ThingInstallable):
         self.blocks_sound = True
         self.thing_char = '#'
 
+    def lock(self):
+        self.locked = True
+        self.thing_char = 'L'
+
 
 
 class Thing_Psychedelic(Thing):
     symbol_hint = 'P'
     portable = True
+    cookable = True
 
 
 
@@ -201,6 +223,7 @@ class Thing_Bottle(Thing):
     full = True
     thing_char = '~'
     spinnable = True
+    cookable = True
 
     def empty(self):
         self.thing_char = '_'
@@ -238,6 +261,7 @@ class Thing_Hat(Thing):
     portable = True
     design = ' +--+ ' + ' |  | ' + '======'
     spinnable = True
+    cookable = True
 
     def spin(self):
         new_design = ''
@@ -288,6 +312,7 @@ class Thing_MusicPlayer(Thing):
     next_song_start = datetime.datetime.now()
     playlist_index = -1
     playing = True
+    cookable = True
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -432,7 +457,7 @@ class Thing_CookieSpawner(Thing):
 
 
 class ThingAnimate(Thing):
-    blocks_movement = True
+    weariness = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -461,6 +486,7 @@ class ThingAnimate(Thing):
             task = self.next_task[0]
             self.next_task = [None]
             task.check()
+            task.todo += self.weariness * 10
             return task
 
     def proceed(self):
@@ -582,18 +608,22 @@ class Thing_Player(ThingAnimate):
         if self.tripping >= 0:
             self.tripping -= 1
         if self.need_for_toilet > 0:
-            self.need_for_toilet += 1
             terrain = self.game.maps[self.position[0]][self.position[1]]
             if terrain in self.game.terrains:
                 terrain_type = self.game.terrains[terrain]
                 if 'toilet' in terrain_type.tags:
                     self.send_msg('CHAT "You use the toilet. What a relief!"')
                     self.need_for_toilet = 0
-            if 10000 * random.random() < self.need_for_toilet / 100000:
+        if self.need_for_toilet > 0:
+            if random.random() > 0.9999:
+                self.need_for_toilet += 1
+                self.game.changed = True
+            if 100000 * random.random() < self.need_for_toilet:
                 self.send_msg('CHAT "You need to go to a toilet."')
-            if self.need_for_toilet > 1000000:
+            if self.need_for_toilet > 100:
                 self.send_msg('CHAT "You pee into your pants. Eww!"')
                 self.need_for_toilet = 0
+                self.game.changed = True
         if self.drunk == 0:
             self.send_msg('CHAT "You sober up."')
             self.invalidate('fov')
@@ -605,6 +635,16 @@ class Thing_Player(ThingAnimate):
         elif self.tripping > 0 and self.tripping % 250 == 0:
             self.send_msg('RANDOM_COLORS')
             self.game.changed = True
+        if random.random() > 0.9999:
+            if self.standing:
+                self.weariness += 1
+                if self.weariness % 5 == 0:
+                    self.send_msg('CHAT "All that walking or standing makes '
+                                  'you weary, and thereby slower. Find a place '
+                                  'to sit or lie down to regain energy."')
+            elif self.weariness > 0:
+                self.weariness -= 1
+            self.game.changed = True
 
     def send_msg(self, msg):
         for c_id in self.game.sessions:
@@ -625,6 +665,9 @@ class Thing_Player(ThingAnimate):
             self.game.players_hat_chars[self.name] += c
 
     def get_cookie_chars(self):
+        chars = ' #'  # default
         if self.name in self.game.players_hat_chars:
-            return self.game.players_hat_chars[self.name]
-        return ' #'  # default
+            chars = self.game.players_hat_chars[self.name]
+        chars_split = list(chars)
+        chars_split.sort()
+        return ''.join(chars_split)