Container/ship templates rewritten

diff --git a/application/ship-simu/templates/de/game/!MISSING b/application/ship-simu/templates/de/game/!MISSING
index 6c8b968b3155f0baf3845654b7dfcf2776a0e93e..888fc4170692a70593e058e789f702e0ad996ae9 100644 (file)
--- a/application/ship-simu/templates/de/game/!MISSING
+++ b/application/ship-simu/templates/de/game/!MISSING
@@ -1,3 +1,2 @@
 <construction-company extends="{?construction_template?}">
-<resource-merchant extends="{?merchant_template?}">
 <construction-contract extends="{?contract_template?}">

diff --git a/application/ship-simu/templates/de/game/container/base_container.xml b/application/ship-simu/templates/de/game/container/base_container.xml
index b5cfe5a52a65f19ed56f89513debed75aed51a2d..e3a813f845a5928c37ad48b906a4cc2ec7f51813 100644 (file)
--- a/application/ship-simu/templates/de/game/container/base_container.xml
+++ b/application/ship-simu/templates/de/game/container/base_container.xml
@@ -47,8 +47,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        </content-list>
        <!-- A system, freezer or colder or something else, which maintains a
             constant temperature. This is useful for biological content like
-            fruits. But it is optional. //-->
-       <maintenance-system>
-               <!-- @TODO Find something for this empty tag. //-->
-       </maintenance-system>
+            fruits. But it is optional. You can currently specify multiple systems,
+            e.g. ventilation and maybe cooling aggregate or so. //-->
+       <maintenance-system-list>
+               <!-- A single maintenance system. //-->
+               <maintenance-system>
+                       <id>{?maintenance_id?}</id>
+                       <type>{?maintenance_type?}</type>
+               </maintenance-system>
+       </maintenance-system-list>
 </container>

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 477c982cfdeae3ea2f880b98bedbf3771511f454..e7ccc3d42889b3b0de85e3c4df5bb0a73f1ff72f 100644 (file)
--- a/application/ship-simu/templates/de/game/ship/base_ship.xml
+++ b/application/ship-simu/templates/de/game/ship/base_ship.xml
@@ -74,6 +74,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <id>{?engine_id?{</id>
                <type>{?engine_type?}</type>
        </engine>
+       <!-- A list of what this transportates. //-->
+       <transportation-list>
+       </transportation-list>
        <!-- A ship may require one or more of these system to operate. //-->
        <ship-systems>
                <!-- The electric system of latest ship has becom the most important
@@ -92,8 +95,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <!-- Nearly all ships will have a navigation system. //-->
                <navigation-system>
                </navigation-system>
-               <!-- A guidance system, //-->
+               <!-- A guidance system which every ship should have... //-->
                <guidance-system>
                </guidance-system>
+               <!-- A fire reporting and fighting system. //-->
+               <fire-system>
+               </fire-system>
        </ship-systems>
 </ship>