LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.4.0: reworked how armor drops

Browse Source
This commit is contained in:
Evan Debenham 2016-06-06 04:02:58 -04:00
parent d05dcc0601
commit 2af3e75080
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
View File

@ -168,6 +168,15 @@ public class Generator {
return item instanceof Bag ? Integer.MAX_VALUE : Integer.MAX_VALUE - 1; return item instanceof Bag ? Integer.MAX_VALUE : Integer.MAX_VALUE - 1;
} }
}
//TODO decide on balancing here
private static final float[][] floorSetTierProbs = new float[][] {
{0, 70, 20, 8, 2},
{0, 25, 50, 20, 5},
{0, 10, 40, 40, 10},
{0, 5, 20, 50, 25},
{0, 2, 8, 20, 70}
}; };
private static HashMap<Category,Float> categoryProbs = new HashMap<Generator.Category, Float>(); private static HashMap<Category,Float> categoryProbs = new HashMap<Generator.Category, Float>();
@ -227,6 +236,7 @@ public class Generator {
WandOfRegrowth.class }; WandOfRegrowth.class };
Category.WAND.probs = new float[]{ 4, 4, 4, 4, 4, 3, /*3,*/ 3, 3, /*3,*/ 3, 3, 3 }; Category.WAND.probs = new float[]{ 4, 4, 4, 4, 4, 3, /*3,*/ 3, 3, /*3,*/ 3, 3, 3 };
//TODO overhaul these
Category.WEAPON.classes = new Class<?>[]{ Category.WEAPON.classes = new Class<?>[]{
Dagger.class, Dagger.class,
Knuckles.class, Knuckles.class,
@ -252,7 +262,8 @@ public class Generator {
MailArmor.class, MailArmor.class,
ScaleArmor.class, ScaleArmor.class,
PlateArmor.class }; PlateArmor.class };
Category.ARMOR.probs = new float[]{ 1, 1, 1, 1, 1 }; //this changes depending on the floor set, see randomArmor
Category.ARMOR.probs = new float[]{ 0, 0, 0, 0, 0 };
Category.FOOD.classes = new Class<?>[]{ Category.FOOD.classes = new Class<?>[]{
Food.class, Food.class,
@ -355,23 +366,17 @@ public class Generator {
} }
public static Armor randomArmor(){ public static Armor randomArmor(){
int curStr = Hero.STARTING_STR + Dungeon.limitedDrops.strengthPotions.count; return randomArmor(Dungeon.depth / 5);
return randomArmor(curStr);
} }
public static Armor randomArmor(int targetStr) { public static Armor randomArmor(int floorSet) {
Category cat = Category.ARMOR; floorSet = Math.min(floorSet, floorSetTierProbs.length-1);
try { try {
Armor a1 = (Armor) cat.classes[Random.chances(cat.probs)].newInstance(); Armor a = (Armor)Category.ARMOR.classes[Random.chances(floorSetTierProbs[floorSet])].newInstance();
Armor a2 = (Armor) cat.classes[Random.chances(cat.probs)].newInstance(); a.random();
return a;
a1.random();
a2.random();
return Math.abs(targetStr - a1.STRReq()) < Math.abs(targetStr - a2.STRReq()) ? a1 : a2;
} catch (Exception e) { } catch (Exception e) {
return null; return null;
} }