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

Changes the default value of itemDB's "Override" to 100 (#6577)

Browse Source 
Changes the Default of both "Override" settings ("NoUse" and "Trade" restrictions) from 0 to 100 and removes all "Override" settings currently set.
Minor formatting and doc fixes.
Fixes CD_In_MouthK (420003) headgear Location.

Thanks to @aleos89
This commit is contained in:
Everade 2022-02-02 01:05:29 +01:00 committed by GitHub
parent 3deb3e2048
commit 2c48725761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 41 additions and 6335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/import-tmpl/item_db.yml
View File

@ -65,10 +65,10 @@
# Storage If the stack is applied to the player's storage. (Default: false)
# GuildStorage If the stack is applied to the player's guild storage. (Default: false)
# NoUse: Conditions when the item is unusable. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# Sitting If the item can not be used while sitting. (Default: false)
# Trade: Trade restrictions. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# NoDrop If the item can not be dropped. (Default: false)
# NoTrade If the item can not be traded. (Default: false)
# TradePartner If the item can not be traded to the player's partner. (Default: false)

4
db/item_db.yml
View File

@ -65,10 +65,10 @@
# Storage If the stack is applied to the player's storage. (Default: false)
# GuildStorage If the stack is applied to the player's guild storage. (Default: false)
# NoUse: Conditions when the item is unusable. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# Sitting If the item can not be used while sitting. (Default: false)
# Trade: Trade restrictions. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# NoDrop If the item can not be dropped. (Default: false)
# NoTrade If the item can not be traded. (Default: false)
# TradePartner If the item can not be traded to the player's partner. (Default: false)

4
db/pre-re/item_db.yml
View File

@ -65,10 +65,10 @@
# Storage If the stack is applied to the player's storage. (Default: false)
# GuildStorage If the stack is applied to the player's guild storage. (Default: false)
# NoUse: Conditions when the item is unusable. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# Sitting If the item can not be used while sitting. (Default: false)
# Trade: Trade restrictions. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# NoDrop If the item can not be dropped. (Default: false)
# NoTrade If the item can not be traded. (Default: false)
# TradePartner If the item can not be traded to the player's partner. (Default: false)

493
db/pre-re/item_db_equip.yml
View File

File diff suppressed because it is too large Load Diff

347
db/pre-re/item_db_etc.yml
View File

File diff suppressed because it is too large Load Diff

914
db/pre-re/item_db_usable.yml
View File

File diff suppressed because it is too large Load Diff

4
db/re/item_db.yml
View File

@ -65,10 +65,10 @@
# Storage If the stack is applied to the player's storage. (Default: false)
# GuildStorage If the stack is applied to the player's guild storage. (Default: false)
# NoUse: Conditions when the item is unusable. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# Sitting If the item can not be used while sitting. (Default: false)
# Trade: Trade restrictions. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# NoDrop If the item can not be dropped. (Default: false)
# NoTrade If the item can not be traded. (Default: false)
# TradePartner If the item can not be traded to the player's partner. (Default: false)

1526
db/re/item_db_equip.yml
View File

File diff suppressed because it is too large Load Diff

915
db/re/item_db_etc.yml
View File

File diff suppressed because it is too large Load Diff

2147
db/re/item_db_usable.yml
View File

File diff suppressed because it is too large Load Diff

4
doc/yaml/db/item_db.yml
View File

@ -48,10 +48,10 @@
# Storage If the stack is applied to the player's storage. (Default: false)
# GuildStorage If the stack is applied to the player's guild storage. (Default: false)
# NoUse: Conditions when the item is unusable. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# Sitting If the item can not be used while sitting. (Default: false)
# Trade: Trade restrictions. (Default: null)
# Override Group level to override these conditions.
# Override Group level to override these conditions. (Default: 100)
# NoDrop If the item can not be dropped. (Default: false)
# NoTrade If the item can not be traded. (Default: false)
# TradePartner If the item can not be traded to the player's partner. (Default: false)

8
src/map/itemdb.cpp
View File

@ -856,7 +856,7 @@ uint64 ItemDatabase::parseBodyNode(const YAML::Node &node) {
item->item_usage.override = override;
} else {
if (!exists)
item->item_usage.override = 0;
item->item_usage.override = 100;
}
if (this->nodeExists(nouseNode, "Sitting")) {
@ -872,7 +872,7 @@ uint64 ItemDatabase::parseBodyNode(const YAML::Node &node) {
}
} else {
if (!exists) {
item->item_usage.override = 0;
item->item_usage.override = 100;
item->item_usage.sitting = false;
}
}
@ -894,7 +894,7 @@ uint64 ItemDatabase::parseBodyNode(const YAML::Node &node) {
item->gm_lv_trade_override = override;
} else {
if (!exists)
item->gm_lv_trade_override = 0;
item->gm_lv_trade_override = 100;
}
if (this->nodeExists(tradeNode, "NoDrop")) {
@ -1006,7 +1006,7 @@ uint64 ItemDatabase::parseBodyNode(const YAML::Node &node) {
}
} else {
if (!exists) {
item->gm_lv_trade_override = 0;
item->gm_lv_trade_override = 100;
item->flag.trade_restriction.drop = false;
item->flag.trade_restriction.trade = false;
item->flag.trade_restriction.trade_partner = false;

6
src/tool/csv2yaml.cpp
View File

@ -2947,7 +2947,8 @@ static bool itemdb_read_db(const char* file) {
if (it_nouse != item_nouse.end()) {
body << YAML::Key << "NoUse";
body << YAML::BeginMap;
body << YAML::Key << "Override" << YAML::Value << it_nouse->second.override;
if (it_nouse->second.override != 100)
body << YAML::Key << "Override" << YAML::Value << it_nouse->second.override;
body << YAML::Key << "Sitting" << YAML::Value << "true";
body << YAML::EndMap;
}
@ -2957,7 +2958,8 @@ static bool itemdb_read_db(const char* file) {
if (it_trade != item_trade.end()) {
body << YAML::Key << "Trade";
body << YAML::BeginMap;
body << YAML::Key << "Override" << YAML::Value << it_trade->second.override;
if (it_trade->second.override != 100)
body << YAML::Key << "Override" << YAML::Value << it_trade->second.override;
if (it_trade->second.drop)
body << YAML::Key << "NoDrop" << YAML::Value << it_trade->second.drop;
if (it_trade->second.trade)