summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/arena/arena_aco.txt28
-rw-r--r--npc/other/pvp.txt20
2 files changed, 24 insertions, 24 deletions
diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 588143d32..8d56b9a59 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -130,49 +130,49 @@ OnTimer4000:
end;
OnTimer60000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco1::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 7 Minutes",bc_map|bc_npc;
end;
OnTimer120000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco1::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 6 Minutes",bc_map|bc_npc;
end;
OnTimer180000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco1::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 5 Minutes",bc_map|bc_npc;
end;
OnTimer240000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco1::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 4 Minutes",bc_map|bc_npc;
end;
OnTimer300000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco1::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 3 Minutes",bc_map|bc_npc;
end;
OnTimer360000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco1::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 2 Minutes",bc_map|bc_npc;
end;
OnTimer420000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco1::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 1 Minute",bc_map|bc_npc;
@@ -558,49 +558,49 @@ OnTimer4000:
end;
OnTimer60000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco2::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 7 Minutes",bc_map|bc_npc;
end;
OnTimer120000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco2::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 6 Minutes",bc_map|bc_npc;
end;
OnTimer180000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco2::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 5 Minutes",bc_map|bc_npc;
end;
OnTimer240000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco2::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 4 Minutes",bc_map|bc_npc;
end;
OnTimer300000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco2::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 3 Minutes",bc_map|bc_npc;
end;
OnTimer360000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco2::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 2 Minutes",bc_map|bc_npc;
end;
OnTimer420000:
- if (getmapusers("force_5-1.gat") == 0) {
+ if (getmapusers("force_5-1") == 0) {
donpcevent "Trocco#aco2::Onfailclearstage";
}
mapannounce "force_5-1","Time left: 1 Minute",bc_map|bc_npc;
diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt
index 5a7673ce9..9bd0bfe57 100644
--- a/npc/other/pvp.txt
+++ b/npc/other/pvp.txt
@@ -164,19 +164,19 @@ pvp_y_room,86,85,4 script Fight Square Reception#1 105,{
while(1) {
switch(select("Prontera [ "+.@mapcount_1+" / 128 ]:Izlude [ "+.@mapcount_2+" / 128 ]:Payon [ "+.@mapcount_3+" / 128 ]:Alberta [ "+.@mapcount_4+" / 128 ]:Morroc [ "+.@mapcount_5+" / 128 ]:Cancel")) {
case 1:
- callsub S_CheckPVPRoom,@mapcount_1,"pvp_y_8-1";
+ callsub S_CheckPVPRoom,.@mapcount_1,"pvp_y_8-1";
break;
case 2:
- callsub S_CheckPVPRoom,@mapcount_2,"pvp_y_8-2";
+ callsub S_CheckPVPRoom,.@mapcount_2,"pvp_y_8-2";
break;
case 3:
- callsub S_CheckPVPRoom,@mapcount_3,"pvp_y_8-3";
+ callsub S_CheckPVPRoom,.@mapcount_3,"pvp_y_8-3";
break;
case 4:
- callsub S_CheckPVPRoom,@mapcount_4,"pvp_y_8-4";
+ callsub S_CheckPVPRoom,.@mapcount_4,"pvp_y_8-4";
break;
case 5:
- callsub S_CheckPVPRoom,@mapcount_5,"pvp_y_8-5";
+ callsub S_CheckPVPRoom,.@mapcount_5,"pvp_y_8-5";
break;
case 6:
close;
@@ -211,19 +211,19 @@ pvp_n_room,30,85,4 script Fight Square Reception#2 105,{
while(1) {
switch(select("Sandwich [ "+.@mapcount_1+" / 64 ]:Lock on [ "+.@mapcount_2+" / 32 ]:Four Room [ "+.@mapcount_3+" / 32 ]:Under cross [ "+.@mapcount_4+" / 32 ]:Compass Room [ "+.@mapcount_5+" / 32 ]:Cancel")) {
case 1:
- callsub S_CheckPVPRoom,@mapcount_1,"pvp_n_8-1",64;
+ callsub S_CheckPVPRoom,.@mapcount_1,"pvp_n_8-1",64;
break;
case 2:
- callsub S_CheckPVPRoom,@mapcount_2,"pvp_n_8-2",32;
+ callsub S_CheckPVPRoom,.@mapcount_2,"pvp_n_8-2",32;
break;
case 3:
- callsub S_CheckPVPRoom,@mapcount_3,"pvp_n_8-3",32;
+ callsub S_CheckPVPRoom,.@mapcount_3,"pvp_n_8-3",32;
break;
case 4:
- callsub S_CheckPVPRoom,@mapcount_4,"pvp_n_8-4",32;
+ callsub S_CheckPVPRoom,.@mapcount_4,"pvp_n_8-4",32;
break;
case 5:
- callsub S_CheckPVPRoom,@mapcount_5,"pvp_n_8-5",32;
+ callsub S_CheckPVPRoom,.@mapcount_5,"pvp_n_8-5",32;
break;
case 6:
close;