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

Cleanup/skill db fixes (#5560)

Browse Source 
* Cleanup of some minor skill db issues.
* Fixes CastCancel documentation to describe default as false.
Thanks to @Tokeiburu!
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
This commit is contained in:
Aleos 2020-11-21 18:41:43 -05:00 committed by GitHub
parent 071990ebc0
commit 90d74c2ed1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/import-tmpl/skill_db.yml
View File

@ -55,7 +55,7 @@
# NoNearNPC: Determines if the skill can be used near a NPC. (Optional)
# AdditionalRange Number of cells from an NPC where the skill can be cast. (Optional)
# Type: Type of NPC.
# CastCancel Cancel cast when hit. (Default: true)
# CastCancel Cancel cast when hit. (Default: false)
# CastDefenseReduction Defense reduction rate during skill cast. (Default: 0)
# CastTime: Time to cast the skill in milliseconds. (Default: 0)
# - Level Skill level.

2
db/pre-re/skill_db.yml
View File

@ -55,7 +55,7 @@
# NoNearNPC: Determines if the skill can be used near a NPC. (Optional)
# AdditionalRange Number of cells from an NPC where the skill can be cast. (Optional)
# Type: Type of NPC.
# CastCancel Cancel cast when hit. (Default: true)
# CastCancel Cancel cast when hit. (Default: false)
# CastDefenseReduction Defense reduction rate during skill cast. (Default: 0)
# CastTime: Time to cast the skill in milliseconds. (Default: 0)
# - Level Skill level.

2
db/re/skill_db.yml
View File

@ -55,7 +55,7 @@
# NoNearNPC: Determines if the skill can be used near a NPC. (Optional)
# AdditionalRange Number of cells from an NPC where the skill can be cast. (Optional)
# Type: Type of NPC.
# CastCancel Cancel cast when hit. (Default: true)
# CastCancel Cancel cast when hit. (Default: false)
# CastDefenseReduction Defense reduction rate during skill cast. (Default: 0)
# CastTime: Time to cast the skill in milliseconds. (Default: 0)
# - Level Skill level.

2
db/skill_db.yml
View File

@ -55,7 +55,7 @@
# NoNearNPC: Determines if the skill can be used near a NPC. (Optional)
# AdditionalRange Number of cells from an NPC where the skill can be cast. (Optional)
# Type: Type of NPC.
# CastCancel Cancel cast when hit. (Default: true)
# CastCancel Cancel cast when hit. (Default: false)
# CastDefenseReduction Defense reduction rate during skill cast. (Default: 0)
# CastTime: Time to cast the skill in milliseconds. (Default: 0)
# - Level Skill level.

2
doc/yaml/db/skill_db.yml
View File

@ -38,7 +38,7 @@
# NoNearNPC: Determines if the skill can be used near a NPC. (Optional)
# AdditionalRange Number of cells from an NPC where the skill can be cast. (Optional)
# Type: Type of NPC.
# CastCancel Cancel cast when hit. (Default: true)
# CastCancel Cancel cast when hit. (Default: false)
# CastDefenseReduction Defense reduction rate during skill cast. (Default: 0)
# CastTime: Time to cast the skill in milliseconds. (Default: 0)
# - Level Skill level.

53
src/tool/csv2yaml.cpp
View File

@ -231,7 +231,6 @@ std::unordered_map<const char*, int64> constants;
static bool parse_item_constants_txt( const char* path );
static bool parse_mob_constants( char* split[], int columns, int current );
static bool parse_skill_constants_txt( char* split[], int columns, int current );
static bool parse_skill_constants_yml(std::string path, std::string filename);
static void init_random_option_constants();
bool fileExists( const std::string& path );
@ -432,9 +431,8 @@ int do_init( int argc, char** argv ){
}
sv_readdb( path_db_mode.c_str(), "mob_db.txt", ',', 31 + 2 * MAX_MVP_DROP + 2 * MAX_MOB_DROP, 31 + 2 * MAX_MVP_DROP + 2 * MAX_MOB_DROP, -1, &parse_mob_constants, false );
sv_readdb( path_db_import.c_str(), "mob_db.txt", ',', 31 + 2 * MAX_MVP_DROP + 2 * MAX_MOB_DROP, 31 + 2 * MAX_MVP_DROP + 2 * MAX_MOB_DROP, -1, &parse_mob_constants, false );
if (fileExists(path_db + "/" + "skill_db.yml")) {
parse_skill_constants_yml(path_db_mode, "skill_db.yml");
parse_skill_constants_yml(path_db_import + "/", "skill_db.yml");
if (fileExists(skill_db.getDefaultLocation())) {
skill_db.load();
} else {
sv_readdb(path_db_mode.c_str(), "skill_db.txt", ',', 18, 18, -1, parse_skill_constants_txt, false);
sv_readdb(path_db_import.c_str(), "skill_db.txt", ',', 18, 18, -1, parse_skill_constants_txt, false);
@ -806,29 +804,34 @@ static bool parse_skill_constants_txt( char* split[], int columns, int current )
return true;
}
static bool parse_skill_constants_yml(std::string path, std::string filename) {
YAML::Node rootNode;
try {
rootNode = YAML::LoadFile(path + filename);
} catch (YAML::Exception &e) {
ShowError("Failed to read file from '" CL_WHITE "%s%s" CL_RESET "'.\n", path.c_str(), filename.c_str());
ShowError("%s (Line %d: Column %d)\n", e.msg.c_str(), e.mark.line, e.mark.column);
return false;
}
uint64 count = 0;
for (const YAML::Node &body : rootNode["Body"]) {
aegis_skillnames[body["Id"].as<uint16>()] = body["Name"].as<std::string>();
count++;
}
ShowStatus("Done reading '" CL_WHITE "%" PRIu64 CL_RESET "' entries in '" CL_WHITE "%s%s" CL_RESET "'" CL_CLL "\n", count, path.c_str(), filename.c_str());
return true;
const std::string SkillDatabase::getDefaultLocation() {
return std::string(db_path) + "/skill_db.yml";
}
uint64 SkillDatabase::parseBodyNode(const YAML::Node &node) {
t_itemid nameid;
if (!this->asUInt32(node, "Id", nameid))
return 0;
if (this->nodeExists(node, "Name")) {
std::string name;
if (!this->asString(node, "Name", name))
return 0;
aegis_skillnames[nameid] = name;
}
return 1;
}
void SkillDatabase::clear() {
TypesafeCachedYamlDatabase::clear();
}
SkillDatabase skill_db;
/**
* Split the string with ':' as separator and put each value for a skilllv
* @param str: String to split