From 446724fb64fc64557ef4a2c63659359d7b6fb89f Mon Sep 17 00:00:00 2001 From: ultramage Date: Thu, 1 Nov 2007 16:34:21 +0000 Subject: Removed code that queues OnAgitEliminate after the Emperium is broken, this is now done properly by the gvg script instead (partially deals with bugreport:342). If you have any extra castles, update your scripts accordingly. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11630 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 +++ npc/guild/aldeg/aldeg_ev_agit.txt | 5 +++++ npc/guild/gefg/gefg_ev_agit.txt | 5 +++++ npc/guild/gldfunc_ev_agit.txt | 2 +- npc/guild/payg/payg_ev_agit.txt | 5 +++++ npc/guild/prtg/prtg_ev_agit.txt | 5 +++++ 6 files changed, 24 insertions(+), 1 deletion(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index daffb0979..5ff1c8590 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2007/11/01 + * Added timers to trigger OnAgitEliminate after Emperium is broken + (this was previously done from inside the source code) [ultramage] 2007/10/31 * Rev. 11628 Fixed reward option in Arena giving potato. [L0ne_W0lf] * Rev. 11626 Added Turbo Track point exchanger to arena. [L0ne_W0lf] diff --git a/npc/guild/aldeg/aldeg_ev_agit.txt b/npc/guild/aldeg/aldeg_ev_agit.txt index db92875c5..41db26690 100644 --- a/npc/guild/aldeg/aldeg_ev_agit.txt +++ b/npc/guild/aldeg/aldeg_ev_agit.txt @@ -28,6 +28,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas01","A01"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_A01::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas01","A01"; @@ -54,6 +55,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas02","A02"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_A02::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas02","A02"; @@ -80,6 +82,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas03","A03"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_A03::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas03","A03"; @@ -106,6 +109,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas04","A04"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_A04::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas04","A04"; @@ -132,6 +136,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas05","A05"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_A05::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas05","A05"; diff --git a/npc/guild/gefg/gefg_ev_agit.txt b/npc/guild/gefg/gefg_ev_agit.txt index 628b50c5d..2a33f298b 100644 --- a/npc/guild/gefg/gefg_ev_agit.txt +++ b/npc/guild/gefg/gefg_ev_agit.txt @@ -28,6 +28,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas01","G01"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_G01::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas01","G01"; @@ -54,6 +55,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas02","G02"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_G02::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas02","G02"; @@ -80,6 +82,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas03","G03"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_G03::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas03","G03"; @@ -106,6 +109,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas04","G04"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_G04::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas04","G04"; @@ -132,6 +136,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas05","G05"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_G05::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas05","G05"; diff --git a/npc/guild/gldfunc_ev_agit.txt b/npc/guild/gldfunc_ev_agit.txt index b2e391c19..0bd85b66f 100644 --- a/npc/guild/gldfunc_ev_agit.txt +++ b/npc/guild/gldfunc_ev_agit.txt @@ -157,7 +157,7 @@ function script F_AgitBreak { disablenpc "Kafra Staff#"+.@castle$; - for( set .@i, 4; .@i < 25; set .@i, .@i+1 ) + for( set .@i, 4; .@i <= 25; set .@i, .@i+1 ) SetCastleData .@map$, .@i, 0; return; diff --git a/npc/guild/payg/payg_ev_agit.txt b/npc/guild/payg/payg_ev_agit.txt index 485e31252..9caf96b3f 100644 --- a/npc/guild/payg/payg_ev_agit.txt +++ b/npc/guild/payg/payg_ev_agit.txt @@ -28,6 +28,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas01","Py01"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py01::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","payg_cas01","Py01"; @@ -54,6 +55,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas02","Py02"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py02::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","payg_cas02","Py02"; @@ -80,6 +82,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas03","Py03"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py03::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","payg_cas03","Py03"; @@ -106,6 +109,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas04","Py04"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py04::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","payg_cas04","Py04"; @@ -132,6 +136,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas05","Py05"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py05::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","payg_cas05","Py05"; diff --git a/npc/guild/prtg/prtg_ev_agit.txt b/npc/guild/prtg/prtg_ev_agit.txt index d38557039..22523f17c 100644 --- a/npc/guild/prtg/prtg_ev_agit.txt +++ b/npc/guild/prtg/prtg_ev_agit.txt @@ -28,6 +28,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas01","Pt01"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt01::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas01","Pt01"; @@ -54,6 +55,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas02","Pt02"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt02::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas02","Pt02"; @@ -80,6 +82,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas03","Pt03"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt03::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas03","Pt03"; @@ -106,6 +109,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas04","Pt04"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt04::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas04","Pt04"; @@ -132,6 +136,7 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas05","Pt05"; + addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt05::OnAgitEliminate"; end; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas05","Pt05"; -- cgit v1.2.3-60-g2f50