summaryrefslogtreecommitdiff
path: root/npc/guild2
diff options
context:
space:
mode:
Diffstat (limited to 'npc/guild2')
-rw-r--r--npc/guild2/agit_main_se.txt13
-rw-r--r--npc/guild2/arug_cas01.txt2
-rw-r--r--npc/guild2/arug_cas02.txt2
-rw-r--r--npc/guild2/arug_cas03.txt2
-rw-r--r--npc/guild2/arug_cas04.txt2
-rw-r--r--npc/guild2/arug_cas05.txt2
-rw-r--r--npc/guild2/schg_cas01.txt2
-rw-r--r--npc/guild2/schg_cas02.txt2
-rw-r--r--npc/guild2/schg_cas03.txt2
-rw-r--r--npc/guild2/schg_cas04.txt2
-rw-r--r--npc/guild2/schg_cas05.txt2
11 files changed, 17 insertions, 16 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;
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index 1f54b54ee..a2b929347 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -72,4 +72,4 @@ OnRecvCastleAr01:
}
aru_gld,142,235,4 duplicate(Ar01_Flag) Mardol#flag_Ar01_2 722
aru_gld,164,245,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_3 722
-aru_gld,182,255,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_4 722
+aru_gld,182,255,5 duplicate(Ar01_Flag) Mardol#flag_Ar01_4 722 \ No newline at end of file
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 006443d14..a6b7f0d55 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -77,4 +77,4 @@ OnAgitInit2:
OnRecvCastleAr02:
FlagEmblem GetCastleData("arug_cas02",1);
end;
-}
+} \ No newline at end of file
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index 93144fd36..bf11c9449 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -69,4 +69,4 @@ OnRecvCastleAr03:
FlagEmblem GetCastleData("arug_cas03",1);
end;
}
-aru_gld,74,174,0 duplicate(Ar03_Flag) Horn#flag_Ar03_2 722
+aru_gld,74,174,0 duplicate(Ar03_Flag) Horn#flag_Ar03_2 722 \ No newline at end of file
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index 6826d0d5e..c46c7ff15 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -78,4 +78,4 @@ OnRecvCastlear04:
FlagEmblem GetCastleData("arug_cas04",1);
end;
}
-aru_gld,313,318,4 duplicate(ar04_Flag2) Gefn#flag_ar04_4 722
+aru_gld,313,318,4 duplicate(ar04_Flag2) Gefn#flag_ar04_4 722 \ No newline at end of file
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index 70b61e3cb..b250a9385 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -78,4 +78,4 @@ OnRecvCastlear05:
FlagEmblem GetCastleData("arug_cas05",1);
end;
}
-aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 722
+aru_gld,350,88,6 duplicate(ar05_Flag2) Banadis#flag_ar05_4 722 \ No newline at end of file
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index f001f3379..8200b49a0 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -69,4 +69,4 @@ OnRecvCastlesc01:
FlagEmblem GetCastleData("schg_cas01",1);
end;
}
-sch_gld,297,90,0 duplicate(Sc01_Flag) Himinn#flag_sc01_2 722
+sch_gld,297,90,0 duplicate(Sc01_Flag) Himinn#flag_sc01_2 722 \ No newline at end of file
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index bf7b457ba..0a39f484a 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -61,4 +61,4 @@ OnRecvCastlesc02:
FlagEmblem GetCastleData("schg_cas02",1);
end;
}
-sch_gld,280,247,4 duplicate(Sc02_Flag) Andlangr#flag_sc02_2 722
+sch_gld,280,247,4 duplicate(Sc02_Flag) Andlangr#flag_sc02_2 722 \ No newline at end of file
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index b473c2702..6adfa0ca1 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -69,4 +69,4 @@ OnRecvCastlesc03:
FlagEmblem GetCastleData("schg_cas03",1);
end;
}
-sch_gld,104,191,0 duplicate(Sc03_Flag) Bidblind#flag_sc03_2 722
+sch_gld,104,191,0 duplicate(Sc03_Flag) Bidblind#flag_sc03_2 722 \ No newline at end of file
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index 51e21b972..8da46dec5 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -69,4 +69,4 @@ OnRecvCastlesc04:
FlagEmblem GetCastleData("schg_cas04",1);
end;
}
-sch_gld,141,97,4 duplicate(sc04_Flag) Hljod#flag_sc04_2 722
+sch_gld,141,97,4 duplicate(sc04_Flag) Hljod#flag_sc04_2 722 \ No newline at end of file
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index 6f2b84544..46b03e8bd 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -71,4 +71,4 @@ OnRecvCastlesc05:
}
sch_gld,91,284,4 duplicate(sc05_Flag) Skidbladnir#flag_sc05_2 722
sch_gld,66,320,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_3 722
-sch_gld,66,310,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_4 722
+sch_gld,66,310,6 duplicate(sc05_Flag) Skidbladnir#flag_sc05_4 722 \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-03 21:32:11 +0000