From ce1d7e3c75e41ede082aa2422a85ec6c98895076 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Fri, 26 Feb 2010 06:09:27 +0000 Subject: [PATCH] moving E3-related files fixing config-e3a --- src/eressea/res/buildings.xml | 4 - src/eressea/res/config-e3a.xml | 3 +- src/eressea/res/config-eressea.xml | 15 +- src/eressea/res/dungeons.xml | 16 - src/eressea/res/e3a/items.xml | 3 +- src/eressea/res/e3a/resources.xml | 16 +- .../res/e3a/resources/iron.xml} | 0 src/eressea/res/e3a/resources/mallornseed.xml | 4 + src/eressea/res/e3a/resources/seed.xml | 4 + .../res/e3a/resources/stone.xml} | 0 src/eressea/res/e3a/weapons.xml | 25 +- src/eressea/res/{ => eressea}/artrewards.xml | 0 src/eressea/res/eressea/buildings.xml | 7 + src/eressea/res/{ => eressea}/equipment.xml | 0 src/eressea/res/{ => eressea}/items.xml | 0 src/eressea/res/eressea/races.xml | 1364 +++++++++++++++- src/eressea/res/{ => eressea}/spellinfo.xml | 0 src/eressea/res/{ => eressea}/spells.xml | 0 src/eressea/res/{ => eressea}/strings.xml | 0 src/eressea/res/races.xml | 1382 ----------------- src/res/common/buildings.xml | 3 - src/res/common/items.xml | 12 - src/res/common/resources.xml | 23 +- src/res/resources/hp.xml | 5 + src/res/resources/mallornseed.xml | 6 + src/res/resources/peasant.xml | 5 + src/res/resources/seed.xml | 6 + src/res/resources/stone-2.xml | 11 - 28 files changed, 1439 insertions(+), 1475 deletions(-) delete mode 100644 src/eressea/res/buildings.xml delete mode 100644 src/eressea/res/dungeons.xml rename src/{res/resources/iron-nobonus.xml => eressea/res/e3a/resources/iron.xml} (100%) create mode 100644 src/eressea/res/e3a/resources/mallornseed.xml create mode 100644 src/eressea/res/e3a/resources/seed.xml rename src/{res/resources/stone-nobonus.xml => eressea/res/e3a/resources/stone.xml} (100%) rename src/eressea/res/{ => eressea}/artrewards.xml (100%) create mode 100644 src/eressea/res/eressea/buildings.xml rename src/eressea/res/{ => eressea}/equipment.xml (100%) rename src/eressea/res/{ => eressea}/items.xml (100%) rename src/eressea/res/{ => eressea}/spellinfo.xml (100%) rename src/eressea/res/{ => eressea}/spells.xml (100%) rename src/eressea/res/{ => eressea}/strings.xml (100%) delete mode 100644 src/eressea/res/races.xml create mode 100644 src/res/resources/hp.xml create mode 100644 src/res/resources/mallornseed.xml create mode 100644 src/res/resources/peasant.xml create mode 100644 src/res/resources/seed.xml delete mode 100644 src/res/resources/stone-2.xml diff --git a/src/eressea/res/buildings.xml b/src/eressea/res/buildings.xml deleted file mode 100644 index fe7063029..000000000 --- a/src/eressea/res/buildings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/eressea/res/config-e3a.xml b/src/eressea/res/config-e3a.xml index c9ebfad32..3008cd438 100644 --- a/src/eressea/res/config-e3a.xml +++ b/src/eressea/res/config-e3a.xml @@ -6,6 +6,7 @@ + @@ -174,8 +175,6 @@ - - eressea-server@eressea.de diff --git a/src/eressea/res/config-eressea.xml b/src/eressea/res/config-eressea.xml index db8aa2195..291277c6f 100644 --- a/src/eressea/res/config-eressea.xml +++ b/src/eressea/res/config-eressea.xml @@ -5,7 +5,7 @@ - + @@ -15,7 +15,6 @@ - @@ -24,14 +23,14 @@ - - + + - - - - + + + + diff --git a/src/eressea/res/dungeons.xml b/src/eressea/res/dungeons.xml deleted file mode 100644 index 6752c301b..000000000 --- a/src/eressea/res/dungeons.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/eressea/res/e3a/items.xml b/src/eressea/res/e3a/items.xml index 35f0dbe1a..706bd0d67 100644 --- a/src/eressea/res/e3a/items.xml +++ b/src/eressea/res/e3a/items.xml @@ -80,11 +80,10 @@ - + diff --git a/src/eressea/res/e3a/resources.xml b/src/eressea/res/e3a/resources.xml index df6a5468e..b9f14c32c 100644 --- a/src/eressea/res/e3a/resources.xml +++ b/src/eressea/res/e3a/resources.xml @@ -2,11 +2,15 @@ - - - - - - + + + + + + + + + + diff --git a/src/res/resources/iron-nobonus.xml b/src/eressea/res/e3a/resources/iron.xml similarity index 100% rename from src/res/resources/iron-nobonus.xml rename to src/eressea/res/e3a/resources/iron.xml diff --git a/src/eressea/res/e3a/resources/mallornseed.xml b/src/eressea/res/e3a/resources/mallornseed.xml new file mode 100644 index 000000000..4a348c212 --- /dev/null +++ b/src/eressea/res/e3a/resources/mallornseed.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/eressea/res/e3a/resources/seed.xml b/src/eressea/res/e3a/resources/seed.xml new file mode 100644 index 000000000..21652f364 --- /dev/null +++ b/src/eressea/res/e3a/resources/seed.xml @@ -0,0 +1,4 @@ + + + + diff --git a/src/res/resources/stone-nobonus.xml b/src/eressea/res/e3a/resources/stone.xml similarity index 100% rename from src/res/resources/stone-nobonus.xml rename to src/eressea/res/e3a/resources/stone.xml diff --git a/src/eressea/res/e3a/weapons.xml b/src/eressea/res/e3a/weapons.xml index b84943df3..421c60305 100644 --- a/src/eressea/res/e3a/weapons.xml +++ b/src/eressea/res/e3a/weapons.xml @@ -1,18 +1,17 @@ - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/eressea/res/artrewards.xml b/src/eressea/res/eressea/artrewards.xml similarity index 100% rename from src/eressea/res/artrewards.xml rename to src/eressea/res/eressea/artrewards.xml diff --git a/src/eressea/res/eressea/buildings.xml b/src/eressea/res/eressea/buildings.xml new file mode 100644 index 000000000..64d65cff0 --- /dev/null +++ b/src/eressea/res/eressea/buildings.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/eressea/res/equipment.xml b/src/eressea/res/eressea/equipment.xml similarity index 100% rename from src/eressea/res/equipment.xml rename to src/eressea/res/eressea/equipment.xml diff --git a/src/eressea/res/items.xml b/src/eressea/res/eressea/items.xml similarity index 100% rename from src/eressea/res/items.xml rename to src/eressea/res/eressea/items.xml diff --git a/src/eressea/res/eressea/races.xml b/src/eressea/res/eressea/races.xml index 1c5179973..c09f36e44 100644 --- a/src/eressea/res/eressea/races.xml +++ b/src/eressea/res/eressea/races.xml @@ -1,5 +1,6 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/eressea/res/spellinfo.xml b/src/eressea/res/eressea/spellinfo.xml similarity index 100% rename from src/eressea/res/spellinfo.xml rename to src/eressea/res/eressea/spellinfo.xml diff --git a/src/eressea/res/spells.xml b/src/eressea/res/eressea/spells.xml similarity index 100% rename from src/eressea/res/spells.xml rename to src/eressea/res/eressea/spells.xml diff --git a/src/eressea/res/strings.xml b/src/eressea/res/eressea/strings.xml similarity index 100% rename from src/eressea/res/strings.xml rename to src/eressea/res/eressea/strings.xml diff --git a/src/eressea/res/races.xml b/src/eressea/res/races.xml deleted file mode 100644 index 8309b6e37..000000000 --- a/src/eressea/res/races.xml +++ /dev/null @@ -1,1382 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/res/common/buildings.xml b/src/res/common/buildings.xml index a32d28e5c..5c52bfbb3 100644 --- a/src/res/common/buildings.xml +++ b/src/res/common/buildings.xml @@ -1,9 +1,6 @@ - - - diff --git a/src/res/common/items.xml b/src/res/common/items.xml index f16260e45..7c57a8184 100644 --- a/src/res/common/items.xml +++ b/src/res/common/items.xml @@ -91,18 +91,6 @@ - - - - - - - - - - - - diff --git a/src/res/common/resources.xml b/src/res/common/resources.xml index 55710abe0..bc39933e6 100644 --- a/src/res/common/resources.xml +++ b/src/res/common/resources.xml @@ -2,21 +2,14 @@ - - - - + + + - - - - - - - - - - - + + + + + diff --git a/src/res/resources/hp.xml b/src/res/resources/hp.xml new file mode 100644 index 000000000..fb1b6e32f --- /dev/null +++ b/src/res/resources/hp.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/resources/mallornseed.xml b/src/res/resources/mallornseed.xml new file mode 100644 index 000000000..1c7c1a800 --- /dev/null +++ b/src/res/resources/mallornseed.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/res/resources/peasant.xml b/src/res/resources/peasant.xml new file mode 100644 index 000000000..32e1e1ca1 --- /dev/null +++ b/src/res/resources/peasant.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/res/resources/seed.xml b/src/res/resources/seed.xml new file mode 100644 index 000000000..2193fb8c8 --- /dev/null +++ b/src/res/resources/seed.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/res/resources/stone-2.xml b/src/res/resources/stone-2.xml deleted file mode 100644 index 7983b848a..000000000 --- a/src/res/resources/stone-2.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - -