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 62b9c68b9..f7d04e10f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -450,16 +450,17 @@ public abstract class Char extends Actor { buffs.add( buff ); Actor.add( buff ); - if (sprite != null) + if (sprite != null && buff.announced) switch(buff.type){ case POSITIVE: - sprite.showStatus(CharSprite.POSITIVE, buff.toString()); break; + sprite.showStatus(CharSprite.POSITIVE, buff.toString()); + break; case NEGATIVE: - sprite.showStatus(CharSprite.NEGATIVE, buff.toString());break; - case NEUTRAL: - sprite.showStatus(CharSprite.NEUTRAL, buff.toString()); break; - case SILENT: default: - break; //show nothing + sprite.showStatus(CharSprite.NEGATIVE, buff.toString()); + break; + case NEUTRAL: default: + sprite.showStatus(CharSprite.NEUTRAL, buff.toString()); + break; } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Adrenaline.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Adrenaline.java index 09a9a7d8a..a8de73425 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Adrenaline.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Adrenaline.java @@ -27,6 +27,10 @@ import com.watabou.noosa.Image; public class Adrenaline extends FlavourBuff { + { + type = buffType.POSITIVE; + } + public static final float DURATION = 10f; @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AdrenalineSurge.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AdrenalineSurge.java index 4f36cf304..c9bdc14c7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AdrenalineSurge.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/AdrenalineSurge.java @@ -27,6 +27,10 @@ import com.watabou.utils.Bundle; public class AdrenalineSurge extends Buff { + { + type = buffType.POSITIVE; + } + private int boost; private static final float INTERVAL = TICK * 500f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Amok.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Amok.java index 53633cbf4..08af643ec 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Amok.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Amok.java @@ -29,6 +29,7 @@ public class Amok extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Awareness.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Awareness.java index de6d4bf9e..1893d7958 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Awareness.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Awareness.java @@ -25,6 +25,10 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; public class Awareness extends FlavourBuff { + + { + type = buffType.POSITIVE; + } public static final float DURATION = 2f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barkskin.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barkskin.java index b00f3facc..3c06db6e6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barkskin.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barkskin.java @@ -26,6 +26,10 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.utils.Bundle; public class Barkskin extends Buff { + + { + type = buffType.POSITIVE; + } private int level = 0; private int interval = 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barrier.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barrier.java index 4572a2edc..c3e9414f2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barrier.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Barrier.java @@ -29,7 +29,9 @@ import com.watabou.utils.Bundle; public class Barrier extends ShieldBuff { - //TODO icon and description for phase 2 + { + type = buffType.POSITIVE; + } @Override public boolean act() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java index 71c4fe9ed..0ccf195e5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bleeding.java @@ -34,6 +34,7 @@ public class Bleeding extends Buff { { type = buffType.NEGATIVE; + announced = true; } protected int level; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bless.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bless.java index 23639e821..9b3525099 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bless.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Bless.java @@ -31,6 +31,7 @@ public class Bless extends FlavourBuff { { type = buffType.POSITIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Blindness.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Blindness.java index ae68218ec..250fe470c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Blindness.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Blindness.java @@ -29,6 +29,7 @@ public class Blindness extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/BlobImmunity.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/BlobImmunity.java index 5383d512c..b642395a0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/BlobImmunity.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/BlobImmunity.java @@ -39,6 +39,10 @@ import com.watabou.noosa.Image; public class BlobImmunity extends FlavourBuff { + { + type = buffType.POSITIVE; + } + public static final float DURATION = 20f; @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java index db349ff19..8730de653 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Buff.java @@ -39,10 +39,12 @@ public class Buff extends Actor { } //determines how the buff is announced when it is shown. - //buffs that work behind the scenes, or have other visual indicators can usually be silent. //FIXME should extend this to more buffs, want silent positive and silent negative? - public enum buffType {POSITIVE, NEGATIVE, NEUTRAL, SILENT}; - public buffType type = buffType.SILENT; + public enum buffType {POSITIVE, NEGATIVE, NEUTRAL}; + public buffType type = buffType.NEUTRAL; + + //whether or not the buff announces its name + public boolean announced = false; protected HashSet resistances = new HashSet<>(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java index ef07b6dae..e421bb04b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Burning.java @@ -61,6 +61,7 @@ public class Burning extends Buff implements Hero.Doom { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Charm.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Charm.java index 0f23aa82c..cc04ce3e3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Charm.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Charm.java @@ -33,6 +33,7 @@ public class Charm extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Chill.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Chill.java index a1e9a8572..3319b575d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Chill.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Chill.java @@ -32,6 +32,7 @@ public class Chill extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corrosion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corrosion.java index 09674f628..2c4aadd35 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corrosion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corrosion.java @@ -39,6 +39,7 @@ public class Corrosion extends Buff implements Hero.Doom { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java index 21f077a48..22e25ece5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Corruption.java @@ -30,6 +30,7 @@ public class Corruption extends Buff { { type = buffType.NEGATIVE; + announced = true; } private float buildToDamage = 0f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Cripple.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Cripple.java index 0c9d0a107..65702b2b6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Cripple.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Cripple.java @@ -30,6 +30,7 @@ public class Cripple extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Doom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Doom.java index 3ec149eba..565d93883 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Doom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Doom.java @@ -29,6 +29,7 @@ public class Doom extends Buff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Drowsy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Drowsy.java index 776b169b4..fa5f64910 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Drowsy.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Drowsy.java @@ -30,6 +30,7 @@ public class Drowsy extends Buff { { type = buffType.NEUTRAL; + announced = true; } @Override 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 index a69f0274e..c77431fe7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/EarthImbue.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/EarthImbue.java @@ -29,6 +29,10 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.noosa.Image; public class EarthImbue extends FlavourBuff { + + { + type = buffType.POSITIVE; + } public static final float DURATION = 30f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FireImbue.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FireImbue.java index cbc296121..6fce93d41 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FireImbue.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FireImbue.java @@ -33,6 +33,10 @@ import com.watabou.utils.Bundle; import com.watabou.utils.Random; public class FireImbue extends Buff { + + { + type = buffType.POSITIVE; + } public static final float DURATION = 30f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java index 7e628c96a..dea0e2960 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java @@ -45,6 +45,7 @@ public class Frost extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Fury.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Fury.java index d58381e45..5262ffb07 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Fury.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Fury.java @@ -30,6 +30,7 @@ public class Fury extends Buff { { type = buffType.POSITIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Haste.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Haste.java index f460d9815..42d4d0d89 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Haste.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Haste.java @@ -27,6 +27,10 @@ import com.watabou.noosa.Image; public class Haste extends FlavourBuff { + { + type = buffType.POSITIVE; + } + public static final float DURATION = 20f; @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Healing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Healing.java index b40e8b248..254b49afe 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Healing.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Healing.java @@ -37,6 +37,8 @@ public class Healing extends Buff { //unlike other buffs, this one acts after the hero and takes priority against other effects //healing is much more useful if you get some of it off before taking damage actPriority = HERO_PRIO - 1; + + type = buffType.POSITIVE; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invisibility.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invisibility.java index 79ad83b48..537983cf4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invisibility.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invisibility.java @@ -39,6 +39,7 @@ public class Invisibility extends FlavourBuff { { type = buffType.POSITIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Levitation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Levitation.java index f5e225611..48fb344d9 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Levitation.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Levitation.java @@ -29,6 +29,10 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.noosa.Image; public class Levitation extends FlavourBuff { + + { + type = buffType.POSITIVE; + } public static final float DURATION = 20f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Light.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Light.java index d91eef7f8..02b3db6b3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Light.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Light.java @@ -29,6 +29,10 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.noosa.Image; public class Light extends FlavourBuff { + + { + type = buffType.POSITIVE; + } public static final float DURATION = 300f; public static final int DISTANCE = 6; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSight.java index 38d751233..683743bee 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MagicalSight.java @@ -35,6 +35,7 @@ public class MagicalSight extends FlavourBuff { { type = buffType.POSITIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MindVision.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MindVision.java index 7d7bc2903..d8dd75062 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MindVision.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/MindVision.java @@ -35,6 +35,7 @@ public class MindVision extends FlavourBuff { { type = buffType.POSITIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Momentum.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Momentum.java index 967f12e61..fd1c71cd6 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Momentum.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Momentum.java @@ -28,6 +28,10 @@ import com.watabou.utils.Bundle; public class Momentum extends Buff { + { + type = buffType.POSITIVE; + } + private int stacks = 0; private int turnsSinceMove = 0; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java index 98cebdeeb..5e6e6f115 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Ooze.java @@ -31,6 +31,7 @@ public class Ooze extends Buff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java index 9193173e6..ed818d848 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Paralysis.java @@ -36,6 +36,7 @@ public class Paralysis extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override @@ -102,6 +103,10 @@ public class Paralysis extends FlavourBuff { public static class ParalysisResist extends Buff { + { + type = buffType.POSITIVE; + } + private int damage; @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java index a05437d39..1cd412cb7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Poison.java @@ -41,6 +41,7 @@ public class Poison extends Buff implements Hero.Doom { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Recharging.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Recharging.java index 6d9a1d1a6..a7389afda 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Recharging.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Recharging.java @@ -26,6 +26,10 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator; import com.watabou.noosa.Image; public class Recharging extends FlavourBuff { + + { + type = buffType.POSITIVE; + } @Override public int icon() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Roots.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Roots.java index 07d8df163..4620a2e28 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Roots.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Roots.java @@ -29,6 +29,7 @@ public class Roots extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java index 3a9265c20..831d1957e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Shadows.java @@ -37,7 +37,7 @@ public class Shadows extends Invisibility { private static final String LEFT = "left"; { - type = buffType.SILENT; + announced = false; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Slow.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Slow.java index 64966fa65..2f275f4c4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Slow.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Slow.java @@ -28,6 +28,7 @@ public class Slow extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } public static final float DURATION = 10f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SoulMark.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SoulMark.java index b0f6b7714..af004c850 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SoulMark.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/SoulMark.java @@ -31,6 +31,7 @@ public class SoulMark extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Stamina.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Stamina.java index 535d4c9c1..7fba2ee69 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Stamina.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Stamina.java @@ -27,6 +27,10 @@ import com.watabou.noosa.Image; public class Stamina extends FlavourBuff { + { + type = buffType.POSITIVE; + } + @Override public int icon() { return BuffIndicator.MOMENTUM; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Terror.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Terror.java index 4614817b0..2defa2e18 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Terror.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Terror.java @@ -33,6 +33,7 @@ public class Terror extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ToxicImbue.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ToxicImbue.java index 46b587a73..870e18e8a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ToxicImbue.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ToxicImbue.java @@ -30,6 +30,10 @@ import com.watabou.noosa.Image; import com.watabou.utils.Bundle; public class ToxicImbue extends Buff { + + { + type = buffType.POSITIVE; + } public static final float DURATION = 30f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java index 5ca5e17f5..57fb2b3d2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Vertigo.java @@ -30,6 +30,7 @@ public class Vertigo extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java index f84208042..a2005a0d0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Weakness.java @@ -30,6 +30,7 @@ public class Weakness extends FlavourBuff { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java index 7c66bb0c0..f38da18c0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/MirrorImage.java @@ -208,6 +208,10 @@ public class MirrorImage extends NPC { public static class MirrorInvis extends Invisibility { + { + announced = false; + } + @Override public int icon() { return BuffIndicator.NONE; 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 b2b888c7f..21a57548e 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 @@ -45,6 +45,10 @@ public class Brimstone extends Armor.Glyph { } public static class BrimstoneShield extends ShieldBuff { + + { + type = buffType.POSITIVE; + } @Override public boolean act() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Camouflage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Camouflage.java index b11162fa3..b365d35ac 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Camouflage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Camouflage.java @@ -46,6 +46,11 @@ public class Camouflage extends Armor.Glyph { } public static class Camo extends Invisibility { + + { + announced = false; + } + private int pos; private int left; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java index c2712a28b..1462ed59f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/glyphs/Viscosity.java @@ -72,6 +72,10 @@ public class Viscosity extends Glyph { public static class DeferedDamage extends Buff { + { + type = buffType.NEGATIVE; + } + protected int damage = 0; private static final String DAMAGE = "damage"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java index 9c806d532..d6a52684d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/CloakOfShadows.java @@ -200,6 +200,11 @@ public class CloakOfShadows extends Artifact { } public class cloakStealth extends ArtifactBuff{ + + { + type = buffType.POSITIVE; + } + int turnsToCost = 0; @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java index c159231a2..c4a7e58c2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/TimekeepersHourglass.java @@ -222,6 +222,10 @@ public class TimekeepersHourglass extends Artifact { } public class timeStasis extends ArtifactBuff { + + { + type = buffType.POSITIVE; + } @Override public boolean attachTo(Char target) { @@ -269,6 +273,10 @@ public class TimekeepersHourglass extends Artifact { } public class timeFreeze extends ArtifactBuff { + + { + type = buffType.POSITIVE; + } float partialTime = 1f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java index 125b30913..2541cffb0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAggression.java @@ -67,6 +67,7 @@ public class StoneOfAggression extends Runestone { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java index fbc2b380b..0e36c635d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfAvoidance.java @@ -67,6 +67,7 @@ public class StoneOfAvoidance extends Runestone { { type = buffType.NEGATIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Earthroot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Earthroot.java index af3130f65..e8399bf82 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Earthroot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Earthroot.java @@ -74,6 +74,7 @@ public class Earthroot extends Plant { { type = buffType.POSITIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java index eb3b1ccd1..1659f7e53 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Sungrass.java @@ -75,6 +75,7 @@ public class Sungrass extends Plant { { type = buffType.POSITIVE; + announced = true; } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java index 672d93119..8fcd1a85f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java @@ -61,6 +61,7 @@ public class Swiftthistle extends Plant { { type = buffType.POSITIVE; + announced = true; } @Override