Farmer and product type added, cellular network updated, TODOs.txt updated:

- New base_farmer.xml and farmer_types.xml added (not yet finished)
- TODO added to cellular_network.xml
- TODOs.txt updated

diff --git a/.gitattributes b/.gitattributes
index 88c57e596a05aafba011741536b3cbe27c38f97a..3617df026196b7894fe52a58b727eb4c60df030c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -289,6 +289,8 @@ 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/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/fuel/.htaccess -text
 application/ship-simu/templates/de/game/fuel/base_fuel.xml -text
 application/ship-simu/templates/de/game/merchant/.htaccess -text
@@ -321,9 +323,11 @@ application/ship-simu/templates/de/game/types/content_types.xml -text
 application/ship-simu/templates/de/game/types/contract_types.xml -text
 application/ship-simu/templates/de/game/types/electronic_types.xml -text
 application/ship-simu/templates/de/game/types/engine_types.xml -text
+application/ship-simu/templates/de/game/types/farmer_types.xml -text
 application/ship-simu/templates/de/game/types/fuel_types.xml -text
 application/ship-simu/templates/de/game/types/merchant_types.xml -text
 application/ship-simu/templates/de/game/types/owner_occupants.xml -text
+application/ship-simu/templates/de/game/types/product_types.xml -text
 application/ship-simu/templates/de/game/types/research_types.xml -text
 application/ship-simu/templates/de/game/types/ship_types.xml -text
 application/ship-simu/templates/de/game/types/signer_types.xml -text

diff --git a/application/ship-simu/templates/de/.xml b/application/ship-simu/templates/de/.xml
index e253bddb1d5629124bb75ed449e1fcf32de6629d..d7d7d0869b99abab608bd247da81867ce8b69d4e 100644 (file)
--- a/application/ship-simu/templates/de/.xml
+++ b/application/ship-simu/templates/de/.xml
@@ -7,6 +7,7 @@
 @copyright     Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
 @license       GNU GPL 3.0 or any newer version
 @link          http://www.ship-simu.org
+@todo          Unfinished template
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

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

diff --git a/application/ship-simu/templates/de/game/farmer/base_farmer.xml b/application/ship-simu/templates/de/game/farmer/base_farmer.xml
new file mode 100644 (file)
index 0000000..e45c829
--- /dev/null
+++ b/application/ship-simu/templates/de/game/farmer/base_farmer.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+A general farmer 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/>
+//-->
+<farmer>
+       <!-- General data about this farmer, like name (not the player's nickname)
+            type, birthday. //-->
+       <general-data>
+               <id>{?id?}</id>
+               <name>{?name?}</name>
+               <type>{?type?}</type>
+               <!-- The productivity may depend on the age of the farmer. //-->
+               <birthday>
+                       <month>{?month?}</month>
+                       <day>{?day?}</day>
+                       <year>{?year?}</year>
+               </birthyear>
+               <!-- Productivity, experience and others. //-->
+               <productivity>{?productivity?}</productivity>
+               <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. //-->
+                       <technology-dependency-list>
+                               <!-- A single technology dependency. //-->
+                               <technology-dependency>
+                                       <id>{?technology_farmerid?}</id>
+                                       <name>{?technology_farmername?}</name>
+                                       <level>{?technology_farmerlevel?}</level>
+                               </technology-dependency>
+                       </technology-dependency-list>
+               </product>
+       </product-list>
+</farmer>

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 06ff0a4c7ca73d769501d830a54c3c1825309bfe..adab217da697da4beb3864c13dc319c9f4111a69 100644 (file)
--- a/application/ship-simu/templates/de/game/technology/cellular_network.xml
+++ b/application/ship-simu/templates/de/game/technology/cellular_network.xml
@@ -40,6 +40,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
                <!-- All research dependencies for this technology. //-->
                <research-dependency-list>
                        <!-- A research dependency for this technology. //-->
+                       <!-- @TODO Do we need research dependencies? //-->
                        <research-dependency>
                                <name>{?research_name?}</name>
                                <level>{?research_level?}</level>

diff --git a/application/ship-simu/templates/de/game/types/farmer_types.xml b/application/ship-simu/templates/de/game/types/farmer_types.xml
new file mode 100644 (file)
index 0000000..efd95cd
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/farmer_types.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid farmer types
+
+@author                Roland Haeder <webmaster@ship-simu.org>
+@version       0.0.0
+@copyright     Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
+@license       GNU GPL 3.0 or any newer version
+@link          http://www.ship-simu.org
+@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/>
+//-->
+<farmer-type-list>
+</farmer-type-list>

diff --git a/application/ship-simu/templates/de/game/types/product_types.xml b/application/ship-simu/templates/de/game/types/product_types.xml
new file mode 100644 (file)
index 0000000..4cba48f
--- /dev/null
+++ b/application/ship-simu/templates/de/game/types/product_types.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+All valid product types
+
+@author                Roland Haeder <webmaster@ship-simu.org>
+@version       0.0.0
+@copyright     Copyright (c) 2007, 2008 Roland Haeder, 2009 Ship-Simu Developer Team
+@license       GNU GPL 3.0 or any newer version
+@link          http://www.ship-simu.org
+@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/>
+//-->
+<product-type-list>
+</product-type-list>

diff --git a/docs/TODOs.txt b/docs/TODOs.txt
index 504d185c1f1b32cfaa7372b11592cbd30cfd7ac7..0d0ffc338a434327898c8988765a2a675a2722bc 100644 (file)
--- a/docs/TODOs.txt
+++ b/docs/TODOs.txt
@@ -171,24 +171,29 @@
 ./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/farmer/base_farmer.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: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/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/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/product_types.xml:10:@todo             Unfinished template
 ./application/ship-simu/templates/de/game/types/research_types.xml:10:@todo            Unfinished template
 ./application/ship-simu/templates/de/game/types/ship_types.xml:10:@todo                This is a very simmple list, extend it.
 ./application/ship-simu/templates/de/game/types/ship_types.xml:38:     <!-- @TODO Add more ship types. //-->
 ./application/ship-simu/templates/de/game/types/signer_types.xml:28:   <!-- @TODO Add more types, e.g. company //-->
 ./application/ship-simu/templates/de/game/types/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/.xml:10:@todo             Unfinished template
 ### ### DEPRECATION FOLLOWS: ### ###
 ./application/ship-simu/main/personell/class_SimulatorPersonell.php:118:        * @deprecated
 ./application/ship-simu/main/personell/class_SimulatorPersonell.php:319:        * @deprecated