Skip to content

Commit fe7e6f5

Browse files
wjtwjt
committed
Use new delete other node block
1 parent 2036a28 commit fe7e6f5

File tree

3 files changed

+40
-114
lines changed

3 files changed

+40
-114
lines changed

‎game-06/coin.tscn‎

Lines changed: 17 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=37 format=3 uid="uid://fvdldxg5au17"]
1+
[gd_scene load_steps=33 format=3 uid="uid://fvdldxg5au17"]
22

33
[ext_resource type="Texture2D" uid="uid://blq8smrhpgtpj" path="res://game-06/graphics/graphics.png" id="1_og0d8"]
44
[ext_resource type="Texture2D" uid="uid://djqy6w0vissy2" path="res://game-06/graphics/glow.png" id="2_p4myk"]
@@ -240,56 +240,56 @@ _data = {
240240
"taken": SubResource("Animation_w16q0")
241241
}
242242

243-
[sub_resource type="Resource" id="Resource_sspb5"]
243+
[sub_resource type="Resource" id="Resource_gfvmc"]
244244
script = ExtResource("5_yr5t4")
245245
name = &"animationplayer_play"
246246
children = Array[ExtResource("5_yr5t4")]([])
247247
arguments = {
248248
"animation": "taken",
249-
"direction": "forward"
249+
"direction": "forward",
250+
"wait_mode": "until done"
250251
}
251252

252-
[sub_resource type="Resource" id="Resource_c3tte"]
253+
[sub_resource type="Resource" id="Resource_va7lt"]
253254
script = ExtResource("5_yr5t4")
254255
name = &"print"
255256
children = Array[ExtResource("5_yr5t4")]([])
256257
arguments = {
257258
"text": "ANIMATION END"
258259
}
259260

260-
[sub_resource type="Resource" id="Resource_voi3q"]
261+
[sub_resource type="Resource" id="Resource_kfpvr"]
261262
script = ExtResource("6_mye12")
262263
name = &"get_node"
263264
arguments = {
264265
"path": NodePath("..")
265266
}
266267

267-
[sub_resource type="Resource" id="Resource_8jl1g"]
268+
[sub_resource type="Resource" id="Resource_jvy7v"]
268269
script = ExtResource("5_yr5t4")
269-
name = &"call_method_node"
270+
name = &"queue_free_node"
270271
children = Array[ExtResource("5_yr5t4")]([])
271272
arguments = {
272-
"method_name": "delete",
273-
"node": SubResource("Resource_voi3q")
273+
"node": SubResource("Resource_kfpvr")
274274
}
275275

276-
[sub_resource type="Resource" id="Resource_heq82"]
276+
[sub_resource type="Resource" id="Resource_15crc"]
277277
script = ExtResource("5_yr5t4")
278278
name = &"define_method"
279-
children = Array[ExtResource("5_yr5t4")]([SubResource("Resource_sspb5"), SubResource("Resource_c3tte"), SubResource("Resource_8jl1g")])
279+
children = Array[ExtResource("5_yr5t4")]([SubResource("Resource_gfvmc"), SubResource("Resource_va7lt"), SubResource("Resource_jvy7v")])
280280
arguments = {
281281
"method_name": &"play_taken"
282282
}
283283

284-
[sub_resource type="Resource" id="Resource_2ytwr"]
284+
[sub_resource type="Resource" id="Resource_kfiq8"]
285285
script = ExtResource("4_xb1ij")
286-
root = SubResource("Resource_heq82")
286+
root = SubResource("Resource_15crc")
287287
canvas_position = Vector2(125, 125)
288288

289289
[sub_resource type="Resource" id="Resource_18qip"]
290290
script = ExtResource("7_qi5iu")
291291
script_inherits = "AnimationPlayer"
292-
block_serialization_trees = Array[ExtResource("4_xb1ij")]([SubResource("Resource_2ytwr")])
292+
block_serialization_trees = Array[ExtResource("4_xb1ij")]([SubResource("Resource_kfiq8")])
293293
variables = Array[ExtResource("8_vi8nk")]([])
294294
generated_script = "extends AnimationPlayer
295295
@@ -299,43 +299,11 @@ func play_taken():
299299
play('taken')
300300
else:
301301
play_backwards('taken')
302-
await animation_finished
302+
if 'until done' == \"until done\":
303+
await animation_finished
303304
304305
print('ANIMATION END')
305-
(get_node(\"..\")).call('delete')
306-
307-
"
308-
version = 0
309-
310-
[sub_resource type="Resource" id="Resource_y50rn"]
311-
script = ExtResource("5_yr5t4")
312-
name = &"queue_free"
313-
children = Array[ExtResource("5_yr5t4")]([])
314-
arguments = {}
315-
316-
[sub_resource type="Resource" id="Resource_i8l1h"]
317-
script = ExtResource("5_yr5t4")
318-
name = &"define_method"
319-
children = Array[ExtResource("5_yr5t4")]([SubResource("Resource_y50rn")])
320-
arguments = {
321-
"method_name": &"delete"
322-
}
323-
324-
[sub_resource type="Resource" id="Resource_apy7v"]
325-
script = ExtResource("4_xb1ij")
326-
root = SubResource("Resource_i8l1h")
327-
canvas_position = Vector2(300, 50)
328-
329-
[sub_resource type="Resource" id="Resource_fqhct"]
330-
script = ExtResource("7_qi5iu")
331-
script_inherits = "RigidBody2D"
332-
block_serialization_trees = Array[ExtResource("4_xb1ij")]([SubResource("Resource_apy7v")])
333-
variables = Array[ExtResource("8_vi8nk")]([])
334-
generated_script = "extends RigidBody2D
335-
336-
337-
func delete():
338-
queue_free()
306+
(get_node(\"..\")).queue_free()
339307
340308
"
341309
version = 0
@@ -383,7 +351,3 @@ libraries = {
383351
[node name="BlockCode" type="Node" parent="AnimationPlayer"]
384352
script = ExtResource("3_fm8j6")
385353
block_script = SubResource("Resource_18qip")
386-
387-
[node name="BlockCode" type="Node" parent="."]
388-
script = ExtResource("3_fm8j6")
389-
block_script = SubResource("Resource_fqhct")

‎game-06/main.tscn‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,77 +32,76 @@ distance = -60.0
3232
[sub_resource type="RectangleShape2D" id="RectangleShape2D_a01j5"]
3333
size = Vector2(63, 572)
3434

35-
[sub_resource type="Resource" id="Resource_a4r1w"]
35+
[sub_resource type="Resource" id="Resource_mk0vj"]
3636
script = ExtResource("8_4ctxh")
3737
name = &"area2d_on_entered:something"
3838
arguments = {}
3939

40-
[sub_resource type="Resource" id="Resource_rv5og"]
40+
[sub_resource type="Resource" id="Resource_fmqtw"]
4141
script = ExtResource("8_4ctxh")
4242
name = &"is_node_in_group"
4343
arguments = {
4444
"group": "obstacles",
45-
"node": SubResource("Resource_a4r1w")
45+
"node": SubResource("Resource_mk0vj")
4646
}
4747

48-
[sub_resource type="Resource" id="Resource_hjfth"]
48+
[sub_resource type="Resource" id="Resource_g2hwt"]
4949
script = ExtResource("8_4ctxh")
5050
name = &"area2d_on_entered:something"
5151
arguments = {}
5252

53-
[sub_resource type="Resource" id="Resource_6jau1"]
53+
[sub_resource type="Resource" id="Resource_42fs8"]
5454
script = ExtResource("8_4ctxh")
5555
name = &"is_node_in_group"
5656
arguments = {
5757
"group": "coins",
58-
"node": SubResource("Resource_hjfth")
58+
"node": SubResource("Resource_g2hwt")
5959
}
6060

61-
[sub_resource type="Resource" id="Resource_xg1wv"]
61+
[sub_resource type="Resource" id="Resource_udbj4"]
6262
script = ExtResource("8_4ctxh")
6363
name = &"or"
6464
arguments = {
65-
"bool1": SubResource("Resource_rv5og"),
66-
"bool2": SubResource("Resource_6jau1")
65+
"bool1": SubResource("Resource_fmqtw"),
66+
"bool2": SubResource("Resource_42fs8")
6767
}
6868

69-
[sub_resource type="Resource" id="Resource_x5mj5"]
69+
[sub_resource type="Resource" id="Resource_eh3b3"]
7070
script = ExtResource("8_4ctxh")
7171
name = &"area2d_on_entered:something"
7272
arguments = {}
7373

74-
[sub_resource type="Resource" id="Resource_3ml1n"]
74+
[sub_resource type="Resource" id="Resource_wyh2h"]
7575
script = ExtResource("8_an3ek")
76-
name = &"call_method_node"
76+
name = &"queue_free_node"
7777
children = Array[ExtResource("8_an3ek")]([])
7878
arguments = {
79-
"method_name": "delete",
80-
"node": SubResource("Resource_x5mj5")
79+
"node": SubResource("Resource_eh3b3")
8180
}
8281

83-
[sub_resource type="Resource" id="Resource_6je0i"]
82+
[sub_resource type="Resource" id="Resource_ylq2w"]
8483
script = ExtResource("8_an3ek")
8584
name = &"if"
86-
children = Array[ExtResource("8_an3ek")]([SubResource("Resource_3ml1n")])
85+
children = Array[ExtResource("8_an3ek")]([SubResource("Resource_wyh2h")])
8786
arguments = {
88-
"condition": SubResource("Resource_xg1wv")
87+
"condition": SubResource("Resource_udbj4")
8988
}
9089

91-
[sub_resource type="Resource" id="Resource_a57hc"]
90+
[sub_resource type="Resource" id="Resource_8c3wf"]
9291
script = ExtResource("8_an3ek")
9392
name = &"area2d_on_entered"
94-
children = Array[ExtResource("8_an3ek")]([SubResource("Resource_6je0i")])
93+
children = Array[ExtResource("8_an3ek")]([SubResource("Resource_ylq2w")])
9594
arguments = {}
9695

97-
[sub_resource type="Resource" id="Resource_7bfvp"]
96+
[sub_resource type="Resource" id="Resource_fnhl3"]
9897
script = ExtResource("7_8cvv3")
99-
root = SubResource("Resource_a57hc")
98+
root = SubResource("Resource_8c3wf")
10099
canvas_position = Vector2(25, 50)
101100

102101
[sub_resource type="Resource" id="Resource_acnid"]
103102
script = ExtResource("9_a8xal")
104103
script_inherits = "Area2D"
105-
block_serialization_trees = Array[ExtResource("7_8cvv3")]([SubResource("Resource_7bfvp")])
104+
block_serialization_trees = Array[ExtResource("7_8cvv3")]([SubResource("Resource_fnhl3")])
106105
variables = Array[ExtResource("10_pjdut")]([])
107106
generated_script = "extends Area2D
108107
@@ -113,7 +112,7 @@ func _init():
113112
func _on_body_entered(something: Node2D):
114113
115114
if (((something).is_in_group('obstacles')) or ((something).is_in_group('coins'))):
116-
(something).call('delete')
115+
(something).queue_free()
117116
118117
"
119118
version = 0

‎game-06/obstacle.tscn‎

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=22 format=3 uid="uid://c6umuob7nsko3"]
1+
[gd_scene load_steps=18 format=3 uid="uid://c6umuob7nsko3"]
22

33
[ext_resource type="Texture2D" uid="uid://blq8smrhpgtpj" path="res://game-06/graphics/graphics.png" id="1_312dy"]
44
[ext_resource type="Texture2D" uid="uid://sfab1iwfjhyc" path="res://game-06/graphics/obstacle.png" id="1_imuk3"]
@@ -12,39 +12,6 @@
1212
[sub_resource type="RectangleShape2D" id="RectangleShape2D_be137"]
1313
size = Vector2(80, 419)
1414

15-
[sub_resource type="Resource" id="Resource_1dqus"]
16-
script = ExtResource("5_7t0qk")
17-
name = &"queue_free"
18-
children = Array[ExtResource("5_7t0qk")]([])
19-
arguments = {}
20-
21-
[sub_resource type="Resource" id="Resource_jryw2"]
22-
script = ExtResource("5_7t0qk")
23-
name = &"define_method"
24-
children = Array[ExtResource("5_7t0qk")]([SubResource("Resource_1dqus")])
25-
arguments = {
26-
"method_name": &"delete"
27-
}
28-
29-
[sub_resource type="Resource" id="Resource_o47tg"]
30-
script = ExtResource("4_1i25q")
31-
root = SubResource("Resource_jryw2")
32-
canvas_position = Vector2(325, 50)
33-
34-
[sub_resource type="Resource" id="Resource_usbhe"]
35-
script = ExtResource("6_fmqgp")
36-
script_inherits = "RigidBody2D"
37-
block_serialization_trees = Array[ExtResource("4_1i25q")]([SubResource("Resource_o47tg")])
38-
variables = Array[ExtResource("7_k8x14")]([])
39-
generated_script = "extends RigidBody2D
40-
41-
42-
func delete():
43-
queue_free()
44-
45-
"
46-
version = 0
47-
4815
[sub_resource type="Resource" id="Resource_rx164"]
4916
script = ExtResource("6_pdd8d")
5017
name = &"area2d_on_entered:something"
@@ -146,10 +113,6 @@ shape = SubResource("RectangleShape2D_be137")
146113
position = Vector2(0, 245)
147114
shape = SubResource("RectangleShape2D_be137")
148115

149-
[node name="BlockCode" type="Node" parent="."]
150-
script = ExtResource("3_ypf55")
151-
block_script = SubResource("Resource_usbhe")
152-
153116
[node name="Area2D" type="Area2D" parent="."]
154117
collision_layer = 0
155118

0 commit comments

Comments
 (0)