necron

3 files changed, 35 insertions, 33 deletions

diff --git a/options.txt b/options.txt
index adb7fe67..0cbb760b 100755
--- a/options.txt
+++ b/options.txt
@@ -12,8 +12,8 @@ maxFps:60
 fboEnable:true
 difficulty:3
 fancyGraphics:false
-ao:0
-renderClouds:fast
+ao:1
+renderClouds:false
 resourcePacks:[]
 incompatibleResourcePacks:[]
 lastServer:mc.skyblocksandbox.net
@@ -25,7 +25,7 @@ chatLinksPrompt:true
 chatOpacity:1.0
 snooperEnabled:true
 fullscreen:false
-enableVsync:true
+enableVsync:false
 useVbo:true
 hideServerAddress:false
 advancedItemTooltips:true
@@ -101,6 +101,10 @@ key_start editing session:19
 key_send and save bombdefuse solution:35
 key_navigate to next secret. (Req option enabled at /dg):34
 key_toggle Pathfind. (Req option enabled at /dg):47
+key_Open Maddox Menu:50
+key_Regular Ability:75
+key_Start/Stop Skill Tracker:76
+key_Open Room Images in DSG/SBP:24
 key_Settings:0
 key_Edit GUI Locations:0
 key_Lock Slot:38
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonDeaths.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonDeaths.java
index 9d61c382..c50333b3 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonDeaths.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/dungeon/FeatureDungeonDeaths.java
@@ -116,7 +116,9 @@ public class FeatureDungeonDeaths extends TextHUDFeature implements ChatListener
         for (NetworkPlayerInfo networkPlayerInfoIn : Minecraft.getMinecraft().thePlayer.sendQueue.getPlayerInfoMap()) {
             String name = networkPlayerInfoIn.getDisplayName() != null ? networkPlayerInfoIn.getDisplayName().getFormattedText() : ScorePlayerTeam.formatPlayerName(networkPlayerInfoIn.getPlayerTeam(), networkPlayerInfoIn.getGameProfile().getName());
             if (name.contains("Deaths")) {
-                return Integer.parseInt(TextUtils.keepIntegerCharactersOnly(TextUtils.keepScoreboardCharacters(TextUtils.stripColor(name))));
+                String whatever = TextUtils.keepIntegerCharactersOnly(TextUtils.keepScoreboardCharacters(TextUtils.stripColor(name)));
+                if (whatever.isEmpty()) break;
+                return Integer.parseInt(whatever);
             }
         }
         DungeonContext context = skyblockStatus.getContext();
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorNecron.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorNecron.java
index 6260f62d..9f24edf8 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorNecron.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/bossfight/BossfightProcessorNecron.java
@@ -1,6 +1,7 @@
 package kr.syeyoung.dungeonsguide.roomprocessor.bossfight;
 
 import kr.syeyoung.dungeonsguide.utils.TextUtils;
+import net.minecraft.entity.boss.BossStatus;
 import net.minecraft.entity.item.EntityArmorStand;
 import net.minecraftforge.event.entity.living.LivingEvent;
 
@@ -8,30 +9,40 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class BossfightProcessorNecron extends GeneralBossfightProcessor {
+    // \A7 to §
     public BossfightProcessorNecron() {
         addPhase(PhaseData.builder()
-                .phase("start")
-                .signatureMsg("§r§c[BOSS] Bonzo§r§f: Gratz for making it this far, but I’m basically unbeatable.§r")
-                .nextPhase("fight-1").build()
+                .phase("crystals")
+                .signatureMsg("§r§4[BOSS] Necron§r§c: §r§cFinally, I heard so much about you. The Eye likes you very much.§r")
+                .nextPhase("laser-attack").nextPhase("lost").build()
+        );
+        addPhase(PhaseData.builder()
+                .phase("laser-attack")
+                .signatureMsg("§r§4[BOSS] Necron§r§c: §r§cYou tricked me!§r")
+                .nextPhase("fight-1").nextPhase("lost").build()
         );
         addPhase(PhaseData.builder()
                 .phase("fight-1")
-                .signatureMsg("§r§c[BOSS] Bonzo§r§f: I can summon lots of undead! Check this out.§r")
-                .nextPhase("first-defeat").build()
+                .signatureMsg("§r§4[BOSS] Necron§r§c: §r§cFINE! LET'S MOVE TO SOMEWHERE ELSE!!§r")
+                .nextPhase("terminals").nextPhase("lost").build()
         );
         addPhase(PhaseData.builder()
-                .phase("first-defeat")
-                .signatureMsg("§r§c[BOSS] Bonzo§r§f: Oh I'm dead!§r").signatureMsg("§r§c[BOSS] Bonzo§r§f: Hoho, looks like you killed me!§r")
-                .nextPhase("fight-2").build()
+                .phase("terminals")
+                .signatureMsg("§r§4[BOSS] Necron§r§c: §r§cCRAP!! IT BROKE THE FLOOR!§r")
+                .nextPhase("fight-2").nextPhase("lost").build()
         );
         addPhase(PhaseData.builder()
                 .phase("fight-2")
-                .signatureMsg("§r§c[BOSS] Bonzo§r§f: Sike§r").signatureMsg("§r§c[BOSS] Bonzo§r§f: I can revive myself and become much stronger!§r")
-                .nextPhase("final-defeat").build()
+                .signatureMsg("§r§4[BOSS] Necron§r§c: §r§cTHAT'S IT YOU HAVE DONE IT!§rr")
+                .nextPhase("won").nextPhase("lost").build()
+        );
+        addPhase(PhaseData.builder()
+                .phase("won")
+                .signatureMsg("§r§4[BOSS] Necron§r§c: §r§cAll this, for nothing...§r").build()
         );
         addPhase(PhaseData.builder()
-                .phase("final-defeat")
-                .signatureMsg("§r§c[BOSS] Bonzo§r§f: Alright, maybe I'm just weak after all..§r").build()
+                .phase("lost")
+                .signatureMsg("§r§4[BOSS] Necron§r§c: §r§cFINALLY! This took way too long.§r").build()
         );
     }
 
@@ -39,13 +50,8 @@ public class BossfightProcessorNecron extends GeneralBossfightProcessor {
     @Override
     public List<HealthData> getHealths() {
         List<HealthData> healths = new ArrayList<HealthData>();
-        long health = 0;
-        if (bonzoStand != null) {
-            String name = TextUtils.stripColor(bonzoStand.getName());
-            String healthPart = name.split(" ")[2];
-            health = TextUtils.reverseFormat(healthPart.substring(0, healthPart.length() - 1));
-        }
-//        healths.add(new HealthData("Bonzo", (int) health,250000 , this.getCurrentPhase().startsWith("fight-")));
+        int maxHealth = 1_000_000_000;
+        healths.add(new HealthData("Necron", (int) (BossStatus.healthScale * maxHealth),maxHealth , this.getCurrentPhase().startsWith("fight-")));
         return healths;
     }
 
@@ -53,14 +59,4 @@ public class BossfightProcessorNecron extends GeneralBossfightProcessor {
     public String getBossName() {
         return "Necron";
     }
-
-    private EntityArmorStand bonzoStand;
-    @Override
-    // §e﴾ §c§lBonzo§r §e71k§c❤ §e﴿
-    // §e﴾ §c§lBonzo§r §a250k§c❤ §e﴿
-    public void onEntityUpdate(LivingEvent.LivingUpdateEvent updateEvent) {
-        if (updateEvent.entityLiving.getName().contains("❤") && updateEvent.entityLiving instanceof EntityArmorStand) {
-//            System.out.println(updateEvent.entityLiving.getName());
-        }
-    }
 }