* 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11165 54d463be-8e91-2dee-dedb-b68131a5f0ec

6 files changed, 105 insertions, 161 deletions

diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index d5230660d..e2885e4ee 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
 //=	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;
 		set tu_acolyte01, 3;
 		if(getskilllv(28) == 0){
-			set JobExp,JobExp+100; 
+			getexp 0,100;
 			//misceffect EF_CONE;
 		}
 		close;
@@ -355,13 +356,11 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 				set tu_acolyte01, 5;
 				delitem 1504, 1;
 				if(Class == Job_Acolyte_High){
-					set JobExp,JobExp+1000; 
-					set BaseExp, BaseExp + 2000;
+					getexp 2000,1000;
 					//misceffect EF_CONE;
 					close;
 				} else {
-					set JobExp,JobExp+500;
-					set BaseExp, BaseExp + 1000;
+					getexp 1000,500;
 					//misceffect EF_CONE;
 					close;
 				}
@@ -764,8 +763,7 @@ prt_monk,230,106,3	script	Asthe#tu	79,{
 		mes "[Asthe]";
 		mes "Well, please don't forget what I've taught you. I hope you look back with fondness at our time together amongst these beautiful flowers. May God bless you~";
 		set tu_acolyte01, 25;
-		set JobExp,JobExp+3000;
-		set BaseExp, BaseExp + 5000;
+		getexp 5000,3000;
 		//misceffect EF_CONE;
 		close;
 	}
@@ -840,8 +838,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	110,{
 			mes "Acolyte training.";
 			set tu_acolyte01, 9;
 			percentheal 100,100;
-			set JobExp,JobExp+2000;
-			set BaseExp, BaseExp + 2000;
+			getexp 2000,2000;
 			//misceffect EF_CONE;
 			getitem	505,1;	//Blue_Potion
 			close;
@@ -1071,7 +1068,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	93,{
 				mes "practice your abilities!";
 				mes "It seemed that this good deed has improved your skills.";
 				set tu_acolyte01, 13;
-				set JobExp,JobExp+1000;
+				getexp 0,1000;
 				//misceffect EF_CONE;
 				next;
 				break;
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 72a9fb020..95e461b19 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -14,6 +14,7 @@
 //=	TODO: Test, Add correct misceffects numbers
 //= 1.3 Moved Master Kavaruk (overlapped Phantasmic Arrow
 //=	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 "You should also train and prepare for the future as well.";
 				set tu_archer02, 10;
-				set BaseExp, BaseExp + 2000;
-				set JobExp,JobExp+1000;
+				getexp 2000,1000;
 				close;
 
 			}
@@ -608,7 +608,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 					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!";
 					set tu_archer01, 7;
-					set BaseExp, BaseExp + 500;
+					getexp 500,0;
 					close;
 				}
 				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.";
 				//misceffect EF_WIND ;
 				set tu_archer01, 7;
-				set BaseExp, BaseExp + 500;
+				getexp 500,0;
 				next;
 				emotion e_pif;
 				mes "[Raiden Karus]";
@@ -855,7 +855,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				if(@eagle == 0){
 					//misceffect EF_WIND;
 					set tu_archer01, 10;
-					set JobExp,JobExp+500;
+					getexp 0,500;
 				}
 				emotion e_no1;
 				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!";
 					//misceffect EF_WIND;
 					set tu_archer01, 12;
-					set BaseExp, BaseExp + 1000;
-					set JobExp,JobExp+1000;
+					getexp 1000,1000;
 					getitem 1707, 1;
 					close;
 				}
@@ -1001,8 +1000,7 @@ pay_arche,103,165,5	script	Raiden Karus#tu	832,{
 				mes "this little reward!";
 				//misceffect EF_WIND ;
 				set tu_archer01, 16;
-				set BaseExp, BaseExp + 3000;
-				set JobExp,JobExp+3000;
+				getexp 3000,3000;
 				getitem 1770, 500;
 				next;
 				mes "[Raiden Karus]";
@@ -1341,13 +1339,13 @@ pay_arche,84,139,3	script	Seisner	727,{
 		//misceffect EF_WIND ;
 		set tu_archer01, 3;
 		if(JobLevel == 1){
-			set JobExp,JobExp+30;
+			getexp 0,30;
 		} else if((JobLevel > 1) && (JobLevel < 11)){	
-			set JobExp,JobExp+100;
+			getexp 0,100;
 		} else if((JobLevel > 10) && (JobLevel < 21)){
-			set JobExp,JobExp+250;
+			getexp 0,250;
 		} else {
-			set JobExp,JobExp+500;
+			getexp 0,500;
 		}
 		end;
 	}
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index a8e8a8a2c..a82b27e08 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.1 Optimized [Lupus]
 //=	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 "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 BaseExp,BaseLevel*30;
-		set JobExp,BaseLevel*15;
+		getexp BaseLevel*30,BaseLevel*15;
 		//misceffect EF_HIT5;
 		close;
 		break;
@@ -304,24 +304,19 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 					set tu_magician01, 2;
 					//misceffect EF_HIT5;
 					if(tu_mana&1){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					if(tu_mana&2){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					if(tu_mana&4){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					if(tu_mana&8){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					if(tu_mana&16){
-						set BaseExp, BaseExp + 150;
-						set JobExp,JobExp+70;
+						getexp 150,70;
 					}
 					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 "so if the 'Pupa' is acting weird be extra careful.";
 		set tu_magician01, 3;
-		set BaseExp, BaseExp + 400;
-		set JobExp,JobExp+200;
+		getexp 400,200;
 		//misceffect EF_HIT5;
 		close;
 		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 "move on to explain the other skills.";
 			set tu_magician01, 5;
-			set BaseExp, BaseExp + 400;
-			set JobExp,JobExp+200;
+			getexp 400,200;
 			//misceffect EF_HIT5;
 			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 "move on to explain the other skills.";
 			set tu_magician01, 5;
-			set BaseExp, BaseExp + 400;
-			set JobExp,JobExp+200;
+			getexp 400,200;
 			//misceffect EF_HIT5;
 			close;
 		}
@@ -632,32 +624,25 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 				getitem 1604, 1;
 				//misceffect EF_HIT5;
 				if(tu_mana&1){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				if(tu_mana&2){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				if(tu_mana&4){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				if(tu_mana&8){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				if(tu_mana&16){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				if(tu_mana&32){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				if(tu_mana&64){
-					set BaseExp, BaseExp + 300;
-					set JobExp,JobExp+100;
+					getexp 300,100;
 				}
 				set tu_mana,0;
 				close;
@@ -737,8 +722,7 @@ geffen,67,180,4	script	New Mage Manager#M	102,{
 		set tu_magician01, 28;
 		getitem 2321, 1;
 		set Zeny, Zeny + 3000;
-		set BaseExp, BaseExp + 3000;
-		set JobExp, JobExp + 1000;
+		getexp 3000,1000;
 		close;
 		break;
 	default:
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index 0ed8b7210..51c9e69b3 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.1 Fixed bugs, optimized [Lupus] 1.2 fixed Weight check
 //=	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 "You've taught yourself well. Here, you've earned this little reward~";
 			set tu_merchant, 17;
-			set BaseExp, BaseExp + 1860;
-			set JobExp, JobExp + 604;
+			getexp 1860,604;
 			next;
 		} else if(@chk_vend == 10){
 			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!";
 			set tu_merchant, 17;
-			set BaseExp, BaseExp + 1990;
-			set JobExp, JobExp + 699;
+			getexp 1990,699;
 			//misceffect EF_HIT5;
 			next;
 		} else {
@@ -122,8 +121,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			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~";
 			set tu_merchant, 17;
-			set BaseExp, BaseExp + 1860;
-			set JobExp, JobExp + 604;
+			getexp 1860,604;
 			//misceffect EF_HIT5;
 			next;
 		} else if(@chk_vend == 10){
@@ -137,8 +135,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "little reward for";
 			mes "all your efforts~";
 			set tu_merchant, 17;
-			set BaseExp, BaseExp + 1990;
-			set JobExp, JobExp + 699;
+			getexp 1990,699;
 			//misceffect EF_HIT5;
 			next;
 		} else {
@@ -178,8 +175,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "You deserve a little";
 			mes "reward for your effort~";
 			set tu_merchant, 15;
-			set BaseExp, BaseExp + 1620;
-			set JobExp, JobExp + 520;
+			getexp 1620,520;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -190,8 +186,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Excellent!";
 			mes "You've actually went above and beyond mastered the Push Cart skill. Great work!";
 			set tu_merchant, 15;
-			set BaseExp, BaseExp + 1860;
-			set JobExp, JobExp + 604;
+			getexp 1860,604;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -233,8 +228,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "speed, it shouldn't be a big deal.";
 			mes "Well done~";
 			set tu_merchant, 15;
-			set BaseExp, BaseExp + 1620;
-			set JobExp, JobExp + 520;
+			getexp 1620,520;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -246,8 +240,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "mastered the Push Cart skill.";
 			mes "You truly deserve a little bit of a reward~";
 			set tu_merchant, 15;
-			set BaseExp, BaseExp + 1860;
-			set JobExp, JobExp + 602;
+			getexp 1860,602;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -279,8 +272,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "as I asked. Please,";
 			mes "take this little reward~";
 			set tu_merchant, 13;
-			set BaseExp, BaseExp + 1260;
-			set JobExp, JobExp + 272;
+			getexp 1260,272;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -293,8 +285,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "mastered Over Charge?";
 			mes "Most impressive! You deserve a small reward for your work!";
 			set tu_merchant, 13;
-			set BaseExp, BaseExp + 1420;
-			set JobExp, JobExp + 336;
+			getexp 1420,336;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -327,8 +318,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "[Guarnien]";
 			mes "Ah, you've already learned Level 4 Over Charge. Perfect! Let me give you a little reward~";
 			set tu_merchant, 13;
-			set BaseExp, BaseExp + 1260;
-			set JobExp, JobExp + 272;
+			getexp 1260,272;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -339,8 +329,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "[Guarnien]";
 			mes "Amazing! You've already mastered the Over Charge skill! You must have wanted this reward badly~";
 			set tu_merchant, 13;
-			set BaseExp, BaseExp + 1420;
-			set JobExp, JobExp + 336;
+			getexp 1420,336;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -385,8 +374,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 		mes "Let me see those";
 		mes "Red Potions. Ah, it seems you researched the market and bought the cheapest ones! Great work!";
 		set tu_merchant, 11;
-		set BaseExp, BaseExp + 1120;
-		set JobExp, JobExp + 220;
+		getexp 1120,220;
 		//misceffect EF_HIT5;
 		next;
 		mes "[Guarnien]";
@@ -440,8 +428,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "how to use the Discount skill";
 			mes "well enough. Good, here's a little reward for your hard work~";
 			set tu_merchant, 5;
-			set BaseExp, BaseExp + 830;
-			set JobExp, JobExp + 116;
+			getexp 830,116;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -451,8 +438,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Incredible!";
 			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 BaseExp, BaseExp + 970;
-			set JobExp, JobExp + 180;
+			getexp 970,180;
 			next;
 			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?";
@@ -486,8 +472,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Here, take this";
 			mes "small reward~";
 			set tu_merchant, 5;
-			set BaseExp, BaseExp + 830;
-			set JobExp, JobExp + 116;
+			getexp 830,116;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -498,8 +483,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			mes "Incredible!";
 			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 BaseExp, BaseExp + 970;
-			set JobExp, JobExp + 180;
+			getexp 970,180;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -539,8 +523,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			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?";
 			set tu_merchant, 3;
-			set BaseExp, BaseExp + 700;
-			set JobExp, JobExp + 58;
+			getexp 700,58;
 			//misceffect EF_HIT5;
 			next;
 			mes "[Guarnien]";
@@ -577,8 +560,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 				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!";
 				set tu_merchant, 2;
-				set BaseExp, BaseExp + 585;
-				set JobExp, JobExp + 43;
+				getexp 585,43;
 				getitem 1351, 1;
 				next;
 				mes "[Guarnien]";
@@ -643,8 +625,7 @@ alberta_in,70,51,5	script	Guarnien	98,{
 			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!";
 				//misceffect EF_HIT5;
-				set BaseExp, BaseExp + 585;
-				set JobExp, JobExp + 43;
+				getexp 585,43;
 				getitem 1351, 1;
 				next;
 				mes "[Guarnien]";
diff --git a/npc/quests/first_class/tu_sword.txt b/npc/quests/first_class/tu_sword.txt
index 9c185d8ea..8b1f306d0 100644
--- a/npc/quests/first_class/tu_sword.txt
+++ b/npc/quests/first_class/tu_sword.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.3
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -13,6 +13,7 @@
 //= 1.1 optimized [Lupus]
 //=	TODO: Test, Add correct misceffects numbers
 //= 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 "your great efforts. But do not let your talents allow you to grow arrogant!";
 			set tu_swordman, 23;
-			set BaseExp, BaseExp + 1860;
+			getexp 1860,0;
 			getitem 1113, 1;
 			next;
 			mes "[Shurank]";
@@ -193,7 +194,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "in recognition of";
 			mes "your accomplishment.";
 			set tu_swordman, 22;
-			set BaseExp, BaseExp + 1860;
+			getexp 1860,0;
 			next;
 			mes "[Shurank]";
 			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 "From that gleen of toughness upon your skin, I see now that I was foolish to ask. Well done~";
 			set tu_swordman, 13;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -279,7 +280,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			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 BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -352,7 +353,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			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!";
 			set tu_swordman, 13;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			mes "[Shurank]";
 			mes "Ah, once again, I have";
@@ -374,7 +375,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			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.";
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1120;
+			getexp 1120,0;
 			next;
 			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.";
@@ -388,7 +389,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			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.";
@@ -438,7 +439,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			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.";
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1120;
+			getexp 1120,0;
 			next;
 			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.";
@@ -452,7 +453,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			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.";
 			close;
@@ -532,7 +533,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			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.";
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1120;
+			getexp 1120,0;
 			next;
 			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.";
@@ -546,7 +547,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "an outstanding Swordman.";
 			mes "Here is a small reward...";
 			set tu_swordman, 10;
-			set BaseExp, BaseExp + 1260;
+			getexp 1260,0;
 			next;
 			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.";
@@ -637,7 +638,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			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!";
 			set tu_swordman, 5;
-			set BaseExp, BaseExp + 1120;
+			getexp 1120,0;
 			next;
 		} else {
 			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 "all of the basics.";
 			set tu_swordman, 4;
-			set BaseExp, BaseExp + 970;
+			getexp 970,0;
 			getitem 2503, 1;
 			close;
 		} 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 "you grow stronger.";
 			set tu_swordman, 3;
-			set BaseExp, BaseExp + 830;
+			getexp 830,0;
 			close;
 		} else if(@chk_bash == 10){
 			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 "all of the basics.";
 			set tu_swordman, 4;
-			set BaseExp, BaseExp + 970;
+			getexp 970,0;
 			getitem 2503, 1;
 			close;
 		} 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 "of the fundamentals to cover!";
 			set tu_swordman, 2;
-			set BaseExp, BaseExp + 585;
+			getexp 585,0;
 			close;
 		} else if((@chk_bash > 4) && (@chk_bash < 10)){
 			mes "[Shurank]";
@@ -790,7 +791,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			mes "[Shurank]";
 			mes "For your efforts and patience, I offer you this small reward. Please take it and grow even stronger...";
 			set tu_swordman, 3;
-			set BaseExp, BaseExp + 830;
+			getexp 830,0;
 			next;
 			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.";
@@ -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 "all of the basics.";
 			set tu_swordman, 4;
-			set BaseExp, BaseExp + 970;
+			getexp 970,0;
 			getitem 2503, 1;
 			close;
 		} else {
@@ -838,7 +839,7 @@ izlude_in,82,163,3	script	Shurank	733,{
 			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!";
 			set tu_swordman, 1;
-			set BaseExp, BaseExp + 490;
+			getexp 490,0;
 			close;
 		} else if((@chk_bash > 0) && (@chk_bash < 5)){
 			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 "of the fundamentals to cover!";
 			set tu_swordman, 2;
-			set BaseExp, BaseExp + 585;
+			getexp 585,0;
 			close;
 		} else if((@chk_bash > 4) && (@chk_bash < 10)){
 			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 "of the fundamentals to cover!";
 			set tu_swordman, 3;
-			set BaseExp, BaseExp + 830;
+			getexp 830,0;
 			next;
 			mes "[Shurank]";
 			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 "all of the basics.";
 			set tu_swordman, 4;
-			set BaseExp, BaseExp + 970;
+			getexp 970,0;
 			getitem 2503, 1;
 			close;
 		}
@@ -1051,7 +1052,7 @@ if((tu_swordman == 17) || (tu_swordman == 18)){
 			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!";
 			set tu_swordman, 19;
-			set BaseExp, BaseExp + 1620;
+			getexp 1620,0;
 			close2;
 			warp "moc_fild07",359,201;
 			end;
@@ -2147,7 +2148,7 @@ if(tu_swordman == 6){
 							mes "[Dequ'ee]";
 							mes "Thank you for taking the trouble to come this far. Let me reward you with some experience points.";
 							set tu_swordman, 7;
-							set BaseExp, BaseExp + 1120;
+							getexp 1120,0;
 							next;
 							mes "[Dequ'ee]";
 							mes "Take care";
diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt
index 718ec8043..6290cce8c 100644
--- a/npc/quests/first_class/tu_thief01.txt
+++ b/npc/quests/first_class/tu_thief01.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Fix up by Jukka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= eAthena SVN (Testet in Trunk 88xx)
 //===== Description: ========================================= 
@@ -12,6 +12,7 @@
 //= 1.0 Fully working
 //= 1.1 optimized [Lupus]
 //=	TODO: Test, Add correct misceffects numbers
+//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
 //============================================================ 
 
 //=================================================Thief Trainer====================================================
@@ -85,8 +86,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				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.";
 				set tu_thief01, 1;
-				set BaseExp, BaseExp + 200;
-				set JobExp, JobExp + 100;
+				getexp 200,100;
 				//misceffect EF_HIT5;
 				close;
 				break;
@@ -103,8 +103,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "Sure, ^23238EDEX^000000 and LUK can";
 				mes "also increase your attack damage, but they're insignificant compared to STR. I repeat: ^660000insignificant^000000.";
 				set tu_thief01, 1;
-				set BaseExp, BaseExp + 400;
-				set JobExp, JobExp + 200;
+				getexp 400,200;
 				//misceffect EF_HIT5;
 				close;
 				break;
@@ -120,8 +119,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				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.";
 				set tu_thief01, 1;
-				set BaseExp, BaseExp + 200;
-				set JobExp, JobExp + 100;
+				getexp 200,100;
 				//misceffect EF_HIT5;
 				close;
 				break;
@@ -232,8 +230,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			mes "about any other skills,";
 			mes "I can explain real quick.";
 			set tu_thief01, 3;
-			set BaseExp, BaseExp + (BaseLevel * 30);
-			set JobExp, JobExp + (BaseLevel *15);
+			getexp BaseLevel*30,BaseLevel*15;
 			//misceffect EF_HIT5;//CHECK
 			close;
 		} else if(tu_thief01 == 3){
@@ -333,28 +330,22 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 					set tu_thief01, 4;
 					//misceffect EF_HIT5;
 					if(@read_d){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					if(@read_f){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					if(@read_s){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					if(@read_p){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					if(@read_h){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					if(@read_r){
-						set BaseExp, BaseExp + 300;
-						set JobExp, JobExp + 100;
+						getexp 300,100;
 					}
 					close;
 					break;
@@ -373,8 +364,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 			set tu_thief01, 5;
 			savepoint "moc_ruins",80,164;
 			getitem 602, 1;
-			set BaseExp, BaseExp + 100;
-			set JobExp, JobExp + 50;
+			getexp 100,50;
 			//misceffect EF_HIT5;
 			close2;
 			warp "moc_fild12",158,373;
@@ -427,8 +417,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "They are still poisonous.";
 						set tu_thief01, 8;
 						getitem 1207, 1;
-						set BaseExp, BaseExp + 1000;
-						set JobExp, JobExp + 500;
+						getexp 1000,500;
 						//misceffect EF_HIT5;
 						close;
 						break;
@@ -440,8 +429,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "Hahaha...";
 						set tu_thief01, 7;
 						getitem 1207, 1;
-						set BaseExp, BaseExp + 500;
-						set JobExp, JobExp + 200;
+						getexp 500,200;
 						//misceffect EF_HIT5;
 						close;
 						break;
@@ -459,8 +447,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "Hahaha...";
 						set tu_thief01, 7;
 						getitem 1207, 1;
-						set BaseExp, BaseExp + 500;
-						set JobExp, JobExp + 200;
+						getexp 500,200;
 						//misceffect EF_HIT5;
 						close;
 						break;
@@ -472,8 +459,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 						mes "Hahaha...";
 						set tu_thief01, 7;
 						getitem 1207, 1;
-						set BaseExp, BaseExp + 500;
-						set JobExp, JobExp + 200;
+						getexp 500,200;
 						//misceffect EF_HIT5;
 						close;
 						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 "He might try to use poison with the Gemstone.";
 			set tu_thief01, 8;
-			set BaseExp, BaseExp + 200;
-			set JobExp, JobExp + 100;
+			getexp 200,100;
 			//misceffect EF_HIT5;
 			close;
 		} else if(tu_thief01 == 8){
@@ -594,8 +579,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				set tu_thief01, 27;
 				set Mantle, 1; // Why this? Maybe getitem? [Jukka]
 				set Zeny, Zeny + 5000;
-				set BaseExp, BaseExp + 8000;
-				set JobExp, JobExp + 3000;
+				getexp 8000,3000;
 				next;
 				mes "[Yierhan]";
 				mes "Take care now.";
@@ -705,8 +689,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	84,{
 				mes "Take care now.";
 				set tu_magician01, 27;
 				set Zeny, Zeny + 5000;
-				set BaseExp, BaseExp + 5000;
-				set JobExp, JobExp + 2000;
+				getexp 5000,2000;
 				close2;
 				break;
 			}