base_merchant.xml reverted

diff --git a/application/ship-simu/templates/de/game/merchant/base_merchant.xml b/application/ship-simu/templates/de/game/merchant/base_merchant.xml
index d075c00bf8a2f9abf12324e3637f9a8dba6f34d7..dbbf124127844ad3ef49db4125a6c1ba5761aa94 100644 (file)
--- a/application/ship-simu/templates/de/game/merchant/base_merchant.xml
+++ b/application/ship-simu/templates/de/game/merchant/base_merchant.xml
@@ -25,26 +25,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        <!-- General data about this merchant like id, type, summary or description. //-->
        <general-data>
                <id>{?id?}</id>
        <!-- General data about this merchant like id, type, summary or description. //-->
        <general-data>
                <id>{?id?}</id>

+               <name>{?name?}</name>

                <type>{?type?</type>
                <!-- A summary what this merchant is trading. //-->
                <type>{?type?</type>
                <!-- A summary what this merchant is trading. //-->

-               <merchant-summary>
+               <summary>

                        <![CDATA[{?summary?}]]>
                        <![CDATA[{?summary?}]]>

-               </merchant-summary>
+               </summary>

                <!-- A full description about this merchant. //-->
                <!-- A full description about this merchant. //-->

-               <merchant-description>
+               <description>

                        <![CDATA[{?description?}]]>
                        <![CDATA[{?description?}]]>

-               </merchant-description>
+               </description>

        </general-data>
        </general-data>

-       <!-- A detailed trading list of resources for this merchant. Amount, when
+       <!-- The owner of this merchant. If left out the AI of the game will play
+            this merchant. //-->
+       <owner>
+               <company id="{?owner_id?}" />
+       </owner>
+       <!-- A detailed trading list of goods this merchant is trading. Amount, when

             the first item was added or the last one was removed are being stored
             the first item was added or the last one was removed are being stored

-            with every resource. //-->
-       <resource-list>
-               <!-- A single resource this merchant is trading. //-->
-               <resource
-                       <id>{?resource_id?}</id>
-                       <amount>{?resource_amount?}</amount>
-                       <first-added>{?resource_added?}</first-added>
-                       <last-removed>{?resource_remoed?}</last-removed>
-               </resource>
-       </resource-list>
+            with every goods. //-->
+       <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>
+       </goods-list>

 </merchant>
 </merchant>