Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update everything.

Browse Source
This commit is contained in:
Relintai 2020-01-02 00:19:33 +01:00
parent 6cc3f7dd04
commit 8ff112bde6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": "318c69351624f7794c51b5385d252af397c0404a", "world_generator": "63da1cc4a2084d1c2eb9430e436be22711e964f2", "entity_spell_system": "bc797e4ffbc9827d379c50e9e8bf76690c5b7111", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "a449a410372b4e79328b73dbfa5e7152d47f2a28", "texture_packer": "fbf5d0d634ab04db049099b814d2d58e2743f5b2", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "3fedb4c8534af36d89a1a1a34a6b5ed4d333927a", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"} {"engine": "27b74f42b4fd6b6e56b7a4924697d8881488bee1", "world_generator": "63da1cc4a2084d1c2eb9430e436be22711e964f2", "entity_spell_system": "4a166becf4d9179fe85931bef678c967d5141651", "ui_extensions": "8a81cc53100c5a138fbaf927080410025c64c88e", "voxelman": "9d48a0758df7ef8913ef98ed2e37f3b6dba424da", "texture_packer": "fbf5d0d634ab04db049099b814d2d58e2743f5b2", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5", "mesh_data_resource": "3fedb4c8534af36d89a1a1a34a6b5ed4d333927a", "ess_data": "3bd637fdd3304b64a18287a49a6b7387acf2f5de", "prop_tool": "df438053ebc900966f8f842fc65f0264f1271d49"}

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

@ -31,7 +31,7 @@ func _sstart_casting(info : SpellCastInfo) -> void:
if !info.caster.hass_spell(self): if !info.caster.hass_spell(self):
return return
if cast: if cast_enabled:
info.caster.sstart_casting(info) info.caster.sstart_casting(info)
return return
@ -102,7 +102,7 @@ func handle_effect(info : SpellCastInfo) -> void:
elif target_type == SPELL_TARGET_TYPE_SELF: elif target_type == SPELL_TARGET_TYPE_SELF:
info.target = info.caster info.target = info.caster
if damage and info.target: if damage_enabled and info.target:
var sdi : SpellDamageInfo = SpellDamageInfo.new() var sdi : SpellDamageInfo = SpellDamageInfo.new()
sdi.damage_source = self sdi.damage_source = self
@ -149,7 +149,7 @@ func handle_cooldown(info : SpellCastInfo) -> void:
info.caster.adds_cooldown(id, cooldown_cooldown) info.caster.adds_cooldown(id, cooldown_cooldown)
func handle_gcd(info : SpellCastInfo) -> void: func handle_gcd(info : SpellCastInfo) -> void:
if cooldown_global_cooldown and cast_cast_time < 0.01: if cooldown_global_cooldown_enabled and cast_cast_time < 0.01:
info.caster.sstart_global_cooldown(info.caster.get_gcd().scurrent) info.caster.sstart_global_cooldown(info.caster.get_gcd().scurrent)
func add_spell_cast_effect(info : SpellCastInfo) -> void: func add_spell_cast_effect(info : SpellCastInfo) -> void:

2
game/ui/actionbars/ActionBarEntry.gd
View File

@ -169,7 +169,7 @@ func setup_icon() -> void:
spell_id = spell.id spell_id = spell.id
spell_type = spell.spell_type spell_type = spell.spell_type
has_gcd = spell.cooldown_global_cooldown has_gcd = spell.cooldown_global_cooldown_enabled
func _on_button_pressed() -> void: func _on_button_pressed() -> void:
if (button_entry.type == ActionBarButtonEntry.ACTION_BAR_BUTTON_ENTRY_TYPE_SPELL): if (button_entry.type == ActionBarButtonEntry.ACTION_BAR_BUTTON_ENTRY_TYPE_SPELL):