From 4368408c79526c0fcc81045c69ebdeb01763b25d Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 12 Oct 2017 01:05:03 -0400 Subject: [PATCH] v0.6.2: adjusted a few trap mechanics - slightly boosted the damage of gripping and flashing traps - cursing traps now always prefer to curse weapons and armor - pitfall traps now check for walls specifically, not just solid terrain --- .../shatteredpixeldungeon/levels/traps/CursingTrap.java | 4 ++-- .../shatteredpixeldungeon/levels/traps/FlashingTrap.java | 2 +- .../shatteredpixeldungeon/levels/traps/GrippingTrap.java | 2 +- .../shatteredpixeldungeon/levels/traps/PitfallTrap.java | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java index eb883a36c..6a7a459ab 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/CursingTrap.java @@ -93,12 +93,12 @@ public class CursingTrap extends Trap { KindofMisc misc1 = hero.belongings.misc1; if (misc1 != null){ - priorityCurse.add(misc1); + canCurse.add(misc1); } KindofMisc misc2 = hero.belongings.misc2; if (misc2 != null){ - priorityCurse.add(misc2); + canCurse.add(misc2); } Collections.shuffle(priorityCurse); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java index c81681395..ae9f430a7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/FlashingTrap.java @@ -59,7 +59,7 @@ public class FlashingTrap extends Trap { Char c = Actor.findChar( pos ); if (c != null) { - int damage = Math.max( 0, (Dungeon.depth) - c.drRoll() ); + int damage = Math.max( 0, (4 + Dungeon.depth) - c.drRoll() ); Buff.affect( c, Bleeding.class ).set( damage ); Buff.prolong( c, Blindness.class, 10f ); Buff.prolong( c, Cripple.class, 20f ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java index 62c77a6ab..8c11f4cbe 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/GrippingTrap.java @@ -57,7 +57,7 @@ public class GrippingTrap extends Trap { Char c = Actor.findChar( pos ); if (c != null) { - int damage = Math.max( 0, (Dungeon.depth) - c.drRoll() ); + int damage = Math.max( 0, (2 + Dungeon.depth) - c.drRoll() ); Buff.affect( c, Bleeding.class ).set( damage ); Buff.prolong( c, Cripple.class, Cripple.DURATION); Wound.hit( c ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java index 5687fcac0..bceea379b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/PitfallTrap.java @@ -67,11 +67,11 @@ public class PitfallTrap extends Trap { super.disarm(); int stateChanges = 0; - boolean curPassable = Dungeon.level.passable[pos + PathFinder.CIRCLE8[PathFinder.CIRCLE8.length-1]]; + boolean curWall = Dungeon.level.map[pos + PathFinder.CIRCLE8[PathFinder.CIRCLE8.length-1]] == Terrain.WALL; for (int i : PathFinder.CIRCLE8){ - if (curPassable != Dungeon.level.passable[pos + i]){ + if (curWall != (Dungeon.level.map[pos + i] == Terrain.WALL)){ stateChanges++; - curPassable = Dungeon.level.passable[pos + i]; + curWall = Dungeon.level.map[pos + i] == Terrain.WALL; } }