diff options
| author | Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-17 11:14:59 +0000 |
|---|---|---|
| committer | Lupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-05-17 11:14:59 +0000 |
| commit | 9ee45ad3553ac478011371169113e123e745dad3 (patch) | |
| tree | f3bbb721f9c74574cfcdbb94b0352a8c91045ad8 | |
| parent | 7d850b71d9c288782186c70cb8622d7c250f641a (diff) | |
| download | hercules-9ee45ad3553ac478011371169113e123e745dad3.tar.gz hercules-9ee45ad3553ac478011371169113e123e745dad3.tar.bz2 hercules-9ee45ad3553ac478011371169113e123e745dad3.tar.xz hercules-9ee45ad3553ac478011371169113e123e745dad3.zip | |
updated free kafra pass
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10553 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | npc/Changelog.txt | 1 | ||||
| -rw-r--r-- | npc/jobs/1-1/merchant.txt | 27 |
2 files changed, 11 insertions, 17 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 00fcef94b..6340916ab 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -2,6 +2,7 @@ Date Added ====== 2007/05/17 * Removed .GAT -s from some recent scripts. Please, don't add them in the scripts [Lupus] + - Fixed Merchan Job Quest Kafra (used old ID for Free Ticket) 2007/05/16 * Rev. 10548 Kiel Hyre Quest fix. Fixed the missing spaces in some of the enablenpc commands. [L0ne_W0lf] * Renamed Grandpa Pharmacist to Old Pharmacist, updated dialogs [DZeroX] diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt index ad9a66c4d..b17ffddb1 100644 --- a/npc/jobs/1-1/merchant.txt +++ b/npc/jobs/1-1/merchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.5.1 Removed Duplicates [Silent] //= 1.5.2 Now saves/restores all quest skills [Lupus] //= 1.6 Merged back JFunc, CHANGED NUMBERS TO CONSTANTS [Lupus] +//= 1.7 Updated to use Free Ticket for Kafra [Lupus] //============================================================ @@ -730,9 +731,14 @@ L_Other: menu "Warp.",M_Warp, "Cancel.",M_End; M_Warp: - if(Zeny < 600) goto sL_NdZeny; - set Zeny, Zeny - 600; - set RESRVPTS, RESRVPTS + 37; + // we'll use Free Ticket for Kafra Transportation if available + if(countitem(7060)){ + delitem 7060,1; + } else { + if(Zeny < 600) goto sL_NdZeny; + set Zeny, Zeny - 600; + set RESRVPTS, RESRVPTS + 37; + } warp "izlude",91,105; cutin "kafra_03",255; end; @@ -743,19 +749,6 @@ L_Other: cutin "kafra_03",255; close; - M_Pass: - if(countitem(1084)<1) goto sL_NdPass;//Items: Kafra_Pass, - mes "[Kafra]"; - mes "You are now using a Kafra Pass."; - delitem 1084,1;//Items: Kafra_Pass, - cutin "kafra_03",255; - close; - - sL_NdPass: - mes "[Kafra]"; - mes "I'm sorry but you have no pass...."; - cutin "kafra_03",255; - close; M_End: mes "[Kafra]"; mes "Thank you for using Kafra Corp. Services. We will be with you wherever you go."; |