summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-06 19:46:53 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-06 19:46:53 +0000
commit1c0bab41587fced03042d70a91945f5917f3a29e (patch)
treea47bc916bffe1124c09bae5f7b7b94257709ba3a /npc
parent403d1aceaeb74d5994f0390f61cb31b13923168f (diff)
downloadhercules-1c0bab41587fced03042d70a91945f5917f3a29e.tar.gz
hercules-1c0bab41587fced03042d70a91945f5917f3a29e.tar.bz2
hercules-1c0bab41587fced03042d70a91945f5917f3a29e.tar.xz
hercules-1c0bab41587fced03042d70a91945f5917f3a29e.zip
Fixed item select in Novice Exchanger
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9157 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/merchants/novice_exchange.txt9
2 files changed, 7 insertions, 4 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index bd5e564a7..b6f49f000 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,8 @@ KarLaeda
Date Added
======
+11/06
+ * Fixed item select in Novice Exchanger [KarLaeda]
11/05
* Fixed extra EOL in jro spawn [KarLaeda]
* Fixed reward of gunslinger job quest [Playtester]
diff --git a/npc/merchants/novice_exchange.txt b/npc/merchants/novice_exchange.txt
index 3a675c4aa..6c2dda72b 100644
--- a/npc/merchants/novice_exchange.txt
+++ b/npc/merchants/novice_exchange.txt
@@ -11,6 +11,7 @@
//= Official NPC.
//===== Additional Comments: =================================
//= 1.1 Made it as a function. U can add your own Merchs [Lupus]
+//= 1.1a Fixed item select [KarLaeda]
//============================================================
function script F_NMerch {
@@ -41,16 +42,16 @@ function script F_NMerch {
mes "Or "+getitemname(getarg(5))+"?";
next;
if(getarg(5))
- set @i,select(""+getitemname(getarg(1))+"",""+getitemname(getarg(3))+"",""+getitemname(getarg(5))+"","Cancel")-1;
+ set @i,select(""+getitemname(getarg(1))+"",""+getitemname(getarg(3))+"",""+getitemname(getarg(5))+"","Cancel");
else
- set @i,select(""+getitemname(getarg(1))+"",""+getitemname(getarg(3))+"","Cancel")-1;
+ set @i,select(""+getitemname(getarg(1))+"",""+getitemname(getarg(3))+"","Cancel");
if(@i==4 || (@i==3 && !getarg(5))) {
mes "["+getarg(0)+"]";
mes "Sure, no problem.";
close;
}
- set @item,getarg(1+@i*2);
- set @amount,getarg(2+@i*2);
+ set @item,getarg(@i*2-1);
+ set @amount,getarg(@i*2);
set @have,countitem(@item);
if(@have < @amount) {
mes "["+getarg(0)+"]";