From 6ff84c8bf9ff0023d1edbfa139d104740362f6d1 Mon Sep 17 00:00:00 2001 From: euphyy Date: Sat, 15 Dec 2012 21:06:35 +0000 Subject: * Updated Minstrel and Shadow Chaser job quests to their latest versions. * Fixed more Izlude RE coordinates (bugreport:6285). * Disabled "Fish Tails" NPC in El Dicastes quests until Izlude RE coordinates are found; also, fixed a small mistake. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17024 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/re/quests/eden/11-25.txt | 2 +- npc/re/quests/eden/26-40.txt | 2 +- npc/re/quests/eden/41-55.txt | 2 +- npc/re/quests/eden/56-70.txt | 2 +- npc/re/quests/eden/71-85.txt | 2 +- npc/re/quests/eden/86-90.txt | 2 +- npc/re/quests/eden/91-99.txt | 2 +- npc/re/quests/eden/eden_common.txt | 7 ++++--- npc/re/quests/eden/eden_quests.txt | 2 +- npc/re/quests/eden/eden_service.txt | 2 +- npc/re/quests/quests_dicastes.txt | 42 +++++++++++++++++++------------------ 11 files changed, 35 insertions(+), 32 deletions(-) (limited to 'npc/re/quests') diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index 43dd5e8cb..4e5d95a4d 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Mission [11 - 25] +//= Eden Group Quests - Mission [11 - 25] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index ec33d04f7..267cc0994 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Mission [26 - 40] +//= Eden Group Quests - Mission [26 - 40] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index 2f9ba31b7..dfa5e2df5 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Mission [41 - 55] +//= Eden Group Quests - Mission [41 - 55] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index b54b45382..79a6af3ec 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Mission [56 - 70] +//= Eden Group Quests - Mission [56 - 70] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index b6b94e81f..e1f9b17a9 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Mission [71 - 85] +//= Eden Group Quests - Mission [71 - 85] //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 19726d5ef..eea07144c 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Mission [86 - 90] +//= Eden Group Quests - Mission [86 - 90] //===== By: ================================================== //= Chilly //===== Current Version: ===================================== diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index 8b9c33279..2e7e7dd28 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Mission [91 - 99] +//= Eden Group Quests - Mission [91 - 99] //===== By: ================================================== //= Chilly //===== Current Version: ===================================== diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index 72c37ba72..1b05030c8 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -1,9 +1,9 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Common NPCs +//= Eden Group Quests - Common NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 1.3 Some little optimization here and there. [Masao] //= 1.4 Updated to match the new Izlude Map. [Masao] //= 1.5 Added some missing Eden Group Teleport Officers. [Masao] +//= 1.6 Added Izlude RE coordinates. [Euphy] //============================================================ moc_para01,27,35,5 script Secretary Lime Evenor 952,{ @@ -246,7 +247,7 @@ OnTouch: case 3: warp "geffen",120,39; end; case 4: warp "alberta",117,56; end; case 5: warp "aldebaran",168,112; end; - case 6: warp "izlude",127,142; end; + case 6: if (checkre(0)) warp "izlude",134,118; else warp "izlude",127,142; end; case 7: warp "prt_church",99,78; end; case 8: warp "geffen_in",162,99; end; case 9: warp "moc_prydb1",51,118; end; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 057566f76..a13375198 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quest - Quests NPCs +//= Eden Group Quest - Quests NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index fef7597ca..041395861 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -1,5 +1,5 @@ //===== rAthena Script ======================================= -// Eden Group Quests - Service NPCs +//= Eden Group Quests - Service NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index b4a942a03..ddc87b114 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Gennosuke Kouga, Muad_Dib //===== Current Version: ===================================== -//= 1.8 +//= 1.8a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -24,6 +24,7 @@ //= 1.6 Fixed missing checks for quest: Sapha's Visit. [Joseph] //= 1.7 Updated to match the official script. [Joseph] //= 1.8 Optimized and fixed invalid checkquest. [Joseph] +//= 1.8a Disabled "Fish Tails" until Izlude RE coordinates are found. [Euphy] //============================================================ // Entrance @@ -1026,7 +1027,7 @@ dic_in01,40,193,1 script Papyrus#0001 453,{ else if (.@doc == 11) eldicastes_dp(12169,"Stem","There is nothing like Midgard plants in Manuk.","These plants are used for food and medicine and some are even poisonous."); else if (.@doc == 12) eldicastes_dp(12170,"Pointed Scale","Stem from a bumpy life form. Research required as the usage is unknown.",""); else if (.@doc == 13) eldicastes_dp(12171,"Resin","Sap from an old tree collected and solidified. Very valuable in the human world.",""); - else if (.@doc == 14) eldicastes_dp(12174,"Fish Tail","Humans eat meat called fish.","Can be used as important food supply for foreign adventurers visiting in the city."); + //else if (.@doc == 14) eldicastes_dp(12174,"Fish Tail","Humans eat meat called fish.","Can be used as important food supply for foreign adventurers visiting in the city."); else if (.@doc == 15) eldicastes_dp(12175,"Worm Peeling","They say some Worm Peelings are valuable.","But this is based on the human's standard of value. Research required."); else if (.@doc == 16) eldicastes_dp(12176,"Gill","There are Midgard creatures that live in the sea and breathe through gills.","Further research on their ecology will be useful."); else if (.@doc == 17) eldicastes_dp(12177,"Tooth of Bat","Traces of a nocturnal creature unknown to Manuk. Not a strong creature from the size of its teeth.",""); @@ -1063,6 +1064,7 @@ dic_in01,40,193,1 script Papyrus#0001 453,{ else if (.@doc == 48) eldicastes_dp(12211,"Feather","Warm hair as soft as downy hair.","Must be used for cold protection. Collectable throughout Midgard."); else if (.@doc == 49) eldicastes_dp(12212,"Red Herb","Kind of medicinal red plant.","Humans use this to make recovery medicine. Plant worth researching."); else if (.@doc == 50) eldicastes_dp(12213,"Carrot","Red colored plant. Pub owner requests it all the time. Worth research.",""); + close; function eldicastes_dp { if (checkquest(getarg(0)) >= 0) { @@ -1087,24 +1089,24 @@ dic_in01,25,187,0 duplicate(Document Package#main) Document Package#0004 844 //============================================================ function script unknown_d { - if (checkquest(getarg(0)) == -1) { - mes "You see some traces of digging"; - close; - } - specialeffect2 310; - specialeffect2 830; - progressbar "ffff00",4; - erasequest getarg(0); - mes "You were able to find information on the Reptile Tongue"; - specialeffect2 18; - getitem getarg(1),rand(1,4); - if (!rand(2)) { - next; - mes "In addition, you've obtained an unknown relic to report back to the Saphas"; - specialeffect2 18; - getitem 6308,1; //Unidentified_Relic - } + if (checkquest(getarg(0)) == -1) { + mes "You see some traces of digging"; close; + } + specialeffect2 310; + specialeffect2 830; + progressbar "ffff00",4; + erasequest getarg(0); + mes "You were able to find information on the "+getitemname(getarg(1))+"."; + specialeffect2 18; + getitem getarg(1),rand(1,4); + if (!rand(2)) { + next; + mes "In addition, you've obtained an unknown relic to report back to the Saphas."; + specialeffect2 18; + getitem 6308,1; //Unidentified_Relic + } + close; } prt_fild09,371,255,0 script Reptile Tongues 844,{ unknown_d(12167,903); } prt_fild09,352,241,0 script Scorpion Tails 844,{ unknown_d(12168,904); } @@ -1113,7 +1115,7 @@ pay_fild02,105,113,0 script Pointed Scales 844,{ unknown_d(12170,906); } pay_fild01,152,171,0 script Resin 844,{ unknown_d(12171,907); } gef_fild01,104,111,0 script Spawn 844,{ unknown_d(12172,908); } prt_fild08,299,332,0 script Jellopy 844,{ unknown_d(12173,909); } -izlude,132,136,0 script Fish Tails 844,{ unknown_d(12174,1023); } +//izlude,132,136,0 script Fish Tails 844,{ unknown_d(12174,1023); } prt_fild05,303,169,0 script Worm Peelings 844,{ unknown_d(12175,955); } iz_dun03,155,165,0 script Gills 844,{ unknown_d(12176,956); } mjo_dun01,222,226,0 script Tooth of Bat 844,{ unknown_d(12177,913); } -- cgit v1.2.3-70-g09d2