From 78474fe9877675f3fc173f0b7e7235fd6c105067 Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Fri, 14 Dec 2007 10:57:38 +0000 Subject: * Commited the quick fix "emps not respawning if the emp breaker logs off". (from r11630 bureport:369) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11913 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 3 +++ npc/guild/aldeg/aldeg_ev_agit.txt | 29 ++++++++++++++++++----------- npc/guild/gefg/gefg_ev_agit.txt | 29 ++++++++++++++++++----------- npc/guild/payg/payg_ev_agit.txt | 29 ++++++++++++++++++----------- npc/guild/prtg/prtg_ev_agit.txt | 29 ++++++++++++++++++----------- 5 files changed, 75 insertions(+), 44 deletions(-) diff --git a/npc/Changelog.txt b/npc/Changelog.txt index cf0ad3e90..4fb768992 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,8 @@ Date Added ====== +2007/12/14 + * Commited the quick fix "emps not respawning if the emp breaker logs off". + (from r11630 bureport:369) [FlavioJS] 2007/12/13 * Rev. 11907 Maheo in Ice dungeon quest now uses setnpcdisplay. [L0ne_W0lf] * Rev. 11906 Minor fixes, guild manager, and a couple others. [L0ne_W0lf] diff --git a/npc/guild/aldeg/aldeg_ev_agit.txt b/npc/guild/aldeg/aldeg_ev_agit.txt index 518ae1fe8..c27cbebdd 100644 --- a/npc/guild/aldeg/aldeg_ev_agit.txt +++ b/npc/guild/aldeg/aldeg_ev_agit.txt @@ -4,7 +4,7 @@ //= jAthena (1.0) //= 1.1 by Akaru and ho|yAnge| //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 0.1+; RO Episode 4+ //===== Description: ========================================= @@ -13,6 +13,8 @@ //= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88] //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus] //= 1.4 Small updated. Changed "EMPERIUM" to "Emperium". [L0ne_W0lf] +//= 1.5 Quick fix "emps not respawning if the emp breaker logs off". +//= (from r11630 bureport:369) [FlavioJS] //============================================================ @@ -29,13 +31,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas01","A01"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_A01::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas01","A01"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "aldeg_cas01",GetCastleData("aldeg_cas01",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "aldeg_cas01",216,24,"Emperium",1288,1,"Agit_A01::OnAgitBreak"; end; OnAgitEnd: @@ -56,13 +59,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas02","A02"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_A02::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas02","A02"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "aldeg_cas02",GetCastleData("aldeg_cas02",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "aldeg_cas02",214,24,"Emperium",1288,1,"Agit_A02::OnAgitBreak"; end; OnAgitEnd: @@ -83,13 +87,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas03","A03"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_A03::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas03","A03"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "aldeg_cas03",GetCastleData("aldeg_cas03",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "aldeg_cas03",206,32,"Emperium",1288,1,"Agit_A03::OnAgitBreak"; end; OnAgitEnd: @@ -110,13 +115,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas04","A04"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_A04::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas04","A04"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "aldeg_cas04",GetCastleData("aldeg_cas04",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "aldeg_cas04",36,218,"Emperium",1288,1,"Agit_A04::OnAgitBreak"; end; OnAgitEnd: @@ -137,13 +143,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","aldeg_cas05","A05"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_A05::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","aldeg_cas05","A05"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "aldeg_cas05",GetCastleData("aldeg_cas05",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "aldeg_cas05",28,102,"Emperium",1288,1,"Agit_A05::OnAgitBreak"; end; OnAgitEnd: diff --git a/npc/guild/gefg/gefg_ev_agit.txt b/npc/guild/gefg/gefg_ev_agit.txt index abeffa0ae..40bb4ee53 100644 --- a/npc/guild/gefg/gefg_ev_agit.txt +++ b/npc/guild/gefg/gefg_ev_agit.txt @@ -4,7 +4,7 @@ //= jAthena (1.0) //= 1.1 by Akaru and ho|yAnge| //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 0.1+; RO Episode 4+ //===== Description: ========================================= @@ -13,6 +13,8 @@ //= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88] //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus] //= 1.4 Small updated. Changed "EMPERIUM" to "Emperium". [L0ne_W0lf] +//= 1.5 Quick fix "emps not respawning if the emp breaker logs off". +//= (from r11630 bureport:369) [FlavioJS] //============================================================ @@ -29,13 +31,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas01","G01"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_G01::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas01","G01"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "gefg_cas01",GetCastleData("gefg_cas01",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "gefg_cas01",198,182,"Emperium",1288,1,"Agit_G01::OnAgitBreak"; end; OnAgitEnd: @@ -56,13 +59,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas02","G02"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_G02::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas02","G02"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "gefg_cas02",GetCastleData("gefg_cas02",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "gefg_cas02",176,178,"Emperium",1288,1,"Agit_G02::OnAgitBreak"; end; OnAgitEnd: @@ -83,13 +87,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas03","G03"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_G03::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas03","G03"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "gefg_cas03",GetCastleData("gefg_cas03",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "gefg_cas03",245,167,"Emperium",1288,1,"Agit_G03::OnAgitBreak"; end; OnAgitEnd: @@ -110,13 +115,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas04","G04"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_G04::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas04","G04"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "gefg_cas04",GetCastleData("gefg_cas04",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "gefg_cas04",174,178,"Emperium",1288,1,"Agit_G04::OnAgitBreak"; end; OnAgitEnd: @@ -137,13 +143,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","gefg_cas05","G05"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_G05::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","gefg_cas05","G05"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "gefg_cas05",GetCastleData("gefg_cas05",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "gefg_cas05",194,184,"Emperium",1288,1,"Agit_G05::OnAgitBreak"; end; OnAgitEnd: diff --git a/npc/guild/payg/payg_ev_agit.txt b/npc/guild/payg/payg_ev_agit.txt index 61387af64..517a6a829 100644 --- a/npc/guild/payg/payg_ev_agit.txt +++ b/npc/guild/payg/payg_ev_agit.txt @@ -4,7 +4,7 @@ //= jAthena (1.0) //= 1.1 by Akaru and ho|yAnge| //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 0.1+; RO Episode 4+ //===== Description: ========================================= @@ -13,6 +13,8 @@ //= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88] //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus] //= 1.4 Small updated. Changed "EMPERIUM" to "Emperium". [L0ne_W0lf] +//= 1.5 Quick fix "emps not respawning if the emp breaker logs off". +//= (from r11630 bureport:369) [FlavioJS] //============================================================ @@ -29,13 +31,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas01","Py01"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py01::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","payg_cas01","Py01"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "payg_cas01",GetCastleData("payg_cas01",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "payg_cas01",139,139,"Emperium",1288,1,"Agit_Py01::OnAgitBreak"; end; OnAgitEnd: @@ -56,13 +59,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas02","Py02"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py02::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","payg_cas02","Py02"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "payg_cas02",GetCastleData("payg_cas02",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "payg_cas02",39,25,"Emperium",1288,1,"Agit_Py02::OnAgitBreak"; end; OnAgitEnd: @@ -83,13 +87,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas03","Py03"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py03::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","payg_cas03","Py03"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "payg_cas03",GetCastleData("payg_cas03",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "payg_cas03",269,265,"Emperium",1288,1,"Agit_Py03::OnAgitBreak"; end; OnAgitEnd: @@ -110,13 +115,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas04","Py04"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py04::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","payg_cas04","Py04"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "payg_cas04",GetCastleData("payg_cas04",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "payg_cas04",271,29,"Emperium",1288,1,"Agit_Py04::OnAgitBreak"; end; OnAgitEnd: @@ -137,13 +143,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","payg_cas05","Py05"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Py05::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","payg_cas05","Py05"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "payg_cas05",GetCastleData("payg_cas05",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "payg_cas05",30,30,"Emperium",1288,1,"Agit_Py05::OnAgitBreak"; end; OnAgitEnd: diff --git a/npc/guild/prtg/prtg_ev_agit.txt b/npc/guild/prtg/prtg_ev_agit.txt index 3434fe801..59eaa0335 100644 --- a/npc/guild/prtg/prtg_ev_agit.txt +++ b/npc/guild/prtg/prtg_ev_agit.txt @@ -4,7 +4,7 @@ //= jAthena (1.0) //= 1.1 by Akaru and ho|yAnge| //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena 0.1+; RO Episode 4+ //===== Description: ========================================= @@ -13,6 +13,8 @@ //= v1.2 Now using functions for OnAgitStart and OnAgitBreak. [kobra_k88] //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus] //= 1.4 Small updated. Changed "EMPERIUM" to "Emperium". [L0ne_W0lf] +//= 1.5 Quick fix "emps not respawning if the emp breaker logs off". +//= (from r11630 bureport:369) [FlavioJS] //============================================================ @@ -29,13 +31,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas01","Pt01"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt01::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas01","Pt01"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "prtg_cas01",GetCastleData("prtg_cas01",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "prtg_cas01",197,197,"Emperium",1288,1,"Agit_Pt01::OnAgitBreak"; end; OnAgitEnd: @@ -56,13 +59,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas02","Pt02"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt02::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas02","Pt02"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "prtg_cas02",GetCastleData("prtg_cas02",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "prtg_cas02",158,174,"Emperium",1288,1,"Agit_Pt02::OnAgitBreak"; end; OnAgitEnd: @@ -83,13 +87,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas03","Pt03"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt03::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas03","Pt03"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "prtg_cas03",GetCastleData("prtg_cas03",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "prtg_cas03",17,221,"Emperium",1288,1,"Agit_Pt03::OnAgitBreak"; end; OnAgitEnd: @@ -110,13 +115,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas04","Pt04"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt04::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas04","Pt04"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "prtg_cas04",GetCastleData("prtg_cas04",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "prtg_cas04",292,14,"Emperium",1288,1,"Agit_Pt04::OnAgitBreak"; end; OnAgitEnd: @@ -137,13 +143,14 @@ OnAgitStart: end; OnAgitBreak: callfunc "F_AgitBreak","prtg_cas05","Pt05"; - addtimer getbattleflag("gvg_eliminate_time"), "Agit_Pt05::OnAgitEliminate"; - end; + goto OnAgitEliminate; OnGuildBreak: callfunc "F_GuildBreak","prtg_cas05","Pt05"; end; OnAgitEliminate: + sleep getbattleflag("gvg_eliminate_time"); MapRespawnGuildID "prtg_cas05",GetCastleData("prtg_cas05",1),6; + sleep 6333-getbattleflag("gvg_eliminate_time");// wait for emp animation to end Monster "prtg_cas05",266,266,"Emperium",1288,1,"Agit_Pt05::OnAgitBreak"; end; OnAgitEnd: -- cgit v1.2.3-70-g09d2