diff options
| -rw-r--r-- | npc/Changelog.txt | 4 | ||||
| -rw-r--r-- | npc/cities/izlude.txt | 84 | ||||
| -rw-r--r-- | npc/cities/jawaii.txt | 22 | ||||
| -rw-r--r-- | npc/kafras/functions_kafras.txt | 3 |
4 files changed, 99 insertions, 14 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 9476c7dcc..ce6c39595 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,10 @@ Date Added ====== 2007/06/16 + * Rev. 10777 Fixed the Kafra function, which was screwing up teleporting. [L0ne_W0lf] + * Undid come of the changes to the Jawaii and Izlude NPCs. + - Changed ispartneton() back to getpartnerid() + - Added Cebalis' dialog back in, and fixed a problem with Dega. * Added Byorgue and Ifrit to spawns [Playtester] - lowered Atroce respawn time on Veins fields * Added Louyang Revolution quest. [SinSloth] diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt index 2a26148c4..c26b4ecad 100644 --- a/npc/cities/izlude.txt +++ b/npc/cities/izlude.txt @@ -26,6 +26,9 @@ //= Removed Honeymoon Helper, as she is a Jawaii NPC. //= Moved Signs to the msg_boards file. //= 1.8a Made Red/Cebalis as a single NPC + duplicate [Lupus] +//= 1.9 Fixed a small problem with Dega. (Ne default case) [L0ne_W0lf] +//= Re-added NPC dialog for Cebalis. The dialog differs +//= (even if slightly,) after the five or so lines. //============================================================ // Izlude @@ -145,7 +148,7 @@ izlude,119,121,2 script Cuskoal#izlude 124,{ izlude,150,118,2 script Dega#izlude 84,{ mes "[Dega]"; - switch(rand(4)) { + switch(rand(3)) { case 1: mes "Mt. Mjornir, located north of Prontera, is a tough"; mes "and steep climb."; @@ -165,7 +168,7 @@ izlude,150,118,2 script Dega#izlude 84,{ mes "[Dega]"; mes "If you try to cast magic near it, it will notice and saunter over to smash you. So you better watch out for Golem."; close; - case 3: + Default: mes "There's a very delightful place where you can find every"; mes "type of Poring."; next; @@ -321,7 +324,82 @@ izlude,56,126,2 script Red#izlude::RedCebalis 85,{ close; } -izlude,58,126,2 duplicate(RedCebalis) Cebalis#izlude 98 +izlude,58,126,2 script Cebalis#izlude 98,{ + mes "[Red]"; + mes "The only skill that's needed for a Swordman is ^FF2400Bash^000000! Bash, Bash and ONLY ^FF2400Bash^000000! No need to waste time and effort on smaller skills~~ Everything else is for cowards and wusses!"; + next; + mes "[Cebalis]"; + mes "What are you talking about!? The ideal Swordman resolutely stands alone, surrounded by countless foes, smashing them all with one awesome attack..."; + next; + mes "[Cebalis]"; + mes "^EE0000MAGNUM BREAK!^000000"; + mes "That's right, Magnum Break"; + mes "is the perfect"; + mes "Swordman skill."; + next; + mes "[Cebalis]"; + mes "Well..."; + mes "Sometimes the explosion accidentally hits some monsters that are just wandering around."; + next; + mes "[Cebalis]"; + mes "Then they all end up coming after you, but that's a risk a true Swordman should be willing to take."; + next; + mes "[Red]"; + mes "That's exactly why you're dumb, you idiot! And what was that about the 'ideal Swordman?' You remember the last time you used Magnum Break?!"; + next; + mes "[Red]"; + mes "You had to run away from all those Porings hit by that stupid skill! You weakling! All those Porings that you hit tried to kill you! "; + next; + mes "[Cebalis]"; + mes "Oh shut up. And those were Poporings. As I recall, you were running away too, apparently too busy to use your precious Bash."; + next; + mes "[Cebalis]"; + mes "In any case, Magnum Break is THE skill for a Swordman~!! Something simplistic like Bash is just one of those little steps towards Magnum Break."; + next; + mes "[Red]"; + mes "Oh man~"; + mes "Hey, I know you"; + mes "heard everything."; + mes "So what do you think?"; + next; + mes "[Red]"; + mes "Which one do you think is better? The critical damage skill, ^FF2400Bash^000000, or the Splash damage skill, ^EE0000Magnum Break^000000?"; + next; + if (select("Bash:Magnum Break") == 1) { + if (BaseClass == Job_Swordman) { + mes "[Red]"; + mes "Hahahaha!!! I knew you'd see things my way!! You ARE a great guy!! Without a doubt, only ^FF2400Bash^000000 suits a Swordman. Please tell that to FUNBOY over here!! Hahaha."; + next; + mes "[Red]"; + mes "Hmm, let me give you a bit of advice. After you achieve level 5 Bash, the amount of SP consumed by the skill increases greatly, so watch out for your SP."; + close; + } + mes "[Red]"; + mes "Hahahaha!!"; + mes "See!? Someone who pursues a different job agrees with me~! You really are a great guy! Hahaha!!"; + next; + mes "[Red]"; + mes "Without a doubt, only ^FF2400Bash^000000 suits a Swordman. Please tell that to this MORON over here!! Hahaha~"; + close; + } + if (BaseClass == Job_Swordman) { + mes "[Cebalis]"; + mes " Alright!! ^EE0000Magnum Break^000000 is the BEST!! Now you're talking~!! You know your stuff, kid. HaHaHa~!"; + next; + mes "[Cebalis]"; + mes "You wanna know some useful information? Okay, okay lemme tell ya! The explosion from 'Magnum Break' has the Fire Property."; + next; + mes "[Cebalis]"; + mes "So it won't be very effective against Water property monsters, but this is THE skill to use against Undead and Earth property monsters.!"; + next; + mes "[Cebalis]"; + mes "And most importantly, look around before you use it. Otherwise you'll be in BIG trouble~ "; + close; + } + mes "[Cebalis]"; + mes "I'm right, aren't I?! ^EE0000Magnum Break^000000 is THE BEST!!! You know what you're talking about, eh? I don't know why this LARDFACE is sooooo stubborn."; + close; +} izlude,124,178,2 script Soldier#izlude 105,{ mes "[Soldier]"; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 0cf68ba1d..39f68f129 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -5,7 +5,7 @@ //= DNett123 (1.1 - 1.5) //= L0ne_w0lf //===== Current Version: ===================================== -//= 3.1 +//= 3.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -28,6 +28,8 @@ //= 3.0 Rescripted to Aegis 10.3 standard. Contains all Jawaii-related NPCs. [L0ne_W0lf] //= 3.1 Fixed bugs with getpartnerid() (it never returns 1), fixed some conditons, //= replaced getpartnerid() with ispartneron() at some tri-forks [Lupus] +//= 3.2 Reverted ispartneron() BACK to getpartnerid(). [L0ne_W0lf] +//= None of the NPCs need the player's partner to be online. //============================================================ // Jawaii //============================================================ @@ -424,7 +426,7 @@ jawaii,214,168,5 script Honeymoon Helper#Jawaii 71,{ jawaii_in,25,94,0 script Employee#jaw1 724,{ mes "[Employee Tryteh]"; mes "Welcome to Jawaii Tavern~"; - if (ispartneron()) { + if (getpartnerid()) { mes "Anyway, I am so glad that you two have gotten married. I hope you both will live happily ever after~"; next; mes "[Employee Tryteh]"; @@ -453,7 +455,7 @@ OnSolo: jawaii_in,25,96,0 script Employee#jaw2 724,{ mes "[Employee Fey]"; mes "Welcome to Jawaii Tavern~"; - if (ispartneron()) { + if (getpartnerid()) { next; mes "[Employee Fey]"; mes "We hope that you enjoy your time here with the one that you love. Isn't this place nice and cozy,"; @@ -483,7 +485,7 @@ OnSolo: jawaii_in,25,98,0 script Employee#jaw3 724,{ mes "[Employee Buffy]"; mes "Welcome to Jawaii Tavern~"; - if (ispartneron()) { + if (getpartnerid()) { next; mes "[Employee Buffy]"; mes "Oh~"; @@ -528,7 +530,7 @@ jawaii_in,25,100,0 script Employee#jaw4 724,{ mes "[Employee Itere]"; mes "Welcome to"; mes "Jawaii Tavern~"; - if (ispartneron()) { + if (getpartnerid()) { next; mes "[Employee Itere]"; mes "Oh~"; @@ -566,7 +568,7 @@ OnSolo: jawaii_in,30,94,4 script Employee#jaw5 724,{ mes "[Employee Tonia]"; mes "Welcome to Jawaii Tavern~"; - if (ispartneron()) { + if (getpartnerid()) { next; mes "[Employee Tonia]"; mes "Congratulations to both of you!"; @@ -599,7 +601,7 @@ OnSolo: jawaii_in,30,96,4 script Employee#jaw6 724,{ mes "[Employee Kay]"; mes "Welcome to Jawaii Tavern~"; - if (ispartneron()) { + if (getpartnerid()) { next; mes "[Employee Kay]"; mes "Oh gosh...!"; @@ -624,7 +626,7 @@ OnSolo: jawaii_in,30,98,4 script Employee#jaw7 724,{ mes "[Employee Amy]"; mes "Welcome to Jawaii Tavern~"; - if (ispartneron()) { + if (getpartnerid()) { mes "Oh! You and your partner look perfect for each other. Like, um,"; mes "a gun and a bullet! No...?"; next; @@ -658,7 +660,7 @@ OnSolo: jawaii_in,30,100,4 script Employee#jaw8 724,{ mes "[Employee Yasmine]"; mes "Welcome to Jawaii Tavern~"; - if (ispartneron()) { + if (getpartnerid()) { mes "Just like the moon and the stars, you and your partner look perfect together. I'm really happy for you!"; close; } @@ -1339,7 +1341,7 @@ prt_in,173,13,4 script Customer#SoloHan 86,{ warp "jawaii_in",44,124; end; } - else if (ispartneron()) { + else if (getpartnerid()) { mes "Oh man..."; mes "I think I'm drunk~"; mes "*Hiccup!*"; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 27616d30d..cf36e5e53 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -45,6 +45,7 @@ //= 5.4b temporary moved "-Guide" from the 1st menu punct [Lupus] //= 5.5 Added proper Niflheim welcome message. [L0ne_W0lf] //= Cleaned up the menus a bit. Got rid of the proceeding "-" prefix. +//= 5.5b Missed a preceeding hyphen, which was screwing up teleporting. [L0ne_W0lf] //============================================================ @@ -162,7 +163,7 @@ function script F_Kafra { next; goto M_Menu; } - if (@K_Menu0$[@num] == "-Use Teleport Service"){ + if (@K_Menu0$[@num] == "Use Teleport Service"){ if(getarg(1) == 4){ //Check for Einbroch Tele notice mes "[Kafra]"; mes "Because of the ^FF0000Limited Transport Agreement^000000, the Kafra Corporation cannot provide Teleport Services in the Schwarzwald Republic."; |