From 36c123ea5d4a48b375284c7b1af3a3acd04df9eb Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Thu, 29 Jan 2026 20:58:11 +0300 Subject: [PATCH] Fixed enemy rays --- .../{ => enemies}/abstract_color_enemy.gd | 1 + .../{ => enemies}/abstract_color_enemy.gd.uid | 0 .../{ => enemies}/abstract_color_enemy.tscn | 6 +++--- .../characters/{ => enemies}/abstract_enemy.gd | 18 +++++++++++++++--- .../{ => enemies}/abstract_enemy.gd.uid | 0 .../{ => enemies}/abstract_enemy.tscn | 5 ++--- game/characters/{ => enemies}/black_enemy.gd | 0 .../{ => enemies}/black_enemy.gd.uid | 0 game/characters/{ => enemies}/black_enemy.tscn | 4 ++-- .../characters/{ => enemies}/enemy_sprite.tscn | 0 game/characters/{ => enemies}/gray_enemy.gd | 0 .../characters/{ => enemies}/gray_enemy.gd.uid | 0 game/characters/{ => enemies}/gray_enemy.tscn | 4 ++-- game/characters/{ => enemies}/white_enemy.gd | 0 .../{ => enemies}/white_enemy.gd.uid | 0 game/characters/{ => enemies}/white_enemy.tscn | 4 ++-- game/characters/{ => player}/player.gd | 0 game/characters/{ => player}/player.gd.uid | 0 game/characters/{ => player}/player.tscn | 4 ++-- .../characters/{ => player}/player_sprite.tscn | 0 game/levels/abstract_level.tscn | 2 +- game/levels/level_4.tscn | 6 +++--- game/levels/level_6.tscn | 4 ++-- game/levels/level_7.tscn | 6 +++--- game/levels/test_level.tscn | 8 ++++---- 25 files changed, 42 insertions(+), 30 deletions(-) rename game/characters/{ => enemies}/abstract_color_enemy.gd (92%) rename game/characters/{ => enemies}/abstract_color_enemy.gd.uid (100%) rename game/characters/{ => enemies}/abstract_color_enemy.tscn (86%) rename game/characters/{ => enemies}/abstract_enemy.gd (95%) rename game/characters/{ => enemies}/abstract_enemy.gd.uid (100%) rename game/characters/{ => enemies}/abstract_enemy.tscn (96%) rename game/characters/{ => enemies}/black_enemy.gd (100%) rename game/characters/{ => enemies}/black_enemy.gd.uid (100%) rename game/characters/{ => enemies}/black_enemy.tscn (94%) rename game/characters/{ => enemies}/enemy_sprite.tscn (100%) rename game/characters/{ => enemies}/gray_enemy.gd (100%) rename game/characters/{ => enemies}/gray_enemy.gd.uid (100%) rename game/characters/{ => enemies}/gray_enemy.tscn (93%) rename game/characters/{ => enemies}/white_enemy.gd (100%) rename game/characters/{ => enemies}/white_enemy.gd.uid (100%) rename game/characters/{ => enemies}/white_enemy.tscn (94%) rename game/characters/{ => player}/player.gd (100%) rename game/characters/{ => player}/player.gd.uid (100%) rename game/characters/{ => player}/player.tscn (93%) rename game/characters/{ => player}/player_sprite.tscn (100%) diff --git a/game/characters/abstract_color_enemy.gd b/game/characters/enemies/abstract_color_enemy.gd similarity index 92% rename from game/characters/abstract_color_enemy.gd rename to game/characters/enemies/abstract_color_enemy.gd index 9b0f9f0..b7f348d 100644 --- a/game/characters/abstract_color_enemy.gd +++ b/game/characters/enemies/abstract_color_enemy.gd @@ -6,4 +6,5 @@ extends AbstractEnemy func _ready() -> void: + super._ready() collision_switcher.material = sprite.material diff --git a/game/characters/abstract_color_enemy.gd.uid b/game/characters/enemies/abstract_color_enemy.gd.uid similarity index 100% rename from game/characters/abstract_color_enemy.gd.uid rename to game/characters/enemies/abstract_color_enemy.gd.uid diff --git a/game/characters/abstract_color_enemy.tscn b/game/characters/enemies/abstract_color_enemy.tscn similarity index 86% rename from game/characters/abstract_color_enemy.tscn rename to game/characters/enemies/abstract_color_enemy.tscn index fb9f6ba..41a0ddb 100644 --- a/game/characters/abstract_color_enemy.tscn +++ b/game/characters/enemies/abstract_color_enemy.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=6 format=3 uid="uid://d37eyum03h83i"] +[gd_scene format=3 uid="uid://d37eyum03h83i"] -[ext_resource type="PackedScene" uid="uid://bx0luh4vdob3q" path="res://game/characters/abstract_enemy.tscn" id="1_12hr0"] -[ext_resource type="Script" uid="uid://das7ujanefsn0" path="res://game/characters/abstract_color_enemy.gd" id="2_rd56i"] +[ext_resource type="PackedScene" uid="uid://bx0luh4vdob3q" path="res://game/characters/enemies/abstract_enemy.tscn" id="1_12hr0"] +[ext_resource type="Script" uid="uid://das7ujanefsn0" path="res://game/characters/enemies/abstract_color_enemy.gd" id="2_rd56i"] [ext_resource type="PackedScene" uid="uid://5qlocc0yu8ug" path="res://game/collision_switcher.tscn" id="3_e5cea"] [ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="3_r5rx0"] diff --git a/game/characters/abstract_enemy.gd b/game/characters/enemies/abstract_enemy.gd similarity index 95% rename from game/characters/abstract_enemy.gd rename to game/characters/enemies/abstract_enemy.gd index 9ca55f3..4ec973b 100644 --- a/game/characters/abstract_enemy.gd +++ b/game/characters/enemies/abstract_enemy.gd @@ -68,7 +68,7 @@ var _target_x := 0.0 var _target_found := false -@onready var _state : State = initial_state: +var _state : State: set = _set_state @onready var sprite : AnimatedSprite2D = $AnimatedSprite2D @@ -83,6 +83,10 @@ var _target_found := false @onready var right_player_distant_ray : RayCast2D = $%RightPlayerDistantRay +func _ready() -> void: + _state = initial_state + + func _physics_process(delta: float) -> void: if not is_on_floor(): velocity += get_gravity() * delta @@ -132,15 +136,23 @@ func _set_state(value: State) -> void: right_player_close_ray.process_mode = Node.PROCESS_MODE_DISABLED left_player_distant_ray.process_mode = Node.PROCESS_MODE_DISABLED right_player_distant_ray.process_mode = Node.PROCESS_MODE_DISABLED + left_player_close_ray.hide() + right_player_close_ray.hide() + left_player_distant_ray.hide() + right_player_distant_ray.hide() match _state: State.ChasingLeft, State.WalkLeft: left_player_distant_ray.process_mode = Node.PROCESS_MODE_INHERIT + left_player_distant_ray.show() State.ChasingRight, State.WalkRight: - left_player_distant_ray.process_mode = Node.PROCESS_MODE_INHERIT + right_player_distant_ray.process_mode = Node.PROCESS_MODE_INHERIT + right_player_distant_ray.show() State.LookAround: left_player_close_ray.process_mode = Node.PROCESS_MODE_INHERIT - right_player_distant_ray.process_mode = Node.PROCESS_MODE_INHERIT + right_player_close_ray.process_mode = Node.PROCESS_MODE_INHERIT + left_player_close_ray.show() + right_player_close_ray.show() func _process_player_ray(ray: RayCast2D) -> bool: diff --git a/game/characters/abstract_enemy.gd.uid b/game/characters/enemies/abstract_enemy.gd.uid similarity index 100% rename from game/characters/abstract_enemy.gd.uid rename to game/characters/enemies/abstract_enemy.gd.uid diff --git a/game/characters/abstract_enemy.tscn b/game/characters/enemies/abstract_enemy.tscn similarity index 96% rename from game/characters/abstract_enemy.tscn rename to game/characters/enemies/abstract_enemy.tscn index 8c750bf..7a59680 100644 --- a/game/characters/abstract_enemy.tscn +++ b/game/characters/enemies/abstract_enemy.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://bx0luh4vdob3q"] -[ext_resource type="Script" uid="uid://but5aeh7y1s0f" path="res://game/characters/abstract_enemy.gd" id="1_2wrno"] -[ext_resource type="PackedScene" uid="uid://dtxiercm8dsfm" path="res://game/characters/enemy_sprite.tscn" id="2_tjvyk"] +[ext_resource type="Script" uid="uid://but5aeh7y1s0f" path="res://game/characters/enemies/abstract_enemy.gd" id="1_2wrno"] +[ext_resource type="PackedScene" uid="uid://dtxiercm8dsfm" path="res://game/characters/enemies/enemy_sprite.tscn" id="2_tjvyk"] [ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="3_tjvyk"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_mocsw"] @@ -71,7 +71,6 @@ position = Vector2(0, 2) shape = SubResource("RectangleShape2D_vecdo") [node name="KillingArea" parent="." unique_id=1891922549 instance=ExtResource("3_tjvyk")] -collision_layer = 0 collision_mask = 0 [node name="CollisionShape2D" type="CollisionShape2D" parent="KillingArea" unique_id=1710758452] diff --git a/game/characters/black_enemy.gd b/game/characters/enemies/black_enemy.gd similarity index 100% rename from game/characters/black_enemy.gd rename to game/characters/enemies/black_enemy.gd diff --git a/game/characters/black_enemy.gd.uid b/game/characters/enemies/black_enemy.gd.uid similarity index 100% rename from game/characters/black_enemy.gd.uid rename to game/characters/enemies/black_enemy.gd.uid diff --git a/game/characters/black_enemy.tscn b/game/characters/enemies/black_enemy.tscn similarity index 94% rename from game/characters/black_enemy.tscn rename to game/characters/enemies/black_enemy.tscn index 4125888..ce0f1e3 100644 --- a/game/characters/black_enemy.tscn +++ b/game/characters/enemies/black_enemy.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://cutjutvd8dqqc"] -[ext_resource type="PackedScene" uid="uid://d37eyum03h83i" path="res://game/characters/abstract_color_enemy.tscn" id="1_gj2ks"] -[ext_resource type="Script" uid="uid://c2knsjcp6faf6" path="res://game/characters/black_enemy.gd" id="2_332ds"] +[ext_resource type="PackedScene" uid="uid://d37eyum03h83i" path="res://game/characters/enemies/abstract_color_enemy.tscn" id="1_gj2ks"] +[ext_resource type="Script" uid="uid://c2knsjcp6faf6" path="res://game/characters/enemies/black_enemy.gd" id="2_332ds"] [ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="3_3jy5n"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_0u0ii"] diff --git a/game/characters/enemy_sprite.tscn b/game/characters/enemies/enemy_sprite.tscn similarity index 100% rename from game/characters/enemy_sprite.tscn rename to game/characters/enemies/enemy_sprite.tscn diff --git a/game/characters/gray_enemy.gd b/game/characters/enemies/gray_enemy.gd similarity index 100% rename from game/characters/gray_enemy.gd rename to game/characters/enemies/gray_enemy.gd diff --git a/game/characters/gray_enemy.gd.uid b/game/characters/enemies/gray_enemy.gd.uid similarity index 100% rename from game/characters/gray_enemy.gd.uid rename to game/characters/enemies/gray_enemy.gd.uid diff --git a/game/characters/gray_enemy.tscn b/game/characters/enemies/gray_enemy.tscn similarity index 93% rename from game/characters/gray_enemy.tscn rename to game/characters/enemies/gray_enemy.tscn index 6ee9403..24d681d 100644 --- a/game/characters/gray_enemy.tscn +++ b/game/characters/enemies/gray_enemy.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://cb0w6mt8g4mer"] -[ext_resource type="PackedScene" uid="uid://bx0luh4vdob3q" path="res://game/characters/abstract_enemy.tscn" id="1_q3s46"] -[ext_resource type="Script" uid="uid://cern5veiqkrkc" path="res://game/characters/gray_enemy.gd" id="2_olede"] +[ext_resource type="PackedScene" uid="uid://bx0luh4vdob3q" path="res://game/characters/enemies/abstract_enemy.tscn" id="1_q3s46"] +[ext_resource type="Script" uid="uid://cern5veiqkrkc" path="res://game/characters/enemies/gray_enemy.gd" id="2_olede"] [ext_resource type="Material" uid="uid://dbkn3k0batj5w" path="res://game/materials/enemy_gray.tres" id="3_ho47d"] [node name="GrayEnemy" unique_id=139812221 instance=ExtResource("1_q3s46")] diff --git a/game/characters/white_enemy.gd b/game/characters/enemies/white_enemy.gd similarity index 100% rename from game/characters/white_enemy.gd rename to game/characters/enemies/white_enemy.gd diff --git a/game/characters/white_enemy.gd.uid b/game/characters/enemies/white_enemy.gd.uid similarity index 100% rename from game/characters/white_enemy.gd.uid rename to game/characters/enemies/white_enemy.gd.uid diff --git a/game/characters/white_enemy.tscn b/game/characters/enemies/white_enemy.tscn similarity index 94% rename from game/characters/white_enemy.tscn rename to game/characters/enemies/white_enemy.tscn index 360c5ca..13973bd 100644 --- a/game/characters/white_enemy.tscn +++ b/game/characters/enemies/white_enemy.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://bv2gahb4wxgb1"] -[ext_resource type="PackedScene" uid="uid://d37eyum03h83i" path="res://game/characters/abstract_color_enemy.tscn" id="1_3yi7g"] -[ext_resource type="Script" uid="uid://dmcpkytgiuedi" path="res://game/characters/white_enemy.gd" id="2_c7pdf"] +[ext_resource type="PackedScene" uid="uid://d37eyum03h83i" path="res://game/characters/enemies/abstract_color_enemy.tscn" id="1_3yi7g"] +[ext_resource type="Script" uid="uid://dmcpkytgiuedi" path="res://game/characters/enemies/white_enemy.gd" id="2_c7pdf"] [ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="3_uj6yw"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_gfhm1"] diff --git a/game/characters/player.gd b/game/characters/player/player.gd similarity index 100% rename from game/characters/player.gd rename to game/characters/player/player.gd diff --git a/game/characters/player.gd.uid b/game/characters/player/player.gd.uid similarity index 100% rename from game/characters/player.gd.uid rename to game/characters/player/player.gd.uid diff --git a/game/characters/player.tscn b/game/characters/player/player.tscn similarity index 93% rename from game/characters/player.tscn rename to game/characters/player/player.tscn index 1574ce6..c7cd048 100644 --- a/game/characters/player.tscn +++ b/game/characters/player/player.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://dtcad8tdx78tg"] -[ext_resource type="Script" uid="uid://bb8kc32sggrn2" path="res://game/characters/player.gd" id="1_xln5q"] +[ext_resource type="Script" uid="uid://bb8kc32sggrn2" path="res://game/characters/player/player.gd" id="1_xln5q"] [ext_resource type="PackedScene" uid="uid://5qlocc0yu8ug" path="res://game/collision_switcher.tscn" id="2_j06tb"] -[ext_resource type="PackedScene" uid="uid://cvx6akiplg21s" path="res://game/characters/player_sprite.tscn" id="2_n6ad3"] +[ext_resource type="PackedScene" uid="uid://cvx6akiplg21s" path="res://game/characters/player/player_sprite.tscn" id="2_n6ad3"] [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_xln5q"] radius = 4.0 diff --git a/game/characters/player_sprite.tscn b/game/characters/player/player_sprite.tscn similarity index 100% rename from game/characters/player_sprite.tscn rename to game/characters/player/player_sprite.tscn diff --git a/game/levels/abstract_level.tscn b/game/levels/abstract_level.tscn index 0cd5213..51db29e 100644 --- a/game/levels/abstract_level.tscn +++ b/game/levels/abstract_level.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://mpsu4g2b5h3a"] [ext_resource type="Script" uid="uid://c737mx0kxva7i" path="res://game/levels/abstract_level.gd" id="1_o2mui"] -[ext_resource type="PackedScene" uid="uid://dtcad8tdx78tg" path="res://game/characters/player.tscn" id="2_r0ht6"] +[ext_resource type="PackedScene" uid="uid://dtcad8tdx78tg" path="res://game/characters/player/player.tscn" id="2_r0ht6"] [ext_resource type="PackedScene" uid="uid://dqu87loahl7wn" path="res://game/tiles/walls.tscn" id="3_3fw0b"] [ext_resource type="Texture2D" uid="uid://due8mmt5ww1sf" path="res://images/level/walls.png" id="3_fnnmn"] [ext_resource type="Material" uid="uid://dojhoc6ljpt1a" path="res://game/materials/walls_gray.tres" id="3_pi5fd"] diff --git a/game/levels/level_4.tscn b/game/levels/level_4.tscn index c17db13..ae8a02e 100644 --- a/game/levels/level_4.tscn +++ b/game/levels/level_4.tscn @@ -2,14 +2,14 @@ [ext_resource type="PackedScene" uid="uid://mpsu4g2b5h3a" path="res://game/levels/abstract_level.tscn" id="1_v1h2f"] [ext_resource type="PackedScene" uid="uid://b7mhdrj3b6loq" path="res://game/doors/door.tscn" id="2_h35x0"] -[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/white_enemy.tscn" id="3_2vfi4"] +[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_enemy.tscn" id="3_2vfi4"] [ext_resource type="PackedScene" uid="uid://b7imlh4sl036i" path="res://game/doors/square_door.tscn" id="3_qpxtm"] [ext_resource type="PackedScene" uid="uid://cvhovmnl050os" path="res://game/objects/wardrobe.tscn" id="4_mpb5r"] [ext_resource type="PackedScene" uid="uid://ciubf1ttwc133" path="res://game/pickups/square_key_pickup.tscn" id="4_p0pgv"] [ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/chair_f.tscn" id="5_i374g"] -[ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/gray_enemy.tscn" id="5_p0pgv"] +[ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/enemies/gray_enemy.tscn" id="5_p0pgv"] [ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/plate.tscn" id="6_gwfl1"] -[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/black_enemy.tscn" id="7_12tya"] +[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_enemy.tscn" id="7_12tya"] [ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/table_m.tscn" id="7_fxyr3"] [ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/flask_l.tscn" id="8_pp088"] [ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/flask_s.tscn" id="9_gtr04"] diff --git a/game/levels/level_6.tscn b/game/levels/level_6.tscn index f2a5460..9079145 100644 --- a/game/levels/level_6.tscn +++ b/game/levels/level_6.tscn @@ -21,8 +21,8 @@ [ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/painting_v_l.tscn" id="19_l40pv"] [ext_resource type="PackedScene" uid="uid://ciubf1ttwc133" path="res://game/pickups/square_key_pickup.tscn" id="20_uffr2"] [ext_resource type="PackedScene" uid="uid://dqgmfpv2mhdpn" path="res://game/pickups/triangle_key_pickup.tscn" id="21_jk2b3"] -[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/black_enemy.tscn" id="22_b1xny"] -[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/white_enemy.tscn" id="23_8555i"] +[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_enemy.tscn" id="22_b1xny"] +[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_enemy.tscn" id="23_8555i"] [ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="24_te27h"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_cjy8w"] diff --git a/game/levels/level_7.tscn b/game/levels/level_7.tscn index d147c80..f161753 100644 --- a/game/levels/level_7.tscn +++ b/game/levels/level_7.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=25 format=4 uid="uid://cddh8nh54mrog"] +[gd_scene format=4 uid="uid://cddh8nh54mrog"] [ext_resource type="PackedScene" uid="uid://mpsu4g2b5h3a" path="res://game/levels/abstract_level.tscn" id="1_bhhdo"] [ext_resource type="PackedScene" uid="uid://dx1yasi8wlaye" path="res://game/objects/bookstand.tscn" id="2_1t02d"] @@ -9,8 +9,8 @@ [ext_resource type="PackedScene" uid="uid://dioc4r03dfleq" path="res://game/doors/book_door.tscn" id="4_qqn64"] [ext_resource type="Texture2D" uid="uid://f6vlokb08jir" path="res://images/level/candles.png" id="6_7erpt"] [ext_resource type="Shader" uid="uid://lqq1mg6l1qqe" path="res://game/shaders/black_n_white.gdshader" id="7_qqn64"] -[ext_resource type="PackedScene" uid="uid://cvx6akiplg21s" path="res://game/characters/player_sprite.tscn" id="10_x0kb5"] -[ext_resource type="PackedScene" uid="uid://dtxiercm8dsfm" path="res://game/characters/enemy_sprite.tscn" id="11_6yudq"] +[ext_resource type="PackedScene" uid="uid://cvx6akiplg21s" path="res://game/characters/player/player_sprite.tscn" id="10_x0kb5"] +[ext_resource type="PackedScene" uid="uid://dtxiercm8dsfm" path="res://game/characters/enemies/enemy_sprite.tscn" id="11_6yudq"] [ext_resource type="Theme" uid="uid://bh56my8b2htnr" path="res://themes/menu.tres" id="13_6yudq"] [ext_resource type="Material" uid="uid://dbkn3k0batj5w" path="res://game/materials/enemy_gray.tres" id="13_x83dg"] diff --git a/game/levels/test_level.tscn b/game/levels/test_level.tscn index ecba58f..5c6a1bb 100644 --- a/game/levels/test_level.tscn +++ b/game/levels/test_level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=4 uid="uid://bmn74wc2vophn"] +[gd_scene format=4 uid="uid://bmn74wc2vophn"] [ext_resource type="PackedScene" uid="uid://mpsu4g2b5h3a" path="res://game/levels/abstract_level.tscn" id="1_15okj"] [ext_resource type="PackedScene" uid="uid://b3kyqvuxmfn8f" path="res://game/objects/fireplace.tscn" id="3_tuvkr"] @@ -16,9 +16,9 @@ [ext_resource type="PackedScene" uid="uid://dqgmfpv2mhdpn" path="res://game/pickups/triangle_key_pickup.tscn" id="10_dea75"] [ext_resource type="PackedScene" uid="uid://b7mhdrj3b6loq" path="res://game/doors/door.tscn" id="11_g1txn"] [ext_resource type="PackedScene" uid="uid://dx1yasi8wlaye" path="res://game/objects/bookstand.tscn" id="13_g3b4m"] -[ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/gray_enemy.tscn" id="18_blgb8"] -[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/black_enemy.tscn" id="19_ohfy3"] -[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/white_enemy.tscn" id="20_rt0xo"] +[ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/enemies/gray_enemy.tscn" id="18_blgb8"] +[ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_enemy.tscn" id="19_ohfy3"] +[ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_enemy.tscn" id="20_rt0xo"] [node name="TestLevel" instance=ExtResource("1_15okj")]