a bit better score calculation

2 files changed, 38 insertions, 8 deletions

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 b198841a..6532fdf7 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
@@ -69,13 +69,6 @@ public class CatacombDataProvider implements DungeonSpecificDataProvider {
         return null;
     }
     /*
-    * §r§c[BOSS] The Professor§r§f: I was burdened with terrible news recently...§r
-    * §r§c[BOSS] The Professor§r§f: I'll show you real power!§r
-    * §r§c[BOSS] The Professor§r§f: Oh? You found my Guardians one weakness?§r
-    * §r§c[BOSS] The Professor§r§f: This time I'll be your opponent!§r
-    * §r§c[BOSS] The Professor§r§f: I see. You have forced me to use my ultimate technique.§r
-    * §r§c[BOSS] The Professor§r§f: The process is irreversible, but I'll be stronger than a Wither now!§r
-    * §r§c[BOSS] The Professor§r§f: What?! My Guardian power is unbeatable!§r
      *
     * */
 
@@ -137,6 +130,43 @@ public class CatacombDataProvider implements DungeonSpecificDataProvider {
                     .signatureMsg("§r§c[BOSS] Bonzo§r§f: Alright, maybe I'm just weak after all..§r").build()
             );
             return bossfightProcessor;
+        } else if (floor.equals("F3")) {
+            GeneralBossfightProcessor bossfightProcessor = new GeneralBossfightProcessor();
+            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
+                    .phase("start")
+                    .signatureMsg("§r§c[BOSS] The Professor§r§f: I was burdened with terrible news recently...§r")
+                    .nextPhase("fight-1").build()
+            );
+            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
+                    .phase("fight-1")
+                    .signatureMsg("§r§c[BOSS] The Professor§r§f: I'll show you real power!§r")
+                    .nextPhase("first-defeat").build()
+            );
+            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
+                    .phase("first-defeat")
+                    .signatureMsg("§r§c[BOSS] The Professor§r§f: Oh? You found my Guardians one weakness?§r")
+                    .nextPhase("fight-2").build()
+            );
+            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
+                    .phase("fight-2")
+                    .signatureMsg("§r§c[BOSS] The Professor§r§f: This time I'll be your opponent!§r")
+                    .nextPhase("second-defeat").build()
+            );
+            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
+                    .phase("second-defeat")
+                    .signatureMsg("§r§c[BOSS] The Professor§r§f: I see. You have forced me to use my ultimate technique.§r")
+                    .nextPhase("fight-3").build()
+            );
+            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
+                    .phase("fight-3")
+                    .signatureMsg("§r§c[BOSS] The Professor§r§f: The process is irreversible, but I'll be stronger than a Wither now!§r")
+                    .nextPhase("final-defeat").build()
+            );
+            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
+                    .phase("final-defeat")
+                    .signatureMsg("§r§c[BOSS] The Professor§r§f: What?! My Guardian power is unbeatable!§r").build()
+            );
+            return bossfightProcessor;
         }
         return null;
     }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java
index 75a204d8..6b0322ee 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/roomfinder/DungeonRoom.java
@@ -46,7 +46,7 @@ public class DungeonRoom {
     @AllArgsConstructor
     @Getter
     public static enum RoomState {
-        DISCOVERED(0), COMPLETE_WITHOUT_SECRETS(0), FINISHED(0), FAILED(-10);
+        DISCOVERED(0), COMPLETE_WITHOUT_SECRETS(0), FINISHED(0), FAILED(-14);
         private int scoreModifier;
     }