From ee4bd85afc9aefcc31097517d1c39ab024849ca7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 10 Sep 2009 22:22:41 +0000
Subject: [PATCH] Technology XML added, prefixes removed: - New
 base_technology.xml added which can be used for custom technologies - Prefix
 'building' removed from base_building.xml - Same for 'contract' from
 base_contract.xml' - And for 'research' from base_research.xml' - TODOs.txt
 updated

---
 .gitattributes                                |  2 +
 .../de/game/building/base_building.xml        |  6 +-
 .../de/game/contract/base_contract.xml        |  6 +-
 .../de/game/research/base_research.xml        | 22 ++++--
 .../templates/de/game/technology/.htaccess    |  1 +
 .../de/game/technology/base_technology.xml    | 67 +++++++++++++++++++
 docs/TODOs.txt                                |  4 --
 7 files changed, 91 insertions(+), 17 deletions(-)
 create mode 100644 application/ship-simu/templates/de/game/technology/.htaccess
 create mode 100644 application/ship-simu/templates/de/game/technology/base_technology.xml

diff --git a/.gitattributes b/.gitattributes
index c0cfa26..ab6dbf2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -284,6 +284,8 @@ 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/technology/.htaccess -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/contract_types.xml -text
 application/ship-simu/templates/de/game/types/owner_occupants.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 7640500..c95b581 100644
--- a/application/ship-simu/templates/de/game/building/base_building.xml
+++ b/application/ship-simu/templates/de/game/building/base_building.xml
@@ -24,11 +24,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 <building>
 	<!-- General building data //-->
 	<building-data>
-		<dimension width="{?building_width?}" length="{?building_length?}" height="{?building_height?}" />
+		<dimension width="{?width?}" length="{?length?}" height="{?height?}" />
 		<description>
-			<![CDATA[{?building_description?}]]>
+			<![CDATA[{?description?}]]>
 		</description>
-		<general-data id="{?building_id?}" name="{?building_name?}">
+		<general-data id="{?id?}" name="{?name?}">
 			<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>
diff --git a/application/ship-simu/templates/de/game/contract/base_contract.xml b/application/ship-simu/templates/de/game/contract/base_contract.xml
index ecfcf12..d8e73d1 100644
--- a/application/ship-simu/templates/de/game/contract/base_contract.xml
+++ b/application/ship-simu/templates/de/game/contract/base_contract.xml
@@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		</contract-party>
 	</contract-parties>
 	<!-- General contract data like data of signature or cancelation //-->
-	<contract-data id="{?contract_id?}" type="{?contract_type?}">
+	<contract-data id="{?id?}" type="{?type?}">
 		<signed timestamp="{?signed_timestamp?}" />
 		<canceled timestamp="{?canceled_timestamp?}" />
 		<cancelation-reason>
@@ -39,13 +39,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 		</cancelation-reason>
 		<!-- A free-text description: //-->
 		<description>
-			<![CDATA[{?contract_description?}]]>
+			<![CDATA[{?description?}]]>
 		</description>
 	</contract-data>
 	<!-- The subject-(matter) of a contract. If this changes, the contract
 	     needs to be renewed. //-->
 	<contract-subject>
 		<!-- @TODO We need to make this more XML than free text. //-->
-		<![CDATA[{?contract_subject?}]]>
+		<![CDATA[{?subject?}]]>
 	</contract-subject>
 </contract>
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 c922ca9..33fe084 100644
--- a/application/ship-simu/templates/de/game/research/base_research.xml
+++ b/application/ship-simu/templates/de/game/research/base_research.xml
@@ -27,11 +27,19 @@ 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. //-->
+		<!-- All researches end up with results which can be improvements to
+		     to existing technology or how research is conducted. Some research
+		     may have multiple results and they all might not be good. //-->
+		<research-result-list>
+			<!-- A single research result. If you want to modify research and 
+			     technology with this research you have to provide two
+			     <research-result> blocks, one for each. //-->
+			<research-result>
+				<modify-research id="{?modify_research-id?}" type="{?modify_research_type?}" amount="{?modify_-research_amount?}" />
+				<modify-technology id="{?modify_technology-id?}" type="{?modify_technology_type?}" amount="{?modify_-technology_amount?}" />
+			</research-result>
+		</research-result-list>
+		<!-- A summary for this research proposal. //-->
 		<research-summary>
 			<![CDATA[{?summary?}]]>
 		</research-summary>
@@ -42,7 +50,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	</research-data>
 	<!-- This is somewhat a "research history". //-->
 	<research-level-list>
-		<!-- A research level X has its own brief summary and a full description.
+		<!-- A research level X has its own 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?}">
@@ -51,7 +59,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<!-- ... and when it has ended so when the research results are
 			     available. //-->
 			<research-finished timestamp="{?finished?}" />
-			<!-- A brief summary for this research level. //-->
+			<!-- A summary for this research level. //-->
 			<level-summary>
 				<![CDATA[{?level_summary?}]]>
 			</level-summary>
diff --git a/application/ship-simu/templates/de/game/technology/.htaccess b/application/ship-simu/templates/de/game/technology/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/templates/de/game/technology/base_technology.xml b/application/ship-simu/templates/de/game/technology/base_technology.xml
new file mode 100644
index 0000000..977cca9
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/base_technology.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general 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>
+	<!-- General technology data like type, level, summary or description. //-->
+	<general-data id="{?id?}" type="{?type?}" level="{?level?}">
+		<!-- The date/time when this technology was gained, e.g. by research. //-->
+		<technology-gained timestamp="{?gained?}" />
+		<!-- A summary of this technology. //-->
+		<technology-summary>
+			<![CDATA[{?summary?}]]>
+		</technology-summary>
+		<!-- A full description of this technology. //-->
+		<technology-description>
+			<![CDATA[{?description?}]]>
+		</technology-description>
+	</general-data>
+	<!-- All levels of this technology are held in this tag. //-->
+	<technology-level-list>
+		<!-- A single technology level with its basic data, own summary and
+		     description. //-->
+		<technology-level level="{?list_level?}" gained="{?level_gained?}">
+			<!-- A summary of this technology level. //-->
+			<technology-level-summary>
+				<![CDATA[{?level_summary?}]]>
+			</technology-level-summary>
+			<!--  A full description of this technology level. //-->
+			<technology-level-description>
+				<![CDATA[{?level_description?}]]>
+			</technology-level-description>
+		</technology-level>
+	</technology-level-list>
+	<!-- A technology may depend on some other technologies or research
+	     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>
+		<!-- 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>
+	</depencies>
+</technology>
diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index d0904c3..cf05c7b 100644
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -171,10 +171,6 @@
 ./inc/language.php:31:// @TODO Rewrite this
 ./inc/loader/class_ClassLoader.php:262:			/* @todo: Do not die here. */
 ./application/ship-simu/templates/de/game/contract/base_contract.xml:48:		<!-- @TODO We need to make this more XML than free text. //-->
-./application/ship-simu/templates/de/game/research/base_research.xml:30:		<!-- @TODO We need to add something that allows the simulation to e.g.
-./application/ship-simu/templates/de/game/research/base_research.xml:31:		     @TODO decrease building time or higher efficience of certain
-./application/ship-simu/templates/de/game/research/base_research.xml:32:		     @TODO facilities. Currently, a research proposal is only used as a
-./application/ship-simu/templates/de/game/research/base_research.xml:33:		     @TODO depency. //-->
 ./application/ship-simu/templates/de/game/types/owner_occupants.xml:10:@todo		Unfinished definition
 ./application/ship-simu/templates/de/game/types/signer_types.xml:28:	<!-- @TODO Add more types, e.g. company //-->
 ### ### DEPRECATION FOLLOWS: ### ###
-- 
2.39.5