Skip to content

Commit

Permalink
Add *setfavoriteitem & *autofavoriteitem script command.
Browse files Browse the repository at this point in the history
- set an item as favorite item or not based on itemID or inventory
index.
- if an item is set to favorite item, it will be moved into favorite
tab, else move out from favorite tab.
- only non-equipped item can adjust the favorite item state.
  • Loading branch information
Emistry committed Apr 13, 2019
1 parent ab81d40 commit 456e9e5
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 1 deletion.
25 changes: 25 additions & 0 deletions doc/script_commands.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3183,6 +3183,31 @@ runs of getcartinventorylist().

---------------------------------------

*setfavoriteitem(<idx | item_id>, <flag>)

This function will set an item in inventory as favorite or not.
If its favorite item, it will be moved to favorite tab, else move out from favorite tab.
Preferable to use inventory index (idx) since it provide better accuracy to determine which item
in case player has multiple items with same item_id.

Valid Parameters:
<idx | item_id> - item_id or inventory index, refer *getinventorylist()
<flag> - true/false (true = favorite item, false = otherwise)

---------------------------------------

*autofavoriteitem(<item_id>, <flag>)

This function will auto set an item as favorite when <item_id> is obtained.
If its favorite item, it will be auto moved to favorite tab, else move out from favorite tab.
This setting affect not only attached player, but also everyone player globally.

Valid Parameters:
<item_id> - item ID
<flag> - true/false (true = favorite item, false = otherwise)

---------------------------------------

*cardscnt()

This function will return the number of cards inserted into the weapon
Expand Down
3 changes: 2 additions & 1 deletion src/map/itemdb.h
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,8 @@ struct item_data {
unsigned no_refine : 1; // [celest]
unsigned delay_consume : 1; ///< Signifies items that are not consumed immediately upon double-click [Skotlex]
unsigned trade_restriction : 9; ///< Item trade restrictions mask (@see enum ItemTradeRestrictions)
unsigned autoequip: 1;
unsigned autoequip : 1;
unsigned auto_favorite : 1;
unsigned buyingstore : 1;
unsigned bindonequip : 1;
unsigned keepafteruse : 1;
Expand Down
7 changes: 7 additions & 0 deletions src/map/pc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4778,6 +4778,13 @@ static int pc_additem(struct map_session_data *sd, const struct item *item_data,

sd->weight += w;
clif->updatestatus(sd,SP_WEIGHT);

// auto-favorite
if (data->flag.auto_favorite > 0) {
sd->status.inventory[i].favorite = 1;
clif->favorite_item(sd, i);
}

//Auto-equip
if(data->flag.autoequip)
pc->equipitem(sd, i, data->equip);
Expand Down
57 changes: 57 additions & 0 deletions src/map/script.c
Original file line number Diff line number Diff line change
Expand Up @@ -24559,6 +24559,61 @@ static BUILDIN(getcalendartime)
return true;
}

static BUILDIN(setfavoriteitem)
{
struct map_session_data *sd = script_rid2sd(st);
int idx = script_getnum(st, 2);
int value = script_getnum(st, 3);
int nameid = script_getnum(st, 2);
struct item_data *id = itemdb->exists(nameid);

if (sd == NULL) {
ShowError("buildin_setfavoriteitem: No player attached.\n");
return false;
}

// search for idx if item id given
if (nameid >= ITEMID_RED_POTION || nameid >= sd->status.inventorySize) {
if (id == NULL) {
ShowError("buildin_setfavoriteitem: Invalid item %d.\n", nameid);
return false;
}
idx = pc->search_inventory(sd, nameid);
if (idx == INDEX_NOT_FOUND) {
ShowError("buildin_setfavoriteitem: Item %d not found.\n", nameid);
return false;
}
}

if (idx < 0 || idx >= sd->status.inventorySize) {
ShowError("buildin_setfavouriteitem: Invalid inventory index %d (min: %d, max: %d).\n", idx, 0, (sd->status.inventorySize - 1));
return false;
} else if (sd->inventory_data[idx] == NULL || sd->inventory_data[idx]->nameid <= 0) {
ShowWarning("buildin_setfavouriteitem: Current inventory index %d has no data.\n", idx);
return false;
} else if (sd->status.inventory[idx].equip == 0) {
sd->status.inventory[idx].favorite = cap_value(value, 0, 1);
clif->favorite_item(sd, idx);
}

return true;
}

static BUILDIN(autofavoriteitem)
{
int nameid = script_getnum(st, 2);
int flag = script_getnum(st, 3);
struct item_data *item_data;

if ((item_data = itemdb->exists(nameid)) == NULL) {
ShowError("buildin_autofavoriteitem: Invalid item '%d'.\n", nameid);
return false;
}

item_data->flag.auto_favorite = cap_value(flag, 0, 1);
return true;
}

/** place holder for the translation macro **/
static BUILDIN(_)
{
Expand Down Expand Up @@ -25902,6 +25957,8 @@ static void script_parse_builtin(void)
BUILDIN_DEF(expandInventoryResult, "i"),
BUILDIN_DEF(expandInventory, "i"),
BUILDIN_DEF(getInventorySize, ""),
BUILDIN_DEF(setfavoriteitem, "ii"),
BUILDIN_DEF(autofavoriteitem, "ii"),
};
int i, len = ARRAYLENGTH(BUILDIN);
RECREATE(script->buildin, char *, script->buildin_count + len); // Pre-alloc to speed up
Expand Down

0 comments on commit 456e9e5

Please sign in to comment.