From 58ba871622b4b838d473b3cd1078fc5c5862b8fe Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 1 Dec 2019 00:25:55 +0100 Subject: [PATCH] Update ESS to latest. --- HEADS | 2 +- game/data/entity_classes/1_naturalist.tres | 196 +++++++++--------- .../spells/10_aspect_of_scorpions_rank_1.tres | 2 +- .../spells/11_aspect_of_wasps_rank_1.tres | 4 +- .../spells/12_aspect_of_wolves_rank_1.tres | 4 +- .../data/spells/13_aspect_of_bees_rank_1.tres | 4 +- game/data/spells/14_amplify_pain_rank_1.tres | 1 - game/data/spells/15_rejuvenation_rank_1.tres | 4 +- game/data/spells/17_ironbark_rank_1.tres | 4 +- .../spells/18_natures_swiftness_rank_1.tres | 4 +- game/data/spells/19_uproot_rank_1.tres | 2 - game/data/spells/1_test_spell.tres | 1 - game/data/spells/20_root_rank_1.tres | 3 +- .../spells/21_strength_of_nature_rank_1.tres | 2 - .../spells/22_shield_of_barbs_rank_1.tres | 1 - game/data/spells/23_calm_rank_1.tres | 2 - game/data/spells/24_attunement_rank_1.tres | 2 - game/data/spells/25_inner_will.tres | 2 - game/data/spells/26_rest.tres | 2 - game/data/spells/27_aspect_of_scorpions.tres | 2 +- game/data/spells/28_aspectofwasps.tres | 4 +- game/data/spells/29_aspect_of_wolves.tres | 4 +- game/data/spells/30_aspect_of_bees.tres | 4 +- game/data/spells/31_overload.tres | 1 - game/scripts/entities/NaturalistGD.gd | 8 +- 25 files changed, 114 insertions(+), 151 deletions(-) diff --git a/HEADS b/HEADS index f57add02..3e158ebb 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": "f82539944b609dc8327536aa92a3da3851ac1338", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "992d0672f9b143fc0b3996e798dcf9aa7e064a92", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "2b369f5be8efc5fe0ef13da57afa46317c413f47", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "8568888b3c11dec56dbf1088a84bc898d68bd6ce"} \ No newline at end of file +{"engine": "dac2a7b2378973177a166f1f4c0f6ac3c7b3e529", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "abb564acdcb27778123ba3cb7348210c87de0918", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "2b369f5be8efc5fe0ef13da57afa46317c413f47", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "8568888b3c11dec56dbf1088a84bc898d68bd6ce"} \ No newline at end of file diff --git a/game/data/entity_classes/1_naturalist.tres b/game/data/entity_classes/1_naturalist.tres index 278cfbf9..fd6515f8 100644 --- a/game/data/entity_classes/1_naturalist.tres +++ b/game/data/entity_classes/1_naturalist.tres @@ -27,233 +27,231 @@ [ext_resource path="res://data/spells/28_aspectofwasps.tres" type="Spell" id=25] [ext_resource path="res://data/spells/30_aspect_of_bees.tres" type="Spell" id=26] -[sub_resource type="EntityAI" id=49] +[sub_resource type="EntityAI" id=1] script = ExtResource( 20 ) -[sub_resource type="TalentRowData" id=1] +[sub_resource type="TalentRowData" id=2] Talent_0_0 = ExtResource( 21 ) -[sub_resource type="TalentRowData" id=2] +[sub_resource type="TalentRowData" id=3] Talent_2_0 = ExtResource( 22 ) -[sub_resource type="CharacterSpec" id=3] -resource_name = "Melee" +[sub_resource type="CharacterSpec" id=4] id = 1 -text_name = "Melee" -talent_rows = [ SubResource( 1 ), SubResource( 2 ) ] +talent_rows = [ SubResource( 2 ), SubResource( 3 ) ] -[sub_resource type="StatDataEntry" id=4] +[sub_resource type="StatDataEntry" id=5] stat_id = 5 base = 12.0 -[sub_resource type="StatDataEntry" id=5] +[sub_resource type="StatDataEntry" id=6] stat_id = 12 -[sub_resource type="StatDataEntry" id=6] +[sub_resource type="StatDataEntry" id=7] stat_id = 13 -[sub_resource type="StatDataEntry" id=7] +[sub_resource type="StatDataEntry" id=8] stat_id = 19 -[sub_resource type="StatDataEntry" id=8] +[sub_resource type="StatDataEntry" id=9] stat_id = 34 -[sub_resource type="StatDataEntry" id=9] +[sub_resource type="StatDataEntry" id=10] stat_id = 21 -[sub_resource type="StatDataEntry" id=10] +[sub_resource type="StatDataEntry" id=11] stat_id = 24 -[sub_resource type="StatDataEntry" id=11] +[sub_resource type="StatDataEntry" id=12] stat_id = 38 -[sub_resource type="StatDataEntry" id=12] +[sub_resource type="StatDataEntry" id=13] stat_id = 36 -[sub_resource type="StatDataEntry" id=13] +[sub_resource type="StatDataEntry" id=14] stat_id = 31 -[sub_resource type="StatDataEntry" id=14] +[sub_resource type="StatDataEntry" id=15] stat_id = 32 -[sub_resource type="StatDataEntry" id=15] +[sub_resource type="StatDataEntry" id=16] stat_id = 3 base = 1.5 -[sub_resource type="StatDataEntry" id=16] +[sub_resource type="StatDataEntry" id=17] stat_id = 4 -[sub_resource type="StatDataEntry" id=17] +[sub_resource type="StatDataEntry" id=18] stat_id = 10 -[sub_resource type="StatDataEntry" id=18] +[sub_resource type="StatDataEntry" id=19] stat_id = 25 -[sub_resource type="StatDataEntry" id=19] +[sub_resource type="StatDataEntry" id=20] stat_id = 0 -[sub_resource type="StatDataEntry" id=20] +[sub_resource type="StatDataEntry" id=21] stat_id = 28 -[sub_resource type="Curve" id=21] +[sub_resource type="Curve" id=22] max_value = 10.0 _data = [ Vector2( 0, 10 ), 0.0, 0.0, 0, 1, Vector2( 1, 10 ), 0.0, 0.0, 1, 0 ] -[sub_resource type="StatDataEntry" id=22] +[sub_resource type="StatDataEntry" id=23] stat_id = 8 base = 20.0 mod_stat_count = 1 ModStat_0/stat_id = 2 -ModStat_0/curve = SubResource( 21 ) +ModStat_0/curve = SubResource( 22 ) ModStat_0/max_value = 1000.0 -[sub_resource type="StatDataEntry" id=23] +[sub_resource type="StatDataEntry" id=24] stat_id = 33 -[sub_resource type="StatDataEntry" id=24] +[sub_resource type="StatDataEntry" id=25] stat_id = 2 -[sub_resource type="StatDataEntry" id=25] +[sub_resource type="StatDataEntry" id=26] stat_id = 15 base = 5.0 -[sub_resource type="StatDataEntry" id=26] +[sub_resource type="StatDataEntry" id=27] stat_id = 16 base = 50.0 -[sub_resource type="StatDataEntry" id=27] +[sub_resource type="StatDataEntry" id=28] stat_id = 26 -[sub_resource type="StatDataEntry" id=28] +[sub_resource type="StatDataEntry" id=29] stat_id = 22 base = 15.0 -[sub_resource type="StatDataEntry" id=29] +[sub_resource type="StatDataEntry" id=30] stat_id = 30 -[sub_resource type="StatDataEntry" id=30] +[sub_resource type="StatDataEntry" id=31] stat_id = 20 -[sub_resource type="StatDataEntry" id=31] +[sub_resource type="StatDataEntry" id=32] stat_id = 39 -[sub_resource type="StatDataEntry" id=32] +[sub_resource type="StatDataEntry" id=33] stat_id = 11 -[sub_resource type="StatDataEntry" id=33] +[sub_resource type="StatDataEntry" id=34] stat_id = 29 -[sub_resource type="StatDataEntry" id=34] +[sub_resource type="StatDataEntry" id=35] stat_id = 35 -[sub_resource type="StatDataEntry" id=35] +[sub_resource type="StatDataEntry" id=36] stat_id = 1 base = 4.2 modifier_apply_type = 1 -[sub_resource type="StatDataEntry" id=36] +[sub_resource type="StatDataEntry" id=37] stat_id = 17 base = 5.0 -[sub_resource type="StatDataEntry" id=37] +[sub_resource type="StatDataEntry" id=38] stat_id = 18 base = 50.0 -[sub_resource type="StatDataEntry" id=38] +[sub_resource type="StatDataEntry" id=39] stat_id = 27 -[sub_resource type="StatDataEntry" id=39] +[sub_resource type="StatDataEntry" id=40] stat_id = 23 -[sub_resource type="StatDataEntry" id=40] +[sub_resource type="StatDataEntry" id=41] stat_id = 14 -[sub_resource type="StatDataEntry" id=41] +[sub_resource type="StatDataEntry" id=42] stat_id = 9 -[sub_resource type="Curve" id=42] +[sub_resource type="Curve" id=43] max_value = 10.0 _data = [ Vector2( 0, 10 ), 0.0, 0.0, 0, 1, Vector2( 1, 10 ), 0.0, 0.0, 1, 0 ] -[sub_resource type="StatDataEntry" id=43] +[sub_resource type="StatDataEntry" id=44] stat_id = 7 base = 10.0 mod_stat_count = 1 ModStat_0/stat_id = 0 -ModStat_0/curve = SubResource( 42 ) +ModStat_0/curve = SubResource( 43 ) ModStat_0/max_value = 1000.0 -[sub_resource type="StatDataEntry" id=44] +[sub_resource type="StatDataEntry" id=45] stat_id = 6 base = 8.0 -[sub_resource type="StatDataEntry" id=45] +[sub_resource type="StatDataEntry" id=46] stat_id = 37 -[sub_resource type="StatDataEntry" id=46] +[sub_resource type="StatDataEntry" id=47] stat_id = 40 base = 1.0 -[sub_resource type="SimpleLevelStatData" id=47] +[sub_resource type="SimpleLevelStatData" id=48] agility_per_level = 2 strength_per_level = 1 stamina_per_level = 2 intellect_per_level = 2 spirit_per_level = 3 -[sub_resource type="StatData" id=48] -base_stat_health = SubResource( 19 ) -base_stat_speed = SubResource( 35 ) -base_stat_mana = SubResource( 24 ) -base_stat_gcd = SubResource( 15 ) -base_stat_haste = SubResource( 16 ) -base_stat_agility = SubResource( 4 ) -base_stat_strength = SubResource( 44 ) -base_stat_stamina = SubResource( 43 ) -base_stat_intellect = SubResource( 22 ) -base_stat_spirit = SubResource( 41 ) -base_stat_haste_rating = SubResource( 17 ) -base_stat_resilience = SubResource( 32 ) -base_stat_armor = SubResource( 5 ) -base_stat_attack_power = SubResource( 6 ) -base_stat_spell_power = SubResource( 40 ) -base_stat_melee_crit = SubResource( 25 ) -base_stat_melee_crit_bonus = SubResource( 26 ) -base_stat_spell_crit = SubResource( 36 ) -base_stat_spell_crit_bonus = SubResource( 37 ) -base_stat_block = SubResource( 7 ) -base_stat_parry = SubResource( 30 ) -base_stat_damage_reduction = SubResource( 9 ) -base_stat_melee_damage_reduction = SubResource( 28 ) -base_stat_spell_damage_reduction = SubResource( 39 ) -base_stat_damage_taken = SubResource( 10 ) -base_stat_heal_taken = SubResource( 18 ) -base_stat_melee_damage = SubResource( 27 ) -base_stat_spell_damage = SubResource( 38 ) -base_stat_holy_resist = SubResource( 20 ) -base_stat_shadow_resist = SubResource( 33 ) -base_stat_nature_resist = SubResource( 29 ) -base_stat_fire_resist = SubResource( 13 ) -base_stat_frost_resist = SubResource( 14 ) -base_stat_lightning_resist = SubResource( 23 ) -base_stat_chaos_resist = SubResource( 8 ) -base_stat_silence_resist = SubResource( 34 ) -base_stat_fear_resist = SubResource( 12 ) -base_stat_stun_resist = SubResource( 45 ) -base_stat_energy = SubResource( 11 ) -base_stat_rage = SubResource( 31 ) -base_stat_xp_rate = SubResource( 46 ) -level_stat_data = SubResource( 47 ) +[sub_resource type="StatData" id=49] +base_stat_health = SubResource( 20 ) +base_stat_speed = SubResource( 36 ) +base_stat_mana = SubResource( 25 ) +base_stat_gcd = SubResource( 16 ) +base_stat_haste = SubResource( 17 ) +base_stat_agility = SubResource( 5 ) +base_stat_strength = SubResource( 45 ) +base_stat_stamina = SubResource( 44 ) +base_stat_intellect = SubResource( 23 ) +base_stat_spirit = SubResource( 42 ) +base_stat_haste_rating = SubResource( 18 ) +base_stat_resilience = SubResource( 33 ) +base_stat_armor = SubResource( 6 ) +base_stat_attack_power = SubResource( 7 ) +base_stat_spell_power = SubResource( 41 ) +base_stat_melee_crit = SubResource( 26 ) +base_stat_melee_crit_bonus = SubResource( 27 ) +base_stat_spell_crit = SubResource( 37 ) +base_stat_spell_crit_bonus = SubResource( 38 ) +base_stat_block = SubResource( 8 ) +base_stat_parry = SubResource( 31 ) +base_stat_damage_reduction = SubResource( 10 ) +base_stat_melee_damage_reduction = SubResource( 29 ) +base_stat_spell_damage_reduction = SubResource( 40 ) +base_stat_damage_taken = SubResource( 11 ) +base_stat_heal_taken = SubResource( 19 ) +base_stat_melee_damage = SubResource( 28 ) +base_stat_spell_damage = SubResource( 39 ) +base_stat_holy_resist = SubResource( 21 ) +base_stat_shadow_resist = SubResource( 34 ) +base_stat_nature_resist = SubResource( 30 ) +base_stat_fire_resist = SubResource( 14 ) +base_stat_frost_resist = SubResource( 15 ) +base_stat_lightning_resist = SubResource( 24 ) +base_stat_chaos_resist = SubResource( 9 ) +base_stat_silence_resist = SubResource( 35 ) +base_stat_fear_resist = SubResource( 13 ) +base_stat_stun_resist = SubResource( 46 ) +base_stat_energy = SubResource( 12 ) +base_stat_rage = SubResource( 32 ) +base_stat_xp_rate = SubResource( 47 ) +level_stat_data = SubResource( 48 ) [resource] resource_name = "Naturalist" id = 1 text_name = "Naturalist" -stat_data = SubResource( 48 ) +stat_data = SubResource( 49 ) player_resource_type = 2 -specs = [ SubResource( 3 ) ] +specs = [ SubResource( 4 ) ] spells = [ ExtResource( 4 ), ExtResource( 6 ), ExtResource( 16 ), ExtResource( 5 ), ExtResource( 3 ), ExtResource( 10 ), ExtResource( 8 ), ExtResource( 11 ), ExtResource( 9 ), ExtResource( 7 ), ExtResource( 13 ), ExtResource( 2 ), ExtResource( 12 ), ExtResource( 14 ), ExtResource( 15 ), ExtResource( 17 ), ExtResource( 1 ), ExtResource( 24 ), ExtResource( 25 ), ExtResource( 23 ), ExtResource( 26 ) ] start_spells = [ ExtResource( 24 ) ] auras = [ ExtResource( 18 ) ] -ais = [ SubResource( 49 ) ] +ais = [ SubResource( 1 ) ] script = ExtResource( 19 ) diff --git a/game/data/spells/10_aspect_of_scorpions_rank_1.tres b/game/data/spells/10_aspect_of_scorpions_rank_1.tres index 280d850d..2fc79a5f 100644 --- a/game/data/spells/10_aspect_of_scorpions_rank_1.tres +++ b/game/data/spells/10_aspect_of_scorpions_rank_1.tres @@ -13,11 +13,11 @@ spell_type = 8 rank = 10 icon = ExtResource( 2 ) visual_spell_effects = ExtResource( 4 ) +target_aura_applys = [ ExtResource( 3 ) ] text_name = "Aspect of Scorpions" text_description = "Range: 26m. Casttime: {3}. Deals 340 to 380 damage every 3 sec, and increases damage taken by 10% for 30 sec." -target_aura_applys = [ ExtResource( 3 ) ] range = true range_range = 26.0 cast = true diff --git a/game/data/spells/11_aspect_of_wasps_rank_1.tres b/game/data/spells/11_aspect_of_wasps_rank_1.tres index 31fbaf7c..70b304b1 100644 --- a/game/data/spells/11_aspect_of_wasps_rank_1.tres +++ b/game/data/spells/11_aspect_of_wasps_rank_1.tres @@ -11,15 +11,13 @@ id = 11 spell_type = 8 rank = 10 icon = ExtResource( 2 ) +target_aura_applys = [ ExtResource( 3 ) ] text_name = "Aspect of Wasps" text_description = "Range: 26m. Instant. Deals 230 to 270 damage every 3 sec, this damage increases over the duration, for 21 sec." -target_aura_applys = [ ExtResource( 3 ) ] range = true range_range = 26.0 -cost_type = 480 -give_resource_type = 480 aoe_targetType = 541 aoe_movement_type = 99418736 aoe_colliderType = 541 diff --git a/game/data/spells/12_aspect_of_wolves_rank_1.tres b/game/data/spells/12_aspect_of_wolves_rank_1.tres index f2c0a472..25ae60c0 100644 --- a/game/data/spells/12_aspect_of_wolves_rank_1.tres +++ b/game/data/spells/12_aspect_of_wolves_rank_1.tres @@ -12,14 +12,12 @@ spell_type = 8 rank = 10 icon = ExtResource( 2 ) needs_target = true +target_aura_applys = [ ExtResource( 3 ) ] text_name = "Aspect of Wolves" text_description = "Range: 26m. Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% for 22 sec." -target_aura_applys = [ ExtResource( 3 ) ] range = true range_range = 26.0 -cost_type = 480 -give_resource_type = 480 aoe_targetType = 1129071960 aoe_movement_type = 2190112 aoe_colliderType = 1058050193 diff --git a/game/data/spells/13_aspect_of_bees_rank_1.tres b/game/data/spells/13_aspect_of_bees_rank_1.tres index 5d427879..aebd4682 100644 --- a/game/data/spells/13_aspect_of_bees_rank_1.tres +++ b/game/data/spells/13_aspect_of_bees_rank_1.tres @@ -12,17 +12,15 @@ spell_type = 8 rank = 10 icon = ExtResource( 2 ) needs_target = true +target_aura_applys = [ ExtResource( 3 ) ] text_name = "Aspect of Bees" text_description = "Range: 26m. Instant. Cooldown: {2} Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage." cooldown_cooldown = 21.0 -target_aura_applys = [ ExtResource( 3 ) ] range = true range_range = 26.0 -cost_type = 480 -give_resource_type = 480 aoe_targetType = -1910718371 aoe_movement_type = 1611610192 aoe_colliderType = -298046312 diff --git a/game/data/spells/14_amplify_pain_rank_1.tres b/game/data/spells/14_amplify_pain_rank_1.tres index 29b8939b..294ac35a 100644 --- a/game/data/spells/14_amplify_pain_rank_1.tres +++ b/game/data/spells/14_amplify_pain_rank_1.tres @@ -35,7 +35,6 @@ damage = true damage_type = 16 damage_min = 130 damage_max = 150 -cost_type = 476 aoe_targetType = -1910718371 aoe_movement_type = 1611610192 aoe_colliderType = 1065353216 diff --git a/game/data/spells/15_rejuvenation_rank_1.tres b/game/data/spells/15_rejuvenation_rank_1.tres index 686d4c2f..113fe2da 100644 --- a/game/data/spells/15_rejuvenation_rank_1.tres +++ b/game/data/spells/15_rejuvenation_rank_1.tres @@ -12,12 +12,10 @@ target_type = 2 target_relation_type = 4 rank = 1 icon = ExtResource( 2 ) +caster_aura_applys = [ ExtResource( 3 ) ] text_name = "Rejuvenation" text_description = "Instant. Heals you for 400 to 450 every 3 sec for 30 sec." -caster_aura_applys = [ ExtResource( 3 ) ] -cost_type = 480 -give_resource_type = 480 aoe_targetType = 32758 aoe_movement_type = -2000446188 aoe_colliderType = -2147479552 diff --git a/game/data/spells/17_ironbark_rank_1.tres b/game/data/spells/17_ironbark_rank_1.tres index 5b08ff1d..b8a18a07 100644 --- a/game/data/spells/17_ironbark_rank_1.tres +++ b/game/data/spells/17_ironbark_rank_1.tres @@ -12,15 +12,13 @@ target_type = 480 target_relation_type = 914787760 rank = 1 icon = ExtResource( 2 ) +caster_aura_applys = [ ExtResource( 3 ) ] text_name = "Ironbark" text_description = "Instant. Cooldown: {2} Reduces damage taken by 70%. This spell is not on the global cooldown." cooldown_cooldown = 60.0 cooldown_global_cooldown = false -caster_aura_applys = [ ExtResource( 3 ) ] -cost_type = 480 -give_resource_type = 480 aoe_targetType = -1910718371 aoe_movement_type = 1611610192 aoe_colliderType = -298046312 diff --git a/game/data/spells/18_natures_swiftness_rank_1.tres b/game/data/spells/18_natures_swiftness_rank_1.tres index 66feb13e..5e60fb6a 100644 --- a/game/data/spells/18_natures_swiftness_rank_1.tres +++ b/game/data/spells/18_natures_swiftness_rank_1.tres @@ -12,15 +12,13 @@ target_type = 520 target_relation_type = 393653346 rank = 1 icon = ExtResource( 1 ) +caster_aura_applys = [ ExtResource( 2 ) ] text_name = "Nature's Swiftness" text_description = "Instant. Cooldown: {2} Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown." cooldown_cooldown = 20.0 cooldown_global_cooldown = false -caster_aura_applys = [ ExtResource( 2 ) ] -cost_type = 480 -give_resource_type = 480 aoe_targetType = 520 aoe_movement_type = 538514176 aoe_colliderType = 186459648 diff --git a/game/data/spells/19_uproot_rank_1.tres b/game/data/spells/19_uproot_rank_1.tres index c823547a..8330ca6c 100644 --- a/game/data/spells/19_uproot_rank_1.tres +++ b/game/data/spells/19_uproot_rank_1.tres @@ -17,8 +17,6 @@ Roots every enemy around you in a 15m radius for 8 sec. This spell doesn't have cooldown_cooldown = 24.0 range = true range_range = 15.0 -cost_type = 480 -give_resource_type = 6 aoe = true aoe_targetType = -572653568 aoe_movement_type = -436862976 diff --git a/game/data/spells/1_test_spell.tres b/game/data/spells/1_test_spell.tres index f775316b..f2023c39 100644 --- a/game/data/spells/1_test_spell.tres +++ b/game/data/spells/1_test_spell.tres @@ -15,7 +15,6 @@ text_name = "adadadadadad" damage = true damage_min = 200 damage_max = 300 -give_resource_type = 2 aoe_targetType = 1431112251 aoe_movement_type = 860237388 aoe_colliderType = 827465778 diff --git a/game/data/spells/20_root_rank_1.tres b/game/data/spells/20_root_rank_1.tres index db84f1a3..2bdf7643 100644 --- a/game/data/spells/20_root_rank_1.tres +++ b/game/data/spells/20_root_rank_1.tres @@ -10,16 +10,15 @@ id = 20 spell_type = 8 rank = 1 icon = ExtResource( 1 ) +target_aura_applys = [ ExtResource( 3 ) ] text_name = "Root" text_description = "Range: 26m. Casttime: 1.5 sec. Cooldown: {2} Roots the target for 8 sec." -target_aura_applys = [ ExtResource( 3 ) ] range = true cast = true cast_cast_time = 1.4 -give_resource_type = 5 aoe_targetType = 8 aoe_movement_type = 1 aoe_colliderType = 537722880 diff --git a/game/data/spells/21_strength_of_nature_rank_1.tres b/game/data/spells/21_strength_of_nature_rank_1.tres index 157cbbfb..89d691fa 100644 --- a/game/data/spells/21_strength_of_nature_rank_1.tres +++ b/game/data/spells/21_strength_of_nature_rank_1.tres @@ -20,8 +20,6 @@ cooldown_cooldown = 150.0 heal = true heal_min = 6700 heal_max = 7000 -cost_type = 480 -give_resource_type = 2 aoe_targetType = 5 aoe_movement_type = 7602259 aoe_colliderType = 7602273 diff --git a/game/data/spells/22_shield_of_barbs_rank_1.tres b/game/data/spells/22_shield_of_barbs_rank_1.tres index b70883c7..01425a95 100644 --- a/game/data/spells/22_shield_of_barbs_rank_1.tres +++ b/game/data/spells/22_shield_of_barbs_rank_1.tres @@ -16,7 +16,6 @@ text_description = "Instant. Cooldown: {2} Absorbs 4200 to 4400 damage, also deals 340 to 380 damage to any attacker, for 30 sec." cooldown_cooldown = 45.0 -give_resource_type = 5 aoe_targetType = 5 aoe_movement_type = 7274563 aoe_colliderType = 7929968 diff --git a/game/data/spells/23_calm_rank_1.tres b/game/data/spells/23_calm_rank_1.tres index c251ecf0..4fc2e462 100644 --- a/game/data/spells/23_calm_rank_1.tres +++ b/game/data/spells/23_calm_rank_1.tres @@ -15,8 +15,6 @@ Instant. Cooldown: {2} Reduces the target's melee and spell damage by 50% for 10 sec." cooldown_cooldown = 90.0 -cost_type = 480 -give_resource_type = 5 aoe_targetType = -2147478784 aoe_movement_type = 1 aoe_colliderType = 7602273 diff --git a/game/data/spells/24_attunement_rank_1.tres b/game/data/spells/24_attunement_rank_1.tres index 8c4445af..924feffa 100644 --- a/game/data/spells/24_attunement_rank_1.tres +++ b/game/data/spells/24_attunement_rank_1.tres @@ -16,8 +16,6 @@ text_description = "Instant. Cooldown: {2} Increases your spell damage by 30% for 20 sec." cooldown_cooldown = 180.0 -cost_type = 480 -give_resource_type = 6 aoe_targetType = 2 aoe_movement_type = 915097248 aoe_colliderType = 480 diff --git a/game/data/spells/25_inner_will.tres b/game/data/spells/25_inner_will.tres index 73527fd0..c81b4ea4 100644 --- a/game/data/spells/25_inner_will.tres +++ b/game/data/spells/25_inner_will.tres @@ -15,8 +15,6 @@ text_description = "Cooldown: 1.5 min. Removes any movement impairing effects, stuns, and effects which makes you lose control of your character. This spell is not on the global cooldown." cooldown_cooldown = 90.0 cooldown_global_cooldown = false -cost_type = 480 -give_resource_type = 5 aoe_targetType = 7 aoe_movement_type = 18 aoe_colliderType = 480 diff --git a/game/data/spells/26_rest.tres b/game/data/spells/26_rest.tres index 1af36bb0..fe1238fd 100644 --- a/game/data/spells/26_rest.tres +++ b/game/data/spells/26_rest.tres @@ -12,8 +12,6 @@ target_relation_type = 24 icon = ExtResource( 2 ) text_name = "Rest" text_description = "Rest for 30 seconds, greatly increasing your regeneration." -cost_type = 480 -give_resource_type = 6 aoe_targetType = 5 aoe_movement_type = 6357069 aoe_colliderType = 1065353216 diff --git a/game/data/spells/27_aspect_of_scorpions.tres b/game/data/spells/27_aspect_of_scorpions.tres index 32d79667..39a504b9 100644 --- a/game/data/spells/27_aspect_of_scorpions.tres +++ b/game/data/spells/27_aspect_of_scorpions.tres @@ -12,11 +12,11 @@ spell_type = 8 rank = 1 icon = ExtResource( 1 ) visual_spell_effects = ExtResource( 4 ) +target_aura_applys = [ ExtResource( 3 ) ] text_name = "Aspect of Scorpions" text_description = "Range: 26m. Casttime: {3}. Deals 340 to 380 damage every 3 sec, and increases damage taken by 10% for 30 sec." -target_aura_applys = [ ExtResource( 3 ) ] range = true range_range = 26.0 cast = true diff --git a/game/data/spells/28_aspectofwasps.tres b/game/data/spells/28_aspectofwasps.tres index 8d5663fd..8e0f1e65 100644 --- a/game/data/spells/28_aspectofwasps.tres +++ b/game/data/spells/28_aspectofwasps.tres @@ -10,15 +10,13 @@ id = 28 spell_type = 8 rank = 1 icon = ExtResource( 3 ) +target_aura_applys = [ ExtResource( 2 ) ] text_name = "Aspect of Wasps" text_description = "Range: 26m. Instant. Deals 230 to 270 damage every 3 sec, this damage increases over the duration, for 21 sec." -target_aura_applys = [ ExtResource( 2 ) ] range = true range_range = 26.0 -cost_type = 480 -give_resource_type = 480 aoe_targetType = 541 aoe_movement_type = 99418736 aoe_colliderType = 541 diff --git a/game/data/spells/29_aspect_of_wolves.tres b/game/data/spells/29_aspect_of_wolves.tres index 869b8a40..886359ae 100644 --- a/game/data/spells/29_aspect_of_wolves.tres +++ b/game/data/spells/29_aspect_of_wolves.tres @@ -11,14 +11,12 @@ spell_type = 8 rank = 1 icon = ExtResource( 3 ) needs_target = true +target_aura_applys = [ ExtResource( 2 ) ] text_name = "Aspect of Wolves" text_description = "Range: 26m. Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% for 22 sec." -target_aura_applys = [ ExtResource( 2 ) ] range = true range_range = 26.0 -cost_type = 480 -give_resource_type = 480 aoe_targetType = 1129071960 aoe_movement_type = 2190112 aoe_colliderType = 1058050193 diff --git a/game/data/spells/30_aspect_of_bees.tres b/game/data/spells/30_aspect_of_bees.tres index cca414c7..d6c10fb8 100644 --- a/game/data/spells/30_aspect_of_bees.tres +++ b/game/data/spells/30_aspect_of_bees.tres @@ -12,17 +12,15 @@ level = 10 rank = 1 icon = ExtResource( 3 ) needs_target = true +target_aura_applys = [ ExtResource( 2 ) ] text_name = "Aspect of Bees" text_description = "Range: 26m. Instant. Cooldown: {2} Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage." cooldown_cooldown = 21.0 -target_aura_applys = [ ExtResource( 2 ) ] range = true range_range = 26.0 -cost_type = 480 -give_resource_type = 480 aoe_targetType = -1910718371 aoe_movement_type = 1611610192 aoe_colliderType = -298046312 diff --git a/game/data/spells/31_overload.tres b/game/data/spells/31_overload.tres index 15340078..682d778e 100644 --- a/game/data/spells/31_overload.tres +++ b/game/data/spells/31_overload.tres @@ -35,7 +35,6 @@ damage = true damage_type = 16 damage_min = 130 damage_max = 150 -cost_type = 476 aoe_targetType = -1910718371 aoe_movement_type = 1611610192 aoe_colliderType = 1065353216 diff --git a/game/scripts/entities/NaturalistGD.gd b/game/scripts/entities/NaturalistGD.gd index 7791412a..4d85765c 100644 --- a/game/scripts/entities/NaturalistGD.gd +++ b/game/scripts/entities/NaturalistGD.gd @@ -85,10 +85,10 @@ func _sai_attack(entity): mob.target_movement_direction = Vector2(dir.x, dir.z) -func _setup_resources(entity): - var p : EntityResource = ManaResource.new() - - entity.adds_resource(p) +#func _setup_resources(entity): +# var p : EntityResource = ManaResource.new() +# +# entity.adds_resource(p) func sort_spells_by_rank(a, b): if a == null or b == null: