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

Added a getter and setter for all EntityResources into Entity.

Browse Source
This commit is contained in:
Relintai 2020-06-15 11:59:33 +02:00
parent 503481924f
commit 827d67cca0
2 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
entities/entity.cpp
View File

@ -2553,6 +2553,13 @@ Ref<EntityResource> Entity::getc_speed() {
return _s_resources.get(EntityEnums::ENTITY_RESOURCE_INDEX_SPEED);
}
Vector<Variant> Entity::sresources_get() {
VARIANT_ARRAY_GET(_s_resources);
}
void Entity::sresources_set(const Vector<Variant> &resources) {
VARIANT_ARRAY_SET(resources, _s_resources, EntityResource);
}
void Entity::stake_damage(Ref<SpellDamageInfo> info) {
ERR_FAIL_COND(!info.is_valid());
@ -6213,31 +6220,6 @@ bool Entity::_set(const StringName &p_name, const Variant &p_value) {
/*
//// Resources ////
_s_resources.clear();
_c_resources.clear();
Dictionary rd = dict.get("resources", Dictionary());
for (int i = 0; i < rd.size(); ++i) {
Dictionary ird = rd.get(String::num(i), Dictionary());
StringName data_path = ird.get("data_path", "");
Ref<EntityResourceData> resd = ESS::get_singleton()->get_resource_db()->get_entity_resource_path(data_path);
ERR_CONTINUE(!resd.is_valid());
Ref<EntityResource> res = resd->get_entity_resource_instance();
ERR_CONTINUE(!res.is_valid());
res->from_dict(ird);
resource_adds(res);
}
//// States ////
Dictionary statesd = dict.get("states", Dictionary());
@ -6444,20 +6426,6 @@ bool Entity::_get(const StringName &p_name, Variant &r_ret) const {
/*
Dictionary dict;
//// Resources ////
Dictionary rd;
for (int i = 0; i < _s_resources.size(); ++i) {
Ref<EntityResource> r = _s_resources.get(i);
ERR_CONTINUE(!r.is_valid());
rd[String::num(i)] = r->to_dict();
}
dict["resources"] = rd;
//// States ////
Dictionary stated;
@ -7252,6 +7220,10 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("getc_health"), &Entity::getc_health);
ClassDB::bind_method(D_METHOD("getc_speed"), &Entity::getc_speed);
ClassDB::bind_method(D_METHOD("sresources_get"), &Entity::sresources_get);
ClassDB::bind_method(D_METHOD("sresources_set", "caster_aura_applys"), &Entity::sresources_set);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "sresources", PROPERTY_HINT_NONE, "17/17:EntityResource", PROPERTY_USAGE_DEFAULT, "EntityResource"), "sresources_set", "sresources_get");
//GCD
ADD_SIGNAL(MethodInfo("sgcd_started", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::REAL, "value")));
ADD_SIGNAL(MethodInfo("sgcd_finished", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));

3
entities/entity.h
View File

@ -472,6 +472,9 @@ public:
Ref<EntityResource> getc_health();
Ref<EntityResource> getc_speed();
Vector<Variant> sresources_get();
void sresources_set(const Vector<Variant> &resources);
//// Global Cooldown ////
bool gcd_hasc() const;