From 79bf69edf6b7a5d9185567d3b215650dcca61b9c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Wed, 2 Dec 2009 13:23:12 +0000
Subject: [PATCH] Major rewrite of game logic XMLs

---
 .../de/menu/generic_menu_entries.xml          | 12 ++---
 .../game/building/advanced_research_lab.xml   | 15 ++++---
 .../templates/game/building/base_building.xml | 15 ++++---
 .../templates/game/building/research_lab.xml  | 14 +++---
 .../game/container/base_container.xml         | 15 ++++---
 .../game/electronic/base_electronic.xml       | 16 +++----
 .../templates/game/electronic/cellphone.xml   |  4 +-
 .../templates/game/electronic/hifi_system.xml |  4 +-
 .../game/electronic/radio_receiver.xml        |  4 +-
 .../game/electronic/surround_system.xml       |  4 +-
 .../templates/game/electronic/television.xml  |  4 +-
 .../templates/game/engine/base_engine.xml     | 16 +++----
 .../templates/game/farmer/base_farmer.xml     | 16 +++----
 .../templates/game/fuel/base_fuel.xml         |  4 +-
 .../templates/game/merchant/base_merchant.xml | 16 +++----
 .../templates/game/mineral/base_mineral.xml   |  4 +-
 .../templates/game/research/base_research.xml | 44 +++++++++++--------
 .../templates/game/research/electronics.xml   | 10 +++--
 .../game/research/radio_receiving.xml         |  5 ++-
 .../templates/game/research/statics.xml       | 15 ++++---
 .../templates/game/resource/base_resource.xml | 11 ++---
 .../templates/game/ship/base_ship.xml         | 30 +++++++------
 .../templates/game/tank/base_tank.xml         | 17 +++----
 .../game/technology/architecture.xml          | 21 +++++----
 .../game/technology/base_technology.xml       | 30 +++++++------
 .../game/technology/cellular_network.xml      | 15 ++++---
 .../templates/game/technology/drawings.xml    |  4 +-
 .../game/technology/glass_making.xml          | 24 +++++-----
 .../game/technology/household_devices.xml     | 15 ++++---
 .../game/technology/intergrated_currents.xml  | 14 +++---
 .../game/technology/laboratory_equipment.xml  | 14 +++---
 .../game/technology/naval_architecture.xml    | 24 +++++-----
 .../templates/game/technology/plastics.xml    | 16 ++++---
 .../game/technology/signal_amplifying.xml     | 14 +++---
 .../game/technology/signal_modulation.xml     | 14 +++---
 .../game/technology/sound_equalizer.xml       | 14 +++---
 .../game/technology/sound_processor.xml       | 19 ++++----
 .../game/technology/surround_mixing.xml       | 14 +++---
 .../templates/game/technology/transistor.xml  | 20 +++++----
 .../game/technology/video_receiving.xml       | 19 ++++----
 40 files changed, 327 insertions(+), 259 deletions(-)

diff --git a/application/ship-simu/templates/de/menu/generic_menu_entries.xml b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
index be74a9d..2113124 100644
--- a/application/ship-simu/templates/de/menu/generic_menu_entries.xml
+++ b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
@@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			</block-header>
 			<entry-list>
 				<entry>
-					<entry-id><![CDATA[home]]></entry-id>
+					<entry-id><![CDATA[home_entry]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_home]]></anchor-id>
 						<anchor-text><![CDATA[Home]]></anchor-text>
@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 					</anchor>
 				</entry>
 				<entry>
-					<entry-id><![CDATA[login]]></entry-id>
+					<entry-id><![CDATA[login_entry]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_login]]></anchor-id>
 						<anchor-text><![CDATA[Einloggen]]></anchor-text>
@@ -51,7 +51,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 					</anchor>
 				</entry>
 				<entry>
-					<entry-id><![CDATA[register]]></entry-id>
+					<entry-id><![CDATA[register_entry]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_register]]></anchor-id>
 						<anchor-text><![CDATA[Anmeldung]]></anchor-text>
@@ -60,7 +60,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 					</anchor>
 				</entry>
 				<entry>
-					<entry-id><![CDATA[pillory]]></entry-id>
+					<entry-id><![CDATA[pillory_entry]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_pillory]]></anchor-id>
 						<anchor-text><![CDATA[Pranger]]></anchor-text>
@@ -85,7 +85,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			</block-header>
 			<entry-list>
 				<entry>
-					<entry-id><![CDATA[imprint]]></entry-id>
+					<entry-id><![CDATA[imprint_entry]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_imprint]]></anchor-id>
 						<anchor-text><![CDATA[Impressum]]></anchor-text>
@@ -94,7 +94,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 					</anchor>
 				</entry>
 				<entry>
-					<entry-id><![CDATA[terms]]></entry-id>
+					<entry-id><![CDATA[terms_entry]]></entry-id>
 					<anchor>
 						<anchor-id><![CDATA[menu_terms]]></anchor-id>
 						<anchor-text><![CDATA[ANBs]]></anchor-text>
diff --git a/application/ship-simu/templates/game/building/advanced_research_lab.xml b/application/ship-simu/templates/game/building/advanced_research_lab.xml
index ef8aebe..2556eaa 100644
--- a/application/ship-simu/templates/game/building/advanced_research_lab.xml
+++ b/application/ship-simu/templates/game/building/advanced_research_lab.xml
@@ -25,26 +25,29 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<!-- General building data //-->
 	<building-data>
 		<!-- General data, like short name, type, level and many more. //-->
-		<general-data>
+		<building-data>
 			<name>advanced_research_lab</name>
 			<type>research</type>
-		</general-data>
+		</building-data>
 	</building-data>
 	<!-- We also have technology denpencies for a building. These must be
 	     understand by construction companies who made contracts with the
 	     shipping company to construct this building. //-->
 	<dependencies>
 		<!-- A list of required technology to construct this building. //-->
+		<!-- @TODO Find technology types //-->
 		<technology-dependency-list>
 			<!-- Arcgictecture is required. //-->
 			<technology-dependency>
-				<type>architecture</type>
-				<level>10</level>
+				<technology-name>architecture</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>10</technology-level>
 			</technology-dependency>
 			<!-- Labory equipment is required. //-->
 			<technology-dependency>
-				<type>laboratory_equipment</type>
-				<level>8</level>
+				<technology-name>laboratory_equipment</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>8</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/building/base_building.xml b/application/ship-simu/templates/game/building/base_building.xml
index ab77439..5a0aafb 100644
--- a/application/ship-simu/templates/game/building/base_building.xml
+++ b/application/ship-simu/templates/game/building/base_building.xml
@@ -42,7 +42,7 @@ 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>
+		<building-data>
 			<id>{?id?}</id>
 			<name>{?name?}</name>
 			<type>{?type?}</type>
@@ -71,7 +71,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 					<![CDATA[{?destruction_reason?}]]>
 				</destruction-reason>
 			</deconstructed>
-		</general-data>
+		</building-data>
 	</building-data>
 	<!-- All sorts of costs for a building. //-->
 	<costs>
@@ -84,7 +84,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<construction-company extends="{?construction_template?}">
 				<!-- The construction company. //-->
 				<company>
-					<id>{?construct_id?}</id>
+					<company-id>{?construct_id?}</company-id>
 					<!-- A construction of a building requires personel. We
 					     summary their salery here for simplicy. //-->
 					<personel-costs currency="{?personel_currency?}" />
@@ -95,7 +95,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 						<!-- A single resource and its amount to construct this
 						     building. //-->
 						<resource>
-							<id>{?resource_id?}</id>
+							<resource-id>{?resource_id?}</resource-id>
 							<amount>{?resource_amount?}</amount>
 							<!-- The merchant dealing with this resource. //-->
 							<resource-merchant extends="{?merchant_template?}">
@@ -153,9 +153,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A single required technology to construct this building. //-->
 			<technology-dependency>
-				<id>{?technology_id?}</id>
-				<type>{?technology_type?}</type>
-				<level>{?technology_level?}</level>
+				<technology-id>{?technology_id?}</technology-id>
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>{?technology_level?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/building/research_lab.xml b/application/ship-simu/templates/game/building/research_lab.xml
index e54b77c..d9c413f 100644
--- a/application/ship-simu/templates/game/building/research_lab.xml
+++ b/application/ship-simu/templates/game/building/research_lab.xml
@@ -25,10 +25,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<!-- General building data //-->
 	<building-data>
 		<!-- General data, like short name, type, level and many more. //-->
-		<general-data>
+		<building-data>
 			<name>research_lab</name>
 			<type>research</type>
-		</general-data>
+		</building-data>
 	</building-data>
 	<!-- We also have technology denpencies for a building. These must be
 	     understand by construction companies who made contracts with the
@@ -38,13 +38,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- Arcgictecture is required. //-->
 			<technology-dependency>
-				<type>architecture</type>
-				<level>5</level>
+				<technology-name>architecture</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>5</technology-level>
 			</technology-dependency>
 			<!-- Labory equipment is required. //-->
 			<technology-dependency>
-				<type>laboratory_equipment</type>
-				<level>1</level>
+				<technology-name>laboratory_equipment</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>1</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/container/base_container.xml b/application/ship-simu/templates/game/container/base_container.xml
index 2b22937..c95f4a5 100644
--- a/application/ship-simu/templates/game/container/base_container.xml
+++ b/application/ship-simu/templates/game/container/base_container.xml
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <container>
 	<!-- Some general data about this container. //-->
-	<general-data>
+	<container-data>
 		<!-- Id and type of this container. //-->
 		<id>{?id?}</id>
 		<!-- Uni* name, mostly adapted from template name, for this container. //-->
@@ -36,7 +36,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<length>{?length?}</length>
 			<height>{?height?}</height>
 		</dimensions>
-	</general-data>
+	</container-data>
 	<!-- The owner of the container, this should be a company, //-->
 	<owner>
 		<company id="{?owner_id?}" />
@@ -55,9 +55,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<content-list>
 		<!-- A single content of the container which should be transportated. //-->
 		<content>
-			<id>{?content_id?}</id>
-			<type>{?content_type?}</type>
-			<amount>{?content_amount?}</amount>
+			<content-id>{?content_id?}</content-id>
+			<content-type>{?content_type?}</content-type>
+			<content-amount>{?content_amount?}</content-amount>
 		</content>
 	</content-list>
 	<!-- A system, freezer or colder or something else, which maintains a
@@ -67,8 +67,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<maintenance-system-list>
 		<!-- A single maintenance system. //-->
 		<maintenance-system>
-			<id>{?maintenance_id?}</id>
-			<type>{?maintenance_type?}</type>
+			<maintenance-id>{?maintenance_id?}</maintenance-id>
+			<maintenance-name>{?maintenance_name?}</maintenance-name>
+			<maintenance-type>{?maintenance_type?}</maintenance-type>
 		</maintenance-system>
 	</maintenance-system-list>
 </container>
diff --git a/application/ship-simu/templates/game/electronic/base_electronic.xml b/application/ship-simu/templates/game/electronic/base_electronic.xml
index f29a410..e47a110 100644
--- a/application/ship-simu/templates/game/electronic/base_electronic.xml
+++ b/application/ship-simu/templates/game/electronic/base_electronic.xml
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <electronic>
 	<!-- General data of the electronics. //-->
-	<general-data>
+	<electronic-data>
 		<!-- Id and type for this electronic. //-->
 		<id>{?id?}</id>
 		<name>{?name?}</name>
@@ -41,7 +41,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<height>{?height?}</height>
 			<length>{?length?}</length>
 		</dimensions>
-	</general-data>
+	</electronic-data>
 	<!-- An electronical device may depend on one or more technologies, at least
 	     'electronics'. //-->
 	<dependencies>
@@ -49,18 +49,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A single technollogical dependency. //-->
 			<technology-dependency>
-				<id>{?technology_id?}</id>
-				<name>{?technology_name?}</name>
-				<level>{?technology_level?}</level>
+				<technology-id>{?technology_id?}</technology-id>
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-level>{?technology_level?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- A list research dependencies for this electronical device. //-->
 		<research-dependency-list>
 			<!-- A single technollogical dependency. //-->
 			<research-dependency>
-				<id>{?research_id?}</id>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<research-id>{?research_id?}</research-id>
+				<research-name>{?research_name?}</research-name>
+				<research-level>{?research_level?}</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/electronic/cellphone.xml b/application/ship-simu/templates/game/electronic/cellphone.xml
index 2184f02..e2ce154 100644
--- a/application/ship-simu/templates/game/electronic/cellphone.xml
+++ b/application/ship-simu/templates/game/electronic/cellphone.xml
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <electronic extends="base_electronic}">
 	<!-- General data of the electronics. //-->
-	<general-data>
+	<electronic-data>
 		<!-- Id and type for this electronic. //-->
 		<name>cellphone</name>
 		<type>communication</type>
@@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<height>35</height>
 			<length>30</length>
 		</dimensions>
-	</general-data>
+	</electronic-data>
 	<!-- An electronical device may depend on one or more technologies, at least
 	     'electronics'. //-->
 	<dependencies>
diff --git a/application/ship-simu/templates/game/electronic/hifi_system.xml b/application/ship-simu/templates/game/electronic/hifi_system.xml
index 9ac2439..dc1f63f 100644
--- a/application/ship-simu/templates/game/electronic/hifi_system.xml
+++ b/application/ship-simu/templates/game/electronic/hifi_system.xml
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <electronic extends="{?base_electronic?}">
 	<!-- General data of the electronics. //-->
-	<general-data>
+	<electronic-data>
 		<name>hifi_system</name>
 		<type>entertainment</type>
 		<!-- Simplified dimensions of the electronics because it will be placed
@@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<height>70</height>
 			<length>80</length>
 		</dimensions>
-	</general-data>
+	</electronic-data>
 	<!-- An electronical device may depend on one or more technologies, at least
 	     'electronics'. //-->
 	<dependencies>
diff --git a/application/ship-simu/templates/game/electronic/radio_receiver.xml b/application/ship-simu/templates/game/electronic/radio_receiver.xml
index 53ff764..7396eb0 100644
--- a/application/ship-simu/templates/game/electronic/radio_receiver.xml
+++ b/application/ship-simu/templates/game/electronic/radio_receiver.xml
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <electronic extends="{?base_electronic?}">
 	<!-- General data of the electronics. //-->
-	<general-data>
+	<electronic-data>
 		<name>radio_receiver</name>
 		<type>entertainment</type>
 		<!-- Simplified dimensions of the electronics because it will be placed
@@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<height>40</height>
 			<length>20</length>
 		</dimensions>
-	</general-data>
+	</electronic-data>
 	<!-- An electronical device may depend on one or more technologies, at least
 	     'electronics'. //-->
 	<dependencies>
diff --git a/application/ship-simu/templates/game/electronic/surround_system.xml b/application/ship-simu/templates/game/electronic/surround_system.xml
index 35980dc..86a7e17 100644
--- a/application/ship-simu/templates/game/electronic/surround_system.xml
+++ b/application/ship-simu/templates/game/electronic/surround_system.xml
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <electronic extends="base_electronic">
 	<!-- General data of the electronics. //-->
-	<general-data>
+	<electronic-data>
 		<!-- Id and type for this electronic. //-->
 		<name>surround_system</name>
 		<type>entertainment</type>
@@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<height>140</height>
 			<length>120</length>
 		</dimensions>
-	</general-data>
+	</electronic-data>
 	<!-- An electronical device may depend on one or more technologies, at least
 	     'electronics'. //-->
 	<dependencies>
diff --git a/application/ship-simu/templates/game/electronic/television.xml b/application/ship-simu/templates/game/electronic/television.xml
index 12121a8..1c73803 100644
--- a/application/ship-simu/templates/game/electronic/television.xml
+++ b/application/ship-simu/templates/game/electronic/television.xml
@@ -27,7 +27,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <electronic extends="base_electronic">
 	<!-- General data of the electronics. //-->
-	<general-data>
+	<electronic-data>
 		<!-- Id and type for this electronic. //-->
 		<name>television</name>
 		<type>entertainment</type>
@@ -38,7 +38,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<height>110</height>
 			<length>90</length>
 		</dimensions>
-	</general-data>
+	</electronic-data>
 	<!-- An electronical device may depend on one or more technologies, at least
 	     'electronics'. //-->
 	<dependencies>
diff --git a/application/ship-simu/templates/game/engine/base_engine.xml b/application/ship-simu/templates/game/engine/base_engine.xml
index e6bdf63..4708591 100644
--- a/application/ship-simu/templates/game/engine/base_engine.xml
+++ b/application/ship-simu/templates/game/engine/base_engine.xml
@@ -23,17 +23,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <engine>
 	<!-- General data about this engine. //-->
-	<general-data>
+	<engine-data>
 		<id>{?id?}</id>
 		<name>{?name?}</name>
 		<type>{?type?}</type>
 		<horse-power>{?horse_power?}</horse-power>
-	</general-data>
+	</engine-data>
 	<!-- Type of fuel we need. May be left out if this "engine" is e.g. a sail. //-->
 	<fuel>
-		<id>{?fuel_id?}</id>
-		<name>{?fuel_name?}</name>
-		<type>{?fuel_type?}</type>
+		<fuel-id>{?fuel_id?}</fuel-id>
+		<fuel-name>{?fuel_name?}</fuel-name>
+		<fuel-type>{?fuel_type?}</fuel-type>
 	</fuel>
 	<!-- Simplified dimensions of this engine. Can be left out for sails. //-->
 	<dimensions>
@@ -49,9 +49,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A single technology dependency. //-->
 			<technology-dependency>
-				<id>{[?technology_id?}</id>
-				<name>{[?technology_name?}</name>
-				<level>{[?technology_level?}</level>
+				<technology-id>{[?technology_id?}</technology-id>
+				<technology-name>{[?technology_name?}</technology-name>
+				<technology-level>{[?technology_level?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 	</depenndencies>
diff --git a/application/ship-simu/templates/game/farmer/base_farmer.xml b/application/ship-simu/templates/game/farmer/base_farmer.xml
index 36f785b..8388afb 100644
--- a/application/ship-simu/templates/game/farmer/base_farmer.xml
+++ b/application/ship-simu/templates/game/farmer/base_farmer.xml
@@ -25,7 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 <farmer>
 	<!-- General data about this farmer, like name (not the player's nickname)
 	     type, birthday. //-->
-	<general-data>
+	<farmer-data>
 		<id>{?id?}</id>
 		<name>{?name?}</name>
 		<type>{?type?}</type>
@@ -38,22 +38,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<!-- Productivity, experience and others. //-->
 		<productivity>{?productivity?}</productivity>
 		<experience>{?experience?}</experience>
-	</general-data>
+	</farmer-data>
 	<!-- List of all products this farmer is producing. //-->
 	<produce-list>
 		<!-- A single produce this farmer is producing. //-->
 		<produce>
-			<id>{?produce_id?}</id>
-			<name>{?produce_name?}</name>
-			<type>{?produce_type?}</type>
+			<produce-id>{?produce_id?}</produce-id>
+			<produce-name>{?produce_name?}</produce-name>
+			<produce-type>{?produce_type?}</produce-type>
 			<!-- A list of technology dependency required to create this
 			     produce. //-->
 			<technology-dependency-list>
 				<!-- A single technology dependency. //-->
 				<technology-dependency>
-					<id>{?technology_id?}</id>
-					<name>{?technology_name?}</name>
-					<level>{?technology_level?}</level>
+					<technology-id>{?technology_id?}</technology-id>
+					<technology-name>{?technology_name?}</technology-name>
+					<technology-level>{?technology_level?}</technology-level>
 				</technology-dependency>
 			</technology-dependency-list>
 		</produce>
diff --git a/application/ship-simu/templates/game/fuel/base_fuel.xml b/application/ship-simu/templates/game/fuel/base_fuel.xml
index 38bc771..0f023fb 100644
--- a/application/ship-simu/templates/game/fuel/base_fuel.xml
+++ b/application/ship-simu/templates/game/fuel/base_fuel.xml
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <fuel>
-	<general-data>
+	<fuel-data>
 		<id>{?id?}</id>
 		<name>{?name?}</name>
 		<type>{?type?}</type>
-	</general-data>
+	</fuel-data>
 </fuel>
diff --git a/application/ship-simu/templates/game/merchant/base_merchant.xml b/application/ship-simu/templates/game/merchant/base_merchant.xml
index dbbf124..a4a7c85 100644
--- 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>
diff --git a/application/ship-simu/templates/game/mineral/base_mineral.xml b/application/ship-simu/templates/game/mineral/base_mineral.xml
index e114e4b..1084926 100644
--- a/application/ship-simu/templates/game/mineral/base_mineral.xml
+++ b/application/ship-simu/templates/game/mineral/base_mineral.xml
@@ -26,7 +26,7 @@ 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>
+	<mineral-data>
 		<id>{?id?}</id>
 		<type>{?type?}</type>
 		<!-- A summary for this mineral. //-->
@@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<mineral-description>
 			<![CDATA[{?description?}]]>
 		</mineral-description>
-	</general-data>
+	</mineral-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>
diff --git a/application/ship-simu/templates/game/research/base_research.xml b/application/ship-simu/templates/game/research/base_research.xml
index de2e7aa..e2b96c1 100644
--- a/application/ship-simu/templates/game/research/base_research.xml
+++ b/application/ship-simu/templates/game/research/base_research.xml
@@ -79,23 +79,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<level-dependencies>
 				<level-technology-dependency-list>
 					<level-technology-dependency>
-						<id>{?level_technology_id?}</id>
-						<name>{?level_technology_name?}</name>
-						<level>{?level_technology_level?}</level>
+						<level-technology-id>{?level_technology_id?}</level-technology-id>
+						<level-technology-name>{?level_technology_name?}</level-technology-name>
+						<level-technology-type>{?level_technology_type?}</level-technology-type>
+						<level-technology-level>{?level_technology_level?}</level-technology-level>
 					</level-technology-dependency>
 				</level-technology-dependency-list>
 				<level-research-dependency-list>
 					<level-research-dependency>
-						<id>{?level_research_id?}</id>
-						<name>{?level_research_name?}</name>
-						<level>{?level_research_level?}</level>
+						<level-research-id>{?level_research_id?}</level-research-id>
+						<level-research-name>{?level_research_name?}</level-research-name>
+						<level-research-type>{?level_research_type?}</level-research-type>
+						<level-research-level>{?level_research_level?}</level-research-level>
 					</level-research-dependency>
 				</level-research-dependency-list>
 				<level-building-dependency-list>
-					<level-buildimng-dependency>
-						<id>{?level_building_id?}</id>
-						<name>{?level_building_name?}</name>
-						<level>{?level_building_level?}</level>
+					<level-building-dependency>
+						<level-building-id>{?level_building_id?}</level-building-id>
+						<level-building-name>{?level_building_name?}</level-building-name>
+						<level-building-type>{?level_building_type?}</level-building-type>
+						<level-building-level>{?level_building_level?}</level-building-level>
 					</level-building-dependency>
 				</level-building-dependency-list>
 			</level-dependencies>
@@ -104,23 +107,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<dependencies>
 		<technology-dependency-list>
 			<technology-dependency>
-				<id>{?technology_id?}</id>
-				<name>{?technology_name?}</name>
-				<level>{?technology_level?}</level>
+				<technology-id>{?technology_id?}</technology-id>
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>{?technology_level?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<research-dependency-list>
 			<research-dependency>
-				<id>{?research_id?}</id>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<research-id>{?research_id?}</research-id>
+				<research-name>{?research_name?}</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>{?research_level?}</research-level>
 			</research-dependency>
 		</research-dependency-list>
 		<building-dependency-list>
 			<building-dependency>
-				<id>{?building_id?}</id>
-				<name>{?building_name?}</name>
-				<level>{?building_level?}</level>
+				<building-id>{?building_id?}</building-id>
+				<building-name>{?building_name?}</building-name>
+				<building-type>{?building_type?}</building-type>
+				<building-level>{?building_level?}</building-level>
 			</building-dependency>
 		</building-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/research/electronics.xml b/application/ship-simu/templates/game/research/electronics.xml
index 1bd2df2..96fafc4 100644
--- a/application/ship-simu/templates/game/research/electronics.xml
+++ b/application/ship-simu/templates/game/research/electronics.xml
@@ -31,14 +31,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<dependencies>
 		<technology-dependency-list>
 			<technology-dependency>
-				<name>plastics</name>
-				<level>2</level>
+				<technology-name>plastics</technology-name>
+				<technology-type>chemicals</technology-type>
+				<technology-level>2</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<research-dependency-list>
 			<research-dependency>
-				<name>electricity</name>
-				<level>4</level>
+				<research-name>electricity</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>4</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/research/radio_receiving.xml b/application/ship-simu/templates/game/research/radio_receiving.xml
index 44513dd..5d95701 100644
--- a/application/ship-simu/templates/game/research/radio_receiving.xml
+++ b/application/ship-simu/templates/game/research/radio_receiving.xml
@@ -33,8 +33,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A research proposal dependency for this research proposal. //-->
 			<technology-dependency>
-				<name>signal_modulation</name>
-				<level>1</level>
+				<technology-name>signal_modulation</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>1</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/research/statics.xml b/application/ship-simu/templates/game/research/statics.xml
index d82085d..44146e5 100644
--- a/application/ship-simu/templates/game/research/statics.xml
+++ b/application/ship-simu/templates/game/research/statics.xml
@@ -31,20 +31,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<dependencies>
 		<technology-dependency-list>
 			<technology-dependency>
-				<name>{?technology_name?}</name>
-				<level>{?technology_level?}</level>
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>{?technology_level?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<research-dependency-list>
 			<research-dependency>
-				<name>mathematics</name>
-				<level>4</level>
+				<technology-name>mathematics</technology-name>
+				<technology-type>{?research_type?}</technology-type>
+				<technology-level>4</technology-level>
 			</research-dependency>
 		</research-dependency-list>
 		<building-dependency-list>
 			<building-dependency>
-				<name>{?building_name?}</name>
-				<level>{?building_level?}</level>
+				<building-name>{?building_name?}</building-name>
+				<building-type>{?building_type?}</building-type>
+				<building-level>{?building_level?}</building-level>
 			</building-dependency>
 		</building-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/resource/base_resource.xml b/application/ship-simu/templates/game/resource/base_resource.xml
index 2b5ba5d..d6b160c 100644
--- a/application/ship-simu/templates/game/resource/base_resource.xml
+++ b/application/ship-simu/templates/game/resource/base_resource.xml
@@ -25,7 +25,7 @@ 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>
+	<resource-data>
 		<id>{?id?}</id>
 		<name>{?name?}</name>
 		<type>{?type?}</type>
@@ -37,15 +37,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<resource-description>
 			<![CDATA[{?description?}]]>
 		</resource-description>
-	</general-data>
+	</resource-data>
 	<!-- To harvest some resource 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 dependency to harvest this resource. //-->
 		<technology-dependency>
-			<id>{?technology_id?}</id>
-			<name>{?technology_name?}</name>
-			<level>{?technology_level?}</level>
+			<technology-id>{?technology_id?}</technology-id>
+			<technology-name>{?technology_name?}</technology-name>
+			<technology-type>{?technology_type?}</technology-type>
+			<technology-level>{?technology_level?}</technology-level>
 		</technology-dependency>
 	</technology-dependency-list>
 </resource>
diff --git a/application/ship-simu/templates/game/ship/base_ship.xml b/application/ship-simu/templates/game/ship/base_ship.xml
index 5160727..a33efe8 100644
--- a/application/ship-simu/templates/game/ship/base_ship.xml
+++ b/application/ship-simu/templates/game/ship/base_ship.xml
@@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 <ship>
 	<!-- Some general data about this ship. Some may not be required for the
 	     simulation at the moment. //-->
-	<general-data>
+	<ship-data>
 		<id>{?id?}</id>
 		<name><![CDATA[{?name?}]]></name>
 		<type>{?type?}</type>
@@ -42,12 +42,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<!-- And when the ship was constructed. //-->
 			<construction-finished>{?construction_finished?</construction-finished>
 		</construction>
-	</general-data>
+	</ship-data>
 	<!-- A list of shipping companies who owned this ship. //-->
 	<shipping-company-list>
 		<!-- A single company who owned this ship for a tme span. //-->
 		<shipping-company>
-			<id>{?company_id?}</id>
+			<company-id>{?company_id?}</company-id>
 			<!-- A time span when the company owned this ship. //-->
 			<holder-timespan>
 				<started>{?holder_started?}</started>
@@ -63,16 +63,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<!-- A single ship structure. This can be anything from the wheel house
 		     to theatre or little ships, decks and cabins. //-->
 		<ship-structure extends="{?structure_template?}">
-			<id>{?structure_id?}</id>
-			<amount>{?structure_amount?}</amount>
-			<type>{?structure_type?}</type>
+			<structure-id>{?structure_id?}</structure-id>
+			<structure-amount>{?structure_amount?}</structure-amount>
+			<structure-type>{?structure_type?}</structure-type>
 		</ship-structure>
 	</ship-structure-list>
 	<!-- All ships require an engine, even when or 'engine' is a sail, to move
 	     around. //-->
 	<engine extends="{?engine_template?}">
-		<id>{?engine_id?{</id>
-		<type>{?engine_type?}</type>
+		<engine-id>{?engine_id?{</engine-id>
+		<engine-type>{?engine_type?}</engine-type>
 	</engine>
 	<!-- A list of what this ship transportates. //-->
 	<transportation-list>
@@ -114,18 +114,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A single technology dependencies for this ship. //-->
 			<technology-dependency>
-				<id>{?technology_id?}</id>
-				<name>{?technology_name?}</name>
-				<level>{?technology_level?}</level>
+				<technology-id>{?technology_id?}</technology-id>
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>{?technology_level?}</technology-level>
 			</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>
-				<id>{?research_id?}</id>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<research-id>{?research_id?}</research-id>
+				<research-name>{?research_name?}</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>{?research_level?}</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/tank/base_tank.xml b/application/ship-simu/templates/game/tank/base_tank.xml
index 7761160..dc331f2 100644
--- a/application/ship-simu/templates/game/tank/base_tank.xml
+++ b/application/ship-simu/templates/game/tank/base_tank.xml
@@ -22,22 +22,23 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <tank>
-	<general-data>
+	<tank-data>
 		<id>{?id?}</id>
 		<name>{?name?}</name>
 		<type>{?type?}</type>
-	</general-data>
+	</tank-data>
 	<content>
-		<id>{?content_id?}</id>
-		<name>{?content_name?}</name>
-		<type>{?content_type?}</type>
+		<content-id>{?content_id?}</content-id>
+		<content-name>{?content_name?}</content-name>
+		<content-type>{?content_type?}</content-type>
 	</content>
 	<dependencies>
 		<technology-dependency-list>
 			<technology-dependency>
-				<id>{?technology_id?}</id>
-				<name>{?technology_name?}</name>
-				<level>{?technology_level?}</level>
+				<technology-id>{?technology_id?}</technology-id>
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>{?technology_level?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/architecture.xml b/application/ship-simu/templates/game/technology/architecture.xml
index e58e969..c6c521e 100644
--- a/application/ship-simu/templates/game/technology/architecture.xml
+++ b/application/ship-simu/templates/game/technology/architecture.xml
@@ -23,29 +23,34 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>architecture</name>
 		<type>construction</type>
-	</general-data>
+	</technology-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>drawings</name>
-				<level>5</level>
+				<!-- @TODO Find a technology type //-->
+				<technology-name>drawings</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>5</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
+		<!-- @TODO Find research types //-->
 		<research-dependency-list>
 			<research-dependency>
-				<name>statics</name>
-				<level>3</level>
+				<research-name>statics</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>3</research-level>
 			</research-dependency>
 			<research-dependency>
-				<name>mathematics</name>
-				<level>6</level>
+				<research-name>mathematics</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>6</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/base_technology.xml b/application/ship-simu/templates/game/technology/base_technology.xml
index 6e2ae92..846a215 100644
--- a/application/ship-simu/templates/game/technology/base_technology.xml
+++ b/application/ship-simu/templates/game/technology/base_technology.xml
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology>
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<id>{?id?}</id>
 		<name>{?name?}</name>
 		<type>{?type?}</type>
@@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-description>
 			<![CDATA[{?description?}]]>
 		</technology-description>
-	</general-data>
+	</technology-data>
 	<!-- All levels of this technology are held in this tag. //-->
 	<technology-level-list>
 		<!-- A single technology level with its basic data, own summary and
@@ -60,18 +60,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<technology-level-dependency-list>
 					<!-- A technology dependency for this technology. //-->
 					<technology-level-dependency>
-						<id>{?technology_level_id?}</id>
-						<name>{?technology_level_name?}</name>
-						<level>{?technology_level_level?}</level>
+						<technology-level-id>{?technology_level_id?}</technology-level-id>
+						<technology-level-name>{?technology_level_name?}</technology-level-name>
+						<technology-level-level>{?technology_level_level?}</technology-level-level>
 					</technology-level-dependency>
 				</technology-level-dependency-list>
 				<!-- All research dependencies for this technology. //-->
 				<research-level-dependency-list>
 					<!-- A research dependency for this technology. //-->
 					<research-level-dependency>
-						<id>{?research_level_id?}</id>
-						<name>{?research_level_name?}</name>
-						<level>{?research_level_level?}</level>
+						<research-level-id>{?research_level_id?}</research-level-id>
+						<research-level-name>{?research_level_name?}</research-level-name>
+						<research-level-level>{?research_level_level?}</research-level-level>
 					</research-level-dependency>
 				</research-dependency-list>
 			</level-dependencies>
@@ -84,18 +84,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<id>{?technology_id?}</id>
-				<name>{?technology_name?}</name>
-				<level>{?technology_level?}</level>
+				<technology-id>{?technology_id?}</technology-id>
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>{?technology_level?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<id>{?research_id?}</id>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<research-id>{?research_id?}</research-id>
+				<research-name>{?research_name?}</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>{?research_level?}</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/cellular_network.xml b/application/ship-simu/templates/game/technology/cellular_network.xml
index 3be2b24..0e34905 100644
--- a/application/ship-simu/templates/game/technology/cellular_network.xml
+++ b/application/ship-simu/templates/game/technology/cellular_network.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>cellular_network</name>
 		<type>communication</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,16 +34,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- @TODO Find some technology dependencies. //-->
 			<technology-dependency>
-				<name></name>
-				<level></level>
+				<technology-name></technology-name>
+				<technology-type></technology-type>
+				<technology-level></technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
+			<!-- @TODO Find a research type //-->
 			<research-dependency>
-				<name>electronics</name>
-				<level>5</level>
+				<technology-name>electronics</technology-name>
+				<technology-type>{?research_type?}</technology-type>
+				<technology-level>5</technology-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/drawings.xml b/application/ship-simu/templates/game/technology/drawings.xml
index ef38631..43dbf50 100644
--- a/application/ship-simu/templates/game/technology/drawings.xml
+++ b/application/ship-simu/templates/game/technology/drawings.xml
@@ -23,8 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>drawings</name>
 		<type>base</type>
-	</general-data>
+	</technology-data>
 </technology>
diff --git a/application/ship-simu/templates/game/technology/glass_making.xml b/application/ship-simu/templates/game/technology/glass_making.xml
index 85d63d5..5050fab 100644
--- a/application/ship-simu/templates/game/technology/glass_making.xml
+++ b/application/ship-simu/templates/game/technology/glass_making.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>glass_making</name>
 		<type>production</type>
-	</general-data>
+	</technology-data>
 	<!-- All levels of this technology are held in this tag. //-->
 	<technology-level-list>
 		<!-- A single technology level with its basic data, own summary and
@@ -40,16 +40,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<technology-level-dependency-list>
 					<!-- A technology dependency for this technology. //-->
 					<technology-level-dependency>
-						<name>{?technology_level_name?}</name>
-						<level>{?technology_level_level?}</level>
+						<technology-name>{?technology_level_name?}</technology-name>
+						<technology-type>{?technology_level_type?}</technology-type>
+						<technology-level>{?technology_level_level?}</technology-level>
 					</technology-level-dependency>
 				</technology-level-dependency-list>
 				<!-- All research dependencies for this technology. //-->
 				<research-level-dependency-list>
 					<!-- A research dependency for this technology. //-->
 					<research-level-dependency>
-						<name>{?research_level_name?}</name>
-						<level>{?research_level_level?}</level>
+						<research-name>{?research_level_name?}</research-name>
+						<research-type>{?research_level_type?}</research-type>
+						<research-level>{?research_level_level?}</research-level>
 					</research-level-dependency>
 				</research-dependency-list>
 			</level-dependencies>
@@ -62,16 +64,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>{?technology_name?}</name>
-				<level>{?technology_level?}</level>
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>{?technology_level?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<research-name>{?research_name?}</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>{?research_level?}</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/household_devices.xml b/application/ship-simu/templates/game/technology/household_devices.xml
index e67cbd7..0e21326 100644
--- a/application/ship-simu/templates/game/technology/household_devices.xml
+++ b/application/ship-simu/templates/game/technology/household_devices.xml
@@ -23,25 +23,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>household_devices</name>
 		<type>electronics</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
 		<!-- All technology dependencies for this technology. //-->
 		<technology-dependency-list>
 			<technology-dependency>
-				<name>plastics</name>
-				<level>3</level>
+				<technology-name>plastics</technology-name>
+				<technology-type>chemicals</technology-type>
+				<technology-level>3</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research proposal dependencies for this research. //-->
 		<research-dependency-list>
+			<!-- @TODO Find a research type //-->
 			<research-dependency>
-				<name>electronics</name>
-				<level>1</level>
+				<research-name>electronics</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>1</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/intergrated_currents.xml b/application/ship-simu/templates/game/technology/intergrated_currents.xml
index 247d8f2..1e5471a 100644
--- a/application/ship-simu/templates/game/technology/intergrated_currents.xml
+++ b/application/ship-simu/templates/game/technology/intergrated_currents.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>intergrated_currents</name>
 		<type>eletronics</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,16 +34,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>transistor</name>
-				<level>10</level>
+				<technology-name>transistor</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>10</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>silicium_mining</name>
-				<level>1</level>
+				<research-name>silicium_mining</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>1</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/laboratory_equipment.xml b/application/ship-simu/templates/game/technology/laboratory_equipment.xml
index 98c1fb4..05bf5a1 100644
--- a/application/ship-simu/templates/game/technology/laboratory_equipment.xml
+++ b/application/ship-simu/templates/game/technology/laboratory_equipment.xml
@@ -23,21 +23,23 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>laboratory_equipment</name>
 		<type>equipment</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals. //-->
 	<dependencies>
 		<technology-dependency-list>
 			<technology-dependency>
-				<name>plastics</name>
-				<level>3</level>
+				<technology-name>plastics</technology-name>
+				<technology-type>chemicals</technology-type>
+				<technology-level>3</technology-level>
 			</technology-dependency>
 			<technology-dependency>
-				<name>glass_making</name>
-				<level>5</level>
+				<technology-name>glass_making</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>5</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/naval_architecture.xml b/application/ship-simu/templates/game/technology/naval_architecture.xml
index 901e7f4..4cc6656 100644
--- a/application/ship-simu/templates/game/technology/naval_architecture.xml
+++ b/application/ship-simu/templates/game/technology/naval_architecture.xml
@@ -23,33 +23,37 @@ 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>
+	<technology-data>
 		<name>naval_architecture</name>
 		<type>ship_construction</type>
-	</general-data>
+	</technology-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-name>architecture</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>3</technology-level>
 			</technology-dependency>
 			<technology-dependency>
-				<name>statics</name>
-				<level>5</level>
+				<technology-name>statics</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>5</technology-level>
 			</technology-dependency>
 			<technology-dependency>
-				<name>drawings</name>
-				<level>6</level>
+				<technology-name>drawings</technology-name>
+				<technology-type>{?technology_type?}</technology-type>
+				<technology-level>6</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<research-dependency>
-				<name>mathematics</name>
-				<level>8</level>
+				<research-name>mathematics</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>8</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/plastics.xml b/application/ship-simu/templates/game/technology/plastics.xml
index 6eb2fac..b5b9048 100644
--- a/application/ship-simu/templates/game/technology/plastics.xml
+++ b/application/ship-simu/templates/game/technology/plastics.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>plastics</name>
 		<type>production</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,17 +34,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<!-- @TODO Find a chemical name for this technology. //-->
-				<name>{?technology_name?}</name>
-				<level>chemicals</level>
+				<!-- @TODO Find a chemical name and level for this technology. //-->
+				<technology-name>{?technology_name?}</technology-name>
+				<technology-type>chemicals</technology-type>
+				<technology-level>{?technology_name?}</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>chemistry</name>
-				<level>3</level>
+				<research-name>chemistry</research-name>
+				<research-type>chemicals</research-type>
+				<research-level>3</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/signal_amplifying.xml b/application/ship-simu/templates/game/technology/signal_amplifying.xml
index 9603064..e553156 100644
--- a/application/ship-simu/templates/game/technology/signal_amplifying.xml
+++ b/application/ship-simu/templates/game/technology/signal_amplifying.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>signal_amplifying</name>
 		<type>electronics</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,16 +34,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>transistor</name>
-				<level>3</level>
+				<technology-name>transistor</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>3</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>modulation</name>
-				<level>1</level>
+				<research-name>modulation</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>1</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/signal_modulation.xml b/application/ship-simu/templates/game/technology/signal_modulation.xml
index fa220cb..df1acde 100644
--- a/application/ship-simu/templates/game/technology/signal_modulation.xml
+++ b/application/ship-simu/templates/game/technology/signal_modulation.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>signal_modulation</name>
 		<type>electronics</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,16 +34,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>transistor</name>
-				<level>3</level>
+				<technology-name>transistor</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>3</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>modulation</name>
-				<level>1</level>
+				<research-name>modulation</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>1</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/sound_equalizer.xml b/application/ship-simu/templates/game/technology/sound_equalizer.xml
index 2f52c5e..d434381 100644
--- a/application/ship-simu/templates/game/technology/sound_equalizer.xml
+++ b/application/ship-simu/templates/game/technology/sound_equalizer.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>sound_equalizer</name>
 		<type>electronic</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,8 +34,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>transistor</name>
-				<level>5</level>
+				<technology-name>transistor</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>5</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
@@ -43,8 +44,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<research-name>{?research_name?}</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>{?research_level?}</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/sound_processor.xml b/application/ship-simu/templates/game/technology/sound_processor.xml
index 436ccd7..4adc30b 100644
--- a/application/ship-simu/templates/game/technology/sound_processor.xml
+++ b/application/ship-simu/templates/game/technology/sound_processor.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>sound_processor</name>
 		<type>electronic</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,12 +34,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>intergrated_current</name>
-				<level>7</level>
+				<technology-name>intergrated_current</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>7</technology-level>
 			</technology-dependency>
 			<technology-dependency>
-				<name>surround_mixing</name>
-				<level>1</level>
+				<technology-name>surround_mixing</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>1</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
@@ -47,8 +49,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<research-name>{?research_name?}</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>{?research_level?}</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/surround_mixing.xml b/application/ship-simu/templates/game/technology/surround_mixing.xml
index 996a714..baa8ea2 100644
--- a/application/ship-simu/templates/game/technology/surround_mixing.xml
+++ b/application/ship-simu/templates/game/technology/surround_mixing.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>surround_mixing</name>
 		<type>electronic</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,8 +34,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>intergrated_current</name>
-				<level>6</level>
+				<technology-name>intergrated_current</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>6</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
@@ -43,8 +44,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>{?research_name?}</name>
-				<level>{?research_level?}</level>
+				<research-name>{?research_name?}</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>{?research_level?}</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/transistor.xml b/application/ship-simu/templates/game/technology/transistor.xml
index 4253aa2..6f32091 100644
--- a/application/ship-simu/templates/game/technology/transistor.xml
+++ b/application/ship-simu/templates/game/technology/transistor.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>transistor</name>
 		<type>eletronics</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,20 +34,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>semiconductor</name>
-				<level>1</level>
+				<technology-name>semiconductor</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>1</technology-level>
 			</technology-dependency>
 			<technology-dependency>
-				<name>plastics</name>
-				<level>5</level>
+				<technology-name>plastics</technology-name>
+				<technology-type>chemicals</technology-type>
+				<technology-level>5</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<!-- A research dependency for this technology. //-->
+			<!-- @TODO Find a research type //-->
 			<research-dependency>
-				<name>silicium_mining</name>
-				<level>1</level>
+				<research-name>silicium_mining</research-name>
+				<research-type>{?research_type?}</research-type>
+				<research-level>1</research-level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/game/technology/video_receiving.xml b/application/ship-simu/templates/game/technology/video_receiving.xml
index 9d4d10c..c640d1f 100644
--- a/application/ship-simu/templates/game/technology/video_receiving.xml
+++ b/application/ship-simu/templates/game/technology/video_receiving.xml
@@ -23,10 +23,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology extends="base_technology">
 	<!-- General technology data like type, level, summary or description. //-->
-	<general-data>
+	<technology-data>
 		<name>video_receiving</name>
 		<type>eletronics</type>
-	</general-data>
+	</technology-data>
 	<!-- A technology may depend on some other technologies or research
 	     proposals to gain the first level of this technology. //-->
 	<dependencies>
@@ -34,16 +34,19 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<technology-dependency-list>
 			<!-- A technology dependency for this technology. //-->
 			<technology-dependency>
-				<name>signal_amplifying</name>
-				<level>1</level>
+				<technology-name>signal_amplifying</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>1</technology-level>
 			</technology-dependency>
 			<technology-dependency>
-				<name>signal_modulation</name>
-				<level>1</level>
+				<technology-name>signal_modulation</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>1</technology-level>
 			</technology-dependency>
 			<technology-dependency>
-				<name>transistor</name>
-				<level>1</level>
+				<technology-name>transistor</technology-name>
+				<technology-type>electronics</technology-type>
+				<technology-level>1</technology-level>
 			</technology-dependency>
 		</technology-dependency-list>
 	</dependencies>
-- 
2.39.2