Skip to content

Commit 4b25f21

Browse files
dbnicholsondbnicholson
committed
Pong: Fix scoring
This appears to have been broken in 031b29e. In GoalAreaLeft, the checked group was changed from balls to walls. In GoalAreaRight, the checked group was changed from balls to the empty string.
1 parent 8a12028 commit 4b25f21

File tree

1 file changed

+65
-67
lines changed

1 file changed

+65
-67
lines changed

‎addons/block_code/examples/pong_game/pong_game.tscn‎

Lines changed: 65 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -441,114 +441,113 @@ func _init():
441441
"
442442
version = 0
443443

444-
[sub_resource type="Resource" id="Resource_tasas"]
444+
[sub_resource type="Resource" id="Resource_foxq8"]
445445
script = ExtResource("5_wr38c")
446446
block_class = &"ParameterBlock"
447447
serialized_props = [["block_name", "parameter_block"], ["label", "Param"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 3], ["position", Vector2(0, 0)], ["scope", "
448448
func _on_body_entered(_body: Node2D):
449449
var body: NodePath = _body.get_path()
450450
"], ["block_format", "body"], ["statement", "body"], ["defaults", {}], ["variant_type", 22], ["param_input_strings", {}]]
451451

452-
[sub_resource type="Resource" id="Resource_pjafw"]
452+
[sub_resource type="Resource" id="Resource_501iu"]
453453
script = ExtResource("4_qtggh")
454-
serialized_block = SubResource("Resource_tasas")
454+
serialized_block = SubResource("Resource_foxq8")
455455
path_child_pairs = []
456456

457-
[sub_resource type="Resource" id="Resource_he201"]
457+
[sub_resource type="Resource" id="Resource_lc2mv"]
458458
script = ExtResource("5_wr38c")
459459
block_class = &"ParameterBlock"
460460
serialized_props = [["block_name", "parameter_block"], ["label", "Param"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 3], ["position", Vector2(0, 0)], ["scope", "
461461
func _on_body_entered(_body: Node2D):
462462
var body: NodePath = _body.get_path()
463463
"], ["block_format", "body"], ["statement", "body"], ["defaults", {}], ["variant_type", 22], ["param_input_strings", {}]]
464464

465-
[sub_resource type="Resource" id="Resource_ctark"]
465+
[sub_resource type="Resource" id="Resource_usdsx"]
466466
script = ExtResource("4_qtggh")
467-
serialized_block = SubResource("Resource_he201")
467+
serialized_block = SubResource("Resource_lc2mv")
468468
path_child_pairs = []
469469

470-
[sub_resource type="Resource" id="Resource_gxxn8"]
470+
[sub_resource type="Resource" id="Resource_yudev"]
471471
script = ExtResource("5_wr38c")
472472
block_class = &"ParameterBlock"
473473
serialized_props = [["block_name", "parameter_block"], ["label", "Param"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 3], ["position", Vector2(0, 0)], ["scope", ""], ["block_format", "Is {node: NODE_PATH} in group {group: STRING}"], ["statement", "get_node({node}).is_in_group({group})"], ["defaults", {}], ["variant_type", 1], ["param_input_strings", {
474-
"group": "walls",
474+
"group": "balls",
475475
"node": ""
476476
}]]
477477

478-
[sub_resource type="Resource" id="Resource_4t5fq"]
478+
[sub_resource type="Resource" id="Resource_j8nlm"]
479479
script = ExtResource("4_qtggh")
480-
serialized_block = SubResource("Resource_gxxn8")
481-
path_child_pairs = [[NodePath("MarginContainer/HBoxContainer/ParameterInput0/SnapPoint"), SubResource("Resource_ctark")]]
480+
serialized_block = SubResource("Resource_yudev")
481+
path_child_pairs = [[NodePath("MarginContainer/HBoxContainer/ParameterInput0/SnapPoint"), SubResource("Resource_usdsx")]]
482482

483-
[sub_resource type="Resource" id="Resource_jyto7"]
483+
[sub_resource type="Resource" id="Resource_rd5bb"]
484484
script = ExtResource("5_wr38c")
485485
block_class = &"StatementBlock"
486486
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["scope", ""], ["block_format", "Call method {method_name: STRING} in group {group: STRING}"], ["statement", "get_tree().call_group({group}, {method_name})"], ["defaults", {}], ["param_input_strings", {
487487
"group": "balls",
488488
"method_name": "reset"
489489
}]]
490490

491-
[sub_resource type="Resource" id="Resource_ab5of"]
491+
[sub_resource type="Resource" id="Resource_6j2n2"]
492492
script = ExtResource("4_qtggh")
493-
serialized_block = SubResource("Resource_jyto7")
493+
serialized_block = SubResource("Resource_rd5bb")
494494
path_child_pairs = []
495495

496-
[sub_resource type="Resource" id="Resource_j1imx"]
496+
[sub_resource type="Resource" id="Resource_y52j6"]
497497
script = ExtResource("5_wr38c")
498498
block_class = &"StatementBlock"
499499
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["scope", ""], ["block_format", "Call method {method_name: STRING} in group {group: STRING}"], ["statement", "get_tree().call_group({group}, {method_name})"], ["defaults", {}], ["param_input_strings", {
500500
"group": "scoring",
501501
"method_name": "goal_left"
502502
}]]
503503

504-
[sub_resource type="Resource" id="Resource_8ipag"]
504+
[sub_resource type="Resource" id="Resource_j6rsb"]
505505
script = ExtResource("4_qtggh")
506-
serialized_block = SubResource("Resource_j1imx")
507-
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_ab5of")]]
506+
serialized_block = SubResource("Resource_y52j6")
507+
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_6j2n2")]]
508508

509-
[sub_resource type="Resource" id="Resource_288n2"]
509+
[sub_resource type="Resource" id="Resource_oeuh1"]
510510
script = ExtResource("5_wr38c")
511511
block_class = &"ControlBlock"
512512
serialized_props = [["block_name", "control_block"], ["label", "Control Block"], ["color", Color(0.270588, 0.666667, 0.94902, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["scope", ""], ["block_formats", ["if {condition: BOOL}"]], ["statements", ["if {condition}:"]], ["defaults", {}], ["param_input_strings_array", [{
513513
"condition": false
514514
}]]]
515515

516-
[sub_resource type="Resource" id="Resource_glvow"]
516+
[sub_resource type="Resource" id="Resource_jyu6m"]
517517
script = ExtResource("4_qtggh")
518-
serialized_block = SubResource("Resource_288n2")
519-
path_child_pairs = [[NodePath("VBoxContainer/MarginContainer/Rows/Row0/RowHBoxContainer/RowHBox/ParameterInput0/SnapPoint"), SubResource("Resource_4t5fq")], [NodePath("VBoxContainer/MarginContainer/Rows/SnapContainer0/SnapPoint"), SubResource("Resource_8ipag")]]
518+
serialized_block = SubResource("Resource_oeuh1")
519+
path_child_pairs = [[NodePath("VBoxContainer/MarginContainer/Rows/Row0/RowHBoxContainer/RowHBox/ParameterInput0/SnapPoint"), SubResource("Resource_j8nlm")], [NodePath("VBoxContainer/MarginContainer/Rows/SnapContainer0/SnapPoint"), SubResource("Resource_j6rsb")]]
520520

521-
[sub_resource type="Resource" id="Resource_0plda"]
521+
[sub_resource type="Resource" id="Resource_v1q5h"]
522522
script = ExtResource("5_wr38c")
523523
block_class = &"EntryBlock"
524524
serialized_props = [["block_name", "entry_block"], ["label", "EntryBlock"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 1], ["position", Vector2(98, 352)], ["scope", ""], ["block_format", "On [body: NODE_PATH] entered"], ["statement", "
525525
func _on_body_entered(_body: Node2D):
526526
var body: NodePath = _body.get_path()
527527
"], ["defaults", {}], ["param_input_strings", {}], ["signal_name", "body_entered"]]
528528

529-
[sub_resource type="Resource" id="Resource_jwpt1"]
529+
[sub_resource type="Resource" id="Resource_vj0qt"]
530530
script = ExtResource("4_qtggh")
531-
serialized_block = SubResource("Resource_0plda")
532-
path_child_pairs = [[NodePath("VBoxContainer/TopMarginContainer/MarginContainer/HBoxContainer/ParameterOutput0/SnapPoint"), SubResource("Resource_pjafw")], [NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_glvow")]]
531+
serialized_block = SubResource("Resource_v1q5h")
532+
path_child_pairs = [[NodePath("VBoxContainer/TopMarginContainer/MarginContainer/HBoxContainer/ParameterOutput0/SnapPoint"), SubResource("Resource_501iu")], [NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_jyu6m")]]
533533

534-
[sub_resource type="Resource" id="Resource_7qerp"]
534+
[sub_resource type="Resource" id="Resource_6sikv"]
535535
script = ExtResource("6_ppdc3")
536-
array = Array[ExtResource("4_qtggh")]([SubResource("Resource_jwpt1")])
536+
array = Array[ExtResource("4_qtggh")]([SubResource("Resource_vj0qt")])
537537

538538
[sub_resource type="Resource" id="Resource_bx5ai"]
539539
script = ExtResource("7_uuuue")
540540
script_inherits = "Area2D"
541-
block_trees = SubResource("Resource_7qerp")
541+
block_trees = SubResource("Resource_6sikv")
542542
variables = Array[Resource("res://addons/block_code/ui/block_canvas/variable_resource.gd")]([])
543543
generated_script = "extends Area2D
544544
545-
var VAR_DICT := {}
546545
547546
548547
func _on_body_entered(_body: Node2D):
549548
var body: NodePath = _body.get_path()
550549
551-
if get_node(body).is_in_group('walls'):
550+
if get_node(body).is_in_group('balls'):
552551
get_tree().call_group('scoring', 'goal_left')
553552
get_tree().call_group('balls', 'reset')
554553
@@ -557,116 +556,115 @@ func _init():
557556
"
558557
version = 0
559558

560-
[sub_resource type="Resource" id="Resource_doveu"]
559+
[sub_resource type="Resource" id="Resource_g8bbs"]
561560
script = ExtResource("5_wr38c")
562561
block_class = &"ParameterBlock"
563562
serialized_props = [["block_name", "parameter_block"], ["label", "Param"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 3], ["position", Vector2(0, 0)], ["scope", "
564563
func _on_body_entered(_body: Node2D):
565564
var body: NodePath = _body.get_path()
566565
"], ["block_format", "body"], ["statement", "body"], ["defaults", {}], ["variant_type", 22], ["param_input_strings", {}]]
567566

568-
[sub_resource type="Resource" id="Resource_xyxrn"]
567+
[sub_resource type="Resource" id="Resource_by53e"]
569568
script = ExtResource("4_qtggh")
570-
serialized_block = SubResource("Resource_doveu")
569+
serialized_block = SubResource("Resource_g8bbs")
571570
path_child_pairs = []
572571

573-
[sub_resource type="Resource" id="Resource_cbo5a"]
572+
[sub_resource type="Resource" id="Resource_ia057"]
574573
script = ExtResource("5_wr38c")
575574
block_class = &"ParameterBlock"
576575
serialized_props = [["block_name", "parameter_block"], ["label", "Param"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 3], ["position", Vector2(0, 0)], ["scope", "
577576
func _on_body_entered(_body: Node2D):
578577
var body: NodePath = _body.get_path()
579578
"], ["block_format", "body"], ["statement", "body"], ["defaults", {}], ["variant_type", 22], ["param_input_strings", {}]]
580579

581-
[sub_resource type="Resource" id="Resource_6fo05"]
580+
[sub_resource type="Resource" id="Resource_214im"]
582581
script = ExtResource("4_qtggh")
583-
serialized_block = SubResource("Resource_cbo5a")
582+
serialized_block = SubResource("Resource_ia057")
584583
path_child_pairs = []
585584

586-
[sub_resource type="Resource" id="Resource_cwxay"]
585+
[sub_resource type="Resource" id="Resource_mitgp"]
587586
script = ExtResource("5_wr38c")
588587
block_class = &"ParameterBlock"
589588
serialized_props = [["block_name", "parameter_block"], ["label", "Param"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 3], ["position", Vector2(0, 0)], ["scope", ""], ["block_format", "Is {node: NODE_PATH} in group {group: STRING}"], ["statement", "get_node({node}).is_in_group({group})"], ["defaults", {}], ["variant_type", 1], ["param_input_strings", {
590-
"group": "",
589+
"group": "balls",
591590
"node": ""
592591
}]]
593592

594-
[sub_resource type="Resource" id="Resource_hn47f"]
593+
[sub_resource type="Resource" id="Resource_4c6cp"]
595594
script = ExtResource("4_qtggh")
596-
serialized_block = SubResource("Resource_cwxay")
597-
path_child_pairs = [[NodePath("MarginContainer/HBoxContainer/ParameterInput0/SnapPoint"), SubResource("Resource_6fo05")]]
595+
serialized_block = SubResource("Resource_mitgp")
596+
path_child_pairs = [[NodePath("MarginContainer/HBoxContainer/ParameterInput0/SnapPoint"), SubResource("Resource_214im")]]
598597

599-
[sub_resource type="Resource" id="Resource_2rjk3"]
598+
[sub_resource type="Resource" id="Resource_kbjk3"]
600599
script = ExtResource("5_wr38c")
601600
block_class = &"StatementBlock"
602601
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["scope", ""], ["block_format", "Call method {method_name: STRING} in group {group: STRING}"], ["statement", "get_tree().call_group({group}, {method_name})"], ["defaults", {}], ["param_input_strings", {
603-
"group": "scoring",
604-
"method_name": "goal_right"
602+
"group": "balls",
603+
"method_name": "reset"
605604
}]]
606605

607-
[sub_resource type="Resource" id="Resource_b6ghp"]
606+
[sub_resource type="Resource" id="Resource_svw0g"]
608607
script = ExtResource("4_qtggh")
609-
serialized_block = SubResource("Resource_2rjk3")
608+
serialized_block = SubResource("Resource_kbjk3")
610609
path_child_pairs = []
611610

612-
[sub_resource type="Resource" id="Resource_hfvs8"]
611+
[sub_resource type="Resource" id="Resource_ehxpt"]
613612
script = ExtResource("5_wr38c")
614613
block_class = &"StatementBlock"
615614
serialized_props = [["block_name", "statement_block"], ["label", "StatementBlock"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["scope", ""], ["block_format", "Call method {method_name: STRING} in group {group: STRING}"], ["statement", "get_tree().call_group({group}, {method_name})"], ["defaults", {}], ["param_input_strings", {
616-
"group": "balls",
617-
"method_name": "reset"
615+
"group": "scoring",
616+
"method_name": "goal_right"
618617
}]]
619618

620-
[sub_resource type="Resource" id="Resource_x60gt"]
619+
[sub_resource type="Resource" id="Resource_8f3xk"]
621620
script = ExtResource("4_qtggh")
622-
serialized_block = SubResource("Resource_hfvs8")
623-
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_b6ghp")]]
621+
serialized_block = SubResource("Resource_ehxpt")
622+
path_child_pairs = [[NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_svw0g")]]
624623

625-
[sub_resource type="Resource" id="Resource_6o2pm"]
624+
[sub_resource type="Resource" id="Resource_cyk7y"]
626625
script = ExtResource("5_wr38c")
627626
block_class = &"ControlBlock"
628627
serialized_props = [["block_name", "control_block"], ["label", "Control Block"], ["color", Color(0.270588, 0.666667, 0.94902, 1)], ["block_type", 2], ["position", Vector2(0, 0)], ["scope", ""], ["block_formats", ["if {condition: BOOL}"]], ["statements", ["if {condition}:"]], ["defaults", {}], ["param_input_strings_array", [{
629628
"condition": false
630629
}]]]
631630

632-
[sub_resource type="Resource" id="Resource_y0f1u"]
631+
[sub_resource type="Resource" id="Resource_gfghu"]
633632
script = ExtResource("4_qtggh")
634-
serialized_block = SubResource("Resource_6o2pm")
635-
path_child_pairs = [[NodePath("VBoxContainer/MarginContainer/Rows/Row0/RowHBoxContainer/RowHBox/ParameterInput0/SnapPoint"), SubResource("Resource_hn47f")], [NodePath("VBoxContainer/MarginContainer/Rows/SnapContainer0/SnapPoint"), SubResource("Resource_x60gt")]]
633+
serialized_block = SubResource("Resource_cyk7y")
634+
path_child_pairs = [[NodePath("VBoxContainer/MarginContainer/Rows/Row0/RowHBoxContainer/RowHBox/ParameterInput0/SnapPoint"), SubResource("Resource_4c6cp")], [NodePath("VBoxContainer/MarginContainer/Rows/SnapContainer0/SnapPoint"), SubResource("Resource_8f3xk")]]
636635

637-
[sub_resource type="Resource" id="Resource_pjlcp"]
636+
[sub_resource type="Resource" id="Resource_ncxb3"]
638637
script = ExtResource("5_wr38c")
639638
block_class = &"EntryBlock"
640639
serialized_props = [["block_name", "entry_block"], ["label", "EntryBlock"], ["color", Color(0.294118, 0.482353, 0.92549, 1)], ["block_type", 1], ["position", Vector2(195, 56)], ["scope", ""], ["block_format", "On [body: NODE_PATH] entered"], ["statement", "
641640
func _on_body_entered(_body: Node2D):
642641
var body: NodePath = _body.get_path()
643642
"], ["defaults", {}], ["param_input_strings", {}], ["signal_name", "body_entered"]]
644643

645-
[sub_resource type="Resource" id="Resource_uj1xx"]
644+
[sub_resource type="Resource" id="Resource_1nmq4"]
646645
script = ExtResource("4_qtggh")
647-
serialized_block = SubResource("Resource_pjlcp")
648-
path_child_pairs = [[NodePath("VBoxContainer/TopMarginContainer/MarginContainer/HBoxContainer/ParameterOutput0/SnapPoint"), SubResource("Resource_xyxrn")], [NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_y0f1u")]]
646+
serialized_block = SubResource("Resource_ncxb3")
647+
path_child_pairs = [[NodePath("VBoxContainer/TopMarginContainer/MarginContainer/HBoxContainer/ParameterOutput0/SnapPoint"), SubResource("Resource_by53e")], [NodePath("VBoxContainer/SnapPoint"), SubResource("Resource_gfghu")]]
649648

650-
[sub_resource type="Resource" id="Resource_xphhp"]
649+
[sub_resource type="Resource" id="Resource_d14wa"]
651650
script = ExtResource("6_ppdc3")
652-
array = Array[ExtResource("4_qtggh")]([SubResource("Resource_uj1xx")])
651+
array = Array[ExtResource("4_qtggh")]([SubResource("Resource_1nmq4")])
653652

654653
[sub_resource type="Resource" id="Resource_6drva"]
655654
script = ExtResource("7_uuuue")
656655
script_inherits = "Area2D"
657-
block_trees = SubResource("Resource_xphhp")
656+
block_trees = SubResource("Resource_d14wa")
658657
variables = Array[Resource("res://addons/block_code/ui/block_canvas/variable_resource.gd")]([])
659658
generated_script = "extends Area2D
660659
661-
var VAR_DICT := {}
662660
663661
664662
func _on_body_entered(_body: Node2D):
665663
var body: NodePath = _body.get_path()
666664
667-
if get_node(body).is_in_group(''):
668-
get_tree().call_group('balls', 'reset')
665+
if get_node(body).is_in_group('balls'):
669666
get_tree().call_group('scoring', 'goal_right')
667+
get_tree().call_group('balls', 'reset')
670668
671669
func _init():
672670
body_entered.connect(_on_body_entered)

0 commit comments

Comments
 (0)