Browse Source

Corrected one setcastledata call that I missed in r11915

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12116 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 17 years ago
parent
commit
4cd9a940e5
2 changed files with 9 additions and 8 deletions
  1. 2 0
      npc/Changelog.txt
  2. 7 8
      npc/guild/gldfunc_ev_agit.txt

+ 2 - 0
npc/Changelog.txt

@@ -1,5 +1,7 @@
 Date		Added
 ======
+2008/01/20
+	* Corrected one setcastledata call that I missed in r11915
 2008/01/19
 	* Fixed a bad countitem in cross band quest. (bugreport:840) [Samuray22]
 2008/01/13

+ 7 - 8
npc/guild/gldfunc_ev_agit.txt

@@ -160,16 +160,15 @@ function	script	F_AgitBreak	{
 
 	disablenpc "Kafra Staff#"+.@castle$;
 
-	// 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 )
+	// remove investment data and kafra
+	for( set .@i, 4; .@i <= 9; set .@i, .@i+1 )
 		SetCastleData .@map$, .@i, 0;
 
+	// if the new guild doesn't have Guardian Research, erase guardians
+	if( getgdskilllv(.@GID,10002) == 0 )
+		for( set .@i, 10; .@i <= 17; set .@i, .@i+1 )
+			SetCastleData .@map$, .@i, 0;
+
 	return;
 }