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 TargetRelationType back.

Browse Source
This commit is contained in:
Relintai 2019-06-24 13:12:33 +02:00
parent f1194ab218
commit ec6503c5e9
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/spell.cpp
View File

@ -37,6 +37,13 @@ void Spell::set_target_type(SpellTargetType value) {
_target_type = value;
}
TargetRelationType Spell::get_target_relation_type() {
return _target_relation_type;
}
void Spell::set_target_relation_type(TargetRelationType value) {
_target_relation_type = value;
}
Ref<Aura> Spell::get_caster_aura_apply() {
return Ref<Aura>(_caster_aura_apply);
}
@ -724,6 +731,7 @@ Spell::Spell() {
PLAYER_HIT_RADIUS = (float)0.5;
_level = 1;
_rank = 0;
_spell_id = 1;
_spell_type = SpellEnums::SPELL_TYPE_NONE;
@ -878,6 +886,10 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_target_type", "value"), &Spell::set_target_type);
ADD_PROPERTY(PropertyInfo(Variant::INT, "target_type", PROPERTY_HINT_ENUM, "Self, Target, Around, Front, Around Target"), "set_target_type", "get_target_type");
ClassDB::bind_method(D_METHOD("get_target_relation_type"), &Spell::get_target_relation_type);
ClassDB::bind_method(D_METHOD("set_target_relation_type", "value"), &Spell::set_target_relation_type);
ADD_PROPERTY(PropertyInfo(Variant::INT, "target_relation_type", PROPERTY_HINT_FLAGS, "Self, Enemy, Friendly"), "set_target_relation_type", "get_target_relation_type");
ClassDB::bind_method(D_METHOD("get_level"), &Spell::get_level);
ClassDB::bind_method(D_METHOD("set_level", "value"), &Spell::set_level);
ADD_PROPERTY(PropertyInfo(Variant::INT, "level"), "set_level", "get_level");
@ -1083,7 +1095,6 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_spell_cast_finish_effect_point", "value"), &Spell::set_spell_cast_finish_effect_point);
ADD_PROPERTY(PropertyInfo(Variant::INT, "spell_cast_finish_effect_point", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_CHARCATER_SKELETON_POINTS), "set_spell_cast_finish_effect_point", "get_spell_cast_finish_effect_point");
ClassDB::bind_method(D_METHOD("get_spell_cast_finish_effect"), &Spell::get_spell_cast_finish_effect);
ClassDB::bind_method(D_METHOD("set_spell_cast_finish_effect", "value"), &Spell::set_spell_cast_finish_effect);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "effect_spell_cast_finish_effect", PROPERTY_HINT_RESOURCE_TYPE, "PackedScene"), "set_spell_cast_finish_effect", "get_spell_cast_finish_effect");
@ -1130,7 +1141,7 @@ void Spell::_bind_methods() {
BIND_ENUM_CONSTANT(TARGET_SELF);
BIND_ENUM_CONSTANT(TARGET_ENEMY);
BIND_ENUM_CONSTANT(TARGET_TARGET);
BIND_ENUM_CONSTANT(TARGET_FRIENDLY);
BIND_ENUM_CONSTANT(SPELL_TARGET_TYPE_SELF);
BIND_ENUM_CONSTANT(SPELL_TARGET_TYPE_TARGET);

10
data/spell.h
View File

@ -22,9 +22,9 @@ class SpellCastInfo;
class Spell;
enum TargetRelationType {
TARGET_SELF,
TARGET_ENEMY,
TARGET_TARGET
TARGET_SELF = 1 << 0,
TARGET_ENEMY = 1 << 1,
TARGET_FRIENDLY = 1 << 2
};
VARIANT_ENUM_CAST(TargetRelationType);
@ -94,6 +94,9 @@ public:
SpellTargetType get_target_type();
void set_target_type(SpellTargetType value);
TargetRelationType get_target_relation_type();
void set_target_relation_type(TargetRelationType value);
Ref<Aura> get_caster_aura_apply();
void set_caster_aura_apply(Ref<Aura> value);
@ -371,6 +374,7 @@ private:
bool _hide_from_actionbar;
float _cooldown;
SpellTargetType _target_type;
TargetRelationType _target_relation_type;
Ref<Aura> *_caster_aura_apply_ref;
Ref<Aura> *_caster_aura_apply2_ref;