diff --git a/assets/items.png b/assets/items.png index 764d6b5c5..9da01671c 100644 Binary files a/assets/items.png and b/assets/items.png differ diff --git a/assets/plants.png b/assets/plants.png index be7ee6222..f59809df8 100644 Binary files a/assets/plants.png and b/assets/plants.png differ diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java index fcfe13c6c..81009f679 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamfoil.java @@ -27,10 +27,11 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; public class Dreamfoil extends Plant { private static final String TXT_DESC = - "DESC HERE"; + "The Dreamfoil's prickly flowers contain a toxin " + + "which renders most weaker beings unconscious."; { - image = 3; + image = 10; plantName = "Dreamfoil"; } @@ -41,7 +42,6 @@ public class Dreamfoil extends Plant { if (ch != null) { if (ch instanceof Mob) Buff.affect(ch, MagicalSleep.class); - //GameScene.add(Blob.seed(pos, 300 + 20 * Dungeon.depth, ConfusionGas.class)); } } @@ -55,7 +55,7 @@ public class Dreamfoil extends Plant { plantName = "Dreamfoil"; name = "seed of " + plantName; - image = ItemSpriteSheet.SEED_SORROWMOSS; + image = ItemSpriteSheet.SEED_DREAMFOIL; plantClass = Dreamfoil.class; alchemyClass = PotionOfPurity.class; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Stormvine.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Stormvine.java index fc7fea3a6..fb2c25b41 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Stormvine.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Stormvine.java @@ -13,11 +13,13 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; * Created by Evan on 23/10/2014. */ public class Stormvine extends Plant { + private static final String TXT_DESC = - "DESC HERE"; + "Stormvine is an unusual sort fo vine which 'hangs' on the air. " + + "Gravity affects it strangely, and anything caught in the vine is confused as a result."; { - image = 3; + image = 9; plantName = "Stormvine"; } @@ -37,10 +39,10 @@ public class Stormvine extends Plant { public static class Seed extends Plant.Seed { { - plantName = "Dreamfoil"; + plantName = "Stormvine"; name = "seed of " + plantName; - image = ItemSpriteSheet.SEED_ICECAP; + image = ItemSpriteSheet.SEED_STORMVINE; plantClass = Stormvine.class; alchemyClass = PotionOfLevitation.class; diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java index d470b4336..7a18bc08c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/ItemSpriteSheet.java @@ -183,15 +183,16 @@ public class ItemSpriteSheet { public static final int SEED_ROTBERRY = ROW12+0; public static final int SEED_FIREBLOOM = ROW12+1; public static final int SEED_BLINDWEED = ROW12+2; - public static final int SEED_DREAMWEED = ROW12+2; public static final int SEED_SUNGRASS = ROW12+3; public static final int SEED_ICECAP = ROW12+4; - public static final int SEED_SORROWMOSS = ROW12+5; - public static final int SEED_EARTHROOT = ROW12+6; - public static final int SEED_FADELEAF = ROW12+7; - public static final int SEED_BLANDFRUIT = ROW12+8; + public static final int SEED_STORMVINE = ROW12+5; + public static final int SEED_SORROWMOSS = ROW12+6; + public static final int SEED_DREAMFOIL = ROW12+7; + public static final int SEED_EARTHROOT = ROW12+8; + public static final int SEED_FADELEAF = ROW12+9; + public static final int SEED_BLANDFRUIT = ROW12+10; - //Row Theirteen: Food + //Row Thirteen: Food public static final int MEAT = ROW13+0; public static final int STEAK = ROW13+1; public static final int OVERPRICED = ROW13+2;