diff --git a/src/common/items/weapons.c b/src/common/items/weapons.c
index b1d4e88d8..e7a3df109 100644
--- a/src/common/items/weapons.c
+++ b/src/common/items/weapons.c
@@ -59,9 +59,7 @@ enum {
WP_LONGBOW,
WP_CROSSBOW,
WP_SPEAR,
- WP_GREATSWORD,
WP_LANCE,
- WP_RUSTY_GREATSWORD,
WP_RUSTY_HALBERD,
WP_NONE,
WP_MAX
@@ -113,19 +111,11 @@ static weapondata weapontable[WP_MAX + 1] =
/* Langbogen */
{0.00, "1d11+1", "1d11+1", I_LONGBOW, SK_LONGBOW, 0, 0, true, false, { RL_NONE, 0 }, PIERCE },
/* Armbrust */
-#if CHANGED_CROSSBOWS == 1
{0.00, "3d3+5", "3d3+5", I_CROSSBOW, SK_CROSSBOW, 0, 0, true, false, { RL_CROSSBOW, 2 }, PIERCE | ARMORPIERCING },
-#else
- {0.00, "3d3+5", "3d3+5", I_CROSSBOW, SK_CROSSBOW, 0, 0, true, false, { RL_CROSSBOW, 1 }, PIERCE },
-#endif
/* Speer */
{0.00, "1d10+0", "1d12+2", I_SPEAR, SK_SPEAR, 0, 0, false, false, { RL_NONE, 0}, PIERCE },
- /* Zweihänder */
- {0.00, "2d8+3", "2d8+3", I_GREATSWORD, SK_MELEE, -1, -2, false, false, { RL_NONE, 0}, CUT },
/* Lanze */
{0.00, "1d5", "2d6+5", I_LANCE, SK_SPEAR, 0, -2, false, false, { RL_NONE, 0}, PIERCE },
- /* Rostiger Zweihänder */
- {0.00, "2d8", "2d8", I_RUSTY_GREATSWORD, SK_MELEE, -2, -3, false, false, { RL_NONE, 0}, CUT },
/* Rostige Hellebarde */
{0.00, "2d6", "2d6", I_RUSTY_HALBERD, SK_SPEAR, -2, 1, false, false, { RL_NONE, 0}, CUT },
/* Unbewaffnet */
diff --git a/src/common/kernel/item.c b/src/common/kernel/item.c
index f287fea8f..181579c85 100644
--- a/src/common/kernel/item.c
+++ b/src/common/kernel/item.c
@@ -972,10 +972,6 @@ static t_item itemdata[MAXITEMS] = {
"Amulett", "Amulette"},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 0, 0, 0, NULL
},
- { /* I_GREATSWORD 35 */
- {"Bihänder", "Bihänder", "Bihänder", "Bihänder"},
- IS_PRODUCT, SK_WEAPONSMITH, 4, {2, 0, 0, 0, 0, 0}, 200, 0, 0, NULL
- },
{ /* I_LAENSWORD 38 */
{"Laenschwert", "Laenschwerter", "Laenschwert", "Laenschwerter"},
IS_PRODUCT, SK_WEAPONSMITH, 8, {0, 0, 0, 0, 1, 0}, 100, 0, 0, NULL
@@ -1106,10 +1102,6 @@ static t_item itemdata[MAXITEMS] = {
{"Sphäre der Unsichtbarkeit", "Sphären der Unsichtbarkeit", "", ""},
IS_MAGIC, 0, 0, {0, 0, 0, 0, 0, 0}, 100, 0, 0, NULL
},
- { /* I_RUSTY_GREATSWORD */
- {"Rostiger Zweihänder", "Rostige Zweihänder", "Rostiger Zweihänder", "Rostige Zweihänder"},
- IS_PRODUCT, SK_WEAPONSMITH, 4, {2, 0, 0, 0, 0, 0}, 200, 0, 0, NULL
- },
{ /* I_RUSTY_HALBERD */
{"Rostige Hellebarde", "Rostige Hellebarden", "Rostige Hellebarde", "Rostige Hellebarden"},
IS_PRODUCT, SK_WEAPONSMITH, 3, {1, 1, 0, 0, 0, 0}, 200, 0, 0, NULL
diff --git a/src/common/kernel/item.h b/src/common/kernel/item.h
index 2cc027b28..e8d93671c 100644
--- a/src/common/kernel/item.h
+++ b/src/common/kernel/item.h
@@ -302,7 +302,6 @@ enum {
I_FIRESWORD, /* Runenschwert ersetzen durch Flammenschwert */
I_DRAGONHEAD,
I_CHASTITY_BELT, /* bleibt */
- I_GREATSWORD,
I_LAENSWORD,
I_LAEN,
I_SHIELD,
@@ -341,7 +340,6 @@ enum {
I_RUSTY_CHAIN_MAIL,
I_SACK_OF_CONSERVATION,
I_SPHERE_OF_INVISIBILITY,
- I_RUSTY_GREATSWORD,
I_RUSTY_HALBERD,
MAX_ITEMS /* do not use outside item.c ! */
};
@@ -373,7 +371,6 @@ enum {
R_FIRESWORD,
R_DRAGONHEAD,
R_CHASTITY_BELT,
- R_GREATSWORD,
R_EOGSWORD,
R_EOG,
R_SHIELD,
diff --git a/src/common/modules/gmcmd.c b/src/common/modules/gmcmd.c
index 26fa8463d..622430747 100644
--- a/src/common/modules/gmcmd.c
+++ b/src/common/modules/gmcmd.c
@@ -705,7 +705,7 @@ gm_addquest(const char * email, const char * name, short radius, unsigned int fl
for (i=0;i<=I_INCENSE;++i) {
a_add((attrib**)&a->data.v, make_atgmcreate(olditemtype[i]));
}
- for (i=I_GREATSWORD;i!=I_KEKS;++i) {
+ for (i=I_LAENSWORD;i!=I_KEKS;++i) {
a_add((attrib**)&a->data.v, make_atgmcreate(olditemtype[i]));
}
@@ -770,7 +770,7 @@ gm_addfaction(const char * email, plane * p, region * r)
for (i=0;i<=I_INCENSE;++i) {
a_add((attrib**)&a->data.v, make_atgmcreate(olditemtype[i]));
}
- for (i=I_GREATSWORD;i!=I_KEKS;++i) {
+ for (i=I_LAENSWORD;i!=I_KEKS;++i) {
a_add((attrib**)&a->data.v, make_atgmcreate(olditemtype[i]));
}
diff --git a/src/eressea/korrektur.c b/src/eressea/korrektur.c
index 58980d3ea..b2388d816 100644
--- a/src/eressea/korrektur.c
+++ b/src/eressea/korrektur.c
@@ -402,7 +402,7 @@ update_gms(void)
for (k=0;keys[k];++k) {
add_key((attrib**)&permissions->data.v, atoi36(keys[k]));
}
- for (i=I_GREATSWORD;i!=I_KEKS;++i) {
+ for (i=I_LAENSWORD;i!=I_KEKS;++i) {
attrib * a = a_find((attrib*)permissions->data.v, &at_gmcreate);
while (a && a->data.v!=(void*)olditemtype[i]) a=a->nexttype;
if (!a) a_add((attrib**)&permissions->data.v, make_atgmcreate(olditemtype[i]));
diff --git a/src/res/resources.xml b/src/res/resources.xml
index 44c7cf310..2c3a6099a 100644
--- a/src/res/resources.xml
+++ b/src/res/resources.xml
@@ -54,6 +54,30 @@
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
-