From eb51e6dafe953ada051e2fb31cda8c656ebf5599 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 17 Jun 2024 16:44:43 -0400 Subject: [PATCH] v2.5.0: added a proper icon for the catalog tab --- core/src/main/assets/interfaces/icons.png | Bin 15219 -> 15296 bytes .../shatteredpixeldungeon/ui/Icons.java | 18 +++++++++++------- .../windows/WndJournal.java | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png index 63fe09623cf0dfbc044f897038e3a2e274788c4f..fd10f873ee27e04f9a0191feb68b26c2dfe6722f 100644 GIT binary patch literal 15296 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 MNlUR--ZK3E0U0xqq5uE@ diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java index 9c1132aec..0615c08d4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -85,6 +85,7 @@ public enum Icons { ENERGY, COPY, PASTE, + CATALOG, COIN_SML, ENERGY_SML, BACKPACK, @@ -279,26 +280,29 @@ public enum Icons { case PASTE: icon.frame( icon.texture.uvRectBySize( 240, 48, 13, 13 ) ); break; + case CATALOG: + icon.frame( icon.texture.uvRectBySize( 240, 64, 13, 16 ) ); + break; case COIN_SML: - icon.frame( icon.texture.uvRectBySize( 192, 64, 7, 7 ) ); + icon.frame( icon.texture.uvRectBySize( 192, 80, 7, 7 ) ); break; case ENERGY_SML: - icon.frame( icon.texture.uvRectBySize( 192, 72, 8, 7 ) ); + icon.frame( icon.texture.uvRectBySize( 192, 88, 8, 7 ) ); break; case BACKPACK: - icon.frame( icon.texture.uvRectBySize( 201, 64, 10, 10 ) ); + icon.frame( icon.texture.uvRectBySize( 201, 80, 10, 10 ) ); break; case SCROLL_HOLDER: - icon.frame( icon.texture.uvRectBySize( 211, 64, 10, 10 ) ); + icon.frame( icon.texture.uvRectBySize( 211, 80, 10, 10 ) ); break; case SEED_POUCH: - icon.frame( icon.texture.uvRectBySize( 221, 64, 10, 10 ) ); + icon.frame( icon.texture.uvRectBySize( 221, 80, 10, 10 ) ); break; case WAND_HOLSTER: - icon.frame( icon.texture.uvRectBySize( 231, 64, 10, 10 ) ); + icon.frame( icon.texture.uvRectBySize( 231, 80, 10, 10 ) ); break; case POTION_BANDOLIER: - icon.frame( icon.texture.uvRectBySize( 241, 64, 10, 10 ) ); + icon.frame( icon.texture.uvRectBySize( 241, 80, 10, 10 ) ); break; case TARGET: 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 f72a81167..daacf2fbf 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndJournal.java @@ -137,7 +137,7 @@ public class WndJournal extends WndTabbed { if (value) last_index = 2; } }, - new IconTab( Icons.RENAME_ON.get() ) { //TODO dedicated icon here? + new IconTab( Icons.CATALOG.get() ) { protected void select( boolean value ) { super.select( value ); catalogTab.active = catalogTab.visible = value;