diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-20 22:22:36 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-01-20 22:22:36 +0000 |
| commit | 2da86f6d3ab9e5ed7cdd2d37337f2c5803ddb94e (patch) | |
| tree | e80f4c73df9d39b5975f5a8abb542e98348ac93d | |
| parent | 9b318079b61e0582e91c1e20786bf9ab3df857c5 (diff) | |
| download | hercules-2da86f6d3ab9e5ed7cdd2d37337f2c5803ddb94e.tar.gz hercules-2da86f6d3ab9e5ed7cdd2d37337f2c5803ddb94e.tar.bz2 hercules-2da86f6d3ab9e5ed7cdd2d37337f2c5803ddb94e.tar.xz hercules-2da86f6d3ab9e5ed7cdd2d37337f2c5803ddb94e.zip | |
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
| -rw-r--r-- | npc/Changelog.txt | 2 | ||||
| -rw-r--r-- | npc/guild/gldfunc_ev_agit.txt | 15 |
2 files changed, 9 insertions, 8 deletions
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; } |