Bulding types, architecture technology and research lab added, rewrites on base templates

[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 33fe084ac42fd3539ea5462db56a48b60b82f235..ee1ac56bfec2715136f0da5f9f95412d5ecb02c2 100644 (file)
--- a/application/ship-simu/templates/de/game/research/base_research.xml
+++ b/application/ship-simu/templates/de/game/research/base_research.xml
@@ -26,17 +26,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <research-proposal>
        <!-- General data of this research like id, summar or description. //-->
-       <research-data id="{?id?}" type="{?type?}">
+       <research-data>
+               <id>{?id?}</id>
+               <type>{?type?}</type>
                <!-- All researches end up with results which can be improvements to
                     to existing technology or how research is conducted. Some research
                     may have multiple results and they all might not be good. //-->
                <research-result-list>
-                       <!-- A single research result. If you want to modify research and 
-                            technology with this research you have to provide two
-                            <research-result> blocks, one for each. //-->
+                       <!-- A single research result. //-->
                        <research-result>
-                               <modify-research id="{?modify_research-id?}" type="{?modify_research_type?}" amount="{?modify_-research_amount?}" />
-                               <modify-technology id="{?modify_technology-id?}" type="{?modify_technology_type?}" amount="{?modify_-technology_amount?}" />
+                               <!-- A list of modified technology when this research is completed. //-->
+                               <modify-technology-list>
+                                       <!-- A single technology modification. //-->
+                                       <modify-technology id="{?modify_technology_id?}" amount="{?modify_technology_amount?}" />
+                               </modify-technology-list>
                        </research-result>
                </research-result-list>
                <!-- A summary for this research proposal. //-->
@@ -53,7 +56,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <!-- A research level X has its own summary and a full description.
                     It also can have depencies which makes it possible to add different
                     depencies for higher research levels. //-->
-               <research-level level="{?level?}">
+               <research-level>
+                       <level>{?level?}</level>
                        <!-- When the research of this level has been started ... //-->
                        <research-started timestamp="{?started?}" />
                        <!-- ... and when it has ended so when the research results are
@@ -68,17 +72,17 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                <![CDATA[{?level_description?}]]>
                        </level-description>
                        <!-- A research level may depend on none, some or all of these
-                            'depency types'. We are doing this this way to keep this XML
+                            'dependency types'. We are doing this this way to keep this XML
                             simple but still flexible enougth to fit all proposal needs. //-->
-                       <technology-depency-list>
-                               <technology-depency id="{?technology_id?}" level="{?technology_level?}" />
-                       </technology-depency-list>
-                       <research-depency-list>
-                               <research-depency id="{?research_id?}" level="{?research_level?}" />
-                       </research-depency-list>
-                       <building-depency-list>
-                               <building-depency type="{?building_type?}" />
-                       </building-depency-list>
+                       <technology-dependency-list>
+                               <technology-dependency id="{?technology_id?}" level="{?technology_level?}" />
+                       </technology-dependency-list>
+                       <research-dependency-list>
+                               <research-dependency id="{?research_id?}" level="{?research_level?}" />
+                       </research-dependency-list>
+                       <building-dependency-list>
+                               <building-dependency id="{?building_id?}" level="{?building_level?}" />
+                       </building-dependency-list>
                </research-level>
        </research-level-list>
 </research-proposal>