]> git.mxchange.org Git - shipsimu.git/commitdiff
Basic fuel and tank templates added, typos fixed
authorRoland Häder <roland@mxchange.org>
Wed, 30 Sep 2009 23:47:31 +0000 (23:47 +0000)
committerRoland Häder <roland@mxchange.org>
Wed, 30 Sep 2009 23:47:31 +0000 (23:47 +0000)
- New base_fuel.xml and base_tank.xml added (not finished)
- Typos for all "dimensions" nodes fixed
- Comments added to base_engine.xml

15 files changed:
.gitattributes
application/ship-simu/templates/de/game/building/base_building.xml
application/ship-simu/templates/de/game/container/base_container.xml
application/ship-simu/templates/de/game/electronic/base_electronic.xml
application/ship-simu/templates/de/game/electronic/cellphone.xml
application/ship-simu/templates/de/game/engine/base_engine.xml
application/ship-simu/templates/de/game/fuel/.htaccess [new file with mode: 0644]
application/ship-simu/templates/de/game/fuel/base_fuel.xml [new file with mode: 0644]
application/ship-simu/templates/de/game/ship/base_ship.xml
application/ship-simu/templates/de/game/tank/.htaccess [new file with mode: 0644]
application/ship-simu/templates/de/game/tank/base_tank.xml [new file with mode: 0644]
application/ship-simu/templates/de/game/types/contract_types.xml
application/ship-simu/templates/de/game/types/engine_types.xml [new file with mode: 0644]
application/ship-simu/templates/de/game/types/fuel_types.xml [new file with mode: 0644]
application/ship-simu/templates/de/game/types/tank_types.xml [new file with mode: 0644]

index a94be23f18e1f9f8389726642fcb84bd925f7547..88c57e596a05aafba011741536b3cbe27c38f97a 100644 (file)
@@ -289,6 +289,8 @@ 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/fuel/.htaccess -text
+application/ship-simu/templates/de/game/fuel/base_fuel.xml -text
 application/ship-simu/templates/de/game/merchant/.htaccess -text
 application/ship-simu/templates/de/game/merchant/base_merchant.xml -text
 application/ship-simu/templates/de/game/mineral/.htaccess -text
@@ -301,6 +303,8 @@ 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
 application/ship-simu/templates/de/game/ship/base_ship.xml -text
+application/ship-simu/templates/de/game/tank/.htaccess -text
+application/ship-simu/templates/de/game/tank/base_tank.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
@@ -316,11 +320,14 @@ application/ship-simu/templates/de/game/types/container_types.xml -text
 application/ship-simu/templates/de/game/types/content_types.xml -text
 application/ship-simu/templates/de/game/types/contract_types.xml -text
 application/ship-simu/templates/de/game/types/electronic_types.xml -text
+application/ship-simu/templates/de/game/types/engine_types.xml -text
+application/ship-simu/templates/de/game/types/fuel_types.xml -text
 application/ship-simu/templates/de/game/types/merchant_types.xml -text
 application/ship-simu/templates/de/game/types/owner_occupants.xml -text
 application/ship-simu/templates/de/game/types/research_types.xml -text
 application/ship-simu/templates/de/game/types/ship_types.xml -text
 application/ship-simu/templates/de/game/types/signer_types.xml -text
+application/ship-simu/templates/de/game/types/tank_types.xml -text
 application/ship-simu/templates/de/game/types/technology_types.xml -text
 application/ship-simu/templates/de/html/.htaccess -text
 application/ship-simu/templates/de/html/nav_advert.tpl -text
index 7a8fb0d1a854d82a73e16f824eff8e7231621434..0961194586a70b865d6fe1f66f28062f3a032be1 100644 (file)
@@ -25,14 +25,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        <!-- General building data //-->
        <building-data>
                <!-- Estimated dimensions of the building. //-->
-               <dimension>
+               <dimensions>
                        <!-- Width of the building. //-->
                        <width>{?width?}</width>
                        <!-- Height of the building. //-->
                        <height>{?height?}</height>
                        <!-- Length of the building. //-->
                        <length>{?length?}</length>
-               </dimension>
+               </dimensions>
                <!--A summary for this building. //-->
                <summary>
                        <![CDATA[{?summary?}]]>
index fc9c7f47a04da832c7fcf27a66964834f0bef383..2b229370c62817972cefc8ae4df71e8364f9b8f4 100644 (file)
@@ -31,11 +31,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <!-- Look at container_types.xml for details. //-->
                <type>{?type?}</type>
                <!-- Dimension of the container. //-->
-               <dimension>
+               <dimensions>
                        <width>{?width?}</width>
                        <length>{?length?}</length>
                        <height>{?height?}</height>
-               </dimension>
+               </dimensions>
        </general-data>
        <!-- The owner of the container, this should be a company, //-->
        <owner>
index 932eca9499821fc21ac1c5173ac8fee87b2b55a6..8db4deeaca6f5c4b5ea63e202f1ba1e9808d9996 100644 (file)
@@ -34,13 +34,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <id>{?id?}</id>
                <name>{?name?}</name>
                <type>{?type?}</type>
-               <!-- Simplified dimension of the electronics because it will be placed
+               <!-- Simplified dimensions of the electronics because it will be placed
                     into a small box for transportation. //-->
-               <dimension>
+               <dimensions>
                        <width>{?width?}</width>
                        <height>{?height?}</height>
                        <length>{?length?}</length>
-               </dimension>
+               </dimensions>
        </general-data>
        <!-- An electronical device may depend on one or more technologies, at least
             'electronics'. //-->
index 0dcbe982a164a0acd15cbb939ec0ef8531c3c801..a66cc3f6f36934b9686f7c88062312ee48a55119 100644 (file)
@@ -31,13 +31,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <!-- Id and type for this electronic. //-->
                <name>cellphone</name>
                <type>communication</type>
-               <!-- Simplified dimension of the electronics because it will be placed
+               <!-- Simplified dimensions of the electronics because it will be placed
                     into a small box for transportation. //-->
-               <dimension>
+               <dimensions>
                        <width>30</width>
                        <height>35</height>
                        <length>30</length>
-               </dimension>
+               </dimensions>
        </general-data>
        <!-- An electronical device may depend on one or more technologies, at least
             'electronics'. //-->
index 9ca04238907168b73849c80d90172a3d9a9d27e0..e6bdf635add75f84a30bdc2d41b7dd70193ffe99 100644 (file)
@@ -22,4 +22,37 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <engine>
+       <!-- General data about this engine. //-->
+       <general-data>
+               <id>{?id?}</id>
+               <name>{?name?}</name>
+               <type>{?type?}</type>
+               <horse-power>{?horse_power?}</horse-power>
+       </general-data>
+       <!-- Type of fuel we need. May be left out if this "engine" is e.g. a sail. //-->
+       <fuel>
+               <id>{?fuel_id?}</id>
+               <name>{?fuel_name?}</name>
+               <type>{?fuel_type?}</type>
+       </fuel>
+       <!-- Simplified dimensions of this engine. Can be left out for sails. //-->
+       <dimensions>
+               <width>{?width?}</width>
+               <height>{?height?}</height>
+               <length>{?length?}</length>
+       </dimensions>
+       <!-- Some engine require knowledge in specific technologies. //-->
+       <depenndencies>
+               <!-- A list of required technology to build this engine. A better level
+                    may increase the horse power of this engine. Some ships require
+                    higher horse power or else it won't move. //-->
+               <technology-dependency-list>
+                       <!-- A single technology dependency. //-->
+                       <technology-dependency>
+                               <id>{[?technology_id?}</id>
+                               <name>{[?technology_name?}</name>
+                               <level>{[?technology_level?}</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+       </depenndencies>
 </engine>
diff --git a/application/ship-simu/templates/de/game/fuel/.htaccess b/application/ship-simu/templates/de/game/fuel/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/templates/de/game/fuel/base_fuel.xml b/application/ship-simu/templates/de/game/fuel/base_fuel.xml
new file mode 100644 (file)
index 0000000..38bc771
--- /dev/null
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general fuel template.
+
+@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/>
+//-->
+<fuel>
+       <general-data>
+               <id>{?id?}</id>
+               <name>{?name?}</name>
+               <type>{?type?}</type>
+       </general-data>
+</fuel>
index c5316563eb7db2e53a382283830c13335c1926d3..5160727e4d53c77471c450abfc1245cca7c439bb 100644 (file)
@@ -80,8 +80,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        </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
-                    on a ship. It poeeres all other systems and provides electrical
+               <!-- The electric system of latest ships has becom the most important
+                    on a ship. It powers all other systems and provides electrical
                     power to all kind of commercials and cabins including interior and
                     exterior lights. So you should be adviced to provide emergency
                     systems and redudancy for this system. //-->
diff --git a/application/ship-simu/templates/de/game/tank/.htaccess b/application/ship-simu/templates/de/game/tank/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/templates/de/game/tank/base_tank.xml b/application/ship-simu/templates/de/game/tank/base_tank.xml
new file mode 100644 (file)
index 0000000..7761160
--- /dev/null
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general tank template for different types of fuel.
+
+@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/>
+//-->
+<tank>
+       <general-data>
+               <id>{?id?}</id>
+               <name>{?name?}</name>
+               <type>{?type?}</type>
+       </general-data>
+       <content>
+               <id>{?content_id?}</id>
+               <name>{?content_name?}</name>
+               <type>{?content_type?}</type>
+       </content>
+       <dependencies>
+               <technology-dependency-list>
+                       <technology-dependency>
+                               <id>{?technology_id?}</id>
+                               <name>{?technology_name?}</name>
+                               <level>{?technology_level?}</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+       </dependencies>
+</tank>
index dc8513694bf8114197c53e73583ca882e51ec492..2cb1f0c04e6e099bf2e18e9cfed95bbd97dfe804 100644 (file)
@@ -25,11 +25,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        <!-- A construction contract, possible signers: Construction company, customer, creditor //-->
        <contract-type type="construction_contract" max-signers="3">
                <!-- All valid signer types for this contract //-->
-               <signer-types extends="signer_types">
+               <signer-type-list extends="signer_types">
                        <signer-type type="player" slot="all" max="3" />
                        <signer-type type="moneybank" slot="creditor" max="1" />
                        <signer-type type="construction_company" slot="construction_company" max="1" />
-               </signer-types>
+               </signer-type-list>
                <!-- And the corresponding slot types //-->
                <slots>
                        <slot type="construction_company" must-have="true" />
diff --git a/application/ship-simu/templates/de/game/types/engine_types.xml b/application/ship-simu/templates/de/game/types/engine_types.xml
new file mode 100644 (file)
index 0000000..a1dca75
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid engine types.
+
+@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/>
+//-->
+<enngine-type-list>
+       <!-- Modern ships has a motorized (steam, oil or diesel) engine. //-->
+       <engine-type type="motor" />
+</enngine-type-list>
diff --git a/application/ship-simu/templates/de/game/types/fuel_types.xml b/application/ship-simu/templates/de/game/types/fuel_types.xml
new file mode 100644 (file)
index 0000000..21d2357
--- /dev/null
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid fuel types.
+
+@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/>
+//-->
+<fuel-type-list>
+       <!-- Fosil fuels can be oil, cerosine or diesel. //-->
+       <fuel-type type="fosil" />
+</fuel-type-list>
diff --git a/application/ship-simu/templates/de/game/types/tank_types.xml b/application/ship-simu/templates/de/game/types/tank_types.xml
new file mode 100644 (file)
index 0000000..d0711e0
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid tank types
+
+@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
+@todo          Unfinished template
+
+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/>
+//-->
+<tank-type-list>
+</tank-type-list>