- Fixed the Juice Maker's "As many as I can" option. (bugreport:4155)

- Removed a duplicate 'next' in Kiel Hyre Quest. (bugreport:4222)
- Fixed 'checkequipedcard' not counter-checking for signed items. (bugreport:4231)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14294 54d463be-8e91-2dee-dedb-b68131a5f0ec

conf/atcommand_athena.conf

@@ -269,6 +269,7 @@ size: 20,20
 
 // Can command what other npcs (by name) can say.
 npctalk: 20,20
+npctalkc: 20,20
 
 //--------------------
 // 40: Sub-GM commands

npc/quests/Kiel_Hyre_Quest.txt

@@ -1714,7 +1714,6 @@ kh_school,178,180,4	script	Elly	895,{
 			mes "Grey Box you found inside";
 			mes "Kiel Hyre's Cottage.^000000";
 			next;
-			next;
 			mes "^3355FFYou successfully open the";
 			mes "Grey Box with the Golden Key,";
 			mes "and find a Blue Keycard, along";

npc/quests/juice_maker.txt

@@ -228,6 +228,8 @@ payon_in03,188,146,5	script	Marx Hansen#juice	86,{
 			switch(select("As many as I can.:I want a certain amount.:Cancel.")) {
 			case 1:
 				set .@make,countitem(.@fruit);
+				if (countitem(713) < .@make) set .@make, countitem(713);
+				if (Zeny/3 < .@make) set .@make, Zeny/3;
 				break;
 			case 2:
 				mes "[Merchant Marx Hansen]";

src/map/atcommand.c

@@ -8746,7 +8746,7 @@ AtCommandInfo atcommand_info[] = {
 	{ "mobsearch",         10,10,     atcommand_mobsearch },
 	{ "cleanmap",          40,40,     atcommand_cleanmap },
 	{ "npctalk",           20,20,     atcommand_npctalk },
-	{ "npctalkc",           20,20,     atcommand_npctalk },
+	{ "npctalkc",          20,20,     atcommand_npctalk },
 	{ "pettalk",           10,10,     atcommand_pettalk },
 	{ "users",             40,40,     atcommand_users },
 	{ "reset",             40,40,     atcommand_reset },

src/map/script.c

@@ -11151,6 +11151,8 @@ BUILDIN_FUNC(checkequipedcard)
 	if(sd){
 		for(i=0;i<MAX_INVENTORY;i++){
 			if(sd->status.inventory[i].nameid > 0 && sd->status.inventory[i].amount && sd->inventory_data[i]){
+				if (itemdb_isspecial(sd->status.inventory[i].card[0]))
+					continue;
 				for(n=0;n<sd->inventory_data[i]->slot;n++){
 					if(sd->status.inventory[i].card[n]==c){
 						script_pushint(st,1);