From 759f550a20950ad229f6d21071823bbd3bc9693a Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 12 May 2025 17:42:54 -0400
Subject: [PATCH] v3.1.0: improvements to color clarity, mainly for colorblind
 players:

- increased opacity on flare vfx
- added different flare counts for champions
- lightened growing champs slightly
- darkened hero health bar BG on mobile
- lightened shielding on mob HP bar
- increased constrast on inventory button backgrounds
---
 .../main/assets/interfaces/status_pane.png    | Bin 976 -> 1045 bytes
 .../actors/buffs/ChampionEnemy.java           |  11 +++++++++--
 .../actors/buffs/Invulnerability.java         |   2 +-
 .../shatteredpixeldungeon/effects/Flare.java  |   2 +-
 .../sprites/CharSprite.java                   |   8 +++++---
 .../sprites/RatKingSprite.java                |   4 ++--
 .../shatteredpixeldungeon/ui/HealthBar.java   |   2 +-
 .../ui/InventorySlot.java                     |  10 +++++++---
 .../windows/WndJournal.java                   |   8 ++++----
 .../windows/WndRanking.java                   |  18 ++++++++++++++----
 10 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/core/src/main/assets/interfaces/status_pane.png b/core/src/main/assets/interfaces/status_pane.png
index 7a4daf723c72c15e1f74824b4b38571f62946f16..1e409a3a0a689c5f18c677789d8faf2c0d7b8603 100644
GIT binary patch
delta 810
zcmV+_1J(S{2bBnrBu67qOjJcaKskGWb7*W~RasDTcx*X4HG_zHB_|;O001~TG&?;v
zqo$Q4CLk&-C6AMYH#svpJT@aGA1Ny&HaIdpKR6;J9+6yN1}rWoD=j9G)O&vd8cQJn
z000SeQchF<|NsC0|Ns90Q%`sj0007*Nkl<ZcmeI%iApR-6o>KeoH{jj2n=R<10@TP
zfNx;-u!kjVc|uub5eR$s00W4V2+32ZFoVWvJ85hh7)x^t`b+`0erzQJ^hbfk@~1SF
zvJ@dai!cFw=}!wrKuK$7t&xALYa=-fW<r{28-*;Lt|IvXSETHB8!`jBb`{AEu$y;D
zxt?z@vfQmA`2oQKDHf2smK?W{Tn0K*QfA6#MV3f512rYZlt9Fpfd(ZdC`5J<ph}7=
zP%5AX)PNdL18Tq}JsO~O4_JOEZ25Do4CG<v9S~L6rpCZ-@ejD<iTHmWJ^t=+53uE%
zY`G)qUjXmNfBXXu{z!aes9Mhb1LX1}wq5*J^#T3iV2LjaoA!dIBnm(joY_OT<%x!1
z`q+mvn~|i48-PQ_nUN-ASdoAb77W&kD``l%XB6?(6eh>y`kg7sCuI7KNy(?=`ITwO
zXJq+>iOJ{W`k5)o7i53>iAl+q<oS_l$ya3gfr-i2<LS}&>{wHnQCJPA0X3io)PNdL
z18RU#m<TV~!<*3sp3?^0{m*=li;Vdm7a8-tkBs@=MaF#ZBV)ezkul!`W#{|4n$>_B
zPy?DZqrDOVtH7WQln4kIJ?>|1kpSKp7u+%d{tNCn-zVtO{1<=RalTK`*d-R+UCsBy
zz56e?>G_`F-u)NcalTK82TT72cbxB2F5vu#9t;2ZK4oR&msbHFqQa|*xUf!`lXh(_
z^YMregST%;duQDazx7AY|ALQ6>0h7zH}{7~qL31W-8@9WloSi><{|1Io0LOkHxJSI
z5owEEJw%Jw`XNrDIWDT<o5J+EFx@Xq>kZT!IFq8zj4R6ewlKXaOy4R@>kZT!IF+JK
o4WX>>3R5Ypd_WC2k)lri1sl;tVaB5(>;M1&07*qoM6N<$f?w!x<p2Nx

delta 741
zcmV<B0vi352+#+RBseBeOjJcaKskGWb7*W~RasDTcx*X4HG_zH0000uIy5^yH>0MN
zKS4T=lY}=pGdesrHaIdpKRA(VU>GGQAuKK@Bqks$EhZx+A1W**A|xIuD<qN8dw+@+
zX&C?j00?waPE-H?|NsC0{{Y^Dy;%SN0#QjsK~#7F?b!i`R8bg*@#lTtGjkKw_C;1@
z`v6;21qcFtzXcW+0jjDnESp8ur`Sp}%{FH?IRtxlbJjiQMdt_ZxbV1m8GpQ~_)-Kr
z6E*@p?`N=pq2$GBR7yz<ln5{p@_$UD8AW1P1j+-xk#qGVGWkx4E3ya_2k3l*oFA7X
zdW{ls5uiN4lpIqet|_q$TqIzk<V=*+f+B$n1*npviV+xJK>z{g0D3?V=m9;T2Y3a1
z0e}IB9s!>g3W=;I4gu&UB%haf1fa(NFa@Uo9RQZvB;Z#rKmoKtfE;d;3xBXi0k&En
zaGIz9s8kPF+mcfTEGmFn^?(UkYAXQK>H*}*l*A`MZAQXEsY(WNR{6vl24}KOsrQUY
z?oj9*qmsLndCR!u9!1_TGPzHw*NjOXQ0Nt-l82Oe$++YZMP4v6c}#*N&uMIM7I4-B
zdO#280X?7x^nf1V9w5Sbrhn8HI5Ex=jq3g}-%~}wd`}ex^L-r!^L-Ts^L-r!^L^ip
zdO#280X<+?@YmEMU~VKt!y~}h1b`3I=n}w<V*t4M(Ip_W;I<D?0Cfy7&w$K=+d3e>
z;I^3WQ$T|SH_i8X2e7{d0JGNfeKHTsNajWzqT>5MI-Cf%$lDJwy?;xObp+TtChzuP
zOz-|YRz1a+$oZ-1U3#QmfT)n8(&!LbRC3f>9U@ziW33KRIyM=zR)=WzUmqfdZC3+N
zoat9*y5X#Uf&K+_Ph9N<j_~!=nI1XQ>(2TY=wCp0#no;=@b%1@iZlO!9<U>>c76kx
XXD6?lfFczD0000<MFvhpu0mjfPf9lv

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionEnemy.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionEnemy.java
index b4d23a4ff..e5af04590 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionEnemy.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ChampionEnemy.java
@@ -44,6 +44,7 @@ public abstract class ChampionEnemy extends Buff {
 	}
 
 	protected int color;
+	protected int rays;
 
 	@Override
 	public int icon() {
@@ -57,7 +58,7 @@ public abstract class ChampionEnemy extends Buff {
 
 	@Override
 	public void fx(boolean on) {
-		if (on) target.sprite.aura( color );
+		if (on) target.sprite.aura( color, rays );
 		else target.sprite.clearAura();
 	}
 
@@ -114,6 +115,7 @@ public abstract class ChampionEnemy extends Buff {
 
 		{
 			color = 0xFF8800;
+			rays = 4;
 		}
 
 		@Override
@@ -150,6 +152,7 @@ public abstract class ChampionEnemy extends Buff {
 
 		{
 			color = 0x8800FF;
+			rays = 4;
 		}
 
 		@Override
@@ -178,6 +181,7 @@ public abstract class ChampionEnemy extends Buff {
 
 		{
 			color = 0x00FF00;
+			rays = 5;
 		}
 
 		@Override
@@ -196,6 +200,7 @@ public abstract class ChampionEnemy extends Buff {
 
 		{
 			color = 0x0088FF;
+			rays = 5;
 		}
 
 		@Override
@@ -224,6 +229,7 @@ public abstract class ChampionEnemy extends Buff {
 
 		{
 			color = 0xFFFF00;
+			rays = 6;
 		}
 
 		@Override
@@ -235,7 +241,8 @@ public abstract class ChampionEnemy extends Buff {
 	public static class Growing extends ChampionEnemy {
 
 		{
-			color = 0xFF0000;
+			color = 0xFF2222; //a little white helps it stick out from background
+			rays = 6;
 		}
 
 		private float multiplier = 1.19f;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invulnerability.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invulnerability.java
index ccbbe356e..f9ef2dd92 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invulnerability.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Invulnerability.java
@@ -36,7 +36,7 @@ public class Invulnerability extends FlavourBuff {
 	@Override
 	public void fx(boolean on) {
 		if (!target.buffs(ChampionEnemy.class).isEmpty()) return;
-		if (on) target.sprite.aura( 0xFFFF00 );
+		if (on) target.sprite.aura( 0xFFFF00, 5 );
 		else target.sprite.clearAura();
 	}
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Flare.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Flare.java
index f8ed1e20f..f194f5c83 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Flare.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Flare.java
@@ -55,7 +55,7 @@ public class Flare extends Visual {
 		
 		super( 0, 0, 0, 0 );
 
-		int gradient[] = {0xFFFFFFFF, 0x00FFFFFF};
+		int gradient[] = {0xFFFFFFFF, 0xBBFFFFFF, 0x88FFFFFF, 0x00FFFF, 0x00FFFFFF};
 		texture = TextureCache.createGradient( gradient );
 		
 		this.nRays = nRays;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
index 6fde92721..6e59a4955 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
@@ -373,11 +373,13 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 	}
 
 	private int auraColor = 0;
+	private int auraRays = 0;
 
-	//Aura needs color data too
-	public void aura( int color ){
+	//Aura needs color and ray count data too
+	public void aura( int color, int nRays ){
 		add(State.AURA);
 		auraColor = color;
+		auraRays = nRays;
 	}
 
 	protected synchronized void processStateAddition( State state ) {
@@ -450,7 +452,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 				if (aura != null)   aura.killAndErase();
 				float size = Math.max(width(), height());
 				size = Math.max(size+4, 16);
-				aura = new Flare(5, size);
+				aura = new Flare(auraRays, size);
 				aura.angularSpeed = 90;
 				aura.color(auraColor, true);
 				aura.visible = visible;
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java
index 08a70da92..6aa9ea88b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/RatKingSprite.java
@@ -55,7 +55,7 @@ public class RatKingSprite extends MobSprite {
 
 		if (Dungeon.hero != null && Dungeon.hero.armorAbility instanceof Ratmogrify){
 			c = 24;
-			if (parent != null) aura(0xFFFF00);
+			if (parent != null) aura(0xFFFF00, 5);
 		}
 
 		texture( Assets.Sprites.RATKING );
@@ -83,7 +83,7 @@ public class RatKingSprite extends MobSprite {
 	public void link(Char ch) {
 		super.link(ch);
 		if (Dungeon.hero != null && Dungeon.hero.armorAbility instanceof Ratmogrify){
-			aura(0xFFFF00);
+			aura(0xFFFF00, 5);
 		}
 	}
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HealthBar.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HealthBar.java
index e176694a2..fc3ff7d05 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HealthBar.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/HealthBar.java
@@ -29,7 +29,7 @@ public class HealthBar extends Component {
 
 	private static final int COLOR_BG	= 0xFFCC0000;
 	private static final int COLOR_HP	= 0xFF00EE00;
-	private static final int COLOR_SHLD = 0xFFBBEEBB;
+	private static final int COLOR_SHLD = 0xFFCCFFCC;
 	
 	private static final int HEIGHT	= 2;
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventorySlot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventorySlot.java
index e034e7c66..df6fbaa2b 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventorySlot.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventorySlot.java
@@ -89,12 +89,16 @@ public class InventorySlot extends ItemSlot {
 			if (item.cursed && item.cursedKnown) {
 				bg.ra = +0.3f;
 				bg.ga = -0.15f;
+				bg.ba = -0.15f;
 			} else if (!item.isIdentified()) {
 				if ((item instanceof EquipableItem || item instanceof Wand) && item.cursedKnown){
-					bg.ba = 0.3f;
+					bg.ba = +0.3f;
+					bg.ga = +0.06f;
+					bg.ra = -0.06f;
 				} else {
-					bg.ra = 0.3f;
-					bg.ba = 0.3f;
+					bg.ra = +0.3f;
+					bg.ba = +0.3f;
+					bg.ga = -0.1f;
 				}
 			}
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java
index f4745a3d6..34cd28a0c 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java
@@ -864,7 +864,7 @@ public class WndJournal extends WndTabbed {
 				gridItem.addSecondIcon(secondIcon);
 			}
 			if (!seen) {
-				gridItem.hardLightBG(2f, 1f, 2f);
+				gridItem.hardLightBG(2f, 0.8f, 2f);
 			}
 			grid.addItem(gridItem);
 		}
@@ -1001,7 +1001,7 @@ public class WndJournal extends WndTabbed {
 				}
 			};
 			if (!seen) {
-				gridItem.hardLightBG(2f, 1f, 2f);
+				gridItem.hardLightBG(2f, 0.8f, 2f);
 			}
 			grid.addItem(gridItem);
 		}
@@ -1055,10 +1055,10 @@ public class WndJournal extends WndTabbed {
 				text.measure();
 				gridItem.addSecondIcon( text );
 				if (!read) {
-					gridItem.hardLightBG(1f, 1f, 2f);
+					gridItem.hardLightBG(0.9f, 0.9f, 2f);
 				}
 			} else {
-				gridItem.hardLightBG(2f, 1f, 2f);
+				gridItem.hardLightBG(2f, 0.8f, 2f);
 			}
 			grid.addItem(gridItem);
 		}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
index 1a06ecccc..a9047f0a4 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java
@@ -32,8 +32,10 @@ import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
 import com.shatteredpixel.shatteredpixeldungeon.Statistics;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Belongings;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass;
+import com.shatteredpixel.shatteredpixeldungeon.items.EquipableItem;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.Trinket;
+import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
 import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
 import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
 import com.shatteredpixel.shatteredpixeldungeon.sprites.HeroSprite;
@@ -482,11 +484,19 @@ public class WndRanking extends WndTabbed {
 			
 			slot.item( item );
 			if (item.cursed && item.cursedKnown) {
-				bg.ra = +0.2f;
-				bg.ga = -0.1f;
+				bg.ra = +0.3f;
+				bg.ga = -0.15f;
+				bg.ba = -0.15f;
 			} else if (!item.isIdentified()) {
-				bg.ra = 0.1f;
-				bg.ba = 0.1f;
+				if ((item instanceof EquipableItem || item instanceof Wand) && item.cursedKnown){
+					bg.ba = +0.3f;
+					bg.ga = +0.06f;
+					bg.ra = -0.06f;
+				} else {
+					bg.ra = +0.3f;
+					bg.ba = +0.3f;
+					bg.ga = -0.1f;
+				}
 			}
 		}