Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-12-21 13:16:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update ESS to the latest.

Browse Source
This commit is contained in:
Relintai 2020-04-07 13:13:07 +02:00
parent 26e20ee516
commit a9601ad077
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "da4eb7101d986af0ba6a15efaaed3dee77370d80", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "ccd54e340bd28a8bc221bc31f27ad30d5a258aa4"}, "entity_spell_system": {"master": "bfd7bdcf42215714e761a3bb102a8e366e30f86c"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "40535bfb59458ab4a263b985131a01e00a55a375"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "ea3b34d972fb5f76474daabd7c1e192419811348"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "45efc21f3e8af941d96b53d54f82572a6644fef7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dc598c59322185032835f964db069964244e58bc"}, "props": {"master": "152be1328bcf7953de5139f44a26bda0b13afef4"}}
{"engine": {"3.2": "da4eb7101d986af0ba6a15efaaed3dee77370d80", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "ccd54e340bd28a8bc221bc31f27ad30d5a258aa4"}, "entity_spell_system": {"master": "5a7ae51778bb09e749d60a7f167e82d23163e5e2"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "40535bfb59458ab4a263b985131a01e00a55a375"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "ea3b34d972fb5f76474daabd7c1e192419811348"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "45efc21f3e8af941d96b53d54f82572a6644fef7"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dc598c59322185032835f964db069964244e58bc"}, "props": {"master": "152be1328bcf7953de5139f44a26bda0b13afef4"}}

20
game/scripts/spells/gd_spell_script.gd
View File

@ -109,11 +109,11 @@ func _sfinish_cast(info : SpellCastInfo) -> void:
if is_instance_valid(info.target):
info.target.son_cast_finished_target(info)
#
# if projectile != null:
# handle_projectile(info)
# else:
handle_effect(info)
if projectile_scene != null:
handle_projectile(info)
else:
handle_effect(info)
handle_cooldown(info)
handle_gcd(info)
@ -124,16 +124,6 @@ func _son_cast_player_moved(info):
if !cast_can_move_while_casting:
info.caster.sfail_cast()
func handle_projectile(info : SpellCastInfo):
pass
# if projectile_type == SPELL_PROJECTILE_TYPE_FOLLOW:
# var sp : WorldSpellGD = WorldSpellGD.new()
#
# info.get_caster().get_parent().add_child(sp)
# sp.owner = info.get_caster().get_parent()
#
# sp.launch(info, projectile, projectile_speed)
func _son_spell_hit(info):
handle_effect(info)