diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-11 05:30:33 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-08-11 05:30:33 +0000 |
| commit | 2f44d23b95b9658b04c5f012335a4ea079c817a6 (patch) | |
| tree | 12e671fb5cdcea990c9d7e4946d6c18227831673 | |
| parent | ba0a75439b5373c038f5712f57d46cd2f7de794d (diff) | |
| download | hercules-2f44d23b95b9658b04c5f012335a4ea079c817a6.tar.gz hercules-2f44d23b95b9658b04c5f012335a4ea079c817a6.tar.bz2 hercules-2f44d23b95b9658b04c5f012335a4ea079c817a6.tar.xz hercules-2f44d23b95b9658b04c5f012335a4ea079c817a6.zip | |
* Attempted fix at a rare error in guild2 scripts where Emperium would respawn immediately and without an owner after breaking. If this still happens, please file a bug report.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16622 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | npc/guild2/agit_main_se.txt | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index 007af8f8f..fd49510e7 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Euphy //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 0.x Previous authors: L0ne_W0lf, Zephyrus, Brian. //= 1.0 If anything breaks, blame Maki. [Euphy] //= 1.1 Fixed an incorrect label execution. [Euphy] +//= 1.2 Hopefully fixed a processing error. [Euphy] //============================================================ // Core, triggers all other events @@ -578,7 +579,7 @@ OnTreasureDied: } OnStop: - stopnpctimer; + awake strnpcinfo(0); end; OnStartArena: @@ -600,19 +601,17 @@ OnStartArena: // Disable Kafra disablenpc "Kafra Employee#"+strnpcinfo(2); - announce "The ["+getguildname(.@GID)+"] conquered the ["+.@region$+" "+charat(strnpcinfo(2),3)+"] stronghold of "+getcastlename(strnpcinfo(4)),bc_all|bc_woe; + announce "The ["+getguildname(.@GID)+"] guild conquered the ["+.@region$+" "+charat(strnpcinfo(2),3)+"] stronghold of "+getcastlename(strnpcinfo(4))+"!",bc_all|bc_woe; mapannounce strnpcinfo(4),"The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40; donpcevent "Manager#"+strnpcinfo(4)+"::OnReset"; - if (agitcheck2()) initnpctimer; - else stopnpctimer; maprespawnguildid strnpcinfo(4),getcastledata(strnpcinfo(4),1),2; donpcevent "Manager#"+strnpcinfo(4)+"::OnRecvCastle2"; donpcevent "::OnRecvCastle"+strnpcinfo(2); - end; - -OnTimer10000: - donpcevent "Manager#"+strnpcinfo(4)+"::OnChange"; - mapannounce strnpcinfo(4),"Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40; + sleep 10000; + if (agitcheck2()) { + donpcevent "Manager#"+strnpcinfo(4)+"::OnChange"; + mapannounce strnpcinfo(4),"Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40; + } end; } |