New goodies/research added:

- Lifestock template added (unfinished)
- Grain template added (unfinished)
- Drink template added (unfinished)
- Household devices template added (unfinished)
- Research 'electricity and electronics added
- Updated technology and electronic templates for new research proposals
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 76cb8e6153ac8b4e048bb8c0c69bddbd26e1a4c1..ffddb9b47134d8996170e11f6ebd0b5b8e154230 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -284,6 +284,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/drink/.htaccess -text
+application/ship-simu/templates/de/game/drink/base_drink.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/electronic/cellphone.xml -text
@@ -299,6 +301,10 @@ application/ship-simu/templates/de/game/fruit/.htaccess -text
 application/ship-simu/templates/de/game/fruit/base_fruit.xml -text
 application/ship-simu/templates/de/game/fuel/.htaccess -text
 application/ship-simu/templates/de/game/fuel/base_fuel.xml -text
+application/ship-simu/templates/de/game/grain/.htaccess -text
+application/ship-simu/templates/de/game/grain/base_grain.xml -text
+application/ship-simu/templates/de/game/lifestock/.htaccess -text
+application/ship-simu/templates/de/game/lifestock/base_lifestock.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
@@ -307,6 +313,8 @@ application/ship-simu/templates/de/game/produce/.htaccess -text
 application/ship-simu/templates/de/game/produce/base_produce.xml -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/research/electricity.xml -text
+application/ship-simu/templates/de/game/research/electronics.xml -text
 application/ship-simu/templates/de/game/research/mathematics.xml -text
 application/ship-simu/templates/de/game/research/radio_receiving.xml -text
 application/ship-simu/templates/de/game/research/statics.xml -text
@@ -322,6 +330,7 @@ application/ship-simu/templates/de/game/technology/base_technology.xml -text
 application/ship-simu/templates/de/game/technology/cellular_network.xml -text
 application/ship-simu/templates/de/game/technology/drawings.xml -text
 application/ship-simu/templates/de/game/technology/glass_making.xml -text
+application/ship-simu/templates/de/game/technology/household_devices.xml -text
 application/ship-simu/templates/de/game/technology/intergrated_currents.xml -text
 application/ship-simu/templates/de/game/technology/laboratory_equipment.xml -text
 application/ship-simu/templates/de/game/technology/naval_architecture.xml -text

diff --git a/application/ship-simu/templates/de/game/drink/.htaccess b/application/ship-simu/templates/de/game/drink/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/drink/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/application/ship-simu/templates/de/game/drink/base_drink.xml b/application/ship-simu/templates/de/game/drink/base_drink.xml
new file mode 100644 (file)
index 0000000..6ac3a06
--- /dev/null
+++ b/application/ship-simu/templates/de/game/drink/base_drink.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general drink template for juice, mineral water, milk et cetera.
+
+@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 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
+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/>
+//-->
+<drink>
+</drink>

diff --git a/application/ship-simu/templates/de/game/electronic/base_electronic.xml b/application/ship-simu/templates/de/game/electronic/base_electronic.xml
index 8db4deeaca6f5c4b5ea63e202f1ba1e9808d9996..f29a410c34cedea85183e5e944cd4ac14b158c5a 100644 (file)
--- a/application/ship-simu/templates/de/game/electronic/base_electronic.xml
+++ b/application/ship-simu/templates/de/game/electronic/base_electronic.xml
@@ -27,7 +27,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/>
 //-->
-<electronic extends="{?goody_template?}">
+<electronic>
        <!-- General data of the electronics. //-->
        <general-data>
                <!-- Id and type for this electronic. //-->

diff --git a/application/ship-simu/templates/de/game/electronic/cellphone.xml b/application/ship-simu/templates/de/game/electronic/cellphone.xml
index 2baf75ed78458c774d71d8f1798f50117d46f34e..2184f02c7f470cef804e6c6842edfde4ad2e9395 100644 (file)
--- a/application/ship-simu/templates/de/game/electronic/cellphone.xml
+++ b/application/ship-simu/templates/de/game/electronic/cellphone.xml
@@ -52,11 +52,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <!-- A list research dependencies for this electronical device. //-->
                <research-dependency-list>
                        <!-- A single technollogical dependency. //-->
-                       <!-- @TODO Do we need research dependency here? //-->
                        <research-dependency>
-                               <id>{?research_id?}</id>
-                               <name>{?research_name?}</name>
-                               <level>{?research_level?}</level>
+                               <name>electronics</name>
+                               <level>6</level>
                        </research-dependency>
                </research-dependency-list>
        </dependencies>

diff --git a/application/ship-simu/templates/de/game/electronic/hifi_system.xml b/application/ship-simu/templates/de/game/electronic/hifi_system.xml
index 302ad259abefa7cc9aa905800457dc3d748edfc1..9ac243942630f0f0d2b02fec816c6767ffc997fe 100644 (file)
--- a/application/ship-simu/templates/de/game/electronic/hifi_system.xml
+++ b/application/ship-simu/templates/de/game/electronic/hifi_system.xml
@@ -57,5 +57,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                <level>4</level>
                        </technology-dependency>
                </technology-dependency-list>
+               <!-- A list research dependencies for this electronical device. //-->
+               <research-dependency-list>
+                       <!-- A single research dependency. //-->
+                       <research-dependency>
+                               <name>electronics</name>
+                               <level>4</level>
+                       </research-dependency>
+               </research-dependency-list>
        </dependencies>
 </electronic>

diff --git a/application/ship-simu/templates/de/game/electronic/radio_receiver.xml b/application/ship-simu/templates/de/game/electronic/radio_receiver.xml
index 53f40dfbf7df20a806de1f06b8d42e2c93b53509..53ff764548c4bd2e1dd4b9a5f341ee927e390e8e 100644 (file)
--- a/application/ship-simu/templates/de/game/electronic/radio_receiver.xml
+++ b/application/ship-simu/templates/de/game/electronic/radio_receiver.xml
@@ -53,5 +53,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                                <level>1</level>
                        </technology-dependency>
                </technology-dependency-list>
+               <!-- A list research dependencies for this electronical device. //-->
+               <research-dependency-list>
+                       <!-- A single technollogy dependency. //-->
+                       <research-dependency>
+                               <name>electronics</name>
+                               <level>3</level>
+                       </research-dependency>
+               </research-dependency-list>
        </dependencies>
 </electronic>

diff --git a/application/ship-simu/templates/de/game/electronic/television.xml b/application/ship-simu/templates/de/game/electronic/television.xml
index 0738c264e340eebd40bfa9d9812b111875414391..12121a8bb22a2a80d75dacfd8e7f10bdec37853b 100644 (file)
--- a/application/ship-simu/templates/de/game/electronic/television.xml
+++ b/application/ship-simu/templates/de/game/electronic/television.xml
@@ -25,7 +25,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/>
 //-->
-<electronic extends="{?goody_template?}">
+<electronic extends="base_electronic">
        <!-- General data of the electronics. //-->
        <general-data>
                <!-- Id and type for this electronic. //-->

diff --git a/application/ship-simu/templates/de/game/grain/.htaccess b/application/ship-simu/templates/de/game/grain/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/grain/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/application/ship-simu/templates/de/game/grain/base_grain.xml b/application/ship-simu/templates/de/game/grain/base_grain.xml
new file mode 100644 (file)
index 0000000..eac45e4
--- /dev/null
+++ b/application/ship-simu/templates/de/game/grain/base_grain.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general grain 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
+@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
+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/>
+//-->
+<grain>
+</grain>

diff --git a/application/ship-simu/templates/de/game/lifestock/.htaccess b/application/ship-simu/templates/de/game/lifestock/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/application/ship-simu/templates/de/game/lifestock/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/application/ship-simu/templates/de/game/lifestock/base_lifestock.xml b/application/ship-simu/templates/de/game/lifestock/base_lifestock.xml
new file mode 100644 (file)
index 0000000..267077b
--- /dev/null
+++ b/application/ship-simu/templates/de/game/lifestock/base_lifestock.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general lifestock 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
+@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
+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/>
+//-->
+<lifestock>
+</lifestock>

diff --git a/application/ship-simu/templates/de/game/research/electricity.xml b/application/ship-simu/templates/de/game/research/electricity.xml
new file mode 100644 (file)
index 0000000..c6b3480
--- /dev/null
+++ b/application/ship-simu/templates/de/game/research/electricity.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A electricity research proposal 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/>
+//-->
+<research-proposal extends="base_research">
+       <!-- General data of this research like id, summar or description. //-->
+       <research-data>
+               <name>electricity</name>
+               <type>electronics</type>
+               <max-level>10</max-level>
+       </research-data>
+</research-proposal>

diff --git a/application/ship-simu/templates/de/game/research/electronics.xml b/application/ship-simu/templates/de/game/research/electronics.xml
new file mode 100644 (file)
index 0000000..1bd2df2
--- /dev/null
+++ b/application/ship-simu/templates/de/game/research/electronics.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A electronics research proposal 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/>
+//-->
+<research-proposal extends="base_research">
+       <!-- General data of this research like id, summar or description. //-->
+       <research-data>
+               <name>electronics</name>
+               <type>electronics</type>
+               <max-level>20</max-level>
+       </research-data>
+       <dependencies>
+               <technology-dependency-list>
+                       <technology-dependency>
+                               <name>plastics</name>
+                               <level>2</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <research-dependency-list>
+                       <research-dependency>
+                               <name>electricity</name>
+                               <level>4</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </dependencies>
+</research-proposal>

diff --git a/application/ship-simu/templates/de/game/technology/household_devices.xml b/application/ship-simu/templates/de/game/technology/household_devices.xml
new file mode 100644 (file)
index 0000000..e67cbd7
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/household_devices.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A generic household device 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 extends="base_technology">
+       <!-- General technology data like type, level, summary or description. //-->
+       <general-data>
+               <name>household_devices</name>
+               <type>electronics</type>
+       </general-data>
+       <!-- A technology may depend on some other technologies or research
+            proposals to gain the first level of this technology. //-->
+       <dependencies>
+               <!-- All technology dependencies for this technology. //-->
+               <technology-dependency-list>
+                       <technology-dependency>
+                               <name>plastics</name>
+                               <level>3</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research proposal dependencies for this research. //-->
+               <research-dependency-list>
+                       <research-dependency>
+                               <name>electronics</name>
+                               <level>1</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </dependencies>
+</technology>

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 8ebfc71bdf2266a40e2cc7b4993f42bf4baba80e..0cae4cbbfe668edecd50a540392d079681ac2d53 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -171,9 +171,11 @@
 ./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:51:               <!-- @TODO We need to make this more XML than free text. //-->
-./application/ship-simu/templates/de/game/electronic/cellphone.xml:55:                 <!-- @TODO Do we need research dependency here? //-->
+./application/ship-simu/templates/de/game/drink/base_drink.xml:10:@todo                Unfinished template
 ./application/ship-simu/templates/de/game/farmer/base_farmer.xml:10:@todo              Unfinished template
 ./application/ship-simu/templates/de/game/fruit/base_fruit.xml:10:@todo                Unfinished template
+./application/ship-simu/templates/de/game/grain/base_grain.xml:10:@todo                Unfinished template
+./application/ship-simu/templates/de/game/lifestock/base_lifestock.xml:10:@todo                Unfinished template
 ./application/ship-simu/templates/de/game/produce/base_produce.xml:10:@todo            Unfinished template
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:100:                      <!-- @TODO This section is not complete. //-->
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:104:                      <!-- @TODO This section is not complete. //-->