- More optimization to custom folder. (Optimized by Spre)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13214 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 98 insertions, 110 deletions

diff --git a/npc/custom/market.txt b/npc/custom/market.txt
index 35a4db3b5..b16200972 100644
--- a/npc/custom/market.txt
+++ b/npc/custom/market.txt
@@ -3,37 +3,35 @@
 //===== By ===================================================
 //= Lupus
 //===== Version ==============================================
-//= 1.0
+//= 1.1
 //===== Compatible With ======================================
 //= eAthena 5760+
 //===== Description ==========================================
 //= This script should move vending crowds from Prontera
 //= streets to a suitable market place. Save your traffic 8)
 //===== Comments =============================================
-// No comments yet
+//=1.0 unknown
+//=1.1 Optimized it, Removed labels. [Spre]
 //============================================================
-
-
+ 
+ 
 prontera,144,174,3	script	Market Place	722,{
 	mes"[Market Place]";
 	mes"Tristan III's order: ^FF0000Move all the private shops to a special Market Place^000000.";
 	next;
-	menu "Enter the Market",M_ENTER, "Cancel",-;
-	close2;
-	end;
-
-M_ENTER:
-	if(rand(10)==0 && checkcart() && @mrketflg<30 && @mrketflg>5 && getcharid(2)>1) FlagEmblem getcharid(2);
+		if (select("Yes Please:No") == 2) {
+		close;
+	}
+	// I didn't see the need to check and show venders.... Since it didnt even work
 	warp "gon_test",27+rand(5),98;
-	set @mrketflg,@mrketflg+1;
 	end;
 }
-
+ 
 gon_test,73,103,0	script	MarketExit	45,1,2,{
 	warp "prontera",155,177-rand(10);
 	end;
 }
-
+ 
 //disable vending in Prontera
 prontera	mapflag	novending
 prt_in	mapflag	novending
diff --git a/npc/custom/platinum_skills.txt b/npc/custom/platinum_skills.txt
index e97616afa..7ab251256 100644
--- a/npc/custom/platinum_skills.txt
+++ b/npc/custom/platinum_skills.txt
@@ -9,103 +9,93 @@
 //===== Description: ========================================================================
 //= Single NPC that assigns quests skills for all classes.
 //===== Additional Comments: ================================================================
-//= Added advanced classes by ShadowLady.
-//= Added baby clases by Midas
-//= Simplified Job Checks [Silentdragon]
+//=2.0 Added advanced classes by ShadowLady.
+//=2.1 Added baby clases by Midas
+//=2.2 Simplified Job Checks [Silentdragon]
+//=2.3 Thehell? Cleaned up script removed the nastiness. Also added rebirth skills. [Spre]
+//=2.4 Added Advanced skills. [Spre]
 //===========================================================================================
 prontera,128,200,6	script	Platinum Skill NPC	94,{
-mes "[Platinum Skill NPC]";
-mes "I can give you the special skills available to your job. Would you like these skills now?";
-next;
-menu "Yes",Lgetskills,"No",Lnogetskills;
-
-Lgetskills:
-if (BaseClass==Job_Novice) goto Lskillsnovice;
-if (BaseClass==Job_Swordman) goto Lskillsswordie;
-if (BaseClass==Job_Mage) goto Lskillsmage;
-if (BaseClass==Job_Archer) goto Lskillsarcher;
-if (BaseClass==Job_Acolyte) goto Lskillsaco;
-if (BaseClass==Job_Merchant) goto Lskillsmerchie;
-if (BaseClass==Job_Thief) goto Lskillsthief;
-Lskillsnovice:
-mes "[Platinum Skill NPC]";
-mes "I see that you are a Novice Class. I will now add the special skills available to these jobs.";
-skill 142,1,0;
-if(BaseJob==0) skill 143,1,0;
-mes " ";
-mes "You now have all the special skills available to the these jobs.";
-next;
-goto LskillsEND;
-Lskillsswordie:
-mes "[Platinum Skill NPC]";
-mes "I see that you are a Swordman Class. I will now add the special skills available to these jobs.";
-skill 142,1,0;
-skill 144,1,0;
-skill 145,1,0;
-skill 146,1,0;
-mes " ";
-mes "You now have all the special skills available to the these jobs.";
-next;
-goto LskillsEND;
-Lskillsmage:
-mes "[Platinum Skill NPC]";
-mes "I see that you are a Mage Class. I will now add the special skills available to these jobs.";
-skill 142,1,0;
-skill 157,1,0;
-mes " ";
-mes "You now have all the special skills available to the these jobs.";
-next;
-goto LskillsEND;
-Lskillsarcher:
-mes "[Platinum Skill NPC]";
-mes "I see that you are an Archer Class. I will now add the special skills available to these jobs.";
-skill 142,1,0;
-skill 147,1,0;
-skill 148,1,0;
-mes " ";
-mes "You now have all the special skills available to the these jobs.";
-next;
-goto LskillsEND;
-Lskillsaco:
-mes "[Platinum Skill NPC]";
-mes "I see that you are an Acolyte Class. I will now add the special skills available to these jobs.";
-skill 142,1,0;
-skill 156,1,0;
-mes " ";
-mes "You now have all the special skills available to the these jobs.";
-next;
-goto LskillsEND;
-Lskillsmerchie:
-mes "[Platinum Skill NPC]";
-mes "I see that you are a Merchant Class.I will now add the special skills available to these jobs.";
-skill 142,1,0;
-skill 153,1,0;
-skill 154,1,0;
-skill 155,1,0;
-mes " ";
-mes "You now have all the special skills available to the these jobs.";
-next;
-goto LskillsEND;
-Lskillsthief:
-mes "[Platinum Skill NPC]";
-mes "I see that you are a Thief Class. I will now add the special skills available to these jobs.";
-skill 142,1,0;
-skill 149,1,0;
-skill 150,1,0;
-skill 151,1,0;
-skill 152,1,0;
-mes " ";
-mes "You now have all the special skills available to the these jobs.";
-next;
-goto LskillsEND;
-LskillsEND:
-mes "[Platinum Skill NPC]";
-mes "Have a nice day.";
-close;
-Lnogetskills:
-mes "[Platinum Skill NPC]";
-mes "Aww, how come you don't want my special skills?";
-mes "*sob* FINE!";
-mes "Have a nice day... >.>";
-close;
+	mes "[Platinum Skill NPC]";
+	mes "I can give you the special skills available to your job. Would you like these skills now?";
+	next;
+	if (select("Yes Please:No") == 2) {
+	mes "[Platinum Skill NPC]";
+	mes "Have a nice day... >.>";
+	close;
 }
+	if (BaseClass==Job_Novice) {
+		skill 142,1,0;
+		skill 143,1,0;
+		close;
+    } else if (BaseClass==Job_Swordman) {
+		skill 142,1,0;
+		skill 144,1,0;
+		skill 145,1,0;
+		skill 146,1,0;
+		close;
+	} else 	if (BaseClass==Job_Mage) {
+		skill 142,1,0;
+		skill 157,1,0;
+		close;
+	} else 	if (BaseClass==Job_Archer) {
+		skill 142,1,0;
+		skill 147,1,0;
+		skill 148,1,0;
+		close;
+	} else 	if (BaseClass==Job_Acolyte) {
+		skill 142,1,0;
+		skill 156,1,0;
+		close;
+	} else 	if (BaseClass==Job_Merchant) {
+		skill 142,1,0;
+		skill 153,1,0;
+		skill 154,1,0;
+		skill 155,1,0;
+		close;
+	} else 	if (BaseClass==Job_Thief) {
+		skill 142,1,0;
+		skill 149,1,0;
+		skill 150,1,0;
+		skill 151,1,0;
+		skill 152,1,0;
+		close;
+	} else if (BaseClass==Job_Lord_Knight) {
+		skill 1002,1,0;
+		close;
+	} else if (BaseClass==Job_High_Wizard) {
+		skill 1006,1,0;
+		close;
+	} else if (BaseClass==Job_Professor) {
+		skill 1007,1,0;
+		close;	
+	} else if (BaseClass==Job_Sniper) {
+		skill 1009,1,0;
+		close;
+	} else if (BaseClass==Job_Clown) {
+		skill 1010,1,0;
+		close;
+	} else if (BaseClass==Job_Gypsy) {
+		skill 1011,1,0;
+		close;
+	} else if (BaseClass==Job_High_Priest) {
+		skill 1014,1,0;
+		skill 363,10,0;
+		close;
+	} else if (BaseClass==Job_Champion) {
+		skill 1015,1,0;
+		skill 1016,10,0;
+		close;
+	} else if (BaseClass==Job_WhiteSmith) {
+		skill 1012,1,0;
+		skill 1013,1,0;
+		close;
+	} else if (BaseClass==Job_Assassin_Cross) {
+		skill 1003,1,0;
+		skill 1004,1,0;
+		close;
+	} else if (BaseClass==Job_Stalker) {
+		skill 1005,1,0;
+		close;
+	}
+}
\ No newline at end of file