Make terrain types configurable.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 026f99603de4b90562c1d4f1d639481a3b3bddaf..df4b7e204a26b353c8e46db71281e7b9d345717e 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -1,5 +1,6 @@
 from plomrogue.misc import quote
 from plomrogue.errors import GameError, ArgError
+from plomrogue.misc import Terrain
 
 
 
@@ -16,11 +17,17 @@ def cmd_THING_TYPES(game, connection_id):
 cmd_THING_TYPES.argtypes = ''
 
 def cmd_TERRAINS(game, connection_id):
-    for t in game.terrains.keys():
-        game.io.send('TERRAIN %s %s' % (quote(t), quote(game.terrains[t])),
-                     connection_id)
+    for t in game.terrains.values():
+        game.io.send('TERRAIN %s %s' % (quote(t.character),
+                                        quote(t.description)), connection_id)
 cmd_TERRAINS.argtypes = ''
 
+def cmd_TERRAIN(game, character, description,
+                blocks_light, blocks_sound, blocks_movement):
+    game.terrains[character] = Terrain(character, description, blocks_light,
+                                       blocks_sound, blocks_movement)
+cmd_TERRAIN.argtypes = 'char string bool bool bool'
+
 def cmd_ALL(game, msg, connection_id):
     speaker = game.get_player(connection_id)
     if not speaker:
@@ -226,6 +233,7 @@ def cmd_MAP(game, geometry, size):
     if geometry == 'Hex':
         map_geometry_class = MapGeometryHex
     game.new_world(map_geometry_class(size))
+    game.terrains = {}
 cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'
 
 def cmd_MAP_CONTROL_LINE(game, big_yx, y, line):