* Fixed a compile warning in pc.c

* Updated Soul Breaker's damage display
* Some shops and scripts fixes

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

5 files changed, 123 insertions, 22 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index da794ec5b..d9944cd7a 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -35,6 +35,11 @@ Other Ppl
 Date		Added
 ======
 
+03/15
+        * Fixed some typos in shops.txt, thanks to Dino9021 [celest]
+        * Fixed some bugs in the 32 new hats script, the custom jobchanger and platinum
+          skills script, thanks to midas [celest]
+
 03/11
         * Reverted the Moving HP skill quest change, thanks to DracoRPG [celest]
 
diff --git a/npc/jobs/custom/jobchange.txt b/npc/jobs/custom/jobchange.txt
index 36b859266..e69c42595 100644
--- a/npc/jobs/custom/jobchange.txt
+++ b/npc/jobs/custom/jobchange.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= eAthena Scripting Team
 //===== Current Version: =====================================
-//= 2.0
+//= 2.1
 //===== Compatible With: =====================================
 //= Athena Version RC1+
 //===== Description: =========================================
@@ -12,24 +12,27 @@
 //===== Additional Comments: =================================
 //Added missing param into resetlevel [Lupus]
 //Remade Adv. Classes Menu. [shadowlady]
+//Fixed some bugs, by midas
 //============================================================
 
 prontera.gat,160,186,6	script	Jobchanger	94,{
+cutin "kafra_01",2;
 mes "[ ^0065DFJobra^000000 ]";
-mes "Sup? I'm the insanely cool and supra-l337 jobchanger thingy for Athena! First of all, what class would you like to change into (must meet preliminary requirements for each class..)";
+mes "Sup? I'm the insanely cool and uber cute jobchanger thingy for eAthena! First of all, what class would you like to change into (must meet preliminary requirements for each class..)?";
 next;
-menu "First Class",LFirstClass,"Second Class (2-1)",LSecondClass,"Alternate Second Class (2-2)",LSecondClass2,"Novice High",LNovice2,"Advance First Class",Ladvclasses,"Advance Second Class",Ladvclasses,"Super Novice",LSuperNovice;
+menu "First Class",LFirstClass,"Second Class (2-1)",LSecondClass,"Alternate Second Class (2-2)",LSecondClass2,"Novice High",LNovice2,"Advance First Class",Llevelcheck,"Advance Second Class",Llevelcheck,"Super Novice",LSuperNovice;
 LNovice2:
 	if ((readparam(11) >= 99)  && (readparam(55) >= 50) || (readparam(19) > 20)) goto Lchange;
 	mes "[ ^0065DFJobra^000000 ]";
 	mes "Ummmm, excuse me... o.O...";
-	mes "You don't MEET the class requirements...";
-	mes "Hey! You're not ready! Get away, punk! *rolls eyes*";
-	mes "Only 2nd Classes and Alternate 2nd Classes can change into the Novice High... jeeze.";
+	mes "Hey! You don't MEET the class requirements...";
+	mes "You're not ready! Get away, punk! *rolls eyes*";
+	mes "Only the bravest and highest level 2nd Classes and Alternate 2nd Classes can change into the Novice High... jeeze.";
 	cutin "kafra_01",255;
 	close;
 
 Lchange:
+	if ((readparam(19) >= 46) && (readparam(19) <= 68)) goto Babynochange;
 	mes "[ ^0065DFJobra^000000 ]";
 	mes "We shall start the ceremony....";
 	next;
@@ -42,6 +45,12 @@ Lchange:
 	cutin "kafra_01",255;
 	close;
 
+Babynochange:
+	mes "[ ^0065DFJobra^000000 ]";
+	mes "Sorry little one, baby classes can't change to Novice High. They would loose their cuteness and their parents won't allow it.";
+	cutin "kafra_01",255;
+	close;
+
 Llevelcheck:
 	if(readparam(55) >= 45 || readparam(19) == 4001 && readparam(55) >= 10) goto Ladvclasses;
 	mes "[ ^0065DFJobra^000000 ]";
@@ -50,6 +59,7 @@ Llevelcheck:
 	close;
 
 Ladvclasses:
+	if(SkillPoint != 0) goto Lskillpt;
 //Lord Knight & Paladin
 	if(oldclass == 7 && readparam(19) == 4001 || oldclass == 14 && readparam(19) == 4001) goto Lswordsmanhigh;
 	if(readparam(19) == 4002 && oldclass == 7) goto Llordknight;
@@ -75,12 +85,83 @@ Ladvclasses:
 	if(oldclass == 9 && readparam(19) == 4001 || oldclass == 16 && readparam(19) == 4001) goto Lhighmage;
 	if(readparam(19) == 4003 && oldclass == 9) goto Lhighwizard;
 	if(readparam(19) == 4003 && oldclass == 16) goto Lprofessor;
+	if ( oldclass == 0 && readparam(19) >=  4001) goto Nooldclasset;
 	mes "[ ^0065DFJobra^000000 ]";
-	mes "Please... Remove your cart, leave your falcon and get off your peco before.";
+	mes "Please... Remove your cart, leave your falcon and get off your peco before you change.";
 	mes "[" + readparam(19) + "] [" + oldclass + "]";
 	cutin "kafra_01",255;
 	close;
 //Lord Knight & Paladin
+	Nooldclasset:
+	mes "[ ^0065DFJobra^000000 ]";
+	mes "Say, what were you before you were reborn?";
+	if (readparam(19) == 4001) goto Ishnov;
+	if (readparam(19) == 4002) goto Ishsword;
+	if (readparam(19) == 4003) goto Ishmage;
+	if (readparam(19) == 4004 && Sex == 0) goto Isharcherf;
+	if (readparam(19) == 4004 && Sex == 1) goto Isharcherm;
+	if (readparam(19) == 4005) goto Ishacco;
+	if (readparam(19) == 4006) goto Ishmerch;
+	if (readparam(19) == 4002) goto Ishthief;
+
+	Ishnov:
+		menu "Knight",Wasknight,"Priest",Waspriest,"Wizard",Waswizard,"Blacksmith",Wasblacksmith,"Hunter",Washunter,"Assasin",Wasassa,"Crusader",Wascrusader,"Monk",Wasmonk,"Sage",Wassage,"Rogue",Wasrogue,"Alchemist",Wasalche,"Bard",Wasbard,"Dancer",Wasdancer;
+	Ishsword:
+  	menu "Knight",Wasknight,"Crusader",Wascrusader;
+	Ishmage:
+		menu "Wizard",Waswizard,"Sage",Wassage;
+	Isharcherf:	
+		menu "Hunter",Washunter,"Dancer",Wasdancer;
+	Isharcherm:
+		menu "Hunter",Washunter,"Bard",Wasbard;
+	Ishacco:
+		menu "Priest",Waspriest,"Monk",Wasmonk;
+	Ishmerch:
+		menu "Blacksmith",Wasblacksmith,"Alchemist",Wasalche;
+  Ishthief:
+  	menu "Assasin",Wasassa,"Rogue",Wasrogue;
+// now finally the setting of oldclass
+		Wasknight:
+		set oldclass,7;
+		goto Ladvclasses;
+		Waspriest:
+		set oldclass,8;
+		goto Ladvclasses;
+		Waswizard:
+		set oldclass,9;
+		goto Ladvclasses;
+		Wasblacksmith:
+		set oldclass,10;
+		goto Ladvclasses;
+		Washunter:
+		set oldclass,11;
+		goto Ladvclasses;
+		Wasassa:
+		set oldclass,12;
+		goto Ladvclasses;
+		Wascrusader:
+		set oldclass,14;
+		goto Ladvclasses;
+		Wasmonk:
+		set oldclass,15;
+		goto Ladvclasses;
+		Wassage:
+		set oldclass,16;
+		goto Ladvclasses;
+		Wasrogue:
+		set oldclass,17;
+		goto Ladvclasses;
+		Wasalche:
+		set oldclass,18;
+		goto Ladvclasses;
+		Wasbard:
+		set oldclass,19;
+		goto Ladvclasses;
+		Wasdancer:
+		set oldclass,20;
+		goto Ladvclasses;
+		
+//Lord Knight & Paladin
 Lswordsmanhigh:
 	mes "[ ^0065DFJobra^000000 ]";
  	mes "Wow, fantastic! Doesn't all that hard work feel like its paid off? *kekeke* I see the ^B70004BLOOD of Porings^000000 on your hands! You truly are fit for the ^0005CESwordsman^000000 job! ^_^";
@@ -103,7 +184,7 @@ Llordknight:
 
 Lpaladin:
 	mes "[ ^0065DFJobra^000000 ]";
-	mes "Mmmmm, I always liked Paladins.. their Broad Shoulders always turned me on....";
+	mes "Mmmmm, I always liked Paladins.. their broad shoulders always turned me on....";
 	next;
 	mes "[ ^0065DFJobra^000000 ]";
 	mes "Go Forth On Your Mission To Serve God";
@@ -224,7 +305,7 @@ Lwhitesmith:
 	close;
 Lcreator:
 	mes "[ ^0065DFJobra^000000 ]";
-	mes "Create potions for the swordmen of Rune-Midgart";
+	mes "Create potions for the brave heros of Rune-Midgart";
 	cutin "kafra_01",255;
 	jobchange 42;
 	close;
@@ -262,27 +343,32 @@ LFirstClass:
 	menu "Swordsman",LSword,"Mage",LMage,"Thief",LThief,"Merchant",LMerc,"Acolyte",LAco,"Archer",LArch,"Cancel",LCancel;
 
 Lnovice:
+	cutin "kafra_01",255;
 	mes "[ ^0065DFJobra^000000 ]";
 	mes "Ummmm, excuse me... o.O...";
 	mes "You don't LOOK like a novice...";
-	mes "Hey! You're no novice! Get away, punk! *rolls eyes*";
+	mes "Hey! You're no novice! Get away, punk!";
+	mes "*rolls eyes*";
 	mes "Only NOVICES can change into the First Job... jeeze.";
 	cutin "kafra_01",255;
 	close;
 
 Lskillpt:
+	cutin "kafra_01",255;
 	mes "[ ^0065DFJobra^000000 ]";
 	mes "Please use up all your skill points before changing into the next job! ";
 	cutin "kafra_01",255;
 	close;
 
 Ljobten:
+	cutin "kafra_01",255;
 	mes "[ ^0065DFJobra^000000 ]";
 	mes "Ugh, you need to have at least a Job Level of 10 before changing into the first class... go kill some porings or something.. >.>'";
 	cutin "kafra_01",255;
 	close;
 
 LSword:
+	cutin "kafra_01",255;
 	mes "[ ^0065DFJobra^000000 ]";
  	mes "Wow, fantastic! Doesn't all that hard work feel like its paid off? *kekeke* I see the ^B70004BLOOD of Porings^000000 on your hands! You truly are fit for the ^0005CESwordsman^000000 job! ^_^";
 	cutin "kafra_01",255;
@@ -354,8 +440,8 @@ LSecondClass:
 		mes "[ ^0065DFJobra^000000 ]";
 		mes "Yes! You are ready to become... a Knight! ";
 		mes "Go save a Damsel in Distress or something..";
-		cutin "kafra_01",255;
 		jobchange 7;// Job: Job_Knight
+		cutin "kafra_01",255;
 		close;
 
 
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 4080b83b1..af4371951 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -55,7 +55,7 @@ amatsu.gat,183,127,5	shop	Milk Merchant	90,519:-1
 ama_in01.gat,101,18,8	shop	Weapon Dealer	47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
 //2nd set
 ama_in01.gat,89,28,4	shop	Armor Dealer	757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2314:-1,2627:-1
-ama_in01.gat,102,28,4	shop	Weapon Dealer	766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-11154:-1,1407:-1,1457:-1,1354:-1,1519:-1
+ama_in01.gat,102,28,4	shop	Weapon Dealer	766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1
 ama_in01.gat,24,30,4	shop	Tool Dealer	763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
 
 //=======================================================
@@ -204,7 +204,7 @@ yuno.gat,65,122,4	shop	Fruit Merchant	93,512:-1,513:-1,515:-1,516:-1
 yuno.gat,217,97,4	shop	Tool Dealer	83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,505:-1,506:-1,645:-1,656:-1,601:-1,602:-1
 yuno.gat,226,106,5	shop	Trader	97, 911:-1, 910:-1, 912:-1
 yuno.gat,197,115,4	shop	Pet Merchant	124, 537:-1, 643:-1, 10013:-1, 10014:-1
-yuno.gat,205,104,4	shop	Equip Dealer	84, 2340:-1, 2341:-1, 2411:-1, 2222:-1, 2230:-1; 1721:-1
+yuno.gat,205,104,4	shop	Equip Dealer	84, 2340:-1, 2341:-1, 2411:-1, 2222:-1, 2230:-1, 1721:-1
 yuno.gat,163,187,5	shop	Magic Dealer	90,717:-1,1601:-1,1604:-1,1607:-1,1610:-1,2232:-1,2321:-1,2332:-1
 yuno_in01.gat,25,34,4	shop	Tool Dealer	83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,505:-1,506:-1,645:-1,656:-1,601:-1,602:-1
 yuno_in01.gat,104,35,4	shop	Weapon Dealer	49,1750:-1,1751:-1,1101:-1,1701:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1601:-1,1604:-1,1607:-1,1610:-1
diff --git a/npc/other/platinum_skills.txt b/npc/other/platinum_skills.txt
index 765982fe3..8d594b720 100644
--- a/npc/other/platinum_skills.txt
+++ b/npc/other/platinum_skills.txt
@@ -3,13 +3,14 @@
 //===== By: =================================================================================
 //= Keichii and edited by DarkChild
 //===== Current Version: ====================================================================
-//= 2.0 
+//= 2.1 
 //===== Compatible With: ====================================================================
 //= Any eAthena Version
 //===== Description: ========================================================================
 //= Single NPC that assigns quests skills for all classes.
 //===== Additional Comments: ================================================================
 //= Added advanced classes by ShadowLady.
+//= Added baby clases by Midas
 //===========================================================================================
 prontera.gat,128,200,6	script	Platinum Skill NPC	94,{
 mes "[Platinum Skill NPC]";
@@ -18,13 +19,14 @@ next;
 menu "Yes",Lgetskills,"No",Lnogetskills;
 
 Lgetskills:
-if ((Class==Job_Novice) || (Class==4001)) goto Lskillsnovice;
-if ((Class==Job_Swordman) || (Class==7) || (Class==Job_Knight2) || (Class==14)|| (Class==Job_Crusader2) || (Class==4002) || (Class==4008) || (Class==Job_Lord_Knight2) || (Class==4015) || (Class==Job_Paladin2)) goto Lskillsswordie;
-if ((Class==Job_Mage) || (Class==9) || (Class==16) || (Class==4003) || (Class==4010) || (Class==4017)) goto Lskillsmage;
-if ((Class==Job_Archer) || (Class==11) || (Class==19) || (Class==20) || (Class==4004) || (Class==4012) || (Class==4020) || (Class==4021)) goto Lskillsarcher;
-if ((Class==Job_Acolyte) || (Class==8) || (Class==15) || (Class==4005) || (Class==4009) || (Class==4016)) goto Lskillsaco;
-if ((Class==Job_Merchant) || (Class==10) || (Class==18) || (Class==4006) || (Class==4011) || (Class==4019)) goto Lskillsmerchie;
-if ((Class==Job_Thief) || (Class==12) || (Class==17) || (Class==4007) || (Class==4013) || (Class==4018)) goto Lskillsthief;
+if ((Class==0) || (Class==Job_Baby) || (Class==4001)) goto Lskillsnovice;
+if ((Class==Job_SuperNovice) || (Class==Job_Super_Baby)) goto Lskillssnovice;
+if ((Class==Job_Swordman) || (Class==7) || (Class==13) || (Class==14)|| (Class==21) || (Class==Job_Baby_Swordman) || (Class==Job_Baby_Knight) || (Class==Job_Baby_Knight2) || (Class==Job_Baby_Crusader) || (Class==Job_Baby_Crusader2)) || (Class==4002) || (Class==4008) || (Class==Job_Lord_Knight2) || (Class==4015) || (Class==Job_Paladin2)  goto Lskillsswordie;
+if ((Class==Job_Mage) || (Class==Job_Baby_Mage) || (Class==Job_Baby_Wizard) || (Class==Job_Baby_Sage) || (Class==9) || (Class==16) || (Class==4003) || (Class==4010) || (Class==4017)) goto Lskillsmage;
+if ((Class==Job_Archer) || (Class==11) || (Class==19) || (Class==20) || (Class==49) ||  (Class==65) || (Class==66) ||(Class==4004) || (Class==4012) || (Class==4020) || (Class==4021)) goto Lskillsarcher;
+if ((Class==Job_Acolyte) || (Class==8) || (Class==15) || (Class==50) || (Class==54) || (Class==61) || (Class==4005) || (Class==4009) || (Class==4016)) goto Lskillsaco;
+if ((Class==Job_Merchant) || (Class==10) || (Class==18) || (Class==51) || (Class==56) || (Class==64) || (Class==4006) || (Class==4011) || (Class==4019)) goto Lskillsmerchie;
+if ((Class==Job_Thief) || (Class==12) || (Class==17) || (Class==52) || (Class==58) || (Class==63) || (Class==4007) || (Class==4013) || (Class==4018)) goto Lskillsthief;
 Lskillsnovice:
 mes "[Platinum Skill NPC]";
 mes "I see that you are a Novice. I will now add the special skills available to the Novice job.";
@@ -34,6 +36,14 @@ mes " ";
 mes "You now have all the special skills available to the Novice job.";
 next;
 goto LskillsEND;
+Lskillssnovice:
+mes "[Platinum Skills]";
+mes "I see that you are a Super Novice. I will now add the special skills available to your job.";
+skill 142,1,0; //Snovices don't have play dead, do they?
+mes " ";
+mes "You now have all the special skills available to your Novice job.";
+next;
+goto LskillsEND;
 Lskillsswordie:
 mes "[Platinum Skill NPC]";
 mes "I see that you are a Swordman, Knight, Crusader, Lord Knight or Paladin. I will now add the special skills available to these jobs.";
diff --git a/npc/quests/custom/event_32_new_hats.txt b/npc/quests/custom/event_32_new_hats.txt
index 52056d437..5ad0c66f4 100644
--- a/npc/quests/custom/event_32_new_hats.txt
+++ b/npc/quests/custom/event_32_new_hats.txt
@@ -699,7 +699,7 @@ L1_19:
 	mes "Let me check the items you have brought here.";
 	next;
 	if((countitem(10007) < 1)) goto L_ITEM_1b;
-	if((countitem(10008) < 1)) goto L_ITEM_2b;
+	if((countitem(10009) < 1)) goto L_ITEM_2b;
 	mes "[Jac]";
 	mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Kafra Band for you right away. Please Wait a Moment.";
    	next;