From bce995bdaef13c80136d481d8c42975e7a08083c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 23 Sep 2009 23:23:47 +0000 Subject: [PATCH] Attributes converted, more technology/research added: - A lot XMLs rewritten from attributes to nodes - Technologies added: plastics, laborary equipment, statics, drawings, glass making, many are not finished or maybe should be converted to research? - Chemicals prepared (used e.g. for plastics) --- .gitattributes | 8 ++ .../ship-simu/templates/de/game/!MISSING | 4 +- .../de/game/building/base_building.xml | 4 +- .../de/game/building/research_lab.xml | 8 +- .../templates/de/game/chemicals/.htaccess | 1 + .../de/game/container/base_container.xml | 4 +- .../de/game/mineral/base_mineral.xml | 2 +- .../de/game/research/base_research.xml | 6 +- .../de/game/research/mathematics.xml | 31 ++++++++ .../de/game/resource/base_resource.xml | 7 +- .../de/game/technology/architecture.xml | 24 +++--- .../de/game/technology/base_technology.xml | 36 +++++++-- .../templates/de/game/technology/drawings.xml | 30 +++++++ .../de/game/technology/glass_making.xml | 78 +++++++++++++++++++ .../game/technology/laboratory_equipment.xml | 44 +++++++++++ .../templates/de/game/technology/plastics.xml | 77 ++++++++++++++++++ .../templates/de/game/technology/statics.xml | 41 ++++++++++ .../de/game/types/research_types.xml | 28 +++++++ .../de/game/types/technology_types.xml | 12 ++- 19 files changed, 414 insertions(+), 31 deletions(-) create mode 100644 application/ship-simu/templates/de/game/chemicals/.htaccess create mode 100644 application/ship-simu/templates/de/game/research/mathematics.xml create mode 100644 application/ship-simu/templates/de/game/technology/drawings.xml create mode 100644 application/ship-simu/templates/de/game/technology/glass_making.xml create mode 100644 application/ship-simu/templates/de/game/technology/laboratory_equipment.xml create mode 100644 application/ship-simu/templates/de/game/technology/plastics.xml create mode 100644 application/ship-simu/templates/de/game/technology/statics.xml create mode 100644 application/ship-simu/templates/de/game/types/research_types.xml diff --git a/.gitattributes b/.gitattributes index ec0ee66..ac05578 100644 --- a/.gitattributes +++ b/.gitattributes @@ -278,6 +278,7 @@ application/ship-simu/templates/de/game/.htaccess -text application/ship-simu/templates/de/game/building/.htaccess -text application/ship-simu/templates/de/game/building/base_building.xml -text application/ship-simu/templates/de/game/building/research_lab.xml -text +application/ship-simu/templates/de/game/chemicals/.htaccess -text application/ship-simu/templates/de/game/company/.htaccess -text application/ship-simu/templates/de/game/container/.htaccess -text application/ship-simu/templates/de/game/container/base_container.xml -text @@ -291,6 +292,7 @@ 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/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/resource/.htaccess -text application/ship-simu/templates/de/game/resource/base_resource.xml -text application/ship-simu/templates/de/game/ship/.htaccess -text @@ -298,6 +300,11 @@ application/ship-simu/templates/de/game/ship/base_ship.xml -text application/ship-simu/templates/de/game/technology/.htaccess -text application/ship-simu/templates/de/game/technology/architecture.xml -text application/ship-simu/templates/de/game/technology/base_technology.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/laboratory_equipment.xml -text +application/ship-simu/templates/de/game/technology/plastics.xml -text +application/ship-simu/templates/de/game/technology/statics.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 @@ -306,6 +313,7 @@ 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/merchant_types.xml -text application/ship-simu/templates/de/game/types/owner_occupants.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 application/ship-simu/templates/de/game/types/technology_types.xml -text diff --git a/application/ship-simu/templates/de/game/!MISSING b/application/ship-simu/templates/de/game/!MISSING index 888fc41..57cf1de 100644 --- a/application/ship-simu/templates/de/game/!MISSING +++ b/application/ship-simu/templates/de/game/!MISSING @@ -1,2 +1,2 @@ - - + + diff --git a/application/ship-simu/templates/de/game/building/base_building.xml b/application/ship-simu/templates/de/game/building/base_building.xml index ce4331c..7a8fb0d 100644 --- a/application/ship-simu/templates/de/game/building/base_building.xml +++ b/application/ship-simu/templates/de/game/building/base_building.xml @@ -147,7 +147,7 @@ along with this program. If not, see - + @@ -157,5 +157,5 @@ along with this program. If not, see {?technology_level?} - + diff --git a/application/ship-simu/templates/de/game/building/research_lab.xml b/application/ship-simu/templates/de/game/building/research_lab.xml index 1aee0d3..e54b77c 100644 --- a/application/ship-simu/templates/de/game/building/research_lab.xml +++ b/application/ship-simu/templates/de/game/building/research_lab.xml @@ -1,6 +1,6 @@ - + @@ -43,9 +43,9 @@ along with this program. If not, see - labory_equpment + laboratory_equipment 1 - + diff --git a/application/ship-simu/templates/de/game/chemicals/.htaccess b/application/ship-simu/templates/de/game/chemicals/.htaccess new file mode 100644 index 0000000..3a42882 --- /dev/null +++ b/application/ship-simu/templates/de/game/chemicals/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/application/ship-simu/templates/de/game/container/base_container.xml b/application/ship-simu/templates/de/game/container/base_container.xml index c91f20a..fc9c7f4 100644 --- a/application/ship-simu/templates/de/game/container/base_container.xml +++ b/application/ship-simu/templates/de/game/container/base_container.xml @@ -22,10 +22,12 @@ 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/de/game/mineral/base_mineral.xml b/application/ship-simu/templates/de/game/mineral/base_mineral.xml index 19e3464..e114e4b 100644 --- a/application/ship-simu/templates/de/game/mineral/base_mineral.xml +++ b/application/ship-simu/templates/de/game/mineral/base_mineral.xml @@ -3,7 +3,7 @@ A general mineral template. Some mineral requires technology in a specific level to get mined by the user. For example crystals needs drilling machines and undergroup drilling vehicles. These are all represented as 'technologies' so -a mineral may have depencies on technologies. :-) +a mineral may have dependencies on technologies. :-) @author Roland Haeder @version 0.0.0 diff --git a/application/ship-simu/templates/de/game/research/base_research.xml b/application/ship-simu/templates/de/game/research/base_research.xml index ee1ac56..c067967 100644 --- a/application/ship-simu/templates/de/game/research/base_research.xml +++ b/application/ship-simu/templates/de/game/research/base_research.xml @@ -28,7 +28,9 @@ along with this program. If not, see {?id?} + {?name?} {?type?} + {?max_level?} @@ -54,8 +56,8 @@ along with this program. If not, see + It also can have dependencies which makes it possible to add different + dependencies for higher research levels. //--> {?level?} diff --git a/application/ship-simu/templates/de/game/research/mathematics.xml b/application/ship-simu/templates/de/game/research/mathematics.xml new file mode 100644 index 0000000..843c44e --- /dev/null +++ b/application/ship-simu/templates/de/game/research/mathematics.xml @@ -0,0 +1,31 @@ + + + + + + mathematics + base + 10 + + diff --git a/application/ship-simu/templates/de/game/resource/base_resource.xml b/application/ship-simu/templates/de/game/resource/base_resource.xml index 3f87795..2b5ba5d 100644 --- a/application/ship-simu/templates/de/game/resource/base_resource.xml +++ b/application/ship-simu/templates/de/game/resource/base_resource.xml @@ -27,6 +27,7 @@ along with this program. If not, see {?id?} + {?name?} {?type?} @@ -41,6 +42,10 @@ along with this program. If not, see required. Here you can list each technology with its required level. //--> - + + {?technology_id?} + {?technology_name?} + {?technology_level?} + diff --git a/application/ship-simu/templates/de/game/technology/architecture.xml b/application/ship-simu/templates/de/game/technology/architecture.xml index 9d4dfe6..2c075fd 100644 --- a/application/ship-simu/templates/de/game/technology/architecture.xml +++ b/application/ship-simu/templates/de/game/technology/architecture.xml @@ -25,26 +25,28 @@ along with this program. If not, see architecture - building + construction - - + + - - {?technology_name?} - {?technology_level?} + statics + 3 + + + drawings + 5 - + - - {?research_name?} - {?research_level?} + mathematics + 6 - + diff --git a/application/ship-simu/templates/de/game/technology/base_technology.xml b/application/ship-simu/templates/de/game/technology/base_technology.xml index a93ff5c..6e2ae92 100644 --- a/application/ship-simu/templates/de/game/technology/base_technology.xml +++ b/application/ship-simu/templates/de/game/technology/base_technology.xml @@ -42,7 +42,9 @@ along with this program. If not, see - + + {?list_level?} + {?level_gained?} @@ -51,12 +53,34 @@ along with this program. If not, see + + + + + + + {?technology_level_id?} + {?technology_level_name?} + {?technology_level_level?} + + + + + + + {?research_level_id?} + {?research_level_name?} + {?research_level_level?} + + + - - + proposals to gain the first level of this technology. //--> + + @@ -65,7 +89,7 @@ along with this program. If not, see {?technology_level?} - + @@ -74,5 +98,5 @@ along with this program. If not, see {?research_level?} - + diff --git a/application/ship-simu/templates/de/game/technology/drawings.xml b/application/ship-simu/templates/de/game/technology/drawings.xml new file mode 100644 index 0000000..ef38631 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/drawings.xml @@ -0,0 +1,30 @@ + + + + + + drawings + base + + diff --git a/application/ship-simu/templates/de/game/technology/glass_making.xml b/application/ship-simu/templates/de/game/technology/glass_making.xml new file mode 100644 index 0000000..85d63d5 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/glass_making.xml @@ -0,0 +1,78 @@ + + + + + + glass_making + production + + + + + + {?list_level?} + + + + + + + {?technology_level_name?} + {?technology_level_level?} + + + + + + + {?research_level_name?} + {?research_level_level?} + + + + + + + + + + + + {?technology_name?} + {?technology_level?} + + + + + + + {?research_name?} + {?research_level?} + + + + diff --git a/application/ship-simu/templates/de/game/technology/laboratory_equipment.xml b/application/ship-simu/templates/de/game/technology/laboratory_equipment.xml new file mode 100644 index 0000000..98c1fb4 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/laboratory_equipment.xml @@ -0,0 +1,44 @@ + + + + + + laboratory_equipment + equipment + + + + + + plastics + 3 + + + glass_making + 5 + + + + diff --git a/application/ship-simu/templates/de/game/technology/plastics.xml b/application/ship-simu/templates/de/game/technology/plastics.xml new file mode 100644 index 0000000..5556915 --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/plastics.xml @@ -0,0 +1,77 @@ + + + + + + plastics + production + + + + + + {?list_level?} + + + + + + + {?technology_level_name?} + {?technology_level_level?} + + + + + + + {?research_level_name?} + {?research_level_level?} + + + + + + + + + + + {?technology_name?} + chemicals + + + + + + + {?research_name?} + {?research_level?} + + + + diff --git a/application/ship-simu/templates/de/game/technology/statics.xml b/application/ship-simu/templates/de/game/technology/statics.xml new file mode 100644 index 0000000..2a0148e --- /dev/null +++ b/application/ship-simu/templates/de/game/technology/statics.xml @@ -0,0 +1,41 @@ + + + + + + statics + construction + + + + + + + mathematics + 4 + + + + diff --git a/application/ship-simu/templates/de/game/types/research_types.xml b/application/ship-simu/templates/de/game/types/research_types.xml new file mode 100644 index 0000000..7f7c247 --- /dev/null +++ b/application/ship-simu/templates/de/game/types/research_types.xml @@ -0,0 +1,28 @@ + + + + + + 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 d07d2ab..68bf5f8 100644 --- a/application/ship-simu/templates/de/game/types/technology_types.xml +++ b/application/ship-simu/templates/de/game/types/technology_types.xml @@ -23,6 +23,16 @@ You should have received a copy of the GNU General Public License along with this program. If not, see //--> - + + + + + + + + + + + -- 2.39.5