Merge branch 'master' of https://github.com/HerculesWS/Hercules

5 files changed, 114 insertions, 43 deletions

diff --git a/db/pre-re/mob_skill_db.txt b/db/pre-re/mob_skill_db.txt
index d8370a17e..cba21fc60 100644
--- a/db/pre-re/mob_skill_db.txt
+++ b/db/pre-re/mob_skill_db.txt
@@ -5746,11 +5746,11 @@
 2072,Jaguar@NPC_COMBOATTACK,attack,171,1,500,500,5000,no,target,always,0,,,,,,6,
 2072,Jaguar@AS_SONICBLOW,attack,136,3,500,800,5000,no,target,always,0,,,,,,0,
 2072,Jaguar@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-2072,Jaguar@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3195,,,,,
+2072,Jaguar@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3095,,,,,
 2072,Jaguar@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
 2073,Toucan@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
 2073,Toucan@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
-2073,Toucan@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3195,,,,,
+2073,Toucan@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3095,,,,,
 2073,Toucan@NPC_TELEKINESISATTACK,chase,191,5,500,0,5000,yes,target,always,0,,,,,,,
 2073,Toucan@NPC_WINDATTACK,attack,187,3,500,500,5000,no,target,always,0,,,,,,6,
 2073,Toucan@NPC_STOP,attack,342,1,500,500,5000,no,target,always,0,,,,,,30,
diff --git a/db/re/mob_skill_db.txt b/db/re/mob_skill_db.txt
index 3610f95c3..5ba654c93 100644
--- a/db/re/mob_skill_db.txt
+++ b/db/re/mob_skill_db.txt
@@ -5823,11 +5823,11 @@
 2072,Jaguar@NPC_COMBOATTACK,attack,171,1,500,500,5000,no,target,always,0,,,,,,6,
 2072,Jaguar@AS_SONICBLOW,attack,136,3,500,800,5000,no,target,always,0,,,,,,0,
 2072,Jaguar@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-2072,Jaguar@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3195,,,,,
+2072,Jaguar@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3095,,,,,
 2072,Jaguar@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,0,,,,,,,
 2073,Toucan@NPC_EMOTION,walk,197,1,2000,0,5000,yes,self,always,0,2,,,,,,
 2073,Toucan@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,,
-2073,Toucan@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3195,,,,,
+2073,Toucan@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,7,0x3095,,,,,
 2073,Toucan@NPC_TELEKINESISATTACK,chase,191,5,500,0,5000,yes,target,always,0,,,,,,,
 2073,Toucan@NPC_WINDATTACK,attack,187,3,500,500,5000,no,target,always,0,,,,,,6,
 2073,Toucan@NPC_STOP,attack,342,1,500,500,5000,no,target,always,0,,,,,,30,
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index f1a63e272..841e93734 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -19,6 +19,7 @@
 //= 1.7 Corrected reminants from aegis conversion. [L0en_w0lf]
 //= 1.8 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.9 Removed duplicate text. [Kisuka]
+//= 2.0 Corrected EXP reward
 //============================================================
 
 morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
@@ -545,7 +546,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 			set HELLIONQ,69;
 			getitem 2658,1; //Nile_Rose_
 			getitem 603,1; //Old_Blue_Box
-			getexp 120000,0;
+			getexp 1200000,0;
 			next;
 			mes "[Sir Chilias'Tyus]";
 			mes "Thank you, kind";
@@ -612,7 +613,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	735,3,3,{
 			delitem 7332,1; //Slate
 			set HELLIONQ,70;
 			getitem 2658,1; //Nile_Rose_
-			getexp 100000,0;
+			getexp 1000000,0;
 			next;
 			mes "[Sir Chilias'Tyus]";
 			mes "Thank you, kind";
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 86b0697a4..c8cc1d29a 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 2.6a
+//= 2.7
 //===== Description: ========================================= 
 //= [Official Conversion]
 //= Contains Quests:
@@ -43,6 +43,7 @@
 //= 2.5a Minor fixes. [Euphy]
 //= 2.6 Disabled "Ash Vacuum Warper" as it's no longer in iRO. [Euphy]
 //= 2.6a Added 'npcskill' command. [Euphy]
+//= 2.7 Updated incorrect EXP values & added checkre() checks
 //============================================================ 
 
 // Onward to the New World
@@ -292,7 +293,10 @@ prt_castle,83,67,5	script	Recruiter for the Brave	109,{
 		next;
 		changequest 10064,10065;
 		set ep13_ryu,9;
-		getexp 66000,21000;
+		if(checkre(0))
+			getexp 66000,21000;
+		else
+			getexp 660000,210000;
 		mes "[Recruiter]";
 		mes "Just go there!";
 		mes "And listen carefully";
@@ -1938,7 +1942,10 @@ moc_fild22b,230,197,5	script	Munkenro#2	967,{
 		next;
 		completequest 10078;
 		set ep13_ryu,100;
-		getexp 66000,21000;
+		if(checkre(0))
+			getexp 66000,21000;
+		else
+			getexp 660000,210000;
 		mes "[Munkenro]";
 		mes "I will let you go there.";
 		mes "Let me know once you are ready.";
@@ -2831,7 +2838,10 @@ mid_camp,261,284,4	script	Instructor#ep13bs	405,{
 			set ep13_newbs,100;
 			getitem 617,1; //Old_Violet_Box
 			getitem 12322,5; //Chocolate_Pie
-			getexp 100000,10000;
+			if(checkre(0))
+				getexp 100000,10000;
+			else
+				getexp 1000000,100000;
 			completequest 11100;
 			close;
 		}
@@ -4361,7 +4371,10 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
 				mes "I hope you'll make yourself known in Ash Vacuum with your great accomplishments.";
 				set ep13_animal,15;
 				completequest 2157;
-				getexp 150000,0;
+				if(checkre(0))
+					getexp 100000,0;
+				else
+					getexp 1500000,0;
 				close;
 			}
 			else {
@@ -4459,7 +4472,10 @@ mid_camp,188,254,3	script	Monster Scholar#ep13	883,{
 				mes "- You pat his shoulder gently, it's worrying that Rumis is not able to return to his country. -";
 				set ep13_animal,100;
 				delitem 6033,1; //Horn_Of_Tendrilion
-				getexp 100000,0;
+				if(checkre(0))
+					getexp 50000,0;
+				else
+					getexp 1000000,0;
 				close;
 			}
 			else {
@@ -5291,7 +5307,10 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 			mes "I'll discuss this more with the expedition management.";
 			mes "Thank you for your valuable information.";
 			completequest 2158;
-			getexp 70000,0;
+			if(checkre(0))
+				getexp 90000,0;
+			else
+				getexp 900000,0;
 			close;
 		}
 		else if (checkquest(2158) == -1) {
@@ -5312,7 +5331,10 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 				mes "I'll discuss this more with the expedition management.";
 				mes "Thank you for your valuable information.";
 				completequest 2159;
-				getexp 70000,0;
+				if(checkre(0))
+					getexp 90000,0;
+				else
+					getexp 900000,0;
 				close;
 			}
 			else {
@@ -5334,7 +5356,10 @@ mid_camp,212,237,5	script	Camp Guard Captain#man1	852,{
 				mes "I'll discuss this more with the expedition management.";
 				mes "Thank you for your valuable information.";
 				completequest 2159;
-				getexp 70000,0;
+				if(checkre(0))
+					getexp 90000,0;
+				else
+					getexp 900000,0;
 				close;
 			}
 			else {
@@ -5760,7 +5785,10 @@ OnTouch:
 			mes "- You feel so refreshed and light, as you drink the tea that the Official offered. -";
 			specialeffect2 EF_ABSORBSPIRITS;
 			set ep13_1_rhea,100;
-			getexp 30000,10000;
+			if(checkre(0))
+				getexp 80000,3000;
+			else
+				getexp 300000,10000;
 			completequest 8210;
 			next;
 			mes "[United Research Official]";
@@ -7577,7 +7605,10 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				next;
 				delitem 579,50; //Delicious_Fish
 				set ep13_alba,6;
-				getexp 8000,3000;
+				if(checkre(0))
+					getexp 8000,3000;
+				else
+					getexp 80000,30000;
 				erasequest 7042;
 				setquest 7047;
 				mes "^4d4dff You have received 8,000 EXP";
@@ -7610,7 +7641,10 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 7198,30; //Great_Leaf
 				delitem 7188,30; //Browny_Root
 				set ep13_alba,6;
-				getexp 9000,4000;
+				if(checkre(0))
+					getexp 9000,4000;
+				else
+					getexp 90000,40000;
 				erasequest 7043;
 				setquest 7047;
 				mes "^4d4dff You have received 9,000 EXP";
@@ -7648,7 +7682,10 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 528,20; //Monster's_Feed
 				delitem 537,30; //Pet_Food
 				set ep13_alba,6;
-				getexp 8000,3000;
+				if(checkre(0))
+					getexp 8000,3000;
+				else
+					getexp 80000,30000;
 				erasequest 7044;
 				setquest 7047;
 				mes "^4d4dff You have received 8,000 EXP";
@@ -7683,7 +7720,10 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				delitem 517,50; //Meat
 				delitem 537,30; //Pet_Food
 				set ep13_alba,6;
-				getexp 8000,3000;
+				if(checkre(0))
+					getexp 8000,3000;
+				else
+					getexp 80000,30000;
 				erasequest 7045;
 				setquest 7047;
 				mes "^4d4dff You have received 8,000 EXP";
@@ -7715,7 +7755,10 @@ mid_camp,143,306,5	script	Breeder Taab#ep13_alba	946,{
 				next;
 				delitem 6020,30; //Fur
 				set ep13_alba,6;
-				getexp 8000,3000;
+				if(checkre(0))
+					getexp 8000,3000;
+				else
+					getexp 80000,30000;
 				erasequest 7046;
 				setquest 7047;
 				mes "^4d4dff You have received 8,000 EXP";
@@ -8022,7 +8065,7 @@ function Catwarp;
 			close;
 		}
 	}
-	else if ((ep13_yong1 > 39) && (ep13_yong1 < 200)) {
+	else if ((ep13_yong1 > 39) && (ep13_yong1 < 100)) {
 		mes "[Cat Hand Agent]";
 		mes "Cat Trading's available services are as followed.";
 		mes "For additional services, please consult Agent Gyaruk.";
@@ -8467,7 +8510,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				mes "You've brough Pieces of Fish!";
 				mes "GOOD JOB!";
 				delitem 6039,10; //Piece_Of_Fish
-				getexp 3000,0;
+				getexp 20000,0;
 				set ep13_yong1,10;
 				setquest 12060;
 				next;
@@ -8487,7 +8530,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				mes "You've brough Pieces of Fish!";
 				mes "GOOD JOB!";
 				delitem 6039,10; //Piece_Of_Fish
-				getexp 1500,0;
+				getexp 15000,0;
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
@@ -8508,7 +8551,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				mes "You've brough Pieces of Fish!";
 				mes "GOOD JOB!";
 				delitem 6039,10; //Piece_Of_Fish
-				getexp 1500,0;
+				getexp 15000,0;
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
@@ -8528,7 +8571,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				mes "You've brough Pieces of Fish!";
 				mes "GOOD JOB!";
 				delitem 6039,10; //Piece_Of_Fish
-				getexp 1500,0;
+				getexp 15000,0;
 				setquest 12060;
 				set ep13_yong1,ep13_yong1+1;
 				next;
@@ -8543,7 +8586,7 @@ mid_camp,69,144,0	script	Ferocious Gorurug	421,{
 				close;
 			}
 		}
-		else if ((ep13_yong1 > 59) && (ep13_yong1 < 300)) {
+		else if ((ep13_yong1 > 59) && (ep13_yong1 < 80)) {
 			npcskill "AL_HEAL",8,50,50;
 			if (countitem(6039) > 9) {
 				mes "[Ferocious Gorurug]";
@@ -8714,7 +8757,7 @@ mid_camp,88,100,55	script	Cat Hand Mining Agent	876,{
 			mes "Thank you for collecting minerals for me.";
 			next;
 			delitem 6048,3; //Unidentified_Mineral
-			getexp 3000,0;
+			getexp 20000,0;
 			setquest 12062;
 			set ep13_yong1,ep13_yong1+1;
 			select("I'm freezing! Take them quickly.");
@@ -9229,7 +9272,11 @@ mid_campin,90,121,5	script	Hibba Agip	459,{
 		mes "And please take this small reward.";
 		mes "Thank you for your help so far.";
 		next;
-		getexp 3750000,0;
+		if(checkre(0))
+			getexp 30000,0; //kRO
+			//getexp 3750000,0; //iRO?
+		else
+			getexp 2500000,0;
 		getitem 12110,3; //First_Aid_Kit
 		set ep13_1_edq,14;
 		completequest 3094;
@@ -11625,7 +11672,10 @@ mid_campin,68,185,3	script	Pursuit Party Leader#1	803,{
 		mes "[Echinacea]";
 		mes "Keep up the good work assisting the explorers in this camp.";
 		set mao_morocc2,100;
-		getexp 120000,20000;
+		if(checkre(0))
+			getexp 120000,20000;
+		else
+			getexp 1200000,200000;
 		getitem 617,1; //Old_Violet_Box
 		completequest 7036;
 		close;
@@ -12002,7 +12052,10 @@ mid_camp,199,311,7	script	Mr. Kidd#ep13_dan01	884,{
 			delitem 6029,1; //Morocc_Tracing_Log
 			delitem 6027,1; //Crystal_Of_Feardoom
 			set mao_morocc2,10;
-			getexp 20000,1000;
+			if(checkre(0))
+				getexp 20000,1000;
+			else
+				getexp 200000,10000;
 			changequest 7018,7019;
 			close2;
 		}
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index f2c64d2d8..1da301ac9 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 2.4a
+//= 2.5
 //===== Compatible With: =====================================
 //= rAthena SVN
 //===== Description: =========================================
@@ -43,6 +43,8 @@
 //= 2.3 Fixed EF_Wind not showing. (bugreport:5149) [Masao]
 //= 2.4 Optimized (6000+ lines reduced!). [Euphy]
 //= 2.4a Fixed an invisible NPC clashing with a warp portal. [Euphy]
+//= 2.5 Fixed EXP values, added support for pre-re
+//=      & other minor stuff [Streusel] 
 //============================================================ 
 
 // Cat Hand Addition.
@@ -2452,7 +2454,10 @@ spl_in02,236,92,5	script	Arc#ep13md_l02	447,{
 			mes "I'm sorry this is all I can give you for now.";
 			set ep13_mdrama,27;
 			getitem 6081,25; //Splendide_Coin
-			getexp 120000,10000;
+			if(checkre(0))
+				getexp 120000,10000;
+			else
+				getexp 1200000,100000;
 			completequest 7071;
 			close;
 		}
@@ -2771,7 +2776,10 @@ manuk,252,116,3	script	Manuk Galtun#ep13_2day	450,{
 				completequest 7074;
 				completequest 7075;
 				set ep13_2_days01,2;
-				getexp 50000,30000;
+				if(checkre(0))
+					getexp 50000,30000;
+				else
+					getexp 500000,300000;
 				getitem 6080,10; //Manuk_Coin
 				close;
 			}
@@ -2805,7 +2813,7 @@ manuk,252,116,3	script	Manuk Galtun#ep13_2day	450,{
 // Daily Quests
 // - Bradium Collection
 // - Laphine Craftsman
-// - Drago Egg Collection (npc includes 'Wanted' quest)
+// - Draco Egg Collection (npc includes 'Wanted' quest)
 //============================================================
 man_in01,378,276,3	script	Manuk Engineer#ep13_2	453,{
 	if (checkweight(1201,2) == 0) {
@@ -2845,7 +2853,7 @@ man_in01,378,276,3	script	Manuk Engineer#ep13_2	453,{
 					delitem 6090,20; //Purified_Bradium
 					erasequest 7079;
 					setquest 7080;
-					getexp 4000,4000;
+					getexp 40000,40000;
 					getitem 6080,3; //Manuk_Coin
 					close;
 				}
@@ -2954,7 +2962,7 @@ spl_in01,97,313,3	script	Laphine Craftsman#ep13	446,{
 						delitem 6075,15; //Crystalized_Teardrop
 						erasequest 7081;
 						setquest 7082;
-						getexp 3000,3000;
+						getexp 30000,30000;
 						getitem 6081,3; //Splendide_Coin
 						close;
 					}
@@ -3159,7 +3167,7 @@ mid_camp,146,306,3	script	Pet Breeder#ep13_eden01	982,{
 					erasequest 7077;
 					setquest 7078;
 					set ep13_2_dayegg,2;
-					getexp 4000,4000;
+					getexp 40000,40000;
 					getitem 6081,1; //Splendide_Coin
 					getitem 6080,1; //Manuk_Coin
 					close;
@@ -3739,7 +3747,10 @@ mid_camp,197,237,3	script	Schwartzvalt Mechanic#1	869,{
 				mes "I hope this ring would be a big help for your journey through the other world.";
 				completequest 8253;
 				set ep13_2_rhea,100;
-				getexp 100000,30000;
+				if(checkre(0))
+					getexp 200000,5000;
+				else
+					getexp 1000000,300000;
 				getitem 2782,1; //Ring_Of_Wise_King
 				close;
 			}
@@ -4832,10 +4843,13 @@ man_in01,372,221,5	script	Scientist#lifeguard	449,{
 				delitem 6077,.@stone_chk; //Rough_Mineral
 				delitem 6078,.@stoneelse_chk; //Stone_Fragments
 				delitem 6076,1; //Portable_Toolbox
-				getitem 6080,2; //Manuk_Coin
-				getexp 0,70000;
+				getitem 6080,3; //Manuk_Coin
 				changequest 2179+(ep13_2_tre-2),2182;
 				set ep13_2_tre,100;
+				if(checkre(0))
+					close;
+				else
+					getexp 0,700000;
 				close;
 			}
 			else {
@@ -5699,8 +5713,11 @@ spl_in01,30,324,3	script	High Laphine#grenouille	446,{
 					mes "If you have something to talk to me about, come to me whenever. Nice to meet you, human from Rune Midgard.";
 					set ep13_2_tre1,6;
 					changequest 2185,2186;
-					getitem 6081,2; //Splendide_Coin
-					getexp 0,70000;
+					getitem 6081,3; //Splendide_Coin
+					if(checkre(0))
+						close;
+					else
+						getexp 0,700000;
 					close;
 				}
 				else {