- Some minor improvements in the instance Scripts.

- Some minor improvements in the Eden Group NPC's.
- Fixed typo in Wanderer Pet Food NPC. bugreport:5823

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

2 files changed, 19 insertions, 18 deletions

diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt
index d3291350a..7ad00e1ef 100644
--- a/npc/instances/EndlessTower.txt
+++ b/npc/instances/EndlessTower.txt
@@ -44,6 +44,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 		mes "Sigh... I don't know if I can ever go back to sailing the sea...";
 		close;
 	}
+	set .@name$,strcharinfo(0);
 	if (in_102tower == 1) {
 		mes "^0000ffLooking incredibly excited, the old man ran into the marine shop hurriedly ordering goods. You don't have anything better to do, so you decide to ask him why he is in such a rush.^000000";
 		next;
@@ -52,7 +53,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 		mes "[Captain Janssen]";
 		mes "I was touched when you accepted a request from me, a stranger, so easily. You must truly be one of those good, heroic adventurers. Are you interested in setting out on an ocean voyage?";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+.@name$+"]";
 		mes "I've sailed a few times... But now that I think about it, I've never gone across the continent.";
 		next;
 		mes "[Captain Janssen]";
@@ -74,7 +75,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 		mes "[Captain Janssen]";
 		mes "My crew was starving, and a few of them walked into the tower in order to find food... They never came back.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+.@name$+"]";
 		mes "Why didn't you go in there with them?";
 		next;
 		mes "[Captain Janssen]";
@@ -91,13 +92,13 @@ alberta,214,77,6	script	Captain Janssen	709,{
 		mes "[Captain Janssen]";
 		mes "I feel so lucky to meet a warm-hearted adventurer like you. With the money you've given me, I can finally go sailing to the tower again.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+.@name$+"]";
 		mes "How about hiring me as your first mate?";
 		next;
 		mes "[Captain Janssen]";
 		mes "Thank you, but it is an extremely dangerous place. I have my duty to fulfill, but you don't have any obligation to me or them. I don't wish to sacrifice someone as young as you to such a dangerous place.";
 		next;
-		mes "["+strcharinfo(0)+"]";
+		mes "["+.@name$+"]";
 		mes "No...";
 		mes ".";
 		mes ".";
@@ -136,7 +137,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 		next;
 		switch(select("I'll come back later.:Let's go, now!")) {
 		case 1:
-			mes "["+strcharinfo(0)+"]";
+			mes "["+.@name$+"]";
 			mes "I'm sorry, but I don't have that much money. I'll come back when I save enough.";
 			next;
 			mes "[Captain Janssen]";
@@ -170,7 +171,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 		next;
 		switch(select("No!:Sure thing.")) {
 		case 1:
-			mes "["+strcharinfo(0)+"]";
+			mes "["+.@name$+"]";
 			mes "I'm sorry, but you've got the wrong person to ask that.";
 			next;
 			mes "[Captain Janssen]";
@@ -186,7 +187,7 @@ alberta,214,77,6	script	Captain Janssen	709,{
 				close;
 			}
 			else {
-				mes "["+strcharinfo(0)+"]";
+				mes "["+.@name$+"]";
 				mes "I don't know why you'd need so much money, but here. You can take it.";
 				next;
 				mes "^0000ffYou have donated 10,000 Zeny to Captain Janssen^000000.";
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 36f79605d..0852111ab 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -502,7 +502,7 @@ mid_camp,271,299,3	script	Historian Magnifier#edq	755,3,3,{
 }
 
 prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
-	set name,PcName;
+	set .@name$,strcharinfo(0);
 	if (ins_nyd == 3) {
 		mes "[Assistant Naomi]";
 		mes "The doctor never ever tries to come back, and there're too many things to do... How can I do it all...";
@@ -510,7 +510,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 		mes "[Assistant Naomi]";
 		mes "Hey, you. Please move these books. Put them into shelf 3 row B.";
 		next;
-		mes "[" +strcharinfo(0)+ "]";
+		mes "["+.@name$+"]";
 		mes "Ah...um..I...am...";
 		next;
 		mes "[Assistant Naomi]";
@@ -525,19 +525,19 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 			mes "[Assistant Naomi]";
 			mes "Ah... if you're done moving those, then these should go in shelf 3 row B.";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "Ah...I...see...";
 			next;
 			mes "[Assistant Naomi]";
 			mes "Now, I am almost done... Who are you? Are you a new assistant to Dr. Magnifier?";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "He asked me to bring some reports. Didn't he say anything?";
 			next;
 			mes "[Assistant Naomi]";
 			mes "Hmm... I haven't seen him in over a year! What's he doing now?";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "He said that he would send a message to you... didn't you get it?";
 			next;
 			mes "[Assistant Naomi]";
@@ -552,7 +552,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 			next;
 			mes "It's too messy due to lots of stacked books and files. Dr. Magnifier looks like he has a ton of reports.";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "'Birth of the World', 'The Fiction of Odin's Myth', 'God's Battle Then After', 'Dreams of the Tribes'. There are a variety of books...";
 			next;
 			mes "...";
@@ -566,7 +566,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 			mes "[Assistant Naomi]";
 			mes "Ah, here's the message about you. He's said to share the information on research and reports.";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "What is the Doctor's area of expertise?";
 			next;
 			mes "[Assistant Naomi]";
@@ -575,13 +575,13 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 			mes "[Assistant Naomi]";
 			mes "He researches combat between Odin and the Gods, and about the Gods' origins and life.";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "So, did he already know that the Rebirth of Satan Morocc has occured before?";
 			next;
 			mes "[Assistant Naomi]";
 			mes "I can't be sure, but he thought someday it would occur. It broke out earlier than he expected though.";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "But Rune-Midgarts approved this research?";
 			next;
 			mes "[Assistant Naomi]";
@@ -590,7 +590,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 			mes "[Assistant Naomi]";
 			mes "The combat of Odin vs. the Gods, and the God's sons and their purpose... The Doctor has researched this his whole life.";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "But those reports haven't come out yet. Have they?";
 			next;
 			mes "[Assistant Naomi]";
@@ -602,7 +602,7 @@ prt_in,171,94,3	script	Assistant Naomi#edq	893,3,3,{
 			mes "[Assistant Naomi]";
 			mes "Anyway, I should make sure that you read all these books, and I'll just keep doing my work.";
 			next;
-			mes "[" +strcharinfo(0)+ "]";
+			mes "["+.@name$+"]";
 			mes "Shouldn't I have filed the books?";
 			next;
 			mes "[Assistant Naomi]";