diff options
| author | Streusel <m.me1@live.de> | 2013-02-13 17:14:07 -0800 |
|---|---|---|
| committer | Streusel <m.me1@live.de> | 2013-02-13 17:14:07 -0800 |
| commit | 1dd0349429f1456b886e50af7397922b525ef920 (patch) | |
| tree | bfbb5b19bc6da54791753388343940708c6166a0 /npc/re/jobs/1-1/merchant.txt | |
| parent | f825d79768962820f17289ce11342e06c86f7d65 (diff) | |
| parent | 24ffcb5e44e16bf423d22b146502fef835aab725 (diff) | |
| download | hercules-1dd0349429f1456b886e50af7397922b525ef920.tar.gz hercules-1dd0349429f1456b886e50af7397922b525ef920.tar.bz2 hercules-1dd0349429f1456b886e50af7397922b525ef920.tar.xz hercules-1dd0349429f1456b886e50af7397922b525ef920.zip | |
Merge pull request #14 from Streusel/master
Update 1-1 Job Change
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?"; |