diff --git a/game/objects/decorative/bookstand.tscn b/game/objects/decorative/bookstand.tscn index 0a43904..0d36f27 100644 --- a/game/objects/decorative/bookstand.tscn +++ b/game/objects/decorative/bookstand.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://dx1yasi8wlaye"] +[gd_scene format=3 uid="uid://dx1yasi8wlaye"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_nvgb0"] [sub_resource type="AtlasTexture" id="AtlasTexture_opqiy"] atlas = ExtResource("1_nvgb0") -region = Rect2(144, 32, 16, 32) +region = Rect2(144, 64, 16, 32) -[node name="Bookstand" type="Node2D"] +[node name="Bookstand" type="Node2D" unique_id=764203715] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1927584709] texture = SubResource("AtlasTexture_opqiy") diff --git a/game/objects/decorative/cabinet.tscn b/game/objects/decorative/cabinet.tscn index 2ccfcca..802c2a5 100644 --- a/game/objects/decorative/cabinet.tscn +++ b/game/objects/decorative/cabinet.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://dopjsft0y8mw5"] +[gd_scene format=3 uid="uid://dopjsft0y8mw5"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_57t4w"] [sub_resource type="AtlasTexture" id="AtlasTexture_sqimt"] atlas = ExtResource("1_57t4w") -region = Rect2(160, 64, 32, 32) +region = Rect2(128, 96, 32, 32) -[node name="Cabinet" type="Node2D"] +[node name="Cabinet" type="Node2D" unique_id=776063180] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=633984423] texture = SubResource("AtlasTexture_sqimt") diff --git a/game/objects/decorative/chair_b.tscn b/game/objects/decorative/chair_b.tscn index ebe4d8d..eddc713 100644 --- a/game/objects/decorative/chair_b.tscn +++ b/game/objects/decorative/chair_b.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://btpkbyyteewsh"] +[gd_scene format=3 uid="uid://btpkbyyteewsh"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_e7ewy"] [sub_resource type="AtlasTexture" id="AtlasTexture_ea7rc"] atlas = ExtResource("1_e7ewy") -region = Rect2(160, 32, 16, 32) +region = Rect2(32, 96, 16, 32) -[node name="ChairB" type="Node2D"] +[node name="ChairB" type="Node2D" unique_id=593320838] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1141861091] texture = SubResource("AtlasTexture_ea7rc") diff --git a/game/objects/decorative/chair_f.tscn b/game/objects/decorative/chair_f.tscn index 60204c0..7a731b8 100644 --- a/game/objects/decorative/chair_f.tscn +++ b/game/objects/decorative/chair_f.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://b8pvlnpdnfmd0"] +[gd_scene format=3 uid="uid://b8pvlnpdnfmd0"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_rse2u"] [sub_resource type="AtlasTexture" id="AtlasTexture_1kw05"] atlas = ExtResource("1_rse2u") -region = Rect2(160, 0, 16, 32) +region = Rect2(0, 96, 16, 32) -[node name="ChairF" type="Node2D"] +[node name="ChairF" type="Node2D" unique_id=1967501122] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1824855132] texture = SubResource("AtlasTexture_1kw05") diff --git a/game/objects/decorative/chair_l.tscn b/game/objects/decorative/chair_l.tscn index 7b15bd5..c15220b 100644 --- a/game/objects/decorative/chair_l.tscn +++ b/game/objects/decorative/chair_l.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://x82wjrsqdfd"] +[gd_scene format=3 uid="uid://x82wjrsqdfd"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_xguce"] [sub_resource type="AtlasTexture" id="AtlasTexture_cktuf"] atlas = ExtResource("1_xguce") -region = Rect2(176, 0, 16, 32) +region = Rect2(16, 96, 16, 32) -[node name="ChairL" type="Node2D"] +[node name="ChairL" type="Node2D" unique_id=813233619] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=2136740309] texture = SubResource("AtlasTexture_cktuf") diff --git a/game/objects/decorative/chair_r.tscn b/game/objects/decorative/chair_r.tscn index cf22b32..766856a 100644 --- a/game/objects/decorative/chair_r.tscn +++ b/game/objects/decorative/chair_r.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://b6wgujelmka5p"] +[gd_scene format=3 uid="uid://b6wgujelmka5p"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_e7ewy"] [sub_resource type="AtlasTexture" id="AtlasTexture_e7ewy"] atlas = ExtResource("1_e7ewy") -region = Rect2(176, 32, 16, 32) +region = Rect2(48, 96, 16, 32) -[node name="ChairR" type="Node2D"] +[node name="ChairR" type="Node2D" unique_id=567783693] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1599831744] texture = SubResource("AtlasTexture_e7ewy") diff --git a/game/objects/decorative/fireplace.tscn b/game/objects/decorative/fireplace.tscn index b701647..990f5ab 100644 --- a/game/objects/decorative/fireplace.tscn +++ b/game/objects/decorative/fireplace.tscn @@ -13,7 +13,7 @@ func _ready() -> void: [sub_resource type="AtlasTexture" id="AtlasTexture_2ho61"] atlas = ExtResource("1_xghly") -region = Rect2(0, 0, 32, 32) +region = Rect2(0, 32, 32, 32) [sub_resource type="ShaderMaterial" id="ShaderMaterial_2ho61"] shader = ExtResource("2_4nvxe") @@ -26,24 +26,24 @@ shader_parameter/intensity = 0.6000000285 shader_parameter/scale = 75.0000035625 shader_parameter/use_world_pos = false -[sub_resource type="AtlasTexture" id="AtlasTexture_6xx0h"] +[sub_resource type="AtlasTexture" id="AtlasTexture_tl0fg"] atlas = ExtResource("1_xghly") -region = Rect2(32, 0, 16, 16) +region = Rect2(32, 32, 16, 16) -[sub_resource type="AtlasTexture" id="AtlasTexture_b1qtt"] +[sub_resource type="AtlasTexture" id="AtlasTexture_1wq20"] atlas = ExtResource("1_xghly") -region = Rect2(32, 16, 16, 16) +region = Rect2(32, 48, 16, 16) [sub_resource type="SpriteFrames" id="SpriteFrames_f0x6e"] animations = [{ "frames": [{ "duration": 1.0, -"texture": SubResource("AtlasTexture_6xx0h") +"texture": SubResource("AtlasTexture_tl0fg") }, { "duration": 1.0, -"texture": SubResource("AtlasTexture_b1qtt") +"texture": SubResource("AtlasTexture_1wq20") }], -"loop": true, +"loop": 1, "name": &"default", "speed": 5.0 }] diff --git a/game/objects/decorative/flask_l.tscn b/game/objects/decorative/flask_l.tscn index 0a88adb..0c0c0b3 100644 --- a/game/objects/decorative/flask_l.tscn +++ b/game/objects/decorative/flask_l.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://d3m8kf7lqmyb8"] +[gd_scene format=3 uid="uid://d3m8kf7lqmyb8"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_x6vix"] [sub_resource type="AtlasTexture" id="AtlasTexture_i1pbn"] atlas = ExtResource("1_x6vix") -region = Rect2(128, 48, 16, 16) +region = Rect2(128, 80, 16, 16) -[node name="FlaskL" type="Node2D"] +[node name="FlaskL" type="Node2D" unique_id=1215208712] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1287451147] texture = SubResource("AtlasTexture_i1pbn") diff --git a/game/objects/decorative/flask_s.tscn b/game/objects/decorative/flask_s.tscn index f1e8413..90c9d3d 100644 --- a/game/objects/decorative/flask_s.tscn +++ b/game/objects/decorative/flask_s.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://bt4smb361amjj"] +[gd_scene format=3 uid="uid://bt4smb361amjj"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_05y3q"] [sub_resource type="AtlasTexture" id="AtlasTexture_wg65s"] atlas = ExtResource("1_05y3q") -region = Rect2(128, 32, 16, 16) +region = Rect2(128, 64, 16, 16) -[node name="FlaskS" type="Node2D"] +[node name="FlaskS" type="Node2D" unique_id=565628633] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1428095427] texture = SubResource("AtlasTexture_wg65s") diff --git a/game/objects/decorative/mirror_l.tscn b/game/objects/decorative/mirror_l.tscn index 1cc1eaa..b2ab175 100644 --- a/game/objects/decorative/mirror_l.tscn +++ b/game/objects/decorative/mirror_l.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://xny1x7me75gc"] +[gd_scene format=3 uid="uid://xny1x7me75gc"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_xsvl5"] [sub_resource type="AtlasTexture" id="AtlasTexture_nypty"] atlas = ExtResource("1_xsvl5") -region = Rect2(80, 48, 32, 16) +region = Rect2(64, 96, 32, 16) -[node name="MirrorL" type="Node2D"] +[node name="MirrorL" type="Node2D" unique_id=1288179942] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1490381604] texture = SubResource("AtlasTexture_nypty") diff --git a/game/objects/decorative/mirror_s.tscn b/game/objects/decorative/mirror_s.tscn index f2e761d..9647dc9 100644 --- a/game/objects/decorative/mirror_s.tscn +++ b/game/objects/decorative/mirror_s.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://bmx60xftq8f2v"] +[gd_scene format=3 uid="uid://bmx60xftq8f2v"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_vvvt3"] [sub_resource type="AtlasTexture" id="AtlasTexture_7fxax"] atlas = ExtResource("1_vvvt3") -region = Rect2(112, 48, 16, 16) +region = Rect2(80, 80, 16, 16) -[node name="MirrorS" type="Node2D"] +[node name="MirrorS" type="Node2D" unique_id=101696669] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1159919284] texture = SubResource("AtlasTexture_7fxax") diff --git a/game/objects/decorative/painting_h_l.tscn b/game/objects/decorative/painting_h_l.tscn index f08e93c..ad0a300 100644 --- a/game/objects/decorative/painting_h_l.tscn +++ b/game/objects/decorative/painting_h_l.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://crccdk7wmuqig"] +[gd_scene format=3 uid="uid://crccdk7wmuqig"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_a62d7"] [sub_resource type="AtlasTexture" id="AtlasTexture_qwmf4"] atlas = ExtResource("1_a62d7") -region = Rect2(0, 32, 48, 32) +region = Rect2(0, 64, 48, 32) -[node name="PaintingHL" type="Node2D"] +[node name="PaintingHL" type="Node2D" unique_id=959335970] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=2121715166] texture = SubResource("AtlasTexture_qwmf4") diff --git a/game/objects/decorative/painting_h_s.tscn b/game/objects/decorative/painting_h_s.tscn index 892a7a8..c0a8877 100644 --- a/game/objects/decorative/painting_h_s.tscn +++ b/game/objects/decorative/painting_h_s.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://c0bk5sk661hi1"] +[gd_scene format=3 uid="uid://c0bk5sk661hi1"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_u3qkd"] [sub_resource type="AtlasTexture" id="AtlasTexture_vssfe"] atlas = ExtResource("1_u3qkd") -region = Rect2(48, 32, 32, 32) +region = Rect2(48, 64, 32, 32) -[node name="PaintingHS" type="Node2D"] +[node name="PaintingHS" type="Node2D" unique_id=926741995] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1315587316] texture = SubResource("AtlasTexture_vssfe") diff --git a/game/objects/decorative/painting_v_l.tscn b/game/objects/decorative/painting_v_l.tscn index a63a1b7..3068e55 100644 --- a/game/objects/decorative/painting_v_l.tscn +++ b/game/objects/decorative/painting_v_l.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://d330w1ygg6uxy"] +[gd_scene format=3 uid="uid://d330w1ygg6uxy"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_v74mh"] [sub_resource type="AtlasTexture" id="AtlasTexture_hq5lq"] atlas = ExtResource("1_v74mh") -region = Rect2(80, 0, 32, 48) +region = Rect2(80, 32, 32, 48) -[node name="PaintingVL" type="Node2D"] +[node name="PaintingVL" type="Node2D" unique_id=156792445] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=107725313] texture = SubResource("AtlasTexture_hq5lq") diff --git a/game/objects/decorative/painting_v_s.tscn b/game/objects/decorative/painting_v_s.tscn index 93f1197..9993a90 100644 --- a/game/objects/decorative/painting_v_s.tscn +++ b/game/objects/decorative/painting_v_s.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://bo7756lp68bl1"] +[gd_scene format=3 uid="uid://bo7756lp68bl1"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_1hdr2"] [sub_resource type="AtlasTexture" id="AtlasTexture_0ynw1"] atlas = ExtResource("1_1hdr2") -region = Rect2(48, 0, 32, 32) +region = Rect2(48, 32, 32, 32) -[node name="PaintingVS" type="Node2D"] +[node name="PaintingVS" type="Node2D" unique_id=662135951] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1657442294] texture = SubResource("AtlasTexture_0ynw1") diff --git a/game/objects/decorative/plate.tscn b/game/objects/decorative/plate.tscn index 801fc5c..9d05928 100644 --- a/game/objects/decorative/plate.tscn +++ b/game/objects/decorative/plate.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://c6qy8uybkn4x"] +[gd_scene format=3 uid="uid://c6qy8uybkn4x"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_wkk58"] [sub_resource type="AtlasTexture" id="AtlasTexture_q70ul"] atlas = ExtResource("1_wkk58") -region = Rect2(112, 32, 16, 16) +region = Rect2(112, 64, 16, 16) -[node name="Plate" type="Node2D"] +[node name="Plate" type="Node2D" unique_id=611682922] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1274674649] texture = SubResource("AtlasTexture_q70ul") diff --git a/game/objects/decorative/redort_end_l.tscn b/game/objects/decorative/redort_end_l.tscn index 8a02ca0..f7a9ca5 100644 --- a/game/objects/decorative/redort_end_l.tscn +++ b/game/objects/decorative/redort_end_l.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://thggjfcrcjq6"] +[gd_scene format=3 uid="uid://thggjfcrcjq6"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_xsq2h"] [sub_resource type="AtlasTexture" id="AtlasTexture_hbatg"] atlas = ExtResource("1_xsq2h") -region = Rect2(144, 0, 16, 16) +region = Rect2(144, 32, 16, 16) -[node name="RedortEndL" type="Node2D"] +[node name="RedortEndL" type="Node2D" unique_id=186703054] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=2083648757] texture = SubResource("AtlasTexture_hbatg") diff --git a/game/objects/decorative/retort_end_r.tscn b/game/objects/decorative/retort_end_r.tscn index b06ac4f..c6edf00 100644 --- a/game/objects/decorative/retort_end_r.tscn +++ b/game/objects/decorative/retort_end_r.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://cpvsevdfmecrq"] +[gd_scene format=3 uid="uid://cpvsevdfmecrq"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_ibloa"] [sub_resource type="AtlasTexture" id="AtlasTexture_2d2yp"] atlas = ExtResource("1_ibloa") -region = Rect2(112, 16, 16, 16) +region = Rect2(112, 48, 16, 16) -[node name="RetortEndR" type="Node2D"] +[node name="RetortEndR" type="Node2D" unique_id=361163783] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=851249465] texture = SubResource("AtlasTexture_2d2yp") diff --git a/game/objects/decorative/retort_l.tscn b/game/objects/decorative/retort_l.tscn index f4a1da3..c068114 100644 --- a/game/objects/decorative/retort_l.tscn +++ b/game/objects/decorative/retort_l.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://bvbjd5l447qjy"] +[gd_scene format=3 uid="uid://bvbjd5l447qjy"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_u1d6f"] [sub_resource type="AtlasTexture" id="AtlasTexture_8epgq"] atlas = ExtResource("1_u1d6f") -region = Rect2(128, 16, 32, 16) +region = Rect2(128, 48, 32, 16) -[node name="RetortL" type="Node2D"] +[node name="RetortL" type="Node2D" unique_id=928599671] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=777287822] texture = SubResource("AtlasTexture_8epgq") diff --git a/game/objects/decorative/retort_r.tscn b/game/objects/decorative/retort_r.tscn index 946f71b..2ab9d69 100644 --- a/game/objects/decorative/retort_r.tscn +++ b/game/objects/decorative/retort_r.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://b0uy410hvlosm"] +[gd_scene format=3 uid="uid://b0uy410hvlosm"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_gohft"] [sub_resource type="AtlasTexture" id="AtlasTexture_f54r7"] atlas = ExtResource("1_gohft") -region = Rect2(112, 0, 32, 16) +region = Rect2(112, 32, 32, 16) -[node name="RetortR" type="Node2D"] +[node name="RetortR" type="Node2D" unique_id=2131329697] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=889741540] texture = SubResource("AtlasTexture_f54r7") diff --git a/game/objects/decorative/table_l.tscn b/game/objects/decorative/table_l.tscn index 9dcbb33..1284a19 100644 --- a/game/objects/decorative/table_l.tscn +++ b/game/objects/decorative/table_l.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://b1cq0uor2sk6k"] +[gd_scene format=3 uid="uid://b1cq0uor2sk6k"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_ftoqg"] [sub_resource type="AtlasTexture" id="AtlasTexture_l7gad"] atlas = ExtResource("1_ftoqg") -region = Rect2(80, 64, 80, 32) +region = Rect2(80, 0, 80, 32) -[node name="TableL" type="Node2D"] +[node name="TableL" type="Node2D" unique_id=1210198021] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1155132216] texture = SubResource("AtlasTexture_l7gad") diff --git a/game/objects/decorative/table_m.tscn b/game/objects/decorative/table_m.tscn index 45bba32..67738ac 100644 --- a/game/objects/decorative/table_m.tscn +++ b/game/objects/decorative/table_m.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://bdwbdnbenueu1"] +[gd_scene format=3 uid="uid://bdwbdnbenueu1"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_qacj7"] [sub_resource type="AtlasTexture" id="AtlasTexture_runce"] atlas = ExtResource("1_qacj7") -region = Rect2(32, 64, 48, 32) +region = Rect2(32, 0, 48, 32) -[node name="TableM" type="Node2D"] +[node name="TableM" type="Node2D" unique_id=639741163] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=881942302] texture = SubResource("AtlasTexture_runce") diff --git a/game/objects/decorative/table_s.tscn b/game/objects/decorative/table_s.tscn index 2c25a0c..5720f91 100644 --- a/game/objects/decorative/table_s.tscn +++ b/game/objects/decorative/table_s.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://baqawh1drerhk"] +[gd_scene format=3 uid="uid://baqawh1drerhk"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_qacj7"] [sub_resource type="AtlasTexture" id="AtlasTexture_n2itf"] atlas = ExtResource("1_qacj7") -region = Rect2(0, 64, 32, 32) +region = Rect2(0, 0, 32, 32) -[node name="TableS" type="Node2D"] +[node name="TableS" type="Node2D" unique_id=1273697628] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=1017827625] texture = SubResource("AtlasTexture_n2itf") diff --git a/game/objects/decorative/wardrobe.tscn b/game/objects/decorative/wardrobe.tscn index c236ff1..bb7dbc7 100644 --- a/game/objects/decorative/wardrobe.tscn +++ b/game/objects/decorative/wardrobe.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=3 format=3 uid="uid://cvhovmnl050os"] +[gd_scene format=3 uid="uid://cvhovmnl050os"] [ext_resource type="Texture2D" uid="uid://ddm4gc2g3aj2i" path="res://images/level/objects.png" id="1_610bq"] [sub_resource type="AtlasTexture" id="AtlasTexture_wbqlk"] atlas = ExtResource("1_610bq") -region = Rect2(160, 96, 32, 48) +region = Rect2(96, 80, 32, 48) -[node name="Wardrobe" type="Node2D"] +[node name="Wardrobe" type="Node2D" unique_id=1607339750] -[node name="Sprite2D" type="Sprite2D" parent="."] +[node name="Sprite2D" type="Sprite2D" parent="." unique_id=422307570] texture = SubResource("AtlasTexture_wbqlk") diff --git a/game/objects/informative/abstract_action_tip.tscn b/game/objects/informative/abstract_action_tip.tscn index 8ec7d34..940d777 100644 --- a/game/objects/informative/abstract_action_tip.tscn +++ b/game/objects/informative/abstract_action_tip.tscn @@ -2,9 +2,9 @@ [ext_resource type="Script" uid="uid://byjums4jdva4x" path="res://game/objects/informative/abstract_action_tip.gd" id="1_erg4q"] -[node name="AbstractActionTip" type="Node2D"] +[node name="AbstractActionTip" type="Node2D" unique_id=1961962362] script = ExtResource("1_erg4q") -[node name="SpriteKbd" type="Sprite2D" parent="."] +[node name="SpriteKbd" type="Sprite2D" parent="." unique_id=948959005] -[node name="SpritePad" type="Sprite2D" parent="."] +[node name="SpritePad" type="Sprite2D" parent="." unique_id=1703375720] diff --git a/game/objects/informative/interaction_action_hover_tip.tscn b/game/objects/informative/interaction_action_hover_tip.tscn new file mode 100644 index 0000000..3377481 --- /dev/null +++ b/game/objects/informative/interaction_action_hover_tip.tscn @@ -0,0 +1,20 @@ +[gd_scene format=3 uid="uid://bj1en1mlmo6tn"] + +[ext_resource type="PackedScene" uid="uid://b24pn1q6u3u5v" path="res://game/objects/informative/abstract_action_tip.tscn" id="1_jo2j3"] +[ext_resource type="Texture2D" uid="uid://dm52nybfe5efa" path="res://images/level/tips.png" id="2_6frub"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_jo2j3"] +atlas = ExtResource("2_6frub") +region = Rect2(160, 0, 16, 16) + +[sub_resource type="AtlasTexture" id="AtlasTexture_n74up"] +atlas = ExtResource("2_6frub") +region = Rect2(160, 32, 16, 16) + +[node name="InteractionActionHoverTip" unique_id=1961962362 instance=ExtResource("1_jo2j3")] + +[node name="SpriteKbd" parent="." index="0" unique_id=948959005] +texture = SubResource("AtlasTexture_jo2j3") + +[node name="SpritePad" parent="." index="1" unique_id=1703375720] +texture = SubResource("AtlasTexture_n74up") diff --git a/game/objects/informative/interaction_action_tip.tscn b/game/objects/informative/interaction_action_tip.tscn index add8e64..d34566a 100644 --- a/game/objects/informative/interaction_action_tip.tscn +++ b/game/objects/informative/interaction_action_tip.tscn @@ -1,20 +1,20 @@ [gd_scene format=3 uid="uid://g7wjnlsbden8"] [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"] +[ext_resource type="Texture2D" uid="uid://dm52nybfe5efa" path="res://images/level/tips.png" id="2_1hq02"] [sub_resource type="AtlasTexture" id="AtlasTexture_71ogr"] -atlas = ExtResource("2_xbyc1") -region = Rect2(128, 96, 32, 32) +atlas = ExtResource("2_1hq02") +region = Rect2(128, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_jsfj2"] -atlas = ExtResource("2_xbyc1") -region = Rect2(128, 128, 32, 32) +atlas = ExtResource("2_1hq02") +region = Rect2(128, 32, 32, 32) -[node name="InteractionActionTip" instance=ExtResource("1_jsfj2")] +[node name="InteractionActionTip" unique_id=1400240189 instance=ExtResource("1_jsfj2")] -[node name="SpriteKbd" parent="." index="0"] +[node name="SpriteKbd" parent="." index="0" unique_id=948959005] texture = SubResource("AtlasTexture_71ogr") -[node name="SpritePad" parent="." index="1"] +[node name="SpritePad" parent="." index="1" unique_id=1703375720] texture = SubResource("AtlasTexture_jsfj2") diff --git a/game/objects/informative/jump_action_tip.tscn b/game/objects/informative/jump_action_tip.tscn index e4506a1..77f2664 100644 --- a/game/objects/informative/jump_action_tip.tscn +++ b/game/objects/informative/jump_action_tip.tscn @@ -1,20 +1,20 @@ [gd_scene format=3 uid="uid://cjduhfqgdmyhe"] [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"] +[ext_resource type="Texture2D" uid="uid://dm52nybfe5efa" path="res://images/level/tips.png" id="2_vycfk"] [sub_resource type="AtlasTexture" id="AtlasTexture_sre3d"] -atlas = ExtResource("2_nd0mf") -region = Rect2(32, 96, 48, 32) +atlas = ExtResource("2_vycfk") +region = Rect2(32, 0, 48, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_nd0mf"] -atlas = ExtResource("2_nd0mf") -region = Rect2(32, 128, 48, 32) +atlas = ExtResource("2_vycfk") +region = Rect2(32, 32, 48, 32) -[node name="JumpActionTip" instance=ExtResource("1_ffrc6")] +[node name="JumpActionTip" unique_id=540391503 instance=ExtResource("1_ffrc6")] -[node name="SpriteKbd" parent="." index="0"] +[node name="SpriteKbd" parent="." index="0" unique_id=948959005] texture = SubResource("AtlasTexture_sre3d") -[node name="SpritePad" parent="." index="1"] +[node name="SpritePad" parent="." index="1" unique_id=1703375720] texture = SubResource("AtlasTexture_nd0mf") diff --git a/game/objects/informative/movement_action_tip.tscn b/game/objects/informative/movement_action_tip.tscn index fe17ab5..b0d6416 100644 --- a/game/objects/informative/movement_action_tip.tscn +++ b/game/objects/informative/movement_action_tip.tscn @@ -1,20 +1,20 @@ [gd_scene format=3 uid="uid://be3mqeb784shj"] [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"] +[ext_resource type="Texture2D" uid="uid://dm52nybfe5efa" path="res://images/level/tips.png" id="2_vi0b2"] [sub_resource type="AtlasTexture" id="AtlasTexture_qoa1y"] -atlas = ExtResource("2_aui55") -region = Rect2(0, 96, 32, 32) +atlas = ExtResource("2_vi0b2") +region = Rect2(0, 0, 32, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_aui55"] -atlas = ExtResource("2_aui55") -region = Rect2(0, 128, 32, 32) +atlas = ExtResource("2_vi0b2") +region = Rect2(0, 32, 32, 32) -[node name="MovementActionTip" instance=ExtResource("1_6vlve")] +[node name="MovementActionTip" unique_id=1113266380 instance=ExtResource("1_6vlve")] -[node name="SpriteKbd" parent="." index="0"] +[node name="SpriteKbd" parent="." index="0" unique_id=948959005] texture = SubResource("AtlasTexture_qoa1y") -[node name="SpritePad" parent="." index="1"] +[node name="SpritePad" parent="." index="1" unique_id=1703375720] texture = SubResource("AtlasTexture_aui55") diff --git a/game/objects/informative/switch_action_tip.tscn b/game/objects/informative/switch_action_tip.tscn index fe448c1..9a5948a 100644 --- a/game/objects/informative/switch_action_tip.tscn +++ b/game/objects/informative/switch_action_tip.tscn @@ -1,20 +1,20 @@ [gd_scene format=3 uid="uid://b0pxe00dlyx7t"] [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"] +[ext_resource type="Texture2D" uid="uid://dm52nybfe5efa" path="res://images/level/tips.png" id="2_pqxdg"] [sub_resource type="AtlasTexture" id="AtlasTexture_2aait"] -atlas = ExtResource("2_278pw") -region = Rect2(80, 96, 48, 32) +atlas = ExtResource("2_pqxdg") +region = Rect2(80, 0, 48, 32) [sub_resource type="AtlasTexture" id="AtlasTexture_278pw"] -atlas = ExtResource("2_278pw") -region = Rect2(80, 128, 48, 32) +atlas = ExtResource("2_pqxdg") +region = Rect2(80, 32, 48, 32) -[node name="SwitchActionTip" instance=ExtResource("1_sol75")] +[node name="SwitchActionTip" unique_id=990890004 instance=ExtResource("1_sol75")] -[node name="SpriteKbd" parent="." index="0"] +[node name="SpriteKbd" parent="." index="0" unique_id=948959005] texture = SubResource("AtlasTexture_2aait") -[node name="SpritePad" parent="." index="1"] +[node name="SpritePad" parent="." index="1" unique_id=1703375720] texture = SubResource("AtlasTexture_278pw") diff --git a/game/objects/interactive/abstract_activatable_object.gd b/game/objects/interactive/abstract_activatable_object.gd index dbac4db..ae80515 100644 --- a/game/objects/interactive/abstract_activatable_object.gd +++ b/game/objects/interactive/abstract_activatable_object.gd @@ -2,26 +2,26 @@ class_name AbstractActivatableObject extends Node2D -@onready var hint_sprite : Sprite2D = $HintSprite +@onready var hover_tip : Node2D = $HoverTip var _player_in_range := false func _ready() -> void: - hint_sprite.hide() + hover_tip.hide() func _on_body_entered(body: Node2D) -> void: if body is Player: - hint_sprite.show() + hover_tip.show() _player_in_range = true body.interacted.connect(_activate) func _on_body_exited(body: Node2D) -> void: if body is Player: - hint_sprite.hide() + hover_tip.hide() _player_in_range = false body.interacted.disconnect(_activate) diff --git a/game/objects/interactive/abstract_activatable_object.tscn b/game/objects/interactive/abstract_activatable_object.tscn index 8fc5db1..14a1dae 100644 --- a/game/objects/interactive/abstract_activatable_object.tscn +++ b/game/objects/interactive/abstract_activatable_object.tscn @@ -1,7 +1,7 @@ [gd_scene format=3 uid="uid://725frvpqe1c8"] [ext_resource type="Script" uid="uid://cfqo4k2uarorm" path="res://game/objects/interactive/abstract_activatable_object.gd" id="1_b4djr"] -[ext_resource type="Texture2D" uid="uid://c42nswehn307r" path="res://images/level/activation_hint.png" id="1_rexes"] +[ext_resource type="PackedScene" uid="uid://bj1en1mlmo6tn" path="res://game/objects/informative/interaction_action_hover_tip.tscn" id="2_b4djr"] [sub_resource type="CircleShape2D" id="CircleShape2D_n2cvl"] @@ -13,8 +13,7 @@ script = ExtResource("1_b4djr") [node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=2065213362] shape = SubResource("CircleShape2D_n2cvl") -[node name="HintSprite" type="Sprite2D" parent="." unique_id=1362423739] -texture = ExtResource("1_rexes") +[node name="HoverTip" parent="." unique_id=1961962362 instance=ExtResource("2_b4djr")] [connection signal="body_entered" from="." to="." method="_on_body_entered"] [connection signal="body_exited" from="." to="." method="_on_body_exited"] diff --git a/game/objects/interactive/lever.gd b/game/objects/interactive/lever.gd index 92ac477..7b6cbb9 100644 --- a/game/objects/interactive/lever.gd +++ b/game/objects/interactive/lever.gd @@ -39,7 +39,7 @@ func _activate() -> void: var set_state := func(state: State) -> void: _current_state = state _update_animation() - hint_sprite.hide() + hover_tip.hide() switching.emit() SoundManager.play_sfx_stream(SoundManager.sfx_stream_lever, global_position) @@ -61,7 +61,7 @@ func _on_animation_finished() -> void: _update_animation() switched.emit() if _player_in_range: - hint_sprite.show() + hover_tip.show() match _current_state: State.TurningLeft: diff --git a/game/objects/interactive/lever.tscn b/game/objects/interactive/lever.tscn index 0738766..4d6db14 100644 --- a/game/objects/interactive/lever.tscn +++ b/game/objects/interactive/lever.tscn @@ -53,7 +53,7 @@ animations = [{ "duration": 1.0, "texture": SubResource("AtlasTexture_ap6wp") }], -"loop": true, +"loop": 1, "name": &"turned_left", "speed": 5.0 }, { @@ -61,7 +61,7 @@ animations = [{ "duration": 1.0, "texture": SubResource("AtlasTexture_wb3bq") }], -"loop": true, +"loop": 1, "name": &"turned_right", "speed": 5.0 }, { @@ -78,7 +78,7 @@ animations = [{ "duration": 2.0, "texture": SubResource("AtlasTexture_eom63") }], -"loop": false, +"loop": 0, "name": &"turning_left", "speed": 20.0 }, { @@ -95,7 +95,7 @@ animations = [{ "duration": 2.0, "texture": SubResource("AtlasTexture_5h41l") }], -"loop": false, +"loop": 0, "name": &"turning_right", "speed": 20.0 }] @@ -112,7 +112,7 @@ initial_state = 0 position = Vector2(0, -4) shape = SubResource("RectangleShape2D_tnscr") -[node name="HintSprite" parent="." index="1" unique_id=1362423739] +[node name="HoverTip" parent="." index="1" unique_id=1961962362] position = Vector2(0, -11) [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="." index="2" unique_id=2086579452] diff --git a/images/level/activation_hint.png b/images/level/activation_hint.png deleted file mode 100644 index 9b7ac9a..0000000 --- a/images/level/activation_hint.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e84ecf5997778f9ebffdb16e90bd32b8b9e6ec9416c28f3c020e94e9d39dcc2f -size 146 diff --git a/images/level/objects.png b/images/level/objects.png index 8914840..06bdb9c 100644 --- a/images/level/objects.png +++ b/images/level/objects.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d74ed2680639cdd3cd5bb7ff58600b147a01c9556a17fe468177c80bd95bd704 -size 1690 +oid sha256:d39c62497dc9c93b57fc67f97627b88194ca541f010cd3cb15ec2b2ca5324384 +size 1159 diff --git a/images/level/tips.png b/images/level/tips.png new file mode 100644 index 0000000..2b6c31a --- /dev/null +++ b/images/level/tips.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bc715a722045d3c156af0a4b2f3fefb61845e9e901e473e89bee6673a53204d6 +size 665 diff --git a/images/level/activation_hint.png.import b/images/level/tips.png.import similarity index 72% rename from images/level/activation_hint.png.import rename to images/level/tips.png.import index 4c4c886..0393129 100644 --- a/images/level/activation_hint.png.import +++ b/images/level/tips.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c42nswehn307r" -path="res://.godot/imported/activation_hint.png-d71cb806d34b5813c305102aca86fa65.ctex" +uid="uid://dm52nybfe5efa" +path="res://.godot/imported/tips.png-54e4ed860039a31b1db7970cfa7caa43.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://images/level/activation_hint.png" -dest_files=["res://.godot/imported/activation_hint.png-d71cb806d34b5813c305102aca86fa65.ctex"] +source_file="res://images/level/tips.png" +dest_files=["res://.godot/imported/tips.png-54e4ed860039a31b1db7970cfa7caa43.ctex"] [params]