Expand terrain and thing content.

diff --git a/plomrogue/game.py b/plomrogue/game.py
index 1c72aaf7aee40b6cc253faaacbdee73d18d4cad0..7eaa28bb2e5339015de1ac4ce6d049756a1f26a1 100755 (executable)
--- a/plomrogue/game.py
+++ b/plomrogue/game.py
@@ -52,7 +52,14 @@ class Game(GameBase):
         self.player_chars = string.digits + string.ascii_letters
         self.player_char_i = -1
         self.terrains = {
+            '.': 'floor',
             'X': 'wall',
+            '=': 'window',
+            '#': 'bed',
+            'T': 'desk',
+            '8': 'cupboard',
+            '[': 'glass door',
+            'o': 'sink',
             'O': 'toilet'
         }
         if os.path.exists(self.io.save_file):

diff --git a/plomrogue/things.py b/plomrogue/things.py
index 98a5995cf5d46824d5f9fee9ebb2ff1a50cc1510..0a06601e8a3836a77cd05602ff010467c2560e92 100644 (file)
--- a/plomrogue/things.py
+++ b/plomrogue/things.py
@@ -35,8 +35,14 @@ class Thing(ThingBase):
 
 
 
-class Thing_Stone(Thing):
-    symbol_hint = 'o'
+class Thing_Item(Thing):
+    symbol_hint = 'i'
+
+
+
+class Thing_Furniture(Thing):
+    symbol_hint = 'h'
+
 
 
 class ThingAnimate(Thing):

diff --git a/rogue_chat.py b/rogue_chat.py
index 77bc832a3d36e4b06fcf49d5ed56f3484bc6dc44..8aaf1a6a702cc658691141ad209a658f233dbc75 100755 (executable)
--- a/rogue_chat.py
+++ b/rogue_chat.py
@@ -10,7 +10,7 @@ from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_NICK, cmd_PING, cmd_THIN
                                 cmd_THING_NAME, cmd_TERRAINS)
 from plomrogue.tasks import (Task_WAIT, Task_MOVE, Task_WRITE, Task_PICK_UP,
                              Task_DROP, Task_FLATTEN_SURROUNDINGS)
-from plomrogue.things import Thing_Player, Thing_Stone
+from plomrogue.things import Thing_Player, Thing_Item, Thing_Furniture
 import sys
 
 if len(sys.argv) != 2:
@@ -45,7 +45,8 @@ game.register_task(Task_FLATTEN_SURROUNDINGS)
 game.register_task(Task_PICK_UP)
 game.register_task(Task_DROP)
 game.register_thing_type(Thing_Player)
-game.register_thing_type(Thing_Stone)
+game.register_thing_type(Thing_Item)
+game.register_thing_type(Thing_Furniture)
 game.read_savefile()
 game.io.start_loop()
 game.io.start_server(8000, PlomWebSocketServer)