diff --git a/HEADS b/HEADS index 2f1bbfe2..f9bb2363 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "3337694d687bc682599a3cbbf17f5c00e5c3dabd"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "5ac0fb660484494a6c00dffe66f98a8d10150a0a"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "d4b01890414197a8221c58ac944bcbca7f42f947"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "461c2a80a1e9fb3535203d1465bc9d89438146b3"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "terraman": {"master": "ae53ad5001a720ddb2eb52c46eea65dc2242ac9f"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "3337694d687bc682599a3cbbf17f5c00e5c3dabd"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "e14ba1e368fc16423afc3f10fbea8a4f1e409ba7"}, "ui_extensions": {"master": "f82273f54cb1ab87d458c91af9554acec5c10831"}, "voxelman": {"master": "9253cc53c6fbbd78b5e4268eb498ef55b4dd0181"}, "texture_packer": {"master": "a0786956813a85b5a82093a081b90c2f8a000e6c"}, "fastnoise": {"master": "d447fd5364e9ab5a6b14184483eab23cd3fe820b"}, "mesh_data_resource": {"master": "d4b01890414197a8221c58ac944bcbca7f42f947"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "2afd6eff45f9a921bdf4090ff3029def86df5cb5"}, "mesh_utils": {"master": "461c2a80a1e9fb3535203d1465bc9d89438146b3"}, "broken_seals_module": {"master": "2afea56eba66beeb543934edf5a38a8aa63fc79b"}, "thread_pool": {"master": "a02955e929fea4a4188d02850b187fa4048145a2"}, "terraman": {"master": "ae53ad5001a720ddb2eb52c46eea65dc2242ac9f"}} \ No newline at end of file diff --git a/game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres b/game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres index 6e0bcb01..569967d3 100644 --- a/game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/1_aspect_of_scorpions.tres" type="AuraGroup" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres b/game/modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres index 45139782..1f0cba4c 100644 --- a/game/modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres +++ b/game/modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/2_aspect_of_wasps.tres" type="AuraGroup" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres b/game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres index 33effc98..cf736c6a 100644 --- a/game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/3_aspect_of_wolves.tres" type="AuraGroup" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres b/game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres index f15ff760..606c1e19 100644 --- a/game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/aura_groups/4_aspect_of_bees.tres" type="AuraGroup" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres b/game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres index 49a69943..ba2a29f0 100644 --- a/game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/rejuvenation.tres" type="Texture" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres b/game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres index 12b2c40d..9c25b56e 100644 --- a/game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/close_wounds.tres" type="Texture" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres b/game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres index e9941ff8..2ec7c443 100644 --- a/game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/ironbark.tres" type="Texture" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres b/game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres index 9c573027..ac533d69 100644 --- a/game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/SpeedModAura.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/effect_data/natures_swiftness.tres" type="SpellEffectVisual" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/20_root_rank_1.tres b/game/modules/entity_classes/naturalist/auras/20_root_rank_1.tres index e42d88ba..e859bccc 100644 --- a/game/modules/entity_classes/naturalist/auras/20_root_rank_1.tres +++ b/game/modules/entity_classes/naturalist/auras/20_root_rank_1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres b/game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres index c0ba8d1e..ef3ecc3b 100644 --- a/game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres +++ b/game/modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres b/game/modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres index 13002ba2..b0b4814a 100644 --- a/game/modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres +++ b/game/modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres b/game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres index 95797819..619d7628 100644 --- a/game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres +++ b/game/modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=2] diff --git a/game/modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres b/game/modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres index befc9534..df8c47f8 100644 --- a/game/modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres +++ b/game/modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/auras/aura_script.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=2] diff --git a/game/modules/entity_classes/naturalist/resource_db.tres b/game/modules/entity_classes/naturalist/resource_db.tres index fffbcfdc..36bb4289 100644 --- a/game/modules/entity_classes/naturalist/resource_db.tres +++ b/game/modules/entity_classes/naturalist/resource_db.tres @@ -1,34 +1,34 @@ [gd_resource type="ESSResourceDBStatic" load_steps=52 format=2] [ext_resource path="res://modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres" type="Spell" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Aura" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres" type="Aura" id=3] +[ext_resource path="res://modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Spell" id=2] +[ext_resource path="res://modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres" type="Spell" id=3] [ext_resource path="res://modules/entity_classes/naturalist/spells/19_uproot_rank_1.tres" type="Spell" id=4] [ext_resource path="res://modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres" type="Spell" id=5] -[ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=6] -[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=7] -[ext_resource path="res://modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres" type="Aura" id=8] +[ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Spell" id=6] +[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Spell" id=7] +[ext_resource path="res://modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres" type="Spell" id=8] [ext_resource path="res://modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres" type="Spell" id=9] -[ext_resource path="res://modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=10] +[ext_resource path="res://modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Spell" id=10] [ext_resource path="res://modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=11] -[ext_resource path="res://modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Aura" id=12] +[ext_resource path="res://modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=12] [ext_resource path="res://modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres" type="Spell" id=13] [ext_resource path="res://modules/entity_classes/naturalist/spells/24_attunement_rank_1.tres" type="Spell" id=14] -[ext_resource path="res://modules/entity_classes/naturalist/auras/20_root_rank_1.tres" type="Aura" id=15] -[ext_resource path="res://modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres" type="Aura" id=16] -[ext_resource path="res://modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres" type="Aura" id=17] +[ext_resource path="res://modules/entity_classes/naturalist/auras/20_root_rank_1.tres" type="Spell" id=15] +[ext_resource path="res://modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres" type="Spell" id=16] +[ext_resource path="res://modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres" type="Spell" id=17] [ext_resource path="res://modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres" type="Spell" id=18] [ext_resource path="res://modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres" type="Spell" id=19] [ext_resource path="res://modules/entity_classes/naturalist/spells/28_aspectofwasps.tres" type="Spell" id=20] -[ext_resource path="res://modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres" type="Aura" id=21] +[ext_resource path="res://modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres" type="Spell" id=21] [ext_resource path="res://modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres" type="Spell" id=22] [ext_resource path="res://modules/entity_classes/naturalist/spells/14_amplify_pain_rank_1.tres" type="Spell" id=23] -[ext_resource path="res://modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres" type="Aura" id=24] +[ext_resource path="res://modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres" type="Spell" id=24] [ext_resource path="res://modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres" type="Spell" id=25] [ext_resource path="res://modules/entity_classes/naturalist/spells/26_rest.tres" type="Spell" id=26] [ext_resource path="res://modules/entity_classes/naturalist/spells/22_shield_of_barbs_rank_1.tres" type="Spell" id=27] [ext_resource path="res://modules/entity_classes/naturalist/spells/21_strength_of_nature_rank_1.tres" type="Spell" id=28] -[ext_resource path="res://modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Aura" id=29] +[ext_resource path="res://modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Spell" id=29] [ext_resource path="res://modules/entity_classes/naturalist/spells/20_root_rank_1.tres" type="Spell" id=30] [ext_resource path="res://modules/entity_classes/naturalist/spells/23_calm_rank_1.tres" type="Spell" id=31] [ext_resource path="res://modules/entity_classes/naturalist/spells/25_inner_will.tres" type="Spell" id=32] @@ -38,17 +38,17 @@ [ext_resource path="res://modules/entity_classes/naturalist/entities/2_naturalist_mob.tres" type="EntityData" id=36] [ext_resource path="res://modules/entity_classes/naturalist/spells/35_strike.tres" type="Spell" id=37] [ext_resource path="res://modules/entity_classes/naturalist/spells/36_regrow.tres" type="Spell" id=38] -[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Aura" id=39] -[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Aura" id=40] -[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Aura" id=41] -[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Aura" id=42] -[ext_resource path="res://modules/entity_classes/naturalist/specs/talent_regrow_r1.tres" type="Aura" id=43] -[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres" type="Aura" id=44] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Aura" id=45] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Aura" id=46] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Aura" id=47] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres" type="Aura" id=48] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Aura" id=49] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Spell" id=39] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Spell" id=40] +[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Spell" id=41] +[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Spell" id=42] +[ext_resource path="res://modules/entity_classes/naturalist/specs/talent_regrow_r1.tres" type="Spell" id=43] +[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres" type="Spell" id=44] +[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Spell" id=45] +[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Spell" id=46] +[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Spell" id=47] +[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres" type="Spell" id=48] +[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Spell" id=49] [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] diff --git a/game/modules/entity_classes/naturalist/specs/aspects.tres b/game/modules/entity_classes/naturalist/specs/aspects.tres index 366fbec5..7e9c0625 100644 --- a/game/modules/entity_classes/naturalist/specs/aspects.tres +++ b/game/modules/entity_classes/naturalist/specs/aspects.tres @@ -1,10 +1,10 @@ [gd_resource type="CharacterSpec" load_steps=6 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=3] -[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres" type="Aura" id=4] -[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres" type="Aura" id=5] -[ext_resource path="res://modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres" type="Aura" id=6] +[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Spell" id=2] +[ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Spell" id=3] +[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" diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres index edaf2e5d..3e7696c2 100644 --- a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres +++ b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r1.tres @@ -1,15 +1,15 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2] [resource] resource_name = "Improved Asperct of Scorpions" -icon = ExtResource( 2 ) rank = 1 +icon = ExtResource( 2 ) +text_name = "Improved Asperct of Scorpions" aura_type = 6 aura_hide = true -text_name = "Improved Asperct of Scorpions" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 1 ) spell_name = "Aspect of Scorpions" diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres index 71b8ba67..5f4aee46 100644 --- a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres +++ b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r2.tres @@ -1,15 +1,15 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2] [resource] resource_name = "Improved Asperct of Scorpions" -icon = ExtResource( 2 ) rank = 2 +icon = ExtResource( 2 ) +text_name = "Improved Asperct of Scorpions" aura_type = 6 aura_hide = true -text_name = "Improved Asperct of Scorpions" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 1 ) spell_name = "Aspect of Scorpions" diff --git a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres index 4a7fa9a9..65e5e6e8 100644 --- a/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres +++ b/game/modules/entity_classes/naturalist/specs/aspects/talent_aspect_of_scorpions_r3.tres @@ -1,15 +1,15 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=2] [resource] resource_name = "Improved Asperct of Scorpions" -icon = ExtResource( 2 ) rank = 3 +icon = ExtResource( 2 ) +text_name = "Improved Asperct of Scorpions" aura_type = 6 aura_hide = true -text_name = "Improved Asperct of Scorpions" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 1 ) spell_name = "Aspect of Scorpions" diff --git a/game/modules/entity_classes/naturalist/specs/melee.tres b/game/modules/entity_classes/naturalist/specs/melee.tres index 4a58debb..a0712773 100644 --- a/game/modules/entity_classes/naturalist/specs/melee.tres +++ b/game/modules/entity_classes/naturalist/specs/melee.tres @@ -1,10 +1,10 @@ [gd_resource type="CharacterSpec" load_steps=6 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres" type="Aura" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres" type="Aura" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres" type="Aura" id=3] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres" type="Aura" id=4] -[ext_resource path="res://modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres" type="Aura" id=5] +[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" diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres index cbb665ef..1c31b980 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r1.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[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] diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres index d4a3cf72..2ec54f10 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r2.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[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] diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres index b378038b..d548996d 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r3.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[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] diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres index 6e51c400..c450e234 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r4.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[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] diff --git a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres index d891b449..2cfe07b7 100644 --- a/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres +++ b/game/modules/entity_classes/naturalist/specs/melee/talent_strike_r5.tres @@ -1,4 +1,4 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[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] diff --git a/game/modules/entity_classes/naturalist/specs/nature.tres b/game/modules/entity_classes/naturalist/specs/nature.tres index f08fbc6d..0d68657d 100644 --- a/game/modules/entity_classes/naturalist/specs/nature.tres +++ b/game/modules/entity_classes/naturalist/specs/nature.tres @@ -1,8 +1,8 @@ [gd_resource type="CharacterSpec" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres" type="Aura" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/specs/talent_regrow_r1.tres" type="Aura" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres" type="Aura" id=3] +[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/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" diff --git a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres b/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres index 7d4a291a..e8f09ef1 100644 --- a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres +++ b/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r2.tres @@ -1,15 +1,15 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=1] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] resource_name = "Improved Regrow" -icon = ExtResource( 1 ) rank = 2 +icon = ExtResource( 1 ) +text_name = "Improved Regrow" aura_type = 6 aura_hide = true -text_name = "Improved Regrow" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 2 ) spell_name = "Regrow" diff --git a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres b/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres index c9ecafb4..8034cd8d 100644 --- a/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres +++ b/game/modules/entity_classes/naturalist/specs/nature/talent_regrow_r3.tres @@ -1,15 +1,15 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=1] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] resource_name = "Improved Regrow" -icon = ExtResource( 1 ) rank = 3 +icon = ExtResource( 1 ) +text_name = "Improved Regrow" aura_type = 6 aura_hide = true -text_name = "Improved Regrow" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 2 ) spell_name = "Regrow" diff --git a/game/modules/entity_classes/naturalist/specs/talent_regrow_r1.tres b/game/modules/entity_classes/naturalist/specs/talent_regrow_r1.tres index 25ae56fe..0f75882e 100644 --- a/game/modules/entity_classes/naturalist/specs/talent_regrow_r1.tres +++ b/game/modules/entity_classes/naturalist/specs/talent_regrow_r1.tres @@ -1,15 +1,15 @@ -[gd_resource type="Aura" load_steps=3 format=2] +[gd_resource type="Spell" load_steps=3 format=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=1] [ext_resource path="res://scripts/auras/CastTimeReductionAura.gd" type="Script" id=2] [resource] resource_name = "Improved Regrow" -icon = ExtResource( 1 ) rank = 1 +icon = ExtResource( 1 ) +text_name = "Improved Regrow" aura_type = 6 aura_hide = true -text_name = "Improved Regrow" aura_text_description = "Reduces the cast time of Aspect of Scorpions by %%reduction_value seconds." script = ExtResource( 2 ) spell_name = "Regrow" diff --git a/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres b/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres index dc3e1ac3..e1c0495c 100644 --- a/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=7 format=2] [ext_resource path="res://modules/core/entity_resources/1_mana_resource.tres" type="EntityResource" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Aura" id=2] +[ext_resource path="res://modules/entity_classes/naturalist/auras/10_aspect_of_scorpions_rank_1.tres" type="Spell" id=2] [ext_resource path="res://modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=3] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=4] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=5] diff --git a/game/modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres b/game/modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres index 38c0b067..3ce3b5c6 100644 --- a/game/modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/11_aspect_of_wasps_rank_1.tres @@ -1,6 +1,5 @@ -[gd_resource type="Spell" load_steps=4 format=2] +[gd_resource type="Spell" load_steps=3 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/11_aspect_of_wasps_rank1.tres" type="Aura" id=1] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3] @@ -10,7 +9,6 @@ spell_type = 8 level = 2 rank = 1 icon = ExtResource( 3 ) -target_aura_applys = [ ExtResource( 1 ) ] text_name = "Aspect of Wasps" text_description = "Range: 26m. Instant. diff --git a/game/modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres b/game/modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres index f686c3d1..db8efa5e 100644 --- a/game/modules/entity_classes/naturalist/spells/12_aspect_of_wolves_rank_1.tres +++ b/game/modules/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://modules/icons/Naturalist/AspectOfScorpions.png" type="Texture" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Aura" id=3] +[ext_resource path="res://modules/entity_classes/naturalist/auras/12_aspect_of_wolves_rank_1.tres" type="Spell" id=3] [resource] resource_name = "Aspect of Wolves" diff --git a/game/modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres b/game/modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres index 7d9dda66..e53777b2 100644 --- a/game/modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/13_aspect_of_bees_rank_1.tres @@ -1,6 +1,6 @@ [gd_resource type="Spell" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Aura" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/auras/13_aspect_of_bees_rank_1.tres" type="Spell" 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] diff --git a/game/modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres b/game/modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres index b0e0f5fe..1e368fee 100644 --- a/game/modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/15_rejuvenation_rank_1.tres @@ -1,6 +1,6 @@ [gd_resource type="Spell" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres" type="Aura" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/auras/14_rejuvenation_rank_1.tres" type="Spell" id=1] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/rejuvenation.tres" type="Texture" id=3] diff --git a/game/modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres b/game/modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres index f45754b6..aa92d6e1 100644 --- a/game/modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/16_close_wounds_rank_1.tres @@ -1,6 +1,6 @@ [gd_resource type="Spell" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Aura" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/auras/15_close_wounds_rank_1.tres" type="Spell" id=1] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/close_wounds.tres" type="Texture" id=3] diff --git a/game/modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres b/game/modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres index d267a0e7..5c38beb5 100644 --- a/game/modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/17_ironbark_rank_1.tres @@ -1,6 +1,6 @@ [gd_resource type="Spell" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Aura" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/auras/16_ironbark_rank_1.tres" type="Spell" id=1] [ext_resource path="res://modules/entity_classes/naturalist/icons/ironbark.tres" type="Texture" id=2] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=3] diff --git a/game/modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres b/game/modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres index 5826660a..f8cde46e 100644 --- a/game/modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/18_natures_swiftness_rank_1.tres @@ -1,6 +1,6 @@ [gd_resource type="Spell" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Aura" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/auras/17_natures_swiftness_rank_1.tres" type="Spell" 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/natures_swiftness.tres" type="Texture" id=3] diff --git a/game/modules/entity_classes/naturalist/spells/20_root_rank_1.tres b/game/modules/entity_classes/naturalist/spells/20_root_rank_1.tres index 6380e1d8..57767698 100644 --- a/game/modules/entity_classes/naturalist/spells/20_root_rank_1.tres +++ b/game/modules/entity_classes/naturalist/spells/20_root_rank_1.tres @@ -1,6 +1,6 @@ [gd_resource type="Spell" load_steps=4 format=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/20_root_rank_1.tres" type="Aura" id=1] +[ext_resource path="res://modules/entity_classes/naturalist/auras/20_root_rank_1.tres" type="Spell" 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] diff --git a/game/modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres b/game/modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres index 8ff515c0..0e645a2d 100644 --- a/game/modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres +++ b/game/modules/entity_classes/naturalist/spells/27_aspect_of_scorpions.tres @@ -2,7 +2,7 @@ [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=1] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2] -[ext_resource path="res://modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres" type="Aura" id=3] +[ext_resource path="res://modules/entity_classes/naturalist/auras/21_aspect_of_scorpions.tres" type="Spell" id=3] [ext_resource path="res://modules/entity_classes/naturalist/effect_data/aspect_of_scorpions.tres" type="SpellEffectVisual" id=4] [resource] diff --git a/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres b/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres index 60154202..91cdd578 100644 --- a/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres +++ b/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres" type="Aura" id=2] +[ext_resource path="res://modules/entity_classes/naturalist/auras/22_aspect_of_wasps.tres" type="Spell" id=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wasps.tres" type="Texture" id=3] [resource] diff --git a/game/modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres b/game/modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres index c3ece617..12f81faf 100644 --- a/game/modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres +++ b/game/modules/entity_classes/naturalist/spells/29_aspect_of_wolves.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres" type="Aura" id=2] +[ext_resource path="res://modules/entity_classes/naturalist/auras/23_aspect_of_wolves.tres" type="Spell" id=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_wolves.tres" type="Texture" id=3] [resource] diff --git a/game/modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres b/game/modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres index 47880345..b8eb91e6 100644 --- a/game/modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres +++ b/game/modules/entity_classes/naturalist/spells/30_aspect_of_bees.tres @@ -1,7 +1,7 @@ [gd_resource type="Spell" load_steps=4 format=2] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] -[ext_resource path="res://modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres" type="Aura" id=2] +[ext_resource path="res://modules/entity_classes/naturalist/auras/24_aspect_of_bees.tres" type="Spell" id=2] [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_bees.tres" type="Texture" id=3] [resource] diff --git a/game/project.godot b/game/project.godot index ecdc1e9f..c96d2391 100644 --- a/game/project.godot +++ b/game/project.godot @@ -9,7 +9,7 @@ config_version=4 _global_script_classes=[ { -"base": "Aura", +"base": "Spell", "class": "AuraGD", "language": "GDScript", "path": "res://scripts/auras/aura_script.gd" diff --git a/game/scripts/ai/EntityAIGD.gd b/game/scripts/ai/EntityAIGD.gd index 24006ba4..9261e47c 100644 --- a/game/scripts/ai/EntityAIGD.gd +++ b/game/scripts/ai/EntityAIGD.gd @@ -49,8 +49,8 @@ func _on_set_owner(): for i in range(class_data.get_num_spells()): var spell : Spell = class_data.get_spell(i) - if spell.get_num_target_aura_applys() > 0: - var aura : Aura = spell.get_target_aura_apply(0) + if spell.spells_cast_on_target_num_get() > 0: + var aura : Spell = spell.spell_cast_on_target_get(0) if not _data["target_aura_spells"].has(aura.aura_group): _data["target_aura_spells"][aura.aura_group] = [] diff --git a/game/scripts/auras/CastTimeReductionAura.gd b/game/scripts/auras/CastTimeReductionAura.gd index a6cf9474..271d2a9e 100644 --- a/game/scripts/auras/CastTimeReductionAura.gd +++ b/game/scripts/auras/CastTimeReductionAura.gd @@ -1,9 +1,9 @@ -extends Aura +extends Spell export(String) var spell_name : String export(float) var reduction_value : float -func _notification_ccast(what : int, data : AuraData, info: SpellCastInfo): +func _notification_aura_ccast(what : int, data : AuraData, info: SpellCastInfo): if SpellEnums.NOTIFICATION_CAST_STARTED: if info.spell.get_name() == spell_name: info.cast_time -= reduction_value diff --git a/game/scripts/auras/aura_script.gd b/game/scripts/auras/aura_script.gd index 63899974..145b6e0a 100644 --- a/game/scripts/auras/aura_script.gd +++ b/game/scripts/auras/aura_script.gd @@ -1,4 +1,4 @@ -extends Aura +extends Spell class_name AuraGD # Copyright (c) 2019-2021 Péter Magyar diff --git a/game/scripts/entities/EntityClassDataGD.gd b/game/scripts/entities/EntityClassDataGD.gd index 71b50e2b..0ead663f 100644 --- a/game/scripts/entities/EntityClassDataGD.gd +++ b/game/scripts/entities/EntityClassDataGD.gd @@ -32,8 +32,8 @@ func _init(): for i in range(get_num_spells()): var spell : Spell = get_spell(i) - if spell.get_num_target_aura_applys() > 0: - var aura : Aura = spell.get_target_aura_apply(0) + if spell.spells_cast_on_target_num_get() > 0: + var aura : Spell = spell.spell_cast_on_target_get(0) if not _data["target_aura_spells"].has(aura.aura_group): _data["target_aura_spells"][aura.aura_group] = [] diff --git a/game/scripts/spells/amplify_pain.gd b/game/scripts/spells/amplify_pain.gd index de2182c7..f7dcf897 100644 --- a/game/scripts/spells/amplify_pain.gd +++ b/game/scripts/spells/amplify_pain.gd @@ -31,7 +31,7 @@ func _cast_finishs(info : SpellCastInfo) -> void: var ad : AuraData = target.aura_gets(i) if ad.caster == info.caster: - var aura : Aura = ad.aura + var aura : Spell = ad.aura if aura.aura_type & SpellEnums.AURA_TYPE_MAGIC != 0: ad.time_since_last_tick += ad.tick diff --git a/game/scripts/spells/gd_spell_script.gd b/game/scripts/spells/gd_spell_script.gd index 54a3bb2e..2f90b11c 100644 --- a/game/scripts/spells/gd_spell_script.gd +++ b/game/scripts/spells/gd_spell_script.gd @@ -173,7 +173,7 @@ func handle_effect(info : SpellCastInfo) -> void: handle_spell_heal(shi) - for aura in caster_aura_applys: + for aura in spells_cast_on_caster: var ainfo : AuraApplyInfo = AuraApplyInfo.new() ainfo.caster = info.caster @@ -184,7 +184,7 @@ func handle_effect(info : SpellCastInfo) -> void: aura.aura_sapply(ainfo) if info.target != null: - for aura in target_aura_applys: + for aura in spells_cast_on_target: var ad : AuraData = null if aura.aura_group != null: diff --git a/game/ui/talents/TalentEntry.gd b/game/ui/talents/TalentEntry.gd index bc25d72c..9a55362f 100644 --- a/game/ui/talents/TalentEntry.gd +++ b/game/ui/talents/TalentEntry.gd @@ -86,7 +86,7 @@ func refresh() -> void: var known_rank_count : int = 0 for i in range(_spec.get_num_ranks(_row, culomn)): - var a : Aura = _spec.get_talent(_row, culomn, i) + var a : Spell = _spec.get_talent(_row, culomn, i) if a == null: break @@ -105,7 +105,7 @@ func refresh() -> void: _upgrade_button.show() - var aura : Aura = _spec.get_talent(_row, culomn, ridx) + var aura : Spell = _spec.get_talent(_row, culomn, ridx) _aura_name_label.text = aura.text_name _aura_description_label.text = aura.aura_text_description