From 6d1fa1c2b8527838dfdc0c7d0950aa40dc237ca0 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Mon, 11 Oct 2010 03:51:07 +0000 Subject: * Renewal Update to warp portals, and deleted disabled_warps.txt. - Only disabled warps, some coordinates might have slipped past me. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14421 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/warps/cities/rachel.txt | 2 +- npc/warps/cities/yggdrasil.txt | 5 ++++- npc/warps/disabled_warps.txt | 45 ------------------------------------- npc/warps/dungeons/abyss.txt | 14 ++++++------ npc/warps/dungeons/anthell.txt | 8 +++---- npc/warps/fields/com_fild.txt | 8 +++---- npc/warps/fields/geffen_fild.txt | 20 ++++++++--------- npc/warps/fields/hugel_fild.txt | 37 +++++++++++++++++-------------- npc/warps/fields/payon_fild.txt | 48 ++++++++++++++++++++-------------------- npc/warps/fields/rachel_fild.txt | 30 ++++++++++++------------- npc/warps/fields/veins_fild.txt | 19 ++++++++++------ npc/warps/fields/yuno_fild.txt | 47 ++++++++++++++++++++------------------- 12 files changed, 126 insertions(+), 157 deletions(-) delete mode 100644 npc/warps/disabled_warps.txt (limited to 'npc/warps') diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt index f614f778f..8dc9f9675 100644 --- a/npc/warps/cities/rachel.txt +++ b/npc/warps/cities/rachel.txt @@ -105,7 +105,7 @@ ra_temsky,99,135,0 warp rachel71 1,1,ra_temsky,99,113 ra_temsky,137,139,0 warp rachel72 1,1,ra_temsky,109,143 ra_temsky,62,139,0 warp rachel73 1,1,ra_temsky,91,143 -rachel,25,125,0 warp rachel74 1,1,ra_fild11,353,226 +//rachel,25,125,0 warp rachel74 1,1,ra_fild11,353,226 rachel,275,125,0 warp rachel75 1,1,ra_fild12,40,226 rachel,130,21,0 warp rachel76 1,1,ve_fild02,195,377 diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt index 84a51400f..da7f05ece 100644 --- a/npc/warps/cities/yggdrasil.txt +++ b/npc/warps/cities/yggdrasil.txt @@ -13,7 +13,10 @@ //============================================================ //Umbala Entrance -um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63 +//um_dun02,125,163,0 warp nwarp1 1,1,yggdrasil01,40,63 + +// RE Yggdrasil Entrance +umbala,106,285,1 warp ygGate_yg1 1,1,yggdrasil01,39,63 //Niflheim Exit yggdrasil01,249,262,0 warp nwarp5 1,1,nif_fild01,315,66 diff --git a/npc/warps/disabled_warps.txt b/npc/warps/disabled_warps.txt deleted file mode 100644 index f980083d1..000000000 --- a/npc/warps/disabled_warps.txt +++ /dev/null @@ -1,45 +0,0 @@ -//===== eAthena Script ======================================= -//= Disabled Warps -//===== By: ================================================== -//= Nana (1.0) -//===== Current Version: ===================================== -//= 1.2 -//===== Description: ========================================= -//= Disabled Warp's for entire Athena -//===== Additional Comments: ================================= -//= No comment! -//============================================================ - -//= Beach Dungeon ============================================ -//beach_dun,89,28,0 warp cmd00a 3,3,beach_dun2,15,182 -//beach_dun2,13,182,0 warp cmd00b 3,3,beach_dun,89,30 - -//= Comodo Field -//moc_fild12,35,303,0 warp cmd011 3,3,cmd_fild08,331,319 -//cmd_fild09,14,120,0 warp cmdf14-3 3,3,cmd_fild07,386,96 - - -//= Morroc Field ============================================= -//moc_fild04,219,327,0 warp mocf016 3,4,anthell01,35,262 -//moc_fild15,258,253,0 warp mocf017 3,3,anthell01,35,262 - -//= Ant Hell ================================================= -//anthell01,35,267,0 warp ant001 1,1,moc_fild04,213,327 -//anthell02,171,169,0 warp ant002 1,2,moc_fild04,213,327 - -//= Morroc Ruins ============================================= -//morocc_in,108,179,0 warp w280 3,2,morocc,284,175 - -//= Morroc Town ============================================== -//morocc_in,72,67,0 warp w341 2,2,morocc_in,44,162 - -//= Izlude Town ============================================== -//= Due to Job Quest -//izlude_in,62,170,0 warp w1039 1,1,izlude_in,68,165 - -//= Payon Cave -//pay_dun03,127,62,0 warp payd04 1,2,pay_dun04,201,204 - -// Airplane (no direct access there) -//airplane,255,55,0 warp ein044 1,1,airplane,90,68 -//airplane,88,68,0 warp ein044a 1,1,airplane,253,55 diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt index 71abfabcf..4d39ff591 100644 --- a/npc/warps/dungeons/abyss.txt +++ b/npc/warps/dungeons/abyss.txt @@ -3,18 +3,18 @@ //===== By: ================================================== //= Muad-Dib (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 10+ //===== Description: ========================================= //= Warp Points for Abyss Lake Dungeon //===== Additional Comments: ================================= //= 1.0 Thanks to Muad-Dib for the temp warps [Lupus] +//= 1.1 Renewal warp adjustments. //============================================================ -//hu_fild05,197,210,0 warp abysslakedunwarp001 2,3,abyss_01,264,271 -abyss_01,267,274,0 warp abysslakedunwarp002 1,1,hu_fild05,192,207 -abyss_01,26,23,0 warp abysslakedunwarp003 1,1,abyss_02,275,270 -abyss_02,278,270,0 warp abysslakedunwarp004 1,1,abyss_01,26,26 -abyss_02,145,281,0 warp abysslakedunwarp005 1,1,abyss_03,116,27 -abyss_03,116,24,0 warp abysslakedunwarp006 1,1,abyss_02,145,278 +abyss_01,25,24,0 warp abysslakedunwarp001 1,1,abyss_02,271,270 +abyss_02,145,280,0 warp abysslakedunwarp002 1,1,abyss_03,115,30 +abyss_02,277,270,0 warp abysslakedunwarp003 1,1,abyss_01,25,30 +abyss_03,115,25,0 warp abysslakedunwarp004 1,1,abyss_02,145,275 +abyss_01,265,274,0 warp abysslakedunwarp005 1,1,hu_fild05,177,211 diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt index 44625e45d..f10a14db8 100644 --- a/npc/warps/dungeons/anthell.txt +++ b/npc/warps/dungeons/anthell.txt @@ -15,10 +15,10 @@ //============================================================ //= Ant Hell ================================================= -moc_fild20,156,143,0 warp moc_ant1-1 3,4,anthell01,35,262 -anthell01,35,267,0 warp moc_ant1-2 1,1,moc_fild20,164,145 -moc_fild20,337,315,0 warp moc_ant2-1 3,3,anthell01,35,262 -anthell02,172,169,0 warp moc_ant2-2 1,1,moc_fild20,330,314 +cmd_fild08,335,355,0 warp moc_ant1-1 3,4,anthell01,35,262 +anthell01,35,267,0 warp moc_ant1-2 1,1,cmd_fild08,330,355 +cmd_fild08,348,82,0 warp moc_ant2-1 3,3,anthell02,168,170 +anthell02,172,169,0 warp moc_ant2-2 1,1,cmd_fild08,344,82 anthell01,253,32,0 warp ant01 2,1,anthell02,34,263 anthell02,32,267,0 warp ant01-1 2,2,anthell01,253,35 diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt index a44fff690..020034d94 100644 --- a/npc/warps/fields/com_fild.txt +++ b/npc/warps/fields/com_fild.txt @@ -22,14 +22,14 @@ cmd_fild02,358,95,0 warp cmd_fild02-3 1,1,cmd_fild04,35,94 cmd_fild03,23,269,0 warp cmd_fild03-1 1,1,cmd_fild01,359,260 cmd_fild03,23,68,0 warp cmd_fild03-2 1,1,cmd_fild01,359,76 cmd_fild03,181,17,0 warp cmd_fild03-3 1,1,cmd_fild04,181,367 -cmd_fild03,384,165,0 warp cmd_fild03-4 1,1,cmd_fild05,26,161 +//cmd_fild03,384,165,0 warp cmd_fild03-4 1,1,cmd_fild05,26,161 cmd_fild04,21,275,0 warp cmd_fild04-1 1,1,cmd_fild02,378,264 cmd_fild04,31,92,0 warp cmd_fild04-2 1,1,cmd_fild02,351,92 cmd_fild04,376,287,0 warp cmd_fild04-3 1,1,cmd_fild06,26,288 cmd_fild04,180,372,0 warp cmd_fild04-4 1,1,cmd_fild03,183,23 -cmd_fild05,21,163,0 warp cmd_fild05-1 1,1,cmd_fild03,377,167 -cmd_fild05,148,19,0 warp cmd_fild05-2 1,1,cmd_fild06,150,374 -cmd_fild06,150,380,0 warp cmd_fild06-3 1,1,cmd_fild05,146,27 +//cmd_fild05,21,163,0 warp cmd_fild05-1 1,1,cmd_fild03,377,167 +//cmd_fild05,148,19,0 warp cmd_fild05-2 1,1,cmd_fild06,150,374 +//cmd_fild06,150,380,0 warp cmd_fild06-3 1,1,cmd_fild05,146,27 cmd_fild06,21,285,0 warp cmd_fild06-4 1,1,cmd_fild04,371,288 cmd_fild06,151,27,0 warp cmd_fild06-5 1,1,cmd_fild07,147,370 cmd_fild06,368,96,0 warp cmd_fild06-6 1,1,cmd_fild08,25,102 diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt index 778b1b063..d3bb984cd 100644 --- a/npc/warps/fields/geffen_fild.txt +++ b/npc/warps/fields/geffen_fild.txt @@ -45,7 +45,7 @@ gef_fild07,18,191,0 warp geff10 2,4,gef_fild08,357,187 gef_fild07,40,19,0 warp geff13 1,1,gef_fild13,41,369 gef_fild08,200,355,0 warp geff09-1 4,2,gef_fild06,218,20 gef_fild08,360,187,0 warp geff10-1 2,4,gef_fild07,21,191 -gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369 +//gef_fild08,215,18,0 warp geff14 1,1,gef_fild12,221,369 gef_fild09,23,56,0 warp geff18-1 1,1,gef_fild13,376,56 gef_fild09,225,25,0 warp geff11 3,2,gef_fild10,251,368 gef_fild09,368,95,0 warp geff01-1 4,2,gef_fild01,19,102 @@ -57,16 +57,16 @@ gef_fild10,138,284,0 warp gef019 1,1,in_orcs01,29,114 gef_fild10,215,51,0 warp gef020 1,1,in_orcs01,162,53 gef_fild10,223,205,0 warp gef021 1,1,in_orcs01,108,89 gef_fild10,63,337,0 warp gef022 1,1,in_orcs01,30,157 -gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219 +//gef_fild10,27,219,0 warp geff19-1 1,1,gef_fild14,367,219 gef_fild11,377,293,0 warp gef023 2,4,prt_fild11,20,281 gef_fild11,111,364,0 warp geff12-1 6,3,gef_fild10,104,24 -gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25 -gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202 -gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59 -gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357 -gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180 -gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50 +//gef_fild12,221,374,0 warp geff14-1 1,1,gef_fild08,215,25 +//gef_fild12,368,180,0 warp geff15 1,1,gef_fild13,29,202 +//gef_fild12,372,50,0 warp geff16 1,1,gef_fild13,29,59 +//gef_fild13,200,25,0 warp geff17 1,1,gef_fild14,180,357 +//gef_fild13,25,202,0 warp geff15-1 1,1,gef_fild12,364,180 +//gef_fild13,26,59,0 warp geff16-1 1,1,gef_fild12,370,50 gef_fild13,380,56,0 warp geff18 1,1,gef_fild09,27,56 gef_fild13,41,373,0 warp geff13-1 1,1,gef_fild07,40,23 -gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29 -gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219 +//gef_fild14,180,360,0 warp geff17-1 1,1,gef_fild13,200,29 +//gef_fild14,371,219,0 warp geff19 1,1,gef_fild10,31,219 diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt index d8d9d2e41..327431b65 100644 --- a/npc/warps/fields/hugel_fild.txt +++ b/npc/warps/fields/hugel_fild.txt @@ -19,29 +19,34 @@ ein_fild04,343,293,0 warp hugel001 1,1,ein_fild05,80,294 ein_fild05,76,294,0 warp hugel001a 1,1,ein_fild04,336,292 ein_fild05,376,183,0 warp hugel002 1,1,ein_fild06,47,166 ein_fild06,42,171,0 warp hugel002a 1,1,ein_fild05,371,183 -ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280 -yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250 -ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346 -yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367 -ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358 -ein_fild02,108,364,0 warp hugel004a 1,1,ein_fild01,106,40 -ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,258,343 -ein_fild02,257,350,0 warp hugel005a 1,1,ein_fild01,231,40 -ein_fild02,170,29,0 warp hugel006 1,1,ein_fild05,172,366 -ein_fild05,172,371,0 warp hugel006a 1,1,ein_fild02,170,37 +//ein_fild02,357,251,0 warp hugel003-1 1,1,yuno_fild04,38,280 +//yuno_fild04,33,279,0 warp hugel003a-1 1,1,ein_fild02,350,250 +//ein_fild01,349,369,0 warp hugel003 1,1,yuno_fild05,43,346 +//yuno_fild05,41,350,0 warp hugel003a 1,1,ein_fild01,345,367 +//ein_fild01,106,34,0 warp hugel004 1,1,ein_fild02,109,358 +//ein_fild02,108,364,0 warp hugel004a 1,1,ein_fild01,106,40 +//ein_fild01,234,34,0 warp hugel005 1,1,ein_fild02,258,343 +//ein_fild02,257,350,0 warp hugel005a 1,1,ein_fild01,231,40 +//ein_fild02,170,29,0 warp hugel006 1,1,ein_fild05,172,366 +//ein_fild05,172,371,0 warp hugel006a 1,1,ein_fild02,170,37 hu_fild01,366,185,0 warp hugel007 1,1,hu_fild02,22,168 hu_fild02,17,168,0 warp hugel007a 1,1,hu_fild01,361,189 hu_fild04,47,372,0 warp hugel008 1,1,hu_fild02,40,27 hu_fild02,40,22,0 warp hugel008a 1,1,hu_fild04,48,368 hu_fild04,294,379,0 warp hugel009 1,1,hu_fild02,280,31 hu_fild02,283,28,0 warp hugel009a 1,1,hu_fild04,289,376 -hu_fild05,284,356,0 warp hugel010 1,1,hu_fild03,288,26 -hu_fild03,288,19,0 warp hugel010a 1,1,hu_fild05,276,346 +//hu_fild05,284,356,0 warp hugel010 1,1,hu_fild03,288,26 +//hu_fild03,288,19,0 warp hugel010a 1,1,hu_fild05,276,346 hu_fild05,353,126,0 warp hugel011 1,1,hu_fild06,34,119 hu_fild06,28,119,0 warp hugel011a 1,1,hu_fild05,347,130 hu_fild02,374,339,0 warp hugel012 1,1,hu_fild03,24,337 -hu_fild03,20,338,0 warp hugel012a 1,1,hu_fild02,370,339 +//hu_fild03,20,338,0 warp hugel012a 1,1,hu_fild02,370,339 hu_fild02,378,162,0 warp hugel013 1,1,hu_fild03,30,163 -hu_fild03,25,163,0 warp hugel013a 1,1,hu_fild02,373,160 -yuno_fild09,377,184,0 warp hugel014 1,1,yuno_fild10,44,183 -yuno_fild10,39,183,0 warp hugel014a 1,1,yuno_fild09,371,184 +//hu_fild03,25,163,0 warp hugel013a 1,1,hu_fild02,373,160 +//yuno_fild09,377,184,0 warp hugel014 1,1,yuno_fild10,44,183 +//yuno_fild10,39,183,0 warp hugel014a 1,1,yuno_fild09,371,184 + +// RE Addon +ein_fild01,106,34,0 warp EinF01Dn01_EinF05Up01 1,1,ein_fild05,172,366 +ein_fild01,234,34,0 warp EinF01Dn02_EinF05Up02 1,1,ein_fild05,172,366 +ein_fild05,172,371,0 warp EinF05Up01_EinF01Dn01 1,1,ein_fild01,106,40 diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt index 255b57a56..3ae9920e4 100644 --- a/npc/warps/fields/payon_fild.txt +++ b/npc/warps/fields/payon_fild.txt @@ -14,28 +14,28 @@ //============================================================ //= Payon Field's ============================================ -pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 -pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382 -pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381 -pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207 -pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375 -pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135 -pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18 -pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110 -pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18 -pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108 -pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20 -pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372 -pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233 -pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162 -pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336 -pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19 -pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288 -pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284 -pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19 -pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205 -pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275 -pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19 +pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 +pay_fild01,278,14,0 warp payf01 13,2,pay_fild02,83,382 +pay_fild01,353,14,0 warp payf02 20,3,pay_fild02,160,381 +pay_fild01,379,201,0 warp payf03 2,6,pay_fild07,23,207 +//pay_fild02,134,16,0 warp payf04 5,2,pay_fild05,127,375 +//pay_fild02,16,175,0 warp payf06 2,4,pay_fild11,294,135 +pay_fild02,167,390,0 warp payf02-1 20,3,pay_fild01,354,18 +pay_fild02,284,108,0 warp payf07 2,7,pay_fild03,20,110 +pay_fild02,83,386,0 warp payf01-1 13,2,pay_fild01,278,18 +pay_fild03,15,110,0 warp payf07-1 2,10,pay_fild02,280,108 +pay_fild03,172,281,0 warp payf08 5,2,pay_fild07,167,20 +pay_fild03,313,16,0 warp payf09 4,2,pay_fild06,305,372 +pay_fild03,392,63,0 warp payf005 2,7,alberta,19,233 +pay_fild04,17,165,0 warp payf002 2,8,moc_fild01,376,162 +pay_fild04,194,17,0 warp payf003 7,2,moc_fild02,350,336 +//pay_fild05,127,378,0 warp payf04-1 4,2,pay_fild02,134,19 +//pay_fild05,271,284,0 warp payf10 2,4,pay_fild06,31,288 +//pay_fild06,28,288,0 warp payf10-1 2,2,pay_fild05,268,284 +pay_fild06,305,375,0 warp payf09-1 6,2,pay_fild03,313,19 +pay_fild07,16,200,0 warp payf03-1 3,3,pay_fild01,371,205 +pay_fild07,163,17,0 warp payf08-1 5,2,pay_fild03,177,275 +pay_fild07,280,382,0 warp payf11 4,2,pay_fild08,160,19 pay_fild07,382,290,0 warp payf12 2,5,pay_fild10,19,290 pay_fild08,160,16,0 warp payf11-1 4,2,pay_fild07,280,379 pay_fild08,17,75,0 warp payf006 1,1,payon,265,92 @@ -45,5 +45,5 @@ pay_fild09,16,91,0 warp payf13-1 2,4,pay_fild08,259,91 pay_fild10,112,382,0 warp pay14-1 3,2,pay_fild09,112,19 pay_fild10,16,290,0 warp payf12-1 2,5,pay_fild07,379,290 pay_fild10,99,13,0 warp w1034 1,1,pay_fild10,148,252 -pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175 -pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19 +//pay_fild11,297,135,0 warp payf06-1 2,4,pay_fild02,19,175 +//pay_fild11,38,330,0 warp payf004 4,2,moc_fild03,179,19 diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt index f53d21039..2cf3b81e0 100644 --- a/npc/warps/fields/rachel_fild.txt +++ b/npc/warps/fields/rachel_fild.txt @@ -19,12 +19,12 @@ ra_fild01,306,38,0 warp ra001 1,1,ra_fild04,322,371 ra_fild04,322,378,0 warp ra002 1,1,ra_fild01,306,43 ra_fild04,362,351,0 warp ra003 1,1,ra_fild05,39,353 ra_fild05,33,353,0 warp ra004 1,1,ra_fild04,356,351 -ra_fild05,27,13,0 warp ra005 1,1,ra_fild09,30,337 -ra_fild09,29,343,0 warp ra006 1,1,ra_fild05,31,17 +//ra_fild05,27,13,0 warp ra005 1,1,ra_fild09,30,337 +//ra_fild09,29,343,0 warp ra006 1,1,ra_fild05,31,17 ra_fild04,263,54,0 warp ra007 1,1,ra_fild08,287,365 ra_fild08,287,370,0 warp ra008 1,1,ra_fild04,263,60 -ra_fild09,27,238,0 warp ra009 1,1,ra_fild08,360,234 -ra_fild08,368,234,0 warp ra010 1,1,ra_fild09,35,238 +//ra_fild09,27,238,0 warp ra009 1,1,ra_fild08,360,234 +//ra_fild08,368,234,0 warp ra010 1,1,ra_fild09,35,238 ra_fild04,23,176,0 warp ra011 1,1,ra_fild03,370,172 ra_fild03,374,168,0 warp ra012 1,1,ra_fild04,29,176 ra_fild05,348,274,0 warp ra013 1,1,ra_fild06,24,277 @@ -34,14 +34,14 @@ lhz_fild01,296,382,0 warp ra016 1,1,ra_fild06,298,25 ra_fild12,36,225,0 warp ra017 1,1,rachel,270,125 ra_fild08,165,29,0 warp ra018 1,1,ra_fild12,149,369 ra_fild12,149,374,0 warp ra019 1,1,ra_fild08,165,36 -ra_fild12,303,27,0 warp ra020 1,1,ra_fild13,295,341 -ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33 -ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125 -ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283 -ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290 -ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32 -ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329 -ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45 -ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349 -ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294 -ra_fild03,23,294,0 warp ra029 1,1,ra_fild02,367,270 +//ra_fild12,303,27,0 warp ra020 1,1,ra_fild13,295,341 +//ra_fild13,295,346,0 warp ra021 1,1,ra_fild12,303,33 +//ra_fild11,360,226,0 warp ra022 1,1,rachel,30,125 +//ra_fild11,21,290,0 warp ra023 1,1,ra_fild10,379,283 +//ra_fild10,384,287,0 warp ra024 1,1,ra_fild11,28,290 +//ra_fild11,202,335,0 warp ra025a 1,1,ra_fild07,215,32 +//ra_fild07,215,27,0 warp ra025b 1,1,ra_fild11,201,329 +//ra_fild07,168,353,0 warp ra026 1,1,ra_fild02,171,45 +//ra_fild02,168,36,0 warp ra027 1,1,ra_fild07,168,349 +//ra_fild02,373,275,0 warp ra028 1,1,ra_fild03,28,294 +//ra_fild03,23,294,0 warp ra029 1,1,ra_fild02,367,270 diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt index 145b12dd4..fdb907413 100644 --- a/npc/warps/fields/veins_fild.txt +++ b/npc/warps/fields/veins_fild.txt @@ -14,22 +14,23 @@ ve_fild01,366,267,0 warp ve_fild1-1 1,1,ve_fild02,36,263 ve_fild01,184,20,0 warp ve_fild1-2 1,1,ve_fild04,174,334 -ra_fild11,233,27,0 warp ve_fild1-3 1,1,ve_fild01,243,363 -ve_fild01,243,368,0 warp ve_fild1-4 1,1,ra_fild11,232,32 +//ra_fild11,233,27,0 warp ve_fild1-3 1,1,ve_fild01,243,363 +//ve_fild01,243,368,0 warp ve_fild1-4 1,1,ra_fild11,232,32 ve_fild01,350,92,0 warp ve_fild1-5 1,1,ve_fild02,78,133 -ra_fild13,29,308,0 warp ve_fild2-1 1,1,ve_fild02,380,308 -ve_fild02,385,308,0 warp ve_fild2-2 1,1,ra_fild13,34,308 +//ra_fild13,29,308,0 warp ve_fild2-1 1,1,ve_fild02,380,308 +//ve_fild02,385,308,0 warp ve_fild2-2 1,1,ra_fild13,34,308 ve_fild02,195,382,0 warp ve_fild2-3 1,1,rachel,130,25 ve_fild02,31,263,0 warp ve_fild2-4 1,1,ve_fild01,361,267 ve_fild02,73,133,0 warp ve_fild2-5 1,1,ve_fild01,345,92 ve_fild03,355,223,0 warp ve_fild3-1 1,1,ve_fild04,49,249 -ve_fild03,222,43,0 warp ve_fild3-2 1,1,ve_fild05,200,325 +//ve_fild03,222,43,0 warp ve_fild3-2 1,1,ve_fild05,200,325 ve_fild04,174,339,0 warp ve_fild4-1 1,1,ve_fild01,184,25 ve_fild04,44,249,0 warp ve_fild4-2 1,1,ve_fild03,350,220 ve_fild04,115,50,0 warp ve_fild4-3 1,1,ve_fild06,80,183 -ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 -ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 +//ve_fild05,200,330,0 warp ve_fild5-1 1,1,ve_fild03,222,48 +//ve_fild05,359,192,0 warp ve_fild5-2 1,1,ve_fild06,80,183 ve_fild06,153,220,0 warp ve_fild6-1 1,1,veins,218,355 +/* ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ if (rand(2)) warp "ve_fild04",115,55; @@ -37,8 +38,12 @@ ve_fild06,81,177,0 script ve_fild6-2 45,1,1,{ warp "ve_fild05",354,191; end; } +*/ ve_fild07,147,371,0 warp ve_fild7-1 1,1,veins,146,28 +// Renewal Addon +ve_fild06,81,177,0 warp VeF06S_VeF04S 1,1,ve_fild04,115,55 + //============================================================ // Old changelog //============================================================ diff --git a/npc/warps/fields/yuno_fild.txt b/npc/warps/fields/yuno_fild.txt index cd5afe441..331c4e853 100644 --- a/npc/warps/fields/yuno_fild.txt +++ b/npc/warps/fields/yuno_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0), Sara //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 5+ //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.1 - Updated for the new Yuno Fields //= 1.2 New field update - Hugel Field by Sara - Version 1 +//= 1.3 Renewal warp adjustments. //============================================================ //= Yuno Field =============================================== @@ -57,8 +58,8 @@ yuno_fild08,74,376,0 warp newjun12 1,1,yuno_fild02,70,25 yuno_fild02,70,23,0 warp newjun12a 1,1,yuno_fild08,74,374 yuno_fild08,286,386,0 warp newjun13 1,1,yuno_fild02,294,26 yuno_fild02,294,24,0 warp newjun13a 1,1,yuno_fild08,286,384 -yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30 -yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367 +//yuno_fild04,42,369,0 warp newjun14 1,1,yuno_fild05,59,30 +//yuno_fild05,59,28,0 warp newjun14a 1,1,yuno_fild04,42,367 //= Al de Baran <-> Yuno Connection ========================== @@ -67,23 +68,23 @@ yuno_fild01,208,17,0 warp yunfild-alde 1,1,aldebaran,140,242 //= Hugel Field //= Version 1 -yuno_fild05,372,325,0 warp hu001 1,1,yuno_fild06,42,319 -yuno_fild06,40,319,0 warp hu001a 1,1,yuno_fild05,370,325 -yuno_fild06,217,27,0 warp hu002 1,1,yuno_fild03,214,381 -yuno_fild03,214,383,0 warp hu002a 1,1,yuno_fild06,217,29 -yuno_fild06,369,136,0 warp hu003 1,1,hu_fild04,28,126 -hu_fild04,26,126,0 warp hu003a 1,1,yuno_fild06,367,136 -hu_fild04,121,26,0 warp hu004 1,1,yuno_fild02,118,374 -yuno_fild02,118,376,0 warp hu004a 1,1,hu_fild04,121,28 -yuno_fild06,149,369,0 warp hu005 1,1,hu_fild01,139,37 -hu_fild01,139,35,0 warp hu005a 1,1,yuno_fild06,151,369 -hu_fild04,381,187,0 warp hu006 1,1,hu_fild05,34,202 -hu_fild05,32,202,0 warp hu006a 1,1,hu_fild04,379,187 -hu_fild05,91,42,0 warp hu007 1,1,hu_fild07,80,369 -hu_fild07,80,371,0 warp hu007a 1,1,hu_fild05,91,44 -hu_fild07,35,351,0 warp hu008 1,1,yuno_fild02,384,338 -yuno_fild02,384,340,0 warp hu008a 1,1,hu_fild07,37,351 -hu_fild07,56,36,0 warp hu009 1,1,yuno_fild09,47,375 -yuno_fild09,47,377,0 warp hu009a 1,1,hu_fild07,56,38 -hu_fild07,226,36,0 warp hu010 1,1,yuno_fild09,220,372 -yuno_fild09,220,374,0 warp hu010a 1,1,hu_fild07,226,38 +//yuno_fild05,370,321,0 warp hu001 1,1,yuno_fild06,48,322 +//yuno_fild06,41,319,0 warp hu001a 1,1,yuno_fild05,366,319 +yuno_fild06,214,27,0 warp hu002 1,1,yuno_fild03,215,375 +yuno_fild03,215,382,0 warp hu002a 1,1,yuno_fild06,218,33 +yuno_fild06,369,132,0 warp hu003 1,1,hu_fild04,34,126 +hu_fild04,27,126,0 warp hu003a 1,1,yuno_fild06,362,132 +hu_fild04,122,27,0 warp hu004 1,1,yuno_fild02,114,370 +yuno_fild02,117,375,0 warp hu004a 1,1,hu_fild04,122,35 +yuno_fild06,151,370,0 warp hu005 1,1,hu_fild01,135,42 +hu_fild01,141,36,0 warp hu005a 1,1,yuno_fild06,156,368 +hu_fild04,380,183,0 warp hu006 1,1,hu_fild05,39,206 +hu_fild05,33,198,0 warp hu006a 1,1,hu_fild04,373,181 +//hu_fild05,89,43,0 warp hu007 1,1,hu_fild07,80,365 +//hu_fild07,81,370,0 warp hu007a 1,1,hu_fild05,89,50 +//hu_fild07,36,352,0 warp hu008 1,1,yuno_fild02,378,336 +//yuno_fild02,383,339,0 warp hu008a 1,1,hu_fild07,42,351 +//hu_fild07,57,37,0 warp hu009 1,1,yuno_fild09,48,370 +//yuno_fild09,48,376,0 warp hu009a 1,1,hu_fild07,58,42 +//hu_fild07,226,38,0 warp hu010 1,1,yuno_fild09,220,368 +//yuno_fild09,220,373,0 warp hu010a 1,1,hu_fild07,224,43 -- cgit v1.2.3-60-g2f50 From 110a035e58738f0b9156c672194908680187a9cd Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Mon, 11 Oct 2010 03:59:15 +0000 Subject: * Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO. - ...corrected the versions in the file headers as well. :P git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14423 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 2 ++ npc/warps/cities/rachel.txt | 3 ++- npc/warps/cities/yggdrasil.txt | 3 ++- npc/warps/dungeons/abyss.txt | 2 +- npc/warps/dungeons/anthell.txt | 3 ++- npc/warps/fields/com_fild.txt | 3 ++- npc/warps/fields/geffen_fild.txt | 3 ++- npc/warps/fields/hugel_fild.txt | 3 ++- npc/warps/fields/morroc_fild.txt | 2 +- npc/warps/fields/payon_fild.txt | 3 ++- npc/warps/fields/rachel_fild.txt | 3 ++- npc/warps/fields/veins_fild.txt | 3 ++- 12 files changed, 22 insertions(+), 11 deletions(-) (limited to 'npc/warps') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 44fad0822..d6c5e9882 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,8 @@ Date Added ====== 2010/10/10 + * Rev. 14422 Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO. [L0ne_W0lf] + - ...corrected the versions in the file headers as well. :P * Rev. 14421 Renewal Update to warp portals, and deleted disabled_warps.txt. [L0ne_W0lf] - Only disabled warps, some coordinates might have slipped past me. 2010/09/18 diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt index 8dc9f9675..ea2917329 100644 --- a/npc/warps/cities/rachel.txt +++ b/npc/warps/cities/rachel.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= erKURITA & RockmanEXE //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.2a Added missing warp (Pope's office entryway -> temple) [L0ne_W0lf] //= 1.3 Updated Rachel -> Veins Field warp. [L0ne_W0lf] //= 1.4 Disabled rachel33, moved to quest_rachel.txt [L0ne_W0lf] +//= 1.5 Renewal warp adjustments. //============================================================ rachel,150,249,0 warp rachel01 1,1,ra_temple,120,30 diff --git a/npc/warps/cities/yggdrasil.txt b/npc/warps/cities/yggdrasil.txt index da7f05ece..a65ad4a12 100644 --- a/npc/warps/cities/yggdrasil.txt +++ b/npc/warps/cities/yggdrasil.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= PKGINGO (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 6+ //===== Description: ========================================= //= Warp Points for Yggdrasil Tree //===== Additional Comments: ================================= //= Extracted from Vidar -> Athena +//= 1.1 Renewal warp adjustments. //============================================================ //Umbala Entrance diff --git a/npc/warps/dungeons/abyss.txt b/npc/warps/dungeons/abyss.txt index 4d39ff591..509c832e9 100644 --- a/npc/warps/dungeons/abyss.txt +++ b/npc/warps/dungeons/abyss.txt @@ -10,7 +10,7 @@ //= Warp Points for Abyss Lake Dungeon //===== Additional Comments: ================================= //= 1.0 Thanks to Muad-Dib for the temp warps [Lupus] -//= 1.1 Renewal warp adjustments. +//= 1.1 Corrected warp placements. //============================================================ abyss_01,25,24,0 warp abysslakedunwarp001 1,1,abyss_02,271,270 diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt index f10a14db8..dc542628e 100644 --- a/npc/warps/dungeons/anthell.txt +++ b/npc/warps/dungeons/anthell.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -12,6 +12,7 @@ //= 1.3 Changed var anthell to @anthell. Optimized [Lupus] //= 1.4 Removed Duplicates [Silent] //= 1.5 Updated warps for episode 12.1 [L0ne_W0lf] +//= 1.6 Renewal warp adjustments. //============================================================ //= Ant Hell ================================================= diff --git a/npc/warps/fields/com_fild.txt b/npc/warps/fields/com_fild.txt index 020034d94..3eafebe27 100644 --- a/npc/warps/fields/com_fild.txt +++ b/npc/warps/fields/com_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,6 +11,7 @@ //= Warp Points for Comodo Fields //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] +//= 1.2 Renewal warp adjustments. //============================================================ cmd_fild01,222,24,0 warp cmd_fild01-1 1,1,cmd_fild02,222,372 diff --git a/npc/warps/fields/geffen_fild.txt b/npc/warps/fields/geffen_fild.txt index d3bb984cd..657f5280d 100644 --- a/npc/warps/fields/geffen_fild.txt +++ b/npc/warps/fields/geffen_fild.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Geffen Field's //===== Additional Comments: ================================= //= No comment! +//= 1.1 Renewal warp adjustments. //============================================================ //= Geffen Field Warps ======================================= diff --git a/npc/warps/fields/hugel_fild.txt b/npc/warps/fields/hugel_fild.txt index 327431b65..45c06ac9f 100644 --- a/npc/warps/fields/hugel_fild.txt +++ b/npc/warps/fields/hugel_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Sara-chan (1.0) //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 10+ //===== Description: ========================================= @@ -12,6 +12,7 @@ //= Initial Release //= 1.1 Official warps [Playtester] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.3 Renewal warp adjustments. //============================================================ //= Hugel Field ============================================== diff --git a/npc/warps/fields/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt index 328b7e412..9d4944589 100644 --- a/npc/warps/fields/morroc_fild.txt +++ b/npc/warps/fields/morroc_fild.txt @@ -35,7 +35,7 @@ moc_fild02,67,342,0 warp mocf02-3 11,3,moc_fild01,315,25 moc_fild02,71,18,0 warp mocf05 4,2,moc_fild13,146,365 moc_fild02,92,342,0 warp mocf02-4 11,3,moc_fild01,315,25 moc_fild03,17,37,0 warp mocf06 2,4,moc_fild13,305,49 -moc_fild03,179,16,0 warp mocf013 4,2,pay_fild11,38,327 +//moc_fild03,179,16,0 warp mocf013 4,2,pay_fild11,38,327 moc_fild03,303,170,0 warp mocf014 2,7,pay_fild01,17,152 moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23 //moc_fild04,14,122,0 warp mocf07-1 1,11,moc_fild05,378,119 diff --git a/npc/warps/fields/payon_fild.txt b/npc/warps/fields/payon_fild.txt index 3ae9920e4..9f9a76c78 100644 --- a/npc/warps/fields/payon_fild.txt +++ b/npc/warps/fields/payon_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.1 +//= 1.3 //===== Compatible With: ===================================== //= Any eAthena Mod //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.1 Refixed payon field08 -> payon warp //= 1.2 Changed trigger area of pay_fild08 -> payon warp. [L0ne_W0lf] +//= 1.3 Renewal warp adjustments. //============================================================ //= Payon Field's ============================================ diff --git a/npc/warps/fields/rachel_fild.txt b/npc/warps/fields/rachel_fild.txt index 2cf3b81e0..90002c8ad 100644 --- a/npc/warps/fields/rachel_fild.txt +++ b/npc/warps/fields/rachel_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Playtester //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -12,6 +12,7 @@ //= 1.0 Initial version [Playtester] //= 1.1 Official warps [Playtester] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.3 Renewal warp adjustments. //============================================================ ra_fild01,233,333,0 warp ra000 1,1,ice_dun01,157,15 diff --git a/npc/warps/fields/veins_fild.txt b/npc/warps/fields/veins_fild.txt index fdb907413..e64bf0546 100644 --- a/npc/warps/fields/veins_fild.txt +++ b/npc/warps/fields/veins_fild.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= $ephiroth //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Veins Field //===== Additional Comments: ================================= //= 1.4 Rescripted to Aegis 11.2 Standards. [L0ne_W0lf +//= 1.5 Renewal warp adjustments. //============================================================ ve_fild01,366,267,0 warp ve_fild1-1 1,1,ve_fild02,36,263 -- cgit v1.2.3-60-g2f50 From 36c33b2a8141af51cd40fa1d15c507670e95fc0e Mon Sep 17 00:00:00 2001 From: Kisuka Date: Tue, 22 Mar 2011 22:07:31 +0000 Subject: - Renewal changes to The Sign Quest. - Correct warps for The Sign Quest. - Correct weight for Sealed Scroll. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14757 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/item_db.txt | 2 +- npc/quests/The_Sign_Quest.txt | 143 +++++++++++++++++++++--------------------- npc/warps/other/sign.txt | 18 +++--- 3 files changed, 82 insertions(+), 81 deletions(-) (limited to 'npc/warps') diff --git a/db/item_db.txt b/db/item_db.txt index 1087c30cb..225b2b1d9 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -2973,7 +2973,7 @@ 6025,Towel_Of_Memory,Towel of Memory,3,0,,10,,,,,,,,,,,,,{},{},{} 6026,Marriage_Covenant,Written Oath Of Marriage,3,0,,10,,,,,,,,,,,,,{},{},{} 6027,Crystal_Of_Feardoom,Crystal Of Feardom,3,0,,10,,,,,,,,,,,,,{},{},{} -6028,Seal_Scroll,Sealed Scroll,3,0,,10,,,,,,,,,,,,,{},{},{} +6028,Seal_Scroll,Sealed Scroll,3,0,,0,,,,,,,,,,,,,{},{},{} 6029,Morocc_Tracing_Log,Morocc Tracing Log,3,0,,10,,,,,,,,,,,,,{},{},{} 6030,Glitering_PaperA,Glittering Paper,3,0,,10,,,,,,,,,,,,,{},{},{} 6031,Glitering_PaperB,Glittering Paper,3,0,,10,,,,,,,,,,,,,{},{},{} diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt index 28146f879..cda5e9de3 100644 --- a/npc/quests/The_Sign_Quest.txt +++ b/npc/quests/The_Sign_Quest.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= SinSloth(Most of the NPCs), MasterOfMuppets(Some of the NPCs + bug fixes) & Kargha(The quiz NPCs) //===== Current Version: ===================================== -//= 3.2 +//= 3.4 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 3.2 Removed mapannounce used while debugging. [L0ne_W0lf] //= Moved the disablewaitingroomevent in dancing portion. //= 3.3 Applied Kazukin's fix for the dancing portion. (bugreport:3966) [L0ne_W0lf] +//= 3.4 Added Renewal Changes. [Kisuka] //============================================================ //============================================================ @@ -740,7 +741,7 @@ prt_in,227,45,0 script Archeologist#sign 804,{ mes "You may have had your doubts,"; mes "but I'm happy enough to confirm that the Sign really exists. Thanks again, and I hope you stop by and chat from time to time."; set sign_q,142; - getexp 2000000,0; + getexp 200000,0; } else { mes "[Metz]"; @@ -769,7 +770,7 @@ prt_in,227,45,0 script Archeologist#sign 804,{ mes "on your travels, adventurer."; delitem 7178,1; //Star's_Sob set sign_q,202; - getexp 100000,0; + getexp 10000,0; getitem 617,1; //Old_Violet_Box } else if (sign_q > 201) { @@ -1568,19 +1569,19 @@ morocc_in,115,154,5 script Rogue#sign 810,{ mes "you're not a total dumbass."; mes "Now you're supposed to go see Daewoon in Payon. And don't forget to show him this Star thingee."; if (BaseLevel < 60) { - getexp 3000,0; + getexp 300,0; } else if (BaseLevel < 70) { - getexp 7500,0; + getexp 750,0; } else if (BaseLevel < 80) { - getexp 10000,0; + getexp 1000,0; } else if (BaseLevel < 90) { - getexp 13000,0; + getexp 1300,0; } - else if (BaseLevel < 99) { - getexp 18000,0; + else if (BaseLevel < 150) { + getexp 1800,0; } set sign_q,14; getitem 7177,1; //Part_Of_Star's_Sob @@ -2447,19 +2448,19 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ set sign_q,15; getitem 7177,1; //Part_Of_Star's_Sob if (BaseLevel < 60) { - getexp 3000,0; + getexp 300,0; } else if (BaseLevel < 70) { - getexp 7000,0; + getexp 700,0; } else if (BaseLevel < 80) { - getexp 10000,0; + getexp 1000,0; } else if (BaseLevel < 90) { - getexp 13000,0; + getexp 1300,0; } - else if (BaseLevel < 99) { - getexp 18000,0; + else if (BaseLevel < 150) { + getexp 1800,0; } emotion e_heh; mes "[Daewoon]"; @@ -2493,19 +2494,19 @@ payon_in03,11,31,4 script Daewoon#sign 808,{ set sign_q,15; getitem 7177,1; //Part_Of_Star's_Sob if (BaseLevel < 60) { - getexp 3000,0; + getexp 300,0; } else if (BaseLevel < 70) { - getexp 7000,0; + getexp 700,0; } else if (BaseLevel < 80) { - getexp 10000,0; + getexp 1000,0; } else if (BaseLevel < 90) { - getexp 13000,0; + getexp 1300,0; } - else if (BaseLevel < 99) { - getexp 18000,0; + else if (BaseLevel < 150) { + getexp 1800,0; } mes "[Daewoon]"; mes "You know, after talking with"; @@ -4827,19 +4828,19 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{ } set sign_q,30; if (BaseLevel < 60) { - getexp 3000,0; + getexp 300,0; } else if (BaseLevel < 70) { - getexp 5000,0; + getexp 500,0; } else if (BaseLevel < 80) { - getexp 8000,0; + getexp 800,0; } else if (BaseLevel < 90) { - getexp 10000,0; + getexp 1000,0; } - else if (BaseLevel < 99) { - getexp 13000,0; + else if (BaseLevel < 150) { + getexp 1300,0; } next; warp "cmd_in01",33,29; @@ -4923,19 +4924,19 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{ set sign_q,35; getitem 7177,1; //Part_Of_Star's_Sob if (BaseLevel < 60) { - getexp 3000,0; + getexp 300,0; } else if (BaseLevel < 70) { - getexp 7000,0; + getexp 700,0; } else if (BaseLevel < 80) { - getexp 19000,0; + getexp 1900,0; } else if (BaseLevel < 90) { - getexp 12000,0; + getexp 1200,0; } - else if (BaseLevel < 99) { - getexp 17000,0; + else if (BaseLevel < 150) { + getexp 1700,0; } next; mes "[Dearles]"; @@ -4964,19 +4965,19 @@ cmd_in02,88,51,4 script Strange Guy#sign 806,{ getitem 7177,1; //Part_Of_Star's_Sob set zeny,zeny+20000; if (BaseLevel < 60) { - getexp 3000,0; + getexp 300,0; } else if (BaseLevel < 70) { - getexp 7000,0; + getexp 700,0; } else if (BaseLevel < 80) { - getexp 10000,0; + getexp 1000,0; } else if (BaseLevel < 90) { - getexp 14000,0; + getexp 1400,0; } - else if (BaseLevel < 99) { - getexp 19000,0; + else if (BaseLevel < 150) { + getexp 1900,0; } next; mes "[Dearles]"; @@ -5888,19 +5889,19 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 807,{ set sign_q,53; getitem 7177,1; //Part_Of_Star's_Sob if (BaseLevel < 60) { - getexp 5000,0; + getexp 500,0; } else if (BaseLevel < 70) { - getexp 8000,0; + getexp 800,0; } else if (BaseLevel < 80) { - getexp 11000,0; + getexp 1100,0; } else if (BaseLevel < 90) { - getexp 15000,0; + getexp 1500,0; } - else if (BaseLevel < 99) { - getexp 20000,0; + else if (BaseLevel < 150) { + getexp 2000,0; } close; } @@ -7192,19 +7193,19 @@ yuno,330,100,4 script Knight#ss 734,{ set sign_q,39; getitem 7181,1; //Receipt_01 if (BaseLevel < 60) { - getexp 1000,0; + getexp 100,0; } else if (BaseLevel < 70) { - getexp 2000,0; + getexp 200,0; } else if (BaseLevel < 80) { - getexp 4000,0; + getexp 400,0; } else if (BaseLevel < 90) { - getexp 7000,0; + getexp 700,0; } - else if (BaseLevel < 99) { - getexp 11000,0; + else if (BaseLevel < 150) { + getexp 1100,0; } close; } @@ -7537,7 +7538,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 85,{ mes "If it weren't for your help,"; mes "I'd be in big trouble. I really appreciate you stepping in and volunteering your materials like this."; delitem 1002,1; //Iron_Ore - getexp 10,0; + getexp 1,0; close; case 2: mes "[Engel]"; @@ -8219,7 +8220,7 @@ gef_tower,118,36,4 script Annoyed Man 64,{ else { mes "[Dhota]"; mes "You're not even a Mage,"; - mes "much less a Wizard or a Sage."; + mes "much less a Wizard, Sage, Warlock or a Sorcerer."; mes "Why bother climbing this tower?"; } mes "What are you doing here?!"; @@ -8387,7 +8388,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{ mes "that you leave, right now!"; emotion e_an; close2; - warp "um_dun01",129,90; + warp "umbala",111,121; end; } else if (sign_q == 74) { @@ -8534,7 +8535,7 @@ um_in,27,23,3 script Fastidious-Looking Guy 121,{ percentheal -30,0; specialeffect2 EF_MAGNUMBREAK; next; - warp "um_dun01",129,90; + warp "umbala",111,121; end; } } @@ -8796,31 +8797,31 @@ himinn,48,86,5 script Valkyrie#sign 811,{ set sign_q,82; percentheal 100,100; if (BaseLevel < 56) { - getexp 9000,0; + getexp 900,0; } else if ((BaseLevel > 55) && (BaseLevel < 61)) { - getexp 12000,0; + getexp 1200,0; } else if ((BaseLevel > 60) && (BaseLevel < 66)) { - getexp 20000,0; + getexp 2000,0; } else if ((BaseLevel > 65) && (BaseLevel < 71)) { - getexp 35000,0; + getexp 3500,0; } else if ((BaseLevel > 70) && (BaseLevel < 76)) { - getexp 70000,0; + getexp 7000,0; } else if ((BaseLevel > 75) && (BaseLevel < 81)) { - getexp 120000,0; + getexp 12000,0; } else if ((BaseLevel > 80) && (BaseLevel < 86)) { - getexp 160000,0; + getexp 16000,0; } else if ((BaseLevel > 85) && (BaseLevel < 91)) { - getexp 210000,0; + getexp 21000,0; } else if (BaseLevel > 90) { - getexp 350000,0; + getexp 35000,0; } close2; warp "geffen",120,100; @@ -9107,7 +9108,7 @@ que_sign01,196,39,4 script Serin#serin 90,{ mes "ask the Dark Lord to spare"; mes "you. Thank you so much..."; set sign_q,200; - getexp 200000,0; + getexp 20000,0; set $@sign_w2,0; donpcevent "Dark Lord#serin::OnDisable"; close2; @@ -9378,7 +9379,7 @@ que_sign01,197,195,4 script Serin#witch 90,{ mes "ask the Dark Lord to spare"; mes "you. Thank you so much..."; set sign_q,200; - getexp 200000,0; + getexp 20000,0; set $@sign_w1,0; close2; warp "umbala,",132,203; @@ -10124,7 +10125,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 90,{ mes "the faint smile on her lips tell you that her memories of you"; mes "will always remain in her heart.^000000"; delitem 2643,1; //Serin's_Gold_Ring_ - getexp 500000,0; + getexp 50000,0; close; case 2: emotion e_sob; @@ -10918,7 +10919,7 @@ que_sign01,122,141,4 script Witch#s 792,{ mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason, "+strcharinfo(0)+"..."; delitem 7313,5; //Seal_Of_Witch set sign_q,129; - getexp 500000,0; + getexp 50000,0; close; } } @@ -10949,7 +10950,7 @@ que_sign01,122,141,4 script Witch#s 792,{ mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason..."; delitem 7313,5; //Seal_Of_Witch set sign_q,130; - getexp 300000,0; + getexp 30000,0; close; } } @@ -10980,7 +10981,7 @@ que_sign01,122,141,4 script Witch#s 792,{ else { set sign_q,130; } - getexp 300000,0; + getexp 30000,0; close; } else if (sign_q == 200) { @@ -11015,7 +11016,7 @@ que_sign01,122,141,4 script Witch#s 792,{ delitem 7308,1; //Witch's_Potion } set sign_q,201; - getexp 200000,0; + getexp 20000,0; close; } else if (sign_q > 200) { diff --git a/npc/warps/other/sign.txt b/npc/warps/other/sign.txt index 9b53b0967..95236735c 100644 --- a/npc/warps/other/sign.txt +++ b/npc/warps/other/sign.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= MasterOfMuppets //===== Current Version: ===================================== -//= 1.1 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version; RO Episode 8+ //===== Description: ========================================= @@ -12,27 +12,27 @@ //= 1.0 A few warps. [MasterOfMuppets] //= 1.1 A few more warps. [MasterOfMuppets] //= 1.2 Completed the warps [MasterOfMuppets] +//= 1.3 Added Renewal Changes. [Kisuka] //============================================================ cmd_in01,17,34,0 warp sign01 1,1,comodo,187,164 -geffen,140,99,0 warp sign02 1,1,geffen_in,165,52 -geffen_in,165,54,0 warp sign02a 1,1,geffen,138,101 +geffen,140,99,0 warp sign02 1,1,geffen_in,165,50 +geffen_in,165,54,0 warp sign02a 1,1,geffen,138,104 himinn,49,6,0 warp sign03 1,1,gef_fild07,179,241 himinn,49,67,0 warp sign04 1,1,himinn,49,75 -himinn,49,73,0 warp sign04a 1,1,himinn,49,65 +himinn,49,72,0 warp sign04a 1,1,himinn,49,63 um_in,33,18,0 warp sign05 1,1,um_in,89,11 um_in,89,9,0 warp sign05a 1,1,um_in,33,16 -um_dun01,132,90,0 warp sign06 1,1,um_in,12,18 -um_in,10,18,0 warp sign06a 1,1,um_dun01,129,90 +umbala,107,118,0 warp sign06 1,1,um_in,15,20 +um_in,11,18,0 warp sign06a 1,1,umbala,111,121 -que_sign01,113,133,0 warp sign07 1,1,nif_in,117,173 +que_sign01,113,132,0 warp sign07 1,1,nif_in,117,173 que_sign01,45,15,0 warp sign08 1,1,niflheim,146,245 -que_sign02,22,314,0 warp sign09 1,1,niflheim,30,156 -que_sign02,379,235,0 warp sign09a 1,1,que_sign01,180,172 +que_sign02,22,313,0 warp sign09 1,1,niflheim,30,156 \ No newline at end of file -- cgit v1.2.3-60-g2f50 From 1260d294ed795011b5b73284e308a6a01d9eef9e Mon Sep 17 00:00:00 2001 From: ai4rei Date: Sat, 9 Apr 2011 09:09:35 +0000 Subject: * Merged changes from trunk [14742:14782/trunk]. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14783 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/Changelog.txt | 2 + conf/battle/client.conf | 2 +- conf/battle/monster.conf | 2 +- conf/mapflag/nobranch.txt | 6 +- conf/mapflag/noicewall.txt | 4 + conf/mapflag/nomemo.txt | 4 + conf/mapflag/nopenalty.txt | 3 + conf/mapflag/nosave.txt | 4 + conf/mapflag/noteleport.txt | 5 + conf/mapflag/nowarp.txt | 4 + conf/mapflag/nowarpto.txt | 4 + configure | 288 ++- configure.in | 63 +- db/Changelog.txt | 2 + db/const.txt | 108 +- db/packet_db.txt | 8 +- db/skill_require_db.txt | 2 +- doc/script_commands.txt | 103 +- npc/Changelog.txt | 17 + npc/battleground/flavius/flavius01.txt | 7 +- npc/battleground/flavius/flavius02.txt | 7 +- npc/battleground/kvm/kvm02.txt | 18 +- npc/battleground/kvm/kvm03.txt | 11 +- npc/battleground/tierra/tierra01.txt | 7 +- npc/battleground/tierra/tierra02.txt | 7 +- npc/cities/lighthalzen.txt | 53 +- npc/cities/manuk.txt | 79 +- npc/cities/splendide.txt | 39 +- npc/instances/EndlessTower.txt | 233 ++- npc/merchants/hair_dyer.txt | 262 ++- npc/merchants/hair_style.txt | 616 ++++++- npc/other/arena/arena_aco.txt | 8 +- npc/other/hugel_bingo.txt | 5 +- npc/other/poring_war.txt | 1767 ++++++++++++++++++ npc/other/turbotrack/Expert_16.txt | 6 +- npc/other/turbotrack/Expert_4.txt | 6 +- npc/other/turbotrack/Expert_8.txt | 6 +- npc/other/turbotrack/Normal_16.txt | 6 +- npc/other/turbotrack/Normal_4.txt | 6 +- npc/other/turbotrack/Normal_8.txt | 6 +- npc/quests/The_Sign_Quest.txt | 4 +- npc/quests/quests_13_1.txt | 525 +++++- npc/quests/quests_13_2.txt | 667 +++++++ npc/quests/quests_alberta.txt | 676 +++++++ npc/quests/quests_lighthalzen.txt | 3149 +++++++++++++++++--------------- npc/quests/quests_morocc.txt | 10 +- npc/scripts_athena.conf | 1 + npc/warps/dungeons/anthell.txt | 12 + npc/warps/other/sign.txt | 3 +- sql-files/main.sql | 8 +- sql-files/upgrade_svn14759.sql | 4 + src/char_sql/char.c | 3 +- src/common/socket.c | 7 +- src/common/timer.c | 2 +- src/common/utils.c | 2 +- src/map/atcommand.c | 55 +- src/map/battle.c | 4 +- src/map/battleground.c | 4 +- src/map/buyingstore.c | 2 +- src/map/chat.c | 38 +- src/map/chat.h | 5 +- src/map/clif.c | 185 +- src/map/clif.h | 2 +- src/map/guild.c | 4 +- src/map/mail.c | 2 +- src/map/map.c | 3 - src/map/mob.c | 4 +- src/map/npc.c | 12 +- src/map/party.c | 4 +- src/map/pc.c | 60 +- src/map/pc.h | 8 +- src/map/pet.c | 7 +- src/map/script.c | 85 +- src/map/searchstore.c | 2 +- src/map/skill.c | 1 + src/map/status.c | 3 + src/map/trade.c | 4 +- src/map/unit.c | 5 +- src/map/vending.c | 23 +- vcproj-10/char-server_sql.vcxproj | 2 + vcproj-10/char-server_txt.vcxproj | 2 + vcproj-10/login-server_sql.vcxproj | 2 + vcproj-10/login-server_txt.vcxproj | 2 + vcproj-10/map-server_sql.vcxproj | 2 + vcproj-10/map-server_txt.vcxproj | 2 + vcproj-10/mapcache.vcxproj | 2 + vcproj-10/txt-converter-char.vcxproj | 2 + vcproj-10/txt-converter-login.vcxproj | 2 + 88 files changed, 7413 insertions(+), 1986 deletions(-) create mode 100644 npc/other/poring_war.txt create mode 100644 sql-files/upgrade_svn14759.sql (limited to 'npc/warps') diff --git a/conf/Changelog.txt b/conf/Changelog.txt index 3a1121934..a890c1252 100644 --- a/conf/Changelog.txt +++ b/conf/Changelog.txt @@ -1,5 +1,7 @@ Date Added +2011/03/15 + * Rev. 14744 Fixed option 'monster_ai' referring to setting 'mob_npc_warp' rather than 'mob_warp' (follow up to r8135). [Ai4rei] 2011/03/06 * Rev. 14732 Added search store info related settings. [Ai4rei] 2011/02/23 diff --git a/conf/battle/client.conf b/conf/battle/client.conf index 143505a36..6a6c58d13 100644 --- a/conf/battle/client.conf +++ b/conf/battle/client.conf @@ -48,7 +48,7 @@ min_chat_delay: 0 // valid range of dye's and styles on the client min_hair_style: 0 -max_hair_style: 25 +max_hair_style: 27 min_hair_color: 0 max_hair_color: 8 min_cloth_color: 0 diff --git a/conf/battle/monster.conf b/conf/battle/monster.conf index ada628a37..a4c985055 100644 --- a/conf/battle/monster.conf +++ b/conf/battle/monster.conf @@ -51,7 +51,7 @@ monster_max_aspd: 199 // have players on them, instead of only for mobs who are in the vecinity // of players. // 0x040: When set, when the mob's target changes map, the mob will walk towards -// any npc-warps in it's sight of view (use with mob_npc_warp below) +// any npc-warps in it's sight of view (use with mob_warp below) // 0x100: When set, a mob will pick a random skill from it's list and start from // that instead of checking skills in orders (when unset, if a mob has too // many skills, the ones near the end will rarely get selected) diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt index 3e91263da..0684fbe74 100644 --- a/conf/mapflag/nobranch.txt +++ b/conf/mapflag/nobranch.txt @@ -335,4 +335,8 @@ jupe_core2 mapflag nobranch brasilis mapflag nobranch bra_in01 mapflag nobranch -//evt_zombie mapflag nobranch \ No newline at end of file +//evt_zombie mapflag nobranch + +// Poring War ================== +poring_w01 mapflag nobranch +poring_w02 mapflag nobranch \ No newline at end of file diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt index 13af8e2f4..ae64cc3c0 100644 --- a/conf/mapflag/noicewall.txt +++ b/conf/mapflag/noicewall.txt @@ -141,3 +141,7 @@ nguild_prt mapflag noicewall 4@tower mapflag noicewall 5@tower mapflag noicewall 6@tower mapflag noicewall + +// Poring War ==================== +poring_w01 mapflag noicewall +poring_w02 mapflag noicewall diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt index 6e57620c9..e7aea26b6 100644 --- a/conf/mapflag/nomemo.txt +++ b/conf/mapflag/nomemo.txt @@ -681,3 +681,7 @@ spl_in01 mapflag nomemo 2@nyd mapflag nomemo //evt_zombie mapflag nomemo + +// Poring War ==================== +poring_w01 mapflag nomemo +poring_w02 mapflag nomemo \ No newline at end of file diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt index 0d22861aa..3c7d781a4 100644 --- a/conf/mapflag/nopenalty.txt +++ b/conf/mapflag/nopenalty.txt @@ -251,3 +251,6 @@ bat_a01 mapflag nopenalty bat_a02 mapflag nopenalty //evt_zombie mapflag nopenalty + +// Poring War ================== +poring_w02 mapflag nopenalty \ No newline at end of file diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt index 7c254eee2..5296b049a 100644 --- a/conf/mapflag/nosave.txt +++ b/conf/mapflag/nosave.txt @@ -269,3 +269,7 @@ arug_dun01 mapflag nosave SavePoint schg_dun01 mapflag nosave SavePoint //evt_zombie mapflag nosave SavePoint + +// Poring War ==================== +poring_w01 mapflag nosave SavePoint +poring_w02 mapflag nosave SavePoint \ No newline at end of file diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt index 10672aea9..15bd644f0 100644 --- a/conf/mapflag/noteleport.txt +++ b/conf/mapflag/noteleport.txt @@ -391,3 +391,8 @@ nyd_dun02 mapflag noteleport 2@nyd mapflag monster_noteleport //evt_zombie mapflag noteleport + +// Poring War ==================== +poring_w01 mapflag noteleport +poring_w02 mapflag noteleport +poring_w02 mapflag monster_noteleport \ No newline at end of file diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt index 63c9aaaae..853dcf586 100644 --- a/conf/mapflag/nowarp.txt +++ b/conf/mapflag/nowarp.txt @@ -65,3 +65,7 @@ bat_b01 mapflag nowarp bat_b02 mapflag nowarp bat_a01 mapflag nowarp bat_a02 mapflag nowarp + +// Poring War ================== +poring_w01 mapflag nowarp +poring_w02 mapflag nowarp \ No newline at end of file diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt index ca81f6d35..3fc30624b 100644 --- a/conf/mapflag/nowarpto.txt +++ b/conf/mapflag/nowarpto.txt @@ -139,3 +139,7 @@ spl_in01 mapflag nowarpto // Nidhoggr's Instance =========== 1@nyd mapflag nowarpto 2@nyd mapflag nowarpto + +// Poring War ==================== +poring_w01 mapflag nowarpto +poring_w02 mapflag nowarpto \ No newline at end of file diff --git a/configure b/configure index 0412b30eb..9200993f7 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 14708 . +# From configure.in Revision: 14767 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -3196,8 +3196,57 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking whether $CC can actually use -Wno-pointer-sign" >&5 +echo $ECHO_N "checking whether $CC can actually use -Wno-pointer-sign... $ECHO_C" >&6 + # This option causes warnings in C++ mode + # Note: -Werror must be before -Wno-pointer-sign, otherwise it does not do anything + CFLAGS="$OLD_CFLAGS -Werror -Wno-pointer-sign" + cat >conftest.$ac_ext <<_ACEOF +int foo; +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + CFLAGS="$OLD_CFLAGS -Wno-pointer-sign" + +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + CFLAGS="$OLD_CFLAGS" + + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -4702,14 +4751,13 @@ fi # # math library (required) # - -echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 -echo $ECHO_N "checking for sqrt in -lm... $ECHO_C" >&6 -if test "${ac_cv_lib_m_sqrt+set}" = set; then +echo "$as_me:$LINENO: checking for library containing sqrt" >&5 +echo $ECHO_N "checking for library containing sqrt... $ECHO_C" >&6 +if test "${ac_cv_search_sqrt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_sqrt=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4754,25 +4802,78 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_m_sqrt=yes + ac_cv_search_sqrt="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_m_sqrt=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_m_sqrt" >&5 -echo "${ECHO_T}$ac_cv_lib_m_sqrt" >&6 -if test $ac_cv_lib_m_sqrt = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 +if test "$ac_cv_search_sqrt" = no; then + for ac_lib in m; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char sqrt (); +int +main () +{ +sqrt (); + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_sqrt="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIBS="-lm $LIBS" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_sqrt" >&5 +echo "${ECHO_T}$ac_cv_search_sqrt" >&6 +if test "$ac_cv_search_sqrt" != no; then + test "$ac_cv_search_sqrt" = "none required" || LIBS="$ac_cv_search_sqrt $LIBS" else { { echo "$as_me:$LINENO: error: math library not found... stopping" >&5 @@ -4783,16 +4884,15 @@ fi # -# clock_gettime (rt on Debian) +# clock_gettime (optional, rt on Debian) # - -echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5 -echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6 -if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then +echo "$as_me:$LINENO: checking for library containing clock_gettime" >&5 +echo $ECHO_N "checking for library containing clock_gettime... $ECHO_C" >&6 +if test "${ac_cv_search_clock_gettime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lrt $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_clock_gettime=no cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -4837,30 +4937,148 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_rt_clock_gettime=yes + ac_cv_search_clock_gettime="none required" else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_rt_clock_gettime=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5 -echo "${ECHO_T}$ac_cv_lib_rt_clock_gettime" >&6 -if test $ac_cv_lib_rt_clock_gettime = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRT 1 +if test "$ac_cv_search_clock_gettime" = no; then + for ac_lib in rt; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime (); +int +main () +{ +clock_gettime (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_search_clock_gettime="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - LIBS="-lrt $LIBS" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_clock_gettime" >&5 +echo "${ECHO_T}$ac_cv_search_clock_gettime" >&6 +if test "$ac_cv_search_clock_gettime" != no; then + test "$ac_cv_search_clock_gettime" = "none required" || LIBS="$ac_cv_search_clock_gettime $LIBS" fi +# +# CLOCK_MONOTONIC clock for clock_gettime +# Normally defines _POSIX_TIMERS > 0 and _POSIX_MONOTONIC_CLOCK (for posix +# compliant systems) and __FreeBSD_cc_version >= 500005 (for FreeBSD +# >= 5.1.0, which does not have the posix defines (ref. r11983)) would be +# checked but some systems define them even when they do not support it +# (ref. bugreport:1003). +# +if test "$ac_cv_search_clock_gettime" != "no" ; then + echo "$as_me:$LINENO: checking whether CLOCK_MONOTONIC is supported and works" >&5 +echo $ECHO_N "checking whether CLOCK_MONOTONIC is supported and works... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + + echo "$as_me:$LINENO: result: guessing no" >&5 +echo "${ECHO_T}guessing no" >&6 + + +else + cat >conftest.$ac_ext <<_ACEOF + + #include + #include + #include + + int main(int argc, char** argv) + { + struct timespec tval; + return clock_gettime(CLOCK_MONOTONIC, &tval); + } + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + CFLAGS="$CFLAGS -DHAVE_MONOTONIC_CLOCK" + +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) + + # either it failed to compile (CLOCK_MONOTONIC undefined) + # or clock_gettime has returned a non-zero value + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi +fi + + # # MySQL library (optional) # diff --git a/configure.in b/configure.in index afc35ee3a..6407cda1b 100644 --- a/configure.in +++ b/configure.in @@ -318,7 +318,24 @@ OLD_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wno-pointer-sign" AC_COMPILE_IFELSE( [int foo;], - [AC_MSG_RESULT([yes])], + [ + AC_MSG_RESULT([yes]) + AC_MSG_CHECKING([whether $CC can actually use -Wno-pointer-sign]) + # This option causes warnings in C++ mode + # Note: -Werror must be before -Wno-pointer-sign, otherwise it does not do anything + CFLAGS="$OLD_CFLAGS -Werror -Wno-pointer-sign" + AC_COMPILE_IFELSE( + [int foo;], + [ + AC_MSG_RESULT([yes]) + CFLAGS="$OLD_CFLAGS -Wno-pointer-sign" + ], + [ + AC_MSG_RESULT([no]) + CFLAGS="$OLD_CFLAGS" + ] + ) + ], [ AC_MSG_RESULT([no]) CFLAGS="$OLD_CFLAGS" @@ -555,13 +572,51 @@ AC_CHECK_HEADER([zlib.h], [], [AC_MSG_ERROR([zlib header not found, please speci # # math library (required) # -AC_CHECK_LIB([m], [sqrt], [], [AC_MSG_ERROR([math library not found... stopping])]) +AC_SEARCH_LIBS([sqrt], [m], [], [AC_MSG_ERROR([math library not found... stopping])]) # -# clock_gettime (rt on Debian) +# clock_gettime (optional, rt on Debian) +# +AC_SEARCH_LIBS([clock_gettime], [rt]) + + # -AC_CHECK_LIB([rt], [clock_gettime]) +# CLOCK_MONOTONIC clock for clock_gettime +# Normally defines _POSIX_TIMERS > 0 and _POSIX_MONOTONIC_CLOCK (for posix +# compliant systems) and __FreeBSD_cc_version >= 500005 (for FreeBSD +# >= 5.1.0, which does not have the posix defines (ref. r11983)) would be +# checked but some systems define them even when they do not support it +# (ref. bugreport:1003). +# +if test "$ac_cv_search_clock_gettime" != "no" ; then + AC_MSG_CHECKING([whether CLOCK_MONOTONIC is supported and works]) + AC_RUN_IFELSE( + [ + #include + #include + #include + + int main(int argc, char** argv) + { + struct timespec tval; + return clock_gettime(CLOCK_MONOTONIC, &tval); + } + ], + [ + AC_MSG_RESULT([yes]) + CFLAGS="$CFLAGS -DHAVE_MONOTONIC_CLOCK" + ], + [ + # either it failed to compile (CLOCK_MONOTONIC undefined) + # or clock_gettime has returned a non-zero value + AC_MSG_RESULT([no]) + ], + [ + AC_MSG_RESULT([guessing no]) + ] + ) +fi # diff --git a/db/Changelog.txt b/db/Changelog.txt index 7730b3888..3949237db 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -9,6 +9,8 @@ 13005 Angelic Wing Dagger: NEED INFO. ======================= +2011/03/19 + * Rev. 14748 Fixed Beast Strafing (HT_POWER) SP requirement as provided by Playtester (bugreport:4675). [Gepard] 2011/03/06 * Rev. 14732 Added Universal Catalog Silver, Gold and Bronze and their respective boxes. [Ai4rei] - Updated packet info related to search store info. diff --git a/db/const.txt b/db/const.txt index 32c2b5fab..6901caf53 100644 --- a/db/const.txt +++ b/db/const.txt @@ -61,7 +61,7 @@ Job_Baby_Knight 4030 Job_Baby_Priest 4031 Job_Baby_Wizard 4032 Job_Baby_Blacksmith 4033 -Job_Baby_Hunter 4034 +Job_Baby_Hunter 4034 Job_Baby_Assassin 4035 Job_Baby_Knight2 4036 Job_Baby_Crusader 4037 @@ -269,22 +269,22 @@ mf_nosave 2 mf_nobranch 3 mf_nopenalty 4 mf_nozenypenalty 5 -mf_pvp 6 +mf_pvp 6 mf_pvp_noparty 7 mf_pvp_noguild 8 -mf_gvg 9 +mf_gvg 9 mf_gvg_noparty 10 mf_notrade 11 mf_noskill 12 mf_nowarp 13 mf_partylock 14 mf_noicewall 15 -mf_snow 16 -mf_fog 17 +mf_snow 16 +mf_fog 17 mf_sakura 18 mf_leaves 19 -mf_rain 20 -mf_nogo 22 +mf_rain 20 +mf_nogo 22 mf_clouds 23 mf_clouds2 24 mf_fireworks 25 @@ -301,8 +301,8 @@ mf_nonightmaredrop 35 mf_restricted 36 mf_nocommand 37 mf_nodrop 38 -mf_jexp 39 -mf_bexp 40 +mf_jexp 39 +mf_bexp 40 mf_novending 41 mf_loadevent 42 mf_nochat 43 @@ -342,64 +342,64 @@ cell_chknochat 13 StatusPoint 9 1 BaseLevel 11 1 SkillPoint 12 1 -Class 19 1 -Upper 56 1 -Zeny 20 1 -Sex 21 1 -Weight 24 1 +Class 19 1 +Upper 56 1 +Zeny 20 1 +Sex 21 1 +Weight 24 1 MaxWeight 25 1 JobLevel 55 1 -BaseExp 1 1 -JobExp 2 1 -Karma 3 1 -Manner 4 1 +BaseExp 1 1 +JobExp 2 1 +Karma 3 1 +Manner 4 1 NextBaseExp 22 1 NextJobExp 23 1 -Hp 5 1 -MaxHp 6 1 -Sp 7 1 -MaxSp 8 1 -BaseJob 119 1 +Hp 5 1 +MaxHp 6 1 +Sp 7 1 +MaxSp 8 1 +BaseJob 119 1 BaseClass 120 1 killerrid 121 1 killedrid 122 1 -bMaxHP 6 -bMaxSP 8 -bStr 13 -bAgi 14 -bVit 15 -bInt 16 -bDex 17 -bLuk 18 -bAtk 41 -bAtk2 42 -bDef 45 -bDef2 46 -bMdef 47 -bMdef2 48 -bHit 49 -bFlee 50 -bFlee2 51 +bMaxHP 6 +bMaxSP 8 +bStr 13 +bAgi 14 +bVit 15 +bInt 16 +bDex 17 +bLuk 18 +bAtk 41 +bAtk2 42 +bDef 45 +bDef2 46 +bMdef 47 +bMdef2 48 +bHit 49 +bFlee 50 +bFlee2 51 bCritical 52 -bAspd 53 -bFame 59 +bAspd 53 +bFame 59 bUnbreakable 60 bAtkRange 1000 -bAtkEle 1001 -bDefEle 1002 +bAtkEle 1001 +bDefEle 1002 bCastrate 1003 bMaxHPrate 1004 bMaxSPrate 1005 bUseSPrate 1006 -bAddEle 1007 +bAddEle 1007 bAddRace 1008 bAddSize 1009 -bSubEle 1010 +bSubEle 1010 bSubRace 1011 -bAddEff 1012 -bResEff 1013 +bAddEff 1012 +bResEff 1013 bBaseAtk 1014 bAspdRate 1015 bHPrecovRate 1016 @@ -459,9 +459,9 @@ bBreakArmorRate 1069 bAddStealRate 1070 bMagicDamageReturn 1071 bRandomAttackIncrease 1072 -bAllStats 1073 -bAgiVit 1074 -bAgiDexStr 1075 +bAllStats 1073 +bAgiVit 1074 +bAgiDexStr 1075 bPerfectHide 1076 bNoKnockback 1077 bClassChange 1078 @@ -2045,16 +2045,16 @@ CLEAR_NPC 844 HAVEQUEST 0 PLAYTIME 1 -HUNTING 2 +HUNTING 2 FW_DONTCARE 0 -FW_THIN 100 +FW_THIN 100 FW_EXTRALIGHT 200 FW_LIGHT 300 FW_NORMAL 400 FW_MEDIUM 500 FW_SEMIBOLD 600 -FW_BOLD 700 +FW_BOLD 700 FW_EXTRABOLD 800 FW_HEAVY 900 diff --git a/db/packet_db.txt b/db/packet_db.txt index 61fb2e75a..75561d553 100644 --- a/db/packet_db.txt +++ b/db/packet_db.txt @@ -595,7 +595,7 @@ packet_ver: 13 0x021c,10 //2004-11-15aSakexe -0x021d,6 +0x021d,6,lesseffect,2 //2004-11-29aSakexe packet_ver: 14 @@ -766,7 +766,7 @@ packet_ver: 18 0x0248,68 0x0249,3 0x024a,70 -0x024b,4,auctioncancelreg,0 +0x024b,4,auctioncancelreg,2 0x024c,8,auctionsetitem,0 0x024d,14 0x024e,6,auctioncancel,0 @@ -798,7 +798,7 @@ packet_ver: 19 0x0251,4 //2005-08-08aSakexe -0x024d,12,auctionregister,0 +0x024d,12,auctionregister,2:6:10 0x024e,4 //2005-08-17aSakexe @@ -829,7 +829,7 @@ packet_ver: 19 //2005-10-17aSakexe 0x007a,58 -0x025d,6,auctionclose,0 +0x025d,6,auctionclose,2 0x025e,4 //2005-10-24aSakexe diff --git a/db/skill_require_db.txt b/db/skill_require_db.txt index d9fa49e0e..9e9f385f0 100644 --- a/db/skill_require_db.txt +++ b/db/skill_require_db.txt @@ -391,7 +391,7 @@ 496,0,0,200,0,0,0,99,0,0,none,0,7134,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_TWILIGHT1## 497,0,0,200,0,0,0,99,0,0,none,0,7134,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_TWILIGHT2## 498,0,0,200,0,0,0,99,0,0,none,0,7134,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AM_TWILIGHT3## -499,0,0,8,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_POWER## +499,0,0,12,0,0,0,11,1,1,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //HT_POWER## 500,0,0,2,0,0,1,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_GLITTERING 501,0,0,10,0,0,0,99,0,0,none,5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_FLING 502,0,0,20,0,0,0,99,99,1,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GS_TRIPLEACTION diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 6afc94444..f9d5c0059 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -4,7 +4,7 @@ //= A reference manual for the eAthena scripting language. //= Commands are sorted depending on their functionality. //===== Version =========================================== -//= 3.37.20110306 +//= 3.39.20110322 //========================================================= //= 1.0 - First release, filled will as much info as I could //= remember or figure out, most likely there are errors, @@ -159,6 +159,15 @@ //= Added 'buyingstore' command. [Ai4rei] //= 3.37.20110306 //= Added 'searchstores' command. [Ai4rei] +//= 3.38.20110313 +//= Added 'cooking' command. [Ai4rei] +//= Fixed item levels in 'produce' command. +//= 3.39.20110322 +//= Added 'bg_getareausers' and 'bg_get_data' commands. [Ai4rei] +//= Updated description of 'waitingroom2bg_single' command. +//= Documented optional parameter 'npc name' of 'waitingroom2bg' command. +//= 3.40.20110404 +//= Updated description of 'waitingroom' command to include required zeny/lvl. [Kisuka] //========================================================= This document is a reference manual for all the scripting commands and functions @@ -4317,11 +4326,38 @@ Valid item levels are: 1 - Level 1 Weapons 2 - Level 2 Weapons 3 - Level 3 Weapons - 16 - Blacksmith's Stones and Metals - 32 - Alchemist's Potions - 64 - Whitesmith's Coins - 123 - Whitesmith's Nuggets - 256 - Assassin Cross's Deadly Poison + 21 - Blacksmith's Stones and Metals + 22 - Alchemist's Potions, Holy Water, Assassin Cross's Deadly Poison + 23 - Elemental Converters + +--------------------------------------- + +*cooking ; + +This command will open a produce window on the client connected to the invoking +character. The 'dish level' is the number which determines what kind of dish +level you can produce. You can see the full list of dishes that can be produced in +'db/produce_db.txt'. + +The window will be shown empty if the invoking character does not have enough of +the required incredients to cook a dish. + +Valid dish levels are: + +11 - Level 1 Dish +12 - Level 2 Dish +13 - Level 3 Dish +14 - Level 4 Dish +15 - Level 5 Dish +16 - Level 6 Dish +17 - Level 7 Dish +18 - Level 8 Dish +19 - Level 9 Dish +20 - Level 10 Dish + +Altough it's required to set a dish level, it doesn't matter if you set it to 1 +and you want to cook a level 10 dish, as long as you got the required incredients +to cook the dish the command works. --------------------------------------- @@ -5674,7 +5710,7 @@ The function returns 0 if the shop was not found, 1 otherwise. --------------------------------------- -*waitingroom "",{,,}; +*waitingroom "",{,,,,,}; This command will create a chat room, owned by the NPC object running this script and displayed above the NPC sprite. @@ -5685,9 +5721,6 @@ optional event and trigger parameters are given, the event label ("::