Index: src/map/atcommand.c =================================================================== --- src/map/atcommand.c (revision 14697) +++ src/map/atcommand.c (working copy) @@ -6095,35 +6095,78 @@ } /*========================================== - * @alootid + * @alootid [modified version by Rad] + * modified to enable players autoloot 5 + * different items. Uses array. Counter checks added :p *------------------------------------------*/ ACMD_FUNC(autolootitem) { struct item_data *item_data = NULL; + int i, slot=0; + char item_name[100]; - if (!message || !*message) { - if (sd->state.autolootid) { - sd->state.autolootid = 0; + memset(item_name, '\0', sizeof(item_name)); + + if (!message || !*message || ( + sscanf(message, "\"%99[^\"]\" %d", item_name, &slot) < 1 && + sscanf(message, "%99s %d", item_name, &slot) < 1)) + { + if (sd->state.autolootactive) { + sd->state.autolootactive = 0; clif_displaymessage(fd, "Autolootitem has been turned OFF."); - } else - clif_displaymessage(fd, "Please, enter item name or it's ID (usage: @alootid )."); + } else { + clif_displaymessage(fd, "Please, enter item name or its ID (usage: @alootid [])."); + clif_displaymessage(fd, "...to see autoloot list, @alootid list"); + } + return -1; + } + if (strcmp(item_name,"list")==0) { + clif_displaymessage(fd, "Autoloot items:"); + for (i=0; i < 5; i++) { + if (sd->state.autolootid[i] <= 500) { + sprintf(atcmd_output, "Slot %d: %s",i+1,">>> Free autoloot slot <<<"); + } else { + item_data = itemdb_search(sd->state.autolootid[i]); + sprintf(atcmd_output, "Slot %d: '%s'",i+1,item_data->name); + } + clif_displaymessage(fd, atcmd_output); + } + return 0; + } else if ((item_data = itemdb_searchname(item_name)) == NULL && + (item_data = itemdb_exists(atoi(item_name))) == NULL) + { + clif_displaymessage(fd, msg_txt(19)); // Invalid item ID or name. return -1; } + + if (slot < 1 || slot > 5) slot = 1; // check + slot = slot - 1; + + if (slot < 0 || slot > 4) { //counter check + clif_displaymessage(fd, "Slot # can only be 1~5"); + return -1; + } - if ((item_data = itemdb_exists(atoi(message))) == NULL) - item_data = itemdb_searchname(message); - if (!item_data) { // No items founds in the DB with Id or Name clif_displaymessage(fd, "Item not found."); return -1; } + + for (i=0; i < 5; i++) { //to prevent duplicate entry + if (item_data->nameid == sd->state.autolootid[i]) { + sprintf(atcmd_output, "'%s' is already auto-looted in Slot %d.",item_data->name, i+1); + clif_displaymessage(fd, atcmd_output); + return -1; + } + } - sd->state.autolootid = item_data->nameid; // Autoloot Activated + sd->state.autolootid[slot] = item_data->nameid; // Autoloot Activated + sd->state.autolootactive = 1; - sprintf(atcmd_output, "Autolooting item: '%s'/'%s' (%d)", - item_data->name, item_data->jname, item_data->nameid); + sprintf(atcmd_output, "Autolooting item: '%s'/'%s' (%d) , Stored in slot %d", + item_data->name, item_data->jname, item_data->nameid,slot+1); clif_displaymessage(fd, atcmd_output); return 0; Index: src/map/mob.c =================================================================== --- src/map/mob.c (revision 14697) +++ src/map/mob.c (working copy) @@ -1727,7 +1727,7 @@ if( sd == NULL ) sd = map_charid2sd(dlist->third_charid); if( sd - && (drop_rate <= sd->state.autoloot || ditem->item_data.nameid == sd->state.autolootid) + && (drop_rate <= sd->state.autoloot || mob_processdrop( sd, ditem->item_data.nameid )) && (battle_config.idle_no_autoloot == 0 || DIFF_TICK(last_tick, sd->idletime) < battle_config.idle_no_autoloot) && (battle_config.homunculus_autoloot?1:!flag) #ifdef AUTOLOOT_DISTANCE @@ -1746,6 +1746,17 @@ dlist->item = ditem; } +int mob_processdrop(struct map_session_data * sd, int nameid) +{ + int i; + for (i=0; i < 5; i++) + { + if (nameid == sd->state.autolootid[i]) + return 1; + } + return 0; +} + int mob_timer_delete(int tid, unsigned int tick, int id, intptr data) { struct block_list* bl = map_id2bl(id); Index: src/map/mob.h =================================================================== --- src/map/mob.h (revision 14697) +++ src/map/mob.h (working copy) @@ -247,6 +247,7 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type); void mob_revive(struct mob_data *md, unsigned int hp); void mob_heal(struct mob_data *md,unsigned int heal); +int mob_processdrop(struct map_session_data * sd, int nameid); #define mob_stop_walking(md, type) unit_stop_walking(&(md)->bl, type) #define mob_stop_attack(md) unit_stop_attack(&(md)->bl) Index: src/map/pc.h =================================================================== --- src/map/pc.h (revision 14697) +++ src/map/pc.h (working copy) @@ -129,7 +129,8 @@ unsigned ignoreAll : 1; unsigned debug_remove_map : 1; // temporary state to track double remove_map's [FlavioJS] unsigned short autoloot; - unsigned short autolootid; // [Zephyrus] + unsigned short autolootid[5]; // [Zephyrus] [Rad] + unsigned short autolootactive; unsigned noks : 3; // [Zeph Kill Steal Protection] bool changemap; short pmap; // Previous map on Map Change