diff options
Diffstat (limited to 'npc')
-rw-r--r-- | npc/mapflag/nomemo.txt | 5 | ||||
-rw-r--r-- | npc/mapflag/noteleport.txt | 5 | ||||
-rw-r--r-- | npc/re/other/dimensional_gap.txt | 550 | ||||
-rw-r--r-- | npc/re/quests/eden/100-110.txt | 4 | ||||
-rw-r--r-- | npc/re/quests/eden/11-25.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/111-120.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/121-130.txt | 4 | ||||
-rw-r--r-- | npc/re/quests/eden/131-140.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/26-40.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/41-55.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/56-70.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/71-85.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/86-90.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/91-99.txt | 2 | ||||
-rw-r--r-- | npc/re/quests/eden/eden_common.txt | 28 | ||||
-rw-r--r-- | npc/re/quests/eden/eden_quests.txt | 24 | ||||
-rw-r--r-- | npc/re/quests/eden/eden_service.txt | 2 | ||||
-rw-r--r-- | npc/re/scripts.conf | 1 | ||||
-rw-r--r-- | npc/re/scripts_warps.conf | 1 | ||||
-rw-r--r-- | npc/re/warps/cities/izlude.txt | 28 | ||||
-rw-r--r-- | npc/re/warps/other/dimensional_gap.txt | 79 |
21 files changed, 704 insertions, 45 deletions
diff --git a/npc/mapflag/nomemo.txt b/npc/mapflag/nomemo.txt index d93552429..a0dd66e9d 100644 --- a/npc/mapflag/nomemo.txt +++ b/npc/mapflag/nomemo.txt @@ -17,6 +17,7 @@ //= Copyright (C) L0ne_W0lf //= Copyright (C) Samuray22 //= Copyright (C) Lupus +//= Copyright (C) Nova //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -33,7 +34,7 @@ //========================================================================= //= Mapflag: Disable Warp Portal memory. //================= Current Version ======================================= -//= 1.8.2 +//= 1.8.3 //================= Description =========================================== //= Prevents players from using /memo on a map. //= Also disables marriage warp skills. @@ -783,6 +784,8 @@ ecl_tdun04 mapflag nomemo ecl_hub01 mapflag nomemo moc_prydn1 mapflag nomemo moc_prydn2 mapflag nomemo +dali mapflag nomemo +dali02 mapflag nomemo c_tower2_ mapflag nomemo c_tower3_ mapflag nomemo gl_chyard_ mapflag nomemo diff --git a/npc/mapflag/noteleport.txt b/npc/mapflag/noteleport.txt index 1e1ffb739..8b1109ef1 100644 --- a/npc/mapflag/noteleport.txt +++ b/npc/mapflag/noteleport.txt @@ -13,6 +13,7 @@ //= Copyright (C) rAthena Dev Team //= Copyright (C) eAthena Dev Team //= Copyright (C) Lupus +//= Copyright (C) Nova //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -29,7 +30,7 @@ //========================================================================= //= Mapflag: Disable teleportation. //================= Current Version ======================================= -//= 1.6a +//= 1.6.2 //================= Description =========================================== //= Disables all means of teleportation within a map. //= Script commands 'warp', 'areawarp', 'warpchar', @@ -451,6 +452,8 @@ ecl_in04 mapflag noteleport 1@ecl mapflag noteleport 1@ecl mapflag monster_noteleport ecl_hub01 mapflag noteleport +dali mapflag noteleport +dali02 mapflag noteleport //Orc's Memory =================== 1@orcs mapflag noteleport diff --git a/npc/re/other/dimensional_gap.txt b/npc/re/other/dimensional_gap.txt new file mode 100644 index 000000000..b303f14b7 --- /dev/null +++ b/npc/re/other/dimensional_gap.txt @@ -0,0 +1,550 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2016 Hercules Dev Team +//= Copyright (C) 2016 Ridley +//= Copyright (C) 2016 Nova +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Dimensional Gap NPCs +//================= Description =========================================== +//= The Dimensional Gap, or Dimensional Crack, is an opening into the +//= vacuum of time and space that separates dimensions. +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +mid_camp,207,290,6 script Expedition Guide#01 4_M_EIN_SOLDIER,{ + mes("[Expedition Guide]"); + mes("Are you going to enter the ^0000FFDimensional Gap^000000? Please use this Transport Device you see here."); + next(); + if (select("What is the Dimensional Gap?", "End Conversation.") == 2) { + mes("[Expedition Guide]"); + mes("Take care."); + close(); + } + mes("[Expedition Guide]"); + mes("As you know we've already entered through the Dimensional Rift to get to Ash Vacuum right? The Dimensional Gap is an expansion of that initial discovery."); + next(); + mes("[Expedition Guide]"); + mes("A member of the Expedition team found these backdoor passages to get through the Dimensional Rifts."); + next(); + mes("[Expedition Guide]"); + mes("This is like a Rune Midgard Alliance version of the Bifrost bridge so it can connect us to different parts of the New World."); + next(); + mes("[Expedition Guide]"); + mes("Time and space is distorted in the Dimensional Gap. Not all passageways have been discovered so please be sure to use caution when entering an unverified area."); + next(); + mes("[Expedition Guide]"); + mes("Anyone who has become lost here has yet to return."); + close(); +} + +mid_camp,212,290,4 script Expedition Guide#02 4_M_EIN_SOLDIER,{ + mes("[Expedition Guide]"); + mes("Please use a ^0000FFTransport Device^000000 if you wish to travel through the dimensional rift. The insides have not been fully explored yet so please be careful in there."); + close(); +} + +moc_fild22b,225,198,6 duplicate(Expedition Guide#01) Expedition Guide#03 4_M_MOC_SOLDIER +moc_fild22b,223,203,4 duplicate(Expedition Guide#02) Expedition Guide#04 4_M_MOC_SOLDIER +bif_fild01,314,155,6 duplicate(Expedition Guide#01) Expedition Guide#05 4_M_EIN_SOLDIER +bif_fild01,320,154,4 duplicate(Expedition Guide#02) Expedition Guide#06 4_M_EIN_SOLDIER +dic_fild02,236,33,6 duplicate(Expedition Guide#01) Expedition Guide#07 4_M_EIN_SOLDIER +dic_fild02,239,36,4 duplicate(Expedition Guide#02) Expedition Guide#08 4_M_EIN_SOLDIER + +dali,137,87,4 script Allied Forces Soldier 4_M_MOCASS1,{ + mes("[Allied Forces Soldier]"); + mes("This dimensional rift is connected to the Allied Forces ^0000FFExpedition Camp^000000 in Jotunheim."); + next(); + mes("[Allied Forces Soldier]"); + mes("Do not worry, it has been set up after testing hundreds of experiments for safe teleportation."); + close(); +} + +dali,122,60,4 script Morroc Soldier 4_M_MOC_SOLDIER,{ + mes("[Morroc Soldier]"); + mes("This dimensional rift is connected to ^0000FFMorroc^000000 back in Rune Midgard."); + next(); + mes("[Morroc Soldier]"); + mes("This is the fastest gateway back to our world. The area is still destroyed but restoration efforts will soon be on the way."); + close(); +} + +dali,51,104,6 script Spledide Soldier 4_M_FAIRYSOLDIER2,{ + mes("[Spledide Soldier]"); + mes("This dimensional rift is connected to the south of ^0000FFBifrost^000000. It enables quick travel to the Splendide frontline."); + next(); + mes("[Spledide Soldier]"); + mes("If we use it properly, it enables us to advance more easily to the capital of the Sapha."); + next(); + mes("[Spledide Soldier]"); + mes("The Mayor has asked us to cooperate as best we can instead of fighting, so I'm under orders not to do anything. Since we have a common enemy we won't fight the Sapha... for now..."); + close(); +} + +dali,56,126,4 script Dispatched Sapha 4_MAN_BENKUNI,{ + mes("[Dispatched Sapha]"); + mes("This dimensional rift is connected to the southern area of the ^0000FFKamidal Mountains^000000 in El Dicastes. I just dropped by for my research, but it is incredible."); + next(); + mes("[Dispatched Sapha]"); + mes("Moreover it is next to the Laphine capital..... Hmm... Do not worry, I do not want to fight in such a place."); + close(); +} + +dali,109,94,4 trader Sundries Merchant 4_M_MERCAT2,{ +OnInit: + sellitem Spectacles; + sellitem Arrow; + sellitem Booby_Trap; + end; +} + +dali,112,95,4 script Logistics Manager 4_M_MERCAT2,{ + mes("[Logistics Manager]"); + mes("Welcome. I am in charge of logistics to take care of your items in this weird place. Do you need to access your storage?"); + next(); + if (select("Open Storage 200 Zeny.", "No Thanks.") == 2) { + mes("[Logistics Manager]"); + mes("Let me know if you change your mind."); + close(); + } + if (basicskillcheck() && getskilllv(NV_BASIC) < 6) { + mes("[Logistics Manager]"); + mes("You are not yet qualified to use the Storage."); + } else if (Zeny < 200) { + mes("[Logistics Manager]"); + mes("You need at least 200 zeny to use the Storage."); + } else { + Zeny -= 200; + openstorage(); + } + close(); +} + +dali,115,85,5 script Party Leader#dali 2_M_SWORDMASTER,{ + if (.dalichatactive) + end; + initnpctimer(); + .dalichatactive = 1; + end; +OnTimer10: + npctalk(_("Attention!!!"), "Party Leader#dali"); + end; +OnTimer2000: + npctalk(_("Here, here. Everybody be quiet and line up!"), "Party Leader#dali"); + end; +OnTimer3000: + npctalk(_("We have now entered the inside of the Dimensional Crack. Where should be go first?"), "Party Leader#dali"); + end; +OnTimer4000: + npctalk(_("Anyone has an opinion?"), "Party Leader#dali"); + end; +OnTimer6000: + npctalk(_("I heard rumors about some magic swordman. Let's go find him."), "Party Member#MONK"); + end; +OnTimer7500: + npctalk(_("We heard about a magic competition being held here!"), "Party Member#WANDERER"); + end; +OnTimer9000: + npctalk(_("Where is it?!"), "Party Member#MONK"); + end; +OnTimer10500: + npctalk(_("Uh, I'm a little bit hungry... I wonder if anybody is selling some warm sweet potatoes or even dumplings..."), "Party Member#CRU"); + end; +OnTimer12000: + npctalk(_("You want to eat again?"), "Party Member#GUILL"); + end; +OnTimer13500: + npctalk(_("I am just wondering about the tournament.."), "Party Member#WANDERER"); + end; +OnTimer15000: + npctalk(_("I need to eat something before doing anything."), "Party Member#CRU"); + end; +OnTimer16500: + npctalk(_("By the way, I also heard about something called the Devil's Tower."), "Party Member#MONK"); + end; +OnTimer18000: + npctalk(_("I just saw a street trader passing by... Where is he?"), "Party Member#GUILL"); + end; +OnTimer19500: + emotion(e_yawn, 0, "Party Member#SURA"); + npctalk(_("Huh? What is this? You still haven't entered?"), "Party Member#SURA"); + end; +OnTimer20000: + npctalk(_("I am curious about the Faceworms I heard about from a Laphine."), "Party Member#MONK"); + end; +OnTimer21000: + npctalk(_("Can I come back after having a meal?"), "Party Member#CRU"); + end; +OnTimer22500: + npctalk(_("Can you even catch that?"), "Party Member#WANDERER"); + npctalk(_("Are you awake?"), "Party Member#SHADOW"); + end; +OnTimer24000: + emotion(e_an, 0, "Party Member#SURA"); + npctalk(_("Why are you still here?"), "Party Member#SURA"); + end; +OnTimer24500: + npctalk(_("Hang on a bit. The merchant is going to pass by soon."), "Party Member#GUILL"); + end; +OnTimer25500: + npctalk(_("That is your wish...."), "Party Member#MONK"); + end; +OnTimer27000: + npctalk(_("I want to buy cold grape juice~"), "Party Member#CRU"); + end; +OnTimer28500: + npctalk(_("I have no idea. There might be an accident up front."), "Party Member#SHADOW"); + end; +OnTimer30000: + npctalk(_("What? How dare you?!"), "Party Member#WANDERER"); + end; +OnTimer31500: + npctalk(_("Give me a sip of juice."), "Party Member#GUILL"); + end; +OnTimer32000: + npctalk(_("Cough~ Cough~"), "Party Member#EINOLD"); + end; +OnTimer33000: + emotion(e_an, 0, "Party Member#SURA"); + end; +OnTimer34000: + npctalk(_("Damn! I am pissed off! I came here because I heard only a party is allowed to get in!"), "Party Member#SURA"); + end; +OnTimer36000: + npctalk(_("Are you going to hit me? Do it!"), "Party Member#MONK"); + emotion(e_ag, 0, "Party Member#MONK"); + npctalk(_("You pay for your food."), "Party Member#CRU"); + end; +OnTimer37500: + emotion(e_an, 0, "Party Member#SURA"); + end; +OnTimer39000: + npctalk(_("Whatever, I'm not eating."), "Party Member#WANDERER"); + npctalk(_("So mean.. I won't eat then."), "Party Member#GUILL"); + npctalk(_("Right.. I should have entered with another group!"), "Party Member#SHADOW"); + end; +OnTimer40500: + emotion(e_gg, 0, "Party Member#CRU"); + npctalk(_("Hey. Are you pissed off?"), "Party Member#CRU"); + end; +OnTimer42000: + npctalk(_("Not at all."), "Party Member#GUILL"); + end; +OnTimer43500: + emotion(e_gg, 0, "Party Member#MONK"); + npctalk(_("Look at him snoozing. Hehe."), "Party Member#MONK"); + end; +OnTimer45000: + emotion(e_yawn, 0, "Party Member#SURA"); + npctalk(_("Bah, I don't care. I'm gonna take a nap, so wake me up when we're ready."), "Party Member#SURA"); + end; +OnTimer46500: + emotion(e_gg, 0, "Party Member#CRU"); + npctalk(_("You are upset!!"), "Party Member#CRU"); + npctalk(_("Can I get back before I die..."), "Party Member#WANDERER"); + npctalk(_("What? You, we gotta talk! I've been too nice to you!"), "Party Member#EINOLD"); + end; +OnTimer48000: + npctalk(_("Excuse me..... everyone.............?"), "Party Leader#dali"); + end; +OnTimer49500: + emotion(e_ag, 0, "Party Member#GUILL"); + npctalk(_("No!!!!!!!!!"), "Party Member#GUILL"); + npctalk(_("Whatever~"), "Party Member#MONK"); + end; +OnTimer51000: + emotion(e_sob, 0, "Party Leader#dali"); + npctalk(_("Please listen to me...."), "Party Leader#dali"); + npctalk(_("He's angry all right...."), "Party Member#WANDERER"); + npctalk(_("Take a nap. I am sleepy too, so we'll take shifts."), "Party Member#SHADOW"); + end; +OnTimer52500: + .dalichatactive = 0; + stopnpctimer(); + end; +} + +dali,117,81,7 script Party Member#WANDERER 4_F_WANDERER,{ + end; +} + +dali,117,79,5 script Party Member#CRU 4_F_CRU,{ + end; +} + +dali,118,83,3 script Party Member#MONK 4_F_MONK,{ + end; +} + +dali,119,76,7 script Party Member#SHADOW 4_F_SHADOWCHASER,{ + end; +} + +dali,119,78,2 script Party Member#GUILL 4_M_JPNOJI,{ + end; +} + +dali,120,77,4 script Party Member#SURA 4_F_SURA,{ + end; +} + +dali,120,81,3 script Party Member#EINOLD 4_M_EINOLD,{ + end; +} + +dali,102,83,5 script Merchant Prince#HUMERC 4_M_HUMERCHANT,2,2,{ + mes("[Prince Canet]"); + mes("Who're you?"); + next(); + mes("[Prince Canet]"); + mes("What do you want? You looking something in particular?"); + next(); + mes("[Prince Canet]"); + mes("So some enforcers have been cracking down on merchants lately. I can not sell anything."); + next(); + mes("[Prince Canet]"); + mes("Come here..."); + next(); + mes("[Jumpy Knight]"); + mes("I knew you would be here!! No illegal trading is allowed here! Don't you know?"); + hideoffnpc("Jumpy Knight#JP_RUN"); + next(); + mes("[Prince Canet]"); + mes("Says who?"); + next(); + mes("[Jumpy Knight]"); + mes("Ok, then show me your permit."); + next(); + mes("[Prince Canet]"); + mes("Permit\r" + "No one's in charge here!"); + next(); + mes("[Prince Canet]"); + mes("You! If you need anything come to me ok?"); + next(); + mes("[Jumpy Knight]"); + mes("I will catch you!"); + hideonnpc("Merchant Prince#HUMERC"); + close2(); + hideonnpc("Jumpy Knight#JP_RUN"); + enablenpc("Merchant Prince#HUMERC2"); + hideoffnpc("Merchant Prince#HUMERC2"); + disablenpc("Merchant Prince#HUMERC"); + end; + +OnTouch: + mes("[Prince Canet]"); + mes("Cold juice!\r" + "Apple, grape, orange~\r" + "Anything you want!"); + next(); + mes("[Prince Canet]"); + mes("Sweet potato, dumpling~\r" + "Here we have delicious desserts~"); + close(); +} + +dali,105,82,1 script Jumpy Knight#JP_RUN 4_M_JP_RUN,{ + end; + +OnInit: + hideonnpc("Jumpy Knight#JP_RUN"); + end; +} + +dali,63,112,7 script Merchant Prince#HUMERC2 4_M_HUMERCHANT,2,2,{ + mes("[Prince Canet]"); + mes("You need to pay a toll to get past here."); + next(); + select("What toll?"); + mes("[Prince Canet]"); + mes("You did not know?\r" + "500 zeny"); + next(); + mes("[Jumpy Knight]"); + mes("You there! Stop right there!"); + hideoffnpc("Jumpy Knight#JP_RUN2"); + next(); + mes("[Prince Canet]"); + mes("Ugh! How are you always following me? Got some kind of crush on me or something? I don't think you and I make a good match..."); + next(); + mes("[Jumpy Knight]"); + mes("Why don't we find out then?"); + next(); + mes("[Prince Canet]"); + mes("That's it no more talking.\r" + "I'm outta here~"); + next(); + mes("[Jumpy Knight]"); + mes("Keep running you sneaky coward!"); + hideonnpc("Merchant Prince#HUMERC2"); + close2(); + hideonnpc("Jumpy Knight#JP_RUN2"); + hideoffnpc("Merchant Prince#HUMERC3"); + disablenpc("Merchant Prince#HUMERC2"); + end; + +OnInit: + disablenpc("Merchant Prince#HUMERC2"); + end; +OnTouch: + mes("[Prince Canet]"); + mes("500 zeny"); + close(); +} + +dali,67,113,3 script Jumpy Knight#JP_RUN2 4_M_JP_RUN,{ + end; + +OnInit: + hideonnpc("Jumpy Knight#JP_RUN2"); + end; +} + +dali,89,97,3 script Merchant Prince#HUMERC3 4_M_HUMERCHANT,{ + mes("[Prince Canet]"); + mes("You are lucky that you have met up with me.\r" + "Who am I?\r" + "I'm here to become a merchant King."); + next(); + mes("[Prince Canet]"); + mes("I might be working a street stall now but I'll have an actual shop some day."); + next(); + mes("[Prince Canet]"); + mes("It's my first day so I'm having a major sale."); + next(); + mes("[Prince Canet]"); + mes("Let's see I've got a... Ring of something! Sword of stuff! A backpack of some sort!"); + next(); + mes("[Prince Canet]"); + mes("Tell me if you need anything,"); + hideoffnpc("Jumpy Knight#JP_RUN3"); + next(); + mes("[Prince Canet]"); + mes("What are you doing here? This is my spot for a shop Get outta my turf!"); + next(); + mes("[Jumpy Knight]"); + mes("Bah!!\r" + "You're gonna regret those words!"); + next(); + mes("[Prince Canet]"); + mes("I'm shaking..."); + hideonnpc("Merchant Prince#HUMERC3"); + close2(); + hideonnpc("Jumpy Knight#JP_RUN3"); + enablenpc("Merchant Prince#HUMERC"); + hideoffnpc("Merchant Prince#HUMERC"); + end; + +OnInit: + hideonnpc("Merchant Prince#HUMERC3"); + end; +} + +dali,89,94,7 script Jumpy Knight#JP_RUN3 4_M_JP_RUN,{ + end; + +OnInit: + hideonnpc("Jumpy Knight#JP_RUN3"); + end; +} + +dali02,58,123,3 script Curious Knight#KY_KNT 4_M_KY_KNT,{ + mes("[Curious Knight]"); + mes("The Royal Guard in here was desperate for help. We entered through a secret place in the palace."); + next(); + mes("[Curious Knight]"); + mes("We were whisked away here... No idea where I am but I have to establish a base here for the Knighthood."); + close(); +} + +dali02,51,112,5 script Confused Thief#DST_SOL 4_DST_SOLDIER,{ + mes("[Confused Thief]"); + mes("One minute I'm in a bar... The next minute I'm here... What is this place?"); + next(); + mes("[Confused Thief]"); + mes("There's no night or day in here. Hmm, something has to be valuable in this place..."); + close(); +} + +dali02,65,115,5 script Adventurous Rafflesia#ra 4_M_RAFLE_GR,{ + mes("[Adventurous Rafflesia]"); + mes("No no this has to be Thanatos Tower... I sense dark magic here."); + next(); + mes("[Guide]"); + mes("Oh, we're back here again. I cannot find a way out! We are trapped in this maze!"); + next(); + mes("[Tourist]"); + mes("Is this place the famous Prontera? It is dark just like a big city!"); + next(); + mes("[Traveller]"); + mes("I hear a ticking clock. This place must be Geffen!"); + close(); +} + +dali02,68,117,5 script Guide#ra 4_M_RAFLE_GR,{ + mes("[Guide]"); + mes("Oh, we're back here again. I cannot find a way out! We are trapped in this maze!"); + next(); + mes("[Tourist]"); + mes("Is this place the famous Prontera It is dark just like a big city!"); + next(); + mes("[Traveller]"); + mes("I hear a ticking clock. This place must be Geffen!"); + next(); + mes("[Adventurous Rafflesia]"); + mes("No no this has to be Thanatos Tower... I sense dark magic here."); + close(); +} + +dali02,65,119,5 script Tourist#ra 4_M_RAFLE_GR,{ + mes("[Tourist]"); + mes("Is this place the famous Prontera? It is dark just like a big city!"); + next(); + mes("[Adventurous Rafflesia]"); + mes("No no this has to be Thanatos Tower... I sense dark magic here."); + next(); + mes("[Guide]"); + mes("Oh, we're back here again. I cannot find a way out! We are trapped in this maze!"); + next(); + mes("[Traveller]"); + mes("I hear a ticking clock. This place must be Geffen!"); + close(); +} + +dali02,69,122,5 script Traveller#ra 4_M_RAFLE_GR,{ + mes("[Traveller]"); + mes("I hear a ticking clock. This place must be Geffen!"); + next(); + mes("[Guide]"); + mes("Oh, we're back here again. I cannot find a way out! We are trapped in this maze!"); + next(); + mes("[Tourist]"); + mes("Is this place the famous Prontera? It is dark just like a big city!"); + next(); + mes("[Adventurous Rafflesia]"); + mes("No no this has to be Thanatos Tower... I sense dark magic here."); + close(); +} diff --git a/npc/re/quests/eden/100-110.txt b/npc/re/quests/eden/100-110.txt index 2ea72a2d1..3cc47f6ef 100644 --- a/npc/re/quests/eden/100-110.txt +++ b/npc/re/quests/eden/100-110.txt @@ -52,7 +52,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ end; } mes "[Gelkah]"; - if (!countitem(Para_Team_Mark)) { + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { mes "- You need to have an -"; mes "- ^4d4dff'Eden Group Mark'^000000 -"; mes "- to receive these missions. -"; @@ -1047,7 +1047,7 @@ S_Hunting: moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{ mes "[Rohtert]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { cutin "rote01",2; mes "You are not even a member of Eden Group. What are you doing here?"; mes "I'm only dealing with base level ^FF0000100 - 110^000000 adventurers."; diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index 361d6a2e3..f65ad9090 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -35,7 +35,7 @@ //========================================================================= moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "- You need to have an -"; mes "- ^4d4dff'Eden Group Mark'^000000 -"; mes "- to receive these missions. -"; diff --git a/npc/re/quests/eden/111-120.txt b/npc/re/quests/eden/111-120.txt index f133ca85f..4422c92c7 100644 --- a/npc/re/quests/eden/111-120.txt +++ b/npc/re/quests/eden/111-120.txt @@ -41,7 +41,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ mes "[Mingmin]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { cutin "min02",0; mes "A stranger. This place is supposed to be for Eden Group Members only."; mes "I'm in need base level ^FF0000111 - 120^000000 adventurers to help my research."; diff --git a/npc/re/quests/eden/121-130.txt b/npc/re/quests/eden/121-130.txt index 32fbdeb26..d48c71702 100644 --- a/npc/re/quests/eden/121-130.txt +++ b/npc/re/quests/eden/121-130.txt @@ -41,7 +41,7 @@ moc_para01,44,81,3 script Melody-Jack#1 4_M_MELODY,8,8,{ mes "[Melody-Jack]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { mes "Who the hell are you? Get out of here!"; mes "I'm only talking to base level ^FF0000121-130^000000 adventurers."; } @@ -582,7 +582,7 @@ OnTouch: moc_para01,17,77,5 script Aigu#1 4_F_IU,{ mes "[Aigu]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { mes "Oh, why aren't you a part of Eden Group?"; mes "I'm only talking to base level ^FF0000121-130^000000 adventurers."; } diff --git a/npc/re/quests/eden/131-140.txt b/npc/re/quests/eden/131-140.txt index 806466624..fa6061b42 100644 --- a/npc/re/quests/eden/131-140.txt +++ b/npc/re/quests/eden/131-140.txt @@ -42,7 +42,7 @@ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{ cutin "ragi01",0; mes "[Ragi]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { mes "Only adventurers from Eden Group are welcome here."; mes "I'm giving requests to base level ^FF0000130-140^000000 adventurers only."; } diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index c80f1c2c8..3a3068a5c 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -35,7 +35,7 @@ //========================================================================= moc_para01,38,38,3 script Mission [26 - 40] 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "You are not a qualified member. You can not use the bulletin board."; close; } diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index a13db78f8..b7d95aa71 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -35,7 +35,7 @@ //========================================================================= moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "You are not an Eden group member. You are not qualified to access the bulletin board."; close; } diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index 741e6af89..c6aeb8c15 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -36,7 +36,7 @@ //========================================================================= moc_para01,42,38,3 script Mission [56 - 70] 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "To get these missions, I need to Join the Eden Group first. I must find Secretary Lime Evenor and become a member."; close; } diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index f2bd68b6f..31f51871d 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -35,7 +35,7 @@ //========================================================================= moc_para01,44,38,3 script Mission [71 - 85] 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "- Only members of the -"; mes "- Eden Group can read -"; mes "- this bulletin board. -"; diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 029a482ad..394970944 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -41,7 +41,7 @@ //========================================================================= moc_para01,48,175,3 script 86-90 Mission Board 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "Wait a minute!"; mes "-You need to have an-"; mes "-^4d4dff'Eden Group Mark'^000000-"; diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index 2c86f6091..328cc4474 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -41,7 +41,7 @@ //========================================================================= moc_para01,48,177,3 script 91-99 Mission Board 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "Wait a minute!"; mes "-You need to have an-"; mes "-^4d4dff'Eden Group Mark'^000000-"; diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index f07ebb2ad..9085cad91 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -44,6 +44,26 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ mes "- after you loose some weight. -"; close; } + if (countitem(Para_Team_Mark) > 0) { + mes "[Lime Evenor]"; + mes "Thanks to many adventurers visiting our Eden Group, we've recently prepared a new version of Eden Group Mark for our visitors."; + mes "And it is also possible to exchange old version of Eden Group Mark into a new one."; + next; + mes "[Lime Evenor]"; + mes "Though it has a slight time delay, this new version of Eden Group Mark will send you back to current saved location."; + mes "Would you like to exchange yours?"; + next; + if (select("Sure", "I'm good.") == 2){ + mes "[Lime Evenor]"; + mes "What possible reason would you have... to not exchange?"; + close; + } + delitem Para_Team_Mark,1; + getitem Para_Team_Mark_,1; + mes "[Lime Evenor]"; + mes "There you go. Come back again~"; + close; + } mes "[Lime Evenor]"; mes "People who follow their dreams and romances listen to me. We are representatives of the paradise called 'The garden of Eden' called the Eden group . There is no place like this anywhere."; mes "Hello. Can I help you?"; @@ -67,7 +87,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ next; break; case 2: - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "[Lime Evenor]"; mes "You can be a Eden's member by simply registering with me."; mes "Would you like to join Eden Group?"; @@ -106,7 +126,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ next; mes "[Lime Evenor]"; mes "Hopefully you can do great work as an Eden's member."; - getitem Para_Team_Mark,1; + getitem Para_Team_Mark_,1; next; break; case 2: @@ -179,7 +199,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ } break; case 4: - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Lime Evenor]"; mes "Would like to try some missions as an Eden member?"; next; @@ -306,7 +326,7 @@ OnTouch: } moc_para01,47,39,3 script #warp_2_pass HIDDEN_NPC,{ - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Lime Evenor]"; mes "Oh, it is an exclusive place only for Eden's members."; mes "If you are a member, you can come whenever you want!"; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 4e472d1af..f58c3ed5a 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -37,7 +37,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{ mes "[Boya]"; - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "You are not in my group are you?"; mes "I don't have anything to say to outsiders."; mes "If you want something register with my group."; @@ -839,7 +839,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ mes "Not a wolf."; mes "I wasn't a dog originally..."; next; - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Talking Dog]"; mes "Anyway are you a Eden Group member?"; mes "Oh good to see you."; @@ -1047,7 +1047,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ if (para_suv01 < 13) { - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Karl]"; mes "Hey, how are you?"; mes "Good to see you~"; @@ -1190,7 +1190,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ if (para_suv01 < 17) { - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Cloud]"; mes "Oops."; mes "You are a member of my group."; @@ -1380,7 +1380,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ if (para_suv01 < 24) { - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Hooksha]"; mes "Unbelievable why did you come here?"; mes "Um... You are not on the third step of the training?"; @@ -1649,7 +1649,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{ if (para_suv01 < 33) { - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Callandiva]"; mes "How did you get so deep in this ocean city?"; mes "Ah, that symbol is of our group."; @@ -2243,7 +2243,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "Ah, Kim-dduck-soon."; mes "It's the representative meal for normal citizens."; next; - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { if (Zeny > 2699) { mes "[Chef]"; mes "Hey, here you are."; @@ -2282,7 +2282,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "Course meal B?"; mes "This food with meat and vegetables in hot soup has it's origins from nomadic life under the cold and dry nature."; next; - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { if (Zeny > 3599) { mes "[Chef]"; mes "Hey, here you are."; @@ -2317,7 +2317,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "How many times do I have to tell you?"; close; case 4: - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { if (Zeny > 4499) { mes "[Chef]"; mes "Hey, here you are."; @@ -2360,7 +2360,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ close; } case 2: - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Chef]"; mes "Most jobs should be managed by yourself. So it might be difficult, right?"; mes "Actually it's harmful so they have requested continuously."; @@ -2469,7 +2469,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ moc_para01,23,35,5 script Instructor Ur#2nd01 4_M_KNIGHT_BLACK,{ mes "[Instructor Ur]"; - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "Hey there!"; mes "I see you're not one of our agents?"; mes "Are you interested in joining us?"; @@ -3740,7 +3740,7 @@ moc_para01,111,83,3 script Blacksmith Thorn#2nd10 2_M_OLDBLSMITH,{ close; } mes "[Thorn]"; - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "Hmm, are you a member of Eden Group?"; mes "You need to be one of our members to use my services."; close; diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index 387141623..ce6efaa67 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -50,7 +50,7 @@ mes "3.Cabinet fee is"; mes " ^4d4dff500 zeny^000000!"; next; - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "You need to insert zeny to use the cabinet."; mes "Cost : 500 Zeny "; mes "Would you like to use it?"; diff --git a/npc/re/scripts.conf b/npc/re/scripts.conf index 1504e0416..e64052f33 100644 --- a/npc/re/scripts.conf +++ b/npc/re/scripts.conf @@ -127,6 +127,7 @@ //================= Others ================================================ "npc/re/other/bulletin_boards.txt", +"npc/re/other/dimensional_gap.txt", "npc/re/other/mail.txt", "npc/re/other/mercenary_rent.txt", "npc/re/other/pvp.txt", diff --git a/npc/re/scripts_warps.conf b/npc/re/scripts_warps.conf index a5ead53e2..683746d79 100644 --- a/npc/re/scripts_warps.conf +++ b/npc/re/scripts_warps.conf @@ -62,6 +62,7 @@ //================= Others ================================================ "npc/re/warps/other/arena.txt", +"npc/re/warps/other/dimensional_gap.txt", "npc/re/warps/other/jobquests.txt", "npc/re/warps/other/paradise.txt", "npc/re/warps/other/s_workshop.txt", diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt index 0fb3b1f86..7f2be3865 100644 --- a/npc/re/warps/cities/izlude.txt +++ b/npc/re/warps/cities/izlude.txt @@ -83,6 +83,7 @@ OnTouch: OnInit: questinfo(21001, QTYPE_QUEST, 1, Job_Novice); + end; } iz_int,47,30,3 script noviship#room1-2 WARPNPC,2,2,{ @@ -100,30 +101,31 @@ iz_int,56,15,0 script noviship WARPNPC,2,2,{ OnTouch: savepoint("int_land"+strnpcinfo(NPC_NAME_HIDDEN), 77, 101); warp("int_land"+strnpcinfo(NPC_NAME_HIDDEN), 85, 107); + end; } int_land,49,57,0 script noviship#izlude WARPNPC,2,2,{ end; OnTouch: - mes "^4d4dffOnce you left this island there is no way back."; - mes "Are you sure you want to go directly to Izlude?^000000"; - next; - mes "^4d4dffIf you do, the quest got deleted from your Quest Log.^000000"; - next; + mes("^4d4dffOnce you left this island there is no way back."); + mes("Are you sure you want to go directly to Izlude?^000000"); + next(); + mes("^4d4dffIf you do, the quest got deleted from your Quest Log.^000000"); + next(); if (select("Do not go to Izlude yet", "Sail to Izlude!") == 1) { - mes "[Sailor]"; - mes "You want to stay here longer?"; - mes "Good, then I wait until you're ready~"; + mes("[Sailor]"); + mes("You want to stay here longer?"); + mes("Good, then I wait until you're ready~"); close(); } - mes "[Sailor]"; - mes "Lets head toward Izlude!"; - close2; + mes("[Sailor]"); + mes("Lets head toward Izlude!"); + close2(); if (questprogress(21001)) - erasequest 21001; + erasequest(21001); if (questprogress(21002)) - erasequest 21002; + erasequest(21002); warp("izlude"+strnpcinfo(NPC_NAME_HIDDEN), 196, 209); end; } diff --git a/npc/re/warps/other/dimensional_gap.txt b/npc/re/warps/other/dimensional_gap.txt new file mode 100644 index 000000000..890dc76f5 --- /dev/null +++ b/npc/re/warps/other/dimensional_gap.txt @@ -0,0 +1,79 @@ +//================= Hercules Script ======================================= +//= _ _ _ +//= | | | | | | +//= | |_| | ___ _ __ ___ _ _| | ___ ___ +//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __| +//= | | | | __/ | | (__| |_| | | __/\__ \ +//= \_| |_/\___|_| \___|\__,_|_|\___||___/ +//================= License =============================================== +//= This file is part of Hercules. +//= http://herc.ws - http://github.com/HerculesWS/Hercules +//= +//= Copyright (C) 2016 Hercules Dev Team +//= Copyright (C) Ridley +//= Copyright (C) Nova +//= +//= Hercules is free software: you can redistribute it and/or modify +//= it under the terms of the GNU General Public License as published by +//= the Free Software Foundation, either version 3 of the License, or +//= (at your option) any later version. +//= +//= This program is distributed in the hope that it will be useful, +//= but WITHOUT ANY WARRANTY; without even the implied warranty of +//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +//= GNU General Public License for more details. +//= +//= You should have received a copy of the GNU General Public License +//= along with this program. If not, see <http://www.gnu.org/licenses/>. +//========================================================================= +//= Dimensonal Gap warp script (Renewal) +//================= Description =========================================== +//= Warps for Dimensional Gap +//================= Current Version ======================================= +//= 1.0 +//========================================================================= + +mid_camp,210,292,4 script Transport Device#01 PORTAL,{ + mes("Do you wish to enter the Dimensional Gap?"); + next(); + if (select("Yes", "No") == 1) { + warp("dali", 141, 82); + end; + } + close(); +} + +moc_fild22b,222,200,4 script Transport Device#02 PORTAL,{ + mes("Do you wish to enter the Dimensional Gap?"); + next(); + if (select("Yes", "No") == 1) { + warp("dali", 119, 56); + end; + } + close(); +} + +bif_fild01,318,159,4 script Transport Device#03 PORTAL,{ + mes("Do you wish to enter the Dimensional Gap?"); + next(); + if (select("Yes", "No") == 1) { + warp("dali", 43, 92); + end; + } + close(); +} + +dic_fild02,241,31,4 script Transport Device#04 PORTAL,{ + mes("Do you wish to enter the Dimensional Gap?"); + next(); + if (select("Yes", "No") == 1) { + warp("dali", 41, 134); + end; + } + close(); +} + +dali,149,82,0 warp dg001 2,2,mid_camp,210,289 +dali,122,48,0 warp dg002 2,2,moc_fild22b,227,200 +dali,38,87,0 warp dg003 2,2,bif_fild01,318,155 +dali,34,139,0 warp dg004 2,2,dic_fild02,237,32 |