From 03cc029170d3ccdc02864d691b8aecd9d14ae7cd Mon Sep 17 00:00:00 2001
From: MasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 14 Jun 2006 12:55:47 +0000
Subject: Fixed some quests giving too much exp. Also fixed a major problem in
 the level 4 weapon quest, thanks to Qwadrat.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7159 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 npc/Changelog.txt                 |  2 ++
 npc/cities/einbech.txt            | 10 +++++-----
 npc/quests/Lvl4_weapon_quest.txt  |  2 +-
 npc/quests/quests_lighthalzen.txt | 10 +++++-----
 4 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'npc')

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index acfc1b46b..ce8c1826d 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -37,6 +37,8 @@ Musashiden
 Date		Added
 ======
 06/14
+	* Fixed some experience gained bugs in two scripts. [MasterOfMuppets]
+	- Also fixed a major problem in the level 4 weapon quest, thanks to Qwadrat.
 	* Fixed an exploit in the comodo gambling script, thanks to reddozen [MasterOfMuppets]
 06/13
 	* Fixed exploit in Louyang NPC [Playtester]
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index 8327e2df1..b0fd9fb80 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -1385,11 +1385,11 @@ L_P2:
 	mes "their intentions can't be good.";
 	close2;
 	set einbech_buender,3;
-	if(BaseLevel < 40)set BaseExp,BaseExp+34750;
-	if(BaseLevel < 60)set BaseExp,BaseExp+69500;
-	if(BaseLevel > 60 && BaseLevel < 70)set BaseExp,BaseExp+139000;
-	if(BaseLevel > 70 && BaseLevel < 80)set BaseExp,BaseExp+278000;
-	if(BaseLevel > 80 && BaseLevel < 90)set BaseExp,BaseExp+417000;
+	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;
 	end;
 	
diff --git a/npc/quests/Lvl4_weapon_quest.txt b/npc/quests/Lvl4_weapon_quest.txt
index ce2af0856..e2a674fc1 100644
--- a/npc/quests/Lvl4_weapon_quest.txt
+++ b/npc/quests/Lvl4_weapon_quest.txt
@@ -1293,7 +1293,7 @@ LV4_15:
 	if (countitem($@LV4_Phlogopite) >= 30 && countitem($@LV4_Olivine) >= 30 && countitem($@LV4_Rose_Quartz) >= 30) goto LV4_15_POR;
 	if (countitem($@LV4_Phlogopite) >= 30 && countitem($@LV4_Olivine) >= 30) goto LV4_15_PO;
 	if (countitem($@LV4_Phlogopite) >= 30 && countitem($@LV4_Rose_Quartz) >= 30) goto LV4_15_PR;
-	if (countitem($@LV4_Olivine) >= 30 && countitem($@LV4_Rose_Quartz) >= 30) goto LV4_15_PR;
+	if (countitem($@LV4_Olivine) >= 30 && countitem($@LV4_Rose_Quartz) >= 30) goto LV4_15_OR;
 	if (countitem($@LV4_Phlogopite) >= 30) goto LV4_15_P;
 	if (countitem($@LV4_Olivine) >= 30) goto LV4_15_O;
 	if (countitem($@LV4_Rose_Quartz) >= 30) goto LV4_15_R;
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index a47a3384b..9f8ab910f 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -2512,11 +2512,11 @@ s_Ask:
 	mes "adventurer. When the three";
 	mes "of us get together, I'll be";
 	mes "sure to let you know~";
-	if(BaseLevel < 40)set BaseExp,BaseExp+49500;
-	if(BaseLevel < 60)set BaseExp,BaseExp+99000;
-	if(BaseLevel > 60 && BaseLevel < 70)set BaseExp,BaseExp+198000;
-	if(BaseLevel > 70 && BaseLevel < 80)set BaseExp,BaseExp+396000;
-	if(BaseLevel > 80 && BaseLevel < 90)set BaseExp,BaseExp+594000;
+	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;
 	getitem 7350,1;
 	set friendship,11;
-- 
cgit v1.2.3-70-g09d2