Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-03-15 15:56:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix global cooldowns.

Browse Source
This commit is contained in:
Relintai 2020-07-11 18:37:41 +02:00
parent 33ed628aa3
commit 08ebbd24f8
17 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
game/modules/entity_classes/naturalist/entities/1_naturalist.tres
View File

@ -22,6 +22,7 @@ stat/intellect = 19.0
stat/spirit = 3.0 stat/spirit = 3.0
stat/health = 100.0 stat/health = 100.0
stat/mana = 100.0 stat/mana = 100.0
stat/global_cooldown = 1.5
[resource] [resource]
resource_name = "Naturalist" resource_name = "Naturalist"

1
game/modules/entity_classes/naturalist/entities/2_naturalist_mob.tres
View File

@ -22,6 +22,7 @@ stat/intellect = 13.0
stat/spirit = 10.0 stat/spirit = 10.0
stat/health = 20.0 stat/health = 20.0
stat/mana = 20.0 stat/mana = 20.0
stat/global_cooldown = 1.5
[resource] [resource]
resource_name = "Naturalist" resource_name = "Naturalist"

1
game/modules/species/Human/Female/left_calf.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 24 bone = 24

1
game/modules/species/Human/Female/left_foot.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 25 bone = 25

1
game/modules/species/Human/Female/left_forearm.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 9 bone = 9

1
game/modules/species/Human/Female/left_hand.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_models/huf_handl.gltf" type="MeshDataResource" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 10 bone = 10

1
game/modules/species/Human/Female/left_thigh.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 23 bone = 23

1
game/modules/species/Human/Female/neck.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_models/huf_neck.gltf" type="MeshDataResource" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 5 bone = 5

1
game/modules/species/Human/Female/pelvis.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_models/huf_pelvis.gltf" type="MeshDataResource" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 1 bone = 1

1
game/modules/species/Human/Female/right_calf.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_models/huf_calf_left.gltf" type="MeshDataResource" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 27 bone = 27

1
game/modules/species/Human/Female/right_foot.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_models/huf_foot_left.gltf" type="MeshDataResource" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 28 bone = 28

1
game/modules/species/Human/Female/right_forearm.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 17 bone = 17

1
game/modules/species/Human/Female/right_hand.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_models/huf_hand.gltf" type="MeshDataResource" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 18 bone = 18

1
game/modules/species/Human/Female/right_thigh.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_textures/100_seamless/armor_simple_v3.png" type="Texture" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 26 bone = 26

1
game/modules/species/Human/Female/spine_1.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_models/huf_spine1.gltf" type="MeshDataResource" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 3 bone = 3

1
game/modules/species/Human/Female/spine_2.tres
View File

@ -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_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] [ext_resource path="res://modules/species/Human/Female/character_models/huf_spine2.gltf" type="MeshDataResource" id=2]
[resource] [resource]
entity_type = 1 entity_type = 1
bone = 4 bone = 4

3
game/scripts/spells/gd_spell_script.gd
View File

@ -211,7 +211,8 @@ func handle_cooldown(info : SpellCastInfo) -> void:
info.caster.cooldown_adds(id, cooldown_cooldown) info.caster.cooldown_adds(id, cooldown_cooldown)
func handle_gcd(info : SpellCastInfo) -> void: 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)) info.caster.gcd_starts(info.caster.stat_gets_current(gcd_id))
func add_spell_cast_effect(info : SpellCastInfo) -> void: func add_spell_cast_effect(info : SpellCastInfo) -> void: