Major rewrite of game logic XMLs

[shipsimu.git] / application / ship-simu / templates / game / ship / base_ship.xml

diff --git a/application/ship-simu/templates/game/ship/base_ship.xml b/application/ship-simu/templates/game/ship/base_ship.xml
index 5160727e4d53c77471c450abfc1245cca7c439bb..a33efe88f0c669422ba9b4ae28a900a64fc9ce53 100644 (file)
--- 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>