Convert sample area data file to YAML

diff --git a/etc/mudpy.conf b/etc/mudpy.conf
index 86e656f..3c1c175 100644 (file)
--- a/etc/mudpy.conf
+++ b/etc/mudpy.conf
@@ -3,7 +3,7 @@
 # terms provided in the LICENSE file distributed with this software.
 
 [__control__]
-default_files = { "account": "account.mpy", "actor": "actor.mpy", "area": "area.mpy", "command": "command.yaml", "internal": "internal.mpy", "menu": "menu.yaml", "other": "other.mpy", "prop": "prop.mpy" }
+default_files = { "account": "account.mpy", "actor": "actor.mpy", "area": "area.yaml", "command": "command.yaml", "internal": "internal.mpy", "menu": "menu.yaml", "other": "other.mpy", "prop": "prop.mpy" }
 include_dirs = "sample"
 include_files = "archetype.yaml"
 private_files = "account.mpy"

diff --git a/sample/__init__.mpy b/sample/__init__.mpy
index b66fbca..3075204 100644 (file)
--- a/sample/__init__.mpy
+++ b/sample/__init__.mpy
@@ -3,6 +3,6 @@
 # terms provided in the LICENSE file distributed with this software.
 
 [__control__]
-include_files = [ "area.mpy", "prop.mpy" ]
+include_files = [ "area.yaml", "prop.mpy" ]
 read_only = yes
 

diff --git a/sample/area.mpy b/sample/area.mpy
deleted file mode 100644 (file)
index e4641eb..0000000
--- a/sample/area.mpy
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (c) 2004-2014 Jeremy Stanley <fungi@yuggoth.org>. Permission
-# to use, copy, modify, and distribute this software is granted under
-# terms provided in the LICENSE file distributed with this software.
-
-[area:-1,0,0]
-description = This is the West Sample Location. It is merely provided as an example of what an area might look like.
-gridlinks = ['east']
-name = West Sample Location
-terrain = inside
-
-[area:0,-1,0]
-description = This is the South Sample Location. It is merely provided as an example of what an area might look like.
-gridlinks = ['north']
-name = South Sample Location
-terrain = inside
-
-[area:0,0,-1]
-description = This is the Lower Sample Location. It is merely provided as an example of what an area might look like.
-gridlinks = ['up']
-name = Lower Sample Location
-terrain = inside
-
-[area:0,0,0]
-description = This is the Center Sample Location. It is merely provided as an example of what an area might look like.
-gridlinks = ['down', 'east', 'north', 'south', 'up', 'west']
-name = Center Sample Location
-terrain = inside
-
-[area:0,0,1]
-description = This is the Upper Sample Location. It is merely provided as an example of what an area might look like.
-gridlinks = ['down']
-name = Upper Sample Location
-terrain = inside
-
-[area:0,1,0]
-description = This is the North Sample Location. It is merely provided as an example of what an area might look like.
-gridlinks = ['south']
-name = North Sample Location
-terrain = inside
-
-[area:1,0,0]
-description = This is the East Sample Location. It is merely provided as an example of what an area might look like.
-gridlinks = ['west']
-name = East Sample Location
-terrain = inside
-

diff --git a/sample/area.yaml b/sample/area.yaml
new file mode 100644 (file)
index 0000000..93992a6
--- /dev/null
+++ b/sample/area.yaml
@@ -0,0 +1,45 @@
+# Copyright (c) 2004-2014 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# to use, copy, modify, and distribute this software is granted under
+# terms provided in the LICENSE file distributed with this software.
+
+area:-1,0,0:
+    description: This is the West Sample Location. It is merely provided as an example of what an area might look like.
+    gridlinks: ['east']
+    name: West Sample Location
+    terrain: inside
+
+area:0,-1,0:
+    description: This is the South Sample Location. It is merely provided as an example of what an area might look like.
+    gridlinks: ['north']
+    name: South Sample Location
+    terrain: inside
+
+area:0,0,-1:
+    description: This is the Lower Sample Location. It is merely provided as an example of what an area might look like.
+    gridlinks: ['up']
+    name: Lower Sample Location
+    terrain: inside
+
+area:0,0,0:
+    description: This is the Center Sample Location. It is merely provided as an example of what an area might look like.
+    gridlinks: ['down', 'east', 'north', 'south', 'up', 'west']
+    name: Center Sample Location
+    terrain: inside
+
+area:0,0,1:
+    description: This is the Upper Sample Location. It is merely provided as an example of what an area might look like.
+    gridlinks: ['down']
+    name: Upper Sample Location
+    terrain: inside
+
+area:0,1,0:
+    description: This is the North Sample Location. It is merely provided as an example of what an area might look like.
+    gridlinks: ['south']
+    name: North Sample Location
+    terrain: inside
+
+area:1,0,0:
+    description: This is the East Sample Location. It is merely provided as an example of what an area might look like.
+    gridlinks: ['west']
+    name: East Sample Location
+    terrain: inside