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

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

1 files changed, 8 insertions, 7 deletions

diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 16326b6f9..b1fcd2fb0 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/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;