V0.1.1: updated sprites, added seed to generator, fixed (hopefully) all bugs

This commit is contained in:
Evan Debenham
2014-08-15 22:48:02 -04:00
parent 7403aa8359
commit fb115114f4
9 changed files with 43 additions and 43 deletions
@@ -184,8 +184,9 @@ public class Generator {
Sungrass.Seed.class,
Earthroot.Seed.class,
Fadeleaf.Seed.class,
Rotberry.Seed.class };
Category.SEED.probs = new float[]{ 1, 1, 1, 1, 1, 1, 1, 0 };
Rotberry.Seed.class,
BlandfruitBush.Seed.class};
Category.SEED.probs = new float[]{ 7, 7, 7, 7, 7, 7, 7, 0, 1 };
}
public static void reset() {
@@ -242,12 +242,13 @@ public class Heap implements Bundlable {
int count = 0;
if (items.get(0) instanceof Blandfruit && items.get(1) instanceof Seed) {
if (items.size() == 2 && items.get(0) instanceof Seed && items.get(1) instanceof Blandfruit ) {
Sample.INSTANCE.play( Assets.SND_PUFF );
CellEmitter.center( pos ).burst( Speck.factory( Speck.EVOKE ), 3 );
Blandfruit result = new Blandfruit();
result.cook((Seed)items.get(1));
result.cook((Seed)items.get(0));
destroy();
@@ -266,7 +267,7 @@ public class Heap implements Bundlable {
}
}
} else if (count >= SEEDS_TO_POTION) {
if (count >= SEEDS_TO_POTION) {
CellEmitter.get( pos ).burst( Speck.factory( Speck.WOOL ), 6 );
Sample.INSTANCE.play( Assets.SND_PUFF );
@@ -18,6 +18,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Bundle;
import com.watabou.utils.Random;
/**
@@ -232,22 +233,22 @@ public class Blandfruit extends Food {
super.restoreFromBundle(bundle);
name = bundle.getString(NAME);
if (name == "Healthfruit")
if (name.equals("Healthfruit"))
cook(new Sungrass.Seed());
else if (name == "Powerfruit")
else if (name.equals("Powerfruit"))
//TODO: make sure this doesn't break anything
cook(new Wandmaker.Rotberry.Seed());
else if (name == "Paralyzefruit")
else if (name.equals("Paralyzefruit"))
cook(new Earthroot.Seed());
else if (name == "Invisifruit")
else if (name.equals("Invisifruit"))
cook(new Blindweed.Seed());
else if (name == "Flamefruit")
else if (name.equals("Flamefruit"))
cook(new Firebloom.Seed());
else if (name == "Frostfruit")
else if (name.equals("Frostfruit"))
cook(new Icecap.Seed());
else if (name == "Visionfruit")
else if (name.equals("Visionfruit"))
cook(new Fadeleaf.Seed());
else if (name == "Toxicfruit")
else if (name.equals("Toxicfruit"))
cook(new Sorrowmoss.Seed());
}