* 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, 26 insertions, 3 deletions

diff --git a/npc/cities/comodo.txt b/npc/cities/comodo.txt
index 1e2af04d4..a775e2fa1 100644
--- a/npc/cities/comodo.txt
+++ b/npc/cities/comodo.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena dev team
 //===== Current Version: ===================================== 
-//= 1.8
+//= 1.9
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -20,6 +20,7 @@
 //= 1.6 Split doomed sword quest to quests/quests_comodo.txt [Evera]
 //= 1.7 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
 //= 1.8 Fixed a small bug. (close -> close2) [L0ne_W0lf]
+//= 1.9 Added a missing Kafra NPC. [L0ne_W0lf]
 //============================================================
 
 // Inside Comodo
@@ -422,6 +423,27 @@ cmd_fild07,94,134,4	script	Sarumane#cmd	100,{
 }
 
 
+cmd_in02,146,180,4	script	Kafra Employee::kaf_comodo2	721,{
+	cutin "kafra_07",2;
+	mes "[Kafra Misty]";
+	mes "Welcome to the";
+	mes "Kafra Corporation.";
+	mes "You know that our";
+	mes "service is always";
+	mes "on your side~";
+	next;
+	mes "[Kafra Misty]";
+	mes "The Kafra Corporation";
+	mes "Western Division promises";
+	mes "the best quality service that";
+	mes "emphasizes reliability, and";
+	mes "total consumer satisfaction.";
+	mes "Thank you for your patronage~";
+	close2;
+	cutin "", 255;
+	end;
+}
+
 // Morroc Field
 //============================================================
 moc_fild12,35,303,4	script	Serutero#cmd	59,{
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index 81b069f78..e59c94da0 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Everybody mentioned in the comments
 //===== Current Version: ===================================== 
-//= 1.4
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena Revision 3000+
 //===== Description: ========================================= 
@@ -28,6 +28,7 @@
 //= 1.4 Implemented the polution script. [MasterOfMuppets]
 //= 1.5 Updated Hotel Employee to work with Airship Ticket Quest [Samuray22]
 //= 1.6 Optimized several NPCs [DZeroX]
+//= 1.7 Replaced outdated variable with getarg. [L0ne_W0lf]
 //============================================================
 
 einbroch,218,198,5	script	Mark#ein	855,{
@@ -89,7 +90,7 @@ einbroch,176,172,5	script	Khemko#ein	855,{
 }
 
 function	script	EinTower	{
-	mes "["+.@name$+"]";
+	mes "[" + getarg(0) + "]";
 	mes "Good day~";
 	mes "I'm " + getarg(0) + ", your";
 	mes "guide to exploring";