New C5 boats by Enforcer

datapack_development/data/boat.csv

@@ -1 +1,10 @@
-# name;id;spawnx;spawny;spawnz;heading;IdWaypoint1;Ticket1;xtelenoticket;ytelenoticket;ztelenoticket;annonceur1;message10_1;message5_1;message1_1;message0_1;message_begin_1;;IdWaypoint2;Ticket2;xtelenoticket;ytelenoticket;ztelenoticket;annonceur2;message10_2;message5_2;message1_2;message0_2;message_begin_2
+#C5 messages - done by Enforcer
+#name;id;spawnx;spawny;spawnz;heading;IdWaypoint1;Ticket1;xtelenoticket;ytelenoticket;ztelenoticket;annonceur1;message10_1;message5_1;message1_1;message0_1;message_begin_1;;IdWaypoint2;Ticket2;xtelenoticket;ytelenoticket;ztelenoticket;annonceur2;message10_2;message5_2;message1_2;message0_2;message_begin_2 
+
+TI_Gludin_TI;1;-96622;261660;-3610;32768;1;1074;-96777;258970;-3623; Passenger Boat Info;The ferry arrived at Talking Island Harbor. The ferry will leave for Gludin Harbor after anchoring for ten minutes.;The ferry will leave for Gludin Harbor in five minutes.;The ferry will leave for Gludin Harbor in one minute.;The ferry will be leaving soon for Gludin Harbor.;The ferry is leaving for Gludin Harbor.;2;1075;-90015;150422;-3610; Passenger Boat Info;The ferry has arrived at Gludin Harbor. The ferry will leave for Talking Island Harbor after anchoring for ten minutes.;The ferry will leave for Talking Island Harbor in five minutes.;The ferry will leave for Talking Island Harbor in one minute.;The ferry will be leaving soon for Talking Island Harbor.;The ferry is leaving for Talking Island Harbor.
+
+TI_Giran_TI;2;48950;190613;-3610;60800;3;3946;46763;187041;-3451; Passenger Boat Info;The ferry has arrived at Giran Harbor. The ferry will leave for Talking Island Harbor after anchoring for ten minutes.;We depart for Talking Island Harbor in five minutes.;We depart for Talking Island Harbor in one minute.;All aboard for Talking Island!.;We are now leaving for Talking Island!.;4;3945;-96777;258970;-3623; Passenger Boat Info;The ferry arrived at Talking Island Harbor.The ferry will leave for Giran Harbor after anchoring for ten minutes.;The ferry will leave for Giran Harbor in five minutes.;The ferry will leave for Giran Harbor in one minute.Those wishing to ride should make haste to get on.;The ferry will be leaving soon for Giran Harbor.;The ferry is leaving for Giran Harbor.
+
+Gludin_Rune_Gludin;3;-95686;150514;-3610;16723;5;7905;-90015;150422;-3000; Passenger Boat Info;The ferry has arrived at Gludin Harbor. Departure for Rune Harbor will take place after anchoring for ten minutes.;Departure for Rune Harbor will take place in five minutes!;Departure for Rune Harbor will take place in one minute!;Make haste! We will be departing for Rune shortly.;We are now departing for Rune Harbor. Hold on and enjoy the ride!;6;7904;35929;-39403;-3152; Passenger Boat Info;Arrived at Rune Harbor. Departure for Gludin Harbor will take place after anchoring for ten minutes;Departure for Gludin Harbor will take place in five minutes.;Departure for Gludin Harbor will take place in one minute.;Make haste! We will be departing for Gludin shortly.;We are now departing for Gludin Harbor. Hold on and enjoy the ride!
+
+Innadril_Tour;4;111264;226240;-3610;32768;7;0;107092;219098;-3952;Passenger Boat Info;The Innadril pleasure boat has arrived. It will anchor for ten minutes.;The Innadril pleasure boat will leave in five minutes.;The Innadril pleasure boat will leave in one minute.Those wishing to ride should make haste to get on.;Innadril pleasure boat is leaving soon.Those wishing to ride should make haste to get on.;Innadril pleasure boat is leaving.;7;0;107092;219098;-3952;Passenger Boat Info;The Innadril pleasure boat has arrived. It will anchor for ten minutes.;The Innadril pleasure boat will leave in five minutes.;The Innadril pleasure boat will leave in one minute.Those wishing to ride should make haste to get on.;Innadril pleasure boat is leaving soon.Those wishing to ride should make haste to get on.;Innadril pleasure boat is leaving.

datapack_development/data/boatpath.csv

@@ -1,7 +1,29 @@
+#C4-C5 Initial commit by ettore85a. Added route Gludin-Rune-Gludin, refactored all routes (timing,speed,nbpoits) by Enforcer.
 #id;nbpoint;(speed1;speed2;x;y;z;time(ms))
 #
 # Speed1 : Speed of the boat
 # Speed2 : rotation speed of the boat
 # time   : -  > 0:  if the boat has reached the point before the time is spent, the boat wait !
 #                   else if the time is spent and the boat has not reached the point, server will pass to the next point
-#          -  < 0:  lets server calculate when the boat reachs the point (/!\ don't use time < 0 when you do a rotation with the boat.)
+#          -  < 0:  lets server calculate when the boat reachs the point (/!\ don't use time < 0 when you do a rotation with the boat.)
+
+#From Talkin To Gludin 
+1;11;180;800;-121385;261660;-3610;-12;200;800;-127694;253312;-3610;55500;250;800;-129274;237060;-3610;65300;200;800;-114688;139040;-3610;495900;180;800;-109663;135704;-3610;-8;180;800;-102151;135704;-3610;-7;180;800;-96686;140595;-3610;-6;180;800;-95686;147718;-3610;-5;180;800;-95686;148718;-3610;-4;150;800;-95686;149718;-3610;-3;150;800;-95686;150514;-3610;-2; 
+ 
+#From Gludin To Talkin 
+2;10;180;800;-95686;155514;-3610;-12;250;800;-95686;185514;-3610;111800;200;800;-60136;238816;-3610;330200;180;1800;-60520;259609;-3610;115800;180;1800;-65344;261460;-3610;-8;180;1800;-83344;261560;-3610;-7;180;1800;-88344;261660;-3610;-6;150;1800;-92344;261660;-3610;-5;150;1800;-95622;261660;-3610;-4;150;1800;-96622;261660;-3610;-3;
+
+#From Giran To Talkin 
+3;17;150;800;51914;189023;-3610;-18;200;800;60567;189789;-3610;44200;250;800;63732;197457;-3610;33600;250;800;63732;207457;-3610;40500;250;800;60434;219306;-3610;49900;300;800;56115;225303;-3610;24700;300;800;41634;226047;-3610;51900;300;800;27153;226791;-3610;50100;300;800;12672;227535;-3610;49400;300;800;-1808;228280;-3610;49800;300;800;-22165;231742;-3610;69400;250;800;-42523;235205;-3610;83200;200;800;-68451;259960;-3610;178700;180;800;-83344;261610;-3610;-5;180;800;-88344;261660;-3610;-4;150;800;-92344;261660;-3610;-3;150;1800;-96622;261660;-3610;-1;
+
+#From Talkin To Giran 
+4;17;180;800;-113925;261660;-3610;-18;180;800;-126107;249116;-3610;-17;180;800;-126107;234499;-3610;-16;180;800;-126107;219882;-3610;-15;180;800;-109414;204914;-3610;-14;250;800;-92807;204914;-3610;68400;250;800;-80425;216450;-3610;69300;250;800;-68043;227987;-3610;67900;200;800;-60844;231369;-3610;39200;200;800;-44915;231369;-3610;80800;200;800;-28986;231369;-3610;81900;180;800;8233;207624;-3610;-7;180;800;21470;201503;-3610;-6;150;800;40058;195383;-3610;-5;150;800;43022;193793;-3610;-4;150;800;45986;192203;-3610;-3;150;1800;48950;190613;-3610;-1;
+
+#From Gludin to Rune
+5;14;150;800;-95686;155514;-3610;-1;150;800;-97727;160575;-3610;36380;180;800;-108048;158380;-3610;58621;300;800;-107964;91102;-3610;224260;300;800;-66492;47880;-3610;199668;250;800;-56257;40932;-3610;49482;300;800;-33367;16345;-3610;111976;250;800;-27195;1065;-3610;65918;250;800;44363;-18646;-3610;296892;180;800;44914;-25021;-3610;35549;180;800;43496;-27864;-3610;17650;150;800;39077;-32922;-3610;44776;150;800;36650;-35468;-3610;23450;150;800;34400;-37670;-3610;-1;
+
+#From Rune to Gludin
+6;13;150;800;31622;-40501;-3610;-1;150;800;-13722;3629;-3610;421823;180;800;-28875;15029;-3610;105347;200;800;-33367;16345;-3610;23404;250;800;-56257;40932;-3610;134371;250;800;-66492;47880;-3610;49482;300;800;-107964;91102;-3610;199668;300;800;-107531;126510;-3610;118035;300;1800;-96686;140595;-3610;59255;250;1800;-95686;147718;-3610;28771;150;1800;-95686;148718;-3610;-1;150;1800;-95686;149718;-3610;-1;150;1800;-95686;150500;-3610;-1;
+
+#Innandril tour
+7;32;150;800;105129;226240;-3610;-1;150;800;90604;238797;-3610;128002;150;800;74853;237943;-3610;105161;150;800;68207;235399;-3610;47442;150;800;63226;230487;-3610;46637;150;800;61843;224797;-3610;39038;150;800;61822;203066;-3610;144873;150;800;59051;197685;-3610;40350;150;800;54048;195298;-3610;36955;150;800;41609;195687;-3610;82967;150;800;35821;200284;-3610;49276;150;800;35567;205265;-3610;33250;150;800;35617;222471;-3610;114707;150;800;37932;226588;-3610;31488;150;800;42932;229394;-3610;38224;150;800;74324;245231;-3610;234404;150;800;81872;250314;-3610;60666;150;800;101692;249882;-3610;132165;150;800;107907;256073;-3610;58483;150;800;112317;257133;-3610;30237;150;800;126273;255313;-3610;93828;150;800;128067;250961;-3610;31382;150;800;128520;238249;-3610;84800;150;800;126428;235072;-3610;25359;150;800;121843;234656;-3610;30692;150;800;120096;234268;-3610;11930;150;800;118572;233046;-3610;13023;150;800;117671;228951;-3610;27953;150;800;115936;226540;-3610;-1;150;800;113628;226240;-3610;-1;150;800;111300;226240;-3610;-1;150;800;111264;226240;-3610;-1;

datapack_development/data/html/merchant/7047.htm

@@ -2,13 +2,13 @@
 <body>
 Wharf Manager Firon:
 <br>
-You came here to catch a boat? These days there are only liners that go to Gludin, but in the olden days when we traded with Gracia, this harbor was always bustling with ships bringing in new goods... War, hah, what is it good for? I miss the vigor and color of the old harbor... I wonder what the people there are doing now...
+You came here to catch a boat? These days there are only liners that go to Talking Island, but in the olden days when we traded with Gracia, this harbor was always bustling with boats bringing in new wares... What is war anyway? I miss the passion and vigor of the old harbor...
 <br>
-Oh... I m rambling again. Do you want a boat ticket?
+Oh... I m rambling again. Do you want a Boat Ticket?
 <br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy a ticket for the boat.</a>
+<a action="bypass -h npc_%objectId%_Buy 351">Buy a ticket for the boat.</a>
 <br>
-<a action="bypass -h npc_%objectId%_TerritoryStatus">See the Lord and Tax Rate Information</a>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">See the Lord and get the tax rate information</a>
 <br>
 <a action="bypass -h npc_%objectId%_Quest">Quest</a>
 </body>

datapack_development/data/html/merchant/7294-1.htm

@@ -0,0 +1,9 @@
+<html>
+<body>
+Wharf Manager Nedy:
+<br>
+Ha, just kidding! The ferry doesn't charge a toll.
+<br>
+The boat makes a stop at Devil's Isle, goes around near Innandril Castle then returns to Heine. It is a very romantic cruise. If you find a new love, bring them for the ride. You will have a lovely time together on our boat.
+</body>
+</html>

datapack_development/data/html/merchant/7294.htm

@@ -1,19 +1,17 @@
 <html>
 <body>
-Trader Varan:
+Wharf Manager Nedy:
 <br>
-Welcome to the general store, run by the famous brother and sister team. You won t be disappointed, take a look. Our shop makes items in cooperation with the Ivory Tower, famous for magic, as well as the Dwarven guild  Breath of Flame.' Actually, my sibling is a bit of a chatterbox&  it is a good thing you ve come to me.
+Innandril come through many bloody wars relatively unscathed. Lionel Hunter was a very good leader, skilled in both diplomatic and military matters. Under his rule Innandril's wealth began to rival that of Giran. But that was then and this is now. Chaos swirls around us and no one knows where we will end up!
 <br>
-<a action="bypass -h npc_%objectId%_Buy 64">Buy</a>
+Anyway, what do I know? I'm just an old wharf rat. By the way, would you like to buy a ticket for the ferry?
 <br>
-<a action="bypass -h npc_%objectId%_Sell">Sell</a>
+<a action="bypass -h npc_%objectId%_Chat 1">Buy a ticket for the boat.</a>
 <br>
-<a action="bypass -h npc_%objectId%_TerritoryStatus">See the Lord and Tax Rate Information</a>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">View the information about the lord and the tax rate of the manor</a>
 <br>
 <a action="bypass -h npc_%objectId%_Quest">Quest</a>
 </body>
 </html>
 
 
-
-

datapack_development/data/html/merchant/7387.htm

@@ -2,13 +2,13 @@
 <body>
 Wharf Manager Clancy:
 <br>
-You came here to catch a boat? These days there are only liners that go to Talking Island, but in the olden days when we traded with Gracia, this harbor was always bustling with boats bringing in new wares... What is war anyway? I miss the passion and vigor of the old harbor...
+Welcome. Do you want to get aboard? Now we have quite a number of routes here at Gludin. We even had a test operation on the route to the Elmore Kingdom, with whom we once were at odds. Now we have regular liners and shuttles as there been a growing nimber of users to the pleasure of me.
 <br>
-Do you want a ticket for transport?
+Would you try a regular liner ship to the Rune Township of Elmore? It is on a regular schedule.
 <br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy a boat ticket</a>
+<a action="bypass -h npc_%objectId%_Buy 352">Buy the ticket of the ferry</a>
 <br>
-<a action="bypass -h npc_%objectId%_TerritoryStatus">See the Lord and Tax Rate Information</a>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">View rhe information on lords and tax rates</a>
 <br>
 <a action="bypass -h npc_%objectId%_Quest">Quest</a>
 </body>

datapack_development/data/html/merchant/7879.htm

@@ -2,11 +2,11 @@
 <body>
 Wharf Manager Felton:
 <br>
-This wharf is visited by many ships and boats both near and far from other ports of the continent including the wharf in Talking Island.  Without this wharf, even the gigantic market in Giran would not be able to function in normal capacity.  Currently, only the passengers of regular liners, traders business people and a few fishermen use this wharf and it seems that the wharf is not that busy.  But soon a village is going to be established near this wharf.  I heard a rumor that dwarves are already funding the project&   Since the foundation for a village has already been laid out, the only thing left is an order from the lord.
+This wharf is visited by many vessels from ports both near and far, including  Talking Island.  Without this wharf the market in Giran would be devastated.  Right now passengers liners, small cargo ships and a few fishermen are only ones using the wharf.  Soon, however, a village will be established near here. I heard a rumor that Dwarves are behind the project... Since the foundation for the village has already been constructed, the only thing left is to receive the approval of the lord.
 <br>
-<a action="bypass -h npc_%objectId%_Chat 0">Buy a ferry ticket.</a>
+<a action="bypass -h npc_%objectId%_Buy 353">Buy a ferry ticket.</a>
 <br>
-<a action="bypass -h npc_%objectId%_TerritoryStatus">See the Lord and Tax Rate Information</a>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">View information about the lord and the tax rate of the manor</a>
 <br>
 <a action="bypass -h npc_%objectId%_Quest">Quest</a>
 </body>

datapack_development/data/html/merchant/8351.htm

@@ -0,0 +1,12 @@
+<html><head>
+
+<body>
+Wharf Manager Volker:<br>
+Lately,I just can't keep thinking back to the good old days... At one time, there were Grecian trading ships anchored here every day! Aye, we even surpassed Giran and Heine!<br>
+Alas, the bloody war put an end to that! These days, only small ferries show up here, with the occasional odd ocean-going ship carrying adeventures...<br>
+Come to think of it, the ferry to Gludin Harbor in the Kingdom of Aden began to run recently! I've heard that it's even got a regular schedule! You should give it a try!<br>
+<a action="bypass -h npc_%objectId%_Buy 354">I want to buy a ticket for the ferry.</a>
+<br>
+<a action="bypass -h npc_%objectId%_TerritoryStatus">Who is the Lord of the manor and what is the tax rate?</a>
+<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a></body></html>

datapack_development/sql/merchant_buylists.sql

@@ -13438,4 +13438,10 @@ INSERT INTO `merchant_buylists` (`item_id`, `price`, `shop_id`, `order`) VALUES
 (8370,0,71030,41),
 (8371,0,71030,42),
 (8372,0,71030,43),
-(8554,0,71030,44);
+(8554,0,71030,44),
+(1074,1200,351,1), -- Firon - Boat Ticket: Talking Island to Gludin
+(3945,6000,351,2), -- Firon - Ship ticket: From Talking Island  To Giran
+(1075,6000,352,1), -- Clancy - Boat Ticket: Gludin to Talking Island
+(7905,6000,352,2), -- Clancy - Boat Ticket: Gludin to Rune
+(3946,6000,353,1), -- Felton - Ship ticket: From Giran To Talking Island
+(7904,6000,354,1); -- Volker - Boat Ticket: Rune to Gludin

datapack_development/sql/merchant_shopids.sql

@@ -169,6 +169,10 @@ INSERT INTO merchant_shopids VALUES (5807,'8045');
 INSERT INTO merchant_shopids VALUES (5600,'7892');
 INSERT INTO merchant_shopids VALUES (5601,'7893');
 INSERT INTO merchant_shopids VALUES (5710,'8067');
+INSERT INTO merchant_shopids VALUES (351,'7047'); -- Firon - Talking Island
+INSERT INTO merchant_shopids VALUES (352,'7387'); -- Clancy - Gludin
+INSERT INTO merchant_shopids VALUES (353,'7879'); -- Felton - Giran
+INSERT INTO merchant_shopids VALUES (354,'8351'); -- Volker - Rune
 INSERT INTO merchant_shopids VALUES (123161,'12316');
 INSERT INTO merchant_shopids VALUES (123171,'12317');
 INSERT INTO merchant_shopids VALUES (123181,'12318');

datapack_development/sql/npc.sql

@@ -3127,7 +3127,7 @@ INSERT INTO `npc` (`id`, `idTemplate`, `name`, `serverSideName`, `title`, `serve
 (7921,30921,'Timos',0,'Guard',0,'NPC.a_guard_MHuman',8.00,24.00,80,'male','L2Guard',1100,4551,1859,40,43,30,21,20,10,0,0,4031,576,1144,468,249,1000,227,275,0,0,80,120,NULL,0,1,0),
 (7922,30922,'Cage',0,'Guard',0,'NPC.a_guard_MHuman',8.00,24.00,80,'male','L2Guard',40,4551,1859,40,43,30,21,20,10,0,0,1814,576,1144,468,278,1000,253,2,102,0,80,120,NULL,0,1,0),
 (7923,30923,'Dunst',0,'Guard',0,'NPC.a_guard_MHuman',8.00,24.00,80,'male','L2Guard',1100,4551,1859,40,43,30,21,20,10,0,0,4031,576,1144,468,249,1000,227,275,0,0,80,120,NULL,0,1,0),
-(7924,30924,'Nedy',0,'Wharf Manager',0,'NPC.a_wharfinger_MHuman',8.00,23.00,70,'male','L2Npc',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,80,120,NULL,0,1,0),
+(7924,30924,'Nedy',0,'Wharf Manager',0,'NPC.a_wharfinger_MHuman',8.00,23.00,70,'male','L2Merchant',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,80,120,NULL,0,1,0),
 (7925,30925,'Morelyn',0,'High Priestess',0,'NPC.a_mageguild_teacher_FElf',7.00,22.20,70,'female','L2Npc',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,80,120,NULL,0,1,0),
 (7926,30926,'Restina',0,'Priestess',0,'NPC.a_mageguild_teacher_FElf',7.00,22.20,70,'female','L2Trainer',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,80,120,NULL,0,1,0),
 (7927,30927,'Alicia',0,'Priestess',0,'NPC.a_sanctuary_teacher_FHuman',8.00,22.50,70,'female','L2Trainer',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,80,120,NULL,0,1,0),
@@ -3556,7 +3556,7 @@ INSERT INTO `npc` (`id`, `idTemplate`, `name`, `serverSideName`, `title`, `serve
 (8348,31348,'Agripel',0,'High Priest',0,'NPC.a_temple_master_Mhuman',8.00,22.50,70,'male','L2Npc',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,50,120,NULL,0,1,0),
 (8349,31349,'Benedict',0,'Priest',0,'NPC.a_temple_master_Mhuman',8.00,22.50,70,'male','L2Trainer',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,50,120,NULL,0,1,0),
 (8350,31350,'Dominic',0,'Priest',0,'NPC.a_temple_master_Mhuman',8.00,22.50,70,'male','L2Trainer',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,50,120,NULL,0,1,0),
-(8351,31351,'Volker',0,'Wharf Manager',0,'NPC.a_traderC_Mhuman',8.00,23.00,70,'male','L2Npc',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,50,120,NULL,0,1,0),
+(8351,31351,'Volker',0,'Wharf Manager',0,'NPC.a_wharfinger_MHuman',8.00,23.00,70,'male','L2Merchant',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,50,120,NULL,0,1,0),
 (8352,31352,'Lambert',0,'Clan Hall Gatekeeper',0,'NPC.a_common_peopleB_MHuman',8.00,22.00,70,'male','L2Doormen',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,50,120,NULL,0,1,0),
 (8353,31353,'Gerard',0,'Clan Hall Gatekeeper',0,'NPC.a_casino_MHuman',8.00,23.00,70,'male','L2Doormen',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,50,120,NULL,0,1,0),
 (8354,31354,'Volfrem',0,'Clan Hall Gatekeeper',0,'NPC.a_common_peopleB_MHuman',8.00,22.00,70,'male','L2Doormen',40,3862,1493,40,43,30,21,20,10,0,0,1314,470,780,382,278,0,253,0,0,0,50,120,NULL,0,1,0),