From ae3558d270f3c39371e3364e248b1622bfe6d44e Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 12 Feb 2022 19:26:05 +0100 Subject: [PATCH] Moved the entity classes folder. --- .../addons/color-palette/icons/Add.svg.import | 1 + .../color-palette/icons/Filesystem.svg.import | 1 + .../color-palette/icons/Override.svg.import | 1 + .../color-palette/icons/Reload.svg.import | 1 + .../FlexGridContainerIcon.png.import | 1 + .../elementalist/2_elementalist.tres | 19 ++++++++ .../character_specs/2_elementalist_fire.tres | 0 .../character_specs/3_elementalist_water.tres | 0 .../character_specs/4_elementalist_ice.tres | 0 .../elementalist/spells/31_overload.tres | 6 +-- .../elementalist/spells/32_heat.tres | 0 .../elementalist/spells/33_normal.tres | 0 .../elementalist/spells/34_cold.tres | 0 .../naturalist/1_naturalist.tres | 43 +++++++++++++++++ .../naturalist/1_naturalist_vendor.tres | 16 +++---- .../aura_groups/1_aspect_of_scorpions.tres | 0 .../aura_groups/2_aspect_of_wasps.tres | 0 .../aura_groups/3_aspect_of_wolves.tres | 0 .../aura_groups/4_aspect_of_bees.tres | 0 .../effect_data/aspect_of_scorpions.tres | 15 ++++++ .../effect_data/natures_swiftness.tres | 2 +- .../naturalist/entities/1_naturalist.tres | 2 +- .../naturalist/entities/2_naturalist_mob.tres | 2 +- .../entities/3_naturalist_trainer.tres | 12 ++--- .../entities/4_naturalist_vendor.tres | 12 ++--- .../naturalist/game_module.tres | 2 +- .../naturalist/icons/amplify_pain.tres | 1 - .../naturalist/icons/aspect_of_bees.tres | 1 - .../naturalist/icons/aspect_of_scorpions.tres | 1 - .../naturalist/icons/aspect_of_wasps.tres | 1 - .../naturalist/icons/aspect_of_wolves.tres | 0 .../naturalist/icons/attunement.tres | 1 - .../entity_classes/naturalist/icons/calm.tres | 1 - .../naturalist/icons/close_wounds.tres | 1 - .../naturalist/icons/first_aid.tres | 0 .../naturalist/icons/inner_will.tres | 1 - .../naturalist/icons/ironbark.tres | 1 - .../naturalist/icons/natures_swiftness.tres | 1 - .../naturalist/icons/regenerate.tres | 1 - .../naturalist/icons/rejuvenation.tres | 1 - .../entity_classes/naturalist/icons/root.tres | 1 - .../naturalist/icons/shield_of_barbs.tres | 1 - .../naturalist/icons/strength_of_nature.tres | 1 - .../entity_classes/naturalist/icons/test.tres | 0 .../naturalist/icons/uproot.tres | 1 - .../naturalist/resource_db.tres | 44 ++++++++++++++++++ .../naturalist/specs/aspects.tres | 16 +++++++ .../talent_aspect_of_scorpions_r1.tres | 8 ++-- .../talent_aspect_of_scorpions_r2.tres | 8 ++-- .../talent_aspect_of_scorpions_r3.tres | 8 ++-- .../naturalist/specs/melee.tres | 19 ++++++++ .../specs/melee/talent_strike_r1.tres | 2 +- .../specs/melee/talent_strike_r2.tres | 2 +- .../specs/melee/talent_strike_r3.tres | 2 +- .../specs/melee/talent_strike_r4.tres | 2 +- .../specs/melee/talent_strike_r5.tres | 2 +- .../naturalist/specs/nature.tres | 15 ++++++ .../specs/nature/talent_regrow_r1.tres | 2 +- .../specs/nature/talent_regrow_r2.tres | 2 +- .../specs/nature/talent_regrow_r3.tres | 2 +- .../spell_effects/nature/AOSCastFinish.tscn | 4 +- .../spell_effects/nature/AmplifyPain.tscn | 4 +- .../spell_effects/nature/NatureCast.tscn | 16 +++---- .../spell_effects/nature/NautreSwiftness.tscn | 2 +- .../spell_effects/textures/arrows.png | Bin .../spell_effects/textures/arrows.png.import | 6 +-- .../spell_effects/textures/big_glow.png | Bin .../textures/big_glow.png.import | 6 +-- .../spell_effects/textures/main_texture.png | Bin .../textures/main_texture.png.import | 6 +-- .../spell_effects/textures/small_star.png | Bin .../textures/small_star.png.import | 6 +-- .../spell_effects/textures/star.png | Bin .../spell_effects/textures/star.png.import | 6 +-- .../spells/10_aspect_of_scorpions_rank_1.tres | 16 +++---- .../spells/11_aspect_of_wasps_rank_1.tres | 12 ++--- .../spells/12_aspect_of_wolves_rank_1.tres | 4 +- .../spells/13_aspect_of_bees_rank_1.tres | 6 +-- .../spells/14_amplify_pain_rank_1.tres | 14 +++--- .../spells/15_rejuvenation_rank_1.tres | 8 ++-- .../spells/16_close_wounds_rank_1.tres | 8 ++-- .../naturalist/spells/17_ironbark_rank_1.tres | 6 +-- .../spells/18_natures_swiftness_rank_1.tres | 8 ++-- .../naturalist/spells/19_uproot_rank_1.tres | 2 +- .../naturalist/spells/20_root_rank_1.tres | 8 ++-- .../spells/21_strength_of_nature_rank_1.tres | 12 ++--- .../spells/22_shield_of_barbs_rank_1.tres | 12 ++--- .../naturalist/spells/23_calm_rank_1.tres | 2 +- .../spells/24_attunement_rank_1.tres | 8 ++-- .../naturalist/spells/25_inner_will.tres | 2 +- .../naturalist/spells/26_rest.tres | 8 ++-- .../spells/27_aspect_of_scorpions.tres | 4 +- .../naturalist/spells/28_aspectofwasps.tres | 2 +- .../spells/29_aspect_of_wolves.tres | 4 +- .../naturalist/spells/30_aspect_of_bees.tres | 4 +- .../naturalist/spells/35_strike.tres | 18 +++---- .../naturalist/spells/36_regrow.tres | 10 ++-- .../naturalist/stats/mob_statdata.tres | 0 .../naturalist/stats/player_statdata.tres | 0 game/modules/core/item_templates/2_test.tres | 2 +- .../3_chest_of_the_infinite_wisdom.tres | 2 +- .../elementalist/2_elementalist.tres | 27 ----------- .../naturalist/1_naturalist.tres | 43 ----------------- .../effect_data/aspect_of_scorpions.tres | 15 ------ .../naturalist/resource_db.tres | 44 ------------------ .../naturalist/specs/aspects.tres | 16 ------- .../naturalist/specs/melee.tres | 19 -------- .../naturalist/specs/nature.tres | 15 ------ game/worlds/test_world/test_world.tres | 4 +- 109 files changed, 341 insertions(+), 366 deletions(-) create mode 100644 game/entity_classes/elementalist/2_elementalist.tres rename game/{modules => }/entity_classes/elementalist/character_specs/2_elementalist_fire.tres (100%) rename game/{modules => }/entity_classes/elementalist/character_specs/3_elementalist_water.tres (100%) rename game/{modules => }/entity_classes/elementalist/character_specs/4_elementalist_ice.tres (100%) rename game/{modules => }/entity_classes/elementalist/spells/31_overload.tres (74%) rename game/{modules => }/entity_classes/elementalist/spells/32_heat.tres (100%) rename game/{modules => }/entity_classes/elementalist/spells/33_normal.tres (100%) rename game/{modules => }/entity_classes/elementalist/spells/34_cold.tres (100%) create mode 100644 game/entity_classes/naturalist/1_naturalist.tres rename game/{modules => }/entity_classes/naturalist/1_naturalist_vendor.tres (69%) rename game/{modules => }/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres (100%) rename game/{modules => }/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres (100%) rename game/{modules => }/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres (100%) rename game/{modules => }/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres (100%) create mode 100644 game/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres rename game/{modules => }/entity_classes/naturalist/effect_data/natures_swiftness.tres (74%) rename game/{modules => }/entity_classes/naturalist/entities/1_naturalist.tres (81%) rename game/{modules => }/entity_classes/naturalist/entities/2_naturalist_mob.tres (81%) rename game/{modules => }/entity_classes/naturalist/entities/3_naturalist_trainer.tres (53%) rename game/{modules => }/entity_classes/naturalist/entities/4_naturalist_vendor.tres (52%) rename game/{modules => }/entity_classes/naturalist/game_module.tres (66%) rename game/{modules => }/entity_classes/naturalist/icons/amplify_pain.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/aspect_of_bees.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/aspect_of_scorpions.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/aspect_of_wasps.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/aspect_of_wolves.tres (100%) rename game/{modules => }/entity_classes/naturalist/icons/attunement.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/calm.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/close_wounds.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/first_aid.tres (100%) rename game/{modules => }/entity_classes/naturalist/icons/inner_will.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/ironbark.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/natures_swiftness.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/regenerate.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/rejuvenation.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/root.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/shield_of_barbs.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/strength_of_nature.tres (99%) rename game/{modules => }/entity_classes/naturalist/icons/test.tres (100%) rename game/{modules => }/entity_classes/naturalist/icons/uproot.tres (99%) create mode 100644 game/entity_classes/naturalist/resource_db.tres create mode 100644 game/entity_classes/naturalist/specs/aspects.tres rename game/{modules => }/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres (69%) rename game/{modules => }/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres (69%) rename game/{modules => }/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres (69%) create mode 100644 game/entity_classes/naturalist/specs/melee.tres rename game/{modules => }/entity_classes/naturalist/specs/melee/talent_strike_r1.tres (80%) rename game/{modules => }/entity_classes/naturalist/specs/melee/talent_strike_r2.tres (80%) rename game/{modules => }/entity_classes/naturalist/specs/melee/talent_strike_r3.tres (80%) rename game/{modules => }/entity_classes/naturalist/specs/melee/talent_strike_r4.tres (80%) rename game/{modules => }/entity_classes/naturalist/specs/melee/talent_strike_r5.tres (80%) create mode 100644 game/entity_classes/naturalist/specs/nature.tres rename game/{modules => }/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres (82%) rename game/{modules => }/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres (82%) rename game/{modules => }/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres (82%) rename game/{modules => }/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn (86%) rename game/{modules => }/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn (91%) rename game/{modules => }/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn (79%) rename game/{modules => }/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn (95%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/arrows.png (100%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/arrows.png.import (68%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/big_glow.png (100%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/big_glow.png.import (67%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/main_texture.png (100%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/main_texture.png.import (66%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/small_star.png (100%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/small_star.png.import (66%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/star.png (100%) rename game/{modules => }/entity_classes/naturalist/spell_effects/textures/star.png.import (68%) rename game/{modules => }/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres (64%) rename game/{modules => }/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres (68%) rename game/{modules => }/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres (85%) rename game/{modules => }/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres (76%) rename game/{modules => }/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres (69%) rename game/{modules => }/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres (69%) rename game/{modules => }/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres (77%) rename game/{modules => }/entity_classes/naturalist/spells/17_ironbark_rank_1.tres (80%) rename game/{modules => }/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres (80%) rename game/{modules => }/entity_classes/naturalist/spells/19_uproot_rank_1.tres (84%) rename game/{modules => }/entity_classes/naturalist/spells/20_root_rank_1.tres (72%) rename game/{modules => }/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres (68%) rename game/{modules => }/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres (69%) rename game/{modules => }/entity_classes/naturalist/spells/23_calm_rank_1.tres (82%) rename game/{modules => }/entity_classes/naturalist/spells/24_attunement_rank_1.tres (71%) rename game/{modules => }/entity_classes/naturalist/spells/25_inner_will.tres (84%) rename game/{modules => }/entity_classes/naturalist/spells/26_rest.tres (67%) rename game/{modules => }/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres (70%) rename game/{modules => }/entity_classes/naturalist/spells/28_aspectofwasps.tres (81%) rename game/{modules => }/entity_classes/naturalist/spells/29_aspect_of_wolves.tres (78%) rename game/{modules => }/entity_classes/naturalist/spells/30_aspect_of_bees.tres (78%) rename game/{modules => }/entity_classes/naturalist/spells/35_strike.tres (67%) rename game/{modules => }/entity_classes/naturalist/spells/36_regrow.tres (74%) rename game/{modules => }/entity_classes/naturalist/stats/mob_statdata.tres (100%) rename game/{modules => }/entity_classes/naturalist/stats/player_statdata.tres (100%) delete mode 100644 game/modules/entity_classes/elementalist/2_elementalist.tres delete mode 100644 game/modules/entity_classes/naturalist/1_naturalist.tres delete mode 100644 game/modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres delete mode 100644 game/modules/entity_classes/naturalist/resource_db.tres delete mode 100644 game/modules/entity_classes/naturalist/specs/aspects.tres delete mode 100644 game/modules/entity_classes/naturalist/specs/melee.tres delete mode 100644 game/modules/entity_classes/naturalist/specs/nature.tres diff --git a/game/addons/color-palette/icons/Add.svg.import b/game/addons/color-palette/icons/Add.svg.import index 88c02b76..5b43644a 100644 --- a/game/addons/color-palette/icons/Add.svg.import +++ b/game/addons/color-palette/icons/Add.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/color-palette/icons/Filesystem.svg.import b/game/addons/color-palette/icons/Filesystem.svg.import index 3b9af030..df9e3c18 100644 --- a/game/addons/color-palette/icons/Filesystem.svg.import +++ b/game/addons/color-palette/icons/Filesystem.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/color-palette/icons/Override.svg.import b/game/addons/color-palette/icons/Override.svg.import index 99d7142b..49a3f21e 100644 --- a/game/addons/color-palette/icons/Override.svg.import +++ b/game/addons/color-palette/icons/Override.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/color-palette/icons/Reload.svg.import b/game/addons/color-palette/icons/Reload.svg.import index 8246c45d..daf86d0d 100644 --- a/game/addons/color-palette/icons/Reload.svg.import +++ b/game/addons/color-palette/icons/Reload.svg.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/addons/color-palette/utilities/FlexGridContainerIcon.png.import b/game/addons/color-palette/utilities/FlexGridContainerIcon.png.import index 8687fed2..59007347 100644 --- a/game/addons/color-palette/utilities/FlexGridContainerIcon.png.import +++ b/game/addons/color-palette/utilities/FlexGridContainerIcon.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=true diff --git a/game/entity_classes/elementalist/2_elementalist.tres b/game/entity_classes/elementalist/2_elementalist.tres new file mode 100644 index 00000000..3ebeb6e8 --- /dev/null +++ b/game/entity_classes/elementalist/2_elementalist.tres @@ -0,0 +1,19 @@ +[gd_resource type="EntityClassData" load_steps=8 format=2] + +[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=1] +[ext_resource path="res://entity_classes/elementalist/character_specs/2_elementalist_fire.tres" type="CharacterSpec" id=2] +[ext_resource path="res://entity_classes/elementalist/character_specs/3_elementalist_water.tres" type="CharacterSpec" id=3] +[ext_resource path="res://entity_classes/elementalist/character_specs/4_elementalist_ice.tres" type="CharacterSpec" id=4] +[ext_resource path="res://entity_classes/elementalist/spells/34_cold.tres" type="Spell" id=5] +[ext_resource path="res://entity_classes/elementalist/spells/32_heat.tres" type="Spell" id=6] +[ext_resource path="res://entity_classes/elementalist/spells/33_normal.tres" type="Spell" id=7] + +[resource] +resource_name = "Elementalist" +id = 2 +text_name = "Elementalist" +playstyle_type = 2 +specs = [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ) ] +spells = [ ExtResource( 6 ), ExtResource( 7 ), ExtResource( 5 ) ] +start_spells = [ ExtResource( 7 ) ] +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/elementalist/character_specs/2_elementalist_fire.tres b/game/entity_classes/elementalist/character_specs/2_elementalist_fire.tres similarity index 100% rename from game/modules/entity_classes/elementalist/character_specs/2_elementalist_fire.tres rename to game/entity_classes/elementalist/character_specs/2_elementalist_fire.tres diff --git a/game/modules/entity_classes/elementalist/character_specs/3_elementalist_water.tres b/game/entity_classes/elementalist/character_specs/3_elementalist_water.tres similarity index 100% rename from game/modules/entity_classes/elementalist/character_specs/3_elementalist_water.tres rename to game/entity_classes/elementalist/character_specs/3_elementalist_water.tres diff --git a/game/modules/entity_classes/elementalist/character_specs/4_elementalist_ice.tres b/game/entity_classes/elementalist/character_specs/4_elementalist_ice.tres similarity index 100% rename from game/modules/entity_classes/elementalist/character_specs/4_elementalist_ice.tres rename to game/entity_classes/elementalist/character_specs/4_elementalist_ice.tres diff --git a/game/modules/entity_classes/elementalist/spells/31_overload.tres b/game/entity_classes/elementalist/spells/31_overload.tres similarity index 74% rename from game/modules/entity_classes/elementalist/spells/31_overload.tres rename to game/entity_classes/elementalist/spells/31_overload.tres index 68edaa78..b7a0ccc3 100644 --- a/game/modules/entity_classes/elementalist/spells/31_overload.tres +++ b/game/entity_classes/elementalist/spells/31_overload.tres @@ -1,10 +1,10 @@ [gd_resource type="Spell" load_steps=7 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=1] +[ext_resource path="res://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://modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5] +[ext_resource path="res://entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=4] +[ext_resource path="res://entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=5] [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 2 ) diff --git a/game/modules/entity_classes/elementalist/spells/32_heat.tres b/game/entity_classes/elementalist/spells/32_heat.tres similarity index 100% rename from game/modules/entity_classes/elementalist/spells/32_heat.tres rename to game/entity_classes/elementalist/spells/32_heat.tres diff --git a/game/modules/entity_classes/elementalist/spells/33_normal.tres b/game/entity_classes/elementalist/spells/33_normal.tres similarity index 100% rename from game/modules/entity_classes/elementalist/spells/33_normal.tres rename to game/entity_classes/elementalist/spells/33_normal.tres diff --git a/game/modules/entity_classes/elementalist/spells/34_cold.tres b/game/entity_classes/elementalist/spells/34_cold.tres similarity index 100% rename from game/modules/entity_classes/elementalist/spells/34_cold.tres rename to game/entity_classes/elementalist/spells/34_cold.tres diff --git a/game/entity_classes/naturalist/1_naturalist.tres b/game/entity_classes/naturalist/1_naturalist.tres new file mode 100644 index 00000000..6e87dada --- /dev/null +++ b/game/entity_classes/naturalist/1_naturalist.tres @@ -0,0 +1,43 @@ +[gd_resource type="EntityClassData" load_steps=28 format=2] + +[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=1] +[ext_resource path="res://entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=2] +[ext_resource path="res://entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=3] +[ext_resource path="res://entity_classes/naturalist/spells/23_calm_rank_1.tres" type="Spell" id=4] +[ext_resource path="res://entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=5] +[ext_resource path="res://entity_classes/naturalist/spells/26_rest.tres" type="Spell" id=6] +[ext_resource path="res://entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=7] +[ext_resource path="res://entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=8] +[ext_resource path="res://entity_classes/naturalist/specs/aspects.tres" type="CharacterSpec" id=9] +[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=10] +[ext_resource path="res://entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=11] +[ext_resource path="res://entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=12] +[ext_resource path="res://entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=13] +[ext_resource path="res://entity_classes/naturalist/specs/nature.tres" type="CharacterSpec" id=14] +[ext_resource path="res://scripts/ai/EntityAIGD.gd" type="Script" id=15] +[ext_resource path="res://entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=16] +[ext_resource path="res://entity_classes/naturalist/spells/36_regrow.tres" type="Spell" id=17] +[ext_resource path="res://entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=18] +[ext_resource path="res://entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=19] +[ext_resource path="res://entity_classes/naturalist/spells/20_root_rank_1.tres" type="Spell" id=20] +[ext_resource path="res://entity_classes/naturalist/spells/35_strike.tres" type="Spell" id=21] +[ext_resource path="res://entity_classes/naturalist/spells/25_inner_will.tres" type="Spell" id=22] +[ext_resource path="res://entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=23] +[ext_resource path="res://entity_classes/naturalist/stats/player_statdata.tres" type="StatData" id=24] +[ext_resource path="res://entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=25] +[ext_resource path="res://entity_classes/naturalist/specs/melee.tres" type="CharacterSpec" id=26] + +[sub_resource type="EntityAI" id=1] +script = ExtResource( 15 ) + +[resource] +resource_name = "Naturalist" +id = 1 +text_name = "Naturalist" +stat_data = ExtResource( 24 ) +entity_resources = [ ExtResource( 10 ) ] +specs = [ ExtResource( 9 ), ExtResource( 26 ), ExtResource( 14 ) ] +spells = [ ExtResource( 12 ), ExtResource( 13 ), ExtResource( 18 ), ExtResource( 16 ), ExtResource( 8 ), ExtResource( 23 ), ExtResource( 5 ), ExtResource( 11 ), ExtResource( 25 ), ExtResource( 2 ), ExtResource( 20 ), ExtResource( 19 ), ExtResource( 3 ), ExtResource( 4 ), ExtResource( 7 ), ExtResource( 22 ), ExtResource( 6 ), ExtResource( 21 ), ExtResource( 17 ) ] +start_spells = [ ExtResource( 12 ), ExtResource( 21 ), ExtResource( 17 ) ] +ais = [ SubResource( 1 ) ] +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/1_naturalist_vendor.tres b/game/entity_classes/naturalist/1_naturalist_vendor.tres similarity index 69% rename from game/modules/entity_classes/naturalist/1_naturalist_vendor.tres rename to game/entity_classes/naturalist/1_naturalist_vendor.tres index bac5d1cc..e6506b40 100644 --- a/game/modules/entity_classes/naturalist/1_naturalist_vendor.tres +++ b/game/entity_classes/naturalist/1_naturalist_vendor.tres @@ -1,15 +1,15 @@ [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] +[ext_resource path="res://modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres" type="ItemTemplate" id=1] +[ext_resource path="res://modules/core/item_templates/2_test.tres" type="ItemTemplate" id=2] +[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=3] +[ext_resource path="res://entity_classes/naturalist/stats/mob_statdata.tres" type="StatData" id=4] [sub_resource type="VendorItemDataEntry" id=1] -item = ExtResource( 2 ) +item = ExtResource( 1 ) [sub_resource type="VendorItemDataEntry" id=2] -item = ExtResource( 1 ) +item = ExtResource( 2 ) [sub_resource type="VendorItemData" id=3] vendor_datas = [ SubResource( 1 ), SubResource( 2 ) ] @@ -18,6 +18,6 @@ vendor_datas = [ SubResource( 1 ), SubResource( 2 ) ] resource_name = "Naturalist" id = 1 text_name = "Naturalist" -stat_data = ExtResource( 3 ) +stat_data = ExtResource( 4 ) vendor_item_data = SubResource( 3 ) -script = ExtResource( 13 ) +script = ExtResource( 3 ) diff --git a/game/modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres b/game/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres similarity index 100% rename from game/modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres rename to game/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres diff --git a/game/modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres b/game/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres similarity index 100% rename from game/modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres rename to game/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres diff --git a/game/modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres b/game/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres similarity index 100% rename from game/modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres rename to game/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres diff --git a/game/modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres b/game/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres similarity index 100% rename from game/modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres rename to game/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres diff --git a/game/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres b/game/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres new file mode 100644 index 00000000..bf6578eb --- /dev/null +++ b/game/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres @@ -0,0 +1,15 @@ +[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://entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn" type="PackedScene" id=2] +[ext_resource path="res://entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=3] + +[resource] +script = ExtResource( 1 ) +spell_cast_effect_left_hand = ExtResource( 3 ) +spell_cast_effect_right_hand = ExtResource( 3 ) +torso_aura_effect_time = 0.0 +root_aura_effect_time = 0.0 +torso_spell_cast_finish_effect = ExtResource( 2 ) +torso_spell_cast_finish_effect_time = 4.0 +root_spell_cast_finish_effect_time = 1.0 diff --git a/game/modules/entity_classes/naturalist/effect_data/natures_swiftness.tres b/game/entity_classes/naturalist/effect_data/natures_swiftness.tres similarity index 74% rename from game/modules/entity_classes/naturalist/effect_data/natures_swiftness.tres rename to game/entity_classes/naturalist/effect_data/natures_swiftness.tres index 033be2a4..56a343ff 100644 --- a/game/modules/entity_classes/naturalist/effect_data/natures_swiftness.tres +++ b/game/entity_classes/naturalist/effect_data/natures_swiftness.tres @@ -1,7 +1,7 @@ [gd_resource type="SpellEffectVisual" load_steps=3 format=2] [ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn" type="PackedScene" id=2] +[ext_resource path="res://entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn" type="PackedScene" id=2] [resource] script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres b/game/entity_classes/naturalist/entities/1_naturalist.tres similarity index 81% rename from game/modules/entity_classes/naturalist/entities/1_naturalist.tres rename to game/entity_classes/naturalist/entities/1_naturalist.tres index 2a0843d7..e9ce4594 100644 --- a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres +++ b/game/entity_classes/naturalist/entities/1_naturalist.tres @@ -1,6 +1,6 @@ [gd_resource type="EntityData" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] +[ext_resource path="res://entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] [ext_resource path="res://models/entities/human/species_human.tres" type="EntitySpeciesData" id=3] [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=4] diff --git a/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres b/game/entity_classes/naturalist/entities/2_naturalist_mob.tres similarity index 81% rename from game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres rename to game/entity_classes/naturalist/entities/2_naturalist_mob.tres index bb8a45ef..67893e74 100644 --- a/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres +++ b/game/entity_classes/naturalist/entities/2_naturalist_mob.tres @@ -1,7 +1,7 @@ [gd_resource type="EntityData" load_steps=5 format=2] [ext_resource path="res://models/entities/human/species_human.tres" type="EntitySpeciesData" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] +[ext_resource path="res://entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=2] [ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=3] [sub_resource type="LootDataBase" id=1] diff --git a/game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres b/game/entity_classes/naturalist/entities/3_naturalist_trainer.tres similarity index 53% rename from game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres rename to game/entity_classes/naturalist/entities/3_naturalist_trainer.tres index 5ed6f0de..a88ff4ce 100644 --- a/game/modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres +++ b/game/entity_classes/naturalist/entities/3_naturalist_trainer.tres @@ -1,14 +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://models/entities/human/species_human.tres" type="EntitySpeciesData" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist.tres" type="EntityClassData" id=3] +[ext_resource path="res://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://models/entities/human/species_human.tres" type="EntitySpeciesData" 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 ) +entity_species_data = ExtResource( 3 ) +entity_class_data = ExtResource( 1 ) +script = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres b/game/entity_classes/naturalist/entities/4_naturalist_vendor.tres similarity index 52% rename from game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres rename to game/entity_classes/naturalist/entities/4_naturalist_vendor.tres index 6ad68427..f262eb06 100644 --- a/game/modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres +++ b/game/entity_classes/naturalist/entities/4_naturalist_vendor.tres @@ -1,14 +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://models/entities/human/species_human.tres" type="EntitySpeciesData" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/1_naturalist_vendor.tres" type="EntityClassData" id=3] +[ext_resource path="res://entity_classes/naturalist/1_naturalist_vendor.tres" type="EntityClassData" id=1] +[ext_resource path="res://scripts/entities/EntityDataGD.gd" type="Script" id=2] +[ext_resource path="res://models/entities/human/species_human.tres" type="EntitySpeciesData" 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 ) +entity_species_data = ExtResource( 3 ) +entity_class_data = ExtResource( 1 ) +script = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/game_module.tres b/game/entity_classes/naturalist/game_module.tres similarity index 66% rename from game/modules/entity_classes/naturalist/game_module.tres rename to game/entity_classes/naturalist/game_module.tres index 5923e921..5ded54f7 100644 --- a/game/modules/entity_classes/naturalist/game_module.tres +++ b/game/entity_classes/naturalist/game_module.tres @@ -1,7 +1,7 @@ [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://modules/entity_classes/naturalist/resource_db.tres" type="ESSResourceDBStatic" id=2] +[ext_resource path="res://entity_classes/naturalist/resource_db.tres" type="ESSResourceDBStatic" id=2] [resource] script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/icons/amplify_pain.tres b/game/entity_classes/naturalist/icons/amplify_pain.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/amplify_pain.tres rename to game/entity_classes/naturalist/icons/amplify_pain.tres index 17857d67..9951dc46 100644 --- a/game/modules/entity_classes/naturalist/icons/amplify_pain.tres +++ b/game/entity_classes/naturalist/icons/amplify_pain.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-3/beam-jade-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/aspect_of_bees.tres b/game/entity_classes/naturalist/icons/aspect_of_bees.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/aspect_of_bees.tres rename to game/entity_classes/naturalist/icons/aspect_of_bees.tres index 9ad466d8..d4f82494 100644 --- a/game/modules/entity_classes/naturalist/icons/aspect_of_bees.tres +++ b/game/entity_classes/naturalist/icons/aspect_of_bees.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-4/explosion-royal-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres b/game/entity_classes/naturalist/icons/aspect_of_scorpions.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres rename to game/entity_classes/naturalist/icons/aspect_of_scorpions.tres index 48128832..3b3349bb 100644 --- a/game/modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres +++ b/game/entity_classes/naturalist/icons/aspect_of_scorpions.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-2/enchant-acid-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/aspect_of_wasps.tres b/game/entity_classes/naturalist/icons/aspect_of_wasps.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/aspect_of_wasps.tres rename to game/entity_classes/naturalist/icons/aspect_of_wasps.tres index a4227b84..86207a7d 100644 --- a/game/modules/entity_classes/naturalist/icons/aspect_of_wasps.tres +++ b/game/entity_classes/naturalist/icons/aspect_of_wasps.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-2/enchant-blue-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/aspect_of_wolves.tres b/game/entity_classes/naturalist/icons/aspect_of_wolves.tres similarity index 100% rename from game/modules/entity_classes/naturalist/icons/aspect_of_wolves.tres rename to game/entity_classes/naturalist/icons/aspect_of_wolves.tres diff --git a/game/modules/entity_classes/naturalist/icons/attunement.tres b/game/entity_classes/naturalist/icons/attunement.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/attunement.tres rename to game/entity_classes/naturalist/icons/attunement.tres index 7f399601..d2997fa8 100644 --- a/game/modules/entity_classes/naturalist/icons/attunement.tres +++ b/game/entity_classes/naturalist/icons/attunement.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-4/horror-acid-3.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/calm.tres b/game/entity_classes/naturalist/icons/calm.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/calm.tres rename to game/entity_classes/naturalist/icons/calm.tres index ec40c1c1..ea63e48b 100644 --- a/game/modules/entity_classes/naturalist/icons/calm.tres +++ b/game/entity_classes/naturalist/icons/calm.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-5/wind-grasp-acid-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/close_wounds.tres b/game/entity_classes/naturalist/icons/close_wounds.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/close_wounds.tres rename to game/entity_classes/naturalist/icons/close_wounds.tres index 95a13b24..edd741c4 100644 --- a/game/modules/entity_classes/naturalist/icons/close_wounds.tres +++ b/game/entity_classes/naturalist/icons/close_wounds.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-2/heal-jade-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/first_aid.tres b/game/entity_classes/naturalist/icons/first_aid.tres similarity index 100% rename from game/modules/entity_classes/naturalist/icons/first_aid.tres rename to game/entity_classes/naturalist/icons/first_aid.tres diff --git a/game/modules/entity_classes/naturalist/icons/inner_will.tres b/game/entity_classes/naturalist/icons/inner_will.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/inner_will.tres rename to game/entity_classes/naturalist/icons/inner_will.tres index 2e4701d2..9cf2e287 100644 --- a/game/modules/entity_classes/naturalist/icons/inner_will.tres +++ b/game/entity_classes/naturalist/icons/inner_will.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-5/wind-grasp-eerie-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/ironbark.tres b/game/entity_classes/naturalist/icons/ironbark.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/ironbark.tres rename to game/entity_classes/naturalist/icons/ironbark.tres index 52fddab4..9699d1e1 100644 --- a/game/modules/entity_classes/naturalist/icons/ironbark.tres +++ b/game/entity_classes/naturalist/icons/ironbark.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-2/protect-acid-3.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/natures_swiftness.tres b/game/entity_classes/naturalist/icons/natures_swiftness.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/natures_swiftness.tres rename to game/entity_classes/naturalist/icons/natures_swiftness.tres index 83eb192c..60f4c9e1 100644 --- a/game/modules/entity_classes/naturalist/icons/natures_swiftness.tres +++ b/game/entity_classes/naturalist/icons/natures_swiftness.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-3/haste-royal-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/regenerate.tres b/game/entity_classes/naturalist/icons/regenerate.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/regenerate.tres rename to game/entity_classes/naturalist/icons/regenerate.tres index bc08b2bd..d35fa803 100644 --- a/game/modules/entity_classes/naturalist/icons/regenerate.tres +++ b/game/entity_classes/naturalist/icons/regenerate.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-4/wind-blue-1.png" type="Texture" id=1] - [resource] flags = 4 atlas = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/icons/rejuvenation.tres b/game/entity_classes/naturalist/icons/rejuvenation.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/rejuvenation.tres rename to game/entity_classes/naturalist/icons/rejuvenation.tres index 242c742c..115ea53c 100644 --- a/game/modules/entity_classes/naturalist/icons/rejuvenation.tres +++ b/game/entity_classes/naturalist/icons/rejuvenation.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-4/leaf-acid-1.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/root.tres b/game/entity_classes/naturalist/icons/root.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/root.tres rename to game/entity_classes/naturalist/icons/root.tres index 790e568d..189733f4 100644 --- a/game/modules/entity_classes/naturalist/icons/root.tres +++ b/game/entity_classes/naturalist/icons/root.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-3/vines-plain-1.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/shield_of_barbs.tres b/game/entity_classes/naturalist/icons/shield_of_barbs.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/shield_of_barbs.tres rename to game/entity_classes/naturalist/icons/shield_of_barbs.tres index b5b36399..1adef15f 100644 --- a/game/modules/entity_classes/naturalist/icons/shield_of_barbs.tres +++ b/game/entity_classes/naturalist/icons/shield_of_barbs.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-2/protect-eerie-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/strength_of_nature.tres b/game/entity_classes/naturalist/icons/strength_of_nature.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/strength_of_nature.tres rename to game/entity_classes/naturalist/icons/strength_of_nature.tres index 23ad4ada..6b7d8cd4 100644 --- a/game/modules/entity_classes/naturalist/icons/strength_of_nature.tres +++ b/game/entity_classes/naturalist/icons/strength_of_nature.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-3/lighting-acid-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/modules/entity_classes/naturalist/icons/test.tres b/game/entity_classes/naturalist/icons/test.tres similarity index 100% rename from game/modules/entity_classes/naturalist/icons/test.tres rename to game/entity_classes/naturalist/icons/test.tres diff --git a/game/modules/entity_classes/naturalist/icons/uproot.tres b/game/entity_classes/naturalist/icons/uproot.tres similarity index 99% rename from game/modules/entity_classes/naturalist/icons/uproot.tres rename to game/entity_classes/naturalist/icons/uproot.tres index c7fa4d7b..b1f8917c 100644 --- a/game/modules/entity_classes/naturalist/icons/uproot.tres +++ b/game/entity_classes/naturalist/icons/uproot.tres @@ -2,7 +2,6 @@ [ext_resource path="res://icons/icons-3/vines-plain-2.png" type="Texture" id=1] - [resource] atlas = ExtResource( 1 ) region = Rect2( 0, 0, 16, 16 ) diff --git a/game/entity_classes/naturalist/resource_db.tres b/game/entity_classes/naturalist/resource_db.tres new file mode 100644 index 00000000..92dc6fe4 --- /dev/null +++ b/game/entity_classes/naturalist/resource_db.tres @@ -0,0 +1,44 @@ +[gd_resource type="ESSResourceDBStatic" load_steps=39 format=2] + +[ext_resource path="res://entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1] +[ext_resource path="res://entity_classes/naturalist/specs/nature/talent_regrow_r2.tres" type="Spell" id=2] +[ext_resource path="res://entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Spell" id=3] +[ext_resource path="res://entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=4] +[ext_resource path="res://entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=5] +[ext_resource path="res://entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Spell" id=6] +[ext_resource path="res://entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Spell" id=7] +[ext_resource path="res://entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Spell" id=8] +[ext_resource path="res://entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=9] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Spell" id=10] +[ext_resource path="res://entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=11] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Spell" id=12] +[ext_resource path="res://entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=13] +[ext_resource path="res://entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=14] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Spell" id=15] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Spell" id=16] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r3.tres" type="Spell" id=17] +[ext_resource path="res://entity_classes/naturalist/spells/27_aspect_of_scorpions.tres" type="Spell" id=18] +[ext_resource path="res://entity_classes/naturalist/spells/29_aspect_of_wolves.tres" type="Spell" id=19] +[ext_resource path="res://entity_classes/naturalist/spells/28_aspectofwasps.tres" type="Spell" id=20] +[ext_resource path="res://entity_classes/naturalist/specs/nature/talent_regrow_r1.tres" type="Spell" id=21] +[ext_resource path="res://entity_classes/naturalist/spells/30_aspect_of_bees.tres" type="Spell" id=22] +[ext_resource path="res://entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=23] +[ext_resource path="res://entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=25] +[ext_resource path="res://entity_classes/naturalist/spells/26_rest.tres" type="Spell" id=26] +[ext_resource path="res://entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=27] +[ext_resource path="res://entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=28] +[ext_resource path="res://entity_classes/naturalist/spells/20_root_rank_1.tres" type="Spell" id=30] +[ext_resource path="res://entity_classes/naturalist/spells/23_calm_rank_1.tres" type="Spell" id=31] +[ext_resource path="res://entity_classes/naturalist/spells/25_inner_will.tres" type="Spell" id=32] +[ext_resource path="res://entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=33] +[ext_resource path="res://entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=34] +[ext_resource path="res://entity_classes/naturalist/entities/1_naturalist.tres" type="EntityData" id=35] +[ext_resource path="res://entity_classes/naturalist/entities/2_naturalist_mob.tres" type="EntityData" id=36] +[ext_resource path="res://entity_classes/naturalist/spells/35_strike.tres" type="Spell" id=37] +[ext_resource path="res://entity_classes/naturalist/spells/36_regrow.tres" type="Spell" id=38] +[ext_resource path="res://entity_classes/naturalist/entities/3_naturalist_trainer.tres" type="EntityData" id=50] +[ext_resource path="res://entity_classes/naturalist/entities/4_naturalist_vendor.tres" type="EntityData" id=51] + +[resource] +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 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 3 ), ExtResource( 10 ), ExtResource( 12 ), ExtResource( 17 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 2 ), ExtResource( 8 ), ExtResource( 21 ) ] diff --git a/game/entity_classes/naturalist/specs/aspects.tres b/game/entity_classes/naturalist/specs/aspects.tres new file mode 100644 index 00000000..1655f09a --- /dev/null +++ b/game/entity_classes/naturalist/specs/aspects.tres @@ -0,0 +1,16 @@ +[gd_resource type="CharacterSpec" load_steps=4 format=2] + +[ext_resource path="res://entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Spell" id=1] +[ext_resource path="res://entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Spell" id=2] +[ext_resource path="res://entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Spell" id=3] + +[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( 1 ) +row_0/column_0/entry_1 = ExtResource( 3 ) +row_0/column_0/entry_2 = ExtResource( 2 ) +row_1/size = 0 diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres b/game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres similarity index 69% rename from game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres rename to game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres index 3e7696c2..e6b6aeef 100644 --- a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres +++ b/game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres @@ -1,16 +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] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=1] +[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] resource_name = "Improved Asperct of Scorpions" rank = 1 -icon = ExtResource( 2 ) +icon = ExtResource( 1 ) 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 ) +script = ExtResource( 2 ) spell_name = "Aspect of Scorpions" reduction_value = 0.1 diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres b/game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres similarity index 69% rename from game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres rename to game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres index 5f4aee46..f4f0a848 100644 --- a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres +++ b/game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres @@ -1,16 +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] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=1] +[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] resource_name = "Improved Asperct of Scorpions" rank = 2 -icon = ExtResource( 2 ) +icon = ExtResource( 1 ) 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 ) +script = ExtResource( 2 ) spell_name = "Aspect of Scorpions" reduction_value = 0.2 diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres b/game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres similarity index 69% rename from game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres rename to game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres index 65e5e6e8..855d7090 100644 --- a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres +++ b/game/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres @@ -1,16 +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] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=1] +[ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] resource_name = "Improved Asperct of Scorpions" rank = 3 -icon = ExtResource( 2 ) +icon = ExtResource( 1 ) 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 ) +script = ExtResource( 2 ) spell_name = "Aspect of Scorpions" reduction_value = 0.3 diff --git a/game/entity_classes/naturalist/specs/melee.tres b/game/entity_classes/naturalist/specs/melee.tres new file mode 100644 index 00000000..9a774051 --- /dev/null +++ b/game/entity_classes/naturalist/specs/melee.tres @@ -0,0 +1,19 @@ +[gd_resource type="CharacterSpec" load_steps=6 format=2] + +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Spell" id=1] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Spell" id=2] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Spell" id=3] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Spell" id=4] +[ext_resource path="res://entity_classes/naturalist/specs/melee/talent_strike_r3.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( 3 ) +row_0/column_0/entry_2 = ExtResource( 5 ) +row_0/column_0/entry_3 = ExtResource( 4 ) +row_0/column_0/entry_4 = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres b/game/entity_classes/naturalist/specs/melee/talent_strike_r1.tres similarity index 80% rename from game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres rename to game/entity_classes/naturalist/specs/melee/talent_strike_r1.tres index fad51bfd..72808a00 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres +++ b/game/entity_classes/naturalist/specs/melee/talent_strike_r1.tres @@ -1,7 +1,7 @@ [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] +[ext_resource path="res://entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2] [resource] resource_name = "Improved Strike" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres b/game/entity_classes/naturalist/specs/melee/talent_strike_r2.tres similarity index 80% rename from game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres rename to game/entity_classes/naturalist/specs/melee/talent_strike_r2.tres index dc8a8bae..34fab9ae 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres +++ b/game/entity_classes/naturalist/specs/melee/talent_strike_r2.tres @@ -1,7 +1,7 @@ [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] +[ext_resource path="res://entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2] [resource] resource_name = "Improved Strike" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres b/game/entity_classes/naturalist/specs/melee/talent_strike_r3.tres similarity index 80% rename from game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres rename to game/entity_classes/naturalist/specs/melee/talent_strike_r3.tres index c98b9f53..6ec3f3b8 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres +++ b/game/entity_classes/naturalist/specs/melee/talent_strike_r3.tres @@ -1,7 +1,7 @@ [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] +[ext_resource path="res://entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2] [resource] resource_name = "Improved Strike" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres b/game/entity_classes/naturalist/specs/melee/talent_strike_r4.tres similarity index 80% rename from game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres rename to game/entity_classes/naturalist/specs/melee/talent_strike_r4.tres index 51fe4aa0..1e3b793c 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres +++ b/game/entity_classes/naturalist/specs/melee/talent_strike_r4.tres @@ -1,7 +1,7 @@ [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] +[ext_resource path="res://entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2] [resource] resource_name = "Improved Strike" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres b/game/entity_classes/naturalist/specs/melee/talent_strike_r5.tres similarity index 80% rename from game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres rename to game/entity_classes/naturalist/specs/melee/talent_strike_r5.tres index 5b49876f..2b2c10f9 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres +++ b/game/entity_classes/naturalist/specs/melee/talent_strike_r5.tres @@ -1,7 +1,7 @@ [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] +[ext_resource path="res://entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=2] [resource] resource_name = "Improved Strike" diff --git a/game/entity_classes/naturalist/specs/nature.tres b/game/entity_classes/naturalist/specs/nature.tres new file mode 100644 index 00000000..2ee5ae7c --- /dev/null +++ b/game/entity_classes/naturalist/specs/nature.tres @@ -0,0 +1,15 @@ +[gd_resource type="CharacterSpec" load_steps=4 format=2] + +[ext_resource path="res://entity_classes/naturalist/specs/nature/talent_regrow_r1.tres" type="Spell" id=1] +[ext_resource path="res://entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Spell" id=2] +[ext_resource path="res://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( 1 ) +row_0/column_0/entry_1 = ExtResource( 3 ) +row_0/column_0/entry_2 = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres b/game/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres similarity index 82% rename from game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres rename to game/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres index 0f75882e..3e022c9b 100644 --- a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres +++ b/game/entity_classes/naturalist/specs/nature/talent_regrow_r1.tres @@ -1,6 +1,6 @@ [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://entity_classes/naturalist/icons/root.tres" type="Texture" id=1] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] diff --git a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres b/game/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres similarity index 82% rename from game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres rename to game/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres index e8f09ef1..dff56677 100644 --- a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres +++ b/game/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres @@ -1,6 +1,6 @@ [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://entity_classes/naturalist/icons/root.tres" type="Texture" id=1] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] diff --git a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres b/game/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres similarity index 82% rename from game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres rename to game/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres index 8034cd8d..aaae36ed 100644 --- a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres +++ b/game/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres @@ -1,6 +1,6 @@ [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://entity_classes/naturalist/icons/root.tres" type="Texture" id=1] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn b/game/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn similarity index 86% rename from game/modules/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn rename to game/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn index 22026cd8..e392b025 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn +++ b/game/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn @@ -1,9 +1,7 @@ [gd_scene load_steps=5 format=2] [ext_resource path="res://shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/textures/small_star.png" type="Texture" id=2] - - +[ext_resource path="res://entity_classes/naturalist/spell_effects/textures/small_star.png" type="Texture" id=2] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn b/game/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn similarity index 91% rename from game/modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn rename to game/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn index cf091eae..67caa1d9 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn +++ b/game/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn @@ -1,9 +1,7 @@ [gd_scene load_steps=6 format=2] [ext_resource path="res://shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/textures/star.png" type="Texture" id=2] - - +[ext_resource path="res://entity_classes/naturalist/spell_effects/textures/star.png" type="Texture" id=2] [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn b/game/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn similarity index 79% rename from game/modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn rename to game/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn index a71fe7a0..42211f24 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn +++ b/game/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn @@ -1,23 +1,21 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://shaders/3_simple_y_billboard.shader" type="Shader" id=1] -[ext_resource path="res://shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/textures/big_glow.png" type="Texture" id=3] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/textures/main_texture.png" type="Texture" id=4] - - +[ext_resource path="res://shaders/2_simple_particle_billboard_shader.shader" type="Shader" id=1] +[ext_resource path="res://entity_classes/naturalist/spell_effects/textures/main_texture.png" type="Texture" id=2] +[ext_resource path="res://entity_classes/naturalist/spell_effects/textures/big_glow.png" type="Texture" id=3] +[ext_resource path="res://shaders/3_simple_y_billboard.shader" type="Shader" id=4] [sub_resource type="ShaderMaterial" id=1] -shader = ExtResource( 2 ) +shader = ExtResource( 1 ) shader_param/albedo = Color( 1, 1, 1, 1 ) -shader_param/texture_albedo = ExtResource( 4 ) +shader_param/texture_albedo = ExtResource( 2 ) [sub_resource type="QuadMesh" id=2] material = SubResource( 1 ) size = Vector2( 0.1, 0.1 ) [sub_resource type="ShaderMaterial" id=3] -shader = ExtResource( 1 ) +shader = ExtResource( 4 ) shader_param/albedo = Color( 0.027451, 0.537255, 0.317647, 1 ) shader_param/texture_albedo = ExtResource( 3 ) diff --git a/game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn b/game/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn similarity index 95% rename from game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn rename to game/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn index 8ff7d496..f20bbb0b 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn +++ b/game/entity_classes/naturalist/spell_effects/nature/NautreSwiftness.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/textures/arrows.png" type="Texture" id=1] +[ext_resource path="res://entity_classes/naturalist/spell_effects/textures/arrows.png" type="Texture" id=1] [ext_resource path="res://shaders/3_simple_y_billboard.shader" type="Shader" id=2] [ext_resource path="res://materials/2_simple_particle_billboard.tres" type="Material" id=3] diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/arrows.png b/game/entity_classes/naturalist/spell_effects/textures/arrows.png similarity index 100% rename from game/modules/entity_classes/naturalist/spell_effects/textures/arrows.png rename to game/entity_classes/naturalist/spell_effects/textures/arrows.png diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/arrows.png.import b/game/entity_classes/naturalist/spell_effects/textures/arrows.png.import similarity index 68% rename from game/modules/entity_classes/naturalist/spell_effects/textures/arrows.png.import rename to game/entity_classes/naturalist/spell_effects/textures/arrows.png.import index 5e26c8be..a7664652 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/textures/arrows.png.import +++ b/game/entity_classes/naturalist/spell_effects/textures/arrows.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/arrows.png-03e1173efc34a2c2f5ac82b362e0eda3.stex" +path="res://.import/arrows.png-e9fcabceaecfeef437d8561040ab497f.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/entity_classes/naturalist/spell_effects/textures/arrows.png" -dest_files=[ "res://.import/arrows.png-03e1173efc34a2c2f5ac82b362e0eda3.stex" ] +source_file="res://entity_classes/naturalist/spell_effects/textures/arrows.png" +dest_files=[ "res://.import/arrows.png-e9fcabceaecfeef437d8561040ab497f.stex" ] [params] diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/big_glow.png b/game/entity_classes/naturalist/spell_effects/textures/big_glow.png similarity index 100% rename from game/modules/entity_classes/naturalist/spell_effects/textures/big_glow.png rename to game/entity_classes/naturalist/spell_effects/textures/big_glow.png diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/big_glow.png.import b/game/entity_classes/naturalist/spell_effects/textures/big_glow.png.import similarity index 67% rename from game/modules/entity_classes/naturalist/spell_effects/textures/big_glow.png.import rename to game/entity_classes/naturalist/spell_effects/textures/big_glow.png.import index c4e1721c..a71a983e 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/textures/big_glow.png.import +++ b/game/entity_classes/naturalist/spell_effects/textures/big_glow.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/big_glow.png-df97a9764c4514dfeedfecf176820312.stex" +path="res://.import/big_glow.png-e15c8c81838208c0d12b4b7597759cfd.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/entity_classes/naturalist/spell_effects/textures/big_glow.png" -dest_files=[ "res://.import/big_glow.png-df97a9764c4514dfeedfecf176820312.stex" ] +source_file="res://entity_classes/naturalist/spell_effects/textures/big_glow.png" +dest_files=[ "res://.import/big_glow.png-e15c8c81838208c0d12b4b7597759cfd.stex" ] [params] diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/main_texture.png b/game/entity_classes/naturalist/spell_effects/textures/main_texture.png similarity index 100% rename from game/modules/entity_classes/naturalist/spell_effects/textures/main_texture.png rename to game/entity_classes/naturalist/spell_effects/textures/main_texture.png diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/main_texture.png.import b/game/entity_classes/naturalist/spell_effects/textures/main_texture.png.import similarity index 66% rename from game/modules/entity_classes/naturalist/spell_effects/textures/main_texture.png.import rename to game/entity_classes/naturalist/spell_effects/textures/main_texture.png.import index 98a81eec..58135455 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/textures/main_texture.png.import +++ b/game/entity_classes/naturalist/spell_effects/textures/main_texture.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/main_texture.png-6116655823a3509ea26ac46bc3689bc0.stex" +path="res://.import/main_texture.png-b2a25dfef5937dbfb451b08d60fdf475.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/entity_classes/naturalist/spell_effects/textures/main_texture.png" -dest_files=[ "res://.import/main_texture.png-6116655823a3509ea26ac46bc3689bc0.stex" ] +source_file="res://entity_classes/naturalist/spell_effects/textures/main_texture.png" +dest_files=[ "res://.import/main_texture.png-b2a25dfef5937dbfb451b08d60fdf475.stex" ] [params] diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/small_star.png b/game/entity_classes/naturalist/spell_effects/textures/small_star.png similarity index 100% rename from game/modules/entity_classes/naturalist/spell_effects/textures/small_star.png rename to game/entity_classes/naturalist/spell_effects/textures/small_star.png diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/small_star.png.import b/game/entity_classes/naturalist/spell_effects/textures/small_star.png.import similarity index 66% rename from game/modules/entity_classes/naturalist/spell_effects/textures/small_star.png.import rename to game/entity_classes/naturalist/spell_effects/textures/small_star.png.import index f1cb2fda..2b0cb434 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/textures/small_star.png.import +++ b/game/entity_classes/naturalist/spell_effects/textures/small_star.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/small_star.png-2aeece93bc0331c8ad7b3682bfb322d2.stex" +path="res://.import/small_star.png-ea0eea8dc52ff5592b057b09d5f2020d.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/entity_classes/naturalist/spell_effects/textures/small_star.png" -dest_files=[ "res://.import/small_star.png-2aeece93bc0331c8ad7b3682bfb322d2.stex" ] +source_file="res://entity_classes/naturalist/spell_effects/textures/small_star.png" +dest_files=[ "res://.import/small_star.png-ea0eea8dc52ff5592b057b09d5f2020d.stex" ] [params] diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/star.png b/game/entity_classes/naturalist/spell_effects/textures/star.png similarity index 100% rename from game/modules/entity_classes/naturalist/spell_effects/textures/star.png rename to game/entity_classes/naturalist/spell_effects/textures/star.png diff --git a/game/modules/entity_classes/naturalist/spell_effects/textures/star.png.import b/game/entity_classes/naturalist/spell_effects/textures/star.png.import similarity index 68% rename from game/modules/entity_classes/naturalist/spell_effects/textures/star.png.import rename to game/entity_classes/naturalist/spell_effects/textures/star.png.import index edcd6df8..1c9a707e 100644 --- a/game/modules/entity_classes/naturalist/spell_effects/textures/star.png.import +++ b/game/entity_classes/naturalist/spell_effects/textures/star.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/star.png-f0edde12a69ecac5a6b2138bcc202fd5.stex" +path="res://.import/star.png-c183c5ae10449ab52d3c3f5e9ce2bfee.stex" metadata={ "vram_texture": false } [deps] -source_file="res://modules/entity_classes/naturalist/spell_effects/textures/star.png" -dest_files=[ "res://.import/star.png-f0edde12a69ecac5a6b2138bcc202fd5.stex" ] +source_file="res://entity_classes/naturalist/spell_effects/textures/star.png" +dest_files=[ "res://.import/star.png-c183c5ae10449ab52d3c3f5e9ce2bfee.stex" ] [params] diff --git a/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres b/game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres similarity index 64% rename from game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres rename to game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres index b935c835..bedc2690 100644 --- a/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres +++ b/game/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres @@ -1,22 +1,22 @@ [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/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=3] +[ext_resource path="res://entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=1] +[ext_resource path="res://entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=2] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" 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] +[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=5] [sub_resource type="EntityResourceCostDataResource" id=1] cost = 34 -entity_resource_data = ExtResource( 1 ) +entity_resource_data = ExtResource( 5 ) [resource] resource_name = "Aspect of Scorpions" id = 0 spell_type = 8 rank = 1 -icon = ExtResource( 5 ) -visual_spell_effects = ExtResource( 3 ) +icon = ExtResource( 3 ) +visual_spell_effects = ExtResource( 2 ) text_name = "Aspect of Scorpions" text_description = "Range: 26m. Casttime: %%cast_cast_time . @@ -31,7 +31,7 @@ resource_cost = SubResource( 1 ) aura_time = 30.0 aura_tick = 3.0 aura_debuff = true -aura_group = ExtResource( 6 ) +aura_group = ExtResource( 1 ) aura_text_description = "Deals %%damage_min to %%damage_max damage every %%tick sec, and increases damage taken by 10% for 30 sec." aura_damage_enabled = true aura_damage_type = 8 diff --git a/game/modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres b/game/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres similarity index 68% rename from game/modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres rename to game/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres index a67198e9..88e9592f 100644 --- a/game/modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres +++ b/game/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://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] +[ext_resource path="res://entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=1] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=2] +[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=3] [resource] resource_name = "Aspect of Wasps" spell_type = 8 level = 2 rank = 10 -icon = ExtResource( 3 ) +icon = ExtResource( 2 ) text_name = "Aspect of Wasps" text_description = "Range: 26m. Instant. @@ -21,10 +21,10 @@ aura_time = 21.0 aura_tick = 1.0 aura_debuff = true aura_type = 1 -aura_group = ExtResource( 4 ) +aura_group = ExtResource( 1 ) 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 ) +script = ExtResource( 3 ) diff --git a/game/modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres b/game/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres similarity index 85% rename from game/modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres rename to game/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres index 0c9e48c9..8d0469d9 100644 --- a/game/modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres +++ b/game/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres @@ -2,7 +2,7 @@ [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] [ext_resource path="res://icons/naturalist/AspectOfScorpions.png" type="Texture" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=4] +[ext_resource path="res://entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=3] [resource] resource_name = "Aspect of Wolves" @@ -22,7 +22,7 @@ aura_time = 22.0 aura_tick = 2.0 aura_debuff = true aura_type = 1 -aura_group = ExtResource( 4 ) +aura_group = ExtResource( 3 ) aura_text_description = "Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% for 22 sec." aura_damage_enabled = true aura_damage_type = 16 diff --git a/game/modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres b/game/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres similarity index 76% rename from game/modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres rename to game/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres index 4bf65f8d..69c60fe5 100644 --- a/game/modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres +++ b/game/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres @@ -1,8 +1,8 @@ [gd_resource type="Spell" load_steps=4 format=2] +[ext_resource path="res://entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" 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] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3] [resource] resource_name = "Aspect of Bees" @@ -25,7 +25,7 @@ aura_time = 21.0 aura_tick = 3.0 aura_debuff = true aura_type = 1 -aura_group = ExtResource( 4 ) +aura_group = ExtResource( 1 ) aura_text_description = "Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage." aura_damage_enabled = true aura_damage_type = 16 diff --git a/game/modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres b/game/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres similarity index 69% rename from game/modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres rename to game/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres index 2e0091fa..26b05650 100644 --- a/game/modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres +++ b/game/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres @@ -1,15 +1,15 @@ [gd_resource type="Spell" load_steps=7 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1] +[ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" 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://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=4] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=5] +[ext_resource path="res://entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=3] +[ext_resource path="res://entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=4] +[ext_resource path="res://entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=5] [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 2 ) -spell_cast_effect_left_hand = ExtResource( 1 ) -spell_cast_effect_right_hand = ExtResource( 1 ) +spell_cast_effect_left_hand = ExtResource( 3 ) +spell_cast_effect_right_hand = ExtResource( 3 ) torso_aura_effect_time = 0.0 root_aura_effect_time = 0.0 torso_spell_cast_finish_effect = ExtResource( 5 ) @@ -43,4 +43,4 @@ 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 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres b/game/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres similarity index 69% rename from game/modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres rename to game/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres index d57e9eaf..26725649 100644 --- a/game/modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres +++ b/game/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=3 format=2] -[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] +[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] +[ext_resource path="res://entity_classes/naturalist/icons/rejuvenation.tres" type="Texture" id=2] [resource] resource_name = "Rejuvenation" @@ -10,10 +10,10 @@ spell_type = 8 target_type = 2 target_relation_type = 4 rank = 1 -icon = ExtResource( 3 ) +icon = ExtResource( 2 ) 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( 2 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres b/game/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres similarity index 77% rename from game/modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres rename to game/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres index c6617dff..07233b4d 100644 --- a/game/modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres +++ b/game/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=3 format=2] -[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] +[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] +[ext_resource path="res://entity_classes/naturalist/icons/close_wounds.tres" type="Texture" id=2] [resource] resource_name = "Close Wounds" @@ -9,7 +9,7 @@ id = 6 spell_type = 8 target_type = 2 rank = 1 -icon = ExtResource( 3 ) +icon = ExtResource( 2 ) text_name = "Close Wounds" text_description = "Casttime: 2 sec. Cooldown: %%cooldown_cooldown sec @@ -23,4 +23,4 @@ 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 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres b/game/entity_classes/naturalist/spells/17_ironbark_rank_1.tres similarity index 80% rename from game/modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres rename to game/entity_classes/naturalist/spells/17_ironbark_rank_1.tres index c05bf406..afad6daa 100644 --- a/game/modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres +++ b/game/entity_classes/naturalist/spells/17_ironbark_rank_1.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=3 format=2] -[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] +[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] +[ext_resource path="res://entity_classes/naturalist/icons/ironbark.tres" type="Texture" id=2] [resource] resource_name = "Ironbark" @@ -21,4 +21,4 @@ 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 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres b/game/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres similarity index 80% rename from game/modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres rename to game/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres index b623a29c..7cedc98d 100644 --- a/game/modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres +++ b/game/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=3 format=2] -[ext_resource path="res://scripts/auras/SpeedModAura.gd" type="Script" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/icons/natures_swiftness.tres" type="Texture" id=3] +[ext_resource path="res://scripts/auras/SpeedModAura.gd" type="Script" id=1] +[ext_resource path="res://entity_classes/naturalist/icons/natures_swiftness.tres" type="Texture" id=2] [resource] resource_name = "Nature's Swiftness" @@ -10,7 +10,7 @@ spell_type = 8 target_type = 520 target_relation_type = 1 rank = 1 -icon = ExtResource( 3 ) +icon = ExtResource( 2 ) text_name = "Nature's Swiftness" text_description = "Instant. Cooldown: %%cooldown_cooldown sec @@ -22,6 +22,6 @@ 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 ) +script = ExtResource( 1 ) does_stack = true mod_speed = 40.0 diff --git a/game/modules/entity_classes/naturalist/spells/19_uproot_rank_1.tres b/game/entity_classes/naturalist/spells/19_uproot_rank_1.tres similarity index 84% rename from game/modules/entity_classes/naturalist/spells/19_uproot_rank_1.tres rename to game/entity_classes/naturalist/spells/19_uproot_rank_1.tres index 59a0b626..1824c0a9 100644 --- a/game/modules/entity_classes/naturalist/spells/19_uproot_rank_1.tres +++ b/game/entity_classes/naturalist/spells/19_uproot_rank_1.tres @@ -1,7 +1,7 @@ [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/icons/uproot.tres" type="Texture" id=2] +[ext_resource path="res://entity_classes/naturalist/icons/uproot.tres" type="Texture" id=2] [resource] resource_name = "Uproot" diff --git a/game/modules/entity_classes/naturalist/spells/20_root_rank_1.tres b/game/entity_classes/naturalist/spells/20_root_rank_1.tres similarity index 72% rename from game/modules/entity_classes/naturalist/spells/20_root_rank_1.tres rename to game/entity_classes/naturalist/spells/20_root_rank_1.tres index 4f112408..01d3d1aa 100644 --- a/game/modules/entity_classes/naturalist/spells/20_root_rank_1.tres +++ b/game/entity_classes/naturalist/spells/20_root_rank_1.tres @@ -1,14 +1,14 @@ [gd_resource type="Spell" load_steps=3 format=2] -[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] +[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] +[ext_resource path="res://entity_classes/naturalist/icons/root.tres" type="Texture" id=2] [resource] resource_name = "Root" id = 10 spell_type = 8 rank = 1 -icon = ExtResource( 3 ) +icon = ExtResource( 2 ) text_name = "Root" text_description = "Range: 26m. Casttime: 1.5 sec. @@ -21,4 +21,4 @@ aura_time = 10.0 aura_debuff = true aura_type = 1 aura_states_add = 4 -script = ExtResource( 2 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres b/game/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres similarity index 68% rename from game/modules/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres rename to game/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres index e4528064..668de801 100644 --- a/game/modules/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres +++ b/game/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.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/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] +[ext_resource path="res://entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=1] +[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2] +[ext_resource path="res://entity_classes/naturalist/icons/strength_of_nature.tres" type="Texture" id=3] [resource] resource_name = "Strength of Nature" @@ -12,7 +12,7 @@ target_type = -2147477248 target_relation_type = 24 level = 11 rank = 1 -icon = ExtResource( 2 ) +icon = ExtResource( 3 ) text_name = "Strength of Nature" text_description = "Instant. Cooldown: {2} @@ -26,10 +26,10 @@ aura_time = 30.0 aura_tick = 3.0 aura_debuff = true aura_type = 1 -aura_group = ExtResource( 3 ) +aura_group = ExtResource( 1 ) 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 ) +script = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres b/game/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres similarity index 69% rename from game/modules/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres rename to game/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres index 2e420896..b1b0e826 100644 --- a/game/modules/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres +++ b/game/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.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/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] +[ext_resource path="res://entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=1] +[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2] +[ext_resource path="res://entity_classes/naturalist/icons/shield_of_barbs.tres" type="Texture" id=3] [resource] resource_name = "Shield of Barbs" @@ -11,7 +11,7 @@ spell_type = 8 target_type = -2147456768 target_relation_type = 24 rank = 1 -icon = ExtResource( 2 ) +icon = ExtResource( 3 ) text_name = "Shield of Barbs" text_description = "Instant. Cooldown: {2} @@ -23,10 +23,10 @@ aura_time = 21.0 aura_tick = 1.0 aura_debuff = true aura_type = 1 -aura_group = ExtResource( 3 ) +aura_group = ExtResource( 1 ) 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 ) +script = ExtResource( 2 ) diff --git a/game/modules/entity_classes/naturalist/spells/23_calm_rank_1.tres b/game/entity_classes/naturalist/spells/23_calm_rank_1.tres similarity index 82% rename from game/modules/entity_classes/naturalist/spells/23_calm_rank_1.tres rename to game/entity_classes/naturalist/spells/23_calm_rank_1.tres index 038b3a5b..1c9cebc2 100644 --- a/game/modules/entity_classes/naturalist/spells/23_calm_rank_1.tres +++ b/game/entity_classes/naturalist/spells/23_calm_rank_1.tres @@ -1,7 +1,7 @@ [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/icons/calm.tres" type="Texture" id=2] +[ext_resource path="res://entity_classes/naturalist/icons/calm.tres" type="Texture" id=2] [resource] resource_name = "Calm" diff --git a/game/modules/entity_classes/naturalist/spells/24_attunement_rank_1.tres b/game/entity_classes/naturalist/spells/24_attunement_rank_1.tres similarity index 71% rename from game/modules/entity_classes/naturalist/spells/24_attunement_rank_1.tres rename to game/entity_classes/naturalist/spells/24_attunement_rank_1.tres index df9cd941..8448db09 100644 --- a/game/modules/entity_classes/naturalist/spells/24_attunement_rank_1.tres +++ b/game/entity_classes/naturalist/spells/24_attunement_rank_1.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=3 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/icons/attunement.tres" type="Texture" id=1] -[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=1] +[ext_resource path="res://entity_classes/naturalist/icons/attunement.tres" type="Texture" id=2] [resource] resource_name = "Attunement" @@ -10,7 +10,7 @@ spell_type = 8 target_type = -2147448576 target_relation_type = 24 rank = 1 -icon = ExtResource( 1 ) +icon = ExtResource( 2 ) 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( 2 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spells/25_inner_will.tres b/game/entity_classes/naturalist/spells/25_inner_will.tres similarity index 84% rename from game/modules/entity_classes/naturalist/spells/25_inner_will.tres rename to game/entity_classes/naturalist/spells/25_inner_will.tres index 96475fb4..4c4af5fa 100644 --- a/game/modules/entity_classes/naturalist/spells/25_inner_will.tres +++ b/game/entity_classes/naturalist/spells/25_inner_will.tres @@ -1,7 +1,7 @@ [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/icons/inner_will.tres" type="Texture" id=2] +[ext_resource path="res://entity_classes/naturalist/icons/inner_will.tres" type="Texture" id=2] [resource] resource_name = "Inner Will" diff --git a/game/modules/entity_classes/naturalist/spells/26_rest.tres b/game/entity_classes/naturalist/spells/26_rest.tres similarity index 67% rename from game/modules/entity_classes/naturalist/spells/26_rest.tres rename to game/entity_classes/naturalist/spells/26_rest.tres index f4a317f1..2b4869e1 100644 --- a/game/modules/entity_classes/naturalist/spells/26_rest.tres +++ b/game/entity_classes/naturalist/spells/26_rest.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=3 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/icons/regenerate.tres" type="Texture" id=1] -[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=1] +[ext_resource path="res://entity_classes/naturalist/icons/regenerate.tres" type="Texture" id=2] [resource] resource_name = "Rest" @@ -9,9 +9,9 @@ id = 16 spell_type = 1 target_type = 2 target_relation_type = 24 -icon = ExtResource( 1 ) +icon = ExtResource( 2 ) text_name = "Rest" text_description = "Rest for 30 seconds, greatly increasing your regeneration." aoe_targetType = 5 aoe_colliderType = 1065353216 -script = ExtResource( 2 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres b/game/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres similarity index 70% rename from game/modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres rename to game/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres index bd609c7d..e46a96bc 100644 --- a/game/modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres +++ b/game/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres @@ -1,8 +1,8 @@ [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://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/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=4] +[ext_resource path="res://entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=4] [resource] resource_name = "Aspect of Scorpions" diff --git a/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres b/game/entity_classes/naturalist/spells/28_aspectofwasps.tres similarity index 81% rename from game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres rename to game/entity_classes/naturalist/spells/28_aspectofwasps.tres index 4afb7ae4..6ccf634b 100644 --- a/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres +++ b/game/entity_classes/naturalist/spells/28_aspectofwasps.tres @@ -1,7 +1,7 @@ [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/icons/aspect_of_wasps.tres" type="Texture" id=3] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3] [resource] resource_name = "Aspect of Wasps" diff --git a/game/modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres b/game/entity_classes/naturalist/spells/29_aspect_of_wolves.tres similarity index 78% rename from game/modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres rename to game/entity_classes/naturalist/spells/29_aspect_of_wolves.tres index f57edde9..6317a432 100644 --- a/game/modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres +++ b/game/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/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] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=3] +[ext_resource path="res://entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=4] [resource] resource_name = "Aspect of Wolves" diff --git a/game/modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres b/game/entity_classes/naturalist/spells/30_aspect_of_bees.tres similarity index 78% rename from game/modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres rename to game/entity_classes/naturalist/spells/30_aspect_of_bees.tres index a5721027..82399304 100644 --- a/game/modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres +++ b/game/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/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] +[ext_resource path="res://entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3] +[ext_resource path="res://entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=4] [resource] resource_name = "Aspect of Bees" diff --git a/game/modules/entity_classes/naturalist/spells/35_strike.tres b/game/entity_classes/naturalist/spells/35_strike.tres similarity index 67% rename from game/modules/entity_classes/naturalist/spells/35_strike.tres rename to game/entity_classes/naturalist/spells/35_strike.tres index efde26a6..2303a193 100644 --- a/game/modules/entity_classes/naturalist/spells/35_strike.tres +++ b/game/entity_classes/naturalist/spells/35_strike.tres @@ -1,18 +1,18 @@ [gd_resource type="Spell" load_steps=7 format=2] -[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=3] -[ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=4] -[ext_resource path="res://modules/entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=5] +[ext_resource path="res://scripts/spells/amplify_pain.gd" type="Script" id=1] +[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2] +[ext_resource path="res://entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=3] +[ext_resource path="res://entity_classes/naturalist/icons/amplify_pain.tres" type="Texture" id=4] +[ext_resource path="res://entity_classes/naturalist/spell_effects/nature/AmplifyPain.tscn" type="PackedScene" id=5] [sub_resource type="SpellEffectVisual" id=1] -script = ExtResource( 1 ) +script = ExtResource( 2 ) spell_cast_effect_left_hand = ExtResource( 3 ) spell_cast_effect_right_hand = ExtResource( 3 ) torso_aura_effect_time = 0.0 root_aura_effect_time = 0.0 -torso_spell_cast_finish_effect = ExtResource( 2 ) +torso_spell_cast_finish_effect = ExtResource( 5 ) torso_spell_cast_finish_effect_time = 0.4 root_spell_cast_finish_effect_time = 1.0 @@ -21,7 +21,7 @@ resource_name = "Strike" id = 35 spell_type = 1 rank = 1 -icon = ExtResource( 5 ) +icon = ExtResource( 4 ) needs_target = true visual_spell_effects = SubResource( 1 ) text_name = "Strike" @@ -39,4 +39,4 @@ damage_scale_stat = 41 damage_scale_coeff = 1.0 aoe_targetType = -1910718371 aoe_colliderType = 1065353216 -script = ExtResource( 4 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/spells/36_regrow.tres b/game/entity_classes/naturalist/spells/36_regrow.tres similarity index 74% rename from game/modules/entity_classes/naturalist/spells/36_regrow.tres rename to game/entity_classes/naturalist/spells/36_regrow.tres index 731e6a9b..d0f28126 100644 --- a/game/modules/entity_classes/naturalist/spells/36_regrow.tres +++ b/game/entity_classes/naturalist/spells/36_regrow.tres @@ -1,12 +1,12 @@ [gd_resource type="Spell" load_steps=5 format=2] -[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" 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] +[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] +[ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=2] +[ext_resource path="res://entity_classes/naturalist/icons/root.tres" type="Texture" id=3] [sub_resource type="EntityResourceCostDataResource" id=1] cost = 90 -entity_resource_data = ExtResource( 1 ) +entity_resource_data = ExtResource( 2 ) [resource] resource_name = "Regrow" @@ -27,4 +27,4 @@ heal_max = 102 heal_scale_stat = 14 heal_scale_coeff = 0.1 resource_cost = SubResource( 1 ) -script = ExtResource( 2 ) +script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/stats/mob_statdata.tres b/game/entity_classes/naturalist/stats/mob_statdata.tres similarity index 100% rename from game/modules/entity_classes/naturalist/stats/mob_statdata.tres rename to game/entity_classes/naturalist/stats/mob_statdata.tres diff --git a/game/modules/entity_classes/naturalist/stats/player_statdata.tres b/game/entity_classes/naturalist/stats/player_statdata.tres similarity index 100% rename from game/modules/entity_classes/naturalist/stats/player_statdata.tres rename to game/entity_classes/naturalist/stats/player_statdata.tres diff --git a/game/modules/core/item_templates/2_test.tres b/game/modules/core/item_templates/2_test.tres index 8e024942..5827f1c6 100644 --- a/game/modules/core/item_templates/2_test.tres +++ b/game/modules/core/item_templates/2_test.tres @@ -1,6 +1,6 @@ [gd_resource type="ItemTemplate" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=1] +[ext_resource path="res://entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=1] [ext_resource path="res://icons/3_iron_bar.tres" type="Texture" id=2] [ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=3] diff --git a/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres b/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres index 70ed3a73..9f77fd57 100644 --- a/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres +++ b/game/modules/core/item_templates/3_chest_of_the_infinite_wisdom.tres @@ -3,7 +3,7 @@ [ext_resource path="res://modules/core/model_visuals/1_chest_of_the_infinite_wisdom.tres" type="ModelVisual" id=1] [ext_resource path="res://icons/4_chest_of_the_infinite_wisdom.tres" type="Texture" id=2] [ext_resource path="res://scripts/items/ItemTemplateGD.gd" type="Script" id=3] -[ext_resource path="res://modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=4] +[ext_resource path="res://entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=4] [resource] resource_name = "Chest of the Infinite Wisdom" diff --git a/game/modules/entity_classes/elementalist/2_elementalist.tres b/game/modules/entity_classes/elementalist/2_elementalist.tres deleted file mode 100644 index 00fd6be4..00000000 --- a/game/modules/entity_classes/elementalist/2_elementalist.tres +++ /dev/null @@ -1,27 +0,0 @@ -[gd_resource type="EntityClassData" load_steps=51 format=2] - -[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=1] -[ext_resource path="res://modules/entity_classes/elementalist/character_specs/2_elementalist_fire.tres" type="CharacterSpec" id=2] -[ext_resource path="res://modules/entity_classes/elementalist/character_specs/3_elementalist_water.tres" type="CharacterSpec" id=3] -[ext_resource path="res://modules/entity_classes/elementalist/character_specs/4_elementalist_ice.tres" type="CharacterSpec" id=4] -[ext_resource path="res://modules/entity_classes/elementalist/spells/34_cold.tres" type="Spell" id=5] -[ext_resource path="res://modules/entity_classes/elementalist/spells/32_heat.tres" type="Spell" id=6] -[ext_resource path="res://modules/entity_classes/elementalist/spells/33_normal.tres" type="Spell" id=7] - -[sub_resource type="SimpleLevelStatData" id=1] -agility = 4 -strength = 5 -stamina = 5 -intellect = 3 -spirit = 5 - -[resource] -resource_name = "Elementalist" -id = 2 -text_name = "Elementalist" -stat_data = SubResource( 43 ) -playstyle_type = 2 -specs = [ ExtResource( 2 ), ExtResource( 3 ), ExtResource( 4 ) ] -spells = [ ExtResource( 6 ), ExtResource( 7 ), ExtResource( 5 ) ] -start_spells = [ ExtResource( 7 ) ] -script = ExtResource( 1 ) diff --git a/game/modules/entity_classes/naturalist/1_naturalist.tres b/game/modules/entity_classes/naturalist/1_naturalist.tres deleted file mode 100644 index 0f3c93c4..00000000 --- a/game/modules/entity_classes/naturalist/1_naturalist.tres +++ /dev/null @@ -1,43 +0,0 @@ -[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/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] -[ext_resource path="res://modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=12] -[ext_resource path="res://scripts/entities/EntityClassDataGD.gd" type="Script" id=13] -[ext_resource path="res://modules/entity_classes/naturalist/spells/36_regrow.tres" type="Spell" id=14] -[ext_resource path="res://modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=15] -[ext_resource path="res://modules/entity_classes/naturalist/spells/26_rest.tres" type="Spell" id=16] -[ext_resource path="res://modules/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=17] -[ext_resource path="res://modules/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=18] -[ext_resource path="res://modules/entity_classes/naturalist/spells/20_root_rank_1.tres" type="Spell" id=19] -[ext_resource path="res://modules/entity_classes/naturalist/spells/23_calm_rank_1.tres" type="Spell" id=20] -[ext_resource path="res://modules/entity_classes/naturalist/spells/35_strike.tres" type="Spell" id=21] -[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 ) - -[resource] -resource_name = "Naturalist" -id = 1 -text_name = "Naturalist" -stat_data = ExtResource( 26 ) -entity_resources = [ ExtResource( 4 ) ] -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 ) ] -script = ExtResource( 13 ) diff --git a/game/modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres b/game/modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres deleted file mode 100644 index 4488404e..00000000 --- a/game/modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="SpellEffectVisual" load_steps=4 format=2] - -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/NatureCast.tscn" type="PackedScene" id=1] -[ext_resource path="res://scripts/resources/spell_effect_visual_basic.gd" type="Script" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/spell_effects/nature/AOSCastFinish.tscn" type="PackedScene" id=3] - -[resource] -script = ExtResource( 2 ) -spell_cast_effect_left_hand = ExtResource( 1 ) -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 ) -torso_spell_cast_finish_effect_time = 4.0 -root_spell_cast_finish_effect_time = 1.0 diff --git a/game/modules/entity_classes/naturalist/resource_db.tres b/game/modules/entity_classes/naturalist/resource_db.tres deleted file mode 100644 index d8e30f84..00000000 --- a/game/modules/entity_classes/naturalist/resource_db.tres +++ /dev/null @@ -1,44 +0,0 @@ -[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/specs/nature/talent_regrow_r2.tres" type="Spell" id=2] -[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/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Spell" id=6] -[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/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/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/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/specs/melee/talent_strike_r4.tres" type="Spell" id=15] -[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/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/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/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/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] -[ext_resource path="res://modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres" type="Spell" id=33] -[ext_resource path="res://modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres" type="Spell" id=34] -[ext_resource path="res://modules/entity_classes/naturalist/entities/1_naturalist.tres" type="EntityData" id=35] -[ext_resource path="res://modules/entity_classes/naturalist/entities/2_naturalist_mob.tres" type="EntityData" id=36] -[ext_resource path="res://modules/entity_classes/naturalist/spells/35_strike.tres" type="Spell" id=37] -[ext_resource path="res://modules/entity_classes/naturalist/spells/36_regrow.tres" type="Spell" id=38] -[ext_resource path="res://modules/entity_classes/naturalist/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 ), 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 ), ExtResource( 6 ), ExtResource( 7 ), ExtResource( 3 ), ExtResource( 10 ), ExtResource( 12 ), ExtResource( 17 ), ExtResource( 15 ), ExtResource( 16 ), ExtResource( 2 ), ExtResource( 8 ), ExtResource( 21 ) ] diff --git a/game/modules/entity_classes/naturalist/specs/aspects.tres b/game/modules/entity_classes/naturalist/specs/aspects.tres deleted file mode 100644 index cb57907b..00000000 --- a/game/modules/entity_classes/naturalist/specs/aspects.tres +++ /dev/null @@ -1,16 +0,0 @@ -[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 diff --git a/game/modules/entity_classes/naturalist/specs/melee.tres b/game/modules/entity_classes/naturalist/specs/melee.tres deleted file mode 100644 index a0712773..00000000 --- a/game/modules/entity_classes/naturalist/specs/melee.tres +++ /dev/null @@ -1,19 +0,0 @@ -[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 ) diff --git a/game/modules/entity_classes/naturalist/specs/nature.tres b/game/modules/entity_classes/naturalist/specs/nature.tres deleted file mode 100644 index 45f5139e..00000000 --- a/game/modules/entity_classes/naturalist/specs/nature.tres +++ /dev/null @@ -1,15 +0,0 @@ -[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 ) diff --git a/game/worlds/test_world/test_world.tres b/game/worlds/test_world/test_world.tres index e7f6e1d2..5c2067e9 100644 --- a/game/worlds/test_world/test_world.tres +++ b/game/worlds/test_world/test_world.tres @@ -7,8 +7,8 @@ [ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t2scene.tres" type="PropData" id=5] [ext_resource path="res://worlds/test_world/biomes/simple_biome/low_poly_rpg_item_collection_3/t1scene.tres" type="PropData" id=6] [ext_resource path="res://world_generator/zones/test_zone.gd" type="Script" id=7] -[ext_resource path="res://modules/entity_classes/naturalist/entities/4_naturalist_vendor.tres" type="EntityData" id=8] -[ext_resource path="res://modules/entity_classes/naturalist/entities/3_naturalist_trainer.tres" type="EntityData" id=9] +[ext_resource path="res://entity_classes/naturalist/entities/4_naturalist_vendor.tres" type="EntityData" id=8] +[ext_resource path="res://entity_classes/naturalist/entities/3_naturalist_trainer.tres" type="EntityData" id=9] [sub_resource type="Resource" id=2] resource_name = "Spawner"