diff options
| author | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-14 18:56:08 -0800 |
|---|---|---|
| committer | Mysterious <mysteriousragnarok@hotmail.com> | 2013-02-14 18:56:08 -0800 |
| commit | 7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e (patch) | |
| tree | 3a6cb20957b1486d92f7f017e0e6048951112d87 /npc/re/jobs/1-1/merchant.txt | |
| parent | 52e8c428bfc64a2285710256496331bfff19b651 (diff) | |
| parent | 74c31098137aae3e0bfc962e4685a7050409df78 (diff) | |
| download | hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.gz hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.bz2 hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.tar.xz hercules-7fa99e3524cb9cafdc797bcfc779ae5e0f730c8e.zip | |
Merge pull request #4 from HerculesWS/master
Merging Hercules Changes
Diffstat (limited to 'npc/re/jobs/1-1/merchant.txt')
| -rw-r--r-- | npc/re/jobs/1-1/merchant.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index a010af556..0edefd1ac 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= //= Job Change to Merchant Class //===== Additional Comments: ================================= //= 1.0 First Version. [Kisuka] +//= 1.1 Added Baby Job compatibility [Streusel] //============================================================ alberta_in,53,43,6 script Merchant#mer 86,{ if (Upper == 1) { @@ -57,7 +58,7 @@ 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) { + if(Class != Job_Novice && Class != Job_Baby) { mes "[Guildsman Mahnsoo]"; if(Class == Job_Merchant) { mes ".....? Sorry? What are you saying?"; |