diff --git a/game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres b/game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres index 9b831f47..11f15dee 100644 --- a/game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres +++ b/game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres @@ -20,9 +20,4 @@ damage_enabled = true damage_type = 8 damage_min = 10 damage_max = 20 -attribute_count = 1 -StatModAttribute_0/stat = 24 -StatModAttribute_0/base_mod = 0.0 -StatModAttribute_0/bonus_mod = 0.0 -StatModAttribute_0/percent_mod = 10.0 script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres b/game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres index bedfd681..fa457133 100644 --- a/game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres +++ b/game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres @@ -20,13 +20,4 @@ damage_enabled = true damage_type = 16 damage_min = 10 damage_max = 12 -attribute_count = 2 -StatModAttribute_0/stat = 26 -StatModAttribute_0/base_mod = 0.0 -StatModAttribute_0/bonus_mod = 0.0 -StatModAttribute_0/percent_mod = -10.0 -StatModAttribute_1/stat = 27 -StatModAttribute_1/base_mod = 0.0 -StatModAttribute_1/bonus_mod = 0.0 -StatModAttribute_1/percent_mod = -10.0 script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/resource_db.tres b/game/modules/entity_classes/naturalist/resource_db.tres index a280be78..8f1a6be6 100644 --- a/game/modules/entity_classes/naturalist/resource_db.tres +++ b/game/modules/entity_classes/naturalist/resource_db.tres @@ -1,4 +1,4 @@ -[gd_resource type="ESSResourceDBStatic" load_steps=39 format=2] +[gd_resource type="ESSResourceDBStatic" load_steps=42 format=2] [ext_resource path="res://modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1] [ext_resource path="res://modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Aura" id=2] @@ -38,8 +38,11 @@ [ext_resource path="res://modules/entity_classes/naturalist/entities/2_naturalist_mob.tres" type="EntityData" id=36] [ext_resource path="res://modules/entity_classes/naturalist/spells/35_strike.tres" type="Spell" id=37] [ext_resource path="res://modules/entity_classes/naturalist/spells/36_regrow.tres" type="Spell" id=38] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Aura" id=39] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Aura" id=40] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Aura" id=41] [resource] entity_datas = [ ExtResource( 36 ), ExtResource( 35 ) ] spells = [ ExtResource( 11 ), ExtResource( 5 ), ExtResource( 25 ), ExtResource( 9 ), ExtResource( 23 ), ExtResource( 33 ), ExtResource( 1 ), ExtResource( 13 ), ExtResource( 34 ), ExtResource( 4 ), ExtResource( 30 ), ExtResource( 28 ), ExtResource( 27 ), ExtResource( 31 ), ExtResource( 14 ), ExtResource( 32 ), ExtResource( 26 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 19 ), ExtResource( 22 ), ExtResource( 37 ), ExtResource( 38 ) ] -auras = [ ExtResource( 12 ), ExtResource( 8 ), ExtResource( 29 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 7 ), ExtResource( 2 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 21 ), ExtResource( 24 ) ] +auras = [ ExtResource( 12 ), ExtResource( 8 ), ExtResource( 29 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 7 ), ExtResource( 2 ), ExtResource( 6 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 21 ), ExtResource( 24 ), ExtResource( 39 ), ExtResource( 41 ), ExtResource( 40 ) ] diff --git a/game/modules/entity_classes/naturalist/specs/aspects.tres b/game/modules/entity_classes/naturalist/specs/aspects.tres index 32e2f5ef..366fbec5 100644 --- a/game/modules/entity_classes/naturalist/specs/aspects.tres +++ b/game/modules/entity_classes/naturalist/specs/aspects.tres @@ -1,16 +1,20 @@ -[gd_resource type="CharacterSpec" load_steps=4 format=2] +[gd_resource type="CharacterSpec" load_steps=6 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Aura" id=1] [ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=2] [ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=3] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Aura" id=4] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Aura" id=5] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Aura" id=6] [resource] resource_name = "Aspects" text_name = "Aspects" num_rows = 2 row_0/size = 1 -row_0/column_0/size = 1 -row_0/column_0/entry_0 = ExtResource( 1 ) +row_0/column_0/size = 3 +row_0/column_0/entry_0 = ExtResource( 4 ) +row_0/column_0/entry_1 = ExtResource( 6 ) +row_0/column_0/entry_2 = ExtResource( 5 ) row_1/size = 2 row_1/column_0/size = 1 row_1/column_0/entry_0 = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres new file mode 100644 index 00000000..f3ba16d0 --- /dev/null +++ b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres @@ -0,0 +1,16 @@ +[gd_resource type="Aura" load_steps=3 format=2] + +[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2] + +[resource] +resource_name = "Improved Asperct of Scorpions" +icon = ExtResource( 2 ) +rank = 1 +aura_type = 6 +hide = true +text_name = "Improved Asperct of Scorpions" +text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." +script = ExtResource( 1 ) +spell_name = "Aspect of Scorpions" +reduction_value = 0.1 diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres new file mode 100644 index 00000000..f4e92b97 --- /dev/null +++ b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres @@ -0,0 +1,16 @@ +[gd_resource type="Aura" load_steps=3 format=2] + +[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2] + +[resource] +resource_name = "Improved Asperct of Scorpions" +icon = ExtResource( 2 ) +rank = 2 +aura_type = 6 +hide = true +text_name = "Improved Asperct of Scorpions" +text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." +script = ExtResource( 1 ) +spell_name = "Aspect of Scorpions" +reduction_value = 0.2 diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres new file mode 100644 index 00000000..c42dd522 --- /dev/null +++ b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres @@ -0,0 +1,16 @@ +[gd_resource type="Aura" load_steps=3 format=2] + +[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2] + +[resource] +resource_name = "Improved Asperct of Scorpions" +icon = ExtResource( 2 ) +rank = 3 +aura_type = 6 +hide = true +text_name = "Improved Asperct of Scorpions" +text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." +script = ExtResource( 1 ) +spell_name = "Aspect of Scorpions" +reduction_value = 0.3 diff --git a/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres b/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres index a555b2b3..0c20f3c2 100644 --- a/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres @@ -24,7 +24,7 @@ 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 +cast_cast_time = 1.5 heal_enabled = true heal_min = 123 heal_max = 333 diff --git a/game/scripts/auras/CastTimeReductionAura.gd b/game/scripts/auras/CastTimeReductionAura.gd new file mode 100644 index 00000000..a6cf9474 --- /dev/null +++ b/game/scripts/auras/CastTimeReductionAura.gd @@ -0,0 +1,9 @@ +extends Aura + +export(String) var spell_name : String +export(float) var reduction_value : float + +func _notification_ccast(what : int, data : AuraData, info: SpellCastInfo): + if SpellEnums.NOTIFICATION_CAST_STARTED: + if info.spell.get_name() == spell_name: + info.cast_time -= reduction_value