From 7ba15b471216c07990ec66b8189d6879abff07a3 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Tue, 29 Sep 2020 20:34:20 -0400
Subject: [PATCH] v0.9.0: overhauled visuals for badges

---
 core/src/main/assets/interfaces/badges.png    | Bin 3275 -> 4328 bytes
 .../shatteredpixeldungeon/Badges.java         | 160 ++++++++-------
 .../effects/BadgeBanner.java                  | 192 +++++-------------
 .../scenes/BadgesScene.java                   |   2 +-
 .../windows/WndBadge.java                     |   2 +-
 5 files changed, 140 insertions(+), 216 deletions(-)

diff --git a/core/src/main/assets/interfaces/badges.png b/core/src/main/assets/interfaces/badges.png
index b6525046233965369387cbd40f27f9c6dff30d3d..1194f286eaaeca89bffaf2b7226534aad3445dae 100644
GIT binary patch
literal 4328
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
Ee-ZXPvH$=8

delta 3245
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
M%{A-yR_LVv0K_mUivR!s

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
index 19a75fdd0..ebb1ee988 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java
@@ -46,48 +46,82 @@ import java.util.List;
 public class Badges {
 	
 	public enum Badge {
-		MONSTERS_SLAIN_1( 0 ),
-		MONSTERS_SLAIN_2( 1 ),
-		MONSTERS_SLAIN_3( 2 ),
-		MONSTERS_SLAIN_4( 3 ),
-		GOLD_COLLECTED_1( 4 ),
-		GOLD_COLLECTED_2( 5 ),
-		GOLD_COLLECTED_3( 6 ),
-		GOLD_COLLECTED_4( 7 ),
-		LEVEL_REACHED_1( 8 ),
-		LEVEL_REACHED_2( 9 ),
-		LEVEL_REACHED_3( 10 ),
-		LEVEL_REACHED_4( 11 ),
-		ALL_WEAPONS_IDENTIFIED( 16 ),
-		ALL_ARMOR_IDENTIFIED( 17 ),
-		ALL_WANDS_IDENTIFIED( 18 ),
-		ALL_RINGS_IDENTIFIED( 19 ),
-		ALL_ARTIFACTS_IDENTIFIED( 20 ),
-		ALL_POTIONS_IDENTIFIED( 21 ),
-		ALL_SCROLLS_IDENTIFIED( 22 ),
-		ALL_ITEMS_IDENTIFIED( 23, true ),
+		MASTERY_WARRIOR,
+		MASTERY_MAGE,
+		MASTERY_ROGUE,
+		MASTERY_HUNTRESS,
+
+		//bronze
+		UNLOCK_MAGE                 ( 1 ),
+		UNLOCK_ROGUE                ( 2 ),
+		UNLOCK_HUNTRESS             ( 3 ),
+		MONSTERS_SLAIN_1            ( 4 ),
+		MONSTERS_SLAIN_2            ( 5 ),
+		GOLD_COLLECTED_1            ( 6 ),
+		GOLD_COLLECTED_2            ( 7 ),
+		ITEM_LEVEL_1                ( 8 ),
+		LEVEL_REACHED_1             ( 9 ),
+		STRENGTH_ATTAINED_1         ( 10 ),
+		FOOD_EATEN_1                ( 11 ),
+		POTIONS_COOKED_1            ( 12 ),
+		BOSS_SLAIN_1                ( 13 ),
+		DEATH_FROM_FIRE             ( 14 ),
+		DEATH_FROM_POISON           ( 15 ),
+		DEATH_FROM_GAS              ( 16 ),
+		DEATH_FROM_HUNGER           ( 17 ),
+		DEATH_FROM_FALLING          ( 18 ),
+
+		//silver
+		NO_MONSTERS_SLAIN           ( 32 ),
+		GRIM_WEAPON                 ( 33 ),
+		MONSTERS_SLAIN_3            ( 34 ),
+		MONSTERS_SLAIN_4            ( 35 ),
+		GOLD_COLLECTED_3            ( 36 ),
+		GOLD_COLLECTED_4            ( 37 ),
+		ITEM_LEVEL_2                ( 38 ),
+		ITEM_LEVEL_3                ( 39 ),
+		LEVEL_REACHED_2             ( 40 ),
+		LEVEL_REACHED_3             ( 41 ),
+		STRENGTH_ATTAINED_2         ( 42 ),
+		STRENGTH_ATTAINED_3         ( 43 ),
+		FOOD_EATEN_2                ( 44 ),
+		FOOD_EATEN_3                ( 45 ),
+		POTIONS_COOKED_2            ( 46 ),
+		POTIONS_COOKED_3            ( 47 ),
+		BOSS_SLAIN_2                ( 48 ),
+		BOSS_SLAIN_3                ( 49 ),
+		ALL_POTIONS_IDENTIFIED      ( 50 ),
+		ALL_SCROLLS_IDENTIFIED      ( 51 ),
+		DEATH_FROM_GLYPH            ( 52 ),
+		BOSS_SLAIN_1_WARRIOR,
+		BOSS_SLAIN_1_MAGE,
+		BOSS_SLAIN_1_ROGUE,
+		BOSS_SLAIN_1_HUNTRESS,
+		BOSS_SLAIN_1_ALL_CLASSES    ( 53, true ),
+		GAMES_PLAYED_1              ( 54, true ),
+
+		//gold
+		PIRANHAS                    ( 64 ),
 		//these names are a bit outdated, but it doesn't really matter.
 		BAG_BOUGHT_SEED_POUCH,
 		BAG_BOUGHT_SCROLL_HOLDER,
 		BAG_BOUGHT_POTION_BANDOLIER,
 		BAG_BOUGHT_WAND_HOLSTER,
-		ALL_BAGS_BOUGHT( 24 ),
-		DEATH_FROM_FIRE( 25 ),
-		DEATH_FROM_POISON( 26 ),
-		DEATH_FROM_GAS( 27 ),
-		DEATH_FROM_HUNGER( 28 ),
-		DEATH_FROM_GLYPH( 29 ),
-		DEATH_FROM_FALLING( 30 ),
-		YASD( 31, true ),
-		BOSS_SLAIN_1_WARRIOR,
-		BOSS_SLAIN_1_MAGE,
-		BOSS_SLAIN_1_ROGUE,
-		BOSS_SLAIN_1_HUNTRESS,
-		BOSS_SLAIN_1( 12 ),
-		BOSS_SLAIN_2( 13 ),
-		BOSS_SLAIN_3( 14 ),
-		BOSS_SLAIN_4( 15 ),
-		BOSS_SLAIN_1_ALL_CLASSES( 32, true ),
+		ALL_BAGS_BOUGHT             ( 65 ),
+		MASTERY_COMBO               ( 66 ),
+		ITEM_LEVEL_4                ( 67 ),
+		LEVEL_REACHED_4             ( 68 ),
+		STRENGTH_ATTAINED_4         ( 69 ),
+		FOOD_EATEN_4                ( 70 ),
+		POTIONS_COOKED_4            ( 71 ),
+		BOSS_SLAIN_4                ( 72 ),
+		ALL_WEAPONS_IDENTIFIED      ( 73 ),
+		ALL_ARMOR_IDENTIFIED        ( 74 ),
+		ALL_WANDS_IDENTIFIED        ( 75 ),
+		ALL_RINGS_IDENTIFIED        ( 76 ),
+		ALL_ARTIFACTS_IDENTIFIED    ( 77 ),
+		VICTORY                     ( 78 ),
+		YASD                        ( 79, true ),
 		BOSS_SLAIN_3_GLADIATOR,
 		BOSS_SLAIN_3_BERSERKER,
 		BOSS_SLAIN_3_WARLOCK,
@@ -96,48 +130,24 @@ public class Badges {
 		BOSS_SLAIN_3_ASSASSIN,
 		BOSS_SLAIN_3_SNIPER,
 		BOSS_SLAIN_3_WARDEN,
-		BOSS_SLAIN_3_ALL_SUBCLASSES( 33, true ),
+		BOSS_SLAIN_3_ALL_SUBCLASSES ( 80, true ),
+		GAMES_PLAYED_2              ( 81, true ),
+
+		//platinum
+		HAPPY_END                   ( 96 ),
+		ALL_ITEMS_IDENTIFIED        ( 97, true ),
 		VICTORY_WARRIOR,
 		VICTORY_MAGE,
 		VICTORY_ROGUE,
 		VICTORY_HUNTRESS,
-		VICTORY( 34 ),
-		VICTORY_ALL_CLASSES( 35, true ),
-		HAPPY_END( 36 ),
-		CHAMPION_1( 37, true ),
-		CHAMPION_2( 38, true ),
-		CHAMPION_3( 39, true ),
-		STRENGTH_ATTAINED_1( 40 ),
-		STRENGTH_ATTAINED_2( 41 ),
-		STRENGTH_ATTAINED_3( 42 ),
-		STRENGTH_ATTAINED_4( 43 ),
-		FOOD_EATEN_1( 44 ),
-		FOOD_EATEN_2( 45 ),
-		FOOD_EATEN_3( 46 ),
-		FOOD_EATEN_4( 47 ),
-		MASTERY_WARRIOR,
-		MASTERY_MAGE,
-		MASTERY_ROGUE,
-		MASTERY_HUNTRESS,
-		UNLOCK_MAGE( 65 ),
-		UNLOCK_ROGUE( 66 ),
-		UNLOCK_HUNTRESS( 67 ),
-		ITEM_LEVEL_1( 48 ),
-		ITEM_LEVEL_2( 49 ),
-		ITEM_LEVEL_3( 50 ),
-		ITEM_LEVEL_4( 51 ),
-		POTIONS_COOKED_1( 52 ),
-		POTIONS_COOKED_2( 53 ),
-		POTIONS_COOKED_3( 54 ),
-		POTIONS_COOKED_4( 55 ),
-		MASTERY_COMBO( 56 ),
-		NO_MONSTERS_SLAIN( 57 ),
-		GRIM_WEAPON( 58 ),
-		PIRANHAS( 59 ),
-		GAMES_PLAYED_1( 60, true ),
-		GAMES_PLAYED_2( 61, true ),
-		GAMES_PLAYED_3( 62, true ),
-		GAMES_PLAYED_4( 63, true );
+		VICTORY_ALL_CLASSES         ( 98, true ),
+		GAMES_PLAYED_3              ( 99, true ),
+		CHAMPION_1                  ( 100, true ),
+
+		//diamond
+		GAMES_PLAYED_4              ( 112, true ),
+		CHAMPION_2                  ( 113, true ),
+		CHAMPION_3                  ( 114, true );
 
 		public boolean meta;
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java
index c40b787ba..21b8bf837 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/BadgeBanner.java
@@ -22,12 +22,17 @@
 package com.shatteredpixel.shatteredpixeldungeon.effects;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
+import com.watabou.gltextures.SmartTexture;
+import com.watabou.gltextures.TextureCache;
 import com.watabou.noosa.Game;
 import com.watabou.noosa.Image;
 import com.watabou.noosa.TextureFilm;
 import com.watabou.noosa.audio.Sample;
+import com.watabou.utils.Point;
 import com.watabou.utils.PointF;
 
+import java.util.HashMap;
+
 public class BadgeBanner extends Image {
 
 	private enum State {
@@ -119,149 +124,58 @@ public class BadgeBanner extends Image {
 		}
 		super.kill();
 	}
-	
+
+	//map to cache highlight positions so we don't have to keep looking at texture pixels
+	private static HashMap<Integer, Point> highlightPositions = new HashMap<>();
+
+	//we also hardcode any special cases
+	static {
+		//combo master
+		highlightPositions.put(66, new Point(3, 7));
+	}
+
+	//adds a shine to an appropriate pixel on a badge
 	public static void highlight( Image image, int index ) {
 		
 		PointF p = new PointF();
-		
-		switch (index) {
-		case 0:
-		case 1:
-		case 2:
-		case 3:
-			p.offset( 7, 3 );
-			break;
-		case 4:
-		case 5:
-		case 6:
-		case 7:
-			p.offset( 6, 5 );
-			break;
-		case 8:
-		case 9:
-		case 10:
-		case 11:
-			p.offset( 6, 3 );
-			break;
-		case 12:
-		case 13:
-		case 14:
-		case 15:
-			p.offset( 7, 4 );
-			break;
-		case 16:
-			p.offset( 6, 3 );
-			break;
-		case 17:
-			p.offset( 5, 4 );
-			break;
-		case 18:
-			p.offset( 7, 3 );
-			break;
-		case 20:
-			p.offset( 7, 3 );
-			break;
-		case 21:
-			p.offset( 7, 3 );
-			break;
-		case 22:
-			p.offset( 6, 4 );
-			break;
-		case 23:
-			p.offset( 4, 5 );
-			break;
-		case 24:
-			p.offset( 6, 4 );
-			break;
-		case 25:
-			p.offset( 6, 5 );
-			break;
-		case 26:
-			p.offset( 5, 5 );
-			break;
-		case 27:
-			p.offset( 6, 4 );
-			break;
-		case 28:
-			p.offset( 3, 5 );
-			break;
-		case 29:
-			p.offset( 5, 4 );
-			break;
-		case 30:
-			p.offset( 5, 4 );
-			break;
-		case 31:
-			p.offset( 5, 5 );
-			break;
-		case 32:
-		case 33:
-			p.offset( 7, 4 );
-			break;
-		case 34:
-			p.offset( 6, 4 );
-			break;
-		case 35:
-			p.offset( 6, 4 );
-			break;
-		case 36:
-			p.offset( 6, 5 );
-			break;
-		case 37:
-			p.offset( 4, 4 );
-			break;
-		case 38:
-			p.offset( 5, 5 );
-		break;
-		case 39:
-			p.offset( 5, 4 );
-			break;
-		case 40:
-		case 41:
-		case 42:
-		case 43:
-			p.offset( 5, 4 );
-			break;
-		case 44:
-		case 45:
-		case 46:
-		case 47:
-			p.offset( 5, 5 );
-			break;
-		case 48:
-		case 49:
-		case 50:
-		case 51:
-			p.offset( 7, 4 );
-			break;
-		case 52:
-		case 53:
-		case 54:
-		case 55:
-			p.offset( 4, 4 );
-			break;
-		case 56:
-			p.offset( 3, 7 );
-			break;
-		case 57:
-			p.offset( 4, 5 );
-			break;
-		case 58:
-			p.offset( 6, 4 );
-			break;
-		case 59:
-			p.offset( 7, 4 );
-			break;
-		case 60:
-		case 61:
-		case 62:
-		case 63:
-			p.offset( 4, 4 );
-			break;
+
+		if (highlightPositions.containsKey(index)){
+			p.x = highlightPositions.get(index).x * image.scale.x;
+			p.y = highlightPositions.get(index).y * image.scale.y;
+		} else {
+
+			SmartTexture tx = TextureCache.get(Assets.Interfaces.BADGES);
+
+			int size = 16;
+
+			int cols = tx.width / size;
+			int row = index / cols;
+			int col = index % cols;
+
+			int x = 3;
+			int y = 4;
+			int bgColor = tx.getPixel(col * size + x, row * size + y);
+			int curColor = 0;
+
+			for (x = 3; x <= 12; x++) {
+				curColor = tx.getPixel(col * size + x, row * size + y);
+				if (curColor != bgColor) break;
+			}
+
+			if (curColor == bgColor) {
+				y++;
+				for (x = 3; x <= 12; x++) {
+					curColor = tx.getPixel(col * size + x, row * size + y);
+					if (curColor != bgColor) break;
+				}
+			}
+
+			p.x = x * image.scale.x;
+			p.y = y * image.scale.y;
+
+			highlightPositions.put(index, new Point(x, y));
 		}
-		
-		p.x *= image.scale.x;
-		p.y *= image.scale.y;
+
 		p.offset(
 			-image.origin.x * (image.scale.x - 1),
 			-image.origin.y * (image.scale.y - 1) );
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java
index 1b0ac6287..bd74d9741 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/BadgesScene.java
@@ -144,7 +144,7 @@ public class BadgesScene extends PixelScene {
 
 			icon = BadgeBanner.image(badge.image);
 			if (!unlocked) {
-				icon.brightness(0.25f);
+				icon.brightness(0.4f);
 			}
 			add(icon);
 
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBadge.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBadge.java
index 887ccc9c1..2a95919ba 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBadge.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndBadge.java
@@ -39,7 +39,7 @@ public class WndBadge extends Window {
 		
 		Image icon = BadgeBanner.image( badge.image );
 		icon.scale.set( 2 );
-		if (!unlocked) icon.brightness(0.52f);
+		if (!unlocked) icon.brightness(0.4f);
 		add( icon );
 
 		RenderedTextBlock info = PixelScene.renderTextBlock( badge.desc(), 8 );