From a5014cad6007ecc0b6fc195a829a1dc836fdfc68 Mon Sep 17 00:00:00 2001 From: euphyy Date: Sun, 3 Jun 2012 03:36:02 +0000 Subject: * Platinum Skills NPC now works for all Upper types (bugreport:5903) (custom\platinum_skills.txt) * Revamped the official clothes dyer (merchants\clothes_dyer.txt) * Optimized custom Berzebub Card quest (custom\quests\berzebub.txt) * Warper bug on ma_fild02 fixed (bugreport:5908) (custom\warper.txt) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16216 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/custom/platinum_skills.txt | 91 +++----- npc/custom/quests/berzebub.txt | 81 +++---- npc/custom/warper.txt | 2 +- npc/merchants/clothes_dyer.txt | 488 +++++++++++------------------------------ 4 files changed, 189 insertions(+), 473 deletions(-) diff --git a/npc/custom/platinum_skills.txt b/npc/custom/platinum_skills.txt index 2a30e00f1..7eb933106 100644 --- a/npc/custom/platinum_skills.txt +++ b/npc/custom/platinum_skills.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Keichii, DarkChild //===== Current Version: ===================================== -//= 2.7 +//= 2.8 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 2.5 Added dialog for if the user is none of the listed jobs. [Kisuka] //= 2.6 Fixed 2nd advanced classes not being able to get their advanced skills. [Ancyker] //= 2.7 Rewrote to give all correct skills to all proper classes. [Paradox924X] +//= 2.8 Clustered conditionals replaced with switch to include all Upper types. [Euphy] //============================================================ prontera,128,200,6 script Platinum Skill NPC 94,{ @@ -27,66 +28,34 @@ prontera,128,200,6 script Platinum Skill NPC 94,{ if (select("Yes Please:No") == 2) { mes "[Platinum Skill NPC]"; mes "Have a nice day... >.>"; - close; - } - skill 142,1,0; // First Aid - if (BaseClass == Job_Novice) { - skill 143,1,0; // Play Dead - } else if (BaseClass == Job_Swordman) { - skill 144,1,0; // Moving HP-Recovery - skill 145,1,0; // Fatal Blow - skill 146,1,0; // Auto Berserk - } else if (BaseClass == Job_Mage) { - skill 157,1,0; // Energy Coat - } else if (BaseClass == Job_Archer) { - skill 147,1,0; // Arrow Crafting - skill 148,1,0; // Arrow Repel - } else if (BaseClass == Job_Merchant) { - skill 153,1,0; // Cart Revolution - skill 154,1,0; // Change Cart - skill 155,1,0; // Crazy Uproar - } else if (BaseClass == Job_Thief) { - skill 149,1,0; // Sand Attack - skill 150,1,0; // Back Slide - skill 151,1,0; // Find Stone - skill 152,1,0; // Stone Fling - } else if (BaseClass == Job_Acolyte) { - skill 156,1,0; // Holy Light - } - if (Class == Job_Knight || Class == Job_Lord_Knight) { - skill 1001,1,0; // Charge Attack - } else if (Class == Job_Crusader || Class == Job_Paladin) { - skill 1002,1,0; // Shrink - } else if (Class == Job_Wizard || Class == Job_High_Wizard) { - skill 1006,1,0; // Sight Blaster - } else if (Class == Job_Sage || Class == Job_Professor) { - skill 1007,1,0; // Create Elemental Converter - skill 1008,1,0; // Elemental Change Water - skill 1017,1,0; // Elemental Change Earth - skill 1018,1,0; // Elemental Change Fire - skill 1019,1,0; // Elemental Change Wind - } else if (Class == Job_Hunter || Class == Job_Sniper) { - skill 1009,1,0; // Phantasmic Arrow - } else if (Class == Job_Bard || Class == Job_Clown) { - skill 1010,1,0; // Pang Voice - } else if (Class == Job_Dancer || Class == Job_Gypsy) { - skill 1011,1,0; // Wink of Charm - } else if (Class == Job_Blacksmith || Class == Job_Whitesmith) { - skill 1012,1,0; // Unfair Trick - skill 1013,1,0; // Greed - } else if (Class == Job_Alchemist || Class == Job_Creator) { - skill 238,1,0; // Bioethics - } else if (Class == Job_Assassin || Class == Job_Assassin_Cross) { - skill 1003,1,0; // Sonic Acceleration - skill 1004,1,0; // Throw Venom Knife - } else if (Class == Job_Rogue || Class == Job_Stalker) { - skill 1005,1,0; // Close Confine - } else if (Class == Job_Priest || Class == Job_High_Priest) { - skill 1014,1,0; // Redemptio - } else if (Class == Job_Monk || Class == Job_Champion) { - skill 1015,1,0; // Ki Translation - skill 1016,1,0; // Ki Explosion - } + close; } + + skill 142,1,0; + switch(BaseClass) { + case 0: if (Class !=23) skill 143,1,0; break; + case 1: skill 144,1,0; skill 145,1,0; skill 146,1,0; break; + case 2: skill 157,1,0; break; + case 3: skill 147,1,0; skill 148,1,0; break; + case 4: skill 156,1,0; break; + case 5: skill 153,1,0; skill 154,1,0; skill 155,1,0; break; + case 6: skill 149,1,0; skill 150,1,0; skill 151,1,0; skill 152,1,0; break; + default: break; } + switch(roclass(eaclass()&EAJ_UPPERMASK)) { + case 7: skill 1001,1,0; break; + case 8: skill 1014,1,0; break; + case 9: skill 1006,1,0; break; + case 10: skill 1012,1,0; skill 1013,1,0; break; + case 11: skill 1009,1,0; break; + case 12: skill 1003,1,0; skill 1004,1,0; break; + case 14: skill 1002,1,0; break; + case 15: skill 1015,1,0; skill 1016,1,0; break; + case 16: skill 1007,1,0; skill 1008,1,0; skill 1017,1,0; skill 1018,1,0; skill 1019,1,0; break; + case 17: skill 1005,1,0; break; + case 18: skill 238,1,0; break; + case 19: skill 1010,1,0; break; + case 20: skill 1011,1,0; break; + default: break; } + mes "[Platinum Skill NPC]"; mes "There you go!"; close; diff --git a/npc/custom/quests/berzebub.txt b/npc/custom/quests/berzebub.txt index 6fbb60960..cfaf78980 100644 --- a/npc/custom/quests/berzebub.txt +++ b/npc/custom/quests/berzebub.txt @@ -10,64 +10,55 @@ //= Quest to get the Berzebub Card //===== Additional Comments: ================================= //= 1.1 Fixed ingredients. Was too exploitable [Lupus] +//= 1.2 Optimized. [Euphy] //============================================================ prontera,165,178,8 script Old Woman 103,{ - mes "[Old Woman]"; - if(BerzQuest == 1) goto L_Already; - mes "Greeting lad. I found a really nifty item while I was picking mushrooms near Glast Heim."; + + setarray .@Items[0],714,25,1061,100,1095,200,618,10,1551,2,1614,1,727,20; + set .@n$,"[Old Woman]"; + + mes .@n$; + if(BerzQuest == 1) { + mes "Hey, I remember you! I already told you that you may only complete this quest once."; + close; } + mes "Greeting, lad. I found a really nifty item while I was picking mushrooms near Glast Heim."; next; - menu "Keep talking",-, "Leave", M_Leave; - - mes "[Old Woman]"; - mes "I have never seen an item like this before. I am told it can be placed inside am accessory that has a slot avaiable in it."; + if(select("Keep Talking:Leave")==2) goto M_Leave; + + mes .@n$; + mes "I have never seen an item like this before. I am told it can be placed inside any accessory with a slot available."; next; - mes "[Old Woman]"; - mes "If you're interested in this item, tell me and I'll tell you what you need for me to make you one of your own. I can only give one of these to each player, so once you finish this quest once, you may not do it again."; + mes .@n$; + mes "If you're interested in this item, I'll tell you what you need for me to make you one of your own. I can only give one of these to each player, so once you finish this quest, you may not do it again."; next; - menu "Tell me more about it",-, "Nah, I don't care about it", M_Leave; - - mes "[Old Woman]"; - mes "I believe the item is called a ^FF0000Berzebub Card^000000. It can make any spell caster cast spells really fast!"; + if(select("Tell me more about it:Nah, I don't care about it")==2) goto M_Leave; + + mes .@n$; + mes "I believe the item is called a ^FF0000Berzebub Card^000000. It makes you cast spells really fast!"; next; - mes "[Old Woman]"; + mes .@n$; mes "I need all of the following items:"; - mes "^0080FF25^000000 Emperiums"; - mes "^0080FF100^000000 Witched Starsands"; - mes "^0080FF200^000000 Needles of Alarm"; - mes "^0080FF10^000000 Worn Out Scrolls"; - mes "^0080FF2^000000 Biblies"; - mes "^0080FF1^000000 Wand of the Occult"; - mes "^0080FF20^000000 Opals"; + for(set .@i,0; .@i,{,...}); + // Colors: [1]Orange, [2]Violet, [3]Red, [4]Black, [5]Green, [6]Blue, [7]White, [8]Yellow + + case Job_Novice: if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4); + case Job_Swordman: if (Sex) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4); + case Job_Mage: if (Sex) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4); + case Job_Archer: if (Sex) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4); + case Job_Acolyte: if (Sex) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4); + case Job_Merchant: if (Sex) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4); + case Job_Thief: if (Sex) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4); + case Job_Knight: case Job_Crusader: if (Sex) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4); + case Job_Priest: case Job_Monk: if (Sex) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4); + case Job_Wizard: case Job_Sage: if (Sex) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4); + case Job_Blacksmith: case Job_Alchemist: if (Sex) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4); + case Job_Hunter: case Job_Bard: case Job_Dancer: if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4); + case Job_Assassin: case Job_Rogue: if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3); + case Job_SuperNovice: if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4); + default: + mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it."; + close; } + case 3: + mes .n$; + mes "Each color costs 10000z and 1 dye:"; + mes " "; + mes " - ^FF4422Red^000000: Scarlet Dyestuffs"; + mes " - ^D5A500Yellow^000000: Lemon Dyestuffs"; + mes " - ^AA00AAViolet^000000: Violet Dyestuffs"; + mes " - ^FF8800Orange^000000: Orange Dyestuffs"; + mes " - ^4422FFBlue^000000: CobaltBlue Dyestuffs"; + mes " - ^009500Green^000000: DarkGreen Dyestuffs"; + mes " - Black: Black Dyestuffs"; + mes " - White: White Dyestuffs"; + break; + case 4: + goto L_End; } } L_End: - mes "[Dyer Ginedin Rephere]"; + mes .n$; mes "Make yourself at home. Even though I don't have time for you."; close; -} + +function Dyes { + setarray .@DyeName$[0],"the default color","Orange","Violet","Red","Black","Green","Blue","White","Yellow"; + setarray .@DyeItems[0],0,980,981,975,983,979,978,982,976; + set .@menu$,"- Default:"; + for(set .@i,0; 1; set .@i,.@i+2) { + if (!getarg(.@i,0)) break; + set .@menu$, .@menu$+"- "+.@DyeName$[getarg(.@i)]+":"; } + set .@menu$, .@menu$+"- ^777777Cancel^000000"; + set .@s, select(.@menu$)-1; + if (.@s==.@i-2) goto L_End; + mes .n$; + if (!.@s) { + mes "I can change your dye to"; + mes "the default for free."; + mes "Are you sure?"; + next; + if(select("Yes:No")==2) goto L_End; + mes .n$; + setlook 7,0; + mes "Your clothes have been dyed "+.@DyeName$[0]+"."; + close; } + if (!countitem(.@DyeItems[getarg((.@s-1)*2)])) { + mes "For me to dye your clothes, I'll need the appropriate Dyestuffs. Please check my price list for the information."; + close; } + if (Zeny < 10000) { + mes "I'm sorry, but you don't have enough money."; + close; } + delitem .@DyeItems[getarg((.@s-1)*2)],1; + set Zeny, Zeny-10000; + setlook 7, ((.@s)?(getarg((.@s-1)*2+1)):0); + mes "Your clothes have been dyed "+((.@s)?.@DyeName$[getarg((.@s-1)*2)]:.@DyeName$[0])+"."; + close; } +} \ No newline at end of file -- cgit v1.2.3-60-g2f50