From cb6faf1120128d7619c10c860e1f3d16915c6310 Mon Sep 17 00:00:00 2001 From: Relintai Date: Tue, 10 Mar 2020 13:30:40 +0100 Subject: [PATCH] Updated everything to get the improvements from ESS (spell scailng became a project wide setting.) Spell scaling is now off. Added back in ranks, as in the long run ranks will work better. --- HEADS | 2 +- game/data/spells/10_aspect_of_scorpions_rank_1.tres | 1 + game/data/spells/11_aspect_of_wasps_rank_1.tres | 1 + game/data/spells/12_aspect_of_wolves_rank_1.tres | 1 + game/data/spells/13_aspect_of_bees_rank_1.tres | 4 ++-- game/data/spells/14_amplify_pain_rank_1.tres | 1 + game/data/spells/16_close_wounds_rank_1.tres | 2 +- game/data/spells/18_natures_swiftness_rank_1.tres | 2 +- game/scripts/auras/aura_script.gd | 5 ++++- 9 files changed, 13 insertions(+), 6 deletions(-) diff --git a/HEADS b/HEADS index b1df3526..ae73f291 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "69c1805735df2a7a35e826e2f1bd40bac7dc1058", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3e10779dbc5258d1e1b08eab287189f9c1ccec64"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "91540092500d8b8bd0c12322e46f4e10a00c66ae"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "9b1868668de4242ccc0565cf3c6b5e1c375f1576"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dbfd76aaf74873ca104593bb85c97d3257c5c708"}} \ No newline at end of file +{"engine": {"3.2": "e5526544a32023122e3c686d866b9f70751cf1e6", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "0bf97e57da3e4a56a5e0a893ee4762ef9c52ee61"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "91540092500d8b8bd0c12322e46f4e10a00c66ae"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "9b1868668de4242ccc0565cf3c6b5e1c375f1576"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "3144600da9dd00595518c5f0d4cc2cc400825c86"}} \ 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 724d79f6..e392c98c 100644 --- a/game/data/spells/10_aspect_of_scorpions_rank_1.tres +++ b/game/data/spells/10_aspect_of_scorpions_rank_1.tres @@ -9,6 +9,7 @@ resource_name = "Aspect of Scorpions" id = 10 spell_type = 8 +rank = 1 icon = ExtResource( 2 ) visual_spell_effects = ExtResource( 4 ) target_aura_applys = [ ExtResource( 3 ) ] diff --git a/game/data/spells/11_aspect_of_wasps_rank_1.tres b/game/data/spells/11_aspect_of_wasps_rank_1.tres index 90be1a75..29f58ed7 100644 --- a/game/data/spells/11_aspect_of_wasps_rank_1.tres +++ b/game/data/spells/11_aspect_of_wasps_rank_1.tres @@ -8,6 +8,7 @@ resource_name = "Aspect of Wasps" id = 11 spell_type = 8 +rank = 1 icon = ExtResource( 2 ) target_aura_applys = [ ExtResource( 3 ) ] text_name = "Aspect of Wasps" diff --git a/game/data/spells/12_aspect_of_wolves_rank_1.tres b/game/data/spells/12_aspect_of_wolves_rank_1.tres index 2494375b..8efc0f1c 100644 --- a/game/data/spells/12_aspect_of_wolves_rank_1.tres +++ b/game/data/spells/12_aspect_of_wolves_rank_1.tres @@ -8,6 +8,7 @@ resource_name = "Aspect of Wolves" id = 12 spell_type = 8 +rank = 1 icon = ExtResource( 2 ) needs_target = true target_aura_applys = [ ExtResource( 3 ) ] diff --git a/game/data/spells/13_aspect_of_bees_rank_1.tres b/game/data/spells/13_aspect_of_bees_rank_1.tres index 75a1c678..0f946ed4 100644 --- a/game/data/spells/13_aspect_of_bees_rank_1.tres +++ b/game/data/spells/13_aspect_of_bees_rank_1.tres @@ -8,14 +8,14 @@ resource_name = "Aspect of Bees" id = 13 spell_type = 8 -rank = 10 +rank = 1 icon = ExtResource( 2 ) needs_target = true target_aura_applys = [ ExtResource( 3 ) ] text_name = "Aspect of Bees" text_description = "Range: 26m. Instant. -Cooldown: {2} +Cooldown: %%cooldown_cooldown sec Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage." cooldown_cooldown = 21.0 range_range = 26.0 diff --git a/game/data/spells/14_amplify_pain_rank_1.tres b/game/data/spells/14_amplify_pain_rank_1.tres index 9f8a7824..c55ac034 100644 --- a/game/data/spells/14_amplify_pain_rank_1.tres +++ b/game/data/spells/14_amplify_pain_rank_1.tres @@ -22,6 +22,7 @@ id = 14 spell_type = 8 level = 10 icon = ExtResource( 2 ) +needs_target = true visual_spell_effects = SubResource( 1 ) text_name = "Amplify Pain" text_description = "Range: 26m. diff --git a/game/data/spells/16_close_wounds_rank_1.tres b/game/data/spells/16_close_wounds_rank_1.tres index cf71c0fa..480ff9d5 100644 --- a/game/data/spells/16_close_wounds_rank_1.tres +++ b/game/data/spells/16_close_wounds_rank_1.tres @@ -14,7 +14,7 @@ icon = ExtResource( 2 ) caster_aura_applys = [ ExtResource( 3 ) ] text_name = "Close Wounds" text_description = "Casttime: 2 sec. -Cooldown: {2} +Cooldown: %%cooldown_cooldown sec Heals you for 720 to 780 every 3 sec for 21 sec." cast_cast_time = 1.3 aoe_colliderType = -2147479552 diff --git a/game/data/spells/18_natures_swiftness_rank_1.tres b/game/data/spells/18_natures_swiftness_rank_1.tres index f45de83f..7aec5536 100644 --- a/game/data/spells/18_natures_swiftness_rank_1.tres +++ b/game/data/spells/18_natures_swiftness_rank_1.tres @@ -15,7 +15,7 @@ icon = ExtResource( 1 ) caster_aura_applys = [ ExtResource( 2 ) ] text_name = "Nature's Swiftness" text_description = "Instant. -Cooldown: {2} +Cooldown: %%cooldown_cooldown sec Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown." cooldown_cooldown = 20.0 aoe_targetType = 520 diff --git a/game/scripts/auras/aura_script.gd b/game/scripts/auras/aura_script.gd index 6a8d5697..09cf96c4 100644 --- a/game/scripts/auras/aura_script.gd +++ b/game/scripts/auras/aura_script.gd @@ -30,7 +30,10 @@ func _handle_aura_damage(aura_data : AuraData, damage_info : SpellDamageInfo) -> return damage_info.damage = damage_min + (randi() % (damage_max - damage_min)) - damage_info.damage *= damage_info.dealer.scharacter_level / float(EntityEnums.MAX_CHARACTER_LEVEL) + + if scale_with_level: + damage_info.damage *= 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)):