diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18600.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18600.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18600.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18601.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18601.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18601.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18602.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18602.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18602.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18700.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18700.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18700.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18701.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18701.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18701.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18702.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18702.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18702.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18800.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18800.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18800.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18801.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18801.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18801.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18802.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18802.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18802.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18900.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18900.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18900.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18901.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18901.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18901.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18902.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18902.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/18902.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19000.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19000.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19000.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19001.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19001.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19001.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19002.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19002.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19002.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19100.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19100.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19100.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19101.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19101.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19101.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19102.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19102.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19102.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19200.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19200.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19200.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19201.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19201.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19201.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19202.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19202.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19202.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19300.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19300.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19300.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19301.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19301.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19301.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19302.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19302.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19302.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19400.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19400.xml new file mode 100644 index 0000000000..b9300749f7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19400.xml @@ -0,0 +1,9 @@ + + + + 33360 + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19401.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19401.xml new file mode 100644 index 0000000000..be12e516de --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19401.xml @@ -0,0 +1,14 @@ + + + + 33360 + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19402.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19402.xml new file mode 100644 index 0000000000..6ea606ac01 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/buylists/19402.xml @@ -0,0 +1,46 @@ + + + + 33360 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall1.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall1.xml new file mode 100644 index 0000000000..6fe70f20a7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall2.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall2.xml new file mode 100644 index 0000000000..8bf69ef206 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall3.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall3.xml new file mode 100644 index 0000000000..f7f1f440f8 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/ElliaHall3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall1.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall1.xml new file mode 100644 index 0000000000..1753480a5d --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall2.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall2.xml new file mode 100644 index 0000000000..717e047bb4 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall3.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall3.xml new file mode 100644 index 0000000000..62a668008c --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/LaurellHall3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall1.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall1.xml new file mode 100644 index 0000000000..c02e175b86 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall2.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall2.xml new file mode 100644 index 0000000000..f24b5f329a --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall3.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall3.xml new file mode 100644 index 0000000000..fc73cbc54e --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/residences/clanHalls/TalkingIsland/OrchidHall3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-01b.html b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-01b.html new file mode 100644 index 0000000000..e636a9ddf7 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-01b.html @@ -0,0 +1,10 @@ +Greetings, my lord. +I am at your service.
+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 81e8fd76e2..f6816515d7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -118,7 +119,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -257,7 +272,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -289,7 +311,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -435,7 +464,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 81e8fd76e2..f6816515d7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -118,7 +119,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -257,7 +272,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -289,7 +311,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -435,7 +464,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 81e8fd76e2..f6816515d7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -118,7 +119,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -257,7 +272,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -289,7 +311,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -435,7 +464,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 81e8fd76e2..f6816515d7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -118,7 +119,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -257,7 +272,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -289,7 +311,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -435,7 +464,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 655b32f8c8..a55a147eb8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -116,7 +117,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -255,7 +270,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -287,7 +309,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -433,7 +462,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 655b32f8c8..a55a147eb8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -116,7 +117,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -255,7 +270,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -287,7 +309,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -433,7 +462,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 655b32f8c8..a55a147eb8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -116,7 +117,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -255,7 +270,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -287,7 +309,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -433,7 +462,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 655b32f8c8..a55a147eb8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -116,7 +117,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -255,7 +270,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -287,7 +309,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -433,7 +462,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 833cfdd30b..31b529fae1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -109,7 +110,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -248,7 +263,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -280,7 +302,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -426,7 +455,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 833cfdd30b..31b529fae1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -109,7 +110,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -248,7 +263,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -280,7 +302,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -426,7 +455,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 833cfdd30b..31b529fae1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -109,7 +110,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -248,7 +263,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -280,7 +302,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -426,7 +455,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 7d23c341e6..157b7170bb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -109,7 +110,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -248,7 +263,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -280,7 +302,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -426,7 +455,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 7d23c341e6..157b7170bb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -109,7 +110,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -248,7 +263,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -280,7 +302,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -426,7 +455,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+ + + + + +
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html new file mode 100644 index 0000000000..1b789e7c9a --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager-11b.html @@ -0,0 +1,9 @@ +
+[Manage Clan Hall]
+
+
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java index 7d23c341e6..157b7170bb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ClanHallManager/ClanHallManager.java @@ -62,6 +62,7 @@ public class ClanHallManager extends AbstractNpcAI 36721, 36723, 36725, 36727, // Gludio Outskirts 36729, 36731, 36733, 36735, // Dion Outskirts 36737, 36739, // Floran Village + 33360, // Talking Island }; // @formatter:on // Misc @@ -109,7 +110,21 @@ public class ClanHallManager extends AbstractNpcAI { case "index": { - htmltext = isOwningClan(player, npc) ? "ClanHallManager-01.html" : "ClanHallManager-03.html"; + if (isOwningClan(player, npc)) + { + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) + { + htmltext = "ClanHallManager-01.html"; + } + } + else + { + htmltext = "ClanHallManager-03.html"; + } break; } case "manageDoors": @@ -248,7 +263,14 @@ public class ClanHallManager extends AbstractNpcAI case 2: case 3: { - ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + if (npc.getId() == 33360) // Provisional Hall Manager + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(clanHall.getResidenceId() + "0" + (itemLevel - 1))); + } + else + { + ((MerchantInstance) npc).showBuyWindow(player, Integer.parseInt(npc.getId() + "0" + (itemLevel - 1))); + } break; } default: @@ -280,7 +302,14 @@ public class ClanHallManager extends AbstractNpcAI { if (!st.hasMoreTokens()) { - htmltext = "ClanHallManager-11.html"; + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-11b.html"; + } + else + { + htmltext = "ClanHallManager-11.html"; + } } else { @@ -426,7 +455,11 @@ public class ClanHallManager extends AbstractNpcAI final ClanHall clanHall = npc.getClanHall(); if (isOwningClan(player, npc)) { - if (clanHall.getCostFailDay() == 0) + if (npc.getId() == 33360) // Provisional Hall Manager + { + htmltext = "ClanHallManager-01b.html"; + } + else if (clanHall.getCostFailDay() == 0) { htmltext = "ClanHallManager-01.html"; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html new file mode 100644 index 0000000000..84a177d7d4 --- /dev/null +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/ProvisionalHalls/33359-01.html @@ -0,0 +1,13 @@ +


+Ah, hello!

+I am the Clan Hall Gatekeeper, Kerry. It's an honor to serve you.
+Do you need help with the Provisional Clan Hall?
+

+
+