More technology added (commercial and electronical), TODOs.txt updated

- Transistor technology added which is an eletronical semiconductor device
- Radio receiving research added
- Simple radio receiver added
- Sound equalizer technology added
- Intergrated current technology added (so called "ICs")
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 3617df026196b7894fe52a58b727eb4c60df030c..3839fec068ba7229779f088d92b80e0513d62f13 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -287,6 +287,8 @@ 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/electronic/cellphone.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

+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/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/engine/.htaccess -text
 application/ship-simu/templates/de/game/engine/base_engine.xml -text
 application/ship-simu/templates/de/game/farmer/.htaccess -text


@@ -300,6 +302,7 @@ application/ship-simu/templates/de/game/mineral/base_mineral.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

+application/ship-simu/templates/de/game/research/radio_receiving.xml -text

 application/ship-simu/templates/de/game/research/statics.xml -text
 application/ship-simu/templates/de/game/resource/.htaccess -text
 application/ship-simu/templates/de/game/resource/base_resource.xml -text
 application/ship-simu/templates/de/game/research/statics.xml -text
 application/ship-simu/templates/de/game/resource/.htaccess -text
 application/ship-simu/templates/de/game/resource/base_resource.xml -text


@@ -313,9 +316,12 @@ 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/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/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
 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/sound_equalizer.xml -text
+application/ship-simu/templates/de/game/technology/transistor.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

diff --git a/application/ship-simu/templates/de/game/electronic/cellphone.xml b/application/ship-simu/templates/de/game/electronic/cellphone.xml
index a66cc3f6f36934b9686f7c88062312ee48a55119..2baf75ed78458c774d71d8f1798f50117d46f34e 100644 (file)
--- a/application/ship-simu/templates/de/game/electronic/cellphone.xml
+++ b/application/ship-simu/templates/de/game/electronic/cellphone.xml
@@ -52,6 +52,7 @@ 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. //-->
                <!-- 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>
                        <research-dependency>
                                <id>{?research_id?}</id>
                                <name>{?research_name?}</name>

diff --git a/application/ship-simu/templates/de/game/electronic/hifi_system.xml b/application/ship-simu/templates/de/game/electronic/hifi_system.xml
new file mode 100644 (file)
index 0000000..302ad25
--- /dev/null
+++ b/application/ship-simu/templates/de/game/electronic/hifi_system.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A commercial, compact Hi-Fi (High Fidelity) sound system.
+
+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>
+               <name>hifi_system</name>
+               <type>entertainment</type>
+               <!-- Simplified dimensions of the electronics because it will be placed
+                    into a small box for transportation. //-->
+               <dimensions>
+                       <width>70</width>
+                       <height>70</height>
+                       <length>80</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>intergrated_currents</name>
+                               <level>6</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>sound_equalizer</name>
+                               <level>3</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>radio_receiving</name>
+                               <level>4</level>
+                       </technology-dependency>
+               </technology-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
new file mode 100644 (file)
index 0000000..53f40df
--- /dev/null
+++ b/application/ship-simu/templates/de/game/electronic/radio_receiver.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A commercial, simple radio receiver.
+
+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>
+               <name>radio_receiver</name>
+               <type>entertainment</type>
+               <!-- Simplified dimensions of the electronics because it will be placed
+                    into a small box for transportation. //-->
+               <dimensions>
+                       <width>30</width>
+                       <height>40</height>
+                       <length>20</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>intergrated_currents</name>
+                               <level>3</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>radio_receiving</name>
+                               <level>1</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+       </dependencies>
+</electronic>

diff --git a/application/ship-simu/templates/de/game/research/radio_receiving.xml b/application/ship-simu/templates/de/game/research/radio_receiving.xml
new file mode 100644 (file)
index 0000000..1988b27
--- /dev/null
+++ b/application/ship-simu/templates/de/game/research/radio_receiving.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A radio-receiving 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>radio_receiving</name>
+               <type>electronics</type>
+               <max-level>10</max-level>
+       </research-data>
+       <dependencies>
+               <!-- 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>
+                               <name>{?technology_name?}</name>
+                               <level>{?technology_level?}</level>
+                       </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>

diff --git a/application/ship-simu/templates/de/game/technology/cellular_network.xml b/application/ship-simu/templates/de/game/technology/cellular_network.xml
index adab217da697da4beb3864c13dc319c9f4111a69..3be2b2472625e1f10040ac7f182e735ba07a24ae 100644 (file)
--- a/application/ship-simu/templates/de/game/technology/cellular_network.xml
+++ b/application/ship-simu/templates/de/game/technology/cellular_network.xml
@@ -32,18 +32,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        <dependencies>
                <!-- All technology dependencies for this technology. //-->
                <technology-dependency-list>
        <dependencies>
                <!-- All technology dependencies for this technology. //-->
                <technology-dependency-list>

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

                        <technology-dependency>
                        <technology-dependency>

-                               <name>electronics</name>
-                               <level>5</level>
+                               <name></name>
+                               <level></level>

                        </technology-dependency>
                </technology-dependency-list>
                <!-- All research dependencies for this technology. //-->
                <research-dependency-list>
                        <!-- A research dependency for this technology. //-->
                        </technology-dependency>
                </technology-dependency-list>
                <!-- All research dependencies for this technology. //-->
                <research-dependency-list>
                        <!-- A research dependency for this technology. //-->

-                       <!-- @TODO Do we need research dependencies? //-->

                        <research-dependency>
                        <research-dependency>

-                               <name>{?research_name?}</name>
-                               <level>{?research_level?}</level>
+                               <name>electronics</name>
+                               <level>5</level>

                        </research-dependency>
                </research-dependency-list>
        </dependencies>
                        </research-dependency>
                </research-dependency-list>
        </dependencies>

diff --git a/application/ship-simu/templates/de/game/technology/intergrated_currents.xml b/application/ship-simu/templates/de/game/technology/intergrated_currents.xml
new file mode 100644 (file)
index 0000000..247d8f2
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/intergrated_currents.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A intergrated-current (IC) 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>intergrated_currents</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>transistor</name>
+                               <level>10</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research dependencies for this technology. //-->
+               <research-dependency-list>
+                       <!-- A research dependency for this technology. //-->
+                       <research-dependency>
+                               <name>silicium_mining</name>
+                               <level>1</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </dependencies>
+</technology>

diff --git a/application/ship-simu/templates/de/game/technology/plastics.xml b/application/ship-simu/templates/de/game/technology/plastics.xml
index f363949e47a2d24d25122eceaf17a4fc36f240b2..6eb2fac7894f63a7139022fae1dd4ff5d974d10b 100644 (file)
--- a/application/ship-simu/templates/de/game/technology/plastics.xml
+++ b/application/ship-simu/templates/de/game/technology/plastics.xml
@@ -27,46 +27,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <name>plastics</name>
                <type>production</type>
        </general-data>
                <name>plastics</name>
                <type>production</type>
        </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?}</level>
-                       <!-- A specific technology level may depend on some further technologies or research
-                            proposals. //-->
-                       <level-dependencies>
-                               <!-- All technology dependencies for this technology. //-->
-                               <technology-level-dependency-list>
-                                       <!-- A technology dependency for this technology. //-->
-                                       <technology-level-dependency>
-                                               <name>{?technology_level_name?}</name>
-                                               <level>{?technology_level_level?}</level>
-                                       </technology-level-dependency>
-                               </technology-level-dependency-list>
-                               <!-- All research dependencies for this technology. //-->
-                               <research-level-dependency-list>
-                                       <!-- A research dependency for this technology. //-->
-                                       <research-level-dependency>
-                                               <name>{?research_level_name?}</name>
-                                               <level>{?research_level_level?}</level>
-                                       </research-level-dependency>
-                               </research-dependency-list>
-                       </level-dependencies>
-               </technology-level>
-       </technology-level-list>

        <!-- 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 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>
                        <technology-dependency>

+                               <!-- @TODO Find a chemical name for this technology. //-->

                                <name>{?technology_name?}</name>
                                <level>chemicals</level>
                        </technology-dependency>
                </technology-dependency-list>
                <!-- All research dependencies for this technology. //-->
                <research-dependency-list>
                                <name>{?technology_name?}</name>
                                <level>chemicals</level>
                        </technology-dependency>
                </technology-dependency-list>
                <!-- All research dependencies for this technology. //-->
                <research-dependency-list>

+                       <!-- A research dependency for this technology. //-->

                        <research-dependency>
                                <name>chemistry</name>
                                <level>3</level>
                        <research-dependency>
                                <name>chemistry</name>
                                <level>3</level>

diff --git a/application/ship-simu/templates/de/game/technology/sound_equalizer.xml b/application/ship-simu/templates/de/game/technology/sound_equalizer.xml
new file mode 100644 (file)
index 0000000..2f52c5e
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/sound_equalizer.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>sound_equalizer</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>transistor</name>
+                               <level>5</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research dependencies for this technology. //-->
+               <!-- @TODO Should we find some theory behind equalizing? //-->
+               <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/transistor.xml b/application/ship-simu/templates/de/game/technology/transistor.xml
new file mode 100644 (file)
index 0000000..4253aa2
--- /dev/null
+++ b/application/ship-simu/templates/de/game/technology/transistor.xml
@@ -0,0 +1,54 @@
+<?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>transistor</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>semiconductor</name>
+                               <level>1</level>
+                       </technology-dependency>
+                       <technology-dependency>
+                               <name>plastics</name>
+                               <level>5</level>
+                       </technology-dependency>
+               </technology-dependency-list>
+               <!-- All research dependencies for this technology. //-->
+               <research-dependency-list>
+                       <!-- A research dependency for this technology. //-->
+                       <research-dependency>
+                               <name>silicium_mining</name>
+                               <level>1</level>
+                       </research-dependency>
+               </research-dependency-list>
+       </dependencies>
+</technology>

diff --git a/application/ship-simu/templates/de/game/types/electronic_types.xml b/application/ship-simu/templates/de/game/types/electronic_types.xml
index 6ff53e9e77230565b4e6c1285b5e339223059e01..dcbc2086e6e339820453520d4b56da129209e9a4 100644 (file)
--- a/application/ship-simu/templates/de/game/types/electronic_types.xml
+++ b/application/ship-simu/templates/de/game/types/electronic_types.xml
@@ -25,5 +25,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
 <electronic-type-list>
        <!-- All common communication devices. //-->
        <electronic-type type="communication" />
 <electronic-type-list>
        <!-- All common communication devices. //-->
        <electronic-type type="communication" />

+       <!-- All commercial systems for entertainment. //-->
+       <electronic-type type="entertainment" />

        <!-- @TODO Add more types. //-->
 </electronic-type-list>
        <!-- @TODO Add more types. //-->
 </electronic-type-list>

diff --git a/application/ship-simu/templates/de/game/types/research_types.xml b/application/ship-simu/templates/de/game/types/research_types.xml
index 7f7c247b3e78fbe66446a292eb02e43789353ad4..f3a6b47b44d92d864c5bac740c82f6c88bc06f90 100644 (file)
--- a/application/ship-simu/templates/de/game/types/research_types.xml
+++ b/application/ship-simu/templates/de/game/types/research_types.xml
@@ -22,7 +22,11 @@ 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/>
 //-->
 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-type-list>
+<research-type-list>

        <!-- A base research proposal which all others depend on. //-->
        <!-- A base research proposal which all others depend on. //-->

-       <technology-type type="base" />
+       <research-type type="base" />
+       <!-- An electronics research proposal. This type may conflict with the
+            same technology. This is also why it is hard to devide between
+            technology and theory in this type. //-->
+       <research-type type="electronics" />

 </technology-type-list>
 </technology-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 1d968111d1f6229e22efe2734462adc3b24d1627..4666d861eee64bbd589695b834770122b4efda5d 100644 (file)
--- a/application/ship-simu/templates/de/game/types/technology_types.xml
+++ b/application/ship-simu/templates/de/game/types/technology_types.xml
@@ -33,6 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
        <technology-type type="communication" />
        <!-- Technologies for different constructions. //-->
        <technology-type type="construction" />
        <technology-type type="communication" />
        <!-- Technologies for different constructions. //-->
        <technology-type type="construction" />

+       <!-- Different electronics technologies. //-->
+       <technology-type type="electronics" />

        <!-- Different equipment technologies. //-->
        <technology-type type="equipment" />
        <!-- Different production technologies. //-->
        <!-- Different equipment technologies. //-->
        <technology-type type="equipment" />
        <!-- Different production technologies. //-->

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 0d0ffc338a434327898c8988765a2a675a2722bc..f8ee4748c137e737a58227780d0c9a3e3272de13 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -171,18 +171,24 @@
 ./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. //-->
 ./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/farmer/base_farmer.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/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/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:79:               <!-- @TODO This section is not complete. //-->
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:89:                       <!-- @TODO This section is not complete. //-->
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:96:                       <!-- @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. //-->
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:79:               <!-- @TODO This section is not complete. //-->
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:89:                       <!-- @TODO This section is not complete. //-->
 ./application/ship-simu/templates/de/game/ship/base_ship.xml:96:                       <!-- @TODO This section is not complete. //-->

-./application/ship-simu/templates/de/game/technology/cellular_network.xml:43:                  <!-- @TODO Do we need research dependencies? //-->
+./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/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. //-->

-./application/ship-simu/templates/de/game/types/electronic_types.xml:28:       <!-- @TODO Add more types. //-->
+./application/ship-simu/templates/de/game/types/electronic_types.xml:30:       <!-- @TODO Add more types. //-->

 ./application/ship-simu/templates/de/game/types/farmer_types.xml:10:@todo              Unfinished template
 ./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/farmer_types.xml:10:@todo              Unfinished template
 ./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