Resolves an issue with RENEWAL_ASPD (#6959)

* Fixes #6900.
* Resolves an issue where if RENEWAL was enabled but RENEWAL_ASPD was disabled, players would receive incorrect ASPD values.
* Split the ASPD values to their own files so these can be overridden based on the macro defines.
Thanks to @jamesonfajardo and @bgamez23!
Co-authored-by: Vincent Stumpf <vincents.995@gmail.com>
This commit is contained in:
Aleos
2023-06-12 09:28:38 -04:00
committed by GitHub
parent 33d20fa91a
commit c1a52490b1
6 changed files with 970 additions and 1721 deletions

View File

@@ -196,6 +196,12 @@ void YamlDatabase::parseImports( const ryml::Tree& rootNode ){
#ifdef RENEWAL
std::string compiledMode = "Renewal";
// RENEWAL mode with RENEWAL_ASPD off, load pre-re ASPD
#ifndef RENEWAL_ASPD
if (importFile.find("job_aspd.yml") != std::string::npos)
compiledMode = "Prerenewal";
#endif
#else
std::string compiledMode = "Prerenewal";
#endif