Buffed Zot a little

Author: Smujb

app/build/intermediates/dex/debug/mergeDexDebug/out/classes.dex

@@ -86,6 +86,7 @@
 import com.github.dachhack.sprout.items.wands.WandOfLightning;
 import com.github.dachhack.sprout.items.wands.WandOfMagicMissile;
 import com.github.dachhack.sprout.items.wands.WandOfTelekinesis;
+import com.github.dachhack.sprout.items.weapon.enchantments.Slashing;
 import com.github.dachhack.sprout.items.weapon.melee.Chainsaw;
 import com.github.dachhack.sprout.items.weapon.melee.Dagger;
 import com.github.dachhack.sprout.items.weapon.melee.Glaive;
@@ -304,54 +305,60 @@ public static void playtest(Hero hero) {
 		if (!Dungeon.playtest) {
 			//Playtest
 			//TomeOfMastery tome = new TomeOfMastery(); tome.collect();
-			new WandOfDisintegration().identify().reinforce().upgrade(15).collect();
-			new WandOfFirebolt().identify().reinforce().upgrade(15).collect();
-			new WandOfLightning().identify().reinforce().upgrade(15).collect();
-			new WandOfAvalanche().identify().reinforce().upgrade(15).collect();
-			new WandOfTelekinesis().identify().reinforce().upgrade(15).collect();
-			new WandHolster().collect();
+			//new WandOfDisintegration().identify().reinforce().upgrade(15).collect();
+			//new WandOfFirebolt().identify().reinforce().upgrade(15).collect();
+			//new WandOfLightning().identify().reinforce().upgrade(15).collect();
+			//new WandOfAvalanche().identify().reinforce().upgrade(15).collect();
+			//new WandOfTelekinesis().identify().reinforce().upgrade(15).collect();
+			//new WandHolster().collect();
 
-			new Tamahawk().quantity(40).collect();
+			//new Tamahawk().quantity(40).collect();
 
-			new AnkhChain().collect();
-			new KeyRing().collect();
+			//new AnkhChain().collect();
+			//new KeyRing().collect();
 
-			new SeedPouch().collect();
+			//new SeedPouch().collect();
 
-			new PotionBandolier().collect();
+			//new PotionBandolier().collect();
 
-			new DewVial().fill().collect();
+			//new DewVial().fill().collect();
 
-			new BookOfDead().collect();
-			new BookOfLife().collect();
-			new BookOfTranscendence().collect();
-			new Amulet().collect();
+			//new BookOfDead().collect();
+			//new BookOfLife().collect();
+			//new BookOfTranscendence().collect();
+			//new Amulet().collect();
 
-			(hero.belongings.misc2 = new RingOfWealth()).identify().upgrade(28);
-			hero.belongings.misc2.activate(hero);
-			new PotionOfHealing().quantity(50).identify().collect();
+			//(hero.belongings.misc2 = new RingOfWealth()).identify().upgrade(28);
+			//hero.belongings.misc2.activate(hero);
+			//new PotionOfHealing().quantity(50).identify().collect();
 
 			//hero.HT=hero.HP=999;
-			hero.STR = hero.STR + 10;
-			PlateArmor armor1 = new PlateArmor();
-			armor1.reinforce().upgrade(15).identify().collect();
+			//hero.STR = hero.STR + 10;
+			//PlateArmor armor1 = new PlateArmor();
+			//armor1.reinforce().upgrade(15).identify().collect();
 			// PlateArmor armor2 = new PlateArmor();
 			// armor2.upgrade(14).identify().collect();
 
-			WarHammer hammer = new WarHammer();
-			hammer.reinforce().upgrade(15).identify().collect();
+			//WarHammer hammer = new WarHammer();
+			//hammer.reinforce().upgrade(15).identify().collect();
 
-			Glaive glaive = new Glaive();
-			glaive.reinforce().upgrade(15).identify().collect();
+			//Glaive glaive = new Glaive();
+			//glaive.reinforce().upgrade(15).identify().collect();
 
 			Spork spork = new Spork();
-			spork.reinforce().upgrade(15).identify().collect();
+			spork.enchantNom().upgrade(4).identify().collect();
+			new Spork().enchant(new Slashing()).upgrade(4).identify().collect();
+			if (hero.heroClass == HeroClass.HUNTRESS) {
+				new Boomerang().enchant(new Slashing()).identify().collect();
+			}
 
-			Towel towel = new Towel();
-			towel.identify().collect();
+			//spork.reinforce().upgrade(15).identify().collect();
 
-			Spectacles specs = new Spectacles();
-			specs.collect();
+			//Towel towel = new Towel();
+			//towel.identify().collect();
+
+			//Spectacles specs = new Spectacles();
+			//specs.collect();
 			//Dewcatcher.Seed seed3 = new Dewcatcher.Seed(); seed3.collect();
 			//Flytrap.Seed seed1 = new Flytrap.Seed(); seed1.collect();
 			//Phaseshift.Seed seed2 = new Phaseshift.Seed(); seed2.collect();
@@ -361,16 +368,16 @@ public static void playtest(Hero hero) {
 			//new JupitersWrath().enchantJupiter().setTesting().identify().collect();
 			//new CromCruachAxe().enchantLuck().setTesting().identify().collect();
 			//new AresSword().enchantAres().setTesting().identify().collect();
-			ScrollHolder bag2 = new ScrollHolder();
-			bag2.collect();
+			//ScrollHolder bag2 = new ScrollHolder();
+			//bag2.collect();
 			// armor = new PlateArmor(); armor.upgrade(130); armor.identify().collect();
 			//OrbOfZot zot = new OrbOfZot(); zot.collect();
 			//WarHammer hammer = new WarHammer();
 			//hammer.identify().collect();
 			// Wand wand = new WandOfDisintegration(); wand.upgrade(50); wand.collect();
-			Wand wand3 = new WandOfFlock();
-			wand3.upgrade(15).reinforce();
-			wand3.collect();
+			//Wand wand3 = new WandOfFlock();
+			//wand3.upgrade(15).reinforce();
+			//wand3.collect();
 			// Wand wand2 = new WandOfTelekinesis(); wand2.upgrade(15); wand2.collect();
 			//Wand wand3 = new WandOfTeleportation(); wand3.upgrade(15); wand3.collect();
 			// Wand wand4 = new WandOfBlink(); wand4.upgrade(15); wand4.collect();
@@ -453,7 +460,7 @@ public static void playtest(Hero hero) {
 			GLog.i("Playtest Activated");
 
 
-			for (int i = 0; i < 50; i++) {
+			/*for (int i = 0; i < 50; i++) {
 				//Scroll scroll = new ScrollOfMagicalInfusion();
 				//scroll.identify().collect();
 				Scroll scroll2 = new ScrollOfMagicMapping();
@@ -481,7 +488,7 @@ public static void playtest(Hero hero) {
 				new Stormvine.Seed().collect();
 				new Sungrass.Seed().collect();
 
-			}
+			}*/
 
 				/*
 				for(int i=1; i<61; i++){

app/build/intermediates/javac/debug/classes/com/github/dachhack/sprout/actors/mobs/Eye.class

@@ -131,7 +131,7 @@ public boolean attack(Char enemy) {
 			}
 
 			if (hit(this, ch, true)) {
-				ch.damage(Random.NormalIntRange(14, 20+ adjustForDepth(0)), this);
+				ch.damage(Random.NormalIntRange(14, 45), this);
 
 				if (Dungeon.visible[pos]) {
 					ch.sprite.flash();

app/build/intermediates/javac/debug/classes/com/github/dachhack/sprout/items/weapon/Weapon$Enchantment.class

@@ -103,8 +103,8 @@ public void setVol (int vol) {
 		volume=vol;		
 	}
 
-	public int upgradeLimit() {
-		int levelLimit = 2+(int)(Statistics.deepestFloor/2f);
+	public static int upgradeLimit() {
+		int levelLimit = 2+Math.round(Statistics.deepestFloor/2f);
 		if (Dungeon.hero.heroClass == HeroClass.MAGE){levelLimit++;}
 		levelLimit = Math.min(15,levelLimit);
 		return levelLimit;
@@ -324,10 +324,7 @@ public void execute(final Hero hero, String action) {
 	public static boolean uncurse(Hero hero, Item... items) {
 
 
-		int levelLimit = 0;
-		if (Dungeon.dewVial != null) {
-			levelLimit = Dungeon.dewVial.upgradeLimit();
-		}
+		int levelLimit = DewVial.upgradeLimit();
 
         float lvlchance = 0.50f;
         if (hero.heroClass == HeroClass.MAGE){lvlchance = 0.55f;}

app/build/intermediates/javac/debug/classes/com/github/dachhack/sprout/sprites/OtilukeNPCSprite.class

@@ -339,13 +339,13 @@ public static abstract class Enchantment implements Bundlable {
 				Luck.class, Nomnom.class, BuzzSaw.class, NeptuneShock.class,
 				CromLuck.class, AresLeech.class, Elastic.class};
 		private static final float[] chances = new float[] { 10, 10, 1, 2, 1,
-				2, 6, 3, 2, 2, 0, 0, 0, 0, 0, 4 };
+				2, 6, 3, 2, 2, 0, 0, 0, 0, 0, 10 };
 
 		private static final float[] chancesLow = new float[] { 10, 10, 0, 0, 1,
 			2, 6, 0, 0, 2, 0, 0, 0, 0, 0, 0 };
 
 		private static final float[] chancesAdv = new float[] { 2, 2, 2, 2, 2,
-			2, 2, 2, 2, 2, 0, 0,0, 0, 0, 0 };
+			2, 2, 2, 2, 2, 0, 0,0, 0, 0, 2 };
 
 		private static final float[] chancesNom = new float[] { 0, 0, 0, 0, 0,
 			0, 0, 0, 0, 0, 1, 0,0, 0, 0, 0 };

app/build/intermediates/javac/debug/classes/com/github/dachhack/sprout/windows/WndBag$BagTab.class

@@ -38,19 +38,19 @@ public class Nomnom extends Weapon.Enchantment {
 	public boolean proc(RelicMeleeWeapon weapon, Char attacker, Char defender, int damage) {
 		return false;
 	}
-	
+
 	@Override
 	public boolean proc(Weapon weapon, Char attacker, Char defender, int damage) {
 		// lvl 0 - 8%
 		// lvl 1 ~ 9%
 		// lvl 2 ~ 10%
 		int level = Math.max(0, weapon.level*3);
-				
+
 		if (Random.Int(level + 100) >= 75) {
 
 			defender.damage(defender.HP, this);
-		
-			
+
+
 			int maxValue = damage * (level + 2) / (level + 3);
 			int effValue = Math.min(Random.IntRange(0, maxValue), attacker.HT-attacker.HP);
 
@@ -60,11 +60,11 @@ public boolean proc(Weapon weapon, Char attacker, Char defender, int damage) {
 				attacker.sprite.emitter().start(Speck.factory(Speck.HEALING), 0.4f,	1);
 				attacker.sprite.showStatus(CharSprite.POSITIVE,	Integer.toString(effValue));
 			}
-			
+
 			attacker.buff(Hunger.class).satisfy(maxValue);
 			SpellSprite.show(attacker, SpellSprite.FOOD);
-		
-		
+
+
 			return true;
 
 		} else {

app/build/intermediates/javac/debug/classes/com/github/dachhack/sprout/windows/WndBag$Mode.class

@@ -142,7 +142,7 @@ public void proc(Char attacker, Char defender, int damage) {
 				detach(null);
 			}
 		}
-		if (defender.buff(PinCushion.class) == null || Random.Int(Dungeon.hero.heroClass == HeroClass.HUNTRESS ? 2 : 5) == 0) {
+		if ((defender.buff(PinCushion.class) == null || Random.Int(Dungeon.hero.heroClass == HeroClass.HUNTRESS ? 2 : 5) == 0) && !(this instanceof Boomerang | this instanceof JupitersWrath)) {
 			Buff.affect(defender, PinCushion.class).stick(this);
 		}
 	}

app/build/intermediates/javac/debug/classes/com/github/dachhack/sprout/windows/WndBag$Placeholder.class

@@ -17,17 +17,8 @@
  */
 package com.github.dachhack.sprout.sprites;
 
-import javax.microedition.khronos.opengles.GL10;
-
-import android.opengl.GLES20;
-
 import com.github.dachhack.sprout.Assets;
-import com.github.dachhack.sprout.actors.Char;
-import com.github.dachhack.sprout.effects.Halo;
-import com.github.dachhack.sprout.effects.particles.ElmoParticle;
-import com.watabou.noosa.Game;
 import com.watabou.noosa.TextureFilm;
-import com.watabou.utils.PointF;
 
 public class OtilukeNPCSprite extends MobSprite {
 

app/build/intermediates/javac/debug/classes/com/github/dachhack/sprout/windows/WndBag.class

@@ -28,6 +28,7 @@
 import com.github.dachhack.sprout.items.AdamantRing;
 import com.github.dachhack.sprout.items.AdamantWand;
 import com.github.dachhack.sprout.items.AdamantWeapon;
+import com.github.dachhack.sprout.items.DewVial;
 import com.github.dachhack.sprout.items.EquipableItem;
 import com.github.dachhack.sprout.items.Gold;
 import com.github.dachhack.sprout.items.Item;
@@ -47,6 +48,7 @@
 import com.github.dachhack.sprout.items.weapon.melee.MeleeWeapon;
 import com.github.dachhack.sprout.items.weapon.missiles.Boomerang;
 import com.github.dachhack.sprout.items.weapon.missiles.JupitersWrath;
+import com.github.dachhack.sprout.plants.Dewcatcher;
 import com.github.dachhack.sprout.plants.Plant.Seed;
 import com.github.dachhack.sprout.scenes.GameScene;
 import com.github.dachhack.sprout.scenes.PixelScene;
@@ -372,47 +374,28 @@ public void item(Item item) {
 					enable(false);
 				} else {
 
-					int levelLimit = 0;
-					if (Dungeon.dewVial != null) {
-						levelLimit = Dungeon.dewVial.upgradeLimit();
-					}
-
-					enable(mode == Mode.FOR_SALE
-							&& (item.price() > 0)
-							&& (!item.isEquipped(Dungeon.hero) || !item.cursed)
-							
-							|| mode == Mode.UPGRADEABLE
-							&& ((item.isUpgradable() && item.level<15 && !item.isReinforced())
-									||  item.isUpgradable() && item.isReinforced())		
-							|| mode == Mode.UPGRADEDEW
-							&& (item.isUpgradable() && item.level <= levelLimit)
-							|| mode == Mode.UPGRADEABLESIMPLE
-							&& item.isUpgradable()			
-							|| mode == Mode.ADAMANT
-							&& (item instanceof AdamantArmor || item instanceof AdamantRing || item instanceof AdamantWand || item instanceof AdamantWeapon)
-							|| mode == Mode.REINFORCED
-							&& item.isReinforced()
-							|| mode == Mode.NOTREINFORCED
-							&& (!item.isReinforced() && item.isUpgradable())
-							|| mode == Mode.UNIDENTIFED
-							&& !item.isIdentified()
-							|| mode == Mode.QUICKSLOT
-							&& (item.defaultAction != null)
-							|| mode == Mode.WEAPON
-							&& (item instanceof MeleeWeapon || item instanceof Boomerang || item instanceof JupitersWrath)
-							|| mode == Mode.ARMOR
-							&& (item instanceof Armor)
-							|| mode == Mode.ENCHANTABLE
-							&& (item instanceof MeleeWeapon	|| item instanceof Boomerang || item instanceof Armor)
-							|| mode == Mode.JOURNALPAGES
-							&& (item instanceof JournalPage)
+					int levelLimit = DewVial.upgradeLimit();
+
+					enable(mode == Mode.FOR_SALE && (item.price() > 0) && (!item.isEquipped(Dungeon.hero) || !item.cursed)
+							|| mode == Mode.UPGRADEABLE && ((item.isUpgradable() && item.level<15 && !item.isReinforced())
+									||  item.isUpgradable() && item.isReinforced())
+							|| mode == Mode.UPGRADEDEW && (item.isUpgradable() && item.level <= levelLimit)
+							|| mode == Mode.UPGRADEABLESIMPLE && item.isUpgradable()
+							|| mode == Mode.ADAMANT && (item instanceof AdamantArmor || item instanceof AdamantRing || item instanceof AdamantWand || item instanceof AdamantWeapon)
+							|| mode == Mode.REINFORCED && item.isReinforced()
+							|| mode == Mode.NOTREINFORCED && (!item.isReinforced() && item.isUpgradable())
+							|| mode == Mode.UNIDENTIFED && !item.isIdentified()
+							|| mode == Mode.QUICKSLOT && (item.defaultAction != null)
+							|| mode == Mode.WEAPON && (item instanceof MeleeWeapon || item instanceof Boomerang || item instanceof JupitersWrath)
+							|| mode == Mode.ARMOR && (item instanceof Armor)
+							|| mode == Mode.ENCHANTABLE && (item instanceof MeleeWeapon	|| item instanceof Boomerang || item instanceof Armor)
+							|| mode == Mode.JOURNALPAGES && (item instanceof JournalPage)
 							|| mode == Mode.WAND && (item instanceof Wand)
 							|| mode == Mode.SEED && (item instanceof Seed)
 							|| mode == Mode.FOOD && (item instanceof Food)
 							|| mode == Mode.POTION && (item instanceof Potion)
 							|| mode == Mode.SCROLL && (item instanceof Scroll)
-							|| mode == Mode.EQUIPMENT
-							&& (item instanceof EquipableItem)
+							|| mode == Mode.EQUIPMENT && (item instanceof EquipableItem)
 							|| mode == Mode.ALL);
 				}
 			} else {