diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index eec279897..3e655dc6a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -39,7 +39,6 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Corrosion; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Corruption; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Doom; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.EarthImbue; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FireImbue; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.FrostImbue; @@ -306,12 +305,8 @@ public abstract class Char extends Actor { enemy.damage( effectiveDamage, this ); - if (buff(FireImbue.class) != null) - buff(FireImbue.class).proc(enemy); - if (buff(EarthImbue.class) != null) - buff(EarthImbue.class).proc(enemy); - if (buff(FrostImbue.class) != null) - buff(FrostImbue.class).proc(enemy); + if (buff(FireImbue.class) != null) buff(FireImbue.class).proc(enemy); + if (buff(FrostImbue.class) != null) buff(FrostImbue.class).proc(enemy); if (enemy.isAlive() && prep != null && prep.canKO(enemy)){ enemy.HP = 0; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java index 537bb3a09..0eacea9fc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java @@ -286,12 +286,8 @@ public class Combo extends Buff implements ActionIndicator.Action { break; } - if (target.buff(FireImbue.class) != null) - target.buff(FireImbue.class).proc(enemy); - if (target.buff(EarthImbue.class) != null) - target.buff(EarthImbue.class).proc(enemy); - if (target.buff(FrostImbue.class) != null) - target.buff(FrostImbue.class).proc(enemy); + if (target.buff(FireImbue.class) != null) target.buff(FireImbue.class).proc(enemy); + if (target.buff(FrostImbue.class) != null) target.buff(FrostImbue.class).proc(enemy); target.hitSound(Random.Float(0.87f, 1.15f)); if (type != finisherType.FURY) Sample.INSTANCE.play(Assets.Sounds.HIT_STRONG); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/EarthImbue.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/EarthImbue.java deleted file mode 100644 index 58667c873..000000000 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/EarthImbue.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Pixel Dungeon - * Copyright (C) 2012-2015 Oleg Dolya - * - * Shattered Pixel Dungeon - * Copyright (C) 2014-2021 Evan Debenham - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - */ - -package com.shatteredpixel.shatteredpixeldungeon.actors.buffs; - -import com.shatteredpixel.shatteredpixeldungeon.actors.Char; -import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; -import com.shatteredpixel.shatteredpixeldungeon.effects.particles.EarthParticle; -import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; -import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; - -//pre-0.7.0, otherwise unused -public class EarthImbue extends FlavourBuff { - - { - type = buffType.POSITIVE; - announced = true; - } - - public static final float DURATION = 30f; - - public void proc(Char enemy){ - Buff.affect(enemy, Cripple.class, 2); - CellEmitter.bottom(enemy.pos).start(EarthParticle.FACTORY, 0.05f, 8); - } - - @Override - public int icon() { - return BuffIndicator.ROOTS; - } - - @Override - public float iconFadePercent() { - return Math.max(0, (DURATION - visualcooldown()) / DURATION); - } - - @Override - public String toString() { - return Messages.get(this, "name"); - } - - @Override - public String desc() { - return Messages.get(this, "desc", dispTurns()); - } - -} \ No newline at end of file diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Brimstone.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Brimstone.java index 3072874ff..ad4ec9c49 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Brimstone.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Brimstone.java @@ -22,8 +22,6 @@ package com.shatteredpixel.shatteredpixeldungeon.items.armor.glyphs; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; -import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ShieldBuff; -import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; @@ -42,34 +40,4 @@ public class Brimstone extends Armor.Glyph { return ORANGE; } - //pre-0.7.4 saves - public static class BrimstoneShield extends ShieldBuff { - - { - type = buffType.POSITIVE; - } - - @Override - public boolean act() { - Hero hero = (Hero)target; - - if (hero.belongings.armor == null || !hero.belongings.armor.hasGlyph(Brimstone.class, hero)) { - detach(); - return true; - } - - if (shielding() > 0){ - decShield(); - - //shield decays at a rate of 1 per turn. - spend(TICK); - } else { - detach(); - } - - return true; - } - - } - }