Update to last rAthena npc.

Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt

1 files changed, 99 insertions, 103 deletions

diff --git a/npc/re/merchants/refine.txt b/npc/re/merchants/refine.txt
index b1493e12d..923e862e6 100644
--- a/npc/re/merchants/refine.txt
+++ b/npc/re/merchants/refine.txt
@@ -3,9 +3,7 @@
 //===== By: ==================================================
 //= Hercules Dev Team
 //===== Current Version: =====================================
-//= 1.2
-//===== Compatible With: =====================================
-//= Hercules
+//= 1.3
 //===== Description: =========================================
 //= Renewal-specific refining NPCs and material merchants.
 //===== Additional Comments: =================================
@@ -14,20 +12,21 @@
 //= 1.1 Added Malangdo Refiner "Clink". [Euphy]
 //= 1.2 Added official success calculation, thanks to Helvetica.
 //=     The safe/multiple refine feature is now functional. [Euphy]
+//= 1.3 Updated to match the latest official script. [Euphy]
 //============================================================
 
 // +11 and above Refiners
 //============================================================
-prt_in,90,72,5	script	Bestry#prt	826,{
-	callfunc "refinenew","Bestry",0;
+prt_in,90,72,5	script	Vestri#prt	826,{
+	callfunc "refinenew","Vestri",0;
 	end;
 }
-morocc_in,64,41,5	script	Bestry#moc	826,{
-	callfunc "refinenew","Bestry",0;
+morocc_in,64,41,5	script	Vestri#moc	826,{
+	callfunc "refinenew","Vestri",0;
 	end;
 }
-payon_in01,18,132,3	script	Bestry#pay	826,{
-	callfunc "refinenew","Bestry",0;
+payon_in01,18,132,3	script	Vestri#pay	826,{
+	callfunc "refinenew","Vestri",0;
 	end;
 }
 
@@ -45,24 +44,32 @@ payon_in01,18,132,3	script	Bestry#pay	826,{
 function	script	refinenew	{
 	disable_items;
 	mes "["+ getarg(0) +"]";
-	mes "I am the best Blacksmith ever!";
-	mes "I don't work with normal, boring items.";
-	mes "But only with items that are level 10 or higher!";
+	mes "I am the best Armsmith ever!";
+	mes "I don't refine normal, boring items.";
+	mes "I only refine items that are Level 10 or higher.";
 	next;
 	mes "["+ getarg(0) +"]";
-	mes "Anyway, you may use my services if your item is lv 10 or higher.";
-	mes "What do you want to have refined?";
+	mes "Anyway, you may use my services if your item is Level 10 or higher.";
+	mes "What do 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";
 	set .@menu$,"";
 	for(set .@i,1; .@i<=10; set .@i,.@i+1) {
-		if(getequipisequiped(.@i))
+		if (getequipisequiped(.@i)) {
 			set .@menu$, .@menu$ + .@position$[.@i] + "-" + "[" + getequipname(.@i) + "]";
+			set .@equipped,1;
+		}
 		set .@menu$, .@menu$ + ":";
 	}
-	set .@part,select(.@menu$);
-	if(!getequipisequiped(.@part)) {
+	if (.@equipped == 0) {
+		mes "[" + getarg(0) + "]";
+		mes "I don't think I can refine any items you have...";
+		close;
+	}
+	set .@part, select(.@menu$);
+
+	if (!getequipisequiped(.@part)) { //custom check
 		mes "[" + getarg(0) + "]";
 		mes "You're not wearing";
 		mes "anything there that";
@@ -70,20 +77,18 @@ function	script	refinenew	{
 		emotion e_an;
 		close;
 	}
-	//Check if the item is refinable...
-	if(!getequipisenableref(.@part)) {
+	if (!getequipisenableref(.@part)) {
 		mes "[" + getarg(0) + "]";
 		mes "I don't think I can";
 		mes "refine this item at all...";
 		close;
 	}
-	//Check to see if the items is at least +10
-	if(getequiprefinerycnt(.@part) < 10) {
+	if (getequiprefinerycnt(.@part) < 10) {
 		mes "["+ getarg(0) +"]";
-		mes "I said I don't work with Equipment under lv. 10.";
+		mes "I said I don't work with items that are lower than Level 10.";
 		close;
 	}
-	if(getequiprefinerycnt(.@part) >= 20) {
+	if (getequiprefinerycnt(.@part) >= 20) { //custom check
 		mes "["+ getarg(0) +"]";
 		mes "I can't refine this";
 		mes "any more. This is as";
@@ -93,7 +98,8 @@ function	script	refinenew	{
 	set .@refineitemid, getequipid(.@part); // save id of the item
 	set .@refinerycnt, getequiprefinerycnt(.@part); //save refinery count
 	if ((getequipweaponlv(.@part) >= 1) && (getequipweaponlv(.@part) <= 4)) {
-		set .@material,6224;
+		set .@type$,"weapon";
+		set .@material,6224; //Bradium
 		set .@price,100000;
 		switch(getequipweaponlv(.@part)) {
 			case 1: set .@safe,17; break;
@@ -105,69 +111,61 @@ function	script	refinenew	{
 		mes "Hmm a weapon, is that ok?";
 		mes "If you want to refine this weapon,";
 		mes "I will need 1 ^003366Bradium^000000 and 100,000 zeny.";
-		mes "Are you sure you want to continue?";
 	} else {
-		set .@material,6223;
+		set .@type$,"armor";
+		set .@material,6223; //Carnium
 		set .@price,100000;
 		set .@safe,14;
 		mes "["+ getarg(0) +"]";
 		mes "Hmm an armor, is that ok?";
 		mes "If you want to refine this armor,";
 		mes "I will need 1 ^003366Carnium^000000 and 100,000 zeny.";
-		mes "Are you sure you want to continue?";
 	}
+	mes "Are you sure you want to continue?";
 	next;
 	if(select("Yes:No") == 2){
 		mes "["+ getarg(0) +"]";
-		mes "Well, no challenge is one way...";
-		mes "No risk... that could be wise.";
+		mes "Hm... if you mind... never mind...";
 		close;
 	}
-	if(getarg(1) != 1) {
-		if ((getequipweaponlv(.@part) >= 1) && (getequipweaponlv(.@part) <= 4)) {
+	if (getarg(1) != 1) {
+		if (getequippercentrefinery(.@part) < 100) {
 			mes "["+ getarg(0) +"]";
-			mes "This weapon already has been refined serveral times.";
-			mes "It could be destroyed if you try more.";
-			mes "It won't break 100%, but is has a small chance.";
+			mes "This "+.@type$+" already has been refined serveral times.";
+			mes "It could be destroyed if I try again.";
+			mes "It won't break for sure, but there is has a small chance.";
 			next;
 			mes "["+ getarg(0) +"]";
-			mes "You could have the upgrade level of the weapon decreased,";
+			mes "You could be ^FF0000lowering the upgrade level^000000 of the "+.@type$+",";
 			mes "or if it breaks, you will lose ^FF0000any cards^000000 or special properties added to it.";
-		} else {
-			mes "["+ getarg(0) +"]";
-			mes "This armor already has been refined serveral times.";
-			mes "It could be destroyed if you try more.";
-			mes "It won't break 100%, but is has a small chance.";
 			next;
 			mes "["+ getarg(0) +"]";
-			mes "You could have the upgrade level of the armor decreased,";
-			mes "or if it breaks, you will lose ^FF0000any cards^000000 or special properties added to it.";
-		}
-		next;
-		mes "["+ getarg(0) +"]";
-		mes "Do you want me to refine it?";
-		mes "I think I gave you enough warnings.";
-		next;
-		if(select("Yes.:No.") == 2) {
-			mes "["+ getarg(0) +"]";
-			mes "Well, no challenge is one way..";
-			mes "No risk.. that could be wise.";
-			close;
+			mes "Do you still want me to refine it?";
+			mes "I think I have given you enough warning.";
+			next;
+			if(select("Yes.:No.") == 2) {
+				mes "["+ getarg(0) +"]";
+				mes "Well, no challenge is one way to go...";
+				mes "No risk... that could be wise.";
+				close;
+			}
 		}
-		if(countitem(.@material) < 1 || Zeny < .@price) {
+		if (countitem(.@material) < 1 || Zeny < .@price) {
 			mes "["+ getarg(0) +"]";
-			mes "Hm, it seems you don't have enough materials or money.";
-			mes "Please check it out.";
+			mes "Hm. You don't seem to have enough money or "+getitemname(.@material)+".";
+			mes "Please come back when you have them.";
 			close;
 		}
 		set Zeny,Zeny - .@price;
 		delitem .@material,1;
-		if(getequipisequiped(.@part) == 0) { // hacker has removed the item (not changed, why?)
+
+		//custom checks
+		if (getequipisequiped(.@part) == 0) { // hacker has removed the item (not changed, why?)
 			mes "[" + getarg(0) + "]";
 			mes "Look here... you don't have any items on...";
 			close;
 		}
-		if(getequiprefinerycnt(.@part) != .@refinerycnt || getequipid(.@part) != .@refineitemid) { // hacker has changed the item
+		if (getequiprefinerycnt(.@part) != .@refinerycnt || getequipid(.@part) != .@refineitemid) { // hacker has changed the item
 			mes "[" + getarg(0) + "]";
 			emotion e_an;
 			mes "Wait a second...";
@@ -175,6 +173,7 @@ function	script	refinenew	{
 			mes "You switched the item while I wasn't looking! Get out of here!";
 			close;
 		}
+
 		if (getequippercentrefinery(.@part) > rand(100)) {
 			mes "Clang! Clang! Clang! Clang!";
 			successrefitem .@part;
@@ -182,7 +181,7 @@ function	script	refinenew	{
 			emotion e_no1;
 			mes "["+ getarg(0) +"]";
 			mes "Good! Succes!!!";
-			mes "I am the best Blacksmith.";
+			mes "I am the best Armsmith.";
 			close;
 		} else {
 			if (rand(100) < 80) {
@@ -195,14 +194,8 @@ function	script	refinenew	{
 				mes "Ahhh!!!";
 				next;
 				mes "["+ getarg(0) +"]";
-				mes "Oh my!";
+				mes "Oh my god!";
 				mes "The upgrade level has dropped...";
-				mes "There could've been made an mistake even though I am the best ever.";
-				mes "It was out of my hands.";
-				next;
-				mes "["+ getarg(0) +"]";
-				mes "I will do a better job next time! Don't worry!";
-				close;
 			} else {
 				mes "["+ getarg(0) +"]";
 				mes "Clang! Clang! Clang!";
@@ -215,17 +208,17 @@ function	script	refinenew	{
 				mes "["+ getarg(0) +"]";
 				mes "Oh my! I've failed to refine stuff...";
 				mes "I didn't mean it!";
-				mes "There could've been made an mistake even though I am the best ever.";
-				mes "It was out of my hands.";
-				next;
-				mes "["+ getarg(0) +"]";
-				mes "I will do a better job next time! Don't worry!";
-				close;
 			}
+			mes "I could have made a mistake even though I am the best Armsmith ever.";
+			mes "It just wasn't meant to be.";
+			next;
+			mes "["+ getarg(0) +"]";
+			mes "I will do a better job next time! Don't worry!";
+			close;
 		}
 	}
 // New +11 and above Refining Functions ========================
-	if(getequiprefinerycnt(.@part) < .@safe) {
+	if (getequiprefinerycnt(.@part) < .@safe) {
 		mes "[" + getarg(0) + "]";
 		mes "I can refine this to the safe limit or a desired number of times. It's your choice.";
 		next;
@@ -247,7 +240,7 @@ function	script	refinenew	{
 			mes "I can't refine this item that many times.";
 			close;
 		}
-		if(.@refinecheck > .@safe) {
+		if (.@refinecheck > .@safe) {
 			set .@refinecheck,.@refinecheck - .@safe;
 			mes "[" + getarg(0) + "]";
 			mes "This will try to refine the equipment " + .@refinecheck + " times past the safe limit. Your equipment may be destroyed... is that ok?";
@@ -268,14 +261,15 @@ function	script	refinenew	{
 	mes "[" + getarg(0) + "]";
 	mes "That will cost you " + .@refinecnt + " " + getitemname(.@material) + " and " + .@fullprice + " Zeny. Is that ok?";
 	next;
-	if(select("Yes","No...") == 2){
+	if(select("Yes:No...") == 2){
 		mes "[" + getarg(0) + "]";
 		mes "You said so... So be it.";
 		close;
 	}
-	if(countitem(.@material) < .@refinecnt || Zeny < .@fullprice) {
+	if (countitem(.@material) < .@refinecnt || Zeny < .@fullprice) {
 		mes "[" + getarg(0) + "]";
-		mes "Is that all you got? Unfortunately I can't work for you at a lower price. Try putting yourself in my shoes.";
+		mes "Hm. You don't seem to have enough money or "+getitemname(.@material)+".";
+		mes "Please come back when you have them.";
 		close;
 	}
 	set Zeny,Zeny - .@fullprice;
@@ -309,14 +303,8 @@ function	script	refinenew	{
 				mes "Ahhh!!!";
 				next;
 				mes "["+ getarg(0) +"]";
-				mes "Oh my!";
+				mes "Oh my god!";
 				mes "The upgrade level has dropped...";
-				mes "There could've been made an mistake even though I am the best ever.";
-				mes "It was out of my hands.";
-				next;
-				mes "["+ getarg(0) +"]";
-				mes "I will do a better job next time! Don't worry!";
-				close;
 			} else {
 				mes "["+ getarg(0) +"]";
 				mes "Clang! Clang! Clang!";
@@ -329,13 +317,13 @@ function	script	refinenew	{
 				mes "["+ getarg(0) +"]";
 				mes "Oh my! I've failed to refine stuff...";
 				mes "I didn't mean it!";
-				mes "There could've been made an mistake even though I am the best ever.";
-				mes "It was out of my hands.";
-				next;
-				mes "["+ getarg(0) +"]";
-				mes "I will do a better job next time! Don't worry!";
-				close;
 			}
+			mes "I could have made a mistake even though I am the best Armsmith ever.";
+			mes "It just wasn't meant to be.";
+			next;
+			mes "["+ getarg(0) +"]";
+			mes "I will do a better job next time! Don't worry!";
+			close;
 		}
 	}
 	emotion e_no1;
@@ -347,8 +335,16 @@ function	script	refinenew	{
 
 // Ori/Elu to Carnium/Bradium Refiners
 //============================================================
--	script	Austry#ref	-1,{
-	mes "[Austry]";
+-	script	Austri#ref	-1,{
+	if (checkweight(1201,1) == 0) {
+		mes "- Wait a minute !! -";
+		mes "- Currently you're carrying -";
+		mes "- too many items with you. -";
+		mes "- Please try again -";
+		mes "- after you lose some weight. -";
+		close;
+	}
+	mes "[Austri]";
 	mes "If you bring me 3";
 	mes "Oridecon or Elunium";
 	mes "I can exchange them for";
@@ -366,7 +362,7 @@ function	script	refinenew	{
 		setarray .@i[0],6090,1,6223; //Purified_Bradium -> Carnium
 		break;
 	case 4:
-		mes "[Austry]";
+		mes "[Austri]";
 		mes "Hmm...";
 		close;
 	}
@@ -374,26 +370,26 @@ function	script	refinenew	{
 		delitem .@i[0],.@i[1];
 		set Zeny, Zeny - 50000;
 		getitem .@i[2],1;
-		mes "[Austry]";
+		mes "[Austri]";
 		if (.@i[0] == 6090) {
-			mes "Refining with Purified Bradium";
-			mes "is a little expensive. I can";
-			mes "trade it for some Carnium.";
+			mes "Refining with Refined Bradium";
+			mes "can be a little expensive.";
+			mes "I can exchange it for some Carnium.";
 		} else
-			mes "Ok! Here is your "+getitemname(.@i[2])+".";
+			mes "Ok! Here's your "+getitemname(.@i[2])+".";
 		mes "Take it and use it well.";
 		close;
 	}
-	mes "[Austry]";
+	mes "[Austri]";
 	mes "You better not be trying";
 	mes "to cheat me because you";
-	mes "don't have enough zeny";
+	mes "don't have enough money";
 	mes "or "+getitemname(.@i[0])+".";
 	close;
 }
-prt_in,85,71,5	duplicate(Austry#ref)	Austry#prt	826
-payon_in01,14,125,5	duplicate(Austry#ref)	Austry#pay	826
-morocc_in,60,38,5	duplicate(Austry#ref)	Austry#moc	826
+prt_in,85,71,5	duplicate(Austri#ref)	Austri#prt	826
+payon_in01,14,125,5	duplicate(Austri#ref)	Austri#pay	826
+morocc_in,60,38,5	duplicate(Austri#ref)	Austri#moc	826
 
 // Malangdo Refiner
 //============================================================