scarf / bonzo done

1 files changed, 4 insertions, 34 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 daff59d0..0d79c67d 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/doorfinder/CatacombDataProvider.java
@@ -3,10 +3,7 @@ package kr.syeyoung.dungeonsguide.dungeon.doorfinder;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Sets;
 import kr.syeyoung.dungeonsguide.e;
-import kr.syeyoung.dungeonsguide.roomprocessor.bossfight.BossfightProcessor;
-import kr.syeyoung.dungeonsguide.roomprocessor.bossfight.BossfightProcessorBonzo;
-import kr.syeyoung.dungeonsguide.roomprocessor.bossfight.BossfightProcessorLivid;
-import kr.syeyoung.dungeonsguide.roomprocessor.bossfight.GeneralBossfightProcessor;
+import kr.syeyoung.dungeonsguide.roomprocessor.bossfight.*;
 import net.minecraft.entity.item.EntityArmorStand;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.BlockPos;
@@ -78,37 +75,10 @@ public class CatacombDataProvider implements DungeonSpecificDataProvider {
     public BossfightProcessor createBossfightProcessor(World w, String dungeonName) {
         String floor = dungeonName.substring(14).trim();
         e.sendDebugChat(new ChatComponentText("Floor: "+floor+ " Building bossfight processor"));
-//        if (floor.equals("F2")) {
-//            GeneralBossfightProcessor bossfightProcessor = new GeneralBossfightProcessor();
-//            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
-//                    .phase("start")
-//                    .signatureMsg("§r§c[BOSS] Scarf§r§f: This is where the journey ends for you, Adventurers.§r")
-//                    .nextPhase("fight-1").build()
-//            );
-//            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
-//                    .phase("fight-1")
-//                    .signatureMsg("§r§c[BOSS] Scarf§r§f: ARISE, MY CREATIONS!§r")
-//                    .nextPhase("first-defeat").build()
-//            );
-//            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
-//                    .phase("first-defeat")
-//                    .signatureMsg("§r§c[BOSS] Scarf§r§f: Those toys are not strong enough I see.§r")
-//                    .nextPhase("fight-2").build()
-//            );
-//            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
-//                    .phase("fight-2")
-//                    .signatureMsg("§r§c[BOSS] Scarf§r§f: Did you forget? I was taught by the best! Let's dance.§r")
-//                    .nextPhase("final-defeat").build()
-//            );
-//            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()
-//                    .phase("final-defeat")
-//                    .signatureMsg("§r§c[BOSS] Scarf§r§f: Whatever...§r").build()
-//            );
-//            return bossfightProcessor;
-        if (false) {
+        if (floor.equals("F2")) {
+            return new BossfightProcessorScarf();
         } else if (floor.equals("F1")) {
-            GeneralBossfightProcessor bossfightProcessor = new BossfightProcessorBonzo();
-            return bossfightProcessor;
+            return new BossfightProcessorBonzo();
 //        } else if (floor.equals("F3")) {
 //            GeneralBossfightProcessor bossfightProcessor = new GeneralBossfightProcessor();
 //            bossfightProcessor.addPhase(GeneralBossfightProcessor.PhaseData.builder()