Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-02-22 17:18:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added sgcd, and cgcd properties.

Browse Source
This commit is contained in:
Relintai 2020-06-15 11:48:22 +02:00
parent adf0f3b715
commit 503481924f
2 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
entities/entity.cpp
View File

@ -1631,22 +1631,30 @@ bool Entity::getc_is_dead() {
return _c_is_dead; return _c_is_dead;
} }
bool Entity::gcd_hasc() { bool Entity::gcd_hasc() const {
return _c_gcd >= 0.000000001; return _c_gcd >= 0.000000001;
} }
bool Entity::gcd_hass() { bool Entity::gcd_hass() const {
return _s_gcd >= 0.000000001; return _s_gcd >= 0.000000001;
} }
float Entity::gcd_getc() { float Entity::gcd_getc() const {
return _c_gcd; return _c_gcd;
} }
float Entity::gcd_gets() { void Entity::gcd_setc(const float value) {
_c_gcd = value;
}
float Entity::gcd_gets() const {
return _s_gcd; return _s_gcd;
} }
void Entity::gcd_sets(const float value) {
_s_gcd = value;
}
void Entity::gcd_starts(float value) { void Entity::gcd_starts(float value) {
_s_gcd = value; _s_gcd = value;
@ -6230,11 +6238,6 @@ bool Entity::_set(const StringName &p_name, const Variant &p_value) {
resource_adds(res); resource_adds(res);
} }
//// GCD ////
_s_gcd = dict.get("gcd", 0);
_c_gcd = _s_gcd;
//// States //// //// States ////
Dictionary statesd = dict.get("states", Dictionary()); Dictionary statesd = dict.get("states", Dictionary());
@ -6382,23 +6385,6 @@ bool Entity::_set(const StringName &p_name, const Variant &p_value) {
_c_skills.push_back(r); _c_skills.push_back(r);
} }
//// Bags ////
Dictionary bagd = dict.get("bag", Dictionary());
if (!bagd.empty()) {
if (!_s_bag.is_valid()) {
Ref<Bag> bag;
bag.instance();
bag->from_dict(bagd);
sets_bag(bag);
} else {
_s_bag->from_dict(bagd);
}
}
//// Actionbars //// //// Actionbars ////
_actionbar_locked = dict.get("actionbar_locked", false); _actionbar_locked = dict.get("actionbar_locked", false);
@ -6472,10 +6458,6 @@ bool Entity::_get(const StringName &p_name, Variant &r_ret) const {
dict["resources"] = rd; dict["resources"] = rd;
//// GCD ////
dict["gcd"] = _s_gcd;
//// States //// //// States ////
Dictionary stated; Dictionary stated;
@ -6577,11 +6559,6 @@ bool Entity::_get(const StringName &p_name, Variant &r_ret) const {
dict["skills"] = skills; dict["skills"] = skills;
//// Bags ////
if (_s_bag.is_valid())
dict["bag"] = _s_bag->to_dict();
//// Actionbars //// //// Actionbars ////
dict["actionbar_locked"] = _actionbar_locked; dict["actionbar_locked"] = _actionbar_locked;
@ -7283,8 +7260,15 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("gcd_hasc"), &Entity::gcd_hasc); ClassDB::bind_method(D_METHOD("gcd_hasc"), &Entity::gcd_hasc);
ClassDB::bind_method(D_METHOD("gcd_hass"), &Entity::gcd_hass); ClassDB::bind_method(D_METHOD("gcd_hass"), &Entity::gcd_hass);
ClassDB::bind_method(D_METHOD("gcd_getc"), &Entity::gcd_getc); ClassDB::bind_method(D_METHOD("gcd_getc"), &Entity::gcd_getc);
ClassDB::bind_method(D_METHOD("gcd_setc", "value"), &Entity::gcd_setc);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "cgcd", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_NETWORK), "gcd_setc", "gcd_getc");
ClassDB::bind_method(D_METHOD("gcd_gets"), &Entity::gcd_gets); ClassDB::bind_method(D_METHOD("gcd_gets"), &Entity::gcd_gets);
ClassDB::bind_method(D_METHOD("gcd_sets", "value"), &Entity::gcd_sets);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "sgcd", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_NETWORK), "gcd_sets", "gcd_gets");
ClassDB::bind_method(D_METHOD("gcd_starts", "value"), &Entity::gcd_starts); ClassDB::bind_method(D_METHOD("gcd_starts", "value"), &Entity::gcd_starts);
ClassDB::bind_method(D_METHOD("gcd_startc", "value"), &Entity::gcd_startc); ClassDB::bind_method(D_METHOD("gcd_startc", "value"), &Entity::gcd_startc);

17
entities/entity.h
View File

@ -474,12 +474,17 @@ public:
//// Global Cooldown //// //// Global Cooldown ////
bool gcd_hasc(); bool gcd_hasc() const;
bool gcd_hass(); bool gcd_hass() const;
float gcd_getc();
float gcd_gets(); float gcd_getc() const;
void gcd_starts(float value); void gcd_setc(const float value);
void gcd_startc(float value);
float gcd_gets() const;
void gcd_sets(const float value);
void gcd_starts(const float value);
void gcd_startc(const float value);
//// States //// //// States ////
int getc_state(); int getc_state();