Updated the engine and the modules to the latest.

HEADS

@@ -1 +1 @@
-{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "9a7de6a344292fa3e979274c7149fb2e69d4c575"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "cfba9403cb150d0a1c802039a5b7a8822a4f4832"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "mesh_data_resource": {"master": "4c8560f40d7a210380a2e25962ac794e0950ef75"}, "mesh_utils": {"master": "ca1f54268be462414ee40b9ff96276a8112276a9"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "b547515ae3817b0088e2cf499af59c8f1dee7189"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "rtile_map": {"master": "27e175b352f87987ca190ca617c247a313077eb1"}}
+{"engine": {"3.2": "64a9e86c5c20bd4bd5833f0563457d0126617489", "3.x": "156ee820f620111a2dc2f884e79190777ca6e785"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3c334566ff05a74e913cd5c5ff38ae45aba5f5d2"}, "ui_extensions": {"master": "992b322266e3d3225447c4df0a1c34fee19e1fe3"}, "texture_packer": {"master": "59480880356b7aff8967dfe2163e8416031c4f9b"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "thread_pool": {"master": "06c56fcb37d28a275212e2864c5885ae6a5c2ba0"}, "mesh_data_resource": {"master": "362d59ae45cbcd96aad24a0dc1cbd504a3e61e82"}, "mesh_utils": {"master": "4feb5186203640c234f0fc4e24cc0de83f21e951"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "terraman_2d": {"master": "b547515ae3817b0088e2cf499af59c8f1dee7189"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "rtile_map": {"master": "389070cfef387b69902e23e6c4ac53997b69e42e"}}

game/modules/entity_classes/naturalist/1_naturalist.tres

@@ -1,12 +1,13 @@
-[gd_resource type="EntityClassData" load_steps=26 format=2]
+[gd_resource type="EntityClassData" load_steps=28 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/spells/19_uproot_rank_1.tres" type="Spell" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=3]
 [ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=4]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=5]
-[ext_resource path="res://modules/entity_classes/naturalist/stats/player_statdata.tres" type="StatData" id=6]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects.tres" type="CharacterSpec" id=6]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=7]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/nature.tres" type="CharacterSpec" id=8]
 [ext_resource path="res://scripts/ai/EntityAIGD.gd" type="Script" id=9]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=10]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=11]
@@ -23,20 +24,19 @@
 [ext_resource path="res://modules/entity_classes/naturalist/spells/25_inner_will.tres" type="Spell" id=22]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=23]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=24]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee.tres" type="CharacterSpec" id=25]
+[ext_resource path="res://modules/entity_classes/naturalist/stats/player_statdata.tres" type="StatData" id=26]
 
 [sub_resource type="EntityAI" id=1]
 script = ExtResource( 9 )
 
-[sub_resource type="CharacterSpec" id=2]
-id = 1
-
 [resource]
 resource_name = "Naturalist"
 id = 1
 text_name = "Naturalist"
-stat_data = ExtResource( 6 )
+stat_data = ExtResource( 26 )
 entity_resources = [ ExtResource( 4 ) ]
-specs = [ SubResource( 2 ) ]
+specs = [ ExtResource( 6 ), ExtResource( 25 ), ExtResource( 8 ) ]
 spells = [ ExtResource( 7 ), ExtResource( 3 ), ExtResource( 15 ), ExtResource( 5 ), ExtResource( 12 ), ExtResource( 23 ), ExtResource( 1 ), ExtResource( 10 ), ExtResource( 24 ), ExtResource( 2 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 17 ), ExtResource( 20 ), ExtResource( 11 ), ExtResource( 22 ), ExtResource( 16 ), ExtResource( 21 ), ExtResource( 14 ) ]
 start_spells = [ ExtResource( 7 ), ExtResource( 21 ), ExtResource( 14 ) ]
 ais = [ SubResource( 1 ) ]

game/modules/entity_classes/naturalist/1_naturalist_vendor.tres

@@ -0,0 +1,23 @@
+[gd_resource type="EntityClassData" load_steps=8 format=2]
+
+[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=1]
+[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=2]
+[ext_resource path="res://modules/entity_classes/naturalist/stats/mob_statdata.tres" type="StatData" id=3]
+[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=13]
+
+[sub_resource type="VendorItemDataEntry" id=1]
+item = ExtResource( 2 )
+
+[sub_resource type="VendorItemDataEntry" id=2]
+item = ExtResource( 1 )
+
+[sub_resource type="VendorItemData" id=3]
+vendor_datas = [ SubResource( 1 ), SubResource( 2 ) ]
+
+[resource]
+resource_name = "Naturalist"
+id = 1
+text_name = "Naturalist"
+stat_data = ExtResource( 3 )
+vendor_item_data = SubResource( 3 )
+script = ExtResource( 13 )

game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres

@@ -1,22 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=3]
-
-[resource]
-resource_name = "Aspect of Scorpions"
-icon = ExtResource( 3 )
-time = 30.0
-tick = 3.0
-debuff = true
-rank = 1
-aura_type = 1
-aura_group = ExtResource( 2 )
-text_name = "Aspect of Scorpions"
-text_description = "Deals %%damage_min  to %%damage_max  damage every %%tick  sec, and increases damage taken by 10% for 30 sec."
-damage_enabled = true
-damage_type = 8
-damage_min = 4
-damage_max = 5
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres

@@ -1,23 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3]
-
-[resource]
-resource_name = "Aspect of Wasps"
-id = 1
-icon = ExtResource( 3 )
-time = 21.0
-tick = 1.0
-debuff = true
-rank = 10
-aura_type = 1
-aura_group = ExtResource( 2 )
-text_name = "Aspect of Wasps"
-text_description = "Deals 230 to 270 damage every 3 sec, this damage increases over the duration, for 21 sec."
-damage_enabled = true
-damage_type = 16
-damage_min = 280
-damage_max = 300
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres

@@ -1,23 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=3]
-
-[resource]
-resource_name = "Aspect of Wolves"
-id = 2
-icon = ExtResource( 3 )
-time = 22.0
-tick = 2.0
-debuff = true
-rank = 10
-aura_type = 1
-aura_group = ExtResource( 2 )
-text_name = "Aspect of Wolves"
-text_description = "Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% for 22 sec."
-damage_enabled = true
-damage_type = 16
-damage_min = 280
-damage_max = 330
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres

@@ -1,23 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3]
-
-[resource]
-resource_name = "Aspect of Bees"
-id = 3
-icon = ExtResource( 3 )
-time = 21.0
-tick = 3.0
-debuff = true
-rank = 10
-aura_type = 1
-aura_group = ExtResource( 2 )
-text_name = "Aspect of Bees"
-text_description = "Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage."
-damage_enabled = true
-damage_type = 16
-damage_min = 420
-damage_max = 440
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres

@@ -1,19 +0,0 @@
-[gd_resource type="Aura" load_steps=3 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/rejuvenation.tres" type="Texture" id=2]
-
-[resource]
-resource_name = "Rejuvenation"
-id = 4
-icon = ExtResource( 2 )
-time = 30.0
-tick = 3.0
-rank = 10
-aura_type = 1
-text_name = "Rejuvenation"
-text_description = "Heals you for 400 to 450 every 3 sec for 30 sec."
-heal_enabled = true
-heal_min = 400
-heal_max = 450
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres

@@ -1,18 +0,0 @@
-[gd_resource type="Aura" load_steps=3 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/close_wounds.tres" type="Texture" id=2]
-
-[resource]
-resource_name = "Close Wounds"
-id = 5
-icon = ExtResource( 2 )
-time = 21.0
-tick = 3.0
-aura_type = 1
-text_name = "Close Wounds"
-text_description = "Heals you for 720 to 780 every 3 sec for 21 sec."
-heal_enabled = true
-heal_min = 720
-heal_max = 780
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres

@@ -1,14 +0,0 @@
-[gd_resource type="Aura" load_steps=3 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/ironbark.tres" type="Texture" id=2]
-
-[resource]
-resource_name = "Ironbark"
-id = 6
-icon = ExtResource( 2 )
-time = 6.0
-aura_type = 1
-text_name = "Ironbark"
-text_description = "Reduces damage taken by 70%. This spell is not on the global cooldown."
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres

@@ -1,16 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/effect_data/natures_swiftness.tres" type="SpellEffectVisual" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/natures_swiftness.tres" type="Texture" id=3]
-
-[resource]
-resource_name = "Nature's Swiftness"
-id = 7
-icon = ExtResource( 3 )
-time = 10.0
-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 )
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/20_root_rank_1.tres

@@ -1,13 +0,0 @@
-[gd_resource type="Aura" load_steps=3 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=2]
-
-[resource]
-id = 8
-icon = ExtResource( 2 )
-time = 10.0
-debuff = true
-aura_type = 1
-states_add = 4
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres

@@ -1,28 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=3]
-
-[resource]
-resource_name = "Aspect of Scorpions"
-id = 9
-icon = ExtResource( 2 )
-time = 30.0
-tick = 3.0
-debuff = true
-rank = 1
-aura_type = 1
-aura_group = ExtResource( 3 )
-text_name = "Aspect of Scorpions"
-text_description = "Deals 340 to 380 damage every 3 sec, and increases damage taken by 10% for 30 sec."
-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 )

game/modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres

@@ -1,23 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=3]
-
-[resource]
-resource_name = "Aspect of Wasps"
-id = 10
-icon = ExtResource( 2 )
-time = 21.0
-tick = 1.0
-debuff = true
-rank = 1
-aura_type = 1
-aura_group = ExtResource( 3 )
-text_name = "Aspect of Wasps"
-text_description = "Deals 230 to 270 damage every 3 sec, this damage increases over the duration, for 21 sec."
-damage_enabled = true
-damage_type = 16
-damage_min = 6
-damage_max = 7
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres

@@ -1,32 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=3]
-
-[resource]
-resource_name = "Aspect of Wolves"
-id = 11
-icon = ExtResource( 2 )
-time = 22.0
-tick = 2.0
-debuff = true
-rank = 1
-aura_type = 1
-aura_group = ExtResource( 3 )
-text_name = "Aspect of Wolves"
-text_description = "Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% for 22 sec."
-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 )

game/modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres

@@ -1,23 +0,0 @@
-[gd_resource type="Aura" load_steps=4 format=2]
-
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=3]
-
-[resource]
-resource_name = "Aspect of Bees"
-id = 12
-icon = ExtResource( 2 )
-time = 21.0
-tick = 3.0
-debuff = true
-rank = 1
-aura_type = 1
-aura_group = ExtResource( 3 )
-text_name = "Aspect of Bees"
-text_description = "Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage."
-damage_enabled = true
-damage_type = 16
-damage_min = 60
-damage_max = 80
-script = ExtResource( 1 )

game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres

@@ -0,0 +1,14 @@
+[gd_resource type="EntityData" load_steps=4 format=2]
+
+[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=1]
+[ext_resource path="res://modules/species/Human/species_human.tres" type="EntitySpeciesData" id=2]
+[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=3]
+
+[resource]
+resource_name = "Naturalist Trainer"
+id = 3
+entity_interaction_type = 4
+text_name = "Naturalist Trainer"
+entity_species_data = ExtResource( 2 )
+entity_class_data = ExtResource( 3 )
+script = ExtResource( 1 )

game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres

@@ -0,0 +1,14 @@
+[gd_resource type="EntityData" load_steps=4 format=2]
+
+[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=1]
+[ext_resource path="res://modules/species/Human/species_human.tres" type="EntitySpeciesData" id=2]
+[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist_vendor.tres" type="EntityClassData" id=3]
+
+[resource]
+resource_name = "Naturalist Vendor"
+id = 3
+entity_interaction_type = 5
+text_name = "Naturalist Vendor"
+entity_species_data = ExtResource( 2 )
+entity_class_data = ExtResource( 3 )
+script = ExtResource( 1 )

game/modules/entity_classes/naturalist/resource_db.tres

@@ -1,34 +1,32 @@
-[gd_resource type="ESSResourceDBStatic" load_steps=40 format=2]
+[gd_resource type="ESSResourceDBStatic" load_steps=39 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]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres" type="Spell" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Spell" id=3]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=4]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=5]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=6]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Spell" id=6]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=7]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Spell" id=7]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres" type="Aura" id=8]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Spell" id=8]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=9]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=10]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Spell" id=10]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=11]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Aura" id=12]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Spell" id=12]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=13]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=14]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/20_root_rank_1.tres" type="Aura" id=15]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Spell" id=15]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres" type="Aura" id=16]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Spell" id=16]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres" type="Aura" id=17]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres" type="Spell" id=17]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres" type="Spell" id=18]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres" type="Spell" id=19]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/28_aspectofwasps.tres" type="Spell" id=20]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres" type="Aura" id=21]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres" type="Spell" id=21]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres" type="Spell" id=22]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=23]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres" type="Aura" id=24]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=25]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/26_rest.tres" type="Spell" id=26]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=27]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=28]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Aura" id=29]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/20_root_rank_1.tres" type="Spell" id=30]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/23_calm_rank_1.tres" type="Spell" id=31]
 [ext_resource path="res://modules/entity_classes/naturalist/spells/25_inner_will.tres" type="Spell" id=32]
@@ -38,10 +36,9 @@
 [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/species/Human/species_human.tres" type="EntitySpeciesData" id=39]
+[ext_resource path="res://modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres" type="EntityData" id=50]
+[ext_resource path="res://modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres" type="EntityData" id=51]
 
 [resource]
-entity_datas = [ ExtResource( 36 ), ExtResource( 35 ) ]
+entity_datas = [ ExtResource( 36 ), ExtResource( 35 ), ExtResource( 50 ), ExtResource( 51 ) ]
-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 ) ]
+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 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 3 ), ExtResource( 10 ), ExtResource( 12 ), ExtResource( 17 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 2 ), ExtResource( 8 ), ExtResource( 21 ) ]
-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 ) ]
-entity_species_datas = [ ExtResource( 39 ) ]

game/modules/entity_classes/naturalist/specs/aspects.tres

@@ -0,0 +1,16 @@
+[gd_resource type="CharacterSpec" load_steps=4 format=2]
+
+[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Spell" id=4]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Spell" id=5]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Spell" id=6]
+
+[resource]
+resource_name = "Aspects"
+text_name = "Aspects"
+num_rows = 2
+row_0/size = 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 = 0

game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" 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"
+rank = 1
+icon = ExtResource( 2 )
+text_name = "Improved Asperct of Scorpions"
+aura_type = 6
+aura_hide = true
+aura_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

game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" 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"
+rank = 2
+icon = ExtResource( 2 )
+text_name = "Improved Asperct of Scorpions"
+aura_type = 6
+aura_hide = true
+aura_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

game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" 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"
+rank = 3
+icon = ExtResource( 2 )
+text_name = "Improved Asperct of Scorpions"
+aura_type = 6
+aura_hide = true
+aura_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

game/modules/entity_classes/naturalist/specs/melee.tres

@@ -0,0 +1,19 @@
+[gd_resource type="CharacterSpec" load_steps=6 format=2]
+
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Spell" id=1]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Spell" id=2]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Spell" id=3]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres" type="Spell" id=4]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Spell" id=5]
+
+[resource]
+resource_name = "Melee"
+text_name = "Melee"
+num_rows = 1
+row_0/size = 1
+row_0/column_0/size = 5
+row_0/column_0/entry_0 = ExtResource( 1 )
+row_0/column_0/entry_1 = ExtResource( 5 )
+row_0/column_0/entry_2 = ExtResource( 4 )
+row_0/column_0/entry_3 = ExtResource( 3 )
+row_0/column_0/entry_4 = ExtResource( 2 )

game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" load_steps=3 format=2]
+
+[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
+[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
+
+[resource]
+resource_name = "Improved Strike"
+rank = 1
+icon = ExtResource( 2 )
+text_name = "Improved Strike"
+aura_type = 6
+aura_hide = true
+aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+script = ExtResource( 1 )
+spell_name = "Strike"
+mod_value = 40.0

game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" load_steps=3 format=2]
+
+[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
+[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
+
+[resource]
+resource_name = "Improved Strike"
+rank = 1
+icon = ExtResource( 2 )
+text_name = "Improved Strike"
+aura_type = 6
+aura_hide = true
+aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+script = ExtResource( 1 )
+spell_name = "Strike"
+mod_value = 200.0

game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" load_steps=3 format=2]
+
+[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
+[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
+
+[resource]
+resource_name = "Improved Strike"
+rank = 1
+icon = ExtResource( 2 )
+text_name = "Improved Strike"
+aura_type = 6
+aura_hide = true
+aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+script = ExtResource( 1 )
+spell_name = "Strike"
+mod_value = 60.0

game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" load_steps=3 format=2]
+
+[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
+[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
+
+[resource]
+resource_name = "Improved Strike"
+rank = 1
+icon = ExtResource( 2 )
+text_name = "Improved Strike"
+aura_type = 6
+aura_hide = true
+aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+script = ExtResource( 1 )
+spell_name = "Strike"
+mod_value = 80.0

game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" load_steps=3 format=2]
+
+[ext_resource path="res://scripts/auras/SpellDamageModAura.gd" type="Script" id=1]
+[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
+
+[resource]
+resource_name = "Improved Strike"
+rank = 1
+icon = ExtResource( 2 )
+text_name = "Improved Strike"
+aura_type = 6
+aura_hide = true
+aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+script = ExtResource( 1 )
+spell_name = "Strike"
+mod_value = 100.0

game/modules/entity_classes/naturalist/specs/nature.tres

@@ -0,0 +1,15 @@
+[gd_resource type="CharacterSpec" load_steps=4 format=2]
+
+[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Spell" id=1]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres" type="Spell" id=2]
+[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres" type="Spell" id=3]
+
+[resource]
+resource_name = "Nature"
+text_name = "Nature"
+num_rows = 1
+row_0/size = 1
+row_0/column_0/size = 3
+row_0/column_0/entry_0 = ExtResource( 2 )
+row_0/column_0/entry_1 = ExtResource( 3 )
+row_0/column_0/entry_2 = ExtResource( 1 )

game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" load_steps=3 format=2]
+
+[ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=1]
+[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2]
+
+[resource]
+resource_name = "Improved Regrow"
+rank = 1
+icon = ExtResource( 1 )
+text_name = "Improved Regrow"
+aura_type = 6
+aura_hide = true
+aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+script = ExtResource( 2 )
+spell_name = "Regrow"
+reduction_value = 0.16

game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" load_steps=3 format=2]
+
+[ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=1]
+[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2]
+
+[resource]
+resource_name = "Improved Regrow"
+rank = 2
+icon = ExtResource( 1 )
+text_name = "Improved Regrow"
+aura_type = 6
+aura_hide = true
+aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+script = ExtResource( 2 )
+spell_name = "Regrow"
+reduction_value = 0.33

game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres

@@ -0,0 +1,16 @@
+[gd_resource type="Spell" load_steps=3 format=2]
+
+[ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=1]
+[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2]
+
+[resource]
+resource_name = "Improved Regrow"
+rank = 3
+icon = ExtResource( 1 )
+text_name = "Improved Regrow"
+aura_type = 6
+aura_hide = true
+aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+script = ExtResource( 2 )
+spell_name = "Regrow"
+reduction_value = 0.5

game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres

@@ -1,13 +1,13 @@
 [gd_resource type="Spell" load_steps=7 format=2]
 
 [ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Aura" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=3]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=4]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=5]
+[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=6]
 
 [sub_resource type="EntityResourceCostDataResource" id=1]
-cost = 100
+cost = 34
 entity_resource_data = ExtResource( 1 )
 
 [resource]
@@ -17,16 +17,24 @@ spell_type = 8
 rank = 1
 icon = ExtResource( 5 )
 visual_spell_effects = ExtResource( 3 )
-target_aura_applys = [ ExtResource( 2 ) ]
 text_name = "Aspect of Scorpions"
 text_description = "Range: 26m.
 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
 resource_cost = SubResource( 1 )
+aura_time = 30.0
+aura_tick = 3.0
+aura_debuff = true
+aura_group = ExtResource( 6 )
+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
+aura_damage_min = 23
+aura_damage_max = 26
 script = ExtResource( 4 )

game/modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres

@@ -1,15 +1,15 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres" type="Aura" id=1]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3]
+[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=4]
 
 [resource]
 resource_name = "Aspect of Wasps"
 spell_type = 8
-rank = 1
+level = 2
+rank = 10
 icon = ExtResource( 3 )
-target_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Aspect of Wasps"
 text_description = "Range: 26m.
 Instant.
@@ -17,4 +17,14 @@ Deals 230 to 270 damage every 3 sec, this damage increases over the duration, fo
 range_range = 26.0
 aoe_targetType = 541
 aoe_colliderType = 541
+aura_time = 21.0
+aura_tick = 1.0
+aura_debuff = true
+aura_type = 1
+aura_group = ExtResource( 4 )
+aura_text_description = "Deals 230 to 270 damage every 3 sec, this damage increases over the duration, for 21 sec."
+aura_damage_enabled = true
+aura_damage_type = 16
+aura_damage_min = 280
+aura_damage_max = 300
 script = ExtResource( 2 )

game/modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres

@@ -2,20 +2,30 @@
 
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/icons/Naturalist/AspectOfScorpions.png" type="Texture" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=4]
 
 [resource]
 resource_name = "Aspect of Wolves"
 id = 2
 spell_type = 8
+level = 3
 rank = 1
 icon = ExtResource( 2 )
 needs_target = true
-target_aura_applys = [ ExtResource( 3 ) ]
 text_name = "Aspect of Wolves"
 text_description = "Range: 26m.
 Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% for 22 sec."
 range_range = 26.0
 aoe_targetType = 1129071960
 aoe_colliderType = 1058050193
+aura_time = 22.0
+aura_tick = 2.0
+aura_debuff = true
+aura_type = 1
+aura_group = ExtResource( 4 )
+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
+aura_damage_min = 280
+aura_damage_max = 330
 script = ExtResource( 1 )

game/modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres

@@ -1,17 +1,17 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=1]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3]
+[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=4]
 
 [resource]
 resource_name = "Aspect of Bees"
 id = 3
 spell_type = 8
+level = 4
 rank = 1
 icon = ExtResource( 3 )
 needs_target = true
-target_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Aspect of Bees"
 text_description = "Range: 26m.
 Instant.
@@ -21,4 +21,14 @@ cooldown_cooldown = 21.0
 range_range = 26.0
 aoe_targetType = -1910718371
 aoe_colliderType = -298046312
+aura_time = 21.0
+aura_tick = 3.0
+aura_debuff = true
+aura_type = 1
+aura_group = ExtResource( 4 )
+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
+aura_damage_min = 420
+aura_damage_max = 440
 script = ExtResource( 2 )

game/modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres

@@ -36,4 +36,11 @@ damage_min = 130
 damage_max = 150
 aoe_targetType = -1910718371
 aoe_colliderType = 1065353216
+aura_time = 30.0
+aura_tick = 3.0
+aura_type = 1
+aura_text_description = "Heals you for 400 to 450 every 3 sec for 30 sec."
+aura_heal_enabled = true
+aura_heal_min = 400
+aura_heal_max = 450
 script = ExtResource( 3 )

game/modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres

@@ -1,6 +1,5 @@
-[gd_resource type="Spell" load_steps=4 format=2]
+[gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres" type="Aura" id=1]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/rejuvenation.tres" type="Texture" id=3]
 
@@ -12,7 +11,6 @@ target_type = 2
 target_relation_type = 4
 rank = 1
 icon = ExtResource( 3 )
-caster_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Rejuvenation"
 text_description = "Instant.
 Heals you for 400 to 450 every 3 sec for 30 sec."

game/modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres

@@ -1,6 +1,5 @@
-[gd_resource type="Spell" load_steps=4 format=2]
+[gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=1]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/close_wounds.tres" type="Texture" id=3]
 
@@ -11,11 +10,17 @@ spell_type = 8
 target_type = 2
 rank = 1
 icon = ExtResource( 3 )
-caster_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Close Wounds"
 text_description = "Casttime: 2 sec.
 Cooldown: %%cooldown_cooldown sec
 Heals you for 720 to 780 every 3 sec for 21 sec."
 cast_cast_time = 1.3
 aoe_colliderType = -2147479552
+aura_time = 21.0
+aura_tick = 3.0
+aura_type = 1
+aura_text_description = "Heals you for 720 to 780 every 3 sec for 21 sec."
+aura_heal_enabled = true
+aura_heal_min = 720
+aura_heal_max = 780
 script = ExtResource( 2 )

game/modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres

@@ -1,6 +1,5 @@
-[gd_resource type="Spell" load_steps=4 format=2]
+[gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Aura" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/ironbark.tres" type="Texture" id=2]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=3]
 
@@ -12,7 +11,6 @@ target_type = 480
 target_relation_type = 914787760
 rank = 1
 icon = ExtResource( 2 )
-caster_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Ironbark"
 text_description = "Instant.
 Cooldown: {2}
@@ -20,4 +18,7 @@ Reduces damage taken by 70%. This spell is not on the global cooldown."
 cooldown_cooldown = 60.0
 aoe_targetType = -1910718371
 aoe_colliderType = -298046312
+aura_time = 6.0
+aura_type = 1
+aura_text_description = "Reduces damage taken by 70%. This spell is not on the global cooldown."
 script = ExtResource( 3 )

game/modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres

@@ -1,7 +1,6 @@
-[gd_resource type="Spell" load_steps=4 format=2]
+[gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=1]
+[ext_resource path="res://scripts/auras/SpeedModAura.gd" type="Script" id=2]
-[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/natures_swiftness.tres" type="Texture" id=3]
 
 [resource]
@@ -9,15 +8,20 @@ resource_name = "Nature's Swiftness"
 id = 8
 spell_type = 8
 target_type = 520
-target_relation_type = 393653346
+target_relation_type = 1
 rank = 1
 icon = ExtResource( 3 )
-caster_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Nature's Swiftness"
 text_description = "Instant.
 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
+cooldown_global_cooldown_enabled = false
 aoe_targetType = 520
 aoe_colliderType = 186459648
+aura_time = 10.0
+aura_type = 1
+aura_text_description = "Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown."
 script = ExtResource( 2 )
+does_stack = true
+mod_speed = 40.0

game/modules/entity_classes/naturalist/spells/20_root_rank_1.tres

@@ -1,6 +1,5 @@
-[gd_resource type="Spell" load_steps=4 format=2]
+[gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://modules/entity_classes/naturalist/auras/20_root_rank_1.tres" type="Aura" id=1]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=3]
 
@@ -10,7 +9,6 @@ id = 10
 spell_type = 8
 rank = 1
 icon = ExtResource( 3 )
-target_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Root"
 text_description = "Range: 26m.
 Casttime: 1.5 sec.
@@ -19,4 +17,8 @@ Roots the target for 8 sec."
 cast_cast_time = 1.4
 aoe_targetType = 8
 aoe_colliderType = 537722880
+aura_time = 10.0
+aura_debuff = true
+aura_type = 1
+aura_states_add = 4
 script = ExtResource( 2 )

game/modules/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres

@@ -1,7 +1,8 @@
-[gd_resource type="Spell" load_steps=3 format=2]
+[gd_resource type="Spell" load_steps=4 format=2]
 
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/strength_of_nature.tres" type="Texture" id=2]
+[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=3]
 
 [resource]
 resource_name = "Strength of Nature"
@@ -21,4 +22,14 @@ heal_min = 6700
 heal_max = 7000
 aoe_targetType = 5
 aoe_colliderType = 7602273
+aura_time = 30.0
+aura_tick = 3.0
+aura_debuff = true
+aura_type = 1
+aura_group = ExtResource( 3 )
+aura_text_description = "Deals 340 to 380 damage every 3 sec, and increases damage taken by 10% for 30 sec."
+aura_damage_enabled = true
+aura_damage_type = 8
+aura_damage_min = 10
+aura_damage_max = 20
 script = ExtResource( 1 )

game/modules/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres

@@ -1,7 +1,8 @@
-[gd_resource type="Spell" load_steps=3 format=2]
+[gd_resource type="Spell" load_steps=4 format=2]
 
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/shield_of_barbs.tres" type="Texture" id=2]
+[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=3]
 
 [resource]
 resource_name = "Shield of Barbs"
@@ -18,4 +19,14 @@ Absorbs 4200 to 4400 damage, also deals 340 to 380 damage to any attacker, for 3
 cooldown_cooldown = 45.0
 aoe_targetType = 5
 aoe_colliderType = 7929968
+aura_time = 21.0
+aura_tick = 1.0
+aura_debuff = true
+aura_type = 1
+aura_group = ExtResource( 3 )
+aura_text_description = "Deals 230 to 270 damage every 3 sec, this damage increases over the duration, for 21 sec."
+aura_damage_enabled = true
+aura_damage_type = 16
+aura_damage_min = 6
+aura_damage_max = 7
 script = ExtResource( 1 )

game/modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres

@@ -1,8 +1,7 @@
-[gd_resource type="Spell" load_steps=5 format=2]
+[gd_resource type="Spell" load_steps=4 format=2]
 
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=1]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres" type="Aura" id=3]
 [ext_resource path="res://modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=4]
 
 [resource]
@@ -12,7 +11,6 @@ spell_type = 8
 rank = 1
 icon = ExtResource( 1 )
 visual_spell_effects = ExtResource( 4 )
-target_aura_applys = [ ExtResource( 3 ) ]
 text_name = "Aspect of Scorpions"
 text_description = "Range: 26m.
 Casttime: {3}.

game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres

@@ -1,7 +1,6 @@
-[gd_resource type="Spell" load_steps=4 format=2]
+[gd_resource type="Spell" load_steps=3 format=2]
 
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres" type="Aura" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3]
 
 [resource]
@@ -10,7 +9,6 @@ id = 18
 spell_type = 8
 rank = 1
 icon = ExtResource( 3 )
-target_aura_applys = [ ExtResource( 2 ) ]
 text_name = "Aspect of Wasps"
 text_description = "Range: 26m.
 Instant.

game/modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres

@@ -1,8 +1,8 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres" type="Aura" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=3]
+[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=4]
 
 [resource]
 resource_name = "Aspect of Wolves"
@@ -11,11 +11,20 @@ spell_type = 8
 rank = 1
 icon = ExtResource( 3 )
 needs_target = true
-target_aura_applys = [ ExtResource( 2 ) ]
 text_name = "Aspect of Wolves"
 text_description = "Range: 26m.
 Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% for 22 sec."
 range_range = 26.0
 aoe_targetType = 1129071960
 aoe_colliderType = 1058050193
+aura_time = 22.0
+aura_tick = 2.0
+aura_debuff = true
+aura_type = 1
+aura_group = ExtResource( 4 )
+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
+aura_damage_min = 10
+aura_damage_max = 12
 script = ExtResource( 1 )

game/modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres

@@ -1,8 +1,8 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
-[ext_resource path="res://modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres" type="Aura" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3]
+[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=4]
 
 [resource]
 resource_name = "Aspect of Bees"
@@ -12,7 +12,6 @@ level = 10
 rank = 1
 icon = ExtResource( 3 )
 needs_target = true
-target_aura_applys = [ ExtResource( 2 ) ]
 text_name = "Aspect of Bees"
 text_description = "Range: 26m.
 Instant.
@@ -22,4 +21,14 @@ cooldown_cooldown = 21.0
 range_range = 26.0
 aoe_targetType = -1910718371
 aoe_colliderType = -298046312
+aura_time = 21.0
+aura_tick = 3.0
+aura_debuff = true
+aura_type = 1
+aura_group = ExtResource( 4 )
+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
+aura_damage_min = 60
+aura_damage_max = 80
 script = ExtResource( 1 )

game/modules/entity_classes/naturalist/spells/35_strike.tres

@@ -33,8 +33,8 @@ range_range = 3.0
 cast_cast_time = 1.5
 damage_enabled = true
 damage_type = 1
-damage_min = 19
+damage_min = 29
-damage_max = 25
+damage_max = 34
 damage_scale_stat = 41
 damage_scale_coeff = 1.0
 aoe_targetType = -1910718371

game/modules/entity_classes/naturalist/spells/36_regrow.tres

@@ -5,7 +5,7 @@
 [ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=3]
 
 [sub_resource type="EntityResourceCostDataResource" id=1]
-cost = 100
+cost = 90
 entity_resource_data = ExtResource( 1 )
 
 [resource]
@@ -22,8 +22,8 @@ range_range = 30.0
 cast_enabled = true
 cast_cast_time = 2.0
 heal_enabled = true
-heal_min = 12
+heal_min = 89
-heal_max = 18
+heal_max = 102
 heal_scale_stat = 14
 heal_scale_coeff = 0.1
 resource_cost = SubResource( 1 )

game/project.godot

@@ -9,11 +9,6 @@
 config_version=4
 
 _global_script_classes=[ {
-"base": "Aura",
-"class": "AuraGD",
-"language": "GDScript",
-"path": "res://scripts/auras/aura_script.gd"
-}, {
 "base": "Reference",
 "class": "BrushPrefabs",
 "language": "GDScript",
@@ -385,7 +380,6 @@ _global_script_classes=[ {
 "path": "res://scripts/game_modules/ui_window_module.gd"
 } ]
 _global_script_class_icons={
-"AuraGD": "",
 "BrushPrefabs": "",
 "CharacterAtlas2D": "",
 "CharacterAtlasEntry2D": "",

game/scripts/ai/EntityAIGD.gd

@@ -51,8 +51,8 @@ func _on_set_owner():
 	for i in range(class_data.get_num_spells()):
 		var spell : Spell = class_data.get_spell(i)
 		
-		if spell.get_num_target_aura_applys() > 0:
+		if spell.spells_cast_on_target_num_get() > 0:
-			var aura : Aura = spell.get_target_aura_apply(0)
+			var aura : Spell = spell.spell_cast_on_target_get(0)
 			
 			if not _data["target_aura_spells"].has(aura.aura_group):
 				_data["target_aura_spells"][aura.aura_group] = []

game/scripts/auras/CastTimeReductionAura.gd

@@ -1,9 +1,9 @@
-extends Aura
+extends SpellGD
 
 export(String) var spell_name : String
 export(float) var reduction_value : float
 
-func _notification_ccast(what : int, data : AuraData, info: SpellCastInfo):
+func _notification_aura_ccasta(what : int, data : AuraData, info: SpellCastInfo):
 	if SpellEnums.NOTIFICATION_CAST_STARTED:
 		if info.spell.get_name() == spell_name:
 			info.cast_time -= reduction_value

game/scripts/auras/SpeedModAura.gd

@@ -1,4 +1,4 @@
-extends "aura_script.gd"
+extends SpellGD
 
 export(bool) var does_stack : bool = true
 export(float) var mod_speed : float = 0

game/scripts/auras/SpellDamageModAura.gd

@@ -1,4 +1,4 @@
-extends "aura_script.gd"
+extends SpellGD
 
 export(String) var spell_name : String
 export(float) var mod_value : float

game/scripts/auras/aura_script.gd

@@ -1,101 +0,0 @@
-extends Aura
-class_name AuraGD
-
-# Copyright (c) 2019-2020 Péter Magyar
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-
-func _sapply(info : AuraApplyInfo) -> void:
-#	var add : bool = false
-	var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id)
-
-	if ad == null:
-#		add = true
-		ad = AuraData.new()
-
-		setup_aura_data(ad, info);
-
-		for i in range(stat_attribute_get_count()):
-			info.target.stat_mod(stat_attribute_get_stat(id), stat_attribute_get_base_mod(i), stat_attribute_get_bonus_mod(i), stat_attribute_get_percent_mod(i))
-
-		if states_add != 0:
-			for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
-				var t : int = 1 << i
-
-				if states_add & t != 0:
-					info.target.adds_state_ref(i)
-
-
-		info.target.aura_adds(ad);
-		
-		apply_mods(ad)
-	else:
-		ad.remaining_time = time
-
-
-func _sdeapply(data : AuraData) -> void:
-	for i in range(stat_attribute_get_count()):
-		data.owner.stat_mod(stat_attribute_get_stat(id), -stat_attribute_get_base_mod(i), -stat_attribute_get_bonus_mod(i), -stat_attribute_get_percent_mod(i))
-
-	if states_add != 0:
-		for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
-			var t : int = 1 << i
-
-			if states_add & t != 0:
-				data.owner.removes_state_ref(i)
-				
-	deapply_mods(data)
-				
-func apply_mods(ad : AuraData):
-	pass
-	
-func deapply_mods(ad : AuraData):
-	pass
-	
-
-func _con_aura_added(data : AuraData) -> void:
-	if data.owner.get_character_skeleton() == null or data.owner.get_character_skeleton().root_attach_point == null:
-		return
-	
-	var bse : SpellEffectVisualBasic = visual_spell_effects as SpellEffectVisualBasic
-		
-	if bse != null:
-		if bse.root_aura_effect != null:
-			if bse.root_aura_effect_time < 0.00001:
-				data.owner.get_character_skeleton().root_attach_point.add_effect(bse.root_aura_effect)
-			else:
-				data.owner.get_character_skeleton().root_attach_point.add_effect_timed(bse.root_aura_effect, bse.root_aura_effect_time)
-
-		if bse.torso_aura_effect != null:
-			if bse.torso_aura_effect_time < 0.00001:
-				data.owner.get_character_skeleton().torso_attach_point.add_effect(bse.torso_aura_effect)
-			else:
-				data.owner.get_character_skeleton().torso_attach_point.add_effect_timed(bse.torso_aura_effect, bse.torso_aura_effect_time)
-
-func _con_aura_removed(data : AuraData) -> void:
-	var bse : SpellEffectVisualBasic = visual_spell_effects as SpellEffectVisualBasic
-		
-	if bse != null:
-		if bse.root_aura_effect != null and bse.root_aura_effect_time < 0.00001:
-			data.owner.get_character_skeleton().root_attach_point.remove_effect(bse.root_aura_effect)
-			
-		if bse.torso_aura_effect != null and bse.torso_aura_effect_time < 0.00001:
-			data.owner.get_character_skeleton().torso_attach_point.remove_effect(bse.torso_aura_effect)
-

game/scripts/entities/EntityClassDataGD.gd

@@ -32,8 +32,8 @@ func _init():
 	for i in range(get_num_spells()):
 		var spell : Spell = get_spell(i)
 		
-		if spell.get_num_target_aura_applys() > 0:
+		if spell.spells_cast_on_target_num_get() > 0:
-			var aura : Aura = spell.get_target_aura_apply(0)
+			var aura : Spell = spell.spell_cast_on_target_get(0)
 			
 			if not _data["target_aura_spells"].has(aura.aura_group):
 				_data["target_aura_spells"][aura.aura_group] = []

game/scripts/spells/amplify_pain.gd

@@ -31,7 +31,7 @@ func _cast_finishs(info : SpellCastInfo) -> void:
 		var ad : AuraData = target.aura_gets(i)
 		
 		if ad.caster == info.caster:
-			var aura : Aura = ad.aura
+			var aura : Spell = ad.aura
 			
 			if aura.aura_type & SpellEnums.AURA_TYPE_MAGIC != 0:
 				ad.time_since_last_tick += ad.tick

game/scripts/spells/gd_spell_script.gd

@@ -152,8 +152,8 @@ func handle_effect(info : SpellCastInfo) -> void:
 #		if not ok:
 #			return
 			
-	elif target_type == SPELL_TARGET_TYPE_SELF:
+	#elif target_type == SPELL_TARGET_TYPE_SELF:
-		info.target = info.caster
+	#	info.target = info.caster
 	
 	if damage_enabled and info.target:
 		var sdi : SpellDamageInfo = SpellDamageInfo.new()
@@ -173,38 +173,56 @@ func handle_effect(info : SpellCastInfo) -> void:
 		
 		handle_spell_heal(shi)
 
-	for aura in caster_aura_applys:
+	if is_aura():
-		var ainfo : AuraApplyInfo = AuraApplyInfo.new()
+		var ad : AuraData = AuraData.new()
 
-		ainfo.caster = info.caster
+		if aura_get_aura_group():
-		ainfo.target = info.caster
+			ad = info.target.aura_gets_with_group_by(info.caster, aura_get_aura_group())
-		ainfo.spell_scale = 1
+		else:
-		ainfo.aura = aura
+			ad = info.target.aura_gets_by(info.caster, id)
 		
-		aura.sapply(ainfo)
+		if ad:
+			info.target.aura_removes_exact(ad)
+
+		var aai : AuraApplyInfo = AuraApplyInfo.new()
+
+		aai.caster_set(info.caster)
+		aai.target_set(info.target)
+		aai.spell_scale_set(info.spell_scale)
+		aai.set_aura(self)
+
+		aura_sapply(aai)
+
+	for spell in spells_cast_on_caster:
+		if !spell:
+			continue
+
+		var sci : SpellCastInfo = SpellCastInfo.new()
+
+		sci.caster = info.caster
+		sci.target = info.caster
+		sci.has_cast_time = spell.cast_enabled
+		sci.cast_time = spell.cast_cast_time
+		sci.spell_scale = info.spell_scale
+		sci.set_spell(spell)
+		
+		spell.cast_starts(sci)
 		
 	if info.target != null:
-		for aura in target_aura_applys:
+		for spell in spells_cast_on_target:
-			var ad : AuraData = null
+			if !spell:
+				continue
 
-			if aura.aura_group != null:
+			var sci : SpellCastInfo = SpellCastInfo.new()
-				ad = info.target.aura_gets_with_group_by(info.caster, aura.aura_group)
-			else:
-				ad = info.target.aura_gets_by(info.caster, aura.get_id())
-			
-			if ad != null:
-				info.target.aura_removes_exact(ad)
-			
-			var ainfo : AuraApplyInfo = AuraApplyInfo.new()
-		
-			ainfo.caster = info.caster
-			ainfo.target = info.target
-			ainfo.spell_scale = 1
-			ainfo.aura = aura
-
-			aura.sapply(ainfo)
 
+			sci.caster = info.caster
+			sci.target = info.target
+			sci.has_cast_time = spell.cast_enabled
+			sci.cast_time = spell.cast_cast_time
+			sci.spell_scale = info.spell_scale
+			sci.set_spell(spell)
 
+			spell.cast_starts(sci)
 		
 func handle_cooldown(info : SpellCastInfo) -> void:
 	if cooldown_cooldown > 0:
@@ -261,3 +279,80 @@ func _notification_ccast(what, info):
 
 func _son_spell_hit(info):
 	handle_effect(info)
+
+func _aura_sapply(info : AuraApplyInfo) -> void:
+#	var add : bool = false
+	var ad : AuraData = info.target.aura_gets_by(info.caster, info.aura.id)
+
+	if ad == null:
+#		add = true
+		ad = AuraData.new()
+
+		setup_aura_data(ad, info);
+
+		for i in range(aura_stat_attribute_get_count()):
+			info.target.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))
+
+		if aura_states_add != 0:
+			for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
+				var t : int = 1 << i
+
+				if aura_states_add & t != 0:
+					info.target.adds_state_ref(i)
+
+		info.target.aura_adds(ad);
+		
+		apply_mods(ad)
+	else:
+		ad.remaining_time = aura_time
+
+
+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))
+
+	if aura_states_add != 0:
+		for i in range(EntityEnums.ENTITY_STATE_TYPE_INDEX_MAX):
+			var t : int = 1 << i
+
+			if aura_states_add & t != 0:
+				data.owner.removes_state_ref(i)
+				
+	deapply_mods(data)
+				
+func apply_mods(ad : AuraData):
+	pass
+	
+func deapply_mods(ad : AuraData):
+	pass
+	
+
+func _con_aura_added(data : AuraData) -> void:
+	if data.owner.get_character_skeleton() == null or data.owner.get_character_skeleton().root_attach_point == null:
+		return
+	
+	var bse : SpellEffectVisualBasic = visual_spell_effects as SpellEffectVisualBasic
+		
+	if bse != null:
+		if bse.root_aura_effect != null:
+			if bse.root_aura_effect_time < 0.00001:
+				data.owner.get_character_skeleton().root_attach_point.add_effect(bse.root_aura_effect)
+			else:
+				data.owner.get_character_skeleton().root_attach_point.add_effect_timed(bse.root_aura_effect, bse.root_aura_effect_time)
+
+		if bse.torso_aura_effect != null:
+			if bse.torso_aura_effect_time < 0.00001:
+				data.owner.get_character_skeleton().torso_attach_point.add_effect(bse.torso_aura_effect)
+			else:
+				data.owner.get_character_skeleton().torso_attach_point.add_effect_timed(bse.torso_aura_effect, bse.torso_aura_effect_time)
+
+func _con_aura_removed(data : AuraData) -> void:
+	var bse : SpellEffectVisualBasic = visual_spell_effects as SpellEffectVisualBasic
+		
+	if bse != null:
+		if bse.root_aura_effect != null and bse.root_aura_effect_time < 0.00001:
+			data.owner.get_character_skeleton().root_attach_point.remove_effect(bse.root_aura_effect)
+			
+		if bse.torso_aura_effect != null and bse.torso_aura_effect_time < 0.00001:
+			data.owner.get_character_skeleton().torso_attach_point.remove_effect(bse.torso_aura_effect)
+

game/ui/auraframe/AuraEntry.gd

@@ -1,6 +1,6 @@
 extends VBoxContainer
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -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:

game/ui/auraframe/AuraFrame.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -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)

game/ui/talents/Spec.gd

@@ -1,6 +1,6 @@
 extends ScrollContainer
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/talents/TalentEntry.gd

@@ -1,6 +1,6 @@
 extends CenterContainer
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -86,7 +86,7 @@ func refresh() -> void:
 	var known_rank_count : int = 0
 	
 	for i in range(_spec.get_num_ranks(_row, culomn)):
-		var a : Aura = _spec.get_talent(_row, culomn, i)
+		var a : Spell = _spec.get_talent(_row, culomn, i)
 		
 		if a == null:
 			break
@@ -105,10 +105,10 @@ func refresh() -> void:
 	
 		_upgrade_button.show()
 	
-	var aura : Aura = _spec.get_talent(_row, culomn, ridx)
+	var aura : Spell = _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)
 		

game/ui/talents/TalentRow.gd

@@ -1,6 +1,6 @@
 extends HBoxContainer
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/talents/TalentWindow.gd

@@ -1,6 +1,6 @@
 extends Control
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/talents/TalentWindow.tscn

@@ -11,6 +11,9 @@ anchor_bottom = 1.0
 mouse_filter = 2
 theme = ExtResource( 1 )
 script = ExtResource( 3 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 spec_scene = ExtResource( 2 )
 spec_switcher_scene = ExtResource( 4 )
 spec_container_path = NodePath("PanelContainer/VBoxContainer/HBoxContainer/PanelContainer2/VBoxContainer/TabContainer2")

game/ui/talents/talent_switcher_button.gd

@@ -1,6 +1,6 @@
 extends Button
 
-# Copyright (c) 2019-2020 Péter Magyar
+# Copyright (c) 2019-2021 Péter Magyar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal

game/ui/theme/ui_theme.tres

@@ -100,7 +100,7 @@ Button/colors/font_color_disabled = Color( 0.9, 0.9, 0.9, 0.2 )
 Button/colors/font_color_hover = Color( 0.941176, 0.941176, 0.941176, 1 )
 Button/colors/font_color_pressed = Color( 1, 1, 1, 1 )
 Button/constants/hseparation = 0
-Button/fonts/font = null
+Button/fonts/font = ExtResource( 6 )
 Button/styles/disabled = ExtResource( 2 )
 Button/styles/focus = ExtResource( 3 )
 Button/styles/hover = ExtResource( 5 )
@@ -113,7 +113,7 @@ CheckBox/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 )
 CheckBox/colors/font_color_pressed = Color( 1, 1, 1, 1 )
 CheckBox/constants/check_vadjust = 0
 CheckBox/constants/hseparation = 4
-CheckBox/fonts/font = null
+CheckBox/fonts/font = ExtResource( 6 )
 CheckBox/icons/checked = ExtResource( 19 )
 CheckBox/icons/radio_checked = ExtResource( 17 )
 CheckBox/icons/radio_unchecked = ExtResource( 16 )
@@ -131,7 +131,7 @@ CheckButton/colors/font_color_hover_pressed = Color( 1, 1, 1, 1 )
 CheckButton/colors/font_color_pressed = Color( 1, 1, 1, 1 )
 CheckButton/constants/check_vadjust = 0
 CheckButton/constants/hseparation = 4
-CheckButton/fonts/font = null
+CheckButton/fonts/font = ExtResource( 6 )
 CheckButton/icons/off = ExtResource( 18 )
 CheckButton/icons/on = ExtResource( 19 )
 CheckButton/styles/disabled = ExtResource( 2 )
@@ -164,7 +164,7 @@ ItemList/constants/hseparation = 4
 ItemList/constants/icon_margin = 4
 ItemList/constants/line_separation = 4
 ItemList/constants/vseparation = 2
-ItemList/fonts/font = null
+ItemList/fonts/font = ExtResource( 6 )
 ItemList/styles/bg = ExtResource( 8 )
 ItemList/styles/bg_focus = ExtResource( 14 )
 ItemList/styles/cursor = null
@@ -178,7 +178,7 @@ LineEdit/colors/font_color = Color( 0.878431, 0.878431, 0.878431, 1 )
 LineEdit/colors/font_color_selected = Color( 0, 0, 0, 1 )
 LineEdit/colors/selection_color = Color( 0.490196, 0.490196, 0.490196, 1 )
 LineEdit/constants/minimum_spaces = 24
-LineEdit/fonts/font = null
+LineEdit/fonts/font = ExtResource( 6 )
 LineEdit/icons/clear = null
 LineEdit/styles/focus = ExtResource( 3 )
 LineEdit/styles/normal = ExtResource( 9 )
@@ -189,7 +189,7 @@ OptionButton/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 )
 OptionButton/colors/font_color_pressed = Color( 1, 1, 1, 1 )
 OptionButton/constants/arrow_margin = 4
 OptionButton/constants/hseparation = 4
-OptionButton/fonts/font = null
+OptionButton/fonts/font = ExtResource( 6 )
 OptionButton/icons/arrow = ExtResource( 20 )
 OptionButton/styles/disabled = ExtResource( 2 )
 OptionButton/styles/focus = ExtResource( 3 )
@@ -204,7 +204,7 @@ PopupMenu/colors/font_color_disabled = Color( 0.4, 0.4, 0.4, 0.8 )
 PopupMenu/colors/font_color_hover = Color( 0.88, 0.88, 0.88, 1 )
 PopupMenu/constants/hseparation = 8
 PopupMenu/constants/vseparation = 8
-PopupMenu/fonts/font = null
+PopupMenu/fonts/font = ExtResource( 6 )
 PopupMenu/icons/checked = null
 PopupMenu/icons/radio_checked = ExtResource( 17 )
 PopupMenu/icons/radio_unchecked = ExtResource( 16 )
@@ -219,7 +219,7 @@ PopupMenu/styles/separator = ExtResource( 15 )
 PopupPanel/styles/panel = ExtResource( 8 )
 ProgressBar/colors/font_color = Color( 0.941176, 0.941176, 0.941176, 1 )
 ProgressBar/colors/font_color_shadow = Color( 0, 0, 0, 1 )
-ProgressBar/fonts/font = null
+ProgressBar/fonts/font = ExtResource( 6 )
 ProgressBar/styles/bg = ExtResource( 11 )
 ProgressBar/styles/fg = ExtResource( 12 )
 TabContainer/colors/font_color_bg = Color( 0.69, 0.69, 0.69, 1 )
@@ -230,7 +230,7 @@ TabContainer/constants/label_valign_bg = 4
 TabContainer/constants/label_valign_fg = 0
 TabContainer/constants/side_margin = 16
 TabContainer/constants/top_margin = 48
-TabContainer/fonts/font = null
+TabContainer/fonts/font = ExtResource( 6 )
 TabContainer/icons/decrement = null
 TabContainer/icons/decrement_highlight = null
 TabContainer/icons/increment = null
@@ -248,7 +248,7 @@ Tabs/constants/hseparation = 8
 Tabs/constants/label_valign_bg = 4
 Tabs/constants/label_valign_fg = 0
 Tabs/constants/top_margin = 48
-Tabs/fonts/font = null
+Tabs/fonts/font = ExtResource( 6 )
 Tabs/icons/close = null
 Tabs/icons/decrement = null
 Tabs/icons/decrement_highlight = null
@@ -290,7 +290,7 @@ TextEdit/constants/completion_lines = 7
 TextEdit/constants/completion_max_width = 50
 TextEdit/constants/completion_scroll_width = 3
 TextEdit/constants/line_spacing = 8
-TextEdit/fonts/font = null
+TextEdit/fonts/font = ExtResource( 6 )
 TextEdit/icons/fold = null
 TextEdit/icons/folded = null
 TextEdit/icons/space = null
@@ -304,7 +304,7 @@ ToolButton/colors/font_color_disabled = Color( 0.9, 0.95, 1, 0.3 )
 ToolButton/colors/font_color_hover = Color( 0.94, 0.94, 0.94, 1 )
 ToolButton/colors/font_color_pressed = Color( 1, 1, 1, 1 )
 ToolButton/constants/hseparation = 3
-ToolButton/fonts/font = null
+ToolButton/fonts/font = ExtResource( 6 )
 ToolButton/styles/disabled = ExtResource( 2 )
 ToolButton/styles/focus = ExtResource( 3 )
 ToolButton/styles/hover = ExtResource( 5 )
@@ -314,7 +314,7 @@ TooltipLabel/colors/font_color = Color( 1, 1, 1, 1 )
 TooltipLabel/colors/font_color_shadow = Color( 0, 0, 0, 0.1 )
 TooltipLabel/constants/shadow_offset_x = 1
 TooltipLabel/constants/shadow_offset_y = 1
-TooltipLabel/fonts/font = null
+TooltipLabel/fonts/font = ExtResource( 6 )
 TooltipPanel/styles/panel = ExtResource( 8 )
 Tree/colors/cursor_color = Color( 0, 0, 0, 1 )
 Tree/colors/custom_button_font_highlight = Color( 0.94, 0.94, 0.94, 1 )
@@ -333,8 +333,8 @@ Tree/constants/item_margin = 24
 Tree/constants/scroll_border = 4
 Tree/constants/scroll_speed = 12
 Tree/constants/vseparation = 8
-Tree/fonts/font = null
+Tree/fonts/font = ExtResource( 6 )
-Tree/fonts/title_button_font = null
+Tree/fonts/title_button_font = ExtResource( 6 )
 Tree/icons/arrow = null
 Tree/icons/arrow_collapsed = null
 Tree/icons/checked = null
@@ -369,7 +369,7 @@ WindowDialog/constants/close_h_ofs = 36
 WindowDialog/constants/close_v_ofs = 36
 WindowDialog/constants/scaleborder_size = 8
 WindowDialog/constants/title_height = 40
-WindowDialog/fonts/title_font = null
+WindowDialog/fonts/title_font = ExtResource( 6 )
 WindowDialog/icons/close = null
 WindowDialog/icons/close_highlight = null
 WindowDialog/styles/panel = ExtResource( 8 )