fixed possible double levelup bugs, merged 1st class quests from trunk

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

npc/Changelog.txt

@@ -35,6 +35,7 @@ Date		Added
 ======
 11/17
 	* Added official kRo&idRO Skill Reset Event, thanks to $ephiroth [Lupus]
+	- Fixed possible double levelup bugs [Lupus]
 11/16
 	* Fixed wrong label name in adoption NPC [KarLaeda]
 	* Added official Ninja Job quest! Thanks to Legionaire for translation [Lupus]

npc/quests/quests_ein.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.4.2
+//= 1.5
 //===== Compatible With: ===================================== 
 //= eAthena 7.15 +
 //===== Description: ========================================= 
@@ -17,6 +17,7 @@
 //= 1.3 Implemented the polution quest. [MasterOfMuppets]
 //= 1.4.1 Massive bugfix. Fixed Pollution exploit [Lupus]
 //= 1.4.2 Fixed Khowropher bug [Lupus]
+//= 1.5 Fixed double levelup bug [Lupus]
 //============================================================ 
 
 
@@ -1466,11 +1467,11 @@ L_P2:
 	close2;
 	set Shinokas_Quest,10;
 	if(BaseLevel < 41)set BaseExp,BaseExp+34750;
-	if(BaseLevel > 40 && BaseLevel < 61)set BaseExp,BaseExp+69500;
-	if(BaseLevel > 60 && BaseLevel < 71)set BaseExp,BaseExp+139000;
-	if(BaseLevel > 70 && BaseLevel < 81)set BaseExp,BaseExp+278000;
-	if(BaseLevel > 80 && BaseLevel < 91)set BaseExp,BaseExp+417000;
-	if(BaseLevel > 90)set BaseExp,BaseExp+556000;
+	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;
 	end;
 	
 L_NNotify:
@@ -3543,12 +3544,12 @@ s_Switches:
 		set EinFactory,16;
 		set $EinPolution,$EinPolution+1;
 		if(BaseLevel < 41) set BaseExp,BaseExp+615;
-		if((BaseLevel >= 41) && (BaseLevel < 51)) set BaseExp,BaseExp+3075;
-		if((BaseLevel >= 51) && (BaseLevel < 61)) set BaseExp,BaseExp+6604;
-		if((BaseLevel >= 61) && (BaseLevel < 71)) set BaseExp,BaseExp+18508;
-		if((BaseLevel >= 71) && (BaseLevel < 81)) set BaseExp,BaseExp+32062;
-		if((BaseLevel >= 81) && (BaseLevel < 91)) set BaseExp,BaseExp+76026;
-		if(BaseLevel >= 91) set BaseExp,BaseExp+290675;
+		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;
 		mes "[Zelmeto]";
 		mes "I don't know how";
 		mes "I can possible pay you";

npc/quests/quests_lighthalzen.txt

@@ -4,7 +4,7 @@
 //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets,
 //= Lupus, Lord Gywall
 //===== Current Version: ===================================== 
-//= 2.8
+//= 2.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -49,6 +49,7 @@
 //=	reused cubekey var for 4 Cube Room key vars
 //= 2.8 More optimization. Also fixed bug with "2x short sticks -> long" [Lupus]
 //=	Now uses MISC_QUEST&512 instead of 'hzdun'. WIP
+//= 2.9 Fixed Friendship Quest levelup exploit (u could get EXP twice) [Lupus]
 //============================================================ 
 
 lighthalzen.gat,1,1,7	script	sneakAddSuber	-1,{
@@ -1861,7 +1862,7 @@ lighthalzen.gat,337,232,3	script	Maku	870,{
 	mes "out the rich section of town.";
 	mes "I'm bitter, but I'll also admit";
 	mes "it's way nicer than this place.";
-	set friendship,1;
+	if(BaseLevel > 29) set friendship,1;
 	close;
 
 
@@ -2524,11 +2525,11 @@ s_Ask:
 	mes "of us get together, I'll be";
 	mes "sure to let you know~";
 	if(BaseLevel < 41)set BaseExp,BaseExp+49500;
-	if(BaseLevel > 40 && BaseLevel < 61)set BaseExp,BaseExp+99000;
-	if(BaseLevel > 60 && BaseLevel < 71)set BaseExp,BaseExp+198000;
-	if(BaseLevel > 70 && BaseLevel < 81)set BaseExp,BaseExp+396000;
-	if(BaseLevel > 80 && BaseLevel < 91)set BaseExp,BaseExp+594000;
-	if(BaseLevel > 90)set BaseExp,BaseExp+792000;
+	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;
 	getitem 7350,1;
 	set friendship,11;
 	set friendship3,0;

npc/quests/quests_louyang.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Evera and The eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 1.0a
+//= 1.1
 //===== Compatible With: ===================================== 
 //= eAthena 1.0
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //= Poison King  Quest
 //===== Additional Comments: ================================= 
 //= 1.0 Initial Release [Evera]
+//= 1.1 Fixed double levelup bug [Lupus]
 //============================================================ 
 
 //============================================================
@@ -1989,14 +1990,14 @@ s_CameBack:
 	set QL_POISONPATH,0;
 	getitem 678,3;
 	if(BaseLevel < 56)set BaseExp,BaseExp+8909;
-	if(BaseLevel > 55 && BaseLevel < 61)set BaseExp,BaseExp+10213;
-	if(BaseLevel > 60 && BaseLevel < 66)set BaseExp,BaseExp+17684;
-	if(BaseLevel > 65 && BaseLevel < 71)set BaseExp,BaseExp+25411;
-	if(BaseLevel > 70 && BaseLevel < 76)set BaseExp,BaseExp+68757;
-	if(BaseLevel > 75 && BaseLevel < 81)set BaseExp,BaseExp+128246;
-	if(BaseLevel > 80 && BaseLevel < 86)set BaseExp,BaseExp+142340;
-	if(BaseLevel > 85 && BaseLevel < 91)set BaseExp,BaseExp+152052;
-	if(BaseLevel > 90)set BaseExp,BaseExp+366786;
+	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;
 	warp "louyang.gat",270,136;
 	end;
 
@@ -3022,14 +3023,14 @@ s_Letter:
 	mes "like you're becoming more powerful";
 	mes "and gaining experience.";
 	if(BaseLevel < 56)set BaseExp,BaseExp+9000;
-	if(BaseLevel > 55 && BaseLevel < 61)set BaseExp,BaseExp+10500;
-	if(BaseLevel > 60 && BaseLevel < 66)set BaseExp,BaseExp+18684;
-	if(BaseLevel > 65 && BaseLevel < 71)set BaseExp,BaseExp+27411;
-	if(BaseLevel > 70 && BaseLevel < 76)set BaseExp,BaseExp+70757;
-	if(BaseLevel > 75 && BaseLevel < 81)set BaseExp,BaseExp+130246;
-	if(BaseLevel > 80 && BaseLevel < 86)set BaseExp,BaseExp+150340;
-	if(BaseLevel > 85 && BaseLevel < 91)set BaseExp,BaseExp+182052;
-	if(BaseLevel > 90)set BaseExp,BaseExp+406786;
+	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;
 	set QL_POISONKING,17;
 	close2;
 	warp "louyang.gat",270,136;