From c17e7c7e7a51a720753420156caa6ab4d2a9122e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 25 Sep 2009 21:06:32 +0000
Subject: [PATCH] Statics is no longer a technology, cellphone added, several
 fixes: - Statics is now a research proposal and therefore no longer a
 technology - Several rewrites of templates from attributed to nodes (next
 rewrite-wave) - New electronics 'cellphone' added - New technology 'cellular
 network' added - Some fixes

---
 .gitattributes                                |  4 +-
 .../de/game/electronic/base_electronic.xml    |  6 +-
 .../de/game/electronic/cellphone.xml          | 62 +++++++++++++++
 .../de/game/merchant/base_merchant.xml        | 38 ++++------
 .../de/game/mineral/base_mineral.xml          | 14 ++--
 .../de/game/research/base_research.xml        | 75 ++++++++++++-------
 .../templates/de/game/research/statics.xml    | 51 +++++++++++++
 .../de/game/resource/base_resource.xml        |  8 +-
 .../templates/de/game/ship/base_ship.xml      |  6 ++
 .../de/game/technology/architecture.xml       | 10 +--
 .../de/game/technology/base_technology.xml    | 20 ++---
 .../{statics.xml => cellular_network.xml}     | 22 ++++--
 .../de/game/technology/glass_making.xml       |  8 +-
 .../de/game/technology/naval_architecture.xml |  2 +-
 .../templates/de/game/technology/plastics.xml |  6 +-
 .../de/game/types/electronic_types.xml        |  8 +-
 .../de/game/types/technology_types.xml        |  2 +
 17 files changed, 242 insertions(+), 100 deletions(-)
 create mode 100644 application/ship-simu/templates/de/game/electronic/cellphone.xml
 create mode 100644 application/ship-simu/templates/de/game/research/statics.xml
 rename application/ship-simu/templates/de/game/technology/{statics.xml => cellular_network.xml} (68%)

diff --git a/.gitattributes b/.gitattributes
index 3beebd7..a94be23 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -286,6 +286,7 @@ 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/electronic/cellphone.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
@@ -295,6 +296,7 @@ application/ship-simu/templates/de/game/mineral/base_mineral.xml -text
 application/ship-simu/templates/de/game/research/.htaccess -text
 application/ship-simu/templates/de/game/research/base_research.xml -text
 application/ship-simu/templates/de/game/research/mathematics.xml -text
+application/ship-simu/templates/de/game/research/statics.xml -text
 application/ship-simu/templates/de/game/resource/.htaccess -text
 application/ship-simu/templates/de/game/resource/base_resource.xml -text
 application/ship-simu/templates/de/game/ship/.htaccess -text
@@ -302,12 +304,12 @@ application/ship-simu/templates/de/game/ship/base_ship.xml -text
 application/ship-simu/templates/de/game/technology/.htaccess -text
 application/ship-simu/templates/de/game/technology/architecture.xml -text
 application/ship-simu/templates/de/game/technology/base_technology.xml -text
+application/ship-simu/templates/de/game/technology/cellular_network.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
 application/ship-simu/templates/de/game/types/building_types.xml -text
 application/ship-simu/templates/de/game/types/container_types.xml -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 1a45f15..932eca9 100644
--- a/application/ship-simu/templates/de/game/electronic/base_electronic.xml
+++ b/application/ship-simu/templates/de/game/electronic/base_electronic.xml
@@ -51,16 +51,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<technology-dependency>
 				<id>{?technology_id?}</id>
 				<name>{?technology_name?}</name>
-				<type>{?technology_type?}</type>
+				<level>{?technology_level?}</level>
 			</technology-dependency>
 		</technology-dependency-list>
-		<!-- A list research proposal dependencies for this electronical device. //-->
+		<!-- 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>
-				<type>{?research_type?}</type>
+				<level>{?research_level?}</level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/de/game/electronic/cellphone.xml b/application/ship-simu/templates/de/game/electronic/cellphone.xml
new file mode 100644
index 0000000..0dcbe98
--- /dev/null
+++ b/application/ship-simu/templates/de/game/electronic/cellphone.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A common cellular phone.
+
+For simplification we have only width, length, height and total weight. This is
+in reality mostly the case because the electronics will be placed into a small
+box for transportation.
+
+@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/>
+//-->
+<electronic extends="base_electronic}">
+	<!-- General data of the electronics. //-->
+	<general-data>
+		<!-- Id and type for this electronic. //-->
+		<name>cellphone</name>
+		<type>communication</type>
+		<!-- Simplified dimension of the electronics because it will be placed
+		     into a small box for transportation. //-->
+		<dimension>
+			<width>30</width>
+			<height>35</height>
+			<length>30</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>
+			<technology-dependency>
+				<name>cellular_network</name>
+				<level>1</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-dependency>
+		</research-dependency-list>
+	</dependencies>
+</electronic>
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 dbbf124..d075c00 100644
--- a/application/ship-simu/templates/de/game/merchant/base_merchant.xml
+++ b/application/ship-simu/templates/de/game/merchant/base_merchant.xml
@@ -25,34 +25,26 @@ 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. //-->
-		<summary>
+		<merchant-summary>
 			<![CDATA[{?summary?}]]>
-		</summary>
+		</merchant-summary>
 		<!-- A full description about this merchant. //-->
-		<description>
+		<merchant-description>
 			<![CDATA[{?description?}]]>
-		</description>
+		</merchant-description>
 	</general-data>
-	<!-- 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
+	<!-- A detailed trading list of resources for this merchant. Amount, when
 	     the first item was added or the last one was removed are being stored
-	     with every 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>
+	     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>
 </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 e7fa976..e114e4b 100644
--- a/application/ship-simu/templates/de/game/mineral/base_mineral.xml
+++ b/application/ship-simu/templates/de/game/mineral/base_mineral.xml
@@ -30,22 +30,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		<id>{?id?}</id>
 		<type>{?type?}</type>
 		<!-- A summary for this mineral. //-->
-		<summary>
+		<mineral-summary>
 			<![CDATA[{?summary?}]]>
-		</summary>
+		</mineral-summary>
 		<!-- A full description for this mineral. //-->
-		<description>
+		<mineral-description>
 			<![CDATA[{?description?}]]>
-		</description>
+		</mineral-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?}</id>
-			<name>{?technology_name?}</name>
-			<level>{?technology_level?}</level>
-		</technology-dependency>
+		<technology-dependency id="{?technology_id?}" level="{?technology_level?}" />
 	</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 8a99495..de2e7aa 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. //-->
-		<summary>
+		<research-summary>
 			<![CDATA[{?summary?}]]>
-		</summary>
+		</research-summary>
 		<!-- A full description for this research proposal. //-->
-		<description>
+		<research-description>
 			<![CDATA[{?description?}]]>
-		</description>
+		</research-description>
 	</research-data>
 	<!-- This is somewhat a "research history". //-->
 	<research-level-list>
@@ -76,27 +76,52 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<!-- A research level may depend on none, some or all of these
 			     '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?</id>
-					<name>{?technology_name?</name>
-					<level>{?technology_level?}</level>
-				</technology-dependency>
-			</technology-dependency-list>
-			<research-dependency-list>
-				<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?}</id>
-					<name>{?building_name?}</name>
-					<level>{?building_level?}</level>
-				</building-dependency>
-			</building-dependency-list>
+			<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-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-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-dependency-list>
+			</level-dependencies>
 		</research-level>
 	</research-level-list>
+	<dependencies>
+		<technology-dependency-list>
+			<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?}</id>
+				<name>{?research_name?}</name>
+				<level>{?research_level?}</level>
+			</research-dependency>
+		</research-dependency-list>
+		<building-dependency-list>
+			<building-dependency>
+				<id>{?building_id?}</id>
+				<name>{?building_name?}</name>
+				<level>{?building_level?}</level>
+			</building-dependency>
+		</building-dependency-list>
+	</dependencies>
 </research-proposal>
diff --git a/application/ship-simu/templates/de/game/research/statics.xml b/application/ship-simu/templates/de/game/research/statics.xml
new file mode 100644
index 0000000..d82085d
--- /dev/null
+++ b/application/ship-simu/templates/de/game/research/statics.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+Statistics research purpose
+
+@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/>
+//-->
+<research-proposal>
+	<!-- General data of this research like id, summar or description. //-->
+	<research-data>
+		<name>statics</name>
+		<type>construction</type>
+		<max-level>20</max-level>
+	</research-data>
+	<dependencies>
+		<technology-dependency-list>
+			<technology-dependency>
+				<name>{?technology_name?}</name>
+				<level>{?technology_level?}</level>
+			</technology-dependency>
+		</technology-dependency-list>
+		<research-dependency-list>
+			<research-dependency>
+				<name>mathematics</name>
+				<level>4</level>
+			</research-dependency>
+		</research-dependency-list>
+		<building-dependency-list>
+			<building-dependency>
+				<name>{?building_name?}</name>
+				<level>{?building_level?}</level>
+			</building-dependency>
+		</building-dependency-list>
+	</dependencies>
+</research-proposal>
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 01db9b1..2b5ba5d 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. //-->
-		<summary>
+		<resource-summary>
 			<![CDATA[{?summary?}]]>
-		</summary>
+		</resource-summary>
 		<!-- A full description for this resource. //-->
-		<description>
+		<resource-description>
 			<![CDATA[{?description?}]]>
-		</description>
+		</resource-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 b5431a0..c531656 100644
--- a/application/ship-simu/templates/de/game/ship/base_ship.xml
+++ b/application/ship-simu/templates/de/game/ship/base_ship.xml
@@ -114,12 +114,18 @@ 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-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-dependency>
 		</research-dependency-list>
 	</dependencies>
diff --git a/application/ship-simu/templates/de/game/technology/architecture.xml b/application/ship-simu/templates/de/game/technology/architecture.xml
index ef99147..e58e969 100644
--- a/application/ship-simu/templates/de/game/technology/architecture.xml
+++ b/application/ship-simu/templates/de/game/technology/architecture.xml
@@ -32,17 +32,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<dependencies>
 		<!-- All technology dependencies for this technology. //-->
 		<technology-dependency-list>
-			<technology-dependency>
-				<name>statics</name>
-				<level>3</level>
-			</technology-dependency>
 			<technology-dependency>
 				<name>drawings</name>
 				<level>5</level>
 			</technology-dependency>
 		</technology-dependency-list>
-		<!-- All research proposal dependencies for this technology. //-->
+		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
+			<research-dependency>
+				<name>statics</name>
+				<level>3</level>
+			</research-dependency>
 			<research-dependency>
 				<name>mathematics</name>
 				<level>6</level>
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 299e1d4..6e2ae92 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. //-->
-		<summary>
+		<technology-summary>
 			<![CDATA[{?summary?}]]>
-		</summary>
+		</technology-summary>
 		<!-- A full description of this technology. //-->
-		<description>
+		<technology-description>
 			<![CDATA[{?description?}]]>
-		</description>
+		</technology-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. //-->
-			<level-description>
+			<technology-level-description>
 				<![CDATA[{?level_description?}]]>
-			</level-description>
+			</technology-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 proposal dependencies for this technology. //-->
+				<!-- All research dependencies for this technology. //-->
 				<research-level-dependency-list>
-					<!-- A research proposal dependency for this technology. //-->
+					<!-- A research 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 proposal dependencies for this technology. //-->
+		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
-			<!-- A research proposal dependency for this technology. //-->
+			<!-- A research dependency for this technology. //-->
 			<research-dependency>
 				<id>{?research_id?}</id>
 				<name>{?research_name?}</name>
diff --git a/application/ship-simu/templates/de/game/technology/statics.xml b/application/ship-simu/templates/de/game/technology/cellular_network.xml
similarity index 68%
rename from application/ship-simu/templates/de/game/technology/statics.xml
rename to application/ship-simu/templates/de/game/technology/cellular_network.xml
index 924b861..06ff0a4 100644
--- a/application/ship-simu/templates/de/game/technology/statics.xml
+++ b/application/ship-simu/templates/de/game/technology/cellular_network.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-A statics technology template.
+A cellular network technology template.
 
 @author		Roland Haeder <webmaster@ship-simu.org>
 @version	0.0.0
@@ -24,17 +24,25 @@ 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>
-		<name>statics</name>
-		<type>construction</type>
+		<name>cellular_network</name>
+		<type>communication</type>
 	</general-data>
 	<!-- A technology may depend on some other technologies or research
-	     proposals. //-->
+	     proposals to gain the first level of this technology. //-->
 	<dependencies>
-		<!-- All research proposal dependencies for this technology. //-->
+		<!-- All technology dependencies for this technology. //-->
+		<technology-dependency-list>
+			<technology-dependency>
+				<name>electronics</name>
+				<level>5</level>
+			</technology-dependency>
+		</technology-dependency-list>
+		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
+			<!-- A research dependency for this technology. //-->
 			<research-dependency>
-				<name>mathematics</name>
-				<level>4</level>
+				<name>{?research_name?}</name>
+				<level>{?research_level?}</level>
 			</research-dependency>
 		</research-dependency-list>
 	</dependencies>
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 0dca821..85d63d5 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 proposal dependencies for this technology. //-->
+				<!-- All research dependencies for this technology. //-->
 				<research-level-dependency-list>
-					<!-- A research proposal dependency for this technology. //-->
+					<!-- A research 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 proposal dependencies for this technology. //-->
+		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
-			<!-- A research proposal dependency for this technology. //-->
+			<!-- A research 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
index 27f5b1b..901e7f4 100644
--- a/application/ship-simu/templates/de/game/technology/naval_architecture.xml
+++ b/application/ship-simu/templates/de/game/technology/naval_architecture.xml
@@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<level>6</level>
 			</technology-dependency>
 		</technology-dependency-list>
-		<!-- All research proposal dependencies for this technology. //-->
+		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<research-dependency>
 				<name>mathematics</name>
diff --git a/application/ship-simu/templates/de/game/technology/plastics.xml b/application/ship-simu/templates/de/game/technology/plastics.xml
index 4a84343..f363949 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 proposal dependencies for this technology. //-->
+				<!-- All research dependencies for this technology. //-->
 				<research-level-dependency-list>
-					<!-- A research proposal dependency for this technology. //-->
+					<!-- A research dependency for this technology. //-->
 					<research-level-dependency>
 						<name>{?research_level_name?}</name>
 						<level>{?research_level_level?}</level>
@@ -65,7 +65,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 				<level>chemicals</level>
 			</technology-dependency>
 		</technology-dependency-list>
-		<!-- All research proposal dependencies for this technology. //-->
+		<!-- All research dependencies for this technology. //-->
 		<research-dependency-list>
 			<research-dependency>
 				<name>chemistry</name>
diff --git a/application/ship-simu/templates/de/game/types/electronic_types.xml b/application/ship-simu/templates/de/game/types/electronic_types.xml
index 13e2063..6ff53e9 100644
--- a/application/ship-simu/templates/de/game/types/electronic_types.xml
+++ b/application/ship-simu/templates/de/game/types/electronic_types.xml
@@ -23,9 +23,7 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <electronic-type-list>
-	<!-- A common cellphone, no matter which network provider... ;-) //-->
-	<electronic-type type="cellphone" />
-	<!-- A common land line phone and it's equipment (we simplify again). //-->
-	<electronic-type type="phone" />
-	<!-- @TODO Add more commercial electronic devices. //-->
+	<!-- All common communication devices. //-->
+	<electronic-type type="communication" />
+	<!-- @TODO Add more types. //-->
 </electronic-type-list>
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 ed27d29..1d96811 100644
--- a/application/ship-simu/templates/de/game/types/technology_types.xml
+++ b/application/ship-simu/templates/de/game/types/technology_types.xml
@@ -29,6 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<technology-type type="building" />
 	<!-- Different chemicals. //-->
 	<technology-type type="chemicals" />
+	<!-- Technologies for common communication devices. //-->
+	<technology-type type="communication" />
 	<!-- Technologies for different constructions. //-->
 	<technology-type type="construction" />
 	<!-- Different equipment technologies. //-->
-- 
2.30.2