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

Fixed potentially dangerous map_addflooritem calls and related behaviors (#8360)

Browse Source 
*Removed potentially dangerous map_additemfloor calls
*Added weight/inventory checks for marry atcommand
*Fixed overweight message for box items
*Fixed inventory space check for box items to match official requirement (the total number of the items the box will give you *r min 10, plus 1)
*Fixed inventory space message for box items
*Fixed pet egg creation not deleting the pet data when failed to add it to the inventory
*Fixed pet egg creation dropping the egg on the floor when failed to add it to the inventory
*Fixed pet equipment dropping on the floor when failed to retrieve the item
*Added a battle configuration to prevent removing the pet equipment (and disappear into nothingness) when failed to retrieve the item
*Added missing skill_drop_items_full checks on several skills (official behavior makes the items disappear)
---------

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
This commit is contained in:
Daegaladh
2024-06-10 22:44:19 +02:00
committed by GitHub
parent 9267c2bf8a
commit 6ca99e7852
17 changed files with 220 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/map/pc.cpp
View File

@@ -6262,14 +6262,35 @@ bool pc_isUseitem(map_session_data *sd,int n)
if( itemdb_group.item_exists(IG_MERCENARY, nameid) && sd->md != nullptr )
return false; // Mercenary Scrolls
if( item->flag.group || item->type == IT_CASH) { //safe check type cash disappear when overweight [Napster]
if( pc_is90overweight(sd) ) {
clif_msg(sd, MSI_CANT_GET_ITEM_BECAUSE_WEIGHT);
return false;
// Safe check type cash disappear when overweight [Napster]
if( item->flag.group || item->type == IT_CASH ){
#ifdef RENEWAL
// Check if the player is not overweighted
// In Renewal the limit is 70% weight and gives the same error message
if (pc_is70overweight(sd)) {
clif_msg_color(sd, MSI_PICKUP_FAILED_ITEMCREATE, color_table[COLOR_RED]);
return 0;
}
if( !pc_inventoryblank(sd) ) {
clif_messagecolor(&sd->bl, color_table[COLOR_RED], msg_txt(sd, 732), false, SELF); //Item cannot be open when inventory is full
return false;
#else
// Check if the player is not overweighted
// In Pre-Renewal the limit is 50% weight and gives a specific error message
if (pc_is50overweight(sd)) {
clif_msg_color(sd, MSI_CANT_GET_ITEM_BECAUSE_WEIGHT, color_table[COLOR_RED]);
return 0;
}
#endif
// Check if the player has enough free spaces in the inventory
// Official servers use 10 as the minimum amount of slots required to get the items
// The <= is intentional, as in official servers you actually need an extra empty slot
// TODO: Count the items the player will get and check for the actual inventory space required std::max<size_t>( count, 10 )
if (pc_inventoryblank(sd) <= 10) {
#ifdef RENEWAL
clif_msg_color(sd, MSI_PICKUP_FAILED_ITEMCREATE, color_table[COLOR_RED]);
#else
clif_msg_color(sd, MSI_CANT_GET_ITEM_BECAUSE_COUNT, color_table[COLOR_RED]);
#endif
return 0;
}
}
@@ -9820,7 +9841,7 @@ int pc_dead(map_session_data *sd,struct block_list *src)
item_tmp.card[1]=0;
item_tmp.card[2]=GetWord(sd->status.char_id,0); // CharId
item_tmp.card[3]=GetWord(sd->status.char_id,1);
map_addflooritem(&item_tmp,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,0,0);
map_addflooritem(&item_tmp,1,sd->bl.m,sd->bl.x,sd->bl.y,0,0,0,4,0);
}
//Remove bonus_script when dead