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 569967d3..43e55231 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 @@ -6,13 +6,13 @@ [resource] resource_name = "Aspect of Scorpions" -icon = ExtResource( 3 ) rank = 1 +icon = ExtResource( 3 ) +text_name = "Aspect of Scorpions" aura_time = 30.0 aura_tick = 3.0 aura_debuff = true aura_group = ExtResource( 2 ) -text_name = "Aspect of Scorpions" aura_text_description = "Deals %%damage_min to %%damage_max damage every %%tick sec, and increases damage taken by 10% for 30 sec." aura_damage_enabled = true aura_damage_type = 8 diff --git a/game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres b/game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres index cf736c6a..dec08785 100644 --- a/game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres @@ -7,14 +7,14 @@ [resource] resource_name = "Aspect of Wolves" id = 2 +rank = 10 icon = ExtResource( 3 ) +text_name = "Aspect of Wolves" aura_time = 22.0 aura_tick = 2.0 aura_debuff = true -rank = 10 aura_type = 1 aura_group = ExtResource( 2 ) -text_name = "Aspect of Wolves" aura_text_description = "Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% for 22 sec." aura_damage_enabled = true aura_damage_type = 16 diff --git a/game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres b/game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres index 606c1e19..81791f47 100644 --- a/game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres @@ -7,14 +7,14 @@ [resource] resource_name = "Aspect of Bees" id = 3 +rank = 10 icon = ExtResource( 3 ) +text_name = "Aspect of Bees" aura_time = 21.0 aura_tick = 3.0 aura_debuff = true -rank = 10 aura_type = 1 aura_group = ExtResource( 2 ) -text_name = "Aspect of Bees" aura_text_description = "Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage." aura_damage_enabled = true aura_damage_type = 16 diff --git a/game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres b/game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres index ba2a29f0..31fb2727 100644 --- a/game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres @@ -6,12 +6,12 @@ [resource] resource_name = "Rejuvenation" id = 4 +rank = 10 icon = ExtResource( 2 ) +text_name = "Rejuvenation" aura_time = 30.0 aura_tick = 3.0 -rank = 10 aura_type = 1 -text_name = "Rejuvenation" aura_text_description = "Heals you for 400 to 450 every 3 sec for 30 sec." aura_heal_enabled = true aura_heal_min = 400 diff --git a/game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres b/game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres index 9c25b56e..2b91ad60 100644 --- a/game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres @@ -7,10 +7,10 @@ resource_name = "Close Wounds" id = 5 icon = ExtResource( 2 ) +text_name = "Close Wounds" aura_time = 21.0 aura_tick = 3.0 aura_type = 1 -text_name = "Close Wounds" aura_text_description = "Heals you for 720 to 780 every 3 sec for 21 sec." aura_heal_enabled = true aura_heal_min = 720 diff --git a/game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres b/game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres index 2ec7c443..c5095630 100644 --- a/game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres @@ -7,8 +7,8 @@ resource_name = "Ironbark" id = 6 icon = ExtResource( 2 ) +text_name = "Ironbark" aura_time = 6.0 aura_type = 1 -text_name = "Ironbark" aura_text_description = "Reduces damage taken by 70%. This spell is not on the global cooldown." 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 ac533d69..5bc572f1 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 @@ -8,11 +8,11 @@ resource_name = "Nature's Swiftness" id = 7 icon = ExtResource( 3 ) +text_name = "Nature's Swiftness" aura_time = 10.0 aura_type = 1 -text_name = "Nature's Swiftness" -aura_text_description = "Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown." aura_visual_spell_effects = ExtResource( 2 ) +aura_text_description = "Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown." script = ExtResource( 1 ) does_stack = true mod_speed = 40.0 diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres index 1c31b980..fad51bfd 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres @@ -5,11 +5,11 @@ [resource] resource_name = "Improved Strike" -icon = ExtResource( 2 ) rank = 1 +icon = ExtResource( 2 ) +text_name = "Improved Strike" aura_type = 6 aura_hide = true -text_name = "Improved Strike" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 1 ) spell_name = "Strike" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres index 2ec54f10..dc8a8bae 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres @@ -5,11 +5,11 @@ [resource] resource_name = "Improved Strike" -icon = ExtResource( 2 ) rank = 1 +icon = ExtResource( 2 ) +text_name = "Improved Strike" aura_type = 6 aura_hide = true -text_name = "Improved Strike" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 1 ) spell_name = "Strike" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres index d548996d..c98b9f53 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres @@ -5,11 +5,11 @@ [resource] resource_name = "Improved Strike" -icon = ExtResource( 2 ) rank = 1 +icon = ExtResource( 2 ) +text_name = "Improved Strike" aura_type = 6 aura_hide = true -text_name = "Improved Strike" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 1 ) spell_name = "Strike" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres index c450e234..51fe4aa0 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres @@ -5,11 +5,11 @@ [resource] resource_name = "Improved Strike" -icon = ExtResource( 2 ) rank = 1 +icon = ExtResource( 2 ) +text_name = "Improved Strike" aura_type = 6 aura_hide = true -text_name = "Improved Strike" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 1 ) spell_name = "Strike" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres index 2cfe07b7..5b49876f 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres @@ -5,11 +5,11 @@ [resource] resource_name = "Improved Strike" -icon = ExtResource( 2 ) rank = 1 +icon = ExtResource( 2 ) +text_name = "Improved Strike" aura_type = 6 aura_hide = true -text_name = "Improved Strike" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 1 ) spell_name = "Strike" diff --git a/game/scripts/auras/aura_script.gd b/game/scripts/auras/aura_script.gd index 145b6e0a..51dd0bd5 100644 --- a/game/scripts/auras/aura_script.gd +++ b/game/scripts/auras/aura_script.gd @@ -21,7 +21,7 @@ class_name AuraGD # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -func _sapply(info : AuraApplyInfo) -> void: +func _aura_sapply(info : AuraApplyInfo) -> void: # var add : bool = false var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id) @@ -48,7 +48,7 @@ func _sapply(info : AuraApplyInfo) -> void: ad.remaining_time = aura_time -func _sdeapply(data : AuraData) -> void: +func _aura_sdeapply(data : AuraData) -> void: for i in range(aura_stat_attribute_get_count()): data.owner.stat_mod(aura_stat_attribute_get_stat(id), -aura_stat_attribute_get_base_mod(i), -aura_stat_attribute_get_bonus_mod(i), -aura_stat_attribute_get_percent_mod(i))