Update to last rAthena npc.

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

1 files changed, 12 insertions, 13 deletions

diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index b23a33494..5c0ecdc7a 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -1,20 +1,19 @@
-//===== rAthena Script ======================================= 
+//===== Hercules Script ======================================
 //= Mora Enchants
-//===== By: ================================================== 
+//===== By: ==================================================
 //= Euphy
-//===== Current Version: ===================================== 
-//= 1.1a
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: ========================================= 
+//===== Current Version: =====================================
+//= 1.2
+//===== Description: =========================================
 //= [Official Conversion]
 //= Adds enchantments to various items in exchange for
 //= Mora coins.
-//===== Additional Comments: ================================= 
+//===== Additional Comments: =================================
 //= 1.0 First Version. [Euphy]
 //= 1.1 Optimized. [Euphy]
 //= 1.1a Bug fixes. [Lemongrass]
-//============================================================ 
+//= 1.2 Bug fixes (bugreport:7930) [DeadlySilence]
+//============================================================
 
 // Arch Bishop Enchants :: coin_arc
 //============================================================
@@ -222,7 +221,7 @@ mora,96,74,5	script	Master of Relics#pa0829	495,{
 			if (.@i <= 1024) {
 				// Basic combinations
 				// (raw: .@i increments by 16, 4 repeats)
-				setarray .@enchant_slot2[0],4710,4720,4721,4240; //Inteligence2,Dexterity1,Dexterity2,Vitality1
+				setarray .@enchant_slot2[0],4711,4720,4721,4740; //Inteligence2,Dexterity1,Dexterity2,Vitality1
 				setarray .@enchant_slot3[0],.@sp,4799,4766,4788; //[sp],HP500,Atk2,Mdef6
 				setarray .@enchants[2],
 					.@enchant_slot2[rand(getarraysize(.@enchant_slot2))],
@@ -457,7 +456,7 @@ mora,99,93,5	script	Artifact Crafter#pa0829	495,{
 		break;
 	}
 	set .@item, .@items[(.@select-2)%4];
-	if (countitem(6380) == 0 || countitem(.@item) == 0) {
+	if (countitem(6380) < 2 || countitem(.@item) == 0) {
 		mes "[Artifact Crafter]";
 		mes "You have to have 2 Mora Coins and an item to be reinforced before I can do my work.";
 		close;
@@ -634,7 +633,7 @@ mora,148,98,3	script	Artifact Researcher#new	521,{
 	}
 	if (Zeny < 100000 || countitem(6380) == 0) {
 		mes "[Artifact Researcher]";
-		mes "I'm not giving these services out for free pal. 100,000 zeny or 1 Mora Coin. Is that too much to ask?";
+		mes "I'm not giving these services out for free pal. 100,000 zeny and 1 Mora Coin. Is that too much to ask?";
 		close;
 	}
 	mes "[Artifact Researcher]";
@@ -1227,7 +1226,7 @@ mora,124,82,4	script	Artifact Collector#blan	522,{
 		mes "[Artifact Collector]";
 		mes "+1, +2, +3, +4, +5, +6 those refinements are not strong enough to work on my craft.";
 		next;
-		emotion 57,0;
+		emotion e_otl,0;
 		mes "[Artifact Collector]";
 		mes "But +7! +7 is rare and just barely strong enough to work in my crafting attempts.";
 		next;