diff options
author | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-10-30 18:38:14 -0200 |
commit | 7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch) | |
tree | 715f3b80d75cab3a9c2a3abd04ae4461165e8854 /npc/re/warps/fields | |
parent | a2405882a4123d6a11d24e895b40148dc7cb455e (diff) | |
parent | bd04c6c566902d03d633b4dfee5335361155a79e (diff) | |
download | hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2 hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/re/warps/fields')
-rw-r--r-- | npc/re/warps/fields/bif_fild.txt | 4 | ||||
-rw-r--r-- | npc/re/warps/fields/com_fild.txt | 4 | ||||
-rw-r--r-- | npc/re/warps/fields/dic_fild.txt | 2 | ||||
-rw-r--r-- | npc/re/warps/fields/geffen_fild.txt | 2 | ||||
-rw-r--r-- | npc/re/warps/fields/hugel_fild.txt | 2 | ||||
-rw-r--r-- | npc/re/warps/fields/morroc_fild.txt | 17 | ||||
-rw-r--r-- | npc/re/warps/fields/payon_fild.txt | 12 | ||||
-rw-r--r-- | npc/re/warps/fields/prontera_fild.txt | 36 | ||||
-rw-r--r-- | npc/re/warps/fields/rachel_fild.txt | 2 | ||||
-rw-r--r-- | npc/re/warps/fields/veins_fild.txt | 6 | ||||
-rw-r--r-- | npc/re/warps/fields/yuno_fild.txt | 2 |
11 files changed, 46 insertions, 43 deletions
diff --git a/npc/re/warps/fields/bif_fild.txt b/npc/re/warps/fields/bif_fild.txt index ec9de1cf9..b2a9594c0 100644 --- a/npc/re/warps/fields/bif_fild.txt +++ b/npc/re/warps/fields/bif_fild.txt @@ -1,11 +1,9 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Bifrost Field Warp Script //===== By: ================================================== //= Chilly //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= //= Warp Points for Bifrost Field //===== Additional Comments: ================================= diff --git a/npc/re/warps/fields/com_fild.txt b/npc/re/warps/fields/com_fild.txt index c90257eb3..8e7759504 100644 --- a/npc/re/warps/fields/com_fild.txt +++ b/npc/re/warps/fields/com_fild.txt @@ -4,10 +4,8 @@ //= Nana //===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= -//= [Aegis Conversion] +//= [Official Conversion] //= Warp Points for Comodo Fields //===== Additional Comments: ================================= //= 1.1 Rescripted to Aegis 10.3 Standards. [L0ne_W0lf] diff --git a/npc/re/warps/fields/dic_fild.txt b/npc/re/warps/fields/dic_fild.txt index 41ac07aaf..73edb87fb 100644 --- a/npc/re/warps/fields/dic_fild.txt +++ b/npc/re/warps/fields/dic_fild.txt @@ -4,8 +4,6 @@ //= Chilly, Muad_Dib //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for El Dicastes Field //===== Additional Comments: ================================= diff --git a/npc/re/warps/fields/geffen_fild.txt b/npc/re/warps/fields/geffen_fild.txt index 289ad3a6c..fbe737906 100644 --- a/npc/re/warps/fields/geffen_fild.txt +++ b/npc/re/warps/fields/geffen_fild.txt @@ -4,8 +4,6 @@ //= Nana (1.0) //===== Current Version: ===================================== //= 1.1 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for Geffen Field's //===== Additional Comments: ================================= diff --git a/npc/re/warps/fields/hugel_fild.txt b/npc/re/warps/fields/hugel_fild.txt index 309ba8cc1..11f03b489 100644 --- a/npc/re/warps/fields/hugel_fild.txt +++ b/npc/re/warps/fields/hugel_fild.txt @@ -4,8 +4,6 @@ //= Sara-chan (1.0) //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Hercules; RO Episode 10+ //===== Description: ========================================= //= Warp Points for Hugel Field //===== Additional Comments: ================================= diff --git a/npc/re/warps/fields/morroc_fild.txt b/npc/re/warps/fields/morroc_fild.txt index b256e9413..050c76038 100644 --- a/npc/re/warps/fields/morroc_fild.txt +++ b/npc/re/warps/fields/morroc_fild.txt @@ -3,9 +3,7 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.4b -//===== Compatible With: ===================================== -//= Hercules +//= 1.5 //===== Description: ========================================= //= Warp Points for Morroc Fields //===== Additional Comments: ================================= @@ -15,11 +13,12 @@ //= 1.4 Uncommented warp that shouldn't have been commented. [L0ne_W0lf] //= 1.4a Uncommented yet ANOTHER warp that was taken out. [L0ne_W0lf] //= 1.4b Uncommented ANOTHER warp! Yay! :D [L0ne_W0lf] +//= 1.5 Commented moc_fild20 warps replaced with new NPCs. [Euphy] //============================================================ //= 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_fild20,210,342 +//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 @@ -64,7 +63,7 @@ moc_fild03,70,341,0 warp mocf04-1 5,2,moc_fild02,332,23 //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_fild07,380,201,0 warp mocf13-1 2,16,moc_fild20,36,177 +//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 @@ -79,7 +78,7 @@ moc_fild07,380,201,0 warp mocf13-1 2,16,moc_fild20,36,177 //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,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 @@ -89,7 +88,7 @@ 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,32,171,0 warp mocf17-1 2,4,moc_fild20,349,179 +//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 @@ -101,10 +100,10 @@ moc_fild13,308,49,0 warp mocf06-1 2,4,moc_fild03,20,37 //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,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_fild16,333,380,0 warp mocf27-1 4,2,moc_fild20,197,24 +//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 diff --git a/npc/re/warps/fields/payon_fild.txt b/npc/re/warps/fields/payon_fild.txt index 5bec271e8..292aa0785 100644 --- a/npc/re/warps/fields/payon_fild.txt +++ b/npc/re/warps/fields/payon_fild.txt @@ -1,18 +1,16 @@ //===== Hercules Script ====================================== //= Payon Field Warps -//===== By: ================================================== +//===== By: ================================================== //= Nana (1.0) -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Description: ========================================= //= Payon Field Warps -//===== Additional Comments: ================================= +//===== 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 ============================================ pay_fild01,13,152,0 warp payf001 2,7,moc_fild03,299,170 diff --git a/npc/re/warps/fields/prontera_fild.txt b/npc/re/warps/fields/prontera_fild.txt index 2267c298d..d033d4c53 100644 --- a/npc/re/warps/fields/prontera_fild.txt +++ b/npc/re/warps/fields/prontera_fild.txt @@ -3,15 +3,16 @@ //===== By: ================================================== //= Nana (1.0) //===== Current Version: ===================================== -//= 1.3 -//===== Compatible With: ===================================== -//= Hercules +//= 1.5 //===== 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] //= 1.3 Updated to match the new Izlude Map. [Masao] +//= 1.3a Moved Izlude warp to other file. [Euphy] +//= 1.4 Commented moc_fild20 warps replaced with new NPCs. [Euphy] +//= 1.5 Added Prontera Field 8 duplicates. [Euphy] //============================================================ //= Prontera Fields ========================================== @@ -65,29 +66,50 @@ prt_fild08,16,187,0 warp prtf15-1 3,17,prt_fild07,380,186 prt_fild08,16,239,0 warp prtf14-1 3,15,prt_fild07,379,239 prt_fild08,170,378,0 warp prtf004 3,2,prontera,156,26 prt_fild08,233,16,0 warp prtf023 12,1,moc_fild01,238,378 -prt_fild08,371,212,0 warp prtf005 3,3,izlude,26,98 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,17,0 warp prtf025 7,2,moc_fild20,209,333 +//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,19,0 warp prtf028 7,2,moc_fild20,209,333 +//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,22,0 warp prtf029 6,2,moc_fild20,209,333 +//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 prt_fild11,361,184,0 warp prtf20-1 2,5,prt_fild10,23,196 prt_fild11,362,111,0 warp prtf19-1 2,6,prt_fild10,23,122 +//= Prontera Field 8 Duplicates ============================== +prt_fild08a,16,187,0 warp prtf15-1_a 3,17,prt_fild07,380,186 +prt_fild08b,16,187,0 warp prtf15-1_b 3,17,prt_fild07,380,186 +prt_fild08c,16,187,0 warp prtf15-1_c 3,17,prt_fild07,380,186 +prt_fild08d,16,187,0 warp prtf15-1_d 3,17,prt_fild07,380,186 +prt_fild08a,16,239,0 warp prtf14-1_a 3,15,prt_fild07,379,239 +prt_fild08b,16,239,0 warp prtf14-1_b 3,15,prt_fild07,379,239 +prt_fild08c,16,239,0 warp prtf14-1_c 3,15,prt_fild07,379,239 +prt_fild08d,16,239,0 warp prtf14-1_d 3,15,prt_fild07,379,239 +prt_fild08a,170,378,0 warp prtf004_a 3,2,prontera,156,26 +prt_fild08b,170,378,0 warp prtf004_b 3,2,prontera,156,26 +prt_fild08c,170,378,0 warp prtf004_c 3,2,prontera,156,26 +prt_fild08d,170,378,0 warp prtf004_d 3,2,prontera,156,26 +prt_fild08a,233,16,0 warp prtf023_a 12,1,moc_fild01,238,378 +prt_fild08b,233,16,0 warp prtf023_b 12,1,moc_fild01,238,378 +prt_fild08c,233,16,0 warp prtf023_c 12,1,moc_fild01,238,378 +prt_fild08d,233,16,0 warp prtf023_d 12,1,moc_fild01,238,378 +prt_fild08a,55,21,0 warp prtf024_a 4,2,moc_fild01,56,380 +prt_fild08b,55,21,0 warp prtf024_b 4,2,moc_fild01,56,380 +prt_fild08c,55,21,0 warp prtf024_c 4,2,moc_fild01,56,380 +prt_fild08d,55,21,0 warp prtf024_d 4,2,moc_fild01,56,380 + //= St. Capitolina Abbey ===================================== monk_in,128,46,0 warp monk03 1,3,monk_in,161,38 monk_in,128,84,0 warp monk04 1,3,monk_in,161,90 diff --git a/npc/re/warps/fields/rachel_fild.txt b/npc/re/warps/fields/rachel_fild.txt index 87d4f16d7..621062377 100644 --- a/npc/re/warps/fields/rachel_fild.txt +++ b/npc/re/warps/fields/rachel_fild.txt @@ -4,8 +4,6 @@ //= Playtester //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for Rachel Field //===== Additional Comments: ================================= diff --git a/npc/re/warps/fields/veins_fild.txt b/npc/re/warps/fields/veins_fild.txt index c1a5cce5a..255ce637c 100644 --- a/npc/re/warps/fields/veins_fild.txt +++ b/npc/re/warps/fields/veins_fild.txt @@ -4,8 +4,6 @@ //= $ephiroth //===== Current Version: ===================================== //= 1.5 -//===== Compatible With: ===================================== -//= Hercules //===== Description: ========================================= //= Warp Points for Veins Field //===== Additional Comments: ================================= @@ -45,9 +43,9 @@ 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 -//============================================================ +//============================================================ //= 1.0 Initial version [$ephiroth] //= 1.1 Updated more warps [$ephiroth] //= 1.2 Removed some unofficial warps [Playtester] diff --git a/npc/re/warps/fields/yuno_fild.txt b/npc/re/warps/fields/yuno_fild.txt index b570fca9e..fe998c843 100644 --- a/npc/re/warps/fields/yuno_fild.txt +++ b/npc/re/warps/fields/yuno_fild.txt @@ -4,8 +4,6 @@ //= Nana (1.0), Sara //===== Current Version: ===================================== //= 1.3 -//===== Compatible With: ===================================== -//= Hercules; RO Episode 5+ //===== Description: ========================================= //= Warp Points for Yuno Field //===== Additional Comments: ================================= |