Merging Source v1.7.2: actor changes

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FlavourBuff.java

@@ -17,7 +17,7 @@
  */
 package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
-// Special kind of buff, that doesn't perform any kind actions 
+//Special kind of buff, that doesn't perform any kind actions
 public class FlavourBuff extends Buff {
 	
 	@Override

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSleep.java

@@ -41,7 +41,7 @@ public class MagicalSleep extends Buff {
                     GLog.i("You fall into a deep magical sleep.");
                 }
             else if (target instanceof Mob)
-                ((Mob)target).state = Mob.State.SLEEPING;
+                ((Mob)target).state = ((Mob)target).SLEEPEING;
 
             target.paralysed = true;
 

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java

@@ -30,8 +30,6 @@ import com.watabou.utils.Bundle;
 
 public class Poison extends Buff implements Hero.Doom {
 	
-	public static final int DOT	= 2;
-	
 	protected float left;
 	
 	private static final String LEFT	= "left";
@@ -67,7 +65,7 @@ public class Poison extends Buff implements Hero.Doom {
 	public boolean act() {
 		if (target.isAlive()) {
 			
-			target.damage( DOT, this );
+			target.damage( (int)(left / 3) + 1, this );
 			spend( TICK );
 			
 			if ((left -= TICK) <= 0) {

src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java

@@ -0,0 +1,41 @@
+/*
+ * 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.actors.buffs;
+
+import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
+import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
+import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+
+public class Vertigo extends FlavourBuff {
+
+    public static final float DURATION	= 10f;
+
+    @Override
+    public int icon() {
+        return BuffIndicator.VERTIGO;
+    }
+
+    @Override
+    public String toString() {
+        return "Vertigo";
+    }
+
+    public static float duration( Char ch ) {
+        Resistance r = ch.buff( Resistance.class );
+        return r != null ? r.durationFactor() * DURATION : DURATION;
+    }
+}