From 2d5e17b5be13be61666e25b18195b6d98c00dada Mon Sep 17 00:00:00 2001 From: Relintai Date: Wed, 12 Jan 2022 12:06:00 +0100 Subject: [PATCH] Fix more issues after the aura property renames. Also updated ESS to get property grouping improvements. --- HEADS | 2 +- game/scripts/spells/gd_spell_script.gd | 4 ++-- game/ui/auraframe/AuraEntry.gd | 4 ++-- game/ui/auraframe/AuraFrame.gd | 4 ++-- game/ui/talents/TalentEntry.gd | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/HEADS b/HEADS index 1ec5f30c..8e40a39d 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "3337694d687bc682599a3cbbf17f5c00e5c3dabd"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "6c0ee18eac078b123f4c5d8e4e28008857d584a1"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "d4b01890414197a8221c58ac944bcbca7f42f947"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "461c2a80a1e9fb3535203d1465bc9d89438146b3"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "terraman": {"master": "ae53ad5001a720ddb2eb52c46eea65dc2242ac9f"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "3337694d687bc682599a3cbbf17f5c00e5c3dabd"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "24db319b5f021b6a54084904ea24630273514bbd"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "d4b01890414197a8221c58ac944bcbca7f42f947"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "461c2a80a1e9fb3535203d1465bc9d89438146b3"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "terraman": {"master": "ae53ad5001a720ddb2eb52c46eea65dc2242ac9f"}} \ 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 682642c4..54a3bb2e 100644 --- a/game/scripts/spells/gd_spell_script.gd +++ b/game/scripts/spells/gd_spell_script.gd @@ -181,7 +181,7 @@ func handle_effect(info : SpellCastInfo) -> void: ainfo.spell_scale = 1 ainfo.aura = aura - aura.sapply(ainfo) + aura.aura_sapply(ainfo) if info.target != null: for aura in target_aura_applys: @@ -202,7 +202,7 @@ func handle_effect(info : SpellCastInfo) -> void: ainfo.spell_scale = 1 ainfo.aura = aura - aura.sapply(ainfo) + aura.aura_sapply(ainfo) diff --git a/game/ui/auraframe/AuraEntry.gd b/game/ui/auraframe/AuraEntry.gd index f6a7b559..dd35fba6 100644 --- a/game/ui/auraframe/AuraEntry.gd +++ b/game/ui/auraframe/AuraEntry.gd @@ -74,10 +74,10 @@ func set_aura_data(paura_data : AuraData): set_process(false) time_label.text = "" - tooltip_node.hint_tooltip = aura_data.aura.text_description + tooltip_node.hint_tooltip = aura_data.aura.aura_text_description texture_rect.texture = aura_data.aura.icon - if aura_data.aura.debuff: + if aura_data.aura.aura_debuff: var aura_type : int = aura_data.aura.aura_type if aura_type == SpellEnums.AURA_TYPE_MAGIC: diff --git a/game/ui/auraframe/AuraFrame.gd b/game/ui/auraframe/AuraFrame.gd index dd1c4818..5c96e23d 100644 --- a/game/ui/auraframe/AuraFrame.gd +++ b/game/ui/auraframe/AuraFrame.gd @@ -48,7 +48,7 @@ func on_notification_caura(what :int, aura_data : AuraData) -> void: if what == SpellEnums.NOTIFICATION_AURA_ADDED: var created_node : Node = aura_entry_scene.instance() - if (not aura_data.aura.debuff): + if (not aura_data.aura.aura_debuff): buff_container_node.add_child(created_node) created_node.owner = buff_container_node else: @@ -57,7 +57,7 @@ func on_notification_caura(what :int, aura_data : AuraData) -> void: created_node.set_aura_data(aura_data) elif what == SpellEnums.NOTIFICATION_AURA_REMOVED: - if (not aura_data.aura.debuff): + if (not aura_data.aura.aura_debuff): for bn in buff_container_node.get_children(): if bn.get_aura_data() == aura_data: buff_container_node.remove_child(bn) diff --git a/game/ui/talents/TalentEntry.gd b/game/ui/talents/TalentEntry.gd index 9dd87a6f..bc25d72c 100644 --- a/game/ui/talents/TalentEntry.gd +++ b/game/ui/talents/TalentEntry.gd @@ -108,7 +108,7 @@ func refresh() -> void: var aura : Aura = _spec.get_talent(_row, culomn, ridx) _aura_name_label.text = aura.text_name - _aura_description_label.text = aura.text_description + _aura_description_label.text = aura.aura_text_description _icon_rect.texture = aura.icon _rank_label.text = str(known_rank_count) + "/" + str(rank_count)