mirror of
https://github.com/Relintai/entity_spell_system.git
synced 2025-02-20 17:14:44 +01:00
More renames.
This commit is contained in:
parent
9be4cba706
commit
86aaf2eaf5
@ -573,7 +573,7 @@ void Spell::set_training_required_skill_level(const int value) {
|
||||
|
||||
//// Spell System ////
|
||||
|
||||
void Spell::sstart_casting_simple(Entity *caster, float spell_scale) {
|
||||
void Spell::cast_starts_simple(Entity *caster, float spell_scale) {
|
||||
#if VERSION_MAJOR < 4
|
||||
ERR_FAIL_COND(!caster || !ObjectDB::instance_validate(caster));
|
||||
#else
|
||||
@ -589,10 +589,10 @@ void Spell::sstart_casting_simple(Entity *caster, float spell_scale) {
|
||||
info->set_spell_scale(spell_scale);
|
||||
info->set_spell(Ref<Spell>(this));
|
||||
|
||||
sstart_casting(info);
|
||||
cast_starts(info);
|
||||
}
|
||||
|
||||
void Spell::sinterrupt_cast_simple(Entity *caster) {
|
||||
void Spell::cast_interrupts_simple(Entity *caster) {
|
||||
#if VERSION_MAJOR < 4
|
||||
ERR_FAIL_COND(!caster || !ObjectDB::instance_validate(caster));
|
||||
#else
|
||||
@ -604,10 +604,10 @@ void Spell::sinterrupt_cast_simple(Entity *caster) {
|
||||
info->set_caster(caster);
|
||||
info->set_spell(Ref<Spell>(this));
|
||||
|
||||
sinterrupt_cast(info);
|
||||
cast_interrupts(info);
|
||||
}
|
||||
|
||||
void Spell::sstart_casting_triggered_simple(Entity *caster) {
|
||||
void Spell::cast_starts_triggered_simple(Entity *caster) {
|
||||
#if VERSION_MAJOR < 4
|
||||
ERR_FAIL_COND(!caster || !ObjectDB::instance_validate(caster));
|
||||
#else
|
||||
@ -619,12 +619,12 @@ void Spell::sstart_casting_triggered_simple(Entity *caster) {
|
||||
info->set_caster(caster);
|
||||
info->set_spell(Ref<Spell>(this));
|
||||
|
||||
sstart_casting_triggered(info);
|
||||
cast_starts_triggered(info);
|
||||
}
|
||||
|
||||
//Script methods
|
||||
|
||||
void Spell::sstart_casting(Ref<SpellCastInfo> info) {
|
||||
void Spell::cast_starts(Ref<SpellCastInfo> info) {
|
||||
ERR_FAIL_COND(!info.is_valid());
|
||||
|
||||
//Auto self cast. Note: Remove needs_target, and skip this if spell should only target enemies.
|
||||
@ -632,32 +632,32 @@ void Spell::sstart_casting(Ref<SpellCastInfo> info) {
|
||||
info->set_target(info->get_caster());
|
||||
}
|
||||
|
||||
if (has_method("_sstart_casting")) {
|
||||
call("_sstart_casting", info);
|
||||
if (has_method("_cast_starts")) {
|
||||
call("_cast_starts", info);
|
||||
}
|
||||
}
|
||||
|
||||
void Spell::sstart_casting_triggered(Ref<SpellCastInfo> info) {
|
||||
void Spell::cast_starts_triggered(Ref<SpellCastInfo> info) {
|
||||
ERR_FAIL_COND(!info.is_valid());
|
||||
|
||||
if (has_method("_sstart_casting_triggered")) {
|
||||
call("_sstart_casting_triggered", info);
|
||||
if (has_method("_cast_starts_triggered")) {
|
||||
call("_cast_starts_triggered", info);
|
||||
}
|
||||
}
|
||||
|
||||
void Spell::sinterrupt_cast(Ref<SpellCastInfo> info) {
|
||||
void Spell::cast_interrupts(Ref<SpellCastInfo> info) {
|
||||
ERR_FAIL_COND(!info.is_valid());
|
||||
|
||||
if (has_method("_sinterrupt_cast")) {
|
||||
call("_sinterrupt_cast", info);
|
||||
if (has_method("_cast_interrupts")) {
|
||||
call("_cast_interrupts", info);
|
||||
}
|
||||
}
|
||||
|
||||
void Spell::sfinish_cast(Ref<SpellCastInfo> info) {
|
||||
void Spell::cast_finishs(Ref<SpellCastInfo> info) {
|
||||
ERR_FAIL_COND(!info.is_valid());
|
||||
|
||||
if (has_method("_sfinish_cast")) {
|
||||
call("_sfinish_cast", info);
|
||||
if (has_method("_cast_finishs")) {
|
||||
call("_cast_finishs", info);
|
||||
}
|
||||
}
|
||||
|
||||
@ -916,8 +916,8 @@ Spell::~Spell() {
|
||||
_projectile_scene.unref();
|
||||
}
|
||||
|
||||
void Spell::_sstart_casting(Ref<SpellCastInfo> info) {
|
||||
if (info->get_caster()->sis_casting()) {
|
||||
void Spell::_cast_starts(Ref<SpellCastInfo> info) {
|
||||
if (info->get_caster()->cast_is_castings()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@ -932,11 +932,11 @@ void Spell::_sstart_casting(Ref<SpellCastInfo> info) {
|
||||
}
|
||||
|
||||
if (get_cast_time_enabled()) {
|
||||
info->get_caster()->sstart_casting(info);
|
||||
info->get_caster()->cast_starts(info);
|
||||
return;
|
||||
}
|
||||
|
||||
info->get_caster()->sspell_cast_success(info);
|
||||
info->get_caster()->cast_spell_successs(info);
|
||||
|
||||
info->get_target()->notification_scast(SpellEnums::NOTIFICATION_CAST_FINISHED_TARGET, info);
|
||||
|
||||
@ -951,9 +951,9 @@ void Spell::_sstart_casting(Ref<SpellCastInfo> info) {
|
||||
handle_gcd(info);
|
||||
}
|
||||
|
||||
void Spell::_sfinish_cast(Ref<SpellCastInfo> info) {
|
||||
void Spell::_cast_finishs(Ref<SpellCastInfo> info) {
|
||||
info->get_caster()->notification_scast(SpellEnums::NOTIFICATION_CAST_FINISHED, info);
|
||||
info->get_caster()->sspell_cast_success(info);
|
||||
info->get_caster()->cast_spell_successs(info);
|
||||
|
||||
#if VERSION_MAJOR < 4
|
||||
if (ObjectDB::instance_validate(info->get_target())) {
|
||||
@ -974,7 +974,7 @@ void Spell::_sfinish_cast(Ref<SpellCastInfo> info) {
|
||||
|
||||
void Spell::_son_cast_player_moved(Ref<SpellCastInfo> info) {
|
||||
if (get_can_move_while_casting()) {
|
||||
info->get_caster()->sfail_cast();
|
||||
info->get_caster()->cast_fails();
|
||||
}
|
||||
}
|
||||
|
||||
@ -1116,15 +1116,15 @@ void Spell::_validate_property(PropertyInfo &property) const {
|
||||
|
||||
void Spell::_bind_methods() {
|
||||
//Commands
|
||||
ClassDB::bind_method(D_METHOD("sstart_casting", "info"), &Spell::sstart_casting);
|
||||
ClassDB::bind_method(D_METHOD("sstart_casting_triggered", "info"), &Spell::sstart_casting_triggered);
|
||||
ClassDB::bind_method(D_METHOD("sinterrupt_cast", "info"), &Spell::sinterrupt_cast);
|
||||
ClassDB::bind_method(D_METHOD("sfinish_cast", "info"), &Spell::sfinish_cast);
|
||||
ClassDB::bind_method(D_METHOD("cast_starts", "info"), &Spell::cast_starts);
|
||||
ClassDB::bind_method(D_METHOD("cast_starts_triggered", "info"), &Spell::cast_starts_triggered);
|
||||
ClassDB::bind_method(D_METHOD("cast_interrupts", "info"), &Spell::cast_interrupts);
|
||||
ClassDB::bind_method(D_METHOD("cast_finishs", "info"), &Spell::cast_finishs);
|
||||
|
||||
BIND_VMETHOD(MethodInfo("_sstart_casting", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
|
||||
BIND_VMETHOD(MethodInfo("_sstart_casting_triggered", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
|
||||
BIND_VMETHOD(MethodInfo("_sinterrupt_cast", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
|
||||
BIND_VMETHOD(MethodInfo("_sfinish_cast", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
|
||||
BIND_VMETHOD(MethodInfo("_cast_starts", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
|
||||
BIND_VMETHOD(MethodInfo("_cast_starts_triggered", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
|
||||
BIND_VMETHOD(MethodInfo("_cast_interrupts", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
|
||||
BIND_VMETHOD(MethodInfo("_cast_finishs", PropertyInfo(Variant::OBJECT, "info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo")));
|
||||
|
||||
//Eventhandlers
|
||||
ClassDB::bind_method(D_METHOD("son_cast_player_moved", "info"), &Spell::son_cast_player_moved);
|
||||
@ -1167,8 +1167,8 @@ void Spell::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("handle_cooldown", "info"), &Spell::handle_cooldown);
|
||||
|
||||
//Implementations
|
||||
ClassDB::bind_method(D_METHOD("_sstart_casting", "info"), &Spell::_sstart_casting);
|
||||
ClassDB::bind_method(D_METHOD("_sfinish_cast", "info"), &Spell::_sfinish_cast);
|
||||
ClassDB::bind_method(D_METHOD("_cast_starts", "info"), &Spell::_cast_starts);
|
||||
ClassDB::bind_method(D_METHOD("_cast_finishs", "info"), &Spell::_cast_finishs);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("_son_cast_player_moved", "info"), &Spell::_son_cast_player_moved);
|
||||
ClassDB::bind_method(D_METHOD("_son_spell_hit", "info"), &Spell::_son_spell_hit);
|
||||
|
@ -297,15 +297,15 @@ public:
|
||||
float PLAYER_HIT_RADIUS;
|
||||
|
||||
//Commands, c++ only
|
||||
void sstart_casting_simple(Entity *caster, float spell_scale);
|
||||
void sinterrupt_cast_simple(Entity *caster);
|
||||
void sstart_casting_triggered_simple(Entity *caster);
|
||||
void cast_starts_simple(Entity *caster, float spell_scale);
|
||||
void cast_interrupts_simple(Entity *caster);
|
||||
void cast_starts_triggered_simple(Entity *caster);
|
||||
|
||||
//Commands
|
||||
void sstart_casting(Ref<SpellCastInfo> info);
|
||||
void sstart_casting_triggered(Ref<SpellCastInfo> info);
|
||||
void sinterrupt_cast(Ref<SpellCastInfo> info);
|
||||
void sfinish_cast(Ref<SpellCastInfo> info);
|
||||
void cast_starts(Ref<SpellCastInfo> info);
|
||||
void cast_starts_triggered(Ref<SpellCastInfo> info);
|
||||
void cast_interrupts(Ref<SpellCastInfo> info);
|
||||
void cast_finishs(Ref<SpellCastInfo> info);
|
||||
|
||||
//eventhandlers
|
||||
void son_cast_player_moved(Ref<SpellCastInfo> info);
|
||||
@ -338,8 +338,8 @@ public:
|
||||
~Spell();
|
||||
|
||||
protected:
|
||||
virtual void _sstart_casting(Ref<SpellCastInfo> info);
|
||||
virtual void _sfinish_cast(Ref<SpellCastInfo> info);
|
||||
virtual void _cast_starts(Ref<SpellCastInfo> info);
|
||||
virtual void _cast_finishs(Ref<SpellCastInfo> info);
|
||||
|
||||
virtual void _son_cast_player_moved(Ref<SpellCastInfo> info);
|
||||
virtual void _son_spell_hit(Ref<SpellCastInfo> info);
|
||||
|
@ -1090,7 +1090,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cdelay_cast">
|
||||
<method name="cast_delayc">
|
||||
<return type="void">
|
||||
</return>
|
||||
<description>
|
||||
@ -1158,13 +1158,13 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cfail_cast">
|
||||
<method name="cast_failc">
|
||||
<return type="void">
|
||||
</return>
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cfinish_cast">
|
||||
<method name="cast_finishc">
|
||||
<return type="void">
|
||||
</return>
|
||||
<description>
|
||||
@ -1198,13 +1198,13 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cinterrupt_cast">
|
||||
<method name="cast_interruptc">
|
||||
<return type="void">
|
||||
</return>
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cis_casting">
|
||||
<method name="cast_is_castingc">
|
||||
<return type="bool">
|
||||
</return>
|
||||
<description>
|
||||
@ -1660,7 +1660,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cspell_cast_success">
|
||||
<method name="cast_spell_successc">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -1668,7 +1668,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cspell_cast_success_rpc">
|
||||
<method name="cast_spell_successc_rpc">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="data" type="String">
|
||||
@ -1676,7 +1676,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cstart_casting">
|
||||
<method name="cast_startc">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -1684,7 +1684,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="cstart_casting_rpc">
|
||||
<method name="cast_startc_rpc">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="data" type="String">
|
||||
@ -3114,7 +3114,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sdelay_cast">
|
||||
<method name="cast_delays">
|
||||
<return type="void">
|
||||
</return>
|
||||
<description>
|
||||
@ -3242,13 +3242,13 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sfail_cast">
|
||||
<method name="cast_fails">
|
||||
<return type="void">
|
||||
</return>
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sfinish_cast">
|
||||
<method name="cast_finishs">
|
||||
<return type="void">
|
||||
</return>
|
||||
<description>
|
||||
@ -3270,13 +3270,13 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sinterrupt_cast">
|
||||
<method name="cast_interrupts">
|
||||
<return type="void">
|
||||
</return>
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sis_casting">
|
||||
<method name="cast_is_castings">
|
||||
<return type="bool">
|
||||
</return>
|
||||
<description>
|
||||
@ -3588,7 +3588,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sspell_cast_success">
|
||||
<method name="cast_spell_successs">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -3596,7 +3596,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sstart_casting">
|
||||
<method name="cast_starts">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -4090,7 +4090,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</signal>
|
||||
<signal name="cspell_cast_success">
|
||||
<signal name="cast_spell_successc">
|
||||
<argument index="0" name="spell_cast_info" type="SpellCastInfo">
|
||||
</argument>
|
||||
<description>
|
||||
@ -4454,7 +4454,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</signal>
|
||||
<signal name="sspell_cast_success">
|
||||
<signal name="cast_spell_successs">
|
||||
<argument index="0" name="spell_cast_info" type="SpellCastInfo">
|
||||
</argument>
|
||||
<description>
|
||||
|
@ -106,7 +106,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="_sfinish_cast" qualifiers="virtual">
|
||||
<method name="_cast_finishs" qualifiers="virtual">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -114,7 +114,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="_sinterrupt_cast" qualifiers="virtual">
|
||||
<method name="_cast_interrupts" qualifiers="virtual">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -156,7 +156,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="_sstart_casting" qualifiers="virtual">
|
||||
<method name="_cast_starts" qualifiers="virtual">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -164,7 +164,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="_sstart_casting_triggered" qualifiers="virtual">
|
||||
<method name="_cast_starts_triggered" qualifiers="virtual">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -388,7 +388,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sfinish_cast">
|
||||
<method name="cast_finishs">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -396,7 +396,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sinterrupt_cast">
|
||||
<method name="cast_interrupts">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -438,7 +438,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sstart_casting">
|
||||
<method name="cast_starts">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
@ -446,7 +446,7 @@
|
||||
<description>
|
||||
</description>
|
||||
</method>
|
||||
<method name="sstart_casting_triggered">
|
||||
<method name="cast_starts_triggered">
|
||||
<return type="void">
|
||||
</return>
|
||||
<argument index="0" name="info" type="SpellCastInfo">
|
||||
|
@ -430,7 +430,7 @@ void EntityClassData::start_casting(int spell_id, Entity *caster, float spellSca
|
||||
}
|
||||
|
||||
if (s->get_id() == spell_id) {
|
||||
s->sstart_casting_simple(caster, spellScale);
|
||||
s->cast_starts_simple(caster, spellScale);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -2696,9 +2696,9 @@ void Entity::_item_uses(int item_id) {
|
||||
info->set_source_item(ii);
|
||||
info->set_source_template(it);
|
||||
|
||||
sstart_casting(info);
|
||||
cast_starts(info);
|
||||
|
||||
sp->sstart_casting(info);
|
||||
sp->cast_starts(info);
|
||||
} else {
|
||||
if (!gets_bag()->has_item(it, 1))
|
||||
return;
|
||||
@ -2714,9 +2714,9 @@ void Entity::_item_uses(int item_id) {
|
||||
info->set_spell(sp);
|
||||
info->set_source_template(it);
|
||||
|
||||
sstart_casting(info);
|
||||
cast_starts(info);
|
||||
|
||||
sp->sstart_casting(info);
|
||||
sp->cast_starts(info);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3687,7 +3687,7 @@ void Entity::con_entity_resource_removed(Ref<EntityResource> resource) {
|
||||
|
||||
//// Casting System ////
|
||||
|
||||
void Entity::sstart_casting(Ref<SpellCastInfo> info) {
|
||||
void Entity::cast_starts(Ref<SpellCastInfo> info) {
|
||||
_s_spell_cast_info = Ref<SpellCastInfo>(info);
|
||||
|
||||
for (int i = 0; i < _s_auras.size(); ++i) {
|
||||
@ -3700,97 +3700,97 @@ void Entity::sstart_casting(Ref<SpellCastInfo> info) {
|
||||
|
||||
notification_scast(SpellEnums::NOTIFICATION_CAST_STARTED, info);
|
||||
|
||||
VRPCOBJ(cstart_casting_rpc, JSON::print(info->to_dict()), cstart_casting, info);
|
||||
VRPCOBJ(cast_startc_rpc, JSON::print(info->to_dict()), cast_startc, info);
|
||||
}
|
||||
|
||||
void Entity::sfail_cast() {
|
||||
void Entity::cast_fails() {
|
||||
notification_scast(SpellEnums::NOTIFICATION_CAST_FAILED, _s_spell_cast_info);
|
||||
|
||||
_s_spell_cast_info.unref();
|
||||
|
||||
VRPC(cfail_cast);
|
||||
VRPC(cast_failc);
|
||||
}
|
||||
|
||||
void Entity::sdelay_cast() {
|
||||
void Entity::cast_delays() {
|
||||
emit_signal("notification_scast", SpellEnums::NOTIFICATION_CAST_DELAYED, _s_spell_cast_info);
|
||||
|
||||
VRPC(cdelay_cast);
|
||||
VRPC(cast_delayc);
|
||||
}
|
||||
|
||||
void Entity::sfinish_cast() {
|
||||
_s_spell_cast_info->get_spell()->sfinish_cast(_s_spell_cast_info);
|
||||
void Entity::cast_finishs() {
|
||||
_s_spell_cast_info->get_spell()->cast_finishs(_s_spell_cast_info);
|
||||
|
||||
notification_scast(SpellEnums::NOTIFICATION_CAST_FINISHED, _s_spell_cast_info);
|
||||
|
||||
_s_spell_cast_info.unref();
|
||||
|
||||
VRPC(cfinish_cast);
|
||||
VRPC(cast_finishc);
|
||||
}
|
||||
|
||||
void Entity::sinterrupt_cast() {
|
||||
void Entity::cast_interrupts() {
|
||||
notification_scast(SpellEnums::NOTIFICATION_CAST_INTERRUPTED, _s_spell_cast_info);
|
||||
|
||||
_s_spell_cast_info.unref();
|
||||
|
||||
VRPC(cinterrupt_cast);
|
||||
VRPC(cast_interruptc);
|
||||
}
|
||||
|
||||
void Entity::cstart_casting_rpc(String data) {
|
||||
void Entity::cast_startc_rpc(String data) {
|
||||
Ref<SpellCastInfo> info;
|
||||
info.instance();
|
||||
info->from_dict(data_as_dict(data));
|
||||
info->resolve_references(this);
|
||||
|
||||
cstart_casting(info);
|
||||
cast_startc(info);
|
||||
}
|
||||
|
||||
void Entity::cstart_casting(Ref<SpellCastInfo> info) {
|
||||
void Entity::cast_startc(Ref<SpellCastInfo> info) {
|
||||
_c_spell_cast_info = Ref<SpellCastInfo>(info);
|
||||
|
||||
notification_ccast(SpellEnums::NOTIFICATION_CAST_STARTED, _c_spell_cast_info);
|
||||
}
|
||||
|
||||
void Entity::cfail_cast() {
|
||||
void Entity::cast_failc() {
|
||||
notification_ccast(SpellEnums::NOTIFICATION_CAST_FAILED, _c_spell_cast_info);
|
||||
|
||||
_c_spell_cast_info.unref();
|
||||
}
|
||||
|
||||
void Entity::cdelay_cast() {
|
||||
void Entity::cast_delayc() {
|
||||
|
||||
//c_on_cast_
|
||||
|
||||
notification_scast(SpellEnums::NOTIFICATION_CAST_DELAYED, _c_spell_cast_info);
|
||||
}
|
||||
|
||||
void Entity::cfinish_cast() {
|
||||
void Entity::cast_finishc() {
|
||||
notification_ccast(SpellEnums::NOTIFICATION_CAST_FINISHED, _c_spell_cast_info);
|
||||
|
||||
_c_spell_cast_info.unref();
|
||||
}
|
||||
|
||||
void Entity::cinterrupt_cast() {
|
||||
void Entity::cast_interruptc() {
|
||||
notification_ccast(SpellEnums::NOTIFICATION_CAST_INTERRUPTED, _c_spell_cast_info);
|
||||
|
||||
_c_spell_cast_info.unref();
|
||||
}
|
||||
|
||||
void Entity::sspell_cast_success(Ref<SpellCastInfo> info) {
|
||||
void Entity::cast_spell_successs(Ref<SpellCastInfo> info) {
|
||||
notification_scast(SpellEnums::NOTIFICATION_CAST_SUCCESS, info);
|
||||
|
||||
VRPCOBJ(cspell_cast_success_rpc, JSON::print(info->to_dict()), cspell_cast_success, info);
|
||||
VRPCOBJ(cast_spell_successc_rpc, JSON::print(info->to_dict()), cast_spell_successc, info);
|
||||
}
|
||||
|
||||
void Entity::cspell_cast_success_rpc(String data) {
|
||||
void Entity::cast_spell_successc_rpc(String data) {
|
||||
Ref<SpellCastInfo> info;
|
||||
info.instance();
|
||||
info->from_dict(data_as_dict(data));
|
||||
info->resolve_references(this);
|
||||
|
||||
cspell_cast_success(info);
|
||||
cast_spell_successc(info);
|
||||
}
|
||||
|
||||
void Entity::cspell_cast_success(Ref<SpellCastInfo> info) {
|
||||
void Entity::cast_spell_successc(Ref<SpellCastInfo> info) {
|
||||
notification_ccast(SpellEnums::NOTIFICATION_CAST_SUCCESS, info);
|
||||
}
|
||||
|
||||
@ -4484,10 +4484,10 @@ void Entity::changec_skill_max(int skill_id, int value) {
|
||||
|
||||
//// Casting System ////
|
||||
|
||||
bool Entity::sis_casting() {
|
||||
bool Entity::cast_is_castings() {
|
||||
return _s_spell_cast_info.is_valid();
|
||||
}
|
||||
bool Entity::cis_casting() {
|
||||
bool Entity::cast_is_castingc() {
|
||||
return _c_spell_cast_info.is_valid();
|
||||
}
|
||||
|
||||
@ -5304,7 +5304,7 @@ void Entity::update(float delta) {
|
||||
if (ISSERVER()) {
|
||||
if (_s_spell_cast_info.is_valid() && _s_spell_cast_info->get_is_casting()) {
|
||||
if (_s_spell_cast_info->update_cast_time(delta)) {
|
||||
sfinish_cast();
|
||||
cast_finishs();
|
||||
}
|
||||
}
|
||||
|
||||
@ -5811,13 +5811,13 @@ Entity::Entity() {
|
||||
|
||||
SET_RPC_REMOTE("setc_spell_cast_info");
|
||||
|
||||
SET_RPC_REMOTE("cstart_casting_rpc");
|
||||
SET_RPC_REMOTE("cfail_cast");
|
||||
SET_RPC_REMOTE("cdelay_cast");
|
||||
SET_RPC_REMOTE("cfinish_cast");
|
||||
SET_RPC_REMOTE("cinterrupt_cast");
|
||||
SET_RPC_REMOTE("cast_startc_rpc");
|
||||
SET_RPC_REMOTE("cast_failc");
|
||||
SET_RPC_REMOTE("cast_delayc");
|
||||
SET_RPC_REMOTE("cast_finishc");
|
||||
SET_RPC_REMOTE("cast_interruptc");
|
||||
|
||||
SET_RPC_REMOTE("cspell_cast_success_rpc");
|
||||
SET_RPC_REMOTE("cast_spell_successc_rpc");
|
||||
|
||||
//// Cooldowns ////
|
||||
|
||||
@ -6057,8 +6057,8 @@ void Entity::_son_class_level_up(int level) {
|
||||
}
|
||||
|
||||
void Entity::_moved() {
|
||||
if (sis_casting())
|
||||
sfail_cast();
|
||||
if (cast_is_castings())
|
||||
cast_fails();
|
||||
}
|
||||
|
||||
void Entity::_con_target_changed(Node *p_entity, Node *p_old_target) {
|
||||
@ -7021,8 +7021,8 @@ void Entity::_bind_methods() {
|
||||
BIND_VMETHOD(MethodInfo(PropertyInfo(Variant::BOOL, "value"), "_cans_interact"));
|
||||
BIND_VMETHOD(MethodInfo("_sinteract"));
|
||||
|
||||
ClassDB::bind_method(D_METHOD("cspell_cast_success", "info"), &Entity::cspell_cast_success);
|
||||
ClassDB::bind_method(D_METHOD("cspell_cast_success_rpc", "data"), &Entity::cspell_cast_success_rpc);
|
||||
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);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("con_death"), &Entity::con_death);
|
||||
|
||||
@ -7432,8 +7432,8 @@ void Entity::_bind_methods() {
|
||||
|
||||
//Casting System
|
||||
|
||||
ClassDB::bind_method(D_METHOD("sis_casting"), &Entity::sis_casting);
|
||||
ClassDB::bind_method(D_METHOD("cis_casting"), &Entity::cis_casting);
|
||||
ClassDB::bind_method(D_METHOD("cast_is_castings"), &Entity::cast_is_castings);
|
||||
ClassDB::bind_method(D_METHOD("cast_is_castingc"), &Entity::cast_is_castingc);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("gets_spell_cast_info"), &Entity::gets_spell_cast_info);
|
||||
ClassDB::bind_method(D_METHOD("sets_spell_cast_info", "value"), &Entity::sets_spell_cast_info);
|
||||
@ -7443,19 +7443,19 @@ void Entity::_bind_methods() {
|
||||
ClassDB::bind_method(D_METHOD("setc_spell_cast_info", "value"), &Entity::setc_spell_cast_info);
|
||||
ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "cspell_cast_info", PROPERTY_HINT_RESOURCE_TYPE, "SpellCastInfo", 0), "setc_spell_cast_info", "getc_spell_cast_info");
|
||||
|
||||
ClassDB::bind_method(D_METHOD("sstart_casting", "info"), &Entity::sstart_casting);
|
||||
ClassDB::bind_method(D_METHOD("sfail_cast"), &Entity::sfail_cast);
|
||||
ClassDB::bind_method(D_METHOD("sdelay_cast"), &Entity::sdelay_cast);
|
||||
ClassDB::bind_method(D_METHOD("sfinish_cast"), &Entity::sfinish_cast);
|
||||
ClassDB::bind_method(D_METHOD("sinterrupt_cast"), &Entity::sinterrupt_cast);
|
||||
ClassDB::bind_method(D_METHOD("cast_starts", "info"), &Entity::cast_starts);
|
||||
ClassDB::bind_method(D_METHOD("cast_fails"), &Entity::cast_fails);
|
||||
ClassDB::bind_method(D_METHOD("cast_delays"), &Entity::cast_delays);
|
||||
ClassDB::bind_method(D_METHOD("cast_finishs"), &Entity::cast_finishs);
|
||||
ClassDB::bind_method(D_METHOD("cast_interrupts"), &Entity::cast_interrupts);
|
||||
|
||||
ClassDB::bind_method(D_METHOD("cstart_casting_rpc", "data"), &Entity::cstart_casting_rpc);
|
||||
ClassDB::bind_method(D_METHOD("cstart_casting", "info"), &Entity::cstart_casting);
|
||||
ClassDB::bind_method(D_METHOD("cfail_cast"), &Entity::cfail_cast);
|
||||
ClassDB::bind_method(D_METHOD("cdelay_cast"), &Entity::cdelay_cast);
|
||||
ClassDB::bind_method(D_METHOD("cfinish_cast"), &Entity::cfinish_cast);
|
||||
ClassDB::bind_method(D_METHOD("cinterrupt_cast"), &Entity::cinterrupt_cast);
|
||||
ClassDB::bind_method(D_METHOD("sspell_cast_success", "info"), &Entity::sspell_cast_success);
|
||||
ClassDB::bind_method(D_METHOD("cast_startc_rpc", "data"), &Entity::cast_startc_rpc);
|
||||
ClassDB::bind_method(D_METHOD("cast_startc", "info"), &Entity::cast_startc);
|
||||
ClassDB::bind_method(D_METHOD("cast_failc"), &Entity::cast_failc);
|
||||
ClassDB::bind_method(D_METHOD("cast_delayc"), &Entity::cast_delayc);
|
||||
ClassDB::bind_method(D_METHOD("cast_finishc"), &Entity::cast_finishc);
|
||||
ClassDB::bind_method(D_METHOD("cast_interruptc"), &Entity::cast_interruptc);
|
||||
ClassDB::bind_method(D_METHOD("cast_spell_successs", "info"), &Entity::cast_spell_successs);
|
||||
|
||||
//Cooldowns
|
||||
ADD_SIGNAL(MethodInfo("scooldown_added", PropertyInfo(Variant::OBJECT, "cooldown", PROPERTY_HINT_RESOURCE_TYPE, "Cooldown")));
|
||||
|
@ -609,8 +609,8 @@ public:
|
||||
|
||||
//// Casting System ////
|
||||
|
||||
bool sis_casting();
|
||||
bool cis_casting();
|
||||
bool cast_is_castings();
|
||||
bool cast_is_castingc();
|
||||
|
||||
Ref<SpellCastInfo> gets_spell_cast_info();
|
||||
void sets_spell_cast_info(Ref<SpellCastInfo> info);
|
||||
@ -618,23 +618,23 @@ public:
|
||||
Ref<SpellCastInfo> getc_spell_cast_info();
|
||||
void setc_spell_cast_info(Ref<SpellCastInfo> info);
|
||||
|
||||
void sstart_casting(Ref<SpellCastInfo> info);
|
||||
void sfail_cast();
|
||||
void sdelay_cast();
|
||||
void sfinish_cast();
|
||||
void sinterrupt_cast();
|
||||
void cast_starts(Ref<SpellCastInfo> info);
|
||||
void cast_fails();
|
||||
void cast_delays();
|
||||
void cast_finishs();
|
||||
void cast_interrupts();
|
||||
|
||||
void cstart_casting_rpc(String data);
|
||||
void cstart_casting(Ref<SpellCastInfo> info);
|
||||
void cfail_cast();
|
||||
void cdelay_cast();
|
||||
void cfinish_cast();
|
||||
void cinterrupt_cast();
|
||||
void cast_startc_rpc(String data);
|
||||
void cast_startc(Ref<SpellCastInfo> info);
|
||||
void cast_failc();
|
||||
void cast_delayc();
|
||||
void cast_finishc();
|
||||
void cast_interruptc();
|
||||
|
||||
void sspell_cast_success(Ref<SpellCastInfo> info);
|
||||
void cast_spell_successs(Ref<SpellCastInfo> info);
|
||||
|
||||
void cspell_cast_success_rpc(String data);
|
||||
void cspell_cast_success(Ref<SpellCastInfo> info);
|
||||
void cast_spell_successc_rpc(String data);
|
||||
void cast_spell_successc(Ref<SpellCastInfo> info);
|
||||
|
||||
//// Cooldowns ////
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user