all tested.

2 files changed, 24 insertions, 5 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/party/FeatureGoodParties.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/party/FeatureGoodParties.java
index ae7b0b45..912e0c6a 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/party/FeatureGoodParties.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/party/FeatureGoodParties.java
@@ -66,18 +66,33 @@ public class FeatureGoodParties extends SimpleFeature implements GuiPostRenderLi
                 int classLvReq = 0;
                 int cataLvReq = 0;
                 boolean Req = false;
+                String note = "";
                 for (int n = 0; n < lore.tagCount(); n++) {
                     String str = lore.getStringTagAt(n);
                     if (str.startsWith("§7Dungeon Level Required: §b")) cataLvReq = Integer.parseInt(str.substring(28));
                     if (str.startsWith("§7Class Level Required: §b")) classLvReq = Integer.parseInt(str.substring(26));
+                    if (str.startsWith("§7§7Note:")) note = TextUtils.stripColor(str.substring(10));
                     if (str.startsWith("§cRequires")) Req = true;
                 }
-                System.out.println(classLvReq + " / "+cataLvReq);
 
+                int x = s.xDisplayPosition;
+                int y = s.yDisplayPosition;
                 if (Req) {
-                    int x = s.xDisplayPosition;
-                    int y = s.yDisplayPosition;
                     Gui.drawRect(x, y, x + 16, y + 16, 0x77AA0000);
+                } else {
+
+                    if (note.toLowerCase().contains("car")) {
+                        fr.drawStringWithShadow("C", x + 1, y + 1, 0xFFFF0000);
+                    } else if (note.toLowerCase().replace(" ", "").contains("s/s+")) {
+                        fr.drawStringWithShadow("S+", x + 1, y + 1, 0xFFFFFF00);
+                    } else if (note.toLowerCase().contains("s+")) {
+                        fr.drawStringWithShadow("S+", x + 1, y + 1, 0xFF00FF00);
+                    } else if (note.toLowerCase().contains(" s") || note.toLowerCase().contains(" s ")) {
+                        fr.drawStringWithShadow("S", x + 1, y + 1, 0xFFFFFF00);
+                    } else if (note.toLowerCase().contains("rush")) {
+                        fr.drawStringWithShadow("R", x + 1, y + 1, 0xFFFF0000);
+                    }
+                    fr.drawStringWithShadow("§e"+Integer.max(classLvReq, cataLvReq), x + 1, y + fr.FONT_HEIGHT, 0xFFFFFFFF);
                 }
 
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/party/playerpreview/DataRendererSecrets.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/party/playerpreview/DataRendererSecrets.java
index 73426287..dfb2f6fb 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/party/playerpreview/DataRendererSecrets.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/party/playerpreview/DataRendererSecrets.java
@@ -5,19 +5,23 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 
 import java.awt.*;
+import java.util.stream.Collectors;
 
 public class DataRendererSecrets implements DataRenderer {
     @Override
     public Dimension renderData(PlayerProfile playerProfile) {
         FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
-        fr.drawString("§eSecrets §b"+playerProfile.getTotalSecrets(), 0,0,-1);
+        double theint = playerProfile.getTotalSecrets()/ (double)playerProfile.getDungeonStats().values().stream().flatMap(s -> s.getData().getPlays().values().stream())
+                .map(fs -> fs.getData().getWatcherKills()).reduce(0, Integer::sum);
+        fr.drawString("§eSecrets §b"+playerProfile.getTotalSecrets()+" §7("+
+                String.format("%.2f", theint)+"/run)", 0,0,-1);
         return new Dimension(100, fr.FONT_HEIGHT);
     }
 
     @Override
     public Dimension renderDummy() {
         FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
-        fr.drawString("§eSecrets §b99999", 0,0,-1);
+        fr.drawString("§eSecrets §b99999 §7(X/run)", 0,0,-1);
         return new Dimension(100, fr.FONT_HEIGHT);
     }
     @Override