Statics is no longer a technology, cellphone added, several fixes:

[shipsimu.git] / application / ship-simu / templates / de / game / research / base_research.xml

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 8a994954e522aef2e6332ae501e9cb50ce6eaf1f..de2e7aab0bf335c1a679892816ec1820a0366cc1 100644 (file)
--- 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>