From 78434eb07cc6ecaa1f0f61adc97f60bee117f97a Mon Sep 17 00:00:00 2001 From: malyelfik <malyelfik@users.noreply.github.com> Date: Mon, 15 Apr 2013 18:30:14 +0000 Subject: [PATCH] BETA: Mercenary Captain from Core to DP Reviewed by: !UnAfraid --- .../game/data/html/mercmanager/36481-10.htm | 2 - .../game/data/html/mercmanager/36481-2.htm | 1 - .../game/data/html/mercmanager/36481-4.htm | 8 - .../game/data/html/mercmanager/36481-5.htm | 1 - .../game/data/html/mercmanager/36481-6.htm | 1 - .../game/data/html/mercmanager/36481-7.htm | 1 - .../dist/game/data/html/mercmanager/36481.htm | 12 -- .../game/data/html/mercmanager/36482-10.htm | 2 - .../game/data/html/mercmanager/36482-2.htm | 1 - .../game/data/html/mercmanager/36482-4.htm | 8 - .../game/data/html/mercmanager/36482-5.htm | 1 - .../game/data/html/mercmanager/36482-6.htm | 1 - .../game/data/html/mercmanager/36482-7.htm | 1 - .../dist/game/data/html/mercmanager/36482.htm | 12 -- .../game/data/html/mercmanager/36483-10.htm | 2 - .../game/data/html/mercmanager/36483-2.htm | 1 - .../game/data/html/mercmanager/36483-5.htm | 1 - .../game/data/html/mercmanager/36483-6.htm | 1 - .../game/data/html/mercmanager/36483-7.htm | 1 - .../dist/game/data/html/mercmanager/36483.htm | 12 -- .../game/data/html/mercmanager/36484-10.htm | 2 - .../game/data/html/mercmanager/36484-2.htm | 1 - .../game/data/html/mercmanager/36484-4.htm | 8 - .../game/data/html/mercmanager/36484-5.htm | 1 - .../game/data/html/mercmanager/36484-6.htm | 1 - .../game/data/html/mercmanager/36484-7.htm | 1 - .../dist/game/data/html/mercmanager/36484.htm | 12 -- .../game/data/html/mercmanager/36485-10.htm | 2 - .../game/data/html/mercmanager/36485-2.htm | 1 - .../game/data/html/mercmanager/36485-4.htm | 8 - .../game/data/html/mercmanager/36485-5.htm | 1 - .../game/data/html/mercmanager/36485-6.htm | 1 - .../game/data/html/mercmanager/36485-7.htm | 1 - .../dist/game/data/html/mercmanager/36485.htm | 12 -- .../game/data/html/mercmanager/36486-10.htm | 2 - .../game/data/html/mercmanager/36486-2.htm | 1 - .../game/data/html/mercmanager/36486-4.htm | 8 - .../game/data/html/mercmanager/36486-5.htm | 1 - .../game/data/html/mercmanager/36486-6.htm | 1 - .../game/data/html/mercmanager/36486-7.htm | 1 - .../dist/game/data/html/mercmanager/36486.htm | 12 -- .../game/data/html/mercmanager/36487-10.htm | 2 - .../game/data/html/mercmanager/36487-2.htm | 1 - .../game/data/html/mercmanager/36487-4.htm | 8 - .../game/data/html/mercmanager/36487-5.htm | 1 - .../game/data/html/mercmanager/36487-6.htm | 1 - .../game/data/html/mercmanager/36487-7.htm | 1 - .../dist/game/data/html/mercmanager/36487.htm | 12 -- .../game/data/html/mercmanager/36488-10.htm | 2 - .../game/data/html/mercmanager/36488-2.htm | 1 - .../game/data/html/mercmanager/36488-4.htm | 8 - .../game/data/html/mercmanager/36488-5.htm | 1 - .../game/data/html/mercmanager/36488-6.htm | 1 - .../game/data/html/mercmanager/36488-7.htm | 1 - .../dist/game/data/html/mercmanager/36488.htm | 12 -- .../game/data/html/mercmanager/36489-10.htm | 2 - .../game/data/html/mercmanager/36489-2.htm | 1 - .../game/data/html/mercmanager/36489-4.htm | 8 - .../game/data/html/mercmanager/36489-5.htm | 1 - .../game/data/html/mercmanager/36489-6.htm | 1 - .../game/data/html/mercmanager/36489-7.htm | 1 - .../dist/game/data/html/mercmanager/36489.htm | 12 -- .../html/mercmanager/mercmanager-busy.htm | 3 - .../data/html/mercmanager/mercmanager-no.htm | 3 - .../data/html/mercmanager/mercmanager.htm | 7 - .../data/html/mercmanager/striderslist.htm | 11 -- .../dist/game/data/multisell/686.xml | 101 +++++++++++ .../dist/game/data/multisell/687.xml | 101 +++++++++++ .../dist/game/data/multisell/688.xml | 101 +++++++++++ .../dist/game/data/multisell/689.xml | 101 +++++++++++ .../dist/game/data/multisell/690.xml | 101 +++++++++++ .../dist/game/data/multisell/691.xml | 101 +++++++++++ .../dist/game/data/multisell/692.xml | 101 +++++++++++ .../dist/game/data/multisell/693.xml | 101 +++++++++++ .../dist/game/data/multisell/694.xml | 101 +++++++++++ .../ai/npc/MercenaryCaptain/36481-01.html | 10 ++ .../ai/npc/MercenaryCaptain/36481-02.html} | 6 +- .../ai/npc/MercenaryCaptain/36481-03.html | 9 + .../ai/npc/MercenaryCaptain/36481-04.html | 4 + .../ai/npc/MercenaryCaptain/36481-05.html | 3 + .../ai/npc/MercenaryCaptain/36481-06.html | 4 + .../ai/npc/MercenaryCaptain/36481-07.html | 3 + .../ai/npc/MercenaryCaptain/36481-08.html | 3 + .../ai/npc/MercenaryCaptain/36481-09.html | 3 + .../ai/npc/MercenaryCaptain/36481-10.html} | 0 .../ai/npc/MercenaryCaptain/36482-01.html | 10 ++ .../ai/npc/MercenaryCaptain/36483-01.html | 10 ++ .../ai/npc/MercenaryCaptain/36484-01.html | 10 ++ .../ai/npc/MercenaryCaptain/36485-01.html | 10 ++ .../ai/npc/MercenaryCaptain/36486-01.html | 10 ++ .../ai/npc/MercenaryCaptain/36487-01.html | 10 ++ .../ai/npc/MercenaryCaptain/36488-01.html | 10 ++ .../ai/npc/MercenaryCaptain/36489-01.html | 10 ++ .../MercenaryCaptain/MercenaryCaptain.java | 170 ++++++++++++++++-- .../data/scripts/handlers/MasterHandler.java | 2 - .../handlers/bypasshandlers/TerritoryWar.java | 159 ---------------- L2J_DataPack_BETA/dist/sql/game/npc.sql | 16 +- 97 files changed, 1193 insertions(+), 438 deletions(-) delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-4.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-4.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-4.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-4.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-4.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-4.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-4.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-10.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-2.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-4.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-5.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-6.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-7.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager-busy.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager-no.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager.htm delete mode 100644 L2J_DataPack_BETA/dist/game/data/html/mercmanager/striderslist.htm create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/686.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/687.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/688.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/689.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/690.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/691.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/692.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/693.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/multisell/694.xml create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-01.html rename L2J_DataPack_BETA/dist/game/data/{html/mercmanager/36483-4.htm => scripts/ai/npc/MercenaryCaptain/36481-02.html} (60%) create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-03.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-04.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-05.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-06.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-07.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-08.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-09.html rename L2J_DataPack_BETA/dist/game/data/{html/mercmanager/nocert.htm => scripts/ai/npc/MercenaryCaptain/36481-10.html} (100%) create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36482-01.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36483-01.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36484-01.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36485-01.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36486-01.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36487-01.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36488-01.html create mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36489-01.html delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/TerritoryWar.java diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-4.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-4.htm deleted file mode 100644 index 7ef1b268b1..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-4.htm +++ /dev/null @@ -1,8 +0,0 @@ -<html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> -So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> -But remember one thing... You must always fight as well as you can, no matter who has hired you. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481.htm deleted file mode 100644 index 39719e0b00..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36481.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 1">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 660">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13757 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-4.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-4.htm deleted file mode 100644 index 7ef1b268b1..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-4.htm +++ /dev/null @@ -1,8 +0,0 @@ -<html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> -So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> -But remember one thing... You must always fight as well as you can, no matter who has hired you. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482.htm deleted file mode 100644 index 0c863a9a96..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36482.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 2">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 661">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13758 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483.htm deleted file mode 100644 index 55c9aaf659..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 3">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 662">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13759 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-4.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-4.htm deleted file mode 100644 index 7ef1b268b1..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-4.htm +++ /dev/null @@ -1,8 +0,0 @@ -<html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> -So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> -But remember one thing... You must always fight as well as you can, no matter who has hired you. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484.htm deleted file mode 100644 index e1b3b97626..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36484.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 4">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 663">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13760 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-4.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-4.htm deleted file mode 100644 index 7ef1b268b1..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-4.htm +++ /dev/null @@ -1,8 +0,0 @@ -<html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> -So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> -But remember one thing... You must always fight as well as you can, no matter who has hired you. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485.htm deleted file mode 100644 index a870201669..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36485.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 5">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 664">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13761 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-4.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-4.htm deleted file mode 100644 index 7ef1b268b1..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-4.htm +++ /dev/null @@ -1,8 +0,0 @@ -<html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> -So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> -But remember one thing... You must always fight as well as you can, no matter who has hired you. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486.htm deleted file mode 100644 index 4a5647e20d..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36486.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 6">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 665">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13762 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-4.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-4.htm deleted file mode 100644 index 7ef1b268b1..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-4.htm +++ /dev/null @@ -1,8 +0,0 @@ -<html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> -So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> -But remember one thing... You must always fight as well as you can, no matter who has hired you. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487.htm deleted file mode 100644 index 1a46f451ce..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36487.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 7">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 666">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13763 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-4.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-4.htm deleted file mode 100644 index 7ef1b268b1..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-4.htm +++ /dev/null @@ -1,8 +0,0 @@ -<html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> -So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> -But remember one thing... You must always fight as well as you can, no matter who has hired you. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488.htm deleted file mode 100644 index 90ee646464..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36488.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 8">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 667">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13764 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-10.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-10.htm deleted file mode 100644 index 3af415615c..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-10.htm +++ /dev/null @@ -1,2 +0,0 @@ -<html><body>Do you know what goes on during a battle?<br> -If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh...</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-2.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-2.htm deleted file mode 100644 index 59bbe0f351..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-2.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>If you want to be a mercenary, come back after you have complered the 2nd class transfer and have reached at least level 40.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-4.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-4.htm deleted file mode 100644 index 7ef1b268b1..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-4.htm +++ /dev/null @@ -1,8 +0,0 @@ -<html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> -So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> -But remember one thing... You must always fight as well as you can, no matter who has hired you. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-5.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-5.htm deleted file mode 100644 index d7ba44a1c3..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-5.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>Where is the certificate you promised to show me? Are you trying to pull a fast one on me?</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-6.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-6.htm deleted file mode 100644 index 1e96510aeb..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-6.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>You do not have enough badges yet to be recognized for your activities on behalf of the territory.</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-7.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-7.htm deleted file mode 100644 index 470358c2c2..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489-7.htm +++ /dev/null @@ -1 +0,0 @@ -<html><body>I will expect big things from you. Congratulations!</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489.htm deleted file mode 100644 index 756af84480..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36489.htm +++ /dev/null @@ -1,12 +0,0 @@ -<html><body>Mercenary Captain:<br> -Are you interested in signing on as a mercenary for this Territory War? -I'll be honest with you -- the lord here is doing pretty well for himself. -Serve him well and you can acquire whatever you want.<br> -<a action="bypass -h npc_%objectId%_Territory 9">Territory Registration and Information</a><br> -<a action="bypass -h npc_%objectId%_multisell 668">Buy regular mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_Elite">Buy Elite Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_Chat 5">Buy Exalted Mercenary items.</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy_List 13765 striderslist.htm">Mount Information.</a><br> -<a action="bypass -h npc_%objectId%_Chat 4">Mercenary Information.</a><br> -<a action="bypass -h npc_%objectId%_Quest">Quest</a> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager-busy.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager-busy.htm deleted file mode 100644 index 84865040e6..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager-busy.htm +++ /dev/null @@ -1,3 +0,0 @@ -<html><body>%npcname%:<br> -I can't help you right now. -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager-no.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager-no.htm deleted file mode 100644 index 7fe45e6830..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager-no.htm +++ /dev/null @@ -1,3 +0,0 @@ -<html><body> -Do you wish to join our mercenary guild? -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager.htm deleted file mode 100644 index cacc46c354..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/mercmanager.htm +++ /dev/null @@ -1,7 +0,0 @@ -<html><body>%npcname%:<br> -Greetings, how can I help you? -<center> -<br><br> -<a action="bypass -h npc_%objectId%_hire %npcId%1">Hire Mercenary</a><br> -</center> -</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/striderslist.htm b/L2J_DataPack_BETA/dist/game/data/html/mercmanager/striderslist.htm deleted file mode 100644 index 903567c3a7..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/striderslist.htm +++ /dev/null @@ -1,11 +0,0 @@ -<html><body>Mercenary Captain:<br> -Mobility and speed are vital assets to a mercenary. In a large-scale battle, Striders can prove to be an invaluable -boon in the course of battle.<br> -A mercenary company takes care of striders whom it received when a contract is made with the lord. -And this mercenary company distributes to the mercenaries... If you would like to be at the forefront of the battle, bring me some badges and I will give you a Strider.<br> -About <font color="LEVEL">%striderBadge%</font> for ordinary Striders and about <font color="LEVEL">%gstriderBadge%</font> for Guardian Striders should be enough.<br><br> -<a action="bypass -h npc_%objectId%_TW_Buy %itemId% %striderBadge% 1">I want a "Wind Strider." (ordinary)</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy %itemId% %striderBadge% 2">I want a "Star Strider." (ordinary)</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy %itemId% %striderBadge% 3">I want a "Twilight Strider." (ordinary)</a><br> -<a action="bypass -h npc_%objectId%_TW_Buy %itemId% %gstriderBadge% 4">I want a "Guardian Strider." (special)</a> -</body></html> diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/686.xml b/L2J_DataPack_BETA/dist/game/data/multisell/686.xml new file mode 100644 index 0000000000..c0dfb35714 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/686.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Gludio Human Mercenary --> + <production count="1" id="13569" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Gludio Elf Mercenary --> + <production count="1" id="13570" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Gludio Dark Elf Mercenary --> + <production count="1" id="13571" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Gludio Orc Mercenary --> + <production count="1" id="13572" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Gludio Dwarf Mercenary --> + <production count="1" id="13573" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Gludio Kamael Mercenary --> + <production count="1" id="13574" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Gludio Disguise Scroll --> + <production count="1" id="13677" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Gludio Territory Badge --> + <ingredient count="10" id="13757" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Gludio Territory Badge --> + <ingredient count="13" id="13757" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Gludio Territory Badge --> + <ingredient count="5" id="13757" /> + <!-- Transformation Scroll: Gludio Archer Mercenary --> + <production count="1" id="13576" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Gludio Territory Badge --> + <ingredient count="5" id="13757" /> + <!-- Transformation Scroll: Gludio Wizard Mercenary --> + <production count="1" id="13577" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Gludio Territory Badge --> + <ingredient count="5" id="13757" /> + <!-- Transformation Scroll: Gludio Kamael Captain Mercenary --> + <production count="1" id="13578" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Gludio Territory Badge --> + <ingredient count="10" id="13757" /> + <!-- Transformation Scroll: Gludio Knight Captain Mercenary --> + <production count="1" id="13579" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Gludio Territory Badge --> + <ingredient count="10" id="13757" /> + <!-- Transformation Scroll: Gludio Commander Mercenary --> + <production count="1" id="13580" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/687.xml b/L2J_DataPack_BETA/dist/game/data/multisell/687.xml new file mode 100644 index 0000000000..6eb81b216f --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/687.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Dion Human Mercenary --> + <production count="1" id="13581" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Dion Elf Mercenary --> + <production count="1" id="13582" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Dion Dark Elf Mercenary --> + <production count="1" id="13583" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Dion Orc Mercenary --> + <production count="1" id="13584" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Dion Dwarf Mercenary --> + <production count="1" id="13585" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Dion Kamael Mercenary --> + <production count="1" id="13586" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Dion Disguise Scroll --> + <production count="1" id="13678" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Dion Territory Badge --> + <ingredient count="10" id="13758" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Dion Territory Badge --> + <ingredient count="13" id="13758" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Dion Territory Badge --> + <ingredient count="5" id="13758" /> + <!-- Transformation Scroll: Dion Archer Mercenary --> + <production count="1" id="13588" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Dion Territory Badge --> + <ingredient count="5" id="13758" /> + <!-- Transformation Scroll: Dion Wizard Mercenary --> + <production count="1" id="13589" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Dion Territory Badge --> + <ingredient count="5" id="13758" /> + <!-- Transformation Scroll: Dion Kamael Captain Mercenary --> + <production count="1" id="13590" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Dion Territory Badge --> + <ingredient count="10" id="13758" /> + <!-- Transformation Scroll: Dion Knight Captain Mercenary --> + <production count="1" id="13591" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Dion Territory Badge --> + <ingredient count="10" id="13758" /> + <!-- Transformation Scroll: Dion Commander Mercenary --> + <production count="1" id="13592" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/688.xml b/L2J_DataPack_BETA/dist/game/data/multisell/688.xml new file mode 100644 index 0000000000..b766b08305 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/688.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Giran Human Mercenary --> + <production count="1" id="13593" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Giran Elf Mercenary --> + <production count="1" id="13594" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Giran Dark Elf Mercenary --> + <production count="1" id="13595" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Giran Orc Mercenary --> + <production count="1" id="13596" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Giran Dwarf Mercenary --> + <production count="1" id="13597" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Giran Kamael Mercenary --> + <production count="1" id="13598" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Giran Disguise Scroll --> + <production count="1" id="13679" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Giran Territory Badge --> + <ingredient count="10" id="13759" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Giran Territory Badge --> + <ingredient count="13" id="13759" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Giran Territory Badge --> + <ingredient count="5" id="13759" /> + <!-- Transformation Scroll: Giran Archer Mercenary --> + <production count="1" id="13600" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Giran Territory Badge --> + <ingredient count="5" id="13759" /> + <!-- Transformation Scroll: Giran Wizard Mercenary --> + <production count="1" id="13601" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Giran Territory Badge --> + <ingredient count="5" id="13759" /> + <!-- Transformation Scroll: Giran Kamael Captain Mercenary --> + <production count="1" id="13602" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Giran Territory Badge --> + <ingredient count="10" id="13759" /> + <!-- Transformation Scroll: Giran Knight Captain Mercenary --> + <production count="1" id="13603" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Giran Territory Badge --> + <ingredient count="10" id="13759" /> + <!-- Transformation Scroll: Giran Commander Mercenary --> + <production count="1" id="13604" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/689.xml b/L2J_DataPack_BETA/dist/game/data/multisell/689.xml new file mode 100644 index 0000000000..4b4c4191a5 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/689.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Oren Human Mercenary --> + <production count="1" id="13605" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Oren Elf Mercenary --> + <production count="1" id="13606" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Oren Dark Elf Mercenary --> + <production count="1" id="13607" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Oren Orc Mercenary --> + <production count="1" id="13608" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Oren Dwarf Mercenary --> + <production count="1" id="13609" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Oren Kamael Mercenary --> + <production count="1" id="13610" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Oren Disguise Scroll --> + <production count="1" id="13680" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Oren Territory Badge --> + <ingredient count="10" id="13760" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Oren Territory Badge --> + <ingredient count="13" id="13760" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Oren Territory Badge --> + <ingredient count="5" id="13760" /> + <!-- Transformation Scroll: Oren Archer Mercenary --> + <production count="1" id="13612" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Oren Territory Badge --> + <ingredient count="5" id="13760" /> + <!-- Transformation Scroll: Oren Wizard Mercenary --> + <production count="1" id="13613" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Oren Territory Badge --> + <ingredient count="5" id="13760" /> + <!-- Transformation Scroll: Oren Kamael Captain Mercenary --> + <production count="1" id="13614" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Oren Territory Badge --> + <ingredient count="10" id="13760" /> + <!-- Transformation Scroll: Oren Knight Captain Mercenary --> + <production count="1" id="13615" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Oren Territory Badge --> + <ingredient count="10" id="13760" /> + <!-- Transformation Scroll: Oren Commander Mercenary --> + <production count="1" id="13616" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/690.xml b/L2J_DataPack_BETA/dist/game/data/multisell/690.xml new file mode 100644 index 0000000000..670737e46a --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/690.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Aden Human Mercenary --> + <production count="1" id="13617" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Aden Elf Mercenary --> + <production count="1" id="13618" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Aden Dark Elf Mercenary --> + <production count="1" id="13619" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Aden Orc Mercenary --> + <production count="1" id="13620" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Aden Dwarf Mercenary --> + <production count="1" id="13621" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Aden Kamael Mercenary --> + <production count="1" id="13622" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Aden Disguise Scroll --> + <production count="1" id="13681" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Aden Territory Badge --> + <ingredient count="10" id="13761" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Aden Territory Badge --> + <ingredient count="13" id="13761" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Aden Territory Badge --> + <ingredient count="5" id="13761" /> + <!-- Transformation Scroll: Aden Archer Mercenary --> + <production count="1" id="13624" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Aden Territory Badge --> + <ingredient count="5" id="13761" /> + <!-- Transformation Scroll: Aden Wizard Mercenary --> + <production count="1" id="13625" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Aden Territory Badge --> + <ingredient count="5" id="13761" /> + <!-- Transformation Scroll: Aden Kamael Captain Mercenary --> + <production count="1" id="13626" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Aden Territory Badge --> + <ingredient count="10" id="13761" /> + <!-- Transformation Scroll: Aden Knight Captain Mercenary --> + <production count="1" id="13627" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Aden Territory Badge --> + <ingredient count="10" id="13761" /> + <!-- Transformation Scroll: Aden Commander Mercenary --> + <production count="1" id="13628" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/691.xml b/L2J_DataPack_BETA/dist/game/data/multisell/691.xml new file mode 100644 index 0000000000..6a43bce612 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/691.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Innadril Human Mercenary --> + <production count="1" id="13629" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Innadril Elf Mercenary --> + <production count="1" id="13630" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Innadril Dark Elf Mercenary --> + <production count="1" id="13631" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Innadril Orc Mercenary --> + <production count="1" id="13632" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Innadril Dwarf Mercenary --> + <production count="1" id="13633" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Innadril Kamael Mercenary --> + <production count="1" id="13634" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Innadril Disguise Scroll --> + <production count="1" id="13682" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Innadril Territory Badge --> + <ingredient count="10" id="13762" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Innadril Territory Badge --> + <ingredient count="13" id="13762" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Innadril Territory Badge --> + <ingredient count="5" id="13762" /> + <!-- Transformation Scroll: Innadril Archer Mercenary --> + <production count="1" id="13636" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Innadril Territory Badge --> + <ingredient count="5" id="13762" /> + <!-- Transformation Scroll: Innadril Wizard Mercenary --> + <production count="1" id="13637" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Innadril Territory Badge --> + <ingredient count="5" id="13762" /> + <!-- Transformation Scroll: Innadril Kamael Captain Mercenary --> + <production count="1" id="13638" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Innadril Territory Badge --> + <ingredient count="10" id="13762" /> + <!-- Transformation Scroll: Innadril Knight Captain Mercenary --> + <production count="1" id="13639" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Innadril Territory Badge --> + <ingredient count="10" id="13762" /> + <!-- Transformation Scroll: Innadril Commander Mercenary --> + <production count="1" id="13640" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/692.xml b/L2J_DataPack_BETA/dist/game/data/multisell/692.xml new file mode 100644 index 0000000000..7af2a9ec3c --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/692.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Goddard Human Mercenary --> + <production count="1" id="13641" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Goddard Elf Mercenary --> + <production count="1" id="13642" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Goddard Dark Elf Mercenary --> + <production count="1" id="13643" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Goddard Orc Mercenary --> + <production count="1" id="13644" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Goddard Dwarf Mercenary --> + <production count="1" id="13645" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Goddard Kamael Mercenary --> + <production count="1" id="13646" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Goddard Disguise Scroll --> + <production count="1" id="13683" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Goddard Territory Badge --> + <ingredient count="10" id="13763" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Goddard Territory Badge --> + <ingredient count="13" id="13763" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Goddard Territory Badge --> + <ingredient count="5" id="13763" /> + <!-- Transformation Scroll: Goddard Archer Mercenary --> + <production count="1" id="13648" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Goddard Territory Badge --> + <ingredient count="5" id="13763" /> + <!-- Transformation Scroll: Goddard Wizard Mercenary --> + <production count="1" id="13649" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Goddard Territory Badge --> + <ingredient count="5" id="13763" /> + <!-- Transformation Scroll: Goddard Kamael Captain Mercenary --> + <production count="1" id="13650" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Goddard Territory Badge --> + <ingredient count="10" id="13763" /> + <!-- Transformation Scroll: Goddard Knight Captain Mercenary --> + <production count="1" id="13651" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Goddard Territory Badge --> + <ingredient count="10" id="13763" /> + <!-- Transformation Scroll: Goddard Commander Mercenary --> + <production count="1" id="13652" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/693.xml b/L2J_DataPack_BETA/dist/game/data/multisell/693.xml new file mode 100644 index 0000000000..57619235b4 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/693.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Rune Human Mercenary --> + <production count="1" id="13653" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Rune Elf Mercenary --> + <production count="1" id="13654" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Rune Dark Elf Mercenary --> + <production count="1" id="13655" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Rune Orc Mercenary --> + <production count="1" id="13656" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Rune Dwarf Mercenary --> + <production count="1" id="13657" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Rune Kamael Mercenary --> + <production count="1" id="13658" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Rune Disguise Scroll --> + <production count="1" id="13684" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Rune Territory Badge --> + <ingredient count="10" id="13764" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Rune Territory Badge --> + <ingredient count="13" id="13764" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Rune Territory Badge --> + <ingredient count="5" id="13764" /> + <!-- Transformation Scroll: Rune Archer Mercenary --> + <production count="1" id="13660" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Rune Territory Badge --> + <ingredient count="5" id="13764" /> + <!-- Transformation Scroll: Rune Wizard Mercenary --> + <production count="1" id="13661" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Rune Territory Badge --> + <ingredient count="5" id="13764" /> + <!-- Transformation Scroll: Rune Kamael Captain Mercenary --> + <production count="1" id="13662" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Rune Territory Badge --> + <ingredient count="10" id="13764" /> + <!-- Transformation Scroll: Rune Knight Captain Mercenary --> + <production count="1" id="13663" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Rune Territory Badge --> + <ingredient count="10" id="13764" /> + <!-- Transformation Scroll: Rune Commander Mercenary --> + <production count="1" id="13664" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/multisell/694.xml b/L2J_DataPack_BETA/dist/game/data/multisell/694.xml new file mode 100644 index 0000000000..fdb6fe7aa1 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/multisell/694.xml @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/multisell.xsd"> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Schuttgart Human Mercenary --> + <production count="1" id="13665" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Schuttgart Elf Mercenary --> + <production count="1" id="13666" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Schuttgart Dark Elf Mercenary --> + <production count="1" id="13667" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Schuttgart Orc Mercenary --> + <production count="1" id="13668" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Schuttgart Dwarf Mercenary --> + <production count="1" id="13669" /> + </item> + <item> + <!-- Adena --> + <ingredient count="13200" id="57" /> + <!-- Transformation Scroll: Schuttgart Kamael Mercenary --> + <production count="1" id="13670" /> + </item> + <item> + <!-- Adena --> + <ingredient count="70000" id="57" /> + <!-- Schuttgart Disguise Scroll --> + <production count="1" id="13685" /> + </item> + <item> + <!-- Adena --> + <ingredient count="12200" id="57" /> + <!-- Schuttgart Territory Badge --> + <ingredient count="10" id="13765" /> + <!-- Red Talisman - Territory Guard --> + <production count="1" id="14812" /> + </item> + <item> + <!-- Adena --> + <ingredient count="14500" id="57" /> + <!-- Schuttgart Territory Badge --> + <ingredient count="13" id="13765" /> + <!-- Blue Talisman - Lord's Divine Protection --> + <production count="1" id="14813" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Schuttgart Territory Badge --> + <ingredient count="5" id="13765" /> + <!-- Transformation Scroll: Schuttgart Archer Mercenary --> + <production count="1" id="13672" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Schuttgart Territory Badge --> + <ingredient count="5" id="13765" /> + <!-- Transformation Scroll: Schuttgart Wizard Mercenary --> + <production count="1" id="13673" /> + </item> + <item> + <!-- Adena --> + <ingredient count="27800" id="57" /> + <!-- Schuttgart Territory Badge --> + <ingredient count="5" id="13765" /> + <!-- Transformation Scroll: Schuttgart Kamael Captain Mercenary --> + <production count="1" id="13674" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Schuttgart Territory Badge --> + <ingredient count="10" id="13765" /> + <!-- Transformation Scroll: Schuttgart Knight Captain Mercenary --> + <production count="1" id="13675" /> + </item> + <item> + <!-- Adena --> + <ingredient count="55600" id="57" /> + <!-- Schuttgart Territory Badge --> + <ingredient count="10" id="13765" /> + <!-- Transformation Scroll: Schuttgart Commander Mercenary --> + <production count="1" id="13676" /> + </item> +</list> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-01.html new file mode 100644 index 0000000000..958b66c332 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territory Registration and Information</a><br> +<a action="bypass -h npc_%objectId%_multisell 660">Buy General Items</a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Buy Elite Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Buy Exalted Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Mount information.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Mercenary Information.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-4.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-02.html similarity index 60% rename from L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-4.htm rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-02.html index 7ef1b268b1..1462a875f0 100644 --- a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/36483-4.htm +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-02.html @@ -1,8 +1,6 @@ <html><body>Mercenary Captain:<br> -As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. -Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> +As the war dragged on, those in power sought for a way to wage the conflict without risking their own positions. Politics, eh? No rich lord wants to weaken the strength of his loyal troops if he doesn't have to.<br> So hiring mercenaries like us to fight their battles for them became an easy option.<br> -And, I gotta admit, it's a good way for a soldier to make money. -Win on the battlefield and you'll earn fame and fortune at the same time.<br> +And, I gotta admit, it's a good way for a soldier to make money. Win on the battlefield and you'll earn fame and fortune at the same time.<br> But remember one thing... You must always fight as well as you can, no matter who has hired you. </body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-03.html new file mode 100644 index 0000000000..700b6e3b80 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-03.html @@ -0,0 +1,9 @@ +<html><body>Mercenary Captain:<br> +Mobility and speed are vital assets to a mercenary. In a large-scale battle, Striders can prove to be an invaluable boon in the course of battle.<br> +A mercenary company takes care of striders whom it received when a contract is made with the lord. And this mercenary company distributes to the mercenaries... If you would like to be at the forefront of the battle, bring me some badges and I will give you a Strider.<br> +About <font color="LEVEL">%strider%</font> for ordinary Striders and about <font color="LEVEL">%gstrider%</font> for Guardian Striders should be enough.<br><br> +<a action="bypass -h Quest MercenaryCaptain strider 0" msg="1383">"I want a Wind Strider." (ordinary)</a><br> +<a action="bypass -h Quest MercenaryCaptain strider 1" msg="1383">"I want a Star Strider." (ordinary)</a><br> +<a action="bypass -h Quest MercenaryCaptain strider 2" msg="1383">"I want a Twilight Strider." (ordinary)</a><br> +<a action="bypass -h Quest MercenaryCaptain strider 3" msg="1383">"I want a Guardian Strider" (special).</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-04.html new file mode 100644 index 0000000000..957e833265 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-04.html @@ -0,0 +1,4 @@ +<html><body> +My lord!<br> +We are always ready to fight...for the right price, of course... +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-05.html new file mode 100644 index 0000000000..ecb4023df1 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-05.html @@ -0,0 +1,3 @@ +<html><body> +We will do our best for you. Just have our payment ready! +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-06.html new file mode 100644 index 0000000000..bcba4bddf4 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-06.html @@ -0,0 +1,4 @@ +<html><body> +Do you know what goes on during a battle?<br> +If weren't already engaged, I'd jump at the chance to make some money...er, I mean fight the enemy! Heh... +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-07.html new file mode 100644 index 0000000000..561bfae5ca --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-07.html @@ -0,0 +1,3 @@ +<html><body> +You do not have enough badges yet to be recognized for your activities on behalf of the territory. +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-08.html new file mode 100644 index 0000000000..a71ffcf541 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-08.html @@ -0,0 +1,3 @@ +<html><body> +If you want to be a mercenary, come back after you have completed the 2nd class transfer and have reached at least level 40. +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-09.html new file mode 100644 index 0000000000..c3ba99ca53 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-09.html @@ -0,0 +1,3 @@ +<html><body> +I will expect big things from you. Congratulations! +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/html/mercmanager/nocert.htm b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-10.html similarity index 100% rename from L2J_DataPack_BETA/dist/game/data/html/mercmanager/nocert.htm rename to L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36481-10.html diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36482-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36482-01.html new file mode 100644 index 0000000000..c084d098e4 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36482-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territory battle information</a><br> +<a action="bypass -h npc_%objectId%_multisell 661">Buy General Items</a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Buy Elite Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Buy Exalted Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Mount information.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Mercenary Information.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36483-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36483-01.html new file mode 100644 index 0000000000..731abc9da7 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36483-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territory Registration and Information</a><br> +<a action="bypass -h npc_%objectId%_multisell 662">Buy General Items</a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Buy Elite Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Buy Exalted Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Mount information.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Mercenary Information.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36484-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36484-01.html new file mode 100644 index 0000000000..eb129c24f3 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36484-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territory Registration and Information</a><br> +<a action="bypass -h npc_%objectId%_multisell 663">Buy General Items</a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Buy Elite Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Buy Exalted Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Mount information.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Mercenary Information.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36485-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36485-01.html new file mode 100644 index 0000000000..931827e233 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36485-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territory Registration and Information</a><br> +<a action="bypass -h npc_%objectId%_multisell 664">Buy regular mercenary items.</a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Buy Elite Mercenary items.</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Buy Exalted Mercenary items.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Mount information.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Mercenary Information.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a><br> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36486-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36486-01.html new file mode 100644 index 0000000000..1fed00ef58 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36486-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territory Registration and Information</a><br> +<a action="bypass -h npc_%objectId%_multisell 665">Buy General Items</a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Buy Elite Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Buy Exalted Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Mount information.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Mercenary Information.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36487-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36487-01.html new file mode 100644 index 0000000000..a85b6f095c --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36487-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territory Registration and Information</a><br> +<a action="bypass -h npc_%objectId%_multisell 666">Buy General Items </a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Buy Elite Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Buy Exalted Mercenary Items</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Mount information.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Mercenary Information.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36488-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36488-01.html new file mode 100644 index 0000000000..c16bdfc8b8 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36488-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territorial battle information</a><br> +<a action="bypass -h npc_%objectId%_multisell 667">Buy items.</a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Show Elite Mercenary Certificate and buy items.</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Show Top Elite Mercenary Certificate and buy items.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Ask about mountables.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Ask about mercenaries.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36489-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36489-01.html new file mode 100644 index 0000000000..e8da5ce380 --- /dev/null +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/36489-01.html @@ -0,0 +1,10 @@ +<html><body>Mercenary Captain:<br> +Are you interested in signing on as a mercenary for this Territory War? I'll be honest with you -- the lord here is doing pretty well for himself. Serve him well and you can acquire whatever you want.<br> +<a action="bypass -h Quest MercenaryCaptain territory">Territorial battle information</a><br> +<a action="bypass -h npc_%objectId%_multisell 668">Buy items.</a><br> +<a action="bypass -h Quest MercenaryCaptain elite">Show Elite Mercenary Certificate and buy items.</a><br> +<a action="bypass -h Quest MercenaryCaptain top-elite">Show Top Elite Mercenary Certificate and buy items.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-03.html">Ask about mountables.</a><br> +<a action="bypass -h Quest MercenaryCaptain 36481-02.html">Ask about mercenaries.</a><br> +<a action="bypass -h npc_%objectId%_Quest">Quest</a> +</body></html> \ No newline at end of file diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java index 90f44aa733..4f18a04f85 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/MercenaryCaptain/MercenaryCaptain.java @@ -18,8 +18,13 @@ */ package ai.npc.MercenaryCaptain; +import java.util.HashMap; +import java.util.Map; +import java.util.StringTokenizer; + import ai.npc.AbstractNpcAI; +import com.l2jserver.gameserver.datatables.MultiSell; import com.l2jserver.gameserver.instancemanager.TerritoryWarManager; import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory; import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.TerritoryNPCSpawn; @@ -27,37 +32,56 @@ import com.l2jserver.gameserver.model.actor.L2Npc; import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; import com.l2jserver.gameserver.network.NpcStringId; import com.l2jserver.gameserver.network.clientpackets.Say2; -import com.l2jserver.gameserver.util.Util; +import com.l2jserver.gameserver.network.serverpackets.ExShowDominionRegistry; +import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; /** - * Mercenary Captain AI + * Mercenary Captain AI. * @author malyelfik */ public class MercenaryCaptain extends AbstractNpcAI { // NPCs - private static final int[] NPCS = + private static final Map<Integer, Integer> NPCS = new HashMap<>(); + static { - 36481, // Mercenary Captain (Gludio) - 36482, // Mercenary Captain (Dion) - 36483, // Mercenary Captain (Giran) - 36484, // Mercenary Captain (Oren) - 36485, // Mercenary Captain (Aden) - 36486, // Mercenary Captain (Innadril) - 36487, // Mercenary Captain (Goddard) - 36488, // Mercenary Captain (Rune) - }; + NPCS.put(36481, 13757); // Mercenary Captain (Gludio) + NPCS.put(36482, 13758); // Mercenary Captain (Dion) + NPCS.put(36483, 13759); // Mercenary Captain (Giran) + NPCS.put(36484, 13760); // Mercenary Captain (Oren) + NPCS.put(36485, 13761); // Mercenary Captain (Aden) + NPCS.put(36486, 13762); // Mercenary Captain (Innadril) + NPCS.put(36487, 13763); // Mercenary Captain (Goddard) + NPCS.put(36488, 13764); // Mercenary Captain (Rune) + NPCS.put(36489, 13765); // Mercenary Captain (Schuttgart) + } + // Items + private static final int STRIDER_WIND = 4422; + private static final int STRIDER_STAR = 4423; + private static final int STRIDER_TWILIGHT = 4424; + private static final int GUARDIAN_STRIDER = 14819; + private static final int ELITE_MERCENARY_CERTIFICATE = 13767; + private static final int TOP_ELITE_MERCENARY_CERTIFICATE = 13768; // Misc private static final int DELAY = 3600000; // 1 hour + private static final int MIN_LEVEL = 40; + private static final int CLASS_LEVEL = 2; private MercenaryCaptain(String name, String descr) { super(name, descr); + for (int id : NPCS.keySet()) + { + addStartNpc(id); + addFirstTalkId(id); + addTalkId(id); + } + for (Territory terr : TerritoryWarManager.getInstance().getAllTerritories()) { for (TerritoryNPCSpawn spawn : terr.getSpawnList()) { - if (Util.contains(NPCS, spawn.getNpcId())) + if (NPCS.keySet().contains(spawn.getNpcId())) { startQuestTimer("say", DELAY, spawn.getNpc(), null, true); } @@ -68,7 +92,104 @@ public class MercenaryCaptain extends AbstractNpcAI @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - if (event.equalsIgnoreCase("say") && !npc.isDecayed()) + String htmltext = null; + if (player != null) + { + final StringTokenizer st = new StringTokenizer(event, " "); + switch (st.nextToken()) + { + case "36481-02.html": + { + htmltext = event; + break; + } + case "36481-03.html": + { + final NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId()); + html.setHtml(getHtm(player.getHtmlPrefix(), "36481-03.html")); + html.replace("%strider%", String.valueOf(TerritoryWarManager.MINTWBADGEFORSTRIDERS)); + html.replace("%gstrider%", String.valueOf(TerritoryWarManager.MINTWBADGEFORBIGSTRIDER)); + player.sendPacket(html); + break; + } + case "territory": + { + player.sendPacket(new ExShowDominionRegistry(npc.getCastle().getCastleId(), player)); + break; + } + case "strider": + { + final String type = st.nextToken(); + final int price = (type.equals("3")) ? TerritoryWarManager.MINTWBADGEFORBIGSTRIDER : TerritoryWarManager.MINTWBADGEFORSTRIDERS; + final int badgeId = NPCS.get(npc.getNpcId()); + if (getQuestItemsCount(player, badgeId) < price) + { + return "36481-07.html"; + } + + final int striderId; + switch (type) + { + case "0": + { + striderId = STRIDER_WIND; + break; + } + case "1": + { + striderId = STRIDER_STAR; + break; + } + case "2": + { + striderId = STRIDER_TWILIGHT; + break; + } + case "3": + { + striderId = GUARDIAN_STRIDER; + break; + } + default: + { + _log.warning(MercenaryCaptain.class.getSimpleName() + ": Unknown strider type: " + type); + return null; + } + } + takeItems(player, badgeId, price); + giveItems(player, striderId, 1); + htmltext = "36481-09.html"; + break; + } + case "elite": + { + if (!hasQuestItems(player, ELITE_MERCENARY_CERTIFICATE)) + { + htmltext = "36481-10.html"; + } + else + { + final int listId = 676 + npc.getCastle().getCastleId(); + MultiSell.getInstance().separateAndSend(listId, player, npc, false); + } + break; + } + case "top-elite": + { + if (!hasQuestItems(player, TOP_ELITE_MERCENARY_CERTIFICATE)) + { + htmltext = "36481-10.html"; + } + else + { + final int listId = 685 + npc.getCastle().getCastleId(); + MultiSell.getInstance().separateAndSend(listId, player, npc, false); + } + break; + } + } + } + else if (event.equalsIgnoreCase("say") && !npc.isDecayed()) { if (TerritoryWarManager.getInstance().isTWInProgress()) { @@ -83,7 +204,26 @@ public class MercenaryCaptain extends AbstractNpcAI broadcastNpcSay(npc, Say2.NPC_SHOUT, NpcStringId.DO_YOU_WISH_TO_FIGHT_ARE_YOU_AFRAID_NO_MATTER_HOW_HARD_YOU_TRY_YOU_HAVE_NOWHERE_TO_RUN_BUT_IF_YOU_FACE_IT_HEAD_ON_OUR_MERCENARY_TROOP_WILL_HELP_YOU_OUT); } } - return null; + return htmltext; + } + + @Override + public String onFirstTalk(L2Npc npc, L2PcInstance player) + { + final String htmltext; + if ((player.getLevel() < MIN_LEVEL) || (player.getClassId().level() < CLASS_LEVEL)) + { + htmltext = "36481-08.html"; + } + else if (npc.isMyLord(player)) + { + htmltext = (npc.getCastle().getSiege().getIsInProgress() || TerritoryWarManager.getInstance().isTWInProgress()) ? "36481-05.html" : "36481-04.html"; + } + else + { + htmltext = (npc.getCastle().getSiege().getIsInProgress() || TerritoryWarManager.getInstance().isTWInProgress()) ? "36481-06.html" : npc.getNpcId() + "-01.html"; + } + return htmltext; } public static void main(String[] args) diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java index efa46d9f80..4be0aa9ba7 100644 --- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java +++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java @@ -157,7 +157,6 @@ import handlers.bypasshandlers.SkillList; import handlers.bypasshandlers.SupportBlessing; import handlers.bypasshandlers.SupportMagic; import handlers.bypasshandlers.TerritoryStatus; -import handlers.bypasshandlers.TerritoryWar; import handlers.bypasshandlers.VoiceCommand; import handlers.bypasshandlers.Wear; import handlers.chathandlers.ChatAll; @@ -460,7 +459,6 @@ public class MasterHandler SupportBlessing.class, SupportMagic.class, TerritoryStatus.class, - TerritoryWar.class, VoiceCommand.class, Wear.class, }, diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/TerritoryWar.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/TerritoryWar.java deleted file mode 100644 index 0e2915b1a7..0000000000 --- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/TerritoryWar.java +++ /dev/null @@ -1,159 +0,0 @@ -/* - * Copyright (C) 2004-2013 L2J DataPack - * - * This file is part of L2J DataPack. - * - * L2J DataPack is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * L2J DataPack is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -package handlers.bypasshandlers; - -import java.util.StringTokenizer; -import java.util.logging.Level; - -import com.l2jserver.gameserver.datatables.MultiSell; -import com.l2jserver.gameserver.handler.IBypassHandler; -import com.l2jserver.gameserver.instancemanager.TerritoryWarManager; -import com.l2jserver.gameserver.model.actor.L2Character; -import com.l2jserver.gameserver.model.actor.instance.L2MercenaryManagerInstance; -import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; -import com.l2jserver.gameserver.network.serverpackets.ActionFailed; -import com.l2jserver.gameserver.network.serverpackets.ExShowDominionRegistry; -import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage; - -public class TerritoryWar implements IBypassHandler -{ - private static final String[] COMMANDS = - { - "Territory", - "TW_Buy_List", - "TW_Buy", - "TW_Buy_Elite" - }; - - @Override - public boolean useBypass(String command, L2PcInstance activeChar, L2Character target) - { - if (!target.isNpc()) - { - return false; - } - - try - { - StringTokenizer st = new StringTokenizer(command, " "); - String actualCommand = st.nextToken(); // Get actual command - - if (actualCommand.equalsIgnoreCase("Territory")) - { - if (st.countTokens() < 1) - { - return false; - } - - int castleId = Integer.parseInt(st.nextToken()); - activeChar.sendPacket(new ExShowDominionRegistry(castleId, activeChar)); - } - else if (!(target instanceof L2MercenaryManagerInstance)) - { - return false; - } - - L2MercenaryManagerInstance mercman = ((L2MercenaryManagerInstance) target); - if (actualCommand.equalsIgnoreCase("TW_Buy_List")) - { - if (st.countTokens() < 1) - { - return false; - } - - String itemId = st.nextToken(); - NpcHtmlMessage html = new NpcHtmlMessage(mercman.getObjectId()); - html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/" + st.nextToken()); - html.replace("%itemId%", itemId); - html.replace("%noblessBadge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORNOBLESS)); - html.replace("%striderBadge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORSTRIDERS)); - html.replace("%gstriderBadge%", String.valueOf(TerritoryWarManager.MINTWBADGEFORBIGSTRIDER)); - html.replace("%objectId%", String.valueOf(mercman.getObjectId())); - activeChar.sendPacket(html); - activeChar.sendPacket(ActionFailed.STATIC_PACKET); - } - else if (actualCommand.equalsIgnoreCase("TW_Buy")) - { - int itemId = Integer.parseInt(st.nextToken()); - int count = Integer.parseInt(st.nextToken()); - int type = Integer.parseInt(st.nextToken()); - if (activeChar.getInventory().getItemByItemId(itemId) != null) - { - long playerItemCount = activeChar.getInventory().getItemByItemId(itemId).getCount(); - if (count <= playerItemCount) - { - int boughtId = 0; - switch (type) - { - case 1: - boughtId = 4422; - break; - case 2: - boughtId = 4423; - break; - case 3: - boughtId = 4424; - break; - case 4: - boughtId = 14819; - break; - default: - _log.warning("TerritoryWar buy: not handled type: " + type); - return false; - } - activeChar.exchangeItemsById("TerritoryWar", mercman, itemId, count, boughtId, 1, true); - mercman.showChatWindow(activeChar, 7); - return true; - } - } - mercman.showChatWindow(activeChar, 6); - } - else if (actualCommand.equalsIgnoreCase("TW_Buy_Elite")) - { - if (activeChar.getInventory().getItemByItemId(13767) != null) - { - int _castleid = mercman.getCastle().getCastleId(); - if (_castleid > 0) - { - MultiSell.getInstance().separateAndSend(_castleid + 676, activeChar, mercman, false); - } - } - else - { - NpcHtmlMessage html = new NpcHtmlMessage(mercman.getObjectId()); - html.setFile(activeChar.getHtmlPrefix(), "data/html/mercmanager/nocert.htm"); - activeChar.sendPacket(html); - activeChar.sendPacket(ActionFailed.STATIC_PACKET); - } - } - return true; - } - catch (Exception e) - { - _log.log(Level.WARNING, "Exception in " + getClass().getSimpleName(), e); - } - return false; - } - - @Override - public String[] getBypassList() - { - return COMMANDS; - } -} diff --git a/L2J_DataPack_BETA/dist/sql/game/npc.sql b/L2J_DataPack_BETA/dist/sql/game/npc.sql index db4d358e68..95bdd90047 100644 --- a/L2J_DataPack_BETA/dist/sql/game/npc.sql +++ b/L2J_DataPack_BETA/dist/sql/game/npc.sql @@ -10396,14 +10396,14 @@ INSERT INTO `npc` VALUES (36479, 36479, "Rapidus", 0, "Reputation Manager", 0, "LineageNPC.a_fighterguild_master_Mhuman", 8, 23.5, 70, "male", "L2FameManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 0, 0, 0, 50, 120, 0, 1), (36480, 36480, "Scipio", 0, "Reputation Manager", 0, "LineageNPC.a_fighterguild_master_Mhuman", 8, 23.5, 70, "male", "L2FameManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 0, 0, 0, 50, 120, 0, 1), (36481, 36481, "Mercenary Captain", 0, "Gludio", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), -(36482, 36482, "Mercenary Captain", 0, "Dion", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), -(36483, 36483, "Mercenary Captain", 0, "Giran", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), -(36484, 36484, "Mercenary Captain", 0, "Oren", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), -(36485, 36485, "Mercenary Captain", 0, "Aden", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), -(36486, 36486, "Mercenary Captain", 0, "Innadril", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), -(36487, 36487, "Mercenary Captain", 0, "Goddard", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), -(36488, 36488, "Mercenary Captain", 0, "Rune", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), -(36489, 36489, "Mercenary Captain", 0, "Schuttgart", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2MercenaryManager", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), +(36482, 36482, "Mercenary Captain", 0, "Dion", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), +(36483, 36483, "Mercenary Captain", 0, "Giran", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), +(36484, 36484, "Mercenary Captain", 0, "Oren", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), +(36485, 36485, "Mercenary Captain", 0, "Aden", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), +(36486, 36486, "Mercenary Captain", 0, "Innadril", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), +(36487, 36487, "Mercenary Captain", 0, "Goddard", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), +(36488, 36488, "Mercenary Captain", 0, "Rune", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), +(36489, 36489, "Mercenary Captain", 0, "Schuttgart", 0, "LineageMonster3.Kight_of_Dawn", 12, 24.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 2500, 6377, 0, 36.48, 160, 0, 1), (36490, 36490, "Territory Manager", 0, "Gludio", 0, "LineageNPC2.feudal_custodian", 10, 22.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 0, 0, 0, 50, 120, 0, 1), (36491, 36491, "Territory Manager", 0, "Dion", 0, "LineageNPC2.feudal_custodian", 10, 22.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 0, 0, 0, 50, 120, 0, 1), (36492, 36492, "Territory Manager", 0, "Giran", 0, "LineageNPC2.feudal_custodian", 10, 22.5, 70, "male", "L2Npc", 40, 2444.46819, 1345.8, 7.5, 2.7, 40, 43, 30, 21, 20, 20, 0, 0, 688.86373, 295.91597, 470.40463, 216.53847, 253, 4, 333, 0, 0, 0, 50, 120, 0, 1), -- GitLab