From 2bc4fff27d0c143daddeee22d182541b7a68f22f Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 27 Apr 2020 21:32:52 +0200 Subject: [PATCH] Update ESS to the latest to get the changes for the serverside events. --- HEADS | 2 +- game/scripts/spells/gd_spell_script.gd | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/HEADS b/HEADS index fb50252e..b78b2a59 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "4dda00461f6aa45bcb0c043c911b5f0b995206a6", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "8d680240ea583b2e19ecceffca254e3d46008018"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} \ No newline at end of file +{"engine": {"3.2": "78f0cf40cb4a37b54a27da25349718d1c4b324e5", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "d110b3368ffabd83fc3d5719589816184cd90ed3"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}} \ No newline at end of file diff --git a/game/scripts/spells/gd_spell_script.gd b/game/scripts/spells/gd_spell_script.gd index 15d1f73c..71113e54 100644 --- a/game/scripts/spells/gd_spell_script.gd +++ b/game/scripts/spells/gd_spell_script.gd @@ -80,10 +80,10 @@ func _sstart_casting(info : SpellCastInfo) -> void: r.current_value -= resource_cost.cost - info.caster.sspell_cast_success(info) + info.caster.notification_scast(SpellEnums.NOTIFICATION_CAST_SUCCESS, info) if info.target: - info.target.son_cast_finished_target(info) + info.target.notification_scast(SpellEnums.NOTIFICATION_CAST_FINISHED_TARGET, info) handle_cooldown(info) @@ -103,12 +103,12 @@ func _sfinish_cast(info : SpellCastInfo) -> void: return r.current_value -= resource_cost.cost - - info.caster.son_cast_finished(info) - info.caster.sspell_cast_success(info) + + info.caster.notification_scast(SpellEnums.NOTIFICATION_CAST_FINISHED, info) + info.caster.notification_scast(SpellEnums.NOTIFICATION_CAST_SUCCESS, info) if is_instance_valid(info.target): - info.target.son_cast_finished_target(info) + info.target.notification_scast(SpellEnums.NOTIFICATION_CAST_FINISHED_TARGET, info) if projectile_scene != null: handle_projectile(info) @@ -118,6 +118,7 @@ func _sfinish_cast(info : SpellCastInfo) -> void: handle_cooldown(info) handle_gcd(info) + func _son_cast_player_moved(info):