diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 043f9009fc..b5a7d9d31a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -216,33 +216,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 043f9009fc..b5a7d9d31a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -216,33 +216,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 043f9009fc..b5a7d9d31a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -216,33 +216,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 043f9009fc..b5a7d9d31a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -216,33 +216,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 043f9009fc..b5a7d9d31a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -216,33 +216,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 043f9009fc..b5a7d9d31a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -216,33 +216,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 043f9009fc..9cefd7129d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -48,6 +48,7 @@ public class AdminGrandBoss implements IAdminCommandHandler private static final int QUEENANT = 29001; // Queen Ant private static final int ORFEN = 29014; // Orfen private static final int CORE = 29006; // Core + private static final int FAFURION = 19740; // Fafurion private static final String[] ADMIN_COMMANDS = { @@ -75,7 +76,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -202,7 +203,7 @@ public class AdminGrandBoss implements IAdminCommandHandler private void manageHtml(PlayerInstance activeChar, int grandBossId) { - if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId)) + if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId)) { final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId); NoRestartZone bossZone = null; @@ -216,38 +217,43 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; + break; + } + case FAFURION: + { + htmlPatch = "data/html/admin/grandboss/grandboss_fafurion.htm"; break; } } - if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM).contains(grandBossId)) + if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, FAFURION).contains(grandBossId)) { deadStatus = 3; switch (bossStatus) diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 043f9009fc..9cefd7129d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -48,6 +48,7 @@ public class AdminGrandBoss implements IAdminCommandHandler private static final int QUEENANT = 29001; // Queen Ant private static final int ORFEN = 29014; // Orfen private static final int CORE = 29006; // Core + private static final int FAFURION = 19740; // Fafurion private static final String[] ADMIN_COMMANDS = { @@ -75,7 +76,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -202,7 +203,7 @@ public class AdminGrandBoss implements IAdminCommandHandler private void manageHtml(PlayerInstance activeChar, int grandBossId) { - if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE).contains(grandBossId)) + if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, QUEENANT, ORFEN, CORE, FAFURION).contains(grandBossId)) { final int bossStatus = GrandBossManager.getInstance().getBossStatus(grandBossId); NoRestartZone bossZone = null; @@ -216,38 +217,43 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; + break; + } + case FAFURION: + { + htmlPatch = "data/html/admin/grandboss/grandboss_fafurion.htm"; break; } } - if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM).contains(grandBossId)) + if (Arrays.asList(ANTHARAS, VALAKAS, BAIUM, FAFURION).contains(grandBossId)) { deadStatus = 3; switch (bossStatus) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 7aa7d94c3b..58b619726a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -216,33 +216,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index 7aa7d94c3b..58b619726a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -75,7 +75,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -216,33 +216,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index e8cf2553e4..3ce9f09529 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -71,7 +71,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -212,33 +212,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index e8cf2553e4..3ce9f09529 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -71,7 +71,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -212,33 +212,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index e8cf2553e4..3ce9f09529 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -71,7 +71,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -212,33 +212,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index e8cf2553e4..3ce9f09529 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -71,7 +71,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -212,33 +212,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index e8cf2553e4..3ce9f09529 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -71,7 +71,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -212,33 +212,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index e8cf2553e4..3ce9f09529 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -71,7 +71,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -212,33 +212,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm b/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm deleted file mode 100644 index b7777248b3..0000000000 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/html/admin/grandboss/grandboss_fafurion.htm +++ /dev/null @@ -1,35 +0,0 @@ -Admin GrandBoss -
- - - - - - -
Admin GrandBoss menu
-
-
-Fafurion
- - - - - - - - - - - - - -
Status:%bossStatus%
Respawn time:%respawnTime%
Players inside:%playersInside%
-
-
-
- \ No newline at end of file diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java index e8cf2553e4..3ce9f09529 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminGrandBoss.java @@ -71,7 +71,7 @@ public class AdminGrandBoss implements IAdminCommandHandler else { final NpcHtmlMessage html = new NpcHtmlMessage(0, 1); - html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss.htm")); + html.setHtml(HtmCache.getInstance().getHtm(activeChar, "data/html/admin/grandboss/grandboss.htm")); activeChar.sendPacket(html); } break; @@ -212,33 +212,33 @@ public class AdminGrandBoss implements IAdminCommandHandler case ANTHARAS: { bossZone = ZoneManager.getInstance().getZoneById(ANTHARAS_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_antharas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_antharas.htm"; break; } case VALAKAS: { - htmlPatch = "data/html/admin/grandboss_valakas.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_valakas.htm"; break; } case BAIUM: { bossZone = ZoneManager.getInstance().getZoneById(BAIUM_ZONE, NoRestartZone.class); - htmlPatch = "data/html/admin/grandboss_baium.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_baium.htm"; break; } case QUEENANT: { - htmlPatch = "data/html/admin/grandboss_queenant.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_queenant.htm"; break; } case ORFEN: { - htmlPatch = "data/html/admin/grandboss_orfen.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_orfen.htm"; break; } case CORE: { - htmlPatch = "data/html/admin/grandboss_core.htm"; + htmlPatch = "data/html/admin/grandboss/grandboss_core.htm"; break; } }