- Follow up r15949 .

* Removed some unneeded perm. char. variables.
* And i meant [bugreport:5607] got fixed NOT [bugreport:5606] since Brian already fixed that Bugreport.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15950 54d463be-8e91-2dee-dedb-b68131a5f0ec

npc/quests/skills/archer_skills.txt

@@ -16,7 +16,7 @@
 
 moc_ruins,118,99,5	script	Roberto	88,{
 	if (BaseJob == Job_Archer) {
-		if (ac_makingarrow_x == 1) {
+		if (getskilllv("AC_MAKINGARROW") == 1) {
 			mes "[Roberto]";
 			mes "Ooh, you're from my home town!";
 			mes "Nice to see you!";
@@ -51,7 +51,6 @@ moc_ruins,118,99,5	script	Roberto	88,{
 				delitem 1019,13; //Wooden_Block
 				delitem 501,1; //Red_Potion
 				skill "AC_MAKINGARROW",1,0;
-				set ac_makingarrow_x,1;
 				mes "[Roberto]";
 				mes "No need to worry about arrows now.";
 				mes "Oh, and did you happen to see";
@@ -149,7 +148,7 @@ moc_ruins,118,99,5	script	Roberto	88,{
 
 payon,103,63,3	script	Jason	88,3,3,{
 	if (BaseJob == Job_Archer) {
-		if (ac_chargearrow_x == 1) {
+		if (getskilllv("AC_CHARGEARROW") == 1) {
 			mes "[Jason]";
 			mes "Eh, we meet again.";
 			mes "Ehhhh so weird.";
@@ -231,7 +230,6 @@ payon,103,63,3	script	Jason	88,3,3,{
 					delitem 925,10; //Bill_Of_Birds
 					delitem 532,36; //Banana_Juice
 					skill "AC_CHARGEARROW",1,0;
-					set ac_chargearrow_x,1;
 					mes "[Jason]";
 					mes "Oh, works better than I expected!";
 					mes "Won't be needing to modify the bow!";

npc/quests/skills/merchant_skills.txt

@@ -16,7 +16,7 @@
 
 alberta,83,96,5	script	Necko	98,7,7,{
 	if (BaseJob == Job_Merchant) {
-		if (mc_loud_x == 1) {
+		if (getskilllv("MC_LOUD") == 1) {
 			mes "[Necko]";
 			mes "I'm sorry. Necko's store is...";
 			mes "Oh? Who's this?";
@@ -79,7 +79,6 @@ alberta,83,96,5	script	Necko	98,7,7,{
 				delitem 532,1; //Banana_Juice
 				delitem 921,50; //Mushroom_Spore
 				skill "MC_LOUD",1,0;
-				set mc_loud_x,1;
 				mes "[Necko]";
 				mes "You have learned Crazy Uproar!!";
 				mes "Shout as much as you wish!";
@@ -181,7 +180,7 @@ OnTouch:
 
 alberta,119,221,6	script	Charlron	107,5,5,{
 	if (BaseJob == Job_Merchant) {
-		if (mc_changecart_x == 1) {
+		if (getskilllv("MC_CHANGECART") == 1) {
 			mes "[Charlron]";
 			mes "Mmm? I was wondering who was making all";
 			mes "the raucus carrying around a cart.";
@@ -224,7 +223,6 @@ alberta,119,221,6	script	Charlron	107,5,5,{
 					delitem 998,10; //Iron
 					delitem 919,20; //Animal's_Skin
 					skill "MC_CHANGECART",1,0;
-					set mc_changecart_x,1;
 					mes "[Charlron]";
 					mes "Congratulations.";
 					mes "You can choose a cart";
@@ -335,7 +333,7 @@ alberta,119,221,6	script	Charlron	107,5,5,{
 
 alberta,232,106,6	script	Gershaun	57,5,5,{
 	if (BaseJob == Job_Merchant) {
-		if (mc_cartrevolution_x == 1) {
+		if (getskilllv("MC_CARTREVOLUTION") == 1) {
 			mes "[Gershaun]";
 			mes "Ah, long time no see!";
 			mes "Ohh, the red marks on your cart.";
@@ -378,7 +376,6 @@ alberta,232,106,6	script	Gershaun	57,5,5,{
 						delitem 601,20; //Wing_Of_Fly
 						delitem 962,5; //Tentacle
 						skill "MC_CARTREVOLUTION",1,0;
-						set mc_cartrevolution_x,1;
 						mes "Now you can use Cart Revolution";
 						mes "I expect you to make merchants";
 						mes "famous by using this amazing";
@@ -451,7 +448,6 @@ alberta,232,106,6	script	Gershaun	57,5,5,{
 						delitem 601,15; //Wing_Of_Fly
 						delitem 962,5; //Tentacle
 						skill "MC_CARTREVOLUTION",1,0;
-						set mc_cartrevolution_x,1;
 						mes "Now you can use Cart Revolution";
 						mes "I expect you to make merchants";
 						mes "famous by using its amazing";
@@ -525,7 +521,6 @@ alberta,232,106,6	script	Gershaun	57,5,5,{
 						delitem 601,23; //Wing_Of_Fly
 						delitem 962,6; //Tentacle
 						skill "MC_CARTREVOLUTION",1,0;
-						set mc_cartrevolution_x, 1;
 						mes "Now you can use Cart Revolution";
 						mes "I expect you to make merchants";
 						mes "famous by using its amazing";

npc/quests/skills/swordman_skills.txt

@@ -54,8 +54,7 @@ izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
 			mes "Bring your armor!";
 			mes "Last but not least... bring me one ^008800Moth Wing^000000.";
 			next;
-			switch (select("Eh? You need that, too?")) {
+			menu "Eh? You need that, too?",-;
-			case 1:
 			mes "[De Thomas]";
 			mes "Not really.. I don't really NEED it.";
 			mes "It's just that my niece has gotten a bug hunting as a holiday task during the summer vacation.";
@@ -75,7 +74,6 @@ izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
 			close;
 		}
 	}
-	}
 	else if ((BaseJob == Job_Swordman) && (sm_movingrecovery_x > 1)) {
 		mes "[De Thomas]";
 		mes "Oh, it's you?";
@@ -153,7 +151,7 @@ izlude_in,175,130,2	script	Knight De Thomas	98,4,4,{
 prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 
 	if ((BaseJob == Job_Swordman) && (JobLevel >= 25)) {
-		if (sm_fatalblow_x == 1) {
+		if (getskilllv("SM_FATALBLOW") == 1) {
 			mes "[Leon]";
 			mes "Eh?";
 			mes "I was wondering who that was!";
@@ -179,7 +177,6 @@ prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 				delitem 962,30; //Tentacle
 				delitem 526,5; //Royal_Jelly
 				skill "SM_FATALBLOW",1,0;
-				set sm_fatalblow_x,1;
 				mes "[Leon]";
 				mes "Success!";
 				mes "Go use your new skill to its full potential.";
@@ -204,7 +201,6 @@ prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 				close;
 			}
 		}
-		else {
 		mes "[Leon]";
 		mes "Ooh! A young and strong swordsman!";
 		next;
@@ -292,7 +288,6 @@ prt_in,75,88,5	script	Leon Von Frich	85,3,3,{
 			close;
 		}
 	}
-	}
 	mes "[Leon]";
 	mes "Oh, no! I have nothing to offer you!";
 	mes "I can't say nice and fun things to anyone";
@@ -309,7 +304,7 @@ OnTouch:
 
 prt_in,94,57,3	script	Juan	85,4,4,{
 	if (BaseJob == Job_Swordman) {
-		if (sm_autoberserk_x == 1) {
+		if (getskilllv("SM_AUTOBERSERK") == 1) {
 			mes "[Juan]";
 			mes "Mmm? Long time no see!";
 			mes "How are you?";
@@ -348,7 +343,6 @@ prt_in,94,57,3	script	Juan	85,4,4,{
 				delitem 957,10; //Decayed_Nail
 				delitem 518,10; //Honey
 				skill "SM_AUTOBERSERK",1,0;
-				set sm_autoberserk_x,1;
 				mes "[Juan]";
 				mes "You have just become a swordsman";
 				mes "that can use Auto Berserk.";