diff --git a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres b/game/modules/entity_classes/naturalist/entities/1_naturalist.tres index faa3b5df..57d0c95a 100644 --- a/game/modules/entity_classes/naturalist/entities/1_naturalist.tres +++ b/game/modules/entity_classes/naturalist/entities/1_naturalist.tres @@ -22,6 +22,7 @@ stat/intellect = 19.0 stat/spirit = 3.0 stat/health = 100.0 stat/mana = 100.0 +stat/global_cooldown = 1.5 [resource] resource_name = "Naturalist" diff --git a/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres b/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres index 9ea26e12..c89e01a8 100644 --- a/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres +++ b/game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres @@ -22,6 +22,7 @@ stat/intellect = 13.0 stat/spirit = 10.0 stat/health = 20.0 stat/mana = 20.0 +stat/global_cooldown = 1.5 [resource] resource_name = "Naturalist" diff --git a/game/modules/species/Human/Female/left_calf.tres b/game/modules/species/Human/Female/left_calf.tres index 94cdc5a8..0866720c 100644 --- a/game/modules/species/Human/Female/left_calf.tres +++ b/game/modules/species/Human/Female/left_calf.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - [resource] entity_type = 1 bone = 24 diff --git a/game/modules/species/Human/Female/left_foot.tres b/game/modules/species/Human/Female/left_foot.tres index 3f83d56d..086f97bb 100644 --- a/game/modules/species/Human/Female/left_foot.tres +++ b/game/modules/species/Human/Female/left_foot.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_models/huf_foot_left.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - [resource] entity_type = 1 bone = 25 diff --git a/game/modules/species/Human/Female/left_forearm.tres b/game/modules/species/Human/Female/left_forearm.tres index ffb3478a..cfccd85d 100644 --- a/game/modules/species/Human/Female/left_forearm.tres +++ b/game/modules/species/Human/Female/left_forearm.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_models/huf_forearm.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - [resource] entity_type = 1 bone = 9 diff --git a/game/modules/species/Human/Female/left_hand.tres b/game/modules/species/Human/Female/left_hand.tres index e68adeac..15195316 100644 --- a/game/modules/species/Human/Female/left_hand.tres +++ b/game/modules/species/Human/Female/left_hand.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_handl.gltf" type="MeshDataResource" id=2] - [resource] entity_type = 1 bone = 10 diff --git a/game/modules/species/Human/Female/left_thigh.tres b/game/modules/species/Human/Female/left_thigh.tres index 18343467..899728e0 100644 --- a/game/modules/species/Human/Female/left_thigh.tres +++ b/game/modules/species/Human/Female/left_thigh.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_models/huf_thigh_left.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - [resource] entity_type = 1 bone = 23 diff --git a/game/modules/species/Human/Female/neck.tres b/game/modules/species/Human/Female/neck.tres index 9950cba4..cd23c07d 100644 --- a/game/modules/species/Human/Female/neck.tres +++ b/game/modules/species/Human/Female/neck.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_neck.gltf" type="MeshDataResource" id=2] - [resource] entity_type = 1 bone = 5 diff --git a/game/modules/species/Human/Female/pelvis.tres b/game/modules/species/Human/Female/pelvis.tres index d0c6498d..71997b0f 100644 --- a/game/modules/species/Human/Female/pelvis.tres +++ b/game/modules/species/Human/Female/pelvis.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_pelvis.gltf" type="MeshDataResource" id=2] - [resource] entity_type = 1 bone = 1 diff --git a/game/modules/species/Human/Female/right_calf.tres b/game/modules/species/Human/Female/right_calf.tres index 81485c98..1ff15a9f 100644 --- a/game/modules/species/Human/Female/right_calf.tres +++ b/game/modules/species/Human/Female/right_calf.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.gltf" type="MeshDataResource" id=2] - [resource] entity_type = 1 bone = 27 diff --git a/game/modules/species/Human/Female/right_foot.tres b/game/modules/species/Human/Female/right_foot.tres index 5304c237..b07b7f44 100644 --- a/game/modules/species/Human/Female/right_foot.tres +++ b/game/modules/species/Human/Female/right_foot.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_foot_left.gltf" type="MeshDataResource" id=2] - [resource] entity_type = 1 bone = 28 diff --git a/game/modules/species/Human/Female/right_forearm.tres b/game/modules/species/Human/Female/right_forearm.tres index e0c50c8e..7f846021 100644 --- a/game/modules/species/Human/Female/right_forearm.tres +++ b/game/modules/species/Human/Female/right_forearm.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_models/huf_forearm.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - [resource] entity_type = 1 bone = 17 diff --git a/game/modules/species/Human/Female/right_hand.tres b/game/modules/species/Human/Female/right_hand.tres index 75b75343..0bd0f73c 100644 --- a/game/modules/species/Human/Female/right_hand.tres +++ b/game/modules/species/Human/Female/right_hand.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_green_scarf_v3.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_hand.gltf" type="MeshDataResource" id=2] - [resource] entity_type = 1 bone = 18 diff --git a/game/modules/species/Human/Female/right_thigh.tres b/game/modules/species/Human/Female/right_thigh.tres index 8388b9bf..0e26de85 100644 --- a/game/modules/species/Human/Female/right_thigh.tres +++ b/game/modules/species/Human/Female/right_thigh.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_models/huf_thigh_right.gltf" type="MeshDataResource" id=1] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2] - [resource] entity_type = 1 bone = 26 diff --git a/game/modules/species/Human/Female/spine_1.tres b/game/modules/species/Human/Female/spine_1.tres index 6f554391..fa7badb8 100644 --- a/game/modules/species/Human/Female/spine_1.tres +++ b/game/modules/species/Human/Female/spine_1.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_spine1.gltf" type="MeshDataResource" id=2] - [resource] entity_type = 1 bone = 3 diff --git a/game/modules/species/Human/Female/spine_2.tres b/game/modules/species/Human/Female/spine_2.tres index d4ae3b9b..adb30e6c 100644 --- a/game/modules/species/Human/Female/spine_2.tres +++ b/game/modules/species/Human/Female/spine_2.tres @@ -3,7 +3,6 @@ [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_red_scarf_v3.png" type="Texture" id=1] [ext_resource path="res://modules/species/Human/Female/character_models/huf_spine2.gltf" type="MeshDataResource" id=2] - [resource] entity_type = 1 bone = 4 diff --git a/game/scripts/spells/gd_spell_script.gd b/game/scripts/spells/gd_spell_script.gd index fb842051..20134b70 100644 --- a/game/scripts/spells/gd_spell_script.gd +++ b/game/scripts/spells/gd_spell_script.gd @@ -211,7 +211,8 @@ func handle_cooldown(info : SpellCastInfo) -> void: info.caster.cooldown_adds(id, cooldown_cooldown) func handle_gcd(info : SpellCastInfo) -> void: - if cooldown_global_cooldown_enabled and cast_cast_time < 0.01: + print(cast_cast_time) + if cooldown_global_cooldown_enabled and not cast_enabled: info.caster.gcd_starts(info.caster.stat_gets_current(gcd_id)) func add_spell_cast_effect(info : SpellCastInfo) -> void: