summaryrefslogtreecommitdiff
path: root/npc/custom/woe_controller.txt
diff options
context:
space:
mode:
Diffstat (limited to 'npc/custom/woe_controller.txt')
-rw-r--r--npc/custom/woe_controller.txt24
1 files changed, 12 insertions, 12 deletions
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index fee4dfac5..5f619c1db 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -22,7 +22,7 @@ prontera,149,193,4 script WOE Information 2_BOARD1,{
end;
OnAgitStart:
while(agitcheck()) {
- misceffect EF_BEGINSPELL6;
+ specialeffect(EF_BEGINSPELL6);
sleep 425;
}
end;
@@ -192,13 +192,13 @@ OnReward:
return;
OnPCLoadMapEvent:
- if (!compare(strcharinfo(3),"g_cas")) end;
- if (((.AutoKick && .Active[0]) || (.NoOwner && !getcastledata(strcharinfo(3),1))) && !(.Active[0]&(1<<getd("."+strcharinfo(3))))) {
- if (getcharid(2) && getcastledata(strcharinfo(3),1) == getcharid(2)) end;
+ if (!compare(strcharinfo(PC_MAP),"g_cas")) end;
+ if (((.AutoKick && .Active[0]) || (.NoOwner && !getcastledata(strcharinfo(PC_MAP),1))) && !(.Active[0]&(1<<getd("."+strcharinfo(PC_MAP))))) {
+ if (getcharid(CHAR_ID_GUILD) && getcastledata(strcharinfo(PC_MAP),1) == getcharid(CHAR_ID_GUILD)) end;
sleep2 1000;
- message strcharinfo(0), getcastlename(strcharinfo(3))+" is currently inactive.";
+ message strcharinfo(PC_NAME), getcastlename(strcharinfo(PC_MAP))+" is currently inactive.";
sleep2 5000;
- if (compare(strcharinfo(3),"g_cas")) warp "SavePoint",0,0;
+ if (compare(strcharinfo(PC_MAP),"g_cas")) warp "SavePoint",0,0;
}
end;
@@ -234,7 +234,7 @@ while(1) {
}
}
next;
- switch(select(""+((.CastleWarp || .Active[1])?" ~ Warp to castles...":"")+": ~ Check schedule...: ~ View castle owners...:"+((getgmlevel()<.GMAccess || !getgmlevel())?"":" ~ Manage sessions...")+": ~ ^777777Cancel^000000")) {
+ switch(select(((.CastleWarp || .Active[1])?" ~ Warp to castles...":""), "~ Check schedule...", " ~ View castle owners...", ((getgmlevel()<.GMAccess || !getgmlevel())?"":" ~ Manage sessions..."), " ~ ^777777Cancel^000000")) {
case 1:
if (.CastleWarp) set .@clr$,"^0055FF";
set .@menu$,"";
@@ -287,7 +287,7 @@ while(1) {
mes "There are ^0055FF"+(.Size/4)+" session(s)^000000 configured.";
mes "What would you like to do?";
next;
- switch(select(" ~ Add a session...: ~ Delete a session...: ~ Reload settings...:"+((agitcheck() || agitcheck2())?" ~ End WOE session...":"")+": ~ ^777777Go back^000000")) {
+ switch(select(" ~ Add a session...", " ~ Delete a session...", " ~ Reload settings...", ((agitcheck() || agitcheck2())?" ~ End WOE session...": ""), " ~ ^777777Go back^000000")) {
case 1:
mes "[New Session]";
if (.Size > 127) {
@@ -344,7 +344,7 @@ while(1) {
mes "[New Session]";
mes "Are you sure?";
next;
- switch(select(" ~ ^0055FFAdd session...^000000: ~ Continue selecting castles...: ~ ^777777Cancel^000000")) {
+ switch(select(" ~ ^0055FFAdd session...^000000", " ~ Continue selecting castles...", " ~ ^777777Cancel^000000")) {
case 1:
for(set .@i,0; .@i<.Size; set .@i,.@i+4)
if ((.@day == $WOE_CONTROL[.@i] && .@end <= $WOE_CONTROL[.@i+1]) || .@day < $WOE_CONTROL[.@i]) {
@@ -386,7 +386,7 @@ while(1) {
mes "Delete ^0055FF"+.Days$[$WOE_CONTROL[.@i*4]]+"'s^000000 session?";
mes "This action cannot be undone.";
next;
- set .@j, select(" ~ ^FF0000Delete session...^000000: ~ ^777777Cancel^000000");
+ set .@j, select(" ~ ^FF0000Delete session...^000000", " ~ ^777777Cancel^000000");
mes "[Remove Session]";
if (.@j == 2)
mes "Cancelled.";
@@ -405,7 +405,7 @@ while(1) {
mes "Be aware that this will disrupt the current WOE session.";
}
next;
- set .@i, select(" ~ ^0055FFReload settings...^000000: ~ ^777777Cancel^000000");
+ set .@i, select(" ~ ^0055FFReload settings...^000000", " ~ ^777777Cancel^000000");
mes "[Reload Settings]";
if (.@i == 2) mes "Cancelled.";
else {
@@ -426,7 +426,7 @@ while(1) {
mes " ";
mes "Kill the current WOE session?";
next;
- set .@i, select(" ~ ^FF0000End session...^000000:"+((.Options&1)?" ~ ^FF0000End session without rewards...^000000":"")+": ~ ^777777Cancel^000000");
+ set .@i, select(" ~ ^FF0000End session...^000000", ((.Options&1)?" ~ ^FF0000End session without rewards...^000000": ""), " ~ ^777777Cancel^000000");
mes "[Force Agit End]";
if (.@i == 3)
mes "Cancelled.";