From 68a738bc667ab5cbf2a4ecec49bd036e8f3577fd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 10 Sep 2009 00:56:37 +0000
Subject: [PATCH] XMLs amoved, research XML added, building XML updated: - All
 type definition XMLs moved to own directory - Added owner/occupants
 definition XML - Added research proposal XML - Updated building XML to
 include owner/occupant types

---
 .gitattributes                                |  7 +-
 .../de/game/building/base_building.xml        | 12 ++-
 .../de/game/research/base_research.xml        | 76 +++++++++++++++++++
 .../templates/de/game/types/.htaccess         |  1 +
 .../{contract => types}/contract_types.xml    |  4 +-
 .../de/game/types/owner_occupants.xml         | 26 +++++++
 .../game/{contract => types}/signer_types.xml |  4 +-
 7 files changed, 120 insertions(+), 10 deletions(-)
 create mode 100644 application/ship-simu/templates/de/game/research/base_research.xml
 create mode 100644 application/ship-simu/templates/de/game/types/.htaccess
 rename application/ship-simu/templates/de/game/{contract => types}/contract_types.xml (97%)
 create mode 100644 application/ship-simu/templates/de/game/types/owner_occupants.xml
 rename application/ship-simu/templates/de/game/{contract => types}/signer_types.xml (96%)

diff --git a/.gitattributes b/.gitattributes
index 69ec6dc..c0cfa26 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -280,11 +280,14 @@ application/ship-simu/templates/de/game/building/base_building.xml -text
 application/ship-simu/templates/de/game/company/.htaccess -text
 application/ship-simu/templates/de/game/contract/.htaccess -text
 application/ship-simu/templates/de/game/contract/base_contract.xml -text
-application/ship-simu/templates/de/game/contract/contract_types.xml -text
-application/ship-simu/templates/de/game/contract/signer_types.xml -text
 application/ship-simu/templates/de/game/merchant/.htaccess -text
 application/ship-simu/templates/de/game/research/.htaccess -text
+application/ship-simu/templates/de/game/research/base_research.xml -text
 application/ship-simu/templates/de/game/resource/.htaccess -text
+application/ship-simu/templates/de/game/types/.htaccess -text
+application/ship-simu/templates/de/game/types/contract_types.xml -text
+application/ship-simu/templates/de/game/types/owner_occupants.xml -text
+application/ship-simu/templates/de/game/types/signer_types.xml -text
 application/ship-simu/templates/de/html/.htaccess -text
 application/ship-simu/templates/de/html/nav_advert.tpl -text
 application/ship-simu/templates/de/html/selector_ship-simu.tpl -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 10dd1a2..7640500 100644
--- a/application/ship-simu/templates/de/game/building/base_building.xml
+++ b/application/ship-simu/templates/de/game/building/base_building.xml
@@ -29,8 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<![CDATA[{?building_description?}]]>
 		</description>
 		<general-data id="{?building_id?}" name="{?building_name?}">
-			<owner id="{?owner_id?}" owned-start="{?owner_start_timestamp?}" owned-end="{?owner_end_timestamp?}" />
-			<occupant id="{?occupant_id?}" owned-start="{?occupant_start_timestamp?}" owned-end="{?occupant_end_timestamp?}" />
+			<owner id="{?owner_id?}" type="{?owner_type?}" owned-start="{?owner_start_timestamp?}" owned-end="{?owner_end_timestamp?}" />
+			<occupant id="{?occupant_id?}" type="{?occupant_type?}" owned-start="{?occupant_start_timestamp?}" owned-end="{?occupant_end_timestamp?}" />
 			<constructed>
 				<construction-started timestamp="{?construction_start_timestamp?}" />
 				<construction-finished timestamp="{?construction_end_timestamp?}" />
@@ -93,7 +93,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	     must be understand by construction companies who made contracts with
 	     the shipping company to construct this building. //-->
 	<depencies>
-		<technology id="{?technology_id?}" level="{?technology_level?}" />
-		<research id="{?research_id?}" level="{?research_level?}" />
+		<technology-list>
+			<technology id="{?technology_id?}" level="{?technology_level?}" />
+		</technology-list>
+		<research-list>
+			<research id="{?research_id?}" level="{?research_level?}" />
+		</research-list>
 	</depencies>
 </building>
diff --git a/application/ship-simu/templates/de/game/research/base_research.xml b/application/ship-simu/templates/de/game/research/base_research.xml
new file mode 100644
index 0000000..c922ca9
--- /dev/null
+++ b/application/ship-simu/templates/de/game/research/base_research.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+This is a general research proposal template. A research is the theoretical
+requirement to gain a specific technology or to be able to construct special
+buildings, ships et cetera. A research may not be gainable but conductable e.g.
+in a research lab.
+
+@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/>
+//-->
+<research-proposal>
+	<!-- General data of this research like id, summar or description. //-->
+	<research-data id="{?id?}" type="{?type?}">
+		<!-- @TODO We need to add something that allows the simulation to e.g.
+		     @TODO decrease building time or higher efficience of certain
+		     @TODO facilities. Currently, a research proposal is only used as a
+		     @TODO depency. //-->
+		<!-- A brief summary for this research proposal. //-->
+		<research-summary>
+			<![CDATA[{?summary?}]]>
+		</research-summary>
+		<!-- A full description for this research proposal. //-->
+		<research-description>
+			<![CDATA[{?description?}]]>
+		</research-description>
+	</research-data>
+	<!-- This is somewhat a "research history". //-->
+	<research-level-list>
+		<!-- A research level X has its own brief summary and a full description.
+		     It also can have depencies which makes it possible to add different
+		     depencies for higher research levels. //-->
+		<research-level level="{?level?}">
+			<!-- When the research of this level has been started ... //-->
+			<research-started timestamp="{?started?}" />
+			<!-- ... and when it has ended so when the research results are
+			     available. //-->
+			<research-finished timestamp="{?finished?}" />
+			<!-- A brief summary for this research level. //-->
+			<level-summary>
+				<![CDATA[{?level_summary?}]]>
+			</level-summary>
+			<!-- A full description for this research level. //-->
+			<level-description>
+				<![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
+			     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 type="{?building_type?}" />
+			</building-depency-list>
+		</research-level>
+	</research-level-list>
+</research-proposal>
diff --git a/application/ship-simu/templates/de/game/types/.htaccess b/application/ship-simu/templates/de/game/types/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/templates/de/game/contract/contract_types.xml b/application/ship-simu/templates/de/game/types/contract_types.xml
similarity index 97%
rename from application/ship-simu/templates/de/game/contract/contract_types.xml
rename to application/ship-simu/templates/de/game/types/contract_types.xml
index 14bcf87..50a23be 100644
--- a/application/ship-simu/templates/de/game/contract/contract_types.xml
+++ b/application/ship-simu/templates/de/game/types/contract_types.xml
@@ -21,7 +21,7 @@ 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/>
 //-->
-<contract-types>
+<contract-list>
 	<!-- A construction contract, possible signers: Construction company, customer, creditor //-->
 	<contract-type type="construction_contract" max-signers="3">
 		<!-- All valid signer types for this contract //-->
@@ -37,4 +37,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<slot type="creditor" must-have="false" />
 		</slots>
 	</contract-type>
-</contract-types>
+</contract-type-list>
diff --git a/application/ship-simu/templates/de/game/types/owner_occupants.xml b/application/ship-simu/templates/de/game/types/owner_occupants.xml
new file mode 100644
index 0000000..574590b
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/owner_occupants.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All types of owners and occupants
+
+@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 definirion
+
+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/>
+//-->
+<owner-occupants>
+</owner-occupants>
diff --git a/application/ship-simu/templates/de/game/contract/signer_types.xml b/application/ship-simu/templates/de/game/types/signer_types.xml
similarity index 96%
rename from application/ship-simu/templates/de/game/contract/signer_types.xml
rename to application/ship-simu/templates/de/game/types/signer_types.xml
index 7e4787d..8b9ff18 100644
--- a/application/ship-simu/templates/de/game/contract/signer_types.xml
+++ b/application/ship-simu/templates/de/game/types/signer_types.xml
@@ -22,8 +22,8 @@ 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/>
 //-->
-<signer-types>
+<signer-type-list>
 	<!-- The type 'gamer' which is in facts the user. //-->
 	<signer-type type="gamer" table="user" column="userid" />
 	<!-- @TODO Add more types, e.g. company //-->
-</signer-types>
+</signer-types-list>
-- 
2.30.2