diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/pre-re/scripts_warps.conf | 5 | ||||
| -rw-r--r-- | npc/re/jobs/3-1/archbishop.txt | 5 | ||||
| -rw-r--r-- | npc/re/jobs/3-1/guillotine_cross.txt | 114 | ||||
| -rw-r--r-- | npc/re/jobs/3-2/genetic.txt | 7 | ||||
| -rw-r--r-- | npc/re/quests/quests_lighthalzen.txt | 580 | ||||
| -rw-r--r-- | npc/re/quests/quests_malangdo.txt | 14 | ||||
| -rw-r--r-- | npc/re/scripts_warps.conf | 1 | ||||
| -rw-r--r-- | npc/re/warps/dungeons/iz_dun.txt | 20 | ||||
| -rw-r--r-- | npc/re/warps/other/jobquests.txt | 125 | ||||
| -rw-r--r-- | npc/re/warps/other/other.txt | 35 | ||||
| -rw-r--r-- | npc/scripts_warps.conf | 3 | ||||
| -rw-r--r-- | npc/warps/dungeons/iz_dun.txt (renamed from npc/pre-re/warps/dungeons/iz_dun.txt) | 0 | ||||
| -rw-r--r-- | npc/warps/other/jobquests.txt (renamed from npc/pre-re/warps/other/jobquests.txt) | 2 | ||||
| -rw-r--r-- | npc/warps/other/other.txt (renamed from npc/pre-re/warps/other/other.txt) | 0 |
14 files changed, 662 insertions, 249 deletions
diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf index ba5a4a8f6..50e87d0d9 100644 --- a/npc/pre-re/scripts_warps.conf +++ b/npc/pre-re/scripts_warps.conf @@ -7,9 +7,6 @@ npc: npc/pre-re/warps/cities/izlude.txt npc: npc/pre-re/warps/cities/rachel.txt npc: npc/pre-re/warps/cities/yggdrasil.txt -// -------------------------- Dungeons -------------------------- -npc: npc/pre-re/warps/dungeons/iz_dun.txt - // --------------------------- Fields --------------------------- npc: npc/pre-re/warps/fields/com_fild.txt npc: npc/pre-re/warps/fields/geffen_fild.txt @@ -23,6 +20,4 @@ npc: npc/pre-re/warps/fields/yuno_fild.txt // --------------------------- Others --------------------------- npc: npc/pre-re/warps/other/arena.txt -npc: npc/pre-re/warps/other/jobquests.txt -npc: npc/pre-re/warps/other/other.txt npc: npc/pre-re/warps/other/sign.txt diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index 0b61588d0..0da34bbe8 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -4,7 +4,7 @@ //= L0ne_W0lf //= Credits: Gepard //===== Current Version: ===================================== -//= 1.7 +//= 1.7a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -21,6 +21,7 @@ //= 1.5b More small fixes. [Euphy] //= 1.6 Fixed bugs where players unable to continue the quest. [Joseph] //= 1.7 Updated script, many bugs fixed. [Euphy] +//= 1.7a Moved warps to separate file. [Euphy] //============================================================ prt_church,103,88,3 script Praying Minister#arch 60,{ @@ -1623,8 +1624,6 @@ OnTouch: end; } -job3_arch01,29,24,0 warp #archout 1,1,odin_tem02,282,263 - odin_tem02,30,181,0 script #wherearch01 139,10,10,{ OnTouch: if (job_arch == 5) diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt index 6d5ef573f..8fe6512ac 100644 --- a/npc/re/jobs/3-1/guillotine_cross.txt +++ b/npc/re/jobs/3-1/guillotine_cross.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_Dib //===== Current Version: ===================================== -//= 1.0a +//= 1.0b //===== Compatible With: ===================================== //= rAthena SVN r16945+ //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 1.0 Adapted from original script. [Euphy] //= 1.0a Added 'npcskill' command. [Euphy] +//= 1.0b Moved warps to separate file. [Euphy] //============================================================ que_job01,75,96,3 script Guild Member#3rdgc01 997,{ @@ -140,75 +141,12 @@ que_job01,75,96,3 script Guild Member#3rdgc01 997,{ mes "Go to Veins and find a chapter."; mes "You can hear more details from there."; close; - } else if (job_3rd_gc > 3) { + } else { mes "[Ahcart]"; mes "Good luck to you."; close; - } else { //FIXME: What is this section for? - mes "[Ahcart]"; - mes "As you know, in the assassin guild, there are normal Assassins and Assassin Crosses."; - next; - mes "[Ahcart]"; - mes "But there is one more class that operates in darkness."; - mes "Members of that class are holding their power in check until they want to be revealed themselves."; - next; - mes "[Ahcart]"; - mes "Well, someday you will know about them."; - close; - } -} - -veins,257,256,0 warp #gate_to_guil01 1,1,job3_guil01,9,93 -job3_guil01,6,93,0 warp #gate_to_guil02 1,1,veins,254,255 -job3_guil01,18,48,0 warp #gate_to_guil03 1,1,job3_guil01,68,91 -job3_guil01,67,95,0 warp #gate_to_guil04 1,1,job3_guil01,18,53 -job3_guil01,80,77,0 script #gate_to_guil05 45,1,1,{ - end; -OnTouch: - if (job_3rd_gc > 3) - warp "job3_guil01",60,50; - else { - mes "[Daora]"; - mes "Hey, there!"; - mes "No trespassing!"; - close; - } - end; -} -job3_guil01,65,50,0 warp #gate_to_guil06 1,1,job3_guil01,83,77 -job3_guil01,51,55,0 script #gate_to_guil07 45,1,1,{ - end; -OnTouch: - if (job_3rd_gc == 4 || job_3rd_gc == 14 || job_3rd_gc > 17) - warp "job3_guil01",12,7; - else { - mes " [-----------------------------]"; - mes " No trespassing without "; - mes " permission. "; - mes " I'm not a "; - mes " generous person. "; - mes " - Mayshell "; - mes " [-----------------------------]"; - close; - } - end; -} -job3_guil01,11,4,0 warp #gate_to_guil08 1,1,job3_guil01,51,50 -job3_guil01,51,44,0 script #gate_to_guil09 45,1,1,{ - end; -OnTouch: - if (job_3rd_gc == 11 || job_3rd_gc == 12) - warp "job3_guil01",79,23; - else if (job_3rd_gc > 19) - warp "job3_guil01",144,57; - else { - mes "You don't have anything to do."; - close; } - end; } -job3_guil01,79,27,0 warp #gate_to_guil10 1,1,job3_guil01,51,50 -job3_guil01,143,61,0 warp #gate_to_guil11 1,1,job3_guil01,51,50 function script func_3rdgc { set .@n$, "["+strcharinfo(0)+"]"; @@ -3823,6 +3761,52 @@ L_Info: return; } +// Warp Portals +//============================================================ +job3_guil01,80,77,0 script #gate_to_guil05 45,1,1,{ + end; +OnTouch: + if (job_3rd_gc > 3) + warp "job3_guil01",60,50; + else { + mes "[Daora]"; + mes "Hey, there!"; + mes "No trespassing!"; + close; + } + end; +} +job3_guil01,51,55,0 script #gate_to_guil07 45,1,1,{ + end; +OnTouch: + if (job_3rd_gc == 4 || job_3rd_gc == 14 || job_3rd_gc > 17) + warp "job3_guil01",12,7; + else { + mes " [-----------------------------]"; + mes " No trespassing without "; + mes " permission. "; + mes " I'm not a "; + mes " generous person. "; + mes " - Mayshell "; + mes " [-----------------------------]"; + close; + } + end; +} +job3_guil01,51,44,0 script #gate_to_guil09 45,1,1,{ + end; +OnTouch: + if (job_3rd_gc == 11 || job_3rd_gc == 12) + warp "job3_guil01",79,23; + else if (job_3rd_gc > 19) + warp "job3_guil01",144,57; + else { + mes "You don't have anything to do."; + close; + } + end; +} + /* job3_guil02,1,3,0 script #GMhelper01_gc 844,{ mes "What can I do for you?"; diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index 9375fc4ea..1d0d8cbe9 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Muad_Dib, Aeomin //===== Current Version: ===================================== -//= 1.3 +//= 1.3a //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -14,6 +14,7 @@ //= 1.1 Fixed Scatter Stuff NPCs [JayPee]. //= 1.2 Updated dialogue. Credits to Muad_Dib. [Joseph] //= 1.3 Updated script, optimized. [Euphy] +//= 1.3a Moved warps to separate file. [Euphy] //============================================================ alde_alche,35,186,5 script Alchemist Union Member 805,{ @@ -1016,10 +1017,6 @@ OnTouch: close; } -job3_gen01,7,59,0 warp #from1to2gen 1,1,job3_gen01,72,52 -job3_gen01,71,56,0 warp #from2to1gen 1,1,job3_gen01,11,60 -lighthalzen,52,132,0 warp #lighttogen 1,1,job3_gen01,45,50 -job3_gen01,49,49,0 warp #gentolight 1,1,lighthalzen,54,132 job3_gen01,24,32,0 script The gaze of Devries 139,2,2,{ OnTouch: if (checkquest(2223,HUNTING) == 2) { diff --git a/npc/re/quests/quests_lighthalzen.txt b/npc/re/quests/quests_lighthalzen.txt index 09d92bef4..0d637a8f2 100644 --- a/npc/re/quests/quests_lighthalzen.txt +++ b/npc/re/quests/quests_lighthalzen.txt @@ -1,15 +1,591 @@ //===== rAthena Script ======================================= //= Quest NPCs located in Lighthalzen //===== By: ================================================== -//= Daegaladh, Masao +//= Ziu, Heris (translation) //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Quests related to Lighthalzen City. //===== Additional Comments: ================================= //= 1.0 Updated to match the new Izlude Map. [Masao] +//= 1.1 Added Somatology Laboratory F4 quest. [Euphy] //============================================================ +// Renewal split [Daegaladh] +//============================================================ izlude,171,73,6 duplicate(Scamp) Scamp#2 853 + +// Somatology Laboratory F4 +//============================================================ +lighthalzen,303,304,5 script Jerome Jameson#start 904,{ + if (lhz_dun04 == 0) { + mes "[Jerome Jameson]"; + mes "Wow, what a "+((Sex)?"strong man!":"beautiful dame!"); + next; + mes "[Jerome Jameson]"; + mes ((Sex)?"Sir":"Ma'am")+", please take heed -- as soon"; + mes "as a dangerous rumor aroused about"; + mes "the endangerment of everyone in"; + mes "town, the best thing to do is lock"; + mes "your doors."; + + // To do: check BaseLevel requirement. + if (BaseLevel < 90 || hg_tre < 54) close; + + next; + select("Dangerous rumor?"); + mes "[Jerome Jameson]"; + mes "Strong rumors have been heard from"; + mes "Rekenber Investigation Institute"; + mes "about terrible, secret experiments"; + mes "with human beings!"; + next; + select("What? Experiments?"); + mes "[Jerome Jameson]"; + mes "Yes. Biological experiments!!"; + mes "Experiments with human beings"; + mes "conducted in the undergrounds of"; + mes "these very slums. Apparently, they"; + mes "have spread the rumors upon being"; + mes "denied of social benefits."; + next; + mes "[Jerome Jameson]"; + mes "This rumor cannot go about"; + mes "unhandled. The biological"; + mes "experiments that have been carried"; + mes "out in this place can be real."; + mes "This really needs to be"; + mes "investigated, and soon!"; + setquest 5109; + set lhz_dun04,1; + close; + } + mes "[Jerome Jameson]"; + mes "Please investigate the deeper"; + mes "parts of the laboratory. I hope"; + mes "to hear from you soon."; + close; +} + +// Is this the correct behavior? (limited and conflicting sources) +// -- iRO: lhz_dun03 warps directly to que_lhz. +// -- Ziu: NPC in lhz_dun04 warps into que_lhz. +function script lhz4enter { + if (getmapusers("que_lhz") == 0 && mobcount("que_lhz","#controllhz4::OnMyMobDead") < 1) { + if (getarg(0) == 0) { + mes "- Having Jerome Jameson's orders"; + mes "in mind, you hold your breath and"; + mes "descend the flooded flight of"; + mes "stairs. -"; + } else { + mes "[Researcher]"; + mes "Who are you?"; + mes "................"; + emotion e_omg; + next; + mes "The man runs away and you go after him."; + } + if (lhz_dun04 > 1) { + changequest 5110,5109; + set lhz_dun04,1; + } + close2; + // Check twice because of 'next'. + if (getmapusers("que_lhz") == 0 && mobcount("que_lhz","#controllhz4::OnMyMobDead") < 1) { + donpcevent "#lhz4mes1::OnEnable"; + warp "que_lhz",244,52; + } + end; + } + mes "Right now there are other people inside. Wait for your turn."; + close; +} + +lhz_dun03,239,77,0 script #warplhz3lhz4 45,1,1,{ +OnTouch: + if (lhz_dun04 == 0) { + mes "It doesn't make sense to go down these flooded stairs."; + close; + } else if (lhz_dun04 < 6) { + callfunc "lhz4enter",0; + end; + } + warp "lhz_dun04",244,52; + end; +} +lhz_dun04,245,61,0 warp #warplhz4lhz3 1,1,lhz_dun03,240,74 + +// Does this portal exist? +que_lhz,245,61,0 warp #warplhzqlhz3 1,1,lhz_dun03,240,74 + +que_lhz,244,52,0 script #lhz4mes1 -1,2,2,{ +OnTouch: + mes "- You find another flight of"; + mes "stairs that is raised and deviates"; + mes "from the flooded path. -"; + // Missing dialogue. + close2; + donpcevent "#lhz4mes1::OnDisable"; + end; +OnInit: +OnDisable: + disablenpc "#lhz4mes1"; + end; +OnEnable: + enablenpc "#lhz4mes1"; + end; +} + +lhz_dun04,151,276,3 script Researcher#lhz4 865,{ + if (lhz_dun04 == 0) { + mes "[Researcher]"; + mes "................"; + close; + } else if (lhz_dun04 < 6) { + callfunc "lhz4enter",1; + end; + } else if (lhz_dun04 == 6) { + mes "Think twice before saying that these samples are a reason to shut this place down."; + next; + mes "["+strcharinfo(0)+"]"; + mes "You're stopping me for doing nothing good? What about the last four men I've created?"; + next; + mes "[Wolfchev]"; + mes "Hmm. This place will be completely flooded..."; + next; + mes "[Wolfchev]"; + mes "What is the problem?"; + next; + mes "[Wolfchev]"; + mes "Hmm... All this burocracy is ruining my laboratory. For God's sake!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hey! Wolfchev!!"; + next; + mes "[Wolfchev]"; + mes "Oh yes? To please them all! ^FF0080The different specimen^000000 are organically connected to each other."; + next; + mes "[Wolfchev]"; + mes "Perhaps the boss of these ^00FF00things^000000..."; + mes "My inability to control my own experiment... Here, are all the ^808000slaves used as decoys^000000 and the laboratory will be shut down."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hey, Wolfchev!! This ^00FF00boss^000000 you're talking about. Where is it?"; + next; + mes "[Wolfchev]"; + mes "...in my laboratory. I awakened it. I tried to use it to destroy them all, but it didn't work... you'll have to do it..."; + next; + mes "["+strcharinfo(0)+"]"; + mes "How can I get access to your laboratory?"; + next; + mes "[Wolfchev]"; + mes "Now... One moment!"; + mes "I will help you."; + next; + mes "[Wolfchev]"; + mes "Luckily, the boss hasn't awaken sober, though he's still strong and destructive."; + next; + mes "[Wolfchev]"; + mes "But it's still dangerous. He wil release his colleagues and this means we don't have much time here."; + set lhz_dun04,7; + completequest 5111; + setquest 5113; + setquest 5114; + setquest 5115; + setquest 5116; + setquest 5117; + setquest 5118; + setquest 5119; + setquest 5120; + setquest 5121; + setquest 5122; + setquest 5123; + setquest 5124; + setquest 5125; + close; + } else if (lhz_dun04 == 7) { + mes "[Wolfchev]"; + mes "Are you going alone?"; + mes "You will need a really good group to bypass the system and defeat the boss."; + close; + } + end; +} + +que_lhz,207,75,3 script Researcher#ins 865,3,3,{ +OnTouch: + if (lhz_dun04 == 1) { + mes "[Researcher]"; + mes ".........."; + next; + mes "["+strcharinfo(0)+"]"; + mes "You! Are you professor Wolfchev?"; + emotion e_omg,1; + next; + mes "[Wolfchev]"; + mes "Many people come here looking for me. But most of them are reluctant to."; + mes "What do you want?"; + emotion e_gg; + next; + mes "["+strcharinfo(0)+"]"; + mes "I've heard rumors about biological experiments."; + mes "Wolfchev!!"; + next; + mes "["+strcharinfo(0)+"]"; + mes "These experiments..."; + next; + mes "[Wolfchev]"; + mes "I think I know what you're gonna say. Are you accusing me of something?"; + mes "I don't want to hear more of that."; + mes "You better leave."; + emotion e_gg; + next; + mes "[Wolfchev]"; + mes "They seem to have cried for a long time... I'm busy, excuse me!"; + next; + mes "From Wolfchev's eyes tears welled and he started laughing before running away."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Hey! Wolfchev there..."; + emotion e_omg,1; + changequest 5109,5110; + set lhz_dun04,2; + close2; + warp "que_lhz",96,136; + end; + } + mes "[Researcher]"; + mes ".........."; + close; +} + +que_lhz,94,119,3 script Researcher#ins2 865,{ + if (lhz_dun04 == 2) { + mes "[Wolfchev]"; + mes "Hehehe. You are really persistent. What do you want from someone like me?"; + emotion e_swt2; + next; + mes "["+strcharinfo(0)+"]"; + mes "Wolfchev... You've admitted it's dangerous already. And all these investigations..."; + next; + mes "[Wolfchev]"; + mes "You're right...hehe."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Your research is too dangerous. Do you think everybody wants it to keep going?"; + next; + mes "[Wolfchev]"; + mes "Everyone wants to be strong and dominate the others. Have their obedience, respect and attention. Don't you want that? Hehe."; + emotion e_gg; + next; + mes "["+strcharinfo(0)+"]"; + mes "... ... ..."; + next; + mes "[Wolfchev]"; + mes "With such a dangerous life, avoiding being damaged... Don't you see it?. Hehe."; + next; + mes "Again, Wolfchev hastily escapes."; + next; + mes "["+strcharinfo(0)+"]"; + mes "Oh! He's far... and..."; + set lhz_dun04,3; + close2; + warp "que_lhz",148,215; + end; + } + mes "[Researcher]"; + mes ".........."; + close; +} +que_lhz,147,224,3 script Researcher#ins3 865,{ + if (lhz_dun04 == 4 || mobcount("que_lhz","#controllhz4::OnMyMobDead") > 0) { + mes "[Wolfchev]"; + mes "Wolfchev is freaking out. He is of his mind."; + emotion e_turn; + close; + } else if (lhz_dun04 == 3) { + mes "[Wolfchev]"; + mes "You really are a bothersome little"; + mes "tick, aren't you? Isn't that"; + mes "apparent to you at all?"; + next; + mes "["+strcharinfo(0)+"]"; + mes "... ... ..."; + emotion e_dots,1; + next; + mes "Wolfchev didn't want to talk to you anymore, so while laughing he pressed a button on his hand. Then he went mad."; + specialeffect EF_SIGHTRASHER; + next; + mes "[Wolfchev]"; + mes "Unfortunately to you, I will beat you here."; + donpcevent "#controllhz4::OnEnable"; + next; + mes "[Wolfchev]"; + mes "You're such a fool."; + emotion e_gasp; + next; + mes "[Wolfchev]"; + mes "Look at all these experimental bodies you'll have to deal and see how good they are."; + next; + donpcevent "#controllhz4::OnEnable2"; + progressbar "ffff00",6; + set lhz_dun04,4; + next; + mes "[Wolfchev]"; + mes "NO!! ...Look what you did!! You"; + mes "wreckless madman!!!"; + emotion e_omg; + next; + mes "[Wolfchev]"; + mes "Go back!"; + next; + mes "First, let's destroy all these experiments!"; + close; + } else if (lhz_dun04 == 5) { + mes "Wolfchev is freaking out. He is out of his mind."; + next; + mes "["+strcharinfo(0)+"]"; + mes "*Slaps Face* Hey, snap out of it!"; + mes "We've destroyed them!"; + specialeffect EF_STUNATTACK; + sleep2 1000; + specialeffect EF_STUNATTACK; + next; + mes "["+strcharinfo(0)+"]"; + mes "Let's get out of here first! Is there a place we can go?"; + specialeffect EF_DARKBREATH; + emotion e_no,1; + next; + mes "[Wolfchev]"; + mes "This. My laboratory... My laboratory..."; + next; + mes "["+strcharinfo(0)+"]"; + mes "The laboratory? Where am I indeed?"; + next; + mes "[Wolfchev]"; + mes "Back to the beggining... here's when..."; + next; + mes "- Wolfchev weakly points to the 12 o' clock direction. -"; + next; + mes "I have to go to ^0000FF Wolfchev's Laboratory^000000..."; + changequest 5110,5111; + set lhz_dun04,6; + donpcevent "#controllhz4d::OnEnable"; + close; + } else if (lhz_dun04 == 6) { + mes "I have to go to ^0000FF Wolfchev's Laboratory^000000..."; + close; + } + end; +} + +- script Awake Specimen#lhz -1,{ + end; +OnInit: +OnDisable: + hideonnpc strnpcinfo(0); + end; +OnEnable: + hideoffnpc strnpcinfo(0); + end; +OnEffect1: + specialeffect EF_SUI_EXPLOSION; + end; +OnEffect2: + specialeffect EF_BEGINASURA; + end; +OnEffect3: + specialeffect EF_FLASHER; + end; +} +que_lhz,148,231,0 duplicate(Awake Specimen#lhz) Awake Specimen#0 2244 +que_lhz,140,231,1 duplicate(Awake Specimen#lhz) Awake Specimen#1 2244 +que_lhz,140,224,2 duplicate(Awake Specimen#lhz) Awake Specimen#2 2244 +que_lhz,140,216,3 duplicate(Awake Specimen#lhz) Awake Specimen#3 2244 +que_lhz,147,216,4 duplicate(Awake Specimen#lhz) Awake Specimen#4 2244 +que_lhz,155,216,5 duplicate(Awake Specimen#lhz) Awake Specimen#5 2244 +que_lhz,155,224,6 duplicate(Awake Specimen#lhz) Awake Specimen#6 2244 +que_lhz,155,231,7 duplicate(Awake Specimen#lhz) Awake Specimen#7 2244 + +- script #controllhz4 -1,{ +OnInit: + disablenpc "#controllhz4"; + end; +OnEnable: + enablenpc "#controllhz4"; + donpcevent "Awake Specimen#0::OnEnable"; + donpcevent "Awake Specimen#1::OnEnable"; + donpcevent "Awake Specimen#2::OnEnable"; + donpcevent "Awake Specimen#3::OnEnable"; + donpcevent "Awake Specimen#4::OnEnable"; + donpcevent "Awake Specimen#5::OnEnable"; + donpcevent "Awake Specimen#6::OnEnable"; + donpcevent "Awake Specimen#7::OnEnable"; + end; +OnEnable2: + initnpctimer; + end; +OnTimer1000: + donpcevent "Awake Specimen#0::OnEffect1"; + end; +OnTimer2000: + donpcevent "Awake Specimen#0::OnEffect2"; + donpcevent "Awake Specimen#7::OnEffect1"; + end; +OnTimer3000: + donpcevent "Awake Specimen#7::OnEffect2"; + donpcevent "Awake Specimen#6::OnEffect1"; + end; +OnTimer4000: + donpcevent "Awake Specimen#6::OnEffect2"; + donpcevent "Awake Specimen#5::OnEffect1"; + end; +OnTimer5000: + donpcevent "Awake Specimen#5::OnEffect2"; + donpcevent "Awake Specimen#4::OnEffect1"; + end; +OnTimer6000: + donpcevent "Awake Specimen#4::OnEffect2"; + donpcevent "Awake Specimen#3::OnEffect1"; + end; +OnTimer7000: + donpcevent "Awake Specimen#3::OnEffect2"; + donpcevent "Awake Specimen#2::OnEffect1"; + end; +OnTimer8000: + donpcevent "Awake Specimen#2::OnEffect2"; + donpcevent "Awake Specimen#1::OnEffect1"; + end; +OnTimer9000: + donpcevent "Awake Specimen#1::OnEffect2"; + end; +OnTimer11000: + donpcevent "Awake Specimen#0::OnEffect3"; + donpcevent "Awake Specimen#1::OnEffect3"; + donpcevent "Awake Specimen#2::OnEffect3"; + donpcevent "Awake Specimen#3::OnEffect3"; + donpcevent "Awake Specimen#4::OnEffect3"; + donpcevent "Awake Specimen#5::OnEffect3"; + donpcevent "Awake Specimen#6::OnEffect3"; + donpcevent "Awake Specimen#7::OnEffect3"; + end; +OnTimer14000: + donpcevent "Awake Specimen#0::OnDisable"; + donpcevent "Awake Specimen#1::OnDisable"; + donpcevent "Awake Specimen#2::OnDisable"; + donpcevent "Awake Specimen#3::OnDisable"; + donpcevent "Awake Specimen#4::OnDisable"; + donpcevent "Awake Specimen#5::OnDisable"; + donpcevent "Awake Specimen#6::OnDisable"; + donpcevent "Awake Specimen#7::OnDisable"; + end; +OnTimer16000: + monster "que_lhz",148,231,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead"; + monster "que_lhz",140,231,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead"; + monster "que_lhz",140,224,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead"; + monster "que_lhz",140,216,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead"; + monster "que_lhz",147,216,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead"; + monster "que_lhz",155,216,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead"; + monster "que_lhz",155,224,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead"; + monster "que_lhz",155,231,"Awake Specimen",2244,1,"#controllhz4::OnMyMobDead"; + donpcevent "#controllhz4b::OnEnable"; + stopnpctimer; + end; +OnMyMobDead: + if (mobcount("que_lhz","#controllhz4::OnMyMobDead") < 1) { + donpcevent "#controllhz4b::OnStop"; + donpcevent "#controllhz4c::OnEnable"; + disablenpc "#controllhz4"; + end; + } + end; +} + +- script #controllhz4b -1,{ +OnInit: +OnDisable: + disablenpc "#controllhz4b"; + end; +OnEnable: + enablenpc "#controllhz4b"; + initnpctimer; + end; +OnStop: + stopnpctimer; + donpcevent "#controllhz4b::OnDisable"; + end; +OnTimer400000: + killmonster "que_lhz","#controllhz4::OnMyMobDead"; + mapwarp "que_lhz","lighthalzen",263,200; + disablenpc "#controllhz4"; + disablenpc "#controllhz4b"; + stopnpctimer; + end; +} + +- script #controllhz4c -1,{ +OnInit: + disablenpc "#controllhz4c"; + end; +OnEnable: + enablenpc "#controllhz4c"; + initnpctimer; + end; +OnTimer10000: + mapannounce "que_lhz","Whisper of a man: Help me... Please... Aaah... I don't want to... Die....",bc_map,0x0080C0; + donpcevent "#controllhz4d::OnEnable"; + stopnpctimer; + disablenpc "#controllhz4c"; + end; +} + +que_lhz,147,248,0 script #controllhz4d -1,6,4,{ +OnTouch: + if (lhz_dun04 == 4) { + mes "Looks like it's all done."; + set lhz_dun04,5; + donpcevent "#controllhz4d::OnDisable"; + close; + } else if (lhz_dun04 == 6) { + mes "- Concrete falls from the ceiling"; + mes "due to the weakened structure of"; + mes "the lab and you tumble down the"; + mes "flight of stairs avoiding it. -"; + close2; + warp "lhz_dun04",148,269; + donpcevent "#lhz4mes2::OnEnable"; + donpcevent "#controllhz4d::OnDisable"; + end; + } + end; +OnInit: +OnDisable: + disablenpc "#controllhz4d"; + end; +OnEnable: + enablenpc "#controllhz4d"; + end; +} + +lhz_dun04,148,269,0 script #lhz4mes2 -1,2,2,{ +OnTouch: + if (lhz_dun04 == 6) { + heal -Hp/2,0; // To do: check HP value. + mes "- You awaken injured, hearing the"; + mes "sounds of footsteps all around"; + mes "you... -"; + close2; + donpcevent "#lhz4mes2::OnDisable"; + end; + } + end; +OnInit: +OnDisable: + disablenpc "#lhz4mes2"; + end; +OnEnable: + enablenpc "#lhz4mes2"; + end; +} diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt index fb9cb7591..685da8b24 100644 --- a/npc/re/quests/quests_malangdo.txt +++ b/npc/re/quests/quests_malangdo.txt @@ -715,19 +715,17 @@ malangdo,137,200,6 script Pipielle 549,{ mes "^770099This cat is working on something, she asks for help above LV60.^000000"; close; } - set .@fish_ss1, "What are you doing??"; + set .@fish_ss1$, "What are you doing??"; if (countitem(6451) > 29) - set .@fish_ss2, "I caught a lot of strange fishes!"; - else { - set .@fish_num, 30-countitem(6451); //Unknown_Fish - set .@fish_ss2, "Remaining " + .@fish_num + " of ^bbbbbbUnidentified Fish are required.^000000"; - } + set .@fish_ss2$, "I caught a lot of strange fishes!"; + else + set .@fish_ss2$, "Remaining " + (30-countitem(6451)) + " of ^bbbbbbUnidentified Fish are required.^000000"; if (ma_tomas == 100) - set .@fish_ss3, "I met a Admiral Thomas..."; + set .@fish_ss3$, "I met an Admiral Thomas..."; mes "[Pipielle]"; mes "Would you come here and open your bag for me?"; next; - switch(select(.@fish_ss1,.@fish_ss2,.@fish_ss3)) { + switch(select(.@fish_ss1$,.@fish_ss2$,.@fish_ss3$)) { case 1: mes "[Pipielle]"; mes "There are many beautiful fishes around here. So I feel my heard beating when I standing here."; diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf index ff4c10975..f0b95a462 100644 --- a/npc/re/scripts_warps.conf +++ b/npc/re/scripts_warps.conf @@ -35,7 +35,6 @@ npc: npc/re/warps/fields/yuno_fild.txt // --------------------------- Others --------------------------- npc: npc/re/warps/other/jobquests.txt -npc: npc/re/warps/other/other.txt npc: npc/re/warps/other/paradise.txt npc: npc/re/warps/other/s_workshop.txt npc: npc/re/warps/other/sign.txt diff --git a/npc/re/warps/dungeons/iz_dun.txt b/npc/re/warps/dungeons/iz_dun.txt index ee31f73dd..b912f62e1 100644 --- a/npc/re/warps/dungeons/iz_dun.txt +++ b/npc/re/warps/dungeons/iz_dun.txt @@ -1,32 +1,18 @@ //===== rAthena Script ======================================= -//= Izlude Dungeon Warp Script +//= Izlude Dungeon Renewal Warp Script //===== By: ================================================== //= Athena (1.0) //= Nana (1.1) //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Warp Points for Bibilyn Island & Undersea Cave //===== Additional Comments: ================================= -//= No comment! +//= 1.2 Moved common warps to base path. [Euphy] //============================================================ -//= Bibilyn Island =========================================== -izlu2dun,108,83,0 warp izd01 3,2,iz_dun00,168,168 - //= Undersea Cave ============================================ -iz_dun00,168,173,0 warp izd01-1 3,3,izlu2dun,108,88 -iz_dun00,352,342,0 warp izd02 5,2,iz_dun01,253,252 -iz_dun00,39,41,0 warp izd03 5,2,iz_dun01,41,37 -iz_dun01,118,170,0 warp izd04 5,2,iz_dun02,236,204 -iz_dun01,253,258,0 warp izd02-1 2,2,iz_dun00,352,337 -iz_dun01,41,32,0 warp izd03-1 2,2,iz_dun00,39,46 -iz_dun02,236,198,0 warp izd04-1 5,3,iz_dun01,118,165 -iz_dun02,339,331,0 warp izd05 2,2,iz_dun03,32,63 -iz_dun03,264,245,0 warp izd06 1,2,iz_dun04,26,27 -iz_dun03,29,63,0 warp izd05-1 2,2,iz_dun02,339,328 -iz_dun04,26,24,0 warp izd06-1 2,2,iz_dun03,261,245 iz_dun04,129,233,0 warp izd07 2,2,iz_dun05,141,187 iz_dun05,141,190,0 warp izd07-1 2,2,iz_dun04,129,230 diff --git a/npc/re/warps/other/jobquests.txt b/npc/re/warps/other/jobquests.txt index fc922f819..5dec2077c 100644 --- a/npc/re/warps/other/jobquests.txt +++ b/npc/re/warps/other/jobquests.txt @@ -1,129 +1,42 @@ //===== rAthena Script ======================================= -//= Job Quest Warp Script +//= Job Quest Renewal Warp Script //===== By: ================================================== //= Athena (1.0) //===== Current Version: ===================================== -//= 2.1 +//= 2.2 //===== Compatible With: ===================================== //= Any Athena Version; RO Version Ep4+ //===== Description: ========================================= //= Warp Points for Job Quest Maps //===== Additional Comments: ================================= -//= Split off npc_warp.txt -//= Commented some warps because new Job quests have correct -//= ones! Added missing warps for Thief/Hunter/Swordman [Lupus] -//= 1.3 Added missing warps Swordman [Lupus] -//= Reorganized. Added complete rogue quest warps. -//= Removed unused, duplicate warps. [kobra_k88] -//= 1.3b activated Dancer JQ warp [Lupus] -//= 1.4 Imported damn noobie warps from jAthena (because it's broken since last year) -//= 1.5 Replaced clone maps with the real ones [Lupus] -//= 1.6 removed swordman quest map warps. They are now contained in the swordman quest. [L0ne_W0lf] -//= 1.7 Updated some 2-2 job quest related warps. [L0ne_W0lf] -//= 1.8 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] -//= 1.9 Added Gungslinger and Ninja warps. [L0ne_W0lf] -//= 2.0 Updated Novice warps to use correct maps. [L0ne_W0lf] //= 2.1 Added one Shadow Chaser job warp. [Euphy] +//= 2.2 Moved common warps to base path, added warps. [Euphy] //============================================================ - -//============================================================================== -//Novice -//============================================================================== -new_1-1,148,112,0 warp newwarp6001 2,2,new_1-2,100,9 -new_1-2,100,6,0 warp newwarp6002 2,2,new_1-1,144,112 -new_1-2,126,106,0 warp newwarp6003 2,2,new_1-2,160,171 -new_1-2,156,171,0 warp newwarp6004 2,2,new_1-2,123,106 -new_1-2,73,106,0 warp newwarp6005 2,2,new_1-2,41,172 -new_1-2,46,172,0 warp newwarp6006 2,2,new_1-2,78,106 - -//============================================================================== -//Thief -//============================================================================== -job_thief1,180,15,0 warp jthf 7,1,moc_ruins,145,117 - - -//============================================================================== -// Assassin -//============================================================================== -in_moc_16,18,8,0 warp guild_to_16 2,2,moc_fild16,205,291 -moc_fild16,205,296,0 warp 16_to_guild 2,2,in_moc_16,18,11 - -//============================================================================== -// Hunter -//============================================================================== -in_hunter,100,15,0 warp jhun01 0,0,pay_fild10,143,250 - -//============================================================================== -// Monk (St. Capitolina Abbey) -//============================================================================== -prt_monk,192,172,0 warp monk15 1,1,monk_test,329,50 -monk_test,329,47,0 warp monk16 1,1,prt_monk,193,166 -monk_test,329,76,0 warp monk17 1,1,monk_test,259,118 -monk_test,259,115,0 warp monk18 1,1,monk_test,329,71 -monk_test,272,125,0 warp monk19 1,1,monk_test,301,127 -monk_test,298,127,0 warp monk20 1,1,monk_test,268,125 - -//============================================================================== -//Alchemist -//============================================================================== -aldebaran,65,53,0 warp alche#1 1,1,alde_alche,20,175 -aldebaran,53,65,0 warp alche#2 1,1,alde_alche,42,175 -alde_alche,19,171,0 warp alche#1-1 1,1,aldebaran,68,56 -alde_alche,42,171,0 warp alche#1-2 1,1,aldebaran,56,68 -alde_alche,41,186,0 warp alche#1F_2F 1,1,alde_alche,113,178 -alde_alche,114,183,0 warp alche#2F_1F 1,1,alde_alche,42,182 -alde_alche,13,184,0 warp alche#1F_B1 1,1,alde_alche,88,113 -alde_alche,88,117,0 warp alche#B1_1F 1,1,alde_alche,13,181 -alde_alche,46,104,0 warp alche#B1_r1 1,1,alde_alche,157,17 -alde_alche,160,17,0 warp alche#r1_b1 1,1,alde_alche,50,103 -alde_alche,46,77,0 warp alche#B1_r2 1,1,alde_alche,88,17 -alde_alche,93,17,0 warp alche#r2_b1 1,1,alde_alche,50,77 -alde_alche,89,62,0 warp alche#B1_r3 1,1,alde_alche,17,23 -alde_alche,17,29,0 warp alche#r3_b1 1,1,alde_alche,89,67 -alde_alche,133,77,0 warp alche#B1_r4 1,1,alde_alche,162,107 -alde_alche,158,107,0 warp alche#r4_b1 1,1,alde_alche,129,77 -alde_alche,133,103,0 warp alche#B1_r5 1,1,alde_alche,164,164 -alde_alche,158,163,0 warp alche#r5_b1 1,1,alde_alche,129,103 - -//============================================================================== -//Rogue -//============================================================================== -cmd_fild07,193,117,0 warp fild07-rogue00 1,1,in_rogue,379,46 -in_rogue,375,46,0 warp rogue00-fild07 1,1,cmd_fild07,196,117 -in_rogue,375,34,0 warp rogue01-02 1,1,in_rogue,380,125 -in_rogue,375,125,0 warp rogue02-01 1,1,in_rogue,379,33 -cmd_fild07,355,286,0 warp fild07-rogue03 1,1,in_rogue,247,126 -in_rogue,247,122,0 warp rogue03-fild07 1,1,cmd_fild07,349,285 -in_rogue,244,21,0 warp rogue04-fild09 1,1,cmd_fild09,106,191 -in_rogue,172,34,0 warp rogue05-fild09 1,1,cmd_fild09,341,143 -in_rogue,161,103,0 warp rogue06-fild04 1,1,cmd_fild04,302,177 -in_rogue,8,9,0 warp stair_to_ro 1,1,in_rogue,389,389 - //============================================================================== -//Dancer +//Arch Bishop //============================================================================== -job_duncer,69,43,0 warp duncer1 1,1,comodo,185,156 +job3_arch01,29,24,0 warp #archout 1,1,odin_tem02,282,263 //============================================================================== -//Gunslinger +//Guillotine Cross //============================================================================== -einbroch,136,199,0 warp gswarp1 1,1,que_ng,138,167 -que_ng,130,166,0 warp gswarp2 1,1,einbroch,130,197 -que_ng,178,162,0 warp gswarp3 1,1,que_ng,172,86 -que_ng,166,85,0 warp gswarp4 1,1,que_ng,182,161 -que_ng,165,137,0 warp gswarp5 1,1,que_ng,177,41 -que_ng,172,42,0 warp gswarp6 1,1,que_ng,160,139 +veins,257,256,0 warp #gate_to_guil01 1,1,job3_guil01,9,93 +job3_guil01,6,93,0 warp #gate_to_guil02 1,1,veins,254,255 +job3_guil01,18,48,0 warp #gate_to_guil03 1,1,job3_guil01,68,91 +job3_guil01,67,95,0 warp #gate_to_guil04 1,1,job3_guil01,18,53 +job3_guil01,65,50,0 warp #gate_to_guil06 1,1,job3_guil01,83,77 +job3_guil01,11,4,0 warp #gate_to_guil08 1,1,job3_guil01,51,50 +job3_guil01,79,27,0 warp #gate_to_guil10 1,1,job3_guil01,51,50 +job3_guil01,143,61,0 warp #gate_to_guil11 1,1,job3_guil01,51,50 //============================================================================== -//Ninja +//Genetic //============================================================================== -amatsu,149,140,0 warp ninja01 1,1,que_ng,20,142 -que_ng,20,138,0 warp ninja02 1,1,amatsu,147,136 -que_ng,10,183,0 warp ninja03 1,1,que_ng,33,64 -que_ng,37,64,0 warp ninja04 1,1,que_ng,15,182 -que_ng,30,37,0 warp ninja05 1,1,que_ng,67,28 -que_ng,63,30,0 warp ninja06 1,1,que_ng,25,37 +lighthalzen,52,132,0 warp #lighttogen 1,1,job3_gen01,45,50 +job3_gen01,49,49,0 warp #gentolight 1,1,lighthalzen,54,132 +job3_gen01,7,59,0 warp #from1to2gen 1,1,job3_gen01,72,52 +job3_gen01,71,56,0 warp #from2to1gen 1,1,job3_gen01,11,60 //============================================================================== //Shadow Chaser diff --git a/npc/re/warps/other/other.txt b/npc/re/warps/other/other.txt deleted file mode 100644 index 011494794..000000000 --- a/npc/re/warps/other/other.txt +++ /dev/null @@ -1,35 +0,0 @@ -//===== rAthena Script ======================================= -//= Other Warp Script -//===== By: ================================================== -//= Athena (1.0) -//===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= Any Athena Version; -//===== Description: ========================================= -//= Warp Points for Other Maps -//===== Additional Comments: ================================= -//= Split off npc_warp.txt -//============================================================ - -//guild_room,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs1,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs1,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs1,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs1,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs2,50,88,0 warp warp4 0,0,hoge,0,0 -//guild_vs2,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs2,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs2,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs3,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs3,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs3,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs3,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs4,7,50,0 warp warp4 0,0,hoge,0,0 -//guild_vs4,50,7,0 warp warp4 0,0,hoge,0,0 -//guild_vs4,92,50,0 warp warp4 0,0,hoge,0,0 -//guild_vs4,50,92,0 warp warp4 0,0,hoge,0,0 -//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 -//guild_vs5,0,0,0 warp warp4 0,0,hoge,0,0 diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf index 9b32ecd3d..53366d75d 100644 --- a/npc/scripts_warps.conf +++ b/npc/scripts_warps.conf @@ -43,6 +43,7 @@ npc: npc/warps/dungeons/gef_dun.txt npc: npc/warps/dungeons/gon_dun.txt npc: npc/warps/dungeons/ice_dun.txt npc: npc/warps/dungeons/in_sphinx.txt +npc: npc/warps/dungeons/iz_dun.txt npc: npc/warps/dungeons/juperos.txt npc: npc/warps/dungeons/kh_dun.txt npc: npc/warps/dungeons/lhz_dun.txt @@ -81,6 +82,8 @@ npc: npc/warps/fields/umbala_fild.txt npc: npc/warps/other/airplane.txt npc: npc/warps/other/bossnia.txt npc: npc/warps/other/god.txt +npc: npc/warps/other/jobquests.txt npc: npc/warps/other/kiel.txt +npc: npc/warps/other/other.txt npc: npc/warps/guildcastles.txt npc: npc/warps/pvp.txt diff --git a/npc/pre-re/warps/dungeons/iz_dun.txt b/npc/warps/dungeons/iz_dun.txt index 0ccc42db9..0ccc42db9 100644 --- a/npc/pre-re/warps/dungeons/iz_dun.txt +++ b/npc/warps/dungeons/iz_dun.txt diff --git a/npc/pre-re/warps/other/jobquests.txt b/npc/warps/other/jobquests.txt index 5b1b5c227..e3c36ab51 100644 --- a/npc/pre-re/warps/other/jobquests.txt +++ b/npc/warps/other/jobquests.txt @@ -25,7 +25,6 @@ //= 2.0 Updated Novice warps to use correct maps. [L0ne_W0lf] //============================================================ - //============================================================================== //Novice //============================================================================== @@ -41,7 +40,6 @@ new_1-2,46,172,0 warp newwarp6006 2,2,new_1-2,78,106 //============================================================================== job_thief1,180,15,0 warp jthf 7,1,moc_ruins,145,117 - //============================================================================== // Assassin //============================================================================== diff --git a/npc/pre-re/warps/other/other.txt b/npc/warps/other/other.txt index 011494794..011494794 100644 --- a/npc/pre-re/warps/other/other.txt +++ b/npc/warps/other/other.txt |