From 73f2cfb31f77b568d2c8d401677ab78750d273f0 Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 26 Feb 2020 17:26:07 +0100 Subject: [PATCH] Update to the latest ESS, to get the description/translation api changes. --- HEADS | 2 +- game/data/spells/10_aspect_of_scorpions_rank_1.tres | 5 ++++- game/ui/spellbook/SpellEntryPopup.gd | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/HEADS b/HEADS index 39ad46ed..37cbb293 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "c5c0f2cddd74c849017fa5138bc6ebdeb76dcd80"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "36063410f99f7e44b2169d66ccb0730c9890d462"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} \ No newline at end of file +{"engine": {"3.2": "f4e3701893bdf6b304ee114745def2f8ac4aa822", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "ceb71f56d4c30c432ed6cb91813bef652e53a730"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "36063410f99f7e44b2169d66ccb0730c9890d462"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "00f6c128bd0e9799b7f7f86e118ed68277fbe27d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "prop_tool": {"master": "df438053ebc900966f8f842fc65f0264f1271d49"}} \ No newline at end of file diff --git a/game/data/spells/10_aspect_of_scorpions_rank_1.tres b/game/data/spells/10_aspect_of_scorpions_rank_1.tres index c66998c0..724d79f6 100644 --- a/game/data/spells/10_aspect_of_scorpions_rank_1.tres +++ b/game/data/spells/10_aspect_of_scorpions_rank_1.tres @@ -14,9 +14,12 @@ visual_spell_effects = ExtResource( 4 ) target_aura_applys = [ ExtResource( 3 ) ] text_name = "Aspect of Scorpions" text_description = "Range: 26m. -Casttime: {3}. +Casttime: %%cast_cast_time . Deals 340 to 380 damage every 3 sec, and increases damage taken by 10% for 30 sec." range_range = 26.0 cast_enabled = true cast_cast_time = 1.2 +heal_enabled = true +heal_min = 123 +heal_max = 333 script = ExtResource( 1 ) diff --git a/game/ui/spellbook/SpellEntryPopup.gd b/game/ui/spellbook/SpellEntryPopup.gd index 4bd4ddd5..1db6ad6e 100644 --- a/game/ui/spellbook/SpellEntryPopup.gd +++ b/game/ui/spellbook/SpellEntryPopup.gd @@ -39,5 +39,5 @@ func set_spell(spell : Spell) -> void: return _label.text = _spell.text_name - _desc_label.text = _spell.text_description + _desc_label.text = _spell.get_description(1, 1)