-Updated & improved some job scripts

-Updated script_commands.txt for update 2bc8562
-Moved Honeymoon Helper to Official coordinates
-Updated guides/guides_izlude.txt to fit Honeymoon Helper coordinates

1 files changed, 4 insertions, 3 deletions

diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt
index 0edefd1ac..b08cf1a40 100644
--- a/npc/re/jobs/1-1/merchant.txt
+++ b/npc/re/jobs/1-1/merchant.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -11,6 +11,7 @@
 //===== Additional Comments: ================================= 
 //= 1.0 First Version. [Kisuka]
 //= 1.1 Added Baby Job compatibility [Streusel]
+//= 1.2 Rewrote bits [Euphy]
 //============================================================ 
 alberta_in,53,43,6	script	Merchant#mer	86,{
 	if (Upper == 1) {
@@ -58,9 +59,9 @@ alberta_in,53,43,6	script	Merchant#mer	86,{
 	next;
 	switch(select("I want to be a merchant.:I want to know more about merchants.:Ask him the requirements to be a merchant.:Nothing.")) {
 	case 1:
-		if(Class != Job_Novice && Class != Job_Baby) {
+		if(BaseJob != Job_Novice) {
 			mes "[Guildsman Mahnsoo]";
-			if(Class == Job_Merchant) {
+			if(BaseJob == Job_Merchant) {
 				mes ".....? Sorry? What are you saying?";
 				mes "You are already a merchant. Oh my..";
 				mes "Huh?! ...Do I need to laugh right now?!";