now the text_name properties use resource's resource_name property to store data.

data/aura.cpp

@@ -56,13 +56,6 @@ void Aura::set_rank(int value) {
 	_rank = value;
 }
 
-String Aura::get_text_name() {
-	return _text_name;
-}
-void Aura::set_text_name(String name) {
-	_text_name = name;
-}
-
 String Aura::get_text_description() {
 	return _text_description;
 }
@@ -1389,9 +1382,7 @@ void Aura::_bind_methods() {
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "ability_scale_data_id"), "set_ability_scale_data_id", "get_ability_scale_data_id");
 
 	ADD_GROUP("Texts", "text");
-	ClassDB::bind_method(D_METHOD("get_text_name"), &Aura::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &Aura::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_text_description"), &Aura::get_text_description);
 	ClassDB::bind_method(D_METHOD("set_text_description", "value"), &Aura::set_text_description);

data/aura.h

@@ -62,9 +62,6 @@ public:
 	int get_rank();
 	void set_rank(int value);
 
-	String get_text_name();
-	void set_text_name(String name);
-
 	String get_text_description();
 	void set_text_description(String description);
 
@@ -413,7 +410,6 @@ private:
 	bool _hide;
 	Ref<Spell> _teaches_spell;
 
-	String _text_name;
 	String _text_description;
 	int ability_scale_data_id;
 	int _rank;

data/craft_recipe.cpp

@@ -10,13 +10,6 @@ void CraftRecipe::set_id(int value) {
 	_id = value;
 }
 
-String CraftRecipe::get_text_name() {
-	return _text_name;
-}
-void CraftRecipe::set_text_name(String name) {
-	_text_name = name;
-}
-
 CraftRecipe::CraftCategories CraftRecipe::get_category() {
 	return _category;
 }
@@ -117,9 +110,7 @@ void CraftRecipe::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_id", "value"), &CraftRecipe::set_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
 
-	ClassDB::bind_method(D_METHOD("get_text_name"), &CraftRecipe::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &CraftRecipe::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_category"), &CraftRecipe::get_category);
 	ClassDB::bind_method(D_METHOD("set_category", "value"), &CraftRecipe::set_category);

data/craft_recipe.h

@@ -34,9 +34,6 @@ public:
 	int get_id();
 	void set_id(int value);
 
-	String get_text_name();
-	void set_text_name(String name);
-
 	CraftCategories get_category();
 	void set_category(CraftCategories value);
 

data/item_template.cpp

@@ -12,13 +12,6 @@ void ItemTemplate::set_id(const int value) {
 	_id = value;
 }
 
-String ItemTemplate::get_text_name() const {
-	return _text_name;
-}
-void ItemTemplate::set_text_name(const String value) {
-	_text_name = value;
-}
-
 ItemEnums::ItemType ItemTemplate::get_item_type() const {
 	return _item_type;
 }
@@ -391,7 +384,6 @@ Ref<ItemInstance> ItemTemplate::create_item_instance() {
 
 ItemTemplate::ItemTemplate() {
 	_id = 0;
-	_text_name = "";
 	_item_type = ItemEnums::ITEM_TYPE_NONE;
 	_item_sub_type = ItemEnums::ITEM_SUB_TYPE_NONE;
 	_item_sub_sub_type = ItemEnums::ITEM_SUB_SUB_TYPE_NONE;
@@ -439,9 +431,7 @@ void ItemTemplate::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_id", "count"), &ItemTemplate::set_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
 
-	ClassDB::bind_method(D_METHOD("get_text_name"), &ItemTemplate::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "count"), &ItemTemplate::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_item_type"), &ItemTemplate::get_item_type);
 	ClassDB::bind_method(D_METHOD("set_item_type", "count"), &ItemTemplate::set_item_type);

data/item_template.h

@@ -23,9 +23,6 @@ public:
 	int get_id() const;
 	void set_id(const int value);
 
-	String get_text_name() const;
-	void set_text_name(const String value);
-
 	ItemEnums::ItemType get_item_type() const;
 	void set_item_type(const ItemEnums::ItemType value);
 
@@ -162,7 +159,6 @@ private:
 	};
 
 	int _id;
-	String _text_name;
 	ItemEnums::ItemRarity _rarity;
 	ItemEnums::ItemType _item_type;
 	ItemEnums::ItemSubtype _item_sub_type;

data/spell.cpp

@@ -136,13 +136,6 @@ void Spell::set_icon(Ref<Texture> value) {
 	_icon = Ref<Texture>(value);
 }
 
-String Spell::get_text_name() {
-	return _text_name;
-}
-void Spell::set_text_name(String value) {
-	_text_name = value;
-}
-
 String Spell::get_text_description() {
 	return _text_description;
 }
@@ -739,10 +732,6 @@ void Spell::_handle_spell_damage(Ref<SpellDamageInfo> data) {
 	data->get_dealer()->sdeal_damage_to(data);
 }
 
-String Spell::get_name() {
-	return _text_name;
-}
-
 String Spell::get_description(int level) {
 	return _text_description;
 }
@@ -933,9 +922,7 @@ void Spell::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("get_absorb_scale_for_level"), &Spell::get_absorb_scale_for_level);
 
 	ADD_GROUP("Texts", "text");
-	ClassDB::bind_method(D_METHOD("get_text_name"), &Spell::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &Spell::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_text_description"), &Spell::get_text_description);
 	ClassDB::bind_method(D_METHOD("set_text_description", "value"), &Spell::set_text_description);

data/spell.h

@@ -140,9 +140,6 @@ public:
 	Ref<Texture> get_icon();
 	void set_icon(Ref<Texture> value);
 
-	String get_text_name();
-	void set_text_name(String value);
-
 	String get_text_description();
 	void set_text_description(String value);
 
@@ -332,7 +329,6 @@ public:
 	virtual void _calculate_initial_damage(Ref<SpellDamageInfo> data);
 	virtual void _handle_spell_damage(Ref<SpellDamageInfo> data);
 
-	String get_name();
 	String get_description(int level);
 
 	Spell();
@@ -368,7 +364,6 @@ private:
 	bool _is_local_spell;
 	Ref<Texture> _icon;
 
-	String _text_name;
 	String _text_description;
 
 	Ref<SpellEffectVisual> _visual_spell_effects;

data/spell_effect_visual.cpp

@@ -1,12 +1,5 @@
 #include "spell_effect_visual.h"
 
-String SpellEffectVisual::get_text_name() {
-	return _text_name;
-}
-void SpellEffectVisual::set_text_name(String name) {
-	_text_name = name;
-}
-
 SpellEffectVisual::SpellEffectVisual() {
 }
 
@@ -14,7 +7,5 @@ SpellEffectVisual::~SpellEffectVisual() {
 }
 
 void SpellEffectVisual::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_text_name"), &SpellEffectVisual::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &SpellEffectVisual::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 }

data/spell_effect_visual.h

@@ -7,9 +7,6 @@ class SpellEffectVisual : public Resource {
 	GDCLASS(SpellEffectVisual, Resource);
 
 public:
-	String get_text_name();
-	void set_text_name(String name);
-
 	SpellEffectVisual();
 	~SpellEffectVisual();
 
@@ -17,7 +14,6 @@ protected:
 	static void _bind_methods();
 
 private:
-	String _text_name;
 };
 
 #endif

data/world_effect_data.cpp

@@ -1,12 +1,5 @@
 #include "world_effect_data.h"
 
-String WorldEffectData::get_text_name() {
-	return _text_name;
-}
-void WorldEffectData::set_text_name(String name) {
-	_text_name = name;
-}
-
 WorldEffectData::WorldEffectData() {
 }
 
@@ -14,7 +7,5 @@ WorldEffectData::~WorldEffectData() {
 }
 
 void WorldEffectData::_bind_methods() {
-	ClassDB::bind_method(D_METHOD("get_text_name"), &WorldEffectData::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &WorldEffectData::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 }

data/world_effect_data.h

@@ -7,9 +7,6 @@ class WorldEffectData : public Resource {
 	GDCLASS(WorldEffectData, Resource);
 
 public:
-	String get_text_name();
-	void set_text_name(String name);
-
 	WorldEffectData();
 	~WorldEffectData();
 
@@ -17,7 +14,6 @@ protected:
 	static void _bind_methods();
 
 private:
-	String _text_name;
 };
 
 #endif

entities/data/character_spec.cpp

@@ -9,13 +9,6 @@ void CharacterSpec::set_id(int value) {
 	_id = value;
 }
 
-String CharacterSpec::get_text_name() {
-	return _text_name;
-}
-void CharacterSpec::set_text_name(String value) {
-	_text_name = value;
-}
-
 int CharacterSpec::get_num_talent_rows() {
 	return _rows.size();
 }
@@ -74,9 +67,7 @@ void CharacterSpec::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_id", "value"), &CharacterSpec::set_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
 
-	ClassDB::bind_method(D_METHOD("get_text_name"), &CharacterSpec::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &CharacterSpec::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_num_talent_rows"), &CharacterSpec::get_num_talent_rows);
 	ClassDB::bind_method(D_METHOD("set_num_talent_rows", "value"), &CharacterSpec::set_num_talent_rows);

entities/data/character_spec.h

@@ -17,9 +17,6 @@ public:
 	int get_id();
 	void set_id(int value);
 
-	String get_text_name();
-	void set_text_name(String value);
-
 	int get_num_talent_rows();
 	void set_num_talent_rows(int value);
 
@@ -39,7 +36,6 @@ protected:
 
 private:
 	int _id;
-	String _text_name;
 	Vector<Ref<TalentRowData> > _rows;
 };
 

entities/data/entity_class_data.cpp

@@ -15,13 +15,6 @@ void EntityClassData::set_id(int value) {
 	_id = value;
 }
 
-String EntityClassData::get_text_name() {
-	return _text_name;
-}
-void EntityClassData::set_text_name(String value) {
-	_text_name = value;
-}
-
 String EntityClassData::get_text_description() {
 	return _text_description;
 }
@@ -1050,9 +1043,7 @@ void EntityClassData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_id", "value"), &EntityClassData::set_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
 
-	ClassDB::bind_method(D_METHOD("get_text_name"), &EntityClassData::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &EntityClassData::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_text_description"), &EntityClassData::get_text_description);
 	ClassDB::bind_method(D_METHOD("set_text_description", "value"), &EntityClassData::set_text_description);

entities/data/entity_class_data.h

@@ -33,9 +33,6 @@ public:
 	int get_id();
 	void set_id(int value);
 
-	String get_text_name();
-	void set_text_name(String value);
-
 	String get_text_description();
 	void set_text_description(String value);
 
@@ -227,7 +224,6 @@ protected:
 private:
 	int _id;
 
-	String _text_name;
 	String _text_description;
 
 	Ref<EntityClassData> _inherits;

entities/data/entity_data.cpp

@@ -16,13 +16,6 @@ void EntityData::set_id(int value) {
 	_id = value;
 }
 
-String EntityData::get_text_name() {
-	return _text_name;
-}
-void EntityData::set_text_name(String value) {
-	_text_name = value;
-}
-
 String EntityData::get_text_description() {
 	return _text_description;
 }
@@ -217,7 +210,7 @@ String EntityData::generate_name() {
 		return call("_generate_name");
 	}
 
-	return _text_name;
+	return get_name();
 }
 
 ////    SETUP    ////
@@ -1184,9 +1177,7 @@ void EntityData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_entity_controller", "value"), &EntityData::set_entity_controller);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "entity_controller", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_ENTITY_CONTOLLER), "set_entity_controller", "get_entity_controller");
 
-	ClassDB::bind_method(D_METHOD("get_text_name"), &EntityData::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &EntityData::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_text_description"), &EntityData::get_text_description);
 	ClassDB::bind_method(D_METHOD("set_text_description", "value"), &EntityData::set_text_description);

entities/data/entity_data.h

@@ -45,9 +45,6 @@ public:
 	int get_id();
 	void set_id(int value);
 
-	String get_text_name();
-	void set_text_name(String value);
-
 	String get_text_description();
 	void set_text_description(String value);
 
@@ -247,7 +244,6 @@ private:
 	int _entity_flags;
 	EntityEnums::EntityController _entity_controller;
 
-	String _text_name;
 	String _text_description;
 
 	int _money;

entity_data_manager.cpp

@@ -590,43 +590,43 @@ void EntityDataManager::load_player_character_datas() {
 
 void EntityDataManager::list_characters() {
 	for (int i = 0; i < _entity_datas.size(); ++i) {
-		print_error(itos(i) + ": " + _entity_datas.get(i)->get_text_name());
+		print_error(itos(i) + ": " + _entity_datas.get(i)->get_name());
 	}
 }
 
 void EntityDataManager::list_spells() {
 	for (int i = 0; i < _spells.size(); ++i) {
-		print_error(itos(i) + ": " + _spells.get(i)->get_text_name());
+		print_error(itos(i) + ": " + _spells.get(i)->get_name());
 	}
 }
 
 void EntityDataManager::list_auras() {
 	for (int i = 0; i < _auras.size(); ++i) {
-		print_error(itos(i) + ": " + _auras.get(i)->get_text_name());
+		print_error(itos(i) + ": " + _auras.get(i)->get_name());
 	}
 }
 
 void EntityDataManager::list_craft_data() {
 	for (int i = 0; i < _craft_datas.size(); ++i) {
-		print_error(itos(i) + ": " + _craft_datas.get(i)->get_text_name());
+		print_error(itos(i) + ": " + _craft_datas.get(i)->get_name());
 	}
 }
 
 void EntityDataManager::list_item_templates() {
 	for (int i = 0; i < _item_templates.size(); ++i) {
-		print_error(itos(i) + ": " + _item_templates.get(i)->get_text_name());
+		print_error(itos(i) + ": " + _item_templates.get(i)->get_name());
 	}
 }
 
 void EntityDataManager::list_mob_datas() {
 	for (int i = 0; i < _mob_datas.size(); ++i) {
-		print_error(itos(i) + ": " + _mob_datas.get(i)->get_text_name());
+		print_error(itos(i) + ": " + _mob_datas.get(i)->get_name());
 	}
 }
 
 void EntityDataManager::list_player_character_datas() {
 	for (int i = 0; i < _player_character_datas.size(); ++i) {
-		print_error(itos(i) + ": " + _player_character_datas.get(i)->get_text_name());
+		print_error(itos(i) + ": " + _player_character_datas.get(i)->get_name());
 	}
 }
 

skeleton/entity_species_data.cpp

@@ -17,13 +17,6 @@ void EntitySpeciesData::set_type(EntityEnums::EntityType value) {
 	_type = value;
 }
 
-String EntitySpeciesData::get_text_name() {
-	return _text_name;
-}
-void EntitySpeciesData::set_text_name(String value) {
-	_text_name = value;
-}
-
 String EntitySpeciesData::get_text_description() {
 	return _text_description;
 }
@@ -152,9 +145,7 @@ void EntitySpeciesData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_type", "value"), &EntitySpeciesData::set_type);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "type", PROPERTY_HINT_ENUM, EntityEnums::BINDING_STRING_ENTITY_TYPES), "set_type", "get_type");
 
-	ClassDB::bind_method(D_METHOD("get_text_name"), &EntitySpeciesData::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &EntitySpeciesData::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_text_description"), &EntitySpeciesData::get_text_description);
 	ClassDB::bind_method(D_METHOD("set_text_description", "value"), &EntitySpeciesData::set_text_description);

skeleton/entity_species_data.h

@@ -22,9 +22,6 @@ public:
 	EntityEnums::EntityType get_type();
 	void set_type(EntityEnums::EntityType value);
 
-	String get_text_name();
-	void set_text_name(String value);
-
 	String get_text_description();
 	void set_text_description(String value);
 
@@ -65,7 +62,6 @@ protected:
 private:
 	int _id;
 	EntityEnums::EntityType _type;
-	String _text_name;
 	String _text_description;
 
 	Ref<SpeciesModelData> _model_data;

skeleton/species_model_data.cpp

@@ -7,13 +7,6 @@ void SpeciesModelData::set_id(int value) {
 	_id = value;
 }
 
-String SpeciesModelData::get_text_name() {
-	return _text_name;
-}
-void SpeciesModelData::set_text_name(String value) {
-	_text_name = value;
-}
-
 Ref<PackedScene> SpeciesModelData::get_skeleton() {
 	return _skeleton;
 }
@@ -258,9 +251,7 @@ void SpeciesModelData::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("set_id", "value"), &SpeciesModelData::set_id);
 	ADD_PROPERTY(PropertyInfo(Variant::INT, "id"), "set_id", "get_id");
 
-	ClassDB::bind_method(D_METHOD("get_text_name"), &SpeciesModelData::get_text_name);
+	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
-	ClassDB::bind_method(D_METHOD("set_text_name", "value"), &SpeciesModelData::set_text_name);
-	ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_text_name", "get_text_name");
 
 	ClassDB::bind_method(D_METHOD("get_skeleton"), &SpeciesModelData::get_skeleton);
 	ClassDB::bind_method(D_METHOD("set_skeleton", "value"), &SpeciesModelData::set_skeleton);

skeleton/species_model_data.h

@@ -21,9 +21,6 @@ public:
 	int get_id();
 	void set_id(int value);
 
-	String get_text_name();
-	void set_text_name(String value);
-
 	Ref<PackedScene> get_skeleton();
 	void set_skeleton(Ref<PackedScene> value);
 
@@ -91,8 +88,6 @@ protected:
 private:
 	int _id;
 
-	String _text_name;
-
 	Ref<PackedScene> _skeleton;
 
 	Vector<Ref<ItemVisualEntry> > _visuals[EntityEnums::SKELETON_POINTS_MAX];