summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/msg_athena.conf6
-rw-r--r--npc/other/arena.txt654
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/pet.c3
-rw-r--r--src/map/status.c19
-rw-r--r--src/map/status.h4
-rw-r--r--src/plugins/console.c2
-rw-r--r--src/tool/adduser.c2
-rw-r--r--src/tool/convert.c2
9 files changed, 24 insertions, 670 deletions
diff --git a/conf/msg_athena.conf b/conf/msg_athena.conf
index f43014669..921cb1683 100644
--- a/conf/msg_athena.conf
+++ b/conf/msg_athena.conf
@@ -185,8 +185,8 @@
169: This item (%d: '%s') is not an equipment.
170: This item is not an equipment.
171: %d - void
-172: You replace previous memo position %d - %s (%d,%d).
-173: Note: you don't have the 'Warp' skill level to use it.
+//172: You replace previous memo position %d - %s (%d,%d).
+//173: Note: you don't have the 'Warp' skill level to use it.
174: Number of status points changed!
175: Number of skill points changed!
176: Number of zenys changed!
@@ -266,7 +266,7 @@
250: You have already opened your storage. Close it first.
251: You have already opened your guild storage. Close it first.
252: You are not in a guild.
-253: You are not authorized to memo this map.
+//253: You are not authorized to memo this map.
254: GM command configuration reloaded.
255: Battle configuration reloaded.
256: Status database reloaded.
diff --git a/npc/other/arena.txt b/npc/other/arena.txt
deleted file mode 100644
index b1d7887ec..000000000
--- a/npc/other/arena.txt
+++ /dev/null
@@ -1,654 +0,0 @@
-// ------------------------------------------------------------------
-// Setup Of Arena
-// ------------------------------------------------------------------
-
-// The following maps are used
-//map: prontera
-//map: prt_are_in
-//map: force_1-1
-
-// Disallow Teleport, etc.
-force_1-1 mapflag pvp dummy
-force_1-2 mapflag pvp dummy
-force_1-3 mapflag pvp dummy
-force_2-1 mapflag pvp dummy
-force_2-2 mapflag pvp dummy
-force_2-3 mapflag pvp dummy
-force_3-1 mapflag pvp dummy
-force_3-2 mapflag pvp dummy
-force_3-3 mapflag pvp dummy
-prt_are_in mapflag nomemo dummy
-prt_are_in mapflag noteleport dummy
-prt_are_in mapflag nosave prontera,156,191
-force_1-1 mapflag nomemo dummy
-force_1-1 mapflag noteleport dummy
-force_1-1 mapflag nosave prontera,156,191
-
-// An entrance is placed in Prontera.
-prontera,160,185,3 script Arena Entrance 116,{
- mes "Want to go to the arena?";
- next;
- menu "Let's go!",L_GOARENA,"Nah..",L_YAME;
-L_GOARENA:
- warp "prt_are_in",31,82;
- close;
-L_YAME:
- close;
-}
-
-// Teleport from waiting room to ready room
-prt_are_in,29,79,0 script Time Attack 116,{
- if( getmapusers("force_1-1")>0 ) goto L_WAIT;
-
- mes "This is the Time Attack selection.";
- mes "Please choose your challenge.";
- menu "Level 1 - 5 Porings, 30 secs!",L_GOLV1,"Level 2 - 7 Roda Frogs, 60 secs!",L_GOLV2,"Level 3 - 9 PecoPecos, 100 secs!",L_GOLV3,"Never mind.",L_YAME;
-L_GOLV1:
- if( getmapusers("force_1-1")>0 ) goto L_WAIT;
- disablenpc "fc103-1";
- disablenpc "fc105";
- disablenpc "fc107";
- addtimer 5000,"arenalv1st";
- warp "force_1-1",99,12;
- end;
-L_GOLV2:
- if( getmapusers("force_1-1")>0 ) goto L_WAIT;
- disablenpc "fc103-1";
- disablenpc "fc105";
- disablenpc "fc107";
- addtimer 5000,"arenalv2st";
- warp "force_1-1",99,12;
- end;
-L_GOLV3:
- if( getmapusers("force_1-1")>0 ) goto L_WAIT;
- disablenpc "fc103-1";
- disablenpc "fc105";
- disablenpc "fc107";
- addtimer 5000,"arenalv3st";
- warp "force_1-1",99,12;
- end;
-L_WAIT:
- mes "Since the arena is in use,";
- mes "please wait for a while.";
-L_YAME:
- close;
-}
-
-
-// Ready room (10-second preparation)
-force_1-1,99,12,0 script arenalv1st -1,{
- announce "It will begin in 10 seconds!",3;
- addtimer 10000,"arenalv1fgt";
-}
-force_1-1,99,12,0 script arenalv2st -1,{
- announce "It will begin in 10 seconds!",3;
- addtimer 10000,"arenalv2fgt";
-}
-force_1-1,99,12,0 script arenalv3st -1,{
- announce "It will begin in 10 seconds!",3;
- addtimer 10000,"arenalv3fgt";
-}
-
-
-// Transmission to the room, and mob organization
-//Time Attack Level 1
-force_1-1,99,12,0 script arenalv1fgt -1,{
- killmonster "force_1-1","arenalv1fgt::arenalv1mon";
- killmonster "force_1-1","arenalv2fgt::arenalv2mon";
- killmonster "force_1-1","arenalv3fgt::arenalv3mon";
- monster "force_1-1",25,25,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon";
- monster "force_1-1",20,25,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon";
- monster "force_1-1",25,20,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon";
- monster "force_1-1",30,25,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon";
- monster "force_1-1",25,30,"Arena Enemy",1002,1,"arenalv1fgt::arenalv1mon";
- set $arena00,5;
- disablenpc "fc101";
- disablenpc "fc103";
- warp "force_1-1",25,26;
- enablenpc "fc103-1";
- enablenpc "fc105";
- enablenpc "fc107";
- announce "Do it within 30 seconds!",19;
- addtimer 30000,"arenalv1fail";
- addtimer 20000,"tensecsleft";
-arenalv1mon:
- end;
-}
-
-//Time Attack Level 2
-force_1-1,99,12,0 script arenalv2fgt -1,{
- killmonster "force_1-1","arenalv1fgt::arenalv1mon";
- killmonster "force_1-1","arenalv2fgt::arenalv2mon";
- killmonster "force_1-1","arenalv3fgt::arenalv3mon";
- monster "force_1-1",20,20,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon";
- monster "force_1-1",20,25,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon";
- monster "force_1-1",20,30,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon";
- monster "force_1-1",30,20,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon";
- monster "force_1-1",30,25,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon";
- monster "force_1-1",30,30,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon";
- monster "force_1-1",25,30,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon";
- monster "force_1-1",25,20,"Arena Enemy",1012,1,"arenalv2fgt::arenalv2mon";
- set $arena00,7;
- disablenpc "fc101";
- disablenpc "fc103";
- warp "force_1-1",25,26;
- enablenpc "fc103-1";
- enablenpc "fc105";
- enablenpc "fc107";
- announce "You have 60 seconds to destroy all seven!",19;
- addtimer 60000,"arenalv2fail";
- addtimer 50000,"tensecsleft";
-arenalv2mon:
- end;
-}
-
-//Time Attack Level 3
-force_1-1,99,12,0 script arenalv3fgt -1,{
- killmonster "force_1-1","arenalv1fgt::arenalv1mon";
- killmonster "force_1-1","arenalv2fgt::arenalv2mon";
- killmonster "force_1-1","arenalv3fgt::arenalv3mon";
- monster "force_1-1",20,20,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",20,25,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",20,30,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",30,20,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",30,25,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",30,30,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",25,30,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",25,25,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",25,20,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- monster "force_1-1",20,35,"Arena Enemy",1019,1,"arenalv3fgt::arenalv3mon";
- set $arena00,9;
- disablenpc "fc101";
- disablenpc "fc103";
- warp "force_1-1",25,26;
- enablenpc "fc103-1";
- enablenpc "fc105";
- enablenpc "fc107";
- announce "You have 90 seconds to destroy all nine!",19;
- addtimer 90000,"arenalv3fail";
- addtimer 80000,"tensecsleft";
-arenalv3mon:
- end;
-}
-
-// Pushed-down Processing
-//Time Attack Level 1
-force_1-1,25,26,0 script arenalv1mon -1,{
- set $arena00, $arena00 - 1;
- if( $arena00 > 0 ) goto L_CONT;
- deltimer "arenaev8000";
- announce "Crash!!",3;
- enablenpc "fc101";
- enablenpc "fc103";
- areaannounce "force_1-1",0,0,350,350,
- "You cleared Time Attack Level 1.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "prontera",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "morocc",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "geffen",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "payon",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "alberta",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "izlude",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "aldebaran",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "xmas",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "comodo",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "prt_gld",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "prtg_cas01",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "prtg_cas02",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "prtg_cas03",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "prtg_cas04",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "prtg_cas05",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "pay_gld",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "payg_cas01",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "payg_cas02",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "payg_cas03",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "payg_cas04",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "payg_cas05",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "yuno",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "amatsu",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- areaannounce "gonryun",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 1.",0;
- addtimer 5000,"arenareturn";
-L_CONT:
- end;
-}
-
-force_1-1,25,26,0 script arenalv2mon -1,{
- set $arena00, $arena00 - 1;
- if( $arena00 > 0 ) goto L_CONT;
- deltimer "arenaev8000";
- announce "Crash!!",3;
- enablenpc "fc101";
- enablenpc "fc103";
- areaannounce "force_1-1",0,0,350,350,
- "You cleared Time Attack Level 2.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "prontera",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "morocc",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "geffen",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "payon",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "alberta",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "izlude",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "aldebaran",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "xmas",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "comodo",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "prt_gld",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "prtg_cas01",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "prtg_cas02",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "prtg_cas03",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "prtg_cas04",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "prtg_cas05",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "pay_gld",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "payg_cas01",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "payg_cas02",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "payg_cas03",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "payg_cas04",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "payg_cas05",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "yuno",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "amatsu",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- areaannounce "gonryun",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 2.",0;
- addtimer 5000,"arenareturn";
-L_CONT:
- end;
-}
-
-
-force_1-1,25,26,0 script arenalv3mon -1,{
- set $arena00, $arena00 - 1;
- if( $arena00 > 0 ) goto L_CONT;
- deltimer "arenaev8000";
- announce "Crash!!",3;
- enablenpc "fc101";
- enablenpc "fc103";
- areaannounce "force_1-1",0,0,350,350,
- "You cleared Time Attack Level 3.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "prontera",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "morocc",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "geffen",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "payon",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "alberta",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "izlude",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "aldebaran",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "xmas",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "comodo",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "prt_gld",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "prtg_cas01",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "prtg_cas02",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "prtg_cas03",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "prtg_cas04",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "prtg_cas05",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "pay_gld",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "payg_cas01",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "payg_cas02",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "payg_cas03",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "payg_cas04",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "payg_cas05",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "yuno",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "amatsu",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- areaannounce "gonryun",0,0,350,350,
- strcharinfo(0) + " cleared Time Attack Level 3.",0;
- addtimer 5000,"arenareturn";
-L_CONT:
- end;
-}
-
-// Timeout
-force_1-1,25,26,0 script arenalv1fail -1,{
- set $arena00,99;
- killmonster "force_1-1","arenalv1fgt::arenalv1mon";
- killmonster "force_1-1","arenalv2fgt::arenalv2mon";
- killmonster "force_1-1","arenalv3fgt::arenalv3mon";
- announce "Time Over!!",3;
- areaannounce "force_1-1",0,0,350,350,
- "You failed Time Attack Level 1.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "prontera",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "morocc",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "geffen",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "payon",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "alberta",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "izlude",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "aldebaran",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "xmas",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "comodo",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "prt_gld",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "prtg_cas01",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "prtg_cas02",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "prtg_cas03",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "prtg_cas04",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "prtg_cas05",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "pay_gld",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "payg_cas01",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "payg_cas02",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "payg_cas03",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "payg_cas04",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "payg_cas05",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "yuno",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "amatsu",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- areaannounce "gonryun",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 1.",0;
- addtimer 5000,"arenareturn";
-}
-
-force_1-1,25,26,0 script arenalv2fail -1,{
- set $arena00,99;
- killmonster "force_1-1","arenalv1fgt::arenalv1mon";
- killmonster "force_1-1","arenalv2fgt::arenalv2mon";
- killmonster "force_1-1","arenalv3fgt::arenalv3mon";
- announce "Time Over!!",3;
- areaannounce "force_1-1",0,0,350,350,
- "You failed Time Attack Level 2.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "prontera",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "morocc",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "geffen",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "payon",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "alberta",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "izlude",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "aldebaran",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "xmas",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "comodo",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "prt_gld",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "prtg_cas01",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "prtg_cas02",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "prtg_cas03",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "prtg_cas04",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "prtg_cas05",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "pay_gld",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "payg_cas01",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "payg_cas02",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "payg_cas03",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "payg_cas04",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "payg_cas05",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "yuno",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "amatsu",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- areaannounce "gonryun",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 2.",0;
- addtimer 5000,"arenareturn";
-}
-
-force_1-1,25,26,0 script arenalv3fail -1,{
- set $arena00,99;
- killmonster "force_1-1","arenalv1fgt::arenalv1mon";
- killmonster "force_1-1","arenalv2fgt::arenalv2mon";
- killmonster "force_1-1","arenalv3fgt::arenalv3mon";
- announce "Time Over!!",3;
- areaannounce "force_1-1",0,0,350,350,
- "You failed Time Attack Level 2.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "prontera",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "morocc",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "geffen",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "payon",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "alberta",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "izlude",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "aldebaran",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "prt_are_in",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "xmas",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "comodo",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "prt_gld",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "prtg_cas01",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "prtg_cas02",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "prtg_cas03",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "prtg_cas04",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "prtg_cas05",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "pay_gld",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "payg_cas01",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "payg_cas02",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "payg_cas03",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "payg_cas04",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "payg_cas05",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "yuno",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "amatsu",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- areaannounce "gonryun",0,0,350,350,
- strcharinfo(0) + " failed Time Attack Level 3.",0;
- addtimer 5000,"arenareturn";
-}
-
-// Reminding the player of time constraints.
-force_1-1,25,26,0 script tensecsleft -1,{
- announce "Ten seconds remaining!",3;
-}
-
-
-// Return to Prontera
-force_1-1,25,26,0 script arenareturn -1,{
- warp "prontera",156,191;
-}
-
-//Time Limit Mode
-force_1-1,25,44,0 warp fc101 1,1,force_1-1,25,69
-force_1-1,25,65,0 warp fc101-1 1,1,force_1-1,25,40
-force_1-1,25,134,0 warp fc102 1,1,force_1-1,25,159
-force_1-1,25,155,0 warp fc102-1 1,1,force_1-1,25,130
-force_1-1,44,26,0 warp fc103 1,1,force_1-1,66,26
-force_1-1,62,26,0 warp fc103-1 1,1,force_1-1,40,26
-force_1-1,44,174,0 warp fc104 1,1,force_1-1,69,174
-force_1-1,65,174,0 warp fc104-1 1,1,force_1-1,40,174
-force_1-1,99,54,0 warp fc105 1,1,force_1-1,96,82
-force_1-1,100,81,0 warp fc105-1 1,1,force_1-1,99,51
-force_1-1,134,174,0 warp fc106 1,1,force_1-1,159,174
-force_1-1,155,174,0 warp fc106-1 1,1,force_1-1,130,174
-force_1-1,137,26,0 warp fc107 1,1,force_1-1,159,26
-force_1-1,155,26,0 warp fc107-1 1,1,force_1-1,132,26
-force_1-1,174,44,0 warp fc108 1,1,force_1-1,174,69
-force_1-1,174,65,0 warp fc108-1 1,1,force_1-1,174,40
-force_1-1,174,134,0 warp fc109 1,1,force_1-1,174,159
-force_1-1,174,155,0 warp fc109-1 1,1,force_1-1,174,130
-force_1-2,25,93,0 warp fc201 1,1,force_1-2,25,118
-force_1-2,25,114,0 warp fc201-1 1,1,force_1-2,25,89
-force_1-2,33,178,0 warp fc202 1,1,force_1-2,59,178
-force_1-2,55,178,0 warp fc202-1 1,1,force_1-2,29,178
-force_1-2,41,26,0 warp fc203 1,1,force_1-2,89,26
-force_1-2,85,26,0 warp fc203-1 1,1,force_1-2,37,26
-force_1-2,41,78,0 warp fc204 1,1,force_1-2,88,78
-force_1-2,84,78,0 warp fc204-1 1,1,force_1-2,37,78
-force_1-2,49,130,0 warp fc205 1,1,force_1-2,91,125
-force_1-2,91,129,0 warp fc205-1 1,1,force_1-2,49,134
-force_1-2,95,187,0 warp fc206 1,1,force_1-2,107,141
-force_1-2,107,145,0 warp fc206-1 1,1,force_1-2,95,183
-force_1-2,99,40,0 warp fc207 1,1,force_1-2,99,66
-force_1-2,99,62,0 warp fc207-1 1,1,force_1-2,99,36
-force_1-2,114,26,0 warp fc208 1,1,force_1-2,162,26
-force_1-2,158,26,0 warp fc208-1 1,1,force_1-2,110,26
-force_1-2,115,78,0 warp fc209 1,1,force_1-2,162,78
-force_1-2,158,78,0 warp fc209-1 1,1,force_1-2,111,78
-force_1-2,137,178,0 warp fc210 1,1,force_1-2,162,178
-force_1-2,158,178,0 warp fc210-1 1,1,force_1-2,133,178
-force_1-2,173,93,0 warp fc211 1,1,force_1-2,173,118
-force_1-2,173,114,0 warp fc211-1 1,1,force_1-2,173,89
-force_1-3,10,100,0 warp fc301 1,1,force_1-3,25,180
-force_1-3,29,180,0 warp fc301-1 1,1,force_1-3,14,100
-force_1-3,19,10,0 warp fc302 1,1,force_1-3,19,185
-force_1-3,19,189,0 warp fc302-1 1,1,force_1-3,19,14
-force_1-3,19,29,0 warp fc303 1,1,force_1-3,19,54
-force_1-3,19,50,0 warp fc303-1 1,1,force_1-3,19,25
-force_1-3,19,147,0 warp fc304 1,1,force_1-3,179,94
-force_1-3,179,90,0 warp fc304-1 1,1,force_1-3,19,143
-force_1-3,29,100,0 warp fc305 1,1,force_1-3,174,180
-force_1-3,170,180,0 warp fc305-1 1,1,force_1-3,24,100
-force_1-3,59,29,0 warp fc306 1,1,force_1-3,99,132
-force_1-3,99,128,0 warp fc306-1 1,1,force_1-3,59,25
-force_1-3,59,69,0 warp fc307 1,1,force_1-3,59,94
-force_1-3,59,90,0 warp fc307-1 1,1,force_1-3,59,65
-force_1-3,59,109,0 warp fc308 1,1,force_1-3,139,54
-force_1-3,139,50,0 warp fc308-1 1,1,force_1-3,59,105
-force_1-3,59,128,0 warp fc309 1,1,force_1-3,139,105
-force_1-3,139,109,0 warp fc309-1 1,1,force_1-3,59,132
-force_1-3,69,20,0 warp fc310 1,1,force_1-3,134,100
-force_1-3,130,100,0 warp fc310-1 1,1,force_1-3,65,20
-force_1-3,69,60,0 warp fc311 1,1,force_1-3,94,60
-force_1-3,90,60,0 warp fc311-1 1,1,force_1-3,65,60
-force_1-3,69,138,0 warp fc312 1,1,force_1-3,174,60
-force_1-3,170,60,0 warp fc312-1 1,1,force_1-3,65,138
-force_1-3,99,147,0 warp fc313 1,1,force_1-3,99,168
-force_1-3,99,164,0 warp fc313-1 1,1,force_1-3,99,143
-force_1-3,109,60,0 warp fc314 1,1,force_1-3,134,20
-force_1-3,130,20,0 warp fc314-1 1,1,force_1-3,105,60
-force_1-3,109,100,0 warp fc315 1,1,force_1-3,174,100
-force_1-3,170,100,0 warp fc315-1 1,1,force_1-3,105,100
-force_1-3,109,138,0 warp fc316 1,1,force_1-3,134,138
-force_1-3,130,138,0 warp fc316-1 1,1,force_1-3,105,138
-force_1-3,139,147,0 warp fc317 1,1,force_1-3,179,174
-force_1-3,179,170,0 warp fc317-1 1,1,force_1-3,139,143
-force_1-3,179,29,0 warp fc318 1,1,force_1-3,179,54
-force_1-3,179,50,0 warp fc318-1 1,1,force_1-3,179,25
-force_1-3,179,109,0 warp fc319 1,1,force_1-3,179,132
-force_1-3,179,128,0 warp fc319-1 1,1,force_1-3,179,105
diff --git a/src/map/clif.c b/src/map/clif.c
index d5eec4f56..1d254cf8d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7626,7 +7626,7 @@ void clif_feel_hate_reset(struct map_session_data *sd)
WFIFOSET(fd, packet_len(0x20e));
}
-/// Validates one global/guild/party/whisper message packet to and tries to recognize its components.
+/// Validates one global/guild/party/whisper message packet and tries to recognize its components.
/// Returns true if the packet was parsed successfully.
/// Formats: 0 - <packet id>.w <packet len>.w (<name> : <message>).?B 00
/// 1 - <packet id>.w <packet len>.w <name>.24B <message>.?B 00
diff --git a/src/map/pet.c b/src/map/pet.c
index 606e29d31..64424d7f1 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1359,7 +1359,8 @@ int do_init_pet(void)
return 0;
}
-int do_final_pet(void) {
+int do_final_pet(void)
+{
int i;
for( i = 0; i < MAX_PET_DB; i++ ) {
if(pet_db[i].script) {
diff --git a/src/map/status.c b/src/map/status.c
index 75c877140..6919a47bb 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -6100,11 +6100,15 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
}
/*==========================================
* ステータス異常全解除
+ * type:
+ * 0 - ???
+ * 1 - ???
+ * 2 - ???
*------------------------------------------*/
-int status_change_clear(struct block_list* bl, enum sc_type type)
+int status_change_clear(struct block_list* bl, int type)
{
struct status_change* sc;
- int i;
+ enum sc_type i;
sc = status_get_sc(bl);
@@ -6118,9 +6122,10 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
{
if(sc->data[i].timer == -1)
continue;
+
if(type == 0)
switch (i)
- { //Type 0: PC killed -> Place here stats that do not dispel on death.
+ { //Type 0: PC killed -> Place here statuses that do not dispel on death.
case SC_EDP:
case SC_MELTDOWN:
case SC_XMAS:
@@ -6136,6 +6141,7 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
case SC_JAILED:
continue;
}
+
status_change_end(bl, i, INVALID_TIMER);
if( type == 1 && sc->data[i].timer != INVALID_TIMER )
@@ -6145,12 +6151,13 @@ int status_change_clear(struct block_list* bl, enum sc_type type)
sc->data[i].timer = -1;
}
}
+
sc->opt1 = 0;
sc->opt2 = 0;
sc->opt3 = 0;
sc->option &= OPTION_MASK;
- if(!type || type&2)
+ if( type == 0 || type == 2 )
clif_changeoption(bl);
return 1;
@@ -7025,9 +7032,9 @@ int status_change_timer_sub(struct block_list* bl, va_list ap)
* Clears buffs/debuffs of a character.
* type&1 -> buffs, type&2 -> debuffs
*------------------------------------------*/
-int status_change_clear_buffs (struct block_list* bl, enum sc_type type)
+int status_change_clear_buffs (struct block_list* bl, int type)
{
- int i;
+ enum sc_type i;
struct status_change *sc= status_get_sc(bl);
if (!sc || !sc->count)
diff --git a/src/map/status.h b/src/map/status.h
index 074425de6..a610ed120 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -670,8 +670,8 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid);
int kaahi_heal_timer(int tid, unsigned int tick, int id, int data);
int status_change_timer(int tid, unsigned int tick, int id, int data);
int status_change_timer_sub(struct block_list* bl, va_list ap);
-int status_change_clear(struct block_list* bl, enum sc_type type);
-int status_change_clear_buffs(struct block_list* bl, enum sc_type type);
+int status_change_clear(struct block_list* bl, int type);
+int status_change_clear_buffs(struct block_list* bl, int type);
void status_calc_bl(struct block_list *bl, unsigned long flag);
int status_calc_pet(struct pet_data* pd, int first); // [Skotlex]
diff --git a/src/plugins/console.c b/src/plugins/console.c
index 5374d784f..549091f12 100644
--- a/src/plugins/console.c
+++ b/src/plugins/console.c
@@ -53,7 +53,7 @@ typedef struct _buffer {
/// In linux the worker is a process so it needs to comunicate through pipes.
#define WORKER_FUNC_DECLARE(name) void worker_ ## name(void)
#define WORKER_FUNC_START(name) void worker_ ## name(void) {
-#define WORKER_FUNC_END(name) _exit(0); }
+#define WORKER_FUNC_END(name) _exit(EXIT_SUCCESS); }
#define WORKER_EXECUTE(name,errvar) \
do{ \
int pid = fork(); \
diff --git a/src/tool/adduser.c b/src/tool/adduser.c
index 1140bd6ff..8e7c5f0c2 100644
--- a/src/tool/adduser.c
+++ b/src/tool/adduser.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
if (FPaccin == NULL) {
printf("'%s' file not found!\n", account_txt);
printf("Run the setup wizard please.\n");
- exit(0);
+ exit(EXIT_SUCCESS);
}
next_id = 2000000;
diff --git a/src/tool/convert.c b/src/tool/convert.c
index 863a282dc..671a49fb7 100644
--- a/src/tool/convert.c
+++ b/src/tool/convert.c
@@ -292,7 +292,7 @@ int main(int argc,char *argv[])
{
if(argc < 3) {
printf("Usage: convert <input filename> <output filename>\n");
- exit(0);
+ exit(EXIT_SUCCESS);
}
mmo_char_convert(argv[1],argv[2]);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-07 05:30:21 +0000