From d1f059194db471b16e294d25918ac1a621736211 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 2 Oct 2009 23:35:38 +0000 Subject: [PATCH] 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 --- .gitattributes | 13 ++++ .../de/game/electronic/surround_system.xml | 62 +++++++++++++++++++ .../de/game/electronic/television.xml | 58 +++++++++++++++++ .../templates/de/game/farmer/base_farmer.xml | 26 ++++---- .../templates/de/game/fruit/.htaccess | 1 + .../templates/de/game/fruit/base_fruit.xml | 26 ++++++++ .../templates/de/game/produce/.htaccess | 1 + .../de/game/produce/base_produce.xml | 26 ++++++++ .../de/game/research/radio_receiving.xml | 14 +---- .../de/game/technology/signal_amplifying.xml | 50 +++++++++++++++ .../de/game/technology/signal_modulation.xml | 50 +++++++++++++++ .../de/game/technology/sound_processor.xml | 55 ++++++++++++++++ .../de/game/technology/surround_mixing.xml | 51 +++++++++++++++ .../de/game/technology/video_receiving.xml | 50 +++++++++++++++ .../templates/de/game/vegetable/.htaccess | 1 + .../de/game/vegetable/base_vegetable.xml | 26 ++++++++ docs/TODOs.txt | 8 ++- 17 files changed, 490 insertions(+), 28 deletions(-) create mode 100644 application/ship-simu/templates/de/game/electronic/surround_system.xml create mode 100644 application/ship-simu/templates/de/game/electronic/television.xml create mode 100644 application/ship-simu/templates/de/game/fruit/.htaccess create mode 100644 application/ship-simu/templates/de/game/fruit/base_fruit.xml create mode 100644 application/ship-simu/templates/de/game/produce/.htaccess create mode 100644 application/ship-simu/templates/de/game/produce/base_produce.xml create mode 100644 application/ship-simu/templates/de/game/technology/signal_amplifying.xml create mode 100644 application/ship-simu/templates/de/game/technology/signal_modulation.xml create mode 100644 application/ship-simu/templates/de/game/technology/sound_processor.xml create mode 100644 application/ship-simu/templates/de/game/technology/surround_mixing.xml create mode 100644 application/ship-simu/templates/de/game/technology/video_receiving.xml create mode 100644 application/ship-simu/templates/de/game/vegetable/.htaccess create mode 100644 application/ship-simu/templates/de/game/vegetable/base_vegetable.xml diff --git a/.gitattributes b/.gitattributes index 3839fec..76cb8e6 100644 --- 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/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/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/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 @@ -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/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_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/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 @@ -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/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 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 index 0000000..35980dc --- /dev/null +++ b/application/ship-simu/templates/de/game/electronic/surround_system.xml @@ -0,0 +1,62 @@ + + + + + + + surround_system + entertainment + + + 120 + 140 + 120 + + + + + + + + + sound_processor + 3 + + + sound_equalizer + 5 + + + radio_receiving + 6 + + + + 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 index 0000000..0738c26 --- /dev/null +++ b/application/ship-simu/templates/de/game/electronic/television.xml @@ -0,0 +1,58 @@ + + + + + + + television + entertainment + + + 100 + 110 + 90 + + + + + + + + + video_receiving + 1 + + + transistor + 1 + + + + 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 e45c829..7003d2e 100644 --- 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 {?experience?} - - - - {?product_id?} - {?product_name?} - {?product_type?} - + + + + {?produce_id?} + {?produce_name?} + {?produce_type?} + - {?technology_farmerid?} - {?technology_farmername?} - {?technology_farmerlevel?} + {?technology_id?} + {?technology_name?} + {?technology_level?} - - + + diff --git a/application/ship-simu/templates/de/game/fruit/.htaccess b/application/ship-simu/templates/de/game/fruit/.htaccess new file mode 100644 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 index 0000000..482faad --- /dev/null +++ b/application/ship-simu/templates/de/game/fruit/base_fruit.xml @@ -0,0 +1,26 @@ + + + + diff --git a/application/ship-simu/templates/de/game/produce/.htaccess b/application/ship-simu/templates/de/game/produce/.htaccess new file mode 100644 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 index 0000000..29ca874 --- /dev/null +++ b/application/ship-simu/templates/de/game/produce/base_produce.xml @@ -0,0 +1,26 @@ + + + + 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 1988b27..44513dd 100644 --- 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 - - {?technology_name?} - {?technology_level?} + signal_modulation + 1 - - - - - - {?research_name?} - {?research_level?} - - 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 index 0000000..9603064 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/signal_amplifying.xml @@ -0,0 +1,50 @@ + + + + + + signal_amplifying + electronics + + + + + + + + transistor + 3 + + + + + + + modulation + 1 + + + + 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 index 0000000..fa220cb --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/signal_modulation.xml @@ -0,0 +1,50 @@ + + + + + + signal_modulation + electronics + + + + + + + + transistor + 3 + + + + + + + modulation + 1 + + + + 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 index 0000000..436ccd7 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/sound_processor.xml @@ -0,0 +1,55 @@ + + + + + + sound_processor + electronic + + + + + + + + intergrated_current + 7 + + + surround_mixing + 1 + + + + + + + + {?research_name?} + {?research_level?} + + + + 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 index 0000000..996a714 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/surround_mixing.xml @@ -0,0 +1,51 @@ + + + + + + surround_mixing + electronic + + + + + + + + intergrated_current + 6 + + + + + + + + {?research_name?} + {?research_level?} + + + + 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 index 0000000..9d4d10c --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/video_receiving.xml @@ -0,0 +1,50 @@ + + + + + + video_receiving + eletronics + + + + + + + + signal_amplifying + 1 + + + signal_modulation + 1 + + + transistor + 1 + + + + diff --git a/application/ship-simu/templates/de/game/vegetable/.htaccess b/application/ship-simu/templates/de/game/vegetable/.htaccess new file mode 100644 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 index 0000000..80925e5 --- /dev/null +++ b/application/ship-simu/templates/de/game/vegetable/base_vegetable.xml @@ -0,0 +1,26 @@ + + + + diff --git a/docs/TODOs.txt b/docs/TODOs.txt index f8ee474..8ebfc71 100644 --- a/docs/TODOs.txt +++ b/docs/TODOs.txt @@ -173,9 +173,8 @@ ./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/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: ./application/ship-simu/templates/de/game/ship/base_ship.xml:104: ./application/ship-simu/templates/de/game/ship/base_ship.xml:108: @@ -185,6 +184,8 @@ ./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/technology/sound_processor.xml:46: +./application/ship-simu/templates/de/game/technology/surround_mixing.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: @@ -199,6 +200,7 @@ ./application/ship-simu/templates/de/game/types/signer_types.xml:28: ./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 -- 2.39.5