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

Fixed sell price calculation (#6775)

Browse Source 
Fixes #6773
Additionally added some MAX_ZENY checks.

Thanks to @mazvi
This commit is contained in:
Lemongrass3110 2022-04-02 18:36:47 +02:00 committed by GitHub
parent 945a5cd993
commit 185344a252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/map/itemdb.cpp
View File

@ -183,8 +183,10 @@ uint64 ItemDatabase::parseBodyNode(const ryml::NodeRef node) {
}
item->subtype = static_cast<e_card_type>(constant);
} else
} else {
this->invalidWarning(node["SubType"], "Item sub type is not supported for this item type.\n");
return 0;
}
} else {
if (!exists)
item->subtype = 0;
@ -196,8 +198,12 @@ uint64 ItemDatabase::parseBodyNode(const ryml::NodeRef node) {
if (!this->asUInt32(node, "Buy", buy))
return 0;
if( buy > MAX_ZENY ){
this->invalidWarning( node["Buy"], "Buying price exceeds MAX_ZENY. Capping...\n" );
buy = MAX_ZENY;
}
item->value_buy = buy;
item->value_sell = 0;
} else {
if (!exists) {
item->value_buy = 0;
@ -210,8 +216,12 @@ uint64 ItemDatabase::parseBodyNode(const ryml::NodeRef node) {
if (!this->asUInt32(node, "Sell", sell))
return 0;
if( sell > MAX_ZENY ){
this->invalidWarning( node["Sell"], "Sell price exceeds MAX_ZENY. Capping...\n" );
sell = MAX_ZENY;
}
item->value_sell = sell;
item->value_buy = 0;
} else {
if (!exists) {
item->value_sell = 0;