Skip to content

Block guard detection and light with doors #2886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manuq merged 7 commits into from
Sep 23, 2026
+44 −0
Merged

Block guard detection and light with doors #2886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b3736f
Block guard detection and light with doors
ChiguireDigital Sep 14, 2026
4b22caf
guard detection through doors
ChiguireDigital Sep 15, 2026
f8cd865
Remove issue test scene
ChiguireDigital Sep 18, 2026
241bbdd
Use unique name for door light occluder
ChiguireDigital Sep 18, 2026
dc6a6be
Merge branch 'main' into fix/door-guard-detection
ChiguireDigital Sep 22, 2026
855b347
Update light occluders to better match the door shapes
manuq Sep 23, 2026
cd3fff6
Doors: Add separate collider for sight occlussion
manuq Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions scenes/game_elements/characters/enemies/guard/components/guard.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,6 +466,8 @@ func _set_alert_other_sound_stream(new_value: AudioStream) -> void:


func _on_instant_detection_area_body_entered(body: Node2D) -> void:
if _is_sight_to_point_blocked(body.global_position):
return
state = State.ALERTED
player_detected.emit(body)

Expand Down
2 changes: 2 additions & 0 deletions scenes/game_elements/props/door/components/door.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ func update_opened_state() -> void:

%ColliderWhenClosed.set_collision_layer_value(Enums.CollisionLayers.WALLS, not opened)
%ColliderWhenClosed.set_collision_mask_value(Enums.CollisionLayers.PLAYERS, not opened)
%SightOcclussion.set_collision_layer_value(Enums.CollisionLayers.SIGHT_OCCLUDERS, not opened)
%LightOccluder2D.visible = not opened


func update_door_flip() -> void:
Expand Down
20 changes: 20 additions & 0 deletions scenes/game_elements/props/door/horizontal_door.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,22 @@
[ext_resource type="AudioStream" uid="uid://wyrvtep877iy" path="res://assets/third_party/sounds/characters/enemies/throwing_enemy/Door.ogg" id="4_0hwet"]
[ext_resource type="AudioStream" uid="uid://erxulumcdtuu" path="res://assets/third_party/sounds/characters/enemies/throwing_enemy/Ring.ogg" id="5_qouav"]

[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_ty0te"]
polygon = PackedVector2Array(7, 9, 7, -138, -6, -138, -6, 9)

[sub_resource type="RectangleShape2D" id="RectangleShape2D_t3aaa"]
size = Vector2(13, 76.25)

[sub_resource type="RectangleShape2D" id="RectangleShape2D_qda76"]
size = Vector2(19, 133.375)

[node name="HorizontalDoor" type="Node2D" unique_id=1860367584]
script = ExtResource("1_apinb")

[node name="LightOccluder2D" type="LightOccluder2D" parent="." unique_id=1053118773]
unique_name_in_owner = true
occluder = SubResource("OccluderPolygon2D_ty0te")

[node name="DoorClosed" type="Sprite2D" parent="." unique_id=47488445]
unique_name_in_owner = true
position = Vector2(26, -63)
Expand All @@ -31,6 +41,16 @@ collision_layer = 16
position = Vector2(0.5, -37.125)
shape = SubResource("RectangleShape2D_t3aaa")

[node name="SightOcclussion" type="StaticBody2D" parent="." unique_id=729311558]
unique_name_in_owner = true
collision_layer = 8
collision_mask = 0

[node name="ShapeWhenClosed" type="CollisionShape2D" parent="SightOcclussion" unique_id=1123213291]
position = Vector2(0.5, -63.3125)
shape = SubResource("RectangleShape2D_qda76")
debug_color = Color(0.972549, 0, 0.44313726, 0)

[node name="DoorOpenSound" type="AudioStreamPlayer2D" parent="." unique_id=1659028188]
unique_name_in_owner = true
stream = ExtResource("4_0hwet")
Expand Down
20 changes: 20 additions & 0 deletions scenes/game_elements/props/door/vertical_door.tscn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,22 @@
[ext_resource type="AudioStream" uid="uid://wyrvtep877iy" path="res://assets/third_party/sounds/characters/enemies/throwing_enemy/Door.ogg" id="4_wl1pt"]
[ext_resource type="AudioStream" uid="uid://erxulumcdtuu" path="res://assets/third_party/sounds/characters/enemies/throwing_enemy/Ring.ogg" id="5_20262"]

[sub_resource type="OccluderPolygon2D" id="OccluderPolygon2D_ty0te"]
polygon = PackedVector2Array(33, -65, 26, -73, 18, -76, -18, -76, -27, -73, -33, -65, -30, -65, -18, -72, 18, -72, 30, -65)

[sub_resource type="RectangleShape2D" id="RectangleShape2D_t3aaa"]
size = Vector2(57.5, 25)

[sub_resource type="RectangleShape2D" id="RectangleShape2D_mqtua"]
size = Vector2(68, 81)

[node name="VerticalDoor" type="Node2D" unique_id=1860367584]
script = ExtResource("1_t3aaa")

[node name="LightOccluder2D" type="LightOccluder2D" parent="." unique_id=366675999]
unique_name_in_owner = true
occluder = SubResource("OccluderPolygon2D_ty0te")

[node name="DoorClosed" type="Sprite2D" parent="." unique_id=47488445]
unique_name_in_owner = true
position = Vector2(0, -32)
Expand All @@ -31,6 +41,16 @@ collision_layer = 16
position = Vector2(0.25, -12.5)
shape = SubResource("RectangleShape2D_t3aaa")

[node name="SightOcclussion" type="StaticBody2D" parent="." unique_id=2115023129]
unique_name_in_owner = true
collision_layer = 8
collision_mask = 0

[node name="CollisionShape2D" type="CollisionShape2D" parent="SightOcclussion" unique_id=1355802857]
position = Vector2(0, -37.5)
shape = SubResource("RectangleShape2D_mqtua")
debug_color = Color(0.972549, 0, 0.44313726, 0)

[node name="DoorOpenSound" type="AudioStreamPlayer2D" parent="." unique_id=1659028188]
unique_name_in_owner = true
stream = ExtResource("4_wl1pt")
Expand Down
Loading