From 2da86f6d3ab9e5ed7cdd2d37337f2c5803ddb94e Mon Sep 17 00:00:00 2001 From: ultramage Date: Sun, 20 Jan 2008 22:22:36 +0000 Subject: Corrected one setcastledata call that I missed in r11915 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12116 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/guild/gldfunc_ev_agit.txt | 15 +++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 7189e68f3..4f6fa4f65 100644 --- a/npc/Changelog.txt +++ b/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 diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt index 1a43f2527..d082d9c6d 100644 --- a/npc/guild/gldfunc_ev_agit.txt +++ b/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; } -- cgit v1.2.3-70-g09d2