Started merging auras and spells. As a first step aura's properties got an aura prefix. Updated ESS, and added this prefix to all aura resources.

HEADS

@@ -1 +1 @@
-{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "3337694d687bc682599a3cbbf17f5c00e5c3dabd"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "cfba9403cb150d0a1c802039a5b7a8822a4f4832"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "d4b01890414197a8221c58ac944bcbca7f42f947"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "461c2a80a1e9fb3535203d1465bc9d89438146b3"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "terraman": {"master": "ae53ad5001a720ddb2eb52c46eea65dc2242ac9f"}}
+{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "3337694d687bc682599a3cbbf17f5c00e5c3dabd"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "84450a288937f40b22317b0034988f37531dfc71"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "d4b01890414197a8221c58ac944bcbca7f42f947"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "461c2a80a1e9fb3535203d1465bc9d89438146b3"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "terraman": {"master": "ae53ad5001a720ddb2eb52c46eea65dc2242ac9f"}}

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

@@ -7,16 +7,16 @@
 [resource]
 resource_name = "Aspect of Scorpions"
 icon = ExtResource( 3 )
-time = 30.0
-tick = 3.0
-debuff = true
+aura_time = 30.0
+aura_tick = 3.0
+aura_debuff = true
 rank = 1
-aura_type = 1
+aura_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 = 23
-damage_max = 26
+aura_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
+aura_damage_min = 23
+aura_damage_max = 26
 script = ExtResource( 1 )

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

@@ -8,16 +8,16 @@
 resource_name = "Aspect of Wasps"
 id = 1
 icon = ExtResource( 3 )
-time = 21.0
-tick = 1.0
-debuff = true
+aura_time = 21.0
+aura_tick = 1.0
+aura_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
+aura_text_name = "Aspect of Wasps"
+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( 1 )

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

@@ -8,16 +8,16 @@
 resource_name = "Aspect of Wolves"
 id = 2
 icon = ExtResource( 3 )
-time = 22.0
-tick = 2.0
-debuff = true
+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"
-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
+aura_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
+aura_damage_min = 280
+aura_damage_max = 330
 script = ExtResource( 1 )

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

@@ -8,16 +8,16 @@
 resource_name = "Aspect of Bees"
 id = 3
 icon = ExtResource( 3 )
-time = 21.0
-tick = 3.0
-debuff = true
+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"
-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
+aura_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
+aura_damage_min = 420
+aura_damage_max = 440
 script = ExtResource( 1 )

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

@@ -7,13 +7,13 @@
 resource_name = "Rejuvenation"
 id = 4
 icon = ExtResource( 2 )
-time = 30.0
-tick = 3.0
+aura_time = 30.0
+aura_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
+aura_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
+aura_heal_max = 450
 script = ExtResource( 1 )

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

@@ -7,12 +7,12 @@
 resource_name = "Close Wounds"
 id = 5
 icon = ExtResource( 2 )
-time = 21.0
-tick = 3.0
+aura_time = 21.0
+aura_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
+aura_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
+aura_heal_max = 780
 script = ExtResource( 1 )

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

@@ -7,8 +7,8 @@
 resource_name = "Ironbark"
 id = 6
 icon = ExtResource( 2 )
-time = 6.0
+aura_time = 6.0
 aura_type = 1
-text_name = "Ironbark"
-text_description = "Reduces damage taken by 70%. This spell is not on the global cooldown."
+aura_text_name = "Ironbark"
+aura_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

@@ -8,11 +8,11 @@
 resource_name = "Nature's Swiftness"
 id = 7
 icon = ExtResource( 3 )
-time = 10.0
+aura_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 )
+aura_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 )
 script = ExtResource( 1 )
 does_stack = true
 mod_speed = 40.0

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

@@ -6,8 +6,8 @@
 [resource]
 id = 8
 icon = ExtResource( 2 )
-time = 10.0
-debuff = true
+aura_time = 10.0
+aura_debuff = true
 aura_type = 1
-states_add = 4
+aura_states_add = 4
 script = ExtResource( 1 )

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

@@ -8,16 +8,16 @@
 resource_name = "Aspect of Scorpions"
 id = 9
 icon = ExtResource( 2 )
-time = 30.0
-tick = 3.0
-debuff = true
+aura_time = 30.0
+aura_tick = 3.0
+aura_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
+aura_text_name = "Aspect of Scorpions"
+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/auras/22_aspect_of_wasps.tres

@@ -8,16 +8,16 @@
 resource_name = "Aspect of Wasps"
 id = 10
 icon = ExtResource( 2 )
-time = 21.0
-tick = 1.0
-debuff = true
+aura_time = 21.0
+aura_tick = 1.0
+aura_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
+aura_text_name = "Aspect of Wasps"
+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/auras/23_aspect_of_wolves.tres

@@ -8,16 +8,16 @@
 resource_name = "Aspect of Wolves"
 id = 11
 icon = ExtResource( 2 )
-time = 22.0
-tick = 2.0
-debuff = true
+aura_time = 22.0
+aura_tick = 2.0
+aura_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
+aura_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
+aura_damage_min = 10
+aura_damage_max = 12
 script = ExtResource( 1 )

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

@@ -8,16 +8,16 @@
 resource_name = "Aspect of Bees"
 id = 12
 icon = ExtResource( 2 )
-time = 21.0
-tick = 3.0
-debuff = true
+aura_time = 21.0
+aura_tick = 3.0
+aura_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
+aura_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
+aura_damage_min = 60
+aura_damage_max = 80
 script = ExtResource( 1 )

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

@@ -8,9 +8,9 @@ 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."
+aura_hide = true
+aura_text_name = "Improved Asperct of Scorpions"
+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

@@ -8,9 +8,9 @@ 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."
+aura_hide = true
+aura_text_name = "Improved Asperct of Scorpions"
+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

@@ -8,9 +8,9 @@ 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."
+aura_hide = true
+aura_text_name = "Improved Asperct of Scorpions"
+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/talent_strike_r1.tres

@@ -8,9 +8,9 @@ resource_name = "Improved Strike"
 icon = ExtResource( 2 )
 rank = 1
 aura_type = 6
-hide = true
-text_name = "Improved Strike"
-text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+aura_hide = true
+aura_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"
 mod_value = 40.0

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

@@ -8,9 +8,9 @@ resource_name = "Improved Strike"
 icon = ExtResource( 2 )
 rank = 1
 aura_type = 6
-hide = true
-text_name = "Improved Strike"
-text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+aura_hide = true
+aura_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"
 mod_value = 200.0

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

@@ -8,9 +8,9 @@ resource_name = "Improved Strike"
 icon = ExtResource( 2 )
 rank = 1
 aura_type = 6
-hide = true
-text_name = "Improved Strike"
-text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+aura_hide = true
+aura_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"
 mod_value = 60.0

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

@@ -8,9 +8,9 @@ resource_name = "Improved Strike"
 icon = ExtResource( 2 )
 rank = 1
 aura_type = 6
-hide = true
-text_name = "Improved Strike"
-text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+aura_hide = true
+aura_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"
 mod_value = 80.0

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

@@ -8,9 +8,9 @@ resource_name = "Improved Strike"
 icon = ExtResource( 2 )
 rank = 1
 aura_type = 6
-hide = true
-text_name = "Improved Strike"
-text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+aura_hide = true
+aura_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"
 mod_value = 100.0

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

@@ -8,9 +8,9 @@ resource_name = "Improved Regrow"
 icon = ExtResource( 1 )
 rank = 2
 aura_type = 6
-hide = true
-text_name = "Improved Regrow"
-text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+aura_hide = true
+aura_text_name = "Improved Regrow"
+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

@@ -8,9 +8,9 @@ resource_name = "Improved Regrow"
 icon = ExtResource( 1 )
 rank = 3
 aura_type = 6
-hide = true
-text_name = "Improved Regrow"
-text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+aura_hide = true
+aura_text_name = "Improved Regrow"
+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/specs/talent_regrow_r1.tres

@@ -8,9 +8,9 @@ resource_name = "Improved Regrow"
 icon = ExtResource( 1 )
 rank = 1
 aura_type = 6
-hide = true
-text_name = "Improved Regrow"
-text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds."
+aura_hide = true
+aura_text_name = "Improved Regrow"
+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