Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-05-09 22:41:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed aura ticks.

Browse Source
This commit is contained in:
Relintai 2019-06-24 17:58:25 +02:00
parent ec6503c5e9
commit c9c9267dbb
4 changed files with 45 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
data/aura.cpp
View File

@ -21,6 +21,13 @@ void Aura::set_time(float value) {
time = value;
}
float Aura::get_tick() {
return _tick;
}
void Aura::set_tick(float value) {
_tick = value;
}
int Aura::get_aura_group() {
return aura_group;
}
@ -182,13 +189,6 @@ void Aura::set_damage_max(int value) {
_damage_max = value;
}
float Aura::get_damage_tick() {
return _damage_tick;
}
void Aura::set_damage_tick(float value) {
_damage_tick = value;
}
bool Aura::get_damage_can_crit() {
return _damage_can_crit;
}
@ -196,11 +196,10 @@ void Aura::set_damage_can_crit(bool value) {
_damage_can_crit = value;
}
void Aura::set_damage(int min, int max, float tick, bool can_crit) {
void Aura::set_damage(int min, int max, bool can_crit) {
set_damage_enabled(true);
set_damage_min(min);
set_damage_max(max);
set_damage_tick(tick);
set_damage_can_crit(can_crit);
}
@ -256,13 +255,6 @@ void Aura::set_heal_max(int value) {
_heal_max = value;
}
float Aura::get_heal_tick() {
return _heal_tick;
}
void Aura::set_heal_tick(float value) {
_heal_tick = value;
}
bool Aura::get_heal_can_crit() {
return _heal_can_crit;
}
@ -270,11 +262,10 @@ void Aura::set_heal_can_crit(bool value) {
_heal_can_crit = value;
}
void Aura::set_heal(int min, int max, float tick, bool can_crit) {
void Aura::set_heal(int min, int max, bool can_crit) {
set_heal_enabled(true);
set_heal_min(min);
set_heal_max(max);
set_heal_tick(tick);
set_heal_can_crit(can_crit);
}
@ -282,6 +273,7 @@ Aura::Aura() {
ability_scale_data_id = 1;
id = 0;
time = 0;
_tick = 0;
_aura_type = SpellEnums::AURA_TYPE_NONE;
_is_debuff = false;
aura_group = 0;
@ -291,7 +283,6 @@ Aura::Aura() {
_damage_type = 0;
_damage_min = 0;
_damage_max = 0;
_damage_tick = 0;
_damage_can_crit = false;
_absorb_enabled = false;
@ -302,7 +293,7 @@ Aura::Aura() {
_heal_enabled = false;
_heal_min = 0;
_heal_max = 0;
_heal_tick = 0;
_heal_can_crit = false;
_add_states = 0;
@ -643,6 +634,7 @@ void Aura::_setup_aura_data(Ref<AuraData> data, Ref<AuraApplyInfo> info) {
data->set_aura(Ref<Aura>(this));
data->set_aura_id(get_id());
data->set_caster(info->get_caster());
data->set_tick(info->get_aura()->get_tick());
if (get_time() > 0.2) {
data->set_is_timed(true);
@ -785,11 +777,10 @@ void Aura::_supdate(Ref<AuraData> aura, float delta) {
bool remove = false;
if (aura->get_is_timed())
remove = aura->update_remaining_time(delta);
remove = aura->update(delta);
//ontick
if (aura->get_unhandled_ticks() != 0) {
while (aura->get_unhandled_ticks() > 0) {
if (aura->get_damage() != 0) {
Ref<SpellDamageInfo> dpd = Ref<SpellDamageInfo>(memnew(SpellDamageInfo()));
@ -801,7 +792,7 @@ void Aura::_supdate(Ref<AuraData> aura, float delta) {
handle_aura_damage(aura, dpd);
}
aura->set_unhandled_ticks(0);
aura->set_unhandled_ticks(aura->get_unhandled_ticks() - 1);
}
if (remove) {
@ -971,6 +962,10 @@ void Aura::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_time", "value"), &Aura::set_time);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "time"), "set_time", "get_time");
ClassDB::bind_method(D_METHOD("get_tick"), &Aura::get_tick);
ClassDB::bind_method(D_METHOD("set_tick", "value"), &Aura::set_tick);
ADD_PROPERTY(PropertyInfo(Variant::INT, "tick"), "set_tick", "get_tick");
ClassDB::bind_method(D_METHOD("get_is_debuff"), &Aura::get_is_debuff);
ClassDB::bind_method(D_METHOD("set_is_debuff", "value"), &Aura::set_is_debuff);
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "debuff"), "set_is_debuff", "get_is_debuff");
@ -1018,15 +1013,11 @@ void Aura::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_damage_max", "value"), &Aura::set_damage_max);
ADD_PROPERTY(PropertyInfo(Variant::INT, "damage_max"), "set_damage_max", "get_damage_max");
ClassDB::bind_method(D_METHOD("get_damage_tick"), &Aura::get_damage_tick);
ClassDB::bind_method(D_METHOD("set_damage_tick", "value"), &Aura::set_damage_tick);
ADD_PROPERTY(PropertyInfo(Variant::INT, "damage_tick"), "set_damage_tick", "get_damage_tick");
ClassDB::bind_method(D_METHOD("get_damage_can_crit"), &Aura::get_damage_can_crit);
ClassDB::bind_method(D_METHOD("set_damage_can_crit", "value"), &Aura::set_damage_can_crit);
ADD_PROPERTY(PropertyInfo(Variant::INT, "damage_can_crit"), "set_damage_can_crit", "get_damage_can_crit");
ClassDB::bind_method(D_METHOD("set_damage", "min", "max", "tick", "can_crit"), &Aura::set_damage);
ClassDB::bind_method(D_METHOD("set_damage", "min", "max", "can_crit"), &Aura::set_damage);
ClassDB::bind_method(D_METHOD("get_damage_scaling_curve"), &Aura::get_damage_scaling_curve);
ClassDB::bind_method(D_METHOD("set_damage_scaling_curve", "curve"), &Aura::set_damage_scaling_curve);
@ -1068,15 +1059,11 @@ void Aura::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_heal_max", "value"), &Aura::set_heal_max);
ADD_PROPERTY(PropertyInfo(Variant::INT, "heal_max"), "set_heal_max", "get_heal_max");
ClassDB::bind_method(D_METHOD("get_heal_tick"), &Aura::get_heal_tick);
ClassDB::bind_method(D_METHOD("set_heal_tick", "value"), &Aura::set_heal_tick);
ADD_PROPERTY(PropertyInfo(Variant::INT, "heal_tick"), "set_heal_tick", "get_heal_tick");
ClassDB::bind_method(D_METHOD("get_heal_can_crit"), &Aura::get_heal_can_crit);
ClassDB::bind_method(D_METHOD("set_heal_can_crit", "value"), &Aura::set_heal_can_crit);
ADD_PROPERTY(PropertyInfo(Variant::INT, "heal_can_crit"), "set_heal_can_crit", "get_heal_can_crit");
ClassDB::bind_method(D_METHOD("set_heal", "min", "max", "tick", "can_crit"), &Aura::set_heal);
ClassDB::bind_method(D_METHOD("set_heal", "min", "max", "can_crit"), &Aura::set_heal);
ClassDB::bind_method(D_METHOD("get_heal_scaling_curve"), &Aura::get_heal_scaling_curve);
ClassDB::bind_method(D_METHOD("set_heal_scaling_curve", "curve"), &Aura::set_heal_scaling_curve);

16
data/aura.h
View File

@ -44,6 +44,9 @@ public:
bool get_is_debuff();
void set_is_debuff(bool value);
float get_tick();
void set_tick(float value);
SpellEnums::AuraType get_aura_type();
void set_aura_type(SpellEnums::AuraType value);
@ -96,13 +99,10 @@ public:
int get_damage_max();
void set_damage_max(int value);
float get_damage_tick();
void set_damage_tick(float value);
bool get_damage_can_crit();
void set_damage_can_crit(bool value);
void set_damage(int min, int max, float tick, bool can_crit);
void set_damage(int min, int max, bool can_crit);
//Absorb
bool is_absorb_enabled();
@ -128,13 +128,10 @@ public:
int get_heal_max();
void set_heal_max(int value);
float get_heal_tick();
void set_heal_tick(float value);
bool get_heal_can_crit();
void set_heal_can_crit(bool value);
void set_heal(int min, int max, float tick, bool can_crit);
void set_heal(int min, int max, bool can_crit);
Ref<Curve> get_damage_scaling_curve() { return _damage_scaling_curve; }
void set_damage_scaling_curve(Ref<Curve> curve) { _damage_scaling_curve = curve; }
@ -336,6 +333,7 @@ private:
int id;
float time;
float _tick;
int aura_group;
Ref<Texture> _icon;
SpellEnums::AuraType _aura_type;
@ -353,7 +351,6 @@ private:
int _damage_type;
int _damage_min;
int _damage_max;
float _damage_tick;
bool _damage_can_crit;
Ref<Curve> _damage_scaling_curve;
@ -366,7 +363,6 @@ private:
bool _heal_enabled;
int _heal_min;
int _heal_max;
float _heal_tick;
bool _heal_can_crit;
Ref<Curve> _heal_scaling_curve;

30
entities/auras/aura_data.cpp
View File

@ -1,7 +1,7 @@
#include "aura_data.h"
#include "../entity.h"
#include "../../data/aura.h"
#include "../entity.h"
AuraData::AuraData() {
_aura_id = 0;
@ -52,12 +52,23 @@ void AuraData::set_remaining_time(float value) {
_remaining_time = value;
}
bool AuraData::update_remaining_time(float delta) {
_remaining_time -= delta;
bool AuraData::update(float delta) {
if (_tick > 0.01) {
_time_since_last_tick += delta;
if (_remaining_time <= 0) {
_remaining_time = 0;
return true;
while (_time_since_last_tick >= _tick) {
_time_since_last_tick -= _tick;
++_unhandled_ticks;
}
}
if (_is_timed) {
_remaining_time -= delta;
if (_remaining_time <= 0) {
_remaining_time = 0;
return true;
}
}
return false;
@ -128,7 +139,6 @@ void AuraData::set_aura(Ref<Aura> aura) {
_aura = aura;
}
int AuraData::get_damage() {
return _damage;
}
@ -161,7 +171,6 @@ void AuraData::set_unhandled_ticks(int value) {
_unhandled_ticks = value;
}
int AuraData::get_damage_taken() {
return _damage_already_taken;
}
@ -178,7 +187,6 @@ void AuraData::refresh(float remaining_time) {
//_diminishing_level_count += 1;
}
/*
void AuraData::refresh(float remaining_time) {
_diminishing_level_count += 1;
@ -199,8 +207,6 @@ void AuraData::refresh(float remaining_time) {
_time_since_last_tick = (float)0;
}*/
int AuraData::get_heal() {
return _heal;
}
@ -209,7 +215,6 @@ void AuraData::set_heal(int value) {
_heal = value;
}
int AuraData::get_remaining_absorb() {
return _remaining_absorb;
}
@ -293,4 +298,3 @@ void AuraData::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_slow", "value"), &AuraData::set_slow);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "slow"), "set_slow", "get_slow");
}

2
entities/auras/aura_data.h
View File

@ -19,7 +19,7 @@ public:
float get_remaining_time();
void set_remaining_time(float value);
bool update_remaining_time(float delta);
bool update(float delta);
Entity *get_owner();
void set_owner(Node *value);