浏览代码

* Updated experience rewards in a lot of quests to match upcoming rate adjustments changes.
- Please use 'getexp' command when rewarding experience in any lore-related quest.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11165 54d463be-8e91-2dee-dedb-b68131a5f0ec

SinSloth 17 年之前
父节点
当前提交
b67f4855d1

+ 2 - 0
npc/Changelog.txt

@@ -1,6 +1,8 @@
 Date		Added
 Date		Added
 ======
 ======
 2007/09/10
 2007/09/10
+	* Updated experience rewards in a lot of quests to match upcoming rate adjustments changes. [SinSloth]
+	- Please use 'getexp' command when rewarding experience in any lore-related quest.
 	* Fixed Kafra Storage Exploit via Cool Event Co. Storage. Added password protection to C.E.C NPC [Lupus]
 	* Fixed Kafra Storage Exploit via Cool Event Co. Storage. Added password protection to C.E.C NPC [Lupus]
 		Note: We use script based storage password due to lack of Packet/Client Storage Password Support.
 		Note: We use script based storage password due to lack of Packet/Client Storage Password Support.
 		There were many complains from those servers that use extra password protection from account rippers
 		There were many complains from those servers that use extra password protection from account rippers

+ 20 - 19
npc/quests/Bard_Quest.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Riotblade and L0ne_W0lf
 //= Riotblade and L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //= eAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -24,6 +24,7 @@
 //= This Quest has relation with brisingamen_seal.txt (Seals)
 //= This Quest has relation with brisingamen_seal.txt (Seals)
 //= 1.2 Changed variable to "gef_bards_q" to avoid job quest conflict. [L0ne_W0lf]
 //= 1.2 Changed variable to "gef_bards_q" to avoid job quest conflict. [L0ne_W0lf]
 //=	Progress prior to the 5th+ step will be lost. Job quest takes priority.
 //=	Progress prior to the 5th+ step will be lost. Job quest takes priority.
+//= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 geffen,132,38,3	script	Bard#2	51,{
 geffen,132,38,3	script	Bard#2	51,{
@@ -106,15 +107,15 @@ geffen,132,38,3	script	Bard#2	51,{
 		specialeffect2 77; //EF_RESURRECTION
 		specialeffect2 77; //EF_RESURRECTION
 		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
 		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
 		set gef_bard_q,31;
 		set gef_bard_q,31;
-		if (BaseLevel < 56) set BaseExp,BaseExp+4500;
-		else if ((BaseLevel > 55) && (BaseLevel < 61)) set BaseExp,BaseExp+5500;
-		else if ((BaseLevel > 60) && (BaseLevel < 66)) set BaseExp,BaseExp+9684;
-		else if ((BaseLevel > 65) && (BaseLevel < 71)) set BaseExp,BaseExp+13411;
-		else if ((BaseLevel > 70) && (BaseLevel < 76)) set BaseExp,BaseExp+35757;
-		else if ((BaseLevel > 75) && (BaseLevel < 81)) set BaseExp,BaseExp+60246;
-		else if ((BaseLevel > 80) && (BaseLevel < 86)) set BaseExp,BaseExp+70340;
-		else if ((BaseLevel > 85) && (BaseLevel < 91)) set BaseExp,BaseExp+92052;
-		else if (BaseLevel > 90) set BaseExp,BaseExp+156786;
+		if (BaseLevel < 56) getexp 4500,0;
+		else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 5500,0;
+		else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 9684,0;
+		else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 13411,0;
+		else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 35757,0;
+		else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 60246,0;
+		else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 70340,0;
+		else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 92052,0;
+		else if (BaseLevel > 90) getexp 156786,0;
 		next;
 		next;
 		cutin "bard_eland02",2;
 		cutin "bard_eland02",2;
 		mes "[Errende]";
 		mes "[Errende]";
@@ -196,15 +197,15 @@ geffen,132,38,3	script	Bard#2	51,{
 		specialeffect2 77; //EF_RESURRECTION
 		specialeffect2 77; //EF_RESURRECTION
 		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
 		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
 		set gef_bard_q,30;
 		set gef_bard_q,30;
-		if (BaseLevel < 56) set BaseExp,BaseExp+4500;
-		else if ((BaseLevel > 55) && (BaseLevel < 61)) set BaseExp,BaseExp+5500;
-		else if ((BaseLevel > 60) && (BaseLevel < 66)) set BaseExp,BaseExp+9684;
-		else if ((BaseLevel > 65) && (BaseLevel < 71)) set BaseExp,BaseExp+13411;
-		else if ((BaseLevel > 70) && (BaseLevel < 76)) set BaseExp,BaseExp+35757;
-		else if ((BaseLevel > 75) && (BaseLevel < 81)) set BaseExp,BaseExp+60246;
-		else if ((BaseLevel > 80) && (BaseLevel < 86)) set BaseExp,BaseExp+70340;
-		else if ((BaseLevel > 85) && (BaseLevel < 91)) set BaseExp,BaseExp+92052;
-		else if (BaseLevel > 90) set BaseExp,BaseExp+156786;
+		if (BaseLevel < 56) getexp 4500,0;
+		else if ((BaseLevel > 55) && (BaseLevel < 61)) getexp 5500,0;
+		else if ((BaseLevel > 60) && (BaseLevel < 66)) getexp 9684,0;
+		else if ((BaseLevel > 65) && (BaseLevel < 71)) getexp 13411,0;
+		else if ((BaseLevel > 70) && (BaseLevel < 76)) getexp 35757,0;
+		else if ((BaseLevel > 75) && (BaseLevel < 81)) getexp 60246,0;
+		else if ((BaseLevel > 80) && (BaseLevel < 86)) getexp 70340,0;
+		else if ((BaseLevel > 85) && (BaseLevel < 91)) getexp 92052,0;
+		else if (BaseLevel > 90) getexp 156786,0;
 		next;
 		next;
 		cutin "bard_eland02",2;
 		cutin "bard_eland02",2;
 		mes "[Errende]";
 		mes "[Errende]";

+ 6 - 5
npc/quests/The_Sign_Quest.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
 //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 2.0
+//= 2.1
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN 3422+(Requires jA Script System)
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -33,6 +33,7 @@
 //= fight to finish the quest as well. Completely revamped quiz system. [SinSloth]
 //= fight to finish the quest as well. Completely revamped quiz system. [SinSloth]
 //= 1.9 Made some changes in last event to reflect recent bug exploit fix. [SinSloth]
 //= 1.9 Made some changes in last event to reflect recent bug exploit fix. [SinSloth]
 //= 2.0 Fixed some various minor bugs. [SinSloth]
 //= 2.0 Fixed some various minor bugs. [SinSloth]
+//= 2.1 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 //===== Configuration : ======================================
 //===== Configuration : ======================================
 prontera,1,1,1	script	TheSignConfig	-1,{
 prontera,1,1,1	script	TheSignConfig	-1,{
@@ -727,7 +728,7 @@ L_Where:
         mes "that the Sign really exists. Thanks";
         mes "that the Sign really exists. Thanks";
         mes "again, and I hope you stop by and";
         mes "again, and I hope you stop by and";
         mes "chat from time to time.";
         mes "chat from time to time.";
-        set BaseExp,BaseExp +1823951;
+        getexp 1823951,0;
         close2;
         close2;
         cutin "",255;
         cutin "",255;
         end;
         end;
@@ -780,7 +781,7 @@ L_Stop:
         mes "look at it?";
         mes "look at it?";
         next;
         next;
         getitem 617,1;
         getitem 617,1;
-        set BaseExp,BaseExp + 876543;
+        getexp 876543,0;
     }
     }
     set sign_fail,3;
     set sign_fail,3;
     mes "[Metz]";
     mes "[Metz]";
@@ -8371,7 +8372,7 @@ L_Success:
     mes "I believe she wants to see you for";
     mes "I believe she wants to see you for";
     mes "some reason...";
     mes "some reason...";
     set signquest,57;
     set signquest,57;
-    set BaseExp,BaseExp +297000;
+    getexp 297000,0;
     close;
     close;
 
 
 L_Voucher:
 L_Voucher:
@@ -9361,7 +9362,7 @@ L_Success:
         mes "to me, could you kindly";
         mes "to me, could you kindly";
         mes "give it back please?";
         mes "give it back please?";
         next;
         next;
-        set JobExp,JobExp + 393759;
+        getexp 0,393759;
     }
     }
     mes "[Serin]";
     mes "[Serin]";
     mes "Farewell, now.";
     mes "Farewell, now.";

+ 4 - 3
npc/quests/eye_of_hellion.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //===== By: ==================================================
 //= MasterOfMuppets
 //= MasterOfMuppets
 //===== Current Version: =====================================
 //===== Current Version: =====================================
-//= 1.1
+//= 1.2
 //===== Compatible With: =====================================
 //===== Compatible With: =====================================
 //= eAthena SVN 3422+(Requires jA Script System)
 //= eAthena SVN 3422+(Requires jA Script System)
 //===== Description: =========================================
 //===== Description: =========================================
@@ -13,6 +13,7 @@
 //===== Additional Comments: =================================
 //===== Additional Comments: =================================
 //= 1.0 First version [MasterOfMuppets]
 //= 1.0 First version [MasterOfMuppets]
 //= 1.1 a ',' that should be ';' [FlavioJS]
 //= 1.1 a ',' that should be ';' [FlavioJS]
+//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================
 //============================================================
 
 
 geffen,110,200,3	script	Sage Welshyun	754,2,2,{
 geffen,110,200,3	script	Sage Welshyun	754,2,2,{
@@ -1916,7 +1917,7 @@ s_Tablet:
 	mes "from those motivated by greed.";
 	mes "from those motivated by greed.";
 	delitem 7332,1; //Complete Tablet
 	delitem 7332,1; //Complete Tablet
 	getitem 2658,1; //Nile Rose
 	getitem 2658,1; //Nile Rose
-	set BaseExp,BaseExp+1000000;
+	getexp 1000000,0;
 	set HELLIONQ,27;
 	set HELLIONQ,27;
 	next;
 	next;
 	mes "[Sir Chilias'Tyus]";
 	mes "[Sir Chilias'Tyus]";
@@ -2035,7 +2036,7 @@ s_HellionEye:
 	delitem 7337,1; //Eye of Hellion
 	delitem 7337,1; //Eye of Hellion
 	getitem 2658,1; //Nile Rose
 	getitem 2658,1; //Nile Rose
 	getitem 603,1; //Old Blue Box
 	getitem 603,1; //Old Blue Box
-	set BaseExp,BaseExp+1200000;
+	getexp 1200000,0;
 	set HELLIONQ,27;
 	set HELLIONQ,27;
 	next;
 	next;
 	mes "[Sir Chilias'Tyus]";
 	mes "[Sir Chilias'Tyus]";

+ 8 - 11
npc/quests/first_class/tu_acolyte.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Fix up by Jukka
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
 //= 1.1 optimized [Lupus]
 //=	TODO: Test, Add correct misceffects numbers
 //=	TODO: Test, Add correct misceffects numbers
+//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 
 
@@ -284,7 +285,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		unitskilluseid getcharid(3),28,10;
 		unitskilluseid getcharid(3),28,10;
 		set tu_acolyte01, 3;
 		set tu_acolyte01, 3;
 		if(getskilllv(28) == 0){
 		if(getskilllv(28) == 0){
-			set JobExp,JobExp+100; 
+			getexp 0,100;
 			//misceffect EF_CONE;
 			//misceffect EF_CONE;
 		}
 		}
 		close;
 		close;
@@ -355,13 +356,11 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 				set tu_acolyte01, 5;
 				set tu_acolyte01, 5;
 				delitem 1504, 1;
 				delitem 1504, 1;
 				if(Class == Job_Acolyte_High){
 				if(Class == Job_Acolyte_High){
-					set JobExp,JobExp+1000; 
-					set BaseExp, BaseExp + 2000;
+					getexp 2000,1000;
 					//misceffect EF_CONE;
 					//misceffect EF_CONE;
 					close;
 					close;
 				} else {
 				} else {
-					set JobExp,JobExp+500;
-					set BaseExp, BaseExp + 1000;
+					getexp 1000,500;
 					//misceffect EF_CONE;
 					//misceffect EF_CONE;
 					close;
 					close;
 				}
 				}
@@ -764,8 +763,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "[Asthe]";
 		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~";
 		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;
 		set tu_acolyte01, 25;
-		set JobExp,JobExp+3000;
-		set BaseExp, BaseExp + 5000;
+		getexp 5000,3000;
 		//misceffect EF_CONE;
 		//misceffect EF_CONE;
 		close;
 		close;
 	}
 	}
@@ -840,8 +838,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 			mes "Acolyte training.";
 			mes "Acolyte training.";
 			set tu_acolyte01, 9;
 			set tu_acolyte01, 9;
 			percentheal 100,100;
 			percentheal 100,100;
-			set JobExp,JobExp+2000;
-			set BaseExp, BaseExp + 2000;
+			getexp 2000,2000;
 			//misceffect EF_CONE;
 			//misceffect EF_CONE;
 			getitem	505,1;	//Blue_Potion
 			getitem	505,1;	//Blue_Potion
 			close;
 			close;
@@ -1071,7 +1068,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 				mes "practice your abilities!";
 				mes "practice your abilities!";
 				mes "It seemed that this good deed has improved your skills.";
 				mes "It seemed that this good deed has improved your skills.";
 				set tu_acolyte01, 13;
 				set tu_acolyte01, 13;
-				set JobExp,JobExp+1000;
+				getexp 0,1000;
 				//misceffect EF_CONE;
 				//misceffect EF_CONE;
 				next;
 				next;
 				break;
 				break;

+ 11 - 13
npc/quests/first_class/tu_archer.txt

@@ -14,6 +14,7 @@
 //=	TODO: Test, Add correct misceffects numbers
 //=	TODO: Test, Add correct misceffects numbers
 //= 1.3 Moved Master Kavaruk (overlapped Phantasmic Arrow
 //= 1.3 Moved Master Kavaruk (overlapped Phantasmic Arrow
 //=	Skill quest NPC) [Lupus]
 //=	Skill quest NPC) [Lupus]
+//= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 
 
@@ -307,8 +308,7 @@ payon_in02,47,13,3	script	Master Kavaruk	55,{
 				mes "for bringing me the news. As Arthail has said, I shall wait until he has more news for me.";
 				mes "for bringing me the news. As Arthail has said, I shall wait until he has more news for me.";
 				mes "You should also train and prepare for the future as well.";
 				mes "You should also train and prepare for the future as well.";
 				set tu_archer02, 10;
 				set tu_archer02, 10;
-				set BaseExp, BaseExp + 2000;
-				set JobExp,JobExp+1000;
+				getexp 2000,1000;
 				close;
 				close;
 
 
 			}
 			}
@@ -608,7 +608,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					emotion e_ag;
 					emotion e_ag;
 					mes "Huh. So you already know a little about Owl's Eye already, huh? Well then, I guess I oughta talk about something you don't know about!";
 					mes "Huh. So you already know a little about Owl's Eye already, huh? Well then, I guess I oughta talk about something you don't know about!";
 					set tu_archer01, 7;
 					set tu_archer01, 7;
-					set BaseExp, BaseExp + 500;
+					getexp 500,0;
 					close;
 					close;
 				}
 				}
 				break;
 				break;
@@ -636,7 +636,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "Here, this is a small, special reward for you.";
 				mes "Here, this is a small, special reward for you.";
 				//misceffect EF_WIND ;
 				//misceffect EF_WIND ;
 				set tu_archer01, 7;
 				set tu_archer01, 7;
-				set BaseExp, BaseExp + 500;
+				getexp 500,0;
 				next;
 				next;
 				emotion e_pif;
 				emotion e_pif;
 				mes "[Raiden Karus]";
 				mes "[Raiden Karus]";
@@ -855,7 +855,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				if(@eagle == 0){
 				if(@eagle == 0){
 					//misceffect EF_WIND;
 					//misceffect EF_WIND;
 					set tu_archer01, 10;
 					set tu_archer01, 10;
-					set JobExp,JobExp+500;
+					getexp 0,500;
 				}
 				}
 				emotion e_no1;
 				emotion e_no1;
 				next;
 				next;
@@ -904,8 +904,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
 					mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
 					//misceffect EF_WIND;
 					//misceffect EF_WIND;
 					set tu_archer01, 12;
 					set tu_archer01, 12;
-					set BaseExp, BaseExp + 1000;
-					set JobExp,JobExp+1000;
+					getexp 1000,1000;
 					getitem 1707, 1;
 					getitem 1707, 1;
 					close;
 					close;
 				}
 				}
@@ -1001,8 +1000,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "this little reward!";
 				mes "this little reward!";
 				//misceffect EF_WIND ;
 				//misceffect EF_WIND ;
 				set tu_archer01, 16;
 				set tu_archer01, 16;
-				set BaseExp, BaseExp + 3000;
-				set JobExp,JobExp+3000;
+				getexp 3000,3000;
 				getitem 1770, 500;
 				getitem 1770, 500;
 				next;
 				next;
 				mes "[Raiden Karus]";
 				mes "[Raiden Karus]";
@@ -1341,13 +1339,13 @@ pay_arche,84,139,3	script	Seisner	727,{
 		//misceffect EF_WIND ;
 		//misceffect EF_WIND ;
 		set tu_archer01, 3;
 		set tu_archer01, 3;
 		if(JobLevel == 1){
 		if(JobLevel == 1){
-			set JobExp,JobExp+30;
+			getexp 0,30;
 		} else if((JobLevel > 1) && (JobLevel < 11)){	
 		} else if((JobLevel > 1) && (JobLevel < 11)){	
-			set JobExp,JobExp+100;
+			getexp 0,100;
 		} else if((JobLevel > 10) && (JobLevel < 21)){
 		} else if((JobLevel > 10) && (JobLevel < 21)){
-			set JobExp,JobExp+250;
+			getexp 0,250;
 		} else {
 		} else {
-			set JobExp,JobExp+500;
+			getexp 0,500;
 		}
 		}
 		end;
 		end;
 	}
 	}

+ 19 - 35
npc/quests/first_class/tu_magician01.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Fix up by Jukka
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.0 Fully working
 //= 1.1 Optimized [Lupus]
 //= 1.1 Optimized [Lupus]
 //=	TODO: Test, Add proper misceffects
 //=	TODO: Test, Add proper misceffects
+//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 
 
@@ -92,8 +93,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "Was I talking too much?";
 		mes "Was I talking too much?";
 		mes "Let's take a break and continue later. I'm still new to this, so I'm a little bushed~!";
 		mes "Let's take a break and continue later. I'm still new to this, so I'm a little bushed~!";
 		set tu_magician01, 1;
 		set tu_magician01, 1;
-		set BaseExp,BaseLevel*30;
-		set JobExp,BaseLevel*15;
+		getexp BaseLevel*30,BaseLevel*15;
 		//misceffect EF_HIT5;
 		//misceffect EF_HIT5;
 		close;
 		close;
 		break;
 		break;
@@ -304,24 +304,19 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 					set tu_magician01, 2;
 					set tu_magician01, 2;
 					//misceffect EF_HIT5;
 					//misceffect EF_HIT5;
 					if(tu_mana&1){
 					if(tu_mana&1){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					}
 					if(tu_mana&2){
 					if(tu_mana&2){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					}
 					if(tu_mana&4){
 					if(tu_mana&4){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					}
 					if(tu_mana&8){
 					if(tu_mana&8){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					}
 					if(tu_mana&16){
 					if(tu_mana&16){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					}
 					set tu_mana,0;
 					set tu_mana,0;
 				}
 				}
@@ -417,8 +412,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		mes "It may be hard for you to fight a 'Creamy' yet";
 		mes "It may be hard for you to fight a 'Creamy' yet";
 		mes "so if the 'Pupa' is acting weird be extra careful.";
 		mes "so if the 'Pupa' is acting weird be extra careful.";
 		set tu_magician01, 3;
 		set tu_magician01, 3;
-		set BaseExp, BaseExp + 400;
-		set JobExp,JobExp+200;
+		getexp 400,200;
 		//misceffect EF_HIT5;
 		//misceffect EF_HIT5;
 		close;
 		close;
 		break;
 		break;
@@ -446,8 +440,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 			mes "Let's take a break now before we";
 			mes "Let's take a break now before we";
 			mes "move on to explain the other skills.";
 			mes "move on to explain the other skills.";
 			set tu_magician01, 5;
 			set tu_magician01, 5;
-			set BaseExp, BaseExp + 400;
-			set JobExp,JobExp+200;
+			getexp 400,200;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			close;
 			close;
 		}
 		}
@@ -473,8 +466,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 			mes "Let's take a break now before we";
 			mes "Let's take a break now before we";
 			mes "move on to explain the other skills.";
 			mes "move on to explain the other skills.";
 			set tu_magician01, 5;
 			set tu_magician01, 5;
-			set BaseExp, BaseExp + 400;
-			set JobExp,JobExp+200;
+			getexp 400,200;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			close;
 			close;
 		}
 		}
@@ -632,32 +624,25 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				getitem 1604, 1;
 				getitem 1604, 1;
 				//misceffect EF_HIT5;
 				//misceffect EF_HIT5;
 				if(tu_mana&1){
 				if(tu_mana&1){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				}
 				if(tu_mana&2){
 				if(tu_mana&2){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				}
 				if(tu_mana&4){
 				if(tu_mana&4){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				}
 				if(tu_mana&8){
 				if(tu_mana&8){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				}
 				if(tu_mana&16){
 				if(tu_mana&16){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				}
 				if(tu_mana&32){
 				if(tu_mana&32){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				}
 				if(tu_mana&64){
 				if(tu_mana&64){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				}
 				set tu_mana,0;
 				set tu_mana,0;
 				close;
 				close;
@@ -737,8 +722,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		set tu_magician01, 28;
 		set tu_magician01, 28;
 		getitem 2321, 1;
 		getitem 2321, 1;
 		set Zeny, Zeny + 3000;
 		set Zeny, Zeny + 3000;
-		set BaseExp, BaseExp + 3000;
-		set JobExp, JobExp + 1000;
+		getexp 3000,1000;
 		close;
 		close;
 		break;
 		break;
 	default:
 	default:

+ 21 - 40
npc/quests/first_class/tu_merchant.txt

@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.0 Fully working
 //= 1.1 Fixed bugs, optimized [Lupus] 1.2 fixed Weight check
 //= 1.1 Fixed bugs, optimized [Lupus] 1.2 fixed Weight check
 //=	TODO: Test, add missing misceffects
 //=	TODO: Test, add missing misceffects
+//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 
 
@@ -59,15 +60,13 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Excellent!";
 			mes "Excellent!";
 			mes "You've taught yourself well. Here, you've earned this little reward~";
 			mes "You've taught yourself well. Here, you've earned this little reward~";
 			set tu_merchant, 17;
 			set tu_merchant, 17;
-			set BaseExp, BaseExp + 1860;
-			set JobExp, JobExp + 604;
+			getexp 1860,604;
 			next;
 			next;
 		} else if(@chk_vend == 10){
 		} else if(@chk_vend == 10){
 			mes "[Guarnien]";
 			mes "[Guarnien]";
 			mes "Oh, I see that you're very serious about being a Merchant. I'm proud that you've managed to master this skill! Here, you deserve this reward!";
 			mes "Oh, I see that you're very serious about being a Merchant. I'm proud that you've managed to master this skill! Here, you deserve this reward!";
 			set tu_merchant, 17;
 			set tu_merchant, 17;
-			set BaseExp, BaseExp + 1990;
-			set JobExp, JobExp + 699;
+			getexp 1990,699;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 		} else {
 		} else {
@@ -122,8 +121,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "[Guarnien]";
 			mes "[Guarnien]";
 			mes "But I see that you must already know that, huh? Well, seeing as you're so clever, I think you've earned this little prize~";
 			mes "But I see that you must already know that, huh? Well, seeing as you're so clever, I think you've earned this little prize~";
 			set tu_merchant, 17;
 			set tu_merchant, 17;
-			set BaseExp, BaseExp + 1860;
-			set JobExp, JobExp + 604;
+			getexp 1860,604;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 		} else if(@chk_vend == 10){
 		} else if(@chk_vend == 10){
@@ -137,8 +135,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "little reward for";
 			mes "little reward for";
 			mes "all your efforts~";
 			mes "all your efforts~";
 			set tu_merchant, 17;
 			set tu_merchant, 17;
-			set BaseExp, BaseExp + 1990;
-			set JobExp, JobExp + 699;
+			getexp 1990,699;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 		} else {
 		} else {
@@ -178,8 +175,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "You deserve a little";
 			mes "You deserve a little";
 			mes "reward for your effort~";
 			mes "reward for your effort~";
 			set tu_merchant, 15;
 			set tu_merchant, 15;
-			set BaseExp, BaseExp + 1620;
-			set JobExp, JobExp + 520;
+			getexp 1620,520;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -190,8 +186,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Excellent!";
 			mes "Excellent!";
 			mes "You've actually went above and beyond mastered the Push Cart skill. Great work!";
 			mes "You've actually went above and beyond mastered the Push Cart skill. Great work!";
 			set tu_merchant, 15;
 			set tu_merchant, 15;
-			set BaseExp, BaseExp + 1860;
-			set JobExp, JobExp + 604;
+			getexp 1860,604;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -233,8 +228,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "speed, it shouldn't be a big deal.";
 			mes "speed, it shouldn't be a big deal.";
 			mes "Well done~";
 			mes "Well done~";
 			set tu_merchant, 15;
 			set tu_merchant, 15;
-			set BaseExp, BaseExp + 1620;
-			set JobExp, JobExp + 520;
+			getexp 1620,520;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -246,8 +240,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "mastered the Push Cart skill.";
 			mes "mastered the Push Cart skill.";
 			mes "You truly deserve a little bit of a reward~";
 			mes "You truly deserve a little bit of a reward~";
 			set tu_merchant, 15;
 			set tu_merchant, 15;
-			set BaseExp, BaseExp + 1860;
-			set JobExp, JobExp + 602;
+			getexp 1860,602;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -279,8 +272,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "as I asked. Please,";
 			mes "as I asked. Please,";
 			mes "take this little reward~";
 			mes "take this little reward~";
 			set tu_merchant, 13;
 			set tu_merchant, 13;
-			set BaseExp, BaseExp + 1260;
-			set JobExp, JobExp + 272;
+			getexp 1260,272;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -293,8 +285,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "mastered Over Charge?";
 			mes "mastered Over Charge?";
 			mes "Most impressive! You deserve a small reward for your work!";
 			mes "Most impressive! You deserve a small reward for your work!";
 			set tu_merchant, 13;
 			set tu_merchant, 13;
-			set BaseExp, BaseExp + 1420;
-			set JobExp, JobExp + 336;
+			getexp 1420,336;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -327,8 +318,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "[Guarnien]";
 			mes "[Guarnien]";
 			mes "Ah, you've already learned Level 4 Over Charge. Perfect! Let me give you a little reward~";
 			mes "Ah, you've already learned Level 4 Over Charge. Perfect! Let me give you a little reward~";
 			set tu_merchant, 13;
 			set tu_merchant, 13;
-			set BaseExp, BaseExp + 1260;
-			set JobExp, JobExp + 272;
+			getexp 1260,272;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -339,8 +329,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "[Guarnien]";
 			mes "[Guarnien]";
 			mes "Amazing! You've already mastered the Over Charge skill! You must have wanted this reward badly~";
 			mes "Amazing! You've already mastered the Over Charge skill! You must have wanted this reward badly~";
 			set tu_merchant, 13;
 			set tu_merchant, 13;
-			set BaseExp, BaseExp + 1420;
-			set JobExp, JobExp + 336;
+			getexp 1420,336;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -385,8 +374,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "Let me see those";
 		mes "Let me see those";
 		mes "Red Potions. Ah, it seems you researched the market and bought the cheapest ones! Great work!";
 		mes "Red Potions. Ah, it seems you researched the market and bought the cheapest ones! Great work!";
 		set tu_merchant, 11;
 		set tu_merchant, 11;
-		set BaseExp, BaseExp + 1120;
-		set JobExp, JobExp + 220;
+		getexp 1120,220;
 		//misceffect EF_HIT5;
 		//misceffect EF_HIT5;
 		next;
 		next;
 		mes "[Guarnien]";
 		mes "[Guarnien]";
@@ -440,8 +428,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "how to use the Discount skill";
 			mes "how to use the Discount skill";
 			mes "well enough. Good, here's a little reward for your hard work~";
 			mes "well enough. Good, here's a little reward for your hard work~";
 			set tu_merchant, 5;
 			set tu_merchant, 5;
-			set BaseExp, BaseExp + 830;
-			set JobExp, JobExp + 116;
+			getexp 830,116;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -451,8 +438,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Incredible!";
 			mes "Incredible!";
 			mes "You've actually mastered the Discount skill! You're such a great student. You deserve a bit of a reward!";
 			mes "You've actually mastered the Discount skill! You're such a great student. You deserve a bit of a reward!";
 			set tu_merchant, 5;
 			set tu_merchant, 5;
-			set BaseExp, BaseExp + 970;
-			set JobExp, JobExp + 180;
+			getexp 970,180;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
 			mes "Alright, my next lesson will hopefully offer you a bit more of a challenge. Come back when you think you're ready, alright?";
 			mes "Alright, my next lesson will hopefully offer you a bit more of a challenge. Come back when you think you're ready, alright?";
@@ -486,8 +472,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Here, take this";
 			mes "Here, take this";
 			mes "small reward~";
 			mes "small reward~";
 			set tu_merchant, 5;
 			set tu_merchant, 5;
-			set BaseExp, BaseExp + 830;
-			set JobExp, JobExp + 116;
+			getexp 830,116;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -498,8 +483,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Incredible!";
 			mes "Incredible!";
 			mes "You've actually mastered the Discount skill! You're such a great student. You deserve a bit of a reward!";
 			mes "You've actually mastered the Discount skill! You're such a great student. You deserve a bit of a reward!";
 			set tu_merchant, 5;
 			set tu_merchant, 5;
-			set BaseExp, BaseExp + 970;
-			set JobExp, JobExp + 180;
+			getexp 970,180;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -539,8 +523,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "[Guarnien]";
 			mes "[Guarnien]";
 			mes "Well, since you're still green, I feel awfully sorry if you've wasted Zeny. Why don't you take this as compensation?";
 			mes "Well, since you're still green, I feel awfully sorry if you've wasted Zeny. Why don't you take this as compensation?";
 			set tu_merchant, 3;
 			set tu_merchant, 3;
-			set BaseExp, BaseExp + 700;
-			set JobExp, JobExp + 58;
+			getexp 700,58;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			next;
 			next;
 			mes "[Guarnien]";
 			mes "[Guarnien]";
@@ -577,8 +560,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 				mes "[Guarnien]";
 				mes "[Guarnien]";
 				mes "I see in your eyes that you've already learned to appraise items. Haha, although having that knowledge is reward in itself, let me give you something extra!";
 				mes "I see in your eyes that you've already learned to appraise items. Haha, although having that knowledge is reward in itself, let me give you something extra!";
 				set tu_merchant, 2;
 				set tu_merchant, 2;
-				set BaseExp, BaseExp + 585;
-				set JobExp, JobExp + 43;
+				getexp 585,43;
 				getitem 1351, 1;
 				getitem 1351, 1;
 				next;
 				next;
 				mes "[Guarnien]";
 				mes "[Guarnien]";
@@ -643,8 +625,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			if(getskilllv(40)){
 			if(getskilllv(40)){
 				mes "I see in your eyes that you've already learned to appraise items. Haha, although having that knowledge is reward in itself, let me give you something extra!";
 				mes "I see in your eyes that you've already learned to appraise items. Haha, although having that knowledge is reward in itself, let me give you something extra!";
 				//misceffect EF_HIT5;
 				//misceffect EF_HIT5;
-				set BaseExp, BaseExp + 585;
-				set JobExp, JobExp + 43;
+				getexp 585,43;
 				getitem 1351, 1;
 				getitem 1351, 1;
 				next;
 				next;
 				mes "[Guarnien]";
 				mes "[Guarnien]";

+ 26 - 25
npc/quests/first_class/tu_sword.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Fix up by Jukka
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.3
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.1 optimized [Lupus]
 //= 1.1 optimized [Lupus]
 //=	TODO: Test, Add correct misceffects numbers
 //=	TODO: Test, Add correct misceffects numbers
 //= 1.2 Fixed a typo on NPC name. [SinSloth]
 //= 1.2 Fixed a typo on NPC name. [SinSloth]
+//= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 
 
@@ -106,7 +107,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here is a humble reward for";
 			mes "Here is a humble reward for";
 			mes "your great efforts. But do not let your talents allow you to grow arrogant!";
 			mes "your great efforts. But do not let your talents allow you to grow arrogant!";
 			set tu_swordman, 23;
 			set tu_swordman, 23;
-			set BaseExp, BaseExp + 1860;
+			getexp 1860,0;
 			getitem 1113, 1;
 			getitem 1113, 1;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
@@ -193,7 +194,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "in recognition of";
 			mes "in recognition of";
 			mes "your accomplishment.";
 			mes "your accomplishment.";
 			set tu_swordman, 22;
 			set tu_swordman, 22;
-			set BaseExp, BaseExp + 1860;
+			getexp 1860,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Next time, I will tell you more about the Magnum Break skill.";
 			mes "Next time, I will tell you more about the Magnum Break skill.";
@@ -220,7 +221,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "From that gleen of toughness upon your skin, I see now that I was foolish to ask. Well done~";
 			mes "From that gleen of toughness upon your skin, I see now that I was foolish to ask. Well done~";
 			set tu_swordman, 13;
 			set tu_swordman, 13;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
 			mes "Ah, once again, I have";
@@ -279,7 +280,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "From that gleen of toughness upon your skin, I see now that I was foolish to ask. Well done~";
 			mes "From that gleen of toughness upon your skin, I see now that I was foolish to ask. Well done~";
 			set tu_swordman, 13;
 			set tu_swordman, 13;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
 			mes "Ah, once again, I have";
@@ -352,7 +353,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Hm. But judging from the gleen of toughness on your skin, I suppose teaching you about Endure would be a waste of your time. Well done!";
 			mes "Hm. But judging from the gleen of toughness on your skin, I suppose teaching you about Endure would be a waste of your time. Well done!";
 			set tu_swordman, 13;
 			set tu_swordman, 13;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
 			mes "Ah, once again, I have";
@@ -374,7 +375,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1120;
+			getexp 1120,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -388,7 +389,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -438,7 +439,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1120;
+			getexp 1120,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -452,7 +453,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			next;
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			close;
 			close;
@@ -532,7 +533,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			mes "Ah, I see that you have a fairly good understanding of the Provoke skill. Let me reward you in this small way for your efforts.";
 			set tu_swordman, 10;
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1120;
+			getexp 1120,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -546,7 +547,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
 			mes "Next time we speak, I will tell you what I know about the ^5D478BEndure^000000 skill. When you're ready to learn, come back to me.";
@@ -637,7 +638,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Ah! That healthy glow!";
 			mes "Ah! That healthy glow!";
 			mes "I see that you've mastered this skill already. Let me give you a little reward for your hard training!";
 			mes "I see that you've mastered this skill already. Let me give you a little reward for your hard training!";
 			set tu_swordman, 5;
 			set tu_swordman, 5;
-			set BaseExp, BaseExp + 1120;
+			getexp 1120,0;
 			next;
 			next;
 		} else {
 		} else {
 			mes "[Shurank]";
 			mes "[Shurank]";
@@ -678,7 +679,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			mes "all of the basics.";
 			set tu_swordman, 4;
 			set tu_swordman, 4;
-			set BaseExp, BaseExp + 970;
+			getexp 970,0;
 			getitem 2503, 1;
 			getitem 2503, 1;
 			close;
 			close;
 		} else {
 		} else {
@@ -714,7 +715,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a little reward for all of your hard work. I hope you realize the importance of using Bash as";
 			mes "Here's a little reward for all of your hard work. I hope you realize the importance of using Bash as";
 			mes "you grow stronger.";
 			mes "you grow stronger.";
 			set tu_swordman, 3;
 			set tu_swordman, 3;
-			set BaseExp, BaseExp + 830;
+			getexp 830,0;
 			close;
 			close;
 		} else if(@chk_bash == 10){
 		} else if(@chk_bash == 10){
 			mes "[Shurank]";
 			mes "[Shurank]";
@@ -725,7 +726,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			mes "all of the basics.";
 			set tu_swordman, 4;
 			set tu_swordman, 4;
-			set BaseExp, BaseExp + 970;
+			getexp 970,0;
 			getitem 2503, 1;
 			getitem 2503, 1;
 			close;
 			close;
 		} else {
 		} else {
@@ -761,7 +762,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
 			set tu_swordman, 2;
-			set BaseExp, BaseExp + 585;
+			getexp 585,0;
 			close;
 			close;
 		} else if((@chk_bash > 4) && (@chk_bash < 10)){
 		} else if((@chk_bash > 4) && (@chk_bash < 10)){
 			mes "[Shurank]";
 			mes "[Shurank]";
@@ -790,7 +791,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger...";
 			mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger...";
 			set tu_swordman, 3;
 			set tu_swordman, 3;
-			set BaseExp, BaseExp + 830;
+			getexp 830,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "I believe that every true Swordman should master the Bash skill. If you ever do master the skill as a Swordman, come back to me.";
 			mes "I believe that every true Swordman should master the Bash skill. If you ever do master the skill as a Swordman, come back to me.";
@@ -804,7 +805,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			mes "all of the basics.";
 			set tu_swordman, 4;
 			set tu_swordman, 4;
-			set BaseExp, BaseExp + 970;
+			getexp 970,0;
 			getitem 2503, 1;
 			getitem 2503, 1;
 			close;
 			close;
 		} else {
 		} else {
@@ -838,7 +839,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "Now, if you wish to become a true Swordman, you must learn the Bash skill. There's no question about it: You've got to know these basics! Take this, and learn to Bash!";
 			mes "Now, if you wish to become a true Swordman, you must learn the Bash skill. There's no question about it: You've got to know these basics! Take this, and learn to Bash!";
 			set tu_swordman, 1;
 			set tu_swordman, 1;
-			set BaseExp, BaseExp + 490;
+			getexp 490,0;
 			close;
 			close;
 		} else if((@chk_bash > 0) && (@chk_bash < 5)){
 		} else if((@chk_bash > 0) && (@chk_bash < 5)){
 			mes "[Shurank]";
 			mes "[Shurank]";
@@ -861,7 +862,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 2;
 			set tu_swordman, 2;
-			set BaseExp, BaseExp + 585;
+			getexp 585,0;
 			close;
 			close;
 		} else if((@chk_bash > 4) && (@chk_bash < 10)){
 		} else if((@chk_bash > 4) && (@chk_bash < 10)){
 			mes "[Shurank]";
 			mes "[Shurank]";
@@ -883,7 +884,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "Still, for your training efforts, let me give you a humble reward. But remember, we still have more";
 			mes "of the fundamentals to cover!";
 			mes "of the fundamentals to cover!";
 			set tu_swordman, 3;
 			set tu_swordman, 3;
-			set BaseExp, BaseExp + 830;
+			getexp 830,0;
 			next;
 			next;
 			mes "[Shurank]";
 			mes "[Shurank]";
 			mes "But if you wish to become an expert Swordman in my eyes, you must master Bash!";
 			mes "But if you wish to become an expert Swordman in my eyes, you must master Bash!";
@@ -897,7 +898,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "Here's a small prize in recognition of your efforts thus far. But don't relax yet! You still have a long way to go before grasping";
 			mes "all of the basics.";
 			mes "all of the basics.";
 			set tu_swordman, 4;
 			set tu_swordman, 4;
-			set BaseExp, BaseExp + 970;
+			getexp 970,0;
 			getitem 2503, 1;
 			getitem 2503, 1;
 			close;
 			close;
 		}
 		}
@@ -1051,7 +1052,7 @@ if((tu_swordman == 17) || (tu_swordman == 18)){
 			mes "[Dequ'ee]";
 			mes "[Dequ'ee]";
 			mes "Hurry over to Morroc and monitor Bankley in case he does anything desperate. If something happens, report to me right away!";
 			mes "Hurry over to Morroc and monitor Bankley in case he does anything desperate. If something happens, report to me right away!";
 			set tu_swordman, 19;
 			set tu_swordman, 19;
-			set BaseExp, BaseExp + 1620;
+			getexp 1620,0;
 			close2;
 			close2;
 			warp "moc_fild07",359,201;
 			warp "moc_fild07",359,201;
 			end;
 			end;
@@ -2147,7 +2148,7 @@ if(tu_swordman == 6){
 							mes "[Dequ'ee]";
 							mes "[Dequ'ee]";
 							mes "Thank you for taking the trouble to come this far. Let me reward you with some experience points.";
 							mes "Thank you for taking the trouble to come this far. Let me reward you with some experience points.";
 							set tu_swordman, 7;
 							set tu_swordman, 7;
-							set BaseExp, BaseExp + 1120;
+							getexp 1120,0;
 							next;
 							next;
 							mes "[Dequ'ee]";
 							mes "[Dequ'ee]";
 							mes "Take care";
 							mes "Take care";

+ 20 - 37
npc/quests/first_class/tu_thief01.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Fix up by Jukka
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
 //= 1.1 optimized [Lupus]
 //=	TODO: Test, Add correct misceffects numbers
 //=	TODO: Test, Add correct misceffects numbers
+//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 //=================================================Thief Trainer====================================================
 //=================================================Thief Trainer====================================================
@@ -85,8 +86,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "[Yierhan]";
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				set tu_thief01, 1;
 				set tu_thief01, 1;
-				set BaseExp, BaseExp + 200;
-				set JobExp, JobExp + 100;
+				getexp 200,100;
 				//misceffect EF_HIT5;
 				//misceffect EF_HIT5;
 				close;
 				close;
 				break;
 				break;
@@ -103,8 +103,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "Sure, ^23238EDEX^000000 and LUK can";
 				mes "Sure, ^23238EDEX^000000 and LUK can";
 				mes "also increase your attack damage, but they're insignificant compared to STR. I repeat: ^660000insignificant^000000.";
 				mes "also increase your attack damage, but they're insignificant compared to STR. I repeat: ^660000insignificant^000000.";
 				set tu_thief01, 1;
 				set tu_thief01, 1;
-				set BaseExp, BaseExp + 400;
-				set JobExp, JobExp + 200;
+				getexp 400,200;
 				//misceffect EF_HIT5;
 				//misceffect EF_HIT5;
 				close;
 				close;
 				break;
 				break;
@@ -120,8 +119,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "[Yierhan]";
 				mes "[Yierhan]";
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				set tu_thief01, 1;
 				set tu_thief01, 1;
-				set BaseExp, BaseExp + 200;
-				set JobExp, JobExp + 100;
+				getexp 200,100;
 				//misceffect EF_HIT5;
 				//misceffect EF_HIT5;
 				close;
 				close;
 				break;
 				break;
@@ -232,8 +230,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			mes "about any other skills,";
 			mes "about any other skills,";
 			mes "I can explain real quick.";
 			mes "I can explain real quick.";
 			set tu_thief01, 3;
 			set tu_thief01, 3;
-			set BaseExp, BaseExp + (BaseLevel * 30);
-			set JobExp, JobExp + (BaseLevel *15);
+			getexp BaseLevel*30,BaseLevel*15;
 			//misceffect EF_HIT5;//CHECK
 			//misceffect EF_HIT5;//CHECK
 			close;
 			close;
 		} else if(tu_thief01 == 3){
 		} else if(tu_thief01 == 3){
@@ -333,28 +330,22 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 					set tu_thief01, 4;
 					set tu_thief01, 4;
 					//misceffect EF_HIT5;
 					//misceffect EF_HIT5;
 					if(@read_d){
 					if(@read_d){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					}
 					if(@read_f){
 					if(@read_f){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					}
 					if(@read_s){
 					if(@read_s){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					}
 					if(@read_p){
 					if(@read_p){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					}
 					if(@read_h){
 					if(@read_h){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					}
 					if(@read_r){
 					if(@read_r){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					}
 					close;
 					close;
 					break;
 					break;
@@ -373,8 +364,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			set tu_thief01, 5;
 			set tu_thief01, 5;
 			savepoint "moc_ruins",80,164;
 			savepoint "moc_ruins",80,164;
 			getitem 602, 1;
 			getitem 602, 1;
-			set BaseExp, BaseExp + 100;
-			set JobExp, JobExp + 50;
+			getexp 100,50;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			close2;
 			close2;
 			warp "moc_fild12",158,373;
 			warp "moc_fild12",158,373;
@@ -427,8 +417,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "They are still poisonous.";
 						mes "They are still poisonous.";
 						set tu_thief01, 8;
 						set tu_thief01, 8;
 						getitem 1207, 1;
 						getitem 1207, 1;
-						set BaseExp, BaseExp + 1000;
-						set JobExp, JobExp + 500;
+						getexp 1000,500;
 						//misceffect EF_HIT5;
 						//misceffect EF_HIT5;
 						close;
 						close;
 						break;
 						break;
@@ -440,8 +429,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "Hahaha...";
 						mes "Hahaha...";
 						set tu_thief01, 7;
 						set tu_thief01, 7;
 						getitem 1207, 1;
 						getitem 1207, 1;
-						set BaseExp, BaseExp + 500;
-						set JobExp, JobExp + 200;
+						getexp 500,200;
 						//misceffect EF_HIT5;
 						//misceffect EF_HIT5;
 						close;
 						close;
 						break;
 						break;
@@ -459,8 +447,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "Hahaha...";
 						mes "Hahaha...";
 						set tu_thief01, 7;
 						set tu_thief01, 7;
 						getitem 1207, 1;
 						getitem 1207, 1;
-						set BaseExp, BaseExp + 500;
-						set JobExp, JobExp + 200;
+						getexp 500,200;
 						//misceffect EF_HIT5;
 						//misceffect EF_HIT5;
 						close;
 						close;
 						break;
 						break;
@@ -472,8 +459,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "Hahaha...";
 						mes "Hahaha...";
 						set tu_thief01, 7;
 						set tu_thief01, 7;
 						getitem 1207, 1;
 						getitem 1207, 1;
-						set BaseExp, BaseExp + 500;
-						set JobExp, JobExp + 200;
+						getexp 500,200;
 						//misceffect EF_HIT5;
 						//misceffect EF_HIT5;
 						close;
 						close;
 						break;
 						break;
@@ -505,8 +491,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			mes "takes out a Red Gemstone in front of you, beware.";
 			mes "takes out a Red Gemstone in front of you, beware.";
 			mes "He might try to use poison with the Gemstone.";
 			mes "He might try to use poison with the Gemstone.";
 			set tu_thief01, 8;
 			set tu_thief01, 8;
-			set BaseExp, BaseExp + 200;
-			set JobExp, JobExp + 100;
+			getexp 200,100;
 			//misceffect EF_HIT5;
 			//misceffect EF_HIT5;
 			close;
 			close;
 		} else if(tu_thief01 == 8){
 		} else if(tu_thief01 == 8){
@@ -594,8 +579,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				set tu_thief01, 27;
 				set tu_thief01, 27;
 				set Mantle, 1; // Why this? Maybe getitem? [Jukka]
 				set Mantle, 1; // Why this? Maybe getitem? [Jukka]
 				set Zeny, Zeny + 5000;
 				set Zeny, Zeny + 5000;
-				set BaseExp, BaseExp + 8000;
-				set JobExp, JobExp + 3000;
+				getexp 8000,3000;
 				next;
 				next;
 				mes "[Yierhan]";
 				mes "[Yierhan]";
 				mes "Take care now.";
 				mes "Take care now.";
@@ -705,8 +689,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "Take care now.";
 				mes "Take care now.";
 				set tu_magician01, 27;
 				set tu_magician01, 27;
 				set Zeny, Zeny + 5000;
 				set Zeny, Zeny + 5000;
-				set BaseExp, BaseExp + 5000;
-				set JobExp, JobExp + 2000;
+				getexp 5000,2000;
 				close2;
 				close2;
 				break;
 				break;
 			}
 			}

+ 20 - 19
npc/quests/quests_ayothaya.txt

@@ -3,7 +3,7 @@
 //===== By ===================================================
 //===== By ===================================================
 //= Fredzilla, MasterOfMuppets
 //= Fredzilla, MasterOfMuppets
 //===== Version ==============================================
 //===== Version ==============================================
-//= 1.7
+//= 1.8
 //===== Compatible With ======================================
 //===== Compatible With ======================================
 //= eAthena 1.0
 //= eAthena 1.0
 //===== Description ==========================================
 //===== Description ==========================================
@@ -29,6 +29,7 @@
 //= 1.6 Moved quests from cities/ to here:
 //= 1.6 Moved quests from cities/ to here:
 //= Shrimp, Dungeon, Tom Yum Goong [Evera]
 //= Shrimp, Dungeon, Tom Yum Goong [Evera]
 //= 1.7 Updated the Ayothaya Ring quest to the official one [MasterOfMuppets]
 //= 1.7 Updated the Ayothaya Ring quest to the official one [MasterOfMuppets]
+//= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================
 //============================================================
 
 
 //============================================================
 //============================================================
@@ -747,23 +748,23 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
 					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
 					set thai_find,14;
 					set thai_find,14;
 					if(BaseLevel < 56)
 					if(BaseLevel < 56)
-						set BaseExp,BaseExp+9000;
+						getexp 9000,0;
 					else if(BaseLevel > 55 && BaseLevel < 61)
 					else if(BaseLevel > 55 && BaseLevel < 61)
-						set BaseExp,BaseExp+10500;
+						getexp 10500,0;
 					else if(BaseLevel > 60 && BaseLevel < 66)
 					else if(BaseLevel > 60 && BaseLevel < 66)
-						set BaseExp,BaseExp+18684;
+						getexp 18684,0;
 					else if(BaseLevel > 65 && BaseLevel < 71)
 					else if(BaseLevel > 65 && BaseLevel < 71)
-						set BaseExp,BaseExp+27411;
+						getexp 27411,0;
 					else if(BaseLevel > 70 && BaseLevel < 76)
 					else if(BaseLevel > 70 && BaseLevel < 76)
-						set BaseExp,BaseExp+70757;
+						getexp 70757,0;
 					else if(BaseLevel > 75 && BaseLevel < 81)
 					else if(BaseLevel > 75 && BaseLevel < 81)
-						set BaseExp,BaseExp+130246;
+						getexp 130246,0;
 					else if(BaseLevel > 80 && BaseLevel < 86)
 					else if(BaseLevel > 80 && BaseLevel < 86)
-						set BaseExp,BaseExp+150340;
+						getexp 150340,0;
 					else if(BaseLevel > 85 && BaseLevel < 91)
 					else if(BaseLevel > 85 && BaseLevel < 91)
-						set BaseExp,BaseExp+182052;
+						getexp 182052,0;
 					else if(BaseLevel > 90)
 					else if(BaseLevel > 90)
-						set BaseExp,BaseExp+406786;
+						getexp 406786,0;
 					next;
 					next;
 					mes "[" +strcharinfo(0)+ "]";
 					mes "[" +strcharinfo(0)+ "]";
 					mes "Whoa...?";
 					mes "Whoa...?";
@@ -823,23 +824,23 @@ ayo_dun02,91,264,3	script	Haggard Man	841,{
 					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
 					mes "realigned every bone in your skeleton, placing them in the right spots. Strangely, you feel intense relaxation and refreshment instead of excruciating pain.";
 					set thai_find,14;
 					set thai_find,14;
 					if(BaseLevel < 56)
 					if(BaseLevel < 56)
-						set BaseExp,BaseExp+9000;
+						getexp 9000,0;
 					else if(BaseLevel > 55 && BaseLevel < 61)
 					else if(BaseLevel > 55 && BaseLevel < 61)
-						set BaseExp,BaseExp+10500;
+						getexp 10500,0;
 					else if(BaseLevel > 60 && BaseLevel < 66)
 					else if(BaseLevel > 60 && BaseLevel < 66)
-						set BaseExp,BaseExp+18684;
+						getexp 18684,0;
 					else if(BaseLevel > 65 && BaseLevel < 71)
 					else if(BaseLevel > 65 && BaseLevel < 71)
-						set BaseExp,BaseExp+27411;
+						getexp 27411,0;
 					else if(BaseLevel > 70 && BaseLevel < 76)
 					else if(BaseLevel > 70 && BaseLevel < 76)
-						set BaseExp,BaseExp+70757;
+						getexp 70757,0;
 					else if(BaseLevel > 75 && BaseLevel < 81)
 					else if(BaseLevel > 75 && BaseLevel < 81)
-						set BaseExp,BaseExp+130246;
+						getexp 130246,0;
 					else if(BaseLevel > 80 && BaseLevel < 86)
 					else if(BaseLevel > 80 && BaseLevel < 86)
-						set BaseExp,BaseExp+150340;
+						getexp 150340,0;
 					else if(BaseLevel > 85 && BaseLevel < 91)
 					else if(BaseLevel > 85 && BaseLevel < 91)
-						set BaseExp,BaseExp+182052;
+						getexp 182052,0;
 					else if(BaseLevel > 90)
 					else if(BaseLevel > 90)
-						set BaseExp,BaseExp+406786;
+						getexp 406786,0;
 					next;
 					next;
 					mes "[" +strcharinfo(0)+ "]";
 					mes "[" +strcharinfo(0)+ "]";
 					mes "Whoa...?";
 					mes "Whoa...?";

+ 27 - 26
npc/quests/quests_ein.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //= eAthena 7.15 +
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -24,6 +24,7 @@
 //= 1.6 Updated Laboratory Entrance regarding Heart Fragment quest. [SinSloth]
 //= 1.6 Updated Laboratory Entrance regarding Heart Fragment quest. [SinSloth]
 //= 1.7 Changed the laboratory entrance checking to prevent players
 //= 1.7 Changed the laboratory entrance checking to prevent players
 //= from being stuck in the quest. [SinSloth]
 //= from being stuck in the quest. [SinSloth]
+//= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 
 
@@ -1471,12 +1472,12 @@ L_P2:
 	mes "really worth this kind of";
 	mes "really worth this kind of";
 	mes "cruelty? Whoever they are,";
 	mes "cruelty? Whoever they are,";
 	mes "their intentions can't be good.";
 	mes "their intentions can't be good.";
-	if(BaseLevel < 41)set BaseExp,BaseExp+34750;
-	else if(BaseLevel > 40 && BaseLevel < 61)set BaseExp,BaseExp+69500;
-	else if(BaseLevel > 60 && BaseLevel < 71)set BaseExp,BaseExp+139000;
-	else if(BaseLevel > 70 && BaseLevel < 81)set BaseExp,BaseExp+278000;
-	else if(BaseLevel > 80 && BaseLevel < 91)set BaseExp,BaseExp+417000;
-	else if(BaseLevel > 90)set BaseExp,BaseExp+556000;
+	if(BaseLevel < 41) getexp 34750,0;
+	else if(BaseLevel > 40 && BaseLevel < 61) getexp 69500,0;
+	else if(BaseLevel > 60 && BaseLevel < 71) getexp 139000,0;
+	else if(BaseLevel > 70 && BaseLevel < 81) getexp 278000,0;
+	else if(BaseLevel > 80 && BaseLevel < 91) getexp 417000,0;
+	else if(BaseLevel > 90) getexp 556000,0;
 	close;
 	close;
 	
 	
 L_NNotify:
 L_NNotify:
@@ -2127,12 +2128,12 @@ s_Switches:
 		mes "soooooo good.";
 		mes "soooooo good.";
 		mes "Wait. Now I just";
 		mes "Wait. Now I just";
 		mes "feel goooood~";
 		mes "feel goooood~";
-		if(BaseLevel < 41)set BaseExp,BaseExp+3712;
-		else if(BaseLevel > 40 && BaseLevel < 61)set BaseExp,BaseExp+7425;
-		else if(BaseLevel > 60 && BaseLevel < 71)set BaseExp,BaseExp+14850;
-		else if(BaseLevel > 70 && BaseLevel < 81)set BaseExp,BaseExp+29700;
-		else if(BaseLevel > 80 && BaseLevel < 91)set BaseExp,BaseExp+59400;
-		else if(BaseLevel > 90)set BaseExp,BaseExp+118800;
+		if(BaseLevel < 41) getexp 3712,0;
+		else if(BaseLevel > 40 && BaseLevel < 61) getexp 7425,0;
+		else if(BaseLevel > 60 && BaseLevel < 71) getexp 14850,0;
+		else if(BaseLevel > 70 && BaseLevel < 81) getexp 29700,0;
+		else if(BaseLevel > 80 && BaseLevel < 91) getexp 59400,0;
+		else if(BaseLevel > 90) getexp 118800,0;
 		set EIN_LOVERQ,15;
 		set EIN_LOVERQ,15;
 		next;
 		next;
 		mes "[Calla]";
 		mes "[Calla]";
@@ -2427,12 +2428,12 @@ s_Switches:
 		mes "Hell yeah!";
 		mes "Hell yeah!";
 		mes "That's the stuff!";
 		mes "That's the stuff!";
 		delitem 1901,1;
 		delitem 1901,1;
-		if(BaseLevel < 41)set BaseExp,BaseExp+3712;
-		else if(BaseLevel > 40 && BaseLevel < 61)set BaseExp,BaseExp+7425;
-		else if(BaseLevel > 60 && BaseLevel < 71)set BaseExp,BaseExp+14850;
-		else if(BaseLevel > 70 && BaseLevel < 81)set BaseExp,BaseExp+29700;
-		else if(BaseLevel > 80 && BaseLevel < 91)set BaseExp,BaseExp+59400;
-		else if(BaseLevel > 90)set BaseExp,BaseExp+118800;
+		if(BaseLevel < 41) getexp 3712,0;
+		else if(BaseLevel > 40 && BaseLevel < 61) getexp 7425,0;
+		else if(BaseLevel > 60 && BaseLevel < 71) getexp 14850,0;
+		else if(BaseLevel > 70 && BaseLevel < 81) getexp 29700,0;
+		else if(BaseLevel > 80 && BaseLevel < 91) getexp 59400,0;
+		else if(BaseLevel > 90) getexp 118800,0;
 		set EIN_LOVERQ,4;
 		set EIN_LOVERQ,4;
 		next;
 		next;
 		mes "[Clitzer]";
 		mes "[Clitzer]";
@@ -3549,13 +3550,13 @@ s_Switches:
 		delitem 7319,10;
 		delitem 7319,10;
 		set EinFactory,16;
 		set EinFactory,16;
 		set $EinPolution,$EinPolution+1;
 		set $EinPolution,$EinPolution+1;
-		if(BaseLevel < 41) set BaseExp,BaseExp+615;
-		else if(BaseLevel >= 41 && BaseLevel < 51) set BaseExp,BaseExp+3075;
-		else if(BaseLevel >= 51 && BaseLevel < 61) set BaseExp,BaseExp+6604;
-		else if(BaseLevel >= 61 && BaseLevel < 71) set BaseExp,BaseExp+18508;
-		else if(BaseLevel >= 71 && BaseLevel < 81) set BaseExp,BaseExp+32062;
-		else if(BaseLevel >= 81 && BaseLevel < 91) set BaseExp,BaseExp+76026;
-		else if(BaseLevel >= 91) set BaseExp,BaseExp+290675;
+		if(BaseLevel < 41) getexp 615,0;
+		else if(BaseLevel >= 41 && BaseLevel < 51) getexp 3075,0;
+		else if(BaseLevel >= 51 && BaseLevel < 61) getexp 6604,0;
+		else if(BaseLevel >= 61 && BaseLevel < 71) getexp 18508,0;
+		else if(BaseLevel >= 71 && BaseLevel < 81) getexp 32062,0;
+		else if(BaseLevel >= 81 && BaseLevel < 91) getexp 76026,0;
+		else if(BaseLevel >= 91) getexp 290675,0;
 		mes "[Zelmeto]";
 		mes "[Zelmeto]";
 		mes "I don't know how";
 		mes "I don't know how";
 		mes "I can possible pay you";
 		mes "I can possible pay you";

+ 10 - 10
npc/quests/quests_hugel.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //===== By: ==================================================
 //= MasterOfMuppets & SinSloth
 //= MasterOfMuppets & SinSloth
 //===== Current Version: =====================================
 //===== Current Version: =====================================
-//= 1.3
+//= 1.4
 //===== Compatible With: =====================================
 //===== Compatible With: =====================================
 //= eAthena
 //= eAthena
 //===== Description: =========================================
 //===== Description: =========================================
@@ -15,6 +15,7 @@
 //= 1.2 Added Odin Temple Excavation quest. [SinSloth]
 //= 1.2 Added Odin Temple Excavation quest. [SinSloth]
 //= 1.3 Added a Missing "close;". [Samuray22]
 //= 1.3 Added a Missing "close;". [Samuray22]
 //=	-Thanks to Elfange
 //=	-Thanks to Elfange
+//= 1.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================
 //============================================================
 
 
 //-------------------------------------------------------------------------
 //-------------------------------------------------------------------------
@@ -700,7 +701,7 @@ OnTouch:
 		specialeffect 71;
 		specialeffect 71;
 		set hg_herb,13;
 		set hg_herb,13;
 		getitem 603,1; //Old blue box
 		getitem 603,1; //Old blue box
-		set BaseExp,BaseExp+50000;
+		getexp 50000,0;
 	}
 	}
 	else
 	else
 	{
 	{
@@ -1317,7 +1318,7 @@ ein_in01,16,36,3	script	Morriphen	86,{
 		mes "I won't have to worry";
 		mes "I won't have to worry";
 		mes "about you. Take care~";
 		mes "about you. Take care~";
 		set hg_bio,9;
 		set hg_bio,9;
-		set BaseExp,BaseExp+700000;
+		getexp 700000,0;
 		close;
 		close;
 	}
 	}
 	else if(hg_bio == 9)
 	else if(hg_bio == 9)
@@ -1529,7 +1530,7 @@ hu_in01,326,307,3	script	Siria	90,{
 		mes "I just... I just need to relax.";
 		mes "I just... I just need to relax.";
 		mes "Thank you for everything...";
 		mes "Thank you for everything...";
 		set hg_bio,8;
 		set hg_bio,8;
-		set BaseExp,BaseExp+500000;
+		getexp 500000,0;
 		close;
 		close;
 	}
 	}
 	else if(hg_bio == 8)
 	else if(hg_bio == 8)
@@ -5354,7 +5355,7 @@ hugel,196,164,3	script	El Schatt	50,{
 		next;
 		next;
 		specialeffect2 71;
 		specialeffect2 71;
 		set hg_memory,12;
 		set hg_memory,12;
-		set BaseExp,BaseExp+50000;
+		getexp 50000,0;
 		getitem 603,1; //Old blue box
 		getitem 603,1; //Old blue box
 		mes "[El Schatt]";
 		mes "[El Schatt]";
 		mes "Oh... Oh dear";
 		mes "Oh... Oh dear";
@@ -5685,7 +5686,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		specialeffect2 71;
 		specialeffect2 71;
 		set hg_ubu01,8;
 		set hg_ubu01,8;
 		getitem 12065,3; //Green salad
 		getitem 12065,3; //Green salad
-		set BaseExp,BaseExp+50000;
+		getexp 50000,0;
 		close;
 		close;
 	}
 	}
 	else if(hg_ubu01 == 7)
 	else if(hg_ubu01 == 7)
@@ -5707,7 +5708,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	701,{
 		specialeffect2 68;
 		specialeffect2 68;
 		set hg_ubu01,8;
 		set hg_ubu01,8;
 		getitem 12065,3; //Green salad
 		getitem 12065,3; //Green salad
-		set BaseExp,BaseExp+50000;
+		getexp 50000,0;
 		close;
 		close;
 	}
 	}
 	else if(hg_ubu01 == 8)
 	else if(hg_ubu01 == 8)
@@ -6424,7 +6425,7 @@ hu_in01,15,372,3	script	Cellette Lavit	74,{
 		mes "you so much for your help~";
 		mes "you so much for your help~";
 		set hg_odeng,0;
 		set hg_odeng,0;
 		getitem 584,3; //Skewer soup
 		getitem 584,3; //Skewer soup
-		set BaseExp,BaseExp+1000;
+		getexp 1000,0;
 		next;
 		next;
 		mes "[Cellette]";
 		mes "[Cellette]";
 		mes "It was really nice working";
 		mes "It was really nice working";
@@ -7175,8 +7176,7 @@ yuno,111,156,3	script	Euslan	90,{
 		close2;
 		close2;
 		set hg_ma1,13;
 		set hg_ma1,13;
 		specialeffect 253;
 		specialeffect 253;
-		set BaseExp,BaseExp+900000;
-		set JobExp,JobExp+600000;
+		getexp 900000,600000;
 		end;
 		end;
 	}
 	}
 	else if(hg_ma1 == 13)
 	else if(hg_ma1 == 13)

+ 8 - 7
npc/quests/quests_lighthalzen.txt

@@ -4,7 +4,7 @@
 //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
 //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
 //= Lupus, Lord Gywall
 //= Lupus, Lord Gywall
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 3.3
+//= 3.4
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //= eAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -57,6 +57,7 @@
 //= 3.2 Removed the NPC "#kiz03-4" as I couldn't find any [L0ne_W0lf]
 //= 3.2 Removed the NPC "#kiz03-4" as I couldn't find any [L0ne_W0lf]
 //=	reference to it in the Aegis script.
 //=	reference to it in the Aegis script.
 //= 3.3 Fixed a wrong negative value checking in Schwartzvalt Trilogy quest. [SinSloth]
 //= 3.3 Fixed a wrong negative value checking in Schwartzvalt Trilogy quest. [SinSloth]
+//= 3.4 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 lighthalzen,1,1,7	script	sneakAddSuber	-1,{
 lighthalzen,1,1,7	script	sneakAddSuber	-1,{
@@ -2531,12 +2532,12 @@ s_Ask:
 	mes "adventurer. When the three";
 	mes "adventurer. When the three";
 	mes "of us get together, I'll be";
 	mes "of us get together, I'll be";
 	mes "sure to let you know~";
 	mes "sure to let you know~";
-	if(BaseLevel < 41)set BaseExp,BaseExp+49500;
-	else if(BaseLevel > 40 && BaseLevel < 61)set BaseExp,BaseExp+99000;
-	else if(BaseLevel > 60 && BaseLevel < 71)set BaseExp,BaseExp+198000;
-	else if(BaseLevel > 70 && BaseLevel < 81)set BaseExp,BaseExp+396000;
-	else if(BaseLevel > 80 && BaseLevel < 91)set BaseExp,BaseExp+594000;
-	else if(BaseLevel > 90)set BaseExp,BaseExp+792000;
+	if(BaseLevel < 41) getexp 49500,0;
+	else if(BaseLevel > 40 && BaseLevel < 61) getexp 99000,0;
+	else if(BaseLevel > 60 && BaseLevel < 71) getexp 198000,0;
+	else if(BaseLevel > 70 && BaseLevel < 81) getexp 396000,0;
+	else if(BaseLevel > 80 && BaseLevel < 91) getexp 594000,0;
+	else if(BaseLevel > 90) getexp 792000,0;
 	getitem 7350,1;
 	getitem 7350,1;
 	set friendship,11;
 	set friendship,11;
 	set friendship3,0;
 	set friendship3,0;

+ 25 - 23
npc/quests/quests_louyang.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.2
+//= 1.3
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //= eAthena 1.0
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -13,11 +13,13 @@
 //= 1.0 Initial Release [Evera]
 //= 1.0 Initial Release [Evera]
 //= 1.1 Fixed double levelup bug [Lupus]
 //= 1.1 Fixed double levelup bug [Lupus]
 //= 1.2 Added Revolution Quest. [SinSloth]
 //= 1.2 Added Revolution Quest. [SinSloth]
+//= 1.3 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 //============================================================
 //============================================================
-//======================================================= Soup
-//====================================================== Quest
+//== Soup Quest
+//============================================================
+
 lou_fild01,195,177,4	script	Jiu Lian Bu#01	819,{
 lou_fild01,195,177,4	script	Jiu Lian Bu#01	819,{
 	if(QL_SOUP2) goto L_DONE;
 	if(QL_SOUP2) goto L_DONE;
 	if(QL_SOUPQUEST)goto L_WHERE;
 	if(QL_SOUPQUEST)goto L_WHERE;
@@ -1081,7 +1083,7 @@ L_DONE:
 	set QL_DOC1STTIME,0;
 	set QL_DOC1STTIME,0;
 	set QL_DOCQUEST,2;
 	set QL_DOCQUEST,2;
 	getitem 679,2; //Pilule
 	getitem 679,2; //Pilule
-	set BaseExp,BaseExp + 10000;
+	getexp 10000,0;
 	next;
 	next;
 	mes "[Hua Tuo]";
 	mes "[Hua Tuo]";
 	mes "Well then, I will see you around. Once again, I'd like to thank you for your help.";
 	mes "Well then, I will see you around. Once again, I'd like to thank you for your help.";
@@ -1131,7 +1133,7 @@ L_CHECKITM:
 	mes "Of course!";
 	mes "Of course!";
 	mes "Here's your reward. Use this medicine when you feel weary.";
 	mes "Here's your reward. Use this medicine when you feel weary.";
 	getitem 679,5; //Pilule
 	getitem 679,5; //Pilule
-	set BaseExp,BaseExp + 30000;
+	getexp 30000,0;
 	set QL_GOTHERB,0;
 	set QL_GOTHERB,0;
 	set QL_DOC1STTIME,0;
 	set QL_DOC1STTIME,0;
 	set QL_DOCQUEST,2;
 	set QL_DOCQUEST,2;
@@ -1990,15 +1992,15 @@ s_CameBack:
 	set QL_POISONKING,30;
 	set QL_POISONKING,30;
 	set QL_POISONPATH,0;
 	set QL_POISONPATH,0;
 	getitem 678,3;
 	getitem 678,3;
-	if(BaseLevel < 56)set BaseExp,BaseExp+8909;
-	else if(BaseLevel > 55 && BaseLevel < 61)set BaseExp,BaseExp+10213;
-	else if(BaseLevel > 60 && BaseLevel < 66)set BaseExp,BaseExp+17684;
-	else if(BaseLevel > 65 && BaseLevel < 71)set BaseExp,BaseExp+25411;
-	else if(BaseLevel > 70 && BaseLevel < 76)set BaseExp,BaseExp+68757;
-	else if(BaseLevel > 75 && BaseLevel < 81)set BaseExp,BaseExp+128246;
-	else if(BaseLevel > 80 && BaseLevel < 86)set BaseExp,BaseExp+142340;
-	else if(BaseLevel > 85 && BaseLevel < 91)set BaseExp,BaseExp+152052;
-	else if(BaseLevel > 90)set BaseExp,BaseExp+366786;
+	if(BaseLevel < 56) getexp 8909,0;
+	else if(BaseLevel > 55 && BaseLevel < 61) getexp 10213,0;
+	else if(BaseLevel > 60 && BaseLevel < 66) getexp 17684,0;
+	else if(BaseLevel > 65 && BaseLevel < 71) getexp 25411,0;
+	else if(BaseLevel > 70 && BaseLevel < 76) getexp 68757,0;
+	else if(BaseLevel > 75 && BaseLevel < 81) getexp 128246,0;
+	else if(BaseLevel > 80 && BaseLevel < 86) getexp 142340,0;
+	else if(BaseLevel > 85 && BaseLevel < 91) getexp 152052,0;
+	else if(BaseLevel > 90) getexp 366786,0;
 	warp "louyang",270,136;
 	warp "louyang",270,136;
 	end;
 	end;
 
 
@@ -3023,15 +3025,15 @@ s_Letter:
 	mes "^3131FFYou grow dizzy, but you can also feel";
 	mes "^3131FFYou grow dizzy, but you can also feel";
 	mes "like you're becoming more powerful";
 	mes "like you're becoming more powerful";
 	mes "and gaining experience.";
 	mes "and gaining experience.";
-	if(BaseLevel < 56)set BaseExp,BaseExp+9000;
-	else if(BaseLevel > 55 && BaseLevel < 61)set BaseExp,BaseExp+10500;
-	else if(BaseLevel > 60 && BaseLevel < 66)set BaseExp,BaseExp+18684;
-	else if(BaseLevel > 65 && BaseLevel < 71)set BaseExp,BaseExp+27411;
-	else if(BaseLevel > 70 && BaseLevel < 76)set BaseExp,BaseExp+70757;
-	else if(BaseLevel > 75 && BaseLevel < 81)set BaseExp,BaseExp+130246;
-	else if(BaseLevel > 80 && BaseLevel < 86)set BaseExp,BaseExp+150340;
-	else if(BaseLevel > 85 && BaseLevel < 91)set BaseExp,BaseExp+182052;
-	else if(BaseLevel > 90)set BaseExp,BaseExp+406786;
+	if(BaseLevel < 56) getexp 9000,0;
+	else if(BaseLevel > 55 && BaseLevel < 61) getexp 10500,0;
+	else if(BaseLevel > 60 && BaseLevel < 66) getexp 18684,0;
+	else if(BaseLevel > 65 && BaseLevel < 71) getexp 27411,0;
+	else if(BaseLevel > 70 && BaseLevel < 76) getexp 70757,0;
+	else if(BaseLevel > 75 && BaseLevel < 81) getexp 130246,0;
+	else if(BaseLevel > 80 && BaseLevel < 86) getexp 150340,0;
+	else if(BaseLevel > 85 && BaseLevel < 91) getexp 182052,0;
+	else if(BaseLevel > 90) getexp 406786,0;
 	set QL_POISONKING,17;
 	set QL_POISONKING,17;
 	close2;
 	close2;
 	warp "louyang",270,136;
 	warp "louyang",270,136;

+ 3 - 2
npc/quests/quests_prontera.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= kobra_k88; L0ne_W0lf
 //= kobra_k88; L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.7c
+//= 1.8
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //= eAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -31,6 +31,7 @@
 //= 1.7 Updated "Ph.D Quest" Dialogs. [Samuray22]
 //= 1.7 Updated "Ph.D Quest" Dialogs. [Samuray22]
 //= 1.7b Fixed some minor typos. [SinSloth]
 //= 1.7b Fixed some minor typos. [SinSloth]
 //= 1.7c replaced item "names" with item id. [Lupus]
 //= 1.7c replaced item "names" with item id. [Lupus]
+//= 1.8 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 // Prontera Culvert
 // Prontera Culvert
@@ -2693,7 +2694,7 @@ prt_church,185,106,3	script	Father Bamph	60,{
 		mes "adventurer. May safety accompany you on all of your journeys.";
 		mes "adventurer. May safety accompany you on all of your journeys.";
 		if (prt_curse == 43) set prt_curse,44;
 		if (prt_curse == 43) set prt_curse,44;
 		else set prt_curse,54;
 		else set prt_curse,54;
-		set BaseExp,BaseExp+1600000;
+		getexp 1600000,0;
 		close;
 		close;
 	}
 	}
 	else if (prt_curse > 43 && prt_curse < 50) {
 	else if (prt_curse > 43 && prt_curse < 50) {

+ 9 - 9
npc/quests/quests_rachel.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= L0ne_W0lf
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.9
+//= 2.0
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //= eAthena SVN
 //===== Description: ========================================= 
 //===== Description: ========================================= 
@@ -48,6 +48,7 @@
 //=	Another minor fix to Hamion. "< 1" -> "< 2". Added a missing close to
 //=	Another minor fix to Hamion. "< 1" -> "< 2". Added a missing close to
 //=	the ontouch "key". Thanks to Gepard for pointing them out.
 //=	the ontouch "key". Thanks to Gepard for pointing them out.
 //= 1.9 Fixed a misorder with variable checkings. [SinSloth]
 //= 1.9 Fixed a misorder with variable checkings. [SinSloth]
+//= 2.0 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 //============================================================ 
 
 
 // Lost Child Quest (Prerequisite to High Priest quest)
 // Lost Child Quest (Prerequisite to High Priest quest)
@@ -2606,9 +2607,9 @@ OnTouch:
 		mes "Who would be to blame?";
 		mes "Who would be to blame?";
 		next;
 		next;
 		set rach_vice,24;
 		set rach_vice,24;
-		if (BaseLevel > 90) set BaseExp,BaseExp+1300000;
-		else if (BaseLevel > 75) set BaseExp,BaseExp+850000;
-		else set BaseExp,BaseExp+450000;
+		if (BaseLevel > 90) getexp 1300000,0;
+		else if (BaseLevel > 75) getexp 850000,0;
+		else getexp 450000,0;
 		mes "[" + strcharinfo(0) + "]";
 		mes "[" + strcharinfo(0) + "]";
 		mes "Somehow, I wish that";
 		mes "Somehow, I wish that";
 		mes "Katinshuell had the";
 		mes "Katinshuell had the";
@@ -2901,7 +2902,7 @@ rachel,157,183,3	script	Sincere Follower Urstia	916,{
 		mes "token of my appreication for";
 		mes "token of my appreication for";
 		mes " what you have done for me.";
 		mes " what you have done for me.";
 		delitem 7573,1; //Sparkling Necklace
 		delitem 7573,1; //Sparkling Necklace
-		set BaseExp,BaseExp+700000;
+		getexp 700000,0;
 		set ice_necklace_q,6;
 		set ice_necklace_q,6;
 		next;
 		next;
 		mes "["+strcharinfo(0)+"]";
 		mes "["+strcharinfo(0)+"]";
@@ -4228,7 +4229,7 @@ ra_temple,116,174,3	script	Nemma#ra_temple	920,{
 				if (countitem(12018) >= 20) {
 				if (countitem(12018) >= 20) {
 					cutin "ra_nemma04",2;
 					cutin "ra_nemma04",2;
 					delitem 12018,20; //FireCracker";
 					delitem 12018,20; //FireCracker";
-					set BaseExp,BaseExp+200000;
+					getexp 200000,0;
 					set ra_tem_q,14;
 					set ra_tem_q,14;
 					mes "[Priestess Nemma]";
 					mes "[Priestess Nemma]";
 					mes "Yay!";
 					mes "Yay!";
@@ -5017,7 +5018,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 		mes "be with you, "+strcharinfo(0)+".";
 		mes "be with you, "+strcharinfo(0)+".";
 		set lost_boy,13;
 		set lost_boy,13;
 		specialeffect2 253;
 		specialeffect2 253;
-		set BaseExp,BaseExp+900000;
+		getexp 900000,0;
 		goto L_End;
 		goto L_End;
 	}
 	}
 
 
@@ -5448,8 +5449,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	932,{
 				set ra_tem_q,0;
 				set ra_tem_q,0;
 				cutin "",255;
 				cutin "",255;
 				specialeffect2 253;
 				specialeffect2 253;
-				set BaseExp,BaseExp+900000;
-				set JobExp,JobExp+600000;
+				getexp 900000,600000;
 				end;
 				end;
 
 
 			}
 			}

+ 31 - 30
npc/quests/seals/megingard_seal.txt

@@ -3,14 +3,15 @@
 //===== By: ================================================== 
 //===== By: ================================================== 
 //= SinSloth
 //= SinSloth
 //===== Current Version: ===================================== 
 //===== Current Version: ===================================== 
-//= 1.01
+//= 1.2
 //===== Compatible With: ===================================== 
 //===== Compatible With: ===================================== 
 //= eAthena
 //= eAthena
 //===== Description: ========================================= 
 //===== Description: ========================================= 
 //= Quest for breaking the seal of Megingjard.
 //= Quest for breaking the seal of Megingjard.
 //===== Additional Comments: =================================
 //===== Additional Comments: =================================
-// 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
-// 1.1 fixed exploit [Lupus]
+//= 1.0 First version. Thanks to SinSloth for scripting it. [MasterOfMuppets]
+//= 1.1 fixed exploit [Lupus]
+//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================
 //============================================================
 
 
 prt_castle,44,151,0	script	Rebarev Doug	56,{
 prt_castle,44,151,0	script	Rebarev Doug	56,{
@@ -2654,23 +2655,23 @@ aldebaran,66,213,0	script	Lady#megin	69,{
 		set god_eremes,28;
 		set god_eremes,28;
 		getitem 603,1;
 		getitem 603,1;
 		if (BaseLevel < 56)
 		if (BaseLevel < 56)
-			set BaseExp,BaseExp + 27000;
+			getexp 27000,0;
 		else if (BaseLevel > 55 && BaseLevel < 61)
 		else if (BaseLevel > 55 && BaseLevel < 61)
-			set BaseExp,BaseExp + 30000;
+			getexp 30000,0;
 		else if (BaseLevel > 60 && BaseLevel < 66)
 		else if (BaseLevel > 60 && BaseLevel < 66)
-			set BaseExp,BaseExp + 56052;
+			getexp 56052,0;
 		else if (BaseLevel > 65 && BaseLevel < 71)
 		else if (BaseLevel > 65 && BaseLevel < 71)
-			set BaseExp,BaseExp + 82233;
+			getexp 82233,0;
 		else if (BaseLevel > 70 && BaseLevel < 76)
 		else if (BaseLevel > 70 && BaseLevel < 76)
-			set BaseExp,BaseExp + 212271;
+			getexp 212271,0;
 		else if (BaseLevel > 75 && BaseLevel < 81)
 		else if (BaseLevel > 75 && BaseLevel < 81)
-			set BaseExp,BaseExp + 390738;
+			getexp 390738,0;
 		else if (BaseLevel > 80 && BaseLevel < 86)
 		else if (BaseLevel > 80 && BaseLevel < 86)
-			set BaseExp,BaseExp + 451020;
+			getexp 451020,0;
 		else if (BaseLevel > 85 && BaseLevel < 91)
 		else if (BaseLevel > 85 && BaseLevel < 91)
-			set BaseExp,BaseExp + 546156;
+			getexp 546156,0;
 		else if (BaseLevel > 90)
 		else if (BaseLevel > 90)
-			set BaseExp,BaseExp + 1220358;
+			getexp 1220358,0;
 		close;
 		close;
 	}
 	}
 		else if (god_eremes == 28)
 		else if (god_eremes == 28)
@@ -3214,23 +3215,23 @@ niflheim,109,254,0	script	Egnigem	796,{
 		mes "This is all I can do for you in return...";
 		mes "This is all I can do for you in return...";
 		set god_eremes,27;
 		set god_eremes,27;
 		if (BaseLevel < 56)
 		if (BaseLevel < 56)
-			set BaseExp,BaseExp + 27000;
+			getexp 27000,0;
 		else if (BaseLevel > 55 && BaseLevel < 61)
 		else if (BaseLevel > 55 && BaseLevel < 61)
-			set BaseExp,BaseExp + 30000;
+			getexp 30000,0;
 		else if (BaseLevel > 60 && BaseLevel < 66)
 		else if (BaseLevel > 60 && BaseLevel < 66)
-			set BaseExp,BaseExp + 56052;
+			getexp 56052,0;
 		else if (BaseLevel > 65 && BaseLevel < 71)
 		else if (BaseLevel > 65 && BaseLevel < 71)
-			set BaseExp,BaseExp + 82233;
+			getexp 82233,0;
 		else if (BaseLevel > 70 && BaseLevel < 76)
 		else if (BaseLevel > 70 && BaseLevel < 76)
-			set BaseExp,BaseExp + 212271;
+			getexp 212271,0;
 		else if (BaseLevel > 75 && BaseLevel < 81)
 		else if (BaseLevel > 75 && BaseLevel < 81)
-			set BaseExp,BaseExp + 390738;
+			getexp 390738,0;
 		else if (BaseLevel > 80 && BaseLevel < 86)
 		else if (BaseLevel > 80 && BaseLevel < 86)
-			set BaseExp,BaseExp + 451020;
+			getexp 451020,0;
 		else if (BaseLevel > 85 && BaseLevel < 91)
 		else if (BaseLevel > 85 && BaseLevel < 91)
-			set BaseExp,BaseExp + 546156;
+			getexp 546156,0;
 		else if (BaseLevel > 90)
 		else if (BaseLevel > 90)
-			set BaseExp,BaseExp + 1220358;
+			getexp 1220358,0;
 		close;
 		close;
 	}
 	}
 		else if (god_eremes == 26)
 		else if (god_eremes == 26)
@@ -3270,23 +3271,23 @@ niflheim,109,254,0	script	Egnigem	796,{
 		specialeffect2 245;
 		specialeffect2 245;
 		set god_eremes,27;
 		set god_eremes,27;
 		if (BaseLevel < 56)
 		if (BaseLevel < 56)
-			set BaseExp,BaseExp + 27000;
+			getexp 27000,0;
 		else if (BaseLevel > 55 && BaseLevel < 61)
 		else if (BaseLevel > 55 && BaseLevel < 61)
-			set BaseExp,BaseExp + 30000;
+			getexp 30000,0;
 		else if (BaseLevel > 60 && BaseLevel < 66)
 		else if (BaseLevel > 60 && BaseLevel < 66)
-			set BaseExp,BaseExp + 56052;
+			getexp 56052,0;
 		else if (BaseLevel > 65 && BaseLevel < 71)
 		else if (BaseLevel > 65 && BaseLevel < 71)
-			set BaseExp,BaseExp + 82233;
+			getexp 82233,0;
 		else if (BaseLevel > 70 && BaseLevel < 76)
 		else if (BaseLevel > 70 && BaseLevel < 76)
-			set BaseExp,BaseExp + 212271;
+			getexp 212271,0;
 		else if (BaseLevel > 75 && BaseLevel < 81)
 		else if (BaseLevel > 75 && BaseLevel < 81)
-			set BaseExp,BaseExp + 390738;
+			getexp 390738,0;
 		else if (BaseLevel > 80 && BaseLevel < 86)
 		else if (BaseLevel > 80 && BaseLevel < 86)
-			set BaseExp,BaseExp + 451020;
+			getexp 451020,0;
 		else if (BaseLevel > 85 && BaseLevel < 91)
 		else if (BaseLevel > 85 && BaseLevel < 91)
-			set BaseExp,BaseExp + 546156;
+			getexp 546156,0;
 		else if (BaseLevel > 90)
 		else if (BaseLevel > 90)
-			set BaseExp,BaseExp + 1220358;
+			getexp 1220358,0;
 		close;
 		close;
 	}
 	}
 		else if (god_eremes < 20)
 		else if (god_eremes < 20)

+ 8 - 7
npc/quests/thana_quest.txt

@@ -3,20 +3,21 @@
 //===== By: ==================================================
 //===== By: ==================================================
 //= [Ishizu-chan]
 //= [Ishizu-chan]
 //===== Current Version: =====================================
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //===== Compatible With: =====================================
 //= Any eAthena Version i guess?
 //= Any eAthena Version i guess?
 //===== Description: =========================================
 //===== Description: =========================================
 //= It's the Thanatos Tower Quest...
 //= It's the Thanatos Tower Quest...
 //===== Additional Comments: =================================
 //===== Additional Comments: =================================
-//= 1.0 - First Release [Ishizu-chan]
-//= 1.1 - Updated Thanatos Tower Quest to official. [SinSloth]
-//= 1.2 - Fixed a bug where Reward NPC didn't give you Zeny and Exp. [SinSloth]
-//= 1.3 - Added a checking in boss map to reset event if there's no player. [SinSloth]
-//= 1.4 - Changed the way the Thanatos Portal works to allow people to enter
+//= 1.0 First Release [Ishizu-chan]
+//= 1.1 Updated Thanatos Tower Quest to official. [SinSloth]
+//= 1.2 Fixed a bug where Reward NPC didn't give you Zeny and Exp. [SinSloth]
+//= 1.3 Added a checking in boss map to reset event if there's no player. [SinSloth]
+//= 1.4 Changed the way the Thanatos Portal works to allow people to enter
 //= as long as Thanatos is alive. [SinSloth]
 //= as long as Thanatos is alive. [SinSloth]
 //= 1.4a You may enter either "Charmstone" or "Charm Stone" [Lupus]
 //= 1.4a You may enter either "Charmstone" or "Charm Stone" [Lupus]
 //= 1.5 Fixed a bug in the number part of the quest. [SinSloth]
 //= 1.5 Fixed a bug in the number part of the quest. [SinSloth]
+//= 1.6 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================
 //============================================================
 
 
 hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
 hu_fild01,140,163,5	script	Tower Keeper	852,3,3,{
@@ -531,7 +532,7 @@ function	script	Func_Thana	{
 			mes "and please keep up";
 			mes "and please keep up";
 			mes "the good work~";
 			mes "the good work~";
 			set Zeny,Zeny + countitem(getarg(0)) * 1000;
 			set Zeny,Zeny + countitem(getarg(0)) * 1000;
-			set BaseExp,BaseExp + countitem(getarg(0)) * 2000;
+			getexp countitem(getarg(0))*2000,0;
 			delitem getarg(0),countitem(getarg(0));
 			delitem getarg(0),countitem(getarg(0));
 			close;
 			close;