From: Roland Häder Date: Fri, 2 Oct 2009 00:35:21 +0000 (+0000) Subject: More technology added (commercial and electronical), TODOs.txt updated X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=commitdiff_plain;h=d1c681f20a57be6091d3370131df117b0a2b4c22 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 3617df0..3839fec 100644 --- 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/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 @@ -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/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 @@ -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/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/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 diff --git a/application/ship-simu/templates/de/game/electronic/cellphone.xml b/application/ship-simu/templates/de/game/electronic/cellphone.xml index a66cc3f..2baf75e 100644 --- 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 + {?research_id?} {?research_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 index 0000000..302ad25 --- /dev/null +++ b/application/ship-simu/templates/de/game/electronic/hifi_system.xml @@ -0,0 +1,61 @@ + + + + + + hifi_system + entertainment + + + 70 + 70 + 80 + + + + + + + + + intergrated_currents + 6 + + + sound_equalizer + 3 + + + radio_receiving + 4 + + + + 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 index 0000000..53f40df --- /dev/null +++ b/application/ship-simu/templates/de/game/electronic/radio_receiver.xml @@ -0,0 +1,57 @@ + + + + + + radio_receiver + entertainment + + + 30 + 40 + 20 + + + + + + + + + intergrated_currents + 3 + + + radio_receiving + 1 + + + + 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 index 0000000..1988b27 --- /dev/null +++ b/application/ship-simu/templates/de/game/research/radio_receiving.xml @@ -0,0 +1,51 @@ + + + + + + radio_receiving + electronics + 10 + + + + + + + + {?technology_name?} + {?technology_level?} + + + + + + + + {?research_name?} + {?research_level?} + + + + 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 adab217..3be2b24 100644 --- 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 + - electronics - 5 + + - - {?research_name?} - {?research_level?} + electronics + 5 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 index 0000000..247d8f2 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/intergrated_currents.xml @@ -0,0 +1,50 @@ + + + + + + intergrated_currents + eletronics + + + + + + + + transistor + 10 + + + + + + + silicium_mining + 1 + + + + diff --git a/application/ship-simu/templates/de/game/technology/plastics.xml b/application/ship-simu/templates/de/game/technology/plastics.xml index f363949..6eb2fac 100644 --- 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 plastics production - - - - - {?list_level?} - - - - - - - {?technology_level_name?} - {?technology_level_level?} - - - - - - - {?research_level_name?} - {?research_level_level?} - - - - - + + {?technology_name?} chemicals + chemistry 3 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 index 0000000..2f52c5e --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/sound_equalizer.xml @@ -0,0 +1,51 @@ + + + + + + sound_equalizer + electronic + + + + + + + + transistor + 5 + + + + + + + + {?research_name?} + {?research_level?} + + + + 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 index 0000000..4253aa2 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/transistor.xml @@ -0,0 +1,54 @@ + + + + + + transistor + eletronics + + + + + + + + semiconductor + 1 + + + plastics + 5 + + + + + + + silicium_mining + 1 + + + + 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 6ff53e9..dcbc208 100644 --- 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 + + 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 7f7c247..f3a6b47 100644 --- 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 //--> - + - + + + 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 1d96811..4666d86 100644 --- 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 + + diff --git a/docs/TODOs.txt b/docs/TODOs.txt index 0d0ffc3..f8ee474 100644 --- 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: +./application/ship-simu/templates/de/game/electronic/cellphone.xml:55: ./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: +./application/ship-simu/templates/de/game/research/radio_receiving.xml:44: ./application/ship-simu/templates/de/game/ship/base_ship.xml:100: ./application/ship-simu/templates/de/game/ship/base_ship.xml:104: ./application/ship-simu/templates/de/game/ship/base_ship.xml:108: ./application/ship-simu/templates/de/game/ship/base_ship.xml:79: ./application/ship-simu/templates/de/game/ship/base_ship.xml:89: ./application/ship-simu/templates/de/game/ship/base_ship.xml:96: -./application/ship-simu/templates/de/game/technology/cellular_network.xml:43: +./application/ship-simu/templates/de/game/technology/cellular_network.xml:35: +./application/ship-simu/templates/de/game/technology/plastics.xml:37: +./application/ship-simu/templates/de/game/technology/sound_equalizer.xml:42: ./application/ship-simu/templates/de/game/types/container_types.xml:33: ./application/ship-simu/templates/de/game/types/content_types.xml:31: ./application/ship-simu/templates/de/game/types/contract_types.xml:40: -./application/ship-simu/templates/de/game/types/electronic_types.xml:28: +./application/ship-simu/templates/de/game/types/electronic_types.xml:30: ./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