From 0a5b0edae6e25d3cbba453d788aa201da0b9dbf8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 26 Mar 2011 00:12:39 +0000 Subject: [PATCH] Added a count attribute to all list XML nodes (unhandled at the moment) --- .../ship-simu/templates/de/menu/base_menu.xml | 4 +- .../de/menu/generic_menu_entries.xml | 6 +-- .../game/building/advanced_research_lab.xml | 4 +- .../templates/game/building/base_building.xml | 4 +- .../templates/game/building/research_lab.xml | 2 +- .../game/container/base_container.xml | 4 +- .../templates/game/contract/base_contract.xml | 2 +- .../game/electronic/base_electronic.xml | 4 +- .../templates/game/electronic/cellphone.xml | 4 +- .../templates/game/electronic/hifi_system.xml | 4 +- .../game/electronic/radio_receiver.xml | 4 +- .../game/electronic/surround_system.xml | 2 +- .../templates/game/electronic/television.xml | 2 +- .../templates/game/engine/base_engine.xml | 2 +- .../templates/game/farmer/base_farmer.xml | 4 +- .../templates/game/merchant/base_merchant.xml | 2 +- .../templates/game/mineral/base_mineral.xml | 2 +- .../templates/game/research/base_research.xml | 18 +++---- .../templates/game/research/electronics.xml | 4 +- .../game/research/radio_receiving.xml | 2 +- .../templates/game/research/statics.xml | 6 +-- .../templates/game/resource/base_resource.xml | 2 +- .../templates/game/tank/base_tank.xml | 2 +- .../game/technology/architecture.xml | 4 +- .../game/technology/cellular_network.xml | 4 +- .../game/technology/glass_making.xml | 10 ++-- .../game/technology/household_devices.xml | 4 +- .../game/technology/intergrated_currents.xml | 4 +- .../game/technology/laboratory_equipment.xml | 2 +- .../game/technology/naval_architecture.xml | 4 +- .../templates/game/technology/plastics.xml | 4 +- .../game/technology/signal_amplifying.xml | 4 +- .../game/technology/signal_modulation.xml | 4 +- .../game/technology/sound_equalizer.xml | 4 +- .../game/technology/sound_processor.xml | 4 +- .../game/technology/surround_mixing.xml | 4 +- .../templates/game/technology/transistor.xml | 4 +- .../game/technology/video_receiving.xml | 2 +- .../templates/game/types/building_types.xml | 2 +- .../templates/game/types/container_types.xml | 2 +- .../templates/game/types/content_types.xml | 2 +- .../templates/game/types/contract_types.xml | 4 +- .../templates/game/types/electronic_types.xml | 2 +- .../templates/game/types/engine_types.xml | 2 +- .../templates/game/types/farmer_types.xml | 2 +- .../templates/game/types/fuel_types.xml | 2 +- .../templates/game/types/merchant_types.xml | 2 +- .../templates/game/types/owner_occupants.xml | 2 +- .../templates/game/types/product_types.xml | 2 +- .../templates/game/types/research_types.xml | 2 +- .../templates/game/types/ship_types.xml | 2 +- .../templates/game/types/signer_types.xml | 2 +- .../templates/game/types/tank_types.xml | 2 +- .../templates/game/types/technology_types.xml | 2 +- docs/TODOs.txt | 52 ++++++++++--------- 55 files changed, 120 insertions(+), 118 deletions(-) diff --git a/application/ship-simu/templates/de/menu/base_menu.xml b/application/ship-simu/templates/de/menu/base_menu.xml index 150484e..1c93350 100644 --- a/application/ship-simu/templates/de/menu/base_menu.xml +++ b/application/ship-simu/templates/de/menu/base_menu.xml @@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see //--> - + @@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/> <title-text>{?menu_title?}</title-text> - + {?entry_id?} 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 2113124..65c742e 100644 --- a/application/ship-simu/templates/de/menu/generic_menu_entries.xml +++ b/application/ship-simu/templates/de/menu/generic_menu_entries.xml @@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see //--> - + @@ -31,7 +31,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/> <title-text><![CDATA[Home:]]></title-text> - + @@ -83,7 +83,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 2556eaa..48d3e5e 100644 --- a/application/ship-simu/templates/game/building/advanced_research_lab.xml +++ b/application/ship-simu/templates/game/building/advanced_research_lab.xml @@ -36,7 +36,7 @@ along with this program. If not, see - + architecture @@ -44,7 +44,7 @@ along with this program. If not, see 10 - + 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 5a0aafb..0949690 100644 --- a/application/ship-simu/templates/game/building/base_building.xml +++ b/application/ship-simu/templates/game/building/base_building.xml @@ -150,7 +150,7 @@ along with this program. If not, see shipping company to construct this building. //--> - + {?technology_id?} @@ -161,7 +161,7 @@ along with this program. If not, see - + diff --git a/application/ship-simu/templates/game/building/research_lab.xml b/application/ship-simu/templates/game/building/research_lab.xml index d9c413f..091ad0a 100644 --- a/application/ship-simu/templates/game/building/research_lab.xml +++ b/application/ship-simu/templates/game/building/research_lab.xml @@ -35,7 +35,7 @@ along with this program. If not, see shipping company to construct this building. //--> - + architecture diff --git a/application/ship-simu/templates/game/container/base_container.xml b/application/ship-simu/templates/game/container/base_container.xml index c95f4a5..be79f56 100644 --- a/application/ship-simu/templates/game/container/base_container.xml +++ b/application/ship-simu/templates/game/container/base_container.xml @@ -52,7 +52,7 @@ along with this program. If not, see - + {?content_id?} @@ -64,7 +64,7 @@ along with this program. If not, see constant temperature. This is useful for biological content like fruits. But it is optional. You can currently specify multiple systems, e.g. ventilation and maybe cooling aggregate or so. //--> - + {?maintenance_id?} diff --git a/application/ship-simu/templates/game/contract/base_contract.xml b/application/ship-simu/templates/game/contract/base_contract.xml index 06a9d7c..bb59563 100644 --- a/application/ship-simu/templates/game/contract/base_contract.xml +++ b/application/ship-simu/templates/game/contract/base_contract.xml @@ -23,7 +23,7 @@ along with this program. If not, see //--> - + diff --git a/application/ship-simu/templates/game/electronic/base_electronic.xml b/application/ship-simu/templates/game/electronic/base_electronic.xml index e47a110..06945a5 100644 --- a/application/ship-simu/templates/game/electronic/base_electronic.xml +++ b/application/ship-simu/templates/game/electronic/base_electronic.xml @@ -46,7 +46,7 @@ along with this program. If not, see 'electronics'. //--> - + {?technology_id?} @@ -55,7 +55,7 @@ along with this program. If not, see - + {?research_id?} diff --git a/application/ship-simu/templates/game/electronic/cellphone.xml b/application/ship-simu/templates/game/electronic/cellphone.xml index e2ce154..2c7f2d8 100644 --- a/application/ship-simu/templates/game/electronic/cellphone.xml +++ b/application/ship-simu/templates/game/electronic/cellphone.xml @@ -43,14 +43,14 @@ along with this program. If not, see 'electronics'. //--> - + cellular_network 1 - + electronics diff --git a/application/ship-simu/templates/game/electronic/hifi_system.xml b/application/ship-simu/templates/game/electronic/hifi_system.xml index dc1f63f..76a1a8e 100644 --- a/application/ship-simu/templates/game/electronic/hifi_system.xml +++ b/application/ship-simu/templates/game/electronic/hifi_system.xml @@ -42,7 +42,7 @@ along with this program. If not, see 'electronics'. //--> - + intergrated_currents @@ -58,7 +58,7 @@ along with this program. If not, see - + electronics diff --git a/application/ship-simu/templates/game/electronic/radio_receiver.xml b/application/ship-simu/templates/game/electronic/radio_receiver.xml index 7396eb0..ce5eb0d 100644 --- a/application/ship-simu/templates/game/electronic/radio_receiver.xml +++ b/application/ship-simu/templates/game/electronic/radio_receiver.xml @@ -42,7 +42,7 @@ along with this program. If not, see 'electronics'. //--> - + intergrated_currents @@ -54,7 +54,7 @@ along with this program. If not, see - + electronics diff --git a/application/ship-simu/templates/game/electronic/surround_system.xml b/application/ship-simu/templates/game/electronic/surround_system.xml index 86a7e17..31651a3 100644 --- a/application/ship-simu/templates/game/electronic/surround_system.xml +++ b/application/ship-simu/templates/game/electronic/surround_system.xml @@ -43,7 +43,7 @@ along with this program. If not, see 'electronics'. //--> - + sound_processor diff --git a/application/ship-simu/templates/game/electronic/television.xml b/application/ship-simu/templates/game/electronic/television.xml index 1c73803..44da2f1 100644 --- a/application/ship-simu/templates/game/electronic/television.xml +++ b/application/ship-simu/templates/game/electronic/television.xml @@ -43,7 +43,7 @@ along with this program. If not, see 'electronics'. //--> - + video_receiving diff --git a/application/ship-simu/templates/game/engine/base_engine.xml b/application/ship-simu/templates/game/engine/base_engine.xml index 4708591..675d90f 100644 --- a/application/ship-simu/templates/game/engine/base_engine.xml +++ b/application/ship-simu/templates/game/engine/base_engine.xml @@ -46,7 +46,7 @@ along with this program. If not, see - + {[?technology_id?} diff --git a/application/ship-simu/templates/game/farmer/base_farmer.xml b/application/ship-simu/templates/game/farmer/base_farmer.xml index 8388afb..6542df2 100644 --- a/application/ship-simu/templates/game/farmer/base_farmer.xml +++ b/application/ship-simu/templates/game/farmer/base_farmer.xml @@ -40,7 +40,7 @@ along with this program. If not, see {?experience?} - + {?produce_id?} @@ -48,7 +48,7 @@ along with this program. If not, see {?produce_type?} - + {?technology_id?} diff --git a/application/ship-simu/templates/game/merchant/base_merchant.xml b/application/ship-simu/templates/game/merchant/base_merchant.xml index a4a7c85..22d4c78 100644 --- a/application/ship-simu/templates/game/merchant/base_merchant.xml +++ b/application/ship-simu/templates/game/merchant/base_merchant.xml @@ -44,7 +44,7 @@ along with this program. If not, see - + {?goods_id?} diff --git a/application/ship-simu/templates/game/mineral/base_mineral.xml b/application/ship-simu/templates/game/mineral/base_mineral.xml index 1084926..64847ff 100644 --- a/application/ship-simu/templates/game/mineral/base_mineral.xml +++ b/application/ship-simu/templates/game/mineral/base_mineral.xml @@ -40,7 +40,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 e2b96c1..3c4d185 100644 --- a/application/ship-simu/templates/game/research/base_research.xml +++ b/application/ship-simu/templates/game/research/base_research.xml @@ -34,11 +34,11 @@ along with this program. If not, see - + - + @@ -54,7 +54,7 @@ along with this program. If not, see - + @@ -77,7 +77,7 @@ along with this program. If not, see 'dependency types'. We are doing this this way to keep this XML simple but still flexible enougth to fit all proposal needs. //--> - + {?level_technology_id?} {?level_technology_name?} @@ -85,7 +85,7 @@ along with this program. If not, see {?level_technology_level?} - + {?level_research_id?} {?level_research_name?} @@ -93,7 +93,7 @@ along with this program. If not, see {?level_research_level?} - + {?level_building_id?} {?level_building_name?} @@ -105,7 +105,7 @@ along with this program. If not, see - + {?technology_id?} {?technology_name?} @@ -113,7 +113,7 @@ along with this program. If not, see {?technology_level?} - + {?research_id?} {?research_name?} @@ -121,7 +121,7 @@ along with this program. If not, see {?research_level?} - + {?building_id?} {?building_name?} diff --git a/application/ship-simu/templates/game/research/electronics.xml b/application/ship-simu/templates/game/research/electronics.xml index 96fafc4..c2a1f6e 100644 --- a/application/ship-simu/templates/game/research/electronics.xml +++ b/application/ship-simu/templates/game/research/electronics.xml @@ -29,14 +29,14 @@ along with this program. If not, see 20 - + plastics chemicals 2 - + electricity {?research_type?} diff --git a/application/ship-simu/templates/game/research/radio_receiving.xml b/application/ship-simu/templates/game/research/radio_receiving.xml index 5d95701..3428478 100644 --- a/application/ship-simu/templates/game/research/radio_receiving.xml +++ b/application/ship-simu/templates/game/research/radio_receiving.xml @@ -30,7 +30,7 @@ along with this program. If not, see - + signal_modulation diff --git a/application/ship-simu/templates/game/research/statics.xml b/application/ship-simu/templates/game/research/statics.xml index 44146e5..302412e 100644 --- a/application/ship-simu/templates/game/research/statics.xml +++ b/application/ship-simu/templates/game/research/statics.xml @@ -29,21 +29,21 @@ along with this program. If not, see 20 - + {?technology_name?} {?technology_type?} {?technology_level?} - + mathematics {?research_type?} 4 - + {?building_name?} {?building_type?} diff --git a/application/ship-simu/templates/game/resource/base_resource.xml b/application/ship-simu/templates/game/resource/base_resource.xml index d6b160c..8860210 100644 --- a/application/ship-simu/templates/game/resource/base_resource.xml +++ b/application/ship-simu/templates/game/resource/base_resource.xml @@ -40,7 +40,7 @@ along with this program. If not, see - + {?technology_id?} diff --git a/application/ship-simu/templates/game/tank/base_tank.xml b/application/ship-simu/templates/game/tank/base_tank.xml index dc331f2..c943576 100644 --- a/application/ship-simu/templates/game/tank/base_tank.xml +++ b/application/ship-simu/templates/game/tank/base_tank.xml @@ -33,7 +33,7 @@ along with this program. If not, see {?content_type?} - + {?technology_id?} {?technology_name?} diff --git a/application/ship-simu/templates/game/technology/architecture.xml b/application/ship-simu/templates/game/technology/architecture.xml index c6c521e..6547cc5 100644 --- a/application/ship-simu/templates/game/technology/architecture.xml +++ b/application/ship-simu/templates/game/technology/architecture.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals. //--> - + drawings @@ -41,7 +41,7 @@ along with this program. If not, see - + statics {?research_type?} diff --git a/application/ship-simu/templates/game/technology/cellular_network.xml b/application/ship-simu/templates/game/technology/cellular_network.xml index 0e34905..77f4a82 100644 --- a/application/ship-simu/templates/game/technology/cellular_network.xml +++ b/application/ship-simu/templates/game/technology/cellular_network.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + @@ -40,7 +40,7 @@ along with this program. If not, see - + diff --git a/application/ship-simu/templates/game/technology/glass_making.xml b/application/ship-simu/templates/game/technology/glass_making.xml index 5050fab..7679857 100644 --- a/application/ship-simu/templates/game/technology/glass_making.xml +++ b/application/ship-simu/templates/game/technology/glass_making.xml @@ -28,7 +28,7 @@ along with this program. If not, see production - + @@ -44,9 +44,9 @@ along with this program. If not, see {?technology_level_type?} {?technology_level_level?} - + - + {?research_level_name?} @@ -61,7 +61,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + {?technology_name?} @@ -70,7 +70,7 @@ along with this program. If not, see - + {?research_name?} diff --git a/application/ship-simu/templates/game/technology/household_devices.xml b/application/ship-simu/templates/game/technology/household_devices.xml index 0e21326..e19e14f 100644 --- a/application/ship-simu/templates/game/technology/household_devices.xml +++ b/application/ship-simu/templates/game/technology/household_devices.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + plastics chemicals @@ -39,7 +39,7 @@ along with this program. If not, see - + electronics diff --git a/application/ship-simu/templates/game/technology/intergrated_currents.xml b/application/ship-simu/templates/game/technology/intergrated_currents.xml index 1e5471a..bdfebce 100644 --- a/application/ship-simu/templates/game/technology/intergrated_currents.xml +++ b/application/ship-simu/templates/game/technology/intergrated_currents.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + transistor @@ -40,7 +40,7 @@ along with this program. If not, see - + silicium_mining diff --git a/application/ship-simu/templates/game/technology/laboratory_equipment.xml b/application/ship-simu/templates/game/technology/laboratory_equipment.xml index 05bf5a1..1b40430 100644 --- a/application/ship-simu/templates/game/technology/laboratory_equipment.xml +++ b/application/ship-simu/templates/game/technology/laboratory_equipment.xml @@ -30,7 +30,7 @@ along with this program. If not, see - + plastics chemicals diff --git a/application/ship-simu/templates/game/technology/naval_architecture.xml b/application/ship-simu/templates/game/technology/naval_architecture.xml index 4cc6656..5a00d72 100644 --- a/application/ship-simu/templates/game/technology/naval_architecture.xml +++ b/application/ship-simu/templates/game/technology/naval_architecture.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals. //--> - + architecture {?technology_type?} @@ -49,7 +49,7 @@ along with this program. If not, see - + mathematics {?research_type?} diff --git a/application/ship-simu/templates/game/technology/plastics.xml b/application/ship-simu/templates/game/technology/plastics.xml index b5b9048..94f2720 100644 --- a/application/ship-simu/templates/game/technology/plastics.xml +++ b/application/ship-simu/templates/game/technology/plastics.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + @@ -41,7 +41,7 @@ along with this program. If not, see - + chemistry diff --git a/application/ship-simu/templates/game/technology/signal_amplifying.xml b/application/ship-simu/templates/game/technology/signal_amplifying.xml index e553156..5cc9e01 100644 --- a/application/ship-simu/templates/game/technology/signal_amplifying.xml +++ b/application/ship-simu/templates/game/technology/signal_amplifying.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + transistor @@ -40,7 +40,7 @@ along with this program. If not, see - + modulation diff --git a/application/ship-simu/templates/game/technology/signal_modulation.xml b/application/ship-simu/templates/game/technology/signal_modulation.xml index df1acde..186a569 100644 --- a/application/ship-simu/templates/game/technology/signal_modulation.xml +++ b/application/ship-simu/templates/game/technology/signal_modulation.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + transistor @@ -40,7 +40,7 @@ along with this program. If not, see - + modulation diff --git a/application/ship-simu/templates/game/technology/sound_equalizer.xml b/application/ship-simu/templates/game/technology/sound_equalizer.xml index d434381..8d10f58 100644 --- a/application/ship-simu/templates/game/technology/sound_equalizer.xml +++ b/application/ship-simu/templates/game/technology/sound_equalizer.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + transistor @@ -41,7 +41,7 @@ along with this program. If not, see - + {?research_name?} diff --git a/application/ship-simu/templates/game/technology/sound_processor.xml b/application/ship-simu/templates/game/technology/sound_processor.xml index 4adc30b..d223b4f 100644 --- a/application/ship-simu/templates/game/technology/sound_processor.xml +++ b/application/ship-simu/templates/game/technology/sound_processor.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + intergrated_current @@ -46,7 +46,7 @@ along with this program. If not, see - + {?research_name?} diff --git a/application/ship-simu/templates/game/technology/surround_mixing.xml b/application/ship-simu/templates/game/technology/surround_mixing.xml index baa8ea2..9c674de 100644 --- a/application/ship-simu/templates/game/technology/surround_mixing.xml +++ b/application/ship-simu/templates/game/technology/surround_mixing.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + intergrated_current @@ -41,7 +41,7 @@ along with this program. If not, see - + {?research_name?} diff --git a/application/ship-simu/templates/game/technology/transistor.xml b/application/ship-simu/templates/game/technology/transistor.xml index 6f32091..f41d448 100644 --- a/application/ship-simu/templates/game/technology/transistor.xml +++ b/application/ship-simu/templates/game/technology/transistor.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + semiconductor @@ -45,7 +45,7 @@ along with this program. If not, see - + diff --git a/application/ship-simu/templates/game/technology/video_receiving.xml b/application/ship-simu/templates/game/technology/video_receiving.xml index c640d1f..353d40a 100644 --- a/application/ship-simu/templates/game/technology/video_receiving.xml +++ b/application/ship-simu/templates/game/technology/video_receiving.xml @@ -31,7 +31,7 @@ along with this program. If not, see proposals to gain the first level of this technology. //--> - + signal_amplifying diff --git a/application/ship-simu/templates/game/types/building_types.xml b/application/ship-simu/templates/game/types/building_types.xml index dcd9d57..58da39a 100644 --- a/application/ship-simu/templates/game/types/building_types.xml +++ b/application/ship-simu/templates/game/types/building_types.xml @@ -21,7 +21,7 @@ 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/game/types/container_types.xml b/application/ship-simu/templates/game/types/container_types.xml index 977c60e..46a0c35 100644 --- a/application/ship-simu/templates/game/types/container_types.xml +++ b/application/ship-simu/templates/game/types/container_types.xml @@ -21,7 +21,7 @@ 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/game/types/content_types.xml b/application/ship-simu/templates/game/types/content_types.xml index 3b50c1b..f2853a6 100644 --- a/application/ship-simu/templates/game/types/content_types.xml +++ b/application/ship-simu/templates/game/types/content_types.xml @@ -21,7 +21,7 @@ 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/game/types/contract_types.xml b/application/ship-simu/templates/game/types/contract_types.xml index 2cb1f0c..1e1ce09 100644 --- a/application/ship-simu/templates/game/types/contract_types.xml +++ b/application/ship-simu/templates/game/types/contract_types.xml @@ -21,11 +21,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/game/types/electronic_types.xml b/application/ship-simu/templates/game/types/electronic_types.xml index dcbc208..a5248dd 100644 --- a/application/ship-simu/templates/game/types/electronic_types.xml +++ b/application/ship-simu/templates/game/types/electronic_types.xml @@ -22,7 +22,7 @@ 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/game/types/engine_types.xml b/application/ship-simu/templates/game/types/engine_types.xml index a1dca75..ea42838 100644 --- a/application/ship-simu/templates/game/types/engine_types.xml +++ b/application/ship-simu/templates/game/types/engine_types.xml @@ -21,7 +21,7 @@ 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/game/types/farmer_types.xml b/application/ship-simu/templates/game/types/farmer_types.xml index efd95cd..a11f5cc 100644 --- a/application/ship-simu/templates/game/types/farmer_types.xml +++ b/application/ship-simu/templates/game/types/farmer_types.xml @@ -22,5 +22,5 @@ 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/game/types/fuel_types.xml b/application/ship-simu/templates/game/types/fuel_types.xml index 21d2357..00399a4 100644 --- a/application/ship-simu/templates/game/types/fuel_types.xml +++ b/application/ship-simu/templates/game/types/fuel_types.xml @@ -21,7 +21,7 @@ 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/game/types/merchant_types.xml b/application/ship-simu/templates/game/types/merchant_types.xml index 5edaf57..878359f 100644 --- a/application/ship-simu/templates/game/types/merchant_types.xml +++ b/application/ship-simu/templates/game/types/merchant_types.xml @@ -22,5 +22,5 @@ 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/game/types/owner_occupants.xml b/application/ship-simu/templates/game/types/owner_occupants.xml index 8eeaf12..e72ceea 100644 --- a/application/ship-simu/templates/game/types/owner_occupants.xml +++ b/application/ship-simu/templates/game/types/owner_occupants.xml @@ -22,5 +22,5 @@ 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/game/types/product_types.xml b/application/ship-simu/templates/game/types/product_types.xml index 4cba48f..8c82ddc 100644 --- a/application/ship-simu/templates/game/types/product_types.xml +++ b/application/ship-simu/templates/game/types/product_types.xml @@ -22,5 +22,5 @@ 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/game/types/research_types.xml b/application/ship-simu/templates/game/types/research_types.xml index f3a6b47..0fc7280 100644 --- a/application/ship-simu/templates/game/types/research_types.xml +++ b/application/ship-simu/templates/game/types/research_types.xml @@ -22,7 +22,7 @@ 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/game/types/tank_types.xml b/application/ship-simu/templates/game/types/tank_types.xml index d0711e0..2aa4d22 100644 --- a/application/ship-simu/templates/game/types/tank_types.xml +++ b/application/ship-simu/templates/game/types/tank_types.xml @@ -22,5 +22,5 @@ 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/game/types/technology_types.xml b/application/ship-simu/templates/game/types/technology_types.xml index 4666d86..b139d89 100644 --- a/application/ship-simu/templates/game/types/technology_types.xml +++ b/application/ship-simu/templates/game/types/technology_types.xml @@ -22,7 +22,7 @@ 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/docs/TODOs.txt b/docs/TODOs.txt index c56e725..0f567fe 100644 --- a/docs/TODOs.txt +++ b/docs/TODOs.txt @@ -79,15 +79,16 @@ ./inc/classes/exceptions/main/class_MissingMethodException.php:13: * @todo Try to rewrite user/guest login classes and mark this exception as deprecated ./inc/classes/exceptions/main/class_NoConfigEntryException.php:10: * @todo Rename this class to NoFoundEntryException ./inc/classes/interfaces/class_FrameworkInterface.php:11: * @todo Find a better name for this interface -./inc/classes/main/class_BaseFrameworkSystem.php:1131: * @todo Write a logging mechanism for productive mode -./inc/classes/main/class_BaseFrameworkSystem.php:1145: // @TODO Finish this part! +./inc/classes/main/class_BaseFrameworkSystem.php:1133: * @todo Write a logging mechanism for productive mode +./inc/classes/main/class_BaseFrameworkSystem.php:1147: // @TODO Finish this part! ./inc/classes/main/class_BaseFrameworkSystem.php:154: // @todo Try to clean these constants up -./inc/classes/main/class_BaseFrameworkSystem.php:235: * @todo This is old code. Do we still need this old lost code? -./inc/classes/main/class_BaseFrameworkSystem.php:303: * @todo SearchableResult and UpdateableResult shall have a super interface to use here +./inc/classes/main/class_BaseFrameworkSystem.php:233: * @todo This is old code. Do we still need this old lost code? +./inc/classes/main/class_BaseFrameworkSystem.php:301: * @todo SearchableResult and UpdateableResult shall have a super interface to use here ./inc/classes/main/commands/web/class_WebLoginAreaCommand.php:64: * @todo Add some stuff here: Some personal data, app/game related data ./inc/classes/main/commands/web/class_WebProblemCommand.php:58: * @todo 0% done ./inc/classes/main/commands/web/class_WebStatusCommand.php:58: * @todo 0% done ./inc/classes/main/console/class_ConsoleTools.php:147: * @todo This should be moved out to an external class, e.g. HttpClient +./inc/classes/main/console/class_ConsoleTools.php:154: // @TODO Add some DNS caching here ./inc/classes/main/console/class_ConsoleTools.php:45: * @todo We should connect this to a caching class to cache DNS requests ./inc/classes/main/console/class_ConsoleTools.php:58: // @TODO Here should the cacher be implemented ./inc/classes/main/controller/console/class_ConsoleDefaultController.php:10: * @todo This controller shall still provide some headlines for sidebars @@ -102,7 +103,7 @@ ./inc/classes/main/controller/web/class_WebStatusController.php:10: * @todo This controller shall still provide some headlines for sidebars ./inc/classes/main/criteria/search/class_SearchCriteria.php:114: * @todo Find a nice casting here. (int) allows until and including 32766. ./inc/classes/main/criteria/search/class_SearchCriteria.php:94: * @todo Find a nice casting here. (int) allows until and including 32766. -./inc/classes/main/database/databases/class_LocalFileDatabase.php:363: * @todo Do some checks on the database directory and files here +./inc/classes/main/database/databases/class_LocalFileDatabase.php:360: * @todo Do some checks on the database directory and files here ./inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php:426: * @todo Find something useful with this! ./inc/classes/main/discovery/payment/class_LocalPaymentDiscovery.php:82: * @todo 0% done ./inc/classes/main/filter/change/class_EmailChangeFilter.php:54: * @todo Implement email change of the user here. HINT: Use the User class! @@ -150,22 +151,24 @@ ./inc/classes/main/result/class_DatabaseResult.php:379:4 * @todo Find a caching way without modifying the result array ./inc/classes/main/rng/class_RandomNumberGenerator.php:150: * @todo I had a better random number generator here but now it is somewhere lost :( ./inc/classes/main/rng/class_RandomNumberGenerator.php:83: * @todo Add site key for stronger salt! -./inc/classes/main/template/class_BaseTemplateEngine.php:1049: // @TODO This silent abort should be logged, maybe. -./inc/classes/main/template/class_BaseTemplateEngine.php:1057: // @TODO Old behaviour, will become obsolete! -./inc/classes/main/template/class_BaseTemplateEngine.php:1060: // @TODO Yet another old way -./inc/classes/main/template/class_BaseTemplateEngine.php:1126: // @TODO This silent abort should be logged, maybe. -./inc/classes/main/template/class_BaseTemplateEngine.php:1147: * @todo Make this code some nicer... -./inc/classes/main/template/class_BaseTemplateEngine.php:955: * @todo Unfinished work or don't die here. -./inc/classes/main/template/class_BaseTemplateEngine.php:972: // @TODO Non-string found so we need some deeper analysis... +./inc/classes/main/template/class_BaseTemplateEngine.php:1055: // @TODO This silent abort should be logged, maybe. +./inc/classes/main/template/class_BaseTemplateEngine.php:1063: // @TODO Old behaviour, will become obsolete! +./inc/classes/main/template/class_BaseTemplateEngine.php:1066: // @TODO Yet another old way +./inc/classes/main/template/class_BaseTemplateEngine.php:1132: // @TODO This silent abort should be logged, maybe. +./inc/classes/main/template/class_BaseTemplateEngine.php:1153: * @todo Make this code some nicer... +./inc/classes/main/template/class_BaseTemplateEngine.php:961: * @todo Unfinished work or don't die here. +./inc/classes/main/template/class_BaseTemplateEngine.php:978: // @TODO Non-string found so we need some deeper analysis... ./inc/classes/main/template/console/class_ConsoleTemplateEngine.php:10: * @todo This template engine does not make use of setTemplateType() -./inc/classes/main/template/image/class_ImageTemplateEngine.php:221: * @todo Find something usefull with this! -./inc/classes/main/template/image/class_ImageTemplateEngine.php:241: * @todo Add cache creation here +./inc/classes/main/template/image/class_ImageTemplateEngine.php:215: * @todo Find something usefull with this! +./inc/classes/main/template/image/class_ImageTemplateEngine.php:235: * @todo Add cache creation here ./inc/classes/main/template/mail/class_MailTemplateEngine.php:10: * @todo This template engine does not make use of setTemplateType() -./inc/classes/main/template/mail/class_MailTemplateEngine.php:234: * @todo Add cache creation here -./inc/classes/main/template/mail/class_MailTemplateEngine.php:244: * @todo Should we call back the mailer class here? -./inc/classes/main/template/mail/class_MailTemplateEngine.php:325: * @todo 0% done -./inc/classes/main/template/menu/class_MenuTemplateEngine.php:273: * @todo Find something useful with this! -./inc/classes/main/template/menu/class_MenuTemplateEngine.php:319: * @todo Add cache creation here +./inc/classes/main/template/mail/class_MailTemplateEngine.php:228: * @todo Add cache creation here +./inc/classes/main/template/mail/class_MailTemplateEngine.php:238: * @todo Should we call back the mailer class here? +./inc/classes/main/template/mail/class_MailTemplateEngine.php:319: * @todo 0% done +./inc/classes/main/template/menu/class_MenuTemplateEngine.php:267: * @todo Find something useful with this! +./inc/classes/main/template/menu/class_MenuTemplateEngine.php:313: * @todo Add cache creation here +./inc/classes/main/template/menu/class_MenuTemplateEngine.php:331: * @todo Handle $entryCount +./inc/classes/main/template/menu/class_MenuTemplateEngine.php:363: * @todo Handle $blockCount ./inc/classes/main/user/class_BaseUser.php:308: * @todo Try to make this method more generic so we can move it in BaseFrameworkSystem ./inc/classes/main/user/class_BaseUser.php:80: * @todo Find a way of casting here. "(int)" might destroy the user id > 32766 ./inc/classes/main/user/member/class_Member.php:84: * @todo Add more ways over creating user classes @@ -174,14 +177,11 @@ ./inc/config/class_FrameworkConfiguration.php:172: * @todo We have to add some more entries from $_SERVER here ./inc/database.php:11: * @todo We should minimize these includes ./inc/database.php:51:// @TODO Rewrite this -./inc/file_io.php:13: * @todo We should minimize these includes ./inc/hooks.php:11: * @todo We should minimize these includes ./inc/hooks.php:28:// @TODO This makes the core depending on the SPL. But it should be installed anyway. ./inc/includes.php:11: * @todo We should minimize these includes ./inc/includes.php:38:// @TODO Find a nicer OOP-ed way for this -./inc/language.php:10: * @todo We should minimize these includes -./inc/language.php:33:// @TODO Rewrite this -./inc/loader/class_ClassLoader.php:262: /* @todo: Do not die here. */ +./inc/loader/class_ClassLoader.php:264: /* @todo: Do not die here. */ ./inc/output.php:11: * @todo We should minimize these includes ./inc/selector.php:11: * @todo We should minimize these includes ./index.php:59: * @todo This method is old code and needs heavy rewrite @@ -231,13 +231,15 @@ ./inc/classes/exceptions/io/class_FileNotFoundException.php:2:// @DEPRECATED ./inc/classes/exceptions/io/class_FilePointerNotOpenedException.php:2:// @DEPRECATED ./inc/classes/exceptions/io/class_InvalidDirectoryResourceException.php:2:// @DEPRECATED +./inc/classes/exceptions/language/class_MissingFileIoHandlerException.php:2:// @DEPRECATED +./inc/classes/exceptions/language/class_MissingLanguageHandlerException.php:2:// @DEPRECATED ./inc/classes/exceptions/main/class_ClassNotFoundException.php:2:// @DEPRECATED ./inc/classes/exceptions/main/class_ConfigEntryNotFoundException.php:2:// @DEPRECATED ./inc/classes.php:9: * @deprecated ./inc/database.php:10: * @deprecated -./inc/file_io.php:12: * @deprecated +./inc/file_io.php:2:// @DEPRECATED ./inc/hooks.php:10: * @deprecated ./inc/includes.php:10: * @deprecated -./inc/language.php:9: * @deprecated +./inc/language.php:2:// @DEPRECATED ./inc/output.php:10: * @deprecated ./inc/selector.php:10: * @deprecated -- 2.30.2