From be6ebf48f3596d149256446228b94c295a6da635 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 17 Jul 2020 19:29:24 +0200 Subject: [PATCH] Update ESS to get the aura damage calculation update. --- HEADS | 2 +- .../auras/10_aspect_of_scorpions_rank_1.tres | 2 +- .../auras/17_natures_swiftness_rank_1.tres | 5 ---- game/scripts/auras/aura_script.gd | 27 ------------------- 4 files changed, 2 insertions(+), 34 deletions(-) diff --git a/HEADS b/HEADS index 4d1fbfcd..acea5d08 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "07b24de868457c0a190c88771e99ff09e5451c3b", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9a4f9f9809cb4da6d0196a9b37ea480e3cd0c400"}, "entity_spell_system": {"master": "f6f125b92c05ad12fed573d5568b5384a548fea5"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "dee38b1588ef3224cf8022eaf227e1dcaead6277"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "0e5c54a70f8e90f95cbf11419b959a5f67562d48"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}} \ No newline at end of file +{"engine": {"3.2": "07b24de868457c0a190c88771e99ff09e5451c3b", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "9a4f9f9809cb4da6d0196a9b37ea480e3cd0c400"}, "entity_spell_system": {"master": "af1bd74fbf38d0ac42d3cf203feb3c7212d01849"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "dee38b1588ef3224cf8022eaf227e1dcaead6277"}, "texture_packer": {"master": "2993ed34f34cfa6a5e61b7913380231e9c55eda6"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "85417ebee9198be3cd7cc643e0e0e934db64a620"}, "procedural_animations": {"master": "9226d21781ea05828570e592874aa319df0dc53d"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "544654f49b13af2d25ac14152c8a5014474e6333"}, "mesh_utils": {"master": "4f69ec67b861ce4475cfd17946dfaa586c888d94"}, "broken_seals_module": {"master": "0e5c54a70f8e90f95cbf11419b959a5f67562d48"}, "thread_pool": {"master": "93320fe864128d706bcc47fc7ed0731e6e9bcf69"}} \ No newline at end of file diff --git a/game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres b/game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres index b008d47a..7bf5866d 100644 --- a/game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres @@ -18,5 +18,5 @@ text_description = "Deals %%damage_min to %%damage_max damage every %%tick se damage_enabled = true damage_type = 8 damage_min = 4 -damage_max = 5 +damage_max = 6 script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres b/game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres index 6d8c686d..b5e0cd0a 100644 --- a/game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres @@ -13,9 +13,4 @@ aura_type = 1 text_name = "Nature's Swiftness" text_description = "Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown." visual_spell_effects = ExtResource( 2 ) -attribute_count = 1 -StatModAttribute_0/stat = 1 -StatModAttribute_0/base_mod = 0.0 -StatModAttribute_0/bonus_mod = 0.0 -StatModAttribute_0/percent_mod = 60.0 script = ExtResource( 1 ) diff --git a/game/scripts/auras/aura_script.gd b/game/scripts/auras/aura_script.gd index 0cbbf47f..bb30f994 100644 --- a/game/scripts/auras/aura_script.gd +++ b/game/scripts/auras/aura_script.gd @@ -21,33 +21,6 @@ class_name AuraGD # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# -#func _handle_aura_damage(aura_data : AuraData, damage_info : SpellDamageInfo) -> void: -# randomize() -# -# if damage_info.dealer == null: -# printerr("_handle_aura_damage: damage_info.dealer is null! ") -# return -# -# damage_info.damage = damage_min + (randi() % (damage_max - damage_min)) -# -# if scale_with_level: -# damage_info.damage *= int(float(damage_info.dealer.scharacter_level) / float(EntityEnums.MAX_CHARACTER_LEVEL)) -# -# damage_info.damage_source_type = aura_data.aura.damage_type -# -# if (is_instance_valid(damage_info.dealer)): -# damage_info.dealer.sdeal_damage_to(damage_info) -# -#func _handle_aura_heal(aura_data : AuraData, shi : SpellHealInfo) -> void: -# randomize() -# -# shi.heal = heal_min + (randi() % (heal_max - heal_min)) -# shi.damage *= shi.dealer.scharacter_level / float(EntityEnums.MAX_CHARACTER_LEVEL) -# shi.heal_source_type = aura_data.aura.aura_type -# -# shi.dealer.sdeal_heal_to(shi) -# #func _sapply(info : AuraApplyInfo) -> void: ## var add : bool = false # var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id)