v0.7.5: added new properties for traps

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java

@@ -106,6 +106,7 @@ import com.shatteredpixel.shatteredpixeldungeon.journal.Notes;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
 import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm;
+import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.plants.Earthroot;
 import com.shatteredpixel.shatteredpixeldungeon.plants.Swiftthistle;
@@ -1646,6 +1647,11 @@ public class Hero extends Char {
 					
 					if (Dungeon.level.secret[p]){
 						
+						Trap trap = Dungeon.level.traps.get( p );
+						if (trap != null && !trap.canBeSearched){
+							continue;
+						}
+						
 						float chance;
 						//intentional searches always succeed
 						if (intentional){

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TalismanOfForesight.java

@@ -182,10 +182,13 @@ public class TalismanOfForesight extends Artifact {
 
 					if (Dungeon.level.heroFOV[p]
 							&& Dungeon.level.secret[p]
-							&& Dungeon.level.map[p] != Terrain.SECRET_DOOR)
+							&& Dungeon.level.map[p] != Terrain.SECRET_DOOR) {
+						if (Dungeon.level.traps.get(p) == null || Dungeon.level.traps.get(p).canBeSearched) {
 							smthFound = true;
 						}
 					}
+				}
+			}
 
 			if (smthFound && !cursed){
 				if (warn == 0){

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisintegrationTrap.java

@@ -43,12 +43,8 @@ public class DisintegrationTrap extends Trap {
 	{
 		color = VIOLET;
 		shape = CROSSHAIR;
-	}
 		
-	@Override
+		canBeHidden = false;
-	public Trap hide() {
-		//this one can't be hidden
-		return reveal();
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrimTrap.java

@@ -40,12 +40,8 @@ public class GrimTrap extends Trap {
 	{
 		color = GREY;
 		shape = LARGE_DOT;
-	}
 		
-	@Override
+		canBeHidden = false;
-	public Trap hide() {
-		//cannot hide this trap
-		return reveal();
 	}
 
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PoisonDartTrap.java

@@ -40,12 +40,12 @@ public class PoisonDartTrap extends Trap {
 	{
 		color = GREEN;
 		shape = CROSSHAIR;
+		
+		canBeHidden = false;
 	}
 	
-	@Override
+	protected int poisonAmount(){
-	public Trap hide() {
+		return 8 + Math.round(2*Dungeon.depth / 3f);
-		//this one can't be hidden
-		return reveal();
 	}
 	
 	@Override
@@ -85,8 +85,7 @@ public class PoisonDartTrap extends Trap {
 									if (finalTarget == Dungeon.hero && !finalTarget.isAlive()){
 										Dungeon.fail( trap.getClass() );
 									}
-									Buff.affect( finalTarget, Poison.class )
+									Buff.affect( finalTarget, Poison.class ).set( poisonAmount() );
-											.set( 8 + Math.round(2*Dungeon.depth / 3f) );
 									Sample.INSTANCE.play(Assets.SND_HIT, 1, 1, Random.Float(0.8f, 1.25f));
 									finalTarget.sprite.bloodBurstA(finalTarget.sprite.center(), dmg);
 									finalTarget.sprite.flash();
@@ -99,8 +98,7 @@ public class PoisonDartTrap extends Trap {
 				});
 			} else {
 				finalTarget.damage(Random.NormalIntRange(1, 4) - finalTarget.drRoll(), trap);
-				Buff.affect( finalTarget, Poison.class )
+				Buff.affect( finalTarget, Poison.class ).set( poisonAmount() );
-						.set( 8 + Math.round(2*Dungeon.depth / 3f) );
 			}
 		}
 	}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/RockfallTrap.java

@@ -47,12 +47,8 @@ public class RockfallTrap extends Trap {
 	{
 		color = GREY;
 		shape = DIAMOND;
-	}
 		
-	@Override
+		canBeHidden = false;
-	public Trap hide() {
-		//this one can't be hidden
-		return reveal();
 	}
 	
 	@Override

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/Trap.java

@@ -61,6 +61,9 @@ public abstract class Trap implements Bundlable {
 	public boolean visible;
 	public boolean active = true;
 	
+	public boolean canBeHidden = true;
+	public boolean canBeSearched = true;
+
 	public Trap set(int pos){
 		this.pos = pos;
 		return this;
@@ -73,9 +76,13 @@ public abstract class Trap implements Bundlable {
 	}
 
 	public Trap hide() {
+		if (canBeHidden) {
 			visible = false;
 			GameScene.updateMap(pos);
 			return this;
+		} else {
+			return reveal();
+		}
 	}
 
 	public void trigger() {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/WornDartTrap.java

@@ -40,12 +40,6 @@ public class WornDartTrap extends Trap {
 		shape = CROSSHAIR;
 	}
 
-	@Override
-	public Trap hide() {
-		//this one can't be hidden
-		return reveal();
-	}
-
 	@Override
 	public void activate() {
 		Char target = Actor.findChar(pos);