From 7e4911effe768538c025515292bd5c4f33186a11 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 25 Apr 2022 12:36:01 -0400
Subject: [PATCH] v1.3.0: large pass on buff icons and types, lots of small
 fixes

---
 core/src/main/assets/interfaces/buffs.png     | Bin 1358 -> 1454 bytes
 .../main/assets/interfaces/large_buffs.png    | Bin 2801 -> 3040 bytes
 .../assets/messages/actors/actors.properties  |   2 +-
 .../assets/messages/items/items.properties    |   5 +++
 .../actors/buffs/Adrenaline.java              |   8 ++++-
 .../actors/buffs/AdrenalineSurge.java         |   8 ++++-
 .../actors/buffs/Berserk.java                 |   4 +++
 .../actors/buffs/Combo.java                   |   4 +++
 .../actors/buffs/FireImbue.java               |   8 ++++-
 .../actors/buffs/FrostImbue.java              |   8 ++++-
 .../actors/buffs/Levitation.java              |   6 ++++
 .../actors/buffs/LifeLink.java                |   8 ++++-
 .../actors/buffs/Preparation.java             |   1 +
 .../actors/buffs/ScrollEmpower.java           |   2 +-
 .../actors/buffs/Shadows.java                 |   1 +
 .../actors/buffs/SoulMark.java                |   4 +--
 .../actors/buffs/ToxicImbue.java              |   8 ++++-
 .../hero/abilities/huntress/NaturesPower.java |   6 +++-
 .../hero/abilities/rogue/DeathMark.java       |   8 ++++-
 .../actors/hero/abilities/warrior/Endure.java |  12 ++++++-
 .../items/artifacts/CloakOfShadows.java       |   6 ++++
 .../items/artifacts/TimekeepersHourglass.java |  32 +++++++++++++++++
 .../potions/exotic/PotionOfCleansing.java     |   4 +++
 .../items/spells/FeatherFall.java             |  34 +++++++++++++++++-
 .../items/stones/StoneOfAggression.java       |  24 +++++++++----
 .../items/wands/WandOfLivingEarth.java        |  10 ++++++
 .../items/weapon/enchantments/Blocking.java   |   4 +++
 .../items/weapon/enchantments/Kinetic.java    |   4 +++
 .../ui/BuffIndicator.java                     |   7 +++-
 29 files changed, 206 insertions(+), 22 deletions(-)

diff --git a/core/src/main/assets/interfaces/buffs.png b/core/src/main/assets/interfaces/buffs.png
index 7f9243f080e6fd4a199e411d57376abadd748cf8..40802de80919970e66f0b549aa02cecf050b5378 100644
GIT binary patch
delta 1170
zcmV;D1a14y3a$%~BnuQ!OjJd<Vz_2zW|1#5k!3uQq+<iJ>Hm`l0V)$yQ&azc0I8{|
zfPa5)cSme;VI-3^0Uv(^I7vi7RCobokX2#@F$@D20(EJb8Sa0^DpvW8=~I(LpTs0d
zk`!ZzC60Jv$P<w-j4>k5<b}MFH)6;;$w;0@QBjs<5d<=0AW$VLP}emC8WCx%YrDQ{
zogZ)pZ!!_dRA3w-Fio?Fm>LCvWm$s2x~?j)eF^MA;0OZebzOhwj{x$cA}WhGHpb`=
zR4D}bC@a=tT!-Y&c|G1B48!N6WuCAM>QP|ZHWj#c2pn3-5B(!hM%uBVKw4EWFv1eC
z7}p1!*AoOJ`)IE$l-)+6AX>H7!VSZ+y&zSdnOQMoz!2vD|BvmSwntU=GSeB4!|9{e
z9mxrpp@B5w)Bb-JTtMK0x8Q4R<O2wNd*@r;f-pn{xc+O{*Uhb@0Sa6{2xQs7$3N0Q
zfX#fvm*P#nC;+H|MBv+R@1TVrXu!_^Cm?CyV}rtv&wvp$kg<$`kFg+dfkgpUa3zQQ
z90aa{ADn^HQ;<q=1~^l{>=ZB`0$30r8p5AG1t#*MAc}vYB+BB7sEDdCvl@0?G(=Oh
z#0Me()(%W00+}?)AiP6?E-4gy{bIidfjEvKa5s+cLZItb<r1O5zzGa%LkNs;enwtk
zOeip+z;rg7O+RQG;{yQ!SV+K4(WyY66ie|un8&4ZT;}IWfeQj|A%6e^8@Ai+q1E53
z!=S!cl0|<LjGIS+>1?%H&8CJ}3ar<LZ!h2*=#Vo3$U>lej}3SMH83F6TCI&$I|wWr
z4Stjlfyo30$Tt`SsKDA@00z1RyngIs12o_aFyA-8>!$$W3|zvNK+*svfDJSj4K~1h
z3HSzd{dO+E3Nl^*1{y--`x)R6#27;6Lx2V77My?00Pn%V&%lHnX8_r53>-#*UwjHE
z@as<j;$5^jJBB4;B8s9A+e9Et<U}B@i>t!KRnZbAlAs9ts&E2$@tKw4(j40^@F2Q?
z!2Jk(91wm(!V5gW1MvX`1`=SIeB9%OV-IbE?cRP8*gAp0fPO%J5J6zK-|Zeb0bLz#
zH^zUhbdgGbkWO7hFbE;w{tX25sQ=iNk#nzvM1c7apaB|qxOvD1_zMbbA3uSB>~#*A
zA4jFDPoF(~dJu4{G{?ZtOR034pD4V49|p$;j0SGQA@@1S1p|T?16Cri**xED?C`5W
ztA+fQ1v-1I(KRq<120~@d?5iQoHhUf5V?QORR3`bKDN^aOf$e&o^L=e;KAUrW&i^I
z79fA_8hHBjnFM&5AD_;E8qlAqx*wVWHK4ohXFxh=NCGH8`D!3`GqBt3C7>7S=_v@q
zFgXQG{}rcT0Gxmb_&GlXbMZ=K#G$S$;>I6{1h%gs@aD}M2y6)i-Ue?Wpl8n?F7Q@*
zJ3kdbIyUmJTzU7$3v6`@kbe|7jGglTcmd!Wph3nrP(c14FR(obU~veM?`NQZ{6ALU
kZ*U5*|49D+0{;tq2gfpcD5l1!(*OVf07*qoM6N<$f<qes#{d8T

delta 1075
zcmV-31kC%c3(g9VBnt>oOjJd<Vz_41|B){<1G4G=kzzapv+Dnmo@0{)0V)Je{q=8?
zK>;6s1LR3WK~#7FWRL}-;2;bIX|cMy>;12|FJ!+D?n4A4JjVBZiJ}<I7{)S+37GH$
zOod^@#7x4ZjAAk-XNp3IvZ|_*1Zt%q(D+WEZCeO*xVh7&AI70Kc0w~*m18n@0`m-k
zWm)O{76}5|wvoWT?@r+O5I9NTB7ysPp8HFG0Pl-ZRHf%((M6z<5a3VgP-_%3;N`(s
z*I0$eQ26`E;kwXXq`v~kaX5kZguvwz-lzN}Pzjek#R9TvV8GXrhDI?XVXSK`&F3V5
z#}R?$A7^Eu+(-<@;F-%F{JnB}T-=><!yK2H8Q%X*PO=hjndCU->a#4bVLuYKU>X2_
z)7*k_O!z|pn4FsA7Q`_k!1{YJ`^=9t0RjxQ0cM!Mj~5b%FzIi2lf8)-0YFM11(=+i
z>gjndfzW|j1`rbXVL*7f14bc%Q9}m^{DT0~7zFrEfI0Zj0icI^t^*HGK_<fvuv70k
z1tcJVAL%KWc>NTZG%qbki&9p~N!?O^UMfgtR>UkxWvL=nr7sfQtrnS-0*sDOqcE=%
zpg}DxHd~9WCIFms09bNv2>=a0@?8`GmOa2qaRmUYI6tcaV2vWcIsrB|H#axF)Qt9#
z1OQM7z_;ijK#N+;x~*u-WpggaSN8%30Q`XeG6-y?R;#U8=~D>=rR^PRo6BE+t8@T1
zHg|V-H#gvI1lZf-kqH1HfjadF0I&ea?K6P@pahnwLa|uGD7FE1%4NRf4}kS`5WwF+
z5Y=E=3jiR{7I6KTodih04$wa&!1WV=Vh6e~1&}6y1~7s0c9{v#UjQKit=}F4j52@#
z00NZ|{-FabfkO%D4*&+BEqK&_fo<+U=)gMF=>WWa4ZMs1?>_|u`1mQPnYWf69mA|-
zQj#Pwrb&@x(wr1YeNvBPQjb)XER~EB%pS=D;NrvgU3Lr8rtu(}2Eb4P{fH>O+Z})d
zJP;2Euq*(E$;Uk|96PilOn>_c;MfEBztso$M<D1qIXyW!^8i|17KOuqc28$UzKmq1
z6A;7z@P7jUJ?ek>Fy{P~kOI&j03<*HhewA@fM4{`|NH^~qSra3ze}<`msgjUZ2&*A
zTPXZiHZwB9R}v2m4aFe=BY~e_nEOM`Maxv=@3a))=;-?B$l6~mSF7-^(x265j6Q)a
zCUA3edm{ikJWK!pP~tOxQ~aG4{IG`!m^#2KFC?G~czO9;9RNVs0{CzF1THVH1n`54
zeAodcpr0wa=Q^MSwCkY*!a+g;KmhVr0?v2f<m6NUyhtCPf;f)TQ$Y6*oPuQ${2#p4
t2tt^-KwyBur~^hFFzSF&2aGxZ0Ccurn?zi;bN~PV07*qoM6N;tV1l}v-0lDX

diff --git a/core/src/main/assets/interfaces/large_buffs.png b/core/src/main/assets/interfaces/large_buffs.png
index 88a1266ecd3523684065801dd6e0cdec2d6f8762..5bf96a473552a67baa213fca9856e9fcc044760f 100644
GIT binary patch
delta 2825
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

delta 2585
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
a&p6!}*|f9cd-~Uw13~LH`q%r)vi}c$c4LPC

diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties
index 154e4e51a..caf8f2140 100644
--- a/core/src/main/assets/messages/actors/actors.properties
+++ b/core/src/main/assets/messages/actors/actors.properties
@@ -52,7 +52,7 @@ actors.blobs.web.desc=A thick web is covering everything here. Anything that tou
 actors.buffs.adrenaline.name=Adrenaline
 actors.buffs.adrenaline.desc=A surge of physical power, adrenaline enhanced both attack and movement speed.\n\nAdrenaline allows its target to run at 2x speed, and attack at 1.5x speed.\n\nTurns remaining: %s.
 
-actors.buffs.adrenalinesurge.name=Adrenaline Surge
+actors.buffs.adrenalinesurge.name=Strength Boost
 actors.buffs.adrenalinesurge.desc=A surge of great might, but sadly not permanent.\n\nStrength boost: +%d.\nTurns until boost weakens: %s.
 
 actors.buffs.amok.name=Amok
diff --git a/core/src/main/assets/messages/items/items.properties b/core/src/main/assets/messages/items/items.properties
index 4fec044fd..95748122c 100644
--- a/core/src/main/assets/messages/items/items.properties
+++ b/core/src/main/assets/messages/items/items.properties
@@ -409,6 +409,8 @@ items.artifacts.timekeepershourglass.prompt=How would you like to use the hourgl
 items.artifacts.timekeepershourglass.desc=This large ornate hourglass looks fairly unassuming, but you feel a great power in its finely carved frame. As you rotate the hourglass and watch the sand pour you can feel its magic tugging at you, surely using this magic would give you some control over time.
 items.artifacts.timekeepershourglass.desc_hint=The hourglass seems to have lost some sand, if only you could find some...
 items.artifacts.timekeepershourglass.desc_cursed=The cursed hourglass is locked to your side, you can feel it trying to manipulate your flow of time.
+items.artifacts.timekeepershourglass$timefreeze.name=Time Freeze
+items.artifacts.timekeepershourglass$timefreeze.desc=Time is frozen around you, allowing you to perform actions instantly. The effect will last until it is cancelled or your hourglass runs out of charge. Attacking or using magic will break this effect as well.
 items.artifacts.timekeepershourglass$sandbag.name=bag of magic sand
 items.artifacts.timekeepershourglass$sandbag.levelup=You add the sand to your hourglass.
 items.artifacts.timekeepershourglass$sandbag.maxlevel=Your hourglass is filled with magical sand!
@@ -1081,6 +1083,8 @@ items.spells.curseinfusion.desc=This spell infuses a piece of equipment with the
 items.spells.featherfall.name=feather fall
 items.spells.featherfall.light=You feel light as a feather!
 items.spells.featherfall.desc=This spell manipulates gravity's effect on the caster, allowing them to fall great distances without harm for a short time. Each use of the spell will only provide enough protection for one chasm.
+items.spells.featherfall$featherbuff.name=Feather Fall
+items.spells.featherfall$featherbuff.desc=You are under the effects of a feather fall spell, allowing you to fall into a chasm without taking damage! This effect will expire when it is used, or after a bit of time passes.\n\nTurns remaining: %s.
 
 items.spells.spell.ac_cast=CAST
 items.spells.spell.no_magic=You can't cast spells while magic immune.
@@ -1140,6 +1144,7 @@ items.stones.runestone$placeholder.name=runestone
 items.stones.stoneofaggression.name=stone of aggression
 items.stones.stoneofaggression.desc=When this stone is thrown at an ally or enemy, all nearby enemies will be forced to attack that character for a short time.\n\nWhen used on enemies, the magic will only last for a few turns, but when used on yourself or allies it will last significantly longer.
 items.stones.stoneofaggression$aggression.name=Targeted
+items.stones.stoneofaggression$aggression.desc=Manipulative magic is forcing all nearby enemies to attack this character.\n\nTurns remaining: %s.
 
 items.stones.stoneofaugmentation.name=stone of augmentation
 items.stones.stoneofaugmentation.inv_title=Augment an item
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 bd26a706d..2559f4bee 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
@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class Adrenaline extends FlavourBuff {
 	
@@ -36,7 +37,12 @@ public class Adrenaline extends FlavourBuff {
 	
 	@Override
 	public int icon() {
-		return BuffIndicator.AMOK;
+		return BuffIndicator.UPGRADE;
+	}
+
+	@Override
+	public void tintIcon(Image icon) {
+		icon.hardlight(1, 0, 0);
 	}
 
 	@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 b2b68748d..dcd8cdc01 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
@@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.utils.Bundle;
 
 public class AdrenalineSurge extends Buff {
@@ -59,7 +60,12 @@ public class AdrenalineSurge extends Buff {
 	
 	@Override
 	public int icon() {
-		return BuffIndicator.FURY;
+		return BuffIndicator.UPGRADE;
+	}
+
+	@Override
+	public void tintIcon(Image icon) {
+		icon.hardlight(1f, 0.5f, 0);
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
index 9d45bc7e2..f9ca1cc7f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Berserk.java
@@ -39,6 +39,10 @@ import java.text.DecimalFormat;
 
 public class Berserk extends Buff {
 
+	{
+		type = buffType.POSITIVE;
+	}
+
 	private enum State{
 		NORMAL, BERSERK, RECOVERING
 	}
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 d35843d4e..551aff9e9 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
@@ -52,6 +52,10 @@ import com.watabou.utils.PathFinder;
 import com.watabou.utils.Random;
 
 public class Combo extends Buff implements ActionIndicator.Action {
+
+	{
+		type = buffType.POSITIVE;
+	}
 	
 	private int count = 0;
 	private float comboTime = 0f;
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 3740668fc..0f91db133 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
@@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.Random;
 
@@ -86,7 +87,12 @@ public class FireImbue extends Buff {
 
 	@Override
 	public int icon() {
-		return BuffIndicator.FIRE;
+		return BuffIndicator.IMBUE;
+	}
+
+	@Override
+	public void tintIcon(Image icon) {
+		icon.hardlight(2f, 0.75f, 0f);
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FrostImbue.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FrostImbue.java
index 1c7f685cd..ec11d1c41 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FrostImbue.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/FrostImbue.java
@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SnowParticle;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class FrostImbue extends FlavourBuff {
 	
@@ -42,7 +43,12 @@ public class FrostImbue extends FlavourBuff {
 	
 	@Override
 	public int icon() {
-		return BuffIndicator.FROST;
+		return BuffIndicator.IMBUE;
+	}
+
+	@Override
+	public void tintIcon(Image icon) {
+		icon.hardlight(0, 2f, 3f);
 	}
 
 	@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 729c4846b..5f6cc6bbf 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
@@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 
 public class Levitation extends FlavourBuff {
 	
@@ -63,6 +64,11 @@ public class Levitation extends FlavourBuff {
 		return BuffIndicator.LEVITATION;
 	}
 
+	@Override
+	public void tintIcon(Image icon) {
+		icon.hardlight(1f, 2.1f, 2.5f);
+	}
+
 	@Override
 	public float iconFadePercent() {
 		return Math.max(0, (DURATION - visualcooldown()) / DURATION);
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/LifeLink.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/LifeLink.java
index b4da6ee4a..8de69c755 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/LifeLink.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/LifeLink.java
@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.utils.Bundle;
 
 public class LifeLink extends FlavourBuff {
@@ -65,7 +66,12 @@ public class LifeLink extends FlavourBuff {
 
 	@Override
 	public int icon() {
-		return BuffIndicator.HEART;
+		return BuffIndicator.HERB_HEALING;
+	}
+
+	@Override
+	public void tintIcon(Image icon) {
+		icon.hardlight(1, 0, 1);
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java
index b091b1f5c..14e19fd5d 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Preparation.java
@@ -52,6 +52,7 @@ public class Preparation extends Buff implements ActionIndicator.Action {
 	{
 		//always acts after other buffs, so invisibility effects can process first
 		actPriority = BUFF_PRIO - 1;
+		type = buffType.POSITIVE;
 	}
 	
 	public enum AttackLevel{
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java
index 119ff9af7..8eb9d327e 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ScrollEmpower.java
@@ -62,7 +62,7 @@ public class ScrollEmpower extends Buff {
 
 	@Override
 	public void tintIcon(Image icon) {
-		icon.hardlight(1, 1, 0);
+		icon.hardlight(0.84f, 0.79f, 0.65f); //scroll colors
 	}
 
 	@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 7c5813547..f31d45df7 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
@@ -38,6 +38,7 @@ public class Shadows extends Invisibility {
 
 	{
 		announced = false;
+		type = buffType.POSITIVE;
 	}
 
 	@Override
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 90e599a7e..fc8919bfe 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
@@ -37,12 +37,12 @@ public class SoulMark extends FlavourBuff {
 
 	@Override
 	public int icon() {
-		return BuffIndicator.CORRUPT;
+		return BuffIndicator.INVERT_MARK;
 	}
 
 	@Override
 	public void tintIcon(Image icon) {
-		icon.hardlight(0.5f, 0.5f, 0.5f);
+		icon.hardlight(0.5f, 0.2f, 1f);
 	}
 
 	@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 f79b0457f..e1e39b160 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
@@ -26,6 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.ToxicGas;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.utils.Bundle;
 
 public class ToxicImbue extends Buff {
@@ -73,7 +74,12 @@ public class ToxicImbue extends Buff {
 
 	@Override
 	public int icon() {
-		return BuffIndicator.IMMUNITY;
+		return BuffIndicator.IMBUE;
+	}
+
+	@Override
+	public void tintIcon(Image icon) {
+		icon.hardlight(1f, 1.5f, 0f);
 	}
 
 	@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/NaturesPower.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/NaturesPower.java
index 5aa656caf..1fab82d51 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/NaturesPower.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/huntress/NaturesPower.java
@@ -70,6 +70,10 @@ public class NaturesPower extends ArmorAbility {
 
 	public static class naturesPowerTracker extends FlavourBuff{
 
+		{
+			type = buffType.POSITIVE;
+		}
+
 		public static final float DURATION = 8f;
 
 		public int extensionsLeft = 2;
@@ -83,7 +87,7 @@ public class NaturesPower extends ArmorAbility {
 
 		@Override
 		public int icon() {
-			return BuffIndicator.SHADOWS;
+			return BuffIndicator.NATURE_POWER;
 		}
 
 		@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/DeathMark.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/DeathMark.java
index ce75b75be..1d8ff1722 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/DeathMark.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/rogue/DeathMark.java
@@ -39,6 +39,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
 import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
+import com.watabou.noosa.Image;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.PathFinder;
@@ -149,7 +150,12 @@ public class DeathMark extends ArmorAbility {
 
 		@Override
 		public int icon() {
-			return BuffIndicator.MARK;
+			return BuffIndicator.INVERT_MARK;
+		}
+
+		@Override
+		public void tintIcon(Image icon) {
+			icon.hardlight(1f, 0.2f, 0.2f);
 		}
 
 		@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Endure.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Endure.java
index a32d8efee..4ce4cbb28 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Endure.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/warrior/Endure.java
@@ -38,6 +38,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.armor.ClassArmor;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.ui.HeroIcon;
+import com.watabou.noosa.Image;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
 
@@ -66,6 +67,10 @@ public class Endure extends ArmorAbility {
 
 	public static class EndureTracker extends FlavourBuff {
 
+		{
+			type = buffType.POSITIVE;
+		}
+
 		public boolean enduring;
 
 		public int damageBonus;
@@ -74,7 +79,12 @@ public class Endure extends ArmorAbility {
 
 		@Override
 		public int icon() {
-			return enduring ? BuffIndicator.NONE : BuffIndicator.AMOK;
+			return enduring ? BuffIndicator.NONE : BuffIndicator.ARMOR;
+		}
+
+		@Override
+		public void tintIcon(Image icon) {
+			super.tintIcon(icon);
 		}
 
 		@Override
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 66ed15628..7aa822a0c 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
@@ -40,6 +40,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
+import com.watabou.noosa.Image;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
 
@@ -268,6 +269,11 @@ public class CloakOfShadows extends Artifact {
 			return BuffIndicator.INVISIBLE;
 		}
 
+		@Override
+		public void tintIcon(Image icon) {
+			icon.brightness(0.6f);
+		}
+
 		@Override
 		public float iconFadePercent() {
 			return (4f - turnsToCost) / 4f;
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 fd7486f41..b7f372018 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
@@ -39,8 +39,10 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
+import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
 import com.shatteredpixel.shatteredpixeldungeon.windows.WndOptions;
+import com.watabou.noosa.Image;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.noosa.particles.Emitter;
 import com.watabou.utils.Bundle;
@@ -383,6 +385,36 @@ public class TimekeepersHourglass extends Artifact {
 			}
 		}
 
+		@Override
+		public int icon() {
+			return BuffIndicator.TIME;
+		}
+
+		@Override
+		public void tintIcon(Image icon) {
+			icon.hardlight(1f, 0.5f, 0);
+		}
+
+		@Override
+		public float iconFadePercent() {
+			return Math.max(0, (2f - (turnsToCost+1)) / 2f);
+		}
+
+		@Override
+		public String iconTextDisplay() {
+			return Integer.toString((int)turnsToCost+1);
+		}
+
+		@Override
+		public String toString() {
+			return Messages.get(this, "name");
+		}
+
+		@Override
+		public String desc() {
+			return Messages.get(this, "desc");
+		}
+
 		private static final String PRESSES = "presses";
 		private static final String TURNSTOCOST = "turnsToCost";
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java
index 419288404..9700a3ff2 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfCleansing.java
@@ -87,6 +87,10 @@ public class PotionOfCleansing extends ExoticPotion {
 
 	public static class Cleanse extends FlavourBuff {
 
+		{
+			type = buffType.POSITIVE;
+		}
+
 		public static final float DURATION = 5f;
 
 		@Override
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java
index b1908dc37..22c10604f 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/spells/FeatherFall.java
@@ -29,7 +29,9 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLevitation;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
+import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
+import com.watabou.noosa.Image;
 import com.watabou.noosa.audio.Sample;
 
 public class FeatherFall extends Spell {
@@ -40,7 +42,7 @@ public class FeatherFall extends Spell {
 	
 	@Override
 	protected void onCast(Hero hero) {
-		Buff.append(hero, FeatherBuff.class, 30f);
+		Buff.append(hero, FeatherBuff.class, FeatherBuff.DURATION);
 		hero.sprite.operate(hero.pos);
 		Sample.INSTANCE.play(Assets.Sounds.READ );
 		hero.sprite.emitter().burst( Speck.factory( Speck.JET ), 20);
@@ -54,6 +56,36 @@ public class FeatherFall extends Spell {
 	
 	public static class FeatherBuff extends FlavourBuff {
 		//does nothing, just waits to be triggered by chasm falling
+		{
+			type = buffType.POSITIVE;
+		}
+
+		public static final float DURATION	= 30f;
+
+		@Override
+		public int icon() {
+			return BuffIndicator.LEVITATION;
+		}
+
+		@Override
+		public void tintIcon(Image icon) {
+			icon.hardlight(1f, 2f, 1.25f);
+		}
+
+		@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());
+		}
 	}
 	
 	@Override
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 44e104be3..58e41f5b1 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
@@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Speck;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
+import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
 
@@ -73,17 +74,21 @@ public class StoneOfAggression extends Runestone {
 			type = buffType.NEGATIVE;
 			announced = true;
 		}
-		
+
 		@Override
-		public void storeInBundle( Bundle bundle ) {
-			super.storeInBundle(bundle);
+		public int icon() {
+			return BuffIndicator.TARGETED;
 		}
-		
+
 		@Override
-		public void restoreFromBundle( Bundle bundle ) {
-			super.restoreFromBundle( bundle );
+		public float iconFadePercent() {
+			if (target.alignment == Char.Alignment.ENEMY){
+				return Math.max(0, (DURATION/4f - visualcooldown()) / (DURATION/4f));
+			} else {
+				return Math.max(0, (DURATION - visualcooldown()) / DURATION);
+			}
 		}
-		
+
 		@Override
 		public void detach() {
 			//if our target is an enemy, reset the aggro of any enemies targeting it
@@ -104,6 +109,11 @@ public class StoneOfAggression extends Runestone {
 		public String toString() {
 			return Messages.get(this, "name");
 		}
+
+		@Override
+		public String desc() {
+			return Messages.get(this, "desc", dispTurns());
+		}
 		
 	}
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java
index fe22e4933..12e084266 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLivingEarth.java
@@ -41,6 +41,7 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.EarthGuardianSprite;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.noosa.Image;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.utils.Bundle;
 import com.watabou.utils.Callback;
@@ -224,6 +225,10 @@ public class WandOfLivingEarth extends DamageWand {
 
 	public static class RockArmor extends Buff {
 
+		{
+			type = buffType.POSITIVE;
+		}
+
 		private int wandLevel;
 		private int armor;
 
@@ -253,6 +258,11 @@ public class WandOfLivingEarth extends DamageWand {
 			return BuffIndicator.ARMOR;
 		}
 
+		@Override
+		public void tintIcon(Image icon) {
+			icon.brightness(0.6f);
+		}
+
 		@Override
 		public float iconFadePercent() {
 			return Math.max(0, (armorToGuardian() - armor) / (float)armorToGuardian());
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java
index 5defe2829..aaec0af86 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blocking.java
@@ -52,6 +52,10 @@ public class Blocking extends Weapon.Enchantment {
 	}
 	
 	public static class BlockBuff extends FlavourBuff {
+
+		{
+			type = buffType.POSITIVE;
+		}
 		
 		private int blocking = 0;
 		
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java
index a28633467..a9e79502a 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Kinetic.java
@@ -58,6 +58,10 @@ public class Kinetic extends Weapon.Enchantment {
 	}
 	
 	public static class ConservedDamage extends Buff {
+
+		{
+			type = buffType.POSITIVE;
+		}
 		
 		@Override
 		public int icon() {
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java
index 526f80b32..c142249b5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BuffIndicator.java
@@ -104,6 +104,11 @@ public class BuffIndicator extends Component {
 	public static final int MOMENTUM    = 51;
 	public static final int ANKH        = 52;
 	public static final int NOINV       = 53;
+	public static final int TARGETED    = 54;
+	public static final int IMBUE       = 55;
+	public static final int ENDURE      = 56;
+	public static final int INVERT_MARK = 57;
+	public static final int NATURE_POWER= 58;
 
 	public static final int SIZE_SMALL  = 7;
 	public static final int SIZE_LARGE  = 16;
@@ -247,7 +252,7 @@ public class BuffIndicator extends Component {
 				grey.visible = false;
 				if (buff.type == Buff.buffType.POSITIVE)        text.hardlight(CharSprite.POSITIVE);
 				else if (buff.type == Buff.buffType.NEGATIVE)   text.hardlight(CharSprite.NEGATIVE);
-				text.alpha(0.6f);
+				text.alpha(0.7f);
 
 				text.text(buff.iconTextDisplay());
 				text.measure();