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

Fixes HPFactor being way too high (#6909)

Browse Source 
- Fixes #6908
- HpFactor default changed from 20000 to 0
- Renamed HPMultiplicator to HpIncrease and SPFactor to SpIncrease so the naming is more consistent
- Fixed an issue with case-sensitivity (HP/SP -> Hp/Sp)
- YAML version of JOB_STATS is now 2
- "csv2yaml" and "yamlupgrade" converters updated accordingly
- Improved documentation

Special thanks to @Lemongrass3110
This commit is contained in:
Playtester
2022-05-02 13:50:09 +02:00
committed by GitHub
parent 78bf9f72c8
commit 64f10ed10b
15 changed files with 367 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/map/pc.cpp
View File

@@ -12999,7 +12999,7 @@ void SkillTreeDatabase::loadingFinished() {
*/
static unsigned int pc_calc_basehp(uint16 level, uint16 job_id) {
std::shared_ptr<s_job_info> job = job_db.find(job_id);
double base_hp = 35 + level * (job->hp_multiplicator / 100.);
double base_hp = 35 + level * (job->hp_increase / 100.);
#ifndef RENEWAL
if (level >= 10 && (job_id == JOB_NINJA || job_id == JOB_GUNSLINGER))
@@ -13021,7 +13021,7 @@ static unsigned int pc_calc_basehp(uint16 level, uint16 job_id) {
*/
static unsigned int pc_calc_basesp(uint16 level, uint16 job_id) {
std::shared_ptr<s_job_info> job = job_db.find(job_id);
double base_sp = 10 + floor(level * (job->sp_factor / 100.));
double base_sp = 10 + floor(level * (job->sp_increase / 100.));
switch (job_id) {
case JOB_NINJA:
@@ -13100,40 +13100,40 @@ uint64 JobDatabase::parseBodyNode(const ryml::NodeRef& node) {
job->max_weight_base = 20000;
}
if (this->nodeExists(node, "HPFactor")) {
if (this->nodeExists(node, "HpFactor")) {
uint32 hp;
if (!this->asUInt32(node, "HPFactor", hp))
if (!this->asUInt32(node, "HpFactor", hp))
return 0;
job->hp_factor = hp;
} else {
if (!exists)
job->hp_factor = 20000;
job->hp_factor = 0;
}
if (this->nodeExists(node, "HPMultiplicator")) {
if (this->nodeExists(node, "HpIncrease")) {
uint32 hp;
if (!this->asUInt32(node, "HPMultiplicator", hp))
if (!this->asUInt32(node, "HpIncrease", hp))
return 0;
job->hp_multiplicator = hp;
job->hp_increase = hp;
} else {
if (!exists)
job->hp_multiplicator = 500;
job->hp_increase = 500;
}
if (this->nodeExists(node, "SPFactor")) {
if (this->nodeExists(node, "SpIncrease")) {
uint32 sp;
if (!this->asUInt32(node, "SPFactor", sp))
if (!this->asUInt32(node, "SpIncrease", sp))
return 0;
job->sp_factor = sp;
job->sp_increase = sp;
} else {
if (!exists)
job->sp_factor = 100;
job->sp_increase = 100;
}
if (this->nodeExists(node, "BaseASPD")) {