Convert sample prop data file to YAML

diff --git a/etc/mudpy.conf b/etc/mudpy.conf
index 3c1c175..7283f91 100644 (file)
--- a/etc/mudpy.conf
+++ b/etc/mudpy.conf
@@ -1,9 +1,9 @@
-# Copyright (c) 2004-2010 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# 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.
 
 [__control__]
-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" }
+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.yaml" }
 include_dirs = "sample"
 include_files = "archetype.yaml"
 private_files = "account.mpy"

diff --git a/sample/__init__.mpy b/sample/__init__.mpy
index 3075204..611228e 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.yaml", "prop.mpy" ]
+include_files = [ "area.yaml", "prop.yaml" ]
 read_only = yes
 

diff --git a/sample/prop.mpy b/sample/prop.yaml
similarity index 65%
rename from sample/prop.mpy
rename to sample/prop.yaml
index 1075eba..4104787 100644 (file)
--- a/sample/prop.mpy
+++ b/sample/prop.yaml
@@ -2,8 +2,7 @@
 # to use, copy, modify, and distribute this software is granted under
 # terms provided in the LICENSE file distributed with this software.
 
-[prop:sample_prop]
-impression = A sample prop sits here.
-keywords = sample prop
-location = area:0,0,0
-
+prop:sample_prop:
+    impression: A sample prop sits here.
+    keywords: sample prop
+    location: area:0,0,0