New building 'advanced research lab' added, floor-list added to buildings, menu XML...

diff --git a/.gitattributes b/.gitattributes
index b1fa1f1022fd33f64581cc32501434dd038625a7..dd0460998e717c100c212f88d09c2d486b4662b1 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -285,6 +285,7 @@ application/ship-simu/templates/de/menu/generic_menu_entries.xml -text
 application/ship-simu/templates/game/!MISSING -text
 application/ship-simu/templates/game/.htaccess -text
 application/ship-simu/templates/game/building/.htaccess -text
+application/ship-simu/templates/game/building/advanced_research_lab.xml -text
 application/ship-simu/templates/game/building/base_building.xml -text
 application/ship-simu/templates/game/building/research_lab.xml -text
 application/ship-simu/templates/game/chemicals/.htaccess -text

diff --git a/Doxyfile b/Doxyfile
index 1c05f5d23a9a94eca468fd2b4d8c808b028ebf0a..6b21e2bc317f395ddf8f19fce0c5b31a97b80bc8 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -1282,7 +1282,7 @@ DOT_GRAPH_MAX_NODES    = 50
 # code bases. Also note that the size of a graph can be further restricted by 
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
-MAX_DOT_GRAPH_DEPTH    = 1000
+MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
 # background. This is disabled by default, which results in a white background. 

diff --git a/application/ship-simu/templates/de/menu/base_menu.xml b/application/ship-simu/templates/de/menu/base_menu.xml
index b859ba1660be25a9a59de1d6c5196a9bb6b24b4c..90fcaf5c59d11e8dbb65d35ee535e6ab69de3234 100644 (file)
--- a/application/ship-simu/templates/de/menu/base_menu.xml
+++ b/application/ship-simu/templates/de/menu/base_menu.xml
@@ -22,17 +22,21 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <menu>
-       <header>
-               <title class="{!menu_title_class?}">
-                       {?menu_title?}
-               </title>
-       </header>
-       <entries-content>
-               {?menu_entries?}
-       </entries-content>
-       <footer id="{!footer_id?}">
-               <text class="{?footer_design_class?}">
-                       {?menu_footer?}
-               </text>
-       </footer>
+       <block-list>
+               <block>
+                       <header>
+                               <title class="{!menu_title_class?}">
+                                       {?menu_title?}
+                               </title>
+                       </header>
+                       <entries-content>
+                               {?menu_entry-list?}
+                       </entries-content>
+                       <footer id="{!footer_id?}">
+                               <text class="{?footer_design_class?}">
+                                       {?menu_footer?}
+                               </text>
+                       </footer>
+               </block>
+       </block-list>
 </menu>

diff --git a/application/ship-simu/templates/de/menu/generic_menu_entries.xml b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
index eab5d44a9a2d8ff4ce9db984f19eef45fb3fbbda..3b46731904916c7276bc390fc76e12d47d0eb269 100644 (file)
--- a/application/ship-simu/templates/de/menu/generic_menu_entries.xml
+++ b/application/ship-simu/templates/de/menu/generic_menu_entries.xml
@@ -22,60 +22,64 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <menu>
-       <header>
-               <title id="home" class="menu_title_home">
-                       <![CDATA[Home:]]>
-               </title>
-       </header>
-       <entries>
-               <entry id="home">
-                       <anchor id="menu_home" link="Home" title="Home">
-                               <![CDATA[index.php?app={?app_short_name?}]]>
-                       </anchor>
-               </entry>
-               <entry id="login">
-                       <anchor id="menu_login" link="Einloggen" title="Zum Spiel {?app_name?} einloggen">
-                               <![CDATA[index.php?app={?app_short_name?}&amp;page=login]]>
-                       </anchor>
-               </entry>
-               <entry id="register">
-                       <anchor id="menu_register" link="Home" title="Zur Anmeldeseite">
-                               <![CDATA[index.php?app={?app_short_name?}&amp;page=register]]>
-                       </anchor>
-               </entry>
-       </entries>
-       <header>
-               <title id="law" class="menu_title_law">
-                       <![CDATA[Rechtliches:]]>
-               </title>
-       </header>
-       <entries>
-               <entry id="imprint">
-                       <anchor id="menu_imprint" link="Impressum" title="Impressum">
-                               <![CDATA[index.php?app={?app_short_name?}&amp;page=imprint]]>
-                       </anchor>
-               </entry>
-               <entry id="terms">
-                       <anchor id="menu_terms" link="ANBs" title="Allgemeine Nutzungsbedingungen">
-                               <![CDATA[index.php?app={?app_short_name?}&amp;page=terms]]>
-                       </anchor>
-               </entry>
-               <entry id="pillory">
-                       <anchor id="menu_pillory" link="Pranger" title="Zum Pranger">
-                               <![CDATA[index.php?app={?app_short_name?}&amp;page=pillory]]>
-                       </anchor>
-               </entry>
-               <!--
-               <entry id="">
-                       <anchor id="menu_" link="" title="" target="" rel="">
-                               <![CDATA[index.php?app={?app_short_name?}&amp;page=]]>
-                       </anchor>
-               </entry>
-               //-->
-       </entries>
-       <footer id="generic_menu_footer">
-               <text class="menu_footer">
-                       <![CDATA[Leer]]>
-               </text>
-       </footer>
+       <block-list>
+               <block>
+                       <header>
+                               <title id="home" class="menu_title_home">
+                                       <![CDATA[Home:]]>
+                               </title>
+                       </header>
+                       <entry-list>
+                               <entry id="home">
+                                       <anchor id="menu_home" link="Home" title="Home">
+                                               <![CDATA[index.php?app={?app_short_name?}]]>
+                                       </anchor>
+                               </entry>
+                               <entry id="login">
+                                       <anchor id="menu_login" link="Einloggen" title="Zum Spiel {?app_name?} einloggen">
+                                               <![CDATA[index.php?app={?app_short_name?}&amp;page=login]]>
+                                       </anchor>
+                               </entry>
+                               <entry id="register">
+                                       <anchor id="menu_register" link="Home" title="Zur Anmeldeseite">
+                                               <![CDATA[index.php?app={?app_short_name?}&amp;page=register]]>
+                                       </anchor>
+                               </entry>
+                               <entry id="pillory">
+                                       <anchor id="menu_pillory" link="Pranger" title="Zum Pranger">
+                                               <![CDATA[index.php?app={?app_short_name?}&amp;page=pillory]]>
+                                       </anchor>
+                               </entry>
+                       </entry-list>
+                       <footer id="home_menu_footer">
+                               <text class="menu_footer">
+                                       <![CDATA[Leer]]>
+                               </text>
+                       </footer>
+               </block>
+               <block>
+                       <header>
+                               <title id="law" class="menu_title_law">
+                                       <![CDATA[Rechtliches:]]>
+                               </title>
+                       </header>
+                       <entry-list>
+                               <entry id="imprint">
+                                       <anchor id="menu_imprint" link="Impressum" title="Impressum">
+                                               <![CDATA[index.php?app={?app_short_name?}&amp;page=imprint]]>
+                                       </anchor>
+                               </entry>
+                               <entry id="terms">
+                                       <anchor id="menu_terms" link="ANBs" title="Allgemeine Nutzungsbedingungen">
+                                               <![CDATA[index.php?app={?app_short_name?}&amp;page=terms]]>
+                                       </anchor>
+                               </entry>
+                       </entry-list>
+                       <footer id="law_menu_footer">
+                               <text class="menu_footer">
+                                       <![CDATA[Leer]]>
+                               </text>
+                       </footer>
+               </block>
+       </block-list>
 </menu>

diff --git a/application/ship-simu/templates/game/building/advanced_research_lab.xml b/application/ship-simu/templates/game/building/advanced_research_lab.xml
new file mode 100644 (file)
index 0000000..ef8aebe
--- /dev/null
+++ b/application/ship-simu/templates/game/building/advanced_research_lab.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+An advanced research laboratory 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>advanced_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. //-->
+       <dependencies>
+               <!-- A list of required technology to construct this building. //-->
+               <technology-dependency-list>
+                       <!-- Arcgictecture is required. //-->
+                       <technology-dependency>
+                               <type>architecture</type>
+                               <level>10</level>
+                       </technology-dependency>
+                       <!-- Labory equipment is required. //-->
+                       <technology-dependency>
+                               <type>laboratory_equipment</type>
+                               <level>8</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+       </dependencies>
+</building>

diff --git a/application/ship-simu/templates/game/building/base_building.xml b/application/ship-simu/templates/game/building/base_building.xml
index 0961194586a70b865d6fe1f66f28062f3a032be1..ab7743905c74d22fb7e143ab4f0338b2637b79b4 100644 (file)
--- a/application/ship-simu/templates/game/building/base_building.xml
+++ b/application/ship-simu/templates/game/building/base_building.xml
@@ -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. //-->
-               <dimensions>
+               <estimated-dimensions>
                        <!-- Width of the building. //-->
                        <width>{?width?}</width>
                        <!-- Height of the building. //-->
                        <height>{?height?}</height>
                        <!-- Length of the building. //-->
                        <length>{?length?}</length>
-               </dimensions>
+               </estimated-dimensions>
                <!--A summary for this building. //-->
                <summary>
                        <![CDATA[{?summary?}]]>
@@ -47,6 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                        <name>{?name?}</name>
                        <type>{?type?}</type>
                        <level>{?level?}</level>
+                       <max-floors>{?max_floors?}</max-floors>
                        <!-- The owner of this building. //-->
                        <owner id="{?owner_id?}" type="{?owner_type?}" owned-start="{?owner_start_timestamp?}" owned-end="{?owner_end_timestamp?}" />
                        <!-- The occupant of this building. //-->
@@ -158,4 +159,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                        </technology-dependency>
                </technology-dependency-list>
        </dependencies>
+       <!-- A list of floors this building has. //-->
+       <floor-list>
+               <!-- A single floor where we can add rooms to. //-->
+               <floor>
+               </floor>
+       </floor-list>
 </building>