Merge branch 'master' of https://github.com/dastgirpojee/Hercules into SkidConst

11 files changed, 479 insertions, 423 deletions

diff --git a/npc/merchants/buying_shops.txt b/npc/merchants/buying_shops.txt
index 4532921bd..c8c001902 100644
--- a/npc/merchants/buying_shops.txt
+++ b/npc/merchants/buying_shops.txt
@@ -1,14 +1,15 @@
 //===== Hercules Script ======================================
 //= Buying Shop Scripts
 //===== By: ==================================================
-//= Kisuka, skyiing, Scriptor
+//= Kisuka
 //===== Current Version: =====================================
-//= 1.1
+//= 1.1a
 //===== Description: =========================================
-//= Buying Shop licenses and catalogs.
+//= Buying Shop licenses.
 //===== Additional Comments: =================================
 //= 1.0 First version. [Kisuka]
 //= 1.1 Added Catalog Magician. [Euphy]
+//= 1.1a Moved Catalog Magician to Renewal path. [Euphy]
 //============================================================ 
 
 // Black Marketeer (Buy Licenses - Non-Merchant Classes)
@@ -235,99 +236,4 @@ alberta_in,58,52,4	script	Purchasing Team#Buying	59,{
 	mes "[Mr. Hugh]";
 	mes "My time is solely dedicated to our customers in the Merchant industry.";
 	close;
-}
-
-// Catalog Magician
-//============================================================ 
-moc_para01,22,16,5	script	Catalog Magician#catal01	704,{
-	if (!checkweight(1201,2)) {
-		mes "- You have too many items. Please make space. -";
-		close;
-	}
-	set .@ticket_cost, 200;
-	mes "[Catalog Magician]";
-	mes "Look... the Magic Academy";
-	mes "in Geffen is now directly";
-	mes "selling the brand new";
-	mes "^007777Universal Catalog Silver^000000!";
-	next;
-	mes "He is looking at the words";
-	mes "written on his hand.";
-	mes "Seems like he's too busy";
-	mes "to look at you.";
-	next;
-	mes "[Catalog Magician]";
-	mes "A brand new catalog";
-	mes "has just come out!";
-	mes "You can check what";
-	mes "items can be traded";
-	mes "and what items are on";
-	mes "sale from the vendor.";
-	next;
-	mes "[Catalog Magician]";
-	mes "^007777Universal Catalog Silver^000000~";
-	mes "It costs only 200z each!";
-	mes "You can buy it up to 50";
-	mes "pieces at once!";
-	next;
-	switch(select("Buy ^007777Universal Catalog Silver^000000:I don't need it!:You don't look like a vendor...")) {
-	case 1:
-		mes "[Catalog Magician]";
-		mes "You... want all 50 pieces?";
-		mes "Or how many do you need?";
-		next;
-		while (1) {
-			input .@input;
-			mes "[Catalog Magician]";
-			if (.@input == 0) {
-				mes "Trade has been stopped!";
-				mes "I don't know what to do next...";
-				mes "What should I do?";
-				emotion e_swt2,1;
-				close;
-			} else if (.@input < 1 || .@input > 50) {
-				mes "It should be less than 50 pieces.";
-				next;
-			} else break;
-		}
-		set .@sell, .@ticket_cost * .@input;
-		mes "Total number of catalog(s) that";
-		mes "you're trying to purchase is";
-		mes .@input + " pieces and it costs " + .@sell + " z.";
-		if (Zeny < .@sell) {
-			mes "It seems you don't have enough money.";
-			mes "You can sell your equips";
-			mes "to make more money... if you want.";
-			close;
-		}
-		mes "Okie, here you go.";
-		set Zeny, Zeny - .@sell;
-		getitem 12580,.@input; //Vending_Search_Scroll
-		close;
-	case 2:
-		mes "[Catalog Magician]";
-		mes "Argh... you really need this";
-		mes "item... Do you want me to";
-		mes "explain again? I don't know";
-		mes "what to do next...";
-		mes "What should I do?";
-		emotion e_swt2,1;
-		close;
-	case 3:
-		mes "[Catalog Magician]";
-		mes "My real job is a magician.";
-		mes "I was going to ask the merchant";
-		mes "guild to sell them, but they were";
-		mes "trying use them as an appendix";
-		mes "into broom sales. That's why";
-		mes "I'm selling these by myself.";
-		next;
-		mes "[Catalog Magician]";
-		mes "There are many adventurers";
-		mes "here coming and going. I'm";
-		mes "pretty sure that I can sell them";
-		mes "all soon. Don't you think so?";
-		mes "So... let's start!! Buy more of them, please! PLEASE...!";
-		close;
-	}
-}
+}
\ No newline at end of file
diff --git a/npc/pre-re/quests/quests_veins.txt b/npc/pre-re/quests/quests_veins.txt
new file mode 100644
index 000000000..ec0636b83
--- /dev/null
+++ b/npc/pre-re/quests/quests_veins.txt
@@ -0,0 +1,9 @@
+//===== Hercules Script ======================================
+//= Veins Quests
+//===== By: ================================================== 
+//= L0ne_W0lf
+//===== Current Version: ===================================== 
+//= 1.0 (originally 2.2 prior to being split)
+//============================================================ 
+
+ve_fild05,257,130,4	duplicate(WincingOldMan_veins)	Wincing Old Man#ve	945
\ No newline at end of file
diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf
index a06cab57f..0dd7d035d 100644
--- a/npc/pre-re/scripts.conf
+++ b/npc/pre-re/scripts.conf
@@ -74,3 +74,5 @@ npc: npc/pre-re/quests/monstertamers.txt
 npc: npc/pre-re/quests/quests_nameless.txt
 npc: npc/pre-re/quests/quests_13_1.txt
 npc: npc/pre-re/quests/skills/swordman_skills.txt
+npc: npc/pre-re/quests/quests_veins.txt
+
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index 9ef4e6481..9d1fa6f49 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1,11 +1,11 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ====================================== 
 //= Moscovia Quests
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 2.0a
+//= 2.2
 //===== Compatible With: ===================================== 
-//= rAthena SVN
+//= Hercules
 //===== Description: ========================================= 
 //= Quests for Moscovia.
 //= The Moving Island, Help Mikhail, Acorn Exchange,
@@ -23,11 +23,13 @@
 //= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf]
 //= 2.0 Optimized. [Joseph]
 //= 2.0a Bug fixes. [Euphy]
+//= 2.0b Bug fixes. [Lemongrass]
+//= 2.1 Fixed incorrect use of 'close'. [Joseph]
+//= 2.2 Updated RE/Pre-RE EXP. [Euphy]
 //============================================================ 
 
-//============================================================================
-// The Moving Island
-//============================================================================
+// The Moving Island :: mos_whale_edq
+//============================================================
 
 //----------------------------------------------------------------------------
 // Berbayeff - Starting Point
@@ -269,7 +271,14 @@ moscovia,135,52,0	script	Bulletin Board#npc	837,{
 // Mr. Ibanoff - Docks
 //----------------------------------------------------------------------------
 moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
-	if (mos_whale_edq == 1 || mos_whale_edq == 2) {
+	if (mos_whale_edq == 0) {
+		mes "[Mr. Ibanoff]";
+		mes "You are also an adventurer from another province. I also was a great adventurer.";
+		next;
+		mes "[Mr. Ibanoff]";
+		mes "Uf...I just want to be 20 years younger, so I can travel here and there with invigorating youth such as you... Time is an enemy. Hahahahaha!";
+		close;
+	} else if (mos_whale_edq == 1 || mos_whale_edq == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Hello. Are you Mr. Ibanoff?";
 		next;
@@ -741,13 +750,6 @@ moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
 		mes "You should ride a ship now? Let's ready to leave hurry up.";
 		set mos_whale_edq,19;
 		close;
-	} else {
-		mes "[Mr. Ibanoff]";
-		mes "You are also an adventurer from another province. I also was a great adventurer.";
-		next;
-		mes "[Mr. Ibanoff]";
-		mes "Uf...I just want to be 20 years younger, so I can travel here and there with invigorating youth such as you... Time is an enemy. Hahahahaha!";
-		close;
 	}
 	if ((gettime(3) >= 0 && gettime(3) < 3) || (gettime(3) >= 6 && gettime(3) < 9) || (gettime(3) >= 12 && gettime(3) < 15) || (gettime(3) >= 18 && gettime(3) < 21))  {
 		mes "[Mr. Ibanoff]";
@@ -1096,31 +1098,11 @@ mosk_ship,101,111,4	script	rudder#ship	111,{
 		mes "We should make sure to kill any";
 		mes "monsters onboard.";
 		close;
-	} else if (mos_whale_edq == 22 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We should make sure to kill any";
-		mes "monsters onboard.";
-		close;
-	} else if (mos_whale_edq == 23 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We should make sure to kill any";
-		mes "monsters onboard.";
-		close;
-	} else if (mos_whale_edq == 25 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We should make sure to kill any";
-		mes "monsters onboard.";
-		close;
 	} else if (mos_whale_edq == 25 && $@mos1_edq == 0) {
 		mes "[Mr. Ibanoff]";
 		mes "You can adjust the rudder,";
 		mes "under my direction.";
 		close;
-	} else if (mos_whale_edq > 239 && mos_whale_edq < 250 && $@mos1_edq > 0) {
-		mes "[Mr. Ibanoff]";
-		mes "We should make sure to kill any";
-		mes "monsters onboard.";
-		close;
 	} else if (mos_whale_edq == 26) {
 		mes "[Mr. Ibanoff]";
 		mes "Hey! Listen to what I am saying.";
@@ -1528,7 +1510,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 		mes "Are you ready to learn the Gusli?";
 		mes "Please equip the Gusli.";
 		next;
-		if(getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
+		if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
 			mes "[Aged Stranger]";
 			mes "Hm... Very well.";
 			mes "At first, look at me how I play,";
@@ -1571,7 +1553,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 		mes "[Aged Stranger]";
 		mes "Are you ready to learn the Gusli?";
 		next;
-		if(getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
+		if (getequipid(EQI_ACC_L) || getequipid(EQI_ACC_R) == 2707) {
 			mes "[Aged Stranger]";
 			mes "Um... You did well.";
 			next;
@@ -1652,7 +1634,7 @@ mosk_fild01,86,104,3	script	Aged Stranger#npc	963,{
 			warp "mosk_fild02",204,54;
 			end;
 		}
-	}else{
+	} else {
 		mes "[Aged Stranger]";
 		mes "Long time, no see!";
 		mes "You probably like the island, don't you?";
@@ -1727,7 +1709,7 @@ S_AS_2:
 	mes "So, what will you do now?";
 	next;
 	switch (select("How would I get back here?:"+((getarg(0))?"I want to learn the Gusli":"")+":Go back to the mainland.")) {
-		Case 1:
+		case 1:
 			mes "[Aged Stranger]";
 			mes "You are my friend now,";
 			mes "and you have this instrument.";
@@ -1752,7 +1734,7 @@ S_AS_2:
 			mes "with this island. Only if you are a";
 			mes "friend... heheh.";
 			close;
-		Case 2:
+		case 2:
 			mes "[Aged Stranger]";
 			mes "You really want to...";
 			mes "learn this instrument...";
@@ -1775,7 +1757,7 @@ S_AS_2:
 			mes "Gusli, let me know.";
 			set mos_whale_edq,36;
 			close;	
-		Case 3:
+		case 3:
 			mes "[Aged Stranger]";
 			mes "I see. Okay, let's go.";
 			next;
@@ -2022,7 +2004,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 		mes "Stay here as long as you want, and";
 		mes "enjoy yourself to the fullest this summer.";
 		close;
-	} if (mos_whale_edq < 16) {
+	} else if (mos_whale_edq < 16) {
 		mes "[Csar Alexsay III]";
 		mes "Welcome to Moscovia!";
 		mes "I am the ruler, Csar Aleksay III, of Moscovia.";
@@ -2033,7 +2015,7 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 	} else if (mos_whale_edq == 16) {
 		mes "[Csar Alexsay III]";
 		mes "A foreign traveler...?";
-		mes " Do you have something to tell me?";
+		mes "Do you have something to tell me?";
 		next;
 		mes "[Csar Alexsay III]";
 		mes "If it is not important,";
@@ -2206,8 +2188,8 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 				next;
 				mes "[Prime Minister Dmitree]";
 				mes "Even though I regard as your effort for the time so, award you. Take it and go out.";
-				getitem 12702,1;
-				getexp 50000,0;
+				getitem 12702,1; //Old_Bleu_Box
+				getexp (checkre(3))?50000:500000,0;
 				set mos_whale_edq,39;
 				close;
 			}
@@ -2234,8 +2216,8 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 			next;
 			mes "[Prime Minister Dmitree]";
 			mes "Even though I regard as your effort for the time so, award you. Take it.";
-			getitem 12702,1;
-			getexp 70000,0;
+			getitem 12702,1; //Old_Bleu_Box
+			getexp (checkre(3))?70000:700000,0;
 			set mos_whale_edq,40;
 			close;
 		}
@@ -2316,8 +2298,8 @@ mosk_in,131,92,3	script	Csar Alexsay III#npc	965,{
 			mes "of our dear Csar and all the people";
 			mes "in his palace. I will reward your";
 			mes "efforts, in the name of the Csar.";
-			getitem 617,1;
-			getexp 120000,0;
+			getitem 617,1; //Old_Violet_Box
+			getexp (checkre(3))?100000:1200000,0;
 			set mos_whale_edq,41;
 			close;
 		}
@@ -2515,7 +2497,7 @@ OnTouch:
 			mes "island...!!! Someday, I hope to go there! Hahaha.";
 			next;
 			warp "mosk_fild01",95,93;
-		}else{
+		} else {
 			mes "["+strcharinfo(0)+"]";
 			mes "Oh my goodness... Slipped right out";
 			mes "of my mind... to forget equipping the Gusli.";
@@ -2597,10 +2579,10 @@ OnEnable:
 	enablenpc strnpcinfo(0);
 	set .@c,charat(strnpcinfo(0),9);
 	switch (.@c) {
-		Case 1: setarray .@m, 89,112,1425,85,110,1425; break;
-		Case 2: setarray .@m, 89,112,1425,80,110,1426,83,114,1426,85,110,1425; break;
-		Case 3: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
-		Case 4: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
+		case 1: setarray .@m, 89,112,1425,85,110,1425; break;
+		case 2: setarray .@m, 89,112,1425,80,110,1426,83,114,1426,85,110,1425; break;
+		case 3: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
+		case 4: setarray .@m, 85,111,1451,89,112,1543,90,106,1543; break;
 	}
 	for (set .@i, 0; .@i < getarraysize(.@m); set .@i, .@i + 3)
 		monster "mosk_ship",.@m[.@i],.@m[.@i+1],"Sea Monster",.@m[.@i+2],1,strnpcinfo(0)+"::OnMyMobDead";
@@ -2622,10 +2604,10 @@ OnMyMobDead:
 		mes "normally.";
 		set .@c,charat(strnpcinfo(0),9);
 		switch (.@c) {
-			Case 1: break;
-			Case 2: break;
-			Case 3: set mos_whale_edq,11; break;
-			Case 4: set mos_whale_edq,26; break;
+			case 1: break;
+			case 2: break;
+			case 3: set mos_whale_edq,11; break;
+			case 4: set mos_whale_edq,26; break;
 		}
 		donpcevent strnpcinfo(0)+"::OnDisable";
 		close;
@@ -2643,9 +2625,8 @@ mosk_ship,3,3,4	duplicate(Baehideun#main)	Baehideun2#ship	-1
 mosk_ship,5,5,4	duplicate(Baehideun#main)	Baehideun3#ship	-1
 mosk_ship,15,15,4	duplicate(Baehideun#main)	Baehideun4#ship	-1
 
-//============================================================================
-// Help Mikhail
-//============================================================================
+// Help Mikhail :: mos_swan & mos_swan_pt2
+//============================================================
 
 //----------------------------------------------------------------------------
 // Gallina - Starting Point
@@ -2774,7 +2755,7 @@ mosk_in,144,279,5	script	Gallina#mos	959,{
 		mes "Well, now I have to get to work!";
 		mes "I'll make you my hotcakes someday. Please visit me later";
 		set mos_swan,100;
-		getexp 100000,0;
+		getexp (checkre(3))?90000:1000000,0;
 		close;
 	}
 	mes "[Gallina]";
@@ -2806,11 +2787,11 @@ mosk_in,148,274,1	script	Anna#mos	958,{
 					mes "Where is Mikhail?";
 					mes "Do you know where he is?";
 					next;
-					emotion 39;
+					emotion e_meh;
 					mes "[Anna]";
 					mes "If I had known that, I would have already found him, you fool.";
 					next;
-					emotion 4,1;
+					emotion e_swt,1;
 					mes "["+strcharinfo(0)+"]";
 					mes "Hahaha, you're right.";
 					next;
@@ -2876,7 +2857,7 @@ mosk_in,148,274,1	script	Anna#mos	958,{
 					mes "["+strcharinfo(0)+"]";
 					mes "Is there anyone who is close to him?";
 					next;
-					emotion 32;
+					emotion e_pif;
 					mes "[Anna]";
 					mes "(giggle) He's a fool and has no friends.";
 					mes "But among our villagers, the lady of ^3131FFInn 'Sticky Herb Tree'^000000 has held Mikhail dear.";
@@ -3216,13 +3197,13 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 				close;
 			case 3:
 				mes "[Landlord]";
-				emotion 3;
-				mes "Oh~! You look great! Look at the "+((sex)?"solid muscle":"fair skin")+"!";
+				emotion e_lv;
+				mes "Oh~! You look great! Look at the "+((Sex)?"solid muscle":"fair skin")+"!";
 				mes "But you look tired. Is it because of a long journey?";
 				next;
 				mes "[Landlord]";
-				mes "We've got a room available just for you. "+((sex)?"It's the best in town. How about staying the night?":"It's like a princess' room.");
-				mes (sex)?"I'll charge you at reasonable price for you, handsome guy.":"How about staying the night? I'll mark down the price for you, beautiful lady.";
+				mes "We've got a room available just for you. "+((Sex)?"It's the best in town. How about staying the night?":"It's like a princess' room.");
+				mes (Sex)?"I'll charge you at reasonable price for you, handsome guy.":"How about staying the night? I'll mark down the price for you, beautiful lady.";
 				next;
 				mes "["+strcharinfo(0)+"]";
 				mes "Oh, I'm sorry but I didn't come to stay here.";
@@ -3241,7 +3222,7 @@ mosk_in,135,191,5	script	Landlord#mos	961,{
 				mes "If you promise me to stay overnight, I'll tell you about what you want to know. Deal?";
 				next;
 				if(select("Refuse.:Stay overnight and get the info. - 5000z") == 1) {
-					emotion 7;
+					emotion e_ag;
 					mes "[Landlord]";
 					mes "Well, get the info by yourself then.";
 					close;
@@ -3958,9 +3939,8 @@ mosk_in,211,259,5	script	Larissa#mos_01	960,{
 	close;
 }
 
-//============================================================================
-// Acorn Exchange
-//============================================================================
+// Acorn Exchange :: mos_squirrel
+//============================================================
 
 //----------------------------------------------------------------------------
 // Acorn Dealer - Sells Acorns
@@ -4141,9 +4121,8 @@ S_BS_1:
 mosk_fild01,113,108,3	duplicate(Squirrel#mos_main)	Big Squirrel#mos	111
 mosk_fild01,113,108,5	duplicate(Squirrel#mos_main)	#mos_sq	1104,2,2
 
-//============================================================================
-// Banish Winter
-//============================================================================
+// Banish Winter :: mos_nowinter
+//============================================================
 
 //----------------------------------------------------------------------------
 // Baba Yaga, the Horrible - Starting Point
@@ -4401,7 +4380,7 @@ mosk_in,215,46,5	script	Baba Yaga, the Horrible	970,{
 		mes "[Baba Yaga, the Horrible]";
 		mes "Let me see...where the season spell...";
 		next;
-		mes "rummaging..";
+		mes "rummaging...";
 		next;
 		mes "[Baba Yaga, the Horrible]";
 		mes "Ah, here it is... I found it!";
@@ -6499,9 +6478,8 @@ mosk_in,131,92,3	script	#Csar	-1,7,7,{
 	end;
 }
 
-//============================================================================
-// Shafka Hat
-//============================================================================
+// Shafka Hat :: mos_whale_edq
+//============================================================
 moscovia,211,93,3	script	Irina#edq	958,{
 	if (!checkweight(1201,1)) {
 		mes "Wait a moment!!";
@@ -6609,9 +6587,8 @@ moscovia,211,93,3	script	Irina#edq	958,{
 	close;
 }
 
-//============================================================================
-// Koshei the Immortal
-//============================================================================
+// Koshei the Immortal :: mos_request
+//============================================================
 
 //----------------------------------------------------------------------------
 // Sage - Starting Point
@@ -6730,7 +6707,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 				percentheal -50,-50;
 				specialeffect2 EF_DARKBREATH;
 				specialeffect2 EF_HIT2;
-				emotion 23,1;
+				emotion e_omg,1;
 				next;
 				mes "- An unknown force has -";
 				mes "- drained your health -";
@@ -6745,7 +6722,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 					mes "- You decide to go to the left -";
 					next;
 					mes "- !!!!!! -";
-					emotion 23,1;
+					emotion e_omg,1;
 					next;
 					mes "- An unknown force has -";
 					mes "- cursed your body -";
@@ -6760,7 +6737,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 				mes "- You decide to go to the left -";
 				next;
 				mes "- !!!!!! -";
-				emotion 23,1;
+				emotion e_omg,1;
 				next;
 				mes "- Your trusty Pecopeco senses -";
 				mes "- an unknown force and tries -";
@@ -6778,7 +6755,7 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	111,{
 				mes "- toward the middle -";
 				next;
 				mes "- !!!!!! -";
-				emotion 23,1;
+				emotion e_omg,1;
 				donpcevent "Gray Wolf#rus03::OnEnable";
 				set rhea_rus_main,2;
 				close;
@@ -6833,7 +6810,7 @@ mosk_dun01,167,160,3	script	Gray Wolf#rus03	972,{
 		mes "I'm warning you again!";
 		mes "Unless you want to be killed, leave now.";
 		set rhea_rus_main,3;
-		emotion 23,1;
+		emotion e_omg,1;
 		specialeffect2 EF_HIT2;
 		percentheal -50,0;
 		next;
@@ -6929,20 +6906,20 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 	if (rhea_rus_main < 5) {
 		mes "["+ strcharinfo(0) +"]";
 		mes "...?!";
-		emotion 1,1;
+		emotion e_what,1;
 		close;
 	} else if (rhea_rus_main == 5) {
 		set .@speak01,rand(1,3);
 		if (.@speak01 == 3) {
 			mes "["+ strcharinfo(0) +"]";
 			mes "...?!";
-			emotion 1,1;
+			emotion e_what,1;
 			donpcevent "Gray Wolf#rus05::OnEnable";
 			next;
 		} else {
 			mes "["+ strcharinfo(0) +"]";
 			mes "...?!";
-			emotion 1,1;
+			emotion e_what,1;
 			close;
 		}
 		mes "[Girl's Voice]";
@@ -6994,8 +6971,8 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		close;
 	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz < 3) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -7112,7 +7089,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 			mes "["+ strcharinfo(0) +"]";
 			mes "Maria?! What happened?!";
 			sc_start SC_CURSE,60000,0;
-			emotion 23,1;
+			emotion e_omg,1;
 			next;
 			mes "[Koshei, the Immortal]";
 			mes "I really want to thank you, human. Maria was imprisoned in the wall so I couldn't do anything!";
@@ -7176,7 +7153,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		next;
 		mes "[Gray Wolf]";
 		mes "No, it's not too late!";
-		emotion 0,1;
+		emotion e_gasp,1;
 		donpcevent "Gray Wolf#rus05::OnEnable";
 		next;
 		mes "[Gray Wolf]";
@@ -7325,23 +7302,36 @@ mosk_dun01,45,259,0	script	Wall#rus04	111,{
 		set rhea_rus_main,52;
 		set .@rus_food,rand(1,6);
 		switch (rand(1,6)) {
-			Case 1: getitem 12093,1; break;
-			Case 2: getitem 12088,1; break;
-			Case 3: getitem 12073,1; break;
-			Case 4: getitem 12078,1; break;
-			Case 5: getitem 12083,1; break;
-			Case 6: getitem 12098,1; break;
-		}
-		if (BaseLevel < 56) getexp 1300,350;
-		else if (BaseLevel < 61) getexp 2460,615;
-		else if (BaseLevel < 66) getexp 4242,1061;
-		else if (BaseLevel < 71) getexp 6489,1622;
-		else if (BaseLevel < 76) getexp 16491,4123;
-		else if (BaseLevel < 81) getexp 27629,6907;
-		else if (BaseLevel < 86) getexp 34041,8510;
-		else if (BaseLevel < 91) getexp 41846,10462;
-		else if (BaseLevel < 150) getexp 88814,22204;
-		else getitem 617,1;
+			case 1: getitem 12093,1; break;
+			case 2: getitem 12088,1; break;
+			case 3: getitem 12073,1; break;
+			case 4: getitem 12078,1; break;
+			case 5: getitem 12083,1; break;
+			case 6: getitem 12098,1; break;
+		}
+		if (checkre(3)) {
+			if (BaseLevel < 56) getexp 5700,500;
+			else if (BaseLevel < 61) getexp 6700,800;
+			else if (BaseLevel < 66) getexp 8000,1000;
+			else if (BaseLevel < 71) getexp 13000,1200;
+			else if (BaseLevel < 76) getexp 17000,1400;
+			else if (BaseLevel < 81) getexp 20000,1700;
+			else if (BaseLevel < 86) getexp 45000,2000;
+			else if (BaseLevel < 91) getexp 75000,3000;
+			else if (BaseLevel < 160) getexp 200000,4000;
+			else getitem 617,1; //Old_Violet_Box
+		} else {
+			if (BaseLevel < 56) getexp 13000,3500;
+			else if (BaseLevel < 61) getexp 24600,6150;
+			else if (BaseLevel < 66) getexp 42420,10605;
+			else if (BaseLevel < 71) getexp 64892,16223;
+			else if (BaseLevel < 76) getexp 164908,41227;
+			else if (BaseLevel < 81) getexp 276292,69073;
+			else if (BaseLevel < 86) getexp 340408,85102;
+			else if (BaseLevel < 91) getexp 418460,104615;
+			else if (BaseLevel < 99) getexp 888140,222035;
+			else getitem 617,1; //Old_Violet_Box
+		}
 		donpcevent "Gray Wolf#rus05::OnDisable";
 		donpcevent "Maria Morebna#rus46::OnDisable";
 		close;
@@ -7593,8 +7583,8 @@ moscovia,178,127,0	script	The Blacksmith#rus06	63,{
 	} else if (rhea_rus_main == 8) {
 		if (countitem(724) > 1 && countitem(969) > 2 && countitem(7877) && countitem(7878) > 1 && countitem(7879) > 9) {
 			if (rhea_rus_ring > 8 && rhea_rus_hair > 8 && rhea_rus_quiz > 29) {
-				if(getequipid(EQI_SHOES) != 2429) {
-					if(getequipid(EQI_SHOES) != 2430) {
+				if (getequipid(EQI_SHOES) != 2429) {
+					if (getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "...Hmm, did I forget to wear something...?";
 						close;
@@ -7749,8 +7739,8 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 		close;
 	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_ring < 1) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -7822,8 +7812,8 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 			mes "She disappeared soon... after Now all I have is Ryubaba. She is also pretty and smart but nothing can relieve the sadnesss in my heart from losing Mashenka...";
 			close;
 		} else if (rhea_rus_ring == 8) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -7853,8 +7843,8 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 				mes "^ff0000Cold marsh swallowing my body^000000";
 				mes "^ff0000Red ring taken away^000000";
 				mes "^ff0000Red ring enchanted^000000";
-				emotion 23;
-				emotion 9,1;
+				emotion e_omg;
+				emotion e_dots,1;
 				next;
 				mes "[Vassili Grandpapa]";
 				mes "...W, what is this? Ehh??";
@@ -7915,8 +7905,8 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 				mes "^ff0000Cold marsh swallowing my body^000000";
 				mes "^ff0000Red ring taken away^000000";
 				mes "^ff0000Red ring enchanted^000000";
-				emotion 9;
-				emotion 9,1;
+				emotion e_dots;
+				emotion e_dots,1;
 				next;
 				mes "[Vassili Grandpapa]";
 				mes "It is.. It is true...";
@@ -7937,19 +7927,35 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 				next;
 				mes "[Vassili Grandpapa]";
 				mes "...It is my fault that this tragedy between my daughters happened. I will spend the rest of my life trying to make up for it...";
-				delitem 7883,1;
+				delitem 7883,1; //Pointed_Wooden_Flute
 				set rhea_rus_ring,10;
-				getitem 7877,1;
-				if (BaseLevel < 56) getexp 470,0;
-				else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
-				else if (BaseLevel > 60 && BaseLevel < 66) getexp 1061,0;
-				else if (BaseLevel > 65 && BaseLevel < 71) getexp 1622,0;
-				else if (BaseLevel > 70 && BaseLevel < 76) getexp 4123,0;
-				else if (BaseLevel > 75 && BaseLevel < 81) getexp 6907,0;
-				else if (BaseLevel > 80 && BaseLevel < 86) getexp 8510,0;
-				else if (BaseLevel > 85 && BaseLevel < 91) getexp 10462,0;
-				else if (BaseLevel > 90 && BaseLevel < 99) getexp 22204,0;
-				else getitem 607,1;
+				getitem 7877,1; //Red_Ring
+				if (checkre(3)) {
+					if (BaseLevel < 56) getexp 470,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 750,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 1000,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 1500,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 2000,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 4500,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 8500,0;
+					else if (BaseLevel > 90 && BaseLevel < 99) getexp 30000,0;
+					else {
+						getitem 607,1; //Yggdrasilberry
+						getexp 30000,0;
+					}
+				} else {
+					if (BaseLevel < 56) getexp 4700,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 6150,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 10605,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 16223,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 41227,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 69073,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 85102,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 104615,0;
+					else if (BaseLevel > 90 && BaseLevel < 99) getexp 222035,0;
+					else getitem 607,1; //Yggdrasilberry
+				}
 				close;
 			}
 			mes "[Vassili Grandpapa]";
@@ -7959,7 +7965,7 @@ moscovia,206,81,0	script	Vassili Grandpapa#rus07	712,{
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "Ehh?! This is weird. Where is the flute?!";
-			emotion 23,1;
+			emotion e_omg,1;
 			close;
 		} else if (rhea_rus_ring == 9) {
 			mes "[Vassili Grandpapa]";
@@ -7991,7 +7997,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 		next;
 		mes "[Ryubaba]";
 		mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?";
-		emotion 18;
+		emotion e_heh;
 		close;
 	}
 	else if (rhea_rus_main == 8) {
@@ -8001,11 +8007,11 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			next;
 			mes "[Ryubaba]";
 			mes "Mmm, you must be an adventurer? What would you say? Have you seen somebody more beautiful than me? I doubt it. How can you find anyone more beautiful than me?";
-			emotion 18;
+			emotion e_heh;
 			close;
 		} else if (rhea_rus_ring == 1) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -8040,7 +8046,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			}
 			mes "["+ strcharinfo(0) +"]";;
 			mes "Yes, you are really beautiful.";
-			emotion 18,1;
+			emotion e_heh,1;
 			next;
 			mes "[Ryubaba]";
 			mes "Huhu, oh you jest. You know what you're talking about. Ah, this is a Choco drink that I have made. Give it a taste, isn't it good?";
@@ -8132,8 +8138,8 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 			mes "Right... Let me finish talking. We tried searching for her but we couldn't find her. She must have been wearing the ring when she disappeared around the marsh.";
 			close;
 		} else if (rhea_rus_ring == 7) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -8163,8 +8169,8 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				mes "^ff0000Cold marsh swallowing my body^000000";
 				mes "^ff0000Red ring taken away^000000";
 				mes "^ff0000Red ring enchanted^000000";
-				emotion 23;
-				emotion 9,1;
+				emotion e_omg;
+				emotion e_dots,1;
 				next;
 				mes "[Ryubaba]";
 				mes "S, stop! You'd better stop!?";
@@ -8191,7 +8197,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				next;
 				mes "[Ryubaba]";
 				mes "Please, I am begging you... Don't tell my father...";
-				emotion 28;
+				emotion e_sob;
 				next;
 				mes "- Suddenly, she sheds -";
 				mes "- tears and kneels down -";
@@ -8216,7 +8222,7 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 					mes "...Mmmm, what should I do...";
 					mes "Ok, I will do it.";
 					next;
-				}else{
+				} else {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Mmmm, what should I do...";
 					mes "No, I can't do it!";
@@ -8239,24 +8245,40 @@ moscovia,213,216,3	script	Ryubaba#rus08	960,{
 				next;
 				mes "[Ryubaba]";
 				mes "I have to repent for my sins and atone for them for the rest of my life.";
-				delitem 7883,1;
+				delitem 7883,1; //Pointed_Wooden_Flute
 				set rhea_rus_ring,9;
-				getitem 7877,1;
-				if (BaseLevel < 56) getexp 470,0;
-				else if (BaseLevel < 61) getexp 615,0;
-				else if (BaseLevel < 66) getexp 1061,0;
-				else if (BaseLevel < 71) getexp 1622,0;
-				else if (BaseLevel < 76) getexp 4123,0;
-				else if (BaseLevel < 81) getexp 6907,0;
-				else if (BaseLevel < 86) getexp 8510,0;
-				else if (BaseLevel < 91) getexp 10462,0;
-				else if (BaseLevel < 99) getexp 22204,0;
-				else getitem 607,1;
+				getitem 7877,1; //Red_Ring
+				if (checkre(3)) {
+					if (BaseLevel < 56) getexp 470,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 615,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 750,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 1000,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 1500,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 2000,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 4500,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 8500,0;
+					else if (BaseLevel > 90 && BaseLevel < 99) getexp 30000,0;
+					else {
+						getitem 607,1; //Yggdrasilberry
+						getexp 30000,0;
+					}
+				} else {
+					if (BaseLevel < 56) getexp 4700,0;
+					else if (BaseLevel > 55 && BaseLevel < 61) getexp 6150,0;
+					else if (BaseLevel > 60 && BaseLevel < 66) getexp 10605,0;
+					else if (BaseLevel > 65 && BaseLevel < 71) getexp 16223,0;
+					else if (BaseLevel > 70 && BaseLevel < 76) getexp 41227,0;
+					else if (BaseLevel > 75 && BaseLevel < 81) getexp 69073,0;
+					else if (BaseLevel > 80 && BaseLevel < 86) getexp 85102,0;
+					else if (BaseLevel > 85 && BaseLevel < 91) getexp 104615,0;
+					else if (BaseLevel > 90 && BaseLevel < 99) getexp 222035,0;
+					else getitem 607,1; //Yggdrasilberry
+				}
 				close;
 			}
 			mes "["+ strcharinfo(0) +"]";
 			mes "...!? Where is the flute!?";
-			emotion 23,1;
+			emotion e_omg,1;
 			close;
 		} else if (rhea_rus_ring == 8) {
 			mes "[Ryubaba]";
@@ -8373,8 +8395,8 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 			mes "I wish that I could listen to music all the time.";
 			close;
 		} else if (rhea_rus_ring == 5) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -8404,8 +8426,8 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 			close;
 		} else if (rhea_rus_ring == 6) {
 			if (countitem(7882) > 24) {
-				if(getequipid(EQI_SHOES) != 2429) {
-					if(getequipid(EQI_SHOES) != 2430) {
+				if (getequipid(EQI_SHOES) != 2429) {
+					if (getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "...Hmm, did I forget to wear something...?";
 						close;
@@ -8442,8 +8464,8 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	69,{
 				mes "^ff0000Cold marsh swallowing my body^000000";
 				mes "^ff0000Red ring taken away^000000";
 				mes "^ff0000Red ring enchanted^000000";
-				emotion 23;
-				emotion 23,1;
+				emotion e_omg;
+				emotion e_omg,1;
 				next;
 				mes "[Shepherdess]";
 				mes "W, what is this? Horrible! Why did this flute play a voice?";
@@ -8545,8 +8567,8 @@ moscovia,166,145,1	script	Worried Mother#rus19	961,{
 		close;
 	} else if (rhea_rus_main == 8) {
 		if (rhea_rus_hair < 1) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -8649,84 +8671,81 @@ mosk_fild02,101,200,0	duplicate(NoSwim)	Caution#rus02	837
 mosk_fild02,116,202,3	script	Lusalka#07russai_22	-1,3,3,{
 	end;
 OnTouch:
-	if (rhea_rus_main < 8) {
-		emotion 1,1;
-		close;
-	} else if (rhea_rus_main == 8) {
-		if (rhea_rus_hair == 2) {
-			if (gettime(3)>=23 || gettime(3)<=5) {
-				mes "- Splash !! -";
-				next;
-				if (countitem(523) > 0) {
-					mes "- You hear a splashing sound -";
-					mes "- and see something gleaming -";
-					donpcevent "Lusalka#rus23::OnEnable";
-					close;
-				}
-				mes "- You hear a splashing as -";
-				mes "- something gleaming -";
-				mes "- seems to stare at you!! -";
-				next;
-				specialeffect2 EF_FLASHER;
-				percentheal -100,0;
+	if (rhea_rus_main != 8) {
+		emotion e_what,1;
+		end;
+	}
+	if (rhea_rus_hair == 2) {
+		if (gettime(3)>=23 || gettime(3)<=5) {
+			mes "- Splash !! -";
+			next;
+			if (countitem(523) > 0) {
+				mes "- You hear a splashing sound -";
+				mes "- and see something gleaming -";
+				donpcevent "Lusalka#rus23::OnEnable";
 				close;
 			}
-		} else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) {
-			mes "[Lusalka's Voice]";
-			mes "His name is 'Igor'.. He has gone to the capital of Rune Midgarts. Give him my golden earrings.";
+			mes "- You hear a splashing as -";
+			mes "- something gleaming -";
+			mes "- seems to stare at you!! -";
 			next;
-			mes "[Lusalka's Voice]";
-			mes "And please, tell him to stop suffering and to be happy. This is my request.";
+			specialeffect2 EF_FLASHER;
+			percentheal -100,0;
 			close;
-		} else if (rhea_rus_hair == 7) {
-			if (gettime(3)>=23 || gettime(3)<=5) {
-				mes "- Splash !! -";
-				next;
-				if (countitem(523) > 0) {
-					mes "-You hear splashing sound and see something gleaming-";
-					donpcevent "Lusalka#rus23::OnEnable";
-					close;
-				}
-				mes "-You seem to hear the splash but something gleaming raids on you!!-";
-				specialeffect2 EF_FLASHER;
-				percentheal -100,0;
+		}
+	} else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) {
+		mes "[Lusalka's Voice]";
+		mes "His name is 'Igor'.. He has gone to the capital of Rune Midgarts. Give him my golden earrings.";
+		next;
+		mes "[Lusalka's Voice]";
+		mes "And please, tell him to stop suffering and to be happy. This is my request.";
+		close;
+	} else if (rhea_rus_hair == 7) {
+		if (gettime(3)>=23 || gettime(3)<=5) {
+			mes "- Splash !! -";
+			next;
+			if (countitem(523) > 0) {
+				mes "-You hear splashing sound and see something gleaming-";
+				donpcevent "Lusalka#rus23::OnEnable";
 				close;
 			}
-		} else if (rhea_rus_hair == 8) {
-			mes "["+ strcharinfo(0) +"]";
-			mes "What was that?!";
-			mes "Why am I here?";
-			next;
-			mes "- After standing up, you see -";
-			mes "- the wet hair in front of you -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "...This.. is Lusalka's hair?";
-			mes "Ah, right.. I came here to get her hair.";
-			next;
-			mes "- You pick up the hair -";
-			next;
-			mes "- As soon as you touch the -";
-			mes "- cool damp hair, you seem -";
-			mes "- the feel the sadness within -";
-			set rhea_rus_hair,9;
-			getitem 7878,2;
-			close;
-		} else if (rhea_rus_hair > 8) {
-			mes "- You feel that someone -";
-			mes "- is watching you -";
-			next;
-			mes "["+ strcharinfo(0) +"]";
-			mes "Who's there? Anybody here?";
-			next;
-			mes "- The splashing sound -";
-			mes "- fades away, but you -";
-			mes "- still feel the sadness -";
+			mes "-You seem to hear the splash but something gleaming raids on you!!-";
+			specialeffect2 EF_FLASHER;
+			percentheal -100,0;
 			close;
 		}
+	} else if (rhea_rus_hair == 8) {
+		mes "["+ strcharinfo(0) +"]";
+		mes "What was that?!";
+		mes "Why am I here?";
+		next;
+		mes "- After standing up, you see -";
+		mes "- the wet hair in front of you -";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "...This.. is Lusalka's hair?";
+		mes "Ah, right.. I came here to get her hair.";
+		next;
+		mes "- You pick up the hair -";
+		next;
+		mes "- As soon as you touch the -";
+		mes "- cool damp hair, you seem -";
+		mes "- the feel the sadness within -";
+		set rhea_rus_hair,9;
+		getitem 7878,2;
+		close;
+	} else if (rhea_rus_hair > 8) {
+		mes "- You feel that someone -";
+		mes "- is watching you -";
+		next;
+		mes "["+ strcharinfo(0) +"]";
+		mes "Who's there? Anybody here?";
+		next;
+		mes "- The splashing sound -";
+		mes "- fades away, but you -";
+		mes "- still feel the sadness -";
+		close;
 	}
-	emotion 1,1;
-	close;
 }
 
 //----------------------------------------------------------------------------
@@ -8747,8 +8766,8 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				mes "What are you doing here...?";
 				close;
 			} else if (rhea_rus_hair == 2) {
-				if(getequipid(EQI_SHOES) != 2429) {
-					if(getequipid(EQI_SHOES) != 2430) {
+				if (getequipid(EQI_SHOES) != 2429) {
+					if (getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "...Hmm, did I forget to wear something...?";
 						close;
@@ -8816,7 +8835,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 					next;
 					mes "[Lusalka]";
 					mes "Ah... but...";
-					emotion 28;
+					emotion e_sob;
 					donpcevent "Lusalka#rus23::OnDisable";
 					close;
 				}
@@ -8837,8 +8856,8 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				mes "And please, tell him to stop suffering and to be happy. This is my request.";
 				close;
 			} else if (rhea_rus_hair == 7) {
-				if(getequipid(EQI_SHOES) != 2429) {
-					if(getequipid(EQI_SHOES) != 2430) {
+				if (getequipid(EQI_SHOES) != 2429) {
+					if (getequipid(EQI_SHOES) != 2430) {
 						mes "["+ strcharinfo(0) +"]";
 						mes "...Hmm, did I forget to wear something...?";
 						close;
@@ -8891,7 +8910,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	971,{
 				mes "Aaaaaaaah!??!?!";
 				sc_start SC_CURSE,60000,0;
 				specialeffect2 EF_LORD;
-				emotion 23,1;
+				emotion e_omg,1;
 				percentheal -30,0;
 				next;
 				mes "["+ strcharinfo(0) +"]";
@@ -8976,8 +8995,8 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 			mes "In your free time, come to see me! The weather here is even more favorable than our the best summer back home.";
 			close;
 		} else if (rhea_rus_hair == 3) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9022,7 +9041,7 @@ prontera,228,279,3	script	Wanderer#rus24	968,{
 			next;
 			mes "[A Wanderer from a strange land]";
 			mes "Ah, oh yes! How could I forget?";
-			emotion 5;
+			emotion e_ic;
 			next;
 			mes "[A Wanderer from a strange land]";
 			mes "We came here from Moscovia together. He called himself Igg. I came here with him but parted with him quite a while ago. He was sad because he couldn't forget about his lost lover.";
@@ -9081,8 +9100,8 @@ morocc,165,82,0	script	Morroc Villager#rus25	48,{
 			mes "But natives, like me, can tell the difference.";
 			close;
 		} else if (rhea_rus_hair == 4) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9148,8 +9167,8 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 			mes "............................";
 			close;
 		} else if (rhea_rus_hair == 4 || rhea_rus_hair == 5) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9225,8 +9244,8 @@ moc_pryd04,126,120,0	script	Soldier#rus26	967,{
 			set rhea_rus_hair,6;
 			close;
 		} else if (rhea_rus_hair == 6) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9348,15 +9367,15 @@ OnTouch:
 			close;
 		}
 	}
-	emotion 1,1;
+	emotion e_what,1;
 	close;
 }
 
 mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 	if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz == 1) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9383,7 +9402,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 				mes "["+ strcharinfo(0) +"]";
 				mes "Oops, it's hot, hot!!!";
 				specialeffect2 EF_FIREHIT;
-				emotion 23,1;
+				emotion e_omg,1;
 				percentheal -5,0;
 				close;
 			}
@@ -9404,7 +9423,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	111,{
 			close;
 		}
 	}
-	emotion 1,1;
+	emotion e_what,1;
 	close;
 
 OnInit:
@@ -9426,8 +9445,8 @@ OnTimer300000:
 mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
 	if (rhea_rus_main == 8) {
 		if (rhea_rus_quiz == 2) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9448,7 +9467,7 @@ mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
 				next;
 				mes "["+ strcharinfo(0) +"]";
 				mes "Ahhhhhhhh!!!";
-				emotion 23,1;
+				emotion e_omg,1;
 				close;
 			}
 			mes "- ^0000ff You get 100 Apples !!^000000 -";
@@ -9457,7 +9476,7 @@ mosk_que,56,202,0	script	Occult Apple Tree#rus29	111,{
 			close;
 		}
 	}
-	emotion 1,1;
+	emotion e_what,1;
 	close;
 }
 
@@ -9477,8 +9496,8 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			mes "...........................";
 			close;
 		} else if (rhea_rus_quiz == 3) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9544,8 +9563,8 @@ mosk_fild02,243,270,0	script	Marozka#rus31	866,{
 			set rhea_rus_quiz,29;
 			close;
 		} else if (rhea_rus_quiz == 29) {
-			if(getequipid(EQI_SHOES) != 2429) {
-				if(getequipid(EQI_SHOES) != 2430) {
+			if (getequipid(EQI_SHOES) != 2429) {
+				if (getequipid(EQI_SHOES) != 2430) {
 					mes "["+ strcharinfo(0) +"]";
 					mes "...Hmm, did I forget to wear something...?";
 					close;
@@ -9629,8 +9648,8 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		mes "[Baba Yaga]";
 		mes "...........................";
 		mes "If you lotter around here any longer, I will make myself some tasty human soup! Hehehehehe.";
-		emotion 29;
-		emotion 23,1;
+		emotion e_gg;
+		emotion e_omg,1;
 		close;
 	} else if (rhea_rus_main == 9) {
 		mes "[Baba Yaga]";
@@ -9647,7 +9666,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		mes "'Presto Change-o!!'";
 		mes "'Turn into a pig!!'";
 		specialeffect2 EF_BARRIER;
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Baba Yaga]";
 		mes "Hmm? You are protected by a Protection Spell?";
@@ -9866,14 +9885,14 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	970,{
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hey, I am talking...";
-		emotion 28,1;
+		emotion e_sob,1;
 		next;
 		mes "[Baba Yaga]";
 		mes "'In the corner...'";
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "!!!!!!!!!!!!!!!!!!!!!!!!!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "[Baba Yaga]";
 		mes "What, child? Do you feel bad?";
@@ -10385,7 +10404,7 @@ OnTouch:
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "You! Go home now!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
@@ -10408,7 +10427,7 @@ OnTouch:
 				next;
 				mes "[Cow]";
 				mes "...Moo...";
-				emotion 9;
+				emotion e_dots;
 				next;
 				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
 				if (rand(1,2) == 1) {
@@ -10483,7 +10502,7 @@ OnTouch:
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "You! Go home now!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
@@ -10506,7 +10525,7 @@ OnTouch:
 				next;
 				mes "[Cow]";
 				mes "...Moo...";
-				emotion 9;
+				emotion e_dots;
 				next;
 				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
 				if (rand(1,2) == 1) {
@@ -10582,7 +10601,7 @@ OnTouch:
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "You! Go home now!";
-		emotion 23;
+		emotion e_omg;
 		next;
 		mes "- The cow seems surprised, jumps and tries to attack you !! -";
 		next;
@@ -10605,7 +10624,7 @@ OnTouch:
 				next;
 				mes "[Cow]";
 				mes "...Moo...";
-				emotion 9;
+				emotion e_dots;
 				next;
 				mes "- The cow, seems to gibe at you, looks at you quickly and runs to bushes !! -";
 				donpcevent "Cow#rus35::OnDisable";
@@ -10815,7 +10834,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		next;
 		mes "[Noisy Coffin]";
 		mes "................................";
-		emotion 9;
+		emotion e_dots;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hu, the job has been done.";
@@ -10828,7 +10847,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		next;
 		mes "[Noisy Coffin]";
 		mes "................................";
-		emotion 9;
+		emotion e_dots;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hu, the job has been done.";
@@ -10841,7 +10860,7 @@ mosk_dun02,65,232,0	script	Noisy Coffin#rus36	801,{
 		next;
 		mes "[Noisy Coffin]";
 		mes "................................";
-		emotion 9;
+		emotion e_dots;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Hu, the job has been done.";
@@ -10984,7 +11003,7 @@ treasure01,24,39,0	script	Old Bed#rus38	111,{
 		viewpoint 2,61,183,2,0x00FF00;
 		viewpoint 2,98,118,3,0x00FF00;
 		viewpoint 2,27,115,4,0x00FF00;
-		emotion 23,1;
+		emotion e_omg,1;
 		next;
 		mes "["+ strcharinfo(0) +"]";
 		mes "Eek, it would be best to run away now!";
@@ -11078,17 +11097,17 @@ treasure01,27,115,0	script	Opened Treasure Chest#41	111,{
 			next;
 		} else {
 			switch (.@russ_key02) {
-				Case 1: mes "- You find the cuticle of Kukre !! -"; break;
-				Case 2: mes "- You find the egg of a Theif Bug !! -"; break;
-				Case 4: mes "- You find something that seems to be a banana before !! -"; break;
-				Case 5: mes "- You find the tentacles of a Jelly Fish !! -"; break;
-				Case 6: mes "- You find pieces of cloth with must on it !! -"; break;
-				Case 7: mes "- You find a bone !! -"; break;
+				case 1: mes "- You find the cuticle of Kukre !! -"; break;
+				case 2: mes "- You find the egg of a Theif Bug !! -"; break;
+				case 4: mes "- You find something that seems to be a banana before !! -"; break;
+				case 5: mes "- You find the tentacles of a Jelly Fish !! -"; break;
+				case 6: mes "- You find pieces of cloth with must on it !! -"; break;
+				case 7: mes "- You find a bone !! -"; break;
 			}
 			next;
 			mes "["+ strcharinfo(0) +"]";
 			mes "W, what is this!?";
-			emotion 23,1;
+			emotion e_omg,1;
 			close;
 		}
 		mes "["+ strcharinfo(0) +"]";
@@ -11191,7 +11210,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 		mes "- You tap the jar -";
 		mes "- with your hand -";
 		specialeffect EF_SIGHTRASHER;
-		emotion 23,1;
+		emotion e_omg,1;
 		next;
 		mes "- A voice laughs in the jar as -";
 		mes "- it shakes from right to left -";
@@ -11260,7 +11279,7 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 			mes "[House Ghost]";
 			mes "Ok, first let me shuffle these cards around.";
 			mes "Ready!";
-			emotion 56;
+			emotion e_loud;
 			next;
 			mes "[House Ghost]";
 			mes "One!";
@@ -11294,9 +11313,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 				mes "One! Two! Three!!";
 				next;
 				if (.@rucard_game01 == 1) {
-					cutin "Poring_Card.bmp",4;
-					emotion 0;
-					emotion 5,1;
+					cutin "Æ÷¸µÄ«µå",4; // Poring Card
+					emotion e_gasp;
+					emotion e_ic,1;
 					next;
 					mes "[House Ghost]";
 					mes "You got it right. You are good.";
@@ -11306,10 +11325,12 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					cutin "",255;
 					next;
 				} else {
-					if (.@rucard_game01 == 2) cutin "?¡ê¨¢??¦Ì??¦Ì?.bmp",4;
-					else cutin "¡ã¨ª?o???¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 23,1;
+					if (.@rucard_game01 == 2)
+						cutin "¿£Á©¸µÄ«µå",4; // Angeling Card
+					else
+						cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
+					emotion e_gasp;
+					emotion e_omg,1;
 					next;
 					mes "[House Ghost]";
 					mes "Huuu...";
@@ -11328,9 +11349,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 				mes "One! Two! Three!!";
 				next;
 				if (.@rucard_game01 == 2) {
-					cutin "?¡ê¨¢??¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 5,1;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Angeling Card
+					emotion e_gasp;
+					emotion e_ic,1;
 					next;
 					mes "[House Ghost]";
 					mes "You got it right. You are good.";
@@ -11340,10 +11361,12 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					cutin "",255;
 					next;
 				} else {
-					if (.@rucard_game01 == 1) cutin "Poring_Card.bmp",4;
-					else cutin "¡ã¨ª?o???¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 23,1;
+					if (.@rucard_game01 == 1)
+						cutin "Æ÷¸µÄ«µå",4; // Poring Card
+					else
+						cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
+					emotion e_gasp;
+					emotion e_omg,1;
 					next;
 					mes "[House Ghost]";
 					mes "Huuu...";
@@ -11362,9 +11385,9 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 				mes "One! Two! Three!!";
 				next;
 				if (.@rucard_game01 == 3) {
-					cutin "¡ã¨ª?o???¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 5,1;
+					cutin "°í½ºÆ®¸µÄ«µå",4; // Ghostring Card
+					emotion e_gasp;
+					emotion e_ic,1;
 					next;
 					mes "[House Ghost]";
 					mes "You got it right. You are good.";
@@ -11374,10 +11397,12 @@ mosk_dun02,57,220,0	script	House Ghost Jar#rus43	111,{
 					cutin "",255;
 					next;
 				} else {
-					if (.@rucard_game01 == 1) cutin "Poring_Card.bmp",4;
-					else cutin "?¡ê¨¢??¦Ì??¦Ì?.bmp",4;
-					emotion 0;
-					emotion 23,1;
+					if (.@rucard_game01 == 1)
+						cutin "Æ÷¸µÄ«µå",4; // Poring Card
+					else
+						cutin "°í½ºÆ®¸µÄ«µå",4; // Angeling Card
+					emotion e_gasp;
+					emotion e_omg,1;
 					next;
 					mes "[House Ghost]";
 					mes "Huuu...";
@@ -11779,7 +11804,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 			mes "["+ strcharinfo(0) +"]";
 			if (.@rus_dice01 == .@tree_dice01) {
 				mes "Let's see... Wow, I got it! I've got ^0000ffNumber "+.@rus_dice01+"^000000!";
-				emotion 0;
+				emotion e_gasp;
 				next;
 				mes "[Ghost Tree]";
 				mes "You seem lucky...";
@@ -11790,7 +11815,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 				mes "Let's see................... It is ^0000ff "+.@rus_dice01+" ^000000...";
 				mes "[Ghost Tree]";
 				mes "Huuu...";
-				emotion 18;
+				emotion e_heh;
 				set .@rustree_turn01,.@rustree_turn01+1;
 				next;
 			}
@@ -11824,4 +11849,4 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	111,{
 		close;
 	}
 	end;
-}
+}
\ No newline at end of file
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index eabbd5d46..0fad3c34e 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -48,7 +48,7 @@
 
 // Stone Quest
 //============================================================ 
-ve_fild05,257,130,4	script	::WincingOldMan_veins	945,{
+-	script	::WincingOldMan_veins	-1,{
 	if ((MaxWeight - Weight) < 2000 || checkweight(1201,1) == 0) {
 		mes "- Wait a moment! -";
 		mes "- Currently you are carrying -";
diff --git a/npc/re/merchants/catalog.txt b/npc/re/merchants/catalog.txt
new file mode 100644
index 000000000..67f45059a
--- /dev/null
+++ b/npc/re/merchants/catalog.txt
@@ -0,0 +1,108 @@
+//===== Hercules Script ======================================
+//= Catalog Magician
+//===== By: ==================================================
+//= skyiing, Scriptor
+//===== Current Version: =====================================
+//= 1.1
+//===== Compatible With: =====================================
+//= Hercules
+//===== Description: =========================================
+//= [Official Conversion]
+//= Catalogs allow players to easily search for items in-game,
+//= and to buy/sell directly from the catalog interface.
+//===== Additional Comments: =================================
+//= 1.0 Moved from root directory. [Euphy]
+//= 1.1 Updated dialogue. [Euphy]
+//============================================================ 
+
+moc_para01,22,16,5	script	Catalog Magician#catal01	704,{
+	if (!checkweight(1301,3)) {
+		mes "- You have too many items. Please make space. -";
+		close;
+	}
+	set .@ticket_cost, 200;
+	mes "[Catalog Magician]";
+	mes "Look... the Magic Academy";
+	mes "in Geffen is now directly";
+	mes "selling the brand new";
+	mes "^007777Universal Catalog Silver^000000!";
+	next;
+	mes "He is looking at the words";
+	mes "written on his hand.";
+	mes "He seems too busy";
+	mes "to look at you.";
+	next;
+	mes "[Catalog Magician]";
+	mes "A brand new catalog";
+	mes "has just come out!";
+	mes "You can check";
+	mes "what items you can trade";
+	mes "and what items are on sale";
+	mes "from the vendor.";
+	next;
+	mes "[Catalog Magician]";
+	mes "The ^007777Universal Catalog Silver^000000";
+	mes "costs only 200z!";
+	mes "You can buy up to 50 pieces at once!";
+	next;
+	switch(select("Buy a ^007777Universal Catalog Silver^000000:I don't need it!:You don't look like a vendor!")) {
+	case 1:
+		mes "[Catalog Magician]";
+		mes "You... want all 50 pieces?";
+		mes "Or how many do you need?";
+		next;
+		while (1) {
+			input .@input;
+			mes "[Catalog Magician]";
+			if (.@input == 0) {
+				mes "The trade has been stopped!";
+				mes "I don't know what to do next...";
+				mes "What should I do?";
+				emotion e_swt2,1;
+				close;
+			} else if (.@input < 1 || .@input > 50) {
+				mes "It should be less than 50 pieces.";
+				next;
+			} else
+				break;
+		}
+		set .@sell, .@ticket_cost * .@input;
+		mes "The total number of catalog(s) that you're trying to purchase is " + .@input + " pieces.";
+		mes "It costs " + .@sell + " z.";
+		if (Zeny < .@sell) {
+			mes "It seems you don't have enough money.";
+			mes "You can sell your equipment";
+			mes "to make more money... if you want.";
+			close;
+		}
+		mes "Ok, here you go.";
+		set Zeny, Zeny - .@sell;
+		getitem 12580,.@input; //Vending_Search_Scroll
+		close;
+	case 2:
+		mes "[Catalog Magician]";
+		mes "Argh... you really need this";
+		mes "item... Do you want me to";
+		mes "explain again? I don't know";
+		mes "what to do next...";
+		mes "What should I do?";
+		emotion e_swt2,1;
+		close;
+	case 3:
+		mes "[Catalog Magician]";
+		mes "My real job is a magician.";
+		mes "I was going to ask the merchant";
+		mes "guild to sell them, but they were";
+		mes "trying use them as an appendix";
+		mes "into broom sales. That's why";
+		mes "I'm selling these by myself.";
+		next;
+		mes "[Catalog Magician]";
+		mes "There are many adventurers";
+		mes "here who come and go.";
+		mes "I'm pretty sure that I can sell to all of them soon.";
+		mes "Don't you think so?";
+		mes "So... let's start!! Buy more of them, please! PLEASE...!";
+		close;
+	}
+}
\ No newline at end of file
diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf
index 86cf10d28..149be0a46 100644
--- a/npc/re/scripts.conf
+++ b/npc/re/scripts.conf
@@ -56,6 +56,7 @@ npc: npc/re/kafras/kafras.txt
 
 // -------------------------- Merchant --------------------------
 npc: npc/re/merchants/3rd_trader.txt
+npc: npc/re/merchants/catalog.txt
 npc: npc/re/merchants/blessed_refiner.txt
 npc: npc/re/merchants/diamond.txt
 npc: npc/re/merchants/flute.txt
diff --git a/src/char/char.c b/src/char/char.c
index 5a51130de..574e4f66b 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1897,7 +1897,7 @@ int mmo_char_tobuf(uint8* buffer, struct mmo_charstatus* p) {
 	offset += MAP_NAME_LENGTH_EXT;
 #endif
 #if PACKETVER >= 20100803
-	WBUFL(buf,124) = TOL(p->delete_date);
+	WBUFL(buf,124) = (int)p->delete_date;
 	offset += 4;
 #endif
 #if PACKETVER >= 20110111
@@ -3565,7 +3565,12 @@ void char_delete2_ack(int fd, int char_id, uint32 result, time_t delete_date)
 	WFIFOW(fd,0) = 0x828;
 	WFIFOL(fd,2) = char_id;
 	WFIFOL(fd,6) = result;
-	WFIFOL(fd,10) = TOL(delete_date);
+#if PACKETVER >= 20130000
+	WFIFOL(fd,10) = (int)(delete_date - time(NULL));
+#else
+	WFIFOL(fd,10) = (int)delete_date;
+
+#endif
 	WFIFOSET(fd,14);
 }
 
diff --git a/src/login/login.c b/src/login/login.c
index b603117e4..f81ee30c7 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -1383,11 +1383,11 @@ int parse_login(int fd)
 		{
 			uint32 version;
 			char username[NAME_LENGTH];
-			char password[NAME_LENGTH];
+			char password[PASSWD_LEN];
 			unsigned char passhash[16];
 			uint8 clienttype;
 			bool israwpass = (command==0x0064 || command==0x0277 || command==0x02b0 || command == 0x0825);
-
+			
 			// Shinryo: For the time being, just use token as password.
 			if(command == 0x0825)
 			{
@@ -1397,15 +1397,14 @@ int parse_login(int fd)
 				size_t uTokenLen = RFIFOREST(fd) - 0x5C;
 
 				version = RFIFOL(fd,4);
-
-				if(uAccLen > NAME_LENGTH - 1 || uAccLen <= 0 || uTokenLen > NAME_LENGTH - 1  || uTokenLen <= 0)
-				{
+				
+				if(uAccLen <= 0 || uTokenLen <= 0) {
 					login_auth_failed(sd, 3);
 					return 0;
 				}
 
-				safestrncpy(username, accname, uAccLen + 1);
-				safestrncpy(password, token, uTokenLen + 1);
+				safestrncpy(username, accname, NAME_LENGTH);
+				safestrncpy(password, token, PASSWD_LEN);
 				clienttype = RFIFOB(fd, 8);
 			}
 			else
@@ -1431,7 +1430,7 @@ int parse_login(int fd)
 			if( israwpass )
 			{
 				ShowStatus("Request for connection of %s (ip: %s).\n", sd->userid, ip);
-				safestrncpy(sd->passwd, password, NAME_LENGTH);
+				safestrncpy(sd->passwd, password, PASSWD_LEN);
 				if( login_config.use_md5_passwds )
 					MD5_String(sd->passwd, sd->passwd);
 				sd->passwdenc = 0;
diff --git a/src/login/login.h b/src/login/login.h
index 8a5eabb09..0a41b803f 100644
--- a/src/login/login.h
+++ b/src/login/login.h
@@ -19,6 +19,7 @@ enum E_LOGINSERVER_ST
 
 // supported encryption types: 1- passwordencrypt, 2- passwordencrypt2, 3- both
 #define PASSWORDENC 3
+#define PASSWD_LEN 32+1 // 23+1 for plaintext, 32+1 for md5-ed passwords
 
 struct login_session_data {
 	int account_id;
@@ -27,7 +28,7 @@ struct login_session_data {
 	char sex;// 'F','M','S'
 
 	char userid[NAME_LENGTH];
-	char passwd[32+1]; // 23+1 for plaintext, 32+1 for md5-ed passwords
+	char passwd[PASSWD_LEN];
 	int passwdenc;
 	char md5key[20];
 	uint16 md5keylen;
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 01af69fbf..5308eada9 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -1738,7 +1738,7 @@ void chrif_defaults(void) {
 	chrif->update_ip = chrif_update_ip;
 	chrif->disconnectplayer = chrif_disconnectplayer;
 	chrif->removemap = chrif_removemap;
-	chrif->updatefamelist_ack = chrif->updatefamelist_ack;
+	chrif->updatefamelist_ack = chrif_updatefamelist_ack;
 	chrif->keepalive = chrif_keepalive;
 	chrif->keepalive_ack = chrif_keepalive_ack;
 	chrif->deadopt = chrif_deadopt;