From e4472dfd54f4dd2549fc46008004b31b282cbb41 Mon Sep 17 00:00:00 2001 From: ultramage Date: Fri, 21 Sep 2007 14:20:52 +0000 Subject: Fixed a typo from r11221 causing castle problems after they've been conquered. Converted rest of variables used to temporary script vars. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11258 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/guild/gldfunc_ev_agit.txt | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) (limited to 'npc') diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt index 8aa989149..b2e391c19 100644 --- a/npc/guild/gldfunc_ev_agit.txt +++ b/npc/guild/gldfunc_ev_agit.txt @@ -139,30 +139,28 @@ function script F_AgitBreak { set .@castle$, getarg(1); //killmonsterall .@map$; - set @GID,getcharid(2); - if (@GID <= 0) return; + set .@GID,getcharid(2); + if (.@GID <= 0) return; - set @Economy,GetCastleData(.@map$,2) - 5; - if (@Economy < 0) set @Economy, 0; - SetCastleData .@map$,2, @Economy; + set .@Economy,GetCastleData(.@map$,2) - 5; + if (.@Economy < 0) set .@Economy, 0; + SetCastleData .@map$, 2, .@Economy; - set @Defence,GetCastleData(.@map$,3) - 5; - if (@Defence < 0) set @Defence, 0; - SetCastleData .@map$,3, @Defence; + set .@Defence,GetCastleData(.@map$,3) - 5; + if (.@Defence < 0) set .@Defence, 0; + SetCastleData .@map$, 3, .@Defence; - SetCastleData .@map$,1, @GID; + SetCastleData .@map$,1, .@GID; MapAnnounce .@map$,"The emperium has been destroyed.",bc_map,0x00CCFF; - Announce "The [" + GetCastleName(.@map$) + "] castle has been conquered by the [" + GetGuildName(@GID) + "] guild.",bc_all; - GetCastleData .@map$,0,"::OnRecvCastle"+@castle$; + Announce "The [" + GetCastleName(.@map$) + "] castle has been conquered by the [" + GetGuildName(.@GID) + "] guild.",bc_all; + GetCastleData .@map$,0,"::OnRecvCastle"+.@castle$; disablenpc "Kafra Staff#"+.@castle$; - set @i, 3; - L_Loop: - set @i, @i + 1; - SetCastleData .@map$,@i,0; - if(@i < 25) goto L_Loop; - return; + for( set .@i, 4; .@i < 25; set .@i, .@i+1 ) + SetCastleData .@map$, .@i, 0; + + return; } -- cgit v1.2.3-60-g2f50