- Merged /branches/renewal/conf (partial)

- Merged /branches/renewal/db (only mob_db.txt and mob_skill_db.txt)
- Merged /branches/renewal/npc (full)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15060 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 51 insertions, 93 deletions

diff --git a/npc/other/arena/arena_room.txt b/npc/other/arena/arena_room.txt
index bfc0deb18..c742cc021 100644
--- a/npc/other/arena/arena_room.txt
+++ b/npc/other/arena/arena_room.txt
@@ -684,10 +684,10 @@ prt_are_in,98,14,3	script	Givu#arena	728,{
 						close;
 					}
 					set arena_point,arena_point -40;
-					if(BaseLevel < 70) getexp 3000,0;
-					else if(BaseLevel < 80) getexp 9000,0;
-					else if(BaseLevel < 90) getexp 10000,0;
-					else if(BaseLevel < 100) getexp 30000,0;
+					if(BaseLevel < 70) getexp 300,0;
+					else if(BaseLevel < 80) getexp 900,0;
+					else if(BaseLevel < 90) getexp 1000,0;
+					else if(BaseLevel < 151) getexp 3000,0;
 					mes "[Givu]";
 					mes "You have gained experience points. Thank you.";
 					close;
diff --git a/npc/other/monster_race.txt b/npc/other/monster_race.txt
index 08ac734b6..f69bee822 100644
--- a/npc/other/monster_race.txt
+++ b/npc/other/monster_race.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= L0ne_W0lf
 //===== Current Version: =====================================
-//= 1.5
+//= 1.6
 //===== Compatible With: =====================================
 //= eAthena SVN (Trunk, r12752+)
 //===== Description: =========================================
@@ -18,7 +18,8 @@
 //= 1.2 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.3 Ei'felle now gives Exercise. (Bugreport:4092) [L0ne_W0lf]
 //= 1.4 Fixed call to a non-existant event. [L0ne_W0lf]
-//= 1.5 Updated Dialog. [L0e_W0lf]
+//= 1.5 Updated Dialog. [L0ne_W0lf]
+//= 1.6 Updated experience rewards. [L0ne_W0lf]
 //============================================================
 
 //============================================================
@@ -11902,21 +11903,29 @@ S_Reward:
 			mes "power of hope?";
 			delitem 7515,1; //Marvelous_Medal
 			if (BaseLevel < 21)
-				getexp 150,0;
+				getexp 200,0;
 			else if ((BaseLevel > 20) && (BaseLevel < 31))
 				getexp 300,0;
 			else if ((BaseLevel > 30) && (BaseLevel < 41))
-				getexp 2000,0;
+				getexp 1000,0;
 			else if ((BaseLevel > 40) && (BaseLevel < 51))
-				getexp 8000,0;
+				getexp 1800,0;
 			else if ((BaseLevel > 50) && (BaseLevel < 61))
-				getexp 25000,0;
+				getexp 2500,0;
 			else if ((BaseLevel > 60) && (BaseLevel < 71))
-				getexp 47000,0;
+				getexp 4700,0;
 			else if ((BaseLevel > 70) && (BaseLevel < 81))
-				getexp 55000,0;
+				getexp 5500,0;
+			else if ((BaseLevel > 80) && (BaseLevel < 96))
+				getexp 7000,0;
+			else if ((BaseLevel > 95) && (BaseLevel < 111))
+				getexp 8800,0;
+			else if ((BaseLevel > 110) && (BaseLevel < 126))
+				getexp 10900,0;
+			else if ((BaseLevel > 125) && (BaseLevel < 141))
+				getexp 13300,0;
 			else
-				getexp 65000,0;
+				getexp 16000,0;
 			close;
 		case 2:
 			mes "[Ei'felle]";
@@ -11944,81 +11953,30 @@ S_Reward:
 			mes "whatever you feed it.";
 			mes "Placebos and psychosomatic symptoms-- it all ties together.";
 			delitem 7515,1; //Marvelous_Medal
-			if (Upper != 2 && Class < Job_SuperNovice) {
-				if (BaseJob == Job_Novice)
-					getexp 0,30;
-				else if (((BaseJob >= Job_Swordman) && (BaseJob <= Job_Thief)) || (Class == Job_Taekwon)) {
-					if (JobLevel < 11)
-						getexp 0,50;
-					else if ((JobLevel > 10) && (JobLevel < 21))
-						getexp 0,250;
-					else if ((JobLevel > 20) && (JobLevel < 31))
-						getexp 0,1500;
-					else if ((JobLevel > 30) && (JobLevel < 41))
-						getexp 0,7000;
-					else
-						getexp 0,20000;
-				}
-				else if ((BaseJob >= Job_Knight) && (BaseJob <= Job_Crusader2)) {
-					if (JobLevel < 11)
-						getexp 0,80;
-					else if ((JobLevel > 10) && (JobLevel < 21))
-						getexp 0,2000;
-					else if ((JobLevel > 20) && (JobLevel < 31))
-						getexp 0,10000;
-					else if ((JobLevel > 30) && (JobLevel < 41))
-						getexp 0,25000;
-					else
-						getexp 0,38000;
-				}
-			}
-			else if (Upper == 2) {
-				if (Class == Job_Novice_High) {
-					getexp 0,40;
-				}
-				else if ((Class >= Job_Swordman_High) && (Class <= Job_Thief_High)) {
-					if (JobLevel < 11)
-						getexp 0,65;
-					else if ((JobLevel > 10) && (JobLevel < 21))
-						getexp 0,300;
-					else if ((JobLevel > 20) && (JobLevel < 31))
-						getexp 0,2500;
-					else if ((JobLevel > 30) && (JobLevel < 41))
-						getexp 0,10000;
-					else
-						getexp 0,25000;
-				}
-				else if ((Class >= Job_Lord_Knight) && (Class <= Job_Paladin_2)) {
-					if (JobLevel < 11)
-						getexp 0,150;
-					else if ((JobLevel > 10) && (JobLevel < 21))
-						getexp 0,2200;
-					else if ((JobLevel > 20) && (JobLevel < 31))
-						getexp 0,13000;
-					else if ((JobLevel > 30) && (JobLevel < 41))
-						getexp 0,27000;
-					else if ((JobLevel > 40) && (JobLevel < 51))
-						getexp 0,38000;
-					else
-						getexp 0,40000;
-				}
-			}
-			else {
-				if (JobLevel < 11)
-					getexp 0,50;
-				else if ((JobLevel > 10) && (JobLevel < 21))
-					getexp 0,250;
-				else if ((JobLevel > 20) && (JobLevel < 31))
-					getexp 0,1500;
-				else if ((JobLevel > 30) && (JobLevel < 41))
-					getexp 0,7000;
-				else if ((JobLevel > 40) && (JobLevel < 51))
-					getexp 0,20000;
-				else if ((JobLevel > 50) && (JobLevel < 61))
-					getexp 0,30000;
-				else
-					getexp 0,38000;
-			}
+			if (BaseLevel < 21)
+				getexp 0,150;
+			else if ((BaseLevel > 20) && (BaseLevel < 31))
+				getexp 0,200;
+			else if ((BaseLevel > 30) && (BaseLevel < 41))
+				getexp 0,750;
+			else if ((BaseLevel > 40) && (BaseLevel < 51))
+				getexp 0,1800;
+			else if ((BaseLevel > 50) && (BaseLevel < 61))
+				getexp 0,2500;
+			else if ((BaseLevel > 60) && (BaseLevel < 71))
+				getexp 0,3525;
+			else if ((BaseLevel > 70) && (BaseLevel < 81))
+				getexp 0,4125;
+			else if ((BaseLevel > 80) && (BaseLevel < 96)) 
+				getexp 0,5250;
+			else if ((BaseLevel > 95) && (BaseLevel < 111))
+				getexp 0,6600;
+			else if ((BaseLevel > 110) && (BaseLevel < 126))
+				getexp 0,8175;
+			else if ((BaseLevel > 125) && (BaseLevel < 141))
+				getexp 0,9975;
+			else
+				getexp 0,12000;
 			close;
 		case 3:
 			mes "[Ei'felle]";
diff --git a/npc/other/turbotrack/Turbo_Track.txt b/npc/other/turbotrack/Turbo_Track.txt
index e84403c4d..23c0ddc8c 100644
--- a/npc/other/turbotrack/Turbo_Track.txt
+++ b/npc/other/turbotrack/Turbo_Track.txt
@@ -636,13 +636,13 @@ turbo_room,93,117,5	script	Point Exchange Helper	125,{
 					}
 					set tt_point,tt_point-40;
 					if (BaseLevel < 70)
-						getexp 3000,0;
+						getexp 300,0;
 					else if (BaseLevel < 80)
-						getexp 9000,0;
+						getexp 900,0;
 					else if (BaseLevel < 90)
-						getexp 10000,0;
-					else if (BaseLevel < 100)
-						getexp 30000,0;
+						getexp 1000,0;
+					else if (BaseLevel < 151)
+						getexp 3000,0;
 					mes "[Item Exchange Helper]";
 					mes "Thank you, your";
 					mes "Turbo Track Points";