Merge pull request #1 from HerculesWS/master

Hercules Merge.

3 files changed, 288 insertions, 246 deletions

diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 5652260f2..22aab9052 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -596,48 +596,6 @@ geffen_in,164,112,4	script	Mixing Machine	111,{
 	close;
 }
 
-pay_arche,122,100,0	script	Dollshoi	88,{
-	mes "[Mage Guildsman]";
-	mes "You want a Solution? Hmm, give me 50 Zeny and at least 1 Empty Test Tube.";
-	next;
-	if (select("Alright, Deal.:Nah, forget it.") == 1) {
-		mes "[Mage Guildsman]";
-		if (Zeny < 50) {
-			mes "Hey! You don't have enough money to cover my 50 Zeny charge.";
-			close;
-		}
-		if (countitem(1092) == 0) {
-			mes "You can't carry solutions without a bottle! Bring me an Empty Test Tube.";
-			close;
-		}
-		delitem 1092,1; //Empty_Cylinder
-		set zeny,zeny-50;
-		getitem 1089,1; //Payon_Potion
-	}
-	close;
-}
-
-moc_ruins,91,150,0	script	Ponka-Hontas	93,{
-	mes "[Mage Guildsman]";
-	mes "Would you like a Solution? Then please give me 50 Zeny and at least 1 Empty Testtube.";
-	next;
-	if (select("Alright, Deal.:Nah, forget it.") == 1) {
-		mes "[Mage Guildsman]";
-		if (zeny < 50) {
-			mes "I'm sorry, but you don't have enough money to cover the 50 Zeny fee.";
-			close;
-		}
-		if (countitem(1092) == 0) {
-			mes "You can't carry liquids without using a bottle. Bring an Empty Test Tube the next time you see me.";
-			close;
-		}
-		delitem 1092,1; //Empty_Cylinder
-		set zeny,zeny-50;
-		getitem 1088,1; //Morocc_Potion
-	}
-	close;
-}
-
 geffen_in,177,112,4	script	Bookshelf	111,{
 	mes "[Guide Book]";
 	mes "This Guide Book is the property of the Geffen Mage Association. Please handle with care.";
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index edd9b05c5..f53596cd0 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.6a
+//= 1.9
 //===== Compatible With: ===================================== 
 //= Hercules
 //===== Description: ========================================= 
@@ -18,13 +18,16 @@
 //= 1.5 Adjusted EXP gains to Renewal values.
 //= 1.6 Fixed a wrong placed curly bracket. [Joseph]
 //= 1.6a Added 'npcskill' command. [Euphy]
+//= 1.7 Fixed exp, texts, and requirements in pre-renewal [Daegaladh]
+//= 1.8 Updated to match the official script. [Euphy]
+//= 1.9 Added GM management function. [Euphy]
 //============================================================ 
 
 // Priest Praupin
 //============================================================
 prt_church,179,15,1	script	Priest Praupin	110,{
 	mes "[Priest Praupin]";
-	if(BaseClass != Job_Acolyte){
+	if(BaseJob != Job_Acolyte){
 		if(tu_acolyte01 == 25){
 			mes "Oh...!";
 			mes "You're "+strcharinfo(0)+" !";
@@ -290,10 +293,10 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		next;
 		mes "[Asthe]";
 		mes "HEAL !!";
-		npcskill "AL_HEAL",10,99,60;
+		npcskill "AL_HEAL",11,99,60;
 		set tu_acolyte01, 3;
 		if(getskilllv("AL_HEAL") == 0){
-			getexp 0,10;
+			getexp 0,100;
 			specialeffect2 EF_CONE;
 		}
 		close;
@@ -381,12 +384,15 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 				emotion e_heh;
 				set tu_acolyte01, 5;
 				delitem 1504, 1; //Mace
-				if(Class == Job_Acolyte_High)
-					getexp 200,100;
-				else
-					getexp 100,50;
-				specialeffect2 EF_CONE;
-				close;
+				if(Class == Job_Acolyte_High) {
+					getexp 2000,1000;
+					specialeffect2 EF_CONE;
+					close;
+				} else {
+					getexp 1000,500;
+					specialeffect2 EF_CONE;
+					close;
+				}
 			} else {
 				mes "Oh my!";
 				mes "Welcome back~";
@@ -451,7 +457,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "building nearby.";
 		close;
 	case 9:
-		mes "You went to Prontera on behalf of the convent for Priest Gardron? That must have been tough...";
+		mes "You went to "+(checkre(0)?"Prontera":"Payon")+" on behalf of the convent for Priest Gardron? That must have been tough...";
 		next;
 		mes "[Asthe]";
 		mes "Blessing!";
@@ -772,7 +778,10 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "[Asthe]";
 		mes "Well, please don't forget what I've taught you. I hope you look back with fondness at our time together amongst these beautiful flowers. May God bless you~";
 		set tu_acolyte01, 25;
-		getexp 500,300;
+		if (checkre(3))
+			getexp 1000,1000;
+		else
+			getexp 5000,3000;
 		specialeffect2 EF_CONE;
 		close;
 	}
@@ -826,8 +835,8 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 			close;
 		}
 	} else if(tu_acolyte01 == 8){
-		if(countitem(939) > 4){
-			mes "Oh..!";
+		if(countitem((checkre(0)?939:957)) > 4){
+			mes "Oh...!";
 			mes "You've returned!";
 			mes "Let's see... One...";
 			mes "Two... Three...";
@@ -838,7 +847,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 			mes "on behalf of the convent,";
 			mes "not to mention the fact that";
 			mes "you've protected the citizens";
-			mes "of Prontera from danger.";
+			mes "of "+(checkre(0)?"Prontera":"Payon")+" from danger.";
 			next;
 			mes "[Priest Gardron]";
 			mes "May you always";
@@ -848,45 +857,88 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 			mes "Acolyte training.";
 			set tu_acolyte01, 9;
 			percentheal 100,100;
-			getexp 200,200;
+			if (checkre(3))
+				getexp 1000,1000;
+			else
+				getexp 2000,2000;
 			specialeffect2 EF_CONE;
 			//getitem 505,1; //Blue_Potion
 			close;
 		} else {
-			mes "A little while ago, a Prontere Sister sent me a message. Apparently,";
-			mes "the residents of Prontera are being plagued by Hornets.";
-
-			next;
-			mes "[Priest Gardron]";
-			mes "She has requested the convent for help, but we've got a big problem. We're running out of people here that can deal with this situation...";
-			next;
-			mes "[Priest Gardron]";
-			mes "....!";
-			emotion e_gasp;
-			next;
-			mes "[Priest Gardron]";
-			mes ""+strcharinfo(0)+",";
-			mes "may I ask";
-			mes "you to take care";
-			mes "of this task? Exterminate the Hornets west of Prontera.";
-			next;
-			mes "[Priest Gardron]";
-			mes "Since you're still in basic training, I will give you some";
-			mes "help if you return with";
-			mes "^3131FF5 Bee Stings^000000.";
-			next;
-			mes "[Priest Gardron]";
-			mes "Now then...";
-			mes "Will you go to Prontera?";
-			next;
-			if(select("Let's go to Prontera!:Um, let me get ready first.")==1){
+			if (checkre(0)) {
+				mes "A few days ago, a sister in Prontera";
+				mes "sent me a telegram that citizens had been harmed";
+				mes "by Hornets in the western field,";
+				mes "so she asked the abbey to help with them.";
+				next;
 				mes "[Priest Gardron]";
-				mes "Good, good.";
-				mes "I shall send you";
-				mes "there to fight the monsters west of Prontera so that you can return with 5 Bee Stings. May God bless you...";
-				close2;
-				warp "prontera",116,72;
-				end;
+				mes "But at this time,";
+				mes "we are also short of hands...";
+				mes "so it's a big problem.";
+				next;
+				mes "[Priest Gardron]";
+				mes "....!";
+				emotion e_gasp;
+				next;
+				mes "[Priest Gardron]";
+				mes "May I entrust you, acolyte "+strcharinfo(0)+",";
+				mes "this urgent matter?";
+				mes "Please dispose of Hornets";
+				mes "which are causing trouble on ^FF0000the western field of Prontera^000000.";
+				next;
+				mes "[Priest Gardron]";
+				mes "I know that you are undergoing the discipline,";
+				mes "So I will give you something to help you";
+				mes "if you bring me ^3131FF 5^000000 ^3131FFBee Sting^000000.";
+				next;
+				mes "[Priest Gardron]";
+				mes "Will you go to Prontera?";
+				next;
+				if(select("Let's go to Prontera!:I'll be back after doing some preparation.") == 1) {
+					mes "[Priest Gardron]";
+					mes "Okay, I will send you to Prontera.";
+					mes "Please dispose of Hornets and bring me 5 Bee Stings for confirmation.";
+					mes "My Lord, please protect this acolyte from evil monsters.";
+					close2;
+					warp "prontera",116,72;
+					end;
+				}
+			} else {
+				mes "A little while ago, the Payon Elder sent me a message. Apparently,";
+				mes "the residents of Payon are being attacked by Zombies.";
+				next;
+				mes "[Priest Gardron]";
+				mes "He has requested the convent for help, but we've got a big problem. We're running out of people here that can deal with this situation...";
+				next;
+				mes "[Priest Gardron]";
+				mes "....!";
+				emotion e_gasp;
+				next;
+				mes "[Priest Gardron]";
+				mes ""+strcharinfo(0)+",";
+				mes "may I ask";
+				mes "you to take care";
+				mes "of this task? Exterminate the Skeletons and Zombies in the";
+				mes "First Floor of Payon Dungeon.";
+				next;
+				mes "[Priest Gardron]";
+				mes "Since you're still in basic training, I will give you some";
+				mes "help if you return with";
+				mes "^3131FF5 Decayed Nails^000000.";
+				next;
+				mes "[Priest Gardron]";
+				mes "Now then...";
+				mes "Will you go to Payon?";
+				next;
+				if(select("Let's go to Payon!:Um, let me get ready first.")==1) {
+					mes "[Priest Gardron]";
+					mes "Good, good.";
+					mes "I shall send you";
+					mes "there to fight the monsters in Payon Dungeon so that you can return with 5 Decayed Nails. May God bless you...";
+					close2;
+					warp "payon",161,58;
+					end;
+				}
 			}
 			close;
 		}
@@ -908,8 +960,7 @@ prt_monk,235,245,5	script	Dog#tu	81,{
 	mes "Woof woof!^000000";
 	next;
 	if(tu_acolyte01 == 10){
-		set .@dog_food, 0;
-		while((1)){
+		while(1) {
 			switch(select("Give a treat.:Pet the dog.:End actions.")){
 			case 1:
 				set .@dog_food, .@dog_food + 1;
@@ -995,7 +1046,6 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 		mes "H-hurts...";
 		next;
 		select("Are you alright?");
-
 		mes "[Angelic]";
 		mes "My sister...";
 		mes "She was so beautiful...";
@@ -1023,8 +1073,9 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "Are you alright?";
+		mes "................";
 		next;
-		specialeffect EF_CURSEATTACK ;
+		specialeffect EF_CURSEATTACK;
 		soundeffectall "_curse.wav",0;
 		emotion e_omg;
 		mes "["+strcharinfo(0)+"]";
@@ -1056,7 +1107,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 			mes "["+strcharinfo(0)+"]";
 			mes "H...";
 			mes "Heal !!";
-			specialeffect EF_HEAL ;
+			specialeffect EF_HEAL;
 			next;
 			mes "^3355FFNothing happened.";
 			mes "It doesn't look like";
@@ -1081,7 +1132,10 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 					mes "It seemed that this good";
 					mes "deed has improved your skills.^000000";
 					set tu_acolyte01, 13;
-					getexp 0,100;
+					if (checkre(3))
+						getexp 0,500;
+					else
+						getexp 0,1000;
 					specialeffect2 EF_CONE;
 					next;
 					break;
@@ -1725,7 +1779,6 @@ prt_monk,223,123,3	script	Eavesdrop#tu	111,{
 		close;
 	}
 }
-
 /*
 sec_in02,17,156,3	script	1st Job Quest Reset	726,{
 	mes "[1st Job Quest]";
@@ -1755,4 +1808,4 @@ sec_in02,17,156,3	script	1st Job Quest Reset	726,{
 	mes "Completed.";
 	close;
 }
-*/
+*/
\ No newline at end of file
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 6b1101169..fc841fb88 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Gennosuke Kouga, Muad_Dib
 //===== Current Version: =====================================
-//= 2.0
+//= 2.3
 //===== Compatible With: =====================================
 //= Hercules
 //===== Description: =========================================
@@ -29,6 +29,9 @@
 //= 1.9 Updated "Fish Tails" with RE coordinates.
 //= 1.9a Minor fix. [Joseph]
 //= 2.0 Fixed variables. [Joseph]
+//= 2.1 Added reset option to "Kareka". [Euphy]
+//= 2.2 Added Izlude duplicates. [Euphy]
+//= 2.3 Added GM management NPCs. [Euphy]
 //============================================================
 
 // Entrance
@@ -63,114 +66,113 @@ manuk,321,182,5	script	Entrance Manager#ep133	450,{
 }
 
 dic_dun01,266,113,5	script	Curious Sapha#ep13_3_	449,{
+	if (!isequipped(2782)) {
+		mes "[Curious Sapha]";
+		mes "¡ö¡ñ¡Ð ¡ò ¡õ?";
+		next;
+		mes "- Cannot understand a word. -";
+		close;
+	}
 	mes "[Curious Sapha]";
-	if (isequipped(2782)) {
-		mes "Hello?";
+	mes "Hello?";
+	next;
+	switch(select("What are you doing here?:Buy research items.:Hello!:I want to help your research.")) {
+	case 1:
+		mes "[Curious Sapha]";
+		mes "Do you see that dirty vigilante over there?";
 		next;
-		switch(select("What are you doing here?:Buy research items.:Hello!:I want to help your research.")) {
-			case 1:
-				mes "[Curious Sapha]";
-				mes "Do you see that dirty vigilante over there?";
-				next;
-				mes "[Curious Sapha]";
-				mes "He was attacked by Scarabas after falling into Scaraba Hall.";
-				mes "And he was the only one attacked even with others around him.";
-				next;
-				mes "[Curious Sapha]";
-				mes "I think he slipped and fell on some secretion of the Queen Scaraba. I thought it was an accident was looking into it.";
-				next;
-				mes "[Curious Sapha]";
-				mes "If the research results are correct, the Scarabas are very sensitive to the smell.";
-				mes "Or else say they go crazy over it. Almost as if they were losing it...";
-				next;
-				mes "[Curious Sapha]";
-				mes "I came to research the relationship between the Queen secretion component and the Scarabas.";
-				mes "So I created this into a perfume to carry it easily.";
-				next;
-				mes "[Curious Sapha]";
-				mes "I might be able to use this perfume's reaction to Scarabas and make progress in research.";
-				close;
-			case 2:
-				if (!checkweight(1201,1)) {
-					mes "[Curious Sapha]";
-					mes "You don't seem to have enough space.";
-					close;
-				}
-				if ((MaxWeight - Weight) < 2000) {
-					mes "[Curious Sapha]";
-					mes "Your bags already seem too heavy.";
-					close;
-				}
-				mes "[Curious Sapha]";
-				mes "You want to buy the Scaraba Perfume? A gift for home?";
-				mes "Well, it has become a rare perfume.";
-				next;
-				mes "[Curious Sapha]";
-				mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall.";
-				mes "How many do you want? You can buy up to 100.";
-				next;
-				input .@input;
-				set .@deal, 500 * .@input;
-				if (.@deal == 0) {
-					mes "[Curious Sapha]";
-					mes "You changed your mind?";
-					close; 
-				}
-				if (Zeny < .@deal) {
-					mes "[Curious Sapha]";
-					mes "You don't have enough money.";
-					close; 
-				}
-				mes "[Curious Sapha]";
-				mes "Will you buy "+.@input+"?";
-				next;
-				if(select("Yes:No") == 2) {
-					mes "[Curious Sapha]";
-					mes "You changed your mind?";
-					close;
-				}
-				set Zeny, Zeny - .@deal;
-				getitem 6437,.@input; //Scaraba_Perfume
-				mes "[Curious Sapha]";
-				mes "Here you go. Scaraba might flock around you so don't use it near Scaraba Hall.";
-				close;
-			case 3:
-				mes "[Curious Sapha]";
-				mes "Hello? You must be a traveler. This place is dangerous so please find your way out of this tunnel.";
-				close;
-			case 4:
-				mes "[Curious Sapha]";
-				mes "Do you have any useful information?";
-				mes "Please let me know!";
-				input .@str$;
-				next;
-				mes "[Curious Sapha]";
-				mes "It says ^0000FF"+.@str$+"^000000.";
-				next;
-				set .@his_rd_ms, rand(1,3);
-				if (.@his_rd_ms == 1) {
-					mes "[Curious Sapha]";
-					mes "That is great information!";
-					mes "I must start on the research.";
-					close;
-				}
-				else if (.@his_rd_ms == 2) {
-					mes "[Curious Sapha]";
-					mes "I already know about that information but I'm really grateful for you to come all the way here to tell me.";
-					close;
-				}
-				else {
-					mes "[Curious Sapha]";
-					mes "Hmm... do you think so?";
-					mes "I have some doubts about your information. I'll think it over.";
-					close;
-				}
+		mes "[Curious Sapha]";
+		mes "He was attacked by Scarabas after falling into Scaraba Hall.";
+		mes "And he was the only one attacked even with others around him.";
+		next;
+		mes "[Curious Sapha]";
+		mes "I think he slipped and fell on some secretion of the Queen Scaraba. I thought it was an accident was looking into it.";
+		next;
+		mes "[Curious Sapha]";
+		mes "If the research results are correct, the Scarabas are very sensitive to the smell.";
+		mes "Or else say they go crazy over it. Almost as if they were losing it...";
+		next;
+		mes "[Curious Sapha]";
+		mes "I came to research the relationship between the Queen secretion component and the Scarabas.";
+		mes "So I created this into a perfume to carry it easily.";
+		next;
+		mes "[Curious Sapha]";
+		mes "I might be able to use this perfume's reaction to Scarabas and make progress in research.";
+		close;
+	case 2:
+		if (checkweight(1201,1) == 0) {
+			mes "[Curious Sapha]";
+			mes "You don't seem to have enough space.";
+			close;
+		}
+		if (MaxWeight - Weight < 2000) {
+			mes "[Curious Sapha]";
+			mes "Your bags already seem too heavy.";
+			close;
+		}
+		mes "[Curious Sapha]";
+		mes "You want to buy the Scaraba Perfume? A gift for home?";
+		mes "Well, it has become a rare perfume.";
+		next;
+		mes "[Curious Sapha]";
+		mes "I'll give you a deal and sell it by 500 Zeny each. But, try not to carry it with you into Scaraba Hall.";
+		mes "How many do you want? You can buy up to 100.";
+		next;
+		input .@input;
+		set .@deal, 500 * .@input;
+		if (.@deal == 0) {
+			mes "[Curious Sapha]";
+			mes "You changed your mind?";
+			close; 
+		}
+		if (Zeny < .@deal) {
+			mes "[Curious Sapha]";
+			mes "You don't have enough money.";
+			close; 
+		}
+		mes "[Curious Sapha]";
+		mes "Will you buy "+.@input+"?";
+		next;
+		if(select("Yes:No") == 2) {
+			mes "[Curious Sapha]";
+			mes "You changed your mind?";
+			close;
+		}
+		set Zeny, Zeny - .@deal;
+		getitem 6437,.@input; //Scaraba_Perfume
+		mes "[Curious Sapha]";
+		mes "Here you go. Scaraba might flock around you so don't use it near Scaraba Hall.";
+		close;
+	case 3:
+		mes "[Curious Sapha]";
+		mes "Hello? You must be a traveler. This place is dangerous so please find your way out of this tunnel.";
+		close;
+	case 4:
+		mes "[Curious Sapha]";
+		mes "Do you have any useful information?";
+		mes "Please let me know!";
+		input .@str$;
+		next;
+		mes "[Curious Sapha]";
+		mes "It says ^0000FF"+.@str$+"^000000.";
+		next;
+		switch(rand(1,3)) {
+		case 1:
+			mes "[Curious Sapha]";
+			mes "That is great information!";
+			mes "I must start on the research.";
+			close;
+		case 2:
+			mes "[Curious Sapha]";
+			mes "I already know about that information but I'm really grateful for you to come all the way here to tell me.";
+			close;
+		case 3:
+			mes "[Curious Sapha]";
+			mes "Hmm... do you think so?";
+			mes "I have some doubts about your information. I'll think it over.";
+			close;
 		}
 	}
-	mes "¡ö¡ñ¡Ð ¡ò ¡õ?";
-	next;
-	mes "- Cannot understand a word. -";
-	close;
 }
 
 // Vigilantes
@@ -262,7 +264,7 @@ dic_dun01,284,102,5	script	Dirty Vigilante#ep13_3	450,{
 			next;
 			if (select("Enter after spraying perfume.:Do not enter because it's dangerous.") == 1) {
 				if (!countitem(6437)) {
-					mes "- You Scaraba Perfume disappeared. -";
+					mes "- Your Scaraba Perfume disappeared. -";
 					close;
 				}
 				mes "[Vigilante]";
@@ -279,7 +281,7 @@ dic_dun01,284,102,5	script	Dirty Vigilante#ep13_3	450,{
 		close;
 	}
 	mes "[Vigilante]";
-	mes "Phew, what happened?! Why are they all over me";
+	mes "Phew, what happened?! Why are they all over me?";
 	next;
 	mes "[Vigilante]";
 	mes "I already had bad luck in falling into Scaraba Hall and being drenched with this awful ^FF0000stench^000000 my head is starting to ache!";
@@ -423,7 +425,6 @@ dic_in01,254,119,0	script	Item Storage#01	844,{
 
 // Civil Services
 //============================================================
-
 function	script	que_dic	{
 	if (!getarg(0)) {
 		if (checkquest(getarg(1),HUNTING) != 2) return;
@@ -983,7 +984,6 @@ dic_in01,40,193,1	script	Papyrus#0001	453,{
 
 // Document Packages
 //============================================================
-
 -	script	Document Package#main	-1,{
 	function	eldicastes_dp;
 	if (isequipped(2782) < 1) {
@@ -1091,7 +1091,6 @@ dic_in01,25,187,0	duplicate(Document Package#main)	Document Package#0004	844
 
 // Unknown Relics
 //============================================================
-
 function	script	unknown_d	{
 	if (checkquest(getarg(0)) == -1) {
 		mes "You see some traces of digging.";
@@ -1119,7 +1118,11 @@ pay_fild02,105,113,0	script	Pointed Scales	844,{ unknown_d(12170,906); }
 pay_fild01,152,171,0	script	Resin	844,{ unknown_d(12171,907); }
 gef_fild01,104,111,0	script	Spawn	844,{ unknown_d(12172,908); }
 prt_fild08,299,332,0	script	Jellopy	844,{ unknown_d(12173,909); }
-izlude,136,160,0	script	Fish Tails	844,{ unknown_d(12174,1023); }	// Pre-RE: izlude (132,136)
+izlude,136,160,0	script	Fish Tails	844,{ unknown_d(12174,1023); }	// Old coordinates: (132,136)
+izlude_a,136,160,0	script	Fish Tails#a	844,{ unknown_d(12174,1023); }
+izlude_b,136,160,0	script	Fish Tails#b	844,{ unknown_d(12174,1023); }
+izlude_c,136,160,0	script	Fish Tails#c	844,{ unknown_d(12174,1023); }
+izlude_d,136,160,0	script	Fish Tails#d	844,{ unknown_d(12174,1023); }
 prt_fild05,303,169,0	script	Worm Peelings	844,{ unknown_d(12175,955); }
 iz_dun03,155,165,0	script	Gills	844,{ unknown_d(12176,956); }
 mjo_dun01,222,226,0	script	Tooth of Bat	844,{ unknown_d(12177,913); }
@@ -3355,10 +3358,8 @@ dicastes01,225,211,3	script	Tragis#pa0829	453,{
 
 // Doha's Secret Orders
 //============================================================
-
 mid_campin,168,170,3	script	Inspector Doha#ep133	59,{
-//	if ((GetInventoryRemainCount 1301 3 == 2) || (GetInventoryRemainCount 1301 3 == 3)) {
-	if ((MaxWeight - Weight) < 1000) {
+	if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) {
 		mes "- You can too many items to proceed with the quest. -";
 		close;
 	}
@@ -3646,11 +3647,11 @@ dic_in01,245,119,4	script	Shay#ep133_13	884,{
 	cutin "ep13_shy",2;
 	mes "[Shay]";
 	switch (rand(1,5)) {
-		Case 1: mes ".. Burman Flone."; break;
-		Case 2: mes "What?"; break;
-		Case 3: mes "Boring. What is it?"; break;
-		Case 4: mes "Sigh... Ready to order?"; break;
-		Case 5:
+		case 1: mes ".. Burman Flone."; break;
+		case 2: mes "What?"; break;
+		case 3: mes "Boring. What is it?"; break;
+		case 4: mes "Sigh... Ready to order?"; break;
+		case 5:
 			mes "Another failure?.";
 			mes "I'm talking to myself. Don't bother.";
 			mes "What do you want?";
@@ -5128,7 +5129,7 @@ dic_in01,165,104,0	script	Frede#13_3_in	454,{
 			mes "Maybe......they forgot?";
 			next;
 			mes "[Frede]";
-			mes "Oh.. what should I do......";
+			mes "Oh... what should I do......";
 			mes "I would run there myself if only my legs would move normally.";
 			next;
 			mes "[Frede]";
@@ -5159,7 +5160,7 @@ dic_in01,165,104,0	script	Frede#13_3_in	454,{
 		}
 		else if (ep13_3_bra == 3) {
 			mes "[Frede]";
-			mes "Oh.. what should I do......";
+			mes "Oh... what should I do......";
 			mes "I would run there myself if only my legs would move normally.";
 			next;
 			mes "[Frede]";
@@ -6913,7 +6914,6 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 }
 // Enchantment NPCs
 //============================================================
-
 -	script	dic_enc#main	-1,{
 	set .@re$, strnpcinfo(1);
 	set .@n$, "["+.@re$+"]";
@@ -6930,8 +6930,37 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 			mes "[Kareka]";
 			mes "Do you want to upgrade the ^990099Light of El Dicastes^000000 again?";
 			next;
+
+			// The reset feature was disabled in previous versions.
+			//mes "[Kareka]";
+			//mes "Ha ha ha, that is out of the question. This item is very rare and valuable so I cannot give you a new one.";
+			//close;
+
+			mes "[Kareka]";
+			mes "That will cost ^9900996 Sapha Certifications^000000 in order to retry.";
+			mes "And note this, your current Light of El Dicastes will be destroyed along with all of its enchantments.";
+			next;
 			mes "[Kareka]";
-			mes "Ha ha ha, that is out of the question. This item is very rare and valuable so I cannot give you a new one.";
+			mes "Are you sure you want to do this?";
+			next;
+			if(select("No, let me think about it.:Take my Light of El Dicastes.") == 2) {
+				if (countitem(2844) == 0 || countitem(6304) < 6) {
+					mes "[Kareka]";
+					mes "You need to bring the Light of El Dicastes and 6 Sapha Certifications!";
+					mes "Don't try to cheat me!";
+					close;
+				}
+				mes "[Kareka]";
+				mes "Ok, let's get this started.";
+				mes "I'm going to remove all enchantments from your Light of El Dicastes.";
+				mes "Haaap--!";
+				specialeffect2 EF_REPAIRWEAPON;
+				progressbar "ffff00",3;
+				delitem 6304,6; //Sapa_Feat_Cert
+				delitem 2844,1; //El_Dicastes_Light
+				getitem 2844,1; //El_Dicastes_Light
+				set ep13_3_ring2,0;
+			}
 			close;
 		}
 		if (countitem(6304) < 1) {
@@ -6974,21 +7003,21 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	453,{
 		mes .@n$;
 		set .@cat_hi, rand(1,30);
 		if (.@cat_hi == 1) mes "It is difficult to find fish here. Can't find any so Jahbong would forget that he's busy or angry at the sight of a Fish Tail.";
-		if (.@cat_hi == 2) mes "Grrr... I was punished with a ladle for peeing on my blanket yesterday.";
-		if (.@cat_hi == 3) mes "I dream sometimes of a giant patting me on the head. But I feel more annoyed than afraid.";
-		if (.@cat_hi == 4) mes "Newbie Jarute, Ahat doesn't seem to look like a Sapha.";
-		if (.@cat_hi == 5) mes "Our people say Ahat looks like a beautiful cat.";
-		if (.@cat_hi == 6) mes "I heard there was a superior equipment upgrade craftsman in the capital city of Manuk.";
-		if (.@cat_hi == 7) mes "Grrr... I don't think my voice sounds normal these days. I think it's the weather.";
-		if (.@cat_hi == 8) mes "There are times when I shout out loud but it is only because I am in a good mood. No need to be startled.";
-		if (.@cat_hi == 9) mes "I feel an urge to jump on a pile with my four paws when I see one.";
-		if (.@cat_hi == 10) mes "I must have been a cat in my previous life.";
-		if (.@cat_hi == 11) mes "I dreamt about the giant again. I waved my paws annoyed and he kept on patting me.";
-		if (.@cat_hi == 12) mes "Yup!! Was the rumor true that Ahat looks like a human?! ";
-		if (.@cat_hi == 13) mes "I heard on my way that this Pinqucula Dark has a Withered Flower.";
-		if (.@cat_hi == 14) mes "There is a guy named Pinguicula nearby who has the Sharp Leaf nearby.";
-		if (.@cat_hi == 15) mes "There is a guy named Pinguicula nearby who has the Great Leaf nearby.";
-		if (.@cat_hi == 16) mes "I recommend getting it from the Dracos nearby. But then, they only drop it randomly so you may come back empty handed...";
+		else if (.@cat_hi == 2) mes "Grrr... I was punished with a ladle for peeing on my blanket yesterday.";
+		else if (.@cat_hi == 3) mes "I dream sometimes of a giant patting me on the head. But I feel more annoyed than afraid.";
+		else if (.@cat_hi == 4) mes "Newbie Jarute, Ahat doesn't seem to look like a Sapha.";
+		else if (.@cat_hi == 5) mes "Our people say Ahat looks like a beautiful cat.";
+		else if (.@cat_hi == 6) mes "I heard there was a superior equipment upgrade craftsman in the capital city of Manuk.";
+		else if (.@cat_hi == 7) mes "Grrr... I don't think my voice sounds normal these days. I think it's the weather.";
+		else if (.@cat_hi == 8) mes "There are times when I shout out loud but it is only because I am in a good mood. No need to be startled.";
+		else if (.@cat_hi == 9) mes "I feel an urge to jump on a pile with my four paws when I see one.";
+		else if (.@cat_hi == 10) mes "I must have been a cat in my previous life.";
+		else if (.@cat_hi == 11) mes "I dreamt about the giant again. I waved my paws annoyed and he kept on patting me.";
+		else if (.@cat_hi == 12) mes "Yup!! Was the rumor true that Ahat looks like a human?! ";
+		else if (.@cat_hi == 13) mes "I heard on my way that this Pinqucula Dark has a Withered Flower.";
+		else if (.@cat_hi == 14) mes "There is a guy named Pinguicula nearby who has the Sharp Leaf nearby.";
+		else if (.@cat_hi == 15) mes "There is a guy named Pinguicula nearby who has the Great Leaf nearby.";
+		else if (.@cat_hi == 16) mes "I recommend getting it from the Dracos nearby. But then, they only drop it randomly so you may come back empty handed...";
 		else mes "Hmm... This may not be important to you but.";
 		next;
 		mes .@n$;
@@ -7326,14 +7355,14 @@ dic_fild01,228,159,4	script	Jahbong#pa0829	496,{
 	}
 	set .@cattalkj,rand(1,9);
 	if (.@cattalkj == 1) mes "Don't touch my back! I might bite you unconsciously.";
-		else if (.@cattalkj == 2) mes "Pub owner Shay carried something away to make something strange! Be careful!";
-		else if (.@cattalkj == 3) mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now.";
-		else if (.@cattalkj == 4) mes "I have to be diligent with my grooming to maintain beautiful fur.";
-		else if (.@cattalkj == 5) mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad.";
-		else if (.@cattalkj == 6) mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!";
-		else if (.@cattalkj == 7) mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry.";
-		else if (.@cattalkj == 8) mes "Meow~~~~~~~~~~";
-		else mes "Yarn is a great way to calm a cat.";
+	else if (.@cattalkj == 2) mes "Pub owner Shay carried something away to make something strange! Be careful!";
+	else if (.@cattalkj == 3) mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now.";
+	else if (.@cattalkj == 4) mes "I have to be diligent with my grooming to maintain beautiful fur.";
+	else if (.@cattalkj == 5) mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad.";
+	else if (.@cattalkj == 6) mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!";
+	else if (.@cattalkj == 7) mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry.";
+	else if (.@cattalkj == 8) mes "Meow~~~~~~~~~~";
+	else mes "Yarn is a great way to calm a cat.";
 	next;
 	mes "[Jahbong]";
 	mes "Why are you here?";
@@ -7393,8 +7422,10 @@ moc_para01,44,19,3	script	Cat Hand Agent#gekk	496,{
 	if (BaseLevel < 70)	{
 		mes "[Cat Hand Agent]";
 		mes "Hey, human! Did you come to make a request, too? When will it be my turn?";
+		next;
 		mes "[Cat Hand Agent]";
 		mes "Our Cat Hand Merchant group really needs any help it can get. But by the looks of all those requests that Ebenor is holding in his hand, Cat Hand Merchant will be closed by the time my request is put up on the board!";
+		next;
 		mes "[Cat Hand Agent]";
 		mes "It breaks my heart to think my colleagues will be shivering in the blizzard. I hope I don't get into trouble since I can't do anything about it, right?";
 		close;
@@ -7576,4 +7607,4 @@ moc_fild22b,182,179,3	script	Cat Hand Agent#Tat	495,{
 	mes "[Tat]";
 	mes "Aren't you suppose to be done getting ready before you come here?";
 	close;
-}
+}
\ No newline at end of file