From 524cdd42ead2c1da036068abf8dcf16b62ade15a Mon Sep 17 00:00:00 2001 From: mitchellgunn Date: Mon, 29 Jul 2024 21:07:04 -0400 Subject: [PATCH] box trap --- .godot/editor/editor_layout.cfg | 2 +- ...game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg | 6 +++--- .godot/editor/script_editor_cache.cfg | 4 ++-- scenes/game.tscn | 3 --- scripts/gamecontroller.gd | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg index 832981f..8a143c2 100644 --- a/.godot/editor/editor_layout.cfg +++ b/.godot/editor/editor_layout.cfg @@ -31,7 +31,7 @@ open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character. current_scene="res://scenes/game.tscn" center_split_offset=-361 selected_default_debugger_tab_idx=0 -selected_main_editor_idx=2 +selected_main_editor_idx=0 selected_bottom_panel_item=0 [ScriptEditor] diff --git a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index 85e0ad9..8b96d7d 100644 --- a/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(17.8379, -194.758), +"ofs": Vector2(-39.9296, 9.56621), "primary_grid_step": Vector2i(8, 8), "show_edit_locks": true, "show_guides": true, @@ -32,7 +32,7 @@ Anim={ "snap_rotation_step": 0.261799, "snap_scale": false, "snap_scale_step": 0.1, -"zoom": 1.41421 +"zoom": 1.49831 } 3D={ "fov": 70.01, @@ -172,4 +172,4 @@ Anim={ "zfar": 4000.01, "znear": 0.05 } -selected_nodes=Array[NodePath]([NodePath("/root/@EditorNode@17140/@Panel@13/@VBoxContainer@14/@HSplitContainer@17/@HSplitContainer@25/@HSplitContainer@33/@VBoxContainer@34/@VSplitContainer@36/@VSplitContainer@62/@VBoxContainer@63/@PanelContainer@110/MainScreen/@CanvasItemEditor@9462/@VSplitContainer@9281/@HSplitContainer@9283/@HSplitContainer@9285/@Control@9286/@SubViewportContainer@9287/@SubViewport@9288/Game")]) +selected_nodes=Array[NodePath]([]) diff --git a/.godot/editor/script_editor_cache.cfg b/.godot/editor/script_editor_cache.cfg index a7c20a6..3f8c6fd 100644 --- a/.godot/editor/script_editor_cache.cfg +++ b/.godot/editor/script_editor_cache.cfg @@ -3,10 +3,10 @@ state={ "bookmarks": PackedInt32Array(), "breakpoints": PackedInt32Array(), -"column": 44, +"column": 5, "folded_lines": Array[int]([]), "h_scroll_position": 0, -"row": 11, +"row": 13, "scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" diff --git a/scenes/game.tscn b/scenes/game.tscn index 8d6aa9b..0405801 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -568,9 +568,6 @@ metadata/_edit_group_ = true shape = SubResource("CircleShape2D_x8qck") debug_color = Color(0.556863, 0.415686, 0.964706, 0.419608) -[node name="RigidBody2D2" parent="." instance=ExtResource("2_ob312")] -position = Vector2(284, 138) - [node name="RigidBody2D3" parent="." instance=ExtResource("2_ob312")] position = Vector2(269, 97) diff --git a/scripts/gamecontroller.gd b/scripts/gamecontroller.gd index fa8b73b..fbcee54 100644 --- a/scripts/gamecontroller.gd +++ b/scripts/gamecontroller.gd @@ -12,7 +12,6 @@ func _ready(): # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta): pass -#test func _on_area_2d_areatrigger(effect, body): print("Game Controller sees the trigger " + effect)