Merge remote-tracking branch 'origin/master'

Conflicts: src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/ConfusionGas.java
2014-10-30 20:00:53 -04:00
parent e02222495c c23191575e
commit 9d19a785ba
22 changed files with 102 additions and 75 deletions
@@ -33,8 +33,7 @@ public class ConfusionGas extends Blob {
        Char ch;
        for (int i=0; i < LENGTH; i++) {
            if (cur[i] > 0 && (ch = Actor.findChar( i )) != null) {
-                if (!ch.immunities().contains(this.getClass()))
-                    Buff.prolong( ch, Vertigo.class, 1 );
+                Buff.prolong( ch, Vertigo.class, 2 );
            }
        }
    }