Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-05-11 22:42:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ran clang format on every file, I got used to it working by default in Visual Studio and I forgot about it.

Browse Source
This commit is contained in:
Relintai 2020-01-09 04:27:19 +01:00
parent 6b2c97df9a
commit 6f3744e2cb
111 changed files with 844 additions and 969 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atlases/character_atlas.cpp
View File

@ -1,8 +1,6 @@
#include "character_atlas.h" #include "character_atlas.h"
CharacterAtlas::CharacterAtlas() { CharacterAtlas::CharacterAtlas() {
} }
void CharacterAtlas::_bind_methods() { void CharacterAtlas::_bind_methods() {

3
atlases/character_atlas.h
View File

@ -12,8 +12,7 @@ public:
protected: protected:
static void _bind_methods(); static void _bind_methods();
//private: //private:
}; };
#endif #endif

2
atlases/character_atlas_entry.cpp
View File

@ -1,8 +1,6 @@
#include "character_atlas_entry.h" #include "character_atlas_entry.h"
CharacterAtlasEntry::CharacterAtlasEntry() { CharacterAtlasEntry::CharacterAtlasEntry() {
} }
void CharacterAtlasEntry::_bind_methods() { void CharacterAtlasEntry::_bind_methods() {

3
atlases/character_atlas_entry.h
View File

@ -12,8 +12,7 @@ public:
protected: protected:
static void _bind_methods(); static void _bind_methods();
//private: //private:
}; };
#endif #endif

3
autoloads/entity_data_manager.cpp
View File

@ -1,9 +1,9 @@
#include "entity_data_manager.h" #include "entity_data_manager.h"
#include "../entities/data/entity_data.h"
#include "../data/aura.h" #include "../data/aura.h"
#include "../data/craft_recipe.h" #include "../data/craft_recipe.h"
#include "../data/spell.h" #include "../data/spell.h"
#include "../entities/data/entity_data.h"
#include "../entities/resources/entity_resource_data.h" #include "../entities/resources/entity_resource_data.h"
#include "../entities/skills/entity_skill_data.h" #include "../entities/skills/entity_skill_data.h"
@ -496,7 +496,6 @@ void EntityDataManager::load_entity_skills() {
} }
} }
void EntityDataManager::load_spells() { void EntityDataManager::load_spells() {
_Directory dir; _Directory dir;

3
autoloads/entity_data_manager.h
View File

@ -2,11 +2,11 @@
#define ENTITY_DATA_MANAGER_H #define ENTITY_DATA_MANAGER_H
#include "core/array.h" #include "core/array.h"
#include "core/engine.h"
#include "core/hash_map.h" #include "core/hash_map.h"
#include "core/io/json.h" #include "core/io/json.h"
#include "core/variant.h" #include "core/variant.h"
#include "core/vector.h" #include "core/vector.h"
#include "core/engine.h"
#include "core/resource.h" #include "core/resource.h"
#include "core/ustring.h" #include "core/ustring.h"
@ -28,7 +28,6 @@ class ItemTemplate;
class EntityResourceData; class EntityResourceData;
class EntitySkillData; class EntitySkillData;
class EntityDataManager : public Node { class EntityDataManager : public Node {
GDCLASS(EntityDataManager, Node); GDCLASS(EntityDataManager, Node);

8
data/aura.cpp
View File

@ -72,7 +72,6 @@ void Aura::set_hide(bool value) {
_hide = value; _hide = value;
} }
Ref<SpellEffectVisual> Aura::get_visual_spell_effects() { Ref<SpellEffectVisual> Aura::get_visual_spell_effects() {
return _visual_spell_effects; return _visual_spell_effects;
} }
@ -358,7 +357,6 @@ Aura::~Aura() {
_talent_required_talent.unref(); _talent_required_talent.unref();
_talent_required_spell.unref(); _talent_required_spell.unref();
} }
////// Triggers /////// ////// Triggers ///////
@ -800,7 +798,7 @@ void Aura::con_death(Ref<AuraData> data) {
void Aura::con_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown) { void Aura::con_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown) {
if (has_method("_con_cooldown_added")) if (has_method("_con_cooldown_added"))
call("_con_cooldown_added", data,cooldown); call("_con_cooldown_added", data, cooldown);
} }
void Aura::con_cooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown) { void Aura::con_cooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown) {
if (has_method("_con_cooldown_removed")) if (has_method("_con_cooldown_removed"))
@ -860,7 +858,7 @@ void Aura::con_heal_dealt(Ref<AuraData> data, Ref<SpellHealInfo> info) {
call("_con_heal_dealt", data, info); call("_con_heal_dealt", data, info);
} }
void Aura::con_dealt_heal(Ref<AuraData> data, Ref<SpellHealInfo> info){ void Aura::con_dealt_heal(Ref<AuraData> data, Ref<SpellHealInfo> info) {
ERR_FAIL_COND(!data.is_valid()); ERR_FAIL_COND(!data.is_valid());
ERR_FAIL_COND(!info.is_valid()); ERR_FAIL_COND(!info.is_valid());
@ -1069,7 +1067,6 @@ void Aura::_sapply(Ref<AuraApplyInfo> info) {
void Aura::_sdeapply(Ref<AuraData> info) { void Aura::_sdeapply(Ref<AuraData> info) {
ERR_FAIL_COND(info->get_owner() == NULL || info->get_caster() == NULL || !info->get_aura().is_valid()); ERR_FAIL_COND(info->get_owner() == NULL || info->get_caster() == NULL || !info->get_aura().is_valid());
} }
void Aura::_sadd(Ref<AuraData> aura) { void Aura::_sadd(Ref<AuraData> aura) {
@ -1568,7 +1565,6 @@ void Aura::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_talent_required_spell", "next_rank"), &Aura::set_talent_required_spell); ClassDB::bind_method(D_METHOD("set_talent_required_spell", "next_rank"), &Aura::set_talent_required_spell);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "talent_required_spell", PROPERTY_HINT_RESOURCE_TYPE, "Spell"), "set_talent_required_spell", "get_talent_required_spell"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "talent_required_spell", PROPERTY_HINT_RESOURCE_TYPE, "Spell"), "set_talent_required_spell", "get_talent_required_spell");
//// Triggers //// //// Triggers ////
ADD_GROUP("Triggers", "trigger"); ADD_GROUP("Triggers", "trigger");
ClassDB::bind_method(D_METHOD("get_trigger_count"), &Aura::get_trigger_count); ClassDB::bind_method(D_METHOD("get_trigger_count"), &Aura::get_trigger_count);

4
data/aura.h
View File

@ -18,12 +18,12 @@
#include "aura_trigger_data.h" #include "aura_trigger_data.h"
#include "../entities/auras/aura_data.h" #include "../entities/auras/aura_data.h"
#include "../infos/spell_cast_info.h"
#include "../pipelines/spell_damage_info.h" #include "../pipelines/spell_damage_info.h"
#include "../pipelines/spell_heal_info.h" #include "../pipelines/spell_heal_info.h"
#include "../infos/spell_cast_info.h"
#include "../utility/cooldown.h"
#include "../utility/category_cooldown.h" #include "../utility/category_cooldown.h"
#include "../utility/cooldown.h"
#include "spell_effect_visual.h" #include "spell_effect_visual.h"

1
data/aura_stat_attribute.cpp
View File

@ -1,2 +1 @@
#include "aura_stat_attribute.h" #include "aura_stat_attribute.h"

4
data/aura_stat_attribute.h
View File

@ -1,8 +1,8 @@
#ifndef AURA_STAT_ATTRIBUTE_H #ifndef AURA_STAT_ATTRIBUTE_H
#define AURA_STAT_ATTRIBUTE_H #define AURA_STAT_ATTRIBUTE_H
#include "core/reference.h"
#include "../entities/stats/stat.h" #include "../entities/stats/stat.h"
#include "core/reference.h"
class AuraStatAttribute : public Reference { class AuraStatAttribute : public Reference {
GDCLASS(AuraStatAttribute, Reference); GDCLASS(AuraStatAttribute, Reference);
@ -53,4 +53,4 @@ private:
float _percent_mod; float _percent_mod;
}; };
#endif #endif

1
data/aura_trigger_data.h
View File

@ -43,5 +43,4 @@ private:
Ref<Spell> _spell; Ref<Spell> _spell;
}; };
#endif #endif

2
data/craft_recipe.cpp
View File

@ -41,7 +41,6 @@ void CraftRecipe::set_required_tools_count(int value) {
_required_tools_count = value; _required_tools_count = value;
} }
void CraftRecipe::set_required_material(int index, const Ref<CraftRecipeHelper> value) { void CraftRecipe::set_required_material(int index, const Ref<CraftRecipeHelper> value) {
_required_materials[index] = value; _required_materials[index] = value;
} }
@ -50,7 +49,6 @@ Ref<CraftRecipeHelper> CraftRecipe::get_required_material(int index) {
return _required_materials[index]; return _required_materials[index];
} }
int CraftRecipe::get_required_materials_count() { int CraftRecipe::get_required_materials_count() {
return _required_materials_count; return _required_materials_count;
} }

2
data/craft_recipe.h
View File

@ -1,9 +1,9 @@
#ifndef CRAFT_RECIPE_H #ifndef CRAFT_RECIPE_H
#define CRAFT_RECIPE_H #define CRAFT_RECIPE_H
#include "core/vector.h"
#include "core/resource.h" #include "core/resource.h"
#include "core/ustring.h" #include "core/ustring.h"
#include "core/vector.h"
#include "item_template.h" #include "item_template.h"

2
data/equipment_data_entry.cpp
View File

@ -1,7 +1,5 @@
#include "equipment_data_entry.h" #include "equipment_data_entry.h"
Ref<ItemInstance> EquipmentDataEntry::get_item() { Ref<ItemInstance> EquipmentDataEntry::get_item() {
if (has_method("_get_item")) { if (has_method("_get_item")) {
return call("_get_item"); return call("_get_item");

2
data/equipment_data_entry.h
View File

@ -19,7 +19,7 @@ public:
protected: protected:
static void _bind_methods(); static void _bind_methods();
//private: //private:
}; };
#endif #endif

3
data/item_instance.cpp
View File

@ -2,7 +2,6 @@
#include "item_template.h" #include "item_template.h"
Ref<ItemTemplate> ItemInstance::get_item_template() const { Ref<ItemTemplate> ItemInstance::get_item_template() const {
return _item_template; return _item_template;
} }
@ -13,7 +12,6 @@ void ItemInstance::set_item_template(const Ref<ItemTemplate> value) {
if (value.is_valid()) if (value.is_valid())
_item_template_id = value->get_id(); _item_template_id = value->get_id();
} }
Ref<ItemStatModifier> ItemInstance::get_item_stat_modifier(int index) { Ref<ItemStatModifier> ItemInstance::get_item_stat_modifier(int index) {
@ -100,7 +98,6 @@ ItemInstance::~ItemInstance() {
_modifiers.clear(); _modifiers.clear();
} }
void ItemInstance::_bind_methods() { void ItemInstance::_bind_methods() {
ADD_SIGNAL(MethodInfo("stack_size_changed", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); ADD_SIGNAL(MethodInfo("stack_size_changed", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance")));

2
data/item_instance.h
View File

@ -4,9 +4,9 @@
#include "core/reference.h" #include "core/reference.h"
#include "core/vector.h" #include "core/vector.h"
#include "item_stat_modifier.h"
#include "../entities/stats/stat.h" #include "../entities/stats/stat.h"
#include "../item_enums.h" #include "../item_enums.h"
#include "item_stat_modifier.h"
#include "../autoloads/entity_data_manager.h" #include "../autoloads/entity_data_manager.h"

3
data/item_stat_modifier.cpp
View File

@ -8,7 +8,6 @@ void ItemStatModifier::set_stat_id(Stat::StatId value) {
_stat_id = value; _stat_id = value;
} }
float ItemStatModifier::get_base_mod() { float ItemStatModifier::get_base_mod() {
return _base_mod; return _base_mod;
} }
@ -25,7 +24,6 @@ void ItemStatModifier::set_bonus_mod(float value) {
_bonus_mod = value; _bonus_mod = value;
} }
float ItemStatModifier::get_percent_mod() { float ItemStatModifier::get_percent_mod() {
return _percent_mod; return _percent_mod;
} }
@ -55,7 +53,6 @@ Dictionary ItemStatModifier::_to_dict() {
void ItemStatModifier::_from_dict(const Dictionary &dict) { void ItemStatModifier::_from_dict(const Dictionary &dict) {
ERR_FAIL_COND(dict.empty()); ERR_FAIL_COND(dict.empty());
_stat_id = static_cast<Stat::StatId>(static_cast<int>(dict.get("stat_id", 0))); _stat_id = static_cast<Stat::StatId>(static_cast<int>(dict.get("stat_id", 0)));
_base_mod = dict.get("base_mod", 0); _base_mod = dict.get("base_mod", 0);
_bonus_mod = dict.get("bonus_mod", 0); _bonus_mod = dict.get("bonus_mod", 0);

2
data/item_stat_modifier.h
View File

@ -1,8 +1,8 @@
#ifndef ITEM_STAT_MODIFIER_H #ifndef ITEM_STAT_MODIFIER_H
#define ITEM_STAT_MODIFIER_H #define ITEM_STAT_MODIFIER_H
#include "core/reference.h"
#include "../entities/stats/stat.h" #include "../entities/stats/stat.h"
#include "core/reference.h"
class ItemStatModifier : public Reference { class ItemStatModifier : public Reference {
GDCLASS(ItemStatModifier, Reference); GDCLASS(ItemStatModifier, Reference);

7
data/item_template.h
View File

@ -2,13 +2,13 @@
#define ITEM_TEMPLATE_H #define ITEM_TEMPLATE_H
#include "core/resource.h" #include "core/resource.h"
#include "scene/resources/texture.h"
#include "core/vector.h" #include "core/vector.h"
#include "scene/resources/texture.h"
#include "item_visual.h"
#include "item_template_stat_modifier.h"
#include "../entities/stats/stat.h" #include "../entities/stats/stat.h"
#include "../item_enums.h" #include "../item_enums.h"
#include "item_template_stat_modifier.h"
#include "item_visual.h"
class ItemInstance; class ItemInstance;
class Aura; class Aura;
@ -19,7 +19,6 @@ class ItemTemplate : public Resource {
GDCLASS(ItemTemplate, Resource); GDCLASS(ItemTemplate, Resource);
public: public:
int get_id() const; int get_id() const;
void set_id(const int value); void set_id(const int value);

1
data/item_template_stat_modifier.cpp
View File

@ -106,4 +106,3 @@ void ItemTemplateStatModifier::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_scaling_factor", "value"), &ItemTemplateStatModifier::set_scaling_factor); ClassDB::bind_method(D_METHOD("set_scaling_factor", "value"), &ItemTemplateStatModifier::set_scaling_factor);
ADD_PROPERTY(PropertyInfo(Variant::REAL, "scaling_factor"), "set_scaling_factor", "get_scaling_factor"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "scaling_factor"), "set_scaling_factor", "get_scaling_factor");
} }

2
data/item_template_stat_modifier.h
View File

@ -1,8 +1,8 @@
#ifndef ITEM_TEMPLATE_STAT_MODIFIER_H #ifndef ITEM_TEMPLATE_STAT_MODIFIER_H
#define ITEM_TEMPLATE_STAT_MODIFIER_H #define ITEM_TEMPLATE_STAT_MODIFIER_H
#include "core/reference.h"
#include "../entities/stats/stat.h" #include "../entities/stats/stat.h"
#include "core/reference.h"
class ItemTemplateStatModifier : public Reference { class ItemTemplateStatModifier : public Reference {
GDCLASS(ItemTemplateStatModifier, Reference); GDCLASS(ItemTemplateStatModifier, Reference);

1
data/item_visual.cpp
View File

@ -70,5 +70,4 @@ void ItemVisual::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "visual_right_thigh", PROPERTY_HINT_RESOURCE_TYPE, "ItemVisualEntry"), "set_visual", "get_visual", EntityEnums::SKELETON_POINT_RIGHT_THIGH); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "visual_right_thigh", PROPERTY_HINT_RESOURCE_TYPE, "ItemVisualEntry"), "set_visual", "get_visual", EntityEnums::SKELETON_POINT_RIGHT_THIGH);
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "visual_right_calf", PROPERTY_HINT_RESOURCE_TYPE, "ItemVisualEntry"), "set_visual", "get_visual", EntityEnums::SKELETON_POINT_RIGHT_CALF); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "visual_right_calf", PROPERTY_HINT_RESOURCE_TYPE, "ItemVisualEntry"), "set_visual", "get_visual", EntityEnums::SKELETON_POINT_RIGHT_CALF);
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "visual_right_foot", PROPERTY_HINT_RESOURCE_TYPE, "ItemVisualEntry"), "set_visual", "get_visual", EntityEnums::SKELETON_POINT_RIGHT_FOOT); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "visual_right_foot", PROPERTY_HINT_RESOURCE_TYPE, "ItemVisualEntry"), "set_visual", "get_visual", EntityEnums::SKELETON_POINT_RIGHT_FOOT);
} }

9
data/item_visual_entry.cpp
View File

@ -52,9 +52,9 @@ ItemVisualEntry::ItemVisualEntry() {
ItemVisualEntry::~ItemVisualEntry() { ItemVisualEntry::~ItemVisualEntry() {
for (int i = 0; i < EntityEnums::GENDER_COUNT; ++i) { for (int i = 0; i < EntityEnums::GENDER_COUNT; ++i) {
#ifdef MESH_DATA_RESOURCE_PRESENT #ifdef MESH_DATA_RESOURCE_PRESENT
_mesh[i].unref(); _mesh[i].unref();
#endif #endif
_texture[i].unref(); _texture[i].unref();
} }
@ -67,12 +67,12 @@ void ItemVisualEntry::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_override_layer", "value"), &ItemVisualEntry::set_override_layer); ClassDB::bind_method(D_METHOD("set_override_layer", "value"), &ItemVisualEntry::set_override_layer);
ADD_PROPERTY(PropertyInfo(Variant::INT, "override_layer", PROPERTY_HINT_ENUM, ItemEnums::BINDING_STRING_ENTITY_TEXTURE_LAYERS), "set_override_layer", "get_override_layer"); ADD_PROPERTY(PropertyInfo(Variant::INT, "override_layer", PROPERTY_HINT_ENUM, ItemEnums::BINDING_STRING_ENTITY_TEXTURE_LAYERS), "set_override_layer", "get_override_layer");
#ifdef MESH_DATA_RESOURCE_PRESENT #ifdef MESH_DATA_RESOURCE_PRESENT
ClassDB::bind_method(D_METHOD("get_mesh", "index"), &ItemVisualEntry::get_mesh); ClassDB::bind_method(D_METHOD("get_mesh", "index"), &ItemVisualEntry::get_mesh);
ClassDB::bind_method(D_METHOD("set_mesh", "index", "value"), &ItemVisualEntry::set_mesh); ClassDB::bind_method(D_METHOD("set_mesh", "index", "value"), &ItemVisualEntry::set_mesh);
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "mesh_male", PROPERTY_HINT_RESOURCE_TYPE, "MeshDataResource"), "set_mesh", "get_mesh", EntityEnums::GENDER_MALE); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "mesh_male", PROPERTY_HINT_RESOURCE_TYPE, "MeshDataResource"), "set_mesh", "get_mesh", EntityEnums::GENDER_MALE);
ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "mesh_female", PROPERTY_HINT_RESOURCE_TYPE, "MeshDataResource"), "set_mesh", "get_mesh", EntityEnums::GENDER_FEMALE); ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "mesh_female", PROPERTY_HINT_RESOURCE_TYPE, "MeshDataResource"), "set_mesh", "get_mesh", EntityEnums::GENDER_FEMALE);
#endif #endif
ClassDB::bind_method(D_METHOD("get_texture", "index"), &ItemVisualEntry::get_texture); ClassDB::bind_method(D_METHOD("get_texture", "index"), &ItemVisualEntry::get_texture);
ClassDB::bind_method(D_METHOD("set_texture", "index", "value"), &ItemVisualEntry::set_texture); ClassDB::bind_method(D_METHOD("set_texture", "index", "value"), &ItemVisualEntry::set_texture);
@ -92,4 +92,3 @@ void ItemVisualEntry::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::VECTOR3, "effect_offset_male"), "set_effect_offset", "get_effect_offset", EntityEnums::GENDER_MALE); ADD_PROPERTYI(PropertyInfo(Variant::VECTOR3, "effect_offset_male"), "set_effect_offset", "get_effect_offset", EntityEnums::GENDER_MALE);
ADD_PROPERTYI(PropertyInfo(Variant::VECTOR3, "effect_offset_female"), "set_effect_offset", "get_effect_offset", EntityEnums::GENDER_FEMALE); ADD_PROPERTYI(PropertyInfo(Variant::VECTOR3, "effect_offset_female"), "set_effect_offset", "get_effect_offset", EntityEnums::GENDER_FEMALE);
} }

12
data/item_visual_entry.h
View File

@ -1,16 +1,16 @@
#ifndef ITEM_VISUAL_ENTRY_H #ifndef ITEM_VISUAL_ENTRY_H
#define ITEM_VISUAL_ENTRY_H #define ITEM_VISUAL_ENTRY_H
#include "core/color.h"
#include "core/resource.h" #include "core/resource.h"
#include "core/ustring.h" #include "core/ustring.h"
#include "core/color.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "../entity_enums.h" #include "../entity_enums.h"
#include "../item_enums.h" #include "../item_enums.h"
#include "scene/resources/packed_scene.h"
#include "scene/resources/mesh.h" #include "scene/resources/mesh.h"
#include "scene/resources/packed_scene.h"
#ifdef MESH_DATA_RESOURCE_PRESENT #ifdef MESH_DATA_RESOURCE_PRESENT
#include "../../mesh_data_resource/mesh_data_resource.h" #include "../../mesh_data_resource/mesh_data_resource.h"
@ -23,10 +23,10 @@ public:
ItemEnums::EntityTextureLayers get_override_layer(); ItemEnums::EntityTextureLayers get_override_layer();
void set_override_layer(ItemEnums::EntityTextureLayers layer); void set_override_layer(ItemEnums::EntityTextureLayers layer);
#ifdef MESH_DATA_RESOURCE_PRESENT #ifdef MESH_DATA_RESOURCE_PRESENT
Ref<MeshDataResource> get_mesh(int index); Ref<MeshDataResource> get_mesh(int index);
void set_mesh(int index, Ref<MeshDataResource> mesh); void set_mesh(int index, Ref<MeshDataResource> mesh);
#endif #endif
Ref<Texture> get_texture(int index); Ref<Texture> get_texture(int index);
void set_texture(int index, Ref<Texture> texture); void set_texture(int index, Ref<Texture> texture);
@ -49,9 +49,9 @@ protected:
private: private:
ItemEnums::EntityTextureLayers _override_layer; ItemEnums::EntityTextureLayers _override_layer;
#ifdef MESH_DATA_RESOURCE_PRESENT #ifdef MESH_DATA_RESOURCE_PRESENT
Ref<MeshDataResource> _mesh[EntityEnums::GENDER_COUNT]; Ref<MeshDataResource> _mesh[EntityEnums::GENDER_COUNT];
#endif #endif
Ref<Texture> _texture[EntityEnums::GENDER_COUNT]; Ref<Texture> _texture[EntityEnums::GENDER_COUNT];
Color _color; Color _color;

13
data/spell.cpp
View File

@ -1,9 +1,9 @@
#include "spell.h" #include "spell.h"
#include "aura.h"
#include "craft_recipe.h"
#include "../entities/resources/entity_resource_cost_data.h" #include "../entities/resources/entity_resource_cost_data.h"
#include "../entities/skills/entity_skill_data.h" #include "../entities/skills/entity_skill_data.h"
#include "aura.h"
#include "craft_recipe.h"
int Spell::get_id() { int Spell::get_id() {
return _id; return _id;
@ -145,7 +145,6 @@ void Spell::set_projectile(Ref<WorldSpellData> value) {
_projectile = value; _projectile = value;
} }
Ref<CraftRecipe> Spell::get_teaches_craft_recipe() { Ref<CraftRecipe> Spell::get_teaches_craft_recipe() {
return _teaches_craft_recipe; return _teaches_craft_recipe;
} }
@ -492,7 +491,6 @@ int Spell::get_training_required_skill_level() {
} }
void Spell::set_training_required_skill_level(int value) { void Spell::set_training_required_skill_level(int value) {
_training_required_skill_level = value; _training_required_skill_level = value;
} }
//// Spell System //// //// Spell System ////
@ -694,8 +692,6 @@ void Spell::_sstart_casting(Ref<SpellCastInfo> info) {
info->get_target()->son_cast_finished_target(info); info->get_target()->son_cast_finished_target(info);
if (get_projectile().is_valid()) { if (get_projectile().is_valid()) {
//fire_projectile(info); //fire_projectile(info);
} else { } else {
@ -758,13 +754,11 @@ pass
# sp.launch(info, projectile, projectile_speed) # sp.launch(info, projectile, projectile_speed)
*/ */
} }
void Spell::_handle_effect(Ref<SpellCastInfo> info) { void Spell::_handle_effect(Ref<SpellCastInfo> info) {
/*
/*
if target_type == SPELL_TARGET_TYPE_TARGET: if target_type == SPELL_TARGET_TYPE_TARGET:
if info.target == null: if info.target == null:
@ -1235,7 +1229,6 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_training_required_skill_level", "value"), &Spell::set_training_required_skill_level); ClassDB::bind_method(D_METHOD("set_training_required_skill_level", "value"), &Spell::set_training_required_skill_level);
ADD_PROPERTY(PropertyInfo(Variant::INT, "training_required_skill_level"), "set_training_required_skill_level", "get_training_required_skill_level"); ADD_PROPERTY(PropertyInfo(Variant::INT, "training_required_skill_level"), "set_training_required_skill_level", "get_training_required_skill_level");
BIND_ENUM_CONSTANT(TARGET_SELF); BIND_ENUM_CONSTANT(TARGET_SELF);
BIND_ENUM_CONSTANT(TARGET_ENEMY); BIND_ENUM_CONSTANT(TARGET_ENEMY);
BIND_ENUM_CONSTANT(TARGET_FRIENDLY); BIND_ENUM_CONSTANT(TARGET_FRIENDLY);

2
data/spell.h
View File

@ -12,8 +12,8 @@
#include "../entities/entity.h" #include "../entities/entity.h"
#include "../entities/stats/stat.h" #include "../entities/stats/stat.h"
#include "../pipelines/spell_damage_info.h"
#include "../infos/aura_infos.h" #include "../infos/aura_infos.h"
#include "../pipelines/spell_damage_info.h"
#include "spell_effect_visual.h" #include "spell_effect_visual.h"

3
data/spell_effect_visual_simple.cpp
View File

@ -1,6 +1,5 @@
#include "spell_effect_visual_simple.h" #include "spell_effect_visual_simple.h"
bool SpellEffectVisualSimple::has_spell_effect_visual() { bool SpellEffectVisualSimple::has_spell_effect_visual() {
return _effect_visual.is_valid(); return _effect_visual.is_valid();
} }
@ -47,7 +46,6 @@ void SpellEffectVisualSimple::set_spell_cast_effect(Ref<PackedScene> value) {
_spell_cast_effect = value; _spell_cast_effect = value;
} }
//Visual Effect //Visual Effect
bool SpellEffectVisualSimple::has_aura_effect_visual() { bool SpellEffectVisualSimple::has_aura_effect_visual() {
@ -68,7 +66,6 @@ void SpellEffectVisualSimple::set_aura_effect_visual(Ref<PackedScene> value) {
_aura_effect_visual = value; _aura_effect_visual = value;
} }
SpellEffectVisualSimple::SpellEffectVisualSimple() { SpellEffectVisualSimple::SpellEffectVisualSimple() {
} }

1
entities/ai/entity_ai.cpp
View File

@ -88,7 +88,6 @@ void EntityAI::pet_update(float delta) {
call("_pet_update", delta); call("_pet_update", delta);
} }
void EntityAI::move(float delta) { void EntityAI::move(float delta) {
ERR_FAIL_COND(!ObjectDB::instance_validate(_owner)); ERR_FAIL_COND(!ObjectDB::instance_validate(_owner));

2
entities/auras/aura_data.h
View File

@ -1,9 +1,9 @@
#ifndef AURA_DATA_H #ifndef AURA_DATA_H
#define AURA_DATA_H #define AURA_DATA_H
#include "core/reference.h"
#include "core/array.h" #include "core/array.h"
#include "core/dictionary.h" #include "core/dictionary.h"
#include "core/reference.h"
#include "../../spell_enums.h" #include "../../spell_enums.h"

1
entities/data/character_spec.cpp
View File

@ -53,7 +53,6 @@ Ref<Aura> CharacterSpec::get_talent(const int row_index, const int culomn, const
return Ref<Aura>(NULL); return Ref<Aura>(NULL);
} }
CharacterSpec::CharacterSpec() { CharacterSpec::CharacterSpec() {
_id = 0; _id = 0;
} }

6
entities/data/entity_class_data.cpp
View File

@ -1,10 +1,10 @@
#include "entity_class_data.h" #include "entity_class_data.h"
#include "../ai/entity_ai.h"
#include "../../data/aura.h" #include "../../data/aura.h"
#include "../../data/spell.h"
#include "../../data/item_instance.h" #include "../../data/item_instance.h"
#include "../../data/spell.h"
#include "../../infos/spell_cast_info.h" #include "../../infos/spell_cast_info.h"
#include "../ai/entity_ai.h"
#include "../entity.h" #include "../entity.h"
#include "character_spec.h" #include "character_spec.h"
@ -116,7 +116,6 @@ void EntityClassData::set_entity_resources(const Vector<Variant> &entity_resourc
} }
} }
//// SPECS //// //// SPECS ////
int EntityClassData::get_num_specs() { int EntityClassData::get_num_specs() {
@ -161,7 +160,6 @@ void EntityClassData::set_specs(const Vector<Variant> &specs) {
} }
} }
//// SPELLS //// //// SPELLS ////
int EntityClassData::get_num_spells() { int EntityClassData::get_num_spells() {

10
entities/data/entity_class_data.h
View File

@ -1,10 +1,10 @@
#ifndef ENTITY_CLASS_DATA_H #ifndef ENTITY_CLASS_DATA_H
#define ENTITY_CLASS_DATA_H #define ENTITY_CLASS_DATA_H
#include "core/resource.h"
#include "core/vector.h"
#include "core/ustring.h"
#include "core/math/math_funcs.h" #include "core/math/math_funcs.h"
#include "core/resource.h"
#include "core/ustring.h"
#include "core/vector.h"
#include "scene/resources/texture.h" #include "scene/resources/texture.h"
#include "../../entities/stats/stat_data.h" #include "../../entities/stats/stat_data.h"
@ -14,9 +14,9 @@
#include "../../pipelines/spell_damage_info.h" #include "../../pipelines/spell_damage_info.h"
#include "../../pipelines/spell_heal_info.h" #include "../../pipelines/spell_heal_info.h"
#include "../../utility/cooldown.h"
#include "../../utility/category_cooldown.h"
#include "../../item_enums.h" #include "../../item_enums.h"
#include "../../utility/category_cooldown.h"
#include "../../utility/cooldown.h"
#include "../resources/entity_resource_data.h" #include "../resources/entity_resource_data.h"

2
entities/data/entity_data.h
View File

@ -25,8 +25,8 @@
#include "../../skeleton/entity_species_data.h" #include "../../skeleton/entity_species_data.h"
#include "../ai/entity_ai.h"
#include "../../formations/ai_formation.h" #include "../../formations/ai_formation.h"
#include "../ai/entity_ai.h"
class Aura; class Aura;
class Spell; class Spell;

1
entities/data/entity_data_container.cpp
View File

@ -16,7 +16,6 @@ Dictionary EntityDataContainer::_to_dict() {
} }
void EntityDataContainer::_from_dict(const Dictionary &dict) { void EntityDataContainer::_from_dict(const Dictionary &dict) {
ERR_FAIL_COND(dict.empty()); ERR_FAIL_COND(dict.empty());
} }
EntityDataContainer::EntityDataContainer() { EntityDataContainer::EntityDataContainer() {

2
entities/data/entity_data_container.h
View File

@ -1,8 +1,8 @@
#ifndef ENTITY_DATA_CONTAINER_H #ifndef ENTITY_DATA_CONTAINER_H
#define ENTITY_DATA_CONTAINER_H #define ENTITY_DATA_CONTAINER_H
#include "core/reference.h"
#include "core/dictionary.h" #include "core/dictionary.h"
#include "core/reference.h"
class EntityDataContainer : public Reference { class EntityDataContainer : public Reference {
GDCLASS(EntityDataContainer, Reference); GDCLASS(EntityDataContainer, Reference);

1
entities/data/item_container_data_entry.cpp
View File

@ -20,7 +20,6 @@ ItemContainerDataEntry::ItemContainerDataEntry() {
_item_count = 0; _item_count = 0;
} }
ItemContainerDataEntry::~ItemContainerDataEntry() { ItemContainerDataEntry::~ItemContainerDataEntry() {
} }
void ItemContainerDataEntry::_bind_methods() { void ItemContainerDataEntry::_bind_methods() {

1
entities/data/vendor_item_data.cpp
View File

@ -34,7 +34,6 @@ void VendorItemData::set_vendor_datas(const Vector<Variant> &vendor_datas) {
} }
} }
VendorItemData::VendorItemData() { VendorItemData::VendorItemData() {
} }
VendorItemData::~VendorItemData() { VendorItemData::~VendorItemData() {

1
entities/entity.cpp
View File

@ -506,7 +506,6 @@ void Entity::sets_ai(Ref<EntityAI> value) {
_s_ai->set_owner(this); _s_ai->set_owner(this);
} }
//// Pets //// //// Pets ////
void Entity::adds_pet(Entity *entity) { void Entity::adds_pet(Entity *entity) {

1
entities/resources/entity_resource_data.cpp
View File

@ -42,5 +42,4 @@ void EntityResourceData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_text_description"), &EntityResourceData::get_text_description); ClassDB::bind_method(D_METHOD("get_text_description"), &EntityResourceData::get_text_description);
ClassDB::bind_method(D_METHOD("set_text_description", "value"), &EntityResourceData::set_text_description); ClassDB::bind_method(D_METHOD("set_text_description", "value"), &EntityResourceData::set_text_description);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_description", PROPERTY_HINT_MULTILINE_TEXT), "set_text_description", "get_text_description"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_description", PROPERTY_HINT_MULTILINE_TEXT), "set_text_description", "get_text_description");
} }

1
entities/skills/entity_skill.cpp
View File

@ -13,7 +13,6 @@ void EntitySkill::set_skill(Ref<EntitySkillData> value) {
else else
_skill_id = 0; _skill_id = 0;
emit_signal("skill_changed", Ref<EntitySkill>(this)); emit_signal("skill_changed", Ref<EntitySkill>(this));
} }

1
entities/skills/entity_skill_data.cpp
View File

@ -55,5 +55,4 @@ void EntitySkillData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_text_description"), &EntitySkillData::get_text_description); ClassDB::bind_method(D_METHOD("get_text_description"), &EntitySkillData::get_text_description);
ClassDB::bind_method(D_METHOD("set_text_description", "value"), &EntitySkillData::set_text_description); ClassDB::bind_method(D_METHOD("set_text_description", "value"), &EntitySkillData::set_text_description);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_description", PROPERTY_HINT_MULTILINE_TEXT), "set_text_description", "get_text_description"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_description", PROPERTY_HINT_MULTILINE_TEXT), "set_text_description", "get_text_description");
} }

1
entities/stats/complex_level_stat_data.cpp
View File

@ -79,7 +79,6 @@ void ComplexLevelStatData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_spirit_for_level", "level"), &ComplexLevelStatData::get_spirit_for_level); ClassDB::bind_method(D_METHOD("get_spirit_for_level", "level"), &ComplexLevelStatData::get_spirit_for_level);
ClassDB::bind_method(D_METHOD("set_spirit_for_level", "level", "value"), &ComplexLevelStatData::set_spirit_for_level); ClassDB::bind_method(D_METHOD("set_spirit_for_level", "level", "value"), &ComplexLevelStatData::set_spirit_for_level);
for (int i = 0; i < EntityEnums::MAX_LEVEL; ++i) { for (int i = 0; i < EntityEnums::MAX_LEVEL; ++i) {
ADD_GROUP("Level " + String::num(i + 1), "level_" + String::num(i + 1)); ADD_GROUP("Level " + String::num(i + 1), "level_" + String::num(i + 1));
ADD_PROPERTYI(PropertyInfo(Variant::INT, "level_" + String::num(i + 1) + "_agility"), "set_agility_for_level", "get_agility_for_level", i); ADD_PROPERTYI(PropertyInfo(Variant::INT, "level_" + String::num(i + 1) + "_agility"), "set_agility_for_level", "get_agility_for_level", i);

1
entities/stats/level_stat_data.cpp
View File

@ -13,4 +13,3 @@ void LevelStatData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_stat_diff", "stat", "old_level", "new_level"), &LevelStatData::get_stat_diff); ClassDB::bind_method(D_METHOD("get_stat_diff", "stat", "old_level", "new_level"), &LevelStatData::get_stat_diff);
} }

2
entities/stats/stat.h
View File

@ -163,7 +163,7 @@ public:
void _from_dict(const Dictionary &dict); void _from_dict(const Dictionary &dict);
Stat(); Stat();
Stat(Stat::StatId id, Entity* owner); Stat(Stat::StatId id, Entity *owner);
Stat(Stat::StatId id, StatModifierApplyType modifier_apply_type, Entity *owner); Stat(Stat::StatId id, StatModifierApplyType modifier_apply_type, Entity *owner);
~Stat(); ~Stat();

2
entities/stats/stat_data.cpp
View File

@ -39,7 +39,6 @@ void StatData::get_stat_for_stat(Ref<Stat> stat) {
sd->get_stats_for_stat(stat); sd->get_stats_for_stat(stat);
} }
StatData::StatData() { StatData::StatData() {
for (int i = 0; i < Stat::STAT_ID_TOTAL_STATS; ++i) { for (int i = 0; i < Stat::STAT_ID_TOTAL_STATS; ++i) {
Ref<StatDataEntry> entry(memnew(StatDataEntry())); Ref<StatDataEntry> entry(memnew(StatDataEntry()));
@ -81,4 +80,3 @@ void StatData::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_level_stat_data", "value"), &StatData::set_level_stat_data); ClassDB::bind_method(D_METHOD("set_level_stat_data", "value"), &StatData::set_level_stat_data);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "level_stat_data", PROPERTY_HINT_RESOURCE_TYPE, "LevelStatData"), "set_level_stat_data", "get_level_stat_data"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "level_stat_data", PROPERTY_HINT_RESOURCE_TYPE, "LevelStatData"), "set_level_stat_data", "get_level_stat_data");
} }

7
entities/stats/stat_data.h
View File

@ -1,12 +1,12 @@
#ifndef STAT_DATA_H #ifndef STAT_DATA_H
#define STAT_DATA_H #define STAT_DATA_H
#include "scene/resources/curve.h"
#include "core/resource.h" #include "core/resource.h"
#include "scene/resources/curve.h"
#include "stat_data_entry.h"
#include "stat.h"
#include "level_stat_data.h" #include "level_stat_data.h"
#include "stat.h"
#include "stat_data_entry.h"
class StatData : public Resource { class StatData : public Resource {
GDCLASS(StatData, Resource); GDCLASS(StatData, Resource);
@ -32,7 +32,6 @@ private:
Ref<StatDataEntry> _entries[Stat::STAT_ID_TOTAL_STATS]; Ref<StatDataEntry> _entries[Stat::STAT_ID_TOTAL_STATS];
Ref<LevelStatData> _level_stat_data; Ref<LevelStatData> _level_stat_data;
}; };
#endif #endif

2
entity_data_manager.cpp
View File

@ -1,9 +1,9 @@
#include "entity_data_manager.h" #include "entity_data_manager.h"
#include "./entities/data/entity_data.h"
#include "./data/aura.h" #include "./data/aura.h"
#include "./data/craft_recipe.h" #include "./data/craft_recipe.h"
#include "./data/spell.h" #include "./data/spell.h"
#include "./entities/data/entity_data.h"
EntityDataManager *EntityDataManager::instance; EntityDataManager *EntityDataManager::instance;

1
entity_enums.h
View File

@ -229,7 +229,6 @@ public:
ENTITY_WINDOW_VENDOR = 2, ENTITY_WINDOW_VENDOR = 2,
}; };
enum { enum {
GENDER_COUNT = 2, GENDER_COUNT = 2,
MAX_LEVEL = 50, MAX_LEVEL = 50,

1
formations/ai_formation.cpp
View File

@ -63,5 +63,4 @@ void AIFormation::_bind_methods() {
ClassDB::bind_method(D_METHOD("_set_editor_description", "editor_description"), &AIFormation::set_editor_description); ClassDB::bind_method(D_METHOD("_set_editor_description", "editor_description"), &AIFormation::set_editor_description);
ClassDB::bind_method(D_METHOD("_get_editor_description"), &AIFormation::get_editor_description); ClassDB::bind_method(D_METHOD("_get_editor_description"), &AIFormation::get_editor_description);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "editor_description", PROPERTY_HINT_MULTILINE_TEXT, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_editor_description", "_get_editor_description"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "editor_description", PROPERTY_HINT_MULTILINE_TEXT, "", PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_INTERNAL), "_set_editor_description", "_get_editor_description");
} }

69
infos/Queued/GenericAOESpell.cpp
View File

@ -1,9 +1,10 @@
#include "GenericAOESpell.h" #include "GenericAOESpell.h"
namespace BS { namespace BS {
namespace SpellsNS { namespace SpellsNS {
namespace generic { namespace generic {
GenericAOESpell::GenericAOESpell(Spell* spell) : SpellScript(spell){ GenericAOESpell::GenericAOESpell(Spell *spell) :
if (!Mathf::Approximately(spell->CastTime, (float)0)){ SpellScript(spell) {
if (!Mathf::Approximately(spell->CastTime, (float)0)) {
this->hasCastTime = true; this->hasCastTime = true;
} }
if (!Mathf::Approximately(spell->Cooldown, (float)0)) { if (!Mathf::Approximately(spell->Cooldown, (float)0)) {
@ -29,20 +30,18 @@ namespace BS {
if (this->spellCastEffectAttribute != null) { if (this->spellCastEffectAttribute != null) {
this->hasSpellCastEffect = true; this->hasSpellCastEffect = true;
} }
} }
void GenericAOESpell::StartCasting(WorldEntity* caster, float spellScale) void GenericAOESpell::StartCasting(WorldEntity *caster, float spellScale) {
{
if ((this->genericSpellAttribute->NeedsTarget || this->damage) && !this->hasCastTime) { if ((this->genericSpellAttribute->NeedsTarget || this->damage) && !this->hasCastTime) {
if (!SpellScript::CanCastTarget(caster, 0)) { if (!SpellScript::CanCastTarget(caster, 0)) {
return; return;
} }
} } else {
else {
if (!SpellScript::CanCast(caster, 0)) { if (!SpellScript::CanCast(caster, 0)) {
return; return;
} }
} }
WorldEntity* worldEntity = null; WorldEntity *worldEntity = null;
if (this->genericSpellAttribute->NeedsTarget || this->damage) { if (this->genericSpellAttribute->NeedsTarget || this->damage) {
worldEntity = SpellScript::GetTarget(caster); worldEntity = SpellScript::GetTarget(caster);
} }
@ -52,18 +51,16 @@ namespace BS {
} }
this->HandleSpellEffect(caster, worldEntity, spellScale); this->HandleSpellEffect(caster, worldEntity, spellScale);
return; return;
} } else {
else {
if (!SpellScript::SpellCostCheck(caster)) { if (!SpellScript::SpellCostCheck(caster)) {
return; return;
} }
SpellScript::DoStartCasting(caster, this->spellId, this->spell->NameKey, this->spell->CastTime, !this->genericSpellAttribute->CanMoveWhileCasting, spellScale); SpellScript::DoStartCasting(caster, this->spellId, this->spell->NameKey, this->spell->CastTime, !this->genericSpellAttribute->CanMoveWhileCasting, spellScale);
return; return;
} }
} }
void GenericAOESpell::CastingFinished(WorldEntity* caster, float spellScale) void GenericAOESpell::CastingFinished(WorldEntity *caster, float spellScale) {
{ WorldEntity *worldEntity = null;
WorldEntity* worldEntity = null;
if (this->genericSpellAttribute->NeedsTarget || this->damage) { if (this->genericSpellAttribute->NeedsTarget || this->damage) {
worldEntity = SpellScript::GetTarget(caster); worldEntity = SpellScript::GetTarget(caster);
} }
@ -77,9 +74,8 @@ namespace BS {
if (this->hasCastTime && !this->genericSpellAttribute->CanMoveWhileCasting) { if (this->hasCastTime && !this->genericSpellAttribute->CanMoveWhileCasting) {
SpellScript::RemoveOnMoveHook(caster); SpellScript::RemoveOnMoveHook(caster);
} }
} }
void GenericAOESpell::SpellHit(WorldEntity* caster, WorldEntity* target, WorldSpell* worldSpell, Spell* spellGo, float spellScale) void GenericAOESpell::SpellHit(WorldEntity *caster, WorldEntity *target, WorldSpell *worldSpell, Spell *spellGo, float spellScale) {
{
if (target->CompareTag(new String("Player"))) { if (target->CompareTag(new String("Player"))) {
if (this->damage) { if (this->damage) {
SpellScript::DealDamage(caster, target, spellScale); SpellScript::DealDamage(caster, target, spellScale);
@ -101,13 +97,11 @@ namespace BS {
} }
} }
worldSpell->Destroy(); worldSpell->Destroy();
} }
void GenericAOESpell::OnPlayerMove(Entity* caster) void GenericAOESpell::OnPlayerMove(Entity *caster) {
{ SpellScript::DoCastFail((WorldEntity *)(caster), true);
SpellScript::DoCastFail((WorldEntity*)(caster), true); }
} void GenericAOESpell::HandleSpellEffect(WorldEntity *caster, WorldEntity *target, float spellScale) {
void GenericAOESpell::HandleSpellEffect(WorldEntity* caster, WorldEntity* target, float spellScale)
{
if (!SpellScript::SpellCostCheckAndRemove(caster)) { if (!SpellScript::SpellCostCheckAndRemove(caster)) {
return; return;
} }
@ -137,28 +131,25 @@ namespace BS {
SpellScript::AddCooldown(caster, this->spellId, this->spell->Cooldown); SpellScript::AddCooldown(caster, this->spellId, this->spell->Cooldown);
} }
SpellScript::SpellCastSuccess(caster); SpellScript::SpellCastSuccess(caster);
} }
void GenericAOESpell::COnSpellCastSuccess(WorldEntity* player) void GenericAOESpell::COnSpellCastSuccess(WorldEntity *player) {
{
if (!this->hasCastTime) { if (!this->hasCastTime) {
SpellScript::PlayStandardSpellCastFinish(player); SpellScript::PlayStandardSpellCastFinish(player);
return; return;
} }
SpellScript::PlayStandardSpellCastFinish(); SpellScript::PlayStandardSpellCastFinish();
} }
void GenericAOESpell::COnSpellCastStarted(WorldEntity* player) void GenericAOESpell::COnSpellCastStarted(WorldEntity *player) {
{
if (this->hasSpellCastEffect) { if (this->hasSpellCastEffect) {
SpellScript::AddSpellCastEffect(player); SpellScript::AddSpellCastEffect(player);
} }
} }
void GenericAOESpell::COnSpellCastEnded(WorldEntity* player) void GenericAOESpell::COnSpellCastEnded(WorldEntity *player) {
{
if (this->hasSpellCastEffect) { if (this->hasSpellCastEffect) {
SpellScript::RemoveSpellCastEffects(player); SpellScript::RemoveSpellCastEffects(player);
} }
}
}
}
} }
} // namespace generic
} // namespace SpellsNS
} // namespace BS

116
infos/Queued/GenericAOESpell.h
View File

@ -1,74 +1,86 @@
#pragma once #pragma once
#include <System/System.h>
#include "SpellScript.h"
#include "GenericSpellData.h"
#include "SpellHealData.h"
#include "SpellCastEffectData.h"
#include "SpellAOEData.h"
#include "SpellRangeData.h"
#include "Spell.h"
#include "Mathf.h"
#include "Debug.h" #include "Debug.h"
#include "Entity.h"
#include "GenericSpellData.h"
#include "Mathf.h"
#include "Spell.h"
#include "SpellAOEData.h"
#include "SpellCastEffectData.h"
#include "SpellHealData.h"
#include "SpellRangeData.h"
#include "SpellScript.h"
#include "WorldEntity.h" #include "WorldEntity.h"
#include "WorldSpell.h" #include "WorldSpell.h"
#include "Entity.h" #include <System/System.h>
using namespace UnityEngine; using namespace UnityEngine;
using namespace BS::Player; using namespace BS::Player;
using namespace BS::SpellsNS::WorldSpells; using namespace BS::SpellsNS::WorldSpells;
using namespace System; using namespace System;
namespace BS { namespace BS {
namespace SpellsNS { namespace SpellsNS {
namespace generic { namespace generic {
class GenericAOESpell : public virtual SpellScript, public virtual Object class GenericAOESpell : public virtual SpellScript, public virtual Object {
{ private:
private: GenericSpellData *genericSpellAttribute;
GenericSpellData* genericSpellAttribute;
private: private:
SpellHealData* spellHealAttribute; SpellHealData *spellHealAttribute;
private:
SpellCastEffectData* spellCastEffectAttribute; private:
private: SpellCastEffectData *spellCastEffectAttribute;
SpellAOEData* aoeAttrib;
private: private:
SpellRangeData* rangeAttrib; SpellAOEData *aoeAttrib;
private:
SpellRangeData *rangeAttrib;
//Attribute: SerializeField* //Attribute: SerializeField*
private: private:
bool damage; bool damage;
//Attribute: SerializeField* //Attribute: SerializeField*
private: private:
bool heal; bool heal;
//Attribute: SerializeField* //Attribute: SerializeField*
private: private:
bool hasCooldown; bool hasCooldown;
//Attribute: SerializeField* //Attribute: SerializeField*
private: private:
bool hasCastTime; bool hasCastTime;
//Attribute: SerializeField* //Attribute: SerializeField*
private: private:
bool hasSpellCastEffect; bool hasSpellCastEffect;
//Attribute: SerializeField* //Attribute: SerializeField*
private: private:
bool range; bool range;
public:
GenericAOESpell(Spell* spell); public:
public: GenericAOESpell(Spell *spell);
virtual void StartCasting(WorldEntity* caster, float spellScale);
public: public:
virtual void CastingFinished(WorldEntity* caster, float spellScale); virtual void StartCasting(WorldEntity *caster, float spellScale);
public:
virtual void SpellHit(WorldEntity* caster, WorldEntity* target, WorldSpell* worldSpell, Spell* spellGo, float spellScale); public:
public: virtual void CastingFinished(WorldEntity *caster, float spellScale);
virtual void OnPlayerMove(Entity* caster);
private: public:
void HandleSpellEffect(WorldEntity* caster, WorldEntity* target, float spellScale); virtual void SpellHit(WorldEntity *caster, WorldEntity *target, WorldSpell *worldSpell, Spell *spellGo, float spellScale);
public:
virtual void COnSpellCastSuccess(WorldEntity* player); public:
public: virtual void OnPlayerMove(Entity *caster);
virtual void COnSpellCastStarted(WorldEntity* player);
public: private:
virtual void COnSpellCastEnded(WorldEntity* player); void HandleSpellEffect(WorldEntity *caster, WorldEntity *target, float spellScale);
};
} public:
} virtual void COnSpellCastSuccess(WorldEntity *player);
}
public:
virtual void COnSpellCastStarted(WorldEntity *player);
public:
virtual void COnSpellCastEnded(WorldEntity *player);
};
} // namespace generic
} // namespace SpellsNS
} // namespace BS

3
infos/aura_infos.cpp
View File

@ -46,7 +46,6 @@ void AuraApplyInfo::set_target_bind(Node *caster) {
_target = e; _target = e;
} }
float AuraApplyInfo::get_spell_scale() const { float AuraApplyInfo::get_spell_scale() const {
return _spell_scale; return _spell_scale;
} }
@ -101,5 +100,3 @@ void AuraApplyInfo::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_aura", "aura"), &AuraApplyInfo::set_aura); ClassDB::bind_method(D_METHOD("set_aura", "aura"), &AuraApplyInfo::set_aura);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "aura", PROPERTY_HINT_RESOURCE_TYPE, "Aura"), "set_aura", "get_aura"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "aura", PROPERTY_HINT_RESOURCE_TYPE, "Aura"), "set_aura", "get_aura");
} }

3
infos/aura_infos.h
View File

@ -1,8 +1,8 @@
#ifndef AURA_INFOS_H #ifndef AURA_INFOS_H
#define AURA_INFOS_H #define AURA_INFOS_H
#include "core/reference.h"
#include "../entities/entity.h" #include "../entities/entity.h"
#include "core/reference.h"
class Entity; class Entity;
class Aura; class Aura;
@ -39,5 +39,4 @@ private:
Aura *_aura; Aura *_aura;
}; };
#endif #endif

1
infos/spell_cast_info.cpp
View File

@ -172,7 +172,6 @@ Dictionary SpellCastInfo::to_dict() {
void SpellCastInfo::from_dict(const Dictionary &dict) { void SpellCastInfo::from_dict(const Dictionary &dict) {
ERR_FAIL_COND(dict.empty()); ERR_FAIL_COND(dict.empty());
_has_cast_time = dict.get("has_cast_time", true); _has_cast_time = dict.get("has_cast_time", true);
_cast_time = dict.get("cast_time", 0); _cast_time = dict.get("cast_time", 0);

12
inventory/grid_bag.cpp
View File

@ -1,7 +1,7 @@
#include "grid_bag.h" #include "grid_bag.h"
#include "../data/item_template.h"
#include "../data/item_instance.h" #include "../data/item_instance.h"
#include "../data/item_template.h"
int GridBag::get_allowed_item_types() const { int GridBag::get_allowed_item_types() const {
return _allowed_item_types; return _allowed_item_types;
@ -51,8 +51,6 @@ bool GridBag::add_item(Ref<ItemInstance> item) {
_space_map.set(xx * _size_x + yy, index); _space_map.set(xx * _size_x + yy, index);
} }
} }
} }
} }
} }
@ -155,7 +153,6 @@ int GridBag::item_count_under_area(const int x, const int y, const int size_x, c
for (int xx = x; xx < sx; ++xx) { for (int xx = x; xx < sx; ++xx) {
for (int yy = y; yy < sy; ++yy) { for (int yy = y; yy < sy; ++yy) {
if (_space_map[xx * _size_x + yy] != 0) { if (_space_map[xx * _size_x + yy] != 0) {
} }
} }
} }
@ -178,7 +175,7 @@ Ref<ItemInstance> GridBag::get_and_remove_item(const int index) {
//Go over everything, to make sure item site changes won't cause bugs. //Go over everything, to make sure item site changes won't cause bugs.
for (int x = 0; x < _size_x; ++x) { for (int x = 0; x < _size_x; ++x) {
for (int y = 0; y < _size_y ; ++y) { for (int y = 0; y < _size_y; ++y) {
int indx = x * _size_x + y; int indx = x * _size_x + y;
if (_space_map[indx] == index) { if (_space_map[indx] == index) {
@ -197,7 +194,7 @@ void GridBag::remove_item(const int index) {
//Go over everything, to make sure item site changes won't cause bugs. //Go over everything, to make sure item site changes won't cause bugs.
for (int x = 0; x < _size_x; ++x) { for (int x = 0; x < _size_x; ++x) {
for (int y = 0; y < _size_y ; ++y) { for (int y = 0; y < _size_y; ++y) {
int indx = x * _size_x + y; int indx = x * _size_x + y;
if (_space_map[indx] == index) { if (_space_map[indx] == index) {
@ -210,7 +207,7 @@ void GridBag::remove_item(const int index) {
void GridBag::basic_add_item(const Ref<ItemInstance> item) { void GridBag::basic_add_item(const Ref<ItemInstance> item) {
_items.push_back(item); _items.push_back(item);
} }
void GridBag::basic_remove_item(const int index){ void GridBag::basic_remove_item(const int index) {
_items.remove(index); _items.remove(index);
} }
@ -285,5 +282,4 @@ void GridBag::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_size_y"), &GridBag::get_size_y); ClassDB::bind_method(D_METHOD("get_size_y"), &GridBag::get_size_y);
ClassDB::bind_method(D_METHOD("set_size", "x", "y"), &GridBag::set_size); ClassDB::bind_method(D_METHOD("set_size", "x", "y"), &GridBag::set_size);
} }

3
inventory/inventory.cpp
View File

@ -1,7 +1,7 @@
#include "inventory.h" #include "inventory.h"
#include "../data/item_template.h"
#include "../data/item_instance.h" #include "../data/item_instance.h"
#include "../data/item_template.h"
#include "../entities/player.h" #include "../entities/player.h"
@ -53,4 +53,3 @@ void Inventory::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_target", "target"), &Inventory::set_target_bind); ClassDB::bind_method(D_METHOD("set_target", "target"), &Inventory::set_target_bind);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "target", PROPERTY_HINT_RESOURCE_TYPE, "Player"), "set_target", "get_target"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "target", PROPERTY_HINT_RESOURCE_TYPE, "Player"), "set_target", "get_target");
} }

10
inventory/normal_bag.cpp
View File

@ -1,7 +1,7 @@
#include "bag.h" #include "bag.h"
#include "../data/item_template.h"
#include "../data/item_instance.h" #include "../data/item_instance.h"
#include "../data/item_template.h"
int Bag::get_allowed_item_types() const { int Bag::get_allowed_item_types() const {
return _allowed_item_types; return _allowed_item_types;
@ -12,10 +12,8 @@ void Bag::set_allowed_item_types(const int value) {
} }
bool Bag::add_item(Ref<ItemInstance> item) { bool Bag::add_item(Ref<ItemInstance> item) {
} }
Ref<ItemInstance> Bag::get_item(const int index) const { Ref<ItemInstance> Bag::get_item(const int index) const {
ERR_FAIL_INDEX_V(index, _items.size(), Ref<ItemInstance>(NULL)); ERR_FAIL_INDEX_V(index, _items.size(), Ref<ItemInstance>(NULL));
@ -31,7 +29,7 @@ Ref<ItemInstance> Bag::remove_item(const int index) {
//Go over everything, to make sure item site changes won't cause bugs. //Go over everything, to make sure item site changes won't cause bugs.
for (int x = 0; x < _size_x; ++x) { for (int x = 0; x < _size_x; ++x) {
for (int y = 0; y < _size_y ; ++y) { for (int y = 0; y < _size_y; ++y) {
int indx = x * _size_x + y; int indx = x * _size_x + y;
if (_space_map[indx] == index) { if (_space_map[indx] == index) {
@ -44,14 +42,12 @@ Ref<ItemInstance> Bag::remove_item(const int index) {
} }
bool Bag::can_add_item(const Ref<ItemInstance> item) const { bool Bag::can_add_item(const Ref<ItemInstance> item) const {
} }
int Bag::get_item_count() const { int Bag::get_item_count() const {
return _items.size(); return _items.size();
} }
int Bag::get_size() const { int Bag::get_size() const {
return _items.size(); return _items.size();
} }
@ -70,7 +66,6 @@ void Bag::set_size(const int x, const int y) {
} }
} }
Bag::Bag() { Bag::Bag() {
_allowed_item_types = 0x1FFF; _allowed_item_types = 0x1FFF;
@ -108,5 +103,4 @@ void Bag::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_size_y"), &Bag::get_size_y); ClassDB::bind_method(D_METHOD("get_size_y"), &Bag::get_size_y);
ClassDB::bind_method(D_METHOD("set_size", "x", "y"), &Bag::set_size); ClassDB::bind_method(D_METHOD("set_size", "x", "y"), &Bag::set_size);
} }

2
loot/loot_data_container.h
View File

@ -1,8 +1,8 @@
#ifndef LOOT_DATA_CONTAINER_H #ifndef LOOT_DATA_CONTAINER_H
#define LOOT_DATA_CONTAINER_H #define LOOT_DATA_CONTAINER_H
#include "loot_data_base.h"
#include "core/vector.h" #include "core/vector.h"
#include "loot_data_base.h"
class LootDataContainter : public LootDataBase { class LootDataContainter : public LootDataBase {
GDCLASS(LootDataContainter, LootDataBase); GDCLASS(LootDataContainter, LootDataBase);

1
loot/loot_data_item.cpp
View File

@ -20,7 +20,6 @@ void LootDataItem::_get_loot(Array into) {
} }
LootDataItem::LootDataItem() { LootDataItem::LootDataItem() {
} }
void LootDataItem::_bind_methods() { void LootDataItem::_bind_methods() {

1
loot/loot_data_item.h
View File

@ -5,7 +5,6 @@
#include "loot_data_base.h" #include "loot_data_base.h"
class LootDataItem : public LootDataBase { class LootDataItem : public LootDataBase {
GDCLASS(LootDataItem, LootDataBase); GDCLASS(LootDataItem, LootDataBase);

2
profile_manager/actionbar/action_bar_button_entry.h
View File

@ -1,8 +1,8 @@
#ifndef ACTION_BAR_BUTTON_ENTRY_H #ifndef ACTION_BAR_BUTTON_ENTRY_H
#define ACTION_BAR_BUTTON_ENTRY_H #define ACTION_BAR_BUTTON_ENTRY_H
#include "core/reference.h"
#include "core/dictionary.h" #include "core/dictionary.h"
#include "core/reference.h"
class ActionBarButtonEntry : public Reference { class ActionBarButtonEntry : public Reference {
GDCLASS(ActionBarButtonEntry, Reference); GDCLASS(ActionBarButtonEntry, Reference);

4
profile_manager/actionbar/action_bar_entry.h
View File

@ -1,10 +1,10 @@
#ifndef ACTION_BAR_ENTRY_H #ifndef ACTION_BAR_ENTRY_H
#define ACTION_BAR_ENTRY_H #define ACTION_BAR_ENTRY_H
#include "core/array.h"
#include "core/dictionary.h"
#include "core/reference.h" #include "core/reference.h"
#include "core/vector.h" #include "core/vector.h"
#include "core/dictionary.h"
#include "core/array.h"
#include "action_bar_button_entry.h" #include "action_bar_button_entry.h"

1
profile_manager/actionbar/action_bar_profile.cpp
View File

@ -130,4 +130,3 @@ void ActionBarProfile::_bind_methods() {
ClassDB::bind_method(D_METHOD("from_actionbar_profile", "other"), &ActionBarProfile::from_actionbar_profile); ClassDB::bind_method(D_METHOD("from_actionbar_profile", "other"), &ActionBarProfile::from_actionbar_profile);
} }

4
profile_manager/actionbar/action_bar_profile.h
View File

@ -1,11 +1,11 @@
#ifndef ACTION_BAR_PROFILE_H #ifndef ACTION_BAR_PROFILE_H
#define ACTION_BAR_PROFILE_H #define ACTION_BAR_PROFILE_H
#include "core/array.h"
#include "core/dictionary.h"
#include "core/reference.h" #include "core/reference.h"
#include "core/ustring.h" #include "core/ustring.h"
#include "core/vector.h" #include "core/vector.h"
#include "core/dictionary.h"
#include "core/array.h"
#include "action_bar_entry.h" #include "action_bar_entry.h"

51
profile_manager/class_profile.cpp
View File

@ -1,42 +1,34 @@
#include "class_profile.h" #include "class_profile.h"
int ClassProfile::get_class_id() { int ClassProfile::get_class_id() {
return _class_id; return _class_id;
} }
void ClassProfile::set_class_id(int value) void ClassProfile::set_class_id(int value) {
{
_class_id = value; _class_id = value;
} }
String ClassProfile::get_character_class_name() String ClassProfile::get_character_class_name() {
{
return _character_class_name; return _character_class_name;
} }
void ClassProfile::set_character_class_name(String value) void ClassProfile::set_character_class_name(String value) {
{
_character_class_name = value; _character_class_name = value;
} }
int ClassProfile::get_level() int ClassProfile::get_level() {
{
return _level; return _level;
} }
void ClassProfile::set_level(int value) void ClassProfile::set_level(int value) {
{
_level = value; _level = value;
} }
int ClassProfile::get_xp() int ClassProfile::get_xp() {
{
return _xp; return _xp;
} }
void ClassProfile::set_xp(int value) void ClassProfile::set_xp(int value) {
{
_xp = value; _xp = value;
} }
@ -47,12 +39,10 @@ void ClassProfile::set_actionbar_locked(bool value) {
_actionbar_locked = value; _actionbar_locked = value;
} }
Ref<InputProfile> ClassProfile::get_input_profile() Ref<InputProfile> ClassProfile::get_input_profile() {
{
return _input_profile; return _input_profile;
} }
Ref<ActionBarProfile> ClassProfile::get_action_bar_profile() Ref<ActionBarProfile> ClassProfile::get_action_bar_profile() {
{
return _action_bar_profile; return _action_bar_profile;
} }
@ -91,9 +81,8 @@ void ClassProfile::from_dict(const Dictionary &dict) {
_custom_data = dict.get("custom_data", Dictionary()); _custom_data = dict.get("custom_data", Dictionary());
} }
ClassProfile::ClassProfile() ClassProfile::ClassProfile() {
{ _action_bar_profile = Ref<ActionBarProfile>(memnew(ActionBarProfile()));
_action_bar_profile = Ref<ActionBarProfile>(memnew( ActionBarProfile()));
_input_profile = Ref<InputProfile>(memnew(InputProfile())); _input_profile = Ref<InputProfile>(memnew(InputProfile()));
_class_id = 0; _class_id = 0;
@ -102,9 +91,8 @@ ClassProfile::ClassProfile()
_actionbar_locked = false; _actionbar_locked = false;
} }
ClassProfile::ClassProfile(int class_id) ClassProfile::ClassProfile(int class_id) {
{ _action_bar_profile = Ref<ActionBarProfile>(memnew(ActionBarProfile()));
_action_bar_profile = Ref<ActionBarProfile>(memnew( ActionBarProfile()));
_input_profile = Ref<InputProfile>(memnew(InputProfile())); _input_profile = Ref<InputProfile>(memnew(InputProfile()));
_class_id = class_id; _class_id = class_id;
@ -114,9 +102,8 @@ ClassProfile::ClassProfile(int class_id)
load_defaults(); load_defaults();
} }
ClassProfile::ClassProfile(String class_name, int class_id, int level, int xp, bool locked, bool pload_defaults) ClassProfile::ClassProfile(String class_name, int class_id, int level, int xp, bool locked, bool pload_defaults) {
{ _action_bar_profile = Ref<ActionBarProfile>(memnew(ActionBarProfile()));
_action_bar_profile = Ref<ActionBarProfile>(memnew( ActionBarProfile()));
_input_profile = Ref<InputProfile>(memnew(InputProfile())); _input_profile = Ref<InputProfile>(memnew(InputProfile()));
_character_class_name = class_name; _character_class_name = class_name;
@ -130,13 +117,11 @@ ClassProfile::ClassProfile(String class_name, int class_id, int level, int xp, b
} }
} }
void ClassProfile::load_defaults() void ClassProfile::load_defaults() {
{
_action_bar_profile->load_defaults(); _action_bar_profile->load_defaults();
} }
void ClassProfile::_bind_methods() void ClassProfile::_bind_methods() {
{
ClassDB::bind_method(D_METHOD("get_class_id"), &ClassProfile::get_class_id); ClassDB::bind_method(D_METHOD("get_class_id"), &ClassProfile::get_class_id);
ClassDB::bind_method(D_METHOD("set_class_id", "value"), &ClassProfile::set_class_id); ClassDB::bind_method(D_METHOD("set_class_id", "value"), &ClassProfile::set_class_id);
ADD_PROPERTY(PropertyInfo(Variant::INT, "class_id"), "set_class_id", "get_class_id"); ADD_PROPERTY(PropertyInfo(Variant::INT, "class_id"), "set_class_id", "get_class_id");
@ -163,5 +148,3 @@ void ClassProfile::_bind_methods()
ClassDB::bind_method(D_METHOD("from_dict", "dict"), &ClassProfile::from_dict); ClassDB::bind_method(D_METHOD("from_dict", "dict"), &ClassProfile::from_dict);
ClassDB::bind_method(D_METHOD("to_dict"), &ClassProfile::to_dict); ClassDB::bind_method(D_METHOD("to_dict"), &ClassProfile::to_dict);
} }

5
profile_manager/class_profile.h
View File

@ -1,10 +1,9 @@
#ifndef CLASS_PROFILE_H #ifndef CLASS_PROFILE_H
#define CLASS_PROFILE_H #define CLASS_PROFILE_H
#include "core/ustring.h"
#include "core/reference.h"
#include "core/dictionary.h" #include "core/dictionary.h"
#include "core/reference.h"
#include "core/ustring.h"
#include "actionbar/action_bar_profile.h" #include "actionbar/action_bar_profile.h"
#include "input/input_profile.h" #include "input/input_profile.h"

3
profile_manager/input/input_profile.h
View File

@ -8,7 +8,6 @@ class InputProfile : public Reference {
GDCLASS(InputProfile, Reference); GDCLASS(InputProfile, Reference);
public: public:
InputProfile() {} InputProfile() {}
protected: protected:
@ -18,6 +17,4 @@ private:
int placeholder; int placeholder;
}; };
#endif #endif

1
profile_manager/input/input_profile_modifier.cpp
View File

@ -75,5 +75,4 @@ void InputProfileModifier::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_entry", "index"), &InputProfileModifier::get_entry); ClassDB::bind_method(D_METHOD("get_entry", "index"), &InputProfileModifier::get_entry);
ClassDB::bind_method(D_METHOD("set_entry", "index", "value"), &InputProfileModifier::set_entry); ClassDB::bind_method(D_METHOD("set_entry", "index", "value"), &InputProfileModifier::set_entry);
ClassDB::bind_method(D_METHOD("remove_entry", "index"), &InputProfileModifier::remove_entry); ClassDB::bind_method(D_METHOD("remove_entry", "index"), &InputProfileModifier::remove_entry);
} }

1
profile_manager/input/input_profile_modifier.h
View File

@ -7,7 +7,6 @@
#include "input_profile_modifier_entry.h" #include "input_profile_modifier_entry.h"
class InputProfileModifier : public Reference { class InputProfileModifier : public Reference {
GDCLASS(InputProfileModifier, Reference); GDCLASS(InputProfileModifier, Reference);

2
profile_manager/input/input_profile_modifier_entry.cpp
View File

@ -17,7 +17,6 @@ void InputProfileModifierEntry::set_translate_to(String value) {
} }
InputProfileModifierEntry::InputProfileModifierEntry() { InputProfileModifierEntry::InputProfileModifierEntry() {
} }
void InputProfileModifierEntry::_bind_methods() { void InputProfileModifierEntry::_bind_methods() {
@ -29,4 +28,3 @@ void InputProfileModifierEntry::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_translate_to", "value"), &InputProfileModifierEntry::set_translate_to); ClassDB::bind_method(D_METHOD("set_translate_to", "value"), &InputProfileModifierEntry::set_translate_to);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "translate_to"), "set_translate_to", "get_translate_to"); ADD_PROPERTY(PropertyInfo(Variant::STRING, "translate_to"), "set_translate_to", "get_translate_to");
} }

1
profile_manager/input/input_profile_modifier_entry.h
View File

@ -24,5 +24,4 @@ private:
String _translate_to; String _translate_to;
}; };
#endif #endif

2
profile_manager/profile_manager.cpp
View File

@ -79,7 +79,7 @@ void ProfileManager::load_profile(String name) {
load_defaults(); load_defaults();
} }
int _last_used_class; int _last_used_class;
String _profile_name; String _profile_name;

2
profile_manager/profile_manager.h
View File

@ -44,7 +44,7 @@ protected:
static void _bind_methods(); static void _bind_methods();
private: private:
static ProfileManager* _instance; static ProfileManager *_instance;
int _last_used_class; int _last_used_class;

54
register_types.cpp
View File

@ -8,26 +8,26 @@
#include "data/aura.h" #include "data/aura.h"
#include "data/aura_group.h" #include "data/aura_group.h"
#include "data/aura_stat_attribute.h" #include "data/aura_stat_attribute.h"
#include "data/xp_data.h" #include "data/equipment_data.h"
#include "data/equipment_data_entry.h"
#include "data/item_stat_modifier.h" #include "data/item_stat_modifier.h"
#include "data/item_template_stat_modifier.h" #include "data/item_template_stat_modifier.h"
#include "data/spell_cooldown_manipulation_data.h" #include "data/spell_cooldown_manipulation_data.h"
#include "data/equipment_data.h" #include "data/xp_data.h"
#include "data/equipment_data_entry.h"
#include "entities/data/entity_data.h"
#include "entities/data/entity_class_data.h" #include "entities/data/entity_class_data.h"
#include "entities/data/vendor_item_data.h" #include "entities/data/entity_data.h"
#include "entities/data/vendor_item_data_entry.h" #include "entities/data/entity_data_container.h"
#include "entities/data/item_container_data.h" #include "entities/data/item_container_data.h"
#include "entities/data/item_container_data_entry.h" #include "entities/data/item_container_data_entry.h"
#include "entities/data/entity_data_container.h" #include "entities/data/vendor_item_data.h"
#include "entities/data/vendor_item_data_entry.h"
#include "entities/skills/entity_skill.h" #include "entities/skills/entity_skill.h"
#include "entities/skills/entity_skill_data.h" #include "entities/skills/entity_skill_data.h"
#include "entities/data/talent_row_data.h"
#include "entities/data/character_spec.h" #include "entities/data/character_spec.h"
#include "entities/data/talent_row_data.h"
#include "data/item_visual.h" #include "data/item_visual.h"
#include "data/item_visual_entry.h" #include "data/item_visual_entry.h"
@ -37,40 +37,39 @@
#include "skeleton/character_bones.h" #include "skeleton/character_bones.h"
#include "data/item_template.h"
#include "data/item_instance.h" #include "data/item_instance.h"
#include "data/item_template.h"
#include "data/spell.h" #include "data/spell.h"
#include "entities/stats/stat.h" #include "entities/stats/complex_level_stat_data.h"
#include "entities/stats/stat_modifier.h"
#include "entities/stats/stat_data.h"
#include "entities/stats/stat_data_entry.h"
#include "entities/stats/level_stat_data.h" #include "entities/stats/level_stat_data.h"
#include "entities/stats/simple_level_stat_data.h" #include "entities/stats/simple_level_stat_data.h"
#include "entities/stats/complex_level_stat_data.h" #include "entities/stats/stat.h"
#include "entities/stats/stat_data.h"
#include "entities/stats/stat_data_entry.h"
#include "entities/stats/stat_modifier.h"
#include "inventory/bag.h" #include "inventory/bag.h"
//#include "inventory/inventory.h" //#include "inventory/inventory.h"
#include "data/craft_recipe_helper.h"
#include "data/craft_recipe.h" #include "data/craft_recipe.h"
#include "data/craft_recipe_helper.h"
#include "infos/spell_cast_info.h"
#include "infos/aura_infos.h" #include "infos/aura_infos.h"
#include "infos/spell_cast_info.h"
#include "pipelines/spell_damage_info.h" #include "pipelines/spell_damage_info.h"
#include "pipelines/spell_heal_info.h" #include "pipelines/spell_heal_info.h"
#include "entities/resources/entity_resource_data.h"
#include "entities/resources/entity_resource_cost_data.h"
#include "entities/resources/entity_resource.h" #include "entities/resources/entity_resource.h"
#include "entities/resources/entity_resource_cost_data.h"
#include "entities/resources/entity_resource_data.h"
#include "entities/auras/aura_data.h" #include "entities/auras/aura_data.h"
#include "entities/entity.h" #include "entities/entity.h"
#include "data/aura_trigger_data.h"
#include "data/aura_stat_attribute.h" #include "data/aura_stat_attribute.h"
#include "data/aura_trigger_data.h"
#include "ui/unit_frame.h" #include "ui/unit_frame.h"
@ -79,32 +78,31 @@
#include "skeleton/character_skeleton_2d.h" #include "skeleton/character_skeleton_2d.h"
#include "skeleton/character_skeleton_3d.h" #include "skeleton/character_skeleton_3d.h"
#include "skeleton/species_model_data.h"
#include "skeleton/entity_species_data.h" #include "skeleton/entity_species_data.h"
#include "skeleton/skeleton_model_entry.h" #include "skeleton/skeleton_model_entry.h"
#include "skeleton/species_model_data.h"
#include "utility/entity_create_info.h"
#include "utility/cooldown.h"
#include "utility/cooldown.h"
#include "utility/category_cooldown.h" #include "utility/category_cooldown.h"
#include "utility/cooldown.h"
#include "utility/entity_create_info.h"
#include "loot/loot_data_base.h" #include "loot/loot_data_base.h"
#include "loot/loot_data_item.h"
#include "loot/loot_data_container.h" #include "loot/loot_data_container.h"
#include "loot/loot_data_item.h"
#include "data/spell_effect_visual.h" #include "data/spell_effect_visual.h"
#include "data/spell_effect_visual_simple.h" #include "data/spell_effect_visual_simple.h"
#include "world_spells/world_spell_data.h"
#include "world_spells/world_spell.h" #include "world_spells/world_spell.h"
#include "world_spells/world_spell_data.h"
#include "entities/ai/entity_ai.h" #include "entities/ai/entity_ai.h"
#include "formations/ai_formation.h" #include "formations/ai_formation.h"
#include "profile_manager/input/input_profile.h"
#include "profile_manager/input/input_profile_modifier.h" #include "profile_manager/input/input_profile_modifier.h"
#include "profile_manager/input/input_profile_modifier_entry.h" #include "profile_manager/input/input_profile_modifier_entry.h"
#include "profile_manager/input/input_profile.h"
#include "profile_manager/actionbar/action_bar_button_entry.h" #include "profile_manager/actionbar/action_bar_button_entry.h"
#include "profile_manager/actionbar/action_bar_entry.h" #include "profile_manager/actionbar/action_bar_entry.h"
@ -240,6 +238,4 @@ void register_entity_spell_system_types() {
} }
void unregister_entity_spell_system_types() { void unregister_entity_spell_system_types() {
} }

4
skeleton/character_bones.cpp
View File

@ -1,9 +1,7 @@
#include "character_bones.h" #include "character_bones.h"
CharacterBones::CharacterBones() { CharacterBones::CharacterBones() {
} }
void CharacterBones::_bind_methods() { void CharacterBones::_bind_methods() {
} }

2
skeleton/character_bones.h
View File

@ -12,7 +12,7 @@ public:
protected: protected:
static void _bind_methods(); static void _bind_methods();
//private: //private:
}; };
#endif #endif

1
skeleton/character_skeleton_2d.h
View File

@ -35,5 +35,4 @@ private:
EntityEnums::EntityGender _gender; EntityEnums::EntityGender _gender;
}; };
#endif #endif

1
skeleton/character_skeleton_3d.h
View File

@ -98,5 +98,4 @@ private:
Vector<Ref<SkeletonModelEntry> > _entries[EntityEnums::SKELETON_POINTS_MAX]; Vector<Ref<SkeletonModelEntry> > _entries[EntityEnums::SKELETON_POINTS_MAX];
}; };
#endif #endif

1
skeleton/entity_skeleton_data.h
View File

@ -8,7 +8,6 @@ class EntitySkeletonData : public Resource {
GDCLASS(EntitySkeletonData, Resource); GDCLASS(EntitySkeletonData, Resource);
public: public:
protected: protected:
static void _bind_methods(); static void _bind_methods();

4
skeleton/entity_species_data.cpp
View File

@ -1,7 +1,7 @@
#include "entity_species_data.h" #include "entity_species_data.h"
#include "../data/spell.h"
#include "../data/aura.h" #include "../data/aura.h"
#include "../data/spell.h"
int EntitySpeciesData::get_id() { int EntitySpeciesData::get_id() {
return _id; return _id;
@ -178,4 +178,4 @@ void EntitySpeciesData::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_auras"), &EntitySpeciesData::get_auras); ClassDB::bind_method(D_METHOD("get_auras"), &EntitySpeciesData::get_auras);
ClassDB::bind_method(D_METHOD("set_auras", "auras"), &EntitySpeciesData::set_auras); ClassDB::bind_method(D_METHOD("set_auras", "auras"), &EntitySpeciesData::set_auras);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "auras", PROPERTY_HINT_NONE, "17/17:Aura", PROPERTY_USAGE_DEFAULT, "Aura"), "set_auras", "get_auras"); ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "auras", PROPERTY_HINT_NONE, "17/17:Aura", PROPERTY_USAGE_DEFAULT, "Aura"), "set_auras", "get_auras");
} }

1
skeleton/entity_species_data.h
View File

@ -50,7 +50,6 @@ public:
Vector<Variant> get_auras(); Vector<Variant> get_auras();
void set_auras(const Vector<Variant> &auras); void set_auras(const Vector<Variant> &auras);
String generate_name(int seed); String generate_name(int seed);
EntitySpeciesData(); EntitySpeciesData();

1
skeleton/skeleton_model_entry.cpp
View File

@ -55,4 +55,3 @@ void SkeletonModelEntry::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_entry", "path"), &SkeletonModelEntry::set_entry); ClassDB::bind_method(D_METHOD("set_entry", "path"), &SkeletonModelEntry::set_entry);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "entry", PROPERTY_HINT_RESOURCE_TYPE, "ItemVisualEntry"), "set_entry", "get_entry"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "entry", PROPERTY_HINT_RESOURCE_TYPE, "ItemVisualEntry"), "set_entry", "get_entry");
} }

2
skeleton/skeleton_model_entry.h
View File

@ -1,8 +1,8 @@
#ifndef SKELETON_MODEL_ENTRY_H #ifndef SKELETON_MODEL_ENTRY_H
#define SKELETON_MODEL_ENTRY_H #define SKELETON_MODEL_ENTRY_H
#include "core/reference.h"
#include "../data/item_visual_entry.h" #include "../data/item_visual_entry.h"
#include "core/reference.h"
class SkeletonModelEntry : public Reference { class SkeletonModelEntry : public Reference {
GDCLASS(SkeletonModelEntry, Reference); GDCLASS(SkeletonModelEntry, Reference);

6
skeleton/species_model_data.h
View File

@ -3,9 +3,9 @@
#include "core/resource.h" #include "core/resource.h"
#include "core/vector.h"
#include "core/ustring.h"
#include "core/color.h" #include "core/color.h"
#include "core/ustring.h"
#include "core/vector.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
#include "../data/item_visual_entry.h" #include "../data/item_visual_entry.h"
@ -95,8 +95,6 @@ private:
Vector<Ref<ItemVisualEntry> > _hair_styles; Vector<Ref<ItemVisualEntry> > _hair_styles;
Vector<Color> _hair_colors; Vector<Color> _hair_colors;
Vector<Ref<ItemVisualEntry> > _heads; Vector<Ref<ItemVisualEntry> > _heads;
}; };
#endif #endif

2
ui/unit_frame.cpp
View File

@ -1,6 +1,4 @@
#include "unit_frame.h" #include "unit_frame.h"
void UnitFrame::_bind_methods() { void UnitFrame::_bind_methods() {
} }

14
utility/category_cooldown.cpp
View File

@ -1,23 +1,18 @@
#include "category_cooldown.h" #include "category_cooldown.h"
int CategoryCooldown::get_category_id() const int CategoryCooldown::get_category_id() const {
{
return _category_id; return _category_id;
} }
void CategoryCooldown::set_category_id(const int value) void CategoryCooldown::set_category_id(const int value) {
{
_category_id = value; _category_id = value;
} }
float CategoryCooldown::get_remaining() const float CategoryCooldown::get_remaining() const {
{
return _remaining; return _remaining;
} }
void CategoryCooldown::set_remaining(const float value) void CategoryCooldown::set_remaining(const float value) {
{
_remaining = value; _remaining = value;
} }
@ -55,7 +50,6 @@ void CategoryCooldown::_from_dict(const Dictionary &dict) {
_remaining = dict.get("remaining", 0); _remaining = dict.get("remaining", 0);
} }
void CategoryCooldown::_bind_methods() { void CategoryCooldown::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_category_id"), &CategoryCooldown::get_category_id); ClassDB::bind_method(D_METHOD("get_category_id"), &CategoryCooldown::get_category_id);
ClassDB::bind_method(D_METHOD("set_category_id", "value"), &CategoryCooldown::set_category_id); ClassDB::bind_method(D_METHOD("set_category_id", "value"), &CategoryCooldown::set_category_id);

13
utility/cooldown.cpp
View File

@ -1,23 +1,18 @@
#include "cooldown.h" #include "cooldown.h"
int Cooldown::get_spell_id() const int Cooldown::get_spell_id() const {
{
return _spell_id; return _spell_id;
} }
void Cooldown::set_spell_id(const int value) void Cooldown::set_spell_id(const int value) {
{
_spell_id = value; _spell_id = value;
} }
float Cooldown::get_remaining() const float Cooldown::get_remaining() const {
{
return _remaining; return _remaining;
} }
void Cooldown::set_remaining(const float value) void Cooldown::set_remaining(const float value) {
{
_remaining = value; _remaining = value;
} }

4
utility/entity_create_info.h
View File

@ -1,10 +1,10 @@
#ifndef ENTITY_CREATE_INFO_H #ifndef ENTITY_CREATE_INFO_H
#define ENTITY_CREATE_INFO_H #define ENTITY_CREATE_INFO_H
#include "../entities/data/entity_data.h"
#include "../entity_enums.h"
#include "core/reference.h" #include "core/reference.h"
#include "core/ustring.h" #include "core/ustring.h"
#include "../entity_enums.h"
#include "../entities/data/entity_data.h"
class EntityCreateInfo : public Reference { class EntityCreateInfo : public Reference {
GDCLASS(EntityCreateInfo, Reference); GDCLASS(EntityCreateInfo, Reference);

1
world_spells/world_spell.h
View File

@ -10,7 +10,6 @@
#include "world_spell_data.h" #include "world_spell_data.h"
class WorldSpell : public Node { class WorldSpell : public Node {
GDCLASS(WorldSpell, Node); GDCLASS(WorldSpell, Node);