From 1839a2df59c1271b8700790ad3868f1241510053 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 24 Sep 2009 21:59:43 +0000
Subject: [PATCH] A lot rewrites, engine base template added, naval
 architecture added: - All templates are now rewritten to use nodes instead of
 attributes. Still   'extends' should be used which is fine. - New template
 'base_engine.xml' added which respresents the engine in general - New
 technology 'naval architects' added (basicly finished, maybe need changes) -
 Some fixes to XML templates

---
 .gitattributes                                |  3 +
 .../de/game/electronic/base_electronic.xml    | 23 ++++++++
 .../templates/de/game/engine/.htaccess        |  1 +
 .../templates/de/game/engine/base_engine.xml  | 25 +++++++++
 .../de/game/merchant/base_merchant.xml        | 38 ++++++++-----
 .../de/game/mineral/base_mineral.xml          | 14 +++--
 .../de/game/research/base_research.xml        | 26 ++++++---
 .../de/game/resource/base_resource.xml        |  8 +--
 .../templates/de/game/ship/base_ship.xml      | 15 +++++
 .../de/game/technology/architecture.xml       |  2 +-
 .../de/game/technology/base_technology.xml    | 20 +++----
 .../de/game/technology/glass_making.xml       |  8 +--
 .../de/game/technology/naval_architecture.xml | 56 +++++++++++++++++++
 .../templates/de/game/technology/plastics.xml | 11 ++--
 .../templates/de/game/technology/statics.xml  |  2 +-
 .../de/game/types/technology_types.xml        |  6 +-
 16 files changed, 203 insertions(+), 55 deletions(-)
 create mode 100644 application/ship-simu/templates/de/game/engine/.htaccess
 create mode 100644 application/ship-simu/templates/de/game/engine/base_engine.xml
 create mode 100644 application/ship-simu/templates/de/game/technology/naval_architecture.xml

diff --git a/.gitattributes b/.gitattributes
index ac05578..3beebd7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -286,6 +286,8 @@ application/ship-simu/templates/de/game/contract/.htaccess -text
 application/ship-simu/templates/de/game/contract/base_contract.xml -text
 application/ship-simu/templates/de/game/electronic/.htaccess -text
 application/ship-simu/templates/de/game/electronic/base_electronic.xml -text
+application/ship-simu/templates/de/game/engine/.htaccess -text
+application/ship-simu/templates/de/game/engine/base_engine.xml -text
 application/ship-simu/templates/de/game/merchant/.htaccess -text
 application/ship-simu/templates/de/game/merchant/base_merchant.xml -text
 application/ship-simu/templates/de/game/mineral/.htaccess -text
@@ -303,6 +305,7 @@ application/ship-simu/templates/de/game/technology/base_technology.xml -text
 application/ship-simu/templates/de/game/technology/drawings.xml -text
 application/ship-simu/templates/de/game/technology/glass_making.xml -text
 application/ship-simu/templates/de/game/technology/laboratory_equipment.xml -text
+application/ship-simu/templates/de/game/technology/naval_architecture.xml -text
 application/ship-simu/templates/de/game/technology/plastics.xml -text
 application/ship-simu/templates/de/game/technology/statics.xml -text
 application/ship-simu/templates/de/game/types/.htaccess -text
diff --git a/application/ship-simu/templates/de/game/electronic/base_electronic.xml b/application/ship-simu/templates/de/game/electronic/base_electronic.xml
index c6a2326..1a45f15 100644
--- a/application/ship-simu/templates/de/game/electronic/base_electronic.xml
+++ b/application/ship-simu/templates/de/game/electronic/base_electronic.xml
@@ -32,6 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<general-data>
 		<!-- Id and type for this electronic. //-->
 		<id>{?id?}</id>
+		<name>{?name?}</name>
 		<type>{?type?}</type>
 		<!-- Simplified dimension of the electronics because it will be placed
 		     into a small box for transportation. //-->
@@ -41,4 +42,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<length>{?length?}</length>
 		</dimension>
 	</general-data>
+	<!-- An electronical device may depend on one or more technologies, at least
+	     'electronics'. //-->
+	<dependencies>
+		<!-- A list technology dependencies for this electronical device. //-->
+		<technology-dependency-list>
+			<!-- A single technollogical dependency. //-->
+			<technology-dependency>
+				<id>{?technology_id?}</id>
+				<name>{?technology_name?}</name>
+				<type>{?technology_type?}</type>
+			</technology-dependency>
+		</technology-dependency-list>
+		<!-- A list research proposal dependencies for this electronical device. //-->
+		<research-dependency-list>
+			<!-- A single technollogical dependency. //-->
+			<research-dependency>
+				<id>{?research_id?}</id>
+				<name>{?research_name?}</name>
+				<type>{?research_type?}</type>
+			</research-dependency>
+		</research-dependency-list>
+	</dependencies>
 </electronic>
diff --git a/application/ship-simu/templates/de/game/engine/.htaccess b/application/ship-simu/templates/de/game/engine/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/engine/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/templates/de/game/engine/base_engine.xml b/application/ship-simu/templates/de/game/engine/base_engine.xml
new file mode 100644
index 0000000..9ca0423
--- /dev/null
+++ b/application/ship-simu/templates/de/game/engine/base_engine.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general engine 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/>
+//-->
+<engine>
+</engine>
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>
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 e114e4b..e7fa976 100644
--- a/application/ship-simu/templates/de/game/mineral/base_mineral.xml
+++ b/application/ship-simu/templates/de/game/mineral/base_mineral.xml
@@ -30,18 +30,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<id>{?id?}</id>
 		<type>{?type?}</type>
 		<!-- A summary for this mineral. //-->
-		<mineral-summary>
+		<summary>
 			<![CDATA[{?summary?}]]>
-		</mineral-summary>
+		</summary>
 		<!-- A full description for this mineral. //-->
-		<mineral-description>
+		<description>
 			<![CDATA[{?description?}]]>
-		</mineral-description>
+		</description>
 	</general-data>
 	<!-- To mine some minerals some knowledge in one or two technologies is
 	     required. Here you can list each technology with its required level. //-->
 	<technology-dependency-list>
 		<!-- A single technology required to mine this mineral. //-->
-		<technology-dependency id="{?technology_id?}" level="{?technology_level?}" />
+		<technology-dependency>
+			<id>{?technology_id?}</id>
+			<name>{?technology_name?}</name>
+			<level>{?technology_level?}</level>
+		</technology-dependency>
 	</technology-dependency-list>
 </mineral>
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 c067967..8a99495 100644
--- a/application/ship-simu/templates/de/game/research/base_research.xml
+++ b/application/ship-simu/templates/de/game/research/base_research.xml
@@ -45,13 +45,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			</research-result>
 		</research-result-list>
 		<!-- A summary for this research proposal. //-->
-		<research-summary>
+		<summary>
 			<![CDATA[{?summary?}]]>
-		</research-summary>
+		</summary>
 		<!-- A full description for this research proposal. //-->
-		<research-description>
+		<description>
 			<![CDATA[{?description?}]]>
-		</research-description>
+		</description>
 	</research-data>
 	<!-- This is somewhat a "research history". //-->
 	<research-level-list>
@@ -77,13 +77,25 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			     'dependency types'. We are doing this this way to keep this XML
 			     simple but still flexible enougth to fit all proposal needs. //-->
 			<technology-dependency-list>
-				<technology-dependency id="{?technology_id?}" level="{?technology_level?}" />
+				<technology-dependency>
+					<id>{?technology_id?</id>
+					<name>{?technology_name?</name>
+					<level>{?technology_level?}</level>
+				</technology-dependency>
 			</technology-dependency-list>
 			<research-dependency-list>
-				<research-dependency id="{?research_id?}" level="{?research_level?}" />
+				<research-dependency>
+					<id>{?research_id?}</id>
+					<name>{?research_id?}</name>
+					<level>{?research_level?}</level>
+				</research-dependency>
 			</research-dependency-list>
 			<building-dependency-list>
-				<building-dependency id="{?building_id?}" level="{?building_level?}" />
+				<building-dependency>
+					<id>{?building_id?}</id>
+					<name>{?building_name?}</name>
+					<level>{?building_level?}</level>
+				</building-dependency>
 			</building-dependency-list>
 		</research-level>
 	</research-level-list>
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 2b5ba5d..01db9b1 100644
--- a/application/ship-simu/templates/de/game/resource/base_resource.xml
+++ b/application/ship-simu/templates/de/game/resource/base_resource.xml
@@ -30,13 +30,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<name>{?name?}</name>
 		<type>{?type?}</type>
 		<!-- A summary for this resource. //-->
-		<resource-summary>
+		<summary>
 			<![CDATA[{?summary?}]]>
-		</resource-summary>
+		</summary>
 		<!-- A full description for this resource. //-->
-		<resource-description>
+		<description>
 			<![CDATA[{?description?}]]>
-		</resource-description>
+		</description>
 	</general-data>
 	<!-- To harvest some resource some knowledge in one or two technologies is
 	     required. Here you can list each technology with its required level. //-->
diff --git a/application/ship-simu/templates/de/game/ship/base_ship.xml b/application/ship-simu/templates/de/game/ship/base_ship.xml
index 1e900f5..b5431a0 100644
--- a/application/ship-simu/templates/de/game/ship/base_ship.xml
+++ b/application/ship-simu/templates/de/game/ship/base_ship.xml
@@ -108,4 +108,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<!-- @TODO This section is not complete. //-->
 		</fire-system>
 	</ship-systems>
+	<!-- Ships depend on several technologies and maybe research proposals. //-->
+	<dependencies>
+		<!-- A list of technology dependencies for this ship. //-->
+		<technology-dependency-list>
+			<!-- A single technology dependencies for this ship. //-->
+			<technology-dependency>
+			</technology-dependency>
+		</technology-dependency-list>
+		<!-- A list of research proposals dependencies for this ship. //-->
+		<research-dependency-list>
+			<!-- A single research proposals  dependencies for this ship. //-->
+			<research-dependency>
+			</research-dependency>
+		</research-dependency-list>
+	</dependencies>
 </ship>
diff --git a/application/ship-simu/templates/de/game/technology/architecture.xml b/application/ship-simu/templates/de/game/technology/architecture.xml
index 2c075fd..ef99147 100644
--- a/application/ship-simu/templates/de/game/technology/architecture.xml
+++ b/application/ship-simu/templates/de/game/technology/architecture.xml
@@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<level>5</level>
 			</technology-dependency>
 		</technology-dependency-list>
-		<!-- All research dependencies for this technology. //-->
+		<!-- All research proposal dependencies for this technology. //-->
 		<research-dependency-list>
 			<research-dependency>
 				<name>mathematics</name>
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 6e2ae92..299e1d4 100644
--- a/application/ship-simu/templates/de/game/technology/base_technology.xml
+++ b/application/ship-simu/templates/de/game/technology/base_technology.xml
@@ -30,13 +30,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<!-- The date/time when this technology was gained, e.g. by research. //-->
 		<technology-gained timestamp="{?gained?}" />
 		<!-- A summary of this technology. //-->
-		<technology-summary>
+		<summary>
 			<![CDATA[{?summary?}]]>
-		</technology-summary>
+		</summary>
 		<!-- A full description of this technology. //-->
-		<technology-description>
+		<description>
 			<![CDATA[{?description?}]]>
-		</technology-description>
+		</description>
 	</general-data>
 	<!-- All levels of this technology are held in this tag. //-->
 	<technology-level-list>
@@ -50,9 +50,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<![CDATA[{?level_summary?}]]>
 			</technology-level-summary>
 			<!--  A full description of this technology level. //-->
-			<technology-level-description>
+			<level-description>
 				<![CDATA[{?level_description?}]]>
-			</technology-level-description>
+			</level-description>
 			<!-- A specific technology level may depend on some further technologies or research
 			     proposals. //-->
 			<level-dependencies>
@@ -65,9 +65,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 						<level>{?technology_level_level?}</level>
 					</technology-level-dependency>
 				</technology-level-dependency-list>
-				<!-- All research dependencies for this technology. //-->
+				<!-- All research proposal dependencies for this technology. //-->
 				<research-level-dependency-list>
-					<!-- A research dependency for this technology. //-->
+					<!-- A research proposal dependency for this technology. //-->
 					<research-level-dependency>
 						<id>{?research_level_id?}</id>
 						<name>{?research_level_name?}</name>
@@ -89,9 +89,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<level>{?technology_level?}</level>
 			</technology-dependency>
 		</technology-dependency-list>
-		<!-- All research dependencies for this technology. //-->
+		<!-- All research proposal dependencies for this technology. //-->
 		<research-dependency-list>
-			<!-- A research dependency for this technology. //-->
+			<!-- A research proposal dependency for this technology. //-->
 			<research-dependency>
 				<id>{?research_id?}</id>
 				<name>{?research_name?}</name>
diff --git a/application/ship-simu/templates/de/game/technology/glass_making.xml b/application/ship-simu/templates/de/game/technology/glass_making.xml
index 85d63d5..0dca821 100644
--- a/application/ship-simu/templates/de/game/technology/glass_making.xml
+++ b/application/ship-simu/templates/de/game/technology/glass_making.xml
@@ -44,9 +44,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 						<level>{?technology_level_level?}</level>
 					</technology-level-dependency>
 				</technology-level-dependency-list>
-				<!-- All research dependencies for this technology. //-->
+				<!-- All research proposal dependencies for this technology. //-->
 				<research-level-dependency-list>
-					<!-- A research dependency for this technology. //-->
+					<!-- A research proposal dependency for this technology. //-->
 					<research-level-dependency>
 						<name>{?research_level_name?}</name>
 						<level>{?research_level_level?}</level>
@@ -66,9 +66,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<level>{?technology_level?}</level>
 			</technology-dependency>
 		</technology-dependency-list>
-		<!-- All research dependencies for this technology. //-->
+		<!-- All research proposal dependencies for this technology. //-->
 		<research-dependency-list>
-			<!-- A research dependency for this technology. //-->
+			<!-- A research proposal dependency for this technology. //-->
 			<research-dependency>
 				<name>{?research_name?}</name>
 				<level>{?research_level?}</level>
diff --git a/application/ship-simu/templates/de/game/technology/naval_architecture.xml b/application/ship-simu/templates/de/game/technology/naval_architecture.xml
new file mode 100644
index 0000000..27f5b1b
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/naval_architecture.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A naval architecture technology 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/>
+//-->
+<technology extends="architecture">
+	<!-- General technology data like type, level, summary or description. //-->
+	<general-data>
+		<name>naval_architecture</name>
+		<type>ship_construction</type>
+	</general-data>
+	<!-- A technology may depend on some other technologies or research
+	     proposals. //-->
+	<dependencies>
+		<!-- All technology dependencies for this technology. //-->
+		<technology-dependency-list>
+			<technology-dependency>
+				<name>architecture</name>
+				<level>3</level>
+			</technology-dependency>
+			<technology-dependency>
+				<name>statics</name>
+				<level>5</level>
+			</technology-dependency>
+			<technology-dependency>
+				<name>drawings</name>
+				<level>6</level>
+			</technology-dependency>
+		</technology-dependency-list>
+		<!-- All research proposal dependencies for this technology. //-->
+		<research-dependency-list>
+			<research-dependency>
+				<name>mathematics</name>
+				<level>8</level>
+			</research-dependency>
+		</research-dependency-list>
+	</dependencies>
+</technology>
diff --git a/application/ship-simu/templates/de/game/technology/plastics.xml b/application/ship-simu/templates/de/game/technology/plastics.xml
index 5556915..4a84343 100644
--- a/application/ship-simu/templates/de/game/technology/plastics.xml
+++ b/application/ship-simu/templates/de/game/technology/plastics.xml
@@ -44,9 +44,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 						<level>{?technology_level_level?}</level>
 					</technology-level-dependency>
 				</technology-level-dependency-list>
-				<!-- All research dependencies for this technology. //-->
+				<!-- All research proposal dependencies for this technology. //-->
 				<research-level-dependency-list>
-					<!-- A research dependency for this technology. //-->
+					<!-- A research proposal dependency for this technology. //-->
 					<research-level-dependency>
 						<name>{?research_level_name?}</name>
 						<level>{?research_level_level?}</level>
@@ -65,12 +65,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<level>chemicals</level>
 			</technology-dependency>
 		</technology-dependency-list>
-		<!-- All research dependencies for this technology. //-->
+		<!-- All research proposal dependencies for this technology. //-->
 		<research-dependency-list>
-			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<name>chemistry</name>
+				<level>3</level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/de/game/technology/statics.xml b/application/ship-simu/templates/de/game/technology/statics.xml
index 2a0148e..924b861 100644
--- a/application/ship-simu/templates/de/game/technology/statics.xml
+++ b/application/ship-simu/templates/de/game/technology/statics.xml
@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<!-- A technology may depend on some other technologies or research
 	     proposals. //-->
 	<dependencies>
-		<!-- All research dependencies for this technology. //-->
+		<!-- All research proposal dependencies for this technology. //-->
 		<research-dependency-list>
 			<research-dependency>
 				<name>mathematics</name>
diff --git a/application/ship-simu/templates/de/game/types/technology_types.xml b/application/ship-simu/templates/de/game/types/technology_types.xml
index 68bf5f8..ed27d29 100644
--- a/application/ship-simu/templates/de/game/types/technology_types.xml
+++ b/application/ship-simu/templates/de/game/types/technology_types.xml
@@ -27,12 +27,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<technology-type type="base" />
 	<!-- Technology required for construction of buildings. //-->
 	<technology-type type="building" />
+	<!-- Different chemicals. //-->
+	<technology-type type="chemicals" />
 	<!-- Technologies for different constructions. //-->
 	<technology-type type="construction" />
 	<!-- Different equipment technologies. //-->
 	<technology-type type="equipment" />
 	<!-- Different production technologies. //-->
 	<technology-type type="production" />
-	<!-- Different chemicals. //-->
-	<technology-type type="chemicals" />
+	<!-- Technologies for different ship constructions. //-->
+	<technology-type type="ship_construction" />
 </technology-type-list>
-- 
2.39.5