Add toilets, and terrain type tags.

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 50445e7f9c62f557b098d7e4781723679c11c74d..49312eeff129006a7755bee3ed4645088eaacf5e 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -28,6 +28,12 @@ def cmd_TERRAIN(game, character, description,
                                        blocks_sound, blocks_movement)
 cmd_TERRAIN.argtypes = 'char string bool bool bool'
 
+def cmd_TERRAIN_TAG(game, character, tag):
+    if not character in game.terrains:
+        raise GameError('terrain does not exist: %s' % character)
+    game.terrains[character].tags.add(tag)
+cmd_TERRAIN_TAG.argtypes = 'char string'
+
 def cmd_ALL(game, msg, connection_id):
     speaker = game.get_player(connection_id)
     if not speaker:

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 9a9b235cd454a13187a6058b88cdc7fe513238ec..202a0fcba9bcf39e76e33e0b21e44d4b4c9723b4 100755 (executable)
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -473,6 +473,10 @@ class Game(GameBase):
                                                      int(terrain.blocks_light),
                                                      int(terrain.blocks_sound),
                                                      int(terrain.blocks_movement)))
+                if len(terrain.tags) > 0:
+                    for tag in terrain.tags:
+                        write(f, 'TERRAIN_TAG %s %s' % (quote(terrain.character),
+                                                        quote(tag)))
             for big_yx in [yx for yx in self.maps if self.maps[yx].modified]:
                 for y, line in self.maps[big_yx].lines():
                     write(f, 'MAP_LINE %s %5s %s' % (big_yx, y, quote(line)))

diff --git a/plomrogue/misc.py b/plomrogue/misc.py
index 84b0a8a6f512cae596f689c85f0e13fa80613052..c3658d9464f3181fb7ad95d293aae1a3c2360193 100644 (file)
--- a/plomrogue/misc.py
+++ b/plomrogue/misc.py
@@ -7,6 +7,7 @@ class Terrain:
         self.blocks_light = blocks_light
         self.blocks_sound = blocks_sound
         self.blocks_movement = blocks_movement
+        self.tags = set()
 
 
 

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 072f2513ce9a11a56e86c92828cbfde3cb1f594b..09dc4b678a066ba83f475250a8f205ac7ab4ec90 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -48,7 +48,6 @@ class Thing(ThingBase):
 
         def lower_msg_by_volume(msg, volume, largest_audible_distance,
                                 url_limits = []):
-            import random
             factor = largest_audible_distance / 4
             lowered_msg = ''
             in_url = False
@@ -139,16 +138,26 @@ class Thing_SpawnPoint(Thing):
 
 
 
+class ThingInstallable(Thing):
+    portable = True
+    installable = True
+
+    def install(self):
+        self.portable = False
+
+    def uninstall(self):
+        self.portable = True
+
+
+
 class Thing_DoorSpawner(ThingSpawner):
     child_type = 'Door'
 
 
 
-class Thing_Door(Thing):
+class Thing_Door(ThingInstallable):
     symbol_hint = 'D'
     blocks_movement = False
-    portable = True
-    installable = True
 
     def open(self):
         self.blocks_movement = False
@@ -162,12 +171,6 @@ class Thing_Door(Thing):
         self.blocks_sound = True
         self.thing_char = '#'
 
-    def install(self):
-        self.portable = False
-
-    def uninstall(self):
-        self.portable = True
-
 
 
 class Thing_Psychedelic(Thing):
@@ -194,7 +197,6 @@ class Thing_Bottle(Thing):
         self.full = False
 
     def spin(self):
-        import random
         all_players = [t for t in self.game.things if t.type_ == 'Player']
         # TODO: refactor with ThingPlayer.prepare_multiprocessible_fov_stencil
         # and ThingPlayer.fov_test
@@ -422,8 +424,6 @@ class Thing_CookieSpawner(Thing):
 
 class ThingAnimate(Thing):
     blocks_movement = True
-    drunk = 0
-    tripping = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -561,6 +561,9 @@ class ThingAnimate(Thing):
 
 class Thing_Player(ThingAnimate):
     symbol_hint = '@'
+    drunk = 0
+    tripping = 0
+    need_for_toilet = 0
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -568,12 +571,26 @@ class Thing_Player(ThingAnimate):
 
     def proceed(self):
         super().proceed()
-        self.drunk -= 1
+        if self.drunk >= 0:
+            self.drunk -= 1
+        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:
+                self.send_msg('CHAT "You need to use a toilet."')
         if self.drunk == 0:
             self.send_msg('CHAT "You sober up."')
             self.invalidate('fov')
             self.game.changed = True
-        self.tripping -= 1
+            self.need_for_toilet *= 2
+            self.need_for_toilet += 1
         if self.tripping == 0:
             self.send_msg('DEFAULT_COLORS')
             self.send_msg('CHAT "You sober up."')

diff --git a/rogue_chat.py b/rogue_chat.py
index b69356a15fb184d0d17a40b6c58094194e691f54..31e53e4af5435b498c1ff80a6f507b10567f37e7 100755 (executable)
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -14,7 +14,8 @@ from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THIN
                                 cmd_THING_MUSICPLAYER_PLAYLIST_ITEM, cmd_TERRAIN,
                                 cmd_THING_BOTTLE_EMPTY, cmd_PLAYER_FACE,
                                 cmd_GOD_PLAYER_FACE, cmd_GOD_PLAYER_HAT,
-                                cmd_GOD_PLAYERS_HAT_CHARS, cmd_PLAYER_HAT)
+                                cmd_GOD_PLAYERS_HAT_CHARS, cmd_PLAYER_HAT,
+                                cmd_TERRAIN_TAG)
 from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_PICK_UP,
                              Task_DROP, Task_FLATTEN_SURROUNDINGS, Task_DOOR,
                              Task_INTOXICATE, Task_COMMAND, Task_INSTALL,
@@ -36,6 +37,7 @@ game.register_command(cmd_NICK)
 game.register_command(cmd_TURN)
 game.register_command(cmd_MAP)
 game.register_command(cmd_TERRAIN)
+game.register_command(cmd_TERRAIN_TAG)
 game.register_command(cmd_MAP_LINE)
 game.register_command(cmd_MAP_CONTROL_LINE)
 game.register_command(cmd_MAP_CONTROL_PW)