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

Apply suggestions from code review

Browse Source 
Co-authored-by: Aleos <aleos89@users.noreply.github.com>
This commit is contained in:
Atemo 2023-06-17 17:41:14 +02:00 committed by GitHub
parent 4a7d2b45b5
commit 62b0b12274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 41 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
db/import-tmpl/produce_db.yml
View File

@ -1,5 +1,5 @@
# This file is a part of rAthena.
# Copyright(C) 2022 rAthena Development Team
# Copyright(C) 2023 rAthena Development Team
# https://rathena.org - https://github.com/rathena
#
# This program is free software: you can redistribute it and/or modify
@ -34,14 +34,10 @@
# NotConsumed: List of items not consumed to produce the Product. (Default: null)
# - Item AegisName of the unconsumed item.
# Clear Remove the item with the given AegisName from NotConsumed. (Optional)
#
###########################################################################
# Additional fields for Change Material (ItemLevel: 26):
#
# BaseRate Base rate (in n/10%). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material. (Default: null)
# - Amount Amount of item created (unique to the list).
# Rate Rate to create the Amount (in n/10%). Default: 1000. 0 to remove on import.
# BaseRate Base rate (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material (ItemLevel: 26). (Default: null)
# - Amount Amount of item created (unique to the list) for Change Material (ItemLevel: 26).
# Rate Rate to create the Amount (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000. 0 to remove on import)
###########################################################################
Header:

14
db/pre-re/produce_db.yml
View File

@ -1,5 +1,5 @@
# This file is a part of rAthena.
# Copyright(C) 2022 rAthena Development Team
# Copyright(C) 2023 rAthena Development Team
# https://rathena.org - https://github.com/rathena
#
# This program is free software: you can redistribute it and/or modify
@ -34,14 +34,10 @@
# NotConsumed: List of items not consumed to produce the Product. (Default: null)
# - Item AegisName of the unconsumed item.
# Clear Remove the item with the given AegisName from NotConsumed. (Optional)
#
###########################################################################
# Additional fields for Change Material (ItemLevel: 26):
#
# BaseRate Base rate (in n/10%). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material. (Default: null)
# - Amount Amount of item created (unique to the list).
# Rate Rate to create the Amount (in n/10%). Default: 1000. 0 to remove on import.
# BaseRate Base rate (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material (ItemLevel: 26). (Default: null)
# - Amount Amount of item created (unique to the list) for Change Material (ItemLevel: 26).
# Rate Rate to create the Amount (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000. 0 to remove on import)
###########################################################################
Header:

14
db/pre-re/skill_produce_db.yml
View File

@ -1,5 +1,5 @@
# This file is a part of rAthena.
# Copyright(C) 2022 rAthena Development Team
# Copyright(C) 2023 rAthena Development Team
# https://rathena.org - https://github.com/rathena
#
# This program is free software: you can redistribute it and/or modify
@ -34,14 +34,10 @@
# NotConsumed: List of items not consumed to produce the Product. (Default: null)
# - Item AegisName of the unconsumed item.
# Clear Remove the item with the given AegisName from NotConsumed. (Optional)
#
###########################################################################
# Additional fields for Change Material (ItemLevel: 26):
#
# BaseRate Base rate (in n/10%). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material. (Default: null)
# - Amount Amount of item created (unique to the list).
# Rate Rate to create the Amount (in n/10%). Default: 1000. 0 to remove on import.
# BaseRate Base rate (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material (ItemLevel: 26). (Default: null)
# - Amount Amount of item created (unique to the list) for Change Material (ItemLevel: 26).
# Rate Rate to create the Amount (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000. 0 to remove on import)
###########################################################################
Header:

14
db/produce_db.yml
View File

@ -1,5 +1,5 @@
# This file is a part of rAthena.
# Copyright(C) 2022 rAthena Development Team
# Copyright(C) 2023 rAthena Development Team
# https://rathena.org - https://github.com/rathena
#
# This program is free software: you can redistribute it and/or modify
@ -34,14 +34,10 @@
# NotConsumed: List of items not consumed to produce the Product. (Default: null)
# - Item AegisName of the unconsumed item.
# Clear Remove the item with the given AegisName from NotConsumed. (Optional)
#
###########################################################################
# Additional fields for Change Material (ItemLevel: 26):
#
# BaseRate Base rate (in n/10%). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material. (Default: null)
# - Amount Amount of item created (unique to the list).
# Rate Rate to create the Amount (in n/10%). Default: 1000. 0 to remove on import.
# BaseRate Base rate (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material (ItemLevel: 26). (Default: null)
# - Amount Amount of item created (unique to the list) for Change Material (ItemLevel: 26).
# Rate Rate to create the Amount (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000. 0 to remove on import)
###########################################################################
Header:

12
db/re/produce_db.yml
View File

@ -34,14 +34,10 @@
# NotConsumed: List of items not consumed to produce the Product. (Default: null)
# - Item AegisName of the unconsumed item.
# Clear Remove the item with the given AegisName from NotConsumed. (Optional)
#
###########################################################################
# Additional fields for Change Material (ItemLevel: 26):
#
# BaseRate Base rate (in n/10%). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material. (Default: null)
# - Amount Amount of item created (unique to the list).
# Rate Rate to create the Amount (in n/10%). Default: 1000. 0 to remove on import.
# BaseRate Base rate (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material (ItemLevel: 26). (Default: null)
# - Amount Amount of item created (unique to the list) for Change Material (ItemLevel: 26).
# Rate Rate to create the Amount (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000. 0 to remove on import)
###########################################################################
Header:

10
db/re/skill_changematerial_db.yml
View File

@ -1,5 +1,5 @@
# This file is a part of rAthena.
# Copyright(C) 2022 rAthena Development Team
# Copyright(C) 2023 rAthena Development Team
# https://rathena.org - https://github.com/rathena
#
# This program is free software: you can redistribute it and/or modify
@ -35,10 +35,10 @@
# NotConsumed: List of items not consumed to produce the Product. (Default: null)
# - Item AegisName of the unconsumed item.
# Clear Remove the item with the given AegisName from NotConsumed. (Optional)
# BaseRate Base rate (in n/10%). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material. (Default: null)
# - Amount Amount of item created (unique to the list).
# Rate Rate to create the Amount (in n/10%). Default: 1000. 0 to remove on import.
# BaseRate Base rate (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material (ItemLevel: 26). (Default: null)
# - Amount Amount of item created (unique to the list) for Change Material (ItemLevel: 26).
# Rate Rate to create the Amount (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000. 0 to remove on import)
###########################################################################
Header:

14
db/re/skill_produce_db.yml
View File

@ -1,5 +1,5 @@
# This file is a part of rAthena.
# Copyright(C) 2022 rAthena Development Team
# Copyright(C) 2023 rAthena Development Team
# https://rathena.org - https://github.com/rathena
#
# This program is free software: you can redistribute it and/or modify
@ -34,14 +34,10 @@
# NotConsumed: List of items not consumed to produce the Product. (Default: null)
# - Item AegisName of the unconsumed item.
# Clear Remove the item with the given AegisName from NotConsumed. (Optional)
#
###########################################################################
# Additional fields for Change Material (ItemLevel: 26):
#
# BaseRate Base rate (in n/10%). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material. (Default: null)
# - Amount Amount of item created (unique to the list).
# Rate Rate to create the Amount (in n/10%). Default: 1000. 0 to remove on import.
# BaseRate Base rate (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material (ItemLevel: 26). (Default: null)
# - Amount Amount of item created (unique to the list) for Change Material (ItemLevel: 26).
# Rate Rate to create the Amount (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000. 0 to remove on import)
###########################################################################
Header:

12
doc/yaml/db/produce_db.yml
View File

@ -17,12 +17,8 @@
# NotConsumed: List of items not consumed to produce the Product. (Default: null)
# - Item AegisName of the unconsumed item.
# Clear Remove the item with the given AegisName from NotConsumed. (Optional)
#
###########################################################################
# Additional fields for Change Material (ItemLevel: 26):
#
# BaseRate Base rate (in n/10%). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material. (Default: null)
# - Amount Amount of item created (unique to the list).
# Rate Rate to create the Amount (in n/10%). Default: 1000. 0 to remove on import.
# BaseRate Base rate (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000)
# Make: List of item amounts with their individual rate produced by Change Material (ItemLevel: 26). (Default: null)
# - Amount Amount of item created (unique to the list) for Change Material (ItemLevel: 26).
# Rate Rate to create the Amount (in n/10%) for Change Material (ItemLevel: 26). (Default: 1000. 0 to remove on import)
###########################################################################

2
src/map/skill.hpp
View File

@ -643,7 +643,7 @@ bool skill_isNotOk_npcRange(struct block_list *src, uint16 skill_id, uint16 skil
// Item creation
std::shared_ptr<s_skill_produce_db_entry> skill_can_produce_mix(map_session_data *sd, t_itemid nameid, int trigger, int qty);
bool skill_produce_mix( map_session_data *sd, uint16 skill_id, t_itemid nameid, int slot1, int slot2, int slot3, int qty, std::shared_ptr<s_skill_produce_db_entry> produce );
bool skill_produce_mix( map_session_data *sd, uint16 skill_id, t_itemid nameid, int slot1, int slot2, int slot3, int qty, std::shared_ptr<s_skill_produce_db_entry> produce = nullptr );
bool skill_arrow_create( map_session_data *sd, t_itemid nameid);

4
src/tool/csv2yaml.cpp
View File

@ -3000,7 +3000,7 @@ static bool itemdb_read_db(const char* file) {
body << YAML::Key << "NoUse";
body << YAML::BeginMap;
if (it_nouse->second.override != 100)
body << YAML::Key << "Override" << YAML::Value << it_nouse->second.override;
body << YAML::Key << "Override" << YAML::Value << it_nouse->second.override;
body << YAML::Key << "Sitting" << YAML::Value << "true";
body << YAML::EndMap;
}
@ -3011,7 +3011,7 @@ static bool itemdb_read_db(const char* file) {
body << YAML::Key << "Trade";
body << YAML::BeginMap;
if (it_trade->second.override != 100)
body << YAML::Key << "Override" << YAML::Value << it_trade->second.override;
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)