Fixed product to produce in farmer, added a lot more XML templates:

- Added more commercial electronics for production and trading
- Added research for radio receiving proposal
- Added generic produce template base_produce.xml (unfinished)
- Added general base_fruit.xml and base_vegetable.xml (unfinished)
- Added more technology for entertainment devices
- Fixed 'product' in base_farmer.xml to 'produce'
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 3839fec068ba7229779f088d92b80e0513d62f13..76cb8e6153ac8b4e048bb8c0c69bddbd26e1a4c1 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -289,16 +289,22 @@ application/ship-simu/templates/de/game/electronic/base_electronic.xml -text
 application/ship-simu/templates/de/game/electronic/cellphone.xml -text
 application/ship-simu/templates/de/game/electronic/hifi_system.xml -text
 application/ship-simu/templates/de/game/electronic/radio_receiver.xml -text
 application/ship-simu/templates/de/game/electronic/cellphone.xml -text
 application/ship-simu/templates/de/game/electronic/hifi_system.xml -text
 application/ship-simu/templates/de/game/electronic/radio_receiver.xml -text

+application/ship-simu/templates/de/game/electronic/surround_system.xml -text
+application/ship-simu/templates/de/game/electronic/television.xml -text

 application/ship-simu/templates/de/game/engine/.htaccess -text
 application/ship-simu/templates/de/game/engine/base_engine.xml -text
 application/ship-simu/templates/de/game/farmer/.htaccess -text
 application/ship-simu/templates/de/game/farmer/base_farmer.xml -text
 application/ship-simu/templates/de/game/engine/.htaccess -text
 application/ship-simu/templates/de/game/engine/base_engine.xml -text
 application/ship-simu/templates/de/game/farmer/.htaccess -text
 application/ship-simu/templates/de/game/farmer/base_farmer.xml -text

+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/merchant/.htaccess -text
 application/ship-simu/templates/de/game/merchant/base_merchant.xml -text
 application/ship-simu/templates/de/game/mineral/.htaccess -text
 application/ship-simu/templates/de/game/mineral/base_mineral.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/merchant/.htaccess -text
 application/ship-simu/templates/de/game/merchant/base_merchant.xml -text
 application/ship-simu/templates/de/game/mineral/.htaccess -text
 application/ship-simu/templates/de/game/mineral/base_mineral.xml -text

+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/mathematics.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/mathematics.xml -text


@@ -320,8 +326,13 @@ application/ship-simu/templates/de/game/technology/intergrated_currents.xml -tex
 application/ship-simu/templates/de/game/technology/laboratory_equipment.xml -text
 application/ship-simu/templates/de/game/technology/naval_architecture.xml -text
 application/ship-simu/templates/de/game/technology/plastics.xml -text
 application/ship-simu/templates/de/game/technology/laboratory_equipment.xml -text
 application/ship-simu/templates/de/game/technology/naval_architecture.xml -text
 application/ship-simu/templates/de/game/technology/plastics.xml -text

+application/ship-simu/templates/de/game/technology/signal_amplifying.xml -text
+application/ship-simu/templates/de/game/technology/signal_modulation.xml -text

 application/ship-simu/templates/de/game/technology/sound_equalizer.xml -text
 application/ship-simu/templates/de/game/technology/sound_equalizer.xml -text

+application/ship-simu/templates/de/game/technology/sound_processor.xml -text
+application/ship-simu/templates/de/game/technology/surround_mixing.xml -text

 application/ship-simu/templates/de/game/technology/transistor.xml -text
 application/ship-simu/templates/de/game/technology/transistor.xml -text

+application/ship-simu/templates/de/game/technology/video_receiving.xml -text

 application/ship-simu/templates/de/game/types/.htaccess -text
 application/ship-simu/templates/de/game/types/building_types.xml -text
 application/ship-simu/templates/de/game/types/container_types.xml -text
 application/ship-simu/templates/de/game/types/.htaccess -text
 application/ship-simu/templates/de/game/types/building_types.xml -text
 application/ship-simu/templates/de/game/types/container_types.xml -text


@@ -339,6 +350,8 @@ 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/tank_types.xml -text
 application/ship-simu/templates/de/game/types/technology_types.xml -text
 application/ship-simu/templates/de/game/types/signer_types.xml -text
 application/ship-simu/templates/de/game/types/tank_types.xml -text
 application/ship-simu/templates/de/game/types/technology_types.xml -text

+application/ship-simu/templates/de/game/vegetable/.htaccess -text
+application/ship-simu/templates/de/game/vegetable/base_vegetable.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
 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/electronic/surround_system.xml b/application/ship-simu/templates/de/game/electronic/surround_system.xml
new file mode 100644 (file)
index 0000000..35980dc
--- /dev/null
+++ b/application/ship-simu/templates/de/game/electronic/surround_system.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A high-end surround sound system developed e.g. for home-cinema.
+
+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="base_electronic">
+       <!-- General data of the electronics. //-->
+       <general-data>
+               <!-- Id and type for this electronic. //-->
+               <name>surround_system</name>
+               <type>entertainment</type>
+               <!-- Simplified dimensions of the electronics because it will be placed
+                    into a small box for transportation. //-->
+               <dimensions>
+                       <width>120</width>
+                       <height>140</height>
+                       <length>120</length>
+               </dimensions>
+       </general-data>
+       <!-- An electronical device may depend on one or more technologies, at least
+            'electronics'. //-->
+       <dependencies>
+               <!-- A list technology dependencies for this electronical device. //-->
+               <technology-dependency-list>
+                       <!-- A single technollogical dependency. //-->
+                       <technology-dependency>
+                               <name>sound_processor</name>
+                               <level>3</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>sound_equalizer</name>
+                               <level>5</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>radio_receiving</name>
+                               <level>6</level>
+                       </technology-dependency>
+               </technology-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
new file mode 100644 (file)
index 0000000..0738c26
--- /dev/null
+++ b/application/ship-simu/templates/de/game/electronic/television.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A regular, commercial television.
+
+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. //-->
+               <name>television</name>
+               <type>entertainment</type>
+               <!-- Simplified dimensions of the electronics because it will be placed
+                    into a small box for transportation. //-->
+               <dimensions>
+                       <width>100</width>
+                       <height>110</height>
+                       <length>90</length>
+               </dimensions>
+       </general-data>
+       <!-- An electronical device may depend on one or more technologies, at least
+            'electronics'. //-->
+       <dependencies>
+               <!-- A list technology dependencies for this electronical device. //-->
+               <technology-dependency-list>
+                       <!-- A single technollogical dependency. //-->
+                       <technology-dependency>
+                               <name>video_receiving</name>
+                               <level>1</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>transistor</name>
+                               <level>1</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+       </dependencies>
+</electronic>

diff --git a/application/ship-simu/templates/de/game/farmer/base_farmer.xml b/application/ship-simu/templates/de/game/farmer/base_farmer.xml
index e45c8291aadb6478f943e7ed388616b7861279f5..7003d2e64e08ec9d95a06ac54233cb0443da8754 100644 (file)
--- a/application/ship-simu/templates/de/game/farmer/base_farmer.xml
+++ b/application/ship-simu/templates/de/game/farmer/base_farmer.xml
@@ -40,22 +40,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <experience>{?experience?}</experience>
        </general-data>
        <!-- List of all products this farmer is producing. //-->
                <experience>{?experience?}</experience>
        </general-data>
        <!-- List of all products this farmer is producing. //-->

-       <product-list>
-               <!-- A single product this farmer is producing. //-->
-               <product>
-                       <id>{?product_id?}</id>
-                       <name>{?product_name?}</name>
-                       <type>{?product_type?}</type>
-                       <!-- A list of technology dependency required to produce this
-                            product. @TODO Find some better typo here. //-->
+       <produce-list>
+               <!-- A single produce this farmer is producing. //-->
+               <produce>
+                       <id>{?produce_id?}</id>
+                       <name>{?produce_name?}</name>
+                       <type>{?produce_type?}</type>
+                       <!-- A list of technology dependency required to create this
+                            produce. //-->

                        <technology-dependency-list>
                                <!-- A single technology dependency. //-->
                                <technology-dependency>
                        <technology-dependency-list>
                                <!-- A single technology dependency. //-->
                                <technology-dependency>

-                                       <id>{?technology_farmerid?}</id>
-                                       <name>{?technology_farmername?}</name>
-                                       <level>{?technology_farmerlevel?}</level>
+                                       <id>{?technology_id?}</id>
+                                       <name>{?technology_name?}</name>
+                                       <level>{?technology_level?}</level>

                                </technology-dependency>
                        </technology-dependency-list>
                                </technology-dependency>
                        </technology-dependency-list>

-               </product>
-       </product-list>
+               </produce>
+       </produce-list>

 </farmer>
 </farmer>

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

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

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

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

diff --git a/application/ship-simu/templates/de/game/research/radio_receiving.xml b/application/ship-simu/templates/de/game/research/radio_receiving.xml
index 1988b2791dc868897bfb0fb6c7cb07dcf1e69496..44513dd8092392963f17cdd6f95c54ed2755b291 100644 (file)
--- a/application/ship-simu/templates/de/game/research/radio_receiving.xml
+++ b/application/ship-simu/templates/de/game/research/radio_receiving.xml
@@ -32,20 +32,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <!-- All research proposal dependencies for this research proposal. //-->
                <technology-dependency-list>
                        <!-- A research proposal dependency for this research proposal. //-->
                <!-- All research proposal dependencies for this research proposal. //-->
                <technology-dependency-list>
                        <!-- A research proposal dependency for this research proposal. //-->

-                       <!-- @TODO Find some technology dependencies. //-->

                        <technology-dependency>
                        <technology-dependency>

-                               <name>{?technology_name?}</name>
-                               <level>{?technology_level?}</level>
+                               <name>signal_modulation</name>
+                               <level>1</level>

                        </technology-dependency>
                </technology-dependency-list>
                        </technology-dependency>
                </technology-dependency-list>

-               <!-- All research dependencies for this research proposal. //-->
-               <research-dependency-list>
-                       <!-- A research dependency for this research proposal. //-->
-                       <!-- @TODO Find some research dependencies. //-->
-                       <research-dependency>
-                               <name>{?research_name?}</name>
-                               <level>{?research_level?}</level>
-                       </research-dependency>
-               </research-dependency-list>

        </dependencies>
 </research-proposal>
        </dependencies>
 </research-proposal>

diff --git a/application/ship-simu/templates/de/game/technology/signal_amplifying.xml b/application/ship-simu/templates/de/game/technology/signal_amplifying.xml
new file mode 100644 (file)
index 0000000..9603064
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/signal_amplifying.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A signal amplifying 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 extends="base_technology">
+       <!-- General technology data like type, level, summary or description. //-->
+       <general-data>
+               <name>signal_amplifying</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>
+                       <!-- A technology dependency for this technology. //-->
+                       <technology-dependency>
+                               <name>transistor</name>
+                               <level>3</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research dependencies for this technology. //-->
+               <research-dependency-list>
+                       <!-- A research dependency for this technology. //-->
+                       <research-dependency>
+                               <name>modulation</name>
+                               <level>1</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </dependencies>
+</technology>

diff --git a/application/ship-simu/templates/de/game/technology/signal_modulation.xml b/application/ship-simu/templates/de/game/technology/signal_modulation.xml
new file mode 100644 (file)
index 0000000..fa220cb
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/signal_modulation.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A signal modulation 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 extends="base_technology">
+       <!-- General technology data like type, level, summary or description. //-->
+       <general-data>
+               <name>signal_modulation</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>
+                       <!-- A technology dependency for this technology. //-->
+                       <technology-dependency>
+                               <name>transistor</name>
+                               <level>3</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research dependencies for this technology. //-->
+               <research-dependency-list>
+                       <!-- A research dependency for this technology. //-->
+                       <research-dependency>
+                               <name>modulation</name>
+                               <level>1</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </dependencies>
+</technology>

diff --git a/application/ship-simu/templates/de/game/technology/sound_processor.xml b/application/ship-simu/templates/de/game/technology/sound_processor.xml
new file mode 100644 (file)
index 0000000..436ccd7
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/sound_processor.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A sound-processing 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 extends="base_technology">
+       <!-- General technology data like type, level, summary or description. //-->
+       <general-data>
+               <name>sound_processor</name>
+               <type>electronic</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>
+                       <!-- A technology dependency for this technology. //-->
+                       <technology-dependency>
+                               <name>intergrated_current</name>
+                               <level>7</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>surround_mixing</name>
+                               <level>1</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research dependencies for this technology. //-->
+               <!-- @TODO Should we find some theory behind processing? //-->
+               <research-dependency-list>
+                       <!-- A research dependency for this technology. //-->
+                       <research-dependency>
+                               <name>{?research_name?}</name>
+                               <level>{?research_level?}</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </dependencies>
+</technology>

diff --git a/application/ship-simu/templates/de/game/technology/surround_mixing.xml b/application/ship-simu/templates/de/game/technology/surround_mixing.xml
new file mode 100644 (file)
index 0000000..996a714
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/surround_mixing.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A sound-processing 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 extends="base_technology">
+       <!-- General technology data like type, level, summary or description. //-->
+       <general-data>
+               <name>surround_mixing</name>
+               <type>electronic</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>
+                       <!-- A technology dependency for this technology. //-->
+                       <technology-dependency>
+                               <name>intergrated_current</name>
+                               <level>6</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research dependencies for this technology. //-->
+               <!-- @TODO Should we find some theory behind surround mixer? //-->
+               <research-dependency-list>
+                       <!-- A research dependency for this technology. //-->
+                       <research-dependency>
+                               <name>{?research_name?}</name>
+                               <level>{?research_level?}</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </dependencies>
+</technology>

diff --git a/application/ship-simu/templates/de/game/technology/video_receiving.xml b/application/ship-simu/templates/de/game/technology/video_receiving.xml
new file mode 100644 (file)
index 0000000..9d4d10c
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/video_receiving.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A transistor 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 extends="base_technology">
+       <!-- General technology data like type, level, summary or description. //-->
+       <general-data>
+               <name>video_receiving</name>
+               <type>eletronics</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>
+                       <!-- A technology dependency for this technology. //-->
+                       <technology-dependency>
+                               <name>signal_amplifying</name>
+                               <level>1</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>signal_modulation</name>
+                               <level>1</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>transistor</name>
+                               <level>1</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+       </dependencies>
+</technology>

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

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

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index f8ee4748c137e737a58227780d0c9a3e3272de13..8ebfc71bdf2266a40e2cc7b4993f42bf4baba80e 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -173,9 +173,8 @@
 ./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/farmer/base_farmer.xml:10:@todo              Unfinished template
 ./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/farmer/base_farmer.xml:10:@todo              Unfinished template

-./application/ship-simu/templates/de/game/farmer/base_farmer.xml:50:                        product. @TODO Find some better typo here. //-->
-./application/ship-simu/templates/de/game/research/radio_receiving.xml:35:                     <!-- @TODO Find some technology dependencies. //-->
-./application/ship-simu/templates/de/game/research/radio_receiving.xml:44:                     <!-- @TODO Find some research dependencies. //-->
+./application/ship-simu/templates/de/game/fruit/base_fruit.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. //-->
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:108:                      <!-- @TODO This section is not complete. //-->
 ./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. //-->
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:108:                      <!-- @TODO This section is not complete. //-->


@@ -185,6 +184,8 @@
 ./application/ship-simu/templates/de/game/technology/cellular_network.xml:35:                  <!-- @TODO Find some technology dependencies. //-->
 ./application/ship-simu/templates/de/game/technology/plastics.xml:37:                          <!-- @TODO Find a chemical name for this technology. //-->
 ./application/ship-simu/templates/de/game/technology/sound_equalizer.xml:42:           <!-- @TODO Should we find some theory behind equalizing? //-->
 ./application/ship-simu/templates/de/game/technology/cellular_network.xml:35:                  <!-- @TODO Find some technology dependencies. //-->
 ./application/ship-simu/templates/de/game/technology/plastics.xml:37:                          <!-- @TODO Find a chemical name for this technology. //-->
 ./application/ship-simu/templates/de/game/technology/sound_equalizer.xml:42:           <!-- @TODO Should we find some theory behind equalizing? //-->

+./application/ship-simu/templates/de/game/technology/sound_processor.xml:46:           <!-- @TODO Should we find some theory behind processing? //-->
+./application/ship-simu/templates/de/game/technology/surround_mixing.xml:42:           <!-- @TODO Should we find some theory behind surround mixer? //-->

 ./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/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. //-->


@@ -199,6 +200,7 @@
 ./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/tank_types.xml:10:@todo                Unfinished template
 ./application/ship-simu/templates/de/game/types/technology_types.xml:10:@todo          Unfinished template
 ./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/tank_types.xml:10:@todo                Unfinished template
 ./application/ship-simu/templates/de/game/types/technology_types.xml:10:@todo          Unfinished template

+./application/ship-simu/templates/de/game/vegetable/base_vegetable.xml:10:@todo                Unfinished template

 ./application/ship-simu/templates/de/.xml:10:@todo             Unfinished template
 ### ### DEPRECATION FOLLOWS: ### ###
 ./application/ship-simu/main/personell/class_SimulatorPersonell.php:118:        * @deprecated
 ./application/ship-simu/templates/de/.xml:10:@todo             Unfinished template
 ### ### DEPRECATION FOLLOWS: ### ###
 ./application/ship-simu/main/personell/class_SimulatorPersonell.php:118:        * @deprecated