v0.4.0: reworked/added the 5 basic swords

src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java

@@ -105,13 +105,11 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Knuckles;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Longsword;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Mace;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Quarterstaff;
-import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.ShortSword;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Spear;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Sword;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.WarHammer;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Boomerang;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.CurareDart;
-import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Dart;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.IncendiaryDart;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Javelin;
 import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.Shuriken;
@@ -240,15 +238,13 @@ public class Generator {
 			BattleAxe.class,
 			WarHammer.class,
 			Glaive.class,
-			ShortSword.class,
-			Dart.class,
 			Javelin.class,
 			IncendiaryDart.class,
 			CurareDart.class,
 			Shuriken.class,
 			Boomerang.class,
 			Tamahawk.class };
-		Category.WEAPON.probs = new float[]{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1 };
+		Category.WEAPON.probs = new float[]{ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1 };
 		
 		Category.ARMOR.classes = new Class<?>[]{
 			ClothArmor.class,

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/Greatsword.java

@@ -0,0 +1,15 @@
+package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee;
+
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
+
+public class Greatsword extends MeleeWeapon {
+
+	{
+		image = ItemSpriteSheet.GREATSWORD;
+	}
+
+	public Greatsword() {
+		super( 5, 1f, 1f );
+	}
+
+}

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/NewShortsword.java

@@ -0,0 +1,36 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2015  Oleg Dolya
+ *
+ * Shattered Pixel Dungeon
+ * Copyright (C) 2014-2016 Evan Debenham
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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 <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee;
+
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
+
+//this class is named as such to avoid conflicts with the ShortSword class, from pre-0.4.0
+public class NewShortsword extends MeleeWeapon {
+
+	{
+		image = ItemSpriteSheet.SHORTSWORD;
+	}
+
+	public NewShortsword() {
+		super( 2, 1f, 1f );
+	}
+
+}

src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/WornShortsword.java

@@ -22,13 +22,13 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee;
 
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 
-public class ShortSword extends MeleeWeapon {
-	
+public class WornShortsword extends MeleeWeapon {
+
 	{
 		image = ItemSpriteSheet.WORN_SHORTSWORD;
 	}
-	
-	public ShortSword() {
+
+	public WornShortsword() {
 		super( 1, 1f, 1f );
 	}