diff --git a/extracted/Sprite/Tree_Field_01_SPRT.png b/extracted/Sprite/Tree_Field_01_SPRT.png deleted file mode 100644 index 2dd91b0..0000000 --- a/extracted/Sprite/Tree_Field_01_SPRT.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5b98cdc13dfbdaecb2f6d4ee85cd0f90085f7809127153f025a4a24c80d1d30e -size 37616 diff --git a/extracted/Sprite/Tree_Field_01_SPRT.png.import b/extracted/Sprite/Tree_Field_01_SPRT.png.import deleted file mode 100644 index 191c9df..0000000 --- a/extracted/Sprite/Tree_Field_01_SPRT.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://ca1mrresx618t" -path="res://.godot/imported/Tree_Field_01_SPRT.png-02a529b82fadd4687fe05464ba8bf06c.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://extracted/Sprite/Tree_Field_01_SPRT.png" -dest_files=["res://.godot/imported/Tree_Field_01_SPRT.png-02a529b82fadd4687fe05464ba8bf06c.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/extracted/Sprite/Tree_Field_02_SPRT.png b/extracted/Sprite/Tree_Field_02_SPRT.png deleted file mode 100644 index bdaf526..0000000 --- a/extracted/Sprite/Tree_Field_02_SPRT.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3356bac1a5cc0f320c12eafc13e1815cd2ad2c39b14abd71d9491370a594ff1a -size 32066 diff --git a/extracted/Sprite/Tree_Field_02_SPRT.png.import b/extracted/Sprite/Tree_Field_02_SPRT.png.import deleted file mode 100644 index 9f9a4df..0000000 --- a/extracted/Sprite/Tree_Field_02_SPRT.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://bliv5pwjnmsja" -path="res://.godot/imported/Tree_Field_02_SPRT.png-e8a50b6e1fe5334b80ff094a374b3521.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://extracted/Sprite/Tree_Field_02_SPRT.png" -dest_files=["res://.godot/imported/Tree_Field_02_SPRT.png-e8a50b6e1fe5334b80ff094a374b3521.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/extracted/Texture2D/TreeLarge1_Sticker #62431.png b/extracted/Texture2D/TreeLarge1_Sticker #62431.png deleted file mode 100644 index 9956216..0000000 --- a/extracted/Texture2D/TreeLarge1_Sticker #62431.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9866c19197d71b4470b145392530b39bc554f90def09513f770cdb4ae2cf67cf -size 41002 diff --git a/extracted/Texture2D/Tree_Field_01_SPRT #62459.png b/extracted/Texture2D/Tree_Field_01_SPRT #62459.png deleted file mode 100644 index 920eb46..0000000 --- a/extracted/Texture2D/Tree_Field_01_SPRT #62459.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb73072afcfab21d3e36a9e504d215af0a0ab1b4c1f4aff5fca86760f9629c65 -size 44009 diff --git a/extracted/Texture2D/Tree_Field_01_SPRT #62459.png.import b/extracted/Texture2D/Tree_Field_01_SPRT #62459.png.import deleted file mode 100644 index 4674fe1..0000000 --- a/extracted/Texture2D/Tree_Field_01_SPRT #62459.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://c46ncjf0ii7uq" -path="res://.godot/imported/Tree_Field_01_SPRT #62459.png-ebc8fc76929b8668f4ab97911404147d.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://extracted/Texture2D/Tree_Field_01_SPRT #62459.png" -dest_files=["res://.godot/imported/Tree_Field_01_SPRT #62459.png-ebc8fc76929b8668f4ab97911404147d.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=false -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=1 diff --git a/maps/map1.tscn b/maps/map1.tscn index 9be0aa6..cc63a19 100644 --- a/maps/map1.tscn +++ b/maps/map1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=21 format=3 uid="uid://wlqsvbqpcbh"] +[gd_scene load_steps=33 format=3 uid="uid://wlqsvbqpcbh"] [ext_resource type="Texture2D" uid="uid://cacwy4tka88k1" path="res://maps/map1.tres" id="1_pt5vq"] [ext_resource type="Texture2D" uid="uid://cxharyv0ajr37" path="res://textures/atlas/DioramaEntrance_All_01_SPRT.png" id="2_n7y5f"] @@ -7,8 +7,13 @@ [ext_resource type="Texture2D" uid="uid://dx8jpmxtm2cdx" path="res://textures/pattern/Pattern_Forest.png" id="5_i137q"] [ext_resource type="Texture2D" uid="uid://cun14l52f477p" path="res://textures/atlas/Bushes_All_01_SPRT.png" id="5_xmosd"] [ext_resource type="PackedScene" uid="uid://domcpxdf6lqpb" path="res://prefab/free_sticker.tscn" id="6_3fkbm"] +[ext_resource type="Texture2D" uid="uid://dggavne4ueche" path="res://extracted/Texture2D/Tree_Field_01_SPRT.png" id="7_gygvy"] [ext_resource type="Texture2D" uid="uid://chuv25pm2vqen" path="res://textures/atlas/Rocks_All_01_SPRT.png" id="8_itp05"] [ext_resource type="PackedScene" uid="uid://6ww1g2enfdx3" path="res://prefab/solid_sticker.tscn" id="9_nxjul"] +[ext_resource type="Texture2D" uid="uid://b366mcexlko72" path="res://textures/atlas/LogsAndWood_All_01_SPRT.png" id="10_jr64r"] +[ext_resource type="Texture2D" uid="uid://bwcex0o7obtg5" path="res://textures/atlas/Props_All_01_SPRT.png" id="11_0efxk"] +[ext_resource type="Texture2D" uid="uid://ciyh3rnoo4uk" path="res://extracted/Texture2D/SimpleParticles_All_01_SPRT.png" id="12_ro7fd"] +[ext_resource type="Texture2D" uid="uid://dcgjlblm2rpy4" path="res://textures/2d_lights_and_shadows_neutral_point_light.webp" id="13_sm1ou"] [sub_resource type="ShaderMaterial" id="ShaderMaterial_js06g"] @@ -24,13 +29,17 @@ region = Rect2(12, 96, 216, 112) radius = 80.0 height = 254.0 +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_dqo8w"] +radius = 70.0 +height = 512.0 + [sub_resource type="AtlasTexture" id="AtlasTexture_rn40i"] atlas = ExtResource("5_xmosd") region = Rect2(736, 96, 224, 160) [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_b3366"] -radius = 70.08 -height = 150.2 +radius = 65.0 +height = 184.05 [sub_resource type="AtlasTexture" id="AtlasTexture_vun1v"] atlas = ExtResource("8_itp05") @@ -50,6 +59,34 @@ height = 230.8 [sub_resource type="RectangleShape2D" id="RectangleShape2D_hk5e3"] size = Vector2(201.89, 146.45) +[sub_resource type="AtlasTexture" id="AtlasTexture_w86nr"] +atlas = ExtResource("10_jr64r") +region = Rect2(544, 32, 160, 192) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_tss3y"] +size = Vector2(90.375, 25.5) + +[sub_resource type="AtlasTexture" id="AtlasTexture_2qdgk"] +atlas = ExtResource("11_0efxk") +region = Rect2(1824, 480, 192, 160) + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_jw3i8"] +lifetime_randomness = 0.2 +particle_flag_disable_z = true +emission_shape_scale = Vector3(0.5, 1, 1) +emission_shape = 1 +emission_sphere_radius = 60.0 +angle_min = -12.5 +angle_max = 12.5 +gravity = Vector3(0, -20, 0) + +[sub_resource type="AtlasTexture" id="AtlasTexture_c24s7"] +atlas = ExtResource("12_ro7fd") +region = Rect2(0, 0, 128, 160) + +[sub_resource type="CircleShape2D" id="CircleShape2D_5wedp"] +radius = 42.25 + [node name="Map1" type="Node2D"] z_as_relative = false y_sort_enabled = true @@ -69,6 +106,7 @@ offset_bottom = 6527.0 grow_horizontal = 2 grow_vertical = 2 auto_translate = false +metadata/_edit_lock_ = true [node name="TextureRect" type="TextureRect" parent="Container"] modulate = Color(0.49519, 0.69, 0.1587, 1) @@ -90,15 +128,18 @@ scale = Vector2(15, 15) auto_translate = false texture = ExtResource("5_i137q") stretch_mode = 1 +metadata/_edit_lock_ = true [node name="Floors05Sprt" type="Sprite2D" parent="."] -z_index = -1 +z_index = -10 z_as_relative = false scale = Vector2(6, 6) texture = ExtResource("1_pt5vq") region_rect = Rect2(0, 0, 1024, 992) +metadata/_edit_lock_ = true [node name="StaticBody2D" type="StaticBody2D" parent="Floors05Sprt"] +metadata/_edit_lock_ = true [node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Floors05Sprt/StaticBody2D"] polygon = PackedVector2Array(-450, 68.3333, -446.167, 162.667, 194.833, 162.667, 211.833, 162.667, 208.167, -35.3333, 462.667, -31.5, 458.833, -131.5, 191.167, -129.667, 191.167, 66.5) @@ -138,24 +179,61 @@ texture = ExtResource("3_yh2wy") [node name="Bush1" parent="." instance=ExtResource("6_3fkbm")] position = Vector2(-2161, 1140) Shape = SubResource("CapsuleShape2D_lfx7b") +Rotation = 1.6 + +[node name="Tree1" parent="." instance=ExtResource("6_3fkbm")] +position = Vector2(1592, 606) +texture = ExtResource("7_gygvy") +offset = Vector2(-251.145, -512) +Shape = SubResource("CapsuleShape2D_dqo8w") +Position = Vector2(0, -253.27) +Rotation = 0.0 + +[node name="Tree2" parent="." instance=ExtResource("6_3fkbm")] +position = Vector2(-2399, -55) +texture = ExtResource("7_gygvy") +offset = Vector2(-251.145, -512) +Shape = SubResource("CapsuleShape2D_dqo8w") +Position = Vector2(0, -253.27) +Rotation = 0.0 + +[node name="Tree3" parent="." instance=ExtResource("6_3fkbm")] +position = Vector2(-763, -2021) +texture = ExtResource("7_gygvy") +offset = Vector2(-251.145, -512) +Shape = SubResource("CapsuleShape2D_dqo8w") +Position = Vector2(0, -253.27) +Rotation = 0.0 + +[node name="Tree4" parent="." instance=ExtResource("6_3fkbm")] +position = Vector2(2365, -2258) +texture = ExtResource("7_gygvy") +offset = Vector2(-251.145, -512) +Shape = SubResource("CapsuleShape2D_dqo8w") +Position = Vector2(0, -253.27) +Rotation = 0.0 [node name="Bush6" parent="." instance=ExtResource("6_3fkbm")] position = Vector2(-1556, 293) Shape = SubResource("CapsuleShape2D_lfx7b") +Rotation = 1.6 [node name="Bush7" parent="." instance=ExtResource("6_3fkbm")] position = Vector2(712, 293) Shape = SubResource("CapsuleShape2D_lfx7b") +Rotation = 1.6 [node name="Bush9" parent="." instance=ExtResource("6_3fkbm")] position = Vector2(1004, -2257) Shape = SubResource("CapsuleShape2D_lfx7b") +Rotation = 1.6 [node name="Bush8" parent="." instance=ExtResource("6_3fkbm")] position = Vector2(-1616, -1651) offset = Vector2(-137.285, -179.785) flip_h = true Shape = SubResource("CapsuleShape2D_lfx7b") +Rotation = 1.6 [node name="Bush10" parent="." instance=ExtResource("6_3fkbm")] position = Vector2(-2063, -2116) @@ -164,6 +242,7 @@ offset = Vector2(-108.615, -141.38) flip_h = true Shape = SubResource("CapsuleShape2D_b3366") Position = Vector2(0, -48.95) +Rotation = 1.5 [node name="Bush11" parent="." instance=ExtResource("6_3fkbm")] position = Vector2(2208, 2337) @@ -171,6 +250,7 @@ texture = SubResource("AtlasTexture_rn40i") offset = Vector2(-108.615, -141.38) Shape = SubResource("CapsuleShape2D_b3366") Position = Vector2(0, -48.95) +Rotation = 1.5 [node name="Rock1" parent="." instance=ExtResource("9_nxjul")] position = Vector2(-1807, 2030) @@ -180,7 +260,6 @@ StickerShape = SubResource("CapsuleShape2D_b3366") Position = Vector2(8.56, -52.395) CollisionShape = SubResource("RectangleShape2D_4cdlc") CollisionPosition = Vector2(7.915, -31.39) -CollisionRotation = 0.0 [node name="Rock2" parent="." instance=ExtResource("9_nxjul")] position = Vector2(-2248, 1895) @@ -190,4 +269,70 @@ StickerShape = SubResource("CapsuleShape2D_bkpsv") Position = Vector2(0, -89.75) CollisionShape = SubResource("RectangleShape2D_hk5e3") CollisionPosition = Vector2(0, -66.02) -CollisionRotation = 0.0 + +[node name="Log" type="Sprite2D" parent="."] +position = Vector2(-1043, -170) +scale = Vector2(4, 4) +texture = SubResource("AtlasTexture_w86nr") +centered = false +offset = Vector2(-79.665, -133.81) +metadata/_edit_lock_ = true + +[node name="StaticBody2D" type="StaticBody2D" parent="Log"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Log/StaticBody2D"] +position = Vector2(3.75, -17.5) +shape = SubResource("RectangleShape2D_tss3y") +debug_color = Color(0.999472, 0.00663362, 0.0810784, 0.42) + +[node name="Log3" type="Sprite2D" parent="."] +position = Vector2(293, -810) +scale = Vector2(4, 4) +texture = SubResource("AtlasTexture_w86nr") +centered = false +offset = Vector2(-79.665, -133.81) +metadata/_edit_lock_ = true + +[node name="StaticBody2D" type="StaticBody2D" parent="Log3"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Log3/StaticBody2D"] +position = Vector2(3.75, -17.5) +shape = SubResource("RectangleShape2D_tss3y") +debug_color = Color(0.999472, 0.00663362, 0.0810784, 0.42) + +[node name="FirePit" type="Sprite2D" parent="."] +z_index = -1 +position = Vector2(-294, -641) +scale = Vector2(4, 4) +texture = SubResource("AtlasTexture_2qdgk") + +[node name="GPUParticles2D" type="GPUParticles2D" parent="FirePit"] +position = Vector2(-5.25, -17.75) +scale = Vector2(0.5, 0.5) +amount = 4 +process_material = SubResource("ParticleProcessMaterial_jw3i8") +texture = SubResource("AtlasTexture_c24s7") +lifetime = 2.0 +collision_base_size = 0.0 +visibility_rect = Rect2(-160, -160, 320, 320) +local_coords = true + +[node name="Sprite2D" type="Sprite2D" parent="FirePit"] +position = Vector2(4.75, -2) +scale = Vector2(0.7, 0.7) +texture = SubResource("AtlasTexture_c24s7") +centered = false +offset = Vector2(-71.215, -125.04) + +[node name="PointLight2D" type="PointLight2D" parent="FirePit/Sprite2D"] +color = Color(1, 0.54902, 0.270588, 1) +energy = 1.2 +shadow_enabled = true +texture = ExtResource("13_sm1ou") +texture_scale = 1.9 + +[node name="StaticBody2D" type="StaticBody2D" parent="FirePit"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="FirePit/StaticBody2D"] +shape = SubResource("CircleShape2D_5wedp") +debug_color = Color(0.937527, 0.247798, 0.087146, 0.42) diff --git a/prefab/free_sticker.tscn b/prefab/free_sticker.tscn index 48984bb..97d23f9 100644 --- a/prefab/free_sticker.tscn +++ b/prefab/free_sticker.tscn @@ -21,7 +21,7 @@ extends Sprite2D Position = new_position $Area2D/CollisionShape2D.position = Position $Area2D/CollisionShape2D.queue_redraw() -@export var Rotation :Vector2: +@export var Rotation :float: set(new_rotation): Rotation = new_rotation $Area2D/CollisionShape2D.rotation = Rotation @@ -35,6 +35,7 @@ texture = SubResource("AtlasTexture_2wdar") centered = false offset = Vector2(-161.055, -179.785) script = SubResource("GDScript_uqtu8") +Rotation = Vector2(0, 0) metadata/tags = ["sticker"] [node name="Area2D" type="Area2D" parent="."] diff --git a/prefab/solid_sticker.tscn b/prefab/solid_sticker.tscn index e351635..a8c86f2 100644 --- a/prefab/solid_sticker.tscn +++ b/prefab/solid_sticker.tscn @@ -55,8 +55,6 @@ texture = SubResource("AtlasTexture_2wdar") centered = false offset = Vector2(-161.055, -179.785) script = SubResource("GDScript_uqtu8") -CollisionPosition = null -CollisionRotation = null metadata/tags = ["sticker"] [node name="Area2D" type="Area2D" parent="."] @@ -72,7 +70,6 @@ rotation = 1.5708 [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] position = Vector2(2.10341, -10.8836) -scale = Vector2(1, 1) shape = SubResource("RectangleShape2D_ep5ck") debug_color = Color(0.996033, 0, 0.194446, 0.42) diff --git a/textures/2d_FE44.tmp b/textures/2d_FE44.tmp new file mode 100644 index 0000000..e71af9f Binary files /dev/null and b/textures/2d_FE44.tmp differ diff --git a/textures/2d_lights_and_shadows_neutral_point_light.webp b/textures/2d_lights_and_shadows_neutral_point_light.webp new file mode 100644 index 0000000..e71af9f Binary files /dev/null and b/textures/2d_lights_and_shadows_neutral_point_light.webp differ diff --git a/extracted/Texture2D/TreeLarge1_Sticker #62431.png.import b/textures/2d_lights_and_shadows_neutral_point_light.webp.import similarity index 61% rename from extracted/Texture2D/TreeLarge1_Sticker #62431.png.import rename to textures/2d_lights_and_shadows_neutral_point_light.webp.import index ab46e3c..cf1d5a3 100644 --- a/extracted/Texture2D/TreeLarge1_Sticker #62431.png.import +++ b/textures/2d_lights_and_shadows_neutral_point_light.webp.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://c00o46q3iyg6b" -path="res://.godot/imported/TreeLarge1_Sticker #62431.png-301805e3beb3b1cf0e118ec36f3dcef3.ctex" +uid="uid://dcgjlblm2rpy4" +path="res://.godot/imported/2d_lights_and_shadows_neutral_point_light.webp-086f9c4fa9cb6d024434559510c1a988.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://extracted/Texture2D/TreeLarge1_Sticker #62431.png" -dest_files=["res://.godot/imported/TreeLarge1_Sticker #62431.png-301805e3beb3b1cf0e118ec36f3dcef3.ctex"] +source_file="res://textures/2d_lights_and_shadows_neutral_point_light.webp" +dest_files=["res://.godot/imported/2d_lights_and_shadows_neutral_point_light.webp-086f9c4fa9cb6d024434559510c1a988.ctex"] [params]