Moved Naturalist into into it's own module. Also updated ESS to get a few typo fixes that are needed.

HEADS

@@ -1 +1 @@
-{"engine": {"3.2": "be5a47e75d4b671a48b0a35eb17887ee38d8516c", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "5901fc66d00c2c2be662f064bebaceaca59c4ed4"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}}
+{"engine": {"3.2": "be5a47e75d4b671a48b0a35eb17887ee38d8516c", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "fdcff467f17a8efb725ea71a10182a33e63704e6"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}}

game/data/auras/1_test1.tres

@@ -1,7 +1,7 @@
 [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://data/icons/naturalist/amplify_pain.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
 
 [resource]
 id = 1

game/data/character_specs/1_test.tres

@@ -1,3 +0,0 @@
-[gd_resource type="CharacterSpec" format=2]
-
-[resource]

game/data/entities/1_naturalist.tres

@@ -1,6 +1,6 @@
 [gd_resource type="EntityData" load_steps=5 format=2]
 
-[ext_resource path="res://data/entity_classes/1_naturalist.tres" type="EntityClassData" id=1]
+[ext_resource path="res://data/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=1]
 [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=2]
 [ext_resource path="res://data/species/1_human_female.tres" type="EntitySpeciesData" id=3]
 

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

@@ -1,39 +1,39 @@
 [gd_resource type="EntityClassData" load_steps=73 format=2]
 
-[ext_resource path="res://data/spells/26_rest.tres" type="Spell" id=1]
+[ext_resource path="res://data/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1]
-[ext_resource path="res://data/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=2]
-[ext_resource path="res://data/spells/14_amplify_pain_rank_1.tres" type="Spell" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=3]
-[ext_resource path="res://data/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=4]
+[ext_resource path="res://data/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=4]
-[ext_resource path="res://data/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=5]
+[ext_resource path="res://data/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=5]
-[ext_resource path="res://data/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=6]
+[ext_resource path="res://data/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=6]
-[ext_resource path="res://data/spells/19_uproot_rank_1.tres" type="Spell" id=7]
+[ext_resource path="res://data/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=7]
-[ext_resource path="res://data/spells/16_close_wounds_rank_1.tres" type="Spell" id=8]
+[ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=8]
-[ext_resource path="res://data/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=9]
+[ext_resource path="res://scripts/ai/EntityAIGD.gd" type="Script" id=9]
-[ext_resource path="res://data/spells/15_rejuvenation_rank_1.tres" type="Spell" id=10]
+[ext_resource path="res://data/entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=10]
-[ext_resource path="res://data/spells/17_ironbark_rank_1.tres" type="Spell" id=11]
+[ext_resource path="res://data/entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=11]
-[ext_resource path="res://data/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=12]
+[ext_resource path="res://data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=12]
-[ext_resource path="res://data/spells/20_root_rank_1.tres" type="Spell" id=13]
+[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=13]
-[ext_resource path="res://data/spells/23_calm_rank_1.tres" type="Spell" id=14]
+[ext_resource path="res://data/spells/36_regrow.tres" type="Spell" id=14]
-[ext_resource path="res://data/spells/24_attunement_rank_1.tres" type="Spell" id=15]
+[ext_resource path="res://data/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=15]
-[ext_resource path="res://data/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=16]
+[ext_resource path="res://data/entity_classes/naturalist/spells/26_rest.tres" type="Spell" id=16]
-[ext_resource path="res://data/spells/25_inner_will.tres" type="Spell" id=17]
+[ext_resource path="res://data/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=17]
-[ext_resource path="res://data/auras/1_test1.tres" type="Aura" id=18]
+[ext_resource path="res://data/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=18]
-[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=19]
+[ext_resource path="res://data/entity_classes/naturalist/spells/20_root_rank_1.tres" type="Spell" id=19]
-[ext_resource path="res://scripts/ai/EntityAIGD.gd" type="Script" id=20]
+[ext_resource path="res://data/entity_classes/naturalist/spells/23_calm_rank_1.tres" type="Spell" id=20]
-[ext_resource path="res://data/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=21]
+[ext_resource path="res://data/spells/35_strike.tres" type="Spell" id=21]
-[ext_resource path="res://data/auras/15_close_wounds_rank_1.tres" type="Aura" id=22]
+[ext_resource path="res://data/entity_classes/naturalist/spells/25_inner_will.tres" type="Spell" id=22]
-[ext_resource path="res://data/spells/35_strike.tres" type="Spell" id=23]
+[ext_resource path="res://data/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=23]
-[ext_resource path="res://data/spells/36_regrow.tres" type="Spell" id=24]
+[ext_resource path="res://data/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=24]
-[ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=27]
+[ext_resource path="res://data/auras/1_test1.tres" type="Aura" id=25]
 
 [sub_resource type="EntityAI" id=1]
-script = ExtResource( 20 )
+script = ExtResource( 9 )
 
 [sub_resource type="TalentRowData" id=2]
-Talent_0_0 = ExtResource( 21 )
+Talent_0_0 = ExtResource( 6 )
 
 [sub_resource type="TalentRowData" id=3]
-Talent_2_0 = ExtResource( 22 )
+Talent_2_0 = ExtResource( 4 )
 
 [sub_resource type="CharacterSpec" id=4]
 id = 1
@@ -227,10 +227,10 @@ id = 1
 text_name = "Naturalist"
 stat_data = SubResource( 47 )
 player_resource_type = 2
-entity_resources = [ ExtResource( 27 ) ]
+entity_resources = [ ExtResource( 8 ) ]
 specs = [ SubResource( 4 ) ]
-spells = [ ExtResource( 4 ), ExtResource( 6 ), ExtResource( 16 ), ExtResource( 5 ), ExtResource( 3 ), ExtResource( 10 ), ExtResource( 8 ), ExtResource( 11 ), ExtResource( 9 ), ExtResource( 7 ), ExtResource( 13 ), ExtResource( 2 ), ExtResource( 12 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 17 ), ExtResource( 1 ), ExtResource( 23 ), ExtResource( 24 ) ]
+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( 4 ), ExtResource( 23 ), ExtResource( 24 ) ]
+start_spells = [ ExtResource( 7 ), ExtResource( 21 ), ExtResource( 14 ) ]
-auras = [ ExtResource( 18 ) ]
+auras = [ ExtResource( 25 ) ]
 ais = [ SubResource( 1 ) ]
-script = ExtResource( 19 )
+script = ExtResource( 13 )

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

@@ -1,19 +1,18 @@
 [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://data/icons/naturalist/aspect_of_scorpions.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=2]
-[ext_resource path="res://data/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Scorpions"
-id = 10
+icon = ExtResource( 3 )
-icon = ExtResource( 2 )
 time = 30.0
 tick = 3.0
 debuff = true
 rank = 1
 aura_type = 1
-aura_group = ExtResource( 3 )
+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

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

@@ -1,19 +1,19 @@
 [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://data/icons/naturalist/aspect_of_wasps.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=2]
-[ext_resource path="res://data/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Wasps"
-id = 11
+id = 1
-icon = ExtResource( 2 )
+icon = ExtResource( 3 )
 time = 21.0
 tick = 1.0
 debuff = true
 rank = 10
 aura_type = 1
-aura_group = ExtResource( 3 )
+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

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

@@ -1,19 +1,19 @@
 [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://data/icons/naturalist/aspect_of_wolves.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=2]
-[ext_resource path="res://data/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Wolves"
-id = 12
+id = 2
-icon = ExtResource( 2 )
+icon = ExtResource( 3 )
 time = 22.0
 tick = 2.0
 debuff = true
 rank = 10
 aura_type = 1
-aura_group = ExtResource( 3 )
+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

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

@@ -1,19 +1,19 @@
 [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://data/icons/naturalist/aspect_of_bees.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=2]
-[ext_resource path="res://data/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Bees"
-id = 13
+id = 3
-icon = ExtResource( 2 )
+icon = ExtResource( 3 )
 time = 21.0
 tick = 3.0
 debuff = true
 rank = 10
 aura_type = 1
-aura_group = ExtResource( 3 )
+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

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

@@ -1,11 +1,11 @@
 [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://data/icons/naturalist/rejuvenation.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/rejuvenation.tres" type="Texture" id=2]
 
 [resource]
 resource_name = "Rejuvenation"
-id = 14
+id = 4
 icon = ExtResource( 2 )
 time = 30.0
 tick = 3.0

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

@@ -1,11 +1,11 @@
 [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://data/icons/naturalist/close_wounds.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/close_wounds.tres" type="Texture" id=2]
 
 [resource]
 resource_name = "Close Wounds"
-id = 15
+id = 5
 icon = ExtResource( 2 )
 time = 21.0
 tick = 3.0

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

@@ -1,11 +1,11 @@
 [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://data/icons/naturalist/ironbark.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/ironbark.tres" type="Texture" id=2]
 
 [resource]
 resource_name = "Ironbark"
-id = 16
+id = 6
 icon = ExtResource( 2 )
 time = 6.0
 aura_type = 1

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

@@ -1,21 +1,21 @@
 [gd_resource type="Aura" load_steps=4 format=2]
 
-[ext_resource path="res://data/icons/naturalist/natures_swiftness.tres" type="Texture" id=1]
+[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1]
-[ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/effect_data/natures_swiftness.tres" type="SpellEffectVisual" id=2]
-[ext_resource path="res://data/effect_data/natures_swiftness.tres" type="SpellEffectVisual" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/natures_swiftness.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Nature's Swiftness"
-id = 17
+id = 7
-icon = ExtResource( 1 )
+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( 3 )
+visual_spell_effects = ExtResource( 2 )
 attribute_count = 1
 StatModAttribute_0/stat = 1
 StatModAttribute_0/base_mod = 0.0
 StatModAttribute_0/bonus_mod = 0.0
 StatModAttribute_0/percent_mod = 60.0
-script = ExtResource( 2 )
+script = ExtResource( 1 )

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

@@ -1,10 +1,10 @@
 [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://data/icons/naturalist/root.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/root.tres" type="Texture" id=2]
 
 [resource]
-id = 20
+id = 8
 icon = ExtResource( 2 )
 time = 10.0
 debuff = true

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

@@ -1,12 +1,12 @@
 [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://data/icons/naturalist/aspect_of_scorpions.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2]
-[ext_resource path="res://data/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=3]
 
 [resource]
 resource_name = "Aspect of Scorpions"
-id = 21
+id = 9
 icon = ExtResource( 2 )
 time = 30.0
 tick = 3.0

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

@@ -1,12 +1,12 @@
 [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://data/icons/naturalist/aspect_of_wasps.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=2]
-[ext_resource path="res://data/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=3]
 
 [resource]
 resource_name = "Aspect of Wasps"
-id = 22
+id = 10
 icon = ExtResource( 2 )
 time = 21.0
 tick = 1.0

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

@@ -1,12 +1,12 @@
 [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://data/icons/naturalist/aspect_of_wolves.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=2]
-[ext_resource path="res://data/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=3]
 
 [resource]
 resource_name = "Aspect of Wolves"
-id = 23
+id = 11
 icon = ExtResource( 2 )
 time = 22.0
 tick = 2.0

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

@@ -1,12 +1,12 @@
 [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://data/icons/naturalist/aspect_of_bees.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=2]
-[ext_resource path="res://data/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=3]
 
 [resource]
 resource_name = "Aspect of Bees"
-id = 24
+id = 12
 icon = ExtResource( 2 )
 time = 21.0
 tick = 3.0

game/data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres

@@ -1,13 +1,13 @@
 [gd_resource type="SpellEffectVisual" load_steps=4 format=2]
 
-[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=1]
+[ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1]
-[ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=2]
+[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2]
 [ext_resource path="res://data/spell_effects/nature/AOSCastFinish.tscn" type="PackedScene" id=3]
 
 [resource]
-script = ExtResource( 1 )
+script = ExtResource( 2 )
-spell_cast_effect_left_hand = ExtResource( 2 )
+spell_cast_effect_left_hand = ExtResource( 1 )
-spell_cast_effect_right_hand = ExtResource( 2 )
+spell_cast_effect_right_hand = ExtResource( 1 )
 torso_aura_effect_time = 0.0
 root_aura_effect_time = 0.0
 torso_spell_cast_finish_effect = ExtResource( 3 )

game/data/entity_classes/naturalist/entities/1_naturalist.tres

@@ -1,10 +1,10 @@
 [gd_resource type="EntityData" load_steps=6 format=2]
 
-[ext_resource path="res://data/entity_classes/1_naturalist.tres" type="EntityClassData" id=1]
+[ext_resource path="res://data/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=1]
-[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2]
-[ext_resource path="res://data/crafting/1_test_craft.tres" type="CraftRecipe" id=3]
+[ext_resource path="res://data/species/1_human_female.tres" type="EntitySpeciesData" id=3]
-[ext_resource path="res://data/crafting/2_chest_of_the_infinite_wisdom.tres" type="CraftRecipe" id=4]
+[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=4]
-[ext_resource path="res://data/species/1_human_female.tres" type="EntitySpeciesData" id=5]
+[ext_resource path="res://data/crafting/1_test_craft.tres" type="CraftRecipe" id=5]
 
 [resource]
 resource_name = "Naturalist"
@@ -14,7 +14,7 @@ entity_controller = 1
 is_playable = true
 text_name = "Naturalist"
 bag_size = 24
-entity_species_data = ExtResource( 5 )
+entity_species_data = ExtResource( 3 )
-entity_class_data = ExtResource( 1 )
+entity_class_data = ExtResource( 2 )
-craft_recipes = [ ExtResource( 3 ), ExtResource( 4 ) ]
+craft_recipes = [ ExtResource( 5 ), ExtResource( 1 ) ]
-script = ExtResource( 2 )
+script = ExtResource( 4 )

game/data/entity_classes/naturalist/game_module.tres

@@ -0,0 +1,8 @@
+[gd_resource type="Resource" load_steps=3 format=2]
+
+[ext_resource path="res://scripts/game_modules/GameModule.gd" type="Script" id=1]
+[ext_resource path="res://data/entity_classes/naturalist/resource_db.tres" type="ESSResourceDBStatic" id=2]
+
+[resource]
+script = ExtResource( 1 )
+resource_db = ExtResource( 2 )

game/data/entity_classes/naturalist/icons/aspect_of_scorpions.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-2/enchant-acid-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/aspect_of_wasps.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-2/enchant-blue-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/aspect_of_wolves.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-4/wild-orange-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/attunement.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-4/horror-acid-3.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/calm.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-5/wind-grasp-acid-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/inner_will.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-5/wind-grasp-eerie-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/natures_swiftness.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-3/haste-royal-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/regenerate.tres

@@ -3,5 +3,6 @@
 [ext_resource path="res://data/icons/icons-4/wind-blue-1.png" type="Texture" id=1]
 
 [resource]
+flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/root.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-3/vines-plain-1.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/shield_of_barbs.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-2/protect-eerie-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/strength_of_nature.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-3/lighting-acid-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/icons/uproot.tres

@@ -3,6 +3,5 @@
 [ext_resource path="res://data/icons/icons-3/vines-plain-2.png" type="Texture" id=1]
 
 [resource]
-flags = 4
 atlas = ExtResource( 1 )
 region = Rect2( 0, 0, 16, 16 )

game/data/entity_classes/naturalist/resource_db.tres

@@ -0,0 +1,42 @@
+[gd_resource type="ESSResourceDBStatic" load_steps=36 format=2]
+
+[ext_resource path="res://data/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1]
+[ext_resource path="res://data/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Aura" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=4]
+[ext_resource path="res://data/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=5]
+[ext_resource path="res://data/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=6]
+[ext_resource path="res://data/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=7]
+[ext_resource path="res://data/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres" type="Aura" id=8]
+[ext_resource path="res://data/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=9]
+[ext_resource path="res://data/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=10]
+[ext_resource path="res://data/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=11]
+[ext_resource path="res://data/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Aura" id=12]
+[ext_resource path="res://data/entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=13]
+[ext_resource path="res://data/entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=14]
+[ext_resource path="res://data/entity_classes/naturalist/auras/20_root_rank_1.tres" type="Aura" id=15]
+[ext_resource path="res://data/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres" type="Aura" id=16]
+[ext_resource path="res://data/entity_classes/naturalist/auras/22_aspect_of_wasps.tres" type="Aura" id=17]
+[ext_resource path="res://data/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres" type="Spell" id=18]
+[ext_resource path="res://data/entity_classes/naturalist/spells/29_aspect_of_wolves.tres" type="Spell" id=19]
+[ext_resource path="res://data/entity_classes/naturalist/spells/28_aspectofwasps.tres" type="Spell" id=20]
+[ext_resource path="res://data/entity_classes/naturalist/auras/23_aspect_of_wolves.tres" type="Aura" id=21]
+[ext_resource path="res://data/entity_classes/naturalist/spells/30_aspect_of_bees.tres" type="Spell" id=22]
+[ext_resource path="res://data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=23]
+[ext_resource path="res://data/entity_classes/naturalist/auras/24_aspect_of_bees.tres" type="Aura" id=24]
+[ext_resource path="res://data/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=25]
+[ext_resource path="res://data/entity_classes/naturalist/spells/26_rest.tres" type="Spell" id=26]
+[ext_resource path="res://data/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=27]
+[ext_resource path="res://data/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=28]
+[ext_resource path="res://data/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Aura" id=29]
+[ext_resource path="res://data/entity_classes/naturalist/spells/20_root_rank_1.tres" type="Spell" id=30]
+[ext_resource path="res://data/entity_classes/naturalist/spells/23_calm_rank_1.tres" type="Spell" id=31]
+[ext_resource path="res://data/entity_classes/naturalist/spells/25_inner_will.tres" type="Spell" id=32]
+[ext_resource path="res://data/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=33]
+[ext_resource path="res://data/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=34]
+[ext_resource path="res://data/entity_classes/naturalist/entities/1_naturalist.tres" type="EntityData" id=35]
+
+[resource]
+entity_datas = [ ExtResource( 35 ) ]
+spells = [ ExtResource( 11 ), ExtResource( 5 ), ExtResource( 25 ), ExtResource( 9 ), ExtResource( 23 ), ExtResource( 33 ), ExtResource( 1 ), ExtResource( 13 ), ExtResource( 34 ), ExtResource( 4 ), ExtResource( 30 ), ExtResource( 28 ), ExtResource( 27 ), ExtResource( 31 ), ExtResource( 14 ), ExtResource( 32 ), ExtResource( 26 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 19 ), ExtResource( 22 ) ]
+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 ) ]

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

@@ -1,23 +1,23 @@
 [gd_resource type="Spell" load_steps=7 format=2]
 
-[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
+[ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=1]
-[ext_resource path="res://data/icons/naturalist/aspect_of_scorpions.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Aura" id=2]
-[ext_resource path="res://data/auras/10_aspect_of_scorpions_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=3]
-[ext_resource path="res://data/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=4]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=4]
-[ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=5]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=5]
 
 [sub_resource type="EntityResourceCostData" id=1]
-entity_resource_data = ExtResource( 5 )
+entity_resource_data = ExtResource( 1 )
 cost = 100
 
 [resource]
 resource_name = "Aspect of Scorpions"
-id = 10
+id = 0
 spell_type = 8
 rank = 1
-icon = ExtResource( 2 )
+icon = ExtResource( 5 )
-visual_spell_effects = ExtResource( 4 )
+visual_spell_effects = ExtResource( 3 )
-target_aura_applys = [ ExtResource( 3 ) ]
+target_aura_applys = [ ExtResource( 2 ) ]
 text_name = "Aspect of Scorpions"
 text_description = "Range: 26m.
 Casttime: %%cast_cast_time .
@@ -29,4 +29,4 @@ heal_enabled = true
 heal_min = 123
 heal_max = 333
 resource_cost = SubResource( 1 )
-script = ExtResource( 1 )
+script = ExtResource( 4 )

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

@@ -1,16 +1,15 @@
 [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://data/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres" type="Aura" id=1]
-[ext_resource path="res://data/icons/naturalist/aspect_of_wasps.tres" type="Texture" id=2]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
-[ext_resource path="res://data/auras/11_aspect_of_wasps_rank1.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Wasps"
-id = 11
 spell_type = 8
 rank = 1
-icon = ExtResource( 2 )
+icon = ExtResource( 3 )
-target_aura_applys = [ ExtResource( 3 ) ]
+target_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Aspect of Wasps"
 text_description = "Range: 26m.
 Instant.
@@ -18,4 +17,4 @@ 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
-script = ExtResource( 1 )
+script = ExtResource( 2 )

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

@@ -2,11 +2,11 @@
 
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
 [ext_resource path="res://data/icons/Naturalist/AspectOfScorpions.png" type="Texture" id=2]
-[ext_resource path="res://data/auras/12_aspect_of_wolves_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Aura" id=3]
 
 [resource]
 resource_name = "Aspect of Wolves"
-id = 12
+id = 2
 spell_type = 8
 rank = 1
 icon = ExtResource( 2 )

game/data/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://scripts/spells/gd_spell_script.gd" type="Script" id=1]
+[ext_resource path="res://data/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=1]
-[ext_resource path="res://data/icons/naturalist/aspect_of_bees.tres" type="Texture" id=2]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
-[ext_resource path="res://data/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Bees"
-id = 13
+id = 3
 spell_type = 8
 rank = 1
-icon = ExtResource( 2 )
+icon = ExtResource( 3 )
 needs_target = true
-target_aura_applys = [ ExtResource( 3 ) ]
+target_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Aspect of Bees"
 text_description = "Range: 26m.
 Instant.
@@ -21,4 +21,4 @@ cooldown_cooldown = 21.0
 range_range = 26.0
 aoe_targetType = -1910718371
 aoe_colliderType = -298046312
-script = ExtResource( 1 )
+script = ExtResource( 2 )

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

@@ -1,27 +1,27 @@
 [gd_resource type="Spell" load_steps=7 format=2]
 
-[ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=1]
+[ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1]
-[ext_resource path="res://data/icons/naturalist/amplify_pain.tres" type="Texture" id=2]
+[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2]
-[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=3]
+[ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=3]
-[ext_resource path="res://data/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4]
+[ext_resource path="res://data/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=4]
-[ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5]
+[ext_resource path="res://data/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=5]
 
 [sub_resource type="SpellEffectVisual" id=1]
-script = ExtResource( 3 )
+script = ExtResource( 2 )
-spell_cast_effect_left_hand = ExtResource( 5 )
+spell_cast_effect_left_hand = ExtResource( 1 )
-spell_cast_effect_right_hand = ExtResource( 5 )
+spell_cast_effect_right_hand = ExtResource( 1 )
 torso_aura_effect_time = 0.0
 root_aura_effect_time = 0.0
-torso_spell_cast_finish_effect = ExtResource( 4 )
+torso_spell_cast_finish_effect = ExtResource( 5 )
 torso_spell_cast_finish_effect_time = 0.4
 root_spell_cast_finish_effect_time = 1.0
 
 [resource]
 resource_name = "Amplify Pain"
-id = 14
+id = 4
 spell_type = 8
 level = 10
-icon = ExtResource( 2 )
+icon = ExtResource( 4 )
 needs_target = true
 visual_spell_effects = SubResource( 1 )
 text_name = "Amplify Pain"
@@ -36,4 +36,4 @@ damage_min = 130
 damage_max = 150
 aoe_targetType = -1910718371
 aoe_colliderType = 1065353216
-script = ExtResource( 1 )
+script = ExtResource( 3 )

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

@@ -1,21 +1,21 @@
 [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://data/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres" type="Aura" id=1]
-[ext_resource path="res://data/icons/naturalist/rejuvenation.tres" type="Texture" id=2]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
-[ext_resource path="res://data/auras/14_rejuvenation_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/rejuvenation.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Rejuvenation"
-id = 15
+id = 5
 spell_type = 8
 target_type = 2
 target_relation_type = 4
 rank = 1
-icon = ExtResource( 2 )
+icon = ExtResource( 3 )
-caster_aura_applys = [ 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."
 aoe_targetType = 32758
 aoe_colliderType = -2147479552
-script = ExtResource( 1 )
+script = ExtResource( 2 )

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

@@ -1,21 +1,21 @@
 [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://data/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=1]
-[ext_resource path="res://data/icons/naturalist/close_wounds.tres" type="Texture" id=2]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
-[ext_resource path="res://data/auras/15_close_wounds_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/close_wounds.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Close Wounds"
-id = 16
+id = 6
 spell_type = 8
 target_type = 2
 rank = 1
-icon = ExtResource( 2 )
+icon = ExtResource( 3 )
-caster_aura_applys = [ 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
-script = ExtResource( 1 )
+script = ExtResource( 2 )

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

@@ -1,18 +1,18 @@
 [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://data/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Aura" id=1]
-[ext_resource path="res://data/icons/naturalist/ironbark.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/ironbark.tres" type="Texture" id=2]
-[ext_resource path="res://data/auras/16_ironbark_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=3]
 
 [resource]
 resource_name = "Ironbark"
-id = 17
+id = 7
 spell_type = 8
 target_type = 480
 target_relation_type = 914787760
 rank = 1
 icon = ExtResource( 2 )
-caster_aura_applys = [ ExtResource( 3 ) ]
+caster_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Ironbark"
 text_description = "Instant.
 Cooldown: {2}
@@ -20,4 +20,4 @@ Reduces damage taken by 70%. This spell is not on the global cooldown."
 cooldown_cooldown = 60.0
 aoe_targetType = -1910718371
 aoe_colliderType = -298046312
-script = ExtResource( 1 )
+script = ExtResource( 3 )

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

@@ -1,18 +1,18 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://data/icons/naturalist/natures_swiftness.tres" type="Texture" id=1]
+[ext_resource path="res://data/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=1]
-[ext_resource path="res://data/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=2]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
-[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/natures_swiftness.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Nature's Swiftness"
-id = 18
+id = 8
 spell_type = 8
 target_type = 520
 target_relation_type = 393653346
 rank = 1
-icon = ExtResource( 1 )
+icon = ExtResource( 3 )
-caster_aura_applys = [ ExtResource( 2 ) ]
+caster_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Nature's Swiftness"
 text_description = "Instant.
 Cooldown: %%cooldown_cooldown sec
@@ -20,4 +20,4 @@ Increases your movement speed by 60% for 6 sec. This spell is not on the global
 cooldown_cooldown = 20.0
 aoe_targetType = 520
 aoe_colliderType = 186459648
-script = ExtResource( 3 )
+script = ExtResource( 2 )

game/data/entity_classes/naturalist/spells/19_uproot_rank_1.tres

@@ -1,15 +1,15 @@
 [gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://data/icons/naturalist/uproot.tres" type="Texture" id=1]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
-[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/uproot.tres" type="Texture" id=2]
 
 [resource]
 resource_name = "Uproot"
-id = 19
+id = 9
 spell_type = 8
 target_type = -2147460864
 rank = 1
-icon = ExtResource( 1 )
+icon = ExtResource( 2 )
 text_name = "Uproot"
 text_description = "Instant.
 Cooldown: {2}
@@ -19,4 +19,4 @@ range_range = 15.0
 aoe = true
 aoe_targetType = -572653568
 aoe_colliderType = 537722880
-script = ExtResource( 2 )
+script = ExtResource( 1 )

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

@@ -1,16 +1,16 @@
 [gd_resource type="Spell" load_steps=4 format=2]
 
-[ext_resource path="res://data/icons/naturalist/root.tres" type="Texture" id=1]
+[ext_resource path="res://data/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://data/auras/20_root_rank_1.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/root.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Root"
-id = 20
+id = 10
 spell_type = 8
 rank = 1
-icon = ExtResource( 1 )
+icon = ExtResource( 3 )
-target_aura_applys = [ ExtResource( 3 ) ]
+target_aura_applys = [ ExtResource( 1 ) ]
 text_name = "Root"
 text_description = "Range: 26m.
 Casttime: 1.5 sec.

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

@@ -1,11 +1,11 @@
 [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://data/icons/naturalist/strength_of_nature.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/strength_of_nature.tres" type="Texture" id=2]
 
 [resource]
 resource_name = "Strength of Nature"
-id = 21
+id = 11
 spell_type = 8
 target_type = -2147477248
 target_relation_type = 24

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

@@ -1,11 +1,11 @@
 [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://data/icons/naturalist/shield_of_barbs.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/shield_of_barbs.tres" type="Texture" id=2]
 
 [resource]
 resource_name = "Shield of Barbs"
-id = 22
+id = 12
 spell_type = 8
 target_type = -2147456768
 target_relation_type = 24

game/data/entity_classes/naturalist/spells/23_calm_rank_1.tres

@@ -1,11 +1,11 @@
 [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://data/icons/naturalist/calm.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/calm.tres" type="Texture" id=2]
 
 [resource]
 resource_name = "Calm"
-id = 23
+id = 13
 spell_type = 8
 rank = 1
 icon = ExtResource( 2 )

game/data/entity_classes/naturalist/spells/24_attunement_rank_1.tres

@@ -1,16 +1,16 @@
 [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://data/entity_classes/naturalist/icons/attunement.tres" type="Texture" id=1]
-[ext_resource path="res://data/icons/naturalist/attunement.tres" type="Texture" id=2]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 
 [resource]
 resource_name = "Attunement"
-id = 24
+id = 14
 spell_type = 8
 target_type = -2147448576
 target_relation_type = 24
 rank = 1
-icon = ExtResource( 2 )
+icon = ExtResource( 1 )
 text_name = "Attunement"
 text_description = "Instant.
 Cooldown: {2}
@@ -18,4 +18,4 @@ Increases your spell damage by 30% for 20 sec."
 cooldown_cooldown = 180.0
 aoe_targetType = 2
 aoe_colliderType = 480
-script = ExtResource( 1 )
+script = ExtResource( 2 )

game/data/entity_classes/naturalist/spells/25_inner_will.tres

@@ -1,11 +1,11 @@
 [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://data/icons/naturalist/inner_will.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/inner_will.tres" type="Texture" id=2]
 
 [resource]
 resource_name = "Inner Will"
-id = 25
+id = 15
 spell_type = 1
 target_type = 2
 target_relation_type = -11822355

game/data/entity_classes/naturalist/spells/26_rest.tres

@@ -1,17 +1,17 @@
 [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://data/entity_classes/naturalist/icons/regenerate.tres" type="Texture" id=1]
-[ext_resource path="res://data/icons/naturalist/regenerate.tres" type="Texture" id=2]
+[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 
 [resource]
 resource_name = "Rest"
-id = 26
+id = 16
 spell_type = 1
 target_type = 2
 target_relation_type = 24
-icon = ExtResource( 2 )
+icon = ExtResource( 1 )
 text_name = "Rest"
 text_description = "Rest for 30 seconds, greatly increasing your regeneration."
 aoe_targetType = 5
 aoe_colliderType = 1065353216
-script = ExtResource( 1 )
+script = ExtResource( 2 )

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

@@ -1,13 +1,13 @@
 [gd_resource type="Spell" load_steps=5 format=2]
 
-[ext_resource path="res://data/icons/naturalist/aspect_of_scorpions.tres" type="Texture" id=1]
+[ext_resource path="res://data/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://data/auras/21_aspect_of_scorpions.tres" type="Aura" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres" type="Aura" id=3]
-[ext_resource path="res://data/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=4]
+[ext_resource path="res://data/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=4]
 
 [resource]
 resource_name = "Aspect of Scorpions"
-id = 27
+id = 17
 spell_type = 8
 rank = 1
 icon = ExtResource( 1 )

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

@@ -1,12 +1,12 @@
 [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://data/auras/22_aspect_of_wasps.tres" type="Aura" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/auras/22_aspect_of_wasps.tres" type="Aura" id=2]
-[ext_resource path="res://data/icons/naturalist/aspect_of_wasps.tres" type="Texture" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Wasps"
-id = 28
+id = 18
 spell_type = 8
 rank = 1
 icon = ExtResource( 3 )

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

@@ -1,12 +1,12 @@
 [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://data/auras/23_aspect_of_wolves.tres" type="Aura" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/auras/23_aspect_of_wolves.tres" type="Aura" id=2]
-[ext_resource path="res://data/icons/naturalist/aspect_of_wolves.tres" type="Texture" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Wolves"
-id = 29
+id = 19
 spell_type = 8
 rank = 1
 icon = ExtResource( 3 )

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

@@ -1,12 +1,12 @@
 [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://data/auras/24_aspect_of_bees.tres" type="Aura" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/auras/24_aspect_of_bees.tres" type="Aura" id=2]
-[ext_resource path="res://data/icons/naturalist/aspect_of_bees.tres" type="Texture" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3]
 
 [resource]
 resource_name = "Aspect of Bees"
-id = 30
+id = 20
 spell_type = 8
 level = 10
 rank = 1

game/data/item_templates/2_test.tres

@@ -2,7 +2,7 @@
 
 [ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=1]
 [ext_resource path="res://data/icons/3_iron_bar.tres" type="Texture" id=2]
-[ext_resource path="res://data/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=3]
+[ext_resource path="res://data/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=3]
 
 [resource]
 resource_name = "Iron Bar"

game/data/item_templates/3_chest_of_the_infinite_wisdom.tres

@@ -3,12 +3,11 @@
 [ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=1]
 [ext_resource path="res://data/item_visuals/1_chest_of_the_infinite_wisdom.tres" type="ItemVisual" id=2]
 [ext_resource path="res://data/icons/4_chest_of_the_infinite_wisdom.tres" type="Texture" id=3]
-[ext_resource path="res://data/spells/14_amplify_pain_rank_1.tres" type="Spell" id=4]
+[ext_resource path="res://data/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=4]
 
 [resource]
 resource_name = "Chest of the Infinite Wisdom"
 id = 3
-text_name = "Chest of the Infinite Wisdom"
 item_type = 1
 rarity = 6
 armor_type = 1
@@ -16,6 +15,7 @@ equip_slot = 3
 item_visual = ExtResource( 2 )
 icon = ExtResource( 3 )
 use_spell = ExtResource( 4 )
+text_name = "Chest of the Infinite Wisdom"
 item_stat_modifier_count = 2
 Modifiers_0/stat_id = 8
 Modifiers_0/min_base_mod = 1000.0

game/data/spells/1_test_spell.tres

@@ -1,7 +1,8 @@
 [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://data/icons/naturalist/test.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/test.tres" type="Texture" id=2]
+
 
 [resource]
 resource_name = "adadadadadad"

game/data/spells/2_test_cast_spell.tres

@@ -1,8 +1,9 @@
 [gd_resource type="Spell" load_steps=3 format=2]
 
-[ext_resource path="res://data/icons/naturalist/natures_swiftness.tres" type="Texture" id=1]
+[ext_resource path="res://data/entity_classes/naturalist/icons/natures_swiftness.tres" type="Texture" id=1]
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 
+
 [resource]
 id = 2
 spell_type = 16

game/data/spells/31_overload.tres

@@ -1,11 +1,12 @@
 [gd_resource type="Spell" load_steps=7 format=2]
 
-[ext_resource path="res://data/icons/naturalist/amplify_pain.tres" type="Texture" id=1]
+[ext_resource path="res://data/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=1]
 [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2]
 [ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=3]
 [ext_resource path="res://data/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4]
 [ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5]
 
+
 [sub_resource type="SpellEffectVisual" id=1]
 script = ExtResource( 2 )
 spell_cast_effect_left_hand = ExtResource( 5 )

game/data/spells/35_strike.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Spell" load_steps=7 format=2]
 
 [ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=1]
-[ext_resource path="res://data/icons/naturalist/amplify_pain.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2]
 [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=3]
 [ext_resource path="res://data/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4]
 [ext_resource path="res://data/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5]

game/data/spells/36_regrow.tres

@@ -1,7 +1,7 @@
 [gd_resource type="Spell" load_steps=5 format=2]
 
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
-[ext_resource path="res://data/icons/naturalist/root.tres" type="Texture" id=2]
+[ext_resource path="res://data/entity_classes/naturalist/icons/root.tres" type="Texture" id=2]
 [ext_resource path="res://data/entity_resources/1_mana_resource.tres" type="EntityResourceData" id=3]
 
 [sub_resource type="EntityResourceCostData" id=1]

game/scripts/game_modules/GameModule.gd

@@ -10,3 +10,7 @@ func load_module():
 		ESS.resource_db.add_entity_resource_db(resource_db)
 		
 #		var r : ESSResourceDB = ESS.resource_db
+#
+#		for s in r.get_spells():
+#			print(s.resource_name)
+#			print(s.get_id())