- 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

1 files changed, 71 insertions, 70 deletions

diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index e2e6ee2f0..0c15b20fd 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -20,6 +20,7 @@
 //= 3.2 Removed mapannounce used while debugging. [L0ne_W0lf]
 //=     Moved the disablewaitingroomevent in dancing portion.
 //= 3.3 Applied Kazukin's fix for the dancing portion. (bugreport:3966) [L0ne_W0lf]
+//= 3.4 Added Renewal Changes. [Kisuka]
 //= 3.4 Updated 'waitingroom' to support required zeny/lvl. [Kisuka]
 //============================================================ 
 
@@ -741,7 +742,7 @@ prt_in,227,45,0	script	Archeologist#sign	804,{
 			mes "You may have had your doubts,";
 			mes "but I'm happy enough to confirm that the Sign really exists. Thanks again, and I hope you stop by and chat from time to time.";
 			set sign_q,142;
-			getexp 2000000,0;
+			getexp 200000,0;
 		}
 		else {
 			mes "[Metz]";
@@ -770,7 +771,7 @@ prt_in,227,45,0	script	Archeologist#sign	804,{
 		mes "on your travels, adventurer.";
 		delitem 7178,1; //Star's_Sob
 		set sign_q,202;
-		getexp 100000,0;
+		getexp 10000,0;
 		getitem 617,1; //Old_Violet_Box
 	}
 	else if (sign_q > 201) {
@@ -1569,19 +1570,19 @@ morocc_in,115,154,5	script	Rogue#sign	810,{
 			mes "you're not a total dumbass.";
 			mes "Now you're supposed to go see Daewoon in Payon. And don't forget to show him this Star thingee.";
 			if (BaseLevel < 60) {
-				getexp 3000,0;
+				getexp 300,0;
 			}
 			else if (BaseLevel < 70) {
-				getexp 7500,0;
+				getexp 750,0;
 			}
 			else if (BaseLevel < 80) {
-				getexp 10000,0;
+				getexp 1000,0;
 			}
 			else if (BaseLevel < 90) {
-				getexp 13000,0;
+				getexp 1300,0;
 			}
-			else if (BaseLevel < 99) {
-				getexp 18000,0;
+			else if (BaseLevel < 150) {
+				getexp 1800,0;
 			}
 			set sign_q,14;
 			getitem 7177,1; //Part_Of_Star's_Sob
@@ -2448,19 +2449,19 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 				set sign_q,15;
 				getitem 7177,1; //Part_Of_Star's_Sob
 				if (BaseLevel < 60) {
-					getexp 3000,0;
+					getexp 300,0;
 				}
 				else if (BaseLevel < 70) {
-					getexp 7000,0;
+					getexp 700,0;
 				}
 				else if (BaseLevel < 80) {
-					getexp 10000,0;
+					getexp 1000,0;
 				}
 				else if (BaseLevel < 90) {
-					getexp 13000,0;
+					getexp 1300,0;
 				}
-				else if (BaseLevel < 99) {
-					getexp 18000,0;
+				else if (BaseLevel < 150) {
+					getexp 1800,0;
 				}
 				emotion e_heh;
 				mes "[Daewoon]";
@@ -2494,19 +2495,19 @@ payon_in03,11,31,4	script	Daewoon#sign	808,{
 				set sign_q,15;
 				getitem 7177,1; //Part_Of_Star's_Sob
 				if (BaseLevel < 60) {
-					getexp 3000,0;
+					getexp 300,0;
 				}
 				else if (BaseLevel < 70) {
-					getexp 7000,0;
+					getexp 700,0;
 				}
 				else if (BaseLevel < 80) {
-					getexp 10000,0;
+					getexp 1000,0;
 				}
 				else if (BaseLevel < 90) {
-					getexp 13000,0;
+					getexp 1300,0;
 				}
-				else if (BaseLevel < 99) {
-					getexp 18000,0;
+				else if (BaseLevel < 150) {
+					getexp 1800,0;
 				}
 				mes "[Daewoon]";
 				mes "You know, after talking with";
@@ -4828,19 +4829,19 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 				}
 				set sign_q,30;
 				if (BaseLevel < 60) {
-					getexp 3000,0;
+					getexp 300,0;
 				}
 				else if (BaseLevel < 70) {
-					getexp 5000,0;
+					getexp 500,0;
 				}
 				else if (BaseLevel < 80) {
-					getexp 8000,0;
+					getexp 800,0;
 				}
 				else if (BaseLevel < 90) {
-					getexp 10000,0;
+					getexp 1000,0;
 				}
-				else if (BaseLevel < 99) {
-					getexp 13000,0;
+				else if (BaseLevel < 150) {
+					getexp 1300,0;
 				}
 				next;
 				warp "cmd_in01",33,29;
@@ -4924,19 +4925,19 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			set sign_q,35;
 			getitem 7177,1; //Part_Of_Star's_Sob
 			if (BaseLevel < 60) {
-				getexp 3000,0;
+				getexp 300,0;
 			}
 			else if (BaseLevel < 70) {
-				getexp 7000,0;
+				getexp 700,0;
 			}
 			else if (BaseLevel < 80) {
-				getexp 19000,0;
+				getexp 1900,0;
 			}
 			else if (BaseLevel < 90) {
-				getexp 12000,0;
+				getexp 1200,0;
 			}
-			else if (BaseLevel < 99) {
-				getexp 17000,0;
+			else if (BaseLevel < 150) {
+				getexp 1700,0;
 			}
 			next;
 			mes "[Dearles]";
@@ -4965,19 +4966,19 @@ cmd_in02,88,51,4	script	Strange Guy#sign	806,{
 			getitem 7177,1; //Part_Of_Star's_Sob
 			set zeny,zeny+20000;
 			if (BaseLevel < 60) {
-				getexp 3000,0;
+				getexp 300,0;
 			}
 			else if (BaseLevel < 70) {
-				getexp 7000,0;
+				getexp 700,0;
 			}
 			else if (BaseLevel < 80) {
-				getexp 10000,0;
+				getexp 1000,0;
 			}
 			else if (BaseLevel < 90) {
-				getexp 14000,0;
+				getexp 1400,0;
 			}
-			else if (BaseLevel < 99) {
-				getexp 19000,0;
+			else if (BaseLevel < 150) {
+				getexp 1900,0;
 			}
 			next;
 			mes "[Dearles]";
@@ -5888,19 +5889,19 @@ alberta_in,125,101,5	script	Wealthy-looking Merchant	807,{
 		set sign_q,53;
 		getitem 7177,1; //Part_Of_Star's_Sob
 		if (BaseLevel < 60) {
-			getexp 5000,0;
+			getexp 500,0;
 		}
 		else if (BaseLevel < 70) {
-			getexp 8000,0;
+			getexp 800,0;
 		}
 		else if (BaseLevel < 80) {
-			getexp 11000,0;
+			getexp 1100,0;
 		}
 		else if (BaseLevel < 90) {
-			getexp 15000,0;
+			getexp 1500,0;
 		}
-		else if (BaseLevel < 99) {
-			getexp 20000,0;
+		else if (BaseLevel < 150) {
+			getexp 2000,0;
 		}
 		close;
 	}
@@ -7192,19 +7193,19 @@ yuno,330,100,4	script	Knight#ss	734,{
 				set sign_q,39;
 				getitem 7181,1; //Receipt_01
 				if (BaseLevel < 60) {
-					getexp 1000,0;
+					getexp 100,0;
 				}
 				else if (BaseLevel < 70) {
-					getexp 2000,0;
+					getexp 200,0;
 				}
 				else if (BaseLevel < 80) {
-					getexp 4000,0;
+					getexp 400,0;
 				}
 				else if (BaseLevel < 90) {
-					getexp 7000,0;
+					getexp 700,0;
 				}
-				else if (BaseLevel < 99) {
-					getexp 11000,0;
+				else if (BaseLevel < 150) {
+					getexp 1100,0;
 				}
 				close;
 			}
@@ -7537,7 +7538,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	85,{
 				mes "If it weren't for your help,";
 				mes "I'd be in big trouble. I really appreciate you stepping in and volunteering your materials like this.";
 				delitem 1002,1; //Iron_Ore
-				getexp 10,0;
+				getexp 1,0;
 				close;
 			case 2:
 				mes "[Engel]";
@@ -8219,7 +8220,7 @@ gef_tower,118,36,4	script	Annoyed Man	64,{
 		else {
 			mes "[Dhota]";
 			mes "You're not even a Mage,";
-			mes "much less a Wizard or a Sage.";
+			mes "much less a Wizard, Sage, Warlock or a Sorcerer.";
 			mes "Why bother climbing this tower?";
 		}
 		mes "What are you doing here?!";
@@ -8387,7 +8388,7 @@ um_in,27,23,3	script	Fastidious-Looking Guy	121,{
 		mes "that you leave, right now!";
 		emotion e_an;
 		close2;
-		warp "um_dun01",129,90;
+		warp "umbala",111,121;
 		end;
 	}
 	else if (sign_q == 74) {
@@ -8534,7 +8535,7 @@ um_in,27,23,3	script	Fastidious-Looking Guy	121,{
 			percentheal -30,0;
 			specialeffect2 EF_MAGNUMBREAK;
 			next;
-			warp "um_dun01",129,90;
+			warp "umbala",111,121;
 			end;
 		}
 	}
@@ -8796,31 +8797,31 @@ himinn,48,86,5	script	Valkyrie#sign	811,{
 		set sign_q,82;
 		percentheal 100,100;
 		if (BaseLevel < 56) {
-			getexp 9000,0;
+			getexp 900,0;
 		}
 		else if ((BaseLevel > 55) && (BaseLevel < 61)) {
-			getexp 12000,0;
+			getexp 1200,0;
 		}
 		else if ((BaseLevel > 60) && (BaseLevel < 66)) {
-			getexp 20000,0;
+			getexp 2000,0;
 		}
 		else if ((BaseLevel > 65) && (BaseLevel < 71)) {
-			getexp 35000,0;
+			getexp 3500,0;
 		}
 		else if ((BaseLevel > 70) && (BaseLevel < 76)) {
-			getexp 70000,0;
+			getexp 7000,0;
 		}
 		else if ((BaseLevel > 75) && (BaseLevel < 81)) {
-			getexp 120000,0;
+			getexp 12000,0;
 		}
 		else if ((BaseLevel > 80) && (BaseLevel < 86)) {
-			getexp 160000,0;
+			getexp 16000,0;
 		}
 		else if ((BaseLevel > 85) && (BaseLevel < 91)) {
-			getexp 210000,0;
+			getexp 21000,0;
 		}
 		else if (BaseLevel > 90) {
-			getexp 350000,0;
+			getexp 35000,0;
 		}
 		close2;
 		warp "geffen",120,100;
@@ -9107,7 +9108,7 @@ que_sign01,196,39,4	script	Serin#serin	90,{
 				mes "ask the Dark Lord to spare";
 				mes "you. Thank you so much...";
 				set sign_q,200;
-				getexp 200000,0;
+				getexp 20000,0;
 				set $@sign_w2,0;
 				donpcevent "Dark Lord#serin::OnDisable";
 				close2;
@@ -9378,7 +9379,7 @@ que_sign01,197,195,4	script	Serin#witch	90,{
 				mes "ask the Dark Lord to spare";
 				mes "you. Thank you so much...";
 				set sign_q,200;
-				getexp 200000,0;
+				getexp 20000,0;
 				set $@sign_w1,0;
 				close2;
 				warp "umbala,",132,203;
@@ -10124,7 +10125,7 @@ niflheim,313,70,4	script	Pleasant-Featured Lady#s	90,{
 				mes "the faint smile on her lips tell you that her memories of you";
 				mes "will always remain in her heart.^000000";
 				delitem 2643,1; //Serin's_Gold_Ring_
-				getexp 500000,0;
+				getexp 50000,0;
 				close;
 			case 2:
 				emotion e_sob;
@@ -10918,7 +10919,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 				mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason, "+strcharinfo(0)+"...";
 				delitem 7313,5; //Seal_Of_Witch
 				set sign_q,129;
-				getexp 500000,0;
+				getexp 50000,0;
 				close;
 			}
 		}
@@ -10949,7 +10950,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 				mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason...";
 				delitem 7313,5; //Seal_Of_Witch
 				set sign_q,130;
-				getexp 300000,0;
+				getexp 30000,0;
 				close;
 			}
 		}
@@ -10980,7 +10981,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 		else {
 			set sign_q,130;
 		}
-		getexp 300000,0;
+		getexp 30000,0;
 		close;
 	}
 	else if (sign_q == 200) {
@@ -11015,7 +11016,7 @@ que_sign01,122,141,4	script	Witch#s	792,{
 			delitem 7308,1; //Witch's_Potion
 		}
 		set sign_q,201;
-		getexp 200000,0;
+		getexp 20000,0;
 		close;
 	}
 	else if (sign_q > 200) {