summaryrefslogtreecommitdiff
path: root/npc/events/nguild
diff options
context:
space:
mode:
Diffstat (limited to 'npc/events/nguild')
-rw-r--r--npc/events/nguild/nguild_dunsw.txt8
-rw-r--r--npc/events/nguild/nguild_flags.txt86
-rw-r--r--npc/events/nguild/nguild_kafras.txt10
-rw-r--r--npc/events/nguild/nguild_managers.txt8
-rw-r--r--npc/events/nguild/nguild_treas.txt8
-rw-r--r--npc/events/nguild/nguild_warper.txt4
6 files changed, 62 insertions, 62 deletions
diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt
index 7f191290b..2fd6b7594 100644
--- a/npc/events/nguild/nguild_dunsw.txt
+++ b/npc/events/nguild/nguild_dunsw.txt
@@ -41,25 +41,25 @@ function script F_GldDunSw {
}
// Castle 1 ===============================================
-nguild_alde,212,181,0 script Switch#DunN01 111,{
+nguild_alde,212,181,0 script Switch#DunN01 HIDDEN_NPC,{
callfunc "F_GldDunSw","nguild_alde","02",32,122;
close;
}
// Castle 2 ===============================================
-nguild_gef,78,84,0 script Switch#DunN02 111,{
+nguild_gef,78,84,0 script Switch#DunN02 HIDDEN_NPC,{
callfunc "F_GldDunSw","nguild_gef","04",39,258;
close;
}
// Castle 3 ===============================================
-nguild_pay,101,25,0 script Switch#DunN03 111,{
+nguild_pay,101,25,0 script Switch#DunN03 HIDDEN_NPC,{
callfunc "F_GldDunSw","nguild_pay","01",186,165;
close;
}
// Castle 4 ===============================================
-nguild_prt,94,200,0 script Switch#DunN04 111,{
+nguild_prt,94,200,0 script Switch#DunN04 HIDDEN_NPC,{
callfunc "F_GldDunSw","nguild_prt","03",28,251;
close;
}
diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt
index 178125643..17e1db744 100644
--- a/npc/events/nguild/nguild_flags.txt
+++ b/npc/events/nguild/nguild_flags.txt
@@ -61,7 +61,7 @@ function script F_Flags {
//============================================================================//
// Castle 1
//============================================================================//
-n_castle,110,96,1 script NGuild Aldebaran#a1-1 722,{
+n_castle,110,96,1 script NGuild Aldebaran#a1-1 GUILD_FLAG,{
callfunc "F_Flags","Al De Baran","nguild_alde",218,170,1,1;
close;
@@ -70,7 +70,7 @@ OnRecvCastleN01:
end;
}
-nguild_alde,30,248,4 script NGuild Aldebaran#a1-6::NGuildAlde 722,{
+nguild_alde,30,248,4 script NGuild Aldebaran#a1-6::NGuildAlde GUILD_FLAG,{
callfunc "F_Flags","Al De Baran","nguild_alde",218,170,0,1;
close;
@@ -79,20 +79,20 @@ OnRecvCastleN01:
end;
}
// In Castle ============================================
-nguild_alde,30,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-7 722
-nguild_alde,37,248,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-8 722
-nguild_alde,37,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-9 722
-nguild_alde,95,80,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-10 722
-nguild_alde,95,59,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-11 722
-nguild_alde,62,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-12 722
-nguild_alde,70,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-13 722
-nguild_alde,74,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-14 722
-nguild_alde,62,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-15 722
-nguild_alde,66,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-16 722
-nguild_alde,70,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-17 722
-nguild_alde,74,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-18 722
-nguild_alde,203,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-19 722
-nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 722
+nguild_alde,30,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-7 GUILD_FLAG
+nguild_alde,37,248,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-8 GUILD_FLAG
+nguild_alde,37,246,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-9 GUILD_FLAG
+nguild_alde,95,80,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-10 GUILD_FLAG
+nguild_alde,95,59,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-11 GUILD_FLAG
+nguild_alde,62,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-12 GUILD_FLAG
+nguild_alde,70,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-13 GUILD_FLAG
+nguild_alde,74,75,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-14 GUILD_FLAG
+nguild_alde,62,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-15 GUILD_FLAG
+nguild_alde,66,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-16 GUILD_FLAG
+nguild_alde,70,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-17 GUILD_FLAG
+nguild_alde,74,64,2 duplicate(NGuildAlde) NGuild Aldebaran#a1-18 GUILD_FLAG
+nguild_alde,203,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-19 GUILD_FLAG
+nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 GUILD_FLAG
@@ -100,7 +100,7 @@ nguild_alde,210,150,4 duplicate(NGuildAlde) NGuild Aldebaran#a1-20 722
//============================================================================//
// Castle 2
//============================================================================//
-n_castle,110,109,3 script NGuild Geffen#g1-1 722,{
+n_castle,110,109,3 script NGuild Geffen#g1-1 GUILD_FLAG,{
callfunc "F_Flags","Geffen","nguild_gef",83,47,1,1;
close;
@@ -109,7 +109,7 @@ OnRecvCastleN02:
end;
}
-nguild_gef,28,157,4 script NGuild Geffen#g1-6::NGuildGef 722,{
+nguild_gef,28,157,4 script NGuild Geffen#g1-6::NGuildGef GUILD_FLAG,{
callfunc "F_Flags","Geffen","nguild_gef",83,47,0,1;
close;
@@ -118,19 +118,19 @@ OnRecvCastleN02:
end;
}
// In Castle =============================================
-nguild_gef,32,157,4 duplicate(NGuildGef) NGuild Geffen#g1-7 722
-nguild_gef,22,156,5 duplicate(NGuildGef) NGuild Geffen#g1-8 722
-nguild_gef,68,185,3 duplicate(NGuildGef) NGuild Geffen#g1-9 722
-nguild_gef,17,171,5 duplicate(NGuildGef) NGuild Geffen#g1-10 722
-nguild_gef,59,16,4 duplicate(NGuildGef) NGuild Geffen#g1-11 722
-nguild_gef,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 722
+nguild_gef,32,157,4 duplicate(NGuildGef) NGuild Geffen#g1-7 GUILD_FLAG
+nguild_gef,22,156,5 duplicate(NGuildGef) NGuild Geffen#g1-8 GUILD_FLAG
+nguild_gef,68,185,3 duplicate(NGuildGef) NGuild Geffen#g1-9 GUILD_FLAG
+nguild_gef,17,171,5 duplicate(NGuildGef) NGuild Geffen#g1-10 GUILD_FLAG
+nguild_gef,59,16,4 duplicate(NGuildGef) NGuild Geffen#g1-11 GUILD_FLAG
+nguild_gef,64,16,4 duplicate(NGuildGef) NGuild Geffen#g1-12 GUILD_FLAG
//============================================================================//
// Castle 3
//============================================================================//
-n_castle,94,109,5 script NGuild Payon#f1-1 722,{
+n_castle,94,109,5 script NGuild Payon#f1-1 GUILD_FLAG,{
callfunc "F_Flags","Payon","nguild_pay",87,29,1,1;
close;
@@ -139,7 +139,7 @@ OnRecvCastleN03:
end;
}
-nguild_pay,238,67,4 script NGuild Payon#f1-6::NGuildPay 722,{
+nguild_pay,238,67,4 script NGuild Payon#f1-6::NGuildPay GUILD_FLAG,{
callfunc "F_Flags","Payon","nguild_pay",87,29,0,1;
close;
@@ -148,12 +148,12 @@ OnRecvCastleN03:
end;
}
// In Castle ===============================================
-nguild_pay,238,67,4 duplicate(NGuildPay) NGuild Payon#f1-6 722
-nguild_pay,233,67,4 duplicate(NGuildPay) NGuild Payon#f1-7 722
-nguild_pay,221,123,4 duplicate(NGuildPay) NGuild Payon#f1-8 722
-nguild_pay,221,116,4 duplicate(NGuildPay) NGuild Payon#f1-9 722
-nguild_pay,206,108,4 duplicate(NGuildPay) NGuild Payon#f1-10 722
-nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 722
+nguild_pay,238,67,4 duplicate(NGuildPay) NGuild Payon#f1-6 GUILD_FLAG
+nguild_pay,233,67,4 duplicate(NGuildPay) NGuild Payon#f1-7 GUILD_FLAG
+nguild_pay,221,123,4 duplicate(NGuildPay) NGuild Payon#f1-8 GUILD_FLAG
+nguild_pay,221,116,4 duplicate(NGuildPay) NGuild Payon#f1-9 GUILD_FLAG
+nguild_pay,206,108,4 duplicate(NGuildPay) NGuild Payon#f1-10 GUILD_FLAG
+nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 GUILD_FLAG
@@ -161,7 +161,7 @@ nguild_pay,212,108,4 duplicate(NGuildPay) NGuild Payon#f1-11 722
//=============================================================================//
// Castle 4
//=============================================================================//
-n_castle,94,96,7 script NGuild Prontera#p1-1 722,{
+n_castle,94,96,7 script NGuild Prontera#p1-1 GUILD_FLAG,{
callfunc "F_Flags","Prontera","nguild_prt",97,174,1,1;
close;
@@ -170,7 +170,7 @@ OnRecvCastleN04:
end;
}
-nguild_prt,58,56,4 script NGuild Prontera#p1-7::NGuildPrt 722,{
+nguild_prt,58,56,4 script NGuild Prontera#p1-7::NGuildPrt GUILD_FLAG,{
callfunc "F_Flags","Prontera","nguild_prt",97,174,0,1;
close;
@@ -179,12 +179,12 @@ OnRecvCastleN04:
end;
}
// In Castle =============================================
-nguild_prt,64,56,4 duplicate(NGuildPrt) NGuild Prontera#p1-8 722
-nguild_prt,76,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-9 722
-nguild_prt,84,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-10 722
-nguild_prt,94,39,4 duplicate(NGuildPrt) NGuild Prontera#p1-11 722
-nguild_prt,94,24,4 duplicate(NGuildPrt) NGuild Prontera#p1-12 722
-nguild_prt,73,14,4 duplicate(NGuildPrt) NGuild Prontera#p1-13 722
-nguild_prt,73,6,4 duplicate(NGuildPrt) NGuild Prontera#p1-14 722
-nguild_prt,55,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-15 722
-nguild_prt,45,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-16 722
+nguild_prt,64,56,4 duplicate(NGuildPrt) NGuild Prontera#p1-8 GUILD_FLAG
+nguild_prt,76,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-9 GUILD_FLAG
+nguild_prt,84,32,4 duplicate(NGuildPrt) NGuild Prontera#p1-10 GUILD_FLAG
+nguild_prt,94,39,4 duplicate(NGuildPrt) NGuild Prontera#p1-11 GUILD_FLAG
+nguild_prt,94,24,4 duplicate(NGuildPrt) NGuild Prontera#p1-12 GUILD_FLAG
+nguild_prt,73,14,4 duplicate(NGuildPrt) NGuild Prontera#p1-13 GUILD_FLAG
+nguild_prt,73,6,4 duplicate(NGuildPrt) NGuild Prontera#p1-14 GUILD_FLAG
+nguild_prt,55,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-15 GUILD_FLAG
+nguild_prt,45,46,4 duplicate(NGuildPrt) NGuild Prontera#p1-16 GUILD_FLAG
diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt
index 11d748ab4..155c33792 100644
--- a/npc/events/nguild/nguild_kafras.txt
+++ b/npc/events/nguild/nguild_kafras.txt
@@ -32,7 +32,7 @@ L_StartG:
}
// Castle 1 ===============================================
-nguild_alde,218,170,0 script Kafra Service#N01 117,{
+nguild_alde,218,170,0 script Kafra Service#N01 4_F_KAFRA1,{
callfunc "F_GKafra", "nguild_alde", "Prontera";
end;
OnRecvCastleN01:
@@ -41,8 +41,8 @@ OnRecvCastleN01:
}
// Castle 2 ===============================================
-//nguild_gef,96,173,0 script Kafra Service#N02 117,{
-nguild_gef,35,37,0 script Kafra Service#N02 117,{
+//nguild_gef,96,173,0 script Kafra Service#N02 4_F_KAFRA1,{
+nguild_gef,35,37,0 script Kafra Service#N02 4_F_KAFRA1,{
callfunc "F_GKafra", "nguild_gef", "Prontera";
end;
OnRecvCastleN02:
@@ -51,7 +51,7 @@ OnRecvCastleN02:
}
// Castle 3 ===============================================
-nguild_pay,128,58,3 script Kafra Service#N03 117,{
+nguild_pay,128,58,3 script Kafra Service#N03 4_F_KAFRA1,{
callfunc "F_GKafra", "nguild_pay", "Prontera";
end;
OnRecvCastleN03:
@@ -60,7 +60,7 @@ OnRecvCastleN03:
}
// Castle 4 ===============================================
-nguild_prt,96,173,0 script Kafra Service#N04 117,{
+nguild_prt,96,173,0 script Kafra Service#N04 4_F_KAFRA1,{
callfunc "F_GKafra", "nguild_prt", "Prontera";
end;
OnRecvCastleN04:
diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt
index 0b35108f7..fd5fc6053 100644
--- a/npc/events/nguild/nguild_managers.txt
+++ b/npc/events/nguild/nguild_managers.txt
@@ -145,28 +145,28 @@ function script F_GldManager {
}
// Castle 1 ==================================================================================
-nguild_alde,218,175,0 script Frolo 55,{
+nguild_alde,218,175,0 script Frolo 1_M_JOBTESTER,{
callfunc "F_GldManager","Frolo","nguild_alde",119,223,"N01";
close;
}
// Castle 2 ==================================================================================
-nguild_gef,40,48,5 script Leiber 55,{
+nguild_gef,40,48,5 script Leiber 1_M_JOBTESTER,{
callfunc "F_GldManager","Leiber","nguild_gef",155,112,"N02";
close;
}
// Castle 3 ==================================================================================
-nguild_pay,120,58,4 script Dundar 55,{
+nguild_pay,120,58,4 script Dundar 1_M_JOBTESTER,{
callfunc "F_GldManager","Dundar","nguild_pay",290,7,"N03";
close;
}
// Castle 4 ==================================================================================
-nguild_prt,112,181,0 script Thefton 55,{
+nguild_prt,112,181,0 script Thefton 1_M_JOBTESTER,{
callfunc "F_GldManager","Thefton","nguild_prt",15,209,"N04";
close;
}
diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt
index 1c9443225..cc3d7db1e 100644
--- a/npc/events/nguild/nguild_treas.txt
+++ b/npc/events/nguild/nguild_treas.txt
@@ -83,7 +83,7 @@ OnDied:
}
// Treasure Room Switch --------------------
-nguild_alde,123,223,0 script Switch#TresN01 111,{
+nguild_alde,123,223,0 script Switch#TresN01 HIDDEN_NPC,{
callfunc "F_GldTreasSw", "nguild_alde",218,176;
end;
}
@@ -109,7 +109,7 @@ OnDied:
}
// Room Switch ---------------------------------------------------------
-nguild_gef,152,117,0 script Switch#TresN02 111,{
+nguild_gef,152,117,0 script Switch#TresN02 HIDDEN_NPC,{
callfunc "F_GldTreasSw","nguild_gef",40,49;
end;
}
@@ -134,7 +134,7 @@ OnDied:
}
// Treasure Room Switch ---------------------------------------------------
-nguild_pay,295,8,0 script Switch#TresN03 111,{
+nguild_pay,295,8,0 script Switch#TresN03 HIDDEN_NPC,{
callfunc "F_GldTreasSw", "nguild_pay",120,59;
end;
}
@@ -159,7 +159,7 @@ OnDied:
}
// Treasure Room Switch ----------------------------------------------------
-nguild_prt,15,209,0 script Switch#TresN04 111,{
+nguild_prt,15,209,0 script Switch#TresN04 HIDDEN_NPC,{
callfunc "F_GldTreasSw", "nguild_prt",109,179;
end;
}
diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt
index ac54c0716..61541d096 100644
--- a/npc/events/nguild/nguild_warper.txt
+++ b/npc/events/nguild/nguild_warper.txt
@@ -26,7 +26,7 @@
//= TODO: The official entrance is in Izlude.
//============================================================
-prontera,146,163,6 script Novice Castles 729,{
+prontera,146,163,6 script Novice Castles 4_F_NOVICE,{
mes "[Cita]";
if (!getcharid(2)) {
mes "^FF0000You have to enter a guild to be able to hit Emperium!^000000";
@@ -80,7 +80,7 @@ prontera,146,163,6 script Novice Castles 729,{
close;
}
-n_castle,102,107,5 script Cita 729,{
+n_castle,102,107,5 script Cita 4_F_NOVICE,{
mes "[Cita]";
mes "Hello, "+ strcharinfo(0) +". Can I help you?";
next;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-07 21:58:37 +0000