Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-04-29 21:58:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

removed version 3 checks + renamed incorrectly identified replacement for BIND_VMETHOD

Browse Source
This commit is contained in:
Your Name 2022-08-31 17:27:11 -04:00
parent 924a18db6f
commit ee46263958
107 changed files with 353 additions and 734 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/atlases/character_atlas.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class CharacterAtlas : public Resource {
GDCLASS(CharacterAtlas, Resource);

5
data/atlases/character_atlas_entry.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class CharacterAtlasEntry : public Resource {
GDCLASS(CharacterAtlasEntry, Resource);

5
data/auras/aura_group.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class AuraGroup : public Resource {
GDCLASS(AuraGroup, Resource);

7
data/items/craft_recipe.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#include "core/ustring.h"
#endif
#include "item_template.h"

5
data/items/craft_recipe_helper.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "item_template.h"

5
data/items/equipment_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class ItemInstance;
class ItemTemplate;

11
data/items/item_instance.cpp
View File

@ -197,11 +197,8 @@ Dictionary ItemInstance::_to_dict() {
return dict;
}
void ItemInstance::_from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_item_template_path = dict.get("item_path", 0);
@ -271,12 +268,12 @@ void ItemInstance::_bind_methods() {
ClassDB::bind_method(D_METHOD("stat_modifiers_set", "mods"), &ItemInstance::stat_modifiers_set);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "stat_modifiers", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_DEFAULT, ""), "stat_modifiers_set", "stat_modifiers_get");
D_METHOD("_get_description", "desc");
GDVIRTUAL_BIND("_get_description", "desc");
ClassDB::bind_method(D_METHOD("get_description"), &ItemInstance::get_description);
//Serialization
D_METHOD("_from_dict", "dict");
D_METHOD("_to_dict", "dict");
GDVIRTUAL_BIND("_from_dict", "dict");
GDVIRTUAL_BIND("_to_dict", "dict");
ClassDB::bind_method(D_METHOD("from_dict", "dict"), &ItemInstance::from_dict);
ClassDB::bind_method(D_METHOD("to_dict"), &ItemInstance::to_dict);

6
data/items/item_instance.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#endif
#include "../../item_enums.h"

4
data/items/item_template.cpp
View File

@ -441,7 +441,7 @@ void ItemTemplate::_validate_property(PropertyInfo &property) const {
}
void ItemTemplate::_bind_methods() {
D_METHOD("_create_item_instance");
GDVIRTUAL_BIND("_create_item_instance");
ClassDB::bind_method(D_METHOD("create_item_instance"), &ItemTemplate::create_item_instance);
@ -568,7 +568,7 @@ void ItemTemplate::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_text_translation_key", "value"), &ItemTemplate::set_text_translation_key);
ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_translation_key"), "set_text_translation_key", "get_text_translation_key");
D_METHOD("_get_description");
GDVIRTUAL_BIND("_get_description");
ClassDB::bind_method(D_METHOD("get_description"), &ItemTemplate::get_description);
//StatMods Property binds

6
data/items/item_template.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#endif
#include "scene/resources/texture.h"

5
data/items/model_visual.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "../../item_enums.h"
#include "model_visual_entry.h"

7
data/items/model_visual_entry.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/string/ustring.h"
#include "core/math/color.h"
#else
#include "core/resource.h"
#include "core/ustring.h"
#include "core/color.h"
#endif
#include "scene/resources/texture.h"

2
data/loot/loot_data_base.cpp
View File

@ -278,7 +278,7 @@ void LootDataBase::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_item", "index"), &LootDataBase::get_item);
ClassDB::bind_method(D_METHOD("set_item", "index", "value"), &LootDataBase::set_item);
D_METHOD("_get_loot");
GDVIRTUAL_BIND("_get_loot");
ClassDB::bind_method(D_METHOD("get_loot"), &LootDataBase::get_loot);
ClassDB::bind_method(D_METHOD("_get_loot"), &LootDataBase::_get_loot);

6
data/loot/loot_data_base.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/templates/vector.h"
#include "core/variant/array.h"
#else
#include "core/vector.h"
#include "core/array.h"
#endif
#include "../items/item_template.h"

2
data/species/entity_species_data.cpp
View File

@ -176,7 +176,7 @@ void EntitySpeciesData::_validate_property(PropertyInfo &property) const {
}
void EntitySpeciesData::_bind_methods() {
D_METHOD("_generate_name", "seed");
GDVIRTUAL_BIND("_generate_name", "seed");
ClassDB::bind_method(D_METHOD("generate_name"), &EntitySpeciesData::generate_name);

7
data/species/entity_species_data.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#include "core/ustring.h"
#endif
#include "../../entity_enums.h"

9
data/species/species_instance.cpp
View File

@ -115,11 +115,8 @@ Dictionary SpeciesInstance::_to_dict() {
return dict;
}
void SpeciesInstance::_from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_id = dict.get("id", 0);
set_species_path(dict.get("species_path", ""));
@ -171,8 +168,8 @@ void SpeciesInstance::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "head_index"), "set_head_index", "get_head_index");
//Serialization
D_METHOD("_from_dict", "dict");
D_METHOD("_to_dict");
GDVIRTUAL_BIND("_from_dict", "dict");
GDVIRTUAL_BIND("_to_dict");
ClassDB::bind_method(D_METHOD("from_dict", "dict"), &SpeciesInstance::from_dict);
ClassDB::bind_method(D_METHOD("to_dict"), &SpeciesInstance::to_dict);

5
data/species/species_instance.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "../items/model_visual_entry.h"

5
data/species/species_model_data.cpp
View File

@ -27,11 +27,8 @@ SOFTWARE.
#include "../../defines.h"
#include "../../singletons/ess.h"
#if VERSION_MAJOR > 3
#include "core/string/ustring.h"
#else
#include "core/ustring.h"
#endif
int SpeciesModelData::get_id() {

8
data/species/species_model_data.h
View File

@ -25,17 +25,11 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#include "core/math/color.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#include "core/ustring.h"
#include "core/color.h"
#endif
#include "scene/resources/packed_scene.h"

170
data/spells/spell.cpp
View File

@ -2348,10 +2348,10 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("cast_interrupts", "info"), &Spell::cast_interrupts);
ClassDB::bind_method(D_METHOD("cast_finishs", "info"), &Spell::cast_finishs);
D_METHOD("_cast_starts", "info", "SpellCastInfo");
D_METHOD("_cast_starts_triggered", "info", "SpellCastInfo");
D_METHOD("_cast_interrupts", "info", "SpellCastInfo");
D_METHOD("_cast_finishs", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_cast_starts", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_cast_starts_triggered", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_cast_interrupts", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_cast_finishs", "info", "SpellCastInfo");
//Aura Commands
ClassDB::bind_method(D_METHOD("aura_sapply", "info"), &Spell::aura_sapply);
@ -2362,13 +2362,13 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("aura_removes_dispell", "aura"), &Spell::aura_removes_dispell);
ClassDB::bind_method(D_METHOD("aura_supdate", "aura", "delta"), &Spell::aura_supdate);
D_METHOD("_aura_sapply", "info", "AuraApplyInfo");
D_METHOD("_aura_sdeapply", "info", "AuraData");
D_METHOD("_aura_sadd", "aura", "AuraData");
D_METHOD("_aura_sremove", "aura", "AuraData");
D_METHOD("_aura_removes_expired", "info", "AuraData");
D_METHOD("_aura_removes_dispell", "info", "AuraData");
D_METHOD("_aura_supdate", "info", "AuraData", "delta");
GDVIRTUAL_BIND("_aura_sapply", "info", "AuraApplyInfo");
GDVIRTUAL_BIND("_aura_sdeapply", "info", "AuraData");
GDVIRTUAL_BIND("_aura_sadd", "aura", "AuraData");
GDVIRTUAL_BIND("_aura_sremove", "aura", "AuraData");
GDVIRTUAL_BIND("_aura_removes_expired", "info", "AuraData");
GDVIRTUAL_BIND("_aura_removes_dispell", "info", "AuraData");
GDVIRTUAL_BIND("_aura_supdate", "info", "AuraData", "delta");
ClassDB::bind_method(D_METHOD("_aura_sapply", "info"), &Spell::_aura_sapply);
ClassDB::bind_method(D_METHOD("_aura_sdeapply", "aura"), &Spell::_aura_sdeapply);
@ -2384,23 +2384,23 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("son_spell_hit", "info"), &Spell::son_spell_hit);
ClassDB::bind_method(D_METHOD("son_physics_process", "info", "delta"), &Spell::son_physics_process);
D_METHOD("_son_cast_player_moved", "info", "SpellCastInfo");
D_METHOD("_son_cast_damage_received", "info", "SpellCastInfo");
D_METHOD("_son_spell_hit", "info", "SpellCastInfo");
D_METHOD("_son_physics_process", "info", "SpellCastInfo", "delta");
GDVIRTUAL_BIND("_son_cast_player_moved", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_son_cast_damage_received", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_son_spell_hit", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_son_physics_process", "info", "SpellCastInfo", "delta");
//Clientside Event Handlers
D_METHOD("_notification_scast", "what", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_notification_scast", "what", "info", "SpellCastInfo");
ClassDB::bind_method(D_METHOD("notification_scast", "what", "info"), &Spell::notification_scast);
D_METHOD("_notification_ccast", "what", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_notification_ccast", "what", "info", "SpellCastInfo");
ClassDB::bind_method(D_METHOD("notification_ccast", "what", "info"), &Spell::notification_ccast);
//Aura EventHandlers
D_METHOD("_notification_saura", "what", "data", "AuraData");
D_METHOD("_notification_sheal", "what", "data", "AuraData", "data", "SpellHealInfo");
D_METHOD("_notification_aura_scast", "what", "data", "AuraData", "info", "SpellCastInfo");
D_METHOD("_notification_sdamage", "what", "data", "AuraData", "data", "SpellDamageInfo");
GDVIRTUAL_BIND("_notification_saura", "what", "data", "AuraData");
GDVIRTUAL_BIND("_notification_sheal", "what", "data", "AuraData", "data", "SpellHealInfo");
GDVIRTUAL_BIND("_notification_aura_scast", "what", "data", "AuraData", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_notification_sdamage", "what", "data", "AuraData", "data", "SpellDamageInfo");
ClassDB::bind_method(D_METHOD("notification_saura", "what", "data"), &Spell::notification_saura);
ClassDB::bind_method(D_METHOD("notification_sheal", "what", "aura", "info"), &Spell::notification_sheal);
@ -2430,33 +2430,33 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("notification_sentity_resource_added", "data", "value"), &Spell::notification_sentity_resource_added);
ClassDB::bind_method(D_METHOD("notification_sentity_resource_removed", "data", "value"), &Spell::notification_sentity_resource_removed);
D_METHOD("_son_remove", "data", "AuraData");
D_METHOD("_son_remove_expired", "data", "AuraData");
D_METHOD("_son_remove_dispell", "data", "AuraData");
GDVIRTUAL_BIND("_son_remove", "data", "AuraData");
GDVIRTUAL_BIND("_son_remove_expired", "data", "AuraData");
GDVIRTUAL_BIND("_son_remove_dispell", "data", "AuraData");
D_METHOD("_notification_sdeath", "data", "AuraData");
GDVIRTUAL_BIND("_notification_sdeath", "data", "AuraData");
D_METHOD("_notification_scooldown_added", "data", "AuraData", "id", "value");
D_METHOD("_notification_scooldown_removed", "data", "AuraData", "id", "value");
D_METHOD("_notification_scategory_cooldown_added", "data", "AuraData", "id", "value");
D_METHOD("_notification_scategory_cooldown_removed", "data", "AuraData", "id", "value");
GDVIRTUAL_BIND("_notification_scooldown_added", "data", "AuraData", "id", "value");
GDVIRTUAL_BIND("_notification_scooldown_removed", "data", "AuraData", "id", "value");
GDVIRTUAL_BIND("_notification_scategory_cooldown_added", "data", "AuraData", "id", "value");
GDVIRTUAL_BIND("_notification_scategory_cooldown_removed", "data", "AuraData", "id", "value");
D_METHOD("_notification_sgcd_started", "data", "AuraData", "gcd");
D_METHOD("_notification_sgcd_finished", "data", "AuraData");
GDVIRTUAL_BIND("_notification_sgcd_started", "data", "AuraData", "gcd");
GDVIRTUAL_BIND("_notification_sgcd_finished", "data", "AuraData");
D_METHOD("_son_physics_process_aura", "data", "AuraData");
GDVIRTUAL_BIND("_son_physics_process_aura", "data", "AuraData");
D_METHOD("_notification_sxp_gained", "data", "AuraData", "value");
D_METHOD("_notification_slevel_up", "data", "AuraData", "value");
GDVIRTUAL_BIND("_notification_sxp_gained", "data", "AuraData", "value");
GDVIRTUAL_BIND("_notification_slevel_up", "data", "AuraData", "value");
D_METHOD("_notification_sentity_resource_added", "data", "AuraData", "value");
D_METHOD("_notification_sentity_resource_removed", "data", "AuraData", "value");
GDVIRTUAL_BIND("_notification_sentity_resource_added", "data", "AuraData", "value");
GDVIRTUAL_BIND("_notification_sentity_resource_removed", "data", "AuraData", "value");
//Aura Clientside Event Handlers
D_METHOD("_notification_caura", "what", "data", "AuraData");
D_METHOD("_notification_cheal", "what", "data", "AuraData", "data", "SpellHealInfo");
D_METHOD("_notification_aura_ccast", "what", "data", "AuraData", "info", "SpellCastInfo");
D_METHOD("_notification_cdamage", "what", "data", "AuraData", "data", "SpellDamageInfo");
GDVIRTUAL_BIND("_notification_caura", "what", "data", "AuraData");
GDVIRTUAL_BIND("_notification_cheal", "what", "data", "AuraData", "data", "SpellHealInfo");
GDVIRTUAL_BIND("_notification_aura_ccast", "what", "data", "AuraData", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_notification_cdamage", "what", "data", "AuraData", "data", "SpellDamageInfo");
ClassDB::bind_method(D_METHOD("notification_caura", "what", "data"), &Spell::notification_caura);
ClassDB::bind_method(D_METHOD("notification_cheal", "what", "aura", "info"), &Spell::notification_cheal);
@ -2479,45 +2479,45 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("notification_centity_resource_added", "data", "value"), &Spell::notification_centity_resource_added);
ClassDB::bind_method(D_METHOD("notification_centity_resource_removed", "data", "value"), &Spell::notification_centity_resource_removed);
D_METHOD("_con_cast_failed", "data", "AuraData", "info", "SpellCastInfo");
D_METHOD("_con_cast_started", "data", "AuraData", "info", "SpellCastInfo");
D_METHOD("_con_cast_state_changed", "data", "AuraData", "info", "SpellCastInfo");
D_METHOD("_con_cast_finished", "data", "AuraData", "info", "SpellCastInfo");
D_METHOD("_con_spell_cast_success", "data", "AuraData", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_con_cast_failed", "data", "AuraData", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_con_cast_started", "data", "AuraData", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_con_cast_state_changed", "data", "AuraData", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_con_cast_finished", "data", "AuraData", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_con_spell_cast_success", "data", "AuraData", "info", "SpellCastInfo");
D_METHOD("_notification_cdeath", "data", "AuraData");
GDVIRTUAL_BIND("_notification_cdeath", "data", "AuraData");
D_METHOD("_notification_ccooldown_added", "data", "AuraData", "id", "value");
D_METHOD("_notification_ccooldown_removed", "data", "AuraData", "id", "value");
D_METHOD("_notification_ccategory_cooldown_added", "data", "AuraData", "id", "value");
D_METHOD("_notification_ccategory_cooldown_removed", "data", "AuraData", "id", "value");
GDVIRTUAL_BIND("_notification_ccooldown_added", "data", "AuraData", "id", "value");
GDVIRTUAL_BIND("_notification_ccooldown_removed", "data", "AuraData", "id", "value");
GDVIRTUAL_BIND("_notification_ccategory_cooldown_added", "data", "AuraData", "id", "value");
GDVIRTUAL_BIND("_notification_ccategory_cooldown_removed", "data", "AuraData", "id", "value");
D_METHOD("_con_aura_added", "data", "AuraData");
D_METHOD("_con_aura_removed", "data", "AuraData");
D_METHOD("_con_aura_refresh", "data", "AuraData");
GDVIRTUAL_BIND("_con_aura_added", "data", "AuraData");
GDVIRTUAL_BIND("_con_aura_removed", "data", "AuraData");
GDVIRTUAL_BIND("_con_aura_refresh", "data", "AuraData");
D_METHOD("_con_damage_dealt", "data", "AuraData", "info", "SpellDamageInfo");
D_METHOD("_con_dealt_damage", "data", "AuraData", "info", "SpellDamageInfo");
D_METHOD("_con_heal_dealt", "data", "AuraData", "info", "SpellHealInfo");
D_METHOD("_con_dealt_heal", "data", "AuraData", "info", "SpellHealInfo");
GDVIRTUAL_BIND("_con_damage_dealt", "data", "AuraData", "info", "SpellDamageInfo");
GDVIRTUAL_BIND("_con_dealt_damage", "data", "AuraData", "info", "SpellDamageInfo");
GDVIRTUAL_BIND("_con_heal_dealt", "data", "AuraData", "info", "SpellHealInfo");
GDVIRTUAL_BIND("_con_dealt_heal", "data", "AuraData", "info", "SpellHealInfo");
D_METHOD("_notification_cgcd_started", "data", "AuraData", "gcd");
D_METHOD("_notification_cgcd_finished", "data", "AuraData");
GDVIRTUAL_BIND("_notification_cgcd_started", "data", "AuraData", "gcd");
GDVIRTUAL_BIND("_notification_cgcd_finished", "data", "AuraData");
D_METHOD("_notification_cxp_gained", "data", "AuraData", "value");
D_METHOD("_notification_clevel_up", "data", "AuraData", "value");
GDVIRTUAL_BIND("_notification_cxp_gained", "data", "AuraData", "value");
GDVIRTUAL_BIND("_notification_clevel_up", "data", "AuraData", "value");
D_METHOD("_notification_centity_resource_added", "data", "AuraData", "value");
D_METHOD("_notification_centity_resource_removed", "data", "AuraData", "value");
GDVIRTUAL_BIND("_notification_centity_resource_added", "data", "AuraData", "value");
GDVIRTUAL_BIND("_notification_centity_resource_removed", "data", "AuraData", "value");
//Equipment
D_METHOD("_equip_should_deny", "data", "AuraData", "equip_slot", "item", "ItemInstance");
GDVIRTUAL_BIND("_equip_should_deny", "data", "AuraData", "equip_slot", "item", "ItemInstance");
D_METHOD("_equip_son_success", "data", "AuraData", "equip_slot", "item", "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_son_fail", "data", "AuraData", "equip_slot", "item", "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_con_success", "data", "AuraData", "equip_slot", "item", "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_con_fail", "data", "AuraData", "equip_slot", "item", "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_son_success", "data", "AuraData", "equip_slot", "item", "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_son_fail", "data", "AuraData", "equip_slot", "item", "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_con_success", "data", "AuraData", "equip_slot", "item", "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_con_fail", "data", "AuraData", "equip_slot", "item", "ItemInstance", "old_item", "ItemInstance", "bag_slot");
ClassDB::bind_method(D_METHOD("equip_should_deny", "data", "equip_slot", "item"), &Spell::equip_should_deny);
@ -2530,20 +2530,20 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("calculate_initial_damage", "data"), &Spell::calculate_initial_damage);
ClassDB::bind_method(D_METHOD("handle_spell_damage", "data"), &Spell::handle_spell_damage);
D_METHOD("_calculate_initial_damage", "data", "SpellDamageInfo");
D_METHOD("_handle_spell_damage", "data", "SpellDamageInfo");
GDVIRTUAL_BIND("_calculate_initial_damage", "data", "SpellDamageInfo");
GDVIRTUAL_BIND("_handle_spell_damage", "data", "SpellDamageInfo");
ClassDB::bind_method(D_METHOD("calculate_initial_heal", "data"), &Spell::calculate_initial_heal);
ClassDB::bind_method(D_METHOD("handle_spell_heal", "data"), &Spell::handle_spell_heal);
D_METHOD("_calculate_initial_heal", "data", "SpellHealInfo");
D_METHOD("_handle_spell_heal", "data", "SpellHealInfo");
GDVIRTUAL_BIND("_calculate_initial_heal", "data", "SpellHealInfo");
GDVIRTUAL_BIND("_handle_spell_heal", "data", "SpellHealInfo");
ClassDB::bind_method(D_METHOD("handle_projectile", "info"), &Spell::handle_projectile);
ClassDB::bind_method(D_METHOD("handle_effect", "info"), &Spell::handle_effect);
D_METHOD("_handle_projectile", "info", "SpellCastInfo");
D_METHOD("_handle_effect", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_handle_projectile", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_handle_effect", "info", "SpellCastInfo");
ClassDB::bind_method(D_METHOD("handle_gcd", "info"), &Spell::handle_gcd);
ClassDB::bind_method(D_METHOD("handle_cooldown", "info"), &Spell::handle_cooldown);
@ -2567,7 +2567,7 @@ void Spell::_bind_methods() {
//Aura Calculations / Queries
ClassDB::bind_method(D_METHOD("setup_aura_data", "data", "info"), &Spell::setup_aura_data);
D_METHOD("_setup_aura_data", "data", "AuraData", "info", "AuraApplyInfo");
GDVIRTUAL_BIND("_setup_aura_data", "data", "AuraData", "info", "AuraApplyInfo");
ClassDB::bind_method(D_METHOD("_setup_aura_data", "data", "info"), &Spell::_setup_aura_data);
@ -2577,10 +2577,10 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("aura_calculate_initial_damage", "aura_data", "info"), &Spell::aura_calculate_initial_damage);
ClassDB::bind_method(D_METHOD("handle_aura_damage", "aura_data", "data"), &Spell::handle_aura_damage);
D_METHOD("_aura_sapply_passives_damage_receive", "data", "SpellDamageInfo");
D_METHOD("_aura_sapply_passives_damage_deal", "data", "SpellDamageInfo");
D_METHOD("_aura_calculate_initial_damage", "data", "AuraData", "info", "AuraApplyInfo");
D_METHOD("_handle_aura_damage", "data", "AuraData", "info", "SpellDamageInfo");
GDVIRTUAL_BIND("_aura_sapply_passives_damage_receive", "data", "SpellDamageInfo");
GDVIRTUAL_BIND("_aura_sapply_passives_damage_deal", "data", "SpellDamageInfo");
GDVIRTUAL_BIND("_aura_calculate_initial_damage", "data", "AuraData", "info", "AuraApplyInfo");
GDVIRTUAL_BIND("_handle_aura_damage", "data", "AuraData", "info", "SpellDamageInfo");
ClassDB::bind_method(D_METHOD("_aura_sapply_passives_damage_receive", "info"), &Spell::_aura_sapply_passives_damage_receive);
ClassDB::bind_method(D_METHOD("_aura_sapply_passives_damage_deal", "info"), &Spell::_aura_sapply_passives_damage_deal);
@ -2593,10 +2593,10 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("aura_calculate_initial_heal", "aura_data", "info"), &Spell::aura_calculate_initial_heal);
ClassDB::bind_method(D_METHOD("handle_aura_heal", "aura_data", "data"), &Spell::handle_aura_heal);
D_METHOD("_aura_sapply_passives_heal_receive", "info", "SpellDamageInfo");
D_METHOD("_aura_sapply_passives_heal_deal", "info", "SpellDamageInfo");
D_METHOD("_aura_calculate_initial_heal", "aura_data", "AuraData", "info", "AuraApplyInfo");
D_METHOD("_handle_aura_heal", "aura_data", "AuraData", "spell_heal_info", "SpellHealInfo");
GDVIRTUAL_BIND("_aura_sapply_passives_heal_receive", "info", "SpellDamageInfo");
GDVIRTUAL_BIND("_aura_sapply_passives_heal_deal", "info", "SpellDamageInfo");
GDVIRTUAL_BIND("_aura_calculate_initial_heal", "aura_data", "AuraData", "info", "AuraApplyInfo");
GDVIRTUAL_BIND("_handle_aura_heal", "aura_data", "AuraData", "spell_heal_info", "SpellHealInfo");
ClassDB::bind_method(D_METHOD("_aura_sapply_passives_heal_receive", "info"), &Spell::_aura_sapply_passives_heal_receive);
ClassDB::bind_method(D_METHOD("_aura_sapply_passives_heal_deal", "info"), &Spell::_aura_sapply_passives_heal_deal);
@ -2696,7 +2696,7 @@ void Spell::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "spells_cast_on_learn", PROPERTY_HINT_NONE, "17/17:Spell", PROPERTY_USAGE_DEFAULT, "Spell"), "spells_cast_on_learn_set", "spells_cast_on_learn_get");
ADD_GROUP("Texts", "text");
D_METHOD("_get_description", "class_level", "character_level");
GDVIRTUAL_BIND("_get_description", "class_level", "character_level");
ADD_PROPERTY(PropertyInfo(Variant::STRING, "text_name"), "set_name", "get_name");
@ -2938,7 +2938,7 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("aura_set_visual_spell_effects", "value"), &Spell::aura_set_visual_spell_effects);
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "aura_visual_spell_effects", PROPERTY_HINT_RESOURCE_TYPE, "SpellEffectVisual"), "aura_set_visual_spell_effects", "aura_get_visual_spell_effects");
D_METHOD("_aura_get_description", "class_level", "character_level");
GDVIRTUAL_BIND("_aura_get_description", "class_level", "character_level");
ADD_GROUP("Aura Texts", "aura_text");
ClassDB::bind_method(D_METHOD("aura_get_text_translation_key"), &Spell::aura_get_text_translation_key);

5
data/spells/spell.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "scene/resources/texture.h"

5
data/spells/spell_cooldown_manipulation_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class SpellCooldownManipulationData : public RefCounted {
GDCLASS(SpellCooldownManipulationData, RefCounted);

5
data/spells/spell_effect_visual.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class SpellEffectVisual : public Resource {
GDCLASS(SpellEffectVisual, Resource);

2
database/ess_resource_db.cpp
View File

@ -363,6 +363,6 @@ void ESSResourceDB::_bind_methods() {
ClassDB::bind_method(D_METHOD("clear"), &ESSResourceDB::clear);
ClassDB::bind_method(D_METHOD("add_entity_resource_db", "other"), &ESSResourceDB::add_entity_resource_db);
D_METHOD("_initialize");
GDVIRTUAL_BIND("_initialize");
ClassDB::bind_method(D_METHOD("initialize"), &ESSResourceDB::initialize);
}

10
database/ess_resource_db.h
View File

@ -25,21 +25,13 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#include "core/templates/hash_map.h"
#include "core/string/ustring.h"
#include "core/core_bind.h"
#include "core/variant/variant.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#include "core/hash_map.h"
#include "core/ustring.h"
#include "core/bind/core_bind.h"
#include "core/variant.h"
#endif
#include "../item_enums.h"

11
database/ess_resource_db_folders.h
View File

@ -25,7 +25,6 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/variant/variant.h"
#include "core/templates/vector.h"
#include "core/templates/hash_map.h"
@ -33,15 +32,7 @@ SOFTWARE.
#include "core/config/engine.h"
#include "core/variant/array.h"
#include "core/core_bind.h"
#else
#include "core/variant.h"
#include "core/vector.h"
#include "core/hash_map.h"
#include "core/ustring.h"
#include "core/engine.h"
#include "core/array.h"
#include "core/bind/core_bind.h"
#endif
#include "ess_resource_db_map.h"

11
database/ess_resource_db_map.h
View File

@ -27,7 +27,6 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/variant/variant.h"
#include "core/templates/vector.h"
#include "core/templates/hash_map.h"
@ -35,15 +34,7 @@ SOFTWARE.
#include "core/config/engine.h"
#include "core/variant/array.h"
#include "core/core_bind.h"
#else
#include "core/variant.h"
#include "core/vector.h"
#include "core/hash_map.h"
#include "core/ustring.h"
#include "core/engine.h"
#include "core/array.h"
#include "core/bind/core_bind.h"
#endif
#include "scene/main/node.h"

5
database/ess_resource_db_static.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/templates/hash_map.h"
#else
#include "core/hash_map.h"
#endif
#include "ess_resource_db.h"

6
drag_and_drop/es_drag_and_drop.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/string/ustring.h"
#else
#include "core/reference.h"
#include "core/ustring.h"
#endif
#include "scene/main/node.h"

5
editor/ess_editor_plugin.cpp
View File

@ -30,11 +30,8 @@ void ESSEditorPlugin::fix_ids(Variant param) {
ESSEditorPlugin::ESSEditorPlugin(EditorNode *p_node) {
editor = p_node;
#if VERSION_MAJOR > 3
//editor->add_tool_menu_item("ESS: make ids unique", this, "fix_ids");
#else
editor->add_tool_menu_item("ESS: make ids unique", this, "fix_ids");
#endif
}
ESSEditorPlugin::~ESSEditorPlugin() {

50
entities/ai/entity_ai.cpp
View File

@ -354,13 +354,13 @@ EntityAI::~EntityAI() {
}
void EntityAI::_bind_methods() {
D_METHOD("_on_set_owner");
GDVIRTUAL_BIND("_on_set_owner");
D_METHOD("_update", "delta");
D_METHOD("_pet_update", "delta");
GDVIRTUAL_BIND("_update", "delta");
GDVIRTUAL_BIND("_pet_update", "delta");
D_METHOD("_move", "delta");
D_METHOD("_pet_move", "delta");
GDVIRTUAL_BIND("_move", "delta");
GDVIRTUAL_BIND("_pet_move", "delta");
ClassDB::bind_method(D_METHOD("get_enabled"), &EntityAI::get_enabled);
ClassDB::bind_method(D_METHOD("set_enabled", "value"), &EntityAI::set_enabled);
@ -399,10 +399,10 @@ void EntityAI::_bind_methods() {
ClassDB::bind_method(D_METHOD("_on_set_owner"), &EntityAI::_on_set_owner);
//EventHandlers
D_METHOD("_notification_saura", "what", "data", "AuraData");
D_METHOD("_notification_sheal", "what", "info", "SpellHealInfo");
D_METHOD("_notification_scast", "what", "info", "SpellCastInfo");
D_METHOD("_notification_sdamage", "what", "info", "SpellDamageInfo");
GDVIRTUAL_BIND("_notification_saura", "what", "data", "AuraData");
GDVIRTUAL_BIND("_notification_sheal", "what", "info", "SpellHealInfo");
GDVIRTUAL_BIND("_notification_scast", "what", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_notification_sdamage", "what", "info", "SpellDamageInfo");
ClassDB::bind_method(D_METHOD("notification_saura", "what", "data"), &EntityAI::notification_saura);
ClassDB::bind_method(D_METHOD("notification_sheal", "what", "info"), &EntityAI::notification_sheal);
@ -426,31 +426,31 @@ void EntityAI::_bind_methods() {
ClassDB::bind_method(D_METHOD("notification_sentity_resource_added", "resource"), &EntityAI::notification_sentity_resource_added);
ClassDB::bind_method(D_METHOD("notification_sentity_resource_removed", "resource"), &EntityAI::notification_sentity_resource_removed);
D_METHOD("_notification_sdeath", "data", "Entity");
GDVIRTUAL_BIND("_notification_sdeath", "data", "Entity");
D_METHOD("_notification_scooldown_added", "id", "value");
D_METHOD("_notification_scooldown_removed", "id", "value");
GDVIRTUAL_BIND("_notification_scooldown_added", "id", "value");
GDVIRTUAL_BIND("_notification_scooldown_removed", "id", "value");
D_METHOD("_notification_scategory_cooldown_added", "id", "value");
D_METHOD("_notification_scategory_cooldown_removed", "id", "value");
GDVIRTUAL_BIND("_notification_scategory_cooldown_added", "id", "value");
GDVIRTUAL_BIND("_notification_scategory_cooldown_removed", "id", "value");
D_METHOD("_notification_sgcd_started", "entity", "Entity", "gcd");
D_METHOD("_notification_sgcd_finished", "entity", "Entity");
GDVIRTUAL_BIND("_notification_sgcd_started", "entity", "Entity", "gcd");
GDVIRTUAL_BIND("_notification_sgcd_finished", "entity", "Entity");
D_METHOD("_notification_sxp_gained", "entity", "Entity", "value");
D_METHOD("_notification_slevel_up", "entity", "Entity", "value");
GDVIRTUAL_BIND("_notification_sxp_gained", "entity", "Entity", "value");
GDVIRTUAL_BIND("_notification_slevel_up", "entity", "Entity", "value");
D_METHOD("_notification_sentity_resource_added", "resource", "EntityResource");
D_METHOD("_notification_sentity_resource_removed", "resource", "EntityResource");
GDVIRTUAL_BIND("_notification_sentity_resource_added", "resource", "EntityResource");
GDVIRTUAL_BIND("_notification_sentity_resource_removed", "resource", "EntityResource");
//Equipment
D_METHOD("_equip_should_deny", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "equip_slot", "item", "ItemInstance");
GDVIRTUAL_BIND("_equip_should_deny", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "equip_slot", "item", "ItemInstance");
D_METHOD("_equip_son_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_son_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_con_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_con_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_son_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_son_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_con_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_con_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
ClassDB::bind_method(D_METHOD("equip_should_deny", "entity", "equip_slot", "item"), &EntityAI::equip_should_deny_bind);

5
entities/ai/entity_ai.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "scene/main/node.h"

13
entities/auras/aura_data.cpp
View File

@ -308,11 +308,8 @@ Dictionary AuraData::_to_dict() {
return dict;
}
void AuraData::_from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
ERR_FAIL_COND(!ESS::get_singleton()->get_resource_db().is_valid());
_aura_id = dict.get("aura_id", 0);
@ -447,8 +444,8 @@ void AuraData::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::REAL, "slow"), "set_slow", "get_slow");
//Serialization
D_METHOD("_from_dict", "dict");
D_METHOD("_to_dict");
GDVIRTUAL_BIND("_from_dict", "dict");
GDVIRTUAL_BIND("_to_dict");
ClassDB::bind_method(D_METHOD("from_dict", "dict"), &AuraData::from_dict);
ClassDB::bind_method(D_METHOD("to_dict"), &AuraData::to_dict);
@ -456,8 +453,8 @@ void AuraData::_bind_methods() {
ClassDB::bind_method(D_METHOD("_to_dict"), &AuraData::_to_dict);
//Networking
D_METHOD("_to_send_array");
D_METHOD("_from_send_array", "arr");
GDVIRTUAL_BIND("_to_send_array");
GDVIRTUAL_BIND("_from_send_array", "arr");
ClassDB::bind_method(D_METHOD("to_send_array"), &AuraData::to_send_array);
ClassDB::bind_method(D_METHOD("from_send_array", "arr"), &AuraData::from_send_array);

7
entities/auras/aura_data.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/variant/array.h"
#include "core/variant/dictionary.h"
#else
#include "core/resource.h"
#include "core/array.h"
#include "core/dictionary.h"
#endif
#include "../../spell_enums.h"

7
entities/data/character_spec.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#include "core/ustring.h"
#endif
class Spell;

4
entities/data/entity_class_data.cpp
View File

@ -378,7 +378,7 @@ EntityClassData::~EntityClassData() {
}
void EntityClassData::_bind_methods() {
D_METHOD("_setup_resources", "entity", "Entity");
GDVIRTUAL_BIND("_setup_resources", "entity", "Entity");
ClassDB::bind_method(D_METHOD("get_id"), &EntityClassData::get_id);
ClassDB::bind_method(D_METHOD("set_id", "value"), &EntityClassData::set_id);
@ -498,7 +498,7 @@ void EntityClassData::_bind_methods() {
ClassDB::bind_method(D_METHOD("set_ais", "auras"), &EntityClassData::set_ais);
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "ais", PROPERTY_HINT_NONE, "17/17:EntityAI", PROPERTY_USAGE_DEFAULT, "EntityAI"), "set_ais", "get_ais");
D_METHOD("_get_ai_instance");
GDVIRTUAL_BIND("_get_ai_instance");
ClassDB::bind_method(D_METHOD("get_ai_instance"), &EntityClassData::get_ai_instance);
ClassDB::bind_method(D_METHOD("_get_ai_instance"), &EntityClassData::_get_ai_instance);

7
entities/data/entity_class_data.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#include "core/ustring.h"
#endif
#include "core/math/math_funcs.h"
#include "scene/resources/texture.h"

8
entities/data/entity_data.cpp
View File

@ -265,8 +265,8 @@ void EntityData::_validate_property(PropertyInfo &property) const {
void EntityData::_bind_methods() {
//Interactions
D_METHOD("_cans_interact", "entity", "Entity");
D_METHOD("_sinteract", "entity", "Entity");
GDVIRTUAL_BIND("_cans_interact", "entity", "Entity");
GDVIRTUAL_BIND("_sinteract", "entity", "Entity");
ClassDB::bind_method(D_METHOD("cans_interact", "entity"), &EntityData::cans_interact_bind);
ClassDB::bind_method(D_METHOD("sinteract", "entity"), &EntityData::sinteract_bind);
@ -314,7 +314,7 @@ void EntityData::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "species_instance", PROPERTY_HINT_RESOURCE_TYPE, "SpeciesInstance"), "set_species_instance", "get_species_instance");
//AI
D_METHOD("_get_ai_instance");
GDVIRTUAL_BIND("_get_ai_instance");
ClassDB::bind_method(D_METHOD("get_ai"), &EntityData::get_ai);
ClassDB::bind_method(D_METHOD("set_ai", "value"), &EntityData::set_ai);
@ -329,7 +329,7 @@ void EntityData::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "loot_db", PROPERTY_HINT_RESOURCE_TYPE, "LootDataBase"), "set_loot_db", "get_loot_db");
ClassDB::bind_method(D_METHOD("generate_name"), &EntityData::generate_name);
D_METHOD("_generate_name");
GDVIRTUAL_BIND("_generate_name");
ADD_GROUP("Immunities", "immunity");
ClassDB::bind_method(D_METHOD("get_immunity_flags"), &EntityData::get_immunity_flags);

7
entities/data/entity_data.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#include "core/ustring.h"
#endif
#include "scene/resources/texture.h"

9
entities/data/entity_data_container.cpp
View File

@ -39,11 +39,8 @@ Dictionary EntityDataContainer::_to_dict() {
return dict;
}
void EntityDataContainer::_from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
}
EntityDataContainer::EntityDataContainer() {
@ -53,8 +50,8 @@ EntityDataContainer::~EntityDataContainer() {
void EntityDataContainer::_bind_methods() {
//Serialization
D_METHOD("from_dict", "dict");
D_METHOD("to_dict", "dict");
GDVIRTUAL_BIND("from_dict", "dict");
GDVIRTUAL_BIND("to_dict", "dict");
ClassDB::bind_method(D_METHOD("from_dict", "dict"), &EntityDataContainer::from_dict);
ClassDB::bind_method(D_METHOD("to_dict"), &EntityDataContainer::to_dict);

6
entities/data/entity_data_container.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/variant/dictionary.h"
#else
#include "core/resource.h"
#include "core/dictionary.h"
#endif
class EntityDataContainer : public Resource {
GDCLASS(EntityDataContainer, Resource);

5
entities/data/item_container_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "item_container_data_entry.h"

5
entities/data/item_container_data_entry.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class ItemTemplate;

5
entities/data/vendor_item_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "vendor_item_data_entry.h"

5
entities/data/vendor_item_data_entry.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class ItemTemplate;
class Spell;

172
entities/entity.cpp
View File

@ -43,11 +43,8 @@ SOFTWARE.
#include "./skills/entity_skill.h"
#include "scene/2d/node_2d.h"
#if VERSION_MAJOR > 3
#include "core/object/script_language.h"
#else
#include "core/script_language.h"
#endif
#include "core/version.h"
@ -650,11 +647,8 @@ void Entity::setup(Ref<EntityCreateInfo> info) {
sets_entity_name(info->get_entity_name());
}
#if VERSION_MAJOR > 3
if (!info->get_serialized_data().is_empty()) {
#else
if (!info->get_serialized_data().empty()) {
#endif
from_dict(info->get_serialized_data());
} else {
sets_entity_data(info->get_entity_data());
@ -1359,11 +1353,8 @@ Dictionary Entity::_to_dict() {
return dict;
}
void Entity::_from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
//// Transforms ////
@ -1658,11 +1649,8 @@ void Entity::_from_dict(const Dictionary &dict) {
Dictionary bagd = dict.get("bag", Dictionary());
#if VERSION_MAJOR > 3
if (!bagd.is_empty()) {
#else
if (!bagd.empty()) {
#endif
if (!_s_bag.is_valid()) {
Ref<Bag> bag;
bag.instantiate();
@ -6781,8 +6769,8 @@ void Entity::_bind_methods() {
ADD_SIGNAL(MethodInfo("onc_open_winow_request", PropertyInfo(Variant::INT, "window_id")));
//setup
D_METHOD("_setup");
D_METHOD("_initialize");
GDVIRTUAL_BIND("_setup");
GDVIRTUAL_BIND("_initialize");
ClassDB::bind_method(D_METHOD("_initialize"), &Entity::_initialize);
ClassDB::bind_method(D_METHOD("setup", "info"), &Entity::setup);
@ -6829,19 +6817,19 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("notification_cstat_changed", "stat"), &Entity::notification_cstat_changed);
//EventHandlers
D_METHOD("_notification_sdeath");
GDVIRTUAL_BIND("_notification_sdeath");
D_METHOD("_notification_sgcd_started", "gcd");
D_METHOD("_notification_sgcd_finished");
GDVIRTUAL_BIND("_notification_sgcd_started", "gcd");
GDVIRTUAL_BIND("_notification_sgcd_finished");
D_METHOD("_notification_sxp_gained", "value");
D_METHOD("_notification_slevel_up", "value");
GDVIRTUAL_BIND("_notification_sxp_gained", "value");
GDVIRTUAL_BIND("_notification_slevel_up", "value");
D_METHOD("_notification_sentity_resource_added", "resource", "EntityResource");
D_METHOD("_notification_sentity_resource_removed", "resource", "EntityResource");
GDVIRTUAL_BIND("_notification_sentity_resource_added", "resource", "EntityResource");
GDVIRTUAL_BIND("_notification_sentity_resource_removed", "resource", "EntityResource");
D_METHOD("_son_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
D_METHOD("_con_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
GDVIRTUAL_BIND("_son_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
GDVIRTUAL_BIND("_con_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
//Serverside
ADD_SIGNAL(MethodInfo("notification_sdamage", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
@ -6849,10 +6837,10 @@ void Entity::_bind_methods() {
ADD_SIGNAL(MethodInfo("notification_scast", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "spell_cast_info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
ADD_SIGNAL(MethodInfo("notification_saura", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "aura_data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
D_METHOD("_notification_saura", "what", "data", "AuraData");
D_METHOD("_notification_sheal", "what", "info", "SpellHealInfo");
D_METHOD("_notification_scast", "what", "info", "SpellCastInfo");
D_METHOD("_notification_sdamage", "what", "info", "SpellDamageInfo");
GDVIRTUAL_BIND("_notification_saura", "what", "data", "AuraData");
GDVIRTUAL_BIND("_notification_sheal", "what", "info", "SpellHealInfo");
GDVIRTUAL_BIND("_notification_scast", "what", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_notification_sdamage", "what", "info", "SpellDamageInfo");
ClassDB::bind_method(D_METHOD("notification_saura", "what", "data"), &Entity::notification_saura);
ClassDB::bind_method(D_METHOD("notification_sheal", "what", "info"), &Entity::notification_sheal);
@ -6865,10 +6853,10 @@ void Entity::_bind_methods() {
ADD_SIGNAL(MethodInfo("notification_ccast", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "spell_cast_info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
ADD_SIGNAL(MethodInfo("notification_caura", PropertyInfo(Variant::INT, "what"), PropertyInfo(Variant::OBJECT, "aura_data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData")));
D_METHOD("_notification_caura", "what", "data", "AuraData");
D_METHOD("_notification_cheal", "what", "info", "SpellHealInfo");
D_METHOD("_notification_ccast", "what", "info", "SpellCastInfo");
D_METHOD("_notification_cdamage", "what", "info", "SpellDamageInfo");
GDVIRTUAL_BIND("_notification_caura", "what", "data", "AuraData");
GDVIRTUAL_BIND("_notification_cheal", "what", "info", "SpellHealInfo");
GDVIRTUAL_BIND("_notification_ccast", "what", "info", "SpellCastInfo");
GDVIRTUAL_BIND("_notification_cdamage", "what", "info", "SpellDamageInfo");
ClassDB::bind_method(D_METHOD("notification_caura", "what", "data"), &Entity::notification_caura);
ClassDB::bind_method(D_METHOD("notification_cheal", "what", "info"), &Entity::notification_cheal);
@ -6893,8 +6881,8 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("setc_free_class_talent_points", "value"), &Entity::setc_free_class_talent_points);
ADD_PROPERTY(PropertyInfo(Variant::INT, "cfree_class_talent_points", PROPERTY_HINT_NONE, "", 0), "setc_free_class_talent_points", "getc_free_class_talent_points");
D_METHOD("_class_talent_sreceive_learn_request", "spec_index", "class_talent_row", "class_talent_culomn");
D_METHOD("_class_talent_sreceive_reset_request");
GDVIRTUAL_BIND("_class_talent_sreceive_learn_request", "spec_index", "class_talent_row", "class_talent_culomn");
GDVIRTUAL_BIND("_class_talent_sreceive_reset_request");
ADD_SIGNAL(MethodInfo("sclass_talent_learned", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "class_talent_id")));
ADD_SIGNAL(MethodInfo("cclass_talent_learned", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "class_talent_id")));
@ -6902,11 +6890,11 @@ void Entity::_bind_methods() {
ADD_SIGNAL(MethodInfo("sclass_talent_reset", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
ADD_SIGNAL(MethodInfo("cclass_talent_reset", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
D_METHOD("_son_class_talent_learned", "class_talent_id");
D_METHOD("_con_class_talent_learned", "class_talent_id");
GDVIRTUAL_BIND("_son_class_talent_learned", "class_talent_id");
GDVIRTUAL_BIND("_con_class_talent_learned", "class_talent_id");
D_METHOD("_son_class_talent_reset");
D_METHOD("_con_class_talent_reset");
GDVIRTUAL_BIND("_son_class_talent_reset");
GDVIRTUAL_BIND("_con_class_talent_reset");
ClassDB::bind_method(D_METHOD("class_talent_crequest_learn", "spec_index", "class_talent_row", "class_talent_culomn"), &Entity::class_talent_crequest_learn);
ClassDB::bind_method(D_METHOD("class_talent_sreceive_learn_request", "spec_index", "class_talent_row", "class_talent_culomn"), &Entity::class_talent_sreceive_learn_request);
@ -6947,8 +6935,8 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("setc_free_character_talent_points", "value"), &Entity::setc_free_character_talent_points);
ADD_PROPERTY(PropertyInfo(Variant::INT, "cfree_character_talent_points", PROPERTY_HINT_NONE, "", 0), "setc_free_character_talent_points", "getc_free_character_talent_points");
D_METHOD("_character_talent_sreceive_learn_request", "spec_index", "character_talent_row", "character_talent_culomn");
D_METHOD("_character_talent_sreceive_reset_request");
GDVIRTUAL_BIND("_character_talent_sreceive_learn_request", "spec_index", "character_talent_row", "character_talent_culomn");
GDVIRTUAL_BIND("_character_talent_sreceive_reset_request");
ADD_SIGNAL(MethodInfo("scharacter_talent_learned", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "character_talent_id")));
ADD_SIGNAL(MethodInfo("ccharacter_talent_learned", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "character_talent_id")));
@ -6956,11 +6944,11 @@ void Entity::_bind_methods() {
ADD_SIGNAL(MethodInfo("scharacter_talent_reset", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
ADD_SIGNAL(MethodInfo("ccharacter_talent_reset", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
D_METHOD("_son_character_talent_learned", "character_talent_id");
D_METHOD("_con_character_talent_learned", "character_talent_id");
GDVIRTUAL_BIND("_son_character_talent_learned", "character_talent_id");
GDVIRTUAL_BIND("_con_character_talent_learned", "character_talent_id");
D_METHOD("_son_character_talent_reset");
D_METHOD("_con_character_talent_reset");
GDVIRTUAL_BIND("_son_character_talent_reset");
GDVIRTUAL_BIND("_con_character_talent_reset");
ClassDB::bind_method(D_METHOD("character_talent_crequest_learn", "spec_index", "character_talent_row", "character_talent_culomn"), &Entity::character_talent_crequest_learn);
ClassDB::bind_method(D_METHOD("character_talent_sreceive_learn_request", "spec_index", "character_talent_row", "character_talent_culomn"), &Entity::character_talent_sreceive_learn_request);
@ -6992,10 +6980,10 @@ void Entity::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::POOL_INT_ARRAY, "scharacter_talents", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_ENTITY_HIDDEN), "scharacter_talents_set", "scharacter_talents_get");
//Cooldowns
D_METHOD("notification_scooldown_added", "id", "value");
D_METHOD("notification_scooldown_removed", "id", "value");
D_METHOD("notification_scategory_cooldown_added", "id", "value");
D_METHOD("notification_scategory_cooldown_removed", "id", "value");
GDVIRTUAL_BIND("notification_scooldown_added", "id", "value");
GDVIRTUAL_BIND("notification_scooldown_removed", "id", "value");
GDVIRTUAL_BIND("notification_scategory_cooldown_added", "id", "value");
GDVIRTUAL_BIND("notification_scategory_cooldown_removed", "id", "value");
ClassDB::bind_method(D_METHOD("notification_scooldown_added", "cooldown"), &Entity::notification_scooldown_added);
ClassDB::bind_method(D_METHOD("notification_scooldown_removed", "cooldown"), &Entity::notification_scooldown_removed);
@ -7003,30 +6991,30 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("notification_scategory_cooldown_removed", "category_cooldown"), &Entity::notification_scategory_cooldown_removed);
//Clientside EventHandlers
D_METHOD("_notification_cdeath");
GDVIRTUAL_BIND("_notification_cdeath");
D_METHOD("notification_ccooldown_added", "id", "value");
D_METHOD("notification_ccooldown_removed", "id", "value");
D_METHOD("notification_ccategory_cooldown_added", "id", "value");
D_METHOD("notification_ccategory_cooldown_removed", "id", "value");
GDVIRTUAL_BIND("notification_ccooldown_added", "id", "value");
GDVIRTUAL_BIND("notification_ccooldown_removed", "id", "value");
GDVIRTUAL_BIND("notification_ccategory_cooldown_added", "id", "value");
GDVIRTUAL_BIND("notification_ccategory_cooldown_removed", "id", "value");
ClassDB::bind_method(D_METHOD("notification_ccooldown_added", "cooldown"), &Entity::notification_ccooldown_added);
ClassDB::bind_method(D_METHOD("notification_ccooldown_removed", "cooldown"), &Entity::notification_ccooldown_removed);
ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_added", "category_cooldown"), &Entity::notification_ccategory_cooldown_added);
ClassDB::bind_method(D_METHOD("notification_ccategory_cooldown_removed", "category_cooldown"), &Entity::notification_ccategory_cooldown_removed);
D_METHOD("_notification_cgcd_started", "gcd");
D_METHOD("_notification_cgcd_finished");
GDVIRTUAL_BIND("_notification_cgcd_started", "gcd");
GDVIRTUAL_BIND("_notification_cgcd_finished");
D_METHOD("_notification_cxp_gained", "value");
D_METHOD("_notification_clevel_up", "value");
GDVIRTUAL_BIND("_notification_cxp_gained", "value");
GDVIRTUAL_BIND("_notification_clevel_up", "value");
D_METHOD("_notification_centity_resource_added", "resource", "EntityResource");
D_METHOD("_notification_centity_resource_removed", "resource", "EntityResource");
GDVIRTUAL_BIND("_notification_centity_resource_added", "resource", "EntityResource");
GDVIRTUAL_BIND("_notification_centity_resource_removed", "resource", "EntityResource");
D_METHOD("_canc_interact");
D_METHOD("_cans_interact");
D_METHOD("_sinteract");
GDVIRTUAL_BIND("_canc_interact");
GDVIRTUAL_BIND("_cans_interact");
GDVIRTUAL_BIND("_sinteract");
ClassDB::bind_method(D_METHOD("cast_spell_successc", "info"), &Entity::cast_spell_successc);
ClassDB::bind_method(D_METHOD("cast_spell_successc_rpc", "data"), &Entity::cast_spell_successc_rpc);
@ -7050,7 +7038,7 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("spell_casts", "spell_id"), &Entity::spell_casts);
ClassDB::bind_method(D_METHOD("spell_crequest_cast", "spell_id"), &Entity::spell_crequest_cast);
D_METHOD("_item_uses", "item_id");
GDVIRTUAL_BIND("_item_uses", "item_id");
ClassDB::bind_method(D_METHOD("item_uses", "item_id"), &Entity::item_uses);
ClassDB::bind_method(D_METHOD("item_crequest_use", "item_id"), &Entity::item_crequest_use);
@ -7080,8 +7068,8 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("ssend_open_window", "window_id"), &Entity::ssend_open_window);
ClassDB::bind_method(D_METHOD("copen_window", "window_id"), &Entity::copen_window);
D_METHOD("_iss_target_in_interact_range");
D_METHOD("_isc_target_in_interact_range");
GDVIRTUAL_BIND("_iss_target_in_interact_range");
GDVIRTUAL_BIND("_isc_target_in_interact_range");
ClassDB::bind_method(D_METHOD("iss_target_in_interact_range"), &Entity::iss_target_in_interact_range);
ClassDB::bind_method(D_METHOD("isc_target_in_interact_range"), &Entity::isc_target_in_interact_range);
@ -7143,14 +7131,14 @@ void Entity::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "sauras", PROPERTY_HINT_NONE, "17/17:AuraData", PROPERTY_USAGE_ENTITY_HIDDEN, "AuraData"), "sauras_set", "sauras_get");
//Hooks
D_METHOD("_moved");
GDVIRTUAL_BIND("_moved");
ClassDB::bind_method(D_METHOD("moved"), &Entity::moved);
ADD_SIGNAL(MethodInfo("notification_cmouse_entered"));
ADD_SIGNAL(MethodInfo("notification_cmouse_exited"));
D_METHOD("_notification_cmouse_enter");
D_METHOD("_notification_cmouse_exit");
GDVIRTUAL_BIND("_notification_cmouse_enter");
GDVIRTUAL_BIND("_notification_cmouse_exit");
ClassDB::bind_method(D_METHOD("notification_cmouse_enter"), &Entity::notification_cmouse_enter);
ClassDB::bind_method(D_METHOD("notification_cmouse_exit"), &Entity::notification_cmouse_exit);
@ -7158,8 +7146,8 @@ void Entity::_bind_methods() {
ADD_SIGNAL(MethodInfo("notification_ctargeted"));
ADD_SIGNAL(MethodInfo("notification_cuntargeted"));
D_METHOD("_notification_ctargeted");
D_METHOD("_notification_cuntargeted");
GDVIRTUAL_BIND("_notification_ctargeted");
GDVIRTUAL_BIND("_notification_cuntargeted");
ClassDB::bind_method(D_METHOD("notification_ctargeted"), &Entity::notification_ctargeted);
ClassDB::bind_method(D_METHOD("notification_cuntargeted"), &Entity::notification_cuntargeted);
@ -7218,8 +7206,8 @@ void Entity::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT, "cseed", PROPERTY_HINT_NONE, "", 0), "setc_seed", "getc_seed");
//Interaction type
D_METHOD("_gets_relation_to", "to", "Entity");
D_METHOD("_getc_relation_to", "to", "Entity");
GDVIRTUAL_BIND("_gets_relation_to", "to", "Entity");
GDVIRTUAL_BIND("_getc_relation_to", "to", "Entity");
ClassDB::bind_method(D_METHOD("gets_relation_to", "to"), &Entity::gets_relation_to_bind);
ClassDB::bind_method(D_METHOD("_gets_relation_to", "to"), &Entity::_gets_relation_to);
@ -7307,12 +7295,12 @@ void Entity::_bind_methods() {
ADD_SIGNAL(MethodInfo("equip_con_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::OBJECT, "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::INT, "bag_slot")));
ADD_SIGNAL(MethodInfo("equip_con_fail", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::OBJECT, "old_item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::INT, "bag_slot")));
D_METHOD("_equip_should_deny", "equip_slot", "item", "ItemInstance");
GDVIRTUAL_BIND("_equip_should_deny", "equip_slot", "item", "ItemInstance");
D_METHOD("_equip_son_success", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_son_fail", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_con_success", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
D_METHOD("_equip_con_fail", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_son_success", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_son_fail", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_con_success", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
GDVIRTUAL_BIND("_equip_con_fail", PropertyInfo(Variant::INT, "equip_slot", "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance", "old_item", "ItemInstance", "bag_slot");
ADD_SIGNAL(MethodInfo("equipment_changed", PropertyInfo(Variant::INT, "slot")));
@ -7323,7 +7311,7 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("equip_con_success", "equip_slot", "item", "old_item", "bag_slot"), &Entity::equip_con_success);
ClassDB::bind_method(D_METHOD("equip_con_fail", "equip_slot", "item", "old_item", "bag_slot"), &Entity::equip_con_fail);
D_METHOD("_equips", "equip_slot", "bag_slot");
GDVIRTUAL_BIND("_equips", "equip_slot", "bag_slot");
ClassDB::bind_method(D_METHOD("equip_crequest", "equip_slot", "bag_slot"), &Entity::equip_crequest);
ClassDB::bind_method(D_METHOD("equips", "equip_slot", "bag_slot"), &Entity::equips);
@ -7335,13 +7323,13 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("equip_gets_slot", "index"), &Entity::equip_gets_slot);
ClassDB::bind_method(D_METHOD("equip_getc_slot", "index"), &Entity::equip_getc_slot);
D_METHOD("_equip_can_equip_item", "equip_slot", "item", "ItemInstance");
GDVIRTUAL_BIND("_equip_can_equip_item", "equip_slot", "item", "ItemInstance");
ClassDB::bind_method(D_METHOD("equip_can_equip_item", "equip_slot", "item"), &Entity::equip_can_equip_item);
ClassDB::bind_method(D_METHOD("_equip_can_equip_item", "equip_slot", "item"), &Entity::_equip_can_equip_item);
D_METHOD("_equip_applys_item", "item", "ItemInstance");
D_METHOD("_equip_deapplys_item", "item", "ItemInstance");
GDVIRTUAL_BIND("_equip_applys_item", "item", "ItemInstance");
GDVIRTUAL_BIND("_equip_deapplys_item", "item", "ItemInstance");
ClassDB::bind_method(D_METHOD("equip_applys_item", "item"), &Entity::equip_applys_item);
ClassDB::bind_method(D_METHOD("equip_deapplys_item", "item"), &Entity::equip_deapplys_item);
@ -7349,8 +7337,8 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("_equip_applys_item", "item"), &Entity::_equip_applys_item);
ClassDB::bind_method(D_METHOD("_equip_deapplys_item", "item"), &Entity::_equip_deapplys_item);
D_METHOD("_equip_applyc_item", "item", "ItemInstance");
D_METHOD("_equip_deapplyc_item", "item", "ItemInstance");
GDVIRTUAL_BIND("_equip_applyc_item", "item", "ItemInstance");
GDVIRTUAL_BIND("_equip_deapplyc_item", "item", "ItemInstance");
ClassDB::bind_method(D_METHOD("cequip_applys_item", "item"), &Entity::equip_applyc_item);
ClassDB::bind_method(D_METHOD("equip_deapplyc_item", "item"), &Entity::equip_deapplyc_item);
@ -7564,7 +7552,7 @@ void Entity::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::ARRAY, "sspells", PROPERTY_HINT_NONE, "17/17:Spell", PROPERTY_USAGE_ENTITY_HIDDEN, "Spell"), "sspells_set", "sspells_get");
//Crafting
D_METHOD("_crafts", "id");
GDVIRTUAL_BIND("_crafts", "id");
ADD_SIGNAL(MethodInfo("crafts_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance")));
ADD_SIGNAL(MethodInfo("ccraft_success", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance")));
@ -7633,7 +7621,7 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("instance_body"), &Entity::instance_body);
ClassDB::bind_method(D_METHOD("on_body_changed"), &Entity::on_body_changed);
D_METHOD("_body_changed");
GDVIRTUAL_BIND("_body_changed");
ADD_SIGNAL(MethodInfo("body_changed", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity")));
//Transforms
@ -7737,8 +7725,8 @@ void Entity::_bind_methods() {
ClassDB::bind_method(D_METHOD("vendor_item_sell_crequest", "slot_id"), &Entity::vendor_item_sell_crequest);
ClassDB::bind_method(D_METHOD("vendor_item_ssell", "slot_id"), &Entity::vendor_item_ssell);
D_METHOD("_vendor_item_sbuy", "index", "count");
D_METHOD("_vendor_item_ssell", "slot_id");
GDVIRTUAL_BIND("_vendor_item_sbuy", "index", "count");
GDVIRTUAL_BIND("_vendor_item_ssell", "slot_id");
ClassDB::bind_method(D_METHOD("_vendor_item_sbuy", "index", "count"), &Entity::_vendor_item_sbuy);
ClassDB::bind_method(D_METHOD("_vendor_item_ssell", "slot_id"), &Entity::_vendor_item_ssell);
@ -7812,8 +7800,8 @@ void Entity::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "sai", PROPERTY_HINT_RESOURCE_TYPE, "EntityAI", PROPERTY_USAGE_ENTITY_HIDDEN), "sets_ai", "gets_ai");
//Serialization
D_METHOD("_from_dict", "dict");
D_METHOD("_to_dict");
GDVIRTUAL_BIND("_from_dict", "dict");
GDVIRTUAL_BIND("_to_dict");
ClassDB::bind_method(D_METHOD("is_deserialized"), &Entity::is_deserialized);

7
entities/entity.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/object.h"
#include "core/string/ustring.h"
#include "core/templates/vector.h"
#else
#include "core/object.h"
#include "core/ustring.h"
#include "core/vector.h"
#endif
#include "scene/main/multiplayer_peer.h"

39
entities/resources/entity_resource.cpp
View File

@ -286,11 +286,8 @@ Dictionary EntityResource::_to_dict() {
return dict;
}
void EntityResource::_from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_dirty = dict.get("dirty", false);
_should_process = dict.get("should_process", false);
@ -435,25 +432,25 @@ void EntityResource::_bind_methods() {
ClassDB::bind_method(D_METHOD("mods_changed"), &EntityResource::mods_changed);
D_METHOD("_notification_sstat_changed", "statid", "curent");
D_METHOD("_notification_cstat_changed", "statid", "curent");
GDVIRTUAL_BIND("_notification_sstat_changed", "statid", "curent");
GDVIRTUAL_BIND("_notification_cstat_changed", "statid", "curent");
D_METHOD("_ons_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
D_METHOD("_onc_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
GDVIRTUAL_BIND("_ons_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
GDVIRTUAL_BIND("_onc_target_changed", "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity", "old_target", "Entity");
D_METHOD("_ons_added", "entity", "Entity");
D_METHOD("_onc_added", "entity", "Entity");
GDVIRTUAL_BIND("_ons_added", "entity", "Entity");
GDVIRTUAL_BIND("_onc_added", "entity", "Entity");
D_METHOD("_process_server", "delta");
D_METHOD("_process_client", "delta");
GDVIRTUAL_BIND("_process_server", "delta");
GDVIRTUAL_BIND("_process_client", "delta");
D_METHOD("_stacking_mod_added", "value");
D_METHOD("_stacking_mod_removed", "value");
GDVIRTUAL_BIND("_stacking_mod_added", "value");
GDVIRTUAL_BIND("_stacking_mod_removed", "value");
D_METHOD("_non_stacking_mod_added", "value");
D_METHOD("_non_stacking_mod_removed", "value");
GDVIRTUAL_BIND("_non_stacking_mod_added", "value");
GDVIRTUAL_BIND("_non_stacking_mod_removed", "value");
D_METHOD("_mods_changed");
GDVIRTUAL_BIND("_mods_changed");
ClassDB::bind_method(D_METHOD("process_server", "delta"), &EntityResource::process_server);
ClassDB::bind_method(D_METHOD("_process_server", "delta"), &EntityResource::_process_server);
@ -461,12 +458,12 @@ void EntityResource::_bind_methods() {
ClassDB::bind_method(D_METHOD("process_client", "delta"), &EntityResource::process_client);
ClassDB::bind_method(D_METHOD("_process_client", "delta"), &EntityResource::_process_client);
D_METHOD("_gets_update_string");
D_METHOD("_receivec_update_string", "str");
GDVIRTUAL_BIND("_gets_update_string");
GDVIRTUAL_BIND("_receivec_update_string", "str");
//Serialization
D_METHOD("_from_dict", "dict");
D_METHOD("_to_dict");
GDVIRTUAL_BIND("_from_dict", "dict");
GDVIRTUAL_BIND("_to_dict");
ClassDB::bind_method(D_METHOD("from_dict", "dict"), &EntityResource::from_dict);
ClassDB::bind_method(D_METHOD("to_dict"), &EntityResource::to_dict);

5
entities/resources/entity_resource.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "../../defines.h"

5
entities/resources/entity_resource_cost_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "entity_resource.h"
#include "entity_resource_cost_data.h"

5
entities/resources/entity_resource_cost_data_health.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "entity_resource.h"
#include "entity_resource_cost_data.h"

5
entities/resources/entity_resource_cost_data_resource.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "entity_resource.h"
#include "entity_resource_cost_data.h"

9
entities/skills/entity_skill.cpp
View File

@ -103,11 +103,8 @@ Dictionary EntitySkill::_to_dict() {
return dict;
}
void EntitySkill::_from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_skill_id = dict.get("skill_id", 0);
_skill_path = dict.get("skill_path", "");
@ -153,8 +150,8 @@ void EntitySkill::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::BOOL, "disabled"), "set_disabled", "get_disabled");
//Serialization
D_METHOD("_from_dict", "dict");
D_METHOD("_to_dict");
GDVIRTUAL_BIND("_from_dict", "dict");
GDVIRTUAL_BIND("_to_dict");
ClassDB::bind_method(D_METHOD("from_dict", "dict"), &EntitySkill::from_dict);
ClassDB::bind_method(D_METHOD("to_dict"), &EntitySkill::to_dict);

5
entities/skills/entity_skill.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "entity_skill_data.h"

6
entities/skills/entity_skill_data.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/string/ustring.h"
#else
#include "core/resource.h"
#include "core/ustring.h"
#endif
class EntitySkillData : public Resource {
GDCLASS(EntitySkillData, Resource);

5
entities/stats/complex_level_stat_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "../../entity_enums.h"
#include "level_stat_data.h"

2
entities/stats/level_stat_data.cpp
View File

@ -31,7 +31,7 @@ int LevelStatData::get_stat_diff(int main_stat, int old_level, int new_level) {
void LevelStatData::_bind_methods() {
D_METHOD("_get_stat_diff", "main_stat", "old_level", "new_level");
GDVIRTUAL_BIND("_get_stat_diff", "main_stat", "old_level", "new_level");
ClassDB::bind_method(D_METHOD("get_stat_diff", "stat", "old_level", "new_level"), &LevelStatData::get_stat_diff);
}

5
entities/stats/level_stat_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class LevelStatData : public Resource {
GDCLASS(LevelStatData, Resource);

5
entities/stats/simple_level_stat_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "level_stat_data.h"

5
entities/stats/stat_data.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "scene/resources/curve.h"

7
entity_enums.h
View File

@ -24,15 +24,10 @@ SOFTWARE.
#define ENTITY_ENUMS_H
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/object.h"
#include "core/string/ustring.h"
#include "core/object/class_db.h"
#else
#include "core/object.h"
#include "core/ustring.h"
#endif
class EntityEnums : public Object {
GDCLASS(EntityEnums, Object);

4
formations/ai_formation.cpp
View File

@ -75,8 +75,8 @@ AIFormation::AIFormation() {
}
void AIFormation::_bind_methods() {
D_METHOD("_on_set_owner");
D_METHOD("_get_position", "slot_index");
GDVIRTUAL_BIND("_on_set_owner");
GDVIRTUAL_BIND("_get_position", "slot_index");
ClassDB::bind_method(D_METHOD("get_owner"), &AIFormation::get_owner);
ClassDB::bind_method(D_METHOD("set_owner", "entity"), &AIFormation::set_owner_bind);

5
formations/ai_formation.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
#include "scene/main/node.h"

5
infos/aura_infos.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#else
#include "core/reference.h"
#endif
#include "../entities/entity.h"

5
infos/spell_cast_info.cpp
View File

@ -205,11 +205,8 @@ Dictionary SpellCastInfo::to_dict() {
return dict;
}
void SpellCastInfo::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_has_cast_time = dict.get("has_cast_time", true);
_cast_time = dict.get("cast_time", 0);

5
infos/spell_cast_info.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#else
#include "core/resource.h"
#endif
class Spell;
class Entity;

34
inventory/bag.cpp
View File

@ -388,21 +388,21 @@ Bag::~Bag() {
}
void Bag::_bind_methods() {
D_METHOD("_add_item", "item", "ItemInstance");
D_METHOD("_add_item_at", "index", "item", "ItemInstance", "signal");
D_METHOD("_get_item", "index");
D_METHOD("_remove_item", "index");
D_METHOD("_swap_items", "item1_index", "item2_index");
D_METHOD("_can_add_item", "item", "ItemInstance");
D_METHOD("_get_item_count");
D_METHOD("_get_valid_item_count");
D_METHOD("_get_size");
D_METHOD("_set_size", "size");
D_METHOD("_is_full");
D_METHOD("_is_overburdened");
D_METHOD("_has_item", "item", "ItemTemplate", "count");
D_METHOD("_remove_items", "item", "ItemTemplate", "count");
D_METHOD("_change_item_equip", "slot_id", "item", "ItemInstance");
GDVIRTUAL_BIND("_add_item", "item", "ItemInstance");
GDVIRTUAL_BIND("_add_item_at", "index", "item", "ItemInstance", "signal");
GDVIRTUAL_BIND("_get_item", "index");
GDVIRTUAL_BIND("_remove_item", "index");
GDVIRTUAL_BIND("_swap_items", "item1_index", "item2_index");
GDVIRTUAL_BIND("_can_add_item", "item", "ItemInstance");
GDVIRTUAL_BIND("_get_item_count");
GDVIRTUAL_BIND("_get_valid_item_count");
GDVIRTUAL_BIND("_get_size");
GDVIRTUAL_BIND("_set_size", "size");
GDVIRTUAL_BIND("_is_full");
GDVIRTUAL_BIND("_is_overburdened");
GDVIRTUAL_BIND("_has_item", "item", "ItemTemplate", "count");
GDVIRTUAL_BIND("_remove_items", "item", "ItemTemplate", "count");
GDVIRTUAL_BIND("_change_item_equip", "slot_id", "item", "ItemInstance");
ADD_SIGNAL(MethodInfo("item_added", PropertyInfo(Variant::OBJECT, "bag", PROPERTY_HINT_RESOURCE_TYPE, "Bag"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::INT, "slot_id")));
ADD_SIGNAL(MethodInfo("item_removed", PropertyInfo(Variant::OBJECT, "bag", PROPERTY_HINT_RESOURCE_TYPE, "Bag"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"), PropertyInfo(Variant::INT, "slot_id")));
@ -442,8 +442,8 @@ void Bag::_bind_methods() {
ClassDB::bind_method(D_METHOD("_remove_items", "item", "count"), &Bag::_remove_items);
//Serialization
D_METHOD("_from_dict", "dict");
D_METHOD("_to_dict");
GDVIRTUAL_BIND("_from_dict", "dict");
GDVIRTUAL_BIND("_to_dict");
ClassDB::bind_method(D_METHOD("from_dict", "dict"), &Bag::from_dict);
ClassDB::bind_method(D_METHOD("to_dict"), &Bag::to_dict);

6
inventory/bag.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#endif
#include "../item_enums.h"

6
inventory/grid_bag.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#endif
#include "../item_enums.h"

6
inventory/inventory.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#endif
#include "../item_enums.h"

6
inventory/normal_bag.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/templates/vector.h"
#else
#include "core/resource.h"
#include "core/vector.h"
#endif
#include "../item_enums.h"

6
item_enums.h
View File

@ -25,14 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/object.h"
#include "core/string/ustring.h"
#include "core/object/class_db.h"
#else
#include "core/object.h"
#include "core/ustring.h"
#endif
class ItemEnums : public Object {
GDCLASS(ItemEnums, Object);

12
material_cache/ess_material_cache.cpp
View File

@ -38,7 +38,6 @@ SOFTWARE.
#include "../singletons/ess.h"
#if VERSION_MAJOR > 3
#define VARIANT_ARRAY_GET(arr) \
Vector<Variant> r; \
@ -47,16 +46,7 @@ SOFTWARE.
} \
return r;
#else
#define VARIANT_ARRAY_GET(arr) \
Vector<Variant> r; \
for (int i = 0; i < arr.size(); i++) { \
r.push_back(arr[i].get_ref_ptr()); \
} \
return r;
#endif
bool ESSMaterialCache::get_initialized() {
return _initialized;
@ -336,7 +326,7 @@ void ESSMaterialCache::_bind_methods() {
ClassDB::bind_method(D_METHOD("inc_ref_count"), &ESSMaterialCache::inc_ref_count);
ClassDB::bind_method(D_METHOD("dec_ref_count"), &ESSMaterialCache::dec_ref_count);
D_METHOD("_setup_material_albedo", "texture", "Texture");
GDVIRTUAL_BIND("_setup_material_albedo", "texture", "Texture");
ClassDB::bind_method(D_METHOD("material_get", "index"), &ESSMaterialCache::material_get);
ClassDB::bind_method(D_METHOD("material_lod_get", "index"), &ESSMaterialCache::material_lod_get);

7
material_cache/ess_material_cache.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/math/color.h"
#include "core/templates/vector.h"
#else
#include "core/color.h"
#include "core/resource.h"
#include "core/vector.h"
#endif
#include "core/math/rect2.h"
#include "scene/resources/material.h"

7
material_cache/ess_material_cache_pcm.h
View File

@ -27,15 +27,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/io/resource.h"
#include "core/math/color.h"
#include "core/templates/vector.h"
#else
#include "core/color.h"
#include "core/resource.h"
#include "core/vector.h"
#endif
#include "core/math/rect2.h"
#include "scene/resources/material.h"

5
pipelines/spell_damage_info.cpp
View File

@ -201,11 +201,8 @@ Dictionary SpellDamageInfo::to_dict() {
return dict;
}
void SpellDamageInfo::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_immune = dict.get("immune", true);
_damage = dict.get("damage", 0);

5
pipelines/spell_damage_info.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#else
#include "core/reference.h"
#endif
#include "../spell_enums.h"
#include "scene/main/node.h"

5
pipelines/spell_heal_info.cpp
View File

@ -202,11 +202,8 @@ Dictionary SpellHealInfo::to_dict() {
return dict;
}
void SpellHealInfo::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_immune = dict.get("immune", true);
_heal = dict.get("heal", 0);

5
pipelines/spell_heal_info.h
View File

@ -25,11 +25,8 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#else
#include "core/reference.h"
#endif
#include "../spell_enums.h"
#include "scene/main/node.h"

5
profiles/actionbar/action_bar_button_entry.cpp
View File

@ -93,11 +93,8 @@ Dictionary ActionBarButtonEntry::to_dict() const {
return dict;
}
void ActionBarButtonEntry::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_action_bar_id = dict.get("action_bar_id", 0);
_slot_id = dict.get("slot_id", 0);

6
profiles/actionbar/action_bar_button_entry.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/variant/dictionary.h"
#else
#include "core/reference.h"
#include "core/dictionary.h"
#endif
class ActionBarEntry;

5
profiles/actionbar/action_bar_entry.cpp
View File

@ -117,11 +117,8 @@ Dictionary ActionBarEntry::to_dict() const {
return dict;
}
void ActionBarEntry::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
for (int i = 0; i < _button_entries.size(); ++i) {
_button_entries.get(i)->set_owner(NULL);

8
profiles/actionbar/action_bar_entry.h
View File

@ -25,17 +25,11 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/templates/vector.h"
#include "core/variant/array.h"
#include "core/variant/dictionary.h"
#else
#include "core/reference.h"
#include "core/vector.h"
#include "core/array.h"
#include "core/dictionary.h"
#endif
#include "action_bar_button_entry.h"

6
profiles/actionbar/action_bar_profile.cpp
View File

@ -132,13 +132,9 @@ Dictionary ActionBarProfile::to_dict() const {
return dict;
}
void ActionBarProfile::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
if (dict.is_empty())
return;
#else
if (dict.empty())
return;
#endif
for (int i = 0; i < _action_bars.size(); ++i) {
_action_bars.get(i)->set_owner(NULL);

9
profiles/actionbar/action_bar_profile.h
View File

@ -25,19 +25,12 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#include "core/variant/array.h"
#include "core/variant/dictionary.h"
#else
#include "core/reference.h"
#include "core/vector.h"
#include "core/ustring.h"
#include "core/array.h"
#include "core/dictionary.h"
#endif
#include "action_bar_entry.h"

5
profiles/class_profile.cpp
View File

@ -127,11 +127,8 @@ Dictionary ClassProfile::to_dict() const {
return dict;
}
void ClassProfile::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
_character_class_name = dict.get("character_class_name", "");
_class_path = dict.get("class_path", "");

7
profiles/class_profile.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/string/ustring.h"
#include "core/variant/dictionary.h"
#else
#include "core/reference.h"
#include "core/ustring.h"
#include "core/dictionary.h"
#endif
#include "actionbar/action_bar_profile.h"
#include "input/input_profile.h"

6
profiles/input/input_profile.cpp
View File

@ -24,13 +24,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/string/ustring.h"
#include "core/config/project_settings.h"
#else
#include "core/ustring.h"
#include "core/project_settings.h"
#endif
#include "../class_profile.h"

6
profiles/input/input_profile.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/string/ustring.h"
#else
#include "core/reference.h"
#include "core/ustring.h"
#endif
class ClassProfile;

7
profiles/input/input_profile_modifier.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#else
#include "core/reference.h"
#include "core/vector.h"
#include "core/ustring.h"
#endif
#include "input_profile_modifier_entry.h"

6
profiles/input/input_profile_modifier_entry.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/string/ustring.h"
#else
#include "core/reference.h"
#include "core/ustring.h"
#endif
class InputProfileModifierEntry : public RefCounted {
GDCLASS(InputProfileModifierEntry, RefCounted);

5
profiles/player_profile.cpp
View File

@ -146,11 +146,8 @@ Dictionary PlayerProfile::to_dict() const {
return dict;
}
void PlayerProfile::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
clear_class_profiles();

7
profiles/player_profile.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/ref_counted.h"
#include "core/string/ustring.h"
#include "core/variant/dictionary.h"
#else
#include "core/reference.h"
#include "core/ustring.h"
#include "core/dictionary.h"
#endif
#include "class_profile.h"

9
singletons/ess.h
View File

@ -25,19 +25,12 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/config/engine.h"
#include "core/core_bind.h"
#include "core/io/resource.h"
#include "core/object/object.h"
#include "core/string/ustring.h"
#else
#include "core/bind/core_bind.h"
#include "core/engine.h"
#include "core/object.h"
#include "core/resource.h"
#include "core/ustring.h"
#endif
#include "scene/main/node.h"

15
singletons/profile_manager.cpp
View File

@ -26,13 +26,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/config/engine.h"
#include "core/config/project_settings.h"
#else
#include "core/engine.h"
#include "core/project_settings.h"
#endif
#include "../defines.h"
@ -170,11 +166,8 @@ Dictionary ProfileManager::to_dict() const {
return dict;
}
void ProfileManager::from_dict(const Dictionary &dict) {
#if VERSION_MAJOR > 3
ERR_FAIL_COND(dict.is_empty());
#else
ERR_FAIL_COND(dict.empty());
#endif
clears_player_profiles();
@ -234,8 +227,8 @@ void ProfileManager::_bind_methods() {
ADD_SIGNAL(MethodInfo("keybinds_changed"));
ADD_SIGNAL(MethodInfo("changed"));
D_METHOD("_save");
D_METHOD("_load");
GDVIRTUAL_BIND("_save");
GDVIRTUAL_BIND("_load");
ClassDB::bind_method(D_METHOD("_save"), &ProfileManager::_save);
ClassDB::bind_method(D_METHOD("_load"), &ProfileManager::_load);

6
singletons/profile_manager.h
View File

@ -25,13 +25,9 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/object/object.h"
#include "core/templates/vector.h"
#else
#include "core/object.h"
#include "core/vector.h"
#endif
#include "../profiles/player_profile.h"

4
skeleton/character_skeleton_2d.cpp
View File

@ -551,7 +551,7 @@ void CharacterSkeleton2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_model_visual_count"), &CharacterSkeleton2D::get_model_visual_count);
ClassDB::bind_method(D_METHOD("clear_model_visuals"), &CharacterSkeleton2D::clear_model_visuals);
D_METHOD("_build_model");
GDVIRTUAL_BIND("_build_model");
ClassDB::bind_method(D_METHOD("get_model_dirty"), &CharacterSkeleton2D::get_model_dirty);
ClassDB::bind_method(D_METHOD("set_model_dirty", "value"), &CharacterSkeleton2D::set_model_dirty);
@ -586,7 +586,7 @@ void CharacterSkeleton2D::_bind_methods() {
ClassDB::bind_method(D_METHOD("attach_point_count"), &CharacterSkeleton2D::attach_point_count);
D_METHOD("_common_attach_point_index_get", "point", PROPERTY_HINT_NONE, EntityEnums::BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS);
GDVIRTUAL_BIND("_common_attach_point_index_get", "point", PROPERTY_HINT_NONE, EntityEnums::BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS);
ClassDB::bind_method(D_METHOD("common_attach_point_node_get", "point"), &CharacterSkeleton2D::common_attach_point_node_get);
ClassDB::bind_method(D_METHOD("common_attach_point_add", "point", "scene"), &CharacterSkeleton2D::common_attach_point_add);

7
skeleton/character_skeleton_2d.h
View File

@ -25,15 +25,10 @@ SOFTWARE.
#include "core/version.h"
#if VERSION_MAJOR > 3
#include "core/templates/vector.h"
#include "core/string/ustring.h"
#include "core/string/node_path.h"
#else
#include "core/vector.h"
#include "core/ustring.h"
#include "core/node_path.h"
#endif
#include "scene/2d/node_2d.h"

4
skeleton/character_skeleton_3d.cpp
View File

@ -651,7 +651,7 @@ void CharacterSkeleton3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("get_model_visual_count"), &CharacterSkeleton3D::get_model_visual_count);
ClassDB::bind_method(D_METHOD("clear_model_visuals"), &CharacterSkeleton3D::clear_model_visuals);
D_METHOD("_build_model");
GDVIRTUAL_BIND("_build_model");
ClassDB::bind_method(D_METHOD("get_model_dirty"), &CharacterSkeleton3D::get_model_dirty);
ClassDB::bind_method(D_METHOD("set_model_dirty", "value"), &CharacterSkeleton3D::set_model_dirty);
@ -700,7 +700,7 @@ void CharacterSkeleton3D::_bind_methods() {
ClassDB::bind_method(D_METHOD("attach_point_count"), &CharacterSkeleton3D::attach_point_count);
D_METHOD("_common_attach_point_index_get", "point", PROPERTY_HINT_NONE, EntityEnums::BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS);
GDVIRTUAL_BIND("_common_attach_point_index_get", "point", PROPERTY_HINT_NONE, EntityEnums::BINDING_STRING_COMMON_CHARCATER_SKELETON_POINTS);
ClassDB::bind_method(D_METHOD("common_attach_point_node_get", "point"), &CharacterSkeleton3D::common_attach_point_node_get);
ClassDB::bind_method(D_METHOD("common_attach_point_add", "point", "scene"), &CharacterSkeleton3D::common_attach_point_add);

Some files were not shown because too many files have changed in this diff Show More