diff options
author | Kisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 12:50:24 +0000 |
---|---|---|
committer | Kisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-03-09 12:50:24 +0000 |
commit | 5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0 (patch) | |
tree | 1f546bf12a99017b41ae2fd90e0ac452f97b0282 /npc | |
parent | b4208257ea0906e375024f811d8e51208d539d35 (diff) | |
download | hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.gz hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.bz2 hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.tar.xz hercules-5cca96bf950bcd9586ab04f0e0f2b5d9a556c5e0.zip |
* Merged changes from trunk [14688:14739/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14740 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r-- | npc/Changelog.txt | 30 | ||||
-rw-r--r-- | npc/events/MemorialDay_2008.txt | 230 | ||||
-rw-r--r-- | npc/events/StPatrick_2008.txt | 180 | ||||
-rw-r--r-- | npc/events/christmas_2008.txt | 650 | ||||
-rw-r--r-- | npc/events/gdevent_aru.txt | 18 | ||||
-rw-r--r-- | npc/events/gdevent_sch.txt | 18 | ||||
-rw-r--r-- | npc/events/halloween_2008.txt | 73 | ||||
-rw-r--r-- | npc/events/valentinesday_2009.txt | 362 | ||||
-rw-r--r-- | npc/instances/EndlessTower.txt | 10 | ||||
-rw-r--r-- | npc/merchants/icecream.txt | 12 | ||||
-rw-r--r-- | npc/merchants/socket_enchant.txt | 21 | ||||
-rw-r--r-- | npc/merchants/socket_enchant2.txt | 12 | ||||
-rw-r--r-- | npc/other/auction.txt | 13 | ||||
-rw-r--r-- | npc/other/comodo_gambling.txt | 2 | ||||
-rw-r--r-- | npc/other/mail.txt | 13 | ||||
-rw-r--r-- | npc/other/mercenary_rent.txt | 8 | ||||
-rw-r--r-- | npc/other/pvp.txt | 28 | ||||
-rw-r--r-- | npc/quests/newgears/2006_headgear.txt | 6 | ||||
-rw-r--r-- | npc/quests/quests_13_1.txt | 131 | ||||
-rw-r--r-- | npc/quests/quests_lighthalzen.txt | 163 | ||||
-rw-r--r-- | npc/quests/quests_moscovia.txt | 5 | ||||
-rw-r--r-- | npc/quests/quests_veins.txt | 10 | ||||
-rw-r--r-- | npc/quests/skills/rogue_skills.txt | 4 |
23 files changed, 777 insertions, 1222 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 2af9a0613..b0b1e3f3f 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,17 @@ Date Added ====== +2011/02/06 + * Rev. 14697 Script bug fixing. :] Here's some. I know it's been awhile. [L0ne_W0lf] + - Changed some duplicates so they use a floating NPC as their original. (bugreport:1395) + - Fixed the NPC looking for missing label in the Cursed Spirit quest. (bugreport:4654) + - Applied Uno's fix for the cooldown condition in Endless Tower. (bugreport:4677) + - Removed level requirement for the Viens Stone gathering quest. (bugreport:4678) + - Added the missing restricted skills to zone 6 for Endless Tower. (bugreport:4707) + It's worth noting how much I hate the system for restricting skills per zone. + - Fixed Cat Hand warp service warping players to all warp options. (bugreport:4709) + - Fixed floor 75 warp in endless tower disabling the wrong warp. (bugreport:4711) + - Added a condition for Chungwolmang to only delete items if a certain ID is specified. (bugreport:4719) + - Corrected a mobcount specifying the wrong NPC in the Moscovia Ship quest. (bugreport:4736) 2011/01/16 * Rev. 14676 Various fixes for scripts that are disabled by default. [Ai4rei] - Fixed name collision in Baphomet Jr. taming item quest (custom) with 'Little Boy' in cities/lutie.txt @@ -20,28 +32,10 @@ Date Added Airship Ticket Quest, How the Airship Works, Ice Necklace Quest, Siblings Quest, Thor Volcano Base Quest, Muff's Loan, Broken Diamond, and the Z-Gang Quest -2010/11/14 - * Rev. 14462 Updating spawns as a precursor for Eden group quests. [L0ne_W0lf] - * Updated spawns for Juno fields to Renewal. - * Updated spawns for Umbala fields to Renewal. - * Updated spawns for Comodo fields to Renewal - * Updated spawns for Mjolnir fields to Renewal. - * Updated spawns for Payon fields to Renewal. - * Updated spawns for Morroc fields to Renewal. - * Commented out repeatable EXP quests. 2010/11/04 * Rev. 14448 Just a couple Bug fixes. :P [L0ne_W0lf] - Added a missing close in quests_13_2.txt. (bugreport:4520) - Corrected 'IProntera' typo in quests_prontera.txt (bugreport:4522) -2010/10/23 - * Rev. 14435 Updated spawns for Geffen fields to Renewal. [L0ne_W0lf] -2010/10/20 - * Rev. 14433 Updated spawns for Prontera fields to Renewal. [L0ne_W0lf] -2010/10/10 - * Rev. 14422 Wot's dis? Missed a warp in morroc field! THIS WILL NOT DO. [L0ne_W0lf] - - ...corrected the versions in the file headers as well. :P - * Rev. 14421 Renewal Update to warp portals, and deleted disabled_warps.txt. [L0ne_W0lf] - - Only disabled warps, some coordinates might have slipped past me. 2010/09/18 * Rev 14409 Updates, and bugfixes, the usual stuff. [L0ne_W0lf] * Updated Sage quest skill quest with the file curtosy of 5511. diff --git a/npc/events/MemorialDay_2008.txt b/npc/events/MemorialDay_2008.txt index cbecbdae8..9e67216a7 100644 --- a/npc/events/MemorialDay_2008.txt +++ b/npc/events/MemorialDay_2008.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First version. [Kisuka] //= 1.1 Many Many Fixes. [Kisuka] +//= 1.2 Some changes. [Kisuka] //============================================================ // ================== Lauds ====================== @@ -37,16 +38,11 @@ prontera,182,214,4 script Lauds#Memorial 58,{ mes "My what?"; next; mes "[Mad Sago Lauds]"; - mes "How are you supposed to go on your trip"; - mes "without your towel!?"; + mes "How are you supposed to go on your trip without your towel!?"; next; mes "[Mad Sago Lauds]"; - mes "If you think this is just another"; - mes "holiday,"; - mes "I'm not going to waste my breath."; - mes "But if you like to pay a tribute to"; - mes "great soldiers,"; - mes "I will help you ready yourself"; + mes "If you think this is just another holiday, I'm not going to waste my breath."; + mes "But if you like to pay a tribute to great soldiers, I will help you ready yourself."; next; if (select("I guess so...:Are you crazy or something?") == 2) { mes "[Mad Sago Lauds]"; @@ -62,11 +58,8 @@ prontera,182,214,4 script Lauds#Memorial 58,{ mes "Then listen to me carefully."; next; mes "[Mad Sago Lauds]"; - mes "Now before you can pay tribute to"; - mes "the fallen soldiers"; - mes "you must be properly equipped"; - mes "Without your towel you will be"; - mes "lost!"; + mes "Now before you can pay tribute to the fallen soldiers you must be properly equipped."; + mes "Without your towel you will be lost!"; mes "If you bring me the materials, I can make you a towel."; next; mes "[Mad Sago Lauds]"; @@ -79,25 +72,19 @@ prontera,182,214,4 script Lauds#Memorial 58,{ else if(Memorial08 == 1) { if (countitem(1059) < 30 || countitem(914) < 20) { mes "[Mad Sago Lauds]"; - mes "What are these? They aren't"; - mes "enough?!"; - mes "*Sigh* Do I really have to tell you"; - mes "again?!"; + mes "What are these? They aren't enough?!"; + mes "*Sigh* Do I really have to tell you again?!"; mes "Bring me ^FF000030 Fabric and 20 Fluffs^000000."; close; }else{ - mes "***Mad Sago Lauds appears to be"; - mes "muttering to himself***"; + mes "***Mad Sago Lauds appears to be muttering to himself***"; next; mes "[Mad Sago Lauds]"; - mes "So, did you bring the towel"; - mes "materials?"; + mes "So, did you bring the towel materials?"; next; mes "[Mad Sago Lauds]"; - mes "Excellent; you've brought them"; - mes "all."; - mes "Then I shall make you a Towel of"; - mes "Memory as I promised."; + mes "Excellent; you've brought them all."; + mes "Then I shall make you a Towel of Memory as I promised."; mes "Give me a moment."; next; mes "[Mad Sago Lauds]"; @@ -113,40 +100,30 @@ prontera,182,214,4 script Lauds#Memorial 58,{ else if(Memorial08 == 2) { mes "[Mad Sago Lauds]"; - mes "Ah, you have fluffy new towel now"; - mes "I even put your name on it"; + mes "Ah, you have fluffy new towel now I even put your name on it"; next; mes "[Mad Sago Lauds]"; - mes "Say, how do you like to go"; - mes "on a journey to pay a tribute to"; - mes "Memorial Day?"; + mes "Say, how do you like to go on a journey to pay a tribute to Memorial Day?"; next; if (select("Sure.:No, I'm Busy.") == 2) { mes "[Mad Sago Lauds]"; - mes "Don't come crying to me"; - mes "if someone decides to"; - mes "build a highway through"; - mes "your home!"; + mes "Don't come crying to me if someone decides to build a highway through your home!"; close; } mes "[Mad Sago Lauds]"; - mes "Good. By the way, do you even know"; - mes "what the towel is for?"; + mes "Good. By the way, do you even know what the towel is for?"; next; mes "[Mad Sago Lauds]"; - mes "It seems you're just carrying it"; - mes "without understanding its meaning."; - mes "What a shame! You should go speak"; - mes "to ^FF0000Grast in Prontera^000000."; + mes "It seems you're just carrying it without understanding its meaning."; + mes "What a shame! You should go speak to ^FF0000Grast in Prontera^000000."; set Memorial08,3; close; } else if(Memorial08 == 3) { mes "[Mad Sago Lauds]"; - mes "What are you still doing here? I"; - mes "told you to go speak to Grast in"; - mes "Prontera!"; + mes "What are you still doing here?"; + mes "I told you to go speak to Grast in Prontera!"; close; } @@ -163,20 +140,16 @@ prontera,182,214,4 script Lauds#Memorial 58,{ mes "HAHAHAHAHAHA!!!! cough cough"; next; mes "[Mad Sago Lauds]"; - mes "Please give them to me. Thank you"; - mes "for your hard work, by the way."; + mes "Please give them to me. Thank you for your hard work, by the way."; mes "Say, have you learned anything from the journey?"; - mes "Now is to go visit the plaque at 12"; - mes "o'clock direction in Prontera."; + mes "Now is to go visit the plaque at 12 o'clock direction in Prontera."; next; mes "[Mad Sago Lauds]"; - mes "What do you mean you were just"; - mes "there?"; + mes "What do you mean you were just there?"; next; mes "[Mad Sago Lauds]"; - mes "What? Why are you giving me your"; - mes "garbage!"; - mes "Those items are not useful to me at all"; + mes "What? Why are you giving me your garbage!"; + mes "Those items are not useful to me at all."; mes "You should be going to the plaque!"; set Memorial08,8; close; @@ -185,8 +158,7 @@ prontera,182,214,4 script Lauds#Memorial 58,{ else if(Memorial08 == 8) { mes "[Mad Sago Lauds]"; mes "Stop trying to give me your garbage!"; - mes "Go to the plaque at 12 o'clock"; - mes "direction in Prontera for your journey!"; + mes "Go to the plaque at 12 o'clock direction in Prontera for your journey!"; close; } @@ -201,17 +173,12 @@ prontera,182,214,4 script Lauds#Memorial 58,{ else if(.@RandomMsg == 2) { mes "[Mad Sago Lauds]"; mes "Life... is like a grapefruit."; - mes "It's orange and squishy, and has a"; - mes "few pips in it,"; - mes "and some folks have half a one for"; - mes "breakfast."; + mes "It's orange and squishy, and has a few pips in it, and some folks have half a one for breakfast."; close; } else if(.@RandomMsg == 3) { mes "[Mad Sago Lauds]"; - mes "There was a point to this story,"; - mes "but it has temporarily escaped the"; - mes "chronicler's mind."; + mes "There was a point to this story, but it has temporarily escaped the chronicler's mind."; close; } else if(.@RandomMsg == 4) { @@ -221,9 +188,7 @@ prontera,182,214,4 script Lauds#Memorial 58,{ } else if(.@RandomMsg == 5) { mes "[Mad Sago Lauds]"; - mes "It is a mistake to think you can"; - mes "solve any major problems just with"; - mes "potatoes."; + mes "It is a mistake to think you can solve any major problems just with potatoes."; close; } } @@ -254,14 +219,11 @@ prontera,153,286,4 script Memorial Plaque#Memorial 857,{ } L_CleanPlaque: - mes "- You see a message from the cleaned plaque."; + mes "- You see a message from the cleaned plaque.-"; next; - mes "-Although no sculptured marble"; - mes "should rise to their memory,-"; - mes "-nor engraved stone bear record of"; - mes "their deeds,-"; - mes "-yet will their remembrance be as"; - mes "lasting as the land they honored.-"; + mes "-Although no sculptured marble should rise to their memory,-"; + mes "-nor engraved stone bear record of their deeds,-"; + mes "-yet will their remembrance be as lasting as the land they honored.-"; mes "-Daniel Webster-"; if(Memorial08 == 9) { getexp 93750,43750; @@ -269,10 +231,8 @@ prontera,153,286,4 script Memorial Plaque#Memorial 857,{ next; mes "-There's another message.-"; next; - mes "-I may not have gone where I"; - mes "intended to go,-"; - mes "-but I think I have ended up where"; - mes "I needed to be.-"; + mes "-I may not have gone where I intended to go,-"; + mes "-but I think I have ended up where I needed to be.-"; mes "- Douglas Adams.-"; if(Memorial08 == 9) { getexp 93750,43750; @@ -280,12 +240,9 @@ prontera,153,286,4 script Memorial Plaque#Memorial 857,{ next; mes "-This is the last message.-"; next; - mes "-True heroism is remarkably sober,"; - mes "very undramatic.-"; - mes "-It is not the urge to surpass all"; - mes "others at whatever cost,-"; - mes "- but the urge to serve others at"; - mes "whatever cost. -"; + mes "-True heroism is remarkably sober, very undramatic.-"; + mes "-It is not the urge to surpass all others at whatever cost,-"; + mes "- but the urge to serve others at whatever cost. -"; mes "- Arthur Ashe -"; if(Memorial08 == 9) { getexp 93750,43750; @@ -300,33 +257,24 @@ prontera,153,286,4 script Memorial Plaque#Memorial 857,{ prontera,150,270,4 script Grast#Memorial 900,{ if(Memorial08 < 3) { mes "[Grast]"; - mes "Memorial Day is a sad and yet"; - mes "glorious day."; - mes "I wonder how many people remember"; - mes "them..."; + mes "Memorial Day is a sad and yet glorious day."; + mes "I wonder how many people remember them..."; close; } else if(Memorial08 == 3) { mes "[Grast]"; mes "Oh, isn't that a Towel of Memory?"; - mes "I'm so glad to meet someone who"; - mes "understands the meaning of Memorial Day."; + mes "I'm so glad to meet someone who understands the meaning of Memorial Day."; next; mes "[Grast]"; - mes "It is very important to know what"; - mes "we're celebrating today, don't you think?"; + mes "It is very important to know what we're celebrating today, don't you think?"; next; mes "[Grast]"; - mes "If you like to go on a journey to"; - mes "pay a tribute to Memorial Day,"; - mes "you should bring me some materials"; - mes "I ask."; + mes "If you like to go on a journey to pay a tribute to Memorial Day, you should bring me some materials I ask."; next; mes "[Grast]"; - mes "Please bring me ^FF0000one of each Red"; - mes "Potion, Green Potion, Awakening"; - mes "Potion, and Butterfly Wing^000000."; + mes "Please bring me ^FF0000one of each Red Potion, Green Potion, Awakening Potion, and Butterfly Wing^000000."; mes "I'll be waiting for your return."; set Memorial08,4; close; @@ -335,20 +283,14 @@ prontera,150,270,4 script Grast#Memorial 900,{ else if(Memorial08 == 4) { if (countitem(501) < 1 || countitem(506) < 1 || countitem(656) < 1 || countitem(602) < 1) { mes "[Grast]"; - mes "Oops, you haven't brought all"; - mes "materials."; + mes "Oops, you haven't brought all materials."; mes "Please make sure you need to bring me"; - mes " ^FF0000one of each Red Potion, Green"; - mes "Potion, Awakening Potion, and"; - mes "Butteryfly Wing^000000."; + mes "^FF0000one of each Red Potion, Green Potion, Awakening Potion, and Butteryfly Wing^000000."; next; mes "[Grast]"; - mes "You'll have to bring me more"; - mes "materials afterwards."; - mes "If you feel too burdened to gather"; - mes "them all,"; - mes "I can provide you all the"; - mes "materials."; + mes "You'll have to bring me more materials afterwards."; + mes "If you feel too burdened to gather them all,"; + mes "I can provide you all the materials."; next; if (select("I'll gather the rest.:Give me the materials.") == 2) { goto L_GiveUp; @@ -362,9 +304,7 @@ prontera,150,270,4 script Grast#Memorial 900,{ mes "Hmm, you will need some more things still..."; next; mes "[Grast]"; - mes "Please bring me ^FF0000one of each Trap,"; - mes "Yggdrasil Leaf, Blue Gemstone,"; - mes "Crystal Mirror, Meat, and Carrot.^000000"; + mes "Please bring me ^FF0000one of each Trap, Yggdrasil Leaf, Blue Gemstone, Crystal Mirror, Meat, and Carrot.^000000"; mes "I'll be waiting for your return."; set Memorial08,5; close; @@ -376,15 +316,11 @@ prontera,150,270,4 script Grast#Memorial 900,{ mes "[Grast]"; mes "Oops, you haven't brought all materials."; mes "Please make sure you'll have to bring me"; - mes " ^FF0000one of each Trap, Yggdrasil Leaf,"; - mes "Blue Gemstone, Crystal Mirror,"; - mes "Meat, and Carrot^000000."; + mes "^FF0000one of each Trap, Yggdrasil Leaf, Blue Gemstone, Crystal Mirror, Meat, and Carrot^000000."; next; mes "[Grast]"; - mes "You'll have to bring me more"; - mes "materials afterwards."; - mes "If you feel too burdened to gather them all,"; - mes "I can provide you all the materials."; + mes "You'll have to bring me more materials afterwards."; + mes "If you feel too burdened to gather them all, I can provide you all the materials."; next; if (select("I'll gather the rest.:Give me the materials.") == 2) { goto L_GiveUp; @@ -396,9 +332,7 @@ prontera,150,270,4 script Grast#Memorial 900,{ mes "Hmm, I think you need just a little bit more."; next; mes "[Grast]"; - mes "Please bring me ^FF0000one of each Pet"; - mes "Incubator, Firecracker, Poring"; - mes "Doll, and Bouquet^000000."; + mes "Please bring me ^FF0000one of each Pet Incubator, Firecracker, Poring Doll, and Bouquet^000000."; set Memorial08,6; close; } @@ -409,17 +343,14 @@ prontera,150,270,4 script Grast#Memorial 900,{ mes "[Grast]"; mes "Oops, you haven't brought all materials."; mes "Please make sure you need to bring me"; - mes " ^FF0000one of each Pet Incubator,"; - mes "Firecracker, Poring Doll and Bouquet"; + mes "^FF0000one of each Pet Incubator, Firecracker, Poring Doll and Bouquet"; next; mes "[Grast]"; mes "They are the last batch of materials."; - mes "If you feel too burdened to gather them all,"; - mes "I can provide you all the materials."; + mes "If you feel too burdened to gather them all, I can provide you all the materials."; next; mes "[Grast]"; - mes "If I provide you all materials, however,"; - mes "I won't have to thank you for your service."; + mes "If I provide you all materials, however, I won't have to thank you for your service."; mes "It's your call, " + strcharinfo(0) + "."; next; if (select("I'll gather the rest.:Give me the materials.") == 2) { @@ -429,19 +360,15 @@ prontera,150,270,4 script Grast#Memorial 900,{ }else{ mes "[Grast]"; mes "Have you brought the materials I asked?"; - mes "Ah, thank you for your hard work;"; - mes "you've brought all of them."; + mes "Ah, thank you for your hard work you've brought all of them."; next; mes "[Grast]"; - mes "I hope you'll learn a valuable"; - mes "lesson while gathering these materials."; + mes "I hope you'll learn a valuable lesson while gathering these materials."; mes "I like to give you a small gift for your service."; next; mes "[Grast]"; - mes "You see, I have two different gifts"; - mes "in my each hand."; - mes "A best thing would be giving you"; - mes "both of them, but..."; + mes "You see, I have two different gifts in my each hand."; + mes "A best thing would be giving you both of them, but..."; mes "How do you like to test your luck, " + strcharinfo(0) + "?"; next; mes "[Grast]"; @@ -451,8 +378,7 @@ prontera,150,270,4 script Grast#Memorial 900,{ mes "[Grast]"; mes "You've selected my right hand."; mes "Here's the gift for you."; - mes "Now, please bring all these"; - mes "materials to Lauds."; + mes "Now, please bring all these materials to Lauds."; set Memorial08, 7; getitem 617,1; close; @@ -460,8 +386,7 @@ prontera,150,270,4 script Grast#Memorial 900,{ mes "[Grast]"; mes "You've selected my left hand."; mes "Here's the gift for you."; - mes "Now, please bring all these"; - mes "materials to Lauds."; + mes "Now, please bring all these materials to Lauds."; set Memorial08, 7; getitem 12109,1; close; @@ -471,43 +396,32 @@ prontera,150,270,4 script Grast#Memorial 900,{ else if(Memorial08 == 7) { mes "[Grast]"; mes "Have you met Lauds?"; - mes "I hope you'll remember your freedom"; - mes "and happiness"; - mes "are built on thousands of lives"; - mes "sacrificed in war."; + mes "I hope you'll remember your freedom and happiness are built on thousands of lives sacrificed in war."; close; } else if(Memorial08 >= 8) { mes "[Grast]"; - mes "A towel is about the most massively"; - mes "useful thing an adventurer can have."; + mes "A towel is about the most massively useful thing an adventurer can have."; close; } L_GiveUp: mes "[Grast]"; - mes "Oh, I see. I guess you're quite"; - mes "busy nowadays, huh?"; - mes "No problem; I'll give you all the"; - mes "supplies..."; + mes "Oh, I see. I guess you're quite busy nowadays, huh?"; + mes "No problem; I'll give you all the supplies..."; next; mes "[Grast]"; mes "There you go."; - mes "I crushed all the items together"; - mes "into a more compact form for you"; - mes "You can thank me later for that"; - mes "extra service."; + mes "I crushed all the items together into a more compact form for you."; + mes "You can thank me later for that extra service."; mes "Please bring them to Lauds."; set Memorial08,7; getitem 7126,1; next; mes "[Grast]"; - mes "By the way, he had an unfortunate"; - mes "accident, and has kind of lost his"; - mes "mind."; - mes "Please don't be alarmed even if he"; - mes "starts babbling."; + mes "By the way, he had an unfortunate accident, and has kind of lost his mind."; + mes "Please don't be alarmed even if he starts babbling."; close; L_Continue: diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt index eeaa49dd9..8fac11831 100644 --- a/npc/events/StPatrick_2008.txt +++ b/npc/events/StPatrick_2008.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -29,6 +29,7 @@ //= Corrected EXP rewards, and some typos. //= 1.3 Corrected random in item function. [L0ne_W0lf] //= 1.4 Replaced effect numerics with constants. [Samuray22] +//= 1.5 Revamped the script. [Kisuka] //============================================================ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 954,{ @@ -37,159 +38,105 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 954,{ mes "Hmm..."; mes "Tis a fine day it be."; mes "If you have a moment to spare."; - mes "Come here to me now,"; - mes "come here and I'll tell ya something."; + mes "Come here to me now, come here and I'll tell ya something."; next; select("Go ahead."); mes "[O'Riley the Leprechaun]"; - mes "These past years I've"; - mes "come to see the world"; - mes "and each time the snakes"; - mes "have stolen me treasure."; + mes "These past years I've come to see the world and each time the snakes have stolen me treasure."; next; select("Oh?"); mes "[O'Riley the Leprechaun]"; - mes "Ye fine folks of this land"; - mes "have been so gracious"; - mes "to recover me treasure again and again."; + mes "Ye fine folks of this land have been so gracious to recover me treasure again and again."; next; mes "[O'Riley the Leprechaun]"; - mes "I've learned me lesson"; - mes "and will never forget how those"; - mes "vile snakes have wronged me."; + mes "I've learned me lesson and will never forget how those vile snakes have wronged me."; next; select("What did you do?"); mes "[O'Riley the Leprechaun]"; - mes "I made a safe place to hide me"; - mes "treasure."; - mes "Hidden in a secret place the treasure"; - mes "would be safe until I returned"; - mes "to the world the following year."; + mes "I made a safe place to hide me treasure."; + mes "Hidden in a secret place the treasure would be safe until I returned to the world the following year."; next; mes "[O'Riley the Leprechaun]"; - mes "This year, I have made me journey"; - mes "to see the outside world once again."; - mes "I traveled to me cache of gold"; - mes "I found it to be safe and"; - mes "undisturbed."; + mes "This year, I have made me journey to see the outside world once again."; + mes "I traveled to me cache of gold I found it to be safe and undisturbed."; next; mes "[O'Riley the Leprechaun]"; - mes "I thought to meself,"; - mes "I am very clever to hide the"; - mes "treasure from the snakes."; + mes "I thought to meself, I am very clever to hide the treasure from the snakes."; mes "Oh, but I was a fool still."; next; select("What happened?"); mes "[O'Riley the Leprechaun]"; mes "My hiding place was too clever."; - mes "I pulled and I heaved and pushed,"; - mes "but the hiding place would not"; - mes "budge."; - mes "So once again, I am without"; - mes "treasure this year."; + mes "I pulled and I heaved and pushed, but the hiding place would not budge."; + mes "So once again, I am without treasure this year."; next; mes "[O'Riley the Leprechaun]"; - mes "I have not even begun brewing"; - mes "me famous green ale on account of"; - mes "this mess."; - mes "I will ask ye, will ya help get me"; - mes "treasure back?"; + mes "I have not even begun brewing me famous green ale on account of this mess."; + mes "I will ask ye, will ya help get me treasure back?"; next; if (select("Sure, I can help you.:I'm too busy.") == 2) { mes "[O'Riley the Leprechaun]"; mes "Aye, I understand."; - mes "Thank you for listening to me"; - mes "tale."; + mes "Thank you for listening to me tale."; close; } mes "[O'Riley the Leprechaun]"; mes "To find my treasure it be true."; - mes "To my treasure I give my secret to"; - mes "you."; + mes "To my treasure I give my secret to you."; next; mes "[O'Riley the Leprechaun]"; - mes "So, listen well and make no"; - mes "omissions."; - mes "Make the journey to the city of"; - mes "magicians."; - mes "Over the bridge and across the"; - mes "water"; - mes "Climb the mountain until north ye"; - mes "can travel no farther."; + mes "So, listen well and make no omissions."; + mes "Make the journey to the city of magicians."; + mes "Over the bridge and across the water"; + mes "Climb the mountain until north ye can travel no farther."; next; mes "[O'Riley the Leprechaun]"; - mes "Passed the stone steps set into the"; - mes "air."; - mes "Hidden in the mountain side,"; - mes "me treasure is there."; + mes "Passed the stone steps set into the air."; + mes "Hidden in the mountain side, me treasure is there."; next; mes "[O'Riley the Leprechaun]"; - mes "Ye must find a way to break it"; - mes "open."; - mes "Ye will need a mighty explosion"; - mes "to free the cache to be sure."; + mes "Ye must find a way to break it open."; + mes "Ye will need a mighty explosion to free the cache to be sure."; next; mes "[O'Riley the Leprechaun]"; mes "Ye might try some Firecrackers."; - mes "Course, Ye would need a great"; - mes "number of them,"; - mes "Ye would need at least ^FF0000200"; - mes "Firecreackers^000000"; + mes "Course, Ye would need a great number of them, Ye would need at least ^FF0000200 Firecreackers^000000"; set StPatrick2008,1; close; } else if (StPatrick2008 == 1) { mes "[O'Riley the Leprechaun]"; mes "Tis a fine day it be."; - mes "Have you found me treasure yet,"; - mes "have you?"; - mes "Me hiding spot is a might hard to"; - mes "crack."; + mes "Have you found me treasure yet, have you?"; + mes "Me hiding spot is a might hard to crack."; next; mes "[O'Riley the Leprechaun]"; mes "Ye might try some Firecrackers."; - mes "Course, Ye would need a great"; - mes "number of them,"; - mes "Ye would need at least ^FF0000200"; - mes "Firecreackers^000000"; + mes "Course, Ye would need a great number of them, Ye would need at least ^FF0000200 Firecreackers^000000"; next; mes "[O'Riley the Leprechaun]"; - mes "I be understanding if you can't get"; - mes "to it"; - mes "to be sure to be sure."; + mes "I be understanding if you can't get to it to be sure to be sure."; close; } else if (StPatrick2008 == 2) { mes "[O'Riley the Leprechaun]"; mes "Oh, welcome back!"; - mes "Thank you for returning me"; - mes "treasure!"; + mes "Thank you for returning me treasure!"; mes "Me gratitude knows no bounds!"; next; mes "[O'Riley the Leprechaun]"; mes "I am so happy,"; - mes "I'll be starting up me brew right"; - mes "away"; + mes "I'll be starting up me brew right away"; next; mes "[O'Riley the Leprechaun]"; - mes "It seems that the snakes have"; - mes "returned this year"; - mes "and are here to steal my treasure"; - mes "again."; + mes "It seems that the snakes have returned this year and are here to steal my treasure again."; next; mes "[O'Riley the Leprechaun]"; - mes "The snakes carry the coins"; - mes "of my kinsmen and must be"; - mes "punished."; - mes "But ye have had a long journey, for"; - mes "which I am"; - mes "very grateful."; + mes "The snakes carry the coins of my kinsmen and must be punished."; + mes "But ye have had a long journey, for which I am very grateful."; next; mes "[O'Riley the Leprechaun]"; - mes "When ye have had a moment to rest"; - mes "ye legs,"; - mes "come talk to me again and we may"; - mes "speak again"; + mes "When ye have had a moment to rest ye legs, come talk to me again and we may speak again"; close2; set StPatrick2008,3; getexp 200000,70000; @@ -202,39 +149,23 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 954,{ next; mes "[O'Riley the Leprechaun]"; mes "Thank you for coming by again."; - mes "The snakes carry the coins of my"; - mes "kindsmen"; - mes "and must be punished."; + mes "The snakes carry the coins of my kindsmen and must be punished."; next; mes "[O'Riley the Leprechaun]"; - mes "I would be so generous to give you"; - mes "some of my famous brew"; - mes "if you would bring me the"; - mes "ill-gotten gains carried"; - mes "by those vile snakes"; + mes "I would be so generous to give you some of my famous brew if you would bring me the ill-gotten gains carried by those vile snakes"; next; - mes "And if you find one of the"; - mes "treasures of my kin"; - mes "please bring me those coins"; - mes "so that the snakes don't get them."; + mes "And if you find one of the treasures of my kin please bring me those coins so that the snakes don't get them."; set StPatrick2008,4; close; } else if (StPatrick2008 == 4) { mes "[O'Riley the Leprechaun]"; - mes "The snakes carry too many of me"; - mes "kinsmen's coin"; - mes "I be passing out pints of me brew"; - mes "as reward for their return."; + mes "The snakes carry too many of me kinsmen's coin I be passing out pints of me brew as reward for their return."; next; mes "[O'Riley the Leprechaun]"; - mes "I'll reward ye with one jug of ale"; - mes "for ^0000FF1 Golden Coins^000000, ^0000FF5 Silver Coins^000000,"; - mes "or ^0000FF10 Bronze Coins^000000."; - mes "It be a fair bounty for the"; - mes "ill-gotten coins."; - mes "So, what kind of coin have ye"; - mes "brought?"; + mes "I'll reward ye with one jug of ale for ^0000FF1 Golden Coins^000000, ^0000FF5 Silver Coins^000000, or ^0000FF10 Bronze Coins^000000."; + mes "It be a fair bounty for the ill-gotten coins."; + mes "So, what kind of coin have ye brought?"; next; switch(select("Bronze Coins:Silver Coins:Gold Coins:Quit.")) { case 1: @@ -263,9 +194,7 @@ prt_fild05,170,286,4 script Anxious Leprechaun#8pday 954,{ close; case 4: mes "[O'Riley the Leprechaun]"; - mes "I'll reward ye with one jug of ale"; - mes "for ^0000FF1 Golden Coins^000000, ^0000FF5 Silver Coins^000000,"; - mes "or ^0000FF10 Bronze Coins^000000."; + mes "I'll reward ye with one jug of ale for ^0000FF1 Golden Coins^000000, ^0000FF5 Silver Coins^000000, or ^0000FF10 Bronze Coins^000000."; close; } } @@ -276,37 +205,30 @@ mjolnir_01,272,363,4 script Rocks#08StPattysDay -1,1,1,{ OnTouch: if (StPatrick2008 < 1) { - mes "- You've found a pile of rocks"; - mes "covered with soil. -"; + mes "- You've found a pile of rocks covered with soil. -"; close; } if (StPatrick2008 == 1) { - mes "- You've found a pile of rocks"; - mes "covered with soil. -"; + mes "- You've found a pile of rocks covered with soil. -"; next; if (countitem(12018) < 200) { mes "The rocks won't budge."; - mes "Maybe O'Riley knows a way to move"; - mes "the rocks."; + mes "Maybe O'Riley knows a way to move the rocks."; close; } else { if (select("Use Firecrackers.:Ignore") == 2) { close; } - mes "You buried 200 Firecrackers"; - mes "under the pile of rocks."; + mes "You buried 200 Firecrackers under the pile of rocks."; mes "You light the fuse."; next; mes "*BOOM!*"; specialeffect2 EF_LORD; next; - mes "After A cloud of dust and smoke has"; - mes "dissipated,"; - mes "You've found a box between the"; - mes "rocks and soil."; - mes "This box must contain O'Riley's"; - mes "valuables."; + mes "After A cloud of dust and smoke has dissipated,"; + mes "You've found a box between the rocks and soil."; + mes "This box must contain O'Riley's valuables."; mes "Let's bring the box to O'Riley."; close2; set StPatrick2008,2; diff --git a/npc/events/christmas_2008.txt b/npc/events/christmas_2008.txt index 99b783a22..a696de501 100644 --- a/npc/events/christmas_2008.txt +++ b/npc/events/christmas_2008.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -15,33 +15,31 @@ //= Must enable X-mas08 mobs in mob_db2. //===== Additional Comments: ================================= //= 1.0 First version. [Kisuka] +//= 1.1 Fixed some issues, revamped the whole script. [Kisuka] //============================================================ -// ============== Carolling - Music Box ================ +// ============== Caroller - Music Box ================ // ===================================================== -prontera,226,306,4 script Carolling#iROxmas08 79,{ +prontera,226,306,4 script Caroller#iROxmas08 79,{ if (iROxmas08carol < 1 || iROxmas08carol == 3) { if (iROxmas08carol == 3) { - mes "[Carolling]"; - mes "Jingle Bells! Jingle Bells! Jingle"; - mes "all the way!"; - mes "O' what fun it is to ride in a"; - mes "one-horse open sleeeigh, Hey!"; + mes "[Caroller]"; + mes "Jingle Bells! Jingle Bells! Jingle all the way!"; + mes "O' what fun it is to ride in a one-horse open sleeeigh, Hey!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Merry Christmas!"; - mes "Hey! You! What comes to mind when"; - mes "you think about Christmas?"; + mes "Hey! You! What comes to mind when you think about Christmas?"; next; }else{ - mes "[Carolling]"; + mes "[Caroller]"; mes "Jingle Bells! Jingle Bells! Jingle all the way!"; next; - specialeffect 75; - mes "[Carolling]"; + specialeffect EF_GLORIA; + mes "[Caroller]"; mes "O' what fun it is to ride in a one-horse open sleigh!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Merry Christmas!"; if (Sex) { mes "Hey, boy! What comes to mind when"; @@ -54,291 +52,229 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ switch(select("Santa Claus:Gift Boxes:Carols:Santa Costumes:Fake Santa Antonio")) { case 1: - mes "[Carolling]"; + mes "[Caroller]"; mes "Santa Claus!"; mes "You're so innocent!!"; mes "Ah!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Here's a secret!"; - mes "There's a rumor that Santa Claus"; - mes "lives in a certain village all"; - mes "throughout the year."; + mes "There's a rumor that Santa Claus lives in a certain village all throughout the year."; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "But now!!!"; mes "In this Christmas season!!"; - mes "You guys can meet Santa on either"; - mes "of the five possible villages"; - mes "throughout Rune-Midgerts!"; + mes "You guys can meet Santa on either of the five possible villages throughout Rune-Midgerts!"; next; - mes "[Carolling]"; - mes "If you win over Santa, you can get"; - mes "a gift. Would you go for it?"; + mes "[Caroller]"; + mes "If you win over Santa, you can get a gift. Would you go for it?"; next; emotion 18; - mes "[Carolling]"; - mes "Carolling's hot news! Ha!"; + mes "[Caroller]"; + mes "Caroller's hot news! Ha!"; mes "Isn't that big news?"; close; case 2: - mes "[Carolling]"; + mes "[Caroller]"; mes "Gift boxes?! All right!"; - mes "Isn't it thrilling to open gifts"; - mes "over your head!!"; + mes "Isn't it thrilling to open gifts over your head!!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Anyway, did you know..."; - mes "Some villain, a fake Santa robbed"; - mes "some gifts from the good Santa!"; + mes "Some villain, a fake Santa robbed some gifts from the good Santa!"; next; - mes "[Carolling]"; - mes "Furthermore, he has put bad magic"; - mes "on the gifts so that they become"; - mes "monsters!"; + mes "[Caroller]"; + mes "Furthermore, he has put bad magic on the gifts so that they become monsters!"; next; emotion 18; - mes "[Carolling]"; - mes "Carolling's hot news! Ha!"; + mes "[Caroller]"; + mes "Caroller's hot news! Ha!"; mes "Isn't it amazing?"; close; case 3: if (iROxmas08carol == 3) { - mes "[Carolling]"; + mes "[Caroller]"; mes "Ah, a music box is useful."; next; - mes "[Carolling]"; - mes "Though we can't all play it around"; - mes "the village as we planned, it's"; - mes "cool that you carry it."; + mes "[Caroller]"; + mes "Though we can't all play it around the village as we planned, it's cool that you carry it."; next; - mes "[Carolling]"; - mes "We want to enjoy carols all"; - mes "together... I hope to get Crystal"; - mes "Pieces!"; + mes "[Caroller]"; + mes "We want to enjoy carols all together... I hope to get Crystal Pieces!"; next; - mes "[Carolling]"; - mes "If you can get ^0000FFSinging Crystal"; - mes "Pieces^000000, give them to me please?"; + mes "[Caroller]"; + mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?"; next; select("Why not? Sure, I can give you some."); if (countitem(6092) < 6) { - mes "[Carolling]"; + mes "[Caroller]"; mes "Yes, please."; next; - mes "[Carolling]"; - mes "If you can get ^0000FFSinging Crystal"; - mes "Pieces^000000, give them to me please?"; + mes "[Caroller]"; + mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?"; close; }else{ - mes "[Carolling]"; + mes "[Caroller]"; mes "Wow, you have them."; next; - mes "[Carolling]"; - mes "I can bake you a cake,"; - mes "and I can carve your name on the"; - mes "cake, if you want!"; + mes "[Caroller]"; + mes "I can bake you a cake, and I can carve your name on the cake, if you want!"; next; if (select("No, thanks.:Please name it for me.") == 2) { - mes "[Carolling]"; + mes "[Caroller]"; mes "Thank for your help!"; next; - mes "[Carolling]"; - mes "Many people live in the giant"; - mes "world!"; - mes "So many people hope to hear"; - mes "carolling, yet I always lack"; - mes "Crystal pieces."; + mes "[Caroller]"; + mes "Many people live in the giant world!"; + mes "So many people hope to hear Caroller, yet I always lack Crystal pieces."; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?"; next; emotion 18; delitem 6092,6; getnameditem 12354,"+strcharinfo(0)+"; - mes "[Carolling]"; - mes "Let's care about others around you"; - mes "on this Christmas season!"; + mes "[Caroller]"; + mes "Let's care about others around you on this Christmas season!"; close; }else{ - mes "[Carolling]"; + mes "[Caroller]"; mes "Oh!"; mes "Shyness!"; next; - mes "[Carolling]"; - mes "Anyway, thanks a lot for your"; - mes "help."; + mes "[Caroller]"; + mes "Anyway, thanks a lot for your help."; next; - mes "[Carolling]"; - mes "Many people live in the giant"; - mes "world!"; - mes "So many people hope to hear"; - mes "carolling, yet I always lack"; - mes "Crystal pieces."; + mes "[Caroller]"; + mes "Many people live in the giant world!"; + mes "So many people hope to hear Caroller, yet I always lack Crystal pieces."; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "If you can get ^0000FFSinging Crystal Pieces^000000, give them to me please?"; next; emotion 18; delitem 6092,6; getitem 12354,1; - mes "[Carolling]"; - mes "Let's care about others around you"; - mes "on this Christmas season!"; + mes "[Caroller]"; + mes "Let's care about others around you on this Christmas season!"; close; } } } - mes "[Carolling]"; + mes "[Caroller]"; mes "You know about Christmas!"; mes "Talking about Christmas..."; mes "...it's carols!!!"; mes "I've been waiting for this for when"; mes "Christmas comes around!"; next; - mes "[Carolling]"; - mes "But there's been no caroling here"; - mes "and there like before, so we can't"; - mes "feel the Christmas spirit."; + mes "[Caroller]"; + mes "But there's been no caroling here and there like before, so we can't feel the Christmas spirit."; next; - mes "[Carolling]"; - mes "So, I installed a Singing Crystal"; - mes "in Prontera..."; + mes "[Caroller]"; + mes "So, I installed a Singing Crystal in Prontera..."; next; - mes "[Carolling]"; - mes "but that jerk Antonio broke the"; - mes "crystal!"; + mes "[Caroller]"; + mes "but that jerk Antonio broke the crystal!"; next; - mes "[Carolling]"; - mes "The gift boxes have been changing"; - mes "into monsters since Antonio placed"; - mes "some magic on them, so the monsters"; - mes "ate up the crystal fragments!"; + mes "[Caroller]"; + mes "The gift boxes have been changing into monsters since Antonio placed some magic on them, so the monsters ate up the crystal fragments!"; next; - mes "[Carolling]"; - mes "I am so devastated, since the"; - mes "Singing Crystal has been the hope"; - mes "of many children around the villages."; + mes "[Caroller]"; + mes "I am so devastated, since the Singing Crystal has been the hope of many children around the villages."; next; if (select("There's no other way to carol?:You can hear carols in Lutie.") == 2) { - mes "[Carolling]"; - mes "And just stay there, every"; - mes "Christmas, for your whole life?"; + mes "[Caroller]"; + mes "And just stay there, every Christmas, for your whole life?"; next; mes "["+strcharinfo(0)+"]"; mes "What? What do you mean?"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Oh, nevermind."; mes "Ah..."; close; } - mes "[Carolling]"; - mes "Maybe, it's quite hard to make a"; - mes "jukebox for the villages, but a"; - mes "music box might be possible."; + mes "[Caroller]"; + mes "Maybe, it's quite hard to make a jukebox for the villages, but a music box might be possible."; next; - mes "[Carolling]"; - mes "We need the ^0000FFSinging Crystal Pieces^000000"; - mes "that the monsters ate up."; + mes "[Caroller]"; + mes "We need the ^0000FFSinging Crystal Pieces^000000 that the monsters ate up."; next; - mes "[Carolling]"; - mes "Please bring me ^0000FF6 Singing Crystal"; - mes "Pieces^000000, and you will be rewarded"; - mes "with presents!"; + mes "[Caroller]"; + mes "Please bring me ^0000FF6 Singing Crystal Pieces^000000, and you will be rewarded with presents!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Sounds cool, huh!!"; next; select("........................"); - mes "[Carolling]"; - mes "...Why are you staring at me like"; - mes "that?"; + mes "[Caroller]"; + mes "...Why are you staring at me like that?"; next; - mes "[Carolling]"; - mes "You're thinking that we are always"; - mes "getting our plans spoiled, aren't"; - mes "you?"; + mes "[Caroller]"; + mes "You're thinking that we are always getting our plans spoiled, aren't you?"; next; - mes "[Carolling]"; - mes "I know that we are not good at"; - mes "controlling stuff, but our rewards"; - mes "are good, right?"; + mes "[Caroller]"; + mes "I know that we are not good at controlling stuff, but our rewards are good, right?"; next; select("........................"); - mes "[Carolling]"; + mes "[Caroller]"; mes "Hey, we treat you good..."; next; select("........................"); - mes "[Carolling]"; + mes "[Caroller]"; mes "You are so cruel to me!"; mes "Bad! Bad!"; next; - mes "[Carolling]"; - mes "Please, for our children's"; - mes "hope!!!?"; - mes "Please bring me 6 Singing Crystal"; - mes "Pieces from ^0000FFViolent Gift Boxes^000000!"; + mes "[Caroller]"; + mes "Please, for our children's hope!!!?"; + mes "Please bring me 6 Singing Crystal Pieces from ^0000FFViolent Gift Boxes^000000!"; next; emotion 33; - mes "[Carolling]"; - mes "They're definitely as"; - mes "harsh as their name."; + mes "[Caroller]"; + mes "They're definitely as harsh as their name."; mes "Go on please!"; set iROxmas08carol,1; close; case 4: - mes "[Carolling]"; + mes "[Caroller]"; mes "Santa costumes!!"; - mes "You know, the santa costumes that"; - mes "the monsters are wearing now aren't"; - mes "genuine!"; + mes "You know, the santa costumes that the monsters are wearing now aren't genuine!"; next; - mes "[Carolling]"; - mes "The rumor 'round here is, Lutie's"; - mes "designer made these costumes."; + mes "[Caroller]"; + mes "The rumor 'round here is, Lutie's designer made these costumes."; next; - mes "[Carolling]"; - mes "Every year, adventurers challenge"; - mes "to attack Antonio the fake Santa,"; - mes "but there's no way to catch up to"; - mes "him due to his hat and costume!"; + mes "[Caroller]"; + mes "Every year, adventurers challenge to attack Antonio the fake Santa, but there's no way to catch up to him due to his hat and costume!"; next; - mes "[Carolling]"; - mes "Are there some spcial abilities"; - mes "within them?"; - mes "There's still the designer in the"; - mes "Christmas village... How about"; - mes "asking her to make that costume?"; + mes "[Caroller]"; + mes "Are there some spcial abilities within them?"; + mes "There's still the designer in the Christmas village... How about asking her to make that costume?"; next; emotion 18; - mes "[Carolling]"; - mes "Carolling's hot news! Ha!"; + mes "[Caroller]"; + mes "Caroller's hot news! Ha!"; mes "It's hot, huh?"; close; case 5: - mes "[Carolling]"; + mes "[Caroller]"; mes "A-N-T-O-N-I-O!!!"; - mes "As I heard, this Antonio is quite"; - mes "different from before."; + mes "As I heard, this Antonio is quite different from before."; next; - mes "[Carolling]"; - mes "He seems to be quite resolved with"; - mes "himself since he ran away from"; - mes "people before."; + mes "[Caroller]"; + mes "He seems to be quite resolved with himself since he ran away from people before."; next; - mes "[Carolling]"; - mes "And he isn't alone anymore... is"; - mes "what I heard..."; + mes "[Caroller]"; + mes "And he isn't alone anymore... is what I heard..."; next; emotion 18; - mes "[Carolling]"; - mes "Carolling's hot news! Ha!"; + mes "[Caroller]"; + mes "Caroller's hot news! Ha!"; mes "Hotness, right?"; close; } @@ -346,80 +282,64 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ if (iROxmas08carol == 1) { if (countitem(6092) < 6) { - mes "[Carolling]"; - mes "Maybe, it's quite hard to make a"; - mes "jukebox for the villages, but a"; - mes "music box might be possible."; + mes "[Caroller]"; + mes "Maybe, it's quite hard to make a jukebox for the villages, but a music box might be possible."; next; - mes "[Carolling]"; - mes "We need the ^0000FFSinging Crystal Pieces^000000"; - mes "that the monsters ate up."; + mes "[Caroller]"; + mes "We need the ^0000FFSinging Crystal Pieces^000000 that the monsters ate up."; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Please bring me ^0000FF6 Singing Crystal Pieces^000000, and you will be rewarded with presents!"; next; - mes "[Carolling]"; - mes "For all of the children of this"; - mes "world!!!"; - mes "Please bring me ^0000FFSinging Crystal"; - mes "Pieces^000000 from ^0000FFViolent Gift Boxes^000000!"; + mes "[Caroller]"; + mes "For all of the children of this world!!!"; + mes "Please bring me ^0000FFSinging Crystal Pieces^000000 from ^0000FFViolent Gift Boxes^000000!"; next; emotion 33; - mes "[Carolling]"; + mes "[Caroller]"; mes "Be careful!"; - mes "They're definitely as"; - mes "harsh as their name."; + mes "They're definitely as harsh as their name."; mes "Take care!!!"; close; }else{ - specialeffect 75; - mes "[Carolling]"; + specialeffect EF_GLORIA; + mes "[Caroller]"; mes "Don't cry, don't cry!"; - mes "Santa won't give you a"; - mes "gift if you're crying."; + mes "Santa won't give you a gift if you're crying."; next; - mes "[Carolling]"; + mes "[Caroller]"; select("I got them!"); - mes "[Carolling]"; + mes "[Caroller]"; mes "Wow, you got them!"; mes "They are so cruel, aren't they?"; mes "I'm happy to see you again."; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Let's count together!"; mes "... ..."; mes "Six!!"; next; - mes "[Carolling]"; - mes "All right! We can start to make our"; - mes "music box with crystal fragments."; + mes "[Caroller]"; + mes "All right! We can start to make our music box with crystal fragments."; next; - mes "[Carolling]"; - mes "We would amplify the sounds of the"; - mes "crystal fragments to sound through"; - mes "the music box."; + mes "[Caroller]"; + mes "We would amplify the sounds of the crystal fragments to sound through the music box."; next; - mes "[Carolling]"; - mes "You know, a music box that sounds"; - mes "like a jukebox!"; + mes "[Caroller]"; + mes "You know, a music box that sounds like a jukebox!"; next; - mes "[Carolling]"; - mes "It's handy. You can carry it, as"; - mes "well as listen to sweet carols"; - mes "anywhere. Doesn't that sound"; - mes "cool!?"; + mes "[Caroller]"; + mes "It's handy. You can carry it, as well as listen to sweet carols anywhere."; + mes "Doesn't that sound cool!?"; next; - mes "[Carolling]"; - mes "So, we need more of some"; - mes "materials."; - mes "^0000FF10 Wooden Block, 1 Hammer Of"; - mes "Blacksmith, 1 Jubilee, 10 Sticky"; - mes "Mucus, 3-karat Diamond^000000!"; + mes "[Caroller]"; + mes "So, we need more of some materials."; + mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!"; next; delitem 6092,6; emotion 33; set iROxmas08carol,2; - mes "[Carolling]"; + mes "[Caroller]"; mes "Those are all needed."; mes "Isn't that easy?"; close; @@ -428,86 +348,72 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ if (iROxmas08carol == 2) { if (countitem(1019) < 10 || countitem(1005) < 1 || countitem(7312) < 1 || countitem(938) < 10 || countitem(732) < 1) { - mes "[Carolling]"; - mes "We can make a music box"; - mes "with Singing Crystal Pieces."; - mes "It's handy, you can hear carols"; - mes "anywhere. Sounds cool?"; + mes "[Caroller]"; + mes "We can make a music box with Singing Crystal Pieces."; + mes "It's handy, you can hear carols anywhere. Sounds cool?"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "So, we need more of some materials."; - mes "^0000FF10 Wooden Block, 1 Hammer Of"; - mes "Blacksmith, 1 Jubilee, 10 Sticky"; - mes "Mucus, 3-karat Diamond^000000!"; + mes "^0000FF10 Trunk, 1 Hammer Of Blacksmith, 1 Jubilee, 10 Sticky Mucus, 3carat Diamond^000000!"; next; emotion 33; - mes "[Carolling]"; + mes "[Caroller]"; mes "That's all we need."; mes "Isn't that easy?"; close; }else{ - specialeffect 75; - mes "[Carolling]"; + specialeffect EF_GLORIA; + mes "[Caroller]"; mes "Jingle bells, jingle bells,"; mes "jingle all the way!"; mes "O what fun it is to ride, in a"; mes "one... horse... o-pen... sleigh!!!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Wow!"; mes "You came back!"; - mes "Did you bring all the"; - mes "materials?"; + mes "Did you bring all the materials?"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Good!"; - mes "No need to hesitate! Let's get"; - mes "started to make our music box."; + mes "No need to hesitate! Let's get started to make our music box."; next; - mes "[Carolling]"; - specialeffect 101; - mes "Blacksmith hammers on wooden"; - mes "block... and we shape the frame."; + mes "[Caroller]"; + specialeffect EF_REPAIRWEAPON; + mes "Blacksmith hammers on trunk... and we shape the frame."; next; - mes "[Carolling]"; + mes "[Caroller]"; //(effect - stones from ground?) - mes "Please use the Singing Crystal"; - mes "Pieces for a column, the Diamond as"; - mes "a prop, and the Sticky Mucus as"; - mes "glue."; + mes "Please use the Singing Crystal Pieces for a column, the Diamond as a prop, and the Sticky Mucus as glue."; next; - mes "[Carolling]"; - specialeffect 1; + mes "[Caroller]"; + specialeffect EF_HIT2; mes "And now..."; mes "we decorate with a Jubilee..."; next; - mes "[Carolling]"; - specialeffect 88; + mes "[Caroller]"; + specialeffect EF_SUFFRAGIUM; mes "The last step...!"; mes "Breating life into it!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "It's done now!!!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "It's so cool! Isn't it cute!!?!"; next; - mes "[Carolling]"; - mes "You did as I requested, so I will"; - mes "give you gifts, as promised."; + mes "[Caroller]"; + mes "You did as I requested, so I will give you gifts, as promised."; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "One, is this music box."; - mes "Please play this music box all over"; - mes "the villages!"; + mes "Please play this music box all over the villages!"; next; - mes "[Carolling]"; - mes "Another present is a Christmas cake"; - mes "especially shaped like your name!"; - mes "I made this cake shaped like your"; - mes "name!"; + mes "[Caroller]"; + mes "Another present is a Christmas cake especially shaped like your name!"; + mes "I made this cake shaped like your name!"; next; - mes "[Carolling]"; + mes "[Caroller]"; mes "Don't worry, it tastes good."; next; emotion 33; @@ -519,7 +425,7 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ delitem 938,10; delitem 732,1; set iROxmas08carol,3; - mes "[Carolling]"; + mes "[Caroller]"; mes "Thanks a lot."; mes "Merry Christmas!"; mes "Have a good holiday season!"; @@ -532,22 +438,18 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ // ===================================================== - script Santa Claus#iROxmas08::08santa 718,{ mes "[Santa Claus]"; - mes "Wow! Were you naughty or nice this"; - mes "year?"; - mes "All right, what comes to your mind"; - mes "when you think about Christmas?"; + mes "Wow! Were you naughty or nice this year?"; + mes "All right, what comes to your mind when you think about Christmas?"; next; switch(select("Carolling:Santa Claus:Gift Boxes:Santa Costume:Not much really...")) { case 1: mes "[Santa Claus]"; mes "Carolling! That's good!"; - mes "A sweet carol always makes"; - mes "Christmas more happy!!!"; + mes "A sweet carol always makes Christmas more happy!!!"; next; mes "[Santa Claus]"; - mes "Yes indeed Carolling spreads Joy"; - mes "throughout the world?"; + mes "Yes indeed Carolling spreads Joy throughout the world?"; close; case 2: @@ -559,75 +461,53 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ } next; mes "[Santa Claus]"; - mes "But you should be wary of a fake"; - mes "Santa romaing around."; - mes "Have you heard of Antonio, who"; - mes "invades villages every Christmas?"; + mes "But you should be wary of a fake Santa romaing around."; + mes "Have you heard of Antonio, who invades villages every Christmas?"; next; mes "[Santa Claus]"; - mes "He has stolen my gifts, as well as"; - mes "attacked adventurers around Toy and"; - mes "Lutie field."; + mes "He has stolen my gifts, as well as attacked adventurers around Toy and Lutie field."; next; mes "[Santa Claus]"; - mes "A bad Santa ruins us good Santa's"; - mes "reputations!"; - mes "The World Santa Organization is"; - mes "considering this a grave"; - mes "situation."; + mes "A bad Santa ruins us good Santa's reputations!"; + mes "The World Santa Organization is considering this a grave situation."; close; case 3: mes "[Santa Claus]"; mes "A gift box! That sounds good!"; - mes "It's so exciting to open gift boxes"; - mes "when you wake up on Christmas"; - mes "morning!!!"; + mes "It's so exciting to open gift boxes when you wake up on Christmas morning!!!"; next; mes "[Santa Claus]"; - mes "But we have very little gifts now,"; - mes "since Santa Antonio has stolen my"; - mes "gift bag."; + mes "But we have very little gifts now, since Santa Antonio has stolen my gift bag."; next; mes "[Santa Claus]"; - mes "Many adventurers try to catch up"; - mes "to him, but he is not easy to catch."; + mes "Many adventurers try to catch up to him, but he is not easy to catch."; next; mes "[Santa Claus]"; - mes "Anyway let those adventurers try to"; - mes "catch him, I have a small game for"; - mes "you."; + mes "Anyway let those adventurers try to catch him, I have a small game for you."; next; mes "[Santa Claus]"; - mes "I will give you a small gift if you"; - mes "beat me!"; + mes "I will give you a small gift if you beat me!"; next; mes "[Santa Claus]"; - mes "Do you want to play a game with"; - mes "me?"; + mes "Do you want to play a game with me?"; next; if (select("No, thanks.:Yes, I would.") == 1) { mes "[Santa Claus]"; - mes "Aww, don't be afraid. If you've"; - mes "been a little naughty this year I"; - mes "won't stuff your stockings with"; - mes "coal."; + mes "Aww, don't be afraid."; + mes "If you've been a little naughty this year I won't stuff your stockings with coal."; next; mes "[Santa Claus]"; - mes "I will stay here throughout the"; - mes "Christmas season, just visit me"; - mes "when you change your mind."; + mes "I will stay here throughout the Christmas season, just visit me when you change your mind."; close; } if (gettimetick(2) < SantaCardTime) { mes "[Santa Claus]"; - mes "Um... You've played the game"; - mes "recently haven't you?"; + mes "Um... You've played the game recently haven't you?"; next; mes "[Santa Claus]"; mes "You can try the game once a hour."; - mes "Please visit me after the one hour"; - mes "has passed."; + mes "Please visit me after the one hour has passed."; close; } set .@SantaCardTurn,0; @@ -636,40 +516,35 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ mes "Wow! You're so cool!"; next; mes "[Santa Claus]"; - mes "Let me explain how to play this"; - mes "game."; + mes "Let me explain how to play this game."; next; mes "[Santa Claus]"; - mes "It's quite simple. I will pick one"; - mes "of three cards: Poring Card,"; - mes "Ghostring Card, and Angeling Card."; - mes "Guess which card I pick and"; - mes "you're a winner!"; + mes "It's quite simple."; + mes "I will pick one of three cards: Poring Card, Ghostring Card, and Angeling Card."; + mes "Guess which card I pick and you're a winner!"; next; mes "[Santa Claus]"; - mes "If you guess right 3 times out of"; - mes "5, I will give you a gift."; + mes "If you guess right 3 times out of 5, I will give you a gift."; mes "Let's get started!"; next; while(.@SantaCardTurn != 5) { emotion 56; mes "[Santa Claus]"; - mes "First let me shuffle up these"; - mes "cards... Ok!!!"; + mes "First let me shuffle up these cards... Ok!!!"; next; - specialeffect 0; + specialeffect EF_HIT1; mes "[Santa Claus]"; mes "One!"; next; - specialeffect 1; + specialeffect EF_HIT2; mes "[Santa Claus]"; mes "Two!"; next; - specialeffect 2; + specialeffect EF_HIT3; mes "[Santa Claus]"; mes "Three!"; next; - specialeffect 18; + specialeffect EF_STEAL; mes "[Santa Claus]"; mes "I'm picking up only one!"; next; @@ -725,8 +600,7 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ cutin "",255; mes "[Santa Claus]"; mes "You're lucky."; - mes "Can you guess the right card the"; - mes "next time around?"; + mes "Can you guess the right card the next time around?"; next; }else{ emotion 0; @@ -739,8 +613,8 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ } if (.@SantaCardWins < 3) { mes "["+strcharinfo(0)+"]"; - mes "This is just luck. Let me try"; - mes "again!!"; + mes "This is just luck."; + mes "Let me try again!!"; next; mes "[Santa Claus]"; mes "Whenever you want."; @@ -750,9 +624,8 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ mes "You're so good!"; next; mes "[Santa Claus]"; - mes "Now this gift is for you. Put your"; - mes "hand into the bag and pick only"; - mes "one."; + mes "Now this gift is for you."; + mes "Put your hand into the bag and pick only one."; set .@SantaCardPrize, rand(1,12); next; if (.@SantaCardPrize == 1) { @@ -793,24 +666,19 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ } set SantaCardTime,gettimetick(2)+3600; mes "[Santa Claus]"; - mes "Good job! Thanks for playing the"; - mes "card game with me! Merry"; - mes "Christmas!"; + mes "Good job! Thanks for playing the card game with me!"; + mes "Merry Christmas!"; close; } case 4: mes "[Santa Claus]"; - mes "Do you mean that ever so"; - mes "fashionable costume for Santa's and"; - mes "youngsters!?!"; - mes "Light-weight, fashionable, and"; - mes "keeps you warm!"; + mes "Do you mean that ever so fashionable costume for Santa's and youngsters!?!"; + mes "Light-weight, fashionable, and keeps you warm!"; next; mes "[Santa Claus]"; - mes "There used to be designer who"; - mes "visited my house to make my Santa"; - mes "costumes. Do you have any ideas?"; + mes "There used to be designer who visited my house to make my Santa costumes."; + mes "Do you have any ideas?"; close; case 5: @@ -835,10 +703,8 @@ prontera,226,306,4 script Carolling#iROxmas08 79,{ mes "..."; next; mes "[Santa Claus]"; - mes "You should open your heart to the"; - mes "spirit of Christmas!"; - mes "Once you do, I know you'll be able"; - mes "to think of something."; + mes "You should open your heart to the spirit of Christmas!"; + mes "Once you do, I know you'll be able to think of something."; close; } } @@ -854,32 +720,25 @@ morocc,158,104,4 duplicate(08santa) Santa Claus#0805 718 // ===================================================== xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ mes "[Louise Kim]"; - mes "I always thought about how boring"; - mes "Santa Claus is wearing a too boring"; - mes "costume. Too boring!"; + mes "I always thought about how boring Santa Claus is wearing a too boring costume."; + mes "Too boring!"; next; mes "[Louise Kim]"; - mes "I could make a glamorous style for"; - mes "him!"; + mes "I could make a glamorous style for him!"; next; mes "[Louise Kim]"; - mes "I once made a costume for"; - mes "the notorious figure Antonio!"; - mes "The reason catching up to him"; - mes "is so hard, is that his clothes"; - mes "have been given strong power!"; + mes "I once made a costume for the notorious figure Antonio!"; + mes "The reason catching up to him is so hard, is that his clothes have been given strong power!"; mes "I blessed them with good luck!"; next; emotion 3; mes "[Louise Kim]"; mes "Preta Porter!!"; - mes "Which is quite luxurious"; - mes "but sold at good price ~"; + mes "Which is quite luxurious but sold at good price ~"; next; mes "[Louise Kim]"; - mes "Hey loosers! You can share my sense"; - mes "of fashion and wear my look if you"; - mes "run a light mission for me."; + mes "Hey loosers!"; + mes "You can share my sense of fashion and wear my look if you run a light mission for me."; next; mes "[Louise Kim]"; mes "Are you interested?"; @@ -887,15 +746,12 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ if (select("Nope.:Yes, please.") == 1) { mes "[Louise Kim]"; mes "Ah!"; - mes "You're silly! You lost your big"; - mes "chance!"; + mes "You're silly! You lost your big chance!"; next; emotion 18; mes "[Louise Kim]"; - mes "Come to me later if you"; - mes "want to get the mission."; - mes "I, Louise Kim, am generous"; - mes "enough to accept you next time."; + mes "Come to me later if you want to get the mission."; + mes "I, Louise Kim, am generous enough to accept you next time."; close; } mes "[Louise Kim]"; @@ -904,13 +760,10 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ mes "[Louise Kim]"; mes "Don't worry about this mission."; mes "It's not that difficult."; - mes "I'm only in need of some"; - mes "materials. Things that are"; - mes "beyond my ability..."; + mes "I'm only in need of some materials. Things that are beyond my ability..."; next; mes "[Louise Kim]"; - mes "Anyway, can you bring me some"; - mes "stuff?"; + mes "Anyway, can you bring me some stuff?"; next; if (select("Why not? What do you need?:Sorry, no time.") == 2) { emotion 18; @@ -922,25 +775,18 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ } mes "[Louise Kim]"; mes "All right, you're cool!!"; - mes "You need to bring me: ^0000FFCotton Shirt,"; - mes "3 Red Potion, Holy Water, 4 Wrapping"; - mes "Paper, Wrapping Lace^000000.."; + mes "You need to bring me: ^0000FFCotton Shirt, 3 Red Potion, Holy Water, 4 Wrapping Paper, Wrapping Lace^000000."; next; mes "[Louise Kim]"; - mes "If you bring me all that stuff, I"; - mes "can make you a glamorous Santa"; - mes "costume."; + mes "If you bring me all that stuff, I can make you a glamorous Santa costume."; next; if (countitem(2301) < 1 || countitem(501) < 3 || countitem(523) < 1 || countitem(7175) < 4 || countitem(7174) < 1) { mes "[Louise Kim]"; - mes "If you were to bring me all the"; - mes "stuff, I would make you a wonderful"; - mes "costume, for free..."; + mes "If you were to bring me all the stuff, I would make you a wonderful costume, for free..."; next; emotion 3; mes "[Louise Kim]"; - mes "Please see me again if you are"; - mes "interested."; + mes "Please see me again if you are interested."; close; }else{ select("Here you are."); @@ -948,20 +794,18 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ mes "[Louise Kim]"; mes "Oh! Good!"; mes "Let's not delay."; - mes "I will show you my limitless"; - mes "ability."; + mes "I will show you my limitless ability."; next; mes "-She pours everything in a pot-"; mes "-even the shirt goes in!-"; mes "-She takes it out with skill-"; mes "-and many blessings she sings.-"; next; - specialeffect 42; + specialeffect EF_BLESSING; emotion 2; mes "[Louise Kim]"; mes "By artist, Louise Kim!"; - mes "All over the world will be blessed"; - mes "tonight!"; + mes "All over the world will be blessed tonight!"; next; mes "-Pour red potion in another pot-"; mes "-then stir all of its parts.-"; @@ -971,20 +815,19 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ mes "-String by string-"; mes "-Count your blessings and sing!-"; next; - specialeffect 75; + specialeffect EF_GLORIA; emotion 2; mes "[Louise Kim]"; mes "By artist, Louise Kim!"; - mes "All over the world will be blessed"; - mes "tonight!"; + mes "All over the world will be blessed tonight!"; next; mes "-She is knitting clothes-"; mes "-with a hooked needle-"; mes "-with her great skill.-"; - mes "Spread your blessings,-"; - mes "cheer and goodwill!-"; + mes "-Spread your blessings,-"; + mes "-cheer and goodwill!-"; next; - specialeffect 91; + specialeffect EF_BENEDICTIO; emotion 3; mes "[Louise Kim]"; mes "This is miraculous!"; @@ -995,14 +838,11 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ mes "All right! Isn't it wonderful?"; mes "You can call it what you wish."; mes "My fashion is radiant."; - mes "I ain't envious of Designer"; - mes "Pierre."; + mes "I ain't envious of Designer Pierre."; next; emotion 18; mes "[Louise Kim]"; - mes "I am supposed to get paid well,"; - mes "however I will just let it"; - mes "be free, since this is Christmas!"; + mes "I am supposed to get paid well, however I will just let it be free, since this is Christmas!"; next; delitem 2301,1; delitem 501,3; @@ -1011,9 +851,7 @@ xmas_in,89,92,4 script Louise Kim#iROxmas08 714,{ delitem 7174,1; getitem 12132,1; mes "[Louise Kim]"; - mes "Go brag about these wonderful"; - mes "clothes. There wouldn't be"; - mes "any without me, Louise Kim."; + mes "Go brag about these wonderful clothes. There wouldn't be any without me, Louise Kim."; close; } } diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index e18495620..1c6c70d95 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -1,10 +1,26 @@ +//===== eAthena Script ======================================= +//= Guild dungeon event, Arunafeltz. +//===== By: ================================================== +//= L0ne_W0lf +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= eAthena SVN +//===== Description: ========================================= +//= Guild dungeon event, Arunafeltz. Retrieve Morestone's +//= pickaxe from Kublin. +//===== Additional Comments: ================================= +//= 1.0 First version +//= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf] +//============================================================ + arug_dun01,1,1,1 script Monster Controler#aru_gd 81,{ OnInit: donpcevent "Monster Controler1#aru::OnKill"; initnpctimer; end; -OnTimer10000: +OnTimer3600000: donpcevent "Monster Controler1#aru::OnEnable"; mapannounce "arug_dun01", "Kublin: Aargh!",bc_map,"0x99CC00"; mapannounce "arug_dun01", "Morestone: Stop righ there! You thief!",bc_map,"0x99CC00"; diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 011d0acd7..9f2064afd 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -1,10 +1,26 @@ +//===== eAthena Script ======================================= +//= Guild dungeon event, Schwaltzvalt. +//===== By: ================================================== +//= L0ne_W0lf +//===== Current Version: ===================================== +//= 1.1 +//===== Compatible With: ===================================== +//= eAthena SVN +//===== Description: ========================================= +//= Guild dungeon event, Schwaltzvalt. Retrieve Morestone's +//= pickaxe from Kublin. +//===== Additional Comments: ================================= +//= 1.0 First version +//= 1.1 Changed spawn timer to 1 hour. [L0ne_w0lf] +//============================================================ + schg_dun01,1,1,1 script Monster Controler#sch_gd 81,{ OnInit: donpcevent "Monster Controler1#sch::OnKill"; initnpctimer; end; -OnTimer10000: +OnTimer3600000: donpcevent "Monster Controler1#sch::OnEnable"; mapannounce "schg_dun01", "Kublin: Aargh!",bc_map,"0x99CC00"; mapannounce "schg_dun01", "Morestone: Stop righ there! You thief!",bc_map,"0x99CC00"; diff --git a/npc/events/halloween_2008.txt b/npc/events/halloween_2008.txt index 33f54b411..9f467ae09 100644 --- a/npc/events/halloween_2008.txt +++ b/npc/events/halloween_2008.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +14,7 @@ //= You must enable the event monsters in mob_db2. //===== Additional Comments: ================================= //= 1.0 First version. [Kisuka] +//= 1.1 Some small changes. [Kisuka] //============================================================ payon,162,176,4 script Halloween Magician#iRO08 704,{ @@ -21,15 +22,12 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ if(Hallow08 < 1) { mes "[Halloween Magician]"; mes "Kkkkkkkkk!"; - mes "I have a special event this"; - mes "Halloween that tests your luck and"; - mes "agility."; + mes "I have a special event this Halloween that tests your luck and agility."; mes "Are you interested?"; next; mes "[Halloween Magician]"; mes "Come on! Don't be a wuss!"; - mes "If you collect enough tickets"; - mes "you can get good prizes!"; + mes "If you collect enough tickets you can get good prizes!"; mes "So what do you say?"; next; goto MainMenu; @@ -60,56 +58,40 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ set Hallow08Kill,0; mes "[Halloween Magician]"; mes "As I promised"; - mes "You can get Halloween tickets"; - mes "for cool items."; + mes "You can get Halloween tickets for cool items."; close; } if(Hallow08 > 0) { mes "[Halloween Magician]"; - mes "Well, do you want to hear the rules"; - mes "again or,"; - mes "just get back to it..."; + mes "Well, do you want to hear the rules again or, just get back to it..."; next; goto MainMenu2; } Rules: mes "[Halloween Magician]"; - mes "This village is like a virtual"; - mes "Payon. There are zombies and ghouls"; - mes "roaming around"; - mes "and three southern exits, but only"; - mes "one works."; + mes "This village is like a virtual Payon."; + mes "There are zombies and ghouls roaming around and three southern exits, but only one works."; mes "That's up to you to find out."; next; mes "[Halloween Magician]"; - mes "You can't use any skills"; - mes "to kill the ghouls or zombies."; + mes "You can't use any skills to kill the ghouls or zombies."; mes "And one more thing..."; mes "you shouldn't forget..."; next; mes "[Halloween Magician]"; - mes "All participants"; - mes "should be wearing nothing."; - mes "Put all belongings in your storage"; - mes "and come back here when your weight"; - mes "is '0'."; + mes "All participants should be wearing nothing."; + mes "Put all belongings in your storage and come back here when your weight is '0'."; next; mes "[Halloween Magician]"; mes "Oh and one more thing!"; - mes "You can't be riding a PecoPeco or"; - mes "have a Cart."; - mes "If you are, then I will remove them"; - mes "before you enter."; + mes "You can't be riding a PecoPeco or have a Cart."; + mes "If you are, then I will remove them before you enter."; mes "Got it?"; next; mes "[Halloween Magician]"; - mes "Remember, there are three exits but"; - mes "only one works randomly,"; - mes "the zombies and ghouls roaming"; - mes "around there can't be killed"; - mes "and you can't be wearing anything."; + mes "Remember, there are three exits but only one works randomly, the zombies and ghouls roaming around there can't be killed and you can't be wearing anything."; next; if (Hallow08 > 0) { mes "[Halloween Magician]"; @@ -128,26 +110,21 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ if (Weight > 0) { mes "[Halloween Magician]"; mes "Gosh!"; - mes "There's always a black sheep"; - mes "anywhere."; + mes "There's always a black sheep anywhere."; next; mes "[Halloween Magician]"; - mes "You think I wouldn't notice that"; - mes "your weight is above '0'?"; + mes "You think I wouldn't notice that your weight is above '0'?"; mes "You're overweight..."; close; }else{ mes "[Halloween Magician]"; - mes "You seem good to go,"; - mes "and your weight is just right."; + mes "You seem good to go, and your weight is just right."; next; mes "[Halloween Magician]"; - mes "I was quite swamped with my work,"; - mes "so I'm exhausted."; + mes "I was quite swamped with my work, so I'm exhausted."; next; mes "[Halloween Magician]"; - mes "I sometimes forget to send you"; - mes "there..."; + mes "I sometimes forget to send you there..."; next; mes "[Halloween Magician]"; mes "I hope you come back well."; @@ -166,13 +143,11 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ TicketExchange: mes "[Halloween Magician]"; - mes "You want to exchange tickets for"; - mes "prizes?"; + mes "You want to exchange tickets for prizes?"; mes "Good job! Kkkkkk!"; next; mes "[Halloween Magician]"; - mes "Lemme tell you what items you can"; - mes "exchange for."; + mes "Lemme tell you what items you can exchange for."; next; mes "[Halloween Magician]"; mes "5 tickets for Pumpkin Pie."; @@ -182,8 +157,7 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ mes "200 tickets for Old Card Album."; next; mes "[Halloween Magician]"; - mes "What would you like to exchange"; - mes "for?"; + mes "What would you like to exchange for?"; next; switch(select("Pumpkin Pie:Pumpkin-Head:Old Blue Box:Old Purple Box:Old Card Album")) { case 1: @@ -248,8 +222,7 @@ payon,162,176,4 script Halloween Magician#iRO08 704,{ mes "[Halloween Magician]"; mes "You don't have enough tickets!"; mes "Can't you even count?"; - mes "Please come here with the right"; - mes "number of tickets."; + mes "Please come here with the right number of tickets."; close; Enough: diff --git a/npc/events/valentinesday_2009.txt b/npc/events/valentinesday_2009.txt index 24eb24e01..a9db606aa 100644 --- a/npc/events/valentinesday_2009.txt +++ b/npc/events/valentinesday_2009.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //===== Additional Comments: ================================= //= 1.0 First version. [Kisuka] //= 1.1-1.2 Fixed exploits with unlimited rings and non deleting choco [Lupus] +//= 1.3 Some Changes. [Kisuka] //============================================================ // Marco Bassinio (Chocolate/Chocolate Box maker) @@ -37,17 +38,12 @@ prontera,164,174,4 script Trader#Val09 58,{ case 1: mes "[Marco Bassinio]"; mes "Ahaha, my dear."; - mes "This chocolate is"; - mes "nothing like others."; - mes "Every piece bears the"; - mes "devotion of the person"; - mes "who made it!"; + mes "This chocolate is nothing like others."; + mes "Every piece bears the devotion of the person who made it!"; next; mes "[Marco Bassinio]"; - mes "So, that's why I can't sell"; - mes "more than 5 of them at a time."; - mes "If you really really want more,"; - mes "then talk to me again."; + mes "So, that's why I can't sell more than 5 of them at a time."; + mes "If you really really want more, then talk to me again."; mes "How many do you want anyway?"; next; while(.@input <= 0 || .@input > 5) { @@ -55,29 +51,22 @@ prontera,164,174,4 script Trader#Val09 58,{ if (.@input < 1) { mes "[Marco Bassinio]"; mes "Oh, it's such a shame!"; - mes "I'm sure you'll miss"; - mes "this opportunity and"; - mes "regret you didn't buy it."; + mes "I'm sure you'll miss this opportunity and regret you didn't buy it."; next; mes "[Marco Bassinio]"; - mes "Remember, you can never"; - mes "find this anywhere else!"; - mes "Come back anytime,"; - mes "when you change your mind."; + mes "Remember, you can never find this anywhere else!"; + mes "Come back anytime, when you change your mind."; close; } if (.@input > 5) { mes "[Marco Bassinio]"; mes "Ugh.. Didn't I tell you?"; mes "5 is the maximum!"; - mes "I can't sell more than"; - mes "that to the same person."; + mes "I can't sell more than that to the same person."; next; mes "[Marco Bassinio]"; - mes "And you know it's not"; - mes "like an everyday meal."; - mes "Eating too much is not"; - mes "really good for you."; + mes "And you know it's not like an everyday meal."; + mes "Eating too much is not really good for you."; next; } } @@ -90,60 +79,40 @@ prontera,164,174,4 script Trader#Val09 58,{ set .@price, .@input * 5000; if (Zeny < .@price) { mes "[Marco Bassinio]"; - mes "Looks like you don't have"; - mes "enough zeny with ya."; - mes "Maybe you should borrow"; - mes "some zeny from a friend."; - mes "Cuz, I'm not gonna"; - mes "be here everyday."; + mes "Looks like you don't have enough zeny with ya."; + mes "Maybe you should borrow some zeny from a friend."; + mes "Cuz, I'm not gonna be here everyday."; close; }else{ mes "[Marco Bassinio]"; mes "Good for you!"; mes "It's also perfect as a gift!"; - mes "You know you can't get this"; - mes "kind of chocolate normally."; + mes "You know you can't get this kind of chocolate normally."; next; mes "[Marco Bassinio]"; - mes "If you want more,"; - mes "you should come back."; - mes "Might be a good idea to"; - mes "buy some more while"; - mes "you have a chance...!"; + mes "If you want more, you should come back."; + mes "Might be a good idea to buy some more while you have a chance...!"; set Zeny,Zeny - .@price; getitem 558,.@input; close; } case 2: mes "[Marco Bassinio]"; - mes "If you want to gift-wrap"; - mes "the chocolate, of course,"; - mes "you need chocolate,"; - mes "plus, wrapping paper,"; - mes "wrapping strap and a box."; + mes "If you want to gift-wrap the chocolate, of course, you need chocolate, plus, wrapping paper, wrapping strap and a box."; next; mes "[Marco Bassinio]"; - mes "You also need to pay"; - mes "500 zeny to carve your"; - mes "name on the box."; + mes "You also need to pay 500 zeny to carve your name on the box."; mes "Are you all prepared...?"; next; if(countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 500) { mes "[Marco Bassinio]"; - mes "Hmm.. Looks like you don't"; - mes "have enough materials to"; - mes "decorate the gift box.."; - mes "You can't just put your gift"; - mes "into some plain looking box.."; + mes "Hmm.. Looks like you don't have enough materials to decorate the gift box.."; + mes "You can't just put your gift into some plain looking box.."; mes "Don't you think?"; next; mes "[Marco Bassinio]"; - mes "You need to bring some"; - mes "wrapping paper,"; - mes "wrapping strap, and a box."; - mes "Oh, also bring 500 zeny,"; - mes "and don't forget to bring your"; - mes "true loving heart with you!!"; + mes "You need to bring some wrapping paper, wrapping strap, and a box."; + mes "Oh, also bring 500 zeny, and don't forget to bring your true loving heart with you!!"; close; } if(countitem(558) < 1) { @@ -153,10 +122,7 @@ prontera,164,174,4 script Trader#Val09 58,{ mes "You know I'm not an alchemist or anything."; next; mes "[Marco Bassinio]"; - mes "You're not saying that you"; - mes "want an empty chocolate box"; - mes "without any chocolate in it,"; - mes "am I right?"; + mes "You're not saying that you want an empty chocolate box without any chocolate in it, am I right?"; close; } if (!checkweight(12744,1)) { @@ -167,11 +133,9 @@ prontera,164,174,4 script Trader#Val09 58,{ } mes "[Marco Bassinio]"; mes "Here, look!"; - mes "It's your chocolate box"; - mes "with your name on it."; + mes "It's your chocolate box with your name on it."; mes "Isn't it fabulous?"; - mes "See, your name looks"; - mes "great on the box!"; + mes "See, your name looks great on the box!"; next; delitem 558,1; delitem 7175,1; @@ -186,15 +150,11 @@ prontera,164,174,4 script Trader#Val09 58,{ case 3: mes "[Marco Bassinio]"; mes "Oh, it's such a shame!"; - mes "I'm sure you'll miss"; - mes "this opportunity and"; - mes "regret you didn't buy it."; + mes "I'm sure you'll miss this opportunity and regret you didn't buy it."; next; mes "[Marco Bassinio]"; - mes "Remember, you can never"; - mes "find this anywhere else!"; - mes "Come back anytime,"; - mes "when you change your mind."; + mes "Remember, you can never find this anywhere else!"; + mes "Come back anytime, when you change your mind."; close; } } @@ -203,9 +163,7 @@ prontera,164,174,4 script Trader#Val09 58,{ prontera,147,171,5 script Packs Trader#Val09 58,{ mes "[Packs Trader]"; mes "Hello."; - mes "I am a Packs Trader,"; - mes "I sell paper boxes and"; - mes "supplies for packing presents."; + mes "I am a Packs Trader, I sell paper boxes and supplies for packing presents."; next; while(1) { mes "[Packs Trader]"; @@ -214,18 +172,15 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ switch(select("Packing Paper:Packing Ribbon:Box:Cancel.")) { case 1: mes "[Packs Trader]"; - mes "It's 200 zeny for"; - mes "1 Packing Paper."; + mes "It's 200 zeny for 1 Packing Paper."; mes "How many do you want?"; - mes "You can't buy more"; - mes "than 10 items at once."; + mes "You can't buy more than 10 items at once."; next; input .@input; if (.@input <= 0) { mes "[Packs Trader]"; mes "Nothing to buy."; - mes "Come back when"; - mes "you need something."; + mes "Come back when you need something."; close; } if (.@input > 10) { @@ -250,9 +205,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ }else{ mes "[Packs Trader]"; mes "Here they are."; - mes "Hope it makes your"; - mes "Valentine's Day"; - mes "more pleasing!"; + mes "Hope it makes your Valentine's Day more pleasing!"; set Zeny,Zeny-.@price; getitem 7175,.@input; next; @@ -260,18 +213,15 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ } case 2: mes "[Packs Trader]"; - mes "It's 200 zeny for"; - mes "1 Packing Ribbon."; + mes "It's 200 zeny for 1 Packing Ribbon."; mes "How many do you want?"; - mes "You can't buy more"; - mes "than 10 items at once."; + mes "You can't buy more than 10 items at once."; next; input .@input; if (.@input <= 0) { mes "[Packs Trader]"; mes "Nothing to buy."; - mes "Come back when"; - mes "you need something."; + mes "Come back when you need something."; close; } if (.@input > 10) { @@ -296,9 +246,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ }else{ mes "[Packs Trader]"; mes "Here they are."; - mes "Hope it makes your"; - mes "Valentine's Day"; - mes "more pleasing!"; + mes "Hope it makes your Valentine's Day more pleasing!"; set Zeny,Zeny-.@price; getitem 7174,.@input; next; @@ -306,18 +254,15 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ } case 3: mes "[Packs Trader]"; - mes "It's 600 zeny for"; - mes "1 Box."; + mes "It's 600 zeny for 1 Box."; mes "How many do you want?"; - mes "You can't buy more"; - mes "than 10 items at once."; + mes "You can't buy more than 10 items at once."; next; input .@input; if (.@input <= 0) { mes "[Packs Trader]"; mes "Nothing to buy."; - mes "Come back when"; - mes "you need something."; + mes "Come back when you need something."; close; } if (.@input > 10) { @@ -342,9 +287,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ }else{ mes "[Packs Trader]"; mes "Here they are."; - mes "Hope it makes your"; - mes "Valentine's Day"; - mes "more pleasing!"; + mes "Hope it makes your Valentine's Day more pleasing!"; set Zeny,Zeny-.@price; getitem 7948,.@input; next; @@ -353,8 +296,7 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ case 4: mes "[Packs Trader]"; mes "Goodbye!"; - mes "And enjoy your"; - mes "Valentine's Day."; + mes "And enjoy your Valentine's Day."; close; } } @@ -364,102 +306,66 @@ prontera,147,171,5 script Packs Trader#Val09 58,{ prontera,154,185,5 script Event Ring Maker#Val09 721,{ if (BaseLevel < 75) { mes "[Event Ring Maker]"; - mes "Hello, I only make the"; - mes "Valentine rings to those"; - mes "experienced adventurers"; - mes "Level 75 or above."; + mes "Hello, I only make the Valentine rings to those experienced adventurer Level 75 or above."; next; mes "[Event Ring Maker]"; - mes "You're not fully"; - mes "experienced yet."; - mes "Come back when you're"; - mes "experienced enough to"; - mes "handle the quests."; + mes "You're not fully experienced yet."; + mes "Come back when you're experienced enough to handle the quests."; close; } if (iROval09ring >= 1) { mes "[Event Ring Maker]"; - mes "The box with the ring,"; - mes "carved with your name,"; - mes "is for the one you love."; + mes "The box with the ring, carved with your name, is for the one you love."; next; mes "[Event Ring Maker]"; - mes "As for the rings that you"; - mes "receive from others, they"; - mes "should all be registered"; - mes "with the Vote Manager."; - mes "She is standing near"; - mes "the Prontera Fountain."; + mes "As for the rings that you receive from others, they should all be registered with the Vote Manager."; + mes "She is standing near the Prontera Fountain."; next; mes "[Event Ring Maker]"; - mes "Only the most popular"; - mes "male and female are"; - mes "subjected to getting rewards."; - mes "Be aware, and always"; - mes "try to stay popular!"; + mes "Only the most popular male and female are subjected to getting rewards."; + mes "Be aware, and always try to stay popular!"; close; } mes "[Event Ring Maker]"; mes "Hi, there, how are ya?"; - mes "Come to me if you're"; - mes "interested in the event,"; - mes "'Who's Valentine's Hottest?'"; + mes "Come to me if you're interested in the event, 'Who's Valentine's Hottest?'"; next; mes "[Event Ring Maker]"; - mes "I make the most precious"; - mes "rings that you can give"; - mes "to your sweethearts."; - mes "Those rings are very special"; - mes "because I carve"; - mes "your names on them!"; + mes "I make the most precious rings that you can give to your sweethearts."; + mes "Those rings are very special because I carve your names on them!"; next; mes "[Event Ring Maker]"; mes "Isn't it exciting?"; mes "Isn't it such a brilliant idea?"; - mes "Give these special rings"; - mes "to your sweethearts!"; + mes "Give these special rings to your sweethearts!"; next; mes "[Event Ring Maker]"; - mes "You should hurry 'cuz"; - mes "this event will only"; - mes "last for two weeks."; - mes "Give that special someone"; - mes "a gift of a Valentine's ring."; + mes "You should hurry 'cuz this event will only last for two weeks."; + mes "Give that special someone a gift of a Valentine's ring."; next; mes "[Event Ring Maker]"; - mes "Remember, you can only"; - mes "generate the ring once."; - mes "You also need Wrapping Paper,"; - mes "Wrapping Strap and a Box"; - mes "to make the ring."; + mes "Remember, you can only generate the ring once."; + mes "You also need Wrapping Paper, Wrapping Strap and a Box to make the ring."; next; mes "[Event Ring Maker]"; - mes "So you better be sure"; - mes "of who you give this to."; - mes "By the way,"; - mes "It costs 1,000 zeny."; + mes "So you better be sure of who you give this to."; + mes "By the way, It costs 1,000 zeny."; mes "Would you like to make one?"; next; if(select("Hmm.. I gotta give it a second thought...:Sure.") == 1) { mes "[Event Ring Maker]"; mes "Alrighty!"; - mes "You can't put a rush"; - mes "on such a thing like this."; - mes "Think about what"; - mes "you truly want."; + mes "You can't put a rush on such a thing like this."; + mes "Think about what you truly want."; mes "Just follow your heart!"; close; } if(countitem(7175) < 1 || countitem(7174) < 1 || countitem(7948) < 1 || Zeny < 1000) { mes "[Event Ring Maker]"; - mes "Well, you don't have"; - mes "enough materials"; - mes "to make a gift box."; - mes "Check what you have,"; - mes "and come back later"; - mes "with all the materials."; + mes "Well, you don't have enough materials to make a gift box."; + mes "Check what you have, and come back later with all the materials."; close; } mes "[Event Ring Maker]"; @@ -477,51 +383,33 @@ prontera,154,185,5 script Event Ring Maker#Val09 721,{ getnameditem 12743,strcharinfo(0); } mes "[Event Ring Maker]"; - mes "Here, the most precious"; - mes "ring in the world!"; - mes "Don't forget, you can never"; - mes "make this ring again."; + mes "Here, the most precious ring in the world!"; + mes "Don't forget, you can never make this ring again."; next; mes "[Event Ring Maker]"; - mes "You must pick out the one"; - mes "that you really really love,"; - mes "and give this ring"; - mes "to that person."; + mes "You must pick out the one that you really really love, and give this ring to that person."; next; mes "[Event Ring Maker]"; - mes "Of course, you've got to"; - mes "get rings from others,"; - mes "that's the way you can"; - mes "participate in the voting, right?"; - mes "Challenge yourself to become"; - mes "Valentine's Hottest!"; + mes "Of course, you've got to get rings from others, that's the way you can participate in the voting, right?"; + mes "Challenge yourself to become Valentine's Hottest!"; close; } // Valentine Vote Manager (Registers votes) prontera,157,185,4 script Valentine Vote Manager#v 113,{ mes "[Valentine Vote Manager]"; - mes "Hello, I'm the Valentine's"; - mes "Vote Manager."; - mes "I'm in charge of collecting"; - mes "rings for this event!"; + mes "Hello, I'm the Valentine's Vote Manager."; + mes "I'm in charge of collecting rings for this event!"; next; mes "[Valentine Vote Manager]"; - mes "I register the rings"; - mes "you get from others"; - mes "and I calculate the"; - mes "total number of rings."; + mes "I register the rings you get from others and I calculate the total number of rings."; next; mes "[Valentine Vote Manager]"; - mes "You know what I do besides"; - mes "just counting those rings?"; - mes "I can tell you the adventurer's"; - mes "name who's got the"; - mes "most number of votes."; + mes "You know what I do besides just counting those rings?"; + mes "I can tell you the adventurer's name who's got the most number of votes."; next; mes "[Valentine Vote Manager]"; - mes "Plus, you can also find out how"; - mes "many votes he/she got."; + mes "Plus, you can also find out how many votes he/she got."; next; while (1) { mes "[Valentine Vote Manager]"; @@ -530,15 +418,10 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ switch(select("Please register my rings.:Please count my votes.:Nothing, for now.")) { case 1: mes "[Valentine Vote Manager]"; - mes "Please tell me how many"; - mes "rings you want to register."; + mes "Please tell me how many rings you want to register."; next; mes "[Valentine Vote Manager]"; - mes "When you write the"; - mes "number of the rings,"; - mes "the number shouldn't be"; - mes "larger than the number of"; - mes "rings you actually have."; + mes "When you write the number of the rings, the number shouldn't be larger than the number of rings you actually have."; mes "'0', cancels everything."; next; input .@input; @@ -569,8 +452,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ } mes "[Valentine Vote Manager]"; - mes "I'll take those silver rings,"; - mes "and count the votes for you."; + mes "I'll take those silver rings, and count the votes for you."; mes "Thank you for participating."; delitem 7947,.@input; set Val09Rings,Val09Rings+.@input; @@ -598,8 +480,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ } mes "[Valentine Vote Manager]"; - mes "I'll take those gold rings,"; - mes "and count the votes for you."; + mes "I'll take those gold rings, and count the votes for you."; mes "Thank you for participating."; delitem 7946,.@input; set Val09Rings,Val09Rings+.@input; @@ -613,8 +494,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ case 2: mes "[Valentine Vote Manager]"; mes "Let's see..."; - mes "You have registered.."; - mes ".."+Val09Rings+" rings so far."; + mes "You have registered...."+Val09Rings+" rings so far."; mes "and..."; next; mes "[Valentine Vote Manager]"; @@ -629,8 +509,7 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ mes "[Valentine Vote Manager]"; mes "Hey, you can be popular too!"; mes "Anyone can... really!"; - mes "Though you have to try a lot"; - mes "harder, but still~ Hahaha!"; + mes "Though you have to try a lot harder, but still~ Hahaha!"; close; } } @@ -640,16 +519,12 @@ prontera,157,185,4 script Valentine Vote Manager#v 113,{ prt_castle,42,35,3 script Dessert Manager#Val09 47,{ if (Sex) { mes "[Charles Orleans]"; - mes "Monsieur~! What brings"; - mes "you to my beautiful atelier?"; + mes "Monsieur~! What brings you to my beautiful atelier?"; mes "What is it that you want?"; - mes "Well, my sparkling eyes"; - mes "get dried and lose their shine"; - mes "if not for the pretty little lady."; + mes "Well, my sparkling eyes get dried and lose their shine if not for the pretty little lady."; next; mes "[Charles Orleans]"; - mes "Please leave me alone unless"; - mes "you have business with me."; + mes "Please leave me alone unless you have business with me."; mes "Haaaa~ I'm a busy person."; mes "Don't bother me...."; mes "Annoying, annoying, annoying~~!"; @@ -658,11 +533,8 @@ prt_castle,42,35,3 script Dessert Manager#Val09 47,{ mes "[Charles Orleans]"; mes "Oh, Mademoiselle!"; - mes "This little trifling space"; - mes "felt like heaven the"; - mes "minute you walked in!"; - mes "Can I help you with"; - mes "anything, if it's alright?"; + mes "This little trifling space felt like heaven the minute you walked in!"; + mes "Can I help you with anything, if it's alright?"; next; if(select("Please, make me some chocolate.:Don't bother. I'm just passing by.") == 2) { mes "[Charles Orleans]"; @@ -680,51 +552,36 @@ prt_castle,42,35,3 script Dessert Manager#Val09 47,{ if(countitem(558) < 3) { mes "[Charles Orleans]"; mes "Ahhh, Mademoiselle."; - mes "I'm not an alchemist,"; - mes "or a magician."; - mes "I don't just make chocolate"; - mes "out of anything."; + mes "I'm not an alchemist, or a magician."; + mes "I don't just make chocolate out of anything."; next; mes "[Charles Orleans]"; - mes "I always think of making"; - mes "chocolate as artistic work."; + mes "I always think of making chocolate as artistic work."; mes "You see, I'm no ordinary cook..."; mes "I make chocolate with feelings.."; mes "messages of loving hearts.."; next; mes "[Charles Orleans]"; mes "I make masterpieces."; - mes "No one can imitate"; - mes "the looks and the taste."; - mes "Yes, it's nothing like"; - mes "ordinary chocolate!"; + mes "No one can imitate the looks and the taste."; + mes "Yes, it's nothing like ordinary chocolate!"; next; mes "[Charles Orleans]"; - mes "I'm afraid I can't make it"; - mes "and prove it to you now."; + mes "I'm afraid I can't make it and prove it to you now."; mes "This is really a shame!"; next; mes "[Charles Orleans]"; - mes "I really want to thank"; - mes "you for visiting me"; - mes "and if you only bring"; - mes "^3152ff3 Chocolates^000000,"; - mes "I'll make you chocolate"; - mes "like you've never seen..."; + mes "I really want to thank you for visiting me and if you only bring ^3152ff3 Chocolates^000000, I'll make you chocolate like you've never seen..."; next; mes "[Charles Orleans]"; mes "never tasted before..."; - mes "Mademoiselle, with your spirit,"; - mes "I'm sure you can bring"; - mes "3 pieces of chocolate."; + mes "Mademoiselle, with your spirit, I'm sure you can bring 3 pieces of chocolate."; mes "I have no doubt at all."; next; mes "[Charles Orleans]"; mes "So... what do you think?"; mes "Can you bring ^3152ff3 Chocolates^000000?"; - mes "I could get them myself,"; - mes "but I'm tied up with so much"; - mes "work as you see right now."; + mes "I could get them myself, but I'm tied up with so much work as you see right now."; next; mes "[Charles Orleans]"; mes "Adios, Mademoiselle....."; @@ -739,28 +596,20 @@ prt_castle,42,35,3 script Dessert Manager#Val09 47,{ } mes "[Charles Orleans]"; mes "Oh, Mademoiselle!"; - mes "I'll make the best chocolate"; - mes "with the pieces you've brought."; - mes "I'm going to put the light of"; - mes "your eyes into this chocolate"; - mes "that no one can resist."; + mes "I'll make the best chocolate with the pieces you've brought."; + mes "I'm going to put the light of your eyes into this chocolate that no one can resist."; next; mes "[Charles Orleans]"; - mes "It'll be stronger than a"; - mes "sweet sweet love potion....."; + mes "It'll be stronger than a sweet sweet love potion....."; next; mes "[Charles Orleans]"; mes "Un, Deux, Trois, Quatre....."; - mes "Just like the ugly duckling that"; - mes "turned to a beautiful swan-"; - mes "Ordinary chocolate pieces are"; - mes "becoming a piece of art!"; + mes "Just like the ugly duckling that turned to a beautiful swan-"; + mes "Ordinary chocolate pieces are becoming a piece of art!"; next; mes "[Charles Orleans]"; mes "They're changing!"; - mes "They're getting warm,"; - mes "softly changing the shape,"; - mes "getting stronger again!"; + mes "They're getting warm, softly changing the shape, getting stronger again!"; mes "Oh, is it a master piece or"; mes "what...!!"; next; @@ -774,10 +623,7 @@ prt_castle,42,35,3 script Dessert Manager#Val09 47,{ next; mes "[Charles Orleans]"; mes "Alright. Mademoiselle,"; - mes "I hope this is just"; - mes "what you wanted,"; - mes "for it bears your"; - mes "beautiful heart inside."; + mes "I hope this is just what you wanted, for it bears your beautiful heart inside."; close; } diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index b1dc002b9..495b367d2 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -21,6 +21,8 @@ //= You may need to update your questid2display. //= Changed White lady spawn to MVP White Lady. (bugreport:4601) //= 1.5 Corrected some grammar and typos. +//= 1.6 Corrected the tower re-entry blocked condition. (bugreport:4677) [L0ne_W0lf] +//= Corrected floor 75 warp disabling the wrong NPC. (bugreport:4711) //============================================================ alberta,214,77,6 script Captain Janssen 709,{ @@ -352,7 +354,7 @@ e_tower,81,105,0 script Tower Protection Stone 406,{ } close; } - else if ((.@etower_timer >= 0) && (.@etower_timer2 == 2)) { + else if ((.@etower_timer >= 0) && (.@etower_timer < 2) && (.@etower_timer2 == 2)) { mes "Due to the tower's aftereffects, you cannot enter the dungeon right now, " + .@dun_h + "hours " + .@dun_m + "minutes " + .@dun_s + "seconds left to enter the next dungeon."; next; mes "It is dangerous here. Let me move you to Alberta."; @@ -2807,11 +2809,11 @@ OnTimer120000: 3@tower,355,51,0 script 75FGate102tower-2 45,2,2,{ OnInstanceInit: - disablenpc instance_npcname("75FGate102tower", instance_id()); + disablenpc instance_npcname("75FGate102tower-2", instance_id()); end; OnEnable: - enablenpc instance_npcname("75FGate102tower", instance_id()); + enablenpc instance_npcname("75FGate102tower-2", instance_id()); end; OnTouch_: diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt index eb1dd0c63..e6a4deb23 100644 --- a/npc/merchants/icecream.txt +++ b/npc/merchants/icecream.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= KOOK SWU, Kisuka //===== Current Version: ===================================== -//= 1.3 +//= 1.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -12,10 +12,11 @@ //= 1.1 Optimized, changed overlapping coords in Alberta [Lupus] //= 1.2 According to the patch, IceCream seller has been removed from Morocc [Lupus] //= 1.3 No more label menu and updated to match AEGIS script. [Kisuka] +//= 1.4 Duplicates now spawn from floating NPCs. [L0ne_W0lf] +//= 1.5 Fixed small checkweight issue. [Kisuka] //============================================================ -// Alberta -alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{ +- script Ice Cream Maker::IceCreamer -1,{ mes "[Ice Cream Maker]"; mes "Fresh Ice Cream made with snow from Lutie!"; mes "Enjoy it now, it won't be on sale for long!"; @@ -62,7 +63,7 @@ alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{ mes "Price is ^3355FF100 Zeny^000000 per ice cream."; close; } - if(checkweight(536,.@amount) == 0) { + if(checkweight(536,.@input) == 0) { mes "[Ice Cream Maker]"; mes "Dear customer,you look like you're carrying a lot."; mes "Ice Cream is fine,"; @@ -75,6 +76,9 @@ alberta,120,45,2 script Ice Cream Maker::IceCreamer 85,{ close; } +// Alberta +alberta,120,45,2 duplicate(IceCreamer) Ice Cream Maker#1 85 + // Morroc Field moc_fild16,88,304,4 duplicate(IceCreamer) Ice Cream Maker#2 85 diff --git a/npc/merchants/socket_enchant.txt b/npc/merchants/socket_enchant.txt index 8f8a13b0d..9e9af6d68 100644 --- a/npc/merchants/socket_enchant.txt +++ b/npc/merchants/socket_enchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team //===== Current Version: ===================================== -//= 1.9 +//= 2.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -26,9 +26,10 @@ //= 1.8 Added missing Gae Bolg and Dragon Slayer. [Kisuka] //= 1.9 Moved Episode 12 items to separate NPC. //= Some cleanup & optimization. [Gepard] +//= 2.0 Duplicates now spawn from floating NPCs. [L0ne_W0lf] //============================================================ -payon,140,151,5 script Seiyablem#pay 84,{ +- script Seiyablem#dummy::SocketEnchant -1,{ if (checkweight(1201,1) == 0) { mes "- Wait a minute !! -"; @@ -333,11 +334,12 @@ function script Func_Socket { } } -lhz_in02,281,35,5 duplicate(Seiyablem#pay) Seiyablem#lhz 84 -prt_in,33,70,5 duplicate(Seiyablem#pay) Seiyablem#prt 84 -morocc,51,41,4 duplicate(Seiyablem#pay) Seiyablem#moc 84 +payon,140,151,5 duplicate(SocketEnchant) Seiyablem#pay 84 +lhz_in02,281,35,5 duplicate(SocketEnchant) Seiyablem#lhz 84 +prt_in,33,70,5 duplicate(SocketEnchant) Seiyablem#prt 84 +morocc,51,41,4 duplicate(SocketEnchant) Seiyablem#moc 84 -prt_in,31,57,1 script Young Man#prt 97,{ +- script Young Man#dummy::SocketMan -1,{ mes "[Young Man]"; mes "I'm considering becoming a Slotting Engineer."; mes "It's a new field where you can add Slots to equipment, and it'd be cool if I can work in such a lucrative career."; @@ -354,6 +356,7 @@ prt_in,31,57,1 script Young Man#prt 97,{ close; } -payon,143,143,7 duplicate(Young Man#prt) Young Man#pay 97 -morocc,60,42,3 duplicate(Young Man#prt) Young Man#moc 97 -lhz_in02,269,33,5 duplicate(Young Man#prt) Young Man#lhz 97 +prt_in,31,57,1 duplicate(SocketMan) Young Man#prt 97 +payon,143,143,7 duplicate(SocketMan) Young Man#pay 97 +morocc,60,42,3 duplicate(SocketMan) Young Man#moc 97 +lhz_in02,269,33,5 duplicate(SocketMan) Young Man#lhz 97 diff --git a/npc/merchants/socket_enchant2.txt b/npc/merchants/socket_enchant2.txt index 58b934b24..e7f14c37c 100644 --- a/npc/merchants/socket_enchant2.txt +++ b/npc/merchants/socket_enchant2.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Gepard //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -11,9 +11,10 @@ //= Adds slots to selected weapons and armor. //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Duplicates now spawn from floating NPCs. [L0ne_W0lf] //============================================================ -payon,236,199,3 script Leablem 86,{ +- script Leablem#dummy::SocketEnchant2 -1,{ if (checkweight(1201,1) == 0) { mes "- Wait a seconds !! -"; @@ -377,9 +378,10 @@ payon,236,199,3 script Leablem 86,{ } } -lighthalzen,96,137,3 duplicate(Leablem) Leablem#lhz 86 -prontera,244,169,5 duplicate(Leablem) Leablem#prt 86 -moc_ruins,154,86,3 duplicate(Leablem) Leablem#moc 86 +payon,236,199,3 duplicate(SocketEnchant2) Leablem#pay 86,{ +lighthalzen,96,137,3 duplicate(SocketEnchant2) Leablem#lhz 86 +prontera,244,169,5 duplicate(SocketEnchant2) Leablem#prt 86 +moc_ruins,154,86,3 duplicate(SocketEnchant2) Leablem#moc 86 function script Func_Socket2 { diff --git a/npc/other/auction.txt b/npc/other/auction.txt index 4a033fa3a..20fcde573 100644 --- a/npc/other/auction.txt +++ b/npc/other/auction.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.0 First version, place holders only. [L0ne_W0lf] //= 1.1 Moved Morroc Auction NPCs to Morroc Ruins. [L0ne_W0lf] //= 1.2 Warp fixed. Dialog in Ruins/Lighthalzen changed. [Kisuka] +//= 1.3 Duplicates now spawn from floating NPCs. [L0ne_W0lf] //============================================================ // Auction House warpers @@ -72,14 +73,15 @@ function script F_AuctionWarper { // Sign posts //============================================================ -moc_ruins,76,176,6 script Information Post#moc::AuctionSign 837,{ +- script Information Post#dum::AuctionSign -1,{ mes "[Information]"; mes "Auction Warp Guide"; close; } -prontera,216,120,4 duplicate(AuctionSign) Information Post#prt 837,{ -yuno,131,116,0 duplicate(AuctionSign) Information Post#yuno 837,{ +moc_ruins,76,176,6 duplicate(AuctionSign) Information Post#moc 837 +prontera,216,120,4 duplicate(AuctionSign) Information Post#prt 837 +yuno,131,116,0 duplicate(AuctionSign) Information Post#yuno 837 lighthalzen,207,169,6 duplicate(AuctionSign) Information Post#lhz 837 // Warps @@ -91,7 +93,7 @@ auction_02,43,17,0 warp auction_enterance_lhz 1,1,lighthalzen,209,169 // Auction House NPCs //============================================================ -auction_01,182,68,6 script Auction Broker#moc1::AuctionBroker 98,{ +- script Auction Broker#dum::AuctionBroker -1,{ mes "[Auction Broker]"; mes "Welcome to the Auction Hall."; mes "Would you like to view the goods?"; @@ -114,6 +116,7 @@ auction_01,182,68,6 script Auction Broker#moc1::AuctionBroker 98,{ close; } +auction_01,182,68,6 duplicate(AuctionBroker) Auction Broker#moc1 98 auction_01,182,75,0 duplicate(AuctionBroker) Auction Broker#moc2 99 auction_01,177,75,2 duplicate(AuctionBroker) Auction Broker#moc3 98 auction_01,177,68,4 duplicate(AuctionBroker) Auction Broker#moc4 99 diff --git a/npc/other/comodo_gambling.txt b/npc/other/comodo_gambling.txt index 155e21031..9f563141f 100644 --- a/npc/other/comodo_gambling.txt +++ b/npc/other/comodo_gambling.txt @@ -21,6 +21,7 @@ //= Added missing emotions and cutins //= 1.1- Updated prizes according to 11.1 NPC [Paradox924X] //= 1.2 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.3 Added missing item. [Kisuka] //============================================================ comodo,219,160,3 script Kachua 91,{ @@ -169,6 +170,7 @@ comodo,219,160,3 script Kachua 91,{ else if (.@gamble2 == 81) set .@item,1560; // Sage's Diary[2] else if (.@gamble2 == 82) set .@item,1618; // Survivor's Rod[1] else if (.@gamble2 == 83) set .@item,1620; // Survivor's Rod[1] + else if (.@gamble2 > 83 && .@gamble2 < 86) set .@item,1971; // Electric Wire } else if ((.@gamble1 > 0) && (.@gamble1 < 201)) set .@item,1201; // Knife[3] else if ((.@gamble1 > 200) && (.@gamble1 < 301)) set .@item,1101; // Sword[3] diff --git a/npc/other/mail.txt b/npc/other/mail.txt index 626efcb0b..778dba4f4 100644 --- a/npc/other/mail.txt +++ b/npc/other/mail.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -17,14 +17,12 @@ //= 1.3a Corrected a typo error. (bugreport:798) [Samuray22] //= 1.4 Added a Mapflag to prevent mail operations in other maps [Zephyrus] //= 1.5 Moved Morroc Mail boxes to Morroc Ruins. [L0ne_W0lf] +//= 1.6 Duplicates now spawn from floating NPCs. [L0ne_W0lf] //============================================================ -// Allow Mail Inbox reading from +// Floating mailbox npc that all NPCs duplicate from. //============================================================ - -// Prontera -//============================================================ -prontera,146,86,0 script Mailbox#prt::MailBox 888,{ +- script Mailbox#dummy::MailBox -1,{ mes "[Mailbox]"; mes "If you'd like to use"; mes "the Mailbox Service,"; @@ -57,6 +55,9 @@ prontera,146,86,0 script Mailbox#prt::MailBox 888,{ close; } +// Prontera +//============================================================ +prontera,146,86,0 duplicate(MailBox) Mailbox#prt 888 prontera,275,213,0 duplicate(MailBox) Mailbox#2prt 888 prontera,34,212,0 duplicate(MailBox) Mailbox#3prt 888 diff --git a/npc/other/mercenary_rent.txt b/npc/other/mercenary_rent.txt index 645f7dfd6..23c3e78c1 100644 --- a/npc/other/mercenary_rent.txt +++ b/npc/other/mercenary_rent.txt @@ -1,9 +1,10 @@ //===== eAthena Script ======================================= +//===== eAthena Script ======================================= //= Mercenary related NPCs //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.2 +//= 1.3 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -14,6 +15,7 @@ //= 1.0 First version. [L0ne_W0lf] //= 1.1 Optimization. [Zephyrus] //= 1.2 Removed redundent input. [L0ne_W0lf] +//= 1.3 Duplicates now spawned from floating NPCs. [L0ne_W0lf] //============================================================ prontera,41,337,5 script Mercenary Manager#Spear 105,{ @@ -653,7 +655,7 @@ pay_arche,99,167,4 script Mercenary Manager#Bow 732,{ // Mercenary Merchant NPCs //============================================================ -prontera,30,337,4 script Mercenary Merchant#Spear::MercMerchant 700,{ +- script Mercenary Merchant#dummy::MercMerchant -1,{ mes "[Mercenary Goods Merchant]"; mes "Hello, I sell goods"; mes "that Mercenaries can"; @@ -698,8 +700,10 @@ prontera,30,337,4 script Mercenary Merchant#Spear::MercMerchant 700,{ next; callfunc "F_PurchaseMercItem",12243,2100; } + close; } +prontera,30,337,4 duplicate(MercMerchant) Mercenary Merchant#Spear 700 izlude,56,139,4 duplicate(MercMerchant) Mercenary Merchant#Sword 892 pay_arche,102,167,5 duplicate(MercMerchant) Mercenary Merchant#Bow 879 diff --git a/npc/other/pvp.txt b/npc/other/pvp.txt index 05c56e2e5..5a7673ce9 100644 --- a/npc/other/pvp.txt +++ b/npc/other/pvp.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88; L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -26,15 +26,12 @@ //= exception of the "Free for all" mode. //= Added PVP event NPCs. //= 1.4 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] +//= 1.5 Duplicates now spawn from floating NPCs. [L0ne_W0lf] //============================================================ -// Morroc +// Floating NPC //============================================================ -morocc_in,144,138,4 script PVPNarrator#moc 84,{ - callfunc "F_PVPNarrator","morocc_in",141,139; -} - -morocc_in,144,142,4 script Gate Keeper#moc::PVPGateKeeper 83,{ +- script Gate Keeper#dummy::PVPGateKeeper -1,{ mes "[Gate Keeper]"; mes "Glad to be of service."; mes "I will open the PVP fight"; @@ -114,6 +111,15 @@ morocc_in,144,142,4 script Gate Keeper#moc::PVPGateKeeper 83,{ } } +// Morroc +//============================================================ +morocc_in,144,138,4 script PVPNarrator#moc 84,{ + callfunc "F_PVPNarrator","morocc_in",141,139; +} + +morocc_in,144,142,4 duplicate(PVPGateKeeper) Gate Keeper#moc 83,{ + + // Alberta //============================================================ alberta_in,22,146,4 script PVP Narrator#alb 84,{ @@ -465,7 +471,7 @@ OnInit: // Spectator Entrance //============================================================ -pvp_room,62,85,4 script Spectator's Entrance#1::PVPSpectator 105,{ +- script Spectator's Entrance#dum::PVPSpectator -1,{ if (countitem(7029) == 0) { mes "[PVP Compete Square Register Staff]"; mes "This is the entrance for viewers."; @@ -492,6 +498,8 @@ OnInit: end; } +pvp_room,62,85,4 duplicate(PVPSpectator) Spectator's Entrance#1 105 + pvp_room,70,85,4 duplicate(PVPSpectator) Spectator's Entrance#2 105 pvp_room,78,85,4 duplicate(PVPSpectator) Spectator's Entrance#3 105 @@ -500,7 +508,7 @@ pvp_room,86,85,4 duplicate(PVPSpectator) Spectator's Entrance#4 105 // Spectator Warps //============================================================ -pvp_2vs2,5,4,0 script Combat Square Staff#1::PVPSpecWarp 45,1,1,{ +- script Combat Square Staff#dum::PVPSpecWarp -1,{ OnTouch: mes "[Combat Square Staff]"; mes "May I help you?"; @@ -512,6 +520,8 @@ OnTouch: end; } +pvp_2vs2,5,4,0 duplicate(PVPSpecWarp) Combat Square Staff#1 45,1,1,{ + pvp_2vs2,5,74,0 duplicate(PVPSpecWarp) Combat Square Staff#2 45,1,1 pvp_2vs2,74,74,0 duplicate(PVPSpecWarp) Combat Square Staff#3 45,1,1 diff --git a/npc/quests/newgears/2006_headgear.txt b/npc/quests/newgears/2006_headgear.txt index e8980b0be..25d69475d 100644 --- a/npc/quests/newgears/2006_headgear.txt +++ b/npc/quests/newgears/2006_headgear.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= DiviniaRO members, cleaned by reddozen //===== Current Version: ===================================== -//= 1.3a +//= 1.4 //===== Compatible With: ===================================== //= SVN eA //===== Description: ========================================= @@ -21,6 +21,7 @@ //= Fixed some of the names to iRO. //= 1.3 Fixed some color code bugs in Ghenirhemin. Thanks to yyCC. [L0ne_W0lf] //= 1.3a Fixed wrong item names (due to copy/paste) [Lupus] +//= 1.4 Chungwolmang now checks if the last item set should be deleted. (bugreport:4719) [L0ne_W0lf] //============================================================ //===================== Censor Bar ===================================================== @@ -781,7 +782,8 @@ S_MakeMask: delitem getarg(1),getarg(2); delitem getarg(3),getarg(4); delitem getarg(5),getarg(6); - delitem getarg(7),getarg(8); + if (getarg(0) == 5169) + delitem getarg(7),getarg(8); getitem getarg(0),1; set moza_tal,0; mes "[Chungwolmang]"; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index e1b885d5d..a85c3173d 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -33,6 +33,7 @@ //= 1.4 Changed killmonsterall -> killmonster. (bugreport:4131) //= 1.5 Removed a 'close;' which should have been 'close2'. (bugreport:4276) //= 1.6 Fixed check in cat hand agent. +//= 1.7 Moved the close in Cat Hand Service Warps. (bugreport:4079) [L0ne_W0lf] //============================================================ // Onward to the New World @@ -8956,8 +8957,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: break; } @@ -8972,8 +8973,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 5500) { set zeny,zeny-5500; @@ -8982,8 +8983,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: break; } @@ -8998,8 +8999,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 5025) { set zeny,zeny-5025; @@ -9008,8 +9009,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 5025) { set zeny,zeny-5025; @@ -9018,8 +9019,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: break; } @@ -9034,8 +9035,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 5025) { set zeny,zeny-5025; @@ -9044,8 +9045,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 5025) { set zeny,zeny-5025; @@ -9054,8 +9055,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: if (Zeny >= 5025) { set zeny,zeny-5025; @@ -9064,8 +9065,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 5: break; } @@ -9080,8 +9081,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9090,8 +9091,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9100,8 +9101,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9110,8 +9111,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 5: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9120,8 +9121,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 6: break; } @@ -9136,8 +9137,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9146,8 +9147,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9156,8 +9157,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9166,8 +9167,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 5: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9176,8 +9177,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 6: if (Zeny >= 4765) { set zeny,zeny-4765; @@ -9186,8 +9187,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 7: break; } @@ -9202,8 +9203,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9212,8 +9213,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9222,8 +9223,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9232,8 +9233,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 5: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9242,8 +9243,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 6: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9252,8 +9253,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 7: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9262,8 +9263,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 8: break; } @@ -9338,8 +9339,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9348,8 +9349,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9358,8 +9359,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9368,8 +9369,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 5: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9378,8 +9379,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 6: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9388,8 +9389,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 7: if (Zeny >= 4590) { set zeny,zeny-4590; @@ -9398,8 +9399,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 8: break; } @@ -9414,8 +9415,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 4170) { set zeny,zeny-4170; @@ -9424,8 +9425,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 4170) { set zeny,zeny-4170; @@ -9434,8 +9435,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: if (Zeny >= 4170) { set zeny,zeny-4170; @@ -9444,8 +9445,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 5: if (Zeny >= 4170) { set zeny,zeny-4170; @@ -9454,8 +9455,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 6: if (Zeny >= 4170) { set zeny,zeny-4170; @@ -9464,8 +9465,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 7: if (Zeny >= 4170) { set zeny,zeny-4170; @@ -9474,8 +9475,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 8: if (Zeny >= 4170) { set zeny,zeny-4170; @@ -9484,8 +9485,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 9: break; } @@ -9500,8 +9501,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 4025) { set zeny,zeny-4025; @@ -9510,8 +9511,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 4025) { set zeny,zeny-4025; @@ -9520,8 +9521,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: if (Zeny >= 4025) { set zeny,zeny-4025; @@ -9530,8 +9531,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 5: if (Zeny >= 4025) { set zeny,zeny-4025; @@ -9540,8 +9541,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 6: if (Zeny >= 4025) { set zeny,zeny-4025; @@ -9550,8 +9551,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 7: if (Zeny >= 4025) { set zeny,zeny-4025; @@ -9560,8 +9561,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 8: if (Zeny >= 4025) { set zeny,zeny-4025; @@ -9570,8 +9571,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 9: if (Zeny >= 4025) { set zeny,zeny-4025; @@ -9580,8 +9581,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 10: break; } @@ -9596,8 +9597,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9606,8 +9607,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9616,8 +9617,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 4: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9626,8 +9627,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 5: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9636,8 +9637,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 6: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9646,8 +9647,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 7: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9656,8 +9657,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 8: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9666,8 +9667,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 9: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9676,8 +9677,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 10: if (Zeny >= 3970) { set zeny,zeny-3970; @@ -9686,8 +9687,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 11: break; } @@ -9708,8 +9709,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 2: if (Zeny >= 5500) { set zeny,zeny-5500; @@ -9718,8 +9719,8 @@ mid_camp,62,125,4 script Cat Hand Agent 421,{ else { mes "[Cat Hand Agent]"; mes "Don't play with money."; - close; } + close; case 3: mes "[Cat Hand Agent]"; mes "Thank you for using our service."; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 27d9aa452..1917386cf 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -4,7 +4,7 @@ //= Persian, Vicious_Pucca, aoa00, Evera, MasterOfMupppets, //= Lupus, Lord Gywall //===== Current Version: ===================================== -//= 4.6 +//= 4.7 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -76,6 +76,7 @@ //= 4.5 Official Gangster Alert script. [Gepard] //= 4.6 Added quest log entries for: //= - Cursed Spirit Quest +//= 4.7 Fixed missing label. (bugreport:4654) [L0ne_W0lf] //============================================================ // Gangster Alert [Aegis Conversion] @@ -5235,89 +5236,93 @@ lhz_in01,114,181,3 script Representative 71,{ mes "to the Rekenber Corporation."; mes "How may I be of service today?"; next; - if(lhz_curse == 7) menu "Building Information",L_Building,"Corporation History",L_History; - else menu "Building Information",L_Building; - - while(1) { - mes "[Representative]"; - mes "Please tell me"; - mes "which floor you'd like"; - mes "to know more about."; - next; - switch( select( "1F","2F","B1","Cancel" ) ) - { - case 1: - mes "[Representative]"; - mes "The ^3131FFRekenber Library^000000 can"; - mes "be found at the end of the"; - mes "left hallway. Our library is"; - mes "a great resource of innovative"; - mes "ideas and information for our"; - mes "system development employees."; - next; - mes "[Representative]"; - mes "The ^3131FFBall Room^000000, where"; - mes "various official events are"; - mes "usually held, can be accessed"; - mes "through the right hallway."; - next; - break; + if(lhz_curse == 7) + select("Building Information","Corporation History"); + else + select("Building Information"); + + if (@menu == 1) { + while(1) { + mes "[Representative]"; + mes "Please tell me"; + mes "which floor you'd like"; + mes "to know more about."; + next; + switch( select( "1F","2F","B1","Cancel" ) ) + { + case 1: + mes "[Representative]"; + mes "The ^3131FFRekenber Library^000000 can"; + mes "be found at the end of the"; + mes "left hallway. Our library is"; + mes "a great resource of innovative"; + mes "ideas and information for our"; + mes "system development employees."; + next; + mes "[Representative]"; + mes "The ^3131FFBall Room^000000, where"; + mes "various official events are"; + mes "usually held, can be accessed"; + mes "through the right hallway."; + next; + break; - case 2: - mes "[Representative]"; - mes "Please use the stairs"; - mes "located on both sides of"; - mes "the Help Desk to go to the"; - mes "Second Floor. The Second"; - mes "Floor is mostly used for"; - mes "administrative purposes."; - next; - mes "[Representative]"; - mes "There, you can find"; - mes "the ^3131FFConference Room^000000,"; - mes "^3131FFSecretary Office^000000, the"; - mes "^3131FFAuditorium^000000 and the"; - mes "^3131FFChairman's Office^000000."; - next; - break; + case 2: + mes "[Representative]"; + mes "Please use the stairs"; + mes "located on both sides of"; + mes "the Help Desk to go to the"; + mes "Second Floor. The Second"; + mes "Floor is mostly used for"; + mes "administrative purposes."; + next; + mes "[Representative]"; + mes "There, you can find"; + mes "the ^3131FFConference Room^000000,"; + mes "^3131FFSecretary Office^000000, the"; + mes "^3131FFAuditorium^000000 and the"; + mes "^3131FFChairman's Office^000000."; + next; + break; - case 3: - mes "[Representative]"; - mes "The first underground floor"; - mes "is used by the ^3131FFRegenshirm^000000,"; - mes "our laboratory affiliate. For"; - mes "security reasons, this floor"; - mes "is not accessible to visitors"; - next; - break; + case 3: + mes "[Representative]"; + mes "The first underground floor"; + mes "is used by the ^3131FFRegenshirm^000000,"; + mes "our laboratory affiliate. For"; + mes "security reasons, this floor"; + mes "is not accessible to visitors"; + next; + break; - case 4: - mes "[Representative]"; - mes "We are always doing our"; - mes "best to provide the best"; - mes "services to our customers."; - mes "Remember that Rekenber"; - mes "is the name you can trust."; - mes "Thank you and have a nice day."; - close; + case 4: + mes "[Representative]"; + mes "We are always doing our"; + mes "best to provide the best"; + mes "services to our customers."; + mes "Remember that Rekenber"; + mes "is the name you can trust."; + mes "Thank you and have a nice day."; + close; + } } } - -L_History: - mes "[Representative]"; - mes "If you're interested in"; - mes "learning the history of"; - mes "our corporation, please"; - mes "speak to the representative"; - mes "inside our Library. Thank you."; - next; - mes "[Representative]"; - mes "Please head down"; - mes "the hallway to the left in"; - mes "order to find our Library."; - mes "Thank you and have a nice day."; - changequest 2087,2088; - set lhz_curse,8; + else { + mes "[Representative]"; + mes "If you're interested in"; + mes "learning the history of"; + mes "our corporation, please"; + mes "speak to the representative"; + mes "inside our Library. Thank you."; + next; + mes "[Representative]"; + mes "Please head down"; + mes "the hallway to the left in"; + mes "order to find our Library."; + mes "Thank you and have a nice day."; + changequest 2087,2088; + set lhz_curse,8; + } close; } diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 8371f59bd..89f642316 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.8 +//= 1.9 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -20,6 +20,7 @@ //= 1.6 Added 'tides' to Ibanoff & Fixed time check for Marozka. [Kisuka] //= 1.7 Fixes on donpcevents and fixed some left over aegis stuff. [Kisuka] //= 1.8 Fixed some condition checks. [Gepard] +//= 1.9 Corrected NPC counting mobs for the wrong NPC. (bugreport:4736) [L0ne_W0lf] //============================================================ //============================================================================ @@ -5117,7 +5118,7 @@ OnDisable: end; OnMyMobDead: - if (mobcount("mosk_ship","Baehideun1#ship::OnMyMobDead") < 1) { + if (mobcount("mosk_ship","Baehideun4#ship::OnMyMobDead") < 1) { set $@mos1_edq,0; mes "[Mr. Ibanoff]"; mes "Now that all the monsters are gone,"; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index 8decb1264..a3647b34a 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.9 +//= 2.0 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -43,6 +43,7 @@ //= 1.9 Added quest log entries for: //= - Siblings Quest //= - Thor Volcano Base Quest +//= 2.0 Removed lvel requirement. (bugreport:4678) [L0ne_W0lf] //============================================================ // Stone Quest @@ -56,7 +57,7 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{ mes "- you put some items into Kafra Storage. -"; close; } - if ((veins_stone == 0) && (BaseLevel > 59)) { + if (veins_stone == 0) { mes "[Zabaroo]"; mes "My back is killing me"; mes "after stooping over to"; @@ -300,11 +301,6 @@ ve_fild05,257,130,4 script Wincing Old Man#ve 945,{ mes "care of myself at my age..."; close; } - mes "[Zabaroo]"; - mes "I'm sorry dear."; - mes "You're not strong enough for this kind of work."; - mes "Put on some muscle and talk to me again."; - close; } ve_in,169,310,6 script Strange Old Man#ve 121,{ diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt index 9d417cc1a..6c35b4102 100644 --- a/npc/quests/skills/rogue_skills.txt +++ b/npc/quests/skills/rogue_skills.txt @@ -237,9 +237,9 @@ in_rogue,355,179,0 script Haijara Greg#rogueguild 46,{ mes "[Haijara Greg]"; mes "Hmm... Well, I suppose"; if (Upper == 1) - mes "I can trust a fellow Rogue"; - else mes "I can trust a fellow Stalker"; + else + mes "I can trust a fellow Rogue"; mes "with my predictament. Honor"; mes "among thieves and all that."; mes "Alright. Have you ever heard"; |