6 files changed, 68 insertions, 15 deletions
diff --git a/npc/merchants/advanced_refiner.txt b/npc/merchants/advanced_refiner.txt
index 9632f95f7..ec263e192 100644
--- a/npc/merchants/advanced_refiner.txt
+++ b/npc/merchants/advanced_refiner.txt
@@ -44,14 +44,19 @@
 //=========================================================================
 
 payon,157,146,6	script	Suhnbi#cash	4_M_03,{
-	disable_items;
-	mes "[Suhnbi]";
-	mes "I am the Armsmith";
-	mes "I can refine all kinds of weapons,";
-	mes "armor and equipment, so let me";
-	mes "know what you want to refine.";
-	next;
+	mes("[Suhnbi]");
+	mes("I am the Armsmith");
+	mes("I can refine all kinds of weapons,");
+	mes("armor and equipment, so let me");
+	mes("know what you want to refine.");
 
+	if (getbattleflag("features/replace_refine_npcs") == 1) {
+		if (openrefineryui())
+			close();
+	}
+	next();
+
+	disable_items;
 	setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 	.@menu$ = "";
 	for(.@i = 1; .@i<=10; ++.@i) {
diff --git a/npc/merchants/hd_refine.txt b/npc/merchants/hd_refine.txt
index a7fc5e922..1a5a43621 100644
--- a/npc/merchants/hd_refine.txt
+++ b/npc/merchants/hd_refine.txt
@@ -39,6 +39,17 @@
 
 //== Blacksmith Mighty Hammer (+7~9) =======================
 -	script	::MightyHammer	FAKE_NPC,{
+	mes("[Blacksmith Mighty Hammer]");
+	mes("I'm a blacksmith skilled in refining weapons and armors.");
+	mes("I can refine an item of your choice among the items you are equipped with.");
+	mes("Which item do you want to refine?");
+
+	if (getbattleflag("features/replace_refine_npcs") == 1) {
+		if (openrefineryui())
+			close();
+	}
+	next();
+
 	disable_items;
 	mes "[Blacksmith Mighty Hammer]";
 	mes "Unlike others, I am a blacksmith who refines a very limited number of items.";
@@ -179,6 +190,10 @@ lhz_in02,280,19,3	duplicate(MightyHammer)	Mighty Hammer#lhz	4_M_DWARF
 
 //== Basta (+10 and up) ====================================
 -	script	::Basta	FAKE_NPC,{
+	if (getbattleflag("features/replace_refine_npcs") == 1) {
+		if (openrefineryui())
+			end();
+	}
 	disable_items;
 	mes "[Basta]";
 	mes "I'm the best Blacksmith in the whole world, Basta.";
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 7f1b4d9a3..19ebf4a8e 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -589,14 +589,19 @@ lhz_in02,282,20,7	script	Fulerr	4_M_LGTMAN,{
 // If you enable this function, be sure to edit the value of .@safe to the max
 // safe refine in refine_db.txt as well.
 function	script	refinemain	{
+	mesf("[%s]", getarg(0));
+	mes("I'm the Armsmith.");
+	mes("I can refine all kinds of weapons, armor and equipment, so let me");
+	mes("know what you want me to refine.");
+
+	if (getbattleflag("features/replace_refine_npcs") == 1) {
+		if (openrefineryui())
+			close();
+	}	
+	next();
+
 	disable_items;
 	.@features = getarg(1);
-	mes "[" + getarg(0) + "]";
-	mes "I'm the Armsmith.";
-	mes "I can refine all kinds of weapons, armor and equipment, so let me";
-	mes "know what you want me to refine.";
-	next;
-
 	setarray .@position$[1], "Head","Body","Left hand","Right hand","Robe","Shoes","Accessory 1","Accessory 2","Head 2","Head 3";
 	.@menu$ = "";
 	for(.@i = 1; .@i <= 10; ++.@i) {
diff --git a/npc/re/merchants/hd_refiner.txt b/npc/re/merchants/hd_refiner.txt
index 17979642e..2dcc74bae 100644
--- a/npc/re/merchants/hd_refiner.txt
+++ b/npc/re/merchants/hd_refiner.txt
@@ -39,6 +39,17 @@
 
 //== Blacksmith Mighty Hammer (+7~9) =======================
 -	script	::MightyHammer	FAKE_NPC,{
+	mes("[Blacksmith Mighty Hammer]");
+	mes("I'm a blacksmith skilled in refining weapons and armors.");
+	mes("I can refine an item of your choice among the items you are equipped with.");
+	mes("Which item do you want to refine?");
+
+	if (getbattleflag("features/replace_refine_npcs") == 1) {
+		if (openrefineryui())
+			close();
+	}
+	next();
+	
 	disable_items;
 	mes "[Blacksmith Mighty Hammer]";
 	mes "Unlike others, I am a blacksmith who refines a very limited number of items.";
diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index 6356acfca..879e9a5f1 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -56,6 +56,17 @@ payon_in01,18,132,3	script	Vestri#pay	4_M_DWARF,{
 // On official servers, if an item is unsuccessfully refined it will break at a
 // 20% rate and downgrade at an 80% rate.
 function	script	refinenew	{
+	mesf("[%s]", getarg(0));
+	mes("I'm a blacksmith skilled in refining weapons and armors.");
+	mes("I can refine an item of your choice among the items you are equipped with.");
+	mes("Which item do you want to refine?");
+
+	if (getbattleflag("features/replace_refine_npcs") == 1) {
+		if (openrefineryui())
+			close();
+	}
+	next();
+
 	disable_items;
 	mes "["+ getarg(0) +"]";
 	mes "I am the best Armsmith ever!";
diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt
index f03d348b2..db9668b6d 100644
--- a/npc/re/merchants/shadow_refiner.txt
+++ b/npc/re/merchants/shadow_refiner.txt
@@ -39,11 +39,17 @@ itemmall,31,76,3	script	Shadow Blacksmith#nomal	4_F_JOB_BLACKSMITH,{
 	.@npc_name$ = "[Shadow Blacksmith]";
 	.@zeny_cost = 20000; // Amount of zeny to be charged for refining.
 
-	disable_items;
 	mesf("%s", .@npc_name$);
 	mes("Do you want to refine a Shadow item?");
 	mes("Please choose the part you want to refine.");
-	next;
+	
+	if (getbattleflag("features/replace_refine_npcs") == 1) {
+		if (openrefineryui())
+			close();
+	}
+	next();
+
+	disable_items;
 	setarray(.@position$[0],"Armor","Weapon","Shield","Shoes","Earring","Pendant");
 	for (.@i=EQI_SHADOW_ARMOR; .@i <= EQI_SHADOW_ACC_L; .@i++){
 		.@menu$ = .@menu$ + (getequipisequiped(.@i) ? getequipname(.@i) : ("^8C8C8C" + .@position$[.@i-EQI_SHADOW_ARMOR] + " [Not Equipped]^000000" + ":"));