From 0f32cbf7103259c2c48c9c1450afd81274d15903 Mon Sep 17 00:00:00 2001 From: LUCASTUCIOUS Date: Thu, 5 Sep 2024 11:46:50 +0200 Subject: [PATCH] Convert trees --- maps/map1.tscn | 98 ++++------------------------------------ prefab/prefab_tree1.tscn | 45 ++++++++++++++++++ 2 files changed, 55 insertions(+), 88 deletions(-) create mode 100644 prefab/prefab_tree1.tscn diff --git a/maps/map1.tscn b/maps/map1.tscn index 0510d4b..66c0f6e 100644 --- a/maps/map1.tscn +++ b/maps/map1.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=30 format=3 uid="uid://wlqsvbqpcbh"] +[gd_scene load_steps=29 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://bm2nsrfle5nsd" path="res://textures/sprites/floor_door_grass_right1.tres" id="2_0jvyl"] [ext_resource type="Script" path="res://core/Door.gd" id="3_384sx"] [ext_resource type="Texture2D" uid="uid://bfnbnuclg8ab0" path="res://textures/sprites/props_wood_bridge1.tres" id="3_k46hy"] -[ext_resource type="Texture2D" uid="uid://dggavne4ueche" path="res://textures/sprites/Tree_Field_01_SPRT.png" id="4_74dki"] [ext_resource type="Texture2D" uid="uid://b2nhenx3l2uww" path="res://textures/sprites/floor_door_grass_up1.tres" id="4_f0vha"] [ext_resource type="PackedScene" uid="uid://do65rgg0p2plt" path="res://core/Door.tscn" id="4_lwk0u"] [ext_resource type="PackedScene" uid="uid://bddcriwo55x8k" path="res://prefab/prefab_woddenbridge.tscn" id="4_okpsn"] @@ -16,6 +15,7 @@ [ext_resource type="Texture2D" uid="uid://c6acjgu8jnrkl" path="res://textures/sprites/rocks_rock1.tres" id="8_bhcew"] [ext_resource type="PackedScene" uid="uid://kvjctagkwivk" path="res://prefab/prefab_bush1.tscn" id="8_tag7x"] [ext_resource type="Texture2D" uid="uid://dnomlcslicb3k" path="res://textures/sprites/props_fire1.tres" id="10_2ugv3"] +[ext_resource type="PackedScene" uid="uid://bc1quyxrmv706" path="res://prefab/prefab_tree1.tscn" id="11_8c4hp"] [ext_resource type="PackedScene" uid="uid://cdurdoebbnau7" path="res://prefab/prefab_bush2.tscn" id="11_u6j5q"] [ext_resource type="Texture2D" uid="uid://51ntd0qmjw5j" path="res://textures/sprites/props_woodbarrer.tres" id="14_n4lnm"] [ext_resource type="Texture2D" uid="uid://xx3dwpwk467v" path="res://textures/sprites/stickers_fire1.png" id="19_d8hr8"] @@ -23,11 +23,6 @@ [sub_resource type="RectangleShape2D" id="RectangleShape2D_yeof8"] size = Vector2(202.667, 60.3336) -[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_dqo8w"] -resource_name = "TreeShape" -radius = 70.0 -height = 512.0 - [sub_resource type="RectangleShape2D" id="RectangleShape2D_4cdlc"] size = Vector2(133.06, 62.73) @@ -134,86 +129,17 @@ scale = Vector2(6.15, 6.15) [node name="Bush1" parent="." instance=ExtResource("8_tag7x")] position = Vector2(-2192, 1176) -[node name="Tree2" type="Sprite2D" parent="."] -position = Vector2(-2399, -55) -scale = Vector2(3.80334, 3.95089) -texture = ExtResource("4_74dki") -centered = false -offset = Vector2(-251.145, -512) -metadata/tags = ["sticker"] +[node name="Tree5" parent="." instance=ExtResource("11_8c4hp")] +position = Vector2(1560, 504) -[node name="Sticker" type="Area2D" parent="Tree2" node_paths=PackedStringArray("WorldSprite")] -collision_layer = 2 -collision_mask = 61 -script = ExtResource("5_ek34p") -WorldSprite = NodePath("..") -metadata/tags = PackedStringArray("sticker") +[node name="Tree9" parent="." instance=ExtResource("11_8c4hp")] +position = Vector2(-2402, -62) -[node name="CollisionShape2D" type="CollisionShape2D" parent="Tree2/Sticker"] -position = Vector2(0, -253.27) -rotation = 0.01 -shape = SubResource("CapsuleShape2D_dqo8w") +[node name="Tree8" parent="." instance=ExtResource("11_8c4hp")] +position = Vector2(2377, -2253) -[node name="Tree5" type="Sprite2D" parent="."] -position = Vector2(1592, 606) -scale = Vector2(3.80334, 3.95089) -texture = ExtResource("4_74dki") -centered = false -offset = Vector2(-251.145, -512) -metadata/tags = ["sticker"] - -[node name="Sticker" type="Area2D" parent="Tree5" node_paths=PackedStringArray("WorldSprite")] -collision_layer = 2 -collision_mask = 61 -script = ExtResource("5_ek34p") -WorldSprite = NodePath("..") -metadata/tags = PackedStringArray("sticker") - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Tree5/Sticker"] -position = Vector2(0, -253.27) -rotation = 0.01 -shape = SubResource("CapsuleShape2D_dqo8w") - -[node name="Tree6" type="Sprite2D" parent="."] -position = Vector2(-774, -2011) -scale = Vector2(3.80334, 3.95089) -texture = ExtResource("4_74dki") -centered = false -offset = Vector2(-251.145, -512) -metadata/tags = ["sticker"] - -[node name="Sticker" type="Area2D" parent="Tree6" node_paths=PackedStringArray("WorldSprite")] -collision_layer = 2 -collision_mask = 61 -script = ExtResource("5_ek34p") -WorldSprite = NodePath("..") -metadata/tags = PackedStringArray("sticker") - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Tree6/Sticker"] -position = Vector2(0, -253.27) -rotation = 0.01 -shape = SubResource("CapsuleShape2D_dqo8w") -metadata/_edit_lock_ = true - -[node name="Tree4" type="Sprite2D" parent="."] -position = Vector2(2365, -2258) -scale = Vector2(3.80334, 3.95089) -texture = ExtResource("4_74dki") -centered = false -offset = Vector2(-251.145, -512) -metadata/tags = ["sticker"] - -[node name="Sticker" type="Area2D" parent="Tree4" node_paths=PackedStringArray("WorldSprite")] -collision_layer = 2 -collision_mask = 61 -script = ExtResource("5_ek34p") -WorldSprite = NodePath("..") -metadata/tags = PackedStringArray("sticker") - -[node name="CollisionShape2D" type="CollisionShape2D" parent="Tree4/Sticker"] -position = Vector2(0, -253.27) -rotation = 0.01 -shape = SubResource("CapsuleShape2D_dqo8w") +[node name="Tree7" parent="." instance=ExtResource("11_8c4hp")] +position = Vector2(-766, -2019) [node name="Bush20" parent="." instance=ExtResource("11_u6j5q")] position = Vector2(-2169, -2169) @@ -391,9 +317,5 @@ position = Vector2(2207, 2320) position = Vector2(1000, -2228) flip_h = true -[connection signal="property_list_changed" from="Tree2" to="Tree2" method="_on_property_list_changed"] -[connection signal="property_list_changed" from="Tree5" to="Tree5" method="_on_property_list_changed"] -[connection signal="property_list_changed" from="Tree6" to="Tree6" method="_on_property_list_changed"] -[connection signal="property_list_changed" from="Tree4" to="Tree4" method="_on_property_list_changed"] [connection signal="property_list_changed" from="Rock1" to="Rock1" method="_on_property_list_changed"] [connection signal="property_list_changed" from="Rock2" to="Rock2" method="_on_property_list_changed"] diff --git a/prefab/prefab_tree1.tscn b/prefab/prefab_tree1.tscn new file mode 100644 index 0000000..814700f --- /dev/null +++ b/prefab/prefab_tree1.tscn @@ -0,0 +1,45 @@ +[gd_scene load_steps=5 format=3 uid="uid://bc1quyxrmv706"] + +[ext_resource type="Texture2D" uid="uid://dggavne4ueche" path="res://textures/sprites/Tree_Field_01_SPRT.png" id="1_ks2yc"] +[ext_resource type="Script" path="res://core/stickernode.gd" id="2_7fa8u"] + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_dqo8w"] +resource_name = "TreeShape" +radius = 70.0 +height = 512.0 + +[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_o5egb"] +radius = 21.8229 +height = 69.3515 + +[node name="Tree1" type="Sprite2D"] +scale = Vector2(3.80334, 3.95089) +texture = ExtResource("1_ks2yc") +centered = false +offset = Vector2(-251.145, -512) +metadata/tags = ["sticker"] + +[node name="Sticker" type="Area2D" parent="." node_paths=PackedStringArray("WorldSprite", "DetectionArea")] +collision_layer = 2 +collision_mask = 61 +script = ExtResource("2_7fa8u") +WorldSprite = NodePath("..") +DetectionArea = NodePath("DetectionZone") +metadata/tags = PackedStringArray("sticker") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Sticker"] +position = Vector2(0, -253.27) +rotation = 0.01 +shape = SubResource("CapsuleShape2D_dqo8w") + +[node name="DetectionZone" type="Area2D" parent="Sticker"] +scale = Vector2(1, 1) +collision_layer = 4 +collision_mask = 61 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Sticker/DetectionZone"] +position = Vector2(0, -32.3978) +shape = SubResource("CapsuleShape2D_o5egb") +debug_color = Color(0, 0.637, 0.392, 0.42) + +[connection signal="property_list_changed" from="." to="." method="_on_property_list_changed"]