From a6a08b1c5d2a955cbd586d5d3c7f777e69c215ff Mon Sep 17 00:00:00 2001 From: brianluau Date: Fri, 26 Jun 2009 20:39:22 +0000 Subject: - Moved the anthell warp agent to the new entrance. (bugreport:2801) - Added missing 'F_GldTreasSw' function for Novice Castles. (bugreport:3292) - Removed OnTouch trigger area from Continental Guard NPCs. - Corrected the observatory warp portal. (bugreport:3293) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13911 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/custom/warper.txt | 55 +++++++------------------------------- npc/events/nguild/nguild_treas.txt | 18 ++++++++++++- npc/quests/eye_of_hellion.txt | 4 +-- npc/quests/quests_morocc.txt | 29 ++++++++++---------- npc/warps/cities/mid_camp.txt | 9 ++++--- 5 files changed, 49 insertions(+), 66 deletions(-) (limited to 'npc') diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt index 64dc126de..8444f8cf0 100644 --- a/npc/custom/warper.txt +++ b/npc/custom/warper.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Darkchild //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= Any eAthena Version; //===== Description: ========================================= @@ -24,6 +24,7 @@ //= 1.8 Removed Duplicates [Silent] //= 1.9 Optimized for the greater good. [Kisuka] //= 2.0 Fixed warp for AntHell and Yuno. [Kisuka] +//= 2.1 Moved AntHell warp agent to the new anthell entrance. [brianluau] //============================================================ //============================================================ //= To allow selecting the Level of the Dungeon you want to @@ -48,175 +49,137 @@ switch(select("Alberta:Aldebaran:Amatsu:Ayothaya:Comodo:Einbroch:Einbech:Geffen:Gonryun:Hugel:Izlude:Lighthalzen:Louyang:Lutie:Morroc:Payon:Prontera:Umbala:Yuno")) { case 1: warp "alberta",27,236; - end; break; case 2: warp "aldebaran",145,120; - end; break; case 3: warp "amatsu",197,86; - end; break; case 4: warp "ayothaya",149,118; - end; break; case 5: warp "comodo",188,161; - end; break; case 6: warp "einbroch",64,200; - end; break; case 7: warp "einbech",70,95; - end; break; case 8: warp "geffen",119,66; - end; break; case 9: warp "gonryun",150,130; - end; break; case 10: warp "hugel",96,145; - end; break; case 11: warp "izlude",128,111; - end; break; case 12: warp "lighthalzen",158,92; - end; break; case 13: warp "louyang",210,108; - end; break; case 14: warp "xmas",150,133; - end; break; case 15: warp "morocc",159,93; - end; break; case 16: warp "payon",152,75; - end; break; case 17: warp "prontera",156,187; - end; break; case 18: warp "umbala",130,130; - end; break; case 19: warp "yuno",160,168; - end; + break; } break; - case 2: + case 2: mes "[Warp Agent]"; mes "Please select which dungeon you would like to be teleported to."; next; switch(select("Abyss Lake:Amatsu Dungeon:Anthell:Ayothaya Dungeon:Bibilan Dungeon:Coal Mine (Dead Pit):Culvert:Einbech Dungeon:Glast Heim:Gonryun Dungeon:Juperos:Lighthalzen Bio Lab:Magma Dungeon:Niflheim:Odin Temple:Orc Dungeon:Payon Dungeon:Pyramids:Sphinx:Sunken Ship:Thanatos Tower:Turtle Dungeon")) { case 1: warp "hu_fild05",189,207; - end; break; case 2: warp "ama_dun01",229,12; - end; break; case 3: - warp "moc_fild20",148,141; - end; + warp "moc_fild20",164,145; break; case 4: warp "ayo_fild02",280,149; - end; break; case 5: warp "izlu2dun",106,88; - end; break; case 6: warp "prt_sewb1",126,248; - end; break; case 7: warp "mjolnir_02",81,359; - end; break; case 8: warp "einbech",135,249; - end; break; case 9: warp "glast_01",368,303; - end; break; case 10: warp "gonryun",160,195; - end; break; case 11: warp "yuno_fild07",218,176; - end; break; case 12: warp "lighthalzen",158,285; - end; break; case 13: warp "yuno_fild03",39,140; - end; break; case 14: warp "niflheim",35,161; - end; break; case 15: warp "odin_tem01",98,144; - end; break; case 16: warp "gef_fild10",70,332; - end; break; case 17: warp "pay_arche",43,132; - end; break; case 18: warp "moc_ruins",62,162; - end; break; case 19: warp "moc_fild19",107,100; - end; break; case 20: warp "alb2trea",75,98; - end; break; case 21: warp "tha_scene01",131,223; - end; break; case 22: warp "tur_dun01",149,238; - end; } + break; } + end; } // --------- NPC Clones ------------ @@ -246,7 +209,7 @@ yuno,137,162,4 duplicate(warpra) Warp Agent#21 859 // ------------ Dungeons ------------ ama_dun01,233,9,1 duplicate(warpra) Warp Agent#22 859 -moc_fild04,207,331,4 duplicate(warpra) Warp Agent#23 859 +moc_fild20,162,139,6 duplicate(warpra) Warp Agent#23 859 ayo_fild02,279,154,4 duplicate(warpra) Warp Agent#24 859 izlu2dun,104,82,4 duplicate(warpra) Warp Agent#25 859 prt_sewb1,125,253,4 duplicate(warpra) Warp Agent#26 859 @@ -265,4 +228,4 @@ lhz_dun01,157,285,4 duplicate(warpra) Warp Agent#38 859 hu_fild05,186,210,4 duplicate(warpra) Warp Agent#39 859 yuno_fild07,221,179,4 duplicate(warpra) Warp Agent#40 859 tha_scene01,139,194,1 duplicate(warpra) Warp Agent#41 859 -odin_tem01,96,149,4 duplicate(warpra) Warp Agent#42 859 \ No newline at end of file +odin_tem01,96,149,4 duplicate(warpra) Warp Agent#42 859 diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt index 16863be8b..594eba9e6 100644 --- a/npc/events/nguild/nguild_treas.txt +++ b/npc/events/nguild/nguild_treas.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.3 +//= 1.3b //===== Compatible With: ===================================== //= eAthena 0.1+; RO Episode 4+ //===== Description: ========================================= @@ -12,6 +12,7 @@ //= Based off existing guild scripts. Do not know if it is accurate.[kobra_k88] //= 1.2 Official treasure spawn [Lupus] //= 1.3 Added F_GldTreas function. (bugreport:1788) [L0ne_W0lf] +//= 1.3b Added F_GldTreasSw function. (bugreport:3292) [brianluau] //============================================================ @@ -48,6 +49,21 @@ function script F_GldTreas { return; } +//============================================================== +// Treasure Room Switch +//=============================================================== +function script F_GldTreasSw { + mes " "; + mes "There's a small lever. Will you pull it?"; + next; + + if (select("Pull.:Do not.") == 1) { + warp getarg(0),getarg(1),getarg(2); + return; + } + close; +} + //<=============================== Castle 1 =================================>\\ // Treasure Spawn ----------------------- diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 84baba379..a8416e9cc 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -1466,9 +1466,9 @@ payon,182,132,3 script Grout'he Tuccok#hellion 48,{ else if (HELLIONQ == 52) { mes "[Grout'he]"; mes "Oh, you need some help"; - mes "Win figuring out the clues?"; + mes "in figuring out the clues?"; mes "Heh. Alright, let's see."; - mes "You want I should help"; + mes "You want me to help"; mes "you in making sense of"; mes "this weird riddle?"; next; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index ab77879a1..888e15fe6 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.5 +//= 2.6 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -29,6 +29,7 @@ //= Moved Dandelion's Request to a it's own file. //= Added support NPCs required to finish Gaebolg quest. //= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf] +//= 2.6 Removed Ontouch trigger area from NPCs. [brianluau] //============================================================ //==================================================================================// @@ -876,7 +877,7 @@ que_job01,70,84,1 script Girl#moc_ex002 882,{ // Continental Guard Quest // ============================================================ -moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ +moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,{ if ((rebirth_moc_edq == 0) && (rebirth_moc_edq < 4)) { mes "[Continental Guard]"; mes "No commoners are allowed in the area beyond this point."; @@ -1063,15 +1064,15 @@ OnTouch: end; } -moc_fild20,354,174,3 duplicate(MocConGuard) Continental Guard#02 707,3,3 -moc_fild20,38,174,5 duplicate(MocConGuard) Continental Guard#03 707,3,3 -moc_fild20,38,183,5 duplicate(MocConGuard) Continental Guard#04 707,3,3 -moc_fild20,189,21,7 duplicate(MocConGuard) Continental Guard#05 707,3,3 -moc_fild20,200,21,7 duplicate(MocConGuard) Continental Guard#06 707,3,3 -moc_fild20,203,336,5 duplicate(MocConGuard) Continental Guard#07 707,3,3 -moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 707,3,3 +moc_fild20,354,174,3 duplicate(MocConGuard) Continental Guard#02 707 +moc_fild20,38,174,5 duplicate(MocConGuard) Continental Guard#03 707 +moc_fild20,38,183,5 duplicate(MocConGuard) Continental Guard#04 707 +moc_fild20,189,21,7 duplicate(MocConGuard) Continental Guard#05 707 +moc_fild20,200,21,7 duplicate(MocConGuard) Continental Guard#06 707 +moc_fild20,203,336,5 duplicate(MocConGuard) Continental Guard#07 707 +moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 707 -prontera,164,304,3 script Continental Messenger#01::ConMessenger 997,3,3,{ +prontera,164,304,3 script Continental Messenger#01::ConMessenger 997,{ set .@area$,strnpcinfo(2); if (.@area$ == "01") { set .@area$,"Prontera"; } else if (.@area$ == "02") { set .@area$,"Geffen"; } @@ -1156,10 +1157,10 @@ OnTouch: end; } -geffen,128,90,3 duplicate(ConMessenger) Continental Messenger#02 997,3,3 -payon,200,113,3 duplicate(ConMessenger) Continental Messenger#03 997,3,3 -alberta,127,64,3 duplicate(ConMessenger) Continental Messenger#04 998,3,3 -aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998,3,3 +geffen,128,90,3 duplicate(ConMessenger) Continental Messenger#02 997 +payon,200,113,3 duplicate(ConMessenger) Continental Messenger#03 997 +alberta,127,64,3 duplicate(ConMessenger) Continental Messenger#04 998 +aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998 morocc,176,103,3 script Continental Official 754,{ if (rebirth_moc_edq > 3) { diff --git a/npc/warps/cities/mid_camp.txt b/npc/warps/cities/mid_camp.txt index 7d7df9d2d..acdc9e04e 100644 --- a/npc/warps/cities/mid_camp.txt +++ b/npc/warps/cities/mid_camp.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,12 +11,15 @@ //===== Additional Comments: ================================= //= 1.0 First Version. //= 1.1 Fixed a small bug by brianlew, bugreport:1824 [Brainstorm] +//= 1.2 Corrected the observatory warp portal, thanks to Ziu. [brianluau] //============================================================ moc_fild22b,233,197,0 warp moc_fild22b1-1 1,1,mid_camp,210,290 mid_camp,210,293,0 warp moc_fild22b1-2 1,1,moc_fild22b,241,195 -mid_camp,205,211,0 warp mid_weapon1-1 1,1,mid_campin,222,111 -mid_campin,222,108,0 warp mid_weapon1-2 1,1,mid_camp,207,211 +mid_camp,205,211,0 warp mid_weapon1-1 1,1,mid_campin,230,124 +mid_campin,233,124,0 warp mid_weapon1-2 1,1,mid_camp,207,211 +mid_campin,222,108,0 warp mid_weapon1-3 1,1,mid_camp,198,205 +mid_camp,196,204,0 warp mid_weapon1-4 1,1,mid_campin,221,111 mid_camp,214,249,0 warp mid_meeting1-1 1,1,mid_campin,90,101 mid_campin,90,98,0 warp mid_meeting1-2 1,1,mid_camp,215,246 mid_campin,113,113,0 warp mid_meeting2-1 1,1,mid_campin,164,82 -- cgit v1.2.3-60-g2f50