From 91ee99416e616ea4e4875a61401e17f8766fd1a0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Fri, 18 Sep 2009 17:27:16 +0000
Subject: [PATCH] Electronics added, @TODO tag added, TODOs.txt updated

---
 .gitattributes                                |  5 +++
 .../de/game/container/base_container.xml      | 13 ++++++
 .../templates/de/game/electronic/.htaccess    |  1 +
 .../de/game/electronic/base_electronic.xml    | 44 +++++++++++++++++++
 .../de/game/types/container_types.xml         | 34 ++++++++++++++
 .../templates/de/game/types/content_types.xml | 32 ++++++++++++++
 .../de/game/types/contract_types.xml          |  1 +
 .../de/game/types/electronic_types.xml        | 31 +++++++++++++
 .../de/game/types/merchant_types.xml          |  1 +
 .../templates/de/game/types/ship_types.xml    |  1 +
 .../de/game/types/technology_types.xml        |  1 +
 docs/TODOs.txt                                | 10 ++++-
 12 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 application/ship-simu/templates/de/game/electronic/.htaccess
 create mode 100644 application/ship-simu/templates/de/game/electronic/base_electronic.xml
 create mode 100644 application/ship-simu/templates/de/game/types/container_types.xml
 create mode 100644 application/ship-simu/templates/de/game/types/content_types.xml
 create mode 100644 application/ship-simu/templates/de/game/types/electronic_types.xml

diff --git a/.gitattributes b/.gitattributes
index 8a9c3e0..c4ab0fc 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -282,6 +282,8 @@ application/ship-simu/templates/de/game/container/.htaccess -text
 application/ship-simu/templates/de/game/container/base_container.xml -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/electronic/.htaccess -text
+application/ship-simu/templates/de/game/electronic/base_electronic.xml -text
 application/ship-simu/templates/de/game/merchant/.htaccess -text
 application/ship-simu/templates/de/game/merchant/base_merchant.xml -text
 application/ship-simu/templates/de/game/mineral/.htaccess -text
@@ -295,7 +297,10 @@ 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/base_technology.xml -text
 application/ship-simu/templates/de/game/types/.htaccess -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
+application/ship-simu/templates/de/game/types/electronic_types.xml -text
 application/ship-simu/templates/de/game/types/merchant_types.xml -text
 application/ship-simu/templates/de/game/types/owner_occupants.xml -text
 application/ship-simu/templates/de/game/types/ship_types.xml -text
diff --git a/application/ship-simu/templates/de/game/container/base_container.xml b/application/ship-simu/templates/de/game/container/base_container.xml
index e3a813f..c91f20a 100644
--- a/application/ship-simu/templates/de/game/container/base_container.xml
+++ b/application/ship-simu/templates/de/game/container/base_container.xml
@@ -22,6 +22,19 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>
 //-->
 <container>
+	<!-- Som general data about this container. //-->
+	<general-data>
+		<!-- Id and type of this container. //-->
+		<id>{?id?}</id>
+		<!-- Look at container_types.xml for details. //-->
+		<type>{?type?}</type>
+		<!-- Dimension of the container. //-->
+		<dimension>
+			<width>{?width?}</width>
+			<length>{?length?}</length>
+			<height>{?height?}</height>
+		</dimension>
+	</general-data>
 	<!-- The owner of the container, this should be a company, //-->
 	<owner>
 		<company id="{?owner_id?}" />
diff --git a/application/ship-simu/templates/de/game/electronic/.htaccess b/application/ship-simu/templates/de/game/electronic/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/electronic/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/templates/de/game/electronic/base_electronic.xml b/application/ship-simu/templates/de/game/electronic/base_electronic.xml
new file mode 100644
index 0000000..c6a2326
--- /dev/null
+++ b/application/ship-simu/templates/de/game/electronic/base_electronic.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general electronic template. These electronics can be transported by different
+types of transportation companies. Is can be anything from cellphones over other
+communication electronics to commercial computers (default) or medical devices.
+
+For simplification we have only width, length, height and total weight. This is
+in reality mostly the case because the electronics will be placed into a small
+box for transportation.
+
+@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/>
+//-->
+<electronic extends="{?goody_template?}">
+	<!-- General data of the electronics. //-->
+	<general-data>
+		<!-- Id and type for this electronic. //-->
+		<id>{?id?}</id>
+		<type>{?type?}</type>
+		<!-- Simplified dimension of the electronics because it will be placed
+		     into a small box for transportation. //-->
+		<dimension>
+			<width>{?width?}</width>
+			<height>{?height?}</height>
+			<length>{?length?}</length>
+		</dimension>
+	</general-data>
+</electronic>
diff --git a/application/ship-simu/templates/de/game/types/container_types.xml b/application/ship-simu/templates/de/game/types/container_types.xml
new file mode 100644
index 0000000..977c60e
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/container_types.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid container types
+
+@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/>
+//-->
+<container-type-list>
+	<!-- A large cargo container made of steel, a very usual one which can be
+	     used to transport very lots of things like entertainment electronics
+	     and many more. //-->
+	<container-type type="large_cargo" />
+	<!-- The smaller brother of the above large container. This container is
+	     usually half size of the large one. So two of them can be placed where
+	     one large container fits... //-->
+	<container-type type="medium_cargo" />
+	<!-- @TODO Add more containers. //-->
+</container-type-list>
diff --git a/application/ship-simu/templates/de/game/types/content_types.xml b/application/ship-simu/templates/de/game/types/content_types.xml
new file mode 100644
index 0000000..3b50c1b
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/content_types.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid content types, e.g. to be placed in container.
+
+@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/>
+//-->
+<content-type-list>
+	<!-- All types of resources can be transportated. //-->
+	<content-type type="resource" />
+	<!-- All types of minerals can be transportated. //-->
+	<content-type type="mineral" />
+	<!-- All types of electronics can be transportated e.g. entertainment or communication electronics. //-->
+	<content-type type="electronic" />
+	<!-- @TODO Add more container content types. //-->
+</content-type-list>
diff --git a/application/ship-simu/templates/de/game/types/contract_types.xml b/application/ship-simu/templates/de/game/types/contract_types.xml
index 23e6911..dc85136 100644
--- a/application/ship-simu/templates/de/game/types/contract_types.xml
+++ b/application/ship-simu/templates/de/game/types/contract_types.xml
@@ -37,4 +37,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 			<slot type="creditor" must-have="false" />
 		</slots>
 	</contract-type>
+	<!-- @TODO Add more contract types. //-->
 </contract-type-list>
diff --git a/application/ship-simu/templates/de/game/types/electronic_types.xml b/application/ship-simu/templates/de/game/types/electronic_types.xml
new file mode 100644
index 0000000..13e2063
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/electronic_types.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid types of electronics. This can be cellphones, computers, hifi systems
+and many many more.
+
+@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/>
+//-->
+<electronic-type-list>
+	<!-- A common cellphone, no matter which network provider... ;-) //-->
+	<electronic-type type="cellphone" />
+	<!-- A common land line phone and it's equipment (we simplify again). //-->
+	<electronic-type type="phone" />
+	<!-- @TODO Add more commercial electronic devices. //-->
+</electronic-type-list>
diff --git a/application/ship-simu/templates/de/game/types/merchant_types.xml b/application/ship-simu/templates/de/game/types/merchant_types.xml
index d4ec91b..5edaf57 100644
--- a/application/ship-simu/templates/de/game/types/merchant_types.xml
+++ b/application/ship-simu/templates/de/game/types/merchant_types.xml
@@ -7,6 +7,7 @@ All valid merchant types
 @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 template
 
 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
diff --git a/application/ship-simu/templates/de/game/types/ship_types.xml b/application/ship-simu/templates/de/game/types/ship_types.xml
index 8245829..64d597f 100644
--- a/application/ship-simu/templates/de/game/types/ship_types.xml
+++ b/application/ship-simu/templates/de/game/types/ship_types.xml
@@ -35,4 +35,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 	<ship-type type="oiltanker" />
 	<!-- Medium to large gas tankers for long distances. //-->
 	<ship-type type="gastanker" />
+	<!-- @TODO Add more ship types. //-->
 </ship-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 f80f8f6..5e56fad 100644
--- a/application/ship-simu/templates/de/game/types/technology_types.xml
+++ b/application/ship-simu/templates/de/game/types/technology_types.xml
@@ -7,6 +7,7 @@ All valid technology types
 @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 template
 
 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
diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index cf05c7b..abca2bf 100644
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -170,9 +170,17 @@
 ./inc/includes.php:36:// @TODO Find a nicer OOP-ed way for this
 ./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/contract/base_contract.xml:51:		<!-- @TODO We need to make this more XML than free text. //-->
+./application/ship-simu/templates/de/game/types/container_types.xml:33:	<!-- @TODO Add more containers. //-->
+./application/ship-simu/templates/de/game/types/content_types.xml:31:	<!-- @TODO Add more container content types. //-->
+./application/ship-simu/templates/de/game/types/contract_types.xml:40:	<!-- @TODO Add more contract types. //-->
+./application/ship-simu/templates/de/game/types/electronic_types.xml:30:	<!-- @TODO Add more commercial electronic devices. //-->
+./application/ship-simu/templates/de/game/types/merchant_types.xml:10:@todo		Unfinished template
 ./application/ship-simu/templates/de/game/types/owner_occupants.xml:10:@todo		Unfinished definition
+./application/ship-simu/templates/de/game/types/ship_types.xml:10:@todo		This is a very simmple list, extend it.
+./application/ship-simu/templates/de/game/types/ship_types.xml:38:	<!-- @TODO Add more ship types. //-->
 ./application/ship-simu/templates/de/game/types/signer_types.xml:28:	<!-- @TODO Add more types, e.g. company //-->
+./application/ship-simu/templates/de/game/types/technology_types.xml:10:@todo		Unfinished template
 ### ### DEPRECATION FOLLOWS: ### ###
 ./application/ship-simu/main/personell/class_SimulatorPersonell.php:118:	 * @deprecated
 ./application/ship-simu/main/personell/class_SimulatorPersonell.php:319:	 * @deprecated
-- 
2.30.2