Updated everything to get the improvements from ESS (spell scailng became a project wide setting.) Spell scaling is now off. Added back in ranks, as in the long run ranks will work better.

This commit is contained in:
Relintai 2020-03-10 13:30:40 +01:00
parent 704aa85e93
commit cb6faf1120
9 changed files with 13 additions and 6 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": {"3.2": "69c1805735df2a7a35e826e2f1bd40bac7dc1058", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "3e10779dbc5258d1e1b08eab287189f9c1ccec64"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "91540092500d8b8bd0c12322e46f4e10a00c66ae"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "9b1868668de4242ccc0565cf3c6b5e1c375f1576"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "dbfd76aaf74873ca104593bb85c97d3257c5c708"}} {"engine": {"3.2": "e5526544a32023122e3c686d866b9f70751cf1e6", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "a08917370cdef0884042bdb49fb80ece0b2e76ec"}, "entity_spell_system": {"master": "0bf97e57da3e4a56a5e0a893ee4762ef9c52ee61"}, "ui_extensions": {"master": "38acc650db260a831dc26ca96fe9d9a087230bdc"}, "voxelman": {"master": "91540092500d8b8bd0c12322e46f4e10a00c66ae"}, "texture_packer": {"master": "b17c174906f84de93d84aa60d010ffe603efaa28"}, "fastnoise": {"master": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e"}, "mesh_data_resource": {"master": "4bda19b12be2c2a79a6121de6d22e48f3934e726"}, "procedural_animations": {"master": "9b1868668de4242ccc0565cf3c6b5e1c375f1576"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "3144600da9dd00595518c5f0d4cc2cc400825c86"}}

View File

@ -9,6 +9,7 @@
resource_name = "Aspect of Scorpions" resource_name = "Aspect of Scorpions"
id = 10 id = 10
spell_type = 8 spell_type = 8
rank = 1
icon = ExtResource( 2 ) icon = ExtResource( 2 )
visual_spell_effects = ExtResource( 4 ) visual_spell_effects = ExtResource( 4 )
target_aura_applys = [ ExtResource( 3 ) ] target_aura_applys = [ ExtResource( 3 ) ]

View File

@ -8,6 +8,7 @@
resource_name = "Aspect of Wasps" resource_name = "Aspect of Wasps"
id = 11 id = 11
spell_type = 8 spell_type = 8
rank = 1
icon = ExtResource( 2 ) icon = ExtResource( 2 )
target_aura_applys = [ ExtResource( 3 ) ] target_aura_applys = [ ExtResource( 3 ) ]
text_name = "Aspect of Wasps" text_name = "Aspect of Wasps"

View File

@ -8,6 +8,7 @@
resource_name = "Aspect of Wolves" resource_name = "Aspect of Wolves"
id = 12 id = 12
spell_type = 8 spell_type = 8
rank = 1
icon = ExtResource( 2 ) icon = ExtResource( 2 )
needs_target = true needs_target = true
target_aura_applys = [ ExtResource( 3 ) ] target_aura_applys = [ ExtResource( 3 ) ]

View File

@ -8,14 +8,14 @@
resource_name = "Aspect of Bees" resource_name = "Aspect of Bees"
id = 13 id = 13
spell_type = 8 spell_type = 8
rank = 10 rank = 1
icon = ExtResource( 2 ) icon = ExtResource( 2 )
needs_target = true needs_target = true
target_aura_applys = [ ExtResource( 3 ) ] target_aura_applys = [ ExtResource( 3 ) ]
text_name = "Aspect of Bees" text_name = "Aspect of Bees"
text_description = "Range: 26m. text_description = "Range: 26m.
Instant. Instant.
Cooldown: {2} Cooldown: %%cooldown_cooldown sec
Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage." Deals 460 to 540 damage every 3 sec, healing you for 80% of the damage."
cooldown_cooldown = 21.0 cooldown_cooldown = 21.0
range_range = 26.0 range_range = 26.0

View File

@ -22,6 +22,7 @@ id = 14
spell_type = 8 spell_type = 8
level = 10 level = 10
icon = ExtResource( 2 ) icon = ExtResource( 2 )
needs_target = true
visual_spell_effects = SubResource( 1 ) visual_spell_effects = SubResource( 1 )
text_name = "Amplify Pain" text_name = "Amplify Pain"
text_description = "Range: 26m. text_description = "Range: 26m.

View File

@ -14,7 +14,7 @@ icon = ExtResource( 2 )
caster_aura_applys = [ ExtResource( 3 ) ] caster_aura_applys = [ ExtResource( 3 ) ]
text_name = "Close Wounds" text_name = "Close Wounds"
text_description = "Casttime: 2 sec. text_description = "Casttime: 2 sec.
Cooldown: {2} Cooldown: %%cooldown_cooldown sec
Heals you for 720 to 780 every 3 sec for 21 sec." Heals you for 720 to 780 every 3 sec for 21 sec."
cast_cast_time = 1.3 cast_cast_time = 1.3
aoe_colliderType = -2147479552 aoe_colliderType = -2147479552

View File

@ -15,7 +15,7 @@ icon = ExtResource( 1 )
caster_aura_applys = [ ExtResource( 2 ) ] caster_aura_applys = [ ExtResource( 2 ) ]
text_name = "Nature's Swiftness" text_name = "Nature's Swiftness"
text_description = "Instant. text_description = "Instant.
Cooldown: {2} Cooldown: %%cooldown_cooldown sec
Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown." Increases your movement speed by 60% for 6 sec. This spell is not on the global cooldown."
cooldown_cooldown = 20.0 cooldown_cooldown = 20.0
aoe_targetType = 520 aoe_targetType = 520

View File

@ -30,7 +30,10 @@ func _handle_aura_damage(aura_data : AuraData, damage_info : SpellDamageInfo) ->
return return
damage_info.damage = damage_min + (randi() % (damage_max - damage_min)) damage_info.damage = damage_min + (randi() % (damage_max - damage_min))
damage_info.damage *= damage_info.dealer.scharacter_level / float(EntityEnums.MAX_CHARACTER_LEVEL)
if scale_with_level:
damage_info.damage *= damage_info.dealer.scharacter_level / float(EntityEnums.MAX_CHARACTER_LEVEL)
damage_info.damage_source_type = aura_data.aura.damage_type damage_info.damage_source_type = aura_data.aura.damage_type
if (is_instance_valid(damage_info.dealer)): if (is_instance_valid(damage_info.dealer)):