From 9f1d3bfdee9721bd564a5d888e01b17fc545c919 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Fri, 26 Dec 2008 06:58:19 +0000 Subject: Happy boxing day, eAthena! Here have a massive update. * Implemented the first round of episode 12.1 change which include: - Many Morroc NPCs have been moved to Morroc Ruins. - The addition of new of NPCs to the ruins of Morroc. - Several warp points leading around Morroc altered. - The implementation of the continental Guard Quest. - The removal of the 'Dandelion's Request" quest. - This update contains several changes, as Morroc and several fields no longer exist in one sense of the word. AS such, many NPCs have been moved, there may be quests that no longer function because of NPCs on inaccessable maps. * Commented out maps no longer accessable with 12.1 in maps_athena.conf * Updated mob_skill_db episode 12.1 skills to official. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13415 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/warps/cities/morroc.txt | 83 ++++++++++++------------ npc/warps/dungeons/anthell.txt | 24 +++---- npc/warps/fields/morroc_fild.txt | 126 ++++++++++++++++++++----------------- npc/warps/fields/prontera_fild.txt | 12 ++-- 4 files changed, 127 insertions(+), 118 deletions(-) (limited to 'npc/warps') diff --git a/npc/warps/cities/morroc.txt b/npc/warps/cities/morroc.txt index 32249fb5f..1570d2248 100644 --- a/npc/warps/cities/morroc.txt +++ b/npc/warps/cities/morroc.txt @@ -4,27 +4,29 @@ //= Athena (1.0) //= Nana (1.2) //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Morroc and Assassin Guild //===== Additional Comments: ================================= -//= No Comment +//= 1.3 Updated warps for episode 12.1 [L0ne_W0lf] //============================================================ //= Morroc City ============================================== morocc,160,17,0 warp moc001 2,2,moc_fild12,159,378 -morocc,160,183,0 warp moc002 2,1,moc_castle,94,181 +//morocc,160,183,0 warp moc002 2,1,moc_castle,94,181 morocc,160,297,0 warp moc003 2,2,moc_fild07,198,25 morocc,197,66,0 warp moc01 1,1,morocc_in,83,92 -morocc,22,294,0 warp moc02 2,5,moc_ruins,156,42 +//morocc,22,294,0 warp moc02 2,5,moc_ruins,156,42 +morocc,27,294,0 warp moc02 2,5,moc_ruins,156,42 morocc,24,164,0 warp moc004 1,2,moc_fild19,164,107 morocc,253,56,0 warp moc03 2,1,morocc_in,134,74 -morocc,26,297,0 warp moc02-1 5,2,moc_ruins,156,42 +//morocc,26,297,0 warp moc02-1 5,2,moc_ruins,156,42 morocc,274,269,0 warp moc04 2,2,morocc_in,138,136 morocc,283,170,0 warp moc07 2,2,morocc_in,108,176 -morocc,302,207,0 warp moc005 2,2,moc_fild10,22,207 +//morocc,302,207,0 warp moc005 2,2,moc_fild10,22,207 +morocc,299,207,0 warp moc005 2,2,moc_fild20,36,177 morocc,46,46,0 warp moc05 2,1,morocc_in,68,72 morocc,52,259,0 warp moc06 1,2,morocc_in,180,65 morocc,85,55,0 warp moc08 2,2,morocc_in,44,149 @@ -67,41 +69,42 @@ morocc_in,93,123,0 warp moc11 1,3,morocc_in,109,123 morocc_in,93,95,0 warp moc10 1,3,morocc_in,109,95 //= Morroc Ruins ============================================ -moc_ruins,161,40,0 warp moc02-2 2,4,morocc,26,293 -moc_ruins,157,37,0 warp moc02-3 5,2,morocc,26,293 +moc_ruins,159,39,0 warp moc02-2 2,4,morocc,30,290 +//moc_ruins,161,40,0 warp moc02-2 2,4,morocc,26,293 +//moc_ruins,157,37,0 warp moc02-3 5,2,morocc,26,293 moc_ruins,54,161,0 warp moc006 2,3,moc_pryd01,192,9 moc_ruins,71,16,0 warp moc007 8,2,moc_fild19,71,167 //= Morroc Castle =========================================== -moc_castle,94,183,0 warp mocc001 2,1,morocc,160,185 -moc_castle,107,163,0 warp mocc01 2,3,moc_castle,124,163 -moc_castle,120,163,0 warp mocc01-1 2,3,moc_castle,103,163 -moc_castle,120,75,0 warp mocc02 2,3,moc_castle,56,33 -moc_castle,59,34,0 warp mocc02-1 2,3,moc_castle,124,75 -moc_castle,134,101,0 warp mocc03 1,1,moc_castle,134,128 -moc_castle,134,124,0 warp mocc-03 2,2,moc_castle,134,98 -moc_castle,134,139,0 warp mocc04 1,1,moc_castle,134,160 -moc_castle,134,156,0 warp mocc04-1 2,2,moc_castle,134,136 -moc_castle,149,163,0 warp mocc05 2,3,moc_castle,162,163 -moc_castle,158,163,0 warp mocc05-1 2,3,moc_castle,145,163 -moc_castle,16,131,0 warp mocc06 1,2,moc_castle,16,164 -moc_castle,16,160,0 warp mocc06-1 1,2,moc_castle,16,125 -moc_castle,170,131,0 warp mocc07 2,2,moc_castle,170,163 -moc_castle,170,160,0 warp mocc07-1 1,1,moc_castle,170,128 -moc_castle,29,163,0 warp mocc08 2,2,moc_castle,44,163 -moc_castle,40,163,0 warp mocc08-1 2,2,moc_castle,25,163 -moc_castle,51,114,0 warp mocc09 3,2,moc_castle,54,65 -moc_castle,54,69,0 warp mocc09-1 3,2,moc_castle,52,117 -moc_castle,54,139,0 warp mocc10 2,2,moc_castle,54,160 -moc_castle,54,156,0 warp mocc10-1 2,2,moc_castle,54,134 -moc_castle,63,89,0 warp mocc11 2,3,moc_castle,83,89 -moc_castle,80,89,0 warp mocc11-1 2,3,moc_castle,60,89 -moc_castle,69,163,0 warp mocc12 2,2,moc_castle,86,163 -moc_castle,82,163,0 warp mocc12-1 2,2,moc_castle,66,163 -moc_castle,88,93,0 warp mocc13 1,1,moc_castle,94,119 -moc_castle,94,116,0 warp mocc13-1 1,1,moc_castle,88,90 -moc_castle,96,90,0 warp mocc13-2 1,1,moc_castle,94,119 -moc_castle,92,67,0 warp mocc14 3,2,moc_castle,92,85 -moc_castle,92,82,0 warp mocc14-1 3,2,moc_castle,92,63 -moc_castle,94,143,0 warp mocc15 3,2,moc_castle,94,160 -moc_castle,94,156,0 warp mocc15-1 3,2,moc_castle,94,140 +//moc_castle,94,183,0 warp mocc001 2,1,morocc,160,185 +//moc_castle,107,163,0 warp mocc01 2,3,moc_castle,124,163 +//moc_castle,120,163,0 warp mocc01-1 2,3,moc_castle,103,163 +//moc_castle,120,75,0 warp mocc02 2,3,moc_castle,56,33 +//moc_castle,59,34,0 warp mocc02-1 2,3,moc_castle,124,75 +//moc_castle,134,101,0 warp mocc03 1,1,moc_castle,134,128 +//moc_castle,134,124,0 warp mocc-03 2,2,moc_castle,134,98 +//moc_castle,134,139,0 warp mocc04 1,1,moc_castle,134,160 +//moc_castle,134,156,0 warp mocc04-1 2,2,moc_castle,134,136 +//moc_castle,149,163,0 warp mocc05 2,3,moc_castle,162,163 +//moc_castle,158,163,0 warp mocc05-1 2,3,moc_castle,145,163 +//moc_castle,16,131,0 warp mocc06 1,2,moc_castle,16,164 +//moc_castle,16,160,0 warp mocc06-1 1,2,moc_castle,16,125 +//moc_castle,170,131,0 warp mocc07 2,2,moc_castle,170,163 +//moc_castle,170,160,0 warp mocc07-1 1,1,moc_castle,170,128 +//moc_castle,29,163,0 warp mocc08 2,2,moc_castle,44,163 +//moc_castle,40,163,0 warp mocc08-1 2,2,moc_castle,25,163 +//moc_castle,51,114,0 warp mocc09 3,2,moc_castle,54,65 +//moc_castle,54,69,0 warp mocc09-1 3,2,moc_castle,52,117 +//moc_castle,54,139,0 warp mocc10 2,2,moc_castle,54,160 +//moc_castle,54,156,0 warp mocc10-1 2,2,moc_castle,54,134 +//moc_castle,63,89,0 warp mocc11 2,3,moc_castle,83,89 +//moc_castle,80,89,0 warp mocc11-1 2,3,moc_castle,60,89 +//moc_castle,69,163,0 warp mocc12 2,2,moc_castle,86,163 +//moc_castle,82,163,0 warp mocc12-1 2,2,moc_castle,66,163 +//moc_castle,88,93,0 warp mocc13 1,1,moc_castle,94,119 +//moc_castle,94,116,0 warp mocc13-1 1,1,moc_castle,88,90 +//moc_castle,96,90,0 warp mocc13-2 1,1,moc_castle,94,119 +//moc_castle,92,67,0 warp mocc14 3,2,moc_castle,92,85 +//moc_castle,92,82,0 warp mocc14-1 3,2,moc_castle,92,63 +//moc_castle,94,143,0 warp mocc15 3,2,moc_castle,94,160 +//moc_castle,94,156,0 warp mocc15-1 3,2,moc_castle,94,140 diff --git a/npc/warps/dungeons/anthell.txt b/npc/warps/dungeons/anthell.txt index dfc4e2a5c..44625e45d 100644 --- a/npc/warps/dungeons/anthell.txt +++ b/npc/warps/dungeons/anthell.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,24 +11,14 @@ //===== Additional Comments: ================================= //= 1.3 Changed var anthell to @anthell. Optimized [Lupus] //= 1.4 Removed Duplicates [Silent] +//= 1.5 Updated warps for episode 12.1 [L0ne_W0lf] //============================================================ //= Ant Hell ================================================= -anthell01,35,267,0 script ant001 45,1,1,{ - if(@anthell) { - warp "moc_fild15",251,248; - } else { - warp "moc_fild04",213,327; - } - end; -} -anthell02,171,169,0 script ant002 45,1,2,{ - if(@anthell) { - warp "moc_fild04",213,327; - } else { - warp "moc_fild15",251,248; - } - end; -} +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 + 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/morroc_fild.txt b/npc/warps/fields/morroc_fild.txt index 8e36790a6..f1efa9d64 100644 --- a/npc/warps/fields/morroc_fild.txt +++ b/npc/warps/fields/morroc_fild.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,21 +11,23 @@ //===== Additional Comments: ================================= //= 1.1 changed 'anthell' to @anthell [Lupus] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.3 Updated warps for episode 12.1 [L0ne_W0lf] //============================================================ //= Sograt Dessert =========================================== -moc_fild01,101,16,0 warp mocf01-1 15,3,moc_fild04,317,376 +//moc_fild01,101,16,0 warp mocf01-1 15,3,moc_fild04,317,376 +moc_fild01,101,16,0 warp mocf01-1 15,3,moc_fild20,210,342 moc_fild01,22,242,0 warp mocf005 2,2,prt_fild09,380,237 moc_fild01,239,382,0 warp mocf006 12,1,prt_fild08,233,20 moc_fild01,301,16,0 warp mocf02 10,1,moc_fild02,77,338 moc_fild01,321,16,0 warp mocf02-1 10,1,moc_fild02,77,338 moc_fild01,341,16,0 warp mocf02-2 10,1,moc_fild02,77,338 -moc_fild01,379,162,0 warp mocf011 2,12,pay_fild04,20,165 +//moc_fild01,379,162,0 warp mocf011 2,12,pay_fild04,20,165 moc_fild01,56,384,0 warp moc007a 3,2,prt_fild08,54,24 -moc_fild01,68,16,0 warp mocf01 15,3,moc_fild04,317,376 +//moc_fild01,68,16,0 warp mocf01 15,3,moc_fild04,317,376 moc_fild02,228,29,0 warp mocf03 4,2,moc_fild13,298,367 moc_fild02,332,19,0 warp mocf04 5,3,moc_fild03,70,336 -moc_fild02,350,339,0 warp mocf012 6,2,pay_fild04,194,20 +//moc_fild02,350,339,0 warp mocf012 6,2,pay_fild04,194,20 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 @@ -33,68 +35,74 @@ 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,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 -moc_fild04,14,146,0 warp mocf07-2 1,11,moc_fild05,378,119 -moc_fild04,14,98,0 warp mocf07 1,11,moc_fild05,378,119 -moc_fild04,175,18,0 warp mocf08 3,2,moc_fild08,170,380 -moc_fild04,19,206,0 warp mocf09 3,15,moc_fild05,373,208 -moc_fild04,219,327,0 script mocf016 45,3,4,{ set @anthell,0; warp "anthell01",35,262; } -moc_fild04,292,381,0 warp mocf01-2 10,1,moc_fild01,76,25 -moc_fild04,314,381,0 warp mocf01-3 10,1,moc_fild01,76,25 -moc_fild04,336,381,0 warp mocf01-4 10,1,moc_fild01,76,25 -moc_fild04,92,381,0 warp mocf008 9,2,prt_fild09,246,19 -moc_fild05,144,375,0 warp mocf009 11,2,prt_fild10,263,23 -moc_fild05,18,136,0 warp mocf10 1,8,moc_fild06,367,317 -moc_fild05,18,154,0 warp mocf10-1 1,8,moc_fild06,367,317 -moc_fild05,18,172,0 warp mocf10-2 1,8,moc_fild06,367,317 -moc_fild05,268,18,0 warp mocf11 4,2,moc_fild09,267,368 -moc_fild05,325,382,0 warp mocf010 6,2,prt_fild09,95,19 -moc_fild05,378,208,0 warp mocf09-1 3,14,moc_fild04,26,206 -moc_fild05,384,108,0 warp mocf07-3 1,8,moc_fild04,22,123 -moc_fild05,384,126,0 warp mocf07-4 1,8,moc_fild04,22,123 -moc_fild05,384,144,0 warp mocf07-5 1,8,moc_fild04,22,123 -moc_fild05,82,16,0 warp mocf12 5,2,moc_fild09,80,366 -moc_fild06,18,198,0 warp mocf13 1,18,moc_fild07,378,201 -moc_fild06,207,18,0 warp mocf14 11,2,moc_fild10,208,295 -moc_fild06,377,316,0 warp mocf10-3 1,15,moc_fild05,24,153 +//moc_fild04,14,122,0 warp mocf07-1 1,11,moc_fild05,378,119 +//moc_fild04,14,146,0 warp mocf07-2 1,11,moc_fild05,378,119 +//moc_fild04,14,98,0 warp mocf07 1,11,moc_fild05,378,119 +//moc_fild04,175,18,0 warp mocf08 3,2,moc_fild08,170,380 +//moc_fild04,19,206,0 warp mocf09 3,15,moc_fild05,373,208 +//moc_fild04,219,327,0 script mocf016 45,3,4,{ set @anthell,0; warp "anthell01",35,262; } +//moc_fild04,292,381,0 warp mocf01-2 10,1,moc_fild01,76,25 +//moc_fild04,314,381,0 warp mocf01-3 10,1,moc_fild01,76,25 +//moc_fild04,336,381,0 warp mocf01-4 10,1,moc_fild01,76,25 +//moc_fild04,92,381,0 warp mocf008 9,2,prt_fild09,246,19 +//moc_fild05,144,375,0 warp mocf009 11,2,prt_fild10,263,23 +//moc_fild05,18,136,0 warp mocf10 1,8,moc_fild06,367,317 +//moc_fild05,18,154,0 warp mocf10-1 1,8,moc_fild06,367,317 +//moc_fild05,18,172,0 warp mocf10-2 1,8,moc_fild06,367,317 +//moc_fild05,268,18,0 warp mocf11 4,2,moc_fild09,267,368 +//moc_fild05,325,382,0 warp mocf010 6,2,prt_fild09,95,19 +//moc_fild05,378,208,0 warp mocf09-1 3,14,moc_fild04,26,206 +//moc_fild05,384,108,0 warp mocf07-3 1,8,moc_fild04,22,123 +//moc_fild05,384,126,0 warp mocf07-4 1,8,moc_fild04,22,123 +//moc_fild05,384,144,0 warp mocf07-5 1,8,moc_fild04,22,123 +//moc_fild05,82,16,0 warp mocf12 5,2,moc_fild09,80,366 +//moc_fild06,18,198,0 warp mocf13 1,18,moc_fild07,378,201 +//moc_fild06,207,18,0 warp mocf14 11,2,moc_fild10,208,295 +//moc_fild06,377,316,0 warp mocf10-3 1,15,moc_fild05,24,153 moc_fild07,198,21,0 warp mocf001 2,2,morocc,160,294 -moc_fild07,381,201,0 warp mocf13-1 2,16,moc_fild06,28,201 -moc_fild08,16,207,0 warp mocf15 2,4,moc_fild09,371,195 -moc_fild08,170,383,0 warp mocf08-1 3,2,moc_fild04,175,21 -moc_fild08,204,16,0 warp mocf16 4,2,moc_fild14,196,379 -moc_fild08,383,211,0 warp mocf17 2,4,moc_fild13,32,171 -moc_fild09,126,20,0 warp mocf18 4,2,moc_fild15,158,360 -moc_fild09,267,371,0 warp mocf11-1 4,2,moc_fild05,268,21 -moc_fild09,30,162,0 warp mocf19 2,3,moc_fild10,381,258 -moc_fild09,374,195,0 warp mocf15-1 2,8,moc_fild08,19,207 -moc_fild09,80,369,0 warp mocf12-1 7,2,moc_fild05,82,19 -moc_fild10,189,23,0 warp mocf20 3,2,moc_fild11,189,360 -moc_fild10,19,207,0 warp mocf002 2,2,morocc,299,207 -moc_fild10,208,298,0 warp mocf14-1 10,2,moc_fild06,207,21 -moc_fild10,384,258,0 warp mocf19-1 2,3,moc_fild09,33,162 -moc_fild11,189,363,0 warp mocf20-1 3,2,moc_fild10,189,26 +//moc_fild07,381,201,0 warp mocf13-1 2,16,moc_fild06,28,201 +moc_fild07,380,201,0 warp mocf13-1 2,16,moc_fild20,36,177 +//moc_fild08,16,207,0 warp mocf15 2,4,moc_fild09,371,195 +//moc_fild08,170,383,0 warp mocf08-1 3,2,moc_fild04,175,21 +//moc_fild08,204,16,0 warp mocf16 4,2,moc_fild14,196,379 +//moc_fild08,383,211,0 warp mocf17 2,4,moc_fild13,32,171 +//moc_fild09,126,20,0 warp mocf18 4,2,moc_fild15,158,360 +//moc_fild09,267,371,0 warp mocf11-1 4,2,moc_fild05,268,21 +//moc_fild09,30,162,0 warp mocf19 2,3,moc_fild10,381,258 +//moc_fild09,374,195,0 warp mocf15-1 2,8,moc_fild08,19,207 +//moc_fild09,80,369,0 warp mocf12-1 7,2,moc_fild05,82,19 +//moc_fild10,189,23,0 warp mocf20 3,2,moc_fild11,189,360 +//moc_fild10,19,207,0 warp mocf002 2,2,morocc,299,207 +//moc_fild10,208,298,0 warp mocf14-1 10,2,moc_fild06,207,21 +//moc_fild10,384,258,0 warp mocf19-1 2,3,moc_fild09,33,162 +//moc_fild11,189,363,0 warp mocf20-1 3,2,moc_fild10,189,26 +moc_fild11,189,360,0 warp mocf20-1 3,2,moc_fild20,197,24 moc_fild11,212,29,0 warp mocf21 4,2,moc_fild17,218,366 moc_fild11,26,161,0 warp mocf22 2,10,moc_fild12,286,168 -moc_fild11,379,197,0 warp mocf23 2,6,moc_fild15,41,105 +//moc_fild11,379,197,0 warp mocf23 2,6,moc_fild15,41,105 +moc_fild11,377,197,0 warp mocf23 2,6,moc_fild20,36,177 moc_fild12,118,30,0 warp mocf24 4,2,moc_fild18,158,379 moc_fild12,159,381,0 warp mocf003 2,2,morocc,160,20 moc_fild12,289,168,0 warp mocf22-1 2,3,moc_fild11,29,161 moc_fild13,146,368,0 warp mocf05-1 5,2,moc_fild02,71,21 -moc_fild13,29,171,0 warp mocf17-1 2,4,moc_fild08,380,211 +//moc_fild13,29,171,0 warp mocf17-1 2,4,moc_fild08,380,211 +moc_fild13,32,171,0 warp mocf17-1 2,4,moc_fild20,349,179 moc_fild13,298,370,0 warp mocf03-1 4,2,moc_fild02,228,32 moc_fild13,308,49,0 warp mocf06-1 2,4,moc_fild03,20,37 -moc_fild14,16,278,0 warp mocf25 2,6,moc_fild15,364,276 -moc_fild14,196,382,0 warp mocf16-1 4,2,moc_fild08,204,19 -moc_fild15,104,16,0 warp mocf26 9,2,moc_fild16,125,380 -moc_fild15,158,363,0 warp mocf18-1 6,2,moc_fild09,126,23 -moc_fild15,258,253,0 script mocf017 45,3,3,{ set @anthell,1; warp "anthell01",35,262; } -moc_fild15,348,18,0 warp mocf27 5,2,moc_fild16,334,379 -moc_fild15,367,276,0 warp mocf25-1 2,4,moc_fild14,19,278 -moc_fild15,38,105,0 warp mocf23-1 2,4,moc_fild11,376,197 -moc_fild16,125,383,0 warp mocf26-1 5,2,moc_fild15,104,19 +//moc_fild14,16,278,0 warp mocf25 2,6,moc_fild15,364,276 +//moc_fild14,196,382,0 warp mocf16-1 4,2,moc_fild08,204,19 +//moc_fild15,104,16,0 warp mocf26 9,2,moc_fild16,125,380 +//moc_fild15,158,363,0 warp mocf18-1 6,2,moc_fild09,126,23 +//moc_fild15,258,253,0 script mocf017 45,3,3,{ set @anthell,1; warp "anthell01",35,262; } +//moc_fild15,348,18,0 warp mocf27 5,2,moc_fild16,334,379 +//moc_fild15,367,276,0 warp mocf25-1 2,4,moc_fild14,19,278 +//moc_fild15,38,105,0 warp mocf23-1 2,4,moc_fild11,376,197 +//moc_fild16,125,383,0 warp mocf26-1 5,2,moc_fild15,104,19 +moc_fild16,124,381,0 warp mocf26-1 5,2,moc_fild20,197,24 moc_fild16,16,179,0 warp mocf28 2,6,moc_fild17,366,272 -moc_fild16,334,382,0 warp mocf27-1 4,2,moc_fild15,348,21 -moc_fild17,218,369,0 warp mocf21-1 5,2,moc_fild11,212,32 +//moc_fild16,334,382,0 warp mocf27-1 4,2,moc_fild15,348,21 +moc_fild16,333,380,0 warp mocf27-1 4,2,moc_fild20,197,24 +//moc_fild17,218,369,0 warp mocf21-1 5,2,moc_fild11,212,32 moc_fild17,30,300,0 warp moc29 2,5,moc_fild18,379,305 moc_fild17,369,272,0 warp mocf28-1 2,3,moc_fild16,19,179 moc_fild18,158,382,0 warp mocf24-1 4,2,moc_fild12,118,33 @@ -102,3 +110,7 @@ moc_fild18,382,305,0 warp moc29-1 2,4,moc_fild17,33,300 moc_fild19,169,107,0 warp mocf004 1,4,morocc,27,164 moc_fild19,71,170,0 warp mocf018 8,2,moc_ruins,71,19 moc_fild19,98,99,0 warp mocf019 1,1,in_sphinx1,288,9 + +// Satan Morroc Addition +moc_fild21,26,196,0 warp mocf020 1,1,moc_fild20,349,179 +moc_fild22,32,196,0 warp mocf021 1,1,moc_fild20,349,179 diff --git a/npc/warps/fields/prontera_fild.txt b/npc/warps/fields/prontera_fild.txt index fc5d82a7d..677da8c5f 100644 --- a/npc/warps/fields/prontera_fild.txt +++ b/npc/warps/fields/prontera_fild.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Prontera Field //===== Additional Comments: ================================= //= 1.1 updating according to jA [Lupus] +//= 1.2 Updated warps for episode 12.1 [L0ne_W0lf] //============================================================ //= Prontera Fields ========================================== @@ -68,15 +69,18 @@ prt_fild08,55,21,0 warp prtf024 4,2,moc_fild01,56,380 prt_fild09,14,124,0 warp prtf17 2,6,prt_fild10,336,126 prt_fild09,14,139,0 warp prtf17-1 2,8,prt_fild10,336,126 prt_fild09,224,380,0 warp prtf13-1 4,2,prt_fild07,206,15 -prt_fild09,246,16,0 warp prtf025 7,2,moc_fild04,92,378 +//prt_fild09,246,16,0 warp prtf025 7,2,moc_fild04,92,378 +prt_fild09,246,17,0 warp prtf025 7,2,moc_fild20,209,333 prt_fild09,383,223,0 warp prtf026 2,15,moc_fild01,25,242 prt_fild09,383,251,0 warp prtf027 2,15,moc_fild01,25,242 prt_fild09,87,380,0 warp prtf16-1 5,2,prt_fild07,84,16 -prt_fild09,95,16,0 warp prtf028 7,2,moc_fild05,325,379 +//prt_fild09,95,16,0 warp prtf028 7,2,moc_fild05,325,379 +prt_fild09,95,19,0 warp prtf028 7,2,moc_fild20,209,333 prt_fild10,20,122,0 warp prtf19 2,4,prt_fild11,359,111 prt_fild10,20,196,0 warp prtf20 2,4,prt_fild11,358,184 prt_fild10,227,299,0 warp prtf020 5,2,gef_fild02,266,21 -prt_fild10,263,20,0 warp prtf029 6,2,moc_fild05,144,372 +//prt_fild10,263,20,0 warp prtf029 6,2,moc_fild05,144,372 +prt_fild10,263,22,0 warp prtf029 6,2,moc_fild20,209,333 prt_fild10,339,126,0 warp prtf17-2 2,8,prt_fild09,17,133 prt_fild11,17,281,0 warp prtf021 2,4,gef_fild11,374,293 prt_fild11,302,301,0 warp prtf022 5,2,gef_fild03,312,19 -- cgit v1.2.3-60-g2f50