From 0a82c1ed74ea7c71957732de9ca7964118247cdb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 17 Sep 2009 20:51:03 +0000
Subject: [PATCH] Container added for transportating cargos, some fixes, ship
 type template added

---
 .gitattributes                                |  3 ++
 .../templates/de/game/container/.htaccess     |  1 +
 .../de/game/container/base_container.xml      | 54 +++++++++++++++++++
 .../de/game/types/contract_types.xml          |  2 +-
 .../de/game/types/owner_occupants.xml         |  4 +-
 .../templates/de/game/types/ship_types.xml    | 38 +++++++++++++
 6 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 application/ship-simu/templates/de/game/container/.htaccess
 create mode 100644 application/ship-simu/templates/de/game/container/base_container.xml
 create mode 100644 application/ship-simu/templates/de/game/types/ship_types.xml

diff --git a/.gitattributes b/.gitattributes
index 605c291..8a9c3e0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -278,6 +278,8 @@ application/ship-simu/templates/de/game/.htaccess -text
 application/ship-simu/templates/de/game/building/.htaccess -text
 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/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/merchant/.htaccess -text
@@ -296,6 +298,7 @@ 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/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
 application/ship-simu/templates/de/game/types/signer_types.xml -text
 application/ship-simu/templates/de/game/types/technology_types.xml -text
 application/ship-simu/templates/de/html/.htaccess -text
diff --git a/application/ship-simu/templates/de/game/container/.htaccess b/application/ship-simu/templates/de/game/container/.htaccess
new file mode 100644
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/container/.htaccess
@@ -0,0 +1 @@
+Deny from all
diff --git a/application/ship-simu/templates/de/game/container/base_container.xml b/application/ship-simu/templates/de/game/container/base_container.xml
new file mode 100644
index 0000000..b5cfe5a
--- /dev/null
+++ b/application/ship-simu/templates/de/game/container/base_container.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general container 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/>
+//-->
+<container>
+	<!-- The owner of the container, this should be a company, //-->
+	<owner>
+		<company id="{?owner_id?}" />
+	</owner>
+	<!-- The sender of the container, this should be a company and must not be
+	     the owner. //-->
+	<sender>
+		<company id="{?sender_id?}" />
+	</sender>
+	<!-- The recipient of the container, this should be a company and can be the
+	     owner. //-->
+	<recipient>
+		<company id="{?recipient_id?}" />
+	</recipient>
+	<!-- The transported content inside of the container. This can be more than one item. //-->
+	<content-list>
+		<!-- A single content of the container which should be transportated. //-->
+		<content>
+			<id>{?content_id?}</id>
+			<type>{?content_type?}</type>
+			<amount>{?content_amount?}</amount>
+		</content>
+	</content-list>
+	<!-- A system, freezer or colder or something else, which maintains a
+	     constant temperature. This is useful for biological content like
+	     fruits. But it is optional. //-->
+	<maintenance-system>
+		<!-- @TODO Find something for this empty tag. //-->
+	</maintenance-system>
+</container>
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 5d383ac..23e6911 100644
--- a/application/ship-simu/templates/de/game/types/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-list>
+<contract-type-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 //-->
diff --git a/application/ship-simu/templates/de/game/types/owner_occupants.xml b/application/ship-simu/templates/de/game/types/owner_occupants.xml
index 433f2d8..8eeaf12 100644
--- a/application/ship-simu/templates/de/game/types/owner_occupants.xml
+++ b/application/ship-simu/templates/de/game/types/owner_occupants.xml
@@ -22,5 +22,5 @@ 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>
+<owner-occupant-type-list>
+</owner-occupants-type-list>
diff --git a/application/ship-simu/templates/de/game/types/ship_types.xml b/application/ship-simu/templates/de/game/types/ship_types.xml
new file mode 100644
index 0000000..8245829
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/ship_types.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All known and valid types of ships.
+
+@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		This is a very simmple list, extend it.
+
+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/>
+//-->
+<ship-type-list>
+	<!-- A small ship for passengers used in large habors and cities. //-->
+	<ship-type type="farry" />
+	<!-- Medium to large passenger ships, used to transportate passengers, their
+	     cars and trucks or trains on long distances. //-->
+	<ship-type type="passenger" />
+	<!-- Medium to large container ships to transport their cargo on long
+	     distances. //-->
+	<ship-type type="container" />
+	<!-- Medium to large oil tankers for long distances. //-->
+	<ship-type type="oiltanker" />
+	<!-- Medium to large gas tankers for long distances. //-->
+	<ship-type type="gastanker" />
+</ship-type-list>
-- 
2.39.5