- 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

1 files changed, 98 insertions, 119 deletions

diff --git a/npc/quests/eden/eden_common.txt b/npc/quests/eden/eden_common.txt
index ca779933b..3e23f5c0e 100644
--- a/npc/quests/eden/eden_common.txt
+++ b/npc/quests/eden/eden_common.txt
@@ -3,35 +3,38 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.3
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [AEGIS Conversion]
+//= Eden Group Headquarter NPC's.
 //===== Additional Comments: ================================= 
 //= 1.0 First Version.
 //= 1.1 Removed showevent use, and use of duplicates.
 //=     Commented out warps that should not be active.
+//= 1.2 Reduced 300+ copy-paste lines to 1 duplicated NPC. [Brian]
+//= 1.3 Some little optimization here and there. [Masao]
 //============================================================
 
-moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
-	if (checkweight(1201,1) == 0) {
-		mes "- Wait a minute! -";
-		mes "- Currently you are carrying -";
+moc_para01,27,35,5	script	Secretary Lime Evenor	952,{
+
+	if (checkweight(1201,1) == 0 || (MaxWeight - Weight) < 2000) {
+		mes "- Wait a minute !! -";
+		mes "- Currently you're carrying -";
 		mes "- too many items with you. -";
-		mes "- Please come back again -";
-		mes "- after you store some items into kafra storage. -";
+		mes "- Please try again -";
+		mes "- after you loose some weight. -";
 		close;
 	}
 	mes "[Lime Evenor]";
 	mes "People who follow their dreams and romances listen to me. We are representatives of the paradise called 'The garden of Eden' called the Eden group . There is no place like this anywhere.";
 	mes "Hello. Can I help you?";
 	next;
-	while(1) {
-		switch(select("What is Eden group?:Join the Eden Group:Register new mission:Search for missions:Cancel")) {
+	while (1) {
+		switch (select("What is Eden group?:Join the Eden Group.:Register new mission.:Search for missions.:Cancel.")) {
 		case 1:
 			mes "[Lime Evenor]";
-			mes "Eden Group is a group that helps people who are suffering from distresses in Rune Midgard.";
+			mes "Eden Group is a group that helps people who are suffering from distresses in Rune-Midgard.";
 			next;
 			mes "[Lime Evenor]";
 			mes "If people need help, we put up the case on the bulletin board and introduce it to our members who are eager to help those in need.";
@@ -41,7 +44,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 			mes "Members do these missions for rewards.";
 			next;
 			mes "[Lime Evenor]";
-			mes "If you are not too familiar with Rune Midgard, this is a great way to explore the world.";
+			mes "If you are not too familiar with Rune-Midgard, this is a great way to explore the world.";
 			mes "Or, if you are mature enough, you can travel the world and make new friends while doing missions. Your honorable name will be spread out among lands.";
 			next;
 			break;
@@ -51,7 +54,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 				mes "You can be a Eden's member by simply registering with me.";
 				mes "Would you like to join Eden Group?";
 				next;
-				switch(select("Yes, I want to join:No, I don't want to join")) {
+				switch (select("Yes, I want to join.:No, I don't want to join.")) {
 				case 1:
 					mes "[Lime Evenor]";
 					mes "Aright. Excellent! Please write down your name here.";
@@ -65,9 +68,9 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 					mes "Your name is ^3131FFBo"+.@input$+"Ba^000000..? Is that right?";
 					mes "Huh? Isn't it??";
 					next;
-					emotion 4,"Secretary Lime Evenor#eden";
+					emotion e_swt;
 					mes "[Lime Evenor]";
-					mes "Hmm that isn't what you wrote?";
+					mes "Hmm that isn't what you wrote?.";
 					mes "Ok, hmm, it seems a bit hard to read.";
 					next;
 					mes "[Lime Evenor]";
@@ -78,7 +81,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 					mes "Ah~ ha. You are ^3131FF"+strcharinfo(0)+"^000000.";
 					mes "I got it right this time.";
 					next;
-					emotion e_no1,"Secretary Lime Evenor#eden";
+					emotion e_no1;
 					mes "[Lime Evenor]";
 					mes "We already put your name on the list.";
 					mes "Welcome to Eden's group new member!";
@@ -90,14 +93,13 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 					break;
 				case 2:
 					mes "[Lime Evenor]";
-					mes "Do you still have questions about Eden group?";
+					mes "Do you still have questions about Eden Group?";
 					next;
 					break;
 				}
-			}
-			else {
+			} else {
 				mes "[Lime Evenor]";
-				mes "You are already a member of the Eden Group.";
+				mes "You are already a member of Eden Group.";
 				next;
 			}
 			break;
@@ -105,7 +107,7 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 			mes "[Lime Evenor]";
 			mes "Do you want to register some missions that you want us to do?";
 			next;
-			switch(select("Yes, I want to register.:No, I don't.")) {
+			switch (select("Yes, I want to register.:No, I don't.")) {
 			case 1:
 				mes "[Lime Evenor]";
 				mes "Alrigh. Please write down your name on it.";
@@ -113,15 +115,15 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 				next;
 				mes "[Lime Evenor]";
 				mes "^3131FF"+strcharinfo(0)+"^000000.. Is that your name?";
-				mes "Hmm, your handwriting is not clear. I can't read. it...";
+				mes "Hmm, your handwriting is not clear. I can't read. it";
 				next;
 				mes "[Lime Evenor]";
-				mes "^3131FF"+strcharinfo(0)+"^000000, tell me what you want to register for.";
+				mes "^3131FF"+strcharinfo(0)+"^000000, tell me what you want to register. for";
 				mes "Which map should we go to?";
 				input .@input$;
 				next;
 				mes "[Lime Evenor]";
-				mes "^3131FFMission Map: "+.@input$+"^000000";
+				mes "^3131FFMission Map: "+.@inputstr$+"^000000";
 				mes "hum, I will note that.";
 				next;
 				mes "[Lime Evenor]";
@@ -139,22 +141,22 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 				mes "[Lime Evenor]";
 				mes "Hum.. huh??..................";
 				next;
-				emotion e_dots,"Secretary Lime Evenor#eden";
+				emotion e_dots;
 				mes "[Lime Evenor]";
 				mes "I think you should complete one of our missions first before you take up a new mission.";
 				next;
-				emotion e_pif,"Secretary Lime Evenor#eden";
+				emotion e_pif;
 				mes "[Lime Evenor]";
 				mes "^3131FFClient: Lime Evenor^000000";
 				mes "^3131FFMission: Practice your handwriting for one month.^000000";
 				mes "You've got really bad penmanship!";
 				next;
 				mes "[Lime Evenor]";
-				mes "^3131FFMission: "+.@input$+"^000000";
+				mes "^3131FFMission:"+.@input$+"^000000";
 				mes "Anyway, you are done registering for a new mission.";
 				next;
 				mes "[Lime Evenor]";
-				mes "Missions are fully booked. You have to wait an spot clears up.";
+				mes "Missions are fully booked. You have to wait for an spot to clear up.";
 				mes "Please kindly wait until your turn.";
 				next;
 				break;
@@ -180,29 +182,29 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 			break;
 		case 5:
 			mes "[Lime Evenor]";
-			mes "If you have any questions please come beck again.";
+			mes "If you have any questions please come back again.";
 			close;
 		}
 	}
 	close;
 }
 
--	script	Eden Teleport Officer#0::eden_teleport_officer	729,{
+-	script	Eden Teleport Officer#0::eto	-1,{
 	mes "[Eden Teleport Officer]";
 	mes "Those who are wandering around this strange world with aimless eyes listen up and come to me!";
 	mes "Eden group is here to help you and will show you the great future.";
 	next;
 	mes "[Eden Teleport Officer]";
 	mes "You have nothing to do but waste your time?";
-	mes "Are you eager to do something good but no one offers you work?";
+	mes "You are eager to do something good but no one offers you work?";
 	mes "Would you like to be a problem solver?";
 	mes "Eden group is here to solve your problem.";
 	next;
-	switch(select("Move to Eden Group:Don't want to talk anymore.")) {
+	switch (select("Move to Eden Group.:Don't want to talk anymore.")) {
 	case 1:
 		mes "[Eden Teleport Officer]";
 		mes "Let's go to our secret base!";
-		set nak_warp, strnpcinfo(2);
+		set nak_warp,strnpcinfo(2);
 		close2;
 		warp "moc_para01",31,14;
 		end;
@@ -213,74 +215,55 @@ moc_para01,27,35,5	script	Secretary Lime Evenor#1	952,{
 	}
 }
 
-prontera,124,76,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#1	729
-moc_ruins,68,164,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#2	729
-geffen,132,66,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#3	729
-alberta,124,67,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#4	729
-aldebaran,133,119,5	duplicate(eden_teleport_officer)	Eden Teleport Officer#5	729
-izlude_in,68,162,1	duplicate(eden_teleport_officer)	Eden Teleport Officer#6	729
-prt_church,103,78,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#7	729
-geffen_in,160,104,5	duplicate(eden_teleport_officer)	Eden Teleport Officer#8	729
-moc_prydb1,53,126,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#9	729
-alberta_in,75,39,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#10	729
-payon_in02,58,58,1	duplicate(eden_teleport_officer)	Eden Teleport Officer#11	729
-payon,177,111,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#12	729
-que_ng,33,73,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#13	729
-que_ng,144,161,5	duplicate(eden_teleport_officer)	Eden Teleport Officer#14	729
-yuno,144,189,5	duplicate(eden_teleport_officer)	Eden Teleport Officer#15	729
-rachel,125,144,3	duplicate(eden_teleport_officer)	Eden Teleport Officer#16	729
+prontera,124,76,3	duplicate(eto)	Eden Teleport Officer#1	729
+moc_ruins,68,164,3	duplicate(eto)	Eden Teleport Officer#2	729
+geffen,132,66,3	duplicate(eto)	Eden Teleport Officer#3	729
+alberta,124,67,3	duplicate(eto)	Eden Teleport Officer#4	729
+aldebaran,133,119,5	duplicate(eto)	Eden Teleport Officer#5	729
+izlude_in,68,162,1	duplicate(eto)	Eden Teleport Officer#6	729
+prt_church,103,78,3	duplicate(eto)	Eden Teleport Officer#7	729
+geffen_in,160,104,5	duplicate(eto)	Eden Teleport Officer#8	729
+moc_prydb1,53,126,3	duplicate(eto)	Eden Teleport Officer#9	729
+alberta_in,75,39,3	duplicate(eto)	Eden Teleport Officer#10	729
+payon_in02,58,58,1	duplicate(eto)	Eden Teleport Officer#11	729
+payon,177,111,3	duplicate(eto)	Eden Teleport Officer#12	729
+que_ng,33,73,3	duplicate(eto)	Eden Teleport Officer#13	729
+que_ng,144,161,5	duplicate(eto)	Eden Teleport Officer#14	729
+yuno,144,189,5	duplicate(eto)	Eden Teleport Officer#15	729
+rachel,125,144,3	duplicate(eto)	Eden Teleport Officer#16	729
 
 moc_para01,30,10,0	script	#eden_out	45,1,1,{
+
 OnTouch:
 	switch (nak_warp) {
-		default:
-		case 1: warp "prontera",116,72; break;
-		case 2: warp "moc_ruins",64,161; break;
-		case 3: warp "geffen",120,39; break;
-		case 4: warp "alberta",117,56; break;
-		case 5: warp "aldebaran",168,112; break;
-		case 6: warp "izlude_in",73,165; break;
-		case 7: warp "prt_church",99,78; break;
-		case 8: warp "geffen_in",162,99; break;
-		case 9: warp "moc_prydb1",51,118; break;
-		case 10: warp "alberta_in",73,43; break;
-		case 11: warp "payon_in02",64,60; break;
-		case 12: warp "payon",161,58; break;
-		case 13: warp "que_ng",33,63; break;
-		case 14: warp "que_ng",144,166; break;
-		case 15: warp "yuno",158,125; break;
-		case 16: warp "rachel",115,125; break;
+		case 1: warp "prontera",116,72; end;
+		case 2: warp "moc_ruins",64,161; end;
+		case 3: warp "geffen",120,39; end;
+		case 4: warp "alberta",117,56; end;
+		case 5: warp "aldebaran",168,112; end;
+		case 6: warp "izlude_in",73,165; end;
+		case 7: warp "prt_church",99,78; end;
+		case 8: warp "geffen_in",162,99; end;
+		case 9: warp "moc_prydb1",51,118; end;
+		case 10: warp "alberta_in",73,43; end;
+		case 11: warp "payon_in02",64,60; end;
+		case 12: warp "payon",161,58; end;
+		case 13: warp "que_ng",33,63; end;
+		case 14: warp "que_ng",144,166; end;
+		case 15: warp "yuno",158,125; end;
+		case 16: warp "rachel",115,125; end;
+		default: warp "prontera",116,72; end;
 	}
 	end;
 }
 
-moc_para01,57,27,0	warp	#warp_2_pub	1,1,moc_para01,162,26
-moc_para01,158,26,0	warp	#warp_2_din_1	1,1,moc_para01,55,27
-moc_para01,48,16,0	warp	#warp_2_2f	1,1,moc_para01,48,164
-moc_para01,47,161,0	warp	#warp_2_1f	1,1,moc_para01,47,18
-moc_para01,107,12,0	warp	#warp_2_din_2	1,1,moc_para01,47,37
-moc_para01,100,27,0	warp	#warp_2_gym	1,1,moc_para01,47,85
-moc_para01,49,86,0	warp	#warp_2_pass_1	1,1,moc_para01,103,27
-moc_para01,113,32,0	warp	#warp_2_ware	1,1,moc_para01,105,92
-moc_para01,102,92,0	warp	#warp_2_pass_2	1,1,moc_para01,111,33
-
-/*
-moc_para01,17,187,0	warp	#warp_2_bossroom	1,1,moc_para01,132,159
-moc_para01,132,156,0	warp	#warp_2_2fhall_1	1,1,moc_para01,17,185
-moc_para01,29,187,0	warp	#warp_2_room1	1,1,moc_para01,180,159
-moc_para01,180,156,0	warp	#warp_2_2fhall_2	1,1,moc_para01,29,185
-*/
-
-moc_para01,41,187,0	warp	#warp_2_room2	1,1,moc_para01,179,93
-moc_para01,179,90,0	warp	#warp_2_2fhall_3	1,1,moc_para01,41,185
-
 moc_para01,47,39,3	script	#warp_2_pass	111,{
 	if (countitem(6219) > 0) {
 		mes "[Lime Evenor]";
-		mes "Oh, It is an exclusive place only for Eden's members.";
+		mes "Oh, it is an exclusive place only for Eden's members.";
 		mes "If you are a member, you can come whenever you want!";
 		next;
-		switch(select("Enter:Don't enter")) {
+		switch (select("Enter.:Don't Enter.")) {
 		case 1:
 			mes "This door is beautifully decorated but seems a little bit too heavy.";
 			close2;
@@ -292,12 +275,10 @@ moc_para01,47,39,3	script	#warp_2_pass	111,{
 			close;
 		}
 	}
-	else {
-		mes "[Lime Evenor]";
-		mes "Oh, this is an exclusive place for Eden's member only.";
-		mes "If you want to go inside, you have to join the Eden group.";
-		close;
-	}
+	mes "[Lime Evenor]";
+	mes "Oh, this is an exclusive place for Eden's members only.";
+	mes "If you want to go inside, you have to join the Eden Group.";
+	close;
 }
 
 moc_para01,16,22,7	script	Old Adventurer#eden	900,{
@@ -306,30 +287,30 @@ moc_para01,16,22,7	script	Old Adventurer#eden	900,{
 	next;
 	mes "[Old Adventurer]";
 	mes "I came here to join the Eden group! I don't deserve this!";
-	mes ".Do you also think I look like I'm senile?";
+	mes "Do you also think I look like I'm senile?";
 	close;
 }
 
-moc_para01,182,48,3	script	Eden's chief#eden	886,{
+moc_para01,182,48,3	script	Eden's Chief#eden	886,{
 	set .@eggf,rand(1,118);
-	set .@eggf_1,.@eggf+1;
-	set .@eggf_2,.@eggf+2;
-	set .@eggf_6,.@eggf+6;
-	mes "[Eden's chief]";
+	set .@eggf_1,.@eggf + 1;
+	set .@eggf_2,.@eggf + 2;
+	set .@eggf_6,.@eggf + 6;
+	mes "[Eden's Chief]";
 	mes ""+.@eggf+".. "+.@eggf_1+"... "+.@eggf_2+".... "+.@eggf_6+"..?";
 	next;
-	emotion e_sob,"Eden's chief#eden";
-	mes "[Eden's chief]";
-	mes "Oh, shoot! How many eggs have I done?";
+	emotion e_sob;
+	mes "[Eden's Chief]";
+	mes "Oh, Shoot! How many eggs have I done?";
 	mes "Aww!!! I totally forgot! I have to count again!";
 	next;
-	emotion e_sob,"Eden's chief#eden";
-	mes "[Eden's chief]";
-	mes "Why did have you asked me to do this? What kind of mission is that?";
+	emotion e_sob;
+	mes "[Eden's Chief]";
+	mes "Why have you asked me to do this? What kind of mission is that?";
 	next;
-	emotion e_sob,"Eden's chief#eden";
-	mes "[Eden's chief]";
-	mes "What are you going to do with all of those fried eggs? I am sure you can't eat all of them. You just want to bother me, right?";
+	emotion e_sob;
+	mes "[Eden's Chief]";
+	mes "What are you going to with all of those fried eggs? I am sure you can't eat all of them. You just want to bother me, right?";
 	close;
 }
 
@@ -340,17 +321,15 @@ moc_para01,172,28,5	script	Eden's Intern#eden	883,{
 	mes "[Eden's Intern]";
 	mes "We have to work really hard unless you want to fail.";
 	next;
-	emotion 57,"Eden's Intern#eden";
 	mes "[Eden's Intern]";
 	mes "But, I have never learned about pharmaceuticals yet.";
 	next;
-	emotion e_sob,"Eden's Intern#eden";
 	mes "[Eden's Intern]";
 	mes "I'm going to fail. I can't do this.";
 	close;
 }
 
-moc_para01,20,35,5	script	Office Assistant Neede#e	814,{
+moc_para01,20,35,5	script	Office Assistant Neede	814,{
 	mes "[Neede]";
 	mes "I became a Eden's member several years ago, but it feels like it was yesterday.";
 	mes "I have been doing lots of work, so I didn't even notice how many years I spent here.";
@@ -365,9 +344,9 @@ moc_para01,20,35,5	script	Office Assistant Neede#e	814,{
 	mes "[Neede]";
 	mes "And, do you see the ^3131FFgymnasium^000000 on the cross of ^3131FFthe north side of the lobby^000000? They always shout when they exercise, I can even hear them from here!";
 	next;
-	emotion 7,"Office Assistant Neede#e";
+	emotion e_ag;
 	mes "[Neede]";
-	mes "Besides, the weird girl from^3131FFthe second floor^000000 is crying all the time. Her cries drive me crazy.";
+	mes "Besides, the weird girl from ^3131FFthe second floor^000000 is crying all the time. Her cries drive me crazy.";
 	next;
 	mes "[Neede]";
 	mes "Ah, that weird girl is actually our boss...";
@@ -375,21 +354,21 @@ moc_para01,20,35,5	script	Office Assistant Neede#e	814,{
 	mes "[Neede]";
 	mes "I don't know what she has been up to. But she cries and shouts all the time. Oh, sometimes I hear 'Bang!', loud booming sounds... I don't know where it came from.";
 	next;
-	emotion e_omg,"Office Assistant Neede#e";
+	emotion e_omg;
 	mes "[Neede]";
 	mes "Wait!";
 	mes "Shh! It is a secret, you can't tell anybody!";
 	next;
 	mes "[Neede]";
-	emotion 54,"Office Assistant Neede#e";
+	emotion e_sigh;
 	mes "I don't trust Evenor. She never shows her feelings... she's going to snitch on me to my boss.";
 	next;
-	emotion e_pif,"Secretary Lime Evenor#eden";
+	emotion e_pif,0,"Secretary Lime Evenor";
 	mes "[Lime Evenor]";
 	mes "I am not that kind of guy.";
 	next;
-	emotion e_wah,"Office Assistant Neede#e";
+	emotion e_wah;
 	mes "[Neede]";
 	mes "Huh? Did you hear that? Gosh~!";
 	close;
-}
+}
\ No newline at end of file