Skip to content

Commit 2c3111a

Browse files
committed
Move firing lasers to laser_gun.tscn
1 parent fe7e6f5 commit 2c3111a

File tree

2 files changed

+96
-97
lines changed

2 files changed

+96
-97
lines changed

game-06/laser_gun.tscn

Lines changed: 49 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=16 format=3 uid="uid://cmyx2g1new5rm"]
1+
[gd_scene load_steps=19 format=3 uid="uid://cmyx2g1new5rm"]
22

33
[ext_resource type="Script" path="res://addons/block_code/simple_spawner/simple_spawner.gd" id="1_63puc"]
44
[ext_resource type="PackedScene" uid="uid://bhf37etwtrfbe" path="res://game-06/laser_particle.tscn" id="2_aqswo"]
@@ -10,64 +10,90 @@
1010
[ext_resource type="Script" path="res://addons/block_code/code_generation/variable_definition.gd" id="7_nihrv"]
1111
[ext_resource type="AudioStream" uid="uid://bm178yv4wvqdn" path="res://game-06/Sounds/Pew.ogg" id="8_qms1c"]
1212

13-
[sub_resource type="Resource" id="Resource_cx5ym"]
13+
[sub_resource type="Resource" id="Resource_lhvrs"]
14+
script = ExtResource("6_g1jce")
15+
name = &"is_input_actioned"
16+
arguments = {
17+
"action": "just_pressed",
18+
"action_name": &"player_1_a"
19+
}
20+
21+
[sub_resource type="Resource" id="Resource_sk11w"]
1422
script = ExtResource("6_g1jce")
1523
name = &"get_node"
1624
arguments = {
1725
"path": NodePath("PewSound")
1826
}
1927

20-
[sub_resource type="Resource" id="Resource_nrjwr"]
28+
[sub_resource type="Resource" id="Resource_o6gwk"]
2129
script = ExtResource("5_4y7w8")
2230
name = &"call_method_node"
2331
children = Array[ExtResource("5_4y7w8")]([])
2432
arguments = {
2533
"method_name": "play",
26-
"node": SubResource("Resource_cx5ym")
34+
"node": SubResource("Resource_sk11w")
35+
}
36+
37+
[sub_resource type="Resource" id="Resource_rdric"]
38+
script = ExtResource("6_g1jce")
39+
name = &"get_node"
40+
arguments = {
41+
"path": NodePath("SimpleSpawner")
2742
}
2843

29-
[sub_resource type="Resource" id="Resource_33p8t"]
44+
[sub_resource type="Resource" id="Resource_wbw5k"]
3045
script = ExtResource("5_4y7w8")
31-
name = &"simplespawner_spawn_once"
46+
name = &"call_method_node"
3247
children = Array[ExtResource("5_4y7w8")]([])
33-
arguments = {}
48+
arguments = {
49+
"method_name": "spawn_once",
50+
"node": SubResource("Resource_rdric")
51+
}
3452

35-
[sub_resource type="Resource" id="Resource_p4ncl"]
53+
[sub_resource type="Resource" id="Resource_hswhu"]
3654
script = ExtResource("5_4y7w8")
37-
name = &"define_method"
38-
children = Array[ExtResource("5_4y7w8")]([SubResource("Resource_nrjwr"), SubResource("Resource_33p8t")])
55+
name = &"if"
56+
children = Array[ExtResource("5_4y7w8")]([SubResource("Resource_o6gwk"), SubResource("Resource_wbw5k")])
3957
arguments = {
40-
"method_name": &"fire"
58+
"condition": SubResource("Resource_lhvrs")
4159
}
4260

43-
[sub_resource type="Resource" id="Resource_0e08p"]
61+
[sub_resource type="Resource" id="Resource_3bykt"]
62+
script = ExtResource("5_4y7w8")
63+
name = &"process"
64+
children = Array[ExtResource("5_4y7w8")]([SubResource("Resource_hswhu")])
65+
arguments = {}
66+
67+
[sub_resource type="Resource" id="Resource_qmj0y"]
4468
script = ExtResource("4_n1j5b")
45-
root = SubResource("Resource_p4ncl")
46-
canvas_position = Vector2(75, 50)
69+
root = SubResource("Resource_3bykt")
70+
canvas_position = Vector2(50, 75)
4771

48-
[sub_resource type="Resource" id="Resource_pgr2a"]
72+
[sub_resource type="Resource" id="Resource_1g3pu"]
4973
script = ExtResource("6_jldvy")
50-
script_inherits = "SimpleSpawner"
51-
block_serialization_trees = Array[ExtResource("4_n1j5b")]([SubResource("Resource_0e08p")])
74+
script_inherits = "Node2D"
75+
block_serialization_trees = Array[ExtResource("4_n1j5b")]([SubResource("Resource_qmj0y")])
5276
variables = Array[ExtResource("7_nihrv")]([])
53-
generated_script = "extends SimpleSpawner
77+
generated_script = "extends Node2D
5478
5579
56-
func fire():
57-
(get_node(\"PewSound\")).call('play')
58-
spawn_once()
80+
func _process(delta):
81+
if (Input.is_action_just_pressed('player_1_a')):
82+
(get_node(\"PewSound\")).call('play')
83+
(get_node(\"SimpleSpawner\")).call('spawn_once')
5984
6085
"
6186
version = 0
6287

6388
[node name="LaserGun" type="Node2D" groups=["lasers"]]
89+
90+
[node name="SimpleSpawner" type="Node2D" parent="."]
6491
script = ExtResource("1_63puc")
6592
scenes = Array[PackedScene]([ExtResource("2_aqswo")])
66-
spawn_limit = 10
6793

6894
[node name="BlockCode" type="Node" parent="."]
6995
script = ExtResource("3_ewtfj")
70-
block_script = SubResource("Resource_pgr2a")
96+
block_script = SubResource("Resource_1g3pu")
7197

7298
[node name="PewSound" type="AudioStreamPlayer2D" parent="."]
7399
stream = ExtResource("8_qms1c")

game-06/ship.tscn

Lines changed: 47 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[gd_scene load_steps=39 format=3 uid="uid://dps3xjhs2ssns"]
1+
[gd_scene load_steps=36 format=3 uid="uid://dps3xjhs2ssns"]
22

33
[ext_resource type="Script" path="res://addons/block_code/simple_nodes/simple_character/simple_character.gd" id="1_rrros"]
44
[ext_resource type="Texture2D" uid="uid://dqobtlpqjmouw" path="res://game-06/graphics/engine.svg" id="2_qdvvn"]
@@ -71,22 +71,6 @@ tracks/3/keys = {
7171
"values": [Color(1, 1, 1, 1)]
7272
}
7373

74-
[sub_resource type="Animation" id="Animation_4jhbx"]
75-
resource_name = "wobble"
76-
loop_mode = 2
77-
tracks/0/type = "value"
78-
tracks/0/imported = false
79-
tracks/0/enabled = true
80-
tracks/0/path = NodePath(".:rotation")
81-
tracks/0/interp = 1
82-
tracks/0/loop_wrap = true
83-
tracks/0/keys = {
84-
"times": PackedFloat32Array(0, 1),
85-
"transitions": PackedFloat32Array(1, 1),
86-
"update": 0,
87-
"values": [-0.0523599, 0.0523599]
88-
}
89-
9074
[sub_resource type="Animation" id="Animation_byuum"]
9175
resource_name = "crash"
9276
length = 5.0
@@ -142,14 +126,30 @@ tracks/3/keys = {
142126
"values": [Color(1, 1, 1, 1), Color(1, 1, 1, 0)]
143127
}
144128

129+
[sub_resource type="Animation" id="Animation_4jhbx"]
130+
resource_name = "wobble"
131+
loop_mode = 2
132+
tracks/0/type = "value"
133+
tracks/0/imported = false
134+
tracks/0/enabled = true
135+
tracks/0/path = NodePath(".:rotation")
136+
tracks/0/interp = 1
137+
tracks/0/loop_wrap = true
138+
tracks/0/keys = {
139+
"times": PackedFloat32Array(0, 1),
140+
"transitions": PackedFloat32Array(1, 1),
141+
"update": 0,
142+
"values": [-0.0523599, 0.0523599]
143+
}
144+
145145
[sub_resource type="AnimationLibrary" id="AnimationLibrary_86tyj"]
146146
_data = {
147147
"RESET": SubResource("Animation_rp8jp"),
148148
"crash": SubResource("Animation_byuum"),
149149
"wobble": SubResource("Animation_4jhbx")
150150
}
151151

152-
[sub_resource type="Resource" id="Resource_mxyoo"]
152+
[sub_resource type="Resource" id="Resource_fwfbt"]
153153
script = ExtResource("6_rpoob")
154154
name = &"animationplayer_play"
155155
children = Array[ExtResource("6_rpoob")]([])
@@ -159,18 +159,18 @@ arguments = {
159159
"wait_mode": "until done"
160160
}
161161

162-
[sub_resource type="Resource" id="Resource_dcua4"]
162+
[sub_resource type="Resource" id="Resource_of65a"]
163163
script = ExtResource("6_rpoob")
164164
name = &"ready"
165-
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_mxyoo")])
165+
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_fwfbt")])
166166
arguments = {}
167167

168-
[sub_resource type="Resource" id="Resource_i3gig"]
168+
[sub_resource type="Resource" id="Resource_6gy71"]
169169
script = ExtResource("5_8ag0i")
170-
root = SubResource("Resource_dcua4")
170+
root = SubResource("Resource_of65a")
171171
canvas_position = Vector2(54, 47)
172172

173-
[sub_resource type="Resource" id="Resource_hjyv3"]
173+
[sub_resource type="Resource" id="Resource_uojjp"]
174174
script = ExtResource("6_rpoob")
175175
name = &"animationplayer_play"
176176
children = Array[ExtResource("6_rpoob")]([])
@@ -180,7 +180,7 @@ arguments = {
180180
"wait_mode": "until done"
181181
}
182182

183-
[sub_resource type="Resource" id="Resource_btnwv"]
183+
[sub_resource type="Resource" id="Resource_7sqdd"]
184184
script = ExtResource("6_rpoob")
185185
name = &"call_method_group"
186186
children = Array[ExtResource("6_rpoob")]([])
@@ -189,38 +189,38 @@ arguments = {
189189
"method_name": "game_over"
190190
}
191191

192-
[sub_resource type="Resource" id="Resource_2qloa"]
192+
[sub_resource type="Resource" id="Resource_k3l3i"]
193193
script = ExtResource("11_d0d2t")
194194
name = &"get_node"
195195
arguments = {
196196
"path": NodePath("..")
197197
}
198198

199-
[sub_resource type="Resource" id="Resource_pab2b"]
199+
[sub_resource type="Resource" id="Resource_xnd4j"]
200200
script = ExtResource("6_rpoob")
201201
name = &"queue_free_node"
202202
children = Array[ExtResource("6_rpoob")]([])
203203
arguments = {
204-
"node": SubResource("Resource_2qloa")
204+
"node": SubResource("Resource_k3l3i")
205205
}
206206

207-
[sub_resource type="Resource" id="Resource_egjyw"]
207+
[sub_resource type="Resource" id="Resource_sfyj6"]
208208
script = ExtResource("6_rpoob")
209209
name = &"define_method"
210-
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_hjyv3"), SubResource("Resource_btnwv"), SubResource("Resource_pab2b")])
210+
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_uojjp"), SubResource("Resource_7sqdd"), SubResource("Resource_xnd4j")])
211211
arguments = {
212212
"method_name": &"crash"
213213
}
214214

215-
[sub_resource type="Resource" id="Resource_67bpc"]
215+
[sub_resource type="Resource" id="Resource_y4k1i"]
216216
script = ExtResource("5_8ag0i")
217-
root = SubResource("Resource_egjyw")
218-
canvas_position = Vector2(250, 350)
217+
root = SubResource("Resource_sfyj6")
218+
canvas_position = Vector2(50, 175)
219219

220220
[sub_resource type="Resource" id="Resource_gtmbp"]
221221
script = ExtResource("8_ui4ru")
222222
script_inherits = "AnimationPlayer"
223-
block_serialization_trees = Array[ExtResource("5_8ag0i")]([SubResource("Resource_i3gig"), SubResource("Resource_67bpc")])
223+
block_serialization_trees = Array[ExtResource("5_8ag0i")]([SubResource("Resource_6gy71"), SubResource("Resource_y4k1i")])
224224
variables = Array[ExtResource("9_5ylav")]([])
225225
generated_script = "extends AnimationPlayer
226226
@@ -248,7 +248,7 @@ func crash():
248248
"
249249
version = 0
250250

251-
[sub_resource type="Resource" id="Resource_wq7sh"]
251+
[sub_resource type="Resource" id="Resource_fscym"]
252252
script = ExtResource("6_rpoob")
253253
name = &"simplecharacter_move"
254254
children = Array[ExtResource("6_rpoob")]([])
@@ -257,83 +257,56 @@ arguments = {
257257
"player": "player_1"
258258
}
259259

260-
[sub_resource type="Resource" id="Resource_xpsqv"]
261-
script = ExtResource("11_d0d2t")
262-
name = &"is_input_actioned"
263-
arguments = {
264-
"action": "just_pressed",
265-
"action_name": &"player_1_a"
266-
}
267-
268-
[sub_resource type="Resource" id="Resource_msafw"]
269-
script = ExtResource("6_rpoob")
270-
name = &"call_method_group"
271-
children = Array[ExtResource("6_rpoob")]([])
272-
arguments = {
273-
"group": "lasers",
274-
"method_name": "fire"
275-
}
276-
277-
[sub_resource type="Resource" id="Resource_2kj3p"]
278-
script = ExtResource("6_rpoob")
279-
name = &"if"
280-
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_msafw")])
281-
arguments = {
282-
"condition": SubResource("Resource_xpsqv")
283-
}
284-
285-
[sub_resource type="Resource" id="Resource_7c2cl"]
260+
[sub_resource type="Resource" id="Resource_mixdy"]
286261
script = ExtResource("6_rpoob")
287262
name = &"process"
288-
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_wq7sh"), SubResource("Resource_2kj3p")])
263+
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_fscym")])
289264
arguments = {}
290265

291-
[sub_resource type="Resource" id="Resource_a6ruw"]
266+
[sub_resource type="Resource" id="Resource_prapw"]
292267
script = ExtResource("5_8ag0i")
293-
root = SubResource("Resource_7c2cl")
268+
root = SubResource("Resource_mixdy")
294269
canvas_position = Vector2(75, 50)
295270

296-
[sub_resource type="Resource" id="Resource_sq5ey"]
271+
[sub_resource type="Resource" id="Resource_7wmbg"]
297272
script = ExtResource("11_d0d2t")
298273
name = &"get_node"
299274
arguments = {
300275
"path": NodePath("AnimationPlayer")
301276
}
302277

303-
[sub_resource type="Resource" id="Resource_oupna"]
278+
[sub_resource type="Resource" id="Resource_n4qna"]
304279
script = ExtResource("6_rpoob")
305280
name = &"call_method_node"
306281
children = Array[ExtResource("6_rpoob")]([])
307282
arguments = {
308283
"method_name": "crash",
309-
"node": SubResource("Resource_sq5ey")
284+
"node": SubResource("Resource_7wmbg")
310285
}
311286

312-
[sub_resource type="Resource" id="Resource_mnsle"]
287+
[sub_resource type="Resource" id="Resource_gxptt"]
313288
script = ExtResource("6_rpoob")
314289
name = &"define_method"
315-
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_oupna")])
290+
children = Array[ExtResource("6_rpoob")]([SubResource("Resource_n4qna")])
316291
arguments = {
317292
"method_name": &"crash"
318293
}
319294

320-
[sub_resource type="Resource" id="Resource_tw1cx"]
295+
[sub_resource type="Resource" id="Resource_rsc6w"]
321296
script = ExtResource("5_8ag0i")
322-
root = SubResource("Resource_mnsle")
323-
canvas_position = Vector2(250, 400)
297+
root = SubResource("Resource_gxptt")
298+
canvas_position = Vector2(75, 175)
324299

325300
[sub_resource type="Resource" id="Resource_0xoh2"]
326301
script = ExtResource("8_ui4ru")
327302
script_inherits = "SimpleCharacter"
328-
block_serialization_trees = Array[ExtResource("5_8ag0i")]([SubResource("Resource_a6ruw"), SubResource("Resource_tw1cx")])
303+
block_serialization_trees = Array[ExtResource("5_8ag0i")]([SubResource("Resource_prapw"), SubResource("Resource_rsc6w")])
329304
variables = Array[ExtResource("9_5ylav")]([])
330305
generated_script = "extends SimpleCharacter
331306
332307
333308
func _process(delta):
334309
move_with_player_buttons('player_1', 'top-down', delta)
335-
if (Input.is_action_just_pressed('player_1_a')):
336-
get_tree().call_group('lasers', 'fire')
337310
338311
func crash():
339312
(get_node(\"AnimationPlayer\")).call('crash')

0 commit comments

Comments
 (0)