From b6010ac5e38004f02e1ece27167e2568323d5edf Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 25 Sep 2009 21:10:08 +0000
Subject: [PATCH] base_merchant.xml reverted
---
.../de/game/merchant/base_merchant.xml | 38 +++++++++++--------
1 file changed, 23 insertions(+), 15 deletions(-)
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 d075c00..dbbf124 100644
--- 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>
+ <name>{?name?}</name>
<type>{?type?</type>
<!-- A summary what this merchant is trading. //-->
- <merchant-summary>
+ <summary>
<![CDATA[{?summary?}]]>
- </merchant-summary>
+ </summary>
<!-- A full description about this merchant. //-->
- <merchant-description>
+ <description>
<![CDATA[{?description?}]]>
- </merchant-description>
+ </description>
</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
- 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>
--
2.39.5