From 60c36d86663327b57f7e962febfd10a838968efa Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Sun, 15 Mar 2026 13:18:47 +0300 Subject: [PATCH] Fixed enemy player lost sound. Some file organazing. Updated version number --- .../enemies/state_machine/chase_state.gd | 2 ++ .../enemies/state_machine/walk_state.gd | 2 -- game/levels/level_1.tscn | 32 ++++++++--------- game/levels/level_2.tscn | 30 ++++++++-------- game/levels/level_3.tscn | 34 +++++++++---------- game/levels/level_4.tscn | 30 ++++++++-------- game/levels/level_5.tscn | 24 ++++++------- game/levels/level_6.tscn | 28 +++++++-------- game/levels/level_7.tscn | 2 +- game/levels/test_level.tscn | 10 +++--- game/managers/sound_manager.tscn | 4 +-- game/menu/main_menu.tscn | 2 +- game/objects/{ => decorative}/bookstand.tscn | 0 game/objects/{ => decorative}/cabinet.tscn | 0 game/objects/{ => decorative}/chair_b.tscn | 0 game/objects/{ => decorative}/chair_f.tscn | 0 game/objects/{ => decorative}/chair_l.tscn | 0 game/objects/{ => decorative}/chair_r.tscn | 0 game/objects/{ => decorative}/fireplace.tscn | 0 game/objects/{ => decorative}/flask_l.tscn | 0 game/objects/{ => decorative}/flask_s.tscn | 0 game/objects/{ => decorative}/mirror_l.tscn | 0 game/objects/{ => decorative}/mirror_s.tscn | 0 .../{ => decorative}/painting_h_l.tscn | 0 .../{ => decorative}/painting_h_s.tscn | 0 .../{ => decorative}/painting_v_l.tscn | 0 .../{ => decorative}/painting_v_s.tscn | 0 game/objects/{ => decorative}/plate.tscn | 0 .../{ => decorative}/redort_end_l.tscn | 0 .../{ => decorative}/retort_end_r.tscn | 0 game/objects/{ => decorative}/retort_l.tscn | 0 game/objects/{ => decorative}/retort_r.tscn | 0 game/objects/{ => decorative}/table_l.tscn | 0 game/objects/{ => decorative}/table_m.tscn | 0 game/objects/{ => decorative}/table_s.tscn | 0 game/objects/{ => decorative}/wardrobe.tscn | 0 .../abstract_action_tip.gd | 0 .../abstract_action_tip.gd.uid | 0 .../abstract_action_tip.tscn | 4 +-- .../interaction_action_tip.tscn | 4 +-- .../interaction_kbd.tscn | 0 .../interaction_pad.tscn | 0 .../jump_action_tip.tscn | 4 +-- .../{tutorial => informative}/jump_kbd.tscn | 0 .../{tutorial => informative}/jump_pad.tscn | 0 .../movement_action_tip.tscn | 4 +-- .../movement_kbd.tscn | 0 .../movement_pad.tscn | 0 .../switch_action_tip.tscn | 4 +-- .../{tutorial => informative}/switch_kbd.tscn | 0 .../{tutorial => informative}/switch_pad.tscn | 0 51 files changed, 110 insertions(+), 110 deletions(-) rename game/objects/{ => decorative}/bookstand.tscn (100%) rename game/objects/{ => decorative}/cabinet.tscn (100%) rename game/objects/{ => decorative}/chair_b.tscn (100%) rename game/objects/{ => decorative}/chair_f.tscn (100%) rename game/objects/{ => decorative}/chair_l.tscn (100%) rename game/objects/{ => decorative}/chair_r.tscn (100%) rename game/objects/{ => decorative}/fireplace.tscn (100%) rename game/objects/{ => decorative}/flask_l.tscn (100%) rename game/objects/{ => decorative}/flask_s.tscn (100%) rename game/objects/{ => decorative}/mirror_l.tscn (100%) rename game/objects/{ => decorative}/mirror_s.tscn (100%) rename game/objects/{ => decorative}/painting_h_l.tscn (100%) rename game/objects/{ => decorative}/painting_h_s.tscn (100%) rename game/objects/{ => decorative}/painting_v_l.tscn (100%) rename game/objects/{ => decorative}/painting_v_s.tscn (100%) rename game/objects/{ => decorative}/plate.tscn (100%) rename game/objects/{ => decorative}/redort_end_l.tscn (100%) rename game/objects/{ => decorative}/retort_end_r.tscn (100%) rename game/objects/{ => decorative}/retort_l.tscn (100%) rename game/objects/{ => decorative}/retort_r.tscn (100%) rename game/objects/{ => decorative}/table_l.tscn (100%) rename game/objects/{ => decorative}/table_m.tscn (100%) rename game/objects/{ => decorative}/table_s.tscn (100%) rename game/objects/{ => decorative}/wardrobe.tscn (100%) rename game/objects/{tutorial => informative}/abstract_action_tip.gd (100%) rename game/objects/{tutorial => informative}/abstract_action_tip.gd.uid (100%) rename game/objects/{tutorial => informative}/abstract_action_tip.tscn (67%) rename game/objects/{tutorial => informative}/interaction_action_tip.tscn (84%) rename game/objects/{tutorial => informative}/interaction_kbd.tscn (100%) rename game/objects/{tutorial => informative}/interaction_pad.tscn (100%) rename game/objects/{tutorial => informative}/jump_action_tip.tscn (83%) rename game/objects/{tutorial => informative}/jump_kbd.tscn (100%) rename game/objects/{tutorial => informative}/jump_pad.tscn (100%) rename game/objects/{tutorial => informative}/movement_action_tip.tscn (83%) rename game/objects/{tutorial => informative}/movement_kbd.tscn (100%) rename game/objects/{tutorial => informative}/movement_pad.tscn (100%) rename game/objects/{tutorial => informative}/switch_action_tip.tscn (83%) rename game/objects/{tutorial => informative}/switch_kbd.tscn (100%) rename game/objects/{tutorial => informative}/switch_pad.tscn (100%) diff --git a/game/characters/enemies/state_machine/chase_state.gd b/game/characters/enemies/state_machine/chase_state.gd index 35306db..c61e9bb 100644 --- a/game/characters/enemies/state_machine/chase_state.gd +++ b/game/characters/enemies/state_machine/chase_state.gd @@ -16,6 +16,8 @@ func physics_process(delta: float) -> void: cultist.target_x = player.position.x if _is_target_reached() or _wall_high_ray_cast.is_colliding(): + var stream := SoundManager.sfx_stream_player_lost + SoundManager.play_sfx_stream(stream, cultist.global_position) switch_state.emit(look_around_state) elif _wall_low_ray_cast.is_colliding(): switch_state.emit(jump_state) diff --git a/game/characters/enemies/state_machine/walk_state.gd b/game/characters/enemies/state_machine/walk_state.gd index a2571dc..7999682 100644 --- a/game/characters/enemies/state_machine/walk_state.gd +++ b/game/characters/enemies/state_machine/walk_state.gd @@ -16,8 +16,6 @@ func physics_process(delta: float) -> void: switch_state.emit(chase_state) else: if _wall_low_ray_cast.is_colliding() or _wall_high_ray_cast.is_colliding(): - var stream := SoundManager.sfx_stream_player_lost - SoundManager.play_sfx_stream(stream, cultist.global_position) switch_state.emit(another_direction_walk_state) else: cultist.update_x_velocity(_direction, cultist.MAX_WALK_SPEED, delta) diff --git a/game/levels/level_1.tscn b/game/levels/level_1.tscn index fde8664..1cf6bbd 100644 --- a/game/levels/level_1.tscn +++ b/game/levels/level_1.tscn @@ -7,22 +7,22 @@ [ext_resource type="PackedScene" uid="uid://b7mhdrj3b6loq" path="res://game/doors/door.tscn" id="3_crrvt"] [ext_resource type="Texture2D" uid="uid://du56n63yrot7d" path="res://images/level/tree.png" id="3_o0jti"] [ext_resource type="Texture2D" uid="uid://d3346lrt1c1oh" path="res://images/level/outdoor.png" id="3_wi6ud"] -[ext_resource type="PackedScene" uid="uid://be3mqeb784shj" path="res://game/objects/tutorial/movement_action_tip.tscn" id="6_ia26y"] -[ext_resource type="PackedScene" uid="uid://cjduhfqgdmyhe" path="res://game/objects/tutorial/jump_action_tip.tscn" id="7_rt0xo"] -[ext_resource type="PackedScene" uid="uid://b3kyqvuxmfn8f" path="res://game/objects/fireplace.tscn" id="8_dea75"] -[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/flask_s.tscn" id="8_rt0xo"] -[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/painting_v_l.tscn" id="9_mmf06"] -[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/painting_h_s.tscn" id="10_yrqjd"] -[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/chair_f.tscn" id="11_qpo0v"] -[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/table_m.tscn" id="12_lxfsh"] -[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/painting_h_l.tscn" id="13_g3b4m"] -[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/painting_v_s.tscn" id="14_blgb8"] -[ext_resource type="PackedScene" uid="uid://cvhovmnl050os" path="res://game/objects/wardrobe.tscn" id="15_ohfy3"] -[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/plate.tscn" id="15_rt0xo"] -[ext_resource type="PackedScene" uid="uid://dopjsft0y8mw5" path="res://game/objects/cabinet.tscn" id="16_rt0xo"] -[ext_resource type="PackedScene" uid="uid://xny1x7me75gc" path="res://game/objects/mirror_l.tscn" id="17_blgb8"] -[ext_resource type="PackedScene" uid="uid://btpkbyyteewsh" path="res://game/objects/chair_b.tscn" id="18_ohfy3"] -[ext_resource type="PackedScene" uid="uid://b1cq0uor2sk6k" path="res://game/objects/table_l.tscn" id="19_rt0xo"] +[ext_resource type="PackedScene" uid="uid://be3mqeb784shj" path="res://game/objects/informative/movement_action_tip.tscn" id="6_ia26y"] +[ext_resource type="PackedScene" uid="uid://cjduhfqgdmyhe" path="res://game/objects/informative/jump_action_tip.tscn" id="7_rt0xo"] +[ext_resource type="PackedScene" uid="uid://b3kyqvuxmfn8f" path="res://game/objects/decorative/fireplace.tscn" id="8_dea75"] +[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/decorative/flask_s.tscn" id="8_rt0xo"] +[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/decorative/painting_v_l.tscn" id="9_mmf06"] +[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/decorative/painting_h_s.tscn" id="10_yrqjd"] +[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/decorative/chair_f.tscn" id="11_qpo0v"] +[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/decorative/table_m.tscn" id="12_lxfsh"] +[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/decorative/painting_h_l.tscn" id="13_g3b4m"] +[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/decorative/painting_v_s.tscn" id="14_blgb8"] +[ext_resource type="PackedScene" uid="uid://cvhovmnl050os" path="res://game/objects/decorative/wardrobe.tscn" id="15_ohfy3"] +[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/decorative/plate.tscn" id="15_rt0xo"] +[ext_resource type="PackedScene" uid="uid://dopjsft0y8mw5" path="res://game/objects/decorative/cabinet.tscn" id="16_rt0xo"] +[ext_resource type="PackedScene" uid="uid://xny1x7me75gc" path="res://game/objects/decorative/mirror_l.tscn" id="17_blgb8"] +[ext_resource type="PackedScene" uid="uid://btpkbyyteewsh" path="res://game/objects/decorative/chair_b.tscn" id="18_ohfy3"] +[ext_resource type="PackedScene" uid="uid://b1cq0uor2sk6k" path="res://game/objects/decorative/table_l.tscn" id="19_rt0xo"] [ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="24_ia26y"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_4ocoy"] diff --git a/game/levels/level_2.tscn b/game/levels/level_2.tscn index 9837aa0..94594dc 100644 --- a/game/levels/level_2.tscn +++ b/game/levels/level_2.tscn @@ -3,21 +3,21 @@ [ext_resource type="PackedScene" uid="uid://mpsu4g2b5h3a" path="res://game/levels/abstract_level.tscn" id="1_t037v"] [ext_resource type="PackedScene" uid="uid://cojxqx5al7kyv" path="res://game/doors/locked_door.tscn" id="2_iakit"] [ext_resource type="PackedScene" uid="uid://b7mhdrj3b6loq" path="res://game/doors/door.tscn" id="3_ylsm2"] -[ext_resource type="PackedScene" uid="uid://b0pxe00dlyx7t" path="res://game/objects/tutorial/switch_action_tip.tscn" id="4_xx77b"] -[ext_resource type="PackedScene" uid="uid://xny1x7me75gc" path="res://game/objects/mirror_l.tscn" id="5_bxukv"] -[ext_resource type="PackedScene" uid="uid://dopjsft0y8mw5" path="res://game/objects/cabinet.tscn" id="5_uivyf"] -[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/chair_f.tscn" id="6_go8g1"] -[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/table_m.tscn" id="7_2a8w4"] -[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/chair_r.tscn" id="8_2a8w4"] -[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/plate.tscn" id="10_7s8yo"] -[ext_resource type="PackedScene" uid="uid://btpkbyyteewsh" path="res://game/objects/chair_b.tscn" id="10_ylsm2"] -[ext_resource type="PackedScene" uid="uid://x82wjrsqdfd" path="res://game/objects/chair_l.tscn" id="11_7c6gx"] -[ext_resource type="PackedScene" uid="uid://cvhovmnl050os" path="res://game/objects/wardrobe.tscn" id="13_7c6gx"] -[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/painting_h_l.tscn" id="14_u51cf"] -[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/table_s.tscn" id="15_cys5i"] -[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/painting_v_l.tscn" id="16_ddwrs"] -[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/flask_s.tscn" id="16_v8xjl"] -[ext_resource type="PackedScene" uid="uid://bmx60xftq8f2v" path="res://game/objects/mirror_s.tscn" id="17_ddwrs"] +[ext_resource type="PackedScene" uid="uid://b0pxe00dlyx7t" path="res://game/objects/informative/switch_action_tip.tscn" id="4_xx77b"] +[ext_resource type="PackedScene" uid="uid://xny1x7me75gc" path="res://game/objects/decorative/mirror_l.tscn" id="5_bxukv"] +[ext_resource type="PackedScene" uid="uid://dopjsft0y8mw5" path="res://game/objects/decorative/cabinet.tscn" id="5_uivyf"] +[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/decorative/chair_f.tscn" id="6_go8g1"] +[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/decorative/table_m.tscn" id="7_2a8w4"] +[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/decorative/chair_r.tscn" id="8_2a8w4"] +[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/decorative/plate.tscn" id="10_7s8yo"] +[ext_resource type="PackedScene" uid="uid://btpkbyyteewsh" path="res://game/objects/decorative/chair_b.tscn" id="10_ylsm2"] +[ext_resource type="PackedScene" uid="uid://x82wjrsqdfd" path="res://game/objects/decorative/chair_l.tscn" id="11_7c6gx"] +[ext_resource type="PackedScene" uid="uid://cvhovmnl050os" path="res://game/objects/decorative/wardrobe.tscn" id="13_7c6gx"] +[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/decorative/painting_h_l.tscn" id="14_u51cf"] +[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/decorative/table_s.tscn" id="15_cys5i"] +[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/decorative/painting_v_l.tscn" id="16_ddwrs"] +[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/decorative/flask_s.tscn" id="16_v8xjl"] +[ext_resource type="PackedScene" uid="uid://bmx60xftq8f2v" path="res://game/objects/decorative/mirror_s.tscn" id="17_ddwrs"] [ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="19_7s8yo"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_v8xjl"] diff --git a/game/levels/level_3.tscn b/game/levels/level_3.tscn index bd8d0b2..540a40c 100644 --- a/game/levels/level_3.tscn +++ b/game/levels/level_3.tscn @@ -3,24 +3,24 @@ [ext_resource type="PackedScene" uid="uid://mpsu4g2b5h3a" path="res://game/levels/abstract_level.tscn" id="1_4awbs"] [ext_resource type="PackedScene" uid="uid://b7mhdrj3b6loq" path="res://game/doors/door.tscn" id="2_rvmgs"] [ext_resource type="PackedScene" uid="uid://g0n5npbt3hb2" path="res://game/doors/circle_door.tscn" id="3_pkj3y"] -[ext_resource type="PackedScene" uid="uid://cvhovmnl050os" path="res://game/objects/wardrobe.tscn" id="4_54a2v"] +[ext_resource type="PackedScene" uid="uid://cvhovmnl050os" path="res://game/objects/decorative/wardrobe.tscn" id="4_54a2v"] [ext_resource type="PackedScene" uid="uid://c4gqqhlew67ay" path="res://game/pickups/circle_key_pickup.tscn" id="4_nangp"] -[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/table_s.tscn" id="5_q1mik"] -[ext_resource type="PackedScene" uid="uid://btpkbyyteewsh" path="res://game/objects/chair_b.tscn" id="6_lu8lf"] -[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/painting_h_l.tscn" id="7_gkiew"] -[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/painting_v_s.tscn" id="8_t7g3k"] -[ext_resource type="PackedScene" uid="uid://b3kyqvuxmfn8f" path="res://game/objects/fireplace.tscn" id="9_kqu3l"] -[ext_resource type="PackedScene" uid="uid://x82wjrsqdfd" path="res://game/objects/chair_l.tscn" id="10_b1jnq"] -[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/chair_r.tscn" id="11_54p7s"] -[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/painting_v_l.tscn" id="12_80tx3"] -[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/painting_h_s.tscn" id="13_73jkm"] -[ext_resource type="PackedScene" uid="uid://dx1yasi8wlaye" path="res://game/objects/bookstand.tscn" id="14_o683l"] -[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/table_m.tscn" id="15_pkjbe"] -[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/chair_f.tscn" id="16_o61p0"] -[ext_resource type="PackedScene" uid="uid://b1cq0uor2sk6k" path="res://game/objects/table_l.tscn" id="17_q1mik"] -[ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/flask_l.tscn" id="17_t7g3k"] -[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/flask_s.tscn" id="18_kqu3l"] -[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/plate.tscn" id="20_b1jnq"] +[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/decorative/table_s.tscn" id="5_q1mik"] +[ext_resource type="PackedScene" uid="uid://btpkbyyteewsh" path="res://game/objects/decorative/chair_b.tscn" id="6_lu8lf"] +[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/decorative/painting_h_l.tscn" id="7_gkiew"] +[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/decorative/painting_v_s.tscn" id="8_t7g3k"] +[ext_resource type="PackedScene" uid="uid://b3kyqvuxmfn8f" path="res://game/objects/decorative/fireplace.tscn" id="9_kqu3l"] +[ext_resource type="PackedScene" uid="uid://x82wjrsqdfd" path="res://game/objects/decorative/chair_l.tscn" id="10_b1jnq"] +[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/decorative/chair_r.tscn" id="11_54p7s"] +[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/decorative/painting_v_l.tscn" id="12_80tx3"] +[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/decorative/painting_h_s.tscn" id="13_73jkm"] +[ext_resource type="PackedScene" uid="uid://dx1yasi8wlaye" path="res://game/objects/decorative/bookstand.tscn" id="14_o683l"] +[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/decorative/table_m.tscn" id="15_pkjbe"] +[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/decorative/chair_f.tscn" id="16_o61p0"] +[ext_resource type="PackedScene" uid="uid://b1cq0uor2sk6k" path="res://game/objects/decorative/table_l.tscn" id="17_q1mik"] +[ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/decorative/flask_l.tscn" id="17_t7g3k"] +[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/decorative/flask_s.tscn" id="18_kqu3l"] +[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/decorative/plate.tscn" id="20_b1jnq"] [ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="22_kqu3l"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_b1jnq"] diff --git a/game/levels/level_4.tscn b/game/levels/level_4.tscn index 0342138..a77d5c0 100644 --- a/game/levels/level_4.tscn +++ b/game/levels/level_4.tscn @@ -4,24 +4,24 @@ [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/enemies/white_cultist.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://cvhovmnl050os" path="res://game/objects/decorative/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://b8pvlnpdnfmd0" path="res://game/objects/decorative/chair_f.tscn" id="5_i374g"] [ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/enemies/gray_cultist.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://c6qy8uybkn4x" path="res://game/objects/decorative/plate.tscn" id="6_gwfl1"] [ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_cultist.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"] -[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/painting_h_s.tscn" id="10_c6guj"] -[ext_resource type="PackedScene" uid="uid://b3kyqvuxmfn8f" path="res://game/objects/fireplace.tscn" id="12_s735u"] -[ext_resource type="PackedScene" uid="uid://dopjsft0y8mw5" path="res://game/objects/cabinet.tscn" id="13_rnrg1"] -[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/painting_v_s.tscn" id="14_4ncxq"] -[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/painting_h_l.tscn" id="15_sqm4v"] -[ext_resource type="PackedScene" uid="uid://x82wjrsqdfd" path="res://game/objects/chair_l.tscn" id="16_had2m"] -[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/chair_r.tscn" id="17_fovvg"] -[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/table_s.tscn" id="18_0iuyy"] -[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/painting_v_l.tscn" id="19_s735u"] +[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/decorative/table_m.tscn" id="7_fxyr3"] +[ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/decorative/flask_l.tscn" id="8_pp088"] +[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/decorative/flask_s.tscn" id="9_gtr04"] +[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/decorative/painting_h_s.tscn" id="10_c6guj"] +[ext_resource type="PackedScene" uid="uid://b3kyqvuxmfn8f" path="res://game/objects/decorative/fireplace.tscn" id="12_s735u"] +[ext_resource type="PackedScene" uid="uid://dopjsft0y8mw5" path="res://game/objects/decorative/cabinet.tscn" id="13_rnrg1"] +[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/decorative/painting_v_s.tscn" id="14_4ncxq"] +[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/decorative/painting_h_l.tscn" id="15_sqm4v"] +[ext_resource type="PackedScene" uid="uid://x82wjrsqdfd" path="res://game/objects/decorative/chair_l.tscn" id="16_had2m"] +[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/decorative/chair_r.tscn" id="17_fovvg"] +[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/decorative/table_s.tscn" id="18_0iuyy"] +[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/decorative/painting_v_l.tscn" id="19_s735u"] [ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="23_s735u"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_rnrg1"] diff --git a/game/levels/level_5.tscn b/game/levels/level_5.tscn index 05e398f..6f8c22c 100644 --- a/game/levels/level_5.tscn +++ b/game/levels/level_5.tscn @@ -4,18 +4,18 @@ [ext_resource type="PackedScene" uid="uid://b7mhdrj3b6loq" path="res://game/doors/door.tscn" id="2_2vfi4"] [ext_resource type="PackedScene" uid="uid://g0n5npbt3hb2" path="res://game/doors/circle_door.tscn" id="3_3jny0"] [ext_resource type="PackedScene" uid="uid://c4gqqhlew67ay" path="res://game/pickups/circle_key_pickup.tscn" id="6_r6jdw"] -[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/chair_f.tscn" id="6_t3mj1"] -[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/plate.tscn" id="7_mthp1"] -[ext_resource type="PackedScene" uid="uid://b1cq0uor2sk6k" path="res://game/objects/table_l.tscn" id="8_mpb5r"] -[ext_resource type="PackedScene" uid="uid://btpkbyyteewsh" path="res://game/objects/chair_b.tscn" id="9_i374g"] -[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/painting_h_l.tscn" id="10_c6guj"] -[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/painting_v_l.tscn" id="11_fah6j"] -[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/chair_r.tscn" id="11_ipebk"] -[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/table_s.tscn" id="11_jnu4q"] -[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/painting_v_s.tscn" id="12_gtkf3"] -[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/flask_s.tscn" id="13_8fy2b"] -[ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/flask_l.tscn" id="14_j8u63"] -[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/painting_h_s.tscn" id="15_wjoyx"] +[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/decorative/chair_f.tscn" id="6_t3mj1"] +[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/decorative/plate.tscn" id="7_mthp1"] +[ext_resource type="PackedScene" uid="uid://b1cq0uor2sk6k" path="res://game/objects/decorative/table_l.tscn" id="8_mpb5r"] +[ext_resource type="PackedScene" uid="uid://btpkbyyteewsh" path="res://game/objects/decorative/chair_b.tscn" id="9_i374g"] +[ext_resource type="PackedScene" uid="uid://crccdk7wmuqig" path="res://game/objects/decorative/painting_h_l.tscn" id="10_c6guj"] +[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/decorative/painting_v_l.tscn" id="11_fah6j"] +[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/decorative/chair_r.tscn" id="11_ipebk"] +[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/decorative/table_s.tscn" id="11_jnu4q"] +[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/decorative/painting_v_s.tscn" id="12_gtkf3"] +[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/decorative/flask_s.tscn" id="13_8fy2b"] +[ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/decorative/flask_l.tscn" id="14_j8u63"] +[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/decorative/painting_h_s.tscn" id="15_wjoyx"] [ext_resource type="PackedScene" uid="uid://dike8xgbqdut2" path="res://game/killing_area.tscn" id="17_8fy2b"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_j8u63"] diff --git a/game/levels/level_6.tscn b/game/levels/level_6.tscn index 96c0077..a156498 100644 --- a/game/levels/level_6.tscn +++ b/game/levels/level_6.tscn @@ -5,20 +5,20 @@ [ext_resource type="PackedScene" uid="uid://b7imlh4sl036i" path="res://game/doors/square_door.tscn" id="3_m4658"] [ext_resource type="PackedScene" uid="uid://cojxqx5al7kyv" path="res://game/doors/locked_door.tscn" id="4_86oha"] [ext_resource type="PackedScene" uid="uid://dwvv5dj8lqif2" path="res://game/doors/triangle_door.tscn" id="5_kbju5"] -[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/chair_f.tscn" id="6_l40pv"] -[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/plate.tscn" id="7_qgnyh"] -[ext_resource type="PackedScene" uid="uid://x82wjrsqdfd" path="res://game/objects/chair_l.tscn" id="13_eokxn"] -[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/painting_h_s.tscn" id="14_3svqx"] -[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/table_m.tscn" id="14_uq0u2"] -[ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/flask_l.tscn" id="15_825wl"] -[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/painting_v_s.tscn" id="15_te27h"] -[ext_resource type="PackedScene" uid="uid://bvbjd5l447qjy" path="res://game/objects/retort_l.tscn" id="16_36g7i"] -[ext_resource type="PackedScene" uid="uid://dopjsft0y8mw5" path="res://game/objects/cabinet.tscn" id="16_cjy8w"] -[ext_resource type="PackedScene" uid="uid://cpvsevdfmecrq" path="res://game/objects/retort_end_r.tscn" id="17_fgs51"] -[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/chair_r.tscn" id="17_own00"] -[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/table_s.tscn" id="18_5iebq"] -[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/flask_s.tscn" id="18_dj2vh"] -[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/painting_v_l.tscn" id="19_l40pv"] +[ext_resource type="PackedScene" uid="uid://b8pvlnpdnfmd0" path="res://game/objects/decorative/chair_f.tscn" id="6_l40pv"] +[ext_resource type="PackedScene" uid="uid://c6qy8uybkn4x" path="res://game/objects/decorative/plate.tscn" id="7_qgnyh"] +[ext_resource type="PackedScene" uid="uid://x82wjrsqdfd" path="res://game/objects/decorative/chair_l.tscn" id="13_eokxn"] +[ext_resource type="PackedScene" uid="uid://c0bk5sk661hi1" path="res://game/objects/decorative/painting_h_s.tscn" id="14_3svqx"] +[ext_resource type="PackedScene" uid="uid://bdwbdnbenueu1" path="res://game/objects/decorative/table_m.tscn" id="14_uq0u2"] +[ext_resource type="PackedScene" uid="uid://d3m8kf7lqmyb8" path="res://game/objects/decorative/flask_l.tscn" id="15_825wl"] +[ext_resource type="PackedScene" uid="uid://bo7756lp68bl1" path="res://game/objects/decorative/painting_v_s.tscn" id="15_te27h"] +[ext_resource type="PackedScene" uid="uid://bvbjd5l447qjy" path="res://game/objects/decorative/retort_l.tscn" id="16_36g7i"] +[ext_resource type="PackedScene" uid="uid://dopjsft0y8mw5" path="res://game/objects/decorative/cabinet.tscn" id="16_cjy8w"] +[ext_resource type="PackedScene" uid="uid://cpvsevdfmecrq" path="res://game/objects/decorative/retort_end_r.tscn" id="17_fgs51"] +[ext_resource type="PackedScene" uid="uid://b6wgujelmka5p" path="res://game/objects/decorative/chair_r.tscn" id="17_own00"] +[ext_resource type="PackedScene" uid="uid://baqawh1drerhk" path="res://game/objects/decorative/table_s.tscn" id="18_5iebq"] +[ext_resource type="PackedScene" uid="uid://bt4smb361amjj" path="res://game/objects/decorative/flask_s.tscn" id="18_dj2vh"] +[ext_resource type="PackedScene" uid="uid://d330w1ygg6uxy" path="res://game/objects/decorative/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/enemies/black_cultist.tscn" id="22_b1xny"] diff --git a/game/levels/level_7.tscn b/game/levels/level_7.tscn index f1f5455..699b5cc 100644 --- a/game/levels/level_7.tscn +++ b/game/levels/level_7.tscn @@ -1,7 +1,7 @@ [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"] +[ext_resource type="PackedScene" uid="uid://dx1yasi8wlaye" path="res://game/objects/decorative/bookstand.tscn" id="2_1t02d"] [ext_resource type="PackedScene" uid="uid://cojxqx5al7kyv" path="res://game/doors/locked_door.tscn" id="2_b6xh1"] [ext_resource type="Script" uid="uid://lxye5wqo5suq" path="res://game/levels/level_7.gd" id="2_sh0fj"] [ext_resource type="PackedScene" uid="uid://cudbspmpx6sik" path="res://game/pickups/book_pickup.tscn" id="3_2esp0"] diff --git a/game/levels/test_level.tscn b/game/levels/test_level.tscn index ed920f6..06e4606 100644 --- a/game/levels/test_level.tscn +++ b/game/levels/test_level.tscn @@ -1,13 +1,13 @@ [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"] -[ext_resource type="PackedScene" uid="uid://pw8xqtpauy57" path="res://game/objects/tutorial/jump_kbd.tscn" id="4_crrvt"] +[ext_resource type="PackedScene" uid="uid://b3kyqvuxmfn8f" path="res://game/objects/decorative/fireplace.tscn" id="3_tuvkr"] +[ext_resource type="PackedScene" uid="uid://pw8xqtpauy57" path="res://game/objects/informative/jump_kbd.tscn" id="4_crrvt"] [ext_resource type="PackedScene" uid="uid://g0n5npbt3hb2" path="res://game/doors/circle_door.tscn" id="4_yrqjd"] [ext_resource type="PackedScene" uid="uid://cojxqx5al7kyv" path="res://game/doors/locked_door.tscn" id="5_1skah"] -[ext_resource type="PackedScene" uid="uid://cemhsfdru4pv6" path="res://game/objects/tutorial/movement_kbd.tscn" id="5_rifvl"] +[ext_resource type="PackedScene" uid="uid://cemhsfdru4pv6" path="res://game/objects/informative/movement_kbd.tscn" id="5_rifvl"] [ext_resource type="PackedScene" uid="uid://dwvv5dj8lqif2" path="res://game/doors/triangle_door.tscn" id="6_75eok"] -[ext_resource type="PackedScene" uid="uid://deo60sij43ibm" path="res://game/objects/tutorial/switch_kbd.tscn" id="6_l6jt4"] +[ext_resource type="PackedScene" uid="uid://deo60sij43ibm" path="res://game/objects/informative/switch_kbd.tscn" id="6_l6jt4"] [ext_resource type="PackedScene" uid="uid://b7imlh4sl036i" path="res://game/doors/square_door.tscn" id="7_1skah"] [ext_resource type="PackedScene" uid="uid://cudbspmpx6sik" path="res://game/pickups/book_pickup.tscn" id="7_fq0h3"] [ext_resource type="PackedScene" uid="uid://dioc4r03dfleq" path="res://game/doors/book_door.tscn" id="8_75eok"] @@ -15,7 +15,7 @@ [ext_resource type="PackedScene" uid="uid://ciubf1ttwc133" path="res://game/pickups/square_key_pickup.tscn" id="9_yrqjd"] [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://dx1yasi8wlaye" path="res://game/objects/decorative/bookstand.tscn" id="13_g3b4m"] [ext_resource type="PackedScene" uid="uid://cb0w6mt8g4mer" path="res://game/characters/enemies/gray_cultist.tscn" id="18_blgb8"] [ext_resource type="PackedScene" uid="uid://cutjutvd8dqqc" path="res://game/characters/enemies/black_cultist.tscn" id="19_ohfy3"] [ext_resource type="PackedScene" uid="uid://bv2gahb4wxgb1" path="res://game/characters/enemies/white_cultist.tscn" id="20_rt0xo"] diff --git a/game/managers/sound_manager.tscn b/game/managers/sound_manager.tscn index 8cb6167..d0e57e1 100644 --- a/game/managers/sound_manager.tscn +++ b/game/managers/sound_manager.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=3 uid="uid://drk4dvbn78dva"] +[gd_scene format=3 uid="uid://drk4dvbn78dva"] [ext_resource type="Script" uid="uid://cx5qcukr66whc" path="res://game/managers/sound_manager.gd" id="1_cg0sy"] [ext_resource type="AudioStream" uid="uid://d2suvaisb6w45" path="res://sound/ui/accept.wav" id="2_ge1il"] @@ -20,7 +20,7 @@ [ext_resource type="AudioStream" uid="uid://ckmpft46wjgqs" path="res://sound/music/main_menu.wav" id="17_g6nb7"] [ext_resource type="AudioStream" uid="uid://ttemdy7avyh7" path="res://sound/music/gameplay.wav" id="17_l5yxe"] -[node name="SoundManager" type="Node"] +[node name="SoundManager" type="Node" unique_id=1917953940] process_mode = 3 script = ExtResource("1_cg0sy") putch_ui_min = 0.95 diff --git a/game/menu/main_menu.tscn b/game/menu/main_menu.tscn index 149dc12..7dfd6b0 100644 --- a/game/menu/main_menu.tscn +++ b/game/menu/main_menu.tscn @@ -48,7 +48,7 @@ text = "Quit" layout_mode = 2 size_flags_vertical = 1 theme = ExtResource("3_i4f54") -text = "v 1.0.3 +text = "v 2.0.0 (c) Ruslan Ignatov 2026 Powered by Godot Engine" horizontal_alignment = 2 diff --git a/game/objects/bookstand.tscn b/game/objects/decorative/bookstand.tscn similarity index 100% rename from game/objects/bookstand.tscn rename to game/objects/decorative/bookstand.tscn diff --git a/game/objects/cabinet.tscn b/game/objects/decorative/cabinet.tscn similarity index 100% rename from game/objects/cabinet.tscn rename to game/objects/decorative/cabinet.tscn diff --git a/game/objects/chair_b.tscn b/game/objects/decorative/chair_b.tscn similarity index 100% rename from game/objects/chair_b.tscn rename to game/objects/decorative/chair_b.tscn diff --git a/game/objects/chair_f.tscn b/game/objects/decorative/chair_f.tscn similarity index 100% rename from game/objects/chair_f.tscn rename to game/objects/decorative/chair_f.tscn diff --git a/game/objects/chair_l.tscn b/game/objects/decorative/chair_l.tscn similarity index 100% rename from game/objects/chair_l.tscn rename to game/objects/decorative/chair_l.tscn diff --git a/game/objects/chair_r.tscn b/game/objects/decorative/chair_r.tscn similarity index 100% rename from game/objects/chair_r.tscn rename to game/objects/decorative/chair_r.tscn diff --git a/game/objects/fireplace.tscn b/game/objects/decorative/fireplace.tscn similarity index 100% rename from game/objects/fireplace.tscn rename to game/objects/decorative/fireplace.tscn diff --git a/game/objects/flask_l.tscn b/game/objects/decorative/flask_l.tscn similarity index 100% rename from game/objects/flask_l.tscn rename to game/objects/decorative/flask_l.tscn diff --git a/game/objects/flask_s.tscn b/game/objects/decorative/flask_s.tscn similarity index 100% rename from game/objects/flask_s.tscn rename to game/objects/decorative/flask_s.tscn diff --git a/game/objects/mirror_l.tscn b/game/objects/decorative/mirror_l.tscn similarity index 100% rename from game/objects/mirror_l.tscn rename to game/objects/decorative/mirror_l.tscn diff --git a/game/objects/mirror_s.tscn b/game/objects/decorative/mirror_s.tscn similarity index 100% rename from game/objects/mirror_s.tscn rename to game/objects/decorative/mirror_s.tscn diff --git a/game/objects/painting_h_l.tscn b/game/objects/decorative/painting_h_l.tscn similarity index 100% rename from game/objects/painting_h_l.tscn rename to game/objects/decorative/painting_h_l.tscn diff --git a/game/objects/painting_h_s.tscn b/game/objects/decorative/painting_h_s.tscn similarity index 100% rename from game/objects/painting_h_s.tscn rename to game/objects/decorative/painting_h_s.tscn diff --git a/game/objects/painting_v_l.tscn b/game/objects/decorative/painting_v_l.tscn similarity index 100% rename from game/objects/painting_v_l.tscn rename to game/objects/decorative/painting_v_l.tscn diff --git a/game/objects/painting_v_s.tscn b/game/objects/decorative/painting_v_s.tscn similarity index 100% rename from game/objects/painting_v_s.tscn rename to game/objects/decorative/painting_v_s.tscn diff --git a/game/objects/plate.tscn b/game/objects/decorative/plate.tscn similarity index 100% rename from game/objects/plate.tscn rename to game/objects/decorative/plate.tscn diff --git a/game/objects/redort_end_l.tscn b/game/objects/decorative/redort_end_l.tscn similarity index 100% rename from game/objects/redort_end_l.tscn rename to game/objects/decorative/redort_end_l.tscn diff --git a/game/objects/retort_end_r.tscn b/game/objects/decorative/retort_end_r.tscn similarity index 100% rename from game/objects/retort_end_r.tscn rename to game/objects/decorative/retort_end_r.tscn diff --git a/game/objects/retort_l.tscn b/game/objects/decorative/retort_l.tscn similarity index 100% rename from game/objects/retort_l.tscn rename to game/objects/decorative/retort_l.tscn diff --git a/game/objects/retort_r.tscn b/game/objects/decorative/retort_r.tscn similarity index 100% rename from game/objects/retort_r.tscn rename to game/objects/decorative/retort_r.tscn diff --git a/game/objects/table_l.tscn b/game/objects/decorative/table_l.tscn similarity index 100% rename from game/objects/table_l.tscn rename to game/objects/decorative/table_l.tscn diff --git a/game/objects/table_m.tscn b/game/objects/decorative/table_m.tscn similarity index 100% rename from game/objects/table_m.tscn rename to game/objects/decorative/table_m.tscn diff --git a/game/objects/table_s.tscn b/game/objects/decorative/table_s.tscn similarity index 100% rename from game/objects/table_s.tscn rename to game/objects/decorative/table_s.tscn diff --git a/game/objects/wardrobe.tscn b/game/objects/decorative/wardrobe.tscn similarity index 100% rename from game/objects/wardrobe.tscn rename to game/objects/decorative/wardrobe.tscn diff --git a/game/objects/tutorial/abstract_action_tip.gd b/game/objects/informative/abstract_action_tip.gd similarity index 100% rename from game/objects/tutorial/abstract_action_tip.gd rename to game/objects/informative/abstract_action_tip.gd diff --git a/game/objects/tutorial/abstract_action_tip.gd.uid b/game/objects/informative/abstract_action_tip.gd.uid similarity index 100% rename from game/objects/tutorial/abstract_action_tip.gd.uid rename to game/objects/informative/abstract_action_tip.gd.uid diff --git a/game/objects/tutorial/abstract_action_tip.tscn b/game/objects/informative/abstract_action_tip.tscn similarity index 67% rename from game/objects/tutorial/abstract_action_tip.tscn rename to game/objects/informative/abstract_action_tip.tscn index 83b93a3..8ec7d34 100644 --- a/game/objects/tutorial/abstract_action_tip.tscn +++ b/game/objects/informative/abstract_action_tip.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=2 format=3 uid="uid://b24pn1q6u3u5v"] +[gd_scene format=3 uid="uid://b24pn1q6u3u5v"] -[ext_resource type="Script" uid="uid://byjums4jdva4x" path="res://game/objects/tutorial/abstract_action_tip.gd" id="1_erg4q"] +[ext_resource type="Script" uid="uid://byjums4jdva4x" path="res://game/objects/informative/abstract_action_tip.gd" id="1_erg4q"] [node name="AbstractActionTip" type="Node2D"] script = ExtResource("1_erg4q") diff --git a/game/objects/tutorial/interaction_action_tip.tscn b/game/objects/informative/interaction_action_tip.tscn similarity index 84% rename from game/objects/tutorial/interaction_action_tip.tscn rename to game/objects/informative/interaction_action_tip.tscn index ce638d8..add8e64 100644 --- a/game/objects/tutorial/interaction_action_tip.tscn +++ b/game/objects/informative/interaction_action_tip.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=5 format=3 uid="uid://g7wjnlsbden8"] +[gd_scene format=3 uid="uid://g7wjnlsbden8"] -[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/tutorial/abstract_action_tip.tscn" id="1_jsfj2"] +[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/informative/abstract_action_tip.tscn" id="1_jsfj2"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="2_xbyc1"] [sub_resource type="AtlasTexture" id="AtlasTexture_71ogr"] diff --git a/game/objects/tutorial/interaction_kbd.tscn b/game/objects/informative/interaction_kbd.tscn similarity index 100% rename from game/objects/tutorial/interaction_kbd.tscn rename to game/objects/informative/interaction_kbd.tscn diff --git a/game/objects/tutorial/interaction_pad.tscn b/game/objects/informative/interaction_pad.tscn similarity index 100% rename from game/objects/tutorial/interaction_pad.tscn rename to game/objects/informative/interaction_pad.tscn diff --git a/game/objects/tutorial/jump_action_tip.tscn b/game/objects/informative/jump_action_tip.tscn similarity index 83% rename from game/objects/tutorial/jump_action_tip.tscn rename to game/objects/informative/jump_action_tip.tscn index d659e03..e4506a1 100644 --- a/game/objects/tutorial/jump_action_tip.tscn +++ b/game/objects/informative/jump_action_tip.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=5 format=3 uid="uid://cjduhfqgdmyhe"] +[gd_scene format=3 uid="uid://cjduhfqgdmyhe"] -[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/tutorial/abstract_action_tip.tscn" id="1_ffrc6"] +[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/informative/abstract_action_tip.tscn" id="1_ffrc6"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="2_nd0mf"] [sub_resource type="AtlasTexture" id="AtlasTexture_sre3d"] diff --git a/game/objects/tutorial/jump_kbd.tscn b/game/objects/informative/jump_kbd.tscn similarity index 100% rename from game/objects/tutorial/jump_kbd.tscn rename to game/objects/informative/jump_kbd.tscn diff --git a/game/objects/tutorial/jump_pad.tscn b/game/objects/informative/jump_pad.tscn similarity index 100% rename from game/objects/tutorial/jump_pad.tscn rename to game/objects/informative/jump_pad.tscn diff --git a/game/objects/tutorial/movement_action_tip.tscn b/game/objects/informative/movement_action_tip.tscn similarity index 83% rename from game/objects/tutorial/movement_action_tip.tscn rename to game/objects/informative/movement_action_tip.tscn index 59be73d..fe17ab5 100644 --- a/game/objects/tutorial/movement_action_tip.tscn +++ b/game/objects/informative/movement_action_tip.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=5 format=3 uid="uid://be3mqeb784shj"] +[gd_scene format=3 uid="uid://be3mqeb784shj"] -[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/tutorial/abstract_action_tip.tscn" id="1_6vlve"] +[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/informative/abstract_action_tip.tscn" id="1_6vlve"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="2_aui55"] [sub_resource type="AtlasTexture" id="AtlasTexture_qoa1y"] diff --git a/game/objects/tutorial/movement_kbd.tscn b/game/objects/informative/movement_kbd.tscn similarity index 100% rename from game/objects/tutorial/movement_kbd.tscn rename to game/objects/informative/movement_kbd.tscn diff --git a/game/objects/tutorial/movement_pad.tscn b/game/objects/informative/movement_pad.tscn similarity index 100% rename from game/objects/tutorial/movement_pad.tscn rename to game/objects/informative/movement_pad.tscn diff --git a/game/objects/tutorial/switch_action_tip.tscn b/game/objects/informative/switch_action_tip.tscn similarity index 83% rename from game/objects/tutorial/switch_action_tip.tscn rename to game/objects/informative/switch_action_tip.tscn index de6e14f..fe448c1 100644 --- a/game/objects/tutorial/switch_action_tip.tscn +++ b/game/objects/informative/switch_action_tip.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=5 format=3 uid="uid://b0pxe00dlyx7t"] +[gd_scene format=3 uid="uid://b0pxe00dlyx7t"] -[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/tutorial/abstract_action_tip.tscn" id="1_sol75"] +[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/informative/abstract_action_tip.tscn" id="1_sol75"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="2_278pw"] [sub_resource type="AtlasTexture" id="AtlasTexture_2aait"] diff --git a/game/objects/tutorial/switch_kbd.tscn b/game/objects/informative/switch_kbd.tscn similarity index 100% rename from game/objects/tutorial/switch_kbd.tscn rename to game/objects/informative/switch_kbd.tscn diff --git a/game/objects/tutorial/switch_pad.tscn b/game/objects/informative/switch_pad.tscn similarity index 100% rename from game/objects/tutorial/switch_pad.tscn rename to game/objects/informative/switch_pad.tscn