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

Added Guild Storage Expansion Skill (#3244)

Browse Source 
* Fixes #499 and part of #1303.
* Implements Guild Storage Expansion Skill which requires client 2013-12-23 or newer (enable by default depending on client date in src/config/packets.hpp).
* Implements guild storage permission which requires client 2014-02-05 or newer.
* Expanded script command guildopenstorage return values.
This commit is contained in:
Aleos
2018-07-03 08:49:34 -04:00
committed by GitHub
parent e4eddc3e61
commit e13ca63cc8
18 changed files with 187 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/map/storage.cpp
View File

@@ -589,34 +589,48 @@ char storage_guild_storageopen(struct map_session_data* sd)
nullpo_ret(sd);
if(sd->status.guild_id <= 0)
return 2;
return GSTORAGE_NO_GUILD;
if(sd->state.storage_flag)
return 1; //Can't open both storages at a time.
#ifdef OFFICIAL_GUILD_STORAGE
if (!guild_checkskill(sd->guild, GD_GUILD_STORAGE))
return GSTORAGE_NO_STORAGE; // Can't open storage if the guild has not learned the skill
#endif
if (sd->state.storage_flag == 2)
return GSTORAGE_ALREADY_OPEN; // Guild storage already open.
else if (sd->state.storage_flag)
return GSTORAGE_STORAGE_ALREADY_OPEN; // Can't open both storages at a time.
#if PACKETVER >= 20140205
int pos;
if ((pos = guild_getposition(sd)) < 0 || !(sd->guild->position[pos].mode&GUILD_PERM_STORAGE))
return GSTORAGE_NO_PERMISSION; // Guild member doesn't have permission
#endif
if( !pc_can_give_items(sd) ) { //check is this GM level can open guild storage and store items [Lupus]
clif_displaymessage(sd->fd, msg_txt(sd,246));
return 1;
return GSTORAGE_ALREADY_OPEN;
}
if((gstor = guild2storage2(sd->status.guild_id)) == NULL) {
intif_request_guild_storage(sd->status.account_id,sd->status.guild_id);
return 0;
return GSTORAGE_OPEN;
}
if(gstor->status)
return 1;
return GSTORAGE_ALREADY_OPEN;
if( gstor->lock )
return 1;
return GSTORAGE_ALREADY_OPEN;
gstor->status = true;
sd->state.storage_flag = 2;
storage_sortitem(gstor->u.items_guild, ARRAYLENGTH(gstor->u.items_guild));
clif_storagelist(sd, gstor->u.items_guild, ARRAYLENGTH(gstor->u.items_guild), "Guild Storage");
clif_updatestorageamount(sd, gstor->amount, MAX_GUILD_STORAGE);
clif_updatestorageamount(sd, gstor->amount, gstor->max_amount);
return 0;
return GSTORAGE_OPEN;
}
/**
@@ -655,7 +669,7 @@ bool storage_guild_additem(struct map_session_data* sd, struct s_storage* stor,
}
if(itemdb_isstackable2(id)) { //Stackable
for(i = 0; i < MAX_GUILD_STORAGE; i++) {
for(i = 0; i < stor->max_amount; i++) {
if(compare_item(&stor->u.items_guild[i], item_data)) {
if( amount > MAX_AMOUNT - stor->u.items_guild[i].amount || ( id->stack.guildstorage && amount > id->stack.amount - stor->u.items_guild[i].amount ) )
return false;
@@ -669,15 +683,15 @@ bool storage_guild_additem(struct map_session_data* sd, struct s_storage* stor,
}
//Add item
for(i = 0; i < MAX_GUILD_STORAGE && stor->u.items_guild[i].nameid; i++);
if(i >= MAX_GUILD_STORAGE)
for(i = 0; i < stor->max_amount && stor->u.items_guild[i].nameid; i++);
if(i >= stor->max_amount)
return false;
memcpy(&stor->u.items_guild[i],item_data,sizeof(stor->u.items_guild[0]));
stor->u.items_guild[i].amount = amount;
stor->amount++;
clif_storageitemadded(sd,&stor->u.items_guild[i],i,amount);
clif_updatestorageamount(sd, stor->amount, MAX_GUILD_STORAGE);
clif_updatestorageamount(sd, stor->amount, stor->max_amount);
stor->dirty = true;
return true;
}
@@ -703,7 +717,7 @@ bool storage_guild_additem2(struct s_storage* stor, struct item* item, int amoun
return false;
if (itemdb_isstackable2(id)) { // Stackable
for (i = 0; i < MAX_GUILD_STORAGE; i++) {
for (i = 0; i < stor->max_amount; i++) {
if (compare_item(&stor->u.items_guild[i], item)) {
// Set the amount, make it fit with max amount
amount = min(amount, ((id->stack.guildstorage) ? id->stack.amount : MAX_AMOUNT) - stor->u.items_guild[i].amount);
@@ -717,8 +731,8 @@ bool storage_guild_additem2(struct s_storage* stor, struct item* item, int amoun
}
// Add the item
for (i = 0; i < MAX_GUILD_STORAGE && stor->u.items_guild[i].nameid; i++);
if (i >= MAX_GUILD_STORAGE)
for (i = 0; i < stor->max_amount && stor->u.items_guild[i].nameid; i++);
if (i >= stor->max_amount)
return false;
memcpy(&stor->u.items_guild[i], item, sizeof(stor->u.items_guild[0]));
@@ -749,7 +763,7 @@ bool storage_guild_delitem(struct map_session_data* sd, struct s_storage* stor,
if(!stor->u.items_guild[n].amount) {
memset(&stor->u.items_guild[n],0,sizeof(stor->u.items_guild[0]));
stor->amount--;
clif_updatestorageamount(sd, stor->amount, MAX_GUILD_STORAGE);
clif_updatestorageamount(sd, stor->amount, stor->max_amount);
}
clif_storageitemremoved(sd,n,amount);
@@ -769,7 +783,7 @@ void storage_guild_storageadd(struct map_session_data* sd, int index, int amount
nullpo_retv(sd);
nullpo_retv(stor = guild2storage2(sd->status.guild_id));
if( !stor->status || stor->amount > MAX_GUILD_STORAGE )
if( !stor->status || stor->amount > stor->max_amount )
return;
if( index < 0 || index >= MAX_INVENTORY )
@@ -812,7 +826,7 @@ void storage_guild_storageget(struct map_session_data* sd, int index, int amount
if(!stor->status)
return;
if(index < 0 || index >= MAX_GUILD_STORAGE)
if(index < 0 || index >= stor->max_amount)
return;
if(stor->u.items_guild[index].nameid == 0)
@@ -847,7 +861,7 @@ void storage_guild_storageaddfromcart(struct map_session_data* sd, int index, in
nullpo_retv(sd);
nullpo_retv(stor = guild2storage2(sd->status.guild_id));
if( !stor->status || stor->amount > MAX_GUILD_STORAGE )
if( !stor->status || stor->amount > stor->max_amount )
return;
if( index < 0 || index >= MAX_CART )
@@ -885,7 +899,7 @@ void storage_guild_storagegettocart(struct map_session_data* sd, int index, int
if(!stor->status)
return;
if(index < 0 || index >= MAX_GUILD_STORAGE)
if(index < 0 || index >= stor->max_amount)
return;
if(stor->u.items_guild[index].nameid == 0)