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

Fixed targeting.

Browse Source
This commit is contained in:
Relintai 2019-06-22 01:57:43 +02:00
parent 90e86557c5
commit 29b3ccb3b3
3 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/character.cpp
View File

@ -118,7 +118,7 @@ void CharacterClass::start_casting(int spell_id, Entity *caster, float spellScal
Ref<Spell> s = _spells[i]; Ref<Spell> s = _spells[i];
if (s == NULL) { if (s == NULL) {
print_error("class doesn1t have spell! spell_id: " + itos(spell_id)); print_error("class doesn't have spell! spell_id: " + itos(spell_id));
return; return;
} }

47
entities/entity.cpp
View File

@ -188,30 +188,6 @@ void Entity::sets_spell_target(Node *p_target) {
} }
_s_target = e; _s_target = e;
emit_signal("starget_changed", _s_target);
setc_target(p_target);
}
Entity *Entity::getc_spell_target() {
return _c_target;
}
void Entity::setc_spell_target(Node *p_target) {
if (!p_target) {
return;
}
Entity *e = cast_to<Entity>(p_target);
if (!e) {
return;
}
_c_target = e;
emit_signal("ctarget_changed", _c_target);
} }
Entity::Entity() { Entity::Entity() {
@ -730,7 +706,6 @@ void Entity::creceiveon_heal_dealt(Ref<SpellHealInfo> data) {
emit_signal("con_heal_dealt", this, data); emit_signal("con_heal_dealt", this, data);
} }
void Entity::creceive_died() { void Entity::creceive_died() {
/* /*
cIsDead = true; cIsDead = true;
@ -1533,8 +1508,8 @@ void Entity::sremove_auras_with_group(int aura_group) {
} }
} }
void Entity::crequest_tagret_change(NodePath path) { void Entity::crequest_target_change(NodePath path) {
SEND_RPC_TO_SERVER(rpc_id(1, "net_sets_target", path), setc_target(get_node_or_null(path))); SEND_RPC_TO_SERVER(rpc_id(1, "net_sets_target", path), sets_target(get_node_or_null(path)));
} }
void Entity::net_sets_target(NodePath path) { void Entity::net_sets_target(NodePath path) {
@ -1582,6 +1557,10 @@ void Entity::sets_target(Node *p_target) {
_s_target = e; _s_target = e;
emit_signal("starget_changed", _s_target); emit_signal("starget_changed", _s_target);
if (is_inside_tree() && !get_tree()->has_network_peer()) {
setc_target(p_target);
}
} }
Entity *Entity::getc_target() { Entity *Entity::getc_target() {
@ -1926,12 +1905,6 @@ void Entity::setc_spell_name(String value) {
_c_spell_name = value; _c_spell_name = value;
} }
Entity Entity::*gets_spell_target();
void sets_spell_target(Node *p_target);
Entity Entity::*getc_spell_target();
void setc_spell_target(Node *p_target);
int Entity::gets_target_guid() { int Entity::gets_target_guid() {
return _s_target_guid; return _s_target_guid;
} }
@ -2289,15 +2262,21 @@ void Entity::_bind_methods() {
//// Targeting System //// //// Targeting System ////
ClassDB::bind_method(D_METHOD("crequest_tagret_change", "path"), &Entity::crequest_tagret_change); ClassDB::bind_method(D_METHOD("gets_spell_target"), &Entity::gets_spell_target);
ClassDB::bind_method(D_METHOD("sets_spell_target", "target"), &Entity::sets_spell_target);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sspell_target", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), "sets_spell_target", "gets_spell_target");
ClassDB::bind_method(D_METHOD("crequest_target_change", "path"), &Entity::crequest_target_change);
ClassDB::bind_method(D_METHOD("net_sets_target", "path"), &Entity::net_sets_target); ClassDB::bind_method(D_METHOD("net_sets_target", "path"), &Entity::net_sets_target);
ClassDB::bind_method(D_METHOD("net_setc_target", "path"), &Entity::net_setc_target); ClassDB::bind_method(D_METHOD("net_setc_target", "path"), &Entity::net_setc_target);
ClassDB::bind_method(D_METHOD("gets_target"), &Entity::gets_target); ClassDB::bind_method(D_METHOD("gets_target"), &Entity::gets_target);
ClassDB::bind_method(D_METHOD("sets_target", "target"), &Entity::sets_target); ClassDB::bind_method(D_METHOD("sets_target", "target"), &Entity::sets_target);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "starget", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), "sets_target", "gets_target");
ClassDB::bind_method(D_METHOD("getc_target"), &Entity::getc_target); ClassDB::bind_method(D_METHOD("getc_target"), &Entity::getc_target);
ClassDB::bind_method(D_METHOD("setc_target", "target"), &Entity::setc_target); ClassDB::bind_method(D_METHOD("setc_target", "target"), &Entity::setc_target);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "ctarget", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), "setc_target", "getc_target");
//// Inventory System //// //// Inventory System ////

5
entities/entity.h
View File

@ -229,9 +229,6 @@ public:
Entity *gets_spell_target(); Entity *gets_spell_target();
void sets_spell_target(Node *p_target); void sets_spell_target(Node *p_target);
Entity *getc_spell_target();
void setc_spell_target(Node *p_target);
int gets_target_guid(); int gets_target_guid();
int gets_spell_cast_game_object_guid(); int gets_spell_cast_game_object_guid();
@ -439,7 +436,7 @@ public:
//// TargetComponent //// //// TargetComponent ////
void crequest_tagret_change(NodePath path); void crequest_target_change(NodePath path);
void net_sets_target(NodePath path); void net_sets_target(NodePath path);
void net_setc_target(NodePath path); void net_setc_target(NodePath path);