Update everything to the latest.

This commit is contained in:
Relintai 2019-12-13 09:39:43 +01:00
parent 1d4b27b920
commit f12e3ede7c
24 changed files with 12 additions and 53 deletions

2
HEADS
View File

@ -1 +1 @@
{"engine": "435cced7d8fbc80e6842d7c171a87d4db1e64fe4", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "8826258852d3a53f9f0ea975b2c4b5b43912d34a", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "ce4020962e19144b3f60f707930dc8f653bc0afa", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5"} {"engine": "0da0eec6cc42066626f867079700c10737092217", "world_generator": "290d973ea9580f748881a54502850ae5fecfb586", "entity_spell_system": "d5a3132d165e796fce493326a2a5166e4cb6c302", "ui_extensions": "271dcf89e9afe5cb6350de2f2433c8ebf8aba785", "voxelman": "ce4020962e19144b3f60f707930dc8f653bc0afa", "texture_packer": "604c330188e220c15d10ea5bd545a6fc5aab0132", "fastnoise": "41b7ea05a1f7aa2b8ecddaa1fd739e64d6970f7e", "entity-spell-system-addons": "d60e746b158d3ebf9d2ea306af1dd24bcae49be5"}

View File

@ -19,8 +19,6 @@ Deals 230 to 270 damage every 3 sec, this damage increases over the duration, fo
range = true range = true
range_range = 26.0 range_range = 26.0
aoe_targetType = 541 aoe_targetType = 541
aoe_movement_type = 99418736
aoe_colliderType = 541 aoe_colliderType = 541
projectile_type = 541
training_required_spell = ExtResource( 4 ) training_required_spell = ExtResource( 4 )
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -19,8 +19,6 @@ Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% f
range = true range = true
range_range = 26.0 range_range = 26.0
aoe_targetType = 1129071960 aoe_targetType = 1129071960
aoe_movement_type = 2190112
aoe_colliderType = 1058050193 aoe_colliderType = 1058050193
projectile_type = -1039400960
training_required_spell = ExtResource( 4 ) training_required_spell = ExtResource( 4 )
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -22,8 +22,6 @@ cooldown_cooldown = 21.0
range = true range = true
range_range = 26.0 range_range = 26.0
aoe_targetType = -1910718371 aoe_targetType = -1910718371
aoe_movement_type = 1611610192
aoe_colliderType = -298046312 aoe_colliderType = -298046312
projectile_type = 1065353216
training_required_spell = ExtResource( 4 ) training_required_spell = ExtResource( 4 )
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -36,7 +36,5 @@ damage_type = 16
damage_min = 130 damage_min = 130
damage_max = 150 damage_max = 150
aoe_targetType = -1910718371 aoe_targetType = -1910718371
aoe_movement_type = 1611610192
aoe_colliderType = 1065353216 aoe_colliderType = 1065353216
projectile_type = 882743928
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -17,7 +17,5 @@ text_name = "Rejuvenation"
text_description = "Instant. text_description = "Instant.
Heals you for 400 to 450 every 3 sec for 30 sec." Heals you for 400 to 450 every 3 sec for 30 sec."
aoe_targetType = 32758 aoe_targetType = 32758
aoe_movement_type = -2000446188
aoe_colliderType = -2147479552 aoe_colliderType = -2147479552
projectile_type = 4
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -19,6 +19,5 @@ Cooldown: {2}
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 = true cast = true
cast_cast_time = 1.3 cast_cast_time = 1.3
aoe_movement_type = -2000446188
aoe_colliderType = -2147479552 aoe_colliderType = -2147479552
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -20,7 +20,5 @@ Reduces damage taken by 70%. This spell is not on the global cooldown."
cooldown_cooldown = 60.0 cooldown_cooldown = 60.0
cooldown_global_cooldown = false cooldown_global_cooldown = false
aoe_targetType = -1910718371 aoe_targetType = -1910718371
aoe_movement_type = 1611610192
aoe_colliderType = -298046312 aoe_colliderType = -298046312
projectile_type = 882743928
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -20,7 +20,5 @@ Increases your movement speed by 60% for 6 sec. This spell is not on the global
cooldown_cooldown = 20.0 cooldown_cooldown = 20.0
cooldown_global_cooldown = false cooldown_global_cooldown = false
aoe_targetType = 520 aoe_targetType = 520
aoe_movement_type = 538514176
aoe_colliderType = 186459648 aoe_colliderType = 186459648
projectile_type = 101
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@ -19,7 +19,5 @@ range = true
range_range = 15.0 range_range = 15.0
aoe = true aoe = true
aoe_targetType = -572653568 aoe_targetType = -572653568
aoe_movement_type = -436862976
aoe_colliderType = 537722880 aoe_colliderType = 537722880
projectile_type = 6
script = ExtResource( 2 ) script = ExtResource( 2 )

View File

@ -1,8 +1,7 @@
[gd_resource type="Spell" load_steps=4 format=2] [gd_resource type="Spell" load_steps=3 format=2]
[ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1] [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=1]
[ext_resource path="res://data/icons/naturalist/test.tres" type="Texture" id=2] [ext_resource path="res://data/icons/naturalist/test.tres" type="Texture" id=2]
[ext_resource path="res://data/spell_effects/enchanter/Arrow.tscn" type="PackedScene" id=4]
[resource] [resource]
resource_name = "adadadadadad" resource_name = "adadadadadad"
@ -16,8 +15,5 @@ damage = true
damage_min = 200 damage_min = 200
damage_max = 300 damage_max = 300
aoe_targetType = 1431112251 aoe_targetType = 1431112251
aoe_movement_type = 860237388
aoe_colliderType = 827465778 aoe_colliderType = 827465778
projectile = ExtResource( 4 )
projectile_speed = 50.0
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -20,7 +20,5 @@ range = true
cast = true cast = true
cast_cast_time = 1.4 cast_cast_time = 1.4
aoe_targetType = 8 aoe_targetType = 8
aoe_movement_type = 1
aoe_colliderType = 537722880 aoe_colliderType = 537722880
projectile_type = 6
script = ExtResource( 2 ) script = ExtResource( 2 )

View File

@ -21,7 +21,5 @@ heal = true
heal_min = 6700 heal_min = 6700
heal_max = 7000 heal_max = 7000
aoe_targetType = 5 aoe_targetType = 5
aoe_movement_type = 7602259
aoe_colliderType = 7602273 aoe_colliderType = 7602273
projectile_type = 8
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -17,6 +17,5 @@ Cooldown: {2}
Absorbs 4200 to 4400 damage, also deals 340 to 380 damage to any attacker, for 30 sec." Absorbs 4200 to 4400 damage, also deals 340 to 380 damage to any attacker, for 30 sec."
cooldown_cooldown = 45.0 cooldown_cooldown = 45.0
aoe_targetType = 5 aoe_targetType = 5
aoe_movement_type = 7274563
aoe_colliderType = 7929968 aoe_colliderType = 7929968
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -16,7 +16,5 @@ Cooldown: {2}
Reduces the target's melee and spell damage by 50% for 10 sec." Reduces the target's melee and spell damage by 50% for 10 sec."
cooldown_cooldown = 90.0 cooldown_cooldown = 90.0
aoe_targetType = -2147478784 aoe_targetType = -2147478784
aoe_movement_type = 1
aoe_colliderType = 7602273 aoe_colliderType = 7602273
projectile_type = 5
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -17,7 +17,5 @@ Cooldown: {2}
Increases your spell damage by 30% for 20 sec." Increases your spell damage by 30% for 20 sec."
cooldown_cooldown = 180.0 cooldown_cooldown = 180.0
aoe_targetType = 2 aoe_targetType = 2
aoe_movement_type = 915097248
aoe_colliderType = 480 aoe_colliderType = 480
projectile_type = 8
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -16,6 +16,5 @@ Removes any movement impairing effects, stuns, and effects which makes you lose
cooldown_cooldown = 90.0 cooldown_cooldown = 90.0
cooldown_global_cooldown = false cooldown_global_cooldown = false
aoe_targetType = 7 aoe_targetType = 7
aoe_movement_type = 18
aoe_colliderType = 480 aoe_colliderType = 480
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -13,7 +13,5 @@ icon = ExtResource( 2 )
text_name = "Rest" text_name = "Rest"
text_description = "Rest for 30 seconds, greatly increasing your regeneration." text_description = "Rest for 30 seconds, greatly increasing your regeneration."
aoe_targetType = 5 aoe_targetType = 5
aoe_movement_type = 6357069
aoe_colliderType = 1065353216 aoe_colliderType = 1065353216
projectile_type = 7
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -18,7 +18,5 @@ Deals 230 to 270 damage every 3 sec, this damage increases over the duration, fo
range = true range = true
range_range = 26.0 range_range = 26.0
aoe_targetType = 541 aoe_targetType = 541
aoe_movement_type = 99418736
aoe_colliderType = 541 aoe_colliderType = 541
projectile_type = 541
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -18,7 +18,5 @@ Deals 280 to 330 damage every 2 sec, and reduces melee and spell damage by 10% f
range = true range = true
range_range = 26.0 range_range = 26.0
aoe_targetType = 1129071960 aoe_targetType = 1129071960
aoe_movement_type = 2190112
aoe_colliderType = 1058050193 aoe_colliderType = 1058050193
projectile_type = -1039400960
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -11,5 +11,4 @@ target_relation_type = 4
rank = 1 rank = 1
icon = ExtResource( 1 ) icon = ExtResource( 1 )
aoe_targetType = -2147459840 aoe_targetType = -2147459840
aoe_movement_type = 4
script = ExtResource( 2 ) script = ExtResource( 2 )

View File

@ -22,7 +22,5 @@ cooldown_cooldown = 21.0
range = true range = true
range_range = 26.0 range_range = 26.0
aoe_targetType = -1910718371 aoe_targetType = -1910718371
aoe_movement_type = 1611610192
aoe_colliderType = -298046312 aoe_colliderType = -298046312
projectile_type = 1065353216
script = ExtResource( 1 ) script = ExtResource( 1 )

View File

@ -36,7 +36,5 @@ damage_type = 16
damage_min = 130 damage_min = 130
damage_max = 150 damage_max = 150
aoe_targetType = -1910718371 aoe_targetType = -1910718371
aoe_movement_type = 1611610192
aoe_colliderType = 1065353216 aoe_colliderType = 1065353216
projectile_type = 882743928
script = ExtResource( 3 ) script = ExtResource( 3 )

View File

@ -26,7 +26,7 @@ func _sstart_casting(info : SpellCastInfo) -> void:
handle_cooldown(info) handle_cooldown(info)
if has_projectile(): if projectile != null:
fire_projectile(info) fire_projectile(info)
else: else:
handle_effect(info) handle_effect(info)
@ -40,7 +40,7 @@ func _sfinish_cast(info : SpellCastInfo) -> void:
if is_instance_valid(info.target): if is_instance_valid(info.target):
info.target.son_cast_finished_target(info) info.target.son_cast_finished_target(info)
if has_projectile(): if projectile != null:
fire_projectile(info) fire_projectile(info)
else: else:
handle_effect(info) handle_effect(info)
@ -52,13 +52,14 @@ func _son_cast_player_moved(info):
info.caster.sfail_cast() info.caster.sfail_cast()
func fire_projectile(info : SpellCastInfo): func fire_projectile(info : SpellCastInfo):
if projectile_type == SPELL_PROJECTILE_TYPE_FOLLOW: pass
var sp : WorldSpellGD = WorldSpellGD.new() # if projectile_type == SPELL_PROJECTILE_TYPE_FOLLOW:
# var sp : WorldSpellGD = WorldSpellGD.new()
info.get_caster().get_parent().add_child(sp) #
sp.owner = info.get_caster().get_parent() # info.get_caster().get_parent().add_child(sp)
# sp.owner = info.get_caster().get_parent()
sp.launch(info, projectile, projectile_speed) #
# sp.launch(info, projectile, projectile_speed)
func _son_spell_hit(info): func _son_spell_hit(info):
handle_effect(info) handle_effect(info)