removed I_GREATSWORD and I_RUSTY_GREATSWORD from the source.

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 */

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

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,

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]));
 	}
 

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]));

src/res/resources.xml

@@ -54,6 +54,30 @@
     </item>
   </resource>
 
+  <resource name="rustygreatsword">
+    <item weight="200">
+      <construction skill="sk_weaponsmithing" minskill="4" reqsize="1">
+        <requirement type="iron" quantity="2"/>
+      </construction>
+      <weapon cut="true" skill="sk_melee" offmod="-2" defmod="-3">
+        <damage type="rider" value="2d8"/>
+        <damage type="footman" value="2d8"/>
+      </weapon>
+    </item>
+  </resource>
+
+  <resource name="greatsword">
+    <item weight="200">
+      <construction skill="sk_weaponsmithing" minskill="4" reqsize="1">
+        <requirement type="iron" quantity="2"/>
+      </construction>
+      <weapon cut="true" skill="sk_melee" offmod="-1" defmod="-2">
+        <damage type="rider" value="2d8+3"/>
+        <damage type="footman" value="2d8+3"/>
+      </weapon>
+    </item>
+  </resource>
+
   <resource name="sword">
     <item weight="100">
       <construction skill="sk_weaponsmithing" minskill="3" reqsize="1">