v0.3.2: changed most passive effects to pause when a floor is locked

This commit is contained in:
Evan Debenham
2015-11-04 02:37:32 -05:00
parent 0bcaba7a7c
commit 257ca8a6c6
11 changed files with 23 additions and 14 deletions
@@ -24,6 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Awareness;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
@@ -156,7 +157,7 @@ public class TalismanOfForesight extends Artifact {
}
}
if (smthFound == true && !cursed){
if (smthFound && !cursed){
if (warn == 0){
GLog.w("You feel uneasy.");
if (target instanceof Hero){
@@ -172,7 +173,7 @@ public class TalismanOfForesight extends Artifact {
BuffIndicator.refreshHero();
//fully charges in 2500 turns at lvl=0, scaling to 1000 turns at lvl = 10.
if (charge < 100 && !cursed) {
if (charge < 100 && !cursed && target.buff(LockedFloor.class) == null) {
partialCharge += 0.04+(level*0.006);
if (partialCharge > 1 && charge < 100) {