1 files changed, 16 insertions, 103 deletions
diff --git a/npc/jobs/2-2-1/Creator.txt b/npc/jobs/2-2-1/Creator.txt
index a48dd7871..219091856 100644
--- a/npc/jobs/2-2-1/Creator.txt
+++ b/npc/jobs/2-2-1/Creator.txt
@@ -1,106 +1,19 @@
-// Advance Class jobchanger after kRO Normals.
-// Checks if the player have any questskills, cart\falcon, level and such.
-// Made by Nana.
+//===== eAthena Script ======================================= 
+//= Advance Class jobchanger after kRO Normals.
+//===== By: ==================================================
+//= Nana
+//= finished, optimized and tested by Lupus
+//===== Current Version: ===================================== 
+//= 1.1
+//===== Compatible With: ===================================== 
+//= eAthena 1.0 +
+//===== Description: ========================================= 
+//= Advance Class jobchanger after kRO Normals.
+//===== Additional Comments: ================================= 
+//= v1.1 Made all into functions, additional checks, etc. [Lupus]
+//============================================================ 
 
 // -== Creator ==-
 valkyrie.gat,53,50,6	script	Creator	122,{
-	if(getskilllv(153) > 0) set @qsk,1;
-	if(getskilllv(154) > 0) set @qsk1,1;
-	if(getskilllv(155) > 0) set @qsk2,1;
-	if(checkcart(0) > 0) goto L_Cart;
-	if(readparam(12) > 0) goto Skill_Points;
-	if(readparam(19) >= 4008) goto L_Advance;
-	if((readparam(19) == 4001) && (readparam(55) >= 10)) goto L_HNov;
-	if((readparam(19) == 4007) && (readparam(55) >= 45)) goto L_HMERC;
-	if(readparam(19) < 7) goto L_Class;
-	if(readparam(19) == 4001) goto L_Class1;
-	if(readparam(19) == 4007) goto L_Class;
-	if((readparam(11) >= 99) && (readparam(55) >= 50) && (readparam(19) >= 7)) goto L_Change;
-	if((readparam(11) < 99) && (readparam(55) < 50)) goto L_Levels;
-	mes "[Creator]";
-	mes "Hi there...";
-	close;
-
-L_Change:
-	mes "[Creator]";
-	mes "Hello there "+strcharinfo(0)+"!";
-	mes "You've made a brave choice in coming here to be reborn and stepping forth into the ranks of Creator,";
-	mes "I wish you good fortune in the near future!";
-	jobchange 24;
-	resetlvl(1);
-	close;
-
-L_Cart:
-	mes "[Creator]";
-	mes "Please un-equip that cart before continuing.";
-	close;
-
-L_Class1:
-	mes "[Creator]";
-	mes "You're not ready to become an High Merchant yet.";
-	close;
-
-L_Class:
-	mes "[Creator]";
-	mes "You've come far to get here. unfortunately, you're not ready to become an Creator yet.";
-	close;
-
-L_Levels:
-	mes "[Creator]";
-	mes "You're doing great! keep up the good work. You'll eventually get to the point where you can be an Creator";
-	close;
-
-L_HNov:
-	mes "[Creator]";
-	mes "Tread lightly ahead as you're about to enter the distinguished world of Ragnarok.";
-	mes "Must great fortune follow you!";
-	jobchange 29;
-	next;
-	mes "[Creator]";
-	mes "Let me just add in the missing Quest Skills you lost under the Reborn process if you had any, "+strcharinfo(0)+".";
-	next;
-	if(@qsk > 0) goto qsk;
-	if(@qsk1 > 0) goto qsk1;
-	if(@qsk2 > 0) goto qsk2;
-	next;
-qsk:
-	skill 153,1,0;
-	set @qsk,0;
-	if(@qsk1 > 0) goto qsk1;
-	if(@qsk2 > 0) goto qsk2;
-	goto L_HNov_2;
-qsk1:
-	skill 154,1,0;
-	set @qsk1,0;
-	if(@qsk > 0) goto qsk;
-	if(@qsk2 > 0) goto qsk2;
-	goto L_HNov_2;
-qsk2:
-	skill 155,1,0;
-	set @qsk2,0;
-	if(@qsk > 0) goto qsk;
-	if(@qsk1 > 0) goto qsk1;
-	goto L_HNov_2;
-
-L_HNov_2:
-	mes "[Creator]";
-	mes "Now when the formalities are fixed, I congratulate you on your Advancement to High Merchant";
-	close;
-L_HMERC:
-	mes "[Creator]";
-	mes "Congratulations!";
-	mes "You're not finally after alot of hard work, able to enter the halls of Valkyrie as an Creator!";
-	jobchange 42;
-	close;
-
-Skill_Points:
-	mes "[Creator]";
-	mes "Please use all of your skillpoints before proceeding.";
-	close;
-
-L_Advance:
-	mes "[Creator]";
-	mes "Hey there! You are already an Reborn. You cannot reach any higher";
-	mes "*whistles*";
-	close;
-}
-\ No newline at end of file
+	callfunc "F_Rebirth",29,"Merchant High",42,"Creator",153,154,155,0;
+}