Skip to content

Commit 302706e

Browse files
committed
Fray's End: Add flowerbed
This replaces the previous manually-placed flowers with an Area2D, filled with flower.tscn scene using AreaFiller.
1 parent 7d13730 commit 302706e

File tree

1 file changed

+76
-27
lines changed

1 file changed

+76
-27
lines changed

scenes/world_map/frays_end.tscn

Lines changed: 76 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
[ext_resource type="Texture2D" uid="uid://c8xgl7dcju5h7" path="res://scenes/game_elements/props/buildings/house/components/House_Patch_Blue_03.png" id="6_ojp30"]
1414
[ext_resource type="Texture2D" uid="uid://cvm2x4fhekowd" path="res://scenes/game_elements/props/buildings/house/components/House_Wool_Blue_03.png" id="6_uhynt"]
1515
[ext_resource type="PackedScene" uid="uid://7873qa54birk" path="res://scenes/game_elements/props/tree/tree.tscn" id="7_7v00g"]
16+
[ext_resource type="Script" uid="uid://eenl0b7aoxuq" path="res://scenes/game_elements/props/decoration/flower/components/flower.gd" id="9_lftgk"]
1617
[ext_resource type="PackedScene" uid="uid://bbsc3wssndtfe" path="res://scenes/game_elements/props/decoration/hiding_mushroom/hiding_mushroom.tscn" id="11_jqkod"]
1718
[ext_resource type="PackedScene" uid="uid://ipvcfv2g0oi1" path="res://scenes/game_elements/characters/npcs/talker/talker.tscn" id="11_mr2ek"]
1819
[ext_resource type="PackedScene" uid="uid://ccp4ayow34e7g" path="res://scenes/game_elements/props/decoration/books/books.tscn" id="12_06x6x"]
@@ -39,9 +40,8 @@
3940
[ext_resource type="Texture2D" uid="uid://bytssd0mbo28u" path="res://assets/third_party/inputs/keyboard-and-mouse/Dark/Arrow_Up_Key_Dark.png" id="29_djq26"]
4041
[ext_resource type="Resource" uid="uid://byhqan5a7vkgg" path="res://scenes/world_map/components/tutorial_npc.dialogue" id="32_djq26"]
4142
[ext_resource type="PackedScene" uid="uid://d0c4l7ev6ca3c" path="res://scenes/game_elements/props/spawn_point/spawn_point.tscn" id="37_thm8h"]
42-
[ext_resource type="Texture2D" uid="uid://b4gjylrs0g2xx" path="res://scenes/game_elements/props/decoration/crochenthemum/ND_Crochenthemum_01.png" id="40_06x6x"]
43-
[ext_resource type="Texture2D" uid="uid://c8q2r1dsn1m7w" path="res://scenes/game_elements/props/decoration/crochenthemum/ND_Crochenthemum_02.png" id="41_xt3dw"]
44-
[ext_resource type="Texture2D" uid="uid://72tsg0sif7sq" path="res://scenes/game_elements/props/decoration/mushroom/ND_Mushroom_Blue_01.png" id="42_lftgk"]
43+
[ext_resource type="Script" uid="uid://bdhjixygupit1" path="res://scenes/game_elements/props/area_filler/area_filler.gd" id="38_cjmkx"]
44+
[ext_resource type="PackedScene" uid="uid://c0104ickpm3ru" path="res://scenes/game_elements/props/decoration/flower/flower.tscn" id="45_cjmkx"]
4545

4646
[sub_resource type="RectangleShape2D" id="RectangleShape2D_h30yx"]
4747
size = Vector2(2070, 585)
@@ -134,37 +134,86 @@ editor_draw_limits = true
134134
[node name="Props" type="Node2D" parent="."]
135135
y_sort_enabled = true
136136

137-
[node name="NdCrochenthemum01" type="Sprite2D" parent="Props"]
138-
position = Vector2(1455, 1819)
139-
texture = ExtResource("40_06x6x")
137+
[node name="Flowerbed" type="Area2D" parent="Props"]
138+
y_sort_enabled = true
139+
position = Vector2(1358.05, 1693.82)
140+
141+
[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="Props/Flowerbed"]
142+
polygon = PackedVector2Array(80.9502, -52.8169, 81.9502, 73.1831, 145.95, 74.1831, 146.95, 134.183, 476.95, 136.183, 480.95, 204.183, -87.05, 210.18, -91.05, -178.82, 10.95, -176.82, 11.649, -54.5072)
143+
disabled = true
144+
145+
[node name="AreaFiller" type="Node" parent="Props/Flowerbed"]
146+
script = ExtResource("38_cjmkx")
147+
scenes = Array[PackedScene]([ExtResource("45_cjmkx")])
148+
metadata/_custom_type_script = "uid://bdhjixygupit1"
149+
150+
[node name="Flower" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
151+
position = Vector2(145.987, 76.4082)
152+
script = ExtResource("9_lftgk")
153+
154+
[node name="Flower2" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
155+
position = Vector2(162.489, 161.379)
156+
script = ExtResource("9_lftgk")
157+
158+
[node name="Flower3" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
159+
position = Vector2(57.5313, 127.062)
160+
script = ExtResource("9_lftgk")
161+
162+
[node name="Flower4" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
163+
position = Vector2(82.1759, 198.141)
164+
script = ExtResource("9_lftgk")
165+
166+
[node name="Flower5" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
167+
position = Vector2(80.8003, -8.4669)
168+
script = ExtResource("9_lftgk")
169+
170+
[node name="Flower6" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
171+
position = Vector2(74.8754, 58.9827)
172+
script = ExtResource("9_lftgk")
173+
174+
[node name="Flower7" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
175+
position = Vector2(-4.8579, -36.5672)
176+
script = ExtResource("9_lftgk")
177+
178+
[node name="Flower8" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
179+
position = Vector2(-32.8836, 174.97)
180+
script = ExtResource("9_lftgk")
181+
182+
[node name="Flower9" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
183+
position = Vector2(-15.228, 43.4394)
184+
script = ExtResource("9_lftgk")
185+
186+
[node name="Flower10" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
187+
position = Vector2(2.49678, -154.987)
188+
script = ExtResource("9_lftgk")
140189

141-
[node name="NdCrochenthemum02" type="Sprite2D" parent="Props"]
142-
position = Vector2(1500, 1776)
143-
texture = ExtResource("41_xt3dw")
190+
[node name="Flower11" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
191+
position = Vector2(-88.8473, -124.21)
192+
script = ExtResource("9_lftgk")
144193

145-
[node name="NdCrochenthemum03" type="Sprite2D" parent="Props"]
146-
position = Vector2(1499, 1831)
147-
texture = ExtResource("40_06x6x")
194+
[node name="Flower12" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
195+
position = Vector2(-69.4298, -27.7301)
196+
script = ExtResource("9_lftgk")
148197

149-
[node name="NdCrochenthemum04" type="Sprite2D" parent="Props"]
150-
position = Vector2(1497, 1828)
151-
texture = ExtResource("40_06x6x")
198+
[node name="Flower13" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
199+
position = Vector2(-58.1484, 99.4569)
200+
script = ExtResource("9_lftgk")
152201

153-
[node name="NdMushroomBlue01" type="Sprite2D" parent="Props"]
154-
position = Vector2(1556, 1824)
155-
texture = ExtResource("42_lftgk")
202+
[node name="Flower14" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
203+
position = Vector2(242.783, 153.786)
204+
script = ExtResource("9_lftgk")
156205

157-
[node name="NdMushroomBlue02" type="Sprite2D" parent="Props"]
158-
position = Vector2(1431, 1826)
159-
texture = ExtResource("42_lftgk")
206+
[node name="Flower15" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
207+
position = Vector2(360.015, 195.757)
208+
script = ExtResource("9_lftgk")
160209

161-
[node name="NdMushroomBlue03" type="Sprite2D" parent="Props"]
162-
position = Vector2(1527, 1813)
163-
texture = ExtResource("42_lftgk")
210+
[node name="Flower16" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
211+
position = Vector2(290.57, 206.026)
212+
script = ExtResource("9_lftgk")
164213

165-
[node name="NdCrochenthemum06" type="Sprite2D" parent="Props"]
166-
position = Vector2(1453, 1744)
167-
texture = ExtResource("40_06x6x")
214+
[node name="Flower17" type="Node2D" parent="Props/Flowerbed" instance=ExtResource("45_cjmkx")]
215+
position = Vector2(465.862, 159.547)
216+
script = ExtResource("9_lftgk")
168217

169218
[node name="HidingMushroom" parent="Props" instance=ExtResource("11_jqkod")]
170219
position = Vector2(906, 1516)

0 commit comments

Comments
 (0)