From 4982055fcd221e4447e54f06c2c15c997880e870 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 15 Sep 2009 20:52:42 +0000
Subject: [PATCH] Huge rewrite of all base templates, added base_ship.xml
 (unfinished)

---
 .gitattributes                                |  2 +
 .../de/game/building/base_building.xml        | 49 ++++++++++---
 .../de/game/merchant/base_merchant.xml        | 14 +++-
 .../de/game/mineral/base_mineral.xml          |  4 +-
 .../de/game/research/base_research.xml        |  7 +-
 .../de/game/resource/base_resource.xml        |  4 +-
 .../templates/de/game/ship/.htaccess          |  1 +
 .../templates/de/game/ship/base_ship.xml      | 68 +++++++++++++++++++
 .../de/game/technology/base_technology.xml    |  5 +-
 9 files changed, 138 insertions(+), 16 deletions(-)
 create mode 100644 application/ship-simu/templates/de/game/ship/.htaccess
 create mode 100644 application/ship-simu/templates/de/game/ship/base_ship.xml

diff --git a/.gitattributes b/.gitattributes
index 1146872..605c291 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -288,6 +288,8 @@ application/ship-simu/templates/de/game/research/.htaccess -text
 application/ship-simu/templates/de/game/research/base_research.xml -text
 application/ship-simu/templates/de/game/resource/.htaccess -text
 application/ship-simu/templates/de/game/resource/base_resource.xml -text
+application/ship-simu/templates/de/game/ship/.htaccess -text
+application/ship-simu/templates/de/game/ship/base_ship.xml -text
 application/ship-simu/templates/de/game/technology/.htaccess -text
 application/ship-simu/templates/de/game/technology/base_technology.xml -text
 application/ship-simu/templates/de/game/types/.htaccess -text
diff --git a/application/ship-simu/templates/de/game/building/base_building.xml b/application/ship-simu/templates/de/game/building/base_building.xml
index 5abfa67..c9815d2 100644
--- a/application/ship-simu/templates/de/game/building/base_building.xml
+++ b/application/ship-simu/templates/de/game/building/base_building.xml
@@ -38,7 +38,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<![CDATA[{?description?}]]>
 		</description>
 		<!-- General data, like short name, type, level and many more. //-->
-		<general-data id="{?id?}" name="{?name?}" type="{?type?}" level="{?level?}">
+		<general-data>
+			<id>{?id?}</id>
+			<name>{?name?}</name>
+			<type>{?type?}</type>
+			<level>{?level?}</level>
 			<!-- The owner of this building. //-->
 			<owner id="{?owner_id?}" type="{?owner_type?}" owned-start="{?owner_start_timestamp?}" owned-end="{?owner_end_timestamp?}" />
 			<!-- The occupant of this building. //-->
@@ -70,18 +74,32 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<land-price currency="{?land_currency?}" />
 		<!-- Construction costs may be empty when this building is bougth from
 		     an other user e.g. a broker //-->
-		<construction-costs currency="{?construction_currency?}">
+		<construction-costs>
+			<currency>{?construction_currency?}</currency>
 			<construction-company extends="{?construction_template?}">
-				<company id="{?construct_id?}">
+				<!-- The construction company. //-->
+				<company>
+					<id>{?construct_id?}</id>
+					<!-- A construction of a building requires personel. We
+					     summary their salery here for simplicy. //-->
 					<personel-costs currency="{?personel_currency?}" />
-					<resources extends="{?resources_template?}">
-						<resource id="{?resource_id?}">
+					<!-- A lot resources like steel and concrete are required
+					     for new high buildings. Some older or futuristic may
+					     require different resources. //-->
+					<resource-list extends="{?resources_template?}">
+						<!-- A single resource and its amount to construct this
+						     building. //-->
+						<resource>
+							<id>{?resource_id?}</id>
+							<amount>{?resource_amount?}</amount>
+							<!-- The merchant dealing with this resource. //-->
 							<resource-merchant extends="{?merchant_template?}">
 								<merchant id="{?merchant_id?}" />
 							</resource-merchant>
 						</resource>
-					</resources>
+					</resource-list>
 				</company>
+				<!-- The construction contract for constructing this building. //-->
 				<construction-contract extends="{?contract_template?}">
 					<construction-contract id="{?construct_contract_id?}" />
 				</construction-contract>
@@ -91,22 +109,35 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		     it like house cleaning. simplified repair costs and in some way
 		     taxes. //-->
 		<running-costs>
+			<!-- Taxes for the occupied lot. //-->
 			<taxes currency="{?taxes_currency?}" />
-			<maintenance currency="{?maintenance_currency?}">
+			<!-- A building has mostly maintenance costs. //-->
+			<maintenance>
+				<!-- Almost all buildings needs to be cleaned. //-->
 				<cleaning-costs>
+					<currency>{?cleaning_currency?}</currency>
+					<!-- The cleaning company. //-->
+					<cleaning-company id="{?cleaning_id?}" />
+					<!-- The contract for cleaning this building. //-->
 					<cleaning-contract contract_id="{?cleaning_contract_id?}" />
 				</cleaning-costs>
 				<repair-costs>
+					<currency>{?repair_currency?}</currency>
 					<repair contract_id="{?repair_contract_id?}" />
 				</repair-costs>
 			</maintenance>
 		</running-costs>
 		<!-- For constructing a building you sometimes need to take mortgage to
 		     fund the construction costs. //-->
-		<mortgage currency="{?mortgage_currency?}">
+		<mortgage>
+			<currency>{?mortgage_currency?}</currency>
+			<!-- The bank paying the mortage, if not provided, the following
+			     mortage broker must be provided. //-->
 			<bank id="{?bank_id?}" />
+			<!-- A mortage broker who has payed the mortage. //-->
 			<mortgage-broker id="{?broker_id?}" />
-			<agreement id="{?mortage_id?}">
+			<!-- The contract behind the mortage. //-->
+			<contract id="{?mortage_id?}" />
 		</mortgage>
 	</costs>
 	<!-- We also have technology denpencies for a building. These must be
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 741afa9..d075c00 100644
--- a/application/ship-simu/templates/de/game/merchant/base_merchant.xml
+++ b/application/ship-simu/templates/de/game/merchant/base_merchant.xml
@@ -22,16 +22,26 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <merchant>
-	<general-data id="{?id?}" type="{?type?}">
+	<!-- General data about this merchant like id, type, summary or description. //-->
+	<general-data>
+		<id>{?id?}</id>
+		<type>{?type?</type>
+		<!-- A summary what this merchant is trading. //-->
 		<merchant-summary>
 			<![CDATA[{?summary?}]]>
 		</merchant-summary>
+		<!-- A full description about this merchant. //-->
 		<merchant-description>
 			<![CDATA[{?description?}]]>
 		</merchant-description>
 	</general-data>
+	<!-- A detailed trading list of resources for this merchant. Amount, when
+	     the first item was added or the last one was removed are being stored
+	     with every resource. //-->
 	<resource-list>
-		<resource id="{?resource_id?}">
+		<!-- 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>
diff --git a/application/ship-simu/templates/de/game/mineral/base_mineral.xml b/application/ship-simu/templates/de/game/mineral/base_mineral.xml
index 0d61e0a..4e20395 100644
--- a/application/ship-simu/templates/de/game/mineral/base_mineral.xml
+++ b/application/ship-simu/templates/de/game/mineral/base_mineral.xml
@@ -26,7 +26,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <mineral>
 	<!-- General data for this mineral like id, type, summary or description. //-->
-	<general-data id="{?id?}" type="{?type?}">
+	<general-data>
+		<id>{?id?}</id>
+		<type>{?type?}</type>
 		<!-- A summary for this mineral. //-->
 		<mineral-summary>
 			<![CDATA[{?summary?}]]>
diff --git a/application/ship-simu/templates/de/game/research/base_research.xml b/application/ship-simu/templates/de/game/research/base_research.xml
index 43e1154..b564f27 100644
--- a/application/ship-simu/templates/de/game/research/base_research.xml
+++ b/application/ship-simu/templates/de/game/research/base_research.xml
@@ -26,7 +26,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <research-proposal>
 	<!-- General data of this research like id, summar or description. //-->
-	<research-data id="{?id?}" type="{?type?}">
+	<research-data>
+		<id>{?id?}</id>
+		<type>{?type?}</type>
 		<!-- All researches end up with results which can be improvements to
 		     to existing technology or how research is conducted. Some research
 		     may have multiple results and they all might not be good. //-->
@@ -54,7 +56,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<!-- A research level X has its own summary and a full description.
 		     It also can have depencies which makes it possible to add different
 		     depencies for higher research levels. //-->
-		<research-level level="{?level?}">
+		<research-level>
+			<level>{?level?}</level>
 			<!-- When the research of this level has been started ... //-->
 			<research-started timestamp="{?started?}" />
 			<!-- ... and when it has ended so when the research results are
diff --git a/application/ship-simu/templates/de/game/resource/base_resource.xml b/application/ship-simu/templates/de/game/resource/base_resource.xml
index 386a4c4..6df5267 100644
--- a/application/ship-simu/templates/de/game/resource/base_resource.xml
+++ b/application/ship-simu/templates/de/game/resource/base_resource.xml
@@ -25,7 +25,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <resource>
 	<!-- General data for this resource like id, type, summary or description. //-->
-	<general-data id="{?id?}" type="{?type?}">
+	<general-data>
+		<id>{?id?}</id>
+		<type>{?type?}</type>
 		<!-- A summary for this resource. //-->
 		<resource-summary>
 			<![CDATA[{?summary?}]]>
diff --git a/application/ship-simu/templates/de/game/ship/.htaccess b/application/ship-simu/templates/de/game/ship/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/ship/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/templates/de/game/ship/base_ship.xml b/application/ship-simu/templates/de/game/ship/base_ship.xml
new file mode 100644
index 0000000..e4fe7ac
--- /dev/null
+++ b/application/ship-simu/templates/de/game/ship/base_ship.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general ship template.
+
+@author		Roland Haeder <webmaster@ship-simu.org>
+@version	0.0.0
+@copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
+@license	GNU GPL 3.0 or any newer version
+@link		http://www.ship-simu.org
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>
+//-->
+<ship>
+	<general-data>
+		<id>{?id?}</id>
+		<name><![CDATA[{?name?}]]></name>
+		<type>{?type?}</type>
+		<total-propellers>{?propellers?}</total-propellers>
+		<total-weight>{?weight?}</totaal-weight>
+		<total-displacement>{?displacement?}</totaal-displacement>
+		<construction>
+			<construction-company>{?construction_id?}</construction-company>
+			<construction-started>{?construction_started?}</construction-started>
+			<construction-finished>{?construction_finished?</construction-finished>
+		</construction>
+	</general-data>
+	<shipping-company-list>
+		<shipping-company>
+			<id>{?company_id?}</id>
+			<holder>.
+				<started>{?holder_started?}</started>
+				<ended>{?holder_ended?}</ended>
+			</hoolder>
+			<contract id="{?contract_id?}" />
+		</shipping-company>
+	</shipping-company-list>
+	<ship-structure-list>
+		<ship-structure>
+			<id>{?structure_id?}</id>
+			<type>{?structure_type?}</type>
+		</ship-structure>
+	</ship-structure-list>
+	<engine>
+		<id>{?engine_id?{</id>
+		<type>{?engine_type?}</type>
+	</engine>
+	<ship-systems>
+		<electrical-system>
+		</electrical-system>
+		<hydraulic-system>
+		</hydraulic-system>
+		<navigation-system>
+		</navigation-system>
+		<guidance-system>
+		</guidance-system>
+	</ship-systems>
+</ship>
diff --git a/application/ship-simu/templates/de/game/technology/base_technology.xml b/application/ship-simu/templates/de/game/technology/base_technology.xml
index 977cca9..b08fe14 100644
--- a/application/ship-simu/templates/de/game/technology/base_technology.xml
+++ b/application/ship-simu/templates/de/game/technology/base_technology.xml
@@ -23,7 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology>
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data id="{?id?}" type="{?type?}" level="{?level?}">
+	<general-data>
+		<id>{?id?}</id>
+		<type>{?type?}</type>
+		<level>{?level?}</level>
 		<!-- The date/time when this technology was gained, e.g. by research. //-->
 		<technology-gained timestamp="{?gained?}" />
 		<!-- A summary of this technology. //-->
-- 
2.39.5