Merging Source v1.7.2: level changes

2014-10-20 22:55:37 -04:00
parent e2b877b6b9
commit 1e62a6bd88
12 changed files with 49 additions and 34 deletions
@@ -31,7 +31,7 @@ public class PoisonTrap {
 	public static void trigger( int pos, Char 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) );
 		}
 		
 		CellEmitter.center( pos ).burst( PoisonParticle.SPLASH, 3 );