From 847d21a06d9fabeb76dddc6291de8f5335552010 Mon Sep 17 00:00:00 2001 From: yuki Date: Thu, 13 Nov 2025 08:33:01 -0300 Subject: [PATCH] restructure folder --- scenes/Main.tscn => Main.tscn | 14 ++++++++------ resources/tilesets/level.tres | 6 +++++- scenes/{ => player}/player.gd | 0 scenes/{ => player}/player.gd.uid | 0 scenes/{Player.tscn => player/player.tscn} | 5 ++++- 5 files changed, 17 insertions(+), 8 deletions(-) rename scenes/Main.tscn => Main.tscn (75%) rename scenes/{ => player}/player.gd (100%) rename scenes/{ => player}/player.gd.uid (100%) rename scenes/{Player.tscn => player/player.tscn} (97%) diff --git a/scenes/Main.tscn b/Main.tscn similarity index 75% rename from scenes/Main.tscn rename to Main.tscn index b718dad..4b5e8cf 100644 --- a/scenes/Main.tscn +++ b/Main.tscn @@ -1,18 +1,20 @@ [gd_scene load_steps=3 format=4 uid="uid://d3c6aioatcy20"] -[ext_resource type="PackedScene" uid="uid://642nm6c4mpxx" path="res://scenes/Player.tscn" id="1_elqb8"] -[ext_resource type="TileSet" uid="uid://doja61ouvb77l" path="res://resources/tilesets/level.tres" id="1_rvslj"] +[ext_resource type="TileSet" uid="uid://doja61ouvb77l" path="res://resources/tilesets/level.tres" id="1_uu6xs"] +[ext_resource type="PackedScene" uid="uid://642nm6c4mpxx" path="res://scenes/player/player.tscn" id="2_r0du0"] [node name="Main" type="Node"] [node name="FloorTilemap" type="TileMapLayer" parent="."] tile_map_data = PackedByteArray("AAAEAAAAAgAAAAAAAAAEAAEAAgAAAAAAAAAEAAIAAgAAAAAAAAAEAAMAAgAAAAAAAAAEAAQAAgAAAAAAAAAEAAUAAgAAAAAAAAAEAAYAAgAAAAAAAAAEAAcAAgAAAAAAAAAEAAgAAgAAAAAAAAAEAAkAAgAAAAAAAAAEAAoAAgAAAAAAAAAEAAsAAgAAAAAAAAAEAAwAAgAAAAAAAAAEAA0AAgAAAAAAAAAEAA4AAgAAAAAAAAAFAAAAAgAAAAAAAAAFAAEAAgAAAAAAAAAFAAIAAgAAAAAAAAAFAAMAAgAAAAAAAAAFAAQAAgAAAAAAAAAFAAUAAgAAAAAAAAAFAAYAAgAAAAAAAAAFAAcAAgAAAAAAAAAFAAgAAgAAAAAAAAAFAAkAAgAAAAAAAAAFAAoAAgAAAAAAAAAFAAsAAgAAAAAAAAAFAAwAAgAAAAAAAAAFAA0AAgAAAAAAAAAFAA4AAgAAAAAAAAAGAAAAAgAAAAAAAAAGAAEAAgAAAAAAAAAGAAIAAgAAAAAAAAAGAAMAAgAAAAAAAAAGAAQAAgAAAAAAAAAGAAUAAgAAAAAAAAAGAAYAAgAAAAAAAAAGAAcAAgAAAAAAAAAGAAgAAgAAAAAAAAAGAAkAAgAAAAAAAAAGAAoAAgAAAAAAAAAGAAsAAgAAAAAAAAAGAAwAAgAAAAAAAAAGAA0AAgAAAAAAAAAGAA4AAgAAAAAAAAAHAAAAAgAAAAAAAAAHAAEAAgAAAAAAAAAHAAIAAgAAAAAAAAAHAAMAAgAAAAAAAAAHAAQAAgAAAAAAAAAHAAUAAgAAAAAAAAAHAAYAAgAAAAAAAAAHAAcAAgAAAAAAAAAHAAgAAgAAAAAAAAAHAAkAAgAAAAAAAAAHAAoAAgAAAAAAAAAHAAsAAgAAAAAAAAAHAAwAAgAAAAAAAAAHAA0AAgAAAAAAAAAHAA4AAgAAAAAAAAAIAAAAAgAAAAAAAAAIAAEAAgAAAAAAAAAIAAIAAgAAAAAAAAAIAAMAAgAAAAAAAAAIAAQAAgAAAAAAAAAIAAUAAgAAAAAAAAAIAAYAAgAAAAAAAAAIAAcAAgAAAAAAAAAIAAgAAgAAAAAAAAAIAAkAAgAAAAAAAAAIAAoAAgAAAAAAAAAIAAsAAgAAAAAAAAAIAAwAAgAAAAAAAAAIAA0AAgAAAAAAAAAIAA4AAgAAAAAAAAAJAAAAAgAAAAAAAAAJAAEAAgAAAAAAAAAJAAIAAgAAAAAAAAAJAAMAAgAAAAAAAAAJAAQAAgAAAAAAAAAJAAUAAgAAAAAAAAAJAAYAAgAAAAAAAAAJAAcAAgAAAAAAAAAJAAgAAgAAAAAAAAAJAAkAAgAAAAAAAAAJAAoAAgAAAAAAAAAJAAsAAgAAAAAAAAAJAAwAAgAAAAAAAAAJAA0AAgAAAAAAAAAJAA4AAgAAAAAAAAAKAAAAAgAAAAAAAAAKAAEAAgAAAAAAAAAKAAIAAgAAAAAAAAAKAAMAAgAAAAAAAAAKAAQAAgAAAAAAAAAKAAUAAgAAAAAAAAAKAAYAAgAAAAAAAAAKAAcAAgAAAAAAAAAKAAgAAgAAAAAAAAAKAAkAAgAAAAAAAAAKAAoAAgAAAAAAAAAKAAsAAgAAAAAAAAAKAAwAAgAAAAAAAAAKAA0AAgAAAAAAAAAKAA4AAgAAAAAAAAALAAAAAgAAAAAAAAALAAEAAgAAAAAAAAALAAIAAgAAAAAAAAALAAMAAgAAAAAAAAALAAQAAgAAAAAAAAALAAUAAgAAAAAAAAALAAYAAgAAAAAAAAALAAcAAgAAAAAAAAALAAgAAgAAAAAAAAALAAkAAgAAAAAAAAALAAoAAgAAAAAAAAALAAsAAgAAAAAAAAALAAwAAgAAAAAAAAALAA0AAgAAAAAAAAALAA4AAgAAAAAAAAAMAAAAAgAAAAAAAAAMAAEAAgAAAAAAAAAMAAIAAgAAAAAAAAAMAAMAAgAAAAAAAAAMAAQAAgAAAAAAAAAMAAUAAgAAAAAAAAAMAAYAAgAAAAAAAAAMAAcAAgAAAAAAAAAMAAgAAgAAAAAAAAAMAAkAAgAAAAAAAAAMAAoAAgAAAAAAAAAMAAsAAgAAAAAAAAAMAAwAAgAAAAAAAAAMAA0AAgAAAAAAAAAMAA4AAgAAAAAAAAANAAAAAgAAAAAAAAANAAEAAgAAAAAAAAANAAIAAgAAAAAAAAANAAMAAgAAAAAAAAANAAQAAgAAAAAAAAANAAUAAgAAAAAAAAANAAYAAgAAAAAAAAANAAcAAgAAAAAAAAANAAgAAgAAAAAAAAANAAkAAgAAAAAAAAANAAoAAgAAAAAAAAANAAsAAgAAAAAAAAANAAwAAgAAAAAAAAANAA0AAgAAAAAAAAANAA4AAgAAAAAAAAAOAAAAAgAAAAAAAAAOAAEAAgAAAAAAAAAOAAIAAgAAAAAAAAAOAAMAAgAAAAAAAAAOAAQAAgAAAAAAAAAOAAUAAgAAAAAAAAAOAAYAAgAAAAAAAAAOAAcAAgAAAAAAAAAOAAgAAgAAAAAAAAAOAAkAAgAAAAAAAAAOAAoAAgAAAAAAAAAOAAsAAgAAAAAAAAAOAAwAAgAAAAAAAAAOAA0AAgAAAAAAAAAOAA4AAgAAAAAAAAAPAAAAAgAAAAAAAAAPAAEAAgAAAAAAAAAPAAIAAgAAAAAAAAAPAAMAAgAAAAAAAAAPAAQAAgAAAAAAAAAPAAUAAgAAAAAAAAAPAAYAAgAAAAAAAAAPAAcAAgAAAAAAAAAPAAgAAgAAAAAAAAAPAAkAAgAAAAAAAAAPAAoAAgAAAAAAAAAPAAsAAgAAAAAAAAAPAAwAAgAAAAAAAAAPAA0AAgAAAAAAAAAPAA4AAgAAAAAAAAA=") -tile_set = ExtResource("1_rvslj") +tile_set = ExtResource("1_uu6xs") collision_enabled = false +metadata/_edit_lock_ = true [node name="BlockTilemap" type="TileMapLayer" parent="."] -tile_map_data = PackedByteArray("AAADAA0AAwAEAAIAAAADAAwAAwAEAAIAAAADAAsAAwAEAAIAAAADAAoAAwAEAAIAAAADAAkAAwAEAAIAAAADAAgAAwAEAAIAAAADAAcAAwAEAAIAAAADAAYAAwAEAAIAAAADAAUAAwAEAAIAAAADAAQAAwAEAAIAAAADAAMAAwAEAAIAAAADAAIAAwAEAAIAAAADAAEAAwAEAAIAAAAQAA0AAwAEAAIAAAAQAAwAAwAEAAIAAAAQAAsAAwAEAAIAAAAQAAoAAwAEAAIAAAAQAAkAAwAEAAIAAAAQAAgAAwAEAAIAAAAQAAcAAwAEAAIAAAAQAAYAAwAEAAIAAAAQAAUAAwAEAAIAAAAQAAQAAwAEAAIAAAAQAAMAAwAEAAIAAAAQAAIAAwAEAAIAAAAQAAEAAwAEAAIAAAADAAAAAwAEAAEAAAAQAAAAAwAEAAEAAAADAA4AAwAEAAMAAAAQAA4AAwAEAAMAAAAEAA4AAwAEAAAAAAAPAA4AAwAEAAAAAAAEAAoAAwAHAAQAAAAFAAsAAwAHAAQAAAAGAAwAAwAHAAQAAAAEAA0AAwAFAAIAAAAEAAwAAwAHAAAAAAAEAAsAAwAFAAQAAAAFAAwAAwAFAAQAAAA=") -tile_set = ExtResource("1_rvslj") +tile_map_data = PackedByteArray("AAADAA0AAwAEAAIAAAADAAwAAwAEAAIAAAADAAsAAwAEAAIAAAADAAoAAwAEAAIAAAADAAkAAwAEAAIAAAADAAgAAwAEAAIAAAADAAcAAwAEAAIAAAADAAYAAwAEAAIAAAADAAUAAwAEAAIAAAADAAQAAwAEAAIAAAADAAMAAwAEAAIAAAADAAIAAwAEAAIAAAADAAEAAwAEAAIAAAAQAA0AAwAEAAIAAAAQAAwAAwAEAAIAAAAQAAsAAwAEAAIAAAAQAAoAAwAEAAIAAAAQAAkAAwAEAAIAAAAQAAgAAwAEAAIAAAAQAAcAAwAEAAIAAAAQAAYAAwAEAAIAAAAQAAUAAwAEAAIAAAAQAAQAAwAEAAIAAAAQAAMAAwAEAAIAAAAQAAIAAwAEAAIAAAAQAAEAAwAEAAIAAAADAAAAAwAEAAEAAAAQAAAAAwAEAAEAAAADAA4AAwAEAAMAAAAQAA4AAwAEAAMAAAAEAAoAAwAHAAQAAAAEAAsAAwAFAAQAAAAEAAwAAwAHAAAAAAAEAA0AAwAGAAUAAAAEAA4AAwAGAAcAAAAFAAsAAwAHAAQAAAAFAAwAAwAFAAQAAAAFAA0AAwAHAAUAAAAFAA4AAwAHAAcAAAAGAAwAAwAHAAQAAAAGAA0AAwAEAAEAAAAGAA4AAwAEAAMAAAANAAwAAwAHAAMAAAANAA0AAwAEAAEAAAANAA4AAwAEAAMAAAAOAAsAAwAHAAMAAAAOAAwAAwAGAAMAAAAOAA0AAwAHAAIAAAAOAA4AAwAGAAcAAAAPAAoAAwAHAAMAAAAPAAsAAwAGAAMAAAAPAAwAAwAEAAEAAAAPAA0AAwAEAAMAAAAPAA4AAwAHAAcAAAAFAAAAAwAGAAUAAAAGAAAAAwAHAAUAAAANAAAAAwAEAAEAAAAOAAAAAwAGAAAAAAAGAAIAAwAGAAQAAAAFAAMAAwAGAAQAAAAEAAQAAwAGAAQAAAANAAIAAwAFAAMAAAAOAAMAAwAFAAMAAAAPAAQAAwAFAAMAAAAOAAIAAwAGAAMAAAAPAAMAAwAGAAMAAAAFAAIAAwAFAAIAAAAEAAMAAwAFAAIAAAANAAEAAwAEAAMAAAAGAAEAAwAHAAIAAAAEAAEAAwAEAAQAAAAFAAEAAwAHAAcAAAAEAAAAAwAEAAAAAAAPAAIAAwAEAAQAAAAOAAEAAwAHAAAAAAAEAAIAAwAEAAUAAAAPAAEAAwAGAAMAAAAPAAAAAwAGAAMAAAAHAA0ABAAAAAMAAAAIAA0ABAABAAMAAAAJAA0ABAACAAMAAAAKAA0ABAADAAMAAAALAA0ABAAEAAMAAAAMAA0ABAAFAAMAAAAHAAEABAAAAAMAAAAIAAEABAABAAMAAAAJAAEABAACAAMAAAAKAAEABAADAAMAAAALAAEABAAEAAMAAAAMAAEABAAFAAMAAAA=") +tile_set = ExtResource("1_uu6xs") +metadata/_edit_lock_ = true -[node name="Player" parent="." instance=ExtResource("1_elqb8")] +[node name="Player" parent="." instance=ExtResource("2_r0du0")] position = Vector2(148, 105) diff --git a/resources/tilesets/level.tres b/resources/tilesets/level.tres index 7b63c28..9c5fb92 100644 --- a/resources/tilesets/level.tres +++ b/resources/tilesets/level.tres @@ -1,9 +1,12 @@ -[gd_resource type="TileSet" load_steps=8 format=3 uid="uid://doja61ouvb77l"] +[gd_resource type="TileSet" load_steps=9 format=3 uid="uid://doja61ouvb77l"] [ext_resource type="Texture2D" uid="uid://cwyhgn5jgia1m" path="res://assets/environment/proto.png" id="1_ohrjv"] [ext_resource type="Texture2D" uid="uid://nk83a47ifsqo" path="res://assets/environment/Block Tileset 4 Colors RVG.png" id="2_br5dt"] [ext_resource type="Texture2D" uid="uid://coabfw2isxhtc" path="res://assets/environment/match3_db16.png" id="3_xww2a"] +[sub_resource type="TileMapPattern" id="TileMapPattern_ohrjv"] +tile_data = PackedInt32Array(0, 458755, 4, 65536, 327683, 4, 131072, 458755, 0, 196608, 393219, 5, 262144, 393219, 7, 65537, 458755, 4, 131073, 327683, 4, 196609, 458755, 5, 262145, 458755, 7, 131074, 458755, 4, 196610, 262147, 1, 262146, 262147, 3, 262147, 65540, 6, 262148, 65540, 6, 262149, 65540, 6, 262150, 65540, 6, 262151, 65540, 6, 262152, 65540, 6, 131081, 458755, 3, 196617, 262147, 1, 262153, 262147, 3, 65546, 458755, 3, 131082, 393219, 3, 196618, 458755, 2, 262154, 393219, 7, 11, 458755, 3, 65547, 393219, 3, 131083, 262147, 1, 196619, 262147, 3, 262155, 458755, 7) + [sub_resource type="PhysicsMaterial" id="PhysicsMaterial_ohrjv"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_pdhcq"] @@ -483,3 +486,4 @@ terrain_set_0/terrain_0/color = Color(0.5, 0.34375, 0.25, 1) sources/2 = SubResource("TileSetAtlasSource_pdhcq") sources/3 = SubResource("TileSetAtlasSource_58657") sources/4 = SubResource("TileSetAtlasSource_ln5p0") +pattern_0 = SubResource("TileMapPattern_ohrjv") diff --git a/scenes/player.gd b/scenes/player/player.gd similarity index 100% rename from scenes/player.gd rename to scenes/player/player.gd diff --git a/scenes/player.gd.uid b/scenes/player/player.gd.uid similarity index 100% rename from scenes/player.gd.uid rename to scenes/player/player.gd.uid diff --git a/scenes/Player.tscn b/scenes/player/player.tscn similarity index 97% rename from scenes/Player.tscn rename to scenes/player/player.tscn index 1e7f05f..1520de4 100644 --- a/scenes/Player.tscn +++ b/scenes/player/player.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=17 format=3 uid="uid://642nm6c4mpxx"] -[ext_resource type="Script" uid="uid://rdqmsvofiots" path="res://scenes/player.gd" id="1_v6fml"] +[ext_resource type="Script" uid="uid://rdqmsvofiots" path="res://scenes/player/player.gd" id="1_v6fml"] [ext_resource type="Texture2D" uid="uid://b8ptokcqwpdud" path="res://assets/sprites/saffron.png" id="2_3li8b"] [sub_resource type="AtlasTexture" id="AtlasTexture_g2els"] @@ -127,6 +127,9 @@ radius = 5.0 height = 16.0 [node name="Player" type="CharacterBody2D"] +collision_layer = 2 +collision_mask = 13 +floor_stop_on_slope = false script = ExtResource("1_v6fml") [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]