* Rev. 13458 Looooots of bugfixes provided by various people! [L0ne_W0lf]

- Fixed Seal quest checking for oridecon hammer. Again. (Bugreport:2363)
- Fixed some requirements for the socket NPC. (famiong) (Bugreport:2572)
- Fixed a global variable-collision in Z-Gang quest. (Bugreport:2616)
- Fixed issue with Zhed saying things he shouldn't (Bugreport:2627)
- Fixed OnMyMobDwead in Nameless quest issue. (Bugreport:2628)
- Fixed Kyle Hyre script halting on delitem. (Bugreport:2633)
- Added missing part of Peace for Arunafelts (Gepard) (Bugreport:2639)
- Added missing Kafra npc to Comodo. (Daegaladh) (Bugreport:2662)
- Fixed a minor error in Einbroch Tower NPC. (magegahell) (Bugreport:2669)
- Fixed exp reward in Peace for Arunafeltz. (Gepard) (Bugreport:2676)
- Fixed exp reward in Meg. God Seal quest. (Daegaladh) (Bugreport:2677)


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

2 files changed, 6 insertions, 4 deletions

diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 50c683703..8a2b7696e 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -17,6 +17,7 @@
 //= 1.5 Fixed missing close2 in Rebarev Doug. [L0ne_w0lf]
 //= 1.6 Corrected mismatched variables. [L0ne_W0lf]
 //= 1.7 Replaced effect numerics with constants. [Samuray22]
+//= 1.8 Corrected how exp reward is applied. [L0ne_W0lf]
 //============================================================
 
 prt_castle,44,151,0	script	Rebarev Doug	56,{
@@ -3166,7 +3167,7 @@ niflheim,109,254,0	script	Egnigem	796,{
 			specialeffect EF_LOCKON;
 			specialeffect2 EF_HOLYCROSS;
 			set god_eremes,27;
-			set BaseExp,BaseExp+1220358;
+			getexp 1220358,0;
 			close;
 		}
 		else if (god_eremes == 26) {
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index 4a3674729..0f8a6d800 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= SinSloth
 //===== Current Version: ===================================== 
-//= 1.7
+//= 1.8
 //===== Compatible With: ===================================== 
 //= eAthena
 //===== Description: ========================================= 
@@ -19,6 +19,7 @@
 //= 1.6 Fixed checking for Oridecon Hammer. [L0ne_W0lf]
 //=     Corrected Sudi's and player's HP settings.
 //= 1.7 Fixed a copy/paste error in Nordri. [L0ne_W0lf]
+//= 1.8 Fixed item check for Oridecon. [L0ne_W0lf]
 //============================================================
 
 prontera,124,297,3	script	Tialfi	706,{
@@ -2248,7 +2249,7 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					mes "to work!";
 					close;
 				}
-				if (countitem(615) > 0) {
+				if (countitem(984) > 0) {
 					delitem 984,1; //Oridecon
 				}
 				else {