diff options
| author | Michieru <michieru@0-mail.com> | 2013-10-24 12:10:43 +0200 |
|---|---|---|
| committer | Michieru <michieru@0-mail.com> | 2013-10-24 12:10:43 +0200 |
| commit | e3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch) | |
| tree | 20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/re/jobs/1-1/merchant.txt | |
| parent | 491892212d338903179909b89a5bfc2385e52261 (diff) | |
| download | hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2 hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip | |
Update to last rAthena npc.
Fix some typos
change sc_bleeding to -> sc_blooding
Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/re/jobs/1-1/merchant.txt')
| -rw-r--r-- | npc/re/jobs/1-1/merchant.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/npc/re/jobs/1-1/merchant.txt b/npc/re/jobs/1-1/merchant.txt index 58c13ae17..05b82ec66 100644 --- a/npc/re/jobs/1-1/merchant.txt +++ b/npc/re/jobs/1-1/merchant.txt @@ -1,18 +1,16 @@ //===== Hercules Script ====================================== //= Renewal Merchant Job Quest -//===== By: ================================================== +//===== By: ================================================== //= Kisuka -//===== Current Version: ===================================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================================== -//= Hercules -//===== Description: ========================================= +//===== Description: ========================================= //= Job Change to Merchant Class -//===== Additional Comments: ================================= +//===== 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) { if (Class == Job_Novice_High && (ADVJOB == Job_Whitesmith || ADVJOB == Job_Creator)) { |