Merge branch 'master' of https://github.com/HerculesWS/Hercules

4 files changed, 7 insertions, 15 deletions

diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 627688922..523b5ff00 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -45,6 +45,7 @@
 //= 2.6a Added 'npcskill' command. [Euphy]
 //= 2.7 Updated incorrect EXP values & added checkre() checks [Streusel]
 //= 2.7a Modified Promotional Staff for Izlude
+//= 2.8 Fixed a missing variable check. [Joseph]
 //============================================================
 
 // Onward to the New World
@@ -11152,7 +11153,7 @@ prt_castle,88,165,3	script	Laur	57,{
 		if (ep13_1_edq == 9) set ep13_1_edq,101;
 		else if (ep13_1_edq == 111) set ep13_1_edq,112;
 		else if (ep13_1_edq == 121) set ep13_1_edq,122;
-		else if (ep13_1_edq == 113) {
+		else if (ep13_1_edq == 113 || ep13_1_edq == 123) { 
 			set ep13_1_edq,13;
 			changequest 3093,3094;
 		}
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 12122d883..38320b344 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -5,7 +5,7 @@
 //===== Current Version: ===================================== 
 //= 2.9
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= - Stop Post
 //= - Binoculars Quest
 //= - Assassin Pub NPCs/supporting quest NPCS. [Disabled]
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index e2be244ea..5c796c3b8 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -1963,11 +1963,6 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					mes "me to do with this?";
 					close;
 				}
-				if (getequipisidentify(.@part) == 0) {
-					mes "[Vestri]";
-					mes "You'd better identify this item first. If we don't know what it is, what's the point of upgrading it?";
-					close;
-				}
 				if (getequiprefinerycnt(.@part) >= 10) {
 					mes "[Vestri]";
 					mes "Oh, this is excellent! This piece here has been perfectly refined! But this isn't what I want. I can't do any work on this at all.";
@@ -2189,11 +2184,6 @@ mjolnir_01,35,136,7	script	Dwarf Blacksmith#west	826,{
 					mes "me to do with this?";
 					close;
 				}
-				if (getequipisidentify(.@part) == 0) {
-					mes "[Vestri]";
-					mes "You'd better identify this item first. If we don't know what it is, what's the point of upgrading it?";
-					close;
-				}
 				if (getequiprefinerycnt(.@part) >= 10) {
 					mes "[Vestri]";
 					mes "Oh, this is excellent! This piece here has been perfectly refined! But this isn't what I want. I can't do any work on this at all.";
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index 588009547..03a52023f 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -3,11 +3,11 @@
 //===== By: ================================================== 
 //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs)
 //===== Current Version: ===================================== 
-//= 3.7
+//= 3.8
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
-//= [Aegis Conversion]
+//= [Official Conversion]
 //= Quest for opening the doors to Geffenia.
 //= This script uses sign_01.bmp - sign_04.bmp, these will be
 //= found in the language of your client.
@@ -25,6 +25,7 @@
 //= 3.5 Fixed two bugs. 4230 & 4404 [CalciumKid]
 //= 3.6 Corrected the Level Requirements for 'Standby Room' [tr0n]
 //= 3.7 Massive cleaning/optimization (more can still be done). [Euphy]
+//= 3.8 Corrected an invalid map name. [Joseph]
 //============================================================ 
 
 //============================================================ 
@@ -12348,7 +12349,7 @@ Oncall:
 	end;
 
 OnMyMobDead:
-	if (mobcount("gue_sign01","CallMonster#witch::OnMyMobDead") < 1) {
+	if (mobcount("que_sign01","CallMonster#witch::OnMyMobDead") < 1) {
 		donpcevent "Serin#witch::OnEnable";
 	}
 	end;