Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
brianluau 2010-05-10 00:53:22 +00:00
parent 4f68ab1608
commit 2dbc188909
5 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/atcommand_athena.conf
View File

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

1
npc/quests/Kiel_Hyre_Quest.txt
View File

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

2
npc/quests/juice_maker.txt
View File

@ -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.")) { switch(select("As many as I can.:I want a certain amount.:Cancel.")) {
case 1: case 1:
set .@make,countitem(.@fruit); set .@make,countitem(.@fruit);
if (countitem(713) < .@make) set .@make, countitem(713);
if (Zeny/3 < .@make) set .@make, Zeny/3;
break; break;
case 2: case 2:
mes "[Merchant Marx Hansen]"; mes "[Merchant Marx Hansen]";

2
src/map/script.c
View File

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