Update the engine, and ESS, to get the Cooldown and CategoryCooldown removal change.

HEADS

@@ -1 +1 @@
-{"engine": {"3.2": "6c9b7c27d5ab008c039a15a1805dd2c4a55f2255", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "68443b835ca11da1008c8c5ce3edd52f540409bd"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "cdc918a5b89a226bad0510f270ddc0d06097f07e"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "fb01ca303dd733217fa59cbee391cbde439db35b"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}
+{"engine": {"3.2": "879014c3ff5c999f237e9305d8e52545fdc0adda", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "fb3a5cde0466c51aa8475825935e5657a9a5f5d5"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "cdc918a5b89a226bad0510f270ddc0d06097f07e"}, "texture_packer": {"master": "e3047f7dfab861767c5295ea93d2f1404e8de66e"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "3cc9f15f05be53380e20763efc0be753b621b8a2"}, "procedural_animations": {"master": "fb01ca303dd733217fa59cbee391cbde439db35b"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}, "mesh_utils": {"master": "e540e84f9b9505cbba14d1abcd7777ea0b9963e6"}, "broken_seals_module": {"master": "14c239fd8716988b837c2fcfe20fe7d9f11dd515"}, "thread_pool": {"master": "c2aa3018961655165d31aa4586bf1c2a76ed57c1"}}

game/ui/actionbars/ActionBarEntry.gd

@@ -38,8 +38,8 @@ var player : Entity
 var spell_id : int = 0
 var spell_type : int = 0
 
-var cd : Cooldown = null
-var categ_cd : CategoryCooldown = null
+var cd : float = 0
+var categ_cd : float = 0
 
 var has_gcd : bool = false
 var gcd : float = 0.0
@@ -59,7 +59,13 @@ func _exit_tree():
 		ThemeAtlas.unref_texture(icon_rect.texture)
 
 func _process(delta : float) -> void:
-	if cd == null and categ_cd == null and gcd < 0.001:
+	if cd > 0:
+		cd -= delta
+		
+	if categ_cd > 0:
+		categ_cd -= delta
+	
+	if cd < 0.02 and categ_cd < 0.02 and gcd < 0.001:
 		set_process(false)
 		hide_cooldown_timer()
 		return
@@ -72,11 +78,11 @@ func _process(delta : float) -> void:
 		
 	var value : float = gcd
 		
-	if cd != null and cd.remaining > value:
-		value = cd.remaining
+	if cd > value:
+		value = cd
 		
-	if categ_cd != null and categ_cd.remaining > value:
-		value = categ_cd.remaining
+	if categ_cd > value:
+		value = categ_cd
 	
 	set_cooldown_time(value) 
 
@@ -300,25 +306,25 @@ func set_player(p_player: Entity) -> void:
 	player.connect("cgcd_finished", self, "_cgcd_finished")
 
 
-func _ccooldown_added(cooldown : Cooldown) -> void:
-	if cooldown.spell_id == spell_id:
-		cd = cooldown
+func _ccooldown_added(id : int, value : float) -> void:
+	if id == spell_id:
+		cd = value
 		set_process(true)
-		show_cooldown_timer(cooldown.remaining)
+		show_cooldown_timer(value)
 
-func _ccooldown_removed(cooldown : Cooldown) -> void:
-	if cooldown.spell_id == spell_id:
-		cd = null
+func _ccooldown_removed(id : int, value : float) -> void:
+	if id == spell_id:
+		cd = 0
 	
-func _ccategory_cooldown_added(cooldown : CategoryCooldown) -> void:
-	if cooldown.category_id == spell_type:
-		categ_cd = cooldown
+func _ccategory_cooldown_added(id : int, value : float) -> void:
+	if id  == spell_type:
+		categ_cd = value
 		set_process(true)
-		show_cooldown_timer(cooldown.remaining)
+		show_cooldown_timer(value)
 	
-func _ccategory_cooldown_removed(cooldown : CategoryCooldown) -> void:
-	if cooldown.category_id == spell_type:
-		categ_cd = null
+func _ccategory_cooldown_removed(id : int, value : float) -> void:
+	if id == spell_type:
+		categ_cd = 0
 		
 	
 func _cgcd_started(value :float) -> void:

game/ui/bags/BagEntry.gd

@@ -43,7 +43,7 @@ var player : Entity
 var spell_id : int = 0
 #var spell_type : int = 0
 
-var cd : Cooldown = null
+var cd : float = 0
 
 var has_gcd : bool = false
 var gcd : float = 0.0
@@ -64,7 +64,13 @@ func _ready() -> void:
 #		item.disconnect("stack_size_changed", self, "stack_size_changed")
 
 func _process(delta : float) -> void:
-	if cd == null and gcd < 0.001:
+	if cd > 0:
+		cd -= delta
+		
+		if cd < 0:
+			cd = 0
+	
+	if cd < 0.02 and gcd < 0.001:
 		set_process(false)
 		hide_cooldown_timer()
 		return
@@ -77,8 +83,8 @@ func _process(delta : float) -> void:
 		
 	var value : float = gcd
 		
-	if cd != null and cd.remaining > value:
-		value = cd.remaining
+	if cd > value:
+		value = cd
 	
 	set_cooldown_time(value) 
 
@@ -215,15 +221,15 @@ func set_player(p_player: Entity) -> void:
 	player.connect("cgcd_finished", self, "_cgcd_finished")
 
 
-func _ccooldown_added(cooldown : Cooldown) -> void:
-	if cooldown.spell_id == spell_id:
-		cd = cooldown
+func _ccooldown_added(id : int, value : float) -> void:
+	if id == spell_id:
+		cd = value
 		set_process(true)
-		show_cooldown_timer(cooldown.remaining)
+		show_cooldown_timer(value)
 
-func _ccooldown_removed(cooldown : Cooldown) -> void:
-	if cooldown.spell_id == spell_id:
-		cd = null
+func _ccooldown_removed(id : int, value : float) -> void:
+	if id == spell_id:
+		cd = 0
 	
 func _cgcd_started(value :float) -> void:
 	if not has_gcd: