Implemented Amatsu guides and changed/removed some Amatsu warps.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7097 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 241 insertions, 101 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 0b93b52ac..9dd1b3299 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -36,6 +36,8 @@ Musashiden
 

 Date		Added

 ======

+06/12

+	* Implemented Amatsu guides and changed/removed some Amatsu warps [MasterOfMuppets]

 06/11

 	* Updated spawns by Tharis, thanks to Saycyber21 [Vicious]

 	* Implemented the Poison King quest, beware of potential bugs. [MasterOfMuppets]

diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index 3b3ccad87..bcc4c08dd 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -15,107 +15,120 @@
 // 1.02 Fixed & Spell Checked [massdriller]

 // 1.03 Fixed 2 NPC names, slight optimization [Lupus]

 // 1.04 Fixed a few typo's [Nexon]

-// 1.05 Changed all breaks to ends. [Skotlex] 

+// 1.05 Changed all breaks to ends. [Skotlex]

+// 1.06 The Captain now uses iRO dialog [MasterOfMuppets]

 //=====================================================================

-alberta.gat,245,93,4	script	Captain	709,{

-	mes "[Carter Moores]";

-	mes "Did you know that on the other side of the ocean";

-	mes "there lives a mysterious culture, ";

-	mes "with stories totally unheard of in this country.";

-	mes "Have you heard of it before?";

-	next;

-	menu "I want to know more about Amatsu",L1,"Go to Amatsu",L2,"End Dialogue",-;

-		mes "[Carter Moores]";

-		mes "If you are a true adventurer,";

-		mes "you should try to leave this continent.";

-		mes "Nothing is more exciting than learning about new cultures...";

-		mes "However, do whatever you want.";

+alberta.gat,245,93,4	script	Sea Captain	709,{

+	mes "[Walter Moers]";

+	mes "Hey, there.";

+	mes "Have you ever heard that there";

+	mes "are totally different countries";

+	mes "than the Rune-Midgard Kingdom?";

+	next;

+	menu "About Amatsu...",L1,"Go to Amatsu",L2,"Cancel",-;

+		mes "[Walter Moers]";

+		mes "If you are tired of your daily";

+		mes "life, take a trip to a distant";

+		mes "country across the ocean.";

+		mes "Someplace like, oh I don't know,";

+		mes "Amatsu~";

 		close;

 	L1:

-		mes "[Carter Moores]";

-		mes "The legend says, a sailor got lost on the sea,";

-		mes "in midst of drifting in the sea,";

-		mes "he discovered it...";

-		mes "In the mighty storm and the mist, ";

-		mes "the ship is undoubtedly lost.";

+		mes "[Walter Moers]";

+		mes "I heard that a drifting ship";

+		mes "accidently discovered it...";

+		mes "The ship was totally destroyed";

+		mes "by a raging storm in heavy fog.";

 		next;

-		mes "[Carter Moores]";

-		mes "After the ship sunk";

-		mes "he reached a village.";

-		mes "It is now called Amatsu,";

-		mes "The sailor was later rescued by the locals.";

-		mes "As he worked hard over there,";

-		mes "I heard that he later finished a map.";

+		mes "[Walter Moers]";

+		mes "Anyway, the ship was wrecked";

+		mes "on the beach. It was there";

+		mes "he arrived at a town called";

+		mes "Amatsu.";

 		next;

-		mes "[Carter Moores]";

-		mes "He died soon after his return,";

-		mes "but the map was indeed passed onto Tristian the Third.";

-		mes "Later, the king ordered";

-		mes "that whoever is able to open a route,";

-		mes "that leads to Amatsu, will get a reward from the king.";

-		mes "He gave everyone a copy of the map";

+		mes "[Walter Moers]";

+		mes "The towners took pity on him";

+		mes "and took care of this wounds.";

+		mes "He lived there until he finished";

+		mes "making a map.";

 		next;

-		mes "[Carter Moores]";

-		mes "What the people want is not the reward,";

-		mes "but to get the trading opportunity with other countries.";

-		mes "The benefits from this is almost unimaginable.";

-		mes "Therefore, many adventurers and bold captains";

-		mes "took the map,";

-		mes "And headed for the ocean...";

+		mes "[Walter Moers]";

+		mes "He passed away when he returned";

+		mes "to Rune-Midgard. Fortunately,";

+		mes "the map was given to our king,";

+		mes "Tristan III";

 		next;

-		mes "[Carter Moores]";

-		mes "But all of them have failed!";

-		mes "To face the gigantic current and the unpredictable weather,";

-		mes "one needed to be familiar with sailing and the ocean.";

-		mes "However, all of them were blinded by the reward and desire for the trade rights,";

-		mes "and failed to make the necessary preparations";

+		mes "[Walter Moers]";

+		mes "King Tristan III announced";

+		mes "that he would reward any";

+		mes "person brave enough to venture to";

+		mes "Amatsu, and spread copies of this";

+		mes "map.";

 		next;

-		mes "[Carter Moores]";

-		mes "At this time, someone found it,";

-		mes "the entire route to Amatsu...";

-		mes "And that guy is me, Mr. Carter Moores,";

-		mes "the first person to start trading with Amatsu!";

-		mes "Hahaha! That's pretty  much it";

+		mes "Many Brave and adventurous";

+		mes "sea captains took the";

+		mes "challenge. Great fortune could";

+		mes "be made in trade with Amatsu, as";

+		mes "well as the rewards from King";

+		mes "Tristan III";

 		next;

-		mes "[Carter Moores]";

-		mes "I made quite a bit of zeny from the trade,";

-		mes "and am now trying to start a tourism industry.";

-		mes "Do a little investment.";

-		mes "If you want to go to Amatsu,";

-		mes "then just tell me...!";

+		mes "[Walter Moers]";

+		mes "However, they all failed!";

+		mes "To overcome various currents";

+		mes "and bad weather, lots of";

+		mes "experience is required. But they";

+		mes "were all blinded by their greed...";

+		next;

+		mes "[Walter Moers]";

+		mes "Finally, a great man discovered";

+		mes "the perfect sealane to Amatsu...";

+		mes "Right! That is me. Sir Walter";

+		mes "Moers. I started the trade with";

+		mes "Amatsu! Hahaha! Well, that's all";

+		mes "about Amatsu.";

+		next;

+		mes "[Walter Moers]";

+		mes "I made good money from trades";

+		mes "for years, and now I'm interested";

+		mes "in tourism. If you want to go to";

+		mes "Amatsu, let me know~!";

 		close;

 	L2:

-		mes "[Carter Moores]";

-		mes "Yea, Amatsu is a great place!";

-		mes "Because to cross that treacherous ocean";

-		mes "is not a very easy thing to do.";

-		mes "I hope you find the travelling fee acceptable.";

+		mes "[Walter Moers]";

+		mes "Oh yeah? It's a long way to";

+		mes "Amatsu. That's why we are";

+		mes "charging a fare. You don't think";

+		mes "that crossing oceans and currents";

+		mes "is easy, do you?";

 		next;

-		mes "[Carter Moores]";

-		mes "The round trip costs 10,000 Zeny.";

-		mes "Our commercial vessels are very sturdy.";

-		mes "The passenger rooms are specially designed as well.";

+		mes "[Walter Moers]";

+		mes "10,000 zeny for a round-trip! I've";

+		mes "got a stately room in a sturdy and";

+		mes "safe trade ship for you. It is a";

+		mes "reasonable fare when you consider";

+		mes "that this isn't a one way trip.";

 		next;

-		mes "[Carter Moores]";

-		mes "So, have you decided to leave?";

-		mes "Do you have enough zeny for travelling?";

+		mes "[Walter Moers]";

+		mes "Shall we go now? You didn't forget";

+		mes "the fare, right? Let's go.";

 		next;

 		menu "Yes",Lgo,"No",-;

-			mes "[Carter Moores]";

-			mes "Not drawn to this new continent?";

-			mes "People never like";

-			mes "to head for the far coast on the other side.";

+			mes "[Walter Moers]";

+			mes "If you are an adventurer,";

+			mes "this is a great chance";

+			mes "to experience a different";

+			mes "culture...Well, it is up to you.";

 			close;

 		Lgo:

 			if (Zeny < 10000) goto Lzeny;

 			set Zeny, Zeny-10000;

-			mes "[Carter Moores]";

-			mes "All aboard!";

-			next;

+			mes "[Walter Moers]";

+			mes "Alright, I will start the engine!";

+			close2;

 			warp "amatsu",197,83;

 			end;

 		Lzeny:

-			mes "[Carter Moores]";

+			mes "[Walter Moers]";

 			mes "Did you forget what I said?";

 			mes "10,000 zeny. If you can't come up with enough zeny,";

 			mes "hunt around the Sunken Ship,";

@@ -124,23 +137,25 @@ alberta.gat,245,93,4	script	Captain	709,{
 			close;

 }

 //=====================================================================

-amatsu.gat,194,79,4	script	Captain	709,{

-	mes "[Carter Moores]";

-	mes "Ready to leave?";

-	mes "Probably had lots of fun in the Amatsu Tour!";

-	mes "Are you really ready to leave?";

-	menu "Time to go home!",L1,"I will stay a bit longer",-;

-		mes "[Carter Moores]";

-		mes "Alright! Roger that.";

-		mes "The vessel for return will always be ready.";

-		mes "Have a good trip.";

+amatsu.gat,194,79,4	script	Sea Captain	709,{

+	mes "[Walter Moers]";

+	mes "You came... Did you enjoy";

+	mes "your trip to Amatsu...?";

+	mes "Alright, I will take you";

+	mes "back to Alberta.";

+	next;

+	menu "Back to Alberta",L1,"Cancel",-;

+		mes "[Walter Moers]";

+		mes "Well, take your time.";

+		mes "The ship to Alberta is";

+		mes "always ready to depart...";

 		close;

 	L1:

-		mes "[Carter Moores]";

-		mes "Set sail.";

-		mes "Don't know if you are bringing back any";

-		mes "souvenirs.";

-		next;

+		mes "[Walter Moers]";

+		mes "Let's go then. You must have";

+		mes "so many things to talk about,";

+		mes "right? All aboard now.";

+		close2;

 		warp "alberta",243,91;

 		end;

 }

diff --git a/npc/guides/guides_ama.txt b/npc/guides/guides_ama.txt
new file mode 100644
index 000000000..ebcd4b7d5
--- /dev/null
+++ b/npc/guides/guides_ama.txt
@@ -0,0 +1,127 @@
+//===== eAthena Script ======================================= 

+//= Amatsu Guides

+//===== By: ================================================== 

+//= MasterOfMuppets

+//===== Current Version: ===================================== 

+//= 1.0

+//===== Compatible With: ===================================== 

+//=

+//===== Description: ========================================= 

+//=

+//===== Additional Comments: ================================= 

+//= 1.0 First version [MasterOfMuppets]

+//============================================================

+

+amatsu.gat,207,89,3	script	Amatsu Guide	758,{

+

+	mes "[Amachang]";

+	mes "Welcome to Amatsu,";

+	mes "the town of kind towners";

+	mes "and beatiful cherry blossoms.";

+	next;

+	mes "[Amachang]";

+	mes "I'm Amachang,";

+	mes "the 13th Miss Amatsu.";

+	mes "I will guide you about town";

+	mes "as Miss Amatsu.";

+	mes "Please tell me";

+	mes "if you want to know something.";

+	next;

+	menu "Palace",-,"Tool Shop",s_Tool,"Weapon Shop",s_Weap,"Bar",s_Bar;

+

+	viewpoint 1,85,235,1,0xFF0044;

+	mes "[Amachang]";

+	mes "On the mini-map,";

+	mes "go to ^FF0044+^000000";

+	mes "to find the Palace.";

+	mes "Have a good time";

+	mes "in Amatsu.";

+	close;

+

+s_Tool:

+	viewpoint 1,96,117,2,0xFF9200;

+	mes "[Amachang]";

+	mes "On the mini-map,";

+	mes "go to ^FF9200+^000000";

+	mes "to find the Tool Shop.";

+	mes "Have a good time";

+	mes "in Amatsu.";

+	close;

+

+s_Weap:

+	viewpoint 1,132,117,3,0x85FF00;

+	mes "[Amachang]";

+	mes "On the mini-map,";

+	mes "go to ^85FF00+^000000";

+	mes "to find the Weapon Shop.";

+	mes "Have a good time";

+	mes "in Amatsu.";

+	close;

+

+

+s_Bar:

+	viewpoint 1,216,116,4,0x3366FF;

+	mes "[Amachang]";

+	mes "On the mini-map,";

+	mes "go to ^3366FF+^000000";

+	mes "to find the Bar.";

+	mes "Have a good time";

+	mes "in Amatsu.";

+	close;

+

+}

+

+amatsu.gat,251,283,4	script	Amatsu Guide	767,{

+

+	mes "[Guide Man]";

+	mes "Welcome, tourist from";

+	mes "Rune-Midgard.";

+	mes "I'm the guide of";

+	mes "out beautiful town, Amatsu.";

+	next;

+	mes "[Guide Man]";

+	mes "What are you looking for?";

+	next;

+	menu "Palace",-,"Tool Shop",s_Tool,"Weapon Shop",s_Weap,"Bar",s_Bar;

+

+	viewpoint 1,85,235,1,0xFF0044;

+	mes "[Guide Man]";

+	mes "On the mini-map,";

+	mes "go to ^FF0044+^000000";

+	mes "to find the Palace.";

+	mes "Have a good time";

+	mes "in Amatsu.";

+	close;

+

+s_Tool:

+	viewpoint 1,96,117,2,0xFF9200;

+	mes "[Guide Man]";

+	mes "On the mini-map,";

+	mes "go to ^FF9200+^000000";

+	mes "to find the Tool Shop.";

+	mes "Have a good time";

+	mes "in Amatsu.";

+	close;

+

+s_Weap:

+	viewpoint 1,132,117,3,0x85FF00;

+	mes "[Guide Man]";

+	mes "On the mini-map,";

+	mes "go to ^85FF00+^000000";

+	mes "to find the Weapon Shop.";

+	mes "Have a good time";

+	mes "in Amatsu.";

+	close;

+

+

+s_Bar:

+	viewpoint 1,216,116,4,0x3366FF;

+	mes "[Guide Man]";

+	mes "On the mini-map,";

+	mes "go to ^3366FF+^000000";

+	mes "to find the Bar.";

+	mes "Have a good time";

+	mes "in Amatsu.";

+	close;

+

+}

diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index bcb9e70d8..c1160369e 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -109,6 +109,7 @@ npc: npc/quests/cooking_quest.txt
 // --------------------------- Guides ---------------------------

 npc: npc/guides/guides_alb.txt

 npc: npc/guides/guides_alde.txt

+npc: npc/guides/guides_ama.txt

 npc: npc/guides/guides_com.txt

 npc: npc/guides/guides_einbe.txt

 npc: npc/guides/guides_einbr.txt

diff --git a/npc/warps/cities/amatsu.txt b/npc/warps/cities/amatsu.txt
index 0514d8ae4..1c25603aa 100644
--- a/npc/warps/cities/amatsu.txt
+++ b/npc/warps/cities/amatsu.txt
@@ -24,7 +24,7 @@ ama_in01.gat,31,176,0	warp	warp2010	1,1,amatsu.gat,42,110
 ama_in01.gat,32,24,0	warp	warp1963	1,1,amatsu.gat,98,117

 ama_in01.gat,34,97,0	warp	warp1965	1,1,amatsu.gat,168,178

 ama_in01.gat,77,177,0	warp	warp1967	1,1,amatsu.gat,246,160

-ama_in01.gat,86,23,0	warp	warp2009	1,1,amatsu.gat,130,148

+ama_in01.gat,86,23,0	warp	warp2009	1,1,amatsu.gat,129,117

 ama_in01.gat,88,94,0	warp	warp2008	1,1,amatsu.gat,52,145

 ama_in02.gat,127,163,0	warp	warp1980	1,1,ama_in02.gat,220,161

 ama_in02.gat,195,44,0	warp	warp1973	1,1,ama_in02.gat,65,40

@@ -35,12 +35,7 @@ ama_in02.gat,56,44,0	warp	warp1975	1,1,ama_in02.gat,59,144
 ama_in02.gat,59,142,0	warp	warp1976	1,1,ama_in02.gat,56,41

 ama_in02.gat,59,159,0	warp	warp1977	1,1,ama_in02.gat,215,152

 ama_in02.gat,65,38,0	warp	warp1974	1,1,ama_in02.gat,195,41

-ama_test.gat,50,16,0	warp	warp8003	1,1,ama_fild01.gat,174,330

-ama_test.gat,50,44,0	warp	warp8004	1,1,ama_test.gat,50,82

-ama_test.gat,50,79,0	warp	warp8005	1,1,ama_test.gat,50,41

-//disabled due to amatsu dungeon quest

-//ama_test.gat,50,90,0	warp	warp8006	1,1,ama_dun01.gat,228,9

-amatsu.gat,133,148,0	warp	warp1989	1,1,ama_in01.gat,88,22

+amatsu.gat,132,117,0	warp	warp1989	1,1,ama_in01.gat,88,22

 amatsu.gat,168,180,0	warp	warp1964	1,1,ama_in01.gat,34,99

 amatsu.gat,216,116,0	warp	warp1968	1,1,ama_in01.gat,162,25

 amatsu.gat,217,149,0	warp	warp1987	1,1,ama_in01.gat,174,122