diff options
| -rw-r--r-- | npc/Changelog.txt | 2 | ||||
| -rw-r--r-- | npc/cities/alberta.txt | 28 | ||||
| -rw-r--r-- | npc/cities/aldebaran.txt | 53 | ||||
| -rw-r--r-- | npc/cities/amatsu.txt | 63 | ||||
| -rw-r--r-- | npc/cities/payon.txt | 45 |
5 files changed, 90 insertions, 101 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 62d38a5ff..972c653c6 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,5 +1,7 @@ Date Added ====== +2007/05/06 + * Revised 1/3 of the cities scripts. Thanks to CAHTEXNIK [Lupus] 2007/05/05 * Updated Abyss Lake Entrance Quest to official. [SinSloth] * Fixed a minor bug in Juperos Ruins History Quest. [SinSloth] diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 9a74d3313..844c9d5f0 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -12,7 +12,7 @@ //= 1.0 Converted from Aegis 10.4 [DZeroX] //============================================================ -alberta.gat,97,51,0 script Fabian 84,{ +alberta,97,51,0 script Fabian 84,{ mes "[Fabian]"; mes "Man... When you travel all around"; mes "the world, you'll hear of some"; @@ -37,7 +37,7 @@ alberta.gat,97,51,0 script Fabian 84,{ close; } -alberta.gat,53,39,0 script Steiner 100,{ +alberta,53,39,0 script Steiner 100,{ mes "[Steiner]"; mes "Oh...!"; mes "Welcome to Alberta,"; @@ -58,7 +58,7 @@ alberta.gat,53,39,0 script Steiner 100,{ close; } -alberta.gat,20,183,0 script Chad 49,{ +alberta,20,183,0 script Chad 49,{ mes "[Chad]"; mes "People say the legendary weapon"; mes "Gungnir never misses its target. I"; @@ -79,7 +79,7 @@ alberta.gat,20,183,0 script Chad 49,{ close; } -alberta.gat,189,151,5 script Fisk 100,{ +alberta,189,151,5 script Fisk 100,{ mes "[Fisk]"; mes "Ahoy mate,"; mes "where'd ya"; @@ -116,7 +116,7 @@ alberta.gat,189,151,5 script Fisk 100,{ } } -alb2trea.gat,39,50,6 script Fisk#a2t 100,{ +alb2trea,39,50,6 script Fisk#a2t 100,{ mes "[Fisk]"; mes "So you wanna head back to the"; mes "mainland in Alberta, eh?"; @@ -128,7 +128,7 @@ alb2trea.gat,39,50,6 script Fisk#a2t 100,{ } } -alberta.gat,131,139,2 script Drunken Old Man 54,{ +alberta,131,139,2 script Drunken Old Man 54,{ mes "[Deagle]"; mes "*^CCCCCCHiccup^000000*"; mes "Wh-what are you"; @@ -198,7 +198,7 @@ alberta.gat,131,139,2 script Drunken Old Man 54,{ } } -alberta.gat,58,80,2 script Shakir 99,{ +alberta,58,80,2 script Shakir 99,{ set .@random,rand(1,2); if (.@random == 1) { mes "[Shakir]"; @@ -246,7 +246,7 @@ alberta.gat,58,80,2 script Shakir 99,{ } } -alberta.gat,62,156,2 script Sonya 102,{ +alberta,62,156,2 script Sonya 102,{ set .@random,rand(1,3); if (.@random == 1) { mes "[Sonya]"; @@ -310,7 +310,7 @@ alberta.gat,62,156,2 script Sonya 102,{ } } -alberta.gat,93,174,2 script Grandmother Alma 103,{ +alberta,93,174,2 script Grandmother Alma 103,{ mes "[Grandmother Alma]"; mes "Some time ago,"; mes "a derelict ship"; @@ -346,7 +346,7 @@ alberta.gat,93,174,2 script Grandmother Alma 103,{ close; } -alberta.gat,195,151,2 script Paul 86,{ +alberta,195,151,2 script Paul 86,{ mes "[Paul]"; mes "Good day~"; mes "Would you like"; @@ -390,7 +390,7 @@ alberta.gat,195,151,2 script Paul 86,{ } } -alberta.gat,190,173,4 script Phelix 85,{ +alberta,190,173,4 script Phelix 85,{ set .@weight,MaxWeight-Weight; if ((.@weight) < 10000) { mes "[Phelix]"; @@ -570,7 +570,7 @@ alberta.gat,190,173,4 script Phelix 85,{ } } -alberta.gat,43,49,5 script Poor-looking Merchant 89,{ +alberta,43,49,5 script Poor-looking Merchant 89,{ mes "[Machen]"; mes "Why...?"; mes "How did my"; @@ -587,7 +587,7 @@ alberta.gat,43,49,5 script Poor-looking Merchant 89,{ close; } -alberta.gat,43,244,8 script Tourist 99,{ +alberta,43,244,8 script Tourist 99,{ mes "[Tourist]"; mes "Where am I...?"; mes "...Who am I?"; @@ -619,7 +619,7 @@ alberta.gat,43,244,8 script Tourist 99,{ close; } -alberta.gat,165,83,4 script Fastidious Old Man 755,{ +alberta,165,83,4 script Fastidious Old Man 755,{ mes "[Frank]"; mes "My back~"; mes "It's so sore!"; diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index a6019d5af..6e958f972 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= eAthena dev team //===== Current Version: ===================================== -//= 1.9a +//= 1.9b //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -572,8 +572,10 @@ aldeba_in,152,47,4 script Giddy Fellow 97,{ // Master ---------------------------------------------------------- aldeba_in,156,179,4 script Master#02 61,{ mes "[Master]"; - if(sex==0) mes "Oh hello. Don't mind me, I'm just a perverted old man.... la di da......."; - if(sex==0) close; + if(!sex) { + mes "Oh hello. Don't mind me, I'm just a perverted old man.... la di da......."; + close; + } mes "Did you know that the Kafra Main Office is located here, in Aldebaran?"; next; mes "[Master]"; @@ -831,11 +833,10 @@ aldeba_in,79,161,6 script Kafra#04 115,{ mes "The amount of special reserve points that you have is: ^FF0000"+RESRVPTS+"^000000 pts. Please make a choice based on your point total."; M_Menu: next; - menu "100- Sweet Potato 7 ea",M_1a, "200- Sweet Potato 15 ea",M_1b, "300- Sweet Potato 25 ea",M_1c, "400- Sweet Potato 35 ea",M_1d, + menu "100- Sweet Potato 7 ea",-, "200- Sweet Potato 15 ea",M_1b, "300- Sweet Potato 25 ea",M_1c, "400- Sweet Potato 35 ea",M_1d, "500- Sweet Potato 50 ea",M_1e, "600- Sweet Potato 60 ea",M_1f, "700- Sweet Potato 75 ea",M_1g, "800- Sweet Potato 85 ea",M_1h, "900- Sweet Potato 100 ea",M_1i, "1000- 1st Lottery Chance!",M_1j, "Next items",M_2, "Cancel",M_End; - M_1a: if(RESRVPTS < 100) goto sL_LowPts1; mes "[Kafra]"; mes "Here you are."; @@ -914,12 +915,11 @@ M_Menu: goto M_Menu; M_2: - menu "1100- Red Potion 7 ea",M_2a, "1300- Red Potion 15 ea",M_2b, "1500- Red Potion 25 ea",M_2c, + menu "1100- Red Potion 7 ea",-, "1300- Red Potion 15 ea",M_2b, "1500- Red Potion 25 ea",M_2c, "1700- Red Potion 35 ea",M_2d, "1900- Red Potion 50 ea",M_2e, "2100- Red Potion 60 ea",M_2f, "2300- Red Potion 75 ea",M_2g, "2500- Red Potion 85 ea",M_2h, "2800- Red Potion 100 ea",M_2i, "3000- 2nd Lotery Chance!",M_2j, "Previous List",M_Menu, "Cancel",M_End; - M_2a: if(RESRVPTS < 1100) goto sL_LowPts2; mes "[Kafra]"; mes "Here you are."; @@ -1021,9 +1021,8 @@ aldeba_in,88,161,3 script Kafra#05 115,{ mes "You have the following amount of special reserve points: ^5544FF"+RESRVPTS+"^000000."; mes "Make a choice and test your luck!"; next; - menu "5000pts = 1st Lottery Chance!",sM_1st, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End; + menu "5000pts = 1st Lottery Chance!",-, "7000pts = 2nd Lottery Chance!",sM_2nd, "10000pts = 3rd Lottery Chance!",sM_3rd, "Cancel",M_End; - sM_1st: if(RESRVPTS < 5000) goto sL_NotEnuf; set RESRVPTS, RESRVPTS - 5000; set @Lotto, 3; @@ -1435,7 +1434,15 @@ c_tower3,10,249,4 script Gatekeeper#01 84,{ close; M_2: mes "[Gatekeeper Riku]"; - if(countitem(7026) < 1) goto L_Check_Key; + if(countitem(7026) < 1) { + mes ". . . . . ."; + mes "Unfortunately you don't have a privilege"; + mes "To enter this Gate .."; + mes "You won't be able to go through"; + mes "As long as Ancient Alchemists"; + mes " Don't approve you."; + close; + } delitem 7026,1; mes "Hmm! I already felt that you are not an Ordinary person,"; mes "Now it seems to be successful in Speculation."; @@ -1445,14 +1452,6 @@ c_tower3,10,249,4 script Gatekeeper#01 84,{ warp "c_tower4",185,44; close; - L_Check_Key: - mes ". . . . . ."; - mes "Unfortunately you don't have a privilege"; - mes "To enter this Gate .."; - mes "You won't be able to go through"; - mes "As long as Ancient Alchemists"; - mes " Don't approve you."; - close; M_End: mes "[Gatekeeper Riku]"; mes "This Clock Tower"; @@ -1530,7 +1529,15 @@ alde_dun03,264,16,4 script Gatekeeper#02 101,{ close; M_2: mes "[Gatekeeper Boy]"; - if(countitem(7027) < 1) goto L_Check_Key; + if(countitem(7027) < 1) { + mes ". . . . . ."; + mes "Unfortunately you don't have a privilege"; + mes "To enter this Gate .."; + mes "You won't be able to go through"; + mes "As long as Ancient Alchemists"; + mes " Don't grant you."; + close; + } delitem 7027,1; mes "Hmm! I already felt that you are not an Ordinary person,"; mes "Now it seems to be successful in Speculation."; @@ -1540,14 +1547,6 @@ alde_dun03,264,16,4 script Gatekeeper#02 101,{ warp "alde_dun04",79,267; close; - L_Check_Key: - mes ". . . . . ."; - mes "Unfortunately you don't have a privilege"; - mes "To enter this Gate .."; - mes "You won't be able to go through"; - mes "As long as Ancient Alchemists"; - mes " Don't grant you."; - close; M_End: mes "[Gatekeeper Boy]"; mes "This Clock Tower"; diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt index a202e4ae2..71f0d1109 100644 --- a/npc/cities/amatsu.txt +++ b/npc/cities/amatsu.txt @@ -125,21 +125,21 @@ alberta,245,93,4 script Sea Captain#01 709,{ mes "culture...Well, it is up to you."; close; Lgo: - if (Zeny < 10000) goto Lzeny; + if (Zeny < 10000) { + mes "[Walter Moers]"; + mes "Did you forget what I said?"; + mes "10,000 zeny. If you can't come up with enough zeny,"; + mes "hunt around the Sunken Ship,"; + mes "and hope for some luck hunting treasure..."; + mes "and get enough zeny"; + close; + } set Zeny, Zeny-10000; mes "[Walter Moers]"; mes "Alright, I will start the engine!"; close2; warp "amatsu",197,83; - end; - Lzeny: - mes "[Walter Moers]"; - mes "Did you forget what I said?"; - mes "10,000 zeny. If you can't come up with enough zeny,"; - mes "hunt around the Sunken Ship,"; - mes "and hope for some luck hunting treasure..."; - mes "and get enough zeny"; - close; + end; } //===================================================================== amatsu,194,79,4 script Sea Captain#02 709,{ @@ -727,7 +727,6 @@ amatsu,261,197,4 script Legendary Sakura Tree 111,{ } ama_in02,61,27,6 script Alchemist#amatsu 749,{ - mes "[Laspuchin Gregory]"; mes "KeekeekeeKeheheh."; mes "This is amazing!"; @@ -800,9 +799,7 @@ s_Got: mes "[Laspuchin Gregory]"; mes "Uh-uh, what did you bring?"; next; - switch( select( "Mystic Frozen", "Great Nature", "Flame Heart", "Rough Wind" ) ) - { - + switch( select( "Mystic Frozen:Great Nature:Flame Heart:Rough Wind" ) ){ case 1: set @stoneID,995; set @stoneStr$,"Mystic Frozen"; @@ -823,8 +820,20 @@ s_Got: set @stoneStr$,"Rough Wind"; break; - } - if(countitem(@stoneID) < 8)goto s_NEnough; + } + if(countitem(@stoneID) < 8){ + mes "[Laspuchin Gregory]"; + mes "Keheheh~ Check your pockets"; + mes "before you tell me"; + mes "how foolish you are....."; + next; + mes "[Laspuchin Gregory]"; + mes "Bring me stones! You said you"; + mes "were going to help me!"; + mes "Keep your promises!"; + mes "Kehehehkehkeh..."; + close; + } mes "[Laspuchin Gregory]"; mes "Kehekeh. I see you brought"; mes "enough stones! What kind of"; @@ -916,24 +925,4 @@ s_No: mes "KEHEHEHEHEHEHE!"; close; -s_NEnough: - mes "[Laspuchin Gregory]"; - mes "Keheheh~ Check your pockets"; - mes "before you tell me"; - mes "how foolish you are....."; - next; - mes "[Laspuchin Gregory]"; - mes "Bring me stones! You said you"; - mes "were going to help me!"; - mes "Keep your promises!"; - mes "Kehehehkehkeh..."; - close; - -} - -//| Ninja map portion dummy npcs, commented by default. -//que_ng,27,18,3 script Seaman 709,{end;} -//que_ng,28,45,3 script Man 86,{end;} -//que_ng,28,50,3 script Seaman2 709,{end;} -//que_ng,22,62,3 script Seaman2 709,{end;} -//que_ng,30,65,3 script Ninja Sensei 730,{end;} +}
\ No newline at end of file diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index bcf372273..1ef16b160 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -4,7 +4,7 @@ //= Muad Dib (1.0) Darkchild (1.1) Muad Dib (1.2) //= Darkchild (1.3) DracoRPG (1.5) //===== Current Version: ===================================== -//= 2.0 +//= 2.0a //===== Compatible With: ===================================== //= Any eAthena Mod //===== Description: ========================================= @@ -111,8 +111,8 @@ payon_in01,180,7,0 script Waitress 90,{ mes "[Waitress]"; mes "So, how may I help you? "; next; - menu "Have you ever heard of Zombies?",L_Menu1,"I want to have my fortune told.",L_Menu2,"I need some booze.",L_Menu3,"I'm good",L_Menu4; -L_Menu1: + menu "Have you ever heard of Zombies?",-,"I want to have my fortune told.",L_Menu2,"I need some booze.",L_Menu3,"I'm good",L_Menu4; + mes "[Waitress]"; mes "Zombies are the walking dead. You can easily spot them in this village, Payon."; mes "It's rumored that they fear holiness. That's why Archers prefer to use arrows made out of holy metal, silver against Zombies."; @@ -184,8 +184,8 @@ payon,193,116,1 script Woman#05 66,{ mes "I know of a cave near Archer Village. Just take the exit north of town and follow the path to your left."; mes "The cave is full of monsters and their spawn rate is very high. Does it sound interesting to you?"; next; - menu "It sounds dangerous.",L_Menu1,"I think I need to fully prepare for that place.",L_Menu2,"Lady, you wear nice clothing~",L_Menu3; -L_Menu1: + menu "It sounds dangerous.",-,"I think I need to fully prepare for that place.",L_Menu2,"Lady, you wear nice clothing~",L_Menu3; + mes "[Woman]"; mes "Oh don't be such a coward! It's just a simple cave filled with normal monsters. Archer Village is near by so you shouldn't be worried~ hohoho~"; next; @@ -265,18 +265,21 @@ payon,210,110,4 script Drunk 120,{ mes "[Drunk]"; mes "Do you want to buy me a drink?"; next; - menu "Promise me you won't drink more than one jug.",L_Menu1,"No thanks,buddy.",L_Menu2,"Oh my god~ hell no~!",L_Menu3; -L_Menu1: + menu "Promise me you won't drink more than one jug.",-,"No thanks,buddy.",L_Menu2,"Oh my god~ hell no~!",L_Menu3; + mes "[Drunk]"; if(BaseJob == Job_Archer) mes "Thanksh brothaaa!... archerrrzzz are alwayssszz a generoushhh bunch!...(hicup!)"; else mes "Thanksh!... shhtrangersszz are alwayssszz a generoushhh bunch!... archer guysh are penny pinchershh nowadayssszz!..(hicup!)"; next; - emotion e_thx; - if(Zeny < 200) goto L_SUB_1; - set Zeny,Zeny-200; mes "[Drunk]"; + if(Zeny < 200) { + mes "Cheapass, don't even have enough money. Move on young one, your waisting my time!"; + close; + } + set Zeny,Zeny-200; + emotion e_thx; mes "Thanks brother! Strangers are always generous without exception! Archer guys are pinch-pennies nowadays!"; mes "Muhahahaha! I wasn't like that when I was young."; mes "Back then I was young, I used to fool around with girls! One of the grannies in this village and I was really hot back then!"; @@ -286,10 +289,6 @@ L_Menu1: mes "Gulp~Gulp~Man! This is great! Thank you may man! Thank you! Muhahahahaha!"; emotion e_no1; close; -L_SUB_1: - mes "[Drunk]"; - mes "Cheapass, don't even have enough money. Move on young one, your waisting my time!"; - close; L_Menu2: mes "[Drunk]"; mes "Blah. Young people don't know how to respect elderly people!"; @@ -354,8 +353,8 @@ payon_in01,66,64,5 script Archer Wolt 88,{ mes "I am Wolt the Archer. Just call me Wolt."; mes "I know this is an expected question, do you tend to idle away your time?"; next; - menu "Hell no.",L_Menu1,"Yeah I guess.",L_Menu2; -L_Menu1: + menu "Hell no.",-,"Yeah I guess.",L_Menu2; + mes "[Archer Wolt]"; mes "Hmm... You don't? You are born to be an archer then."; next; @@ -407,8 +406,8 @@ L_case: mes "Heading west, you can see a cave. Inside the cave, enormous monsters keep spawning without limit."; mes "We are here, to protect our territory against them in obedience to our chief's order."; next; - menu "Cave?!",L_para1,"Chief?",L_para2,"Oh man I hate this stupid town~",L_para3; -L_para1: + menu "Cave?!",-,"Chief?",L_para2,"Oh man I hate this stupid town~",L_para3; + mes "[Archer Wolt]"; mes "Head north of town, you can see the cave I told you about."; mes "Inside there, you will encounter lots of ugly monsters such as bastard looking like a bat or the walking dead."; @@ -499,8 +498,8 @@ pay_arche,77,131,2 script Archer Joe 88,{ mes "[Archer Joe]"; mes "Hay you! Have you heard of our fame?"; next; - menu "Oh yeah!",L_Menu1,"Err Sorry?!",L_Menu2,"......",L_Menu3; -L_Menu1: + menu "Oh yeah!",-,"Err Sorry?!",L_Menu2,"......",L_Menu3; + mes "[Archer Joe]"; mes "Oh! You my man buddy! Archers of Payon! You know who we are!"; emotion e_ok; @@ -619,7 +618,7 @@ L_End: close; } -payon,158,246,4 script Guardsman 708,{} +payon,158,246,4 script Guardsman#p0 708,{} payon,158,245,4 script PayonGuard1TriggerArea 139,3,2,{ mes "[Guardsman]"; mes "This is the Central Palace of Payon. This place is open to the public, but in accordance with our laws, you must behave in an orderly fashion while inside."; @@ -667,8 +666,8 @@ payon_in03,99,189,4 script PayonChiefAreaTrigger 139,2,1,{ } mes "[Chief]"; next; - menu "Please tell me about Payon.",L_Menu1,"Where the guards come from?",L_Menu2,"Please tell me about the cave.",L_Menu3,"I am wondering what archer does.",L_Menu4,"I am wondering what hunter does.",L_Menu5; -L_Menu1: + menu "Please tell me about Payon.",-,"Where the guards come from?",L_Menu2,"Please tell me about the cave.",L_Menu3,"I am wondering what archer does.",L_Menu4,"I am wondering what hunter does.",L_Menu5; + mes "[Chief]"; mes "Payon is the city of highlanders, who'be been self-supporting and self-sufficient."; mes "Although our ancestors couldn't take civilized cultural benefits as much as farmers or citizens did, they knew how to make their living without help."; |