* Fixed some minor guild script related bugs.

- And no, this does NOT fix the Emperium spawning issue.

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

2 files changed, 17 insertions, 5 deletions

diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt
index 51d863574..1a43f2527 100644
--- a/npc/guild/gldfunc_ev_agit.txt
+++ b/npc/guild/gldfunc_ev_agit.txt
@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.7
+//= 1.8
 //===== Compatible With: =====================================
 //= eAthena SVN; RO Episode 4+
 //===== Description: =========================================
@@ -31,6 +31,9 @@
 //= 1.6 Fixed the OnAgitBreak message being map-only and not global. (Lil DomX) [L0ne_W0lf]
 //= 1.7 Updated functions, got rid of the various gotos. [L0ne_W0lf]
 //=	Castles can be conquered as long as they un-owned.
+//= 1.8 Fixed Guardian data being overwritten when castle ownership changes. [L0ne_W0lf]
+//	Data will only be saved for guardians if you have the Guaridan Research.
+//	It works this way to deal with a bug on ownership change.
 //============================================================
 
 
@@ -139,7 +142,6 @@ function	script	F_AgitBreak	{
 	set .@map$, getarg(0);
 	set .@castle$, getarg(1);
 
-	//killmonsterall .@map$;
 	set .@GID,getcharid(2);
 	if (.@GID <= 0) return;
 
@@ -158,7 +160,14 @@ function	script	F_AgitBreak	{
 
 	disablenpc "Kafra Staff#"+.@castle$;
 
-	for( set .@i, 4; .@i <= 25; set .@i, .@i+1 )
+	// Set data to be cleared from the castle
+	// If the new owning guild doesn't have have 
+	// Guardian Research erase all guardian data.
+	// Otherwise remove investment data and kafra.
+	if (getgdskilllv(.@GID,10002) == 0) set .@data,25;
+	else set .@data,9;
+
+	for( set .@i, 4; .@i <= .@data; set .@i, .@i+1 )
 		SetCastleData .@map$, .@i, 0;
 
 	return;
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index 86c06443c..009499f3e 100644
--- a/npc/guild/gldfunc_manager.txt
+++ b/npc/guild/gldfunc_manager.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= jAthena - kalen (1.0) & eAthena Team
 //===== Current Version: =====================================
-//= 1.9
+//= 1.9a
 //===== Compatible With: =====================================
 //= eAthena SVN; RO Episode 4+
 //===== Description: =========================================
@@ -37,7 +37,8 @@
 //=	No longer uses defined numerical values for guardian HP calculation
 //=	Guardian summon display list is now DYNAMIC. Updated with guardian corrections.
 //=	Added dialog for castle Abandoning. Commented out be default.
-//= 1.8 Fixed guild members being able to access Guild Master services. [L0ne_W0lf]
+//= 1.9 Fixed guild members being able to access Guild Master services. [L0ne_W0lf]
+//= 1.9a Fixed Kafra cutin not closing if you choose not to dismiss her. [L0ne_W0lf]
 //============================================================
 
 function	script	F_GldManager	{
@@ -303,6 +304,8 @@ function	script	F_GldManager	{
 				case 2:
 					mes "[ Hired Kafra Employee ]";
 					mes "I'll work hard for you... Thank you!";
+					close2;					
+					cutin "kafra_01",255;
 					return 0;
 				}
 				break;