diff options
Diffstat (limited to 'npc/events/nguild')
| -rw-r--r-- | npc/events/nguild/nguild_dunsw.txt | 2 | ||||
| -rw-r--r-- | npc/events/nguild/nguild_ev_agit.txt | 2 | ||||
| -rw-r--r-- | npc/events/nguild/nguild_flags.txt | 4 | ||||
| -rw-r--r-- | npc/events/nguild/nguild_kafras.txt | 2 | ||||
| -rw-r--r-- | npc/events/nguild/nguild_managers.txt | 2 | ||||
| -rw-r--r-- | npc/events/nguild/nguild_warper.txt | 34 |
6 files changed, 23 insertions, 23 deletions
diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt index 23cd8ec8c..291b08db3 100644 --- a/npc/events/nguild/nguild_dunsw.txt +++ b/npc/events/nguild/nguild_dunsw.txt @@ -49,7 +49,7 @@ function script F_GldDunSw { next; if (select("Pull.", "Do not.") == 1) { - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { warp "gld_dun"+getarg(1),getarg(2),getarg(3); end; } diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt index cbf6aec3c..99545bfff 100644 --- a/npc/events/nguild/nguild_ev_agit.txt +++ b/npc/events/nguild/nguild_ev_agit.txt @@ -67,7 +67,7 @@ function script F_AgitBreak { .@map$ = getarg(0); .@castle$ = getarg(1); - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); if (.@GID <= 0) return; .@Economy = getcastledata(.@map$,2) - 5; diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index d2a753003..999f79dca 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -53,12 +53,12 @@ function script F_Flags { return; } else { - if (getcharid(2) == .@GID && getarg(4) == 1) { + if (getcharid(CHAR_ID_GUILD) == .@GID && getarg(4) == 1) { mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if (select("Return to the guild castle.", "Quit.") == 1) { - if (getcharid(2) == getcastledata(getarg(1),1)) + if (getcharid(CHAR_ID_GUILD) == getcastledata(getarg(1),1)) warp getarg(1),getarg(2),getarg(3); } return; diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt index 66c53ff2d..8b448bbe3 100644 --- a/npc/events/nguild/nguild_kafras.txt +++ b/npc/events/nguild/nguild_kafras.txt @@ -39,7 +39,7 @@ function script F_GKafra { cutin "kafra_01",2; @GID = getcastledata(getarg(0),1); - if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG; + if (getcharid(CHAR_ID_GUILD) == @GID && getgdskilllv(@GID,10001)) goto L_StartG; mes "[Kafra Service]"; mes "I am contracted to provide service only for the ^ff0000" + getguildname(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience."; diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index 6ff1e7e2a..1d9b56966 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -47,7 +47,7 @@ function script F_GldManager { mes "I am waiting for my master. Brave adventurer, follow your destiny!"; return; } - if (getcharid(2) != @GID){ + if (getcharid(CHAR_ID_GUILD) != @GID){ mes "I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command! Hey! Your not even a part of the guild!!"; mes "Where are the guardians? Destroy these intruders!"; return; diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt index 07ee4b0ed..a2e2faed1 100644 --- a/npc/events/nguild/nguild_warper.txt +++ b/npc/events/nguild/nguild_warper.txt @@ -42,24 +42,24 @@ prontera,146,163,6 script Novice Castles 4_F_NOVICE,{ mes "[Cita]"; - if (!getcharid(2)) { + if (!getcharid(CHAR_ID_GUILD)) { mes "^FF0000You have to enter a guild to be able to hit Emperium!^000000"; - } else if (getgdskilllv(getcharid(2),10013) || - (getgdskilllv(getcharid(2),10000) + - getgdskilllv(getcharid(2),10001) + - getgdskilllv(getcharid(2),10002) + - getgdskilllv(getcharid(2),10003) + - getgdskilllv(getcharid(2),10004) + - getgdskilllv(getcharid(2),10005) + - getgdskilllv(getcharid(2),10006) + - getgdskilllv(getcharid(2),10007) + - getgdskilllv(getcharid(2),10008) + - getgdskilllv(getcharid(2),10009) + - getgdskilllv(getcharid(2),10010) + - getgdskilllv(getcharid(2),10011) + - getgdskilllv(getcharid(2),10012) + - getgdskilllv(getcharid(2),10013) + - getgdskilllv(getcharid(2),10014) > 9) + } else if (getgdskilllv(getcharid(CHAR_ID_GUILD),10013) || + (getgdskilllv(getcharid(CHAR_ID_GUILD),10000) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10001) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10002) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10003) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10004) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10005) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10006) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10007) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10008) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10009) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10010) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10011) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10012) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10013) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10014) > 9) ) { mes "I see... your guild has Emergency Call mastered."; mes "You cannot enter the Novice Castle area."; |