diff --git a/data/auras/aura.cpp b/data/auras/aura.cpp index 1c20c24..580f312 100644 --- a/data/auras/aura.cpp +++ b/data/auras/aura.cpp @@ -793,40 +793,40 @@ void Aura::con_entity_resource_removed(Ref data, Ref r //Equipment -bool Aura::should_deny_equip(Ref data, ItemEnums::EquipSlots equip_slot, Ref item) { +bool Aura::equip_should_deny(Ref data, ItemEnums::EquipSlots equip_slot, Ref item) { ERR_FAIL_COND_V(!data.is_valid(), false); - if (has_method("_should_deny_equip")) - if (call("_should_deny_equip", data, equip_slot, item)) + if (has_method("_equip_should_deny")) + if (call("_equip_should_deny", data, equip_slot, item)) return true; return false; } -void Aura::son_equip_success(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void Aura::equip_son_success(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { ERR_FAIL_COND(!data.is_valid()); - if (has_method("_son_equip_success")) - call("_son_equip_success", data, equip_slot, item, old_item, bag_slot); + if (has_method("_equip_son_success")) + call("_equip_son_success", data, equip_slot, item, old_item, bag_slot); } -void Aura::son_equip_fail(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void Aura::equip_son_fail(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { ERR_FAIL_COND(!data.is_valid()); - if (has_method("_son_equip_fail")) - call("_son_equip_fail", data, equip_slot, item, old_item, bag_slot); + if (has_method("_equip_son_fail")) + call("_equip_son_fail", data, equip_slot, item, old_item, bag_slot); } -void Aura::con_equip_success(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void Aura::equip_con_success(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { ERR_FAIL_COND(!data.is_valid()); - if (has_method("_con_equip_success")) - call("_con_equip_success", data, equip_slot, item, old_item, bag_slot); + if (has_method("_equip_con_success")) + call("_equip_con_success", data, equip_slot, item, old_item, bag_slot); } -void Aura::con_equip_fail(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void Aura::equip_con_fail(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { ERR_FAIL_COND(!data.is_valid()); - if (has_method("_con_equip_fail")) - call("_con_equip_fail", data, equip_slot, item, old_item, bag_slot); + if (has_method("_equip_con_fail")) + call("_equip_con_fail", data, equip_slot, item, old_item, bag_slot); } void Aura::setup_aura_data(Ref data, Ref info) { @@ -1342,19 +1342,19 @@ void Aura::_bind_methods() { //Equipment - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_should_deny_equip", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_equip_should_deny", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - BIND_VMETHOD(MethodInfo("_son_equip_success", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), 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"))); - BIND_VMETHOD(MethodInfo("_son_equip_fail", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), 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"))); - BIND_VMETHOD(MethodInfo("_con_equip_success", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), 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"))); - BIND_VMETHOD(MethodInfo("_con_equip_fail", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), 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"))); + BIND_VMETHOD(MethodInfo("_equip_son_success", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), 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"))); + BIND_VMETHOD(MethodInfo("_equip_son_fail", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), 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"))); + BIND_VMETHOD(MethodInfo("_equip_con_success", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), 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"))); + BIND_VMETHOD(MethodInfo("_equip_con_fail", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "AuraData"), 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"))); - ClassDB::bind_method(D_METHOD("should_deny_equip", "data", "equip_slot", "item"), &Aura::should_deny_equip); + ClassDB::bind_method(D_METHOD("equip_should_deny", "data", "equip_slot", "item"), &Aura::equip_should_deny); - ClassDB::bind_method(D_METHOD("son_equip_success", "data", "equip_slot", "item", "old_item", "bag_slot"), &Aura::son_equip_success); - ClassDB::bind_method(D_METHOD("son_equip_fail", "data", "equip_slot", "item", "old_item", "bag_slot"), &Aura::son_equip_fail); - ClassDB::bind_method(D_METHOD("con_equip_success", "data", "equip_slot", "item", "old_item", "bag_slot"), &Aura::con_equip_success); - ClassDB::bind_method(D_METHOD("con_equip_fail", "data", "equip_slot", "item", "old_item", "bag_slot"), &Aura::con_equip_fail); + ClassDB::bind_method(D_METHOD("equip_son_success", "data", "equip_slot", "item", "old_item", "bag_slot"), &Aura::equip_son_success); + ClassDB::bind_method(D_METHOD("equip_son_fail", "data", "equip_slot", "item", "old_item", "bag_slot"), &Aura::equip_son_fail); + ClassDB::bind_method(D_METHOD("equip_con_success", "data", "equip_slot", "item", "old_item", "bag_slot"), &Aura::equip_con_success); + ClassDB::bind_method(D_METHOD("equip_con_fail", "data", "equip_slot", "item", "old_item", "bag_slot"), &Aura::equip_con_fail); //Calculations / Queries ClassDB::bind_method(D_METHOD("setup_aura_data", "data", "info"), &Aura::setup_aura_data); diff --git a/data/auras/aura.h b/data/auras/aura.h index f5d8606..578ad08 100644 --- a/data/auras/aura.h +++ b/data/auras/aura.h @@ -305,13 +305,13 @@ public: void con_entity_resource_removed(Ref data, Ref resource); //Equipment - bool should_deny_equip(Ref data, ItemEnums::EquipSlots equip_slot, Ref item); + bool equip_should_deny(Ref data, ItemEnums::EquipSlots equip_slot, Ref item); - void son_equip_success(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void son_equip_fail(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_success(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_fail(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_success(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_fail(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_success(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_fail(Ref data, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); //Calculations / Queries void setup_aura_data(Ref data, Ref info); diff --git a/doc_classes/Aura.xml b/doc_classes/Aura.xml index 79b70f8..6b5a8e9 100644 --- a/doc_classes/Aura.xml +++ b/doc_classes/Aura.xml @@ -227,7 +227,7 @@ - + @@ -244,7 +244,7 @@ Called clientside for an [Entity] when equipping an item fails. - + @@ -436,7 +436,7 @@ This method sets up the given [AuraData] based on the given [AuraApplyInfo]. Override it, if you need to do something special. Serverside. - + @@ -711,7 +711,7 @@ - + @@ -727,7 +727,7 @@ - + @@ -1063,7 +1063,7 @@ - + @@ -1079,7 +1079,7 @@ - + @@ -1425,7 +1425,7 @@ - + @@ -1681,7 +1681,7 @@ - + @@ -1697,7 +1697,7 @@ - + diff --git a/doc_classes/Entity.xml b/doc_classes/Entity.xml index 79e0a77..334f298 100644 --- a/doc_classes/Entity.xml +++ b/doc_classes/Entity.xml @@ -4,15 +4,15 @@ Represents an [Entity] inside the world. Entities can be players, mobs, chests, or any kind of interactable things. - Functions starting, or having an 's' in them (like adds_cooldown, or sapply_item etc) are only called, or meant to be called by serverside code. - Functions with a 'c' in them (like addc_cooldown, cdeapply_item etc) are only called, or meant to be called from clientside code. + Functions starting, or having an 's' in them (like adds_cooldown, or equip_applys_item etc) are only called, or meant to be called by serverside code. + Functions with a 'c' in them (like addc_cooldown, equip_deapplyc_item etc) are only called, or meant to be called from clientside code. Functions that have a virtual variant starting with an underscore, should be called, they will call the virtual version. They will check if the virtual properly exists, also usually they check if the parameters are valid, so you don't have to do it every time in gdscript. - + @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -328,7 +328,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -536,7 +536,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -994,7 +994,7 @@ - + @@ -1082,7 +1082,7 @@ - + @@ -1138,7 +1138,7 @@ - + @@ -1148,7 +1148,7 @@ - + @@ -1412,7 +1412,7 @@ - + @@ -1426,7 +1426,7 @@ - + @@ -1536,7 +1536,7 @@ - + @@ -1652,7 +1652,7 @@ - + @@ -1962,7 +1962,7 @@ - + @@ -2188,7 +2188,7 @@ - + @@ -3028,7 +3028,7 @@ - + @@ -3106,7 +3106,7 @@ - + @@ -3158,7 +3158,7 @@ - + @@ -3254,7 +3254,7 @@ - + @@ -3464,7 +3464,7 @@ - + @@ -3478,7 +3478,7 @@ - + @@ -4006,7 +4006,7 @@ - + @@ -4020,7 +4020,7 @@ - + @@ -4378,7 +4378,7 @@ - + @@ -4392,7 +4392,7 @@ - + diff --git a/doc_classes/EntityClassData.xml b/doc_classes/EntityClassData.xml index a3ae8f1..83cb158 100644 --- a/doc_classes/EntityClassData.xml +++ b/doc_classes/EntityClassData.xml @@ -140,7 +140,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -438,7 +438,7 @@ - + @@ -454,7 +454,7 @@ - + @@ -662,7 +662,7 @@ - + @@ -678,7 +678,7 @@ - + @@ -928,7 +928,7 @@ - + @@ -1144,7 +1144,7 @@ - + @@ -1160,7 +1160,7 @@ - + diff --git a/doc_classes/EntityData.xml b/doc_classes/EntityData.xml index 05a11ec..2a36074 100644 --- a/doc_classes/EntityData.xml +++ b/doc_classes/EntityData.xml @@ -148,7 +148,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -492,7 +492,7 @@ - + @@ -508,7 +508,7 @@ - + @@ -724,7 +724,7 @@ - + @@ -740,7 +740,7 @@ - + @@ -828,7 +828,7 @@ - + @@ -1052,7 +1052,7 @@ - + @@ -1068,7 +1068,7 @@ - + diff --git a/entities/data/entity_class_data.cpp b/entities/data/entity_class_data.cpp index 4e91587..9b80d5d 100644 --- a/entities/data/entity_class_data.cpp +++ b/entities/data/entity_class_data.cpp @@ -747,14 +747,14 @@ void EntityClassData::con_entity_resource_removed(Ref resource) //Equipment -bool EntityClassData::should_deny_equip(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item) { - if (has_method("_should_deny_equip")) - if (call("_should_deny_equip", entity, equip_slot, item)) +bool EntityClassData::equip_should_deny(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item) { + if (has_method("_equip_should_deny")) + if (call("_equip_should_deny", entity, equip_slot, item)) return true; return false; } -bool EntityClassData::should_deny_equip_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item) { +bool EntityClassData::equip_should_deny_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item) { #if VERSION_MAJOR < 4 ERR_FAIL_COND_V(!ObjectDB::instance_validate(entity), false); #else @@ -765,14 +765,14 @@ bool EntityClassData::should_deny_equip_bind(Node *entity, ItemEnums::EquipSlots ERR_FAIL_COND_V(e == NULL, false); - return should_deny_equip(e, equip_slot, item); + return equip_should_deny(e, equip_slot, item); } -void EntityClassData::son_equip_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { - if (has_method("_son_equip_success")) - call("_son_equip_success", entity, equip_slot, item, old_item, bag_slot); +void EntityClassData::equip_son_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { + if (has_method("_equip_son_success")) + call("_equip_son_success", entity, equip_slot, item, old_item, bag_slot); } -void EntityClassData::son_equip_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityClassData::equip_son_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { #if VERSION_MAJOR < 4 ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); #else @@ -783,14 +783,14 @@ void EntityClassData::son_equip_success_bind(Node *entity, ItemEnums::EquipSlots ERR_FAIL_COND(e == NULL); - son_equip_success(e, equip_slot, item, old_item, bag_slot); + equip_son_success(e, equip_slot, item, old_item, bag_slot); } -void EntityClassData::son_equip_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { - if (has_method("_son_equip_fail")) - call("_son_equip_fail", entity, equip_slot, item, old_item, bag_slot); +void EntityClassData::equip_son_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { + if (has_method("_equip_son_fail")) + call("_equip_son_fail", entity, equip_slot, item, old_item, bag_slot); } -void EntityClassData::son_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityClassData::equip_son_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { #if VERSION_MAJOR < 4 ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); #else @@ -801,14 +801,14 @@ void EntityClassData::son_equip_fail_bind(Node *entity, ItemEnums::EquipSlots eq ERR_FAIL_COND(e == NULL); - son_equip_fail(e, equip_slot, item, old_item, bag_slot); + equip_son_fail(e, equip_slot, item, old_item, bag_slot); } -void EntityClassData::con_equip_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { - if (has_method("_con_equip_success")) - call("_con_equip_success", entity, equip_slot, item, old_item, bag_slot); +void EntityClassData::equip_con_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { + if (has_method("_equip_con_success")) + call("_equip_con_success", entity, equip_slot, item, old_item, bag_slot); } -void EntityClassData::con_equip_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityClassData::equip_con_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { #if VERSION_MAJOR < 4 ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); #else @@ -819,14 +819,14 @@ void EntityClassData::con_equip_success_bind(Node *entity, ItemEnums::EquipSlots ERR_FAIL_COND(e == NULL); - con_equip_success(e, equip_slot, item, old_item, bag_slot); + equip_con_success(e, equip_slot, item, old_item, bag_slot); } -void EntityClassData::con_equip_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { - if (has_method("_con_equip_fail")) - call("_con_equip_fail", entity, equip_slot, item, old_item, bag_slot); +void EntityClassData::equip_con_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { + if (has_method("_equip_con_fail")) + call("_equip_con_fail", entity, equip_slot, item, old_item, bag_slot); } -void EntityClassData::con_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityClassData::equip_con_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { #if VERSION_MAJOR < 4 ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); #else @@ -837,7 +837,7 @@ void EntityClassData::con_equip_fail_bind(Node *entity, ItemEnums::EquipSlots eq ERR_FAIL_COND(e == NULL); - con_equip_fail(e, equip_slot, item, old_item, bag_slot); + equip_con_fail(e, equip_slot, item, old_item, bag_slot); } EntityClassData::EntityClassData() { @@ -944,19 +944,19 @@ void EntityClassData::_bind_methods() { BIND_VMETHOD(MethodInfo("_con_character_level_up", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "value"))); //Equipment - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_should_deny_equip", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_equip_should_deny", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - BIND_VMETHOD(MethodInfo("_son_equip_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"))); - BIND_VMETHOD(MethodInfo("_son_equip_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"))); - BIND_VMETHOD(MethodInfo("_con_equip_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"))); - BIND_VMETHOD(MethodInfo("_con_equip_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"))); + BIND_VMETHOD(MethodInfo("_equip_son_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"))); + BIND_VMETHOD(MethodInfo("_equip_son_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"))); + BIND_VMETHOD(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"))); + BIND_VMETHOD(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"))); - ClassDB::bind_method(D_METHOD("should_deny_equip", "entity", "equip_slot", "item"), &EntityClassData::should_deny_equip_bind); + ClassDB::bind_method(D_METHOD("equip_should_deny", "entity", "equip_slot", "item"), &EntityClassData::equip_should_deny_bind); - ClassDB::bind_method(D_METHOD("son_equip_success", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityClassData::son_equip_success_bind); - ClassDB::bind_method(D_METHOD("son_equip_fail", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityClassData::son_equip_fail_bind); - ClassDB::bind_method(D_METHOD("con_equip_success", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityClassData::con_equip_success_bind); - ClassDB::bind_method(D_METHOD("con_equip_fail", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityClassData::con_equip_fail_bind); + ClassDB::bind_method(D_METHOD("equip_son_success", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityClassData::equip_son_success_bind); + ClassDB::bind_method(D_METHOD("equip_son_fail", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityClassData::equip_son_fail_bind); + ClassDB::bind_method(D_METHOD("equip_con_success", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityClassData::equip_con_success_bind); + ClassDB::bind_method(D_METHOD("equip_con_fail", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityClassData::equip_con_fail_bind); ClassDB::bind_method(D_METHOD("get_id"), &EntityClassData::get_id); ClassDB::bind_method(D_METHOD("set_id", "value"), &EntityClassData::set_id); diff --git a/entities/data/entity_class_data.h b/entities/data/entity_class_data.h index fbc7855..af5ea1b 100644 --- a/entities/data/entity_class_data.h +++ b/entities/data/entity_class_data.h @@ -207,18 +207,18 @@ public: //Equipment - bool should_deny_equip(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item); - bool should_deny_equip_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item); + bool equip_should_deny(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item); + bool equip_should_deny_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item); - void son_equip_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void son_equip_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void son_equip_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void son_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); EntityClassData(); ~EntityClassData(); diff --git a/entities/data/entity_data.cpp b/entities/data/entity_data.cpp index 728e066..716eb43 100644 --- a/entities/data/entity_data.cpp +++ b/entities/data/entity_data.cpp @@ -758,18 +758,18 @@ void EntityData::con_entity_resource_removed(Ref resource) { //Equipment -bool EntityData::should_deny_equip(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item) { +bool EntityData::equip_should_deny(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item) { if (_entity_class_data.is_valid()) - if (_entity_class_data->should_deny_equip(entity, equip_slot, item)) + if (_entity_class_data->equip_should_deny(entity, equip_slot, item)) return true; - if (has_method("_should_deny_equip")) - if (call("_should_deny_equip", entity, equip_slot, item)) + if (has_method("_equip_should_deny")) + if (call("_equip_should_deny", entity, equip_slot, item)) return true; return false; } -bool EntityData::should_deny_equip_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item) { +bool EntityData::equip_should_deny_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item) { #if VERSION_MAJOR < 4 ERR_FAIL_COND_V(!ObjectDB::instance_validate(entity), false); #else @@ -780,17 +780,17 @@ bool EntityData::should_deny_equip_bind(Node *entity, ItemEnums::EquipSlots equi ERR_FAIL_COND_V(e == NULL, false); - return should_deny_equip(e, equip_slot, item); + return equip_should_deny(e, equip_slot, item); } -void EntityData::son_equip_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityData::equip_son_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { if (_entity_class_data.is_valid()) - _entity_class_data->son_equip_success(entity, equip_slot, item, old_item, bag_slot); + _entity_class_data->equip_son_success(entity, equip_slot, item, old_item, bag_slot); - if (has_method("_son_equip_success")) - call("_son_equip_success", entity, equip_slot, item, old_item, bag_slot); + if (has_method("_equip_son_success")) + call("_equip_son_success", entity, equip_slot, item, old_item, bag_slot); } -void EntityData::son_equip_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityData::equip_son_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { #if VERSION_MAJOR < 4 ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); #else @@ -801,17 +801,17 @@ void EntityData::son_equip_success_bind(Node *entity, ItemEnums::EquipSlots equi ERR_FAIL_COND(e == NULL); - son_equip_success(e, equip_slot, item, old_item, bag_slot); + equip_son_success(e, equip_slot, item, old_item, bag_slot); } -void EntityData::son_equip_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityData::equip_son_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { if (_entity_class_data.is_valid()) - _entity_class_data->son_equip_fail(entity, equip_slot, item, old_item, bag_slot); + _entity_class_data->equip_son_fail(entity, equip_slot, item, old_item, bag_slot); - if (has_method("_son_equip_fail")) - call("_son_equip_fail", entity, equip_slot, item, old_item, bag_slot); + if (has_method("_equip_son_fail")) + call("_equip_son_fail", entity, equip_slot, item, old_item, bag_slot); } -void EntityData::son_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityData::equip_son_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { #if VERSION_MAJOR < 4 ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); #else @@ -822,17 +822,17 @@ void EntityData::son_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_s ERR_FAIL_COND(e == NULL); - son_equip_fail(e, equip_slot, item, old_item, bag_slot); + equip_son_fail(e, equip_slot, item, old_item, bag_slot); } -void EntityData::con_equip_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityData::equip_con_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { if (_entity_class_data.is_valid()) - _entity_class_data->con_equip_success(entity, equip_slot, item, old_item, bag_slot); + _entity_class_data->equip_con_success(entity, equip_slot, item, old_item, bag_slot); - if (has_method("_con_equip_success")) - call("_con_equip_success", entity, equip_slot, item, old_item, bag_slot); + if (has_method("_equip_con_success")) + call("_equip_con_success", entity, equip_slot, item, old_item, bag_slot); } -void EntityData::con_equip_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityData::equip_con_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { #if VERSION_MAJOR < 4 ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); #else @@ -843,17 +843,17 @@ void EntityData::con_equip_success_bind(Node *entity, ItemEnums::EquipSlots equi ERR_FAIL_COND(e == NULL); - con_equip_success(e, equip_slot, item, old_item, bag_slot); + equip_con_success(e, equip_slot, item, old_item, bag_slot); } -void EntityData::con_equip_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityData::equip_con_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { if (_entity_class_data.is_valid()) - _entity_class_data->con_equip_fail(entity, equip_slot, item, old_item, bag_slot); + _entity_class_data->equip_con_fail(entity, equip_slot, item, old_item, bag_slot); - if (has_method("_con_equip_fail")) - call("_con_equip_fail", entity, equip_slot, item, old_item, bag_slot); + if (has_method("_equip_con_fail")) + call("_equip_con_fail", entity, equip_slot, item, old_item, bag_slot); } -void EntityData::con_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void EntityData::equip_con_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { #if VERSION_MAJOR < 4 ERR_FAIL_COND(!ObjectDB::instance_validate(entity)); #else @@ -864,7 +864,7 @@ void EntityData::con_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_s ERR_FAIL_COND(e == NULL); - con_equip_fail(e, equip_slot, item, old_item, bag_slot); + equip_con_fail(e, equip_slot, item, old_item, bag_slot); } EntityData::EntityData() { @@ -1006,19 +1006,19 @@ void EntityData::_bind_methods() { //Equipment - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_should_deny_equip", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_equip_should_deny", PropertyInfo(Variant::OBJECT, "entity", PROPERTY_HINT_RESOURCE_TYPE, "Entity"), PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - BIND_VMETHOD(MethodInfo("_son_equip_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"))); - BIND_VMETHOD(MethodInfo("_son_equip_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"))); - BIND_VMETHOD(MethodInfo("_con_equip_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"))); - BIND_VMETHOD(MethodInfo("_con_equip_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"))); + BIND_VMETHOD(MethodInfo("_equip_son_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"))); + BIND_VMETHOD(MethodInfo("_equip_son_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"))); + BIND_VMETHOD(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"))); + BIND_VMETHOD(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"))); - ClassDB::bind_method(D_METHOD("should_deny_equip", "entity", "equip_slot", "item"), &EntityData::should_deny_equip_bind); + ClassDB::bind_method(D_METHOD("equip_should_deny", "entity", "equip_slot", "item"), &EntityData::equip_should_deny_bind); - ClassDB::bind_method(D_METHOD("son_equip_success", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityData::son_equip_success_bind); - ClassDB::bind_method(D_METHOD("son_equip_fail", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityData::son_equip_fail_bind); - ClassDB::bind_method(D_METHOD("con_equip_success", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityData::con_equip_success_bind); - ClassDB::bind_method(D_METHOD("con_equip_fail", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityData::con_equip_fail_bind); + ClassDB::bind_method(D_METHOD("equip_son_success", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityData::equip_son_success_bind); + ClassDB::bind_method(D_METHOD("equip_son_fail", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityData::equip_son_fail_bind); + ClassDB::bind_method(D_METHOD("equip_con_success", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityData::equip_con_success_bind); + ClassDB::bind_method(D_METHOD("equip_con_fail", "entity", "equip_slot", "item", "old_item", "bag_slot"), &EntityData::equip_con_fail_bind); ClassDB::bind_method(D_METHOD("get_id"), &EntityData::get_id); ClassDB::bind_method(D_METHOD("set_id", "value"), &EntityData::set_id); diff --git a/entities/data/entity_data.h b/entities/data/entity_data.h index bd2b1e0..eeb5d4a 100644 --- a/entities/data/entity_data.h +++ b/entities/data/entity_data.h @@ -211,18 +211,18 @@ public: //Equipment - bool should_deny_equip(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item); - bool should_deny_equip_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item); + bool equip_should_deny(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item); + bool equip_should_deny_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item); - void son_equip_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void son_equip_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void son_equip_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void son_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_success(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_success_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_fail(Entity *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_fail_bind(Node *entity, ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); EntityData(); ~EntityData(); diff --git a/entities/entity.cpp b/entities/entity.cpp index c7438ca..4cb44af 100644 --- a/entities/entity.cpp +++ b/entities/entity.cpp @@ -1872,118 +1872,118 @@ void Entity::creceive_stat(int id, int ccurrent, int cmax) { //// Equip Slots //// -bool Entity::should_deny_equip(ItemEnums::EquipSlots equip_slot, Ref item) { +bool Entity::equip_should_deny(ItemEnums::EquipSlots equip_slot, Ref item) { if (_s_entity_data.is_valid()) { - if (_s_entity_data->should_deny_equip(this, equip_slot, item)) + if (_s_entity_data->equip_should_deny(this, equip_slot, item)) return true; } for (int i = 0; i < _s_auras.size(); ++i) { Ref ad = _s_auras.get(i); - if (ad->get_aura()->should_deny_equip(ad, equip_slot, item)) + if (ad->get_aura()->equip_should_deny(ad, equip_slot, item)) return true; } - if (has_method("_should_deny_equip")) - if (call("_should_deny_equip", equip_slot, item)) + if (has_method("_equip_should_deny")) + if (call("_equip_should_deny", equip_slot, item)) return true; return false; } -void Entity::son_equip_success(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void Entity::equip_son_success(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { if (_s_entity_data.is_valid()) { - _s_entity_data->son_equip_success(this, equip_slot, item, old_item, bag_slot); + _s_entity_data->equip_son_success(this, equip_slot, item, old_item, bag_slot); } for (int i = 0; i < _s_auras.size(); ++i) { Ref ad = _s_auras.get(i); - ad->get_aura()->son_equip_success(ad, equip_slot, item, old_item, bag_slot); + ad->get_aura()->equip_son_success(ad, equip_slot, item, old_item, bag_slot); } - if (has_method("_son_equip_success")) - call("_son_equip_success", equip_slot, item, old_item, bag_slot); + if (has_method("_equip_son_success")) + call("_equip_son_success", equip_slot, item, old_item, bag_slot); - emit_signal("son_equip_success", this, equip_slot, item, old_item, bag_slot); + emit_signal("equip_son_success", this, equip_slot, item, old_item, bag_slot); } -void Entity::son_equip_fail(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void Entity::equip_son_fail(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { if (_s_entity_data.is_valid()) { - _s_entity_data->son_equip_fail(this, equip_slot, item, old_item, bag_slot); + _s_entity_data->equip_son_fail(this, equip_slot, item, old_item, bag_slot); } for (int i = 0; i < _s_auras.size(); ++i) { Ref ad = _s_auras.get(i); - ad->get_aura()->son_equip_fail(ad, equip_slot, item, old_item, bag_slot); + ad->get_aura()->equip_son_fail(ad, equip_slot, item, old_item, bag_slot); } - if (has_method("_son_equip_fail")) - call("_son_equip_fail", equip_slot, item, old_item, bag_slot); + if (has_method("_equip_son_fail")) + call("_equip_son_fail", equip_slot, item, old_item, bag_slot); - emit_signal("son_equip_fail", this, equip_slot, item, old_item, bag_slot); + emit_signal("equip_son_fail", this, equip_slot, item, old_item, bag_slot); } -void Entity::con_equip_success(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void Entity::equip_con_success(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { if (_c_entity_data.is_valid()) { - _c_entity_data->con_equip_success(this, equip_slot, item, old_item, bag_slot); + _c_entity_data->equip_con_success(this, equip_slot, item, old_item, bag_slot); } for (int i = 0; i < _c_auras.size(); ++i) { Ref ad = _c_auras.get(i); - ad->get_aura()->con_equip_success(ad, equip_slot, item, old_item, bag_slot); + ad->get_aura()->equip_con_success(ad, equip_slot, item, old_item, bag_slot); } - if (has_method("_con_equip_success")) - call("_con_equip_success", equip_slot, item, old_item, bag_slot); + if (has_method("_equip_con_success")) + call("_equip_con_success", equip_slot, item, old_item, bag_slot); - emit_signal("con_equip_success", this, equip_slot, item, old_item, bag_slot); + emit_signal("equip_con_success", this, equip_slot, item, old_item, bag_slot); } -void Entity::con_equip_fail(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { +void Entity::equip_con_fail(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot) { if (_c_entity_data.is_valid()) { - _c_entity_data->con_equip_fail(this, equip_slot, item, old_item, bag_slot); + _c_entity_data->equip_con_fail(this, equip_slot, item, old_item, bag_slot); } for (int i = 0; i < _c_auras.size(); ++i) { Ref ad = _c_auras.get(i); - ad->get_aura()->con_equip_fail(ad, equip_slot, item, old_item, bag_slot); + ad->get_aura()->equip_con_fail(ad, equip_slot, item, old_item, bag_slot); } - if (has_method("_con_equip_fail")) - call("_con_equip_fail", equip_slot, item, old_item, bag_slot); + if (has_method("_equip_con_fail")) + call("_equip_con_fail", equip_slot, item, old_item, bag_slot); - emit_signal("con_equip_fail", this, equip_slot, item, old_item, bag_slot); + emit_signal("equip_con_fail", this, equip_slot, item, old_item, bag_slot); } -void Entity::crequest_equip(ItemEnums::EquipSlots equip_slot, int bag_slot) { - RPCS(sequip, equip_slot, bag_slot) +void Entity::equip_crequest(ItemEnums::EquipSlots equip_slot, int bag_slot) { + RPCS(equips, equip_slot, bag_slot) } -void Entity::sequip(ItemEnums::EquipSlots equip_slot, int bag_slot) { - call("_sequip", equip_slot, bag_slot); +void Entity::equips(ItemEnums::EquipSlots equip_slot, int bag_slot) { + call("_equips", equip_slot, bag_slot); } -void Entity::_sequip(ItemEnums::EquipSlots equip_slot, int bag_slot) { +void Entity::_equips(ItemEnums::EquipSlots equip_slot, int bag_slot) { ERR_FAIL_INDEX(equip_slot, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX); ERR_FAIL_COND(!_s_bag.is_valid()); Ref bag_item = _s_bag->get_item(bag_slot); - Ref equipped_item = gets_equip_slot(equip_slot); + Ref equipped_item = equip_gets_slot(equip_slot); - if (!can_equip_item(equip_slot, bag_item)) { - ORPC(cequip_fail, equip_slot, bag_slot); + if (!equip_can_equip_item(equip_slot, bag_item)) { + ORPC(equip_cfail, equip_slot, bag_slot); return; } - if (should_deny_equip(equip_slot, bag_item)) { - ORPC(cequip_fail, equip_slot, bag_slot); + if (equip_should_deny(equip_slot, bag_item)) { + ORPC(equip_cfail, equip_slot, bag_slot); return; } @@ -1991,70 +1991,70 @@ void Entity::_sequip(ItemEnums::EquipSlots equip_slot, int bag_slot) { //check required skills if (equipped_item.is_valid()) - sdeapply_item(equipped_item); + equip_deapplys_item(equipped_item); if (bag_item.is_valid()) - sapply_item(bag_item); + equip_applys_item(bag_item); - sets_equip_slot(equip_slot, bag_item); + equip_sets_slot(equip_slot, bag_item); _s_bag->add_item_at(equip_slot, equipped_item, false); - ORPC(cequip_success, equip_slot, bag_slot); + ORPC(equip_csuccess, equip_slot, bag_slot); } -void Entity::cequip_success(ItemEnums::EquipSlots equip_slot, int bag_slot) { +void Entity::equip_csuccess(ItemEnums::EquipSlots equip_slot, int bag_slot) { ERR_FAIL_INDEX(equip_slot, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX); ERR_FAIL_COND(!_c_bag.is_valid()); Ref old_bag_item = _c_bag->get_item(bag_slot); - Ref old_equipped_item = getc_equip_slot(equip_slot); + Ref old_equipped_item = equip_getc_slot(equip_slot); _c_bag->add_item_at(bag_slot, old_equipped_item); - setc_equip_slot(equip_slot, old_bag_item); + equip_setc_slot(equip_slot, old_bag_item); if (old_equipped_item.is_valid()) - cdeapply_item(old_equipped_item); + equip_deapplyc_item(old_equipped_item); if (old_bag_item.is_valid()) - capply_item(old_bag_item); + equip_applyc_item(old_bag_item); - con_equip_success(equip_slot, old_bag_item, old_equipped_item, bag_slot); + equip_con_success(equip_slot, old_bag_item, old_equipped_item, bag_slot); } -void Entity::cequip_fail(ItemEnums::EquipSlots equip_slot, int bag_slot) { +void Entity::equip_cfail(ItemEnums::EquipSlots equip_slot, int bag_slot) { ERR_FAIL_INDEX(equip_slot, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX); ERR_FAIL_COND(!_c_bag.is_valid()); Ref bag_item = _c_bag->get_item(bag_slot); - Ref equipped_item = getc_equip_slot(equip_slot); + Ref equipped_item = equip_getc_slot(equip_slot); - con_equip_fail(equip_slot, equipped_item, bag_item, bag_slot); + equip_con_fail(equip_slot, equipped_item, bag_item, bag_slot); } -Ref Entity::gets_equip_slot(int index) { +Ref Entity::equip_gets_slot(int index) { ERR_FAIL_INDEX_V(index, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX, Ref()); return _s_equipment[index]; } -void Entity::sets_equip_slot(int index, Ref item) { +void Entity::equip_sets_slot(int index, Ref item) { ERR_FAIL_INDEX(index, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX); _s_equipment[index] = item; } -Ref Entity::getc_equip_slot(int index) { +Ref Entity::equip_getc_slot(int index) { ERR_FAIL_INDEX_V(index, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX, Ref()); return _c_equipment[index]; } -void Entity::setc_equip_slot(int index, Ref item) { +void Entity::equip_setc_slot(int index, Ref item) { ERR_FAIL_INDEX(index, ItemEnums::EQUIP_SLOT_EQUIP_SLOT_MAX); _c_equipment[index] = item; } -bool Entity::can_equip_item(ItemEnums::EquipSlots equip_slot, Ref item) { - return call("_can_equip_item", equip_slot, item); +bool Entity::equip_can_equip_item(ItemEnums::EquipSlots equip_slot, Ref item) { + return call("_equip_can_equip_item", equip_slot, item); } -bool Entity::_can_equip_item(ItemEnums::EquipSlots equip_slot, Ref item) { +bool Entity::_equip_can_equip_item(ItemEnums::EquipSlots equip_slot, Ref item) { //deequip if (!item.is_valid()) return true; @@ -2066,14 +2066,14 @@ bool Entity::_can_equip_item(ItemEnums::EquipSlots equip_slot, Ref return it->get_equip_slot() == equip_slot; } -void Entity::sapply_item(Ref item) { - call("_sapply_item", item); +void Entity::equip_applys_item(Ref item) { + call("_equip_applys_item", item); } -void Entity::sdeapply_item(Ref item) { - call("_sdeapply_item", item); +void Entity::equip_deapplys_item(Ref item) { + call("_equip_deapplys_item", item); } -void Entity::_sapply_item(Ref item) { +void Entity::_equip_applys_item(Ref item) { ERR_FAIL_COND(!item.is_valid()); Ref it = item->get_item_template(); @@ -2099,7 +2099,7 @@ void Entity::_sapply_item(Ref item) { sm->set_percent_mod(sm->get_percent_mod() + mod->get_percent_mod()); } } -void Entity::_sdeapply_item(Ref item) { +void Entity::_equip_deapplys_item(Ref item) { ERR_FAIL_COND(!item.is_valid()); Ref it = item->get_item_template(); @@ -2126,14 +2126,14 @@ void Entity::_sdeapply_item(Ref item) { } } -void Entity::capply_item(Ref item) { - call("_capply_item", item); +void Entity::equip_applyc_item(Ref item) { + call("_equip_applyc_item", item); } -void Entity::cdeapply_item(Ref item) { - call("_cdeapply_item", item); +void Entity::equip_deapplyc_item(Ref item) { + call("_equip_deapplyc_item", item); } -void Entity::_capply_item(Ref item) { +void Entity::_equip_applyc_item(Ref item) { ERR_FAIL_COND(!item.is_valid()); Ref it = item->get_item_template(); @@ -2150,7 +2150,7 @@ void Entity::_capply_item(Ref item) { _character_skeleton->call("add_item_visual", it->get_item_visual()); } } -void Entity::_cdeapply_item(Ref item) { +void Entity::_equip_deapplyc_item(Ref item) { ERR_FAIL_COND(!item.is_valid()); Ref it = item->get_item_template(); @@ -2676,7 +2676,7 @@ void Entity::_suse_item(int item_id) { ItemEnums::ItemType type = it->get_item_type(); if (type == ItemEnums::ITEM_TYPE_EQUIPMENT) { - Ref ii = gets_equip_slot(it->get_equip_slot()); + Ref ii = equip_gets_slot(it->get_equip_slot()); if (!ii.is_valid()) return; @@ -5735,9 +5735,9 @@ Entity::Entity() { //// Equip Slots //// - SET_RPC_REMOTE("sequip"); - SET_RPC_REMOTE("cequip_success"); - SET_RPC_REMOTE("cequip_fail"); + SET_RPC_REMOTE("equips"); + SET_RPC_REMOTE("equip_csuccess"); + SET_RPC_REMOTE("equip_cfail"); //// Resources //// @@ -7314,61 +7314,61 @@ void Entity::_bind_methods() { //Equipment System - ADD_SIGNAL(MethodInfo("son_equip_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("son_equip_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"))); - ADD_SIGNAL(MethodInfo("con_equip_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("con_equip_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"))); + ADD_SIGNAL(MethodInfo("equip_son_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_son_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"))); + 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"))); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_should_deny_equip", PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "ret"), "_equip_should_deny", PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - BIND_VMETHOD(MethodInfo("_son_equip_success", 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"))); - BIND_VMETHOD(MethodInfo("_son_equip_fail", 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"))); - BIND_VMETHOD(MethodInfo("_con_equip_success", 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"))); - BIND_VMETHOD(MethodInfo("_con_equip_fail", 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"))); + BIND_VMETHOD(MethodInfo("_equip_son_success", 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"))); + BIND_VMETHOD(MethodInfo("_equip_son_fail", 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"))); + BIND_VMETHOD(MethodInfo("_equip_con_success", 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"))); + BIND_VMETHOD(MethodInfo("_equip_con_fail", 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("equipment_changed", PropertyInfo(Variant::INT, "slot"))); - ClassDB::bind_method(D_METHOD("should_deny_equip", "equip_slot", "item"), &Entity::should_deny_equip); + ClassDB::bind_method(D_METHOD("equip_should_deny", "equip_slot", "item"), &Entity::equip_should_deny); - ClassDB::bind_method(D_METHOD("son_equip_success", "equip_slot", "item", "old_item", "bag_slot"), &Entity::son_equip_success); - ClassDB::bind_method(D_METHOD("son_equip_fail", "equip_slot", "item", "old_item", "bag_slot"), &Entity::son_equip_fail); - ClassDB::bind_method(D_METHOD("con_equip_success", "equip_slot", "item", "old_item", "bag_slot"), &Entity::con_equip_success); - ClassDB::bind_method(D_METHOD("con_equip_fail", "equip_slot", "item", "old_item", "bag_slot"), &Entity::con_equip_fail); + ClassDB::bind_method(D_METHOD("equip_son_success", "equip_slot", "item", "old_item", "bag_slot"), &Entity::equip_son_success); + ClassDB::bind_method(D_METHOD("equip_son_fail", "equip_slot", "item", "old_item", "bag_slot"), &Entity::equip_son_fail); + 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); - BIND_VMETHOD(MethodInfo("_sequip", PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::INT, "bag_slot"))); + BIND_VMETHOD(MethodInfo("_equips", PropertyInfo(Variant::INT, "equip_slot"), PropertyInfo(Variant::INT, "bag_slot"))); - ClassDB::bind_method(D_METHOD("crequest_equip", "equip_slot", "bag_slot"), &Entity::crequest_equip); - ClassDB::bind_method(D_METHOD("sequip", "equip_slot", "bag_slot"), &Entity::sequip); - ClassDB::bind_method(D_METHOD("_sequip", "equip_slot", "bag_slot"), &Entity::_sequip); + 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); + ClassDB::bind_method(D_METHOD("_equips", "equip_slot", "bag_slot"), &Entity::_equips); - ClassDB::bind_method(D_METHOD("cequip_success", "equip_slot", "bag_slot"), &Entity::cequip_success); - ClassDB::bind_method(D_METHOD("cequip_fail", "equip_slot", "bag_slot"), &Entity::cequip_fail); + ClassDB::bind_method(D_METHOD("equip_csuccess", "equip_slot", "bag_slot"), &Entity::equip_csuccess); + ClassDB::bind_method(D_METHOD("equip_cfail", "equip_slot", "bag_slot"), &Entity::equip_cfail); - ClassDB::bind_method(D_METHOD("gets_equip_slot", "index"), &Entity::gets_equip_slot); - ClassDB::bind_method(D_METHOD("getc_equip_slot", "index"), &Entity::getc_equip_slot); + 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); - BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "can"), "_can_equip_item", PropertyInfo(Variant::INT, "equip_slot", PROPERTY_HINT_ENUM, ItemEnums::BINDING_STRING_EQUIP_SLOTS), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "can"), "_equip_can_equip_item", PropertyInfo(Variant::INT, "equip_slot", PROPERTY_HINT_ENUM, ItemEnums::BINDING_STRING_EQUIP_SLOTS), PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - ClassDB::bind_method(D_METHOD("can_equip_item", "equip_slot", "item"), &Entity::can_equip_item); - ClassDB::bind_method(D_METHOD("_can_equip_item", "equip_slot", "item"), &Entity::_can_equip_item); + 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); - BIND_VMETHOD(MethodInfo("_sapply_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - BIND_VMETHOD(MethodInfo("_sdeapply_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo("_equip_applys_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo("_equip_deapplys_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - ClassDB::bind_method(D_METHOD("sapply_item", "item"), &Entity::sapply_item); - ClassDB::bind_method(D_METHOD("sdeapply_item", "item"), &Entity::sdeapply_item); + 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); - ClassDB::bind_method(D_METHOD("_sapply_item", "item"), &Entity::_sapply_item); - ClassDB::bind_method(D_METHOD("_sdeapply_item", "item"), &Entity::_sdeapply_item); + 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); - BIND_VMETHOD(MethodInfo("_capply_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - BIND_VMETHOD(MethodInfo("_cdeapply_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo("_equip_applyc_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); + BIND_VMETHOD(MethodInfo("_equip_deapplyc_item", PropertyInfo(Variant::OBJECT, "item", PROPERTY_HINT_RESOURCE_TYPE, "ItemInstance"))); - ClassDB::bind_method(D_METHOD("csapply_item", "item"), &Entity::capply_item); - ClassDB::bind_method(D_METHOD("cdeapply_item", "item"), &Entity::cdeapply_item); + 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); - ClassDB::bind_method(D_METHOD("_capply_item", "item"), &Entity::_capply_item); - ClassDB::bind_method(D_METHOD("_cdeapply_item", "item"), &Entity::_cdeapply_item); + ClassDB::bind_method(D_METHOD("_equip_applyc_item", "item"), &Entity::_equip_applyc_item); + ClassDB::bind_method(D_METHOD("_equip_deapplyc_item", "item"), &Entity::_equip_deapplyc_item); //Resources ClassDB::bind_method(D_METHOD("gets_resource_index", "index"), &Entity::gets_resource_index); diff --git a/entities/entity.h b/entities/entity.h index cf727c7..248644d 100644 --- a/entities/entity.h +++ b/entities/entity.h @@ -353,41 +353,41 @@ public: //// Equip Slots //// - bool should_deny_equip(ItemEnums::EquipSlots equip_slot, Ref item); + bool equip_should_deny(ItemEnums::EquipSlots equip_slot, Ref item); - void son_equip_success(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void son_equip_fail(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_success(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_son_fail(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_success(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void con_equip_fail(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_success(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); + void equip_con_fail(ItemEnums::EquipSlots equip_slot, Ref item, Ref old_item, int bag_slot); - void crequest_equip(ItemEnums::EquipSlots equip_slot, int bag_slot); - void sequip(ItemEnums::EquipSlots equip_slot, int bag_slot); - void _sequip(ItemEnums::EquipSlots equip_slot, int bag_slot); + void equip_crequest(ItemEnums::EquipSlots equip_slot, int bag_slot); + void equips(ItemEnums::EquipSlots equip_slot, int bag_slot); + void _equips(ItemEnums::EquipSlots equip_slot, int bag_slot); - void cequip_success(ItemEnums::EquipSlots equip_slot, int bag_slot); - void cequip_fail(ItemEnums::EquipSlots equip_slot, int bag_slot); + void equip_csuccess(ItemEnums::EquipSlots equip_slot, int bag_slot); + void equip_cfail(ItemEnums::EquipSlots equip_slot, int bag_slot); - Ref gets_equip_slot(int index); - void sets_equip_slot(int index, Ref item); + Ref equip_gets_slot(int index); + void equip_sets_slot(int index, Ref item); - Ref getc_equip_slot(int index); - void setc_equip_slot(int index, Ref item); + Ref equip_getc_slot(int index); + void equip_setc_slot(int index, Ref item); - bool can_equip_item(ItemEnums::EquipSlots equip_slot, Ref item); - bool _can_equip_item(ItemEnums::EquipSlots equip_slot, Ref item); + bool equip_can_equip_item(ItemEnums::EquipSlots equip_slot, Ref item); + bool _equip_can_equip_item(ItemEnums::EquipSlots equip_slot, Ref item); - void sapply_item(Ref item); - void sdeapply_item(Ref item); + void equip_applys_item(Ref item); + void equip_deapplys_item(Ref item); - void _sapply_item(Ref item); - void _sdeapply_item(Ref item); + void _equip_applys_item(Ref item); + void _equip_deapplys_item(Ref item); - void capply_item(Ref item); - void cdeapply_item(Ref item); + void equip_applyc_item(Ref item); + void equip_deapplyc_item(Ref item); - void _capply_item(Ref item); - void _cdeapply_item(Ref item); + void _equip_applyc_item(Ref item); + void _equip_deapplyc_item(Ref item); //// Resources ////