Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16622 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy 2012-08-11 05:30:33 +00:00
parent 9800b743e6
commit bd7de23625
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
npc/guild2/agit_main_se.txt
View File

@ -3,7 +3,7 @@
//===== By: ================================================== //===== By: ==================================================
//= Euphy //= Euphy
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.1 //= 1.2
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -13,6 +13,7 @@
//= 0.x Previous authors: L0ne_W0lf, Zephyrus, Brian. //= 0.x Previous authors: L0ne_W0lf, Zephyrus, Brian.
//= 1.0 If anything breaks, blame Maki. [Euphy] //= 1.0 If anything breaks, blame Maki. [Euphy]
//= 1.1 Fixed an incorrect label execution. [Euphy] //= 1.1 Fixed an incorrect label execution. [Euphy]
//= 1.2 Hopefully fixed a processing error. [Euphy]
//============================================================ //============================================================
// Core, triggers all other events // Core, triggers all other events
@ -578,7 +579,7 @@ OnTreasureDied:
} }
OnStop: OnStop:
stopnpctimer; awake strnpcinfo(0);
end; end;
OnStartArena: OnStartArena:
@ -600,19 +601,17 @@ OnStartArena:
// Disable Kafra // Disable Kafra
disablenpc "Kafra Employee#"+strnpcinfo(2); 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; mapannounce strnpcinfo(4),"The emperium has been shattered!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
donpcevent "Manager#"+strnpcinfo(4)+"::OnReset"; donpcevent "Manager#"+strnpcinfo(4)+"::OnReset";
if (agitcheck2()) initnpctimer;
else stopnpctimer;
maprespawnguildid strnpcinfo(4),getcastledata(strnpcinfo(4),1),2; maprespawnguildid strnpcinfo(4),getcastledata(strnpcinfo(4),1),2;
donpcevent "Manager#"+strnpcinfo(4)+"::OnRecvCastle2"; donpcevent "Manager#"+strnpcinfo(4)+"::OnRecvCastle2";
donpcevent "::OnRecvCastle"+strnpcinfo(2); donpcevent "::OnRecvCastle"+strnpcinfo(2);
end; sleep 10000;
if (agitcheck2()) {
OnTimer10000:
donpcevent "Manager#"+strnpcinfo(4)+"::OnChange"; 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; 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; end;
} }