Fix pipeline

2 files changed, 19 insertions, 18 deletions

diff --git a/npc/00000SAVE/smiths/009-1_silversmith.txt b/npc/00000SAVE/smiths/009-1_silversmith.txt
index 9be3acc8b..5f9e9e23b 100644
--- a/npc/00000SAVE/smiths/009-1_silversmith.txt
+++ b/npc/00000SAVE/smiths/009-1_silversmith.txt
@@ -1,7 +1,8 @@
+//          TODO: Silversmith on 24, 25
 
-009-1,43,32,0	script	Silversmith	NPC135,{
+017-5,24,25,0	script	Silversmith	NPC135,{
 
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"Hello, I am your local silversmith, here for all of your smithing needs!\"";
     goto L_Smithmenu;
 
@@ -14,28 +15,28 @@ L_Smithmenu:
         "I think I have everything I need, thanks.", L_close;
 
 L_Sword:
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"I can, it will cost you 9 Silver Ore, 5 Raw Coal, and 40,000 gp.\"";
     menu
         "Sure.", L_sword2,
         "What a ripoff!  No way!", L_close;
 
 L_Helm:
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"I can silver that helmet for 6 Silver Ore, 9 Raw coal, and 50,000 gp.\"";
     menu
         "Here you go.", L_helm2,
         "Are you nuts?! Forget it!", L_close;
 
 L_Bow:
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"I can silver that bow for 18 Silver Ore, 18 Raw Coal, and 200,000 gp.\"";
     menu
         "Sure.", L_bow2,
         "Whoa, that's way too much.", L_close;
 
 L_Clover:
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"I can silver your clover for 4 Silver Ore, 5 Raw Coal, and 50,000 gp.\"";
     menu
         "I have them right here.", L_Clover2,
@@ -51,7 +52,7 @@ L_sword2:
     delitem "ShortSword", 1;
     Zeny = Zeny - 40000;
     getitem "SilverSword", 1;
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"There you go! Want me to silver anything else?\"";
     menu
         "Yes.", L_Smithmenu,
@@ -67,7 +68,7 @@ L_helm2:
     delitem "UnsilveredCrusadeHelmet", 1;
     Zeny = Zeny - 50000;
     getitem "CrusadeHelmet", 1;
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"There you go.  Would you like anything else silvered?\"";
     menu
         "Yes.", L_Smithmenu,
@@ -83,7 +84,7 @@ L_bow2:
     delitem "ForestBow", 1;
     Zeny = Zeny - 200000;
     getitem "SilverBow", 1;
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"There you go.  Would you like anything else silvered?\"";
     menu
         "Yes.", L_Smithmenu,
@@ -99,24 +100,24 @@ L_Clover2:
         delitem "FourLeafClover", 1;
         Zeny = Zeny - 50000;
         getitem "SilverFourLeafAmulet", 1;
-        mes "[Smith Silvers]";
+        mesn "Smith Silvers";
         mes "\"There you go.  Would you like anything else silvered?\"";
         menu
             "Yes.", L_Smithmenu,
             "No.", L_No;
 
 L_Missing:
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"It looks like you're missing some items.  Please come back when you have what I need!\"";
     goto L_close;
 
 L_NotEnoughMoney:
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"You don't have enough money, come back later!\"";
     goto L_close;
 
 L_No:
-    mes "[Smith Silvers]";
+    mesn "Smith Silvers";
     mes "\"Have a great day!\"";
     goto L_close;
 
diff --git a/npc/003-0/paladin.txt b/npc/003-0/paladin.txt
index 5b0c827fb..eba41aecf 100644
--- a/npc/003-0/paladin.txt
+++ b/npc/003-0/paladin.txt
@@ -46,11 +46,11 @@ L_Member:
     mesn;
     mesq l("Hey there! Do you want to learn new skills for a very small teaching fee?");
     select
-        rif(sk_intcost(SM_BASH) && sk_canlvup(SM_BASH), l("Improve Bash Skill"),
-        rif(sk_intcost(AL_ANGELUS) && sk_canlvup(AL_ANGELUS), l("Improve Party Area Defense"),
-        rif(sk_intcost(MER_INCAGI) && sk_canlvup(MER_INCAGI), l("Improve Increase Agility"),
-        rif(sk_intcost(PR_REDEMPTIO) && !getskilllv(PR_REDEMPTIO), l("Learn Redemption"),
-        rif(sk_intcost(CR_TRUST) && !getskilllv(CR_TRUST), l("Learn Last Standing Man"),
+        rif(sk_intcost(SM_BASH) && sk_canlvup(SM_BASH), l("Improve Bash Skill")),
+        rif(sk_intcost(AL_ANGELUS) && sk_canlvup(AL_ANGELUS), l("Improve Party Area Defense")),
+        rif(sk_intcost(MER_INCAGI) && sk_canlvup(MER_INCAGI), l("Improve Increase Agility")),
+        rif(sk_intcost(PR_REDEMPTIO) && !getskilllv(PR_REDEMPTIO), l("Learn Redemption")),
+        rif(sk_intcost(CR_TRUST) && !getskilllv(CR_TRUST), l("Learn Last Standing Man")),
         l("Nothing at the moment.");
     mes "";
     switch (@menu) {