* 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

1 files changed, 30 insertions, 61 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;