From 7a2c2e23217e1a33b8a582c7a63e8514c542b00e Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 20 May 2025 13:01:02 -0400 Subject: [PATCH] v3.1.0: one more colorblind correction pass for inventory --- .../shatteredpixeldungeon/ui/InventorySlot.java | 12 +++++------- .../shatteredpixeldungeon/windows/WndJournal.java | 8 ++++---- .../shatteredpixeldungeon/windows/WndRanking.java | 12 +++++------- 3 files changed, 14 insertions(+), 18 deletions(-) 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 df6fbaa2b..5bf166d16 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventorySlot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventorySlot.java @@ -88,17 +88,15 @@ public class InventorySlot extends ItemSlot { bg.resetColor(); if (item.cursed && item.cursedKnown) { bg.ra = +0.3f; - bg.ga = -0.15f; - bg.ba = -0.15f; + bg.ga = -0.2f; + bg.ba = -0.2f; } else if (!item.isIdentified()) { if ((item instanceof EquipableItem || item instanceof Wand) && item.cursedKnown){ bg.ba = +0.3f; - bg.ga = +0.06f; - bg.ra = -0.06f; + bg.ra = -0.1f; } else { - bg.ra = +0.3f; - bg.ba = +0.3f; - bg.ga = -0.1f; + bg.ra = +0.35f; + bg.ba = +0.35f; } } 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 b3ef199f2..b909d92e2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java @@ -868,7 +868,7 @@ public class WndJournal extends WndTabbed { gridItem.addSecondIcon(secondIcon); } if (!seen) { - gridItem.hardLightBG(2f, 0.8f, 2f); + gridItem.hardLightBG(2f, 1f, 2f); } grid.addItem(gridItem); } @@ -1005,7 +1005,7 @@ public class WndJournal extends WndTabbed { } }; if (!seen) { - gridItem.hardLightBG(2f, 0.8f, 2f); + gridItem.hardLightBG(2f, 1f, 2f); } grid.addItem(gridItem); } @@ -1059,10 +1059,10 @@ public class WndJournal extends WndTabbed { text.measure(); gridItem.addSecondIcon( text ); if (!read) { - gridItem.hardLightBG(0.9f, 0.9f, 2f); + gridItem.hardLightBG(0.6f, 1f, 2f); } } else { - gridItem.hardLightBG(2f, 0.8f, 2f); + gridItem.hardLightBG(2.2f, 1f, 2.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 a9047f0a4..66b49ab31 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRanking.java @@ -485,17 +485,15 @@ public class WndRanking extends WndTabbed { slot.item( item ); if (item.cursed && item.cursedKnown) { bg.ra = +0.3f; - bg.ga = -0.15f; - bg.ba = -0.15f; + bg.ga = -0.2f; + bg.ba = -0.2f; } else if (!item.isIdentified()) { if ((item instanceof EquipableItem || item instanceof Wand) && item.cursedKnown){ bg.ba = +0.3f; - bg.ga = +0.06f; - bg.ra = -0.06f; + bg.ra = -0.1f; } else { - bg.ra = +0.3f; - bg.ba = +0.3f; - bg.ga = -0.1f; + bg.ra = +0.35f; + bg.ba = +0.35f; } } }