Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-04-19 21:33:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added a max value parameter for the stat dependencies.

Browse Source
This commit is contained in:
Relintai 2019-10-15 21:58:40 +02:00
parent 8ce7742d14
commit 18afb79b58
4 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
entities/stats/stat.cpp
View File

@ -347,13 +347,14 @@ void Stat::apply_modifiers() {
for (int i = 0; i < _stat_data_entry->get_mod_stat_count(); ++i) {
Ref<Stat> stat = _owner->get_stat_enum(_stat_data_entry->get_mod_stat_id(i));
Ref<Curve> curve = _stat_data_entry->get_mod_stat_curve(i);
float max_value = _stat_data_entry->get_mod_stat_max_value(i);
ERR_FAIL_COND(!stat.is_valid());
ERR_FAIL_COND(!curve.is_valid());
Ref<StatModifier> sm = stat->get_or_add_modifier(-(static_cast<int>(_id) + 1));
sm->set_base_mod(_s_current * curve->interpolate(_s_current));
sm->set_base_mod(_s_current * curve->interpolate(_s_current / max_value));
}
_owner->ons_stat_changed(Ref<Stat>(this));

1
entities/stats/stat_data.cpp
View File

@ -72,7 +72,6 @@ void StatData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_stat_data_enum", "index"), &StatData::get_stat_data_enum);
ClassDB::bind_method(D_METHOD("set_stat_data_enum", "stat_id", "entry"), &StatData::set_stat_data_enum);
ADD_GROUP("Base Stats", "base_stat");
for (int i = 0; i < Stat::STAT_ID_TOTAL_STATS; ++i) {
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "base_stat_" + Stat::stat_id_name(i), PROPERTY_HINT_RESOURCE_TYPE, "StatDataEntry"), "set_stat_data_enum", "get_stat_data_enum", i);

26
entities/stats/stat_data_entry.cpp
View File

@ -48,9 +48,13 @@ void StatDataEntry::set_modifier_apply_type(Stat::StatModifierApplyType value) {
bool StatDataEntry::has_mod_stats() {
return _mod_stat_count > 0;
}
int StatDataEntry::get_mod_stat_count() {
return _mod_stat_count;
}
void StatDataEntry::set_mod_stat_count(int value) {
_mod_stat_count = value;
}
Stat::StatId StatDataEntry::get_mod_stat_id(int index) {
ERR_FAIL_INDEX_V(index, MAX_MOD_STATS, Stat::STAT_ID_HEALTH);
@ -74,6 +78,17 @@ void StatDataEntry::set_mod_stat_curve(int index, Ref<Curve> curve) {
_mod_stats[index].curve = curve;
}
float StatDataEntry::get_mod_stat_max_value(int index) {
ERR_FAIL_INDEX_V(index, MAX_MOD_STATS, 1);
return _mod_stats[index].max_value;
}
void StatDataEntry::set_mod_stat_max_value(int index, float value) {
ERR_FAIL_INDEX(index, 1);
_mod_stats[index].max_value = value;
}
void StatDataEntry::get_stats_for_stat(Ref<Stat> stat) {
stat->set_stat_modifier_type(get_modifier_apply_type());
@ -94,6 +109,10 @@ StatDataEntry::StatDataEntry() {
_mod_stat_count = 0;
_modifier_apply_type = Stat::MODIFIER_APPLY_TYPE_STANDARD;
for (int i = 0; i < MAX_MOD_STATS; ++i) {
_mod_stats[i].max_value = 1000;
}
}
StatDataEntry::~StatDataEntry() {
@ -124,7 +143,10 @@ void StatDataEntry::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "modifier_apply_type", PROPERTY_HINT_ENUM, Stat::MODIFIER_APPLY_TYPE_BINDING_STRING), "set_modifier_apply_type", "get_modifier_apply_type");
ClassDB::bind_method(D_METHOD("has_mod_stats"), &StatDataEntry::has_mod_stats);
ClassDB::bind_method(D_METHOD("get_mod_stat_count"), &StatDataEntry::get_mod_stat_count);
ClassDB::bind_method(D_METHOD("set_mod_stat_count", "value"), &StatDataEntry::set_mod_stat_count);
ADD_PROPERTY(PropertyInfo(Variant::INT, "mod_stat_count", PROPERTY_HINT_RANGE, "0," + itos(MAX_MOD_STATS), PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_UPDATE_ALL_IF_MODIFIED), "set_mod_stat_count", "get_mod_stat_count");
ClassDB::bind_method(D_METHOD("get_mod_stat_id", "index"), &StatDataEntry::get_mod_stat_id);
ClassDB::bind_method(D_METHOD("set_mod_stat_id", "index", "value"), &StatDataEntry::set_mod_stat_id);
@ -132,9 +154,13 @@ void StatDataEntry::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_mod_stat_curve", "index"), &StatDataEntry::get_mod_stat_curve);
ClassDB::bind_method(D_METHOD("set_mod_stat_curve", "index", "value"), &StatDataEntry::set_mod_stat_curve);
ClassDB::bind_method(D_METHOD("get_mod_stat_max_value", "index"), &StatDataEntry::get_mod_stat_max_value);
ClassDB::bind_method(D_METHOD("set_mod_stat_max_value", "index", "value"), &StatDataEntry::set_mod_stat_max_value);
for (int i = 0; i < MAX_MOD_STATS; i++) {
ADD_PROPERTYI(PropertyInfo(Variant::INT, "ModStat_" + itos(i) + "/stat_id", PROPERTY_HINT_ENUM, Stat::STAT_BINDING_STRING, PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_mod_stat_id", "get_mod_stat_id", i);
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "ModStat_" + itos(i) + "/curve", PROPERTY_HINT_RESOURCE_TYPE, "Curve", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_mod_stat_curve", "get_mod_stat_curve", i);
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "ModStat_" + itos(i) + "/max_value", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_INTERNAL), "set_mod_stat_max_value", "get_mod_stat_max_value", i);
}
ClassDB::bind_method(D_METHOD("get_stats_for_stat", "stat"), &StatDataEntry::get_stats_for_stat);

6
entities/stats/stat_data_entry.h
View File

@ -30,7 +30,9 @@ public:
void set_modifier_apply_type(Stat::StatModifierApplyType value);
bool has_mod_stats();
int get_mod_stat_count();
void set_mod_stat_count(int value);
Stat::StatId get_mod_stat_id(int index);
void set_mod_stat_id(int index, Stat::StatId value);
@ -38,6 +40,9 @@ public:
Ref<Curve> get_mod_stat_curve(int index);
void set_mod_stat_curve(int index, Ref<Curve> curve);
float get_mod_stat_max_value(int index);
void set_mod_stat_max_value(int index, float value);
void get_stats_for_stat(Ref<Stat> stat);
StatDataEntry();
@ -51,6 +56,7 @@ public:
struct ModStat {
Stat::StatId stat_id;
Ref<Curve> curve;
float max_value;
};
enum {