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

* Updated commands @delitem/#delitem.

Browse Source 
- No longer deletes stackable items one by one (bugreport:1914).
- Fixed pets not getting deleted when a pet egg was deleted.
- Fixed outdated usage message (since r13403).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14626 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ai4rei 2010-12-26 12:19:36 +00:00
parent cce4c55f47
commit 708ea3bf59
2 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog-Trunk.txt
View File

@ -1,5 +1,10 @@
Date Added
2010/12/26
* Updated commands @delitem/#delitem. [Ai4rei]
- No longer deletes stackable items one by one (bugreport:1914).
- Fixed pets not getting deleted when a pet egg was deleted.
- Fixed outdated usage message (since r13403).
2010/12/25
* Fixed two-hand weapons not getting recognized as such upon equipping, causing respective one-hand weapon's base ASPD values being used instead (bugreport:4659, related r12599). [Ai4rei]
* Updated script commands delitem and delitem2. [Ai4rei]

92
src/map/atcommand.c
View File

@ -8506,53 +8506,20 @@ ACMD_FUNC(stats)
ACMD_FUNC(delitem)
{
char item_name[100];
int i, number = 0, item_id, item_position, count;
struct item_data *item_data;
char output[CHAT_SIZE_MAX];
int nameid, amount = 0, total, idx;
struct item_data* id;
nullpo_retr(-1, sd);
memset(item_name, '\0', sizeof(item_name));
memset(output, '\0', sizeof(output));
if (!message || !*message || (
sscanf(message, "\"%99[^\"]\" %d", item_name, &number) < 2 &&
sscanf(message, "%s %d", item_name, &number) < 2
) || number < 1) {
clif_displaymessage(fd, "Please, enter an item name/id, a quantity and a player name (usage: #delitem <item_name_or_ID> <quantity> <player>).");
if( !message || !*message || ( sscanf(message, "\"%99[^\"]\" %d", item_name, &amount) < 2 && sscanf(message, "%99s %d", item_name, &amount) < 2 ) || amount < 1 )
{
clif_displaymessage(fd, "Please, enter an item name/id, a quantity and a player name (usage: #delitem <player> <item_name_or_ID> <quantity>).");
return -1;
}
item_id = 0;
if ((item_data = itemdb_searchname(item_name)) != NULL ||
(item_data = itemdb_exists(atoi(item_name))) != NULL)
item_id = item_data->nameid;
if (item_id > 500) {
item_position = pc_search_inventory(sd, item_id);
if (item_position >= 0) {
count = 0;
for(i = 0; i < number && item_position >= 0; i++) {
//Logs (A)dmins items [Lupus]
if(log_config.enable_logs&0x400)
log_pick_pc(sd, "A", sd->status.inventory[item_position].nameid, -1, &sd->status.inventory[item_position]);
pc_delitem(sd, item_position, 1, 0, 0);
count++;
item_position = pc_search_inventory(sd, item_id); // for next loop
}
sprintf(output, msg_txt(113), count); // %d item(s) removed by a GM.
clif_displaymessage(sd->fd, output);
if (number == count)
sprintf(output, msg_txt(114), count); // %d item(s) removed from the player.
else
sprintf(output, msg_txt(115), count, count, number); // %d item(s) removed. Player had only %d on %d items.
clif_displaymessage(fd, output);
} else {
clif_displaymessage(fd, msg_txt(116)); // Character does not have the item.
return -1;
}
if( ( id = itemdb_searchname(item_name) ) != NULL || ( id = itemdb_exists(atoi(item_name)) ) != NULL )
{
nameid = id->nameid;
}
else
{
@ -8560,6 +8527,49 @@ ACMD_FUNC(delitem)
return -1;
}
total = amount;
// delete items
while( amount && ( idx = pc_search_inventory(sd, nameid) ) != -1 )
{
int delamount = ( amount < sd->status.inventory[idx].amount ) ? amount : sd->status.inventory[idx].amount;
if( sd->inventory_data[idx]->type == IT_PETEGG && sd->status.inventory[idx].card[0] == CARD0_PET )
{// delete pet
intif_delete_petdata(MakeDWord(sd->status.inventory[idx].card[1], sd->status.inventory[idx].card[2]));
}
//Logs (A)dmins items [Lupus]
if( log_config.enable_logs&0x400 )
{
log_pick_pc(sd, "A", nameid, -delamount, &sd->status.inventory[idx]);
}
pc_delitem(sd, idx, delamount, 0, 0);
amount-= delamount;
}
// notify target
sprintf(atcmd_output, msg_txt(113), total-amount); // %d item(s) removed by a GM.
clif_displaymessage(sd->fd, atcmd_output);
// notify source
if( amount == total )
{
clif_displaymessage(fd, msg_txt(116)); // Character does not have the item.
}
else if( amount )
{
sprintf(atcmd_output, msg_txt(115), total-amount, total-amount, total); // %d item(s) removed. Player had only %d on %d items.
clif_displaymessage(fd, atcmd_output);
}
else
{
sprintf(atcmd_output, msg_txt(114), total); // %d item(s) removed from the player.
clif_displaymessage(fd, atcmd_output);
}
return 0;
}