From c82d8121d5c52e42242d9f3f8be36f0aed569701 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Mon, 27 Dec 2010 11:30:37 +0000 Subject: * Added item stacking limit database (item_stack.txt) required for runes and other 3rd class related skill items. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14635 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/itemdb.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/map/itemdb.h | 8 ++++++++ src/map/pc.c | 26 ++++++++++++++++++++++---- src/map/storage.c | 14 ++++++++++++-- 4 files changed, 83 insertions(+), 6 deletions(-) (limited to 'src/map') diff --git a/src/map/itemdb.c b/src/map/itemdb.c index ce10f4f39..6455d10b6 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -724,6 +724,46 @@ static int itemdb_read_itemdelay(void) return 0; } +/*================================================================== + * Reads item stacking restrictions + *----------------------------------------------------------------*/ +static bool itemdb_read_stack(char* fields[], int columns, int current) +{// ,, + unsigned short nameid, amount; + unsigned int type; + struct item_data* id; + + nameid = (unsigned short)strtoul(fields[0], NULL, 10); + + if( ( id = itemdb_exists(nameid) ) == NULL ) + { + ShowWarning("itemdb_read_stack: Unknown item id '%hu'.\n", nameid); + return false; + } + + if( !itemdb_isstackable2(id) ) + { + ShowWarning("itemdb_read_stack: Item id '%hu' is not stackable.\n", nameid); + return false; + } + + amount = (unsigned short)strtoul(fields[1], NULL, 10); + type = strtoul(fields[2], NULL, 10); + + if( !amount ) + {// ignore + return true; + } + + id->stack.amount = amount; + id->stack.inventory = (type&1)!=0; + id->stack.cart = (type&2)!=0; + id->stack.storage = (type&4)!=0; + id->stack.guildstorage = (type&8)!=0; + + return true; +} + /*====================================== * Applies gender restrictions according to settings. [Skotlex] *======================================*/ @@ -1040,6 +1080,7 @@ static void itemdb_read(void) itemdb_read_noequip(); itemdb_read_itemtrade(); itemdb_read_itemdelay(); + sv_readdb(db_path, "item_stack.txt", ',', 3, 3, -1, &itemdb_read_stack); } /*========================================== diff --git a/src/map/itemdb.h b/src/map/itemdb.h index 3fb14b2d4..bc1d5b3b0 100644 --- a/src/map/itemdb.h +++ b/src/map/itemdb.h @@ -77,6 +77,14 @@ struct item_data { unsigned trade_restriction : 7; //Item restrictions mask [Skotlex] unsigned autoequip: 1; } flag; + struct + {// item stacking limitation + unsigned short amount; + unsigned int inventory:1; + unsigned int cart:1; + unsigned int storage:1; + unsigned int guildstorage:1; + } stack; short gm_lv_trade_override; //GM-level to override trade_restriction }; diff --git a/src/map/pc.c b/src/map/pc.c index 94121eba9..a444c7bba 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3200,18 +3200,25 @@ int pc_modifysellvalue(struct map_session_data *sd,int orig_value) int pc_checkadditem(struct map_session_data *sd,int nameid,int amount) { int i; + struct item_data* data; nullpo_ret(sd); if(amount > MAX_AMOUNT) return ADDITEM_OVERAMOUNT; - if(!itemdb_isstackable(nameid)) + data = itemdb_search(nameid); + + if(!itemdb_isstackable2(data)) return ADDITEM_NEW; + if( data->stack.inventory && amount > data->stack.amount ) + return ADDITEM_OVERAMOUNT; + for(i=0;istatus.inventory[i].nameid==nameid){ - if(sd->status.inventory[i].amount+amount > MAX_AMOUNT) + if( amount > MAX_AMOUNT - sd->status.inventory[i].amount || ( data->stack.inventory && amount > data->stack.amount - sd->status.inventory[i].amount ) ) return ADDITEM_OVERAMOUNT; return ADDITEM_EXIST; } @@ -3349,6 +3356,12 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) return 5; data = itemdb_search(item_data->nameid); + + if( data->stack.inventory && amount > data->stack.amount ) + {// item stack limitation + return 5; + } + w = data->weight*amount; if(sd->weight + w > sd->max_weight) return 2; @@ -3361,7 +3374,7 @@ int pc_additem(struct map_session_data *sd,struct item *item_data,int amount) { if( sd->status.inventory[i].nameid == item_data->nameid && memcmp(&sd->status.inventory[i].card, &item_data->card, sizeof(item_data->card)) == 0 ) { - if( amount > MAX_AMOUNT - sd->status.inventory[i].amount ) + if( amount > MAX_AMOUNT - sd->status.inventory[i].amount || ( data->stack.inventory && amount > data->stack.amount - sd->status.inventory[i].amount ) ) return 5; sd->status.inventory[i].amount += amount; clif_additem(sd,i,amount,0); @@ -3787,6 +3800,11 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun return 1; data = itemdb_search(item_data->nameid); + if( data->stack.cart && amount > data->stack.amount ) + {// item stack limitation + return 1; + } + if( !itemdb_cancartstore(item_data, pc_isGM(sd)) ) { // Check item trade restrictions [Skotlex] clif_displaymessage (sd->fd, msg_txt(264)); @@ -3807,7 +3825,7 @@ int pc_cart_additem(struct map_session_data *sd,struct item *item_data,int amoun if( i < MAX_CART ) {// item already in cart, stack it - if(sd->status.cart[i].amount+amount > MAX_AMOUNT) + if( amount > MAX_AMOUNT - sd->status.cart[i].amount || ( data->stack.cart && amount > data->stack.amount - sd->status.cart[i].amount ) ) return 1; // no room sd->status.cart[i].amount+=amount; diff --git a/src/map/storage.c b/src/map/storage.c index eb64d3eb4..9aa34d3e0 100644 --- a/src/map/storage.c +++ b/src/map/storage.c @@ -138,6 +138,11 @@ static int storage_additem(struct map_session_data* sd, struct item* item_data, data = itemdb_search(item_data->nameid); + if( data->stack.storage && amount > data->stack.amount ) + {// item stack limitation + return 1; + } + if( !itemdb_canstore(item_data, pc_isGM(sd)) ) { //Check if item is storable. [Skotlex] clif_displaymessage (sd->fd, msg_txt(264)); @@ -150,7 +155,7 @@ static int storage_additem(struct map_session_data* sd, struct item* item_data, { if( compare_item(&stor->items[i], item_data) ) {// existing items found, stack them - if( amount > MAX_AMOUNT - stor->items[i].amount ) + if( amount > MAX_AMOUNT - stor->items[i].amount || ( data->stack.storage && amount > data->stack.amount - stor->items[i].amount ) ) return 1; stor->items[i].amount += amount; clif_storageitemadded(sd,&stor->items[i],i,amount); @@ -398,6 +403,11 @@ int guild_storage_additem(struct map_session_data* sd, struct guild_storage* sto if(item_data->nameid <= 0 || amount <= 0) return 1; + if( data->stack.guildstorage && amount > data->stack.amount ) + {// item stack limitation + return 1; + } + if( !itemdb_canguildstore(item_data, pc_isGM(sd)) || item_data->expire_time ) { //Check if item is storable. [Skotlex] clif_displaymessage (sd->fd, msg_txt(264)); @@ -407,7 +417,7 @@ int guild_storage_additem(struct map_session_data* sd, struct guild_storage* sto if(itemdb_isstackable2(data)){ //Stackable for(i=0;iitems[i], item_data)) { - if(stor->items[i].amount+amount > MAX_AMOUNT) + if( amount > MAX_AMOUNT - stor->items[i].amount || ( data->stack.guildstorage && amount > data->stack.amount - stor->items[i].amount ) ) return 1; stor->items[i].amount+=amount; clif_storageitemadded(sd,&stor->items[i],i,amount); -- cgit v1.2.3-70-g09d2