From 2053b9ee766b15d760c5d27d348776dcee78f728 Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 16 Oct 2019 14:55:14 +0200 Subject: [PATCH] Small fixes and cleanup. --- entities/entity.cpp | 6 +- entities/stats/level_stat_data.cpp | 2 +- entities/stats/stat.cpp | 97 +++++++++++++++--------------- entities/stats/stat.h | 15 +---- 4 files changed, 55 insertions(+), 65 deletions(-) diff --git a/entities/entity.cpp b/entities/entity.cpp index 2bfe5fe..b1656ea 100644 --- a/entities/entity.cpp +++ b/entities/entity.cpp @@ -2317,16 +2317,16 @@ void Entity::son_xp_gained(int value) { void Entity::son_level_up(int value) { if (_s_entity_data.is_valid()) { - _s_entity_data->son_level_up(this, _s_level); + _s_entity_data->son_level_up(this, value); } if (has_method("_son_level_up")) - call("_son_level_up", _s_level); + call("_son_level_up", value); for (int i = 0; i < _s_auras.size(); ++i) { Ref ad = _s_auras.get(i); - ad->get_aura()->son_level_up(ad, _s_level); + ad->get_aura()->son_level_up(ad, value); } emit_signal("son_level_up", this, value); diff --git a/entities/stats/level_stat_data.cpp b/entities/stats/level_stat_data.cpp index 6af3a8a..c1f0089 100644 --- a/entities/stats/level_stat_data.cpp +++ b/entities/stats/level_stat_data.cpp @@ -2,7 +2,7 @@ int LevelStatData::get_stat_diff(int main_stat, int old_level, int new_level) { if (has_method("_get_stat_diff")) - return call("_get_stat_diff"); + return call("_get_stat_diff", main_stat, old_level, new_level); return 0; } diff --git a/entities/stats/stat.cpp b/entities/stats/stat.cpp index 16eb1db..335a5da 100644 --- a/entities/stats/stat.cpp +++ b/entities/stats/stat.cpp @@ -637,61 +637,60 @@ void Stat::_bind_methods() { ClassDB::bind_method(D_METHOD("_from_dict", "dict"), &Stat::_from_dict); ClassDB::bind_method(D_METHOD("_to_dict"), &Stat::_to_dict); - BIND_ENUM_CONSTANT(Stat::STAT_ID_HEALTH); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SPEED); - BIND_ENUM_CONSTANT(Stat::STAT_ID_MANA); - BIND_ENUM_CONSTANT(Stat::STAT_ID_GLOBAL_COOLDOWN); - BIND_ENUM_CONSTANT(Stat::STAT_ID_HASTE); + BIND_ENUM_CONSTANT(STAT_ID_HEALTH); + BIND_ENUM_CONSTANT(STAT_ID_SPEED); + BIND_ENUM_CONSTANT(STAT_ID_MANA); + BIND_ENUM_CONSTANT(STAT_ID_GLOBAL_COOLDOWN); + BIND_ENUM_CONSTANT(STAT_ID_HASTE); - BIND_ENUM_CONSTANT(Stat::STAT_ID_AGILITY); - BIND_ENUM_CONSTANT(Stat::STAT_ID_STRENGTH); - BIND_ENUM_CONSTANT(Stat::STAT_ID_STAMINA); - BIND_ENUM_CONSTANT(Stat::STAT_ID_INTELLECT); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SPIRIT); + BIND_ENUM_CONSTANT(STAT_ID_AGILITY); + BIND_ENUM_CONSTANT(STAT_ID_STRENGTH); + BIND_ENUM_CONSTANT(STAT_ID_STAMINA); + BIND_ENUM_CONSTANT(STAT_ID_INTELLECT); + BIND_ENUM_CONSTANT(STAT_ID_SPIRIT); - BIND_ENUM_CONSTANT(Stat::STAT_ID_HASTE_RATING); - BIND_ENUM_CONSTANT(Stat::STAT_ID_RESLILIENCE); - BIND_ENUM_CONSTANT(Stat::STAT_ID_ARMOR); + BIND_ENUM_CONSTANT(STAT_ID_HASTE_RATING); + BIND_ENUM_CONSTANT(STAT_ID_RESLILIENCE); + BIND_ENUM_CONSTANT(STAT_ID_ARMOR); - BIND_ENUM_CONSTANT(Stat::STAT_ID_ATTACK_POWER); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SPELL_POWER); + BIND_ENUM_CONSTANT(STAT_ID_ATTACK_POWER); + BIND_ENUM_CONSTANT(STAT_ID_SPELL_POWER); - BIND_ENUM_CONSTANT(Stat::STAT_ID_MELEE_CRIT); - BIND_ENUM_CONSTANT(Stat::STAT_ID_MELEE_CRIT_BONUS); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SPELL_CRIT); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SPELL_CRIT_BONUS); - BIND_ENUM_CONSTANT(Stat::STAT_ID_BLOCK); - BIND_ENUM_CONSTANT(Stat::STAT_ID_PARRY); - BIND_ENUM_CONSTANT(Stat::STAT_ID_DAMAGE_REDUCTION); - BIND_ENUM_CONSTANT(Stat::STAT_ID_MELEE_DAMAGE_REDUCTION); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SPELL_DAMAGE_REDUCTION); - BIND_ENUM_CONSTANT(Stat::STAT_ID_DAMAGE_TAKEN); - BIND_ENUM_CONSTANT(Stat::STAT_ID_MELEE_DAMAGE); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SPELL_DAMAGE); + BIND_ENUM_CONSTANT(STAT_ID_MELEE_CRIT); + BIND_ENUM_CONSTANT(STAT_ID_MELEE_CRIT_BONUS); + BIND_ENUM_CONSTANT(STAT_ID_SPELL_CRIT); + BIND_ENUM_CONSTANT(STAT_ID_SPELL_CRIT_BONUS); + BIND_ENUM_CONSTANT(STAT_ID_BLOCK); + BIND_ENUM_CONSTANT(STAT_ID_PARRY); + BIND_ENUM_CONSTANT(STAT_ID_DAMAGE_REDUCTION); + BIND_ENUM_CONSTANT(STAT_ID_MELEE_DAMAGE_REDUCTION); + BIND_ENUM_CONSTANT(STAT_ID_SPELL_DAMAGE_REDUCTION); + BIND_ENUM_CONSTANT(STAT_ID_DAMAGE_TAKEN); + BIND_ENUM_CONSTANT(STAT_ID_MELEE_DAMAGE); + BIND_ENUM_CONSTANT(STAT_ID_SPELL_DAMAGE); - BIND_ENUM_CONSTANT(Stat::STAT_ID_HOLY_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SHADOW_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_NATURE_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_FIRE_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_FROST_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_LIGHTNING_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_CHAOS_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_SILENCE_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_FEAR_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_HOLY_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_SHADOW_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_NATURE_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_FIRE_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_FROST_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_LIGHTNING_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_CHAOS_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_SILENCE_RESIST); + BIND_ENUM_CONSTANT(STAT_ID_FEAR_RESIST); - BIND_ENUM_CONSTANT(Stat::STAT_ID_TOTAL_STATS); - BIND_ENUM_CONSTANT(Stat::STAT_ID_NONE); + BIND_ENUM_CONSTANT(STAT_ID_TOTAL_STATS); + BIND_ENUM_CONSTANT(STAT_ID_NONE); - BIND_ENUM_CONSTANT(Stat::MODIFIER_APPLY_TYPE_STANDARD); - BIND_ENUM_CONSTANT(Stat::MODIFIER_APPLY_TYPE_ONLY_MIN_MODIFIER); - BIND_ENUM_CONSTANT(Stat::MODIFIER_APPLY_TYPE_ONLY_MAX_MODIFIER); + BIND_ENUM_CONSTANT(MODIFIER_APPLY_TYPE_STANDARD); + BIND_ENUM_CONSTANT(MODIFIER_APPLY_TYPE_ONLY_MIN_MODIFIER); + BIND_ENUM_CONSTANT(MODIFIER_APPLY_TYPE_ONLY_MAX_MODIFIER); - BIND_ENUM_CONSTANT(Stat::MAIN_STAT_ID_AGILITY); - BIND_ENUM_CONSTANT(Stat::MAIN_STAT_ID_STRENGTH); - BIND_ENUM_CONSTANT(Stat::MAIN_STAT_ID_STAMINA); - BIND_ENUM_CONSTANT(Stat::MAIN_STAT_ID_INTELLECT); - BIND_ENUM_CONSTANT(Stat::MAIN_STAT_ID_SPIRIT); - BIND_ENUM_CONSTANT(Stat::MAIN_STAT_ID_COUNT); - BIND_ENUM_CONSTANT(Stat::MAIN_STAT_ID_MIN); - BIND_ENUM_CONSTANT(Stat::MAIN_STAT_ID_MAX); + BIND_ENUM_CONSTANT(MAIN_STAT_AGILITY); + BIND_ENUM_CONSTANT(MAIN_STAT_STRENGTH); + BIND_ENUM_CONSTANT(MAIN_STAT_STAMINA); + BIND_ENUM_CONSTANT(MAIN_STAT_INTELLECT); + BIND_ENUM_CONSTANT(MAIN_STAT_SPIRIT); + BIND_ENUM_CONSTANT(MAIN_STAT_ID_COUNT); + BIND_ENUM_CONSTANT(MAIN_STAT_ID_START); } diff --git a/entities/stats/stat.h b/entities/stats/stat.h index da1e086..bfd8b34 100644 --- a/entities/stats/stat.h +++ b/entities/stats/stat.h @@ -30,7 +30,7 @@ public: STAT_ID_STRENGTH = 6, STAT_ID_STAMINA = 7, STAT_ID_INTELLECT = 8, - STAT_ID_SPIRIT = 9, //+crit, + loot + STAT_ID_SPIRIT = 9, STAT_ID_HASTE_RATING = 10, STAT_ID_RESLILIENCE = 11, @@ -85,18 +85,9 @@ public: MAIN_STAT_STAMINA = 2, MAIN_STAT_INTELLECT = 3, MAIN_STAT_SPIRIT = 4, - }; - - enum MainStatIds { - MAIN_STAT_ID_AGILITY = STAT_ID_AGILITY, - MAIN_STAT_ID_STRENGTH = STAT_ID_STRENGTH, - MAIN_STAT_ID_STAMINA = STAT_ID_STAMINA, - MAIN_STAT_ID_INTELLECT = STAT_ID_INTELLECT, - MAIN_STAT_ID_SPIRIT = STAT_ID_SPIRIT, + MAIN_STAT_ID_START = STAT_ID_AGILITY, MAIN_STAT_ID_COUNT = 5, - MAIN_STAT_ID_MIN = MAIN_STAT_ID_AGILITY, - MAIN_STAT_ID_MAX = MAIN_STAT_ID_SPIRIT, }; static String stat_id_name(int stat_id); @@ -204,7 +195,7 @@ private: }; VARIANT_ENUM_CAST(Stat::StatId); -VARIANT_ENUM_CAST(Stat::MainStatIds); +VARIANT_ENUM_CAST(Stat::MainStats); VARIANT_ENUM_CAST(Stat::StatModifierApplyType); #endif