v0.6.3: adjusted probability of missile weapon drops

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Bolas.java

@@ -24,9 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple;
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.utils.Random;
 
 public class Bolas extends MissileWeapon {
 	
@@ -61,12 +59,6 @@ public class Bolas extends MissileWeapon {
 		return super.durabilityPerUse()*2f;
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.Int( 2, 4 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return 12 * quantity;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Dart.java

@@ -23,7 +23,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
 
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.utils.Random;
 
 public class Dart extends MissileWeapon {
 
@@ -55,7 +54,8 @@ public class Dart extends MissileWeapon {
 	
 	@Override
 	public Item random() {
-		quantity = Random.Int( 5, 10 );
+		super.random();
+		quantity += 3;
 		return this;
 	}
 	

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/FishingSpear.java

@@ -21,9 +21,7 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
 
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.utils.Random;
 
 public class FishingSpear extends MissileWeapon {
 	
@@ -46,12 +44,6 @@ public class FishingSpear extends MissileWeapon {
 		return 13;
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.Int( 2, 4 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return 12 * quantity;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Javelin.java

@@ -21,9 +21,7 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
 
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.utils.Random;
 
 public class Javelin extends MissileWeapon {
 
@@ -46,12 +44,6 @@ public class Javelin extends MissileWeapon {
 		return 15;
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.Int( 2, 4 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return 16 * quantity;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/MissileWeapon.java

@@ -94,6 +94,23 @@ abstract public class MissileWeapon extends Weapon {
 		}
 	}
 	
+	@Override
+	public Item random() {
+		if (!stackable) return this;
+		
+		//+0: 50% (1/2)
+		//+1: 40% (4/10)
+		//+2: 10% (1/10)
+		quantity = 2;
+		if (Random.Int(2) == 0) {
+			quantity++;
+			if (Random.Int(5) == 0) {
+				quantity++;
+			}
+		}
+		return this;
+	}
+	
 	@Override
 	public float castDelay(Char user, int dst) {
 		float delay = speedFactor( user );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Shuriken.java

@@ -23,9 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
 
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.utils.Random;
 
 public class Shuriken extends MissileWeapon {
 
@@ -54,12 +52,6 @@ public class Shuriken extends MissileWeapon {
 		else                                                    return super.speedFactor(owner);
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.NormalIntRange( 2, 4 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return 8 * quantity;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingHammer.java

@@ -21,9 +21,7 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
 
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.utils.Random;
 
 public class ThrowingHammer extends MissileWeapon {
 	
@@ -51,12 +49,6 @@ public class ThrowingHammer extends MissileWeapon {
 		return super.durabilityPerUse()/2f;
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.Int( 2, 4 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return 20 * quantity;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/ThrowingKnife.java

@@ -26,7 +26,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroClass;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfSharpshooting;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.watabou.utils.Random;
@@ -88,12 +87,6 @@ public class ThrowingKnife extends MissileWeapon {
 		return super.durabilityPerUse()*2f;
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.NormalIntRange( 2, 4 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return 4 * quantity;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/TippedDart.java

@@ -25,8 +25,6 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.PinCushion;
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
-import com.watabou.utils.Random;
 
 public abstract class TippedDart extends Dart {
 	
@@ -47,12 +45,6 @@ public abstract class TippedDart extends Dart {
 			Dungeon.level.drop( new Dart(), enemy.pos).sprite.drop();
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.Int( 3, 5 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return quantity * 6;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Tomahawk.java

@@ -24,9 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.utils.Random;
 
 public class Tomahawk extends MissileWeapon {
 
@@ -61,12 +59,6 @@ public class Tomahawk extends MissileWeapon {
 		return super.durabilityPerUse()*2f;
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.Int( 2, 4 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return 16 * quantity;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/Trident.java

@@ -21,9 +21,7 @@
 
 package com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles;
 
-import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
-import com.watabou.utils.Random;
 
 public class Trident extends MissileWeapon {
 	
@@ -46,12 +44,6 @@ public class Trident extends MissileWeapon {
 		return 17;
 	}
 	
-	@Override
-	public Item random() {
-		quantity = Random.Int( 2, 4 );
-		return this;
-	}
-	
 	@Override
 	public int price() {
 		return 20 * quantity;