diff --git a/HEADS b/HEADS index 8e40a39d..2f1bbfe2 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "3337694d687bc682599a3cbbf17f5c00e5c3dabd"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "24db319b5f021b6a54084904ea24630273514bbd"}, "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": "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 diff --git a/game/modules/entity_classes/elementalist/spells/31_overload.tres b/game/modules/entity_classes/elementalist/spells/31_overload.tres index d27497a8..68edaa78 100644 --- a/game/modules/entity_classes/elementalist/spells/31_overload.tres +++ b/game/modules/entity_classes/elementalist/spells/31_overload.tres @@ -6,9 +6,6 @@ [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] - - - [sub_resource type="SpellEffectVisual" id=1] script = ExtResource( 2 ) spell_cast_effect_left_hand = ExtResource( 5 ) 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 4e8d3a44..6e0bcb01 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 @@ -7,11 +7,10 @@ [resource] resource_name = "Aspect of Scorpions" icon = ExtResource( 3 ) +rank = 1 aura_time = 30.0 aura_tick = 3.0 aura_debuff = true -rank = 1 -aura_aura_type = 1 aura_group = ExtResource( 2 ) text_name = "Aspect of Scorpions" aura_text_description = "Deals %%damage_min to %%damage_max damage every %%tick sec, and increases damage taken by 10% for 30 sec." 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 29ca2bd7..dc3e1ac3 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 @@ -17,7 +17,7 @@ spell_type = 8 rank = 1 icon = ExtResource( 5 ) visual_spell_effects = ExtResource( 3 ) -target_aura_applys = [ ExtResource( 2 ) ] +spells_cast_on_target = [ ExtResource( 2 ) ] text_name = "Aspect of Scorpions" text_description = "Range: 26m. Casttime: %%cast_cast_time . 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 9d4138a7..f686c3d1 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 @@ -12,7 +12,7 @@ level = 3 rank = 1 icon = ExtResource( 2 ) needs_target = true -target_aura_applys = [ ExtResource( 3 ) ] +spells_cast_on_target = [ 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." 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 ab2cbccb..7d9dda66 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 @@ -12,7 +12,7 @@ level = 4 rank = 1 icon = ExtResource( 3 ) needs_target = true -target_aura_applys = [ ExtResource( 1 ) ] +spells_cast_on_target = [ ExtResource( 1 ) ] text_name = "Aspect of Bees" text_description = "Range: 26m. Instant. 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 e7fc2ce1..b0e0f5fe 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 @@ -12,7 +12,7 @@ target_type = 2 target_relation_type = 4 rank = 1 icon = ExtResource( 3 ) -caster_aura_applys = [ ExtResource( 1 ) ] +spells_cast_on_caster = [ ExtResource( 1 ) ] text_name = "Rejuvenation" text_description = "Instant. Heals you for 400 to 450 every 3 sec for 30 sec." 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 39df46c4..f45754b6 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 @@ -11,7 +11,7 @@ spell_type = 8 target_type = 2 rank = 1 icon = ExtResource( 3 ) -caster_aura_applys = [ ExtResource( 1 ) ] +spells_cast_on_caster = [ ExtResource( 1 ) ] text_name = "Close Wounds" text_description = "Casttime: 2 sec. Cooldown: %%cooldown_cooldown sec 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 20386608..d267a0e7 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 @@ -12,7 +12,7 @@ target_type = 480 target_relation_type = 914787760 rank = 1 icon = ExtResource( 2 ) -caster_aura_applys = [ ExtResource( 1 ) ] +spells_cast_on_caster = [ ExtResource( 1 ) ] text_name = "Ironbark" text_description = "Instant. Cooldown: {2} 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 c986a3ba..5826660a 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 @@ -12,7 +12,7 @@ target_type = 520 target_relation_type = 1 rank = 1 icon = ExtResource( 3 ) -caster_aura_applys = [ ExtResource( 1 ) ] +spells_cast_on_caster = [ ExtResource( 1 ) ] text_name = "Nature's Swiftness" text_description = "Instant. Cooldown: %%cooldown_cooldown sec 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 b2c7bb77..6380e1d8 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 @@ -10,7 +10,7 @@ id = 10 spell_type = 8 rank = 1 icon = ExtResource( 3 ) -target_aura_applys = [ ExtResource( 1 ) ] +spells_cast_on_target = [ ExtResource( 1 ) ] text_name = "Root" text_description = "Range: 26m. Casttime: 1.5 sec. 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 68c24186..8ff515c0 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 @@ -12,7 +12,7 @@ spell_type = 8 rank = 1 icon = ExtResource( 1 ) visual_spell_effects = ExtResource( 4 ) -target_aura_applys = [ ExtResource( 3 ) ] +spells_cast_on_target = [ ExtResource( 3 ) ] text_name = "Aspect of Scorpions" text_description = "Range: 26m. Casttime: {3}. diff --git a/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres b/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres index b5a3e851..60154202 100644 --- a/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres +++ b/game/modules/entity_classes/naturalist/spells/28_aspectofwasps.tres @@ -10,7 +10,7 @@ id = 18 spell_type = 8 rank = 1 icon = ExtResource( 3 ) -target_aura_applys = [ ExtResource( 2 ) ] +spells_cast_on_target = [ ExtResource( 2 ) ] text_name = "Aspect of Wasps" text_description = "Range: 26m. Instant. 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 1c102ba8..c3ece617 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 @@ -11,7 +11,7 @@ spell_type = 8 rank = 1 icon = ExtResource( 3 ) needs_target = true -target_aura_applys = [ ExtResource( 2 ) ] +spells_cast_on_target = [ 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." 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 f7de0e49..47880345 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 @@ -12,7 +12,7 @@ level = 10 rank = 1 icon = ExtResource( 3 ) needs_target = true -target_aura_applys = [ ExtResource( 2 ) ] +spells_cast_on_target = [ ExtResource( 2 ) ] text_name = "Aspect of Bees" text_description = "Range: 26m. Instant.