v0.6.2: redesigned secret door and searching mechanics

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Hunger.java

@@ -74,7 +74,7 @@ public class Hunger extends Buff implements Hero.Doom {
 
 			if (isStarving()) {
 
-				partialDamage += target.HT/100f;
+				partialDamage += STEP * target.HT/1000f;
 
 				if (partialDamage > 1){
 					target.damage( (int)partialDamage, this);
@@ -139,7 +139,9 @@ public class Hunger extends Buff implements Hero.Doom {
 		if (level < 0) {
 			level = 0;
 		} else if (level > STARVING) {
+			float excess = level - STARVING;
 			level = STARVING;
+			partialDamage += excess * (target.HT/1000f);
 		}
 
 		BuffIndicator.refreshHero();

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

@@ -138,6 +138,7 @@ public class Hero extends Char {
 	
 	private static final float TIME_TO_REST		    = 1f;
 	private static final float TIME_TO_SEARCH	    = 2f;
+	private static final float HUNGER_FOR_SEARCH	= 6f;
 	
 	public HeroClass heroClass = HeroClass.ROGUE;
 	public HeroSubClass subClass = HeroSubClass.NONE;
@@ -152,8 +153,6 @@ public class Hero extends Char {
 
 	private Char enemy;
 	
-	private Item theKey;
-	
 	public boolean resting = false;
 
 	public MissileWeapon rangedWeapon = null;
@@ -180,7 +179,6 @@ public class Hero extends Char {
 		
 		HP = HT = 20;
 		STR = STARTING_STR;
-		awareness = 0.1f;
 		
 		belongings = new Belongings( this );
 		
@@ -249,7 +247,6 @@ public class Hero extends Char {
 		defenseSkill = bundle.getInt( DEFENSE );
 		
 		STR = bundle.getInt( STRENGTH );
-		updateAwareness();
 		
 		lvl = bundle.getInt( LEVEL );
 		exp = bundle.getInt( EXPERIENCE );
@@ -1215,9 +1212,6 @@ public class Hero extends Char {
 				Sample.INSTANCE.play( Assets.SND_LEVELUP );
 			}
 			
-			if (lvl < 10) {
-				updateAwareness();
-			}
 		}
 		
 		if (levelUp) {
@@ -1234,13 +1228,6 @@ public class Hero extends Char {
 		return 5 + lvl * 5;
 	}
 	
-	void updateAwareness() {
-		awareness = (float)(1 - Math.pow(
-			(heroClass == HeroClass.ROGUE ? 0.85 : 0.90),
-			(1 + Math.min( lvl,  9 )) * 0.5
-		));
-	}
-	
 	public boolean isStarving() {
 		return buff(Hunger.class) != null && ((Hunger)buff( Hunger.class )).isStarving();
 	}
@@ -1487,16 +1474,7 @@ public class Hero extends Char {
 		
 		boolean smthFound = false;
 
-		int positive = 0;
+		int distance = 1;
-		int negative = 0;
-
-		int distance = 1 + positive + negative;
-
-		float level = intentional ? (2 * awareness - awareness * awareness) : awareness;
-		if (distance <= 0) {
-			level /= 2 - distance;
-			distance = 1;
-		}
 		
 		int cx = pos % Dungeon.level.width();
 		int cy = pos / Dungeon.level.width();
@@ -1518,11 +1496,7 @@ public class Hero extends Char {
 		}
 
 		TalismanOfForesight.Foresight foresight = buff( TalismanOfForesight.Foresight.class );
-
+		boolean cursed = foresight != null && foresight.isCursed();
-		//cursed talisman of foresight makes unintentionally finding things impossible.
-		if (foresight != null && foresight.isCursed()){
-			level = -1;
-		}
 		
 		for (int y = ay; y <= by; y++) {
 			for (int x = ax, p = ax + y * Dungeon.level.width(); x <= bx; x++, p++) {
@@ -1533,7 +1507,27 @@ public class Hero extends Char {
 						sprite.parent.addToBack( new CheckedCell( p ) );
 					}
 					
-					if (Level.secret[p] && (intentional || Random.Float() < level)) {
+					if (Level.secret[p]){
+						
+						float chance;
+						//intentional searches always succeed
+						if (intentional){
+							chance = 1f;
+						
+						//unintentional searches always fail with a cursed talisman
+						} else if (cursed) {
+							chance = 0f;
+							
+						//unintentional trap detection scales from 40% at floor 0 to 30% at floor 25
+						} else if (Dungeon.level.map[p] == Terrain.SECRET_TRAP) {
+							chance = 0.4f - (Dungeon.depth / 250f);
+							
+						//unintentional door detection scales from 20% at floor 0 to 0% at floor 20
+						} else {
+							chance = 0.2f - (Dungeon.depth / 100f);
+						}
+						
+						if (Random.Float() < chance) {
 						
 							int oldValue = Dungeon.level.map[p];
 							
@@ -1551,17 +1545,19 @@ public class Hero extends Char {
 					}
 				}
 			}
+		}
 
 		
 		if (intentional) {
 			sprite.showStatus( CharSprite.DEFAULT, Messages.get(this, "search") );
 			sprite.operate( pos );
-			if (foresight != null && foresight.isCursed()){
+			if (cursed){
 				GLog.n(Messages.get(this, "search_distracted"));
-				spendAndNext(TIME_TO_SEARCH * 3);
+				buff(Hunger.class).reduceHunger(TIME_TO_SEARCH - (2*HUNGER_FOR_SEARCH));
 			} else {
-				spendAndNext(TIME_TO_SEARCH);
+				buff(Hunger.class).reduceHunger(TIME_TO_SEARCH - HUNGER_FOR_SEARCH);
 			}
+			spendAndNext(TIME_TO_SEARCH);
 			
 		}
 		

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

@@ -80,7 +80,6 @@ public enum HeroClass {
 				break;
 		}
 		
-		hero.updateAwareness();
 	}
 
 	private static void initCommon( Hero hero ) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RegularPainter.java

@@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
 import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
 import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard.EmptyRoom;
 import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
+import com.watabou.utils.Graph;
 import com.watabou.utils.PathFinder;
 import com.watabou.utils.Point;
 import com.watabou.utils.Random;
@@ -104,14 +105,14 @@ public abstract class RegularPainter extends Painter {
 			rooms = new ArrayList<>();
 		}
 		
+		Random.shuffle(rooms);
+		
 		for (Room r : rooms) {
 			placeDoors( r );
 			r.paint( level );
 		}
 		
-		for (Room r : rooms) {
+		paintDoors( level, rooms );
-			paintDoors( level, r );
-		}
 		
 		if (waterFill > 0f) {
 			paintWater( level, rooms );
@@ -151,17 +152,32 @@ public abstract class RegularPainter extends Painter {
 		}
 	}
 	
-	protected void paintDoors( Level l, Room r ) {
+	protected void paintDoors( Level l, ArrayList<Room> rooms ) {
+		for (Room r : rooms) {
 			for (Room n : r.connected.keySet()) {
 				
-			if (joinRooms( l, r, n )) {
+				if (joinRooms(l, r, n)) {
-				
 					continue;
 				}
 				
-			Room.Door d = r.connected.get( n );
+				Room.Door d = r.connected.get(n);
 				int door = d.x + d.y * l.width();
 				
+				if (d.type == Room.Door.Type.REGULAR){
+					//chance for a hidden door scales from 3/21 on floor 2 to 3/3 on floor 20
+					if (Dungeon.depth > 1 &&
+							(Dungeon.depth >= 20 || Random.Int(23 - Dungeon.depth) < Dungeon.depth)) {
+						d.type = Room.Door.Type.HIDDEN;
+						Graph.buildDistanceMap(rooms, r);
+						//don't hide if it would make this room only accessible by hidden doors
+						if (n.distance == Integer.MAX_VALUE){
+							d.type = Room.Door.Type.UNLOCKED;
+						}
+					} else {
+						d.type = Room.Door.Type.UNLOCKED;
+					}
+				}
+				
 				switch (d.type) {
 					case EMPTY:
 						l.map[door] = Terrain.EMPTY;
@@ -169,14 +185,6 @@ public abstract class RegularPainter extends Painter {
 					case TUNNEL:
 						l.map[door] = l.tunnelTile();
 						break;
-				case REGULAR:
-					if (Dungeon.depth <= 1) {
-						l.map[door] = Terrain.DOOR;
-					} else {
-						boolean secret = (Dungeon.depth < 6 ? Random.Int( 12 - Dungeon.depth ) : Random.Int( 6 )) == 0;
-						l.map[door] = secret ? Terrain.SECRET_DOOR : Terrain.DOOR;
-					}
-					break;
 					case UNLOCKED:
 						l.map[door] = Terrain.DOOR;
 						break;
@@ -192,6 +200,7 @@ public abstract class RegularPainter extends Painter {
 				}
 			}
 		}
+	}
 	
 	protected boolean joinRooms( Level l, Room r, Room n ) {
 		

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java

@@ -336,7 +336,16 @@ public class Room extends Rect implements Graph.Node, Bundlable {
 
 	@Override
 	public Collection<Room> edges() {
-		return neigbours;
+		ArrayList<Room> edges = new ArrayList<>();
+		for( Room r : connected.keySet()){
+			Door d = connected.get(r);
+			//for the purposes of path building, ignore all doors that are locked, blocked, or hidden
+			if (d.type == Door.Type.EMPTY || d.type == Door.Type.TUNNEL
+					|| d.type == Door.Type.UNLOCKED || d.type == Door.Type.REGULAR){
+				edges.add(r);
+			}
+		}
+		return edges;
 	}
 	
 	public String legacyType = "NULL";

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/BlacksmithRoom.java

@@ -61,7 +61,7 @@ public class BlacksmithRoom extends StandardRoom {
 		}
 		
 		for (Door door : connected.values()) {
-			door.set( Door.Type.UNLOCKED );
+			door.set( Door.Type.REGULAR );
 			Painter.drawInside( level, this, door, 1, Terrain.EMPTY );
 		}
 		

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/HallwayRoom.java

@@ -87,7 +87,7 @@ public class HallwayRoom extends EmptyRoom {
 		}
 
 		for (Door door : connected.values()) {
-			door.set( Door.Type.UNLOCKED );
+			door.set( Door.Type.REGULAR );
 		}
 	}
 

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/SewerPipeRoom.java

@@ -154,7 +154,7 @@ public class SewerPipeRoom extends StandardRoom {
 		}
 
 		for (Door door : connected.values()) {
-			door.set( Door.Type.UNLOCKED );
+			door.set( Door.Type.REGULAR );
 		}
 	}
 

core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/actors/actors.properties

@@ -218,7 +218,7 @@ actors.hero.hero.locked_door=You don't have a matching key.
 actors.hero.hero.noticed_smth=You noticed something.
 actors.hero.hero.wait=...
 actors.hero.hero.search=search
-actors.hero.hero.search_distracted=You can't concentrate, searching takes a while.
+actors.hero.hero.search_distracted=It's hard to concentrate, searching is exhausting.
 actors.hero.hero.pain_resist=The pain helps you resist the urge to sleep.
 actors.hero.hero.revive=The ankh explodes with life-giving energy!