summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-05-10 00:53:22 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-05-10 00:53:22 +0000
commit01dc34c9a73819dfbf0e8242a9ba7e572d76955d (patch)
tree807e703a81399259da92a17702983c4cf51b4caf
parent89e21c57b3f24f3700957a1ff1dce5359ca8c97f (diff)
downloadhercules-01dc34c9a73819dfbf0e8242a9ba7e572d76955d.tar.gz
hercules-01dc34c9a73819dfbf0e8242a9ba7e572d76955d.tar.bz2
hercules-01dc34c9a73819dfbf0e8242a9ba7e572d76955d.tar.xz
hercules-01dc34c9a73819dfbf0e8242a9ba7e572d76955d.zip
- 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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14294 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--conf/atcommand_athena.conf1
-rw-r--r--npc/quests/Kiel_Hyre_Quest.txt1
-rw-r--r--npc/quests/juice_maker.txt2
-rw-r--r--src/map/atcommand.c2
-rw-r--r--src/map/script.c2
5 files changed, 6 insertions, 2 deletions
diff --git a/conf/atcommand_athena.conf b/conf/atcommand_athena.conf
index 78b78343b..b34ce4fcc 100644
--- a/conf/atcommand_athena.conf
+++ b/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
diff --git a/npc/quests/Kiel_Hyre_Quest.txt b/npc/quests/Kiel_Hyre_Quest.txt
index 04ee73837..49750fc43 100644
--- a/npc/quests/Kiel_Hyre_Quest.txt
+++ b/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";
diff --git a/npc/quests/juice_maker.txt b/npc/quests/juice_maker.txt
index fa9c7145d..d3745a7de 100644
--- a/npc/quests/juice_maker.txt
+++ b/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]";
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7a4690efb..e5567aa2a 100644
--- a/src/map/atcommand.c
+++ b/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 },
diff --git a/src/map/script.c b/src/map/script.c
index 19fb01cc3..12f3a8e23 100644
--- a/src/map/script.c
+++ b/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);