From e2b877b6b91a7dc38a4c516b2d10365fb9a9462b Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Mon, 20 Oct 2014 22:38:13 -0400
Subject: [PATCH] Merging Source v1.7.2: plant changes

---
 .../plants/Blindweed.java                     |  3 +-
 .../plants/Dreamweed.java                     | 67 +++++++++++++++++++
 .../plants/Sorrowmoss.java                    |  2 +-
 3 files changed, 69 insertions(+), 3 deletions(-)
 create mode 100644 src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamweed.java

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java
index 9afdc6160..694a2e37a 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Blindweed.java
@@ -23,7 +23,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
-import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob.State;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfInvisibility;
@@ -50,7 +49,7 @@ public class Blindweed extends Plant {
 			Buff.prolong( ch, Blindness.class, len );
             Buff.prolong( ch, Cripple.class, len );
 			if (ch instanceof Mob) {
-				((Mob)ch).state = State.WANDERING;
+				((Mob)ch).state = ((Mob)ch).WANDERING;
 				((Mob)ch).beckon( Dungeon.level.randomDestination() );
 			}
 		}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamweed.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamweed.java
new file mode 100644
index 000000000..d5fbcb695
--- /dev/null
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Dreamweed.java
@@ -0,0 +1,67 @@
+/*
+ * Pixel Dungeon
+ * Copyright (C) 2012-2014  Oleg Dolya
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+package com.shatteredpixel.shatteredpixeldungeon.plants;
+
+import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob;
+import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfInvisibility;
+import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
+import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
+
+public class Dreamweed extends Plant {
+
+    private static final String TXT_DESC =
+            "Upon touching a Dreamweed it secretes a glittering cloud of confusing gas.";
+
+    {
+        image = 3;
+        plantName = "Dreamweed";
+    }
+
+    @Override
+    public void activate( Char ch ) {
+        super.activate( ch );
+
+        if (ch != null) {
+            //GameScene.add(Blob.seed(pos, 300 + 20 * Dungeon.depth, ConfusionGas.class));
+        }
+    }
+
+    @Override
+    public String desc() {
+        return TXT_DESC;
+    }
+
+    public static class Seed extends Plant.Seed {
+        {
+            plantName = "Dreamweed";
+
+            name = "seed of " + plantName;
+            image = ItemSpriteSheet.SEED_DREAMWEED;
+
+            plantClass = Dreamweed.class;
+            alchemyClass = PotionOfInvisibility.class;
+        }
+
+        @Override
+        public String desc() {
+            return TXT_DESC;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sorrowmoss.java b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sorrowmoss.java
index 6f1c8d949..a95b3f134 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sorrowmoss.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/plants/Sorrowmoss.java
@@ -41,7 +41,7 @@ public class Sorrowmoss extends Plant {
 		super.activate( ch );
 		
 		if (ch != null) {
-			Buff.affect( ch, Poison.class ).set( 5 + Math.min( Dungeon.depth, 15 ) );
+            Buff.affect( ch, Poison.class ).set( Poison.durationFactor( ch ) * (4 + Dungeon.depth / 2) );
 		}
 		
 		if (Dungeon.visible[pos]) {