Update to last rAthena npc.

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

1 files changed, 33 insertions, 37 deletions

diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index 5bb9a7d7d..0375aa15d 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -1,26 +1,24 @@
 //=====Hercules Script =======================================
 //= Armor Enchanter
-//===== By: ================================================== 
+//===== By: ==================================================
 //= L0ne_W0lf
-//===== Current Version: ===================================== 
+//===== Current Version: =====================================
 //= 1.3a
-//===== Compatible With: ===================================== 
-//= Hercules Git
-//===== Description: ========================================= 
-//= [Aegis Conversion]
+//===== Description: =========================================
+//= [Official Conversion]
 //= Add a +1, +2, or +3 random stat to a specified armor.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First version.
 //= 1.1 Corrected typo (Sit -> Suit) (bugreport:4586)
 //= 1.2 Optimized. [Euphy]
 //= 1.3 Fixed some typos and optimized a little more. [Daegaladh]
 //= 1.3a Added 'disable_items' command. [Euphy]
-//============================================================ 
+//============================================================
 
 prontera,165,60,2	script	Apprentice Craftsman	73,{
 	disable_items;
 	mes "[Apprentice Craftsman]";
-	if (Zeny > 399999) {
+	if (Zeny >= 400000) {
 		mes "I've been studying ways to enhance an armor to maximize its capability.";
 		next;
 		mes "[Apprentice Craftsman]";
@@ -35,24 +33,24 @@ prontera,165,60,2	script	Apprentice Craftsman	73,{
 		mes "[Apprentice Craftsman]";
 		mes "I'm not responsible for what would happen if you have more than one of the same kind in your inventory.";
 		next;
-		switch(select("Armor with no Slots:Armor with Slots:High Grade Armor:Maybe next time")) {
-			case 1:
-				setarray .@Items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396;
-				set .@j,50;
-				break;
-			case 2:
-				setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
-				set .@j,55;
-				set .@k,1;
-				break;
-			case 3:
-				setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
-				set .@j,60;
-				break;
-			case 4:
-				mes "[Apprentice Craftsman]";
-				mes "Please come back when you have any interest in enchanting your armor.";
-				close;
+		switch(select("Non Slotted Armor.:Slotted Armor.:High Grade Armor.:Maybe next time.")) {
+		case 1:
+			setarray .@Items[0],2307,2309,2314,2316,2321,2325,2327,2328,2330,2332,2334,2335,2341,2344,2346,2348,2350,2337,2386,2394,2395,2396;
+			set .@j,50;
+			break;
+		case 2:
+			setarray .@Items[0],2311,2318,2319,2320,2308,2310,2315,2317,2322,2324,2326,2331,2333,2336,2342,2345,2347,2349,2351;
+			set .@j,55;
+			set .@k,1;
+			break;
+		case 3:
+			setarray .@Items[0],2364,2365,2391,2374,2375,2376,2377,2378,2379,2380,2381,2382,2387,2388,2389,2390;
+			set .@j,60;
+			break;
+		case 4:
+			mes "[Apprentice Craftsman]";
+			mes "Please come back when you have any interest in enchanting your armor.";
+			close;
 		}
 		set .@menu$,"";
 		for(set .@i,0; .@i<getarraysize(.@Items); set .@i,.@i+1)
@@ -60,19 +58,17 @@ prontera,165,60,2	script	Apprentice Craftsman	73,{
 		callsub S_EnchantArmor, .@Items[select(.@menu$)-1], .@j;
 		end;
 	}
-	else {
-		mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor.";
-		next;
-		mes "[Apprentice Craftsman]";
-		mes "If by any chance, you would want to enchant your armor, bring me 400,000 zeny and the armor you want to enchant and you are all set to go.";
-		close;
-	}
+	mes "I am in charge of Enchanting Armors. Simply put, I've been studying ways to power-up armor.";
+	next;
+	mes "[Apprentice Craftsman]";
+	mes "If by any chance, you would want to enchant your armor, bring me 400,000 zeny and the armor you want to enchant and you are all set to go.";
+	close;
 
 S_EnchantArmor:
 	set .@itemid,getarg(0);
 	set .@failrate,getarg(1);
 	mes "[Apprentice Craftsman]";
-	if ((countitem(.@itemid) > 0) && (countitem(.@itemid) < 2)) {
+	if (countitem(.@itemid) == 1) {
 		mes "Socket enchant will cost you 400,000 zeny. And there will be a random option enchanted. Of course, there is a chance of breaking your armor.";
 		next;
 		mes "[Apprentice Craftsman]";
@@ -81,7 +77,7 @@ S_EnchantArmor:
 		mes "and Cards will be GONE.^000000";
 		mes "Do you still want to try an Enchant?";
 		next;
-		if(select("Hmm... Let me think it over.:I've made up my mind already. Give it a shot.")==1) {
+		if(select("Hmm... Let me think it over.:Go ahead.") == 1) {
 			mes "[Apprentice Craftsman]";
 			mes "Well, I can't blame you. Safety first, eh?";
 			mes "Now you have a nice day.";
@@ -97,7 +93,7 @@ S_EnchantArmor:
 			close;
 		}
 		progressbar "ffff00",7;
-		set zeny,zeny-400000;
+		set Zeny, Zeny-400000;
 		delitem .@itemid,1;
 		switch (rand(1,.@failrate)) {
 			case 1: set .@addpart,4702;break;