summaryrefslogtreecommitdiff
path: root/npc/guild2/agit_main_se.txt
diff options
context:
space:
mode:
authorMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
committerMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
commite3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch)
tree20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/guild2/agit_main_se.txt
parent491892212d338903179909b89a5bfc2385e52261 (diff)
downloadhercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip
Update to last rAthena npc.
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/guild2/agit_main_se.txt')
-rw-r--r--npc/guild2/agit_main_se.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt
index cea4d2223..c4c22b165 100644
--- a/npc/guild2/agit_main_se.txt
+++ b/npc/guild2/agit_main_se.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Euphy
//===== Current Version: =====================================
-//= 1.4
+//= 1.4a
//===== Description: =========================================
//= Like agit_main, this file is required
//= for SE castles to function.
@@ -14,6 +14,7 @@
//= 1.2 Hopefully fixed a processing error. [Euphy]
//= 1.3 Fixed barricade issue in schg_cas02. [Cookie]
//= 1.4 Added OnGuildBreak event and a spawn check. [Euphy]
+//= 1.4a Fixed Guardian Stone respawns. [Euphy]
//============================================================
// Core, triggers all other events
@@ -48,7 +49,6 @@ OnAgitStart2:
if (agitcheck2()) {
maprespawnguildid strnpcinfo(2),getcastledata(strnpcinfo(2),1),2;
gvgon strnpcinfo(2);
- setmapflag strnpcinfo(2),mf_zone,"GvG2";
donpcevent strnpcinfo(0)+"::OnStart";
}
else for(set .@i,0; .@i<4; set .@i,.@i+1)
@@ -58,7 +58,6 @@ OnAgitStart2:
OnAgitEnd2:
if (strnpcinfo(2) == "template") end;
gvgoff strnpcinfo(2);
- removemapflag strnpcinfo(2),mf_zone;
if (getcastledata(strnpcinfo(2),1)) {
set .@str$,substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
killmonster strnpcinfo(2),"Steward#"+.@str$+"::OnStartArena";
@@ -109,8 +108,8 @@ OnEmpSpawn:
OnReset:
set .@str$, substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
- donpcevent "df1#"+strnpcinfo(2)+"::OnEnable";
- donpcevent "df2#"+strnpcinfo(2)+"::OnEnable";
+ donpcevent "df1#"+strnpcinfo(2)+"::OnDisable";
+ donpcevent "df2#"+strnpcinfo(2)+"::OnDisable";
donpcevent "gard1#"+strnpcinfo(2)+"::OnReset";
donpcevent "gard2#"+strnpcinfo(2)+"::OnReset";
donpcevent "1st Guardian Stone#"+.@str$+"::OnDisable";
@@ -966,6 +965,7 @@ OnInit:
mes "5 Red Gemstones";
next;
mes "^3355FFDo you want to continue?^000000";
+ next;
if(select("No:Continue") == 1) {
mes "^3355FFWork canceled.^000000";
close;
@@ -1503,8 +1503,9 @@ OnGuardianStoneDied:
end;
OnTimer300000:
+ set .@num, atoi(charat(strnpcinfo(1),2));
set .@str$,substr(strnpcinfo(2),0,1)+substr(strnpcinfo(2),8,9);
- donpcevent "1st Guardian Stone#"+.@str$+"::OnEnable";
+ donpcevent ((.@num == 1)?"1st":"2nd")+" Guardian Stone#"+.@str$+"::OnEnable";
setd "$agit_"+.@str$+"["+(atoi(charat(strnpcinfo(1),2))-1)+"]",2;
stopnpctimer;
end;