collider disable

This commit is contained in:
Rendo 2025-08-11 01:58:21 +05:00
commit f0f7f6b42b
5 changed files with 19 additions and 12 deletions

View file

@ -181,6 +181,7 @@ position = Vector2(17, -4)
script = ExtResource("8_6jrfv") script = ExtResource("8_6jrfv")
[connection signal="killed" from="." to="DeathHandler" method="_on_killed"] [connection signal="killed" from="." to="DeathHandler" method="_on_killed"]
[connection signal="toggled" from="." to="GenericCollider" method="toggle"]
[connection signal="collision_end" from="GenericHurtbox" to="Controller" method="_on_generic_hurtbox_collision_end"] [connection signal="collision_end" from="GenericHurtbox" to="Controller" method="_on_generic_hurtbox_collision_end"]
[connection signal="collision_start" from="GenericHurtbox" to="Controller" method="_on_generic_hurtbox_collision_start"] [connection signal="collision_start" from="GenericHurtbox" to="Controller" method="_on_generic_hurtbox_collision_start"]
[connection signal="timeout" from="Controller/Timer" to="Controller" method="_on_timer_timeout"] [connection signal="timeout" from="Controller/Timer" to="Controller" method="_on_timer_timeout"]

View file

@ -824,7 +824,7 @@ metadata/_edit_lock_ = true
[node name="RightUpperLeg" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt"] [node name="RightUpperLeg" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt"]
position = Vector2(-6, 3) position = Vector2(-6, 3)
scale = Vector2(0.99983, 0.99983) scale = Vector2(0.999827, 0.999827)
rest = Transform2D(1, 0, 0, 1, -6, 3) rest = Transform2D(1, 0, 0, 1, -6, 3)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -836,13 +836,13 @@ metadata/_edit_lock_ = true
[node name="RightLowerLeg" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/RightUpperLeg"] [node name="RightLowerLeg" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/RightUpperLeg"]
position = Vector2(-2, 12) position = Vector2(-2, 12)
scale = Vector2(0.99983, 0.99983) scale = Vector2(0.999831, 0.999831)
rest = Transform2D(1, 0, 0, 1, -2, 12) rest = Transform2D(1, 0, 0, 1, -2, 12)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
[node name="RightFoot" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg"] [node name="RightFoot" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/RightUpperLeg/RightLowerLeg"]
position = Vector2(-2, 14) position = Vector2(-2, 14)
scale = Vector2(0.99983, 0.99983) scale = Vector2(0.999827, 0.999827)
rest = Transform2D(1, 0, 0, 1, -2, 14) rest = Transform2D(1, 0, 0, 1, -2, 14)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 12.0 length = 12.0
@ -888,7 +888,7 @@ metadata/_edit_lock_ = true
[node name="LeftFoot" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg"] [node name="LeftFoot" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/LeftUpperLeg/LeftLowerLeg"]
position = Vector2(6, 10) position = Vector2(6, 10)
scale = Vector2(0.999826, 0.999826) scale = Vector2(0.999823, 0.999823)
rest = Transform2D(1, 0, 0, 1, 6, 10) rest = Transform2D(1, 0, 0, 1, 6, 10)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 12.0 length = 12.0
@ -903,13 +903,13 @@ metadata/_edit_lock_ = true
[node name="Body" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt"] [node name="Body" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt"]
position = Vector2(1, -2) position = Vector2(1, -2)
scale = Vector2(0.999829, 0.999829) scale = Vector2(0.999827, 0.999827)
rest = Transform2D(1, 0, 0, 1, 1, -2) rest = Transform2D(1, 0, 0, 1, 1, -2)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
[node name="RightUpperArm" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body"] [node name="RightUpperArm" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body"]
position = Vector2(-14, -23) position = Vector2(-14, -23)
scale = Vector2(0.999831, 0.999831) scale = Vector2(0.999828, 0.999828)
rest = Transform2D(1, 0, 0, 1, -14, -23) rest = Transform2D(1, 0, 0, 1, -14, -23)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -921,7 +921,7 @@ metadata/_edit_lock_ = true
[node name="RightLowerArm" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm"] [node name="RightLowerArm" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body/RightUpperArm"]
position = Vector2(-2, 15) position = Vector2(-2, 15)
scale = Vector2(0.99982, 0.99982) scale = Vector2(0.999811, 0.999811)
rest = Transform2D(1, 0, 0, 1, -2, 15) rest = Transform2D(1, 0, 0, 1, -2, 15)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -982,7 +982,7 @@ metadata/_edit_lock_ = true
[node name="Jaw" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body/Head"] [node name="Jaw" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body/Head"]
position = Vector2(-3, 3) position = Vector2(-3, 3)
scale = Vector2(0.999832, 0.999832) scale = Vector2(0.999826, 0.999826)
rest = Transform2D(1, 0, 0, 1, -3, 3) rest = Transform2D(1, 0, 0, 1, -3, 3)
auto_calculate_length_and_angle = false auto_calculate_length_and_angle = false
length = 11.0 length = 11.0
@ -1025,7 +1025,7 @@ metadata/_edit_lock_ = true
[node name="LeftUpperArm" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body"] [node name="LeftUpperArm" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body"]
position = Vector2(-1, -20) position = Vector2(-1, -20)
scale = Vector2(0.999827, 0.999827) scale = Vector2(0.99983, 0.99983)
rest = Transform2D(1, 0, 0, 1, -1, -20) rest = Transform2D(1, 0, 0, 1, -1, -20)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -1038,7 +1038,7 @@ metadata/_edit_lock_ = true
[node name="LeftLowerArm" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm"] [node name="LeftLowerArm" type="Bone2D" parent="Visual/basic_zombie_walk/Zombie/Butt/Body/LeftUpperArm"]
position = Vector2(-2, 14) position = Vector2(-2, 14)
scale = Vector2(0.999825, 0.999825) scale = Vector2(0.999828, 0.999828)
rest = Transform2D(1, 0, 0, 1, -2, 14) rest = Transform2D(1, 0, 0, 1, -2, 14)
editor_settings/show_bone_gizmo = false editor_settings/show_bone_gizmo = false
@ -1110,4 +1110,5 @@ damage = 5.0
script = ExtResource("9_ap2hg") script = ExtResource("9_ap2hg")
[connection signal="killed" from="." to="Controller" method="_on_entity_killed"] [connection signal="killed" from="." to="Controller" method="_on_entity_killed"]
[connection signal="toggled" from="." to="Collider" method="toggle"]
[connection signal="animation_finished" from="AnimationTree" to="DeathHandler" method="_on_animation_tree_animation_finished"] [connection signal="animation_finished" from="AnimationTree" to="DeathHandler" method="_on_animation_tree_animation_finished"]

View file

@ -7,6 +7,8 @@ var walking:
get: get:
return is_walking() return is_walking()
var disabled = false
@export var hurtbox : GenericHurtbox @export var hurtbox : GenericHurtbox
@export var damage : float @export var damage : float
@onready var disablable := get_parent() @onready var disablable := get_parent()

View file

@ -13,3 +13,6 @@ enum Layers
} }
@export var layer : Layers = Layers.NORMAL @export var layer : Layers = Layers.NORMAL
func toggle(value : bool) -> void:
monitorable = value

View file

@ -29,13 +29,13 @@ signal toggled(disabled : bool)
func disable(): func disable():
if disabled: return if disabled: return
disabled = true disabled = true
toggled.emit(disabled) toggled.emit(not disabled)
## ##
func enable(): func enable():
if disabled == false: return if disabled == false: return
disabled = false disabled = false
toggled.emit(disabled) toggled.emit(not disabled)
## Properly deal damage to entity ## Properly deal damage to entity
func deal_damage(amount : float, source : Entity): func deal_damage(amount : float, source : Entity):