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

diff --git a/.gitattributes b/.gitattributes
index c4ab0fc37ab0616860fcebf57747053857dfaf1f..ec0ee660cfffab6a700da573325731cdd84f40b3 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -277,6 +277,7 @@ application/ship-simu/templates/de/game/!MISSING -text
 application/ship-simu/templates/de/game/.htaccess -text
 application/ship-simu/templates/de/game/building/.htaccess -text
 application/ship-simu/templates/de/game/building/base_building.xml -text
+application/ship-simu/templates/de/game/building/research_lab.xml -text
 application/ship-simu/templates/de/game/company/.htaccess -text
 application/ship-simu/templates/de/game/container/.htaccess -text
 application/ship-simu/templates/de/game/container/base_container.xml -text
@@ -295,8 +296,10 @@ 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/technology/.htaccess -text
+application/ship-simu/templates/de/game/technology/architecture.xml -text
 application/ship-simu/templates/de/game/technology/base_technology.xml -text
 application/ship-simu/templates/de/game/types/.htaccess -text
+application/ship-simu/templates/de/game/types/building_types.xml -text
 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

diff --git a/application/ship-simu/templates/de/game/building/base_building.xml b/application/ship-simu/templates/de/game/building/base_building.xml
index c9815d249dbf7055ac049f8251f42db41f384eb1..ce4331c7ac7a48edde98cc9a27e7bcf81c7bc7fd 100644 (file)
--- a/application/ship-simu/templates/de/game/building/base_building.xml
+++ b/application/ship-simu/templates/de/game/building/base_building.xml
@@ -33,6 +33,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                        <!-- Length of the building. //-->
                        <length>{?length?}</length>
                </dimension>
+               <!--A summary for this building. //-->
+               <summary>
+                       <![CDATA[{?summary?}]]>
+               </summary>
                <!-- A full description of this building. //-->
                <description>
                        <![CDATA[{?description?}]]>
@@ -145,9 +149,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
             shipping company to construct this building. //-->
        <depencies>
                <!-- A list of required technology to construct this building. //-->
-               <technology-depency-list>
+               <technology-dependency-list>
                        <!-- A single required technology to construct this building. //-->
-                       <technology-depency id="{?technology_id?}" level="{?technology_level?}" />
-               </technology-depency-list>
+                       <technology-dependency>
+                               <id>{?technology_id?}</id>
+                               <type>{?technology_type?}</type>
+                               <level>{?technology_level?}</level>
+                       </technology-dependency>
+               </technology-dependency-list>
        </depencies>
 </building>

diff --git a/application/ship-simu/templates/de/game/building/research_lab.xml b/application/ship-simu/templates/de/game/building/research_lab.xml
new file mode 100644 (file)
index 0000000..1aee0d3
--- /dev/null
+++ b/application/ship-simu/templates/de/game/building/research_lab.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general research lab for conducting simple experiments.
+
+@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/>
+//-->
+<building extends="base_building">
+       <!-- General building data //-->
+       <building-data>
+               <!-- General data, like short name, type, level and many more. //-->
+               <general-data>
+                       <name>research_lab</name>
+                       <type>research</type>
+               </general-data>
+       </building-data>
+       <!-- We also have technology denpencies for a building. These must be
+            understand by construction companies who made contracts with the
+            shipping company to construct this building. //-->
+       <depencies>
+               <!-- A list of required technology to construct this building. //-->
+               <technology-dependency-list>
+                       <!-- Arcgictecture is required. //-->
+                       <technology-dependency>
+                               <type>architecture</type>
+                               <level>5</level>
+                       </technology-dependency>
+                       <!-- Labory equipment is required. //-->
+                       <technology-dependency>
+                               <type>labory_equpment</type>
+                               <level>1</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+       </depencies>
+</building>

diff --git a/application/ship-simu/templates/de/game/mineral/base_mineral.xml b/application/ship-simu/templates/de/game/mineral/base_mineral.xml
index 4e2039595b906d94b79a6d687bbfdaba84a92767..19e3464b45bfb9f1a721263500a3886fc1765516 100644 (file)
--- a/application/ship-simu/templates/de/game/mineral/base_mineral.xml
+++ b/application/ship-simu/templates/de/game/mineral/base_mineral.xml
@@ -40,8 +40,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        </general-data>
        <!-- To mine some minerals some knowledge in one or two technologies is
             required. Here you can list each technology with its required level. //-->
-       <technology-depency-list>
+       <technology-dependency-list>
                <!-- A single technology required to mine this mineral. //-->
-               <technology-depency id="{?technology_id?}" level="{?technology_level?}" />
-       </technology-depency-list>
+               <technology-dependency id="{?technology_id?}" level="{?technology_level?}" />
+       </technology-dependency-list>
 </mineral>

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 b564f27c8e0106ba0771da1fd4515a981773a2a2..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
@@ -72,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 id="{?building_id?}" level="{?building_level?}" />
-                       </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>

diff --git a/application/ship-simu/templates/de/game/resource/base_resource.xml b/application/ship-simu/templates/de/game/resource/base_resource.xml
index 6df52676baa81e05b6f0b185fe37f4fa9cc61151..3f8779568ed8d50873300820f7b7a2be43eb0a43 100644 (file)
--- a/application/ship-simu/templates/de/game/resource/base_resource.xml
+++ b/application/ship-simu/templates/de/game/resource/base_resource.xml
@@ -39,8 +39,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        </general-data>
        <!-- To harvest some resource some knowledge in one or two technologies is
             required. Here you can list each technology with its required level. //-->
-       <technology-depency-list>
-               <!-- A single technology depency to harvest this resource. //-->
-               <technology-depency id="{?technology_id?}" level="{?technology_level?}" />
-       </technology-depency-list>
+       <technology-dependency-list>
+               <!-- A single technology dependency to harvest this resource. //-->
+               <technology-dependency id="{?technology_id?}" level="{?technology_level?}" />
+       </technology-dependency-list>
 </resource>

diff --git a/application/ship-simu/templates/de/game/technology/architecture.xml b/application/ship-simu/templates/de/game/technology/architecture.xml
new file mode 100644 (file)
index 0000000..9d4dfe6
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/architecture.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A architecture technology 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/>
+//-->
+<technology extends="base_technology">
+       <!-- General technology data like type, level, summary or description. //-->
+       <general-data>
+               <name>architecture</name>
+               <type>building</type>
+       </general-data>
+       <!-- A technology may depend on some other technologies or research
+            proposals. //-->
+       <depencies>
+               <!-- All technology depencies for this technology. //-->
+               <technology-dependency-list>
+                       <!-- A technology dependency for this technology. //-->
+                       <technology-dependency>
+                               <name>{?technology_name?}</name>
+                               <level>{?technology_level?}</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research depencies for this technology. //-->
+               <research-dependency-list>
+                       <!-- A research dependency for this technology. //-->
+                       <research-dependency>
+                               <name>{?research_name?}</name>
+                               <level>{?research_level?}</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </depencies>
+</technology>

diff --git a/application/ship-simu/templates/de/game/technology/base_technology.xml b/application/ship-simu/templates/de/game/technology/base_technology.xml
index b08fe14538d1230d4ae516ac92d122c666a1a2f7..a93ff5cb739cedb163cfdd558fa184d9d65c2140 100644 (file)
--- a/application/ship-simu/templates/de/game/technology/base_technology.xml
+++ b/application/ship-simu/templates/de/game/technology/base_technology.xml
@@ -25,8 +25,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        <!-- General technology data like type, level, summary or description. //-->
        <general-data>
                <id>{?id?}</id>
+               <name>{?name?}</name>
                <type>{?type?}</type>
-               <level>{?level?}</level>
                <!-- The date/time when this technology was gained, e.g. by research. //-->
                <technology-gained timestamp="{?gained?}" />
                <!-- A summary of this technology. //-->
@@ -57,14 +57,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
             proposals. //-->
        <depencies>
                <!-- All technology depencies for this technology. //-->
-               <technology-depency-list>
-                       <!-- A technology depency for this technology. //-->
-                       <technology-depency id="{?technology_id?}" level="{?technology_level?}" />
-               </technology-depency-list>
+               <technology-dependency-list>
+                       <!-- A technology dependency for this technology. //-->
+                       <technology-dependency>
+                               <id>{?technology_id?}</id>
+                               <name>{?technology_name?}</name>
+                               <level>{?technology_level?}</level>
+                       </technology-dependency>
+               </technology-dependency-list>
                <!-- All research depencies for this technology. //-->
-               <research-depency-list>
-                       <!-- A research depency for this technology. //-->
-                       <research-depency id="{?research_id?}" level="{?research_level?}" />
-               </research-depency-list>
+               <research-dependency-list>
+                       <!-- A research dependency for this technology. //-->
+                       <research-dependency>
+                               <id>{?research_id?}</id>
+                               <name>{?research_name?}</name>
+                               <level>{?research_level?}</level>
+                       </research-dependency>
+               </research-dependency-list>
        </depencies>
 </technology>

diff --git a/application/ship-simu/templates/de/game/types/building_types.xml b/application/ship-simu/templates/de/game/types/building_types.xml
new file mode 100644 (file)
index 0000000..dcd9d57
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/building_types.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid types of buildings.
+
+@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/>
+//-->
+<building-type-list>
+       <!-- Research buildings. //-->
+       <building type type="research" />
+</building-type-list>

diff --git a/application/ship-simu/templates/de/game/types/technology_types.xml b/application/ship-simu/templates/de/game/types/technology_types.xml
index 5e56fadf3f2003830c0e63c843ed07cb33525d74..d07d2abb1c75b1210753bac78e27cc8cb0e69a15 100644 (file)
--- a/application/ship-simu/templates/de/game/types/technology_types.xml
+++ b/application/ship-simu/templates/de/game/types/technology_types.xml
@@ -23,4 +23,6 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <technology-type-list>
+       <!-- Technology required for construction of buildings. ///-->
+       <technology-type type="building" />
 </technology-type-list>