From c78a5c6355611bfad71feaebd7646b32329f808f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Mon, 9 Nov 2009 02:17:09 +0000
Subject: [PATCH] New building 'advanced research lab' added, floor-list added
 to buildings, menu XML updated

---
 .gitattributes                                |   1 +
 Doxyfile                                      |   2 +-
 .../ship-simu/templates/de/menu/base_menu.xml |  30 +++--
 .../de/menu/generic_menu_entries.xml          | 116 +++++++++---------
 .../game/building/advanced_research_lab.xml   |  51 ++++++++
 .../templates/game/building/base_building.xml |  11 +-
 6 files changed, 139 insertions(+), 72 deletions(-)
 create mode 100644 application/ship-simu/templates/game/building/advanced_research_lab.xml

diff --git a/.gitattributes b/.gitattributes
index b1fa1f1..dd04609 100644
--- 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 1c05f5d..6b21e2b 100644
--- 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 b859ba1..90fcaf5 100644
--- 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 eab5d44..3b46731 100644
--- 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
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 0961194..ab77439 100644
--- 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>
-- 
2.30.2