diff options
3 files changed, 24 insertions, 3 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java index a8428ff6..10959ef3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/LividColor.java @@ -71,4 +71,20 @@ public class LividColor { List<Text> nameTexts = armorStand.getName().getSiblings(); return !nameTexts.isEmpty() && nameTexts.get(0).getStyle().getColor() == TextColor.fromFormatting(color); } + + public static int getGlowColor(String name) { + return switch (name) { + case "Arcade Livid" -> Formatting.YELLOW.getColorValue(); + case "Crossed Livid" -> Formatting.LIGHT_PURPLE.getColorValue(); + case "Doctor Livid" -> Formatting.GRAY.getColorValue(); + case "Frog Livid" -> Formatting.DARK_GREEN.getColorValue(); + case "Hockey Livid" -> Formatting.RED.getColorValue(); + case "Purple Livid" -> Formatting.DARK_PURPLE.getColorValue(); + case "Scream Livid" -> Formatting.BLUE.getColorValue(); + case "Smile Livid" -> Formatting.GREEN.getColorValue(); + case "Vendetta Livid" -> Formatting.WHITE.getColorValue(); + + default -> Formatting.WHITE.getColorValue(); + }; + } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/StarredMobGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/StarredMobGlow.java index db478b7c..4d159988 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/StarredMobGlow.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/StarredMobGlow.java @@ -24,7 +24,8 @@ public class StarredMobGlow { case "Lost Adventurer", "Shadow Assassin", "Diamond Guy" -> { return true; } - default -> { + case "Arcade Livid", "Crossed Livid", "Doctor Livid", "Frog Livid", "Hockey Livid", + "Purple Livid", "Scream Livid", "Smile Livid", "Vendetta Livid" -> { List<ArmorStandEntity> armorStands = getArmorStands(entity.getWorld(), box); if (!armorStands.isEmpty() && LividColor.shouldGlow(armorStands.get(0))) { @@ -53,11 +54,15 @@ public class StarredMobGlow { } public static int getGlowColor(Entity entity) { + String name = entity.getName().getString(); + if (entity instanceof PlayerEntity) { - return switch (entity.getName().getString()) { + return switch (name) { case "Lost Adventurer" -> 0xfee15c; case "Shadow Assassin" -> 0x5b2cb2; case "Diamond Guy" -> 0x57c2f7; + case "Arcade Livid", "Crossed Livid", "Doctor Livid", "Frog Livid", "Hockey Livid", + "Purple Livid", "Scream Livid", "Smile Livid", "Vendetta Livid" -> LividColor.getGlowColor(name); default -> 0xf57738; }; } diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json index c0f3c7ba..f4154b54 100644 --- a/src/main/resources/assets/skyblocker/lang/en_us.json +++ b/src/main/resources/assets/skyblocker/lang/en_us.json @@ -189,7 +189,7 @@ "text.autoconfig.skyblocker.option.locations.dungeons.mapScreen": "Dungeon Map Placement Config...", "text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Map Scaling", "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow": "Starred Mob Glow", - "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip": "Applies the glowing effect to starred mobs that are visible.", + "text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip": "Applies the glowing effect to starred mobs that are visible. Also applies it to the correct Livid in F5/M5.", "text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle", "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "Solve Blaze Puzzle", "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver.@Tooltip": "Boxes the correct blaze in green, also draws a line to and boxes the next blaze to kill in white.", |