From 705a0f39666eab5425c01c17bcc0b185acd5c97f Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 21 Oct 2015 03:03:15 -0400
Subject: [PATCH] v0.3.2: more implementation on rotberry quest (almost done)

---
 assets/rot_heart.png                          | Bin 487 -> 2283 bytes
 .../actors/mobs/npcs/Wandmaker.java           |  21 --------
 .../levels/painters/RotGardenPainter.java     |  40 +++++++++++----
 .../sprites/RotHeartSprite.java               |  48 +++++++++++++++---
 4 files changed, 72 insertions(+), 37 deletions(-)

diff --git a/assets/rot_heart.png b/assets/rot_heart.png
index 1fdbfb8140a74398300d82863500fd1f1fb2a431..653191c6e02bb35741e0b38e37decb963c3e84f3 100644
GIT binary patch
delta 2184
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
KMNUMnLSTZXC@sGL

delta 374
zcmV-+0g3+W5$6MtQwRzO847=Q?IDp{D}Mn?Nkl<ZXx{CZL283Q6o$W7L$<v@4TXYh
zq36f}f@d&W&ycOTLR$~uISN?^3Sv&+woqO-nPP~I+SJmR_brDvBh35%f1D9j<y9Vd
z)HjUl;|5^M`@x_W30@>*;%g?pwk_gC((9vc{XX@^FiZdzx;q$rdbv}8fGGe@1b++N
zStrJr0Ch6)HDLPHd?$o}DW}q4XqQ?F{DA;m^S|RaL{P7>rv4)Vv^Br02#gCq0*osZ
zKqh|gi9eZRj64B8p0!s^mwIDh0j$<@$~5fU3HN4DrlGFZbKAiYB)~Z~Gz*VF08$ne
zWf~s62%d01Wl;gxJ?_F0Rb?OL3S%%^ZfLp=)|>C<CUJgrmv1}QhpspJF{wqlltrba
zAuKnI#m@P&`&)5yYzs$_006Zgx;BeR66cNXY;)<*^~M<j*o&Zxt2K#pbN)#91XY=T
UP^E;Cy#N3J07*qoM6N<$f}rcDZ~y=R

diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
index 60ee28983..5a7686b4d 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
@@ -108,7 +108,6 @@ public class Wandmaker extends NPC {
 			"If you can get that for me, I'll be happy to pay you with one of my finely crafted wands! " +
 			"I brought two with me, so you can take whichever one you prefer.";
 
-	//TODO
 	private static final String REMINDER_DUST	=
 		"Any luck with corpse dust, %s? Look for some barricades.";
 
@@ -436,26 +435,6 @@ public class Wandmaker extends NPC {
 				alchemyClass = PotionOfStrength.class;
 			}
 			
-			@Override
-			public boolean doPickUp( Hero hero ) {
-				if (super.doPickUp(hero)) {
-					
-					if (Dungeon.level != null) {
-						for (Mob mob : Dungeon.level.mobs) {
-							mob.beckon( Dungeon.hero.pos );
-						}
-						
-						GLog.w( "The seed emits a roar that echoes throughout the dungeon!" );
-						CellEmitter.center( Dungeon.hero.pos ).start( Speck.factory( Speck.SCREAM ), 0.3f, 3 );
-						Sample.INSTANCE.play( Assets.SND_CHALLENGE );
-					}
-					
-					return true;
-				} else {
-					return false;
-				}
-			}
-			
 			@Override
 			public String desc() {
 				return TXT_DESC;
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RotGardenPainter.java b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RotGardenPainter.java
index 345cde063..afa8c2a4e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RotGardenPainter.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RotGardenPainter.java
@@ -21,6 +21,7 @@
 package com.shatteredpixel.shatteredpixeldungeon.levels.painters;
 
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.RotHeart;
 import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.RotLasher;
 import com.shatteredpixel.shatteredpixeldungeon.items.keys.IronKey;
@@ -38,7 +39,7 @@ public class RotGardenPainter extends Painter {
 		level.addItemToSpawn(new IronKey(Dungeon.depth));
 
 		fill(level, room, Terrain.WALL);
-		fill(level, room, 1, Terrain.HIGH_GRASS);
+		fill(level, room, 1, Terrain.GRASS);
 
 
 		int heartX = Random.IntRange(room.left+1, room.right-1);
@@ -54,20 +55,41 @@ public class RotGardenPainter extends Painter {
 			heartY = room.top + 1;
 		}
 
-		RotHeart heart = new RotHeart();
-		heart.pos = heartX + heartY * Level.WIDTH;
-		level.mobs.add( heart );
+		placePlant(level, heartX + heartY * Level.WIDTH, new RotHeart());
 
-		int lashers = ((room.right-room.left-1)*(room.bottom-room.top-1))/5;
+		int lashers = ((room.right-room.left-1)*(room.bottom-room.top-1))/8;
 
 		for (int i = 1; i <= lashers; i++){
 			int pos;
 			do {
 				pos = room.random();
-			} while (level.map[pos] != Terrain.HIGH_GRASS || level.findMob(pos) != null);
-			RotLasher lasher = new RotLasher();
-			lasher.pos = pos;
-			level.mobs.add( lasher );
+			} while (!validPlantPos(level, pos));
+			placePlant(level, pos, new RotLasher());
+		}
+	}
+
+	private static boolean validPlantPos(Level level, int pos){
+		if (level.map[pos] != Terrain.GRASS){
+			return false;
+		}
+
+		for (int i : Level.NEIGHBOURS9){
+			if (level.findMob(pos+i) != null){
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	private static void placePlant(Level level, int pos, Mob plant){
+		plant.pos = pos;
+		level.mobs.add( plant );
+
+		for(int i : Level.NEIGHBOURS8) {
+			if (level.map[pos + i] == Terrain.GRASS){
+				set(level, pos + i, Terrain.HIGH_GRASS);
+			}
 		}
 	}
 }
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java
index 2a69fb382..8f7643a9e 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/sprites/RotHeartSprite.java
@@ -21,11 +21,16 @@
 package com.shatteredpixel.shatteredpixeldungeon.sprites;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.watabou.noosa.MovieClip;
 import com.watabou.noosa.TextureFilm;
+import com.watabou.noosa.particles.Emitter;
 
 public class RotHeartSprite extends MobSprite {
 
+	private Emitter cloud;
+
 	public RotHeartSprite(){
 		super();
 
@@ -33,18 +38,47 @@ public class RotHeartSprite extends MobSprite {
 
 		TextureFilm frames = new TextureFilm( texture, 16, 16 );
 
-		idle = new MovieClip.Animation( 8, true );
+		idle = new MovieClip.Animation( 1, true );
 		idle.frames( frames, 0);
 
-		run = new MovieClip.Animation( 12, true );
-		run.frames( frames, 0, 1 );
+		run = new MovieClip.Animation( 1, true );
+		run.frames( frames, 0 );
 
-		attack = new MovieClip.Animation( 12, false );
-		attack.frames( frames, 2, 3, 0, 1 );
+		attack = new MovieClip.Animation( 1, false );
+		attack.frames( frames, 0 );
 
-		die = new MovieClip.Animation( 12, false );
-		die.frames( frames, 4, 5, 6 );
+		die = new MovieClip.Animation( 8, false );
+		die.frames( frames, 1, 2, 3, 4, 5, 6, 7, 7, 7 );
 
 		play( idle );
 	}
+
+	@Override
+	public void link( Char ch ) {
+		super.link( ch );
+
+		if (cloud == null) {
+			cloud = emitter();
+			cloud.pour( Speck.factory(Speck.TOXIC), 0.7f );
+		}
+	}
+
+	@Override
+	public void update() {
+
+		super.update();
+
+		if (cloud != null) {
+			cloud.visible = visible;
+		}
+	}
+
+	@Override
+	public void die() {
+		super.die();
+
+		if (cloud != null) {
+			cloud.on = false;
+		}
+	}
 }