diff options
| author | shennetsind <ind@henn.et> | 2013-02-16 23:24:02 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-02-16 23:24:02 -0200 |
| commit | a09f772cbda173d1e0182ba3686a5b84d9df5c8d (patch) | |
| tree | 6a218186d307a838d22c3cda852ce9306168df06 /npc/re/jobs/1-1/merchant.txt | |
| parent | b8379d2dc56197dc970db8bf1c0ba60ae4835819 (diff) | |
| parent | fb8352aca63a5e5641df67be49a5c907f434d28e (diff) | |
| download | hercules-a09f772cbda173d1e0182ba3686a5b84d9df5c8d.tar.gz hercules-a09f772cbda173d1e0182ba3686a5b84d9df5c8d.tar.bz2 hercules-a09f772cbda173d1e0182ba3686a5b84d9df5c8d.tar.xz hercules-a09f772cbda173d1e0182ba3686a5b84d9df5c8d.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'npc/re/jobs/1-1/merchant.txt')
| -rw-r--r-- | npc/re/jobs/1-1/merchant.txt | 7 |
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?!"; |