Major rewrite of game logic XMLs

[shipsimu.git] / application / ship-simu / templates / game / merchant / base_merchant.xml

diff --git a/application/ship-simu/templates/game/merchant/base_merchant.xml b/application/ship-simu/templates/game/merchant/base_merchant.xml
index dbbf124127844ad3ef49db4125a6c1ba5761aa94..a4a7c85f2bde22419038f7d27d132e924b12d8a0 100644 (file)
--- a/application/ship-simu/templates/game/merchant/base_merchant.xml
+++ b/application/ship-simu/templates/game/merchant/base_merchant.xml
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <merchant>
        <!-- General data about this merchant like id, type, summary or description. //-->
-       <general-data>
+       <merchant-data>
                <id>{?id?}</id>
                <name>{?name?}</name>
                <type>{?type?</type>
@@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <description>
                        <![CDATA[{?description?}]]>
                </description>
-       </general-data>
+       </merchant-data>
        <!-- The owner of this merchant. If left out the AI of the game will play
             this merchant. //-->
        <owner>
@@ -47,12 +47,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        <goods-list>
                <!-- A single goods this merchant is trading. //-->
                <goods>
-                       <id>{?goods_id?}</id>
-                       <name>{?goods_name?}</name>
-                       <type>{?goods_type?}</type>
-                       <amount>{?goods_amount?}</amount>
-                       <first-added>{?goods_added?}</first-added>
-                       <last-removed>{?goods_remoed?}</last-removed>
+                       <goods-id>{?goods_id?}</goods-id>
+                       <goods-name>{?goods_name?}</goods-name>
+                       <goods-type>{?goods_type?}</goods-type>
+                       <goods-amount>{?goods_amount?}</goods-amount>
+                       <goods-first-added>{?goods_added?}</goods-first-added>
+                       <goods-last-removed>{?goods_remoed?}</goods-last-removed>
                </goods>
        </goods-list>
 </merchant>