summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-09 20:47:29 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-09-09 20:47:29 +0000
commitd4d501b3e5010950ac3e4521f20ec594e9757aa9 (patch)
tree0bc141fab99c3dd22d6256e13cae62967d7c316b /npc
parent1e720ea4015c89a5661c85a73a8b8381f140f675 (diff)
downloadhercules-d4d501b3e5010950ac3e4521f20ec594e9757aa9.tar.gz
hercules-d4d501b3e5010950ac3e4521f20ec594e9757aa9.tar.bz2
hercules-d4d501b3e5010950ac3e4521f20ec594e9757aa9.tar.xz
hercules-d4d501b3e5010950ac3e4521f20ec594e9757aa9.zip
- Fixed some 'getarg' that were switched in Magazine Dealer Kenny.
- Fixed a situation in Rogue Agent where NPC window doesn't close. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14051 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/merchants/ammo_boxes.txt10
-rw-r--r--npc/quests/quests_nameless.txt2
2 files changed, 6 insertions, 6 deletions
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 828569b46..5ea85dbea 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -63,14 +63,14 @@ que_ng,187,149,3 script Magazine Dealer Kenny 83,{
function script Func_Casing {
mes "[Kenny]";
mes "Now, you can trade";
- mes "500 "+getitemname(getarg(1))+"s";
- mes "and 500 zeny for 1 "+getitemname(getarg(0))+", so make sure";
+ mes "500 "+getitemname(getarg(0))+"s";
+ mes "and 500 zeny for 1 "+getitemname(getarg(1))+", so make sure";
mes "you have sufficient bullets";
mes "and zeny for this exchange.";
next;
mes "[Kenny]";
- mes "You can exchange 500 "+getitemname(getarg(1))+"s and 500 zeny";
- mes "with 1 "+getitemname(getarg(0))+".";
+ mes "You can exchange 500 "+getitemname(getarg(0))+"s and 500 zeny";
+ mes "with 1 "+getitemname(getarg(1))+".";
next;
mes "[Kenny]";
mes "Remember that I can't give";
@@ -89,7 +89,7 @@ function script Func_Casing {
mes "greater than 50.";
close;
}
- if (countitem(getarg(1)) >= (500*.@amount)) {
+ if (countitem(getarg(0)) >= (500*.@amount)) {
if (Zeny >= (500*.@amount)) {
if (checkweight(getarg(1),.@amount) == 0) {
mes "[Kenny]";
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index f34e05995..499c1a95a 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -11666,8 +11666,8 @@ in_rogue,355,28,5 script Rogue Agent 118,{
mes "of a trip for me, so get";
mes "some provisions ready, yeah?";
set rumour_nd,2;
- close;
}
+ close;
}
}
else if (rumour_nd == 2) {