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.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Hunger;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.LockedFloor;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
@@ -200,7 +201,7 @@ public class TimekeepersHourglass extends Artifact {
public class hourglassRecharge extends ArtifactBuff {
@Override
public boolean act() {
if (charge < chargeCap && !cursed) {
if (charge < chargeCap && !cursed && target.buff(LockedFloor.class) == null) {
partialCharge += 1 / (60f - (chargeCap - charge)*2f);
if (partialCharge >= 1) {