From: Roland Häder Date: Wed, 2 Dec 2009 13:23:12 +0000 (+0000) Subject: Major rewrite of game logic XMLs X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=79bf69edf6b7a5d9185567d3b215650dcca61b9c;p=shipsimu.git Major rewrite of game logic XMLs --- diff --git a/application/ship-simu/templates/de/menu/generic_menu_entries.xml b/application/ship-simu/templates/de/menu/generic_menu_entries.xml index be74a9d..2113124 100644 --- a/application/ship-simu/templates/de/menu/generic_menu_entries.xml +++ b/application/ship-simu/templates/de/menu/generic_menu_entries.xml @@ -33,7 +33,7 @@ along with this program. If not, see - + @@ -42,7 +42,7 @@ along with this program. If not, see - + @@ -51,7 +51,7 @@ along with this program. If not, see - + @@ -60,7 +60,7 @@ along with this program. If not, see - + @@ -85,7 +85,7 @@ along with this program. If not, see - + @@ -94,7 +94,7 @@ along with this program. If not, see - + diff --git a/application/ship-simu/templates/game/building/advanced_research_lab.xml b/application/ship-simu/templates/game/building/advanced_research_lab.xml index ef8aebe..2556eaa 100644 --- a/application/ship-simu/templates/game/building/advanced_research_lab.xml +++ b/application/ship-simu/templates/game/building/advanced_research_lab.xml @@ -25,26 +25,29 @@ along with this program. If not, see - + advanced_research_lab research - + + - architecture - 10 + architecture + {?technology_type?} + 10 - laboratory_equipment - 8 + laboratory_equipment + {?technology_type?} + 8 diff --git a/application/ship-simu/templates/game/building/base_building.xml b/application/ship-simu/templates/game/building/base_building.xml index ab77439..5a0aafb 100644 --- a/application/ship-simu/templates/game/building/base_building.xml +++ b/application/ship-simu/templates/game/building/base_building.xml @@ -42,7 +42,7 @@ along with this program. If not, see - + {?id?} {?name?} {?type?} @@ -71,7 +71,7 @@ along with this program. If not, see - + @@ -84,7 +84,7 @@ along with this program. If not, see - {?construct_id?} + {?construct_id?} @@ -95,7 +95,7 @@ along with this program. If not, see - {?resource_id?} + {?resource_id?} {?resource_amount?} @@ -153,9 +153,10 @@ along with this program. If not, see - {?technology_id?} - {?technology_type?} - {?technology_level?} + {?technology_id?} + {?technology_name?} + {?technology_type?} + {?technology_level?} diff --git a/application/ship-simu/templates/game/building/research_lab.xml b/application/ship-simu/templates/game/building/research_lab.xml index e54b77c..d9c413f 100644 --- a/application/ship-simu/templates/game/building/research_lab.xml +++ b/application/ship-simu/templates/game/building/research_lab.xml @@ -25,10 +25,10 @@ along with this program. If not, see - + research_lab research - + - architecture - 5 + architecture + {?technology_type?} + 5 - laboratory_equipment - 1 + laboratory_equipment + {?technology_type?} + 1 diff --git a/application/ship-simu/templates/game/container/base_container.xml b/application/ship-simu/templates/game/container/base_container.xml index 2b22937..c95f4a5 100644 --- a/application/ship-simu/templates/game/container/base_container.xml +++ b/application/ship-simu/templates/game/container/base_container.xml @@ -23,7 +23,7 @@ along with this program. If not, see //--> - + {?id?} @@ -36,7 +36,7 @@ along with this program. If not, see {?length?} {?height?} - + @@ -55,9 +55,9 @@ along with this program. If not, see - {?content_id?} - {?content_type?} - {?content_amount?} + {?content_id?} + {?content_type?} + {?content_amount?} - {?maintenance_id?} - {?maintenance_type?} + {?maintenance_id?} + {?maintenance_name?} + {?maintenance_type?} diff --git a/application/ship-simu/templates/game/electronic/base_electronic.xml b/application/ship-simu/templates/game/electronic/base_electronic.xml index f29a410..e47a110 100644 --- a/application/ship-simu/templates/game/electronic/base_electronic.xml +++ b/application/ship-simu/templates/game/electronic/base_electronic.xml @@ -29,7 +29,7 @@ along with this program. If not, see //--> - + {?id?} {?name?} @@ -41,7 +41,7 @@ along with this program. If not, see {?height?} {?length?} - + @@ -49,18 +49,18 @@ along with this program. If not, see - {?technology_id?} - {?technology_name?} - {?technology_level?} + {?technology_id?} + {?technology_name?} + {?technology_level?} - {?research_id?} - {?research_name?} - {?research_level?} + {?research_id?} + {?research_name?} + {?research_level?} diff --git a/application/ship-simu/templates/game/electronic/cellphone.xml b/application/ship-simu/templates/game/electronic/cellphone.xml index 2184f02..e2ce154 100644 --- a/application/ship-simu/templates/game/electronic/cellphone.xml +++ b/application/ship-simu/templates/game/electronic/cellphone.xml @@ -27,7 +27,7 @@ along with this program. If not, see //--> - + cellphone communication @@ -38,7 +38,7 @@ along with this program. If not, see 35 30 - + diff --git a/application/ship-simu/templates/game/electronic/hifi_system.xml b/application/ship-simu/templates/game/electronic/hifi_system.xml index 9ac2439..dc1f63f 100644 --- a/application/ship-simu/templates/game/electronic/hifi_system.xml +++ b/application/ship-simu/templates/game/electronic/hifi_system.xml @@ -27,7 +27,7 @@ along with this program. If not, see //--> - + hifi_system entertainment diff --git a/application/ship-simu/templates/game/electronic/radio_receiver.xml b/application/ship-simu/templates/game/electronic/radio_receiver.xml index 53ff764..7396eb0 100644 --- a/application/ship-simu/templates/game/electronic/radio_receiver.xml +++ b/application/ship-simu/templates/game/electronic/radio_receiver.xml @@ -27,7 +27,7 @@ along with this program. If not, see //--> - + radio_receiver entertainment diff --git a/application/ship-simu/templates/game/electronic/surround_system.xml b/application/ship-simu/templates/game/electronic/surround_system.xml index 35980dc..86a7e17 100644 --- a/application/ship-simu/templates/game/electronic/surround_system.xml +++ b/application/ship-simu/templates/game/electronic/surround_system.xml @@ -27,7 +27,7 @@ along with this program. If not, see //--> - + surround_system entertainment @@ -38,7 +38,7 @@ along with this program. If not, see 140 120 - + diff --git a/application/ship-simu/templates/game/electronic/television.xml b/application/ship-simu/templates/game/electronic/television.xml index 12121a8..1c73803 100644 --- a/application/ship-simu/templates/game/electronic/television.xml +++ b/application/ship-simu/templates/game/electronic/television.xml @@ -27,7 +27,7 @@ along with this program. If not, see //--> - + television entertainment @@ -38,7 +38,7 @@ along with this program. If not, see 110 90 - + diff --git a/application/ship-simu/templates/game/engine/base_engine.xml b/application/ship-simu/templates/game/engine/base_engine.xml index e6bdf63..4708591 100644 --- a/application/ship-simu/templates/game/engine/base_engine.xml +++ b/application/ship-simu/templates/game/engine/base_engine.xml @@ -23,17 +23,17 @@ along with this program. If not, see //--> - + {?id?} {?name?} {?type?} {?horse_power?} - + - {?fuel_id?} - {?fuel_name?} - {?fuel_type?} + {?fuel_id?} + {?fuel_name?} + {?fuel_type?} @@ -49,9 +49,9 @@ along with this program. If not, see - {[?technology_id?} - {[?technology_name?} - {[?technology_level?} + {[?technology_id?} + {[?technology_name?} + {[?technology_level?} diff --git a/application/ship-simu/templates/game/farmer/base_farmer.xml b/application/ship-simu/templates/game/farmer/base_farmer.xml index 36f785b..8388afb 100644 --- a/application/ship-simu/templates/game/farmer/base_farmer.xml +++ b/application/ship-simu/templates/game/farmer/base_farmer.xml @@ -25,7 +25,7 @@ along with this program. If not, see - + {?id?} {?name?} {?type?} @@ -38,22 +38,22 @@ along with this program. If not, see {?productivity?} {?experience?} - + - {?produce_id?} - {?produce_name?} - {?produce_type?} + {?produce_id?} + {?produce_name?} + {?produce_type?} - {?technology_id?} - {?technology_name?} - {?technology_level?} + {?technology_id?} + {?technology_name?} + {?technology_level?} diff --git a/application/ship-simu/templates/game/fuel/base_fuel.xml b/application/ship-simu/templates/game/fuel/base_fuel.xml index 38bc771..0f023fb 100644 --- a/application/ship-simu/templates/game/fuel/base_fuel.xml +++ b/application/ship-simu/templates/game/fuel/base_fuel.xml @@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see //--> - + {?id?} {?name?} {?type?} - + diff --git a/application/ship-simu/templates/game/merchant/base_merchant.xml b/application/ship-simu/templates/game/merchant/base_merchant.xml index dbbf124..a4a7c85 100644 --- a/application/ship-simu/templates/game/merchant/base_merchant.xml +++ b/application/ship-simu/templates/game/merchant/base_merchant.xml @@ -23,7 +23,7 @@ along with this program. If not, see //--> - + {?id?} {?name?} {?type? @@ -35,7 +35,7 @@ along with this program. If not, see - + @@ -47,12 +47,12 @@ along with this program. If not, see - {?goods_id?} - {?goods_name?} - {?goods_type?} - {?goods_amount?} - {?goods_added?} - {?goods_remoed?} + {?goods_id?} + {?goods_name?} + {?goods_type?} + {?goods_amount?} + {?goods_added?} + {?goods_remoed?} diff --git a/application/ship-simu/templates/game/mineral/base_mineral.xml b/application/ship-simu/templates/game/mineral/base_mineral.xml index e114e4b..1084926 100644 --- a/application/ship-simu/templates/game/mineral/base_mineral.xml +++ b/application/ship-simu/templates/game/mineral/base_mineral.xml @@ -26,7 +26,7 @@ along with this program. If not, see //--> - + {?id?} {?type?} @@ -37,7 +37,7 @@ along with this program. If not, see - + diff --git a/application/ship-simu/templates/game/research/base_research.xml b/application/ship-simu/templates/game/research/base_research.xml index de2e7aa..e2b96c1 100644 --- a/application/ship-simu/templates/game/research/base_research.xml +++ b/application/ship-simu/templates/game/research/base_research.xml @@ -79,23 +79,26 @@ along with this program. If not, see - {?level_technology_id?} - {?level_technology_name?} - {?level_technology_level?} + {?level_technology_id?} + {?level_technology_name?} + {?level_technology_type?} + {?level_technology_level?} - {?level_research_id?} - {?level_research_name?} - {?level_research_level?} + {?level_research_id?} + {?level_research_name?} + {?level_research_type?} + {?level_research_level?} - - {?level_building_id?} - {?level_building_name?} - {?level_building_level?} + + {?level_building_id?} + {?level_building_name?} + {?level_building_type?} + {?level_building_level?} @@ -104,23 +107,26 @@ along with this program. If not, see - {?technology_id?} - {?technology_name?} - {?technology_level?} + {?technology_id?} + {?technology_name?} + {?technology_type?} + {?technology_level?} - {?research_id?} - {?research_name?} - {?research_level?} + {?research_id?} + {?research_name?} + {?research_type?} + {?research_level?} - {?building_id?} - {?building_name?} - {?building_level?} + {?building_id?} + {?building_name?} + {?building_type?} + {?building_level?} diff --git a/application/ship-simu/templates/game/research/electronics.xml b/application/ship-simu/templates/game/research/electronics.xml index 1bd2df2..96fafc4 100644 --- a/application/ship-simu/templates/game/research/electronics.xml +++ b/application/ship-simu/templates/game/research/electronics.xml @@ -31,14 +31,16 @@ along with this program. If not, see - plastics - 2 + plastics + chemicals + 2 - electricity - 4 + electricity + {?research_type?} + 4 diff --git a/application/ship-simu/templates/game/research/radio_receiving.xml b/application/ship-simu/templates/game/research/radio_receiving.xml index 44513dd..5d95701 100644 --- a/application/ship-simu/templates/game/research/radio_receiving.xml +++ b/application/ship-simu/templates/game/research/radio_receiving.xml @@ -33,8 +33,9 @@ along with this program. If not, see - signal_modulation - 1 + signal_modulation + electronics + 1 diff --git a/application/ship-simu/templates/game/research/statics.xml b/application/ship-simu/templates/game/research/statics.xml index d82085d..44146e5 100644 --- a/application/ship-simu/templates/game/research/statics.xml +++ b/application/ship-simu/templates/game/research/statics.xml @@ -31,20 +31,23 @@ along with this program. If not, see - {?technology_name?} - {?technology_level?} + {?technology_name?} + {?technology_type?} + {?technology_level?} - mathematics - 4 + mathematics + {?research_type?} + 4 - {?building_name?} - {?building_level?} + {?building_name?} + {?building_type?} + {?building_level?} diff --git a/application/ship-simu/templates/game/resource/base_resource.xml b/application/ship-simu/templates/game/resource/base_resource.xml index 2b5ba5d..d6b160c 100644 --- a/application/ship-simu/templates/game/resource/base_resource.xml +++ b/application/ship-simu/templates/game/resource/base_resource.xml @@ -25,7 +25,7 @@ along with this program. If not, see //--> - + {?id?} {?name?} {?type?} @@ -37,15 +37,16 @@ along with this program. If not, see - + - {?technology_id?} - {?technology_name?} - {?technology_level?} + {?technology_id?} + {?technology_name?} + {?technology_type?} + {?technology_level?} diff --git a/application/ship-simu/templates/game/ship/base_ship.xml b/application/ship-simu/templates/game/ship/base_ship.xml index 5160727..a33efe8 100644 --- a/application/ship-simu/templates/game/ship/base_ship.xml +++ b/application/ship-simu/templates/game/ship/base_ship.xml @@ -24,7 +24,7 @@ along with this program. If not, see - + {?id?} {?type?} @@ -42,12 +42,12 @@ along with this program. If not, see {?construction_finished? - + - {?company_id?} + {?company_id?} {?holder_started?} @@ -63,16 +63,16 @@ along with this program. If not, see - {?structure_id?} - {?structure_amount?} - {?structure_type?} + {?structure_id?} + {?structure_amount?} + {?structure_type?} - {?engine_id?{ - {?engine_type?} + {?engine_id?{ + {?engine_type?} @@ -114,18 +114,20 @@ along with this program. If not, see - {?technology_id?} - {?technology_name?} - {?technology_level?} + {?technology_id?} + {?technology_name?} + {?technology_type?} + {?technology_level?} - {?research_id?} - {?research_name?} - {?research_level?} + {?research_id?} + {?research_name?} + {?research_type?} + {?research_level?} diff --git a/application/ship-simu/templates/game/tank/base_tank.xml b/application/ship-simu/templates/game/tank/base_tank.xml index 7761160..dc331f2 100644 --- a/application/ship-simu/templates/game/tank/base_tank.xml +++ b/application/ship-simu/templates/game/tank/base_tank.xml @@ -22,22 +22,23 @@ You should have received a copy of the GNU General Public License along with this program. If not, see //--> - + {?id?} {?name?} {?type?} - + - {?content_id?} - {?content_name?} - {?content_type?} + {?content_id?} + {?content_name?} + {?content_type?} - {?technology_id?} - {?technology_name?} - {?technology_level?} + {?technology_id?} + {?technology_name?} + {?technology_type?} + {?technology_level?} diff --git a/application/ship-simu/templates/game/technology/architecture.xml b/application/ship-simu/templates/game/technology/architecture.xml index e58e969..c6c521e 100644 --- a/application/ship-simu/templates/game/technology/architecture.xml +++ b/application/ship-simu/templates/game/technology/architecture.xml @@ -23,29 +23,34 @@ along with this program. If not, see //--> - + architecture construction - + - drawings - 5 + + drawings + {?technology_type?} + 5 + - statics - 3 + statics + {?research_type?} + 3 - mathematics - 6 + mathematics + {?research_type?} + 6 diff --git a/application/ship-simu/templates/game/technology/base_technology.xml b/application/ship-simu/templates/game/technology/base_technology.xml index 6e2ae92..846a215 100644 --- a/application/ship-simu/templates/game/technology/base_technology.xml +++ b/application/ship-simu/templates/game/technology/base_technology.xml @@ -23,7 +23,7 @@ along with this program. If not, see //--> - + {?id?} {?name?} {?type?} @@ -37,7 +37,7 @@ along with this program. If not, see - + - {?technology_level_id?} - {?technology_level_name?} - {?technology_level_level?} + {?technology_level_id?} + {?technology_level_name?} + {?technology_level_level?} - {?research_level_id?} - {?research_level_name?} - {?research_level_level?} + {?research_level_id?} + {?research_level_name?} + {?research_level_level?} @@ -84,18 +84,20 @@ along with this program. If not, see - {?technology_id?} - {?technology_name?} - {?technology_level?} + {?technology_id?} + {?technology_name?} + {?technology_type?} + {?technology_level?} - {?research_id?} - {?research_name?} - {?research_level?} + {?research_id?} + {?research_name?} + {?research_type?} + {?research_level?} diff --git a/application/ship-simu/templates/game/technology/cellular_network.xml b/application/ship-simu/templates/game/technology/cellular_network.xml index 3be2b24..0e34905 100644 --- a/application/ship-simu/templates/game/technology/cellular_network.xml +++ b/application/ship-simu/templates/game/technology/cellular_network.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + cellular_network communication - + @@ -34,16 +34,19 @@ along with this program. If not, see - - + + + + - electronics - 5 + electronics + {?research_type?} + 5 diff --git a/application/ship-simu/templates/game/technology/drawings.xml b/application/ship-simu/templates/game/technology/drawings.xml index ef38631..43dbf50 100644 --- a/application/ship-simu/templates/game/technology/drawings.xml +++ b/application/ship-simu/templates/game/technology/drawings.xml @@ -23,8 +23,8 @@ along with this program. If not, see //--> - + drawings base - + diff --git a/application/ship-simu/templates/game/technology/glass_making.xml b/application/ship-simu/templates/game/technology/glass_making.xml index 85d63d5..5050fab 100644 --- a/application/ship-simu/templates/game/technology/glass_making.xml +++ b/application/ship-simu/templates/game/technology/glass_making.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + glass_making production - + - {?technology_level_name?} - {?technology_level_level?} + {?technology_level_name?} + {?technology_level_type?} + {?technology_level_level?} - {?research_level_name?} - {?research_level_level?} + {?research_level_name?} + {?research_level_type?} + {?research_level_level?} @@ -62,16 +64,18 @@ along with this program. If not, see - {?technology_name?} - {?technology_level?} + {?technology_name?} + {?technology_type?} + {?technology_level?} - {?research_name?} - {?research_level?} + {?research_name?} + {?research_type?} + {?research_level?} diff --git a/application/ship-simu/templates/game/technology/household_devices.xml b/application/ship-simu/templates/game/technology/household_devices.xml index e67cbd7..0e21326 100644 --- a/application/ship-simu/templates/game/technology/household_devices.xml +++ b/application/ship-simu/templates/game/technology/household_devices.xml @@ -23,25 +23,28 @@ along with this program. If not, see //--> - + household_devices electronics - + - plastics - 3 + plastics + chemicals + 3 + - electronics - 1 + electronics + {?research_type?} + 1 diff --git a/application/ship-simu/templates/game/technology/intergrated_currents.xml b/application/ship-simu/templates/game/technology/intergrated_currents.xml index 247d8f2..1e5471a 100644 --- a/application/ship-simu/templates/game/technology/intergrated_currents.xml +++ b/application/ship-simu/templates/game/technology/intergrated_currents.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + intergrated_currents eletronics - + @@ -34,16 +34,18 @@ along with this program. If not, see - transistor - 10 + transistor + electronics + 10 - silicium_mining - 1 + silicium_mining + {?research_type?} + 1 diff --git a/application/ship-simu/templates/game/technology/laboratory_equipment.xml b/application/ship-simu/templates/game/technology/laboratory_equipment.xml index 98c1fb4..05bf5a1 100644 --- a/application/ship-simu/templates/game/technology/laboratory_equipment.xml +++ b/application/ship-simu/templates/game/technology/laboratory_equipment.xml @@ -23,21 +23,23 @@ along with this program. If not, see //--> - + laboratory_equipment equipment - + - plastics - 3 + plastics + chemicals + 3 - glass_making - 5 + glass_making + {?technology_type?} + 5 diff --git a/application/ship-simu/templates/game/technology/naval_architecture.xml b/application/ship-simu/templates/game/technology/naval_architecture.xml index 901e7f4..4cc6656 100644 --- a/application/ship-simu/templates/game/technology/naval_architecture.xml +++ b/application/ship-simu/templates/game/technology/naval_architecture.xml @@ -23,33 +23,37 @@ along with this program. If not, see //--> - + naval_architecture ship_construction - + - architecture - 3 + architecture + {?technology_type?} + 3 - statics - 5 + statics + {?technology_type?} + 5 - drawings - 6 + drawings + {?technology_type?} + 6 - mathematics - 8 + mathematics + {?research_type?} + 8 diff --git a/application/ship-simu/templates/game/technology/plastics.xml b/application/ship-simu/templates/game/technology/plastics.xml index 6eb2fac..b5b9048 100644 --- a/application/ship-simu/templates/game/technology/plastics.xml +++ b/application/ship-simu/templates/game/technology/plastics.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + plastics production - + @@ -34,17 +34,19 @@ along with this program. If not, see - - {?technology_name?} - chemicals + + {?technology_name?} + chemicals + {?technology_name?} - chemistry - 3 + chemistry + chemicals + 3 diff --git a/application/ship-simu/templates/game/technology/signal_amplifying.xml b/application/ship-simu/templates/game/technology/signal_amplifying.xml index 9603064..e553156 100644 --- a/application/ship-simu/templates/game/technology/signal_amplifying.xml +++ b/application/ship-simu/templates/game/technology/signal_amplifying.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + signal_amplifying electronics - + @@ -34,16 +34,18 @@ along with this program. If not, see - transistor - 3 + transistor + electronics + 3 - modulation - 1 + modulation + {?research_type?} + 1 diff --git a/application/ship-simu/templates/game/technology/signal_modulation.xml b/application/ship-simu/templates/game/technology/signal_modulation.xml index fa220cb..df1acde 100644 --- a/application/ship-simu/templates/game/technology/signal_modulation.xml +++ b/application/ship-simu/templates/game/technology/signal_modulation.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + signal_modulation electronics - + @@ -34,16 +34,18 @@ along with this program. If not, see - transistor - 3 + transistor + electronics + 3 - modulation - 1 + modulation + {?research_type?} + 1 diff --git a/application/ship-simu/templates/game/technology/sound_equalizer.xml b/application/ship-simu/templates/game/technology/sound_equalizer.xml index 2f52c5e..d434381 100644 --- a/application/ship-simu/templates/game/technology/sound_equalizer.xml +++ b/application/ship-simu/templates/game/technology/sound_equalizer.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + sound_equalizer electronic - + @@ -34,8 +34,9 @@ along with this program. If not, see - transistor - 5 + transistor + electronics + 5 @@ -43,8 +44,9 @@ along with this program. If not, see - {?research_name?} - {?research_level?} + {?research_name?} + {?research_type?} + {?research_level?} diff --git a/application/ship-simu/templates/game/technology/sound_processor.xml b/application/ship-simu/templates/game/technology/sound_processor.xml index 436ccd7..4adc30b 100644 --- a/application/ship-simu/templates/game/technology/sound_processor.xml +++ b/application/ship-simu/templates/game/technology/sound_processor.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + sound_processor electronic - + @@ -34,12 +34,14 @@ along with this program. If not, see - intergrated_current - 7 + intergrated_current + electronics + 7 - surround_mixing - 1 + surround_mixing + electronics + 1 @@ -47,8 +49,9 @@ along with this program. If not, see - {?research_name?} - {?research_level?} + {?research_name?} + {?research_type?} + {?research_level?} diff --git a/application/ship-simu/templates/game/technology/surround_mixing.xml b/application/ship-simu/templates/game/technology/surround_mixing.xml index 996a714..baa8ea2 100644 --- a/application/ship-simu/templates/game/technology/surround_mixing.xml +++ b/application/ship-simu/templates/game/technology/surround_mixing.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + surround_mixing electronic - + @@ -34,8 +34,9 @@ along with this program. If not, see - intergrated_current - 6 + intergrated_current + electronics + 6 @@ -43,8 +44,9 @@ along with this program. If not, see - {?research_name?} - {?research_level?} + {?research_name?} + {?research_type?} + {?research_level?} diff --git a/application/ship-simu/templates/game/technology/transistor.xml b/application/ship-simu/templates/game/technology/transistor.xml index 4253aa2..6f32091 100644 --- a/application/ship-simu/templates/game/technology/transistor.xml +++ b/application/ship-simu/templates/game/technology/transistor.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + transistor eletronics - + @@ -34,20 +34,24 @@ along with this program. If not, see - semiconductor - 1 + semiconductor + electronics + 1 - plastics - 5 + plastics + chemicals + 5 + - silicium_mining - 1 + silicium_mining + {?research_type?} + 1 diff --git a/application/ship-simu/templates/game/technology/video_receiving.xml b/application/ship-simu/templates/game/technology/video_receiving.xml index 9d4d10c..c640d1f 100644 --- a/application/ship-simu/templates/game/technology/video_receiving.xml +++ b/application/ship-simu/templates/game/technology/video_receiving.xml @@ -23,10 +23,10 @@ along with this program. If not, see //--> - + video_receiving eletronics - + @@ -34,16 +34,19 @@ along with this program. If not, see - signal_amplifying - 1 + signal_amplifying + electronics + 1 - signal_modulation - 1 + signal_modulation + electronics + 1 - transistor - 1 + transistor + electronics + 1