From 1c40c23a7279e2bfc4a1b3d0dcc75898c3bdc228 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 3 Oct 2014 14:00:07 -0400 Subject: [PATCH] V0.2.1: Added support for specifying target strength in weapon/armor generation. --- .../items/Generator.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java index 801be6771..f4cfb2251 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java @@ -242,10 +242,14 @@ public class Generator { } } + + public static Armor randomArmor() throws Exception { + int curStr = Hero.STARTING_STR + Dungeon.potionOfStrength; + + return randomArmor(curStr); + } - public static Armor randomArmor() throws Exception { - - int curStr = Hero.STARTING_STR + Dungeon.potionOfStrength; + public static Armor randomArmor(int targetStr) throws Exception { Category cat = Category.ARMOR; @@ -255,13 +259,17 @@ public class Generator { a1.random(); a2.random(); - return Math.abs( curStr - a1.STR ) < Math.abs( curStr - a2.STR ) ? a1 : a2; + return Math.abs( targetStr - a1.STR ) < Math.abs( targetStr - a2.STR ) ? a1 : a2; } + + public static Weapon randomWeapon() throws Exception { + int curStr = Hero.STARTING_STR + Dungeon.potionOfStrength; + + return randomWeapon(curStr); + } - public static Weapon randomWeapon() throws Exception { - - int curStr = Hero.STARTING_STR + Dungeon.potionOfStrength; - + public static Weapon randomWeapon(int targetStr) throws Exception { + Category cat = Category.WEAPON; Weapon w1 = (Weapon)cat.classes[Random.chances( cat.probs )].newInstance(); @@ -270,6 +278,6 @@ public class Generator { w1.random(); w2.random(); - return Math.abs( curStr - w1.STR ) < Math.abs( curStr - w2.STR ) ? w1 : w2; + return Math.abs( targetStr - w1.STR ) < Math.abs( targetStr - w2.STR ) ? w1 : w2; } }