瀏覽代碼

- 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://svn.code.sf.net/p/rathena/svn/trunk@14051 54d463be-8e91-2dee-dedb-b68131a5f0ec

brianluau 15 年之前
父節點
當前提交
1511c48908
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 5 5
      npc/merchants/ammo_boxes.txt
  2. 1 1
      npc/quests/quests_nameless.txt

+ 5 - 5
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]";

+ 1 - 1
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) {