Merging Source v1.7.2: actor changes

This commit is contained in:
Evan Debenham
2014-10-20 23:51:15 -04:00
parent 724338b57f
commit 4a49763309
30 changed files with 980 additions and 682 deletions
@@ -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) {