Relintai/entity_spell_system
1
0
Fork 0
mirror of https://github.com/Relintai/entity_spell_system.git synced 2025-02-22 17:18:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added a few methods for spell heals.

Browse Source
This commit is contained in:
Relintai 2020-03-10 15:32:16 +01:00
parent 0bf97e57da
commit f3073c48e6
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
data/spells/spell.cpp
View File

@ -32,6 +32,10 @@ SOFTWARE.
#include "../../singletons/entity_data_manager.h"
#include "../../pipelines/spell_damage_info.h"
#include "../../pipelines/spell_heal_info.h"
int Spell::get_id() const {
return _id;
}
@ -689,6 +693,18 @@ void Spell::handle_spell_damage(Ref<SpellDamageInfo> data) {
call("_handle_spell_damage", data);
}
void Spell::calculate_initial_heal(Ref<SpellHealInfo> data) {
ERR_FAIL_COND(!data.is_valid() || data->get_receiver() == NULL);
call("_calculate_initial_heal", data);
}
void Spell::handle_spell_heal(Ref<SpellHealInfo> data) {
ERR_FAIL_COND(!data.is_valid() || data->get_receiver() == NULL);
call("_handle_spell_heal", data);
}
void Spell::handle_projectile(Ref<SpellCastInfo> info) {
ERR_FAIL_COND(!info.is_valid());
@ -928,7 +944,9 @@ void Spell::_son_spell_hit(Ref<SpellCastInfo> info) {
}
void Spell::_calculate_initial_damage(Ref<SpellDamageInfo> data) {
data->set_damage(get_damage_min());
Math::randomize();
data->set_damage(get_damage_min() + (get_damage_max() - get_damage_min() * Math::randf()));
}
void Spell::_handle_spell_damage(Ref<SpellDamageInfo> data) {
@ -937,6 +955,18 @@ void Spell::_handle_spell_damage(Ref<SpellDamageInfo> data) {
data->get_dealer()->sdeal_damage_to(data);
}
void Spell::_calculate_initial_heal(Ref<SpellHealInfo> data) {
Math::randomize();
data->set_heal(get_heal_min() + (get_heal_max() - get_heal_min() * Math::randf()));
}
void Spell::_handle_spell_heal(Ref<SpellHealInfo> data) {
calculate_initial_heal(data);
data->get_dealer()->sdeal_heal_to(data);
}
void Spell::_handle_projectile(Ref<SpellCastInfo> info) {
if (_world_spell_data.is_valid()) {
WorldSpell *ws = memnew(WorldSpell);
@ -1072,6 +1102,12 @@ void Spell::_bind_methods() {
BIND_VMETHOD(MethodInfo("_calculate_initial_damage", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
BIND_VMETHOD(MethodInfo("_handle_spell_damage", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellDamageInfo")));
ClassDB::bind_method(D_METHOD("calculate_initial_heal", "data"), &Spell::calculate_initial_heal);
ClassDB::bind_method(D_METHOD("handle_spell_heal", "data"), &Spell::handle_spell_heal);
BIND_VMETHOD(MethodInfo("_calculate_initial_heal", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
BIND_VMETHOD(MethodInfo("_handle_spell_heal", PropertyInfo(Variant::OBJECT, "data", PROPERTY_HINT_RESOURCE_TYPE, "SpellHealInfo")));
ClassDB::bind_method(D_METHOD("handle_projectile", "info"), &Spell::handle_projectile);
ClassDB::bind_method(D_METHOD("handle_effect", "info"), &Spell::handle_effect);
@ -1091,6 +1127,9 @@ void Spell::_bind_methods() {
ClassDB::bind_method(D_METHOD("_calculate_initial_damage", "info"), &Spell::_calculate_initial_damage);
ClassDB::bind_method(D_METHOD("_handle_spell_damage", "info"), &Spell::_handle_spell_damage);
ClassDB::bind_method(D_METHOD("_calculate_initial_heal", "info"), &Spell::_calculate_initial_heal);
ClassDB::bind_method(D_METHOD("_handle_spell_heal", "info"), &Spell::_handle_spell_heal);
ClassDB::bind_method(D_METHOD("_handle_projectile", "info"), &Spell::_handle_projectile);
ClassDB::bind_method(D_METHOD("_handle_effect", "info"), &Spell::_handle_effect);

9
data/spells/spell.h
View File

@ -35,7 +35,6 @@ SOFTWARE.
#include "../../entities/stats/stat.h"
#include "../../infos/aura_infos.h"
#include "../../pipelines/spell_damage_info.h"
#include "spell_effect_visual.h"
@ -48,6 +47,8 @@ class Spell;
class CraftRecipe;
class EntityResourceCostData;
class EntitySkillData;
class SpellDamageInfo;
class SpellHealInfo;
enum TargetRelationType {
TARGET_SELF = 1 << 0,
@ -311,6 +312,9 @@ public:
void calculate_initial_damage(Ref<SpellDamageInfo> data);
void handle_spell_damage(Ref<SpellDamageInfo> data);
void calculate_initial_heal(Ref<SpellHealInfo> data);
void handle_spell_heal(Ref<SpellHealInfo> data);
void handle_projectile(Ref<SpellCastInfo> info);
void handle_effect(Ref<SpellCastInfo> info);
@ -334,6 +338,9 @@ protected:
virtual void _calculate_initial_damage(Ref<SpellDamageInfo> data);
virtual void _handle_spell_damage(Ref<SpellDamageInfo> data);
virtual void _calculate_initial_heal(Ref<SpellHealInfo> data);
virtual void _handle_spell_heal(Ref<SpellHealInfo> data);
virtual void _handle_projectile(Ref<SpellCastInfo> info);
virtual void _handle_effect(Ref<SpellCastInfo> info);