From 8e378b81fa27330b5cce4abe766248944750806f Mon Sep 17 00:00:00 2001
From: syeyoung <cyougn06@naver.com>
Date: Tue, 11 Jan 2022 00:58:10 +0900
Subject: - M5 Support.

---
 .../dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java     | 2 +-
 .../dungeon/doorfinder/CatacombMasterDataProvider.java             | 3 +++
 .../roomprocessor/bossfight/BossfightProcessorLivid.java           | 7 +++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/main/java/kr/syeyoung')

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
index 92bfd218..0b3d33e8 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
@@ -102,7 +102,7 @@ public class CatacombDataProvider implements DungeonSpecificDataProvider {
         } else if (floor.equals("F4")) {
             return new BossfightProcessorThorn();
         } else if (floor.equals("F5")) {
-            return new BossfightProcessorLivid();
+            return new BossfightProcessorLivid(false);
         } else if (floor.equals("F6")) {
             return new BossfightProcessorSadan();
         } else if (floor.equals("F7")) {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombMasterDataProvider.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombMasterDataProvider.java
index 4e535246..43d74079 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombMasterDataProvider.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombMasterDataProvider.java
@@ -93,6 +93,9 @@ public class CatacombMasterDataProvider implements DungeonSpecificDataProvider {
     public BossfightProcessor createBossfightProcessor(World w, String dungeonName) {
         String floor = dungeonName.substring(14).trim();
         DungeonsGuide.sendDebugChat(new ChatComponentText("Floor: Master mode "+floor+ " Building bossfight processor"));
+        if (floor.equals("F5")) {
+            return new BossfightProcessorLivid(true);
+        }
         return null;
     }
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java
index 0ecae36b..ace0fd67 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorLivid.java
@@ -34,8 +34,11 @@ public class BossfightProcessorLivid extends GeneralBossfightProcessor {
 
     private final Set<String> knownLivids = new HashSet<String>();
 
-    public BossfightProcessorLivid() {
+    private boolean isMasterMode;
+
+    public BossfightProcessorLivid(boolean isMasterMode) {
         addPhase(PhaseData.builder().phase("start").build());
+        this.isMasterMode = isMasterMode;
     }
     private static final Map<String, String> lividColorPrefix = new HashMap<String, String>() {{
             put("Vendetta", "§f");
@@ -76,7 +79,7 @@ public class BossfightProcessorLivid extends GeneralBossfightProcessor {
                 health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
             } catch (Exception e) {e.printStackTrace();}
         }
-        healths.add(new HealthData(realLividName == null ? "unknown" : realLividName, (int) health,7000000 , true));
+        healths.add(new HealthData(realLividName == null ? "unknown" : realLividName, (int) health,isMasterMode ? 600000000 : 7000000 , true));
         return healths;
     }
 
-- 
cgit