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

Removed the CharacterSkeletonPoints enum.

Browse Source
This commit is contained in:
Relintai 2020-06-16 13:50:44 +02:00
parent 29e07fd649
commit 3bafbe596e
4 changed files with 18 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/spells/spell_effect_visual_simple.cpp
View File

@ -26,10 +26,10 @@ bool SpellEffectVisualSimple::has_spell_effect_visual() {
return _effect_visual.is_valid();
}
EntityEnums::CharacterSkeletonPoints SpellEffectVisualSimple::get_spell_effect_visual_point() {
EntityEnums::CommonCharacterSkeletonPoints SpellEffectVisualSimple::get_spell_effect_visual_point() {
return _effect_visual_point;
}
void SpellEffectVisualSimple::set_spell_effect_visual_point(EntityEnums::CharacterSkeletonPoints point) {
void SpellEffectVisualSimple::set_spell_effect_visual_point(EntityEnums::CommonCharacterSkeletonPoints point) {
_effect_visual_point = point;
}
@ -44,10 +44,10 @@ bool SpellEffectVisualSimple::has_spell_cast_finish_effect() {
return _spell_cast_finish_effect.is_valid();
}
EntityEnums::CharacterSkeletonPoints SpellEffectVisualSimple::get_spell_cast_finish_effect_point() {
EntityEnums::CommonCharacterSkeletonPoints SpellEffectVisualSimple::get_spell_cast_finish_effect_point() {
return _spell_cast_finish_effect_point;
}
void SpellEffectVisualSimple::set_spell_cast_finish_effect_point(EntityEnums::CharacterSkeletonPoints point) {
void SpellEffectVisualSimple::set_spell_cast_finish_effect_point(EntityEnums::CommonCharacterSkeletonPoints point) {
_spell_cast_finish_effect_point = point;
}
@ -74,10 +74,10 @@ bool SpellEffectVisualSimple::has_aura_effect_visual() {
return _effect_visual.is_valid();
}
EntityEnums::CharacterSkeletonPoints SpellEffectVisualSimple::get_aura_effect_visual_point() {
EntityEnums::CommonCharacterSkeletonPoints SpellEffectVisualSimple::get_aura_effect_visual_point() {
return _aura_effect_visual_point;
}
void SpellEffectVisualSimple::set_aura_effect_visual_point(EntityEnums::CharacterSkeletonPoints point) {
void SpellEffectVisualSimple::set_aura_effect_visual_point(EntityEnums::CommonCharacterSkeletonPoints point) {
_aura_effect_visual_point = point;
}
@ -101,7 +101,7 @@ void SpellEffectVisualSimple::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_spell_effect_visual_point"), &SpellEffectVisualSimple::get_spell_effect_visual_point);
ClassDB::bind_method(D_METHOD("set_spell_effect_visual_point", "value"), &SpellEffectVisualSimple::set_spell_effect_visual_point);
ADD_PROPERTY(PropertyInfo(Variant::INT, "spell_effect_visual_point", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_CHARCATER_SKELETON_POINTS), "set_spell_effect_visual_point", "get_spell_effect_visual_point");
ADD_PROPERTY(PropertyInfo(Variant::INT, "spell_effect_visual_point", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS), "set_spell_effect_visual_point", "get_spell_effect_visual_point");
ClassDB::bind_method(D_METHOD("get_spell_effect_visual"), &SpellEffectVisualSimple::get_spell_effect_visual);
ClassDB::bind_method(D_METHOD("set_spell_effect_visual", "value"), &SpellEffectVisualSimple::set_spell_effect_visual);
@ -111,7 +111,7 @@ void SpellEffectVisualSimple::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_spell_cast_finish_effect_point"), &SpellEffectVisualSimple::get_spell_cast_finish_effect_point);
ClassDB::bind_method(D_METHOD("set_spell_cast_finish_effect_point", "value"), &SpellEffectVisualSimple::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");
ADD_PROPERTY(PropertyInfo(Variant::INT, "spell_cast_finish_effect_point", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_COMMON_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"), &SpellEffectVisualSimple::get_spell_cast_finish_effect);
ClassDB::bind_method(D_METHOD("set_spell_cast_finish_effect", "value"), &SpellEffectVisualSimple::set_spell_cast_finish_effect);
@ -128,7 +128,7 @@ void SpellEffectVisualSimple::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_aura_effect_visual_point"), &SpellEffectVisualSimple::get_aura_effect_visual_point);
ClassDB::bind_method(D_METHOD("set_aura_effect_visual_point", "value"), &SpellEffectVisualSimple::set_aura_effect_visual_point);
ADD_PROPERTY(PropertyInfo(Variant::INT, "aura_effect_visual_point", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_CHARCATER_SKELETON_POINTS), "set_aura_effect_visual_point", "get_aura_effect_visual_point");
ADD_PROPERTY(PropertyInfo(Variant::INT, "aura_effect_visual_point", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS), "set_aura_effect_visual_point", "get_aura_effect_visual_point");
ClassDB::bind_method(D_METHOD("get_aura_effect_visual"), &SpellEffectVisualSimple::get_aura_effect_visual);
ClassDB::bind_method(D_METHOD("set_aura_effect_visual", "value"), &SpellEffectVisualSimple::set_aura_effect_visual);

18
data/spells/spell_effect_visual_simple.h
View File

@ -35,16 +35,16 @@ class SpellEffectVisualSimple : public SpellEffectVisual {
public:
bool has_spell_effect_visual();
EntityEnums::CharacterSkeletonPoints get_spell_effect_visual_point();
void set_spell_effect_visual_point(EntityEnums::CharacterSkeletonPoints point);
EntityEnums::CommonCharacterSkeletonPoints get_spell_effect_visual_point();
void set_spell_effect_visual_point(EntityEnums::CommonCharacterSkeletonPoints point);
Ref<PackedScene> get_spell_effect_visual();
void set_spell_effect_visual(Ref<PackedScene> value);
bool has_spell_cast_finish_effect();
EntityEnums::CharacterSkeletonPoints get_spell_cast_finish_effect_point();
void set_spell_cast_finish_effect_point(EntityEnums::CharacterSkeletonPoints point);
EntityEnums::CommonCharacterSkeletonPoints get_spell_cast_finish_effect_point();
void set_spell_cast_finish_effect_point(EntityEnums::CommonCharacterSkeletonPoints point);
Ref<PackedScene> get_spell_cast_finish_effect();
void set_spell_cast_finish_effect(Ref<PackedScene> value);
@ -56,8 +56,8 @@ public:
//VisualEffect
bool has_aura_effect_visual();
EntityEnums::CharacterSkeletonPoints get_aura_effect_visual_point();
void set_aura_effect_visual_point(EntityEnums::CharacterSkeletonPoints point);
EntityEnums::CommonCharacterSkeletonPoints get_aura_effect_visual_point();
void set_aura_effect_visual_point(EntityEnums::CommonCharacterSkeletonPoints point);
Ref<PackedScene> get_aura_effect_visual();
void set_aura_effect_visual(Ref<PackedScene> value);
@ -69,15 +69,15 @@ protected:
static void _bind_methods();
private:
EntityEnums::CharacterSkeletonPoints _effect_visual_point;
EntityEnums::CommonCharacterSkeletonPoints _effect_visual_point;
Ref<PackedScene> _effect_visual;
EntityEnums::CharacterSkeletonPoints _spell_cast_finish_effect_point;
EntityEnums::CommonCharacterSkeletonPoints _spell_cast_finish_effect_point;
Ref<PackedScene> _spell_cast_finish_effect;
Ref<PackedScene> _spell_cast_effect;
EntityEnums::CharacterSkeletonPoints _aura_effect_visual_point;
EntityEnums::CommonCharacterSkeletonPoints _aura_effect_visual_point;
Ref<PackedScene> _aura_effect_visual;
};

37
entity_enums.cpp
View File

@ -26,7 +26,6 @@ const String EntityEnums::BINDING_STRING_ENTITY_PLAYER_TYPES = "None,Player,Netw
const String EntityEnums::BINDING_STRING_ENTITY_CONTOLLER = "None,Player,AI";
const String EntityEnums::BINDING_STRING_ENTITY_FLAGS = "Untargetable,Hidden,Interactable,Hostile";
const String EntityEnums::BINDING_STRING_ENTITY_STATE_TYPES = "None,Stun,Root,Frozen,Silenced,Disoriented,Feared,Burning,Cold,Cursed,Pacified";
const String EntityEnums::BINDING_STRING_CHARCATER_SKELETON_POINTS = "Root,Pelvis,Spine,Spine 1,Spine 2,Neck,Head,Left Clavicle,Left upper Arm,Left Forearm,Left Hand,Left Thumb Base,Left Thumb End,Left Fingers Base,Left Fingers End,Right Clavicle,Right upper Arm,Right Forearm,Right Hand,Right Thumb Base,Right Thumb End,Right Fingers Base,Right Fingers End,Left Thigh,Left Calf,Left Foot,Right Thigh,Right Calf,Right Foot";
const String EntityEnums::BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS = "Root,Pelvis,Spine,Spine 1,Spine 2,Neck,Head,Torso,Right Hip,Left Hip,Back,Left Hand,Right Hand";
const String EntityEnums::BINDING_STRING_AI_STATES = "Off,Rest,Patrol,Follow Path,Regenerate,Attack,Pet Follow,Pet Stop,Pet Attack";
const String EntityEnums::BINDING_STRING_ENTITY_IMMUNITY_FLAGS = "Stun,Root,Freeze,Silence,Disorient,Fear,Burning,Cold,Pacify,Magic,Poison,Physical,Curse,Bleed,Melee,Holy,Shadow,Nature,Fire,Frost,Lightning,Chaos,Slow,Crit,AOE,Damage,Fall Damage,Projectile,Debuff,Attacks";
@ -94,42 +93,6 @@ void EntityEnums::_bind_methods() {
BIND_CONSTANT(COMMON_SKELETON_POINTS_MAX);
BIND_ENUM_CONSTANT(SKELETON_POINT_ROOT);
BIND_ENUM_CONSTANT(SKELETON_POINT_PELVIS);
BIND_ENUM_CONSTANT(SKELETON_POINT_SPINE);
BIND_ENUM_CONSTANT(SKELETON_POINT_SPINE_1);
BIND_ENUM_CONSTANT(SKELETON_POINT_SPINE_2);
BIND_ENUM_CONSTANT(SKELETON_POINT_NECK);
BIND_ENUM_CONSTANT(SKELETON_POINT_HEAD);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_CLAVICLE);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_UPPER_ARM);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_FOREARM);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_HAND);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_THUMB_BASE);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_THUMB_END);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_FINGERS_BASE);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_FINGERS_END);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_CLAVICLE);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_UPPER_ARM);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_FOREARM);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_HAND);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_THUMB_BASE);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_THUMB_END);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_FINGERS_BASE);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_FINGERS_END);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_THIGH);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_CALF);
BIND_ENUM_CONSTANT(SKELETON_POINT_LEFT_FOOT);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_THIGH);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_CALF);
BIND_ENUM_CONSTANT(SKELETON_POINT_RIGHT_FOOT);
BIND_CONSTANT(SKELETON_POINTS_MAX);
BIND_ENUM_CONSTANT(AI_STATE_OFF);
BIND_ENUM_CONSTANT(AI_STATE_REST);
BIND_ENUM_CONSTANT(AI_STATE_PATROL);

40
entity_enums.h
View File

@ -34,7 +34,6 @@ public:
static const String BINDING_STRING_ENTITY_CONTOLLER;
static const String BINDING_STRING_ENTITY_FLAGS;
static const String BINDING_STRING_ENTITY_STATE_TYPES;
static const String BINDING_STRING_CHARCATER_SKELETON_POINTS;
static const String BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS;
static const String BINDING_STRING_AI_STATES;
static const String BINDING_STRING_PET_STATES;
@ -182,44 +181,6 @@ public:
COMMON_SKELETON_POINTS_MAX,
};
enum CharacterSkeletonPoints {
SKELETON_POINT_ROOT = 0,
SKELETON_POINT_PELVIS = 1,
SKELETON_POINT_SPINE = 2,
SKELETON_POINT_SPINE_1 = 3,
SKELETON_POINT_SPINE_2 = 4,
SKELETON_POINT_NECK = 5,
SKELETON_POINT_HEAD = 6,
SKELETON_POINT_LEFT_CLAVICLE = 7,
SKELETON_POINT_LEFT_UPPER_ARM = 8,
SKELETON_POINT_LEFT_FOREARM = 9,
SKELETON_POINT_LEFT_HAND = 10,
SKELETON_POINT_LEFT_THUMB_BASE = 11,
SKELETON_POINT_LEFT_THUMB_END = 12,
SKELETON_POINT_LEFT_FINGERS_BASE = 13,
SKELETON_POINT_LEFT_FINGERS_END = 14,
SKELETON_POINT_RIGHT_CLAVICLE = 15,
SKELETON_POINT_RIGHT_UPPER_ARM = 16,
SKELETON_POINT_RIGHT_FOREARM = 17,
SKELETON_POINT_RIGHT_HAND = 18,
SKELETON_POINT_RIGHT_THUMB_BASE = 19,
SKELETON_POINT_RIGHT_THUMB_END = 20,
SKELETON_POINT_RIGHT_FINGERS_BASE = 21,
SKELETON_POINT_RIGHT_FINGERS_END = 22,
SKELETON_POINT_LEFT_THIGH = 23,
SKELETON_POINT_LEFT_CALF = 24,
SKELETON_POINT_LEFT_FOOT = 25,
SKELETON_POINT_RIGHT_THIGH = 26,
SKELETON_POINT_RIGHT_CALF = 27,
SKELETON_POINT_RIGHT_FOOT = 28,
SKELETON_POINTS_MAX = 29,
};
enum AIStates {
AI_STATE_OFF = 0,
AI_STATE_REST,
@ -285,7 +246,6 @@ VARIANT_ENUM_CAST(EntityEnums::EntityController);
VARIANT_ENUM_CAST(EntityEnums::EntityFlags);
VARIANT_ENUM_CAST(EntityEnums::EntityStateTypeFlags);
VARIANT_ENUM_CAST(EntityEnums::EntityStateTypeIndexes);
VARIANT_ENUM_CAST(EntityEnums::CharacterSkeletonPoints);
VARIANT_ENUM_CAST(EntityEnums::CommonCharacterSkeletonPoints);
VARIANT_ENUM_CAST(EntityEnums::AIStates);
VARIANT_ENUM_CAST(EntityEnums::EntityImmunityFlags);