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

atlases/character_atlas.cpp

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

atlases/character_atlas.h

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

atlases/character_atlas_entry.cpp

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

atlases/character_atlas_entry.h

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

autoloads/entity_data_manager.cpp

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

autoloads/entity_data_manager.h

@@ -2,11 +2,11 @@
 #define ENTITY_DATA_MANAGER_H
 
 #include "core/array.h"
+#include "core/engine.h"
 #include "core/hash_map.h"
 #include "core/io/json.h"
 #include "core/variant.h"
 #include "core/vector.h"
-#include "core/engine.h"
 
 #include "core/resource.h"
 #include "core/ustring.h"
@@ -28,7 +28,6 @@ class ItemTemplate;
 class EntityResourceData;
 class EntitySkillData;
 
-
 class EntityDataManager : public Node {
 	GDCLASS(EntityDataManager, Node);
 
@@ -106,7 +105,7 @@ public:
 	Ref<ItemTemplate> get_item_template_index(int index);
 	int get_item_template_count();
 
-    String get_mob_data_folder();
+	String get_mob_data_folder();
 	void set_mob_data_folder(String folder);
 	Vector<Ref<EntityData> > *get_mob_datas();
 	void add_mob_data(Ref<EntityData> aura);
@@ -114,7 +113,7 @@ public:
 	Ref<EntityData> get_mob_data_index(int index);
 	int get_mob_data_count();
 
-    String get_player_character_data_folder();
+	String get_player_character_data_folder();
 	void set_player_character_data_folder(String folder);
 	Vector<Ref<EntityData> > *get_player_character_datas();
 	void add_player_character_data(Ref<EntityData> aura);
@@ -132,8 +131,8 @@ public:
 	void load_characters();
 	void load_craft_datas();
 	void load_item_templates();
-    void load_mob_datas();
+	void load_mob_datas();
-    void load_player_character_datas();
+	void load_player_character_datas();
 
 	bool get_automatic_load() { return _automatic_load; }
 	void set_automatic_load(bool load) { _automatic_load = load; }
@@ -181,11 +180,11 @@ private:
 	Vector<Ref<ItemTemplate> > _item_templates;
 	HashMap<int, Ref<ItemTemplate> > _item_template_map;
 
-    String _mob_data_folder;
+	String _mob_data_folder;
 	Vector<Ref<EntityData> > _mob_datas;
 	HashMap<int, Ref<EntityData> > _mob_data_map;
 
-    String _player_character_data_folder;
+	String _player_character_data_folder;
 	Vector<Ref<EntityData> > _player_character_datas;
 	HashMap<int, Ref<EntityData> > _player_character_data_map;
 

data/aura.cpp

@@ -72,7 +72,6 @@ void Aura::set_hide(bool value) {
 	_hide = value;
 }
 
-
 Ref<SpellEffectVisual> Aura::get_visual_spell_effects() {
 	return _visual_spell_effects;
 }
@@ -358,7 +357,6 @@ Aura::~Aura() {
 
 	_talent_required_talent.unref();
 	_talent_required_spell.unref();
-	
 }
 
 //////     Triggers      ///////
@@ -716,7 +714,7 @@ void Aura::son_after_aura_applied(Ref<AuraData> data) {
 }
 
 void Aura::son_death(Ref<AuraData> data) {
-    if (has_method("_son_death"))
+	if (has_method("_son_death"))
 		call("_son_death", data);
 }
 
@@ -794,13 +792,13 @@ void Aura::con_spell_cast_success(Ref<AuraData> data, Ref<SpellCastInfo> info) {
 }
 
 void Aura::con_death(Ref<AuraData> data) {
-    if (has_method("_con_death"))
+	if (has_method("_con_death"))
 		call("_con_death", data);
 }
 
 void Aura::con_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown) {
 	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) {
 	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);
 }
 
-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(!info.is_valid());
 
@@ -1069,7 +1067,6 @@ void Aura::_sapply(Ref<AuraApplyInfo> info) {
 
 void Aura::_sdeapply(Ref<AuraData> info) {
 	ERR_FAIL_COND(info->get_owner() == NULL || info->get_caster() == NULL || !info->get_aura().is_valid());
-
 }
 
 void Aura::_sadd(Ref<AuraData> aura) {
@@ -1193,14 +1190,14 @@ void Aura::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("son_cast_finished_target", "aura", "info"), &Aura::son_cast_finished_target);
 	ClassDB::bind_method(D_METHOD("son_spell_cast_success", "aura", "info"), &Aura::son_spell_cast_success);
 
-    ClassDB::bind_method(D_METHOD("son_before_damage_hit", "aura", "data"), &Aura::son_before_damage_hit);
+	ClassDB::bind_method(D_METHOD("son_before_damage_hit", "aura", "data"), &Aura::son_before_damage_hit);
 	ClassDB::bind_method(D_METHOD("son_hit", "aura", "data"), &Aura::son_hit);
 	ClassDB::bind_method(D_METHOD("son_before_damage", "aura", "data"), &Aura::son_before_damage);
 	ClassDB::bind_method(D_METHOD("son_damage_receive", "aura", "data"), &Aura::son_damage_receive);
 	ClassDB::bind_method(D_METHOD("son_dealt_damage", "aura", "data"), &Aura::son_dealt_damage);
 	ClassDB::bind_method(D_METHOD("son_damage_dealt", "aura", "data"), &Aura::son_damage_dealt);
 
-    ClassDB::bind_method(D_METHOD("son_before_heal_hit", "aura", "data"), &Aura::son_before_heal_hit);
+	ClassDB::bind_method(D_METHOD("son_before_heal_hit", "aura", "data"), &Aura::son_before_heal_hit);
 	ClassDB::bind_method(D_METHOD("son_before_heal", "aura", "data"), &Aura::son_before_heal);
 	ClassDB::bind_method(D_METHOD("son_heal_receive", "aura", "data"), &Aura::son_heal_receive);
 	ClassDB::bind_method(D_METHOD("son_dealt_heal", "aura", "data"), &Aura::son_dealt_heal);
@@ -1213,7 +1210,7 @@ void Aura::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("son_before_aura_applied", "data"), &Aura::son_before_aura_applied);
 	ClassDB::bind_method(D_METHOD("son_after_aura_applied", "data"), &Aura::son_after_aura_applied);
 
-    ClassDB::bind_method(D_METHOD("son_death", "data"), &Aura::son_death);
+	ClassDB::bind_method(D_METHOD("son_death", "data"), &Aura::son_death);
 
 	ClassDB::bind_method(D_METHOD("son_cooldown_added", "data", "cooldown"), &Aura::son_cooldown_added);
 	ClassDB::bind_method(D_METHOD("son_cooldown_removed", "data", "cooldown"), &Aura::son_cooldown_removed);
@@ -1237,14 +1234,14 @@ void Aura::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_son_cast_finished_target", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
 	BIND_VMETHOD(MethodInfo("_son_spell_cast_success", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
 
-    BIND_VMETHOD(MethodInfo("_son_before_damage_hit", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
+	BIND_VMETHOD(MethodInfo("_son_before_damage_hit", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
 	BIND_VMETHOD(MethodInfo("_son_hit", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
 	BIND_VMETHOD(MethodInfo("_son_before_damage", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
 	BIND_VMETHOD(MethodInfo("_son_damage_receive", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
 	BIND_VMETHOD(MethodInfo("_son_dealt_damage", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
 	BIND_VMETHOD(MethodInfo("_son_damage_dealt", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
 
-    BIND_VMETHOD(MethodInfo("_son_before_heal_hit", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
+	BIND_VMETHOD(MethodInfo("_son_before_heal_hit", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
 	BIND_VMETHOD(MethodInfo("_son_before_heal", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
 	BIND_VMETHOD(MethodInfo("_son_heal_receive", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
 	BIND_VMETHOD(MethodInfo("_son_dealt_heal", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
@@ -1257,7 +1254,7 @@ void Aura::_bind_methods() {
 	BIND_VMETHOD(MethodInfo("_son_before_aura_applied", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 	BIND_VMETHOD(MethodInfo("_son_after_aura_applied", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
-    BIND_VMETHOD(MethodInfo("_son_death", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
+	BIND_VMETHOD(MethodInfo("_son_death", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
 
 	BIND_VMETHOD(MethodInfo("_son_cooldown_added", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
 	BIND_VMETHOD(MethodInfo("_son_cooldown_removed", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
@@ -1279,7 +1276,7 @@ void Aura::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("con_cast_finished", "data", "info"), &Aura::con_cast_finished);
 	ClassDB::bind_method(D_METHOD("con_spell_cast_success", "data", "info"), &Aura::con_spell_cast_success);
 
-    ClassDB::bind_method(D_METHOD("con_death", "data"), &Aura::con_death);
+	ClassDB::bind_method(D_METHOD("con_death", "data"), &Aura::con_death);
 
 	ClassDB::bind_method(D_METHOD("con_cooldown_added", "data", "info"), &Aura::con_cooldown_added);
 	ClassDB::bind_method(D_METHOD("con_cooldown_removed", "data", "info"), &Aura::con_cooldown_removed);
@@ -1568,7 +1565,6 @@ void Aura::_bind_methods() {
 	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");
 
-
 	////    Triggers    ////
 	ADD_GROUP("Triggers", "trigger");
 	ClassDB::bind_method(D_METHOD("get_trigger_count"), &Aura::get_trigger_count);

data/aura.h

@@ -18,12 +18,12 @@
 #include "aura_trigger_data.h"
 
 #include "../entities/auras/aura_data.h"
+#include "../infos/spell_cast_info.h"
 #include "../pipelines/spell_damage_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/cooldown.h"
 
 #include "spell_effect_visual.h"
 
@@ -245,14 +245,14 @@ public:
 	void son_cast_finished_target(Ref<AuraData> aura, Ref<SpellCastInfo> info);
 	void son_spell_cast_success(Ref<AuraData> aura, Ref<SpellCastInfo> info);
 
-    void son_before_damage_hit(Ref<AuraData> aura, Ref<SpellDamageInfo> data);
+	void son_before_damage_hit(Ref<AuraData> aura, Ref<SpellDamageInfo> data);
 	void son_hit(Ref<AuraData> aura, Ref<SpellDamageInfo> data);
 	void son_before_damage(Ref<AuraData> aura, Ref<SpellDamageInfo> data);
 	void son_damage_receive(Ref<AuraData> aura, Ref<SpellDamageInfo> data);
 	void son_dealt_damage(Ref<AuraData> aura, Ref<SpellDamageInfo> data);
 	void son_damage_dealt(Ref<AuraData> aura, Ref<SpellDamageInfo> data);
 
-    void son_before_heal_hit(Ref<AuraData> aura, Ref<SpellHealInfo> data);
+	void son_before_heal_hit(Ref<AuraData> aura, Ref<SpellHealInfo> data);
 	void son_before_heal(Ref<AuraData> aura, Ref<SpellHealInfo> data);
 	void son_heal_receive(Ref<AuraData> aura, Ref<SpellHealInfo> data);
 	void son_dealt_heal(Ref<AuraData> aura, Ref<SpellHealInfo> data);
@@ -265,7 +265,7 @@ public:
 	void son_before_aura_applied(Ref<AuraData> data);
 	void son_after_aura_applied(Ref<AuraData> data);
 
-    void son_death(Ref<AuraData> data);
+	void son_death(Ref<AuraData> data);
 
 	void son_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown);
 	void son_cooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown);
@@ -276,7 +276,7 @@ public:
 	void son_gcd_started(Ref<AuraData> data, float gcd);
 	void son_gcd_finished(Ref<AuraData> data);
 
-    void son_physics_process(Ref<AuraData> data);
+	void son_physics_process(Ref<AuraData> data);
 
 	void son_xp_gained(Ref<AuraData> data, int value);
 	void son_level_up(Ref<AuraData> data, int value);
@@ -288,7 +288,7 @@ public:
 	void con_cast_finished(Ref<AuraData> data, Ref<SpellCastInfo> info);
 	void con_spell_cast_success(Ref<AuraData> data, Ref<SpellCastInfo> info);
 
-    void con_death(Ref<AuraData> data);
+	void con_death(Ref<AuraData> data);
 
 	void con_cooldown_added(Ref<AuraData> data, Ref<Cooldown> cooldown);
 	void con_cooldown_removed(Ref<AuraData> data, Ref<Cooldown> cooldown);

data/aura_stat_attribute.cpp

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

data/aura_stat_attribute.h

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

data/aura_trigger_data.h

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

data/craft_recipe.cpp

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

data/craft_recipe.h

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

data/equipment_data_entry.cpp

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

data/equipment_data_entry.h

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

data/item_instance.cpp

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

data/item_instance.h

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

data/item_stat_modifier.cpp

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

data/item_stat_modifier.h

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

data/item_template.h

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

data/item_template_stat_modifier.cpp

@@ -106,4 +106,3 @@ void ItemTemplateStatModifier::_bind_methods() {
 	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");
 }
-

data/item_template_stat_modifier.h

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

data/item_visual.cpp

@@ -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_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);
-
 }

data/item_visual_entry.cpp

@@ -52,9 +52,9 @@ ItemVisualEntry::ItemVisualEntry() {
 
 ItemVisualEntry::~ItemVisualEntry() {
 	for (int i = 0; i < EntityEnums::GENDER_COUNT; ++i) {
-		#ifdef MESH_DATA_RESOURCE_PRESENT
+#ifdef MESH_DATA_RESOURCE_PRESENT
 		_mesh[i].unref();
-		#endif
+#endif
 
 		_texture[i].unref();
 	}
@@ -67,12 +67,12 @@ void ItemVisualEntry::_bind_methods() {
 	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");
 
-	#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("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_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("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_female"), "set_effect_offset", "get_effect_offset", EntityEnums::GENDER_FEMALE);
 }
-

data/item_visual_entry.h

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

data/spell.cpp

@@ -1,9 +1,9 @@
 #include "spell.h"
 
-#include "aura.h"
-#include "craft_recipe.h"
 #include "../entities/resources/entity_resource_cost_data.h"
 #include "../entities/skills/entity_skill_data.h"
+#include "aura.h"
+#include "craft_recipe.h"
 
 int Spell::get_id() {
 	return _id;
@@ -145,7 +145,6 @@ void Spell::set_projectile(Ref<WorldSpellData> value) {
 	_projectile = value;
 }
 
-
 Ref<CraftRecipe> Spell::get_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) {
 	_training_required_skill_level = value;
-
 }
 
 ////    Spell System    ////
@@ -694,8 +692,6 @@ void Spell::_sstart_casting(Ref<SpellCastInfo> info) {
 
 	info->get_target()->son_cast_finished_target(info);
 
-	
-
 	if (get_projectile().is_valid()) {
 		//fire_projectile(info);
 	} else {
@@ -758,13 +754,11 @@ pass
 #		sp.launch(info, projectile, projectile_speed)
 
 	*/
-
 }
 
 void Spell::_handle_effect(Ref<SpellCastInfo> info) {
 
-
+	/*
-/*
 
 	if target_type == SPELL_TARGET_TYPE_TARGET:
 		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);
 	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_ENEMY);
 	BIND_ENUM_CONSTANT(TARGET_FRIENDLY);

data/spell.h

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

data/spell_effect_visual_simple.cpp

@@ -1,6 +1,5 @@
 #include "spell_effect_visual_simple.h"
 
-
 bool SpellEffectVisualSimple::has_spell_effect_visual() {
 	return _effect_visual.is_valid();
 }
@@ -47,7 +46,6 @@ void SpellEffectVisualSimple::set_spell_cast_effect(Ref<PackedScene> value) {
 	_spell_cast_effect = value;
 }
 
-
 //Visual Effect
 
 bool SpellEffectVisualSimple::has_aura_effect_visual() {
@@ -68,7 +66,6 @@ void SpellEffectVisualSimple::set_aura_effect_visual(Ref<PackedScene> value) {
 	_aura_effect_visual = value;
 }
 
-
 SpellEffectVisualSimple::SpellEffectVisualSimple() {
 }
 
@@ -103,7 +100,7 @@ void SpellEffectVisualSimple::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_spell_cast_effect", "value"), &SpellEffectVisualSimple::set_spell_cast_effect);
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "effect_spell_cast_effect_id", PROPERTY_HINT_RESOURCE_TYPE, "PackedScene"), "set_spell_cast_effect", "get_spell_cast_effect");
 
-		//Visual Effect
+	//Visual Effect
 	ADD_GROUP("Aura Effect", "aura_effect");
 	ClassDB::bind_method(D_METHOD("has_aura_effect_visual"), &SpellEffectVisualSimple::has_aura_effect_visual);
 

entities/ai/entity_ai.cpp

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

entities/auras/aura_data.cpp

@@ -130,8 +130,8 @@ void AuraData::set_spell_scale(float value) {
 
 Ref<Aura> AuraData::get_aura() {
 	//if (_aura == NULL) {
-		//TODO fix!
+	//TODO fix!
-		//_aura = Auras::getInstance()->GetData(get_aura_id());
+	//_aura = Auras::getInstance()->GetData(get_aura_id());
 	//}
 
 	return _aura;

entities/auras/aura_data.h

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

entities/data/character_spec.cpp

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

entities/data/entity_class_data.cpp

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

entities/data/entity_class_data.h

@@ -1,10 +1,10 @@
 #ifndef 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/resource.h"
+#include "core/ustring.h"
+#include "core/vector.h"
 #include "scene/resources/texture.h"
 
 #include "../../entities/stats/stat_data.h"
@@ -14,9 +14,9 @@
 #include "../../pipelines/spell_damage_info.h"
 #include "../../pipelines/spell_heal_info.h"
 
-#include "../../utility/cooldown.h"
-#include "../../utility/category_cooldown.h"
 #include "../../item_enums.h"
+#include "../../utility/category_cooldown.h"
+#include "../../utility/cooldown.h"
 
 #include "../resources/entity_resource_data.h"
 
@@ -67,7 +67,7 @@ public:
 	Vector<Variant> get_entity_resources();
 	void set_entity_resources(const Vector<Variant> &entity_resourcess);
 
-    //Specs
+	//Specs
 	int get_num_specs();
 	void set_num_specs(int value);
 
@@ -77,7 +77,7 @@ public:
 	Vector<Variant> get_specs();
 	void set_specs(const Vector<Variant> &specs);
 
-    //Spells
+	//Spells
 	int get_num_spells();
 	void set_num_spells(int value);
 
@@ -97,7 +97,7 @@ public:
 	Vector<Variant> get_start_spells();
 	void set_start_spells(const Vector<Variant> &spells);
 
-    //Auras
+	//Auras
 	int get_num_auras();
 	void set_num_auras(int value);
 
@@ -128,7 +128,7 @@ public:
 
 	void start_casting(int spell_id, Entity *caster, float spellScale);
 
-    void son_before_cast(Ref<SpellCastInfo> info);
+	void son_before_cast(Ref<SpellCastInfo> info);
 	void son_before_cast_target(Ref<SpellCastInfo> info);
 	void son_cast_finished_target(Ref<SpellCastInfo> info);
 	void son_cast_finished(Ref<SpellCastInfo> info);
@@ -136,24 +136,24 @@ public:
 	void son_cast_failed(Ref<SpellCastInfo> info);
 	void son_spell_cast_success(Ref<SpellCastInfo> info);
 
-    void son_before_damage_hit(Ref<SpellDamageInfo> data);
+	void son_before_damage_hit(Ref<SpellDamageInfo> data);
 	void son_hit(Ref<SpellDamageInfo> data);
 	void son_before_damage(Ref<SpellDamageInfo> data);
 	void son_damage_receive(Ref<SpellDamageInfo> data);
 	void son_dealt_damage(Ref<SpellDamageInfo> data);
 	void son_damage_dealt(Ref<SpellDamageInfo> data);
 
-    void son_before_heal_hit(Ref<SpellHealInfo> data);
+	void son_before_heal_hit(Ref<SpellHealInfo> data);
 	void son_before_heal(Ref<SpellHealInfo> data);
 	void son_heal_receive(Ref<SpellHealInfo> data);
 	void son_dealt_heal(Ref<SpellHealInfo> data);
 	void son_heal_dealt(Ref<SpellHealInfo> data);
 
-    void son_before_aura_applied(Ref<AuraData> data);
+	void son_before_aura_applied(Ref<AuraData> data);
 	void son_after_aura_applied(Ref<AuraData> data);
 
-    void son_death(Entity *entity);
+	void son_death(Entity *entity);
-    void son_death_bind(Node *entity);
+	void son_death_bind(Node *entity);
 
 	void son_cooldown_added(Ref<Cooldown> cooldown);
 	void son_cooldown_removed(Ref<Cooldown> cooldown);
@@ -171,7 +171,7 @@ public:
 	void son_level_up(Entity *entity, int value);
 	void son_level_up_bind(Node *entity, int value);
 
-    //Clientside Event Handlers
+	//Clientside Event Handlers
 	void con_cast_failed(Ref<SpellCastInfo> info);
 	void con_cast_started(Ref<SpellCastInfo> info);
 	void con_cast_state_changed(Ref<SpellCastInfo> info);
@@ -179,7 +179,7 @@ public:
 	void con_spell_cast_success(Ref<SpellCastInfo> info);
 
 	void con_death(Entity *entity);
-    void con_death_bind(Node *entity);
+	void con_death_bind(Node *entity);
 
 	void con_cooldown_added(Ref<Cooldown> cooldown);
 	void con_cooldown_removed(Ref<Cooldown> cooldown);

entities/data/entity_data.h

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

entities/data/entity_data_container.cpp

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

entities/data/entity_data_container.h

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

entities/data/item_container_data_entry.cpp

@@ -3,24 +3,23 @@
 #include "../../data/item_template.h"
 
 Ref<ItemTemplate> ItemContainerDataEntry::get_item() {
-    return _item;
+	return _item;
 }
 void ItemContainerDataEntry::set_item(Ref<ItemTemplate> item) {
-    _item = item;
+	_item = item;
 }
 
 int ItemContainerDataEntry::get_item_count() const {
-    return _item_count;
+	return _item_count;
 }
 void ItemContainerDataEntry::set_item_count(int value) {
-    _item_count = value;
+	_item_count = value;
 }
 
 ItemContainerDataEntry::ItemContainerDataEntry() {
-    _item_count = 0;
+	_item_count = 0;
 }
 ItemContainerDataEntry::~ItemContainerDataEntry() {
-
 }
 
 void ItemContainerDataEntry::_bind_methods() {
@@ -28,7 +27,7 @@ void ItemContainerDataEntry::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item", "item"), &ItemContainerDataEntry::set_item);
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemTemplate"), "set_item", "get_item");
 
-    ClassDB::bind_method(D_METHOD("get_item_count"), &ItemContainerDataEntry::get_item_count);
+	ClassDB::bind_method(D_METHOD("get_item_count"), &ItemContainerDataEntry::get_item_count);
 	ClassDB::bind_method(D_METHOD("set_item_count", "value"), &ItemContainerDataEntry::set_item_count);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "item_count"), "set_item_count", "get_item_count");
 }

entities/data/item_container_data_entry.h

@@ -9,10 +9,10 @@ class ItemContainerDataEntry : public Resource {
 	GDCLASS(ItemContainerDataEntry, Resource);
 
 public:
-    Ref<ItemTemplate> get_item();
+	Ref<ItemTemplate> get_item();
 	void set_item(Ref<ItemTemplate> item);
 
-    int get_item_count() const;
+	int get_item_count() const;
 	void set_item_count(int value);
 
 	ItemContainerDataEntry();
@@ -23,7 +23,7 @@ protected:
 
 private:
 	Ref<ItemTemplate> _item;
-    int _item_count;
+	int _item_count;
 };
 
 #endif

entities/data/vendor_item_data.cpp

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

entities/data/vendor_item_data_entry.cpp

@@ -3,37 +3,37 @@
 #include "../../data/item_template.h"
 
 Ref<ItemTemplate> VendorItemDataEntry::get_item() {
-    return _item;
+	return _item;
 }
 void VendorItemDataEntry::set_item(Ref<ItemTemplate> item) {
-    _item = item;
+	_item = item;
 }
 
 int VendorItemDataEntry::get_item_price() const {
-    return _item_price;
+	return _item_price;
 }
 void VendorItemDataEntry::set_item_price(int value) {
-    _item_price = value;
+	_item_price = value;
 }
 
 int VendorItemDataEntry::get_item_count() const {
-    return _item_count;
+	return _item_count;
 }
 void VendorItemDataEntry::set_item_count(int value) {
-    _item_count = value;
+	_item_count = value;
 }
 
 int VendorItemDataEntry::get_item_spawn_time() const {
-    return _item_spawn_time;
+	return _item_spawn_time;
 }
 void VendorItemDataEntry::set_item_spawn_time(int value) {
-    _item_spawn_time = value;
+	_item_spawn_time = value;
 }
 
 VendorItemDataEntry::VendorItemDataEntry() {
-    _item_price = 0;
+	_item_price = 0;
-    _item_count = 0;
+	_item_count = 0;
-    _item_spawn_time = 0;
+	_item_spawn_time = 0;
 }
 VendorItemDataEntry::~VendorItemDataEntry() {
 }
@@ -43,15 +43,15 @@ void VendorItemDataEntry::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_item", "item"), &VendorItemDataEntry::set_item);
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemTemplate"), "set_item", "get_item");
 
-    ClassDB::bind_method(D_METHOD("get_item_price"), &VendorItemDataEntry::get_item_price);
+	ClassDB::bind_method(D_METHOD("get_item_price"), &VendorItemDataEntry::get_item_price);
 	ClassDB::bind_method(D_METHOD("set_item_price", "value"), &VendorItemDataEntry::set_item_price);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "item_price"), "set_item_price", "get_item_price");
 
-    ClassDB::bind_method(D_METHOD("get_item_count"), &VendorItemDataEntry::get_item_count);
+	ClassDB::bind_method(D_METHOD("get_item_count"), &VendorItemDataEntry::get_item_count);
 	ClassDB::bind_method(D_METHOD("set_item_count", "value"), &VendorItemDataEntry::set_item_count);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "item_count"), "set_item_count", "get_item_count");
 
-    ClassDB::bind_method(D_METHOD("get_item_spawn_time"), &VendorItemDataEntry::get_item_spawn_time);
+	ClassDB::bind_method(D_METHOD("get_item_spawn_time"), &VendorItemDataEntry::get_item_spawn_time);
 	ClassDB::bind_method(D_METHOD("set_item_spawn_time", "value"), &VendorItemDataEntry::set_item_spawn_time);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "item_spawn_time"), "set_item_spawn_time", "get_item_spawn_time");
 }

entities/data/vendor_item_data_entry.h

@@ -9,16 +9,16 @@ class VendorItemDataEntry : public Resource {
 	GDCLASS(VendorItemDataEntry, Resource);
 
 public:
-    Ref<ItemTemplate> get_item();
+	Ref<ItemTemplate> get_item();
 	void set_item(Ref<ItemTemplate> item);
 
-    int get_item_price() const;
+	int get_item_price() const;
 	void set_item_price(int value);
 
-    int get_item_count() const;
+	int get_item_count() const;
 	void set_item_count(int value);
 
-    int get_item_spawn_time() const;
+	int get_item_spawn_time() const;
 	void set_item_spawn_time(int time);
 
 	VendorItemDataEntry();
@@ -29,9 +29,9 @@ protected:
 
 private:
 	Ref<ItemTemplate> _item;
-    int _item_price;
+	int _item_price;
-    int _item_count;
+	int _item_count;
-    int _item_spawn_time;
+	int _item_spawn_time;
 };
 
 #endif

entities/entity.cpp

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

entities/entity.h

@@ -127,10 +127,10 @@ enum PlayerSendFlags {
 	}                                                         \
 	normalfunc(normal_var);
 
-#define VRPCOBJP(rpcfunc, rpc_var1, rpc_var2, normalfunc, normal_var1, normal_var2)  \
+#define VRPCOBJP(rpcfunc, rpc_var1, rpc_var2, normalfunc, normal_var1, normal_var2) \
-	if (is_inside_tree() && get_tree()->has_network_peer()) {                        \
+	if (is_inside_tree() && get_tree()->has_network_peer()) {                       \
-		vrpc(#rpcfunc, rpc_var1, rpc_var2);                                          \
+		vrpc(#rpcfunc, rpc_var1, rpc_var2);                                         \
-	}                                                                                \
+	}                                                                               \
 	normalfunc(normal_var1, normal_var2);
 
 #define ORPCOBJ(rpcfunc, rpc_var, normalfunc, normal_var)                 \

entities/resources/entity_resource.cpp

@@ -18,10 +18,10 @@ void EntityResource::set_should_process(bool value) {
 	_should_process = value;
 }
 
-Ref<EntityResourceData>  EntityResource::get_resource_data() {
+Ref<EntityResourceData> EntityResource::get_resource_data() {
 	return _data;
 }
-void EntityResource::set_resource_data(Ref<EntityResourceData>  value) {
+void EntityResource::set_resource_data(Ref<EntityResourceData> value) {
 	_data = value;
 
 	if (_data.is_valid())

entities/resources/entity_resource_data.cpp

@@ -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("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");
-
 }

entities/skills/entity_skill.cpp

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

entities/skills/entity_skill_data.cpp

@@ -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("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");
-
 }

entities/stats/complex_level_stat_data.cpp

@@ -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("set_spirit_for_level", "level", "value"), &ComplexLevelStatData::set_spirit_for_level);
 
-
 	for (int i = 0; i < EntityEnums::MAX_LEVEL; ++i) {
 		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);

entities/stats/level_stat_data.cpp

@@ -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);
 }
-

entities/stats/stat.h

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

entities/stats/stat_data.cpp

@@ -39,7 +39,6 @@ void StatData::get_stat_for_stat(Ref<Stat> stat) {
 	sd->get_stats_for_stat(stat);
 }
 
-
 StatData::StatData() {
 	for (int i = 0; i < Stat::STAT_ID_TOTAL_STATS; ++i) {
 		Ref<StatDataEntry> entry(memnew(StatDataEntry()));
@@ -75,10 +74,9 @@ void StatData::_bind_methods() {
 	ADD_GROUP("Base Stats", "base_stat");
 	for (int i = 0; i < Stat::STAT_ID_TOTAL_STATS; ++i) {
 		ADD_PROPERTYI(PropertyInfo(Variant::OBJECT, "base_stat_" + Stat::stat_id_name(i), PROPERTY_HINT_RESOURCE_TYPE, "StatDataEntry"), "set_stat_data_enum", "get_stat_data_enum", i);
-    }
+	}
 
 	ClassDB::bind_method(D_METHOD("get_level_stat_data"), &StatData::get_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");
 }
-

entities/stats/stat_data.h

@@ -1,15 +1,15 @@
 #ifndef STAT_DATA_H
 #define STAT_DATA_H
 
-#include "scene/resources/curve.h"
 #include "core/resource.h"
+#include "scene/resources/curve.h"
 
-#include "stat_data_entry.h"
-#include "stat.h"
 #include "level_stat_data.h"
+#include "stat.h"
+#include "stat_data_entry.h"
 
 class StatData : public Resource {
-    GDCLASS(StatData, Resource);
+	GDCLASS(StatData, Resource);
 
 public:
 	Ref<StatDataEntry> get_stat_data_int(int index);
@@ -18,21 +18,20 @@ public:
 	Ref<StatDataEntry> get_stat_data_enum(Stat::StatId stat_id);
 	void set_stat_data_enum(Stat::StatId stat_id, Ref<StatDataEntry> entry);
 
-    Ref<LevelStatData> get_level_stat_data();
+	Ref<LevelStatData> get_level_stat_data();
 	void set_level_stat_data(Ref<LevelStatData> value);
 
-    void get_stat_for_stat(Ref<Stat> stat);
+	void get_stat_for_stat(Ref<Stat> stat);
 
-    StatData();
+	StatData();
 
 protected:
-    static void _bind_methods();
+	static void _bind_methods();
 
 private:
 	Ref<StatDataEntry> _entries[Stat::STAT_ID_TOTAL_STATS];
 
-    Ref<LevelStatData> _level_stat_data;
+	Ref<LevelStatData> _level_stat_data;
-
 };
 
 #endif

entity_data_manager.cpp

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

entity_data_manager.h

@@ -76,7 +76,7 @@ public:
 	Ref<ItemTemplate> get_item_template_index(int index);
 	int get_item_template_count();
 
-    String get_mob_data_folder();
+	String get_mob_data_folder();
 	void set_mob_data_folder(String folder);
 	Vector<Ref<EntityData> > *get_mob_datas();
 	void add_mob_data(Ref<EntityData> aura);
@@ -84,7 +84,7 @@ public:
 	Ref<EntityData> get_mob_data_index(int index);
 	int get_mob_data_count();
 
-    String get_player_character_data_folder();
+	String get_player_character_data_folder();
 	void set_player_character_data_folder(String folder);
 	Vector<Ref<EntityData> > *get_player_character_datas();
 	void add_player_character_data(Ref<EntityData> aura);
@@ -99,16 +99,16 @@ public:
 	void load_characters();
 	void load_craft_datas();
 	void load_item_templates();
-    void load_mob_datas();
+	void load_mob_datas();
-    void load_player_character_datas();
+	void load_player_character_datas();
 
 	void list_characters();
 	void list_spells();
 	void list_auras();
 	void list_craft_data();
 	void list_item_templates();
-    void list_mob_datas();
+	void list_mob_datas();
-    void list_player_character_datas();
+	void list_player_character_datas();
 
 	bool get_automatic_load() { return _automatic_load; }
 	void set_automatic_load(bool load) { _automatic_load = load; }
@@ -144,11 +144,11 @@ private:
 	Vector<Ref<ItemTemplate> > _item_templates;
 	HashMap<int, Ref<ItemTemplate> > _item_template_map;
 
-    String _mob_data_folder;
+	String _mob_data_folder;
 	Vector<Ref<EntityData> > _mob_datas;
 	HashMap<int, Ref<EntityData> > _mob_data_map;
 
-    String _player_character_data_folder;
+	String _player_character_data_folder;
 	Vector<Ref<EntityData> > _player_character_datas;
 	HashMap<int, Ref<EntityData> > _player_character_data_map;
 

entity_enums.h

@@ -12,13 +12,13 @@ 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_CHARCATER_SKELETON_POINTS;
-    static const String BINDING_STRING_AI_STATES;
+	static const String BINDING_STRING_AI_STATES;
 	static const String BINDING_STRING_PET_STATES;
-    static const String BINDING_STRING_ENTITY_IMMUNITY_FLAGS;
+	static const String BINDING_STRING_ENTITY_IMMUNITY_FLAGS;
-    static const String BINDING_STRING_ENTITY_INTERACTION_TYPE;
+	static const String BINDING_STRING_ENTITY_INTERACTION_TYPE;
-    static const String BINDING_STRING_ENTITY_PLAYSTYLE_TYPE;
+	static const String BINDING_STRING_ENTITY_PLAYSTYLE_TYPE;
-    static const String BINDING_STRING_ENTITY_GENDER;
+	static const String BINDING_STRING_ENTITY_GENDER;
 	static const String BINDING_STRING_ENTITY_WINDOWS;
 
 	enum EntityType {
@@ -149,7 +149,7 @@ public:
 		ENTITY_IMMUNITY_FLAG_DISPELL = 1 << 30,
 	};
 
-    enum CharacterSkeletonPoints {
+	enum CharacterSkeletonPoints {
 		SKELETON_POINT_ROOT = 0,
 		SKELETON_POINT_PELVIS = 1,
 		SKELETON_POINT_SPINE = 2,
@@ -190,8 +190,8 @@ public:
 	enum AIStates {
 		AI_STATE_OFF = 0,
 		AI_STATE_REST,
-        AI_STATE_PATROL,
+		AI_STATE_PATROL,
-        AI_STATE_FOLLOW_PATH,
+		AI_STATE_FOLLOW_PATH,
 		AI_STATE_REGENERATE,
 		AI_STATE_ATTACK,
 
@@ -229,7 +229,6 @@ public:
 		ENTITY_WINDOW_VENDOR = 2,
 	};
 
-
 	enum {
 		GENDER_COUNT = 2,
 		MAX_LEVEL = 50,

formations/ai_formation.cpp

@@ -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("_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");
-
 }

infos/Queued/GenericAOESpell.cpp

@@ -1,164 +1,155 @@
 #include "GenericAOESpell.h"
 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) {
-					this->hasCastTime = true;
+	if (!Mathf::Approximately(spell->CastTime, (float)0)) {
-				}
+		this->hasCastTime = true;
-				if (!Mathf::Approximately(spell->Cooldown, (float)0)) {
+	}
-					this->hasCooldown = true;
+	if (!Mathf::Approximately(spell->Cooldown, (float)0)) {
-				}
+		this->hasCooldown = true;
-				this->genericSpellAttribute = spell->GenericSpellData;
+	}
-				this->spellHealAttribute = spell->SpellHealData;
+	this->genericSpellAttribute = spell->GenericSpellData;
-				if (this->spellHealAttribute != null) {
+	this->spellHealAttribute = spell->SpellHealData;
-					this->heal = true;
+	if (this->spellHealAttribute != null) {
-				}
+		this->heal = true;
-				if ((spell->DamageMin > 0) && (spell->DamageMax > 0)) {
+	}
-					this->damage = true;
+	if ((spell->DamageMin > 0) && (spell->DamageMax > 0)) {
-				}
+		this->damage = true;
-				this->aoeAttrib = spell->SpellAOEData;
+	}
-				if (this->aoeAttrib == null) {
+	this->aoeAttrib = spell->SpellAOEData;
-					Debug::LogError((*(new String("Spell ")) + *(spell->name)) + *(new String(" doesn't have an AOEAttribute attached!")));
+	if (this->aoeAttrib == null) {
-				}
+		Debug::LogError((*(new String("Spell ")) + *(spell->name)) + *(new String(" doesn't have an AOEAttribute attached!")));
-				this->rangeAttrib = spell->SpellRangeData;
+	}
-				if (this->rangeAttrib != null) {
+	this->rangeAttrib = spell->SpellRangeData;
-					this->range = true;
+	if (this->rangeAttrib != null) {
-				}
+		this->range = true;
-				this->spellCastEffectAttribute = spell->SpellCastEffectData;
+	}
-				if (this->spellCastEffectAttribute != null) {
+	this->spellCastEffectAttribute = spell->SpellCastEffectData;
-					this->hasSpellCastEffect = true;
+	if (this->spellCastEffectAttribute != null) {
-				}
+		this->hasSpellCastEffect = true;
-			}
-			void GenericAOESpell::StartCasting(WorldEntity* caster, float spellScale)
-			{
-				if ((this->genericSpellAttribute->NeedsTarget || this->damage) && !this->hasCastTime) {
-					if (!SpellScript::CanCastTarget(caster, 0)) {
-						return;
-					}
-				}
-				else {
-					if (!SpellScript::CanCast(caster, 0)) {
-						return;
-					}
-				}
-				WorldEntity* worldEntity = null;
-				if (this->genericSpellAttribute->NeedsTarget || this->damage) {
-					worldEntity = SpellScript::GetTarget(caster);
-				}
-				if (!this->hasCastTime) {
-					if (this->range && !SpellScript::isInRange(caster, worldEntity)) {
-						return;
-					}
-					this->HandleSpellEffect(caster, worldEntity, spellScale);
-					return;
-				}
-				else {
-					if (!SpellScript::SpellCostCheck(caster)) {
-						return;
-					}
-					SpellScript::DoStartCasting(caster, this->spellId, this->spell->NameKey, this->spell->CastTime, !this->genericSpellAttribute->CanMoveWhileCasting, spellScale);
-					return;
-				}
-			}
-			void GenericAOESpell::CastingFinished(WorldEntity* caster, float spellScale)
-			{
-				WorldEntity* worldEntity = null;
-				if (this->genericSpellAttribute->NeedsTarget || this->damage) {
-					worldEntity = SpellScript::GetTarget(caster);
-				}
-				if (this->genericSpellAttribute->NeedsTarget && (worldEntity == null)) {
-					return;
-				}
-				if (this->range && !SpellScript::isInRange(caster, worldEntity)) {
-					return;
-				}
-				this->HandleSpellEffect(caster, worldEntity, spellScale);
-				if (this->hasCastTime && !this->genericSpellAttribute->CanMoveWhileCasting) {
-					SpellScript::RemoveOnMoveHook(caster);
-				}
-			}
-			void GenericAOESpell::SpellHit(WorldEntity* caster, WorldEntity* target, WorldSpell* worldSpell, Spell* spellGo, float spellScale)
-			{
-				if (target->CompareTag(new String("Player"))) {
-					if (this->damage) {
-						SpellScript::DealDamage(caster, target, spellScale);
-					}
-					if (this->heal) {
-						SpellScript::Heal(caster, caster, spellScale);
-					}
-					if (this->spell->CasterAuraApply != 0) {
-						SpellScript::ApplyAura(this->spell->CasterAuraApply, caster, spellScale);
-					}
-					if (this->spell->CasterAuraApply2 != 0) {
-						SpellScript::ApplyAura(this->spell->CasterAuraApply2, caster, spellScale);
-					}
-					if (this->spell->TargetAuraApply != 0) {
-						SpellScript::ApplyAura(this->spell->TargetAuraApply, target, spellScale);
-					}
-					if (this->spell->TargetAuraApply2 != 0) {
-						SpellScript::ApplyAura(this->spell->TargetAuraApply2, target, spellScale);
-					}
-				}
-				worldSpell->Destroy();
-			}
-			void GenericAOESpell::OnPlayerMove(Entity* caster)
-			{
-				SpellScript::DoCastFail((WorldEntity*)(caster), true);
-			}
-			void GenericAOESpell::HandleSpellEffect(WorldEntity* caster, WorldEntity* target, float spellScale)
-			{
-				if (!SpellScript::SpellCostCheckAndRemove(caster)) {
-					return;
-				}
-				if (this->damage) {
-					SpellScript::DealDamage(caster, target, spellScale);
-				}
-				if (this->heal) {
-					SpellScript::Heal(caster, caster, spellScale);
-				}
-				if (this->spell->CasterAuraApply != 0) {
-					SpellScript::ApplyAura(this->spell->CasterAuraApply, caster, spellScale);
-				}
-				if (this->spell->CasterAuraApply2 != 0) {
-					SpellScript::ApplyAura(this->spell->CasterAuraApply2, caster, spellScale);
-				}
-				if (this->spell->TargetAuraApply != 0) {
-					SpellScript::ApplyAura(this->spell->TargetAuraApply, target, spellScale);
-				}
-				if (this->spell->TargetAuraApply2 != 0) {
-					SpellScript::ApplyAura(this->spell->TargetAuraApply2, target, spellScale);
-				}
-				if (this->spell->HasGlobalCooldown) {
-					SpellScript::TriggerGlobalCooldown(caster);
-				}
-				SpellScript::SpellResourceGive(caster);
-				if (this->hasCooldown) {
-					SpellScript::AddCooldown(caster, this->spellId, this->spell->Cooldown);
-				}
-				SpellScript::SpellCastSuccess(caster);
-			}
-			void GenericAOESpell::COnSpellCastSuccess(WorldEntity* player)
-			{
-				if (!this->hasCastTime) {
-					SpellScript::PlayStandardSpellCastFinish(player);
-					return;
-				}
-				SpellScript::PlayStandardSpellCastFinish();
-			}
-			void GenericAOESpell::COnSpellCastStarted(WorldEntity* player)
-			{
-				if (this->hasSpellCastEffect) {
-					SpellScript::AddSpellCastEffect(player);
-				}
-			}
-			void GenericAOESpell::COnSpellCastEnded(WorldEntity* player)
-			{
-				if (this->hasSpellCastEffect) {
-					SpellScript::RemoveSpellCastEffects(player);
-				}
-			}
-
-		}
 	}
 }
+void GenericAOESpell::StartCasting(WorldEntity *caster, float spellScale) {
+	if ((this->genericSpellAttribute->NeedsTarget || this->damage) && !this->hasCastTime) {
+		if (!SpellScript::CanCastTarget(caster, 0)) {
+			return;
+		}
+	} else {
+		if (!SpellScript::CanCast(caster, 0)) {
+			return;
+		}
+	}
+	WorldEntity *worldEntity = null;
+	if (this->genericSpellAttribute->NeedsTarget || this->damage) {
+		worldEntity = SpellScript::GetTarget(caster);
+	}
+	if (!this->hasCastTime) {
+		if (this->range && !SpellScript::isInRange(caster, worldEntity)) {
+			return;
+		}
+		this->HandleSpellEffect(caster, worldEntity, spellScale);
+		return;
+	} else {
+		if (!SpellScript::SpellCostCheck(caster)) {
+			return;
+		}
+		SpellScript::DoStartCasting(caster, this->spellId, this->spell->NameKey, this->spell->CastTime, !this->genericSpellAttribute->CanMoveWhileCasting, spellScale);
+		return;
+	}
+}
+void GenericAOESpell::CastingFinished(WorldEntity *caster, float spellScale) {
+	WorldEntity *worldEntity = null;
+	if (this->genericSpellAttribute->NeedsTarget || this->damage) {
+		worldEntity = SpellScript::GetTarget(caster);
+	}
+	if (this->genericSpellAttribute->NeedsTarget && (worldEntity == null)) {
+		return;
+	}
+	if (this->range && !SpellScript::isInRange(caster, worldEntity)) {
+		return;
+	}
+	this->HandleSpellEffect(caster, worldEntity, spellScale);
+	if (this->hasCastTime && !this->genericSpellAttribute->CanMoveWhileCasting) {
+		SpellScript::RemoveOnMoveHook(caster);
+	}
+}
+void GenericAOESpell::SpellHit(WorldEntity *caster, WorldEntity *target, WorldSpell *worldSpell, Spell *spellGo, float spellScale) {
+	if (target->CompareTag(new String("Player"))) {
+		if (this->damage) {
+			SpellScript::DealDamage(caster, target, spellScale);
+		}
+		if (this->heal) {
+			SpellScript::Heal(caster, caster, spellScale);
+		}
+		if (this->spell->CasterAuraApply != 0) {
+			SpellScript::ApplyAura(this->spell->CasterAuraApply, caster, spellScale);
+		}
+		if (this->spell->CasterAuraApply2 != 0) {
+			SpellScript::ApplyAura(this->spell->CasterAuraApply2, caster, spellScale);
+		}
+		if (this->spell->TargetAuraApply != 0) {
+			SpellScript::ApplyAura(this->spell->TargetAuraApply, target, spellScale);
+		}
+		if (this->spell->TargetAuraApply2 != 0) {
+			SpellScript::ApplyAura(this->spell->TargetAuraApply2, target, spellScale);
+		}
+	}
+	worldSpell->Destroy();
+}
+void GenericAOESpell::OnPlayerMove(Entity *caster) {
+	SpellScript::DoCastFail((WorldEntity *)(caster), true);
+}
+void GenericAOESpell::HandleSpellEffect(WorldEntity *caster, WorldEntity *target, float spellScale) {
+	if (!SpellScript::SpellCostCheckAndRemove(caster)) {
+		return;
+	}
+	if (this->damage) {
+		SpellScript::DealDamage(caster, target, spellScale);
+	}
+	if (this->heal) {
+		SpellScript::Heal(caster, caster, spellScale);
+	}
+	if (this->spell->CasterAuraApply != 0) {
+		SpellScript::ApplyAura(this->spell->CasterAuraApply, caster, spellScale);
+	}
+	if (this->spell->CasterAuraApply2 != 0) {
+		SpellScript::ApplyAura(this->spell->CasterAuraApply2, caster, spellScale);
+	}
+	if (this->spell->TargetAuraApply != 0) {
+		SpellScript::ApplyAura(this->spell->TargetAuraApply, target, spellScale);
+	}
+	if (this->spell->TargetAuraApply2 != 0) {
+		SpellScript::ApplyAura(this->spell->TargetAuraApply2, target, spellScale);
+	}
+	if (this->spell->HasGlobalCooldown) {
+		SpellScript::TriggerGlobalCooldown(caster);
+	}
+	SpellScript::SpellResourceGive(caster);
+	if (this->hasCooldown) {
+		SpellScript::AddCooldown(caster, this->spellId, this->spell->Cooldown);
+	}
+	SpellScript::SpellCastSuccess(caster);
+}
+void GenericAOESpell::COnSpellCastSuccess(WorldEntity *player) {
+	if (!this->hasCastTime) {
+		SpellScript::PlayStandardSpellCastFinish(player);
+		return;
+	}
+	SpellScript::PlayStandardSpellCastFinish();
+}
+void GenericAOESpell::COnSpellCastStarted(WorldEntity *player) {
+	if (this->hasSpellCastEffect) {
+		SpellScript::AddSpellCastEffect(player);
+	}
+}
+void GenericAOESpell::COnSpellCastEnded(WorldEntity *player) {
+	if (this->hasSpellCastEffect) {
+		SpellScript::RemoveSpellCastEffects(player);
+	}
+}
+
+} // namespace generic
+} // namespace SpellsNS
+} // namespace BS

infos/Queued/GenericAOESpell.h

@@ -1,74 +1,86 @@
 #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 "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 "WorldSpell.h"
-#include "Entity.h"
+#include <System/System.h>
 
 using namespace UnityEngine;
 using namespace BS::Player;
 using namespace BS::SpellsNS::WorldSpells;
 using namespace System;
 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;
-				//Attribute: SerializeField*
+
-				private:
+private:
-					bool damage;
+	SpellRangeData *rangeAttrib;
-				//Attribute: SerializeField*
+	//Attribute: SerializeField*
-				private:
+private:
-					bool heal;
+	bool damage;
-				//Attribute: SerializeField*
+	//Attribute: SerializeField*
-				private:
+private:
-					bool hasCooldown;
+	bool heal;
-				//Attribute: SerializeField*
+	//Attribute: SerializeField*
-				private:
+private:
-					bool hasCastTime;
+	bool hasCooldown;
-				//Attribute: SerializeField*
+	//Attribute: SerializeField*
-				private:
+private:
-					bool hasSpellCastEffect;
+	bool hasCastTime;
-				//Attribute: SerializeField*
+	//Attribute: SerializeField*
-				private:
+private:
-					bool range;
+	bool hasSpellCastEffect;
-				public:
+	//Attribute: SerializeField*
-					GenericAOESpell(Spell* spell);
+private:
-				public:
+	bool range;
-				virtual void StartCasting(WorldEntity* caster, float spellScale);
+
-				public:
+public:
-				virtual void CastingFinished(WorldEntity* caster, float spellScale);
+	GenericAOESpell(Spell *spell);
-				public:
+
-				virtual void SpellHit(WorldEntity* caster, WorldEntity* target, WorldSpell* worldSpell, Spell* spellGo, float spellScale);
+public:
-				public:
+	virtual void StartCasting(WorldEntity *caster, float spellScale);
-				virtual void OnPlayerMove(Entity* caster);
+
-				private:
+public:
-					void HandleSpellEffect(WorldEntity* caster, WorldEntity* target, float spellScale);
+	virtual void CastingFinished(WorldEntity *caster, float spellScale);
-				public:
+
-				virtual void COnSpellCastSuccess(WorldEntity* player);
+public:
-				public:
+	virtual void SpellHit(WorldEntity *caster, WorldEntity *target, WorldSpell *worldSpell, Spell *spellGo, float spellScale);
-				virtual void COnSpellCastStarted(WorldEntity* player);
+
-				public:
+public:
-				virtual void COnSpellCastEnded(WorldEntity* player);
+	virtual void OnPlayerMove(Entity *caster);
-			};
+
-		}
+private:
-	}
+	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

infos/aura_infos.cpp

@@ -3,7 +3,7 @@
 #include "../data/aura.h"
 
 Entity *AuraApplyInfo::get_caster() const {
-    return _caster;
+	return _caster;
 }
 
 void AuraApplyInfo::set_caster(Entity *value) {
@@ -11,21 +11,21 @@ void AuraApplyInfo::set_caster(Entity *value) {
 }
 
 void AuraApplyInfo::set_caster_bind(Node *caster) {
-    if (!caster) {
+	if (!caster) {
-        return;
+		return;
-    }
+	}
 
-    Entity *e = Object::cast_to<Entity>(caster);
+	Entity *e = Object::cast_to<Entity>(caster);
 
-    if (!e) {
+	if (!e) {
-        return;
+		return;
-    }
+	}
 
-    _caster = e;
+	_caster = e;
 }
 
 Entity *AuraApplyInfo::get_target() const {
-    return _target;
+	return _target;
 }
 
 void AuraApplyInfo::set_target(Entity *value) {
@@ -33,34 +33,33 @@ void AuraApplyInfo::set_target(Entity *value) {
 }
 
 void AuraApplyInfo::set_target_bind(Node *caster) {
-    if (!caster) {
+	if (!caster) {
-        return;
+		return;
-    }
+	}
 
-    Entity *e = Object::cast_to<Entity>(caster);
+	Entity *e = Object::cast_to<Entity>(caster);
 
-    if (!e) {
+	if (!e) {
-        return;
+		return;
-    }
+	}
 
-    _target = e;
+	_target = e;
 }
 
-
 float AuraApplyInfo::get_spell_scale() const {
-    return _spell_scale;
+	return _spell_scale;
 }
 
 void AuraApplyInfo::set_spell_scale(float value) {
-    _spell_scale = value;
+	_spell_scale = value;
 }
 
 Ref<Aura> AuraApplyInfo::get_aura() const {
-    return Ref<Aura>(_aura);
+	return Ref<Aura>(_aura);
 }
 
 void AuraApplyInfo::set_aura(Ref<Aura> aura) {
-    _aura = (*aura);
+	_aura = (*aura);
 }
 
 AuraApplyInfo::AuraApplyInfo() {
@@ -85,21 +84,19 @@ AuraApplyInfo::AuraApplyInfo(Entity *caster, Entity *target, float spell_scale)
 }
 
 void AuraApplyInfo::_bind_methods() {
-    ClassDB::bind_method(D_METHOD("get_caster"), &AuraApplyInfo::get_caster);
+	ClassDB::bind_method(D_METHOD("get_caster"), &AuraApplyInfo::get_caster);
-    ClassDB::bind_method(D_METHOD("set_caster", "caster"), &AuraApplyInfo::set_caster_bind);
+	ClassDB::bind_method(D_METHOD("set_caster", "caster"), &AuraApplyInfo::set_caster_bind);
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "caster", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), "set_caster", "get_caster");
 
 	ClassDB::bind_method(D_METHOD("get_target"), &AuraApplyInfo::get_target);
 	ClassDB::bind_method(D_METHOD("set_target", "target"), &AuraApplyInfo::set_target_bind);
 	ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "target", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), "set_target", "get_target");
 
-    ClassDB::bind_method(D_METHOD("get_spell_scale"), &AuraApplyInfo::get_spell_scale);
+	ClassDB::bind_method(D_METHOD("get_spell_scale"), &AuraApplyInfo::get_spell_scale);
-    ClassDB::bind_method(D_METHOD("set_spell_scale", "value"), &AuraApplyInfo::set_spell_scale);
+	ClassDB::bind_method(D_METHOD("set_spell_scale", "value"), &AuraApplyInfo::set_spell_scale);
 	ADD_PROPERTY(PropertyInfo(Variant::REAL, "spell_scale"), "set_spell_scale", "get_spell_scale");
 
-    ClassDB::bind_method(D_METHOD("get_aura"), &AuraApplyInfo::get_aura);
+	ClassDB::bind_method(D_METHOD("get_aura"), &AuraApplyInfo::get_aura);
-    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");
 }
-
-

infos/aura_infos.h

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

infos/spell_cast_info.cpp

@@ -4,7 +4,7 @@
 
 ////    SpellCastInfo    ////
 
-Entity *SpellCastInfo::get_caster()  {
+Entity *SpellCastInfo::get_caster() {
 	if (_caster && !ObjectDB::instance_validate(_caster)) {
 		_caster = NULL;
 	}
@@ -172,7 +172,6 @@ Dictionary SpellCastInfo::to_dict() {
 void SpellCastInfo::from_dict(const Dictionary &dict) {
 	ERR_FAIL_COND(dict.empty());
 
-
 	_has_cast_time = dict.get("has_cast_time", true);
 	_cast_time = dict.get("cast_time", 0);
 

inventory/bag.h

@@ -19,23 +19,23 @@ public:
 	bool add_item(Ref<ItemInstance> item);
 	void add_item_at(int index, Ref<ItemInstance> item, bool signal = true);
 	Ref<ItemInstance> get_item(const int index);
-    Ref<ItemInstance> remove_item(const int index);
+	Ref<ItemInstance> remove_item(const int index);
-    void swap_items(const int item1_index, const int item2_index);
+	void swap_items(const int item1_index, const int item2_index);
 	void change_item_equip(int slot_id, Ref<ItemInstance> item);
 	void set_item_count(int slot_id, int new_count);
 
-    bool can_add_item(Ref<ItemInstance> item);
+	bool can_add_item(Ref<ItemInstance> item);
 
 	int get_item_count();
 	int get_valid_item_count();
 
 	int get_size();
-    void set_size(const int size);
+	void set_size(const int size);
 
-    bool is_full();
+	bool is_full();
-    bool is_overburdened();
+	bool is_overburdened();
 
-    bool has_item(Ref<ItemTemplate> item, int count);
+	bool has_item(Ref<ItemTemplate> item, int count);
 	bool _has_item(Ref<ItemTemplate> item, int count);
 
 	void remove_items(Ref<ItemTemplate> item, int count);
@@ -48,7 +48,7 @@ public:
 	void _from_dict(const Dictionary &dict);
 
 	Bag();
-    ~Bag();
+	~Bag();
 
 protected:
 	static void _bind_methods();

inventory/grid_bag.cpp

@@ -1,7 +1,7 @@
 #include "grid_bag.h"
 
-#include "../data/item_template.h"
 #include "../data/item_instance.h"
+#include "../data/item_template.h"
 
 int GridBag::get_allowed_item_types() const {
 	return _allowed_item_types;
@@ -51,8 +51,6 @@ bool GridBag::add_item(Ref<ItemInstance> item) {
 							_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 yy = y; yy < sy; ++yy) {
 			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.
 	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;
 
 			if (_space_map[indx] == index) {
@@ -187,7 +184,7 @@ Ref<ItemInstance> GridBag::get_and_remove_item(const int index) {
 		}
 	}
 
-    return item;
+	return item;
 }
 
 void GridBag::remove_item(const int 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.
 	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;
 
 			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) {
 	_items.push_back(item);
 }
-void GridBag::basic_remove_item(const int index){
+void GridBag::basic_remove_item(const int index) {
 	_items.remove(index);
 }
 
@@ -233,7 +230,7 @@ int GridBag::get_size_y() const {
 }
 
 void GridBag::set_size(const int x, const int y) {
-	ERR_FAIL_COND(x == 0 || y ==  0);
+	ERR_FAIL_COND(x == 0 || y == 0);
 	ERR_FAIL_COND(_size_x != 0 || _size_y != 0);
 
 	_size_x = x;
@@ -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("set_size", "x", "y"), &GridBag::set_size);
-
 }

inventory/grid_bag.h

@@ -23,7 +23,7 @@ public:
 	int item_count_under_area(const int x, const int y, const int size_x, const int size_y) const;
 
 	Ref<ItemInstance> get_item(const int index) const;
-    Ref<ItemInstance> get_and_remove_item(const int index);
+	Ref<ItemInstance> get_and_remove_item(const int index);
 	void remove_item(const int index);
 
 	void basic_add_item(const Ref<ItemInstance> item);
@@ -37,13 +37,13 @@ public:
 	int get_size_x() const;
 	int get_size_y() const;
 
-    void set_size(const int x, const int y);
+	void set_size(const int x, const int y);
 
 	//to_dict();
 	//from_dict();
 
 	GridBag();
-    ~GridBag();
+	~GridBag();
 
 protected:
 	static void _bind_methods();

inventory/inventory.cpp

@@ -1,7 +1,7 @@
 #include "inventory.h"
 
-#include "../data/item_template.h"
 #include "../data/item_instance.h"
+#include "../data/item_template.h"
 
 #include "../entities/player.h"
 
@@ -14,7 +14,7 @@ void Inventory::set_allowed_item_types(const int value) {
 }
 
 Player *Inventory::get_target() const {
-    return _target;
+	return _target;
 }
 
 void Inventory::set_target(Player *value) {
@@ -22,17 +22,17 @@ void Inventory::set_target(Player *value) {
 }
 
 void Inventory::set_target_bind(Node *caster) {
-    if (!caster) {
+	if (!caster) {
-        return;
+		return;
-    }
+	}
 
-    Player *e = Object::cast_to<Player>(caster);
+	Player *e = Object::cast_to<Player>(caster);
 
-    if (!e) {
+	if (!e) {
-        return;
+		return;
-    }
+	}
 
-    _target = e;
+	_target = e;
 }
 
 Inventory::Inventory() {
@@ -43,7 +43,7 @@ Inventory::~Inventory() {
 }
 
 void Inventory::_bind_methods() {
-    ADD_SIGNAL(MethodInfo("changed", PropertyInfo(Variant::OBJECT, "inventory", PROPERTY_HINT_RESOURCE_TYPE, "Inventory")));
+	ADD_SIGNAL(MethodInfo("changed", PropertyInfo(Variant::OBJECT, "inventory", PROPERTY_HINT_RESOURCE_TYPE, "Inventory")));
 
 	ClassDB::bind_method(D_METHOD("get_allowed_item_types"), &Inventory::get_allowed_item_types);
 	ClassDB::bind_method(D_METHOD("set_allowed_item_types", "count"), &Inventory::set_allowed_item_types);
@@ -53,4 +53,3 @@ void Inventory::_bind_methods() {
 	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");
 }
-

inventory/inventory.h

@@ -22,7 +22,7 @@ public:
 	void set_target_bind(Node *caster);
 
 	Inventory();
-    ~Inventory();
+	~Inventory();
 
 protected:
 	static void _bind_methods();

inventory/normal_bag.cpp

@@ -1,7 +1,7 @@
 #include "bag.h"
 
-#include "../data/item_template.h"
 #include "../data/item_instance.h"
+#include "../data/item_template.h"
 
 int Bag::get_allowed_item_types() const {
 	return _allowed_item_types;
@@ -12,10 +12,8 @@ void Bag::set_allowed_item_types(const int value) {
 }
 
 bool Bag::add_item(Ref<ItemInstance> item) {
-	
 }
 
-
 Ref<ItemInstance> Bag::get_item(const int index) const {
 	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.
 	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;
 
 			if (_space_map[indx] == index) {
@@ -40,24 +38,22 @@ Ref<ItemInstance> Bag::remove_item(const int index) {
 		}
 	}
 
-    return item;
+	return item;
 }
 
 bool Bag::can_add_item(const Ref<ItemInstance> item) const {
-
 }
 
 int Bag::get_item_count() const {
 	return _items.size();
 }
 
-
 int Bag::get_size() const {
 	return _items.size();
 }
 
 void Bag::set_size(const int x, const int y) {
-	ERR_FAIL_COND(x == 0 || y ==  0);
+	ERR_FAIL_COND(x == 0 || y == 0);
 	ERR_FAIL_COND(_size_x != 0 || _size_y != 0);
 
 	_size_x = x;
@@ -70,7 +66,6 @@ void Bag::set_size(const int x, const int y) {
 	}
 }
 
-
 Bag::Bag() {
 	_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("set_size", "x", "y"), &Bag::set_size);
-
 }

inventory/normal_bag.h

@@ -18,29 +18,29 @@ public:
 
 	bool add_item(Ref<ItemInstance> item);
 	Ref<ItemInstance> get_item(const int index) const;
-    Ref<ItemInstance> remove_item(const int index);
+	Ref<ItemInstance> remove_item(const int index);
 
-    bool can_add_item(Ref<ItemInstance> item);
+	bool can_add_item(Ref<ItemInstance> item);
 
 	int get_item_count() const;
 
 	int get_size() const;
-    void set_size(const int size);
+	void set_size(const int size);
 
-    bool is_full() const;
+	bool is_full() const;
 
 	//to_dict();
 	//from_dict();
 
 	Bag();
-    ~Bag();
+	~Bag();
 
 protected:
 	static void _bind_methods();
 
 private:
 	int _allowed_item_types;
-    int _item_count;
+	int _item_count;
 	Vector<Ref<ItemInstance> > _items;
 };
 

loot/loot_data_container.h

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

loot/loot_data_item.cpp

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

loot/loot_data_item.h

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

pipelines/spell_heal_info.cpp

@@ -206,7 +206,7 @@ SpellHealInfo::~SpellHealInfo() {
 }
 
 void SpellHealInfo::_bind_methods() {
-    ClassDB::bind_method(D_METHOD("get_immune"), &SpellHealInfo::get_immune);
+	ClassDB::bind_method(D_METHOD("get_immune"), &SpellHealInfo::get_immune);
 	ClassDB::bind_method(D_METHOD("set_immune", "value"), &SpellHealInfo::set_immune);
 	ADD_PROPERTY(PropertyInfo(Variant::BOOL, "immune"), "set_immune", "get_immune");
 

pipelines/spell_heal_info.h

@@ -23,7 +23,7 @@ protected:
 	static void _bind_methods();
 
 public:
-    bool get_immune();
+	bool get_immune();
 	void set_immune(bool value);
 
 	int get_heal();

profile_manager/actionbar/action_bar_button_entry.h

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

profile_manager/actionbar/action_bar_entry.cpp

@@ -52,7 +52,7 @@ Ref<ActionBarButtonEntry> ActionBarEntry::get_button(int index) {
 	return _button_entries.get(index);
 }
 
-Dictionary ActionBarEntry::to_dict() const  {
+Dictionary ActionBarEntry::to_dict() const {
 	Dictionary dict;
 
 	dict["action_bar_id"] = _action_bar_id;

profile_manager/actionbar/action_bar_entry.h

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

profile_manager/actionbar/action_bar_profile.cpp

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

profile_manager/actionbar/action_bar_profile.h

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

profile_manager/class_profile.cpp

@@ -1,43 +1,35 @@
 #include "class_profile.h"
 
-
 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;
 }
 
 bool ClassProfile::get_actionbar_locked() {
@@ -47,13 +39,11 @@ void ClassProfile::set_actionbar_locked(bool 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;
 }
 
 Dictionary ClassProfile::get_custom_data() {
@@ -91,10 +81,9 @@ void ClassProfile::from_dict(const Dictionary &dict) {
 	_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;
 	_level = 0;
@@ -102,41 +91,37 @@ ClassProfile::ClassProfile()
 	_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;
-    _level = 50;
+	_level = 50;
-    _xp = 0;
+	_xp = 0;
 	_actionbar_locked = false;
-    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;
-    _class_id = class_id;
+	_class_id = class_id;
-    _level = level;
+	_level = level;
-    _xp = xp;
+	_xp = xp;
 	_actionbar_locked = true;
 
-    if (pload_defaults) {
+	if (pload_defaults) {
-        load_defaults();
+		load_defaults();
-    }
+	}
 }
 
-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("set_class_id", "value"), &ClassProfile::set_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("to_dict"), &ClassProfile::to_dict);
 }
-
-

profile_manager/class_profile.h

@@ -1,10 +1,9 @@
 #ifndef CLASS_PROFILE_H
 #define CLASS_PROFILE_H
 
-
-#include "core/ustring.h"
-#include "core/reference.h"
 #include "core/dictionary.h"
+#include "core/reference.h"
+#include "core/ustring.h"
 
 #include "actionbar/action_bar_profile.h"
 #include "input/input_profile.h"
@@ -13,18 +12,18 @@ class ClassProfile : public Reference {
 	GDCLASS(ClassProfile, Reference);
 
 public:
-    int get_class_id();
+	int get_class_id();
-    void set_class_id(int value);
+	void set_class_id(int value);
-    String get_character_class_name();
+	String get_character_class_name();
-    void set_character_class_name(String value);
+	void set_character_class_name(String value);
-    int get_level();
+	int get_level();
-    void set_level(int value);
+	void set_level(int value);
-    int get_xp();
+	int get_xp();
-    void set_xp(int value);
+	void set_xp(int value);
 	bool get_actionbar_locked();
 	void set_actionbar_locked(bool value);
-    Ref<InputProfile> get_input_profile();
+	Ref<InputProfile> get_input_profile();
-    Ref<ActionBarProfile> get_action_bar_profile();
+	Ref<ActionBarProfile> get_action_bar_profile();
 
 	Dictionary get_custom_data();
 	void set_custom_data(const Dictionary &dict);
@@ -32,23 +31,23 @@ public:
 	Dictionary to_dict() const;
 	void from_dict(const Dictionary &dict);
 
-    ClassProfile();
+	ClassProfile();
-    ClassProfile(int class_id);
+	ClassProfile(int class_id);
-    ClassProfile(String class_name, int class_id, int level, int xp, bool locked, bool load_defaults);
+	ClassProfile(String class_name, int class_id, int level, int xp, bool locked, bool load_defaults);
-    void load_defaults();
+	void load_defaults();
 
 protected:
 	static void _bind_methods();
 
 private:
-    String _character_class_name;
+	String _character_class_name;
-    int _class_id;
+	int _class_id;
-    int _level;
+	int _level;
-    int _xp;
+	int _xp;
 	bool _actionbar_locked;
 
-    Ref<InputProfile> _input_profile;
+	Ref<InputProfile> _input_profile;
-    Ref<ActionBarProfile> _action_bar_profile;
+	Ref<ActionBarProfile> _action_bar_profile;
 
 	Dictionary _custom_data;
 };

profile_manager/input/input_profile.h

@@ -8,16 +8,13 @@ class InputProfile : public Reference {
 	GDCLASS(InputProfile, Reference);
 
 public:
-
 	InputProfile() {}
 
 protected:
 	static void _bind_methods() {}
 
 private:
-    int placeholder;
+	int placeholder;
 };
 
-
-
 #endif

profile_manager/input/input_profile_modifier.cpp

@@ -75,5 +75,4 @@ void InputProfileModifier::_bind_methods() {
 	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("remove_entry", "index"), &InputProfileModifier::remove_entry);
-
 }

profile_manager/input/input_profile_modifier.h

@@ -7,7 +7,6 @@
 
 #include "input_profile_modifier_entry.h"
 
-
 class InputProfileModifier : public Reference {
 	GDCLASS(InputProfileModifier, Reference);
 
@@ -33,8 +32,8 @@ protected:
 	static void _bind_methods();
 
 private:
-    Vector<String> *_modifier_actions;
+	Vector<String> *_modifier_actions;
-    Vector<Ref<InputProfileModifierEntry> > *_entries;
+	Vector<Ref<InputProfileModifierEntry> > *_entries;
 };
 
 #endif

profile_manager/input/input_profile_modifier_entry.cpp

@@ -17,7 +17,6 @@ void InputProfileModifierEntry::set_translate_to(String value) {
 }
 
 InputProfileModifierEntry::InputProfileModifierEntry() {
-
 }
 
 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);
 	ADD_PROPERTY(PropertyInfo(Variant::STRING, "translate_to"), "set_translate_to", "get_translate_to");
 }
-

profile_manager/input/input_profile_modifier_entry.h

@@ -20,9 +20,8 @@ protected:
 	static void _bind_methods();
 
 private:
-    String _action;
+	String _action;
-    String _translate_to;
+	String _translate_to;
 };
 
-
 #endif

profile_manager/profile_manager.cpp

@@ -68,7 +68,7 @@ void ProfileManager::load() {
 	if (has_method("_load")) {
 		call("_load");
 	} //else {
-		//load_defaults();
+	//load_defaults();
 	//}
 }
 
@@ -79,7 +79,7 @@ void ProfileManager::load_profile(String name) {
 	load_defaults();
 }
 
-	int _last_used_class;
+int _last_used_class;
 
 String _profile_name;
 

profile_manager/profile_manager.h

@@ -12,10 +12,10 @@ class ProfileManager : public Node {
 public:
 	static const String DEFAULT_PROFILE_FILE_NAME;
 
-    static ProfileManager *get_instance();
+	static ProfileManager *get_instance();
 
-    int get_last_used_class();
+	int get_last_used_class();
-    void set_last_used_class(int value);
+	void set_last_used_class(int value);
 
 	int get_class_profile_count();
 	Ref<ClassProfile> get_class_profile_index(int index);
@@ -23,34 +23,34 @@ public:
 	void clear_class_profiles();
 	void remove_class_profile(int index);
 
-    Vector<Ref<ClassProfile> > &get_class_profiles();
+	Vector<Ref<ClassProfile> > &get_class_profiles();
-    Ref<ClassProfile> get_class_profile(int class_id);
+	Ref<ClassProfile> get_class_profile(int class_id);
 
 	void save();
 	void load();
 
 	void save_profile(String name);
-    void load_profile(String name);
+	void load_profile(String name);
 
-    void load_defaults();
+	void load_defaults();
 
 	Dictionary to_dict() const;
 	void from_dict(const Dictionary &dict);
 
-    ProfileManager();
+	ProfileManager();
 	~ProfileManager();
 
 protected:
-    static void _bind_methods();
+	static void _bind_methods();
 
 private:
-    static ProfileManager* _instance;
+	static ProfileManager *_instance;
 
 	int _last_used_class;
 
-    String _profile_name;
+	String _profile_name;
 
-    Vector<Ref<ClassProfile> > _class_profiles;
+	Vector<Ref<ClassProfile> > _class_profiles;
 };
 
 #endif

register_types.cpp

@@ -8,26 +8,26 @@
 #include "data/aura.h"
 #include "data/aura_group.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_template_stat_modifier.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/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_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_data.h"
 
-#include "entities/data/talent_row_data.h"
 #include "entities/data/character_spec.h"
+#include "entities/data/talent_row_data.h"
 
 #include "data/item_visual.h"
 #include "data/item_visual_entry.h"
@@ -37,40 +37,39 @@
 
 #include "skeleton/character_bones.h"
 
-#include "data/item_template.h"
 #include "data/item_instance.h"
+#include "data/item_template.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/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/inventory.h"
 
-#include "data/craft_recipe_helper.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/spell_cast_info.h"
 
 #include "pipelines/spell_damage_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_cost_data.h"
+#include "entities/resources/entity_resource_data.h"
 
 #include "entities/auras/aura_data.h"
 #include "entities/entity.h"
 
-#include "data/aura_trigger_data.h"
 #include "data/aura_stat_attribute.h"
+#include "data/aura_trigger_data.h"
 
 #include "ui/unit_frame.h"
 
@@ -79,32 +78,31 @@
 #include "skeleton/character_skeleton_2d.h"
 #include "skeleton/character_skeleton_3d.h"
 
-#include "skeleton/species_model_data.h"
 #include "skeleton/entity_species_data.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/cooldown.h"
+#include "utility/entity_create_info.h"
 
 #include "loot/loot_data_base.h"
-#include "loot/loot_data_item.h"
 #include "loot/loot_data_container.h"
+#include "loot/loot_data_item.h"
 
 #include "data/spell_effect_visual.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_data.h"
 
 #include "entities/ai/entity_ai.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_entry.h"
-#include "profile_manager/input/input_profile.h"
 
 #include "profile_manager/actionbar/action_bar_button_entry.h"
 #include "profile_manager/actionbar/action_bar_entry.h"
@@ -129,12 +127,12 @@ void register_entity_spell_system_types() {
 
 	ClassDB::register_class<EntityData>();
 	ClassDB::register_class<EntityClassData>();
-    ClassDB::register_class<VendorItemData>();
+	ClassDB::register_class<VendorItemData>();
-    ClassDB::register_class<VendorItemDataEntry>();
+	ClassDB::register_class<VendorItemDataEntry>();
 
-    ClassDB::register_class<EntityDataContainer>();
+	ClassDB::register_class<EntityDataContainer>();
 
-    ClassDB::register_class<ItemContainerData>();
+	ClassDB::register_class<ItemContainerData>();
 	ClassDB::register_class<ItemContainerDataEntry>();
 
 	ClassDB::register_class<XPData>();
@@ -208,23 +206,23 @@ void register_entity_spell_system_types() {
 	ClassDB::register_class<SpeciesModelData>();
 	ClassDB::register_class<SkeletonModelEntry>();
 
-    ClassDB::register_class<Cooldown>();
+	ClassDB::register_class<Cooldown>();
-    ClassDB::register_class<CategoryCooldown>();
+	ClassDB::register_class<CategoryCooldown>();
 
 	ClassDB::register_class<LootDataBase>();
 	ClassDB::register_class<LootDataItem>();
 	ClassDB::register_class<LootDataContainter>();
 
-    ClassDB::register_class<SpellEffectVisual>();
+	ClassDB::register_class<SpellEffectVisual>();
-    ClassDB::register_class<SpellEffectVisualSimple>();
+	ClassDB::register_class<SpellEffectVisualSimple>();
 
 	ClassDB::register_class<WorldSpellData>();
-    ClassDB::register_class<WorldSpell>();
+	ClassDB::register_class<WorldSpell>();
 
 	//AI
-    ClassDB::register_class<EntityAI>();
+	ClassDB::register_class<EntityAI>();
 
-    ClassDB::register_class<AIFormation>();
+	ClassDB::register_class<AIFormation>();
 
 	//ProfileManager
 	ClassDB::register_class<InputProfileModifier>();
@@ -240,6 +238,4 @@ void register_entity_spell_system_types() {
 }
 
 void unregister_entity_spell_system_types() {
-
 }
-

skeleton/character_bones.cpp

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

skeleton/character_bones.h

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

skeleton/character_skeleton_2d.h

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

skeleton/character_skeleton_3d.h

@@ -86,7 +86,7 @@ private:
 	NodePath _animation_player_path;
 	NodePath _animation_tree_path;
 
-    NodePath _bone_paths[EntityEnums::SKELETON_POINTS_MAX];
+	NodePath _bone_paths[EntityEnums::SKELETON_POINTS_MAX];
 
 	AnimationPlayer *_animation_player;
 	AnimationTree *_animation_tree;
@@ -98,5 +98,4 @@ private:
 	Vector<Ref<SkeletonModelEntry> > _entries[EntityEnums::SKELETON_POINTS_MAX];
 };
 
-
 #endif

skeleton/entity_skeleton_data.h

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

skeleton/entity_species_data.cpp

@@ -1,7 +1,7 @@
 #include "entity_species_data.h"
 
-#include "../data/spell.h"
 #include "../data/aura.h"
+#include "../data/spell.h"
 
 int EntitySpeciesData::get_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("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");
- }
+}

skeleton/entity_species_data.h

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

skeleton/skeleton_model_entry.cpp

@@ -47,12 +47,11 @@ void SkeletonModelEntry::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_priority", "value"), &SkeletonModelEntry::set_priority);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "priority"), "set_priority", "get_priority");
 
-    ClassDB::bind_method(D_METHOD("get_color"), &SkeletonModelEntry::get_color);
+	ClassDB::bind_method(D_METHOD("get_color"), &SkeletonModelEntry::get_color);
 	ClassDB::bind_method(D_METHOD("set_color", "value"), &SkeletonModelEntry::set_color);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "color"), "set_color", "get_color");
 
-    ClassDB::bind_method(D_METHOD("get_entry"), &SkeletonModelEntry::get_entry);
+	ClassDB::bind_method(D_METHOD("get_entry"), &SkeletonModelEntry::get_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");
 }
-

skeleton/skeleton_model_entry.h

@@ -1,8 +1,8 @@
 #ifndef SKELETON_MODEL_ENTRY_H
 #define SKELETON_MODEL_ENTRY_H
 
-#include "core/reference.h"
 #include "../data/item_visual_entry.h"
+#include "core/reference.h"
 
 class SkeletonModelEntry : public Reference {
 	GDCLASS(SkeletonModelEntry, Reference);
@@ -11,7 +11,7 @@ public:
 	int get_count() const;
 	void set_count(const int value);
 
-    int get_priority() const;
+	int get_priority() const;
 	void set_priority(const int value);
 
 	Color get_color() const;
@@ -20,8 +20,8 @@ public:
 	Ref<ItemVisualEntry> get_entry();
 	void set_entry(Ref<ItemVisualEntry> entry);
 
-    SkeletonModelEntry();
+	SkeletonModelEntry();
-    ~SkeletonModelEntry();
+	~SkeletonModelEntry();
 
 protected:
 	static void _bind_methods();

skeleton/species_model_data.h

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

ui/unit_frame.cpp

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