From 649061fe6af3a09db737038344165f63c1428c41 Mon Sep 17 00:00:00 2001 From: Wynd Date: Sat, 14 Sep 2024 22:50:30 +0300 Subject: [PATCH] Changed the project structure --- bat.png => entities/assets/bat.png | Bin .../assets/bat.png.import | 6 +- ghost.png => entities/assets/ghost.png | Bin .../assets/ghost.png.import | 6 +- .../assets/box-switch.png | Bin .../assets/box-switch.png.import | 6 +- box.png => objects/assets/box.png | Bin .../assets/box.png.import | 6 +- grave.png => objects/assets/grave.png | Bin .../assets/grave.png.import | 6 +- box.tscn => objects/box/box.tscn | 15 ++--- .../box/box_switch.tscn | 32 +++++------ grave.tscn => objects/grave/grave.tscn | 53 +++++++++--------- project.godot | 3 +- tileset.png => scenes/assets/tileset.png | Bin .../assets/tileset.png.import | 6 +- main.tscn => scenes/main.tscn | 22 ++++---- 17 files changed, 81 insertions(+), 80 deletions(-) rename bat.png => entities/assets/bat.png (100%) rename bat.png.import => entities/assets/bat.png.import (73%) rename ghost.png => entities/assets/ghost.png (100%) rename ghost.png.import => entities/assets/ghost.png.import (72%) rename box-switch.png => objects/assets/box-switch.png (100%) rename box-switch.png.import => objects/assets/box-switch.png.import (71%) rename box.png => objects/assets/box.png (100%) rename box.png.import => objects/assets/box.png.import (73%) rename grave.png => objects/assets/grave.png (100%) rename grave.png.import => objects/assets/grave.png.import (72%) rename box.tscn => objects/box/box.tscn (89%) rename box_switch.tscn => objects/box/box_switch.tscn (96%) rename grave.tscn => objects/grave/grave.tscn (92%) rename tileset.png => scenes/assets/tileset.png (100%) rename tileset.png.import => scenes/assets/tileset.png.import (72%) rename main.tscn => scenes/main.tscn (95%) diff --git a/bat.png b/entities/assets/bat.png similarity index 100% rename from bat.png rename to entities/assets/bat.png diff --git a/bat.png.import b/entities/assets/bat.png.import similarity index 73% rename from bat.png.import rename to entities/assets/bat.png.import index 7deedf6..6e84060 100644 --- a/bat.png.import +++ b/entities/assets/bat.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dxkxa6e6ue1b6" -path="res://.godot/imported/bat.png-8c5f11e0110a5921c6efd8f18e634996.ctex" +path="res://.godot/imported/bat.png-c44a91614c3a07ccae4dd187ce12b25d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://bat.png" -dest_files=["res://.godot/imported/bat.png-8c5f11e0110a5921c6efd8f18e634996.ctex"] +source_file="res://entities/assets/bat.png" +dest_files=["res://.godot/imported/bat.png-c44a91614c3a07ccae4dd187ce12b25d.ctex"] [params] diff --git a/ghost.png b/entities/assets/ghost.png similarity index 100% rename from ghost.png rename to entities/assets/ghost.png diff --git a/ghost.png.import b/entities/assets/ghost.png.import similarity index 72% rename from ghost.png.import rename to entities/assets/ghost.png.import index 2064aa4..e27c5cb 100644 --- a/ghost.png.import +++ b/entities/assets/ghost.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d2weyvrv4qsa2" -path="res://.godot/imported/ghost.png-f343bb4bd35f12f8f631dffe3b7d2891.ctex" +path="res://.godot/imported/ghost.png-4bae11df049bb031fc8bd900fd23bdd5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://ghost.png" -dest_files=["res://.godot/imported/ghost.png-f343bb4bd35f12f8f631dffe3b7d2891.ctex"] +source_file="res://entities/assets/ghost.png" +dest_files=["res://.godot/imported/ghost.png-4bae11df049bb031fc8bd900fd23bdd5.ctex"] [params] diff --git a/box-switch.png b/objects/assets/box-switch.png similarity index 100% rename from box-switch.png rename to objects/assets/box-switch.png diff --git a/box-switch.png.import b/objects/assets/box-switch.png.import similarity index 71% rename from box-switch.png.import rename to objects/assets/box-switch.png.import index 695241a..d13bd00 100644 --- a/box-switch.png.import +++ b/objects/assets/box-switch.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b4i416bsd62n1" -path="res://.godot/imported/box-switch.png-09af05dc015f6a7c21a3d4c8a8039a04.ctex" +path="res://.godot/imported/box-switch.png-b01d7f98c3af35149b3dac0b2da9ed80.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://box-switch.png" -dest_files=["res://.godot/imported/box-switch.png-09af05dc015f6a7c21a3d4c8a8039a04.ctex"] +source_file="res://objects/assets/box-switch.png" +dest_files=["res://.godot/imported/box-switch.png-b01d7f98c3af35149b3dac0b2da9ed80.ctex"] [params] diff --git a/box.png b/objects/assets/box.png similarity index 100% rename from box.png rename to objects/assets/box.png diff --git a/box.png.import b/objects/assets/box.png.import similarity index 73% rename from box.png.import rename to objects/assets/box.png.import index 6f694b5..7f62d2e 100644 --- a/box.png.import +++ b/objects/assets/box.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://br4mm65ok0dfl" -path="res://.godot/imported/box.png-196cb2b6d7422a4ab3b9c60b5a994fe3.ctex" +path="res://.godot/imported/box.png-87b425849f24b1a9b2fd08bc5358c175.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://box.png" -dest_files=["res://.godot/imported/box.png-196cb2b6d7422a4ab3b9c60b5a994fe3.ctex"] +source_file="res://objects/assets/box.png" +dest_files=["res://.godot/imported/box.png-87b425849f24b1a9b2fd08bc5358c175.ctex"] [params] diff --git a/grave.png b/objects/assets/grave.png similarity index 100% rename from grave.png rename to objects/assets/grave.png diff --git a/grave.png.import b/objects/assets/grave.png.import similarity index 72% rename from grave.png.import rename to objects/assets/grave.png.import index f60104f..088dd0f 100644 --- a/grave.png.import +++ b/objects/assets/grave.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://boii66my2eiqr" -path="res://.godot/imported/grave.png-04e515fa19f6c3c60cd0f12f47ff3134.ctex" +path="res://.godot/imported/grave.png-f7e08caf0094f9eb8b4fb58fe0a09e30.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://grave.png" -dest_files=["res://.godot/imported/grave.png-04e515fa19f6c3c60cd0f12f47ff3134.ctex"] +source_file="res://objects/assets/grave.png" +dest_files=["res://.godot/imported/grave.png-f7e08caf0094f9eb8b4fb58fe0a09e30.ctex"] [params] diff --git a/box.tscn b/objects/box/box.tscn similarity index 89% rename from box.tscn rename to objects/box/box.tscn index 3af7a66..fb26429 100644 --- a/box.tscn +++ b/objects/box/box.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=5 format=3 uid="uid://cjus07bbbn4wd"] -[ext_resource type="Texture2D" uid="uid://br4mm65ok0dfl" path="res://box.png" id="1_myqej"] +[ext_resource type="Texture2D" uid="uid://br4mm65ok0dfl" path="res://objects/assets/box.png" id="1_myqej"] [sub_resource type="Animation" id="Animation_21bg4"] resource_name = "RESET" @@ -41,13 +41,14 @@ _data = { [node name="Box" type="Node2D"] -[node name="Sprite2D" type="Sprite2D" parent="."] -texture_filter = 1 -texture = ExtResource("1_myqej") -hframes = 5 - -[node name="AnimationPlayer" type="AnimationPlayer" parent="Sprite2D"] +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +root_node = NodePath("../Sprite2D") libraries = { "": SubResource("AnimationLibrary_g7bql") } autoplay = "RESET" + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture_filter = 1 +texture = ExtResource("1_myqej") +hframes = 5 diff --git a/box_switch.tscn b/objects/box/box_switch.tscn similarity index 96% rename from box_switch.tscn rename to objects/box/box_switch.tscn index 1a9f6b7..4058ca5 100644 --- a/box_switch.tscn +++ b/objects/box/box_switch.tscn @@ -1,10 +1,25 @@ [gd_scene load_steps=6 format=3 uid="uid://c2qq84wh76mkx"] -[ext_resource type="Texture2D" uid="uid://b4i416bsd62n1" path="res://box-switch.png" id="1_s5gx1"] +[ext_resource type="Texture2D" uid="uid://b4i416bsd62n1" path="res://objects/assets/box-switch.png" id="1_s5gx1"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_g4f6l"] size = Vector2(8, 8) +[sub_resource type="Animation" id="Animation_615sy"] +length = 0.001 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("Sprite2D:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [0] +} + [sub_resource type="Animation" id="Animation_33k1i"] resource_name = "active" length = 0.5 @@ -22,21 +37,6 @@ tracks/0/keys = { "values": [0, 1] } -[sub_resource type="Animation" id="Animation_615sy"] -length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("Sprite2D:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 1, -"values": [0] -} - [sub_resource type="AnimationLibrary" id="AnimationLibrary_78s6f"] _data = { "RESET": SubResource("Animation_615sy"), diff --git a/grave.tscn b/objects/grave/grave.tscn similarity index 92% rename from grave.tscn rename to objects/grave/grave.tscn index 953018a..bff9b35 100644 --- a/grave.tscn +++ b/objects/grave/grave.tscn @@ -1,25 +1,6 @@ [gd_scene load_steps=7 format=3 uid="uid://chmxabjea27ay"] -[ext_resource type="Texture2D" uid="uid://boii66my2eiqr" path="res://grave.png" id="1_wcgrd"] - -[sub_resource type="AtlasTexture" id="AtlasTexture_h3pxl"] -atlas = ExtResource("1_wcgrd") - -[sub_resource type="Animation" id="Animation_w5bs5"] -resource_name = "sing" -loop_mode = 1 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:frame") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 0.25, 0.5, 0.75), -"transitions": PackedFloat32Array(1, 1, 1, 1), -"update": 1, -"values": [1, 2, 3, 4] -} +[ext_resource type="Texture2D" uid="uid://boii66my2eiqr" path="res://objects/assets/grave.png" id="1_wcgrd"] [sub_resource type="Animation" id="Animation_4eb2t"] resource_name = "RESET" @@ -51,6 +32,22 @@ tracks/0/keys = { "values": [5, 6, 7, 8, 9] } +[sub_resource type="Animation" id="Animation_w5bs5"] +resource_name = "sing" +loop_mode = 1 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 0.25, 0.5, 0.75), +"transitions": PackedFloat32Array(1, 1, 1, 1), +"update": 1, +"values": [1, 2, 3, 4] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_n47hy"] _data = { "RESET": SubResource("Animation_4eb2t"), @@ -58,16 +55,20 @@ _data = { "sing": SubResource("Animation_w5bs5") } +[sub_resource type="AtlasTexture" id="AtlasTexture_h3pxl"] +atlas = ExtResource("1_wcgrd") + [node name="Grave" type="Node2D"] +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +root_node = NodePath("../Sprite2D") +libraries = { +"": SubResource("AnimationLibrary_n47hy") +} +autoplay = "RESET" + [node name="Sprite2D" type="Sprite2D" parent="."] texture_filter = 1 texture = SubResource("AtlasTexture_h3pxl") hframes = 5 vframes = 2 - -[node name="AnimationPlayer" type="AnimationPlayer" parent="Sprite2D"] -libraries = { -"": SubResource("AnimationLibrary_n47hy") -} -autoplay = "RESET" diff --git a/project.godot b/project.godot index c441e6d..7888e5b 100644 --- a/project.godot +++ b/project.godot @@ -11,9 +11,8 @@ config_version=5 [application] config/name="GBJAM12" -run/main_scene="res://main.tscn" +run/main_scene="res://scenes/main.tscn" config/features=PackedStringArray("4.3", "GL Compatibility") -config/icon="res://icon.svg" [display] diff --git a/tileset.png b/scenes/assets/tileset.png similarity index 100% rename from tileset.png rename to scenes/assets/tileset.png diff --git a/tileset.png.import b/scenes/assets/tileset.png.import similarity index 72% rename from tileset.png.import rename to scenes/assets/tileset.png.import index 87de142..90f851d 100644 --- a/tileset.png.import +++ b/scenes/assets/tileset.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cbuibrshdpkm1" -path="res://.godot/imported/tileset.png-a39e944f25b35d62f55d4f98a36e2b5e.ctex" +path="res://.godot/imported/tileset.png-43fc4a4b8263b3825042700901d29d42.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://tileset.png" -dest_files=["res://.godot/imported/tileset.png-a39e944f25b35d62f55d4f98a36e2b5e.ctex"] +source_file="res://scenes/assets/tileset.png" +dest_files=["res://.godot/imported/tileset.png-43fc4a4b8263b3825042700901d29d42.ctex"] [params] diff --git a/main.tscn b/scenes/main.tscn similarity index 95% rename from main.tscn rename to scenes/main.tscn index 44e7906..eb74b12 100644 --- a/main.tscn +++ b/scenes/main.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=7 format=4 uid="uid://cbg46c4q2ian4"] -[ext_resource type="Texture2D" uid="uid://cbuibrshdpkm1" path="res://tileset.png" id="1_7ovc0"] -[ext_resource type="PackedScene" uid="uid://chmxabjea27ay" path="res://grave.tscn" id="2_qgd40"] -[ext_resource type="PackedScene" uid="uid://cjus07bbbn4wd" path="res://box.tscn" id="3_2srwt"] -[ext_resource type="PackedScene" uid="uid://c2qq84wh76mkx" path="res://box_switch.tscn" id="4_vxduc"] +[ext_resource type="Texture2D" uid="uid://cbuibrshdpkm1" path="res://scenes/assets/tileset.png" id="1_8a4g8"] +[ext_resource type="PackedScene" uid="uid://chmxabjea27ay" path="res://objects/grave/grave.tscn" id="2_fe1sr"] +[ext_resource type="PackedScene" uid="uid://cjus07bbbn4wd" path="res://objects/box/box.tscn" id="3_jiwuy"] +[ext_resource type="PackedScene" uid="uid://c2qq84wh76mkx" path="res://objects/box/box_switch.tscn" id="4_7yk3l"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_m1u1u"] -texture = ExtResource("1_7ovc0") +texture = ExtResource("1_8a4g8") texture_region_size = Vector2i(8, 8) 0:0/0 = 0 1:0/0 = 0 @@ -50,24 +50,24 @@ position = Vector2(240, 72) [node name="Camera2D" type="Camera2D" parent="Player"] -[node name="Grave" parent="." instance=ExtResource("2_qgd40")] +[node name="Grave" parent="." instance=ExtResource("2_fe1sr")] texture_filter = 1 position = Vector2(228, 20) -[node name="Grave2" parent="." instance=ExtResource("2_qgd40")] +[node name="Grave2" parent="." instance=ExtResource("2_fe1sr")] texture_filter = 1 position = Vector2(196, 36) -[node name="Grave3" parent="." instance=ExtResource("2_qgd40")] +[node name="Grave3" parent="." instance=ExtResource("2_fe1sr")] texture_filter = 1 position = Vector2(244, 28) -[node name="Grave4" parent="." instance=ExtResource("2_qgd40")] +[node name="Grave4" parent="." instance=ExtResource("2_fe1sr")] texture_filter = 1 position = Vector2(244, 44) -[node name="Box" parent="." instance=ExtResource("3_2srwt")] +[node name="Box" parent="." instance=ExtResource("3_jiwuy")] position = Vector2(276, 20) -[node name="BoxSwitch" parent="." instance=ExtResource("4_vxduc")] +[node name="BoxSwitch" parent="." instance=ExtResource("4_7yk3l")] position = Vector2(292, 116)