From 7a91680a53903e43e2cd6fc238219a16c9fec211 Mon Sep 17 00:00:00 2001 From: OddlyTimbot Date: Mon, 29 Jul 2024 14:23:06 -0400 Subject: [PATCH] updates --- ...cn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg | 2 +- ...cn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg | 2 +- ...tscn-folding-b6bd7a241034177d7fe082a7597ba8ea.cfg | 2 +- ...cn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg | 2 +- ...tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg | 2 +- week2/startpoint/scenes/character.tscn | 3 +-- week2/startpoint/scripts/bullet.gd | 1 + ...cn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg | 4 ++-- .../updated_project/.godot/editor/editor_layout.cfg | 2 +- .../updated_project/.godot/editor/filesystem_cache8 | 12 ++++++------ .../.godot/editor/script_editor_cache.cfg | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/week2/startpoint/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg b/week2/startpoint/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg index 7e41eb7..c574e5f 100644 --- a/week2/startpoint/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg +++ b/week2/startpoint/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg @@ -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/RigidBody2D")]) +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/Area2D")]) diff --git a/week2/startpoint/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg b/week2/startpoint/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg index cf8fc8c..6918fec 100644 --- a/week2/startpoint/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week2/startpoint/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -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/RigidBody2D")]) +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/Area2D")]) diff --git a/week2/startpoint/.godot/editor/character.tscn-folding-b6bd7a241034177d7fe082a7597ba8ea.cfg b/week2/startpoint/.godot/editor/character.tscn-folding-b6bd7a241034177d7fe082a7597ba8ea.cfg index 780ff38..25f0940 100644 --- a/week2/startpoint/.godot/editor/character.tscn-folding-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week2/startpoint/.godot/editor/character.tscn-folding-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[] +node_unfolds=[NodePath("MarkerRight"), PackedStringArray("Transform")] resource_unfolds=["res://scenes/character.tscn::CircleShape2D_ubfw4", PackedStringArray()] nodes_folded=[] diff --git a/week2/startpoint/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/week2/startpoint/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index cc4acb1..5c855c4 100644 --- a/week2/startpoint/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week2/startpoint/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -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/RigidBody2D")]) +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/Area2D")]) diff --git a/week2/startpoint/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg b/week2/startpoint/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg index 91c9bd6..9356504 100644 --- a/week2/startpoint/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg +++ b/week2/startpoint/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg @@ -1,5 +1,5 @@ [folding] -node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("RigidBody2D"), PackedStringArray("Transform"), NodePath("RigidBody2D/CollisionShape2D"), PackedStringArray("Transform"), NodePath("groundblock"), PackedStringArray("Transform"), NodePath("groundblock/CollisionShape2D"), PackedStringArray("Transform"), NodePath("groundblock2"), PackedStringArray("Transform"), NodePath("groundblock2/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock2"), PackedStringArray("Transform"), NodePath("level/groundblock2/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock3"), PackedStringArray("Transform"), NodePath("level/groundblock3/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/StaticBody2D"), PackedStringArray("Transform"), NodePath("Area2D"), PackedStringArray("Transform")] +node_unfolds=[NodePath("."), PackedStringArray("Transform"), NodePath("RigidBody2D"), PackedStringArray("Transform"), NodePath("RigidBody2D/CollisionShape2D"), PackedStringArray("Transform"), NodePath("groundblock"), PackedStringArray("Transform"), NodePath("groundblock/CollisionShape2D"), PackedStringArray("Transform"), NodePath("groundblock2"), PackedStringArray("Transform"), NodePath("groundblock2/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock2"), PackedStringArray("Transform"), NodePath("level/groundblock2/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/groundblock3"), PackedStringArray("Transform"), NodePath("level/groundblock3/CollisionShape2D"), PackedStringArray("Transform"), NodePath("level/StaticBody2D"), PackedStringArray("Transform"), NodePath("CharacterBody2D"), PackedStringArray("Transform"), NodePath("Area2D"), PackedStringArray("Transform")] resource_unfolds=["res://scenes/game.tscn::RectangleShape2D_4vo4d", PackedStringArray("Resource"), "res://scenes/game.tscn::RectangleShape2D_cq7kj", PackedStringArray("Resource"), "res://scenes/game.tscn::WorldBoundaryShape2D_3u4a8", PackedStringArray("Resource"), "res://scenes/game.tscn::CircleShape2D_x8qck", PackedStringArray("Resource")] nodes_folded=[] diff --git a/week2/startpoint/scenes/character.tscn b/week2/startpoint/scenes/character.tscn index 58205a8..8838026 100644 --- a/week2/startpoint/scenes/character.tscn +++ b/week2/startpoint/scenes/character.tscn @@ -10,7 +10,6 @@ position = Vector2(-1, 0) script = ExtResource("1_x87yo") JUMP_VELOCITY = -500.0 PUSH_FORCE = 200 -metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="."] shape = SubResource("CircleShape2D_ubfw4") @@ -22,7 +21,7 @@ target_position = Vector2(25, 0) target_position = Vector2(-25, 0) [node name="MarkerRight" type="Node2D" parent="."] -position = Vector2(16, -6) +position = Vector2(17, -9) [node name="MarkerLeft" type="Node2D" parent="."] position = Vector2(-16, -6) diff --git a/week2/startpoint/scripts/bullet.gd b/week2/startpoint/scripts/bullet.gd index b7aad61..eeb30ef 100644 --- a/week2/startpoint/scripts/bullet.gd +++ b/week2/startpoint/scripts/bullet.gd @@ -10,5 +10,6 @@ func _physics_process(delta): func _on_body_entered(body): print("bullet hit something") + if not body.is_in_group("player"): queue_free() diff --git a/week3/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg b/week3/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg index 86add5d..06f70e7 100644 --- a/week3/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg +++ b/week3/updated_project/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg @@ -8,7 +8,7 @@ Anim={ "grid_snap_active": false, "grid_step": Vector2(8, 8), "grid_visibility": 1, -"ofs": Vector2(-105.112, -79.4505), +"ofs": Vector2(-374.822, -210.115), "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": 4.23785 +"zoom": 1.7818 } 3D={ "fov": 70.01, diff --git a/week3/updated_project/.godot/editor/editor_layout.cfg b/week3/updated_project/.godot/editor/editor_layout.cfg index 85262ce..6cdf3ab 100644 --- a/week3/updated_project/.godot/editor/editor_layout.cfg +++ b/week3/updated_project/.godot/editor/editor_layout.cfg @@ -28,7 +28,7 @@ dock_5="Inspector,Node,History" [EditorNode] open_scenes=PackedStringArray("res://scenes/game.tscn", "res://scenes/character.tscn", "res://scenes/bullet.tscn", "res://scenes/crate.tscn") -current_scene="res://scenes/crate.tscn" +current_scene="res://scenes/game.tscn" center_split_offset=-252 selected_default_debugger_tab_idx=0 selected_main_editor_idx=0 diff --git a/week3/updated_project/.godot/editor/filesystem_cache8 b/week3/updated_project/.godot/editor/filesystem_cache8 index cb7a34f..74a6ab0 100644 --- a/week3/updated_project/.godot/editor/filesystem_cache8 +++ b/week3/updated_project/.godot/editor/filesystem_cache8 @@ -1,5 +1,5 @@ ea4bc82a6ad023ab7ee23ee620429895 -::res://::1722016025 +::res://::1722276824 icon.svg::CompressedTexture2D::9114977118871582245::1721179661::1721179661::1::::<><>:: ::res://graphics/::1721682223 Terrain (32x32).png::CompressedTexture2D::8707534964839485024::1721679370::1721679370::1::::<><>:: @@ -13,11 +13,11 @@ player jump 48x48.png::CompressedTexture2D::1627608568707791839::1721673245::172 player land 48x48.png::CompressedTexture2D::3499637713582873633::1721673245::1721673245::1::::<><>:: ::res://graphics/Player Run/::1721673245 player run 48x48.png::CompressedTexture2D::1502492849971408816::1721673245::1721673245::1::::<><>:: -::res://scenes/::1721682338 -bullet.tscn::PackedScene::6880909734590904373::1721682300::0::1::::<><>::res://scripts/bullet.gd -character.tscn::PackedScene::451838158579532324::1721682300::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png -crate.tscn::PackedScene::41931541512830250::1721682338::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png -game.tscn::PackedScene::1738196330916037717::1721682300::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn +::res://scenes/::1722019009 +bullet.tscn::PackedScene::6880909734590904373::1722019009::0::1::::<><>::res://scripts/bullet.gd +character.tscn::PackedScene::451838158579532324::1722019009::0::1::::<><>::res://scripts/CharacterBody2D.gd<>uid://c0iiaebonyhh0::::res://graphics/Player Idle/Player Idle 48x48.png<>uid://xgoqfqmvorcx::::res://graphics/Player Jump/player jump 48x48.png<>uid://vn23qn3f0dvc::::res://graphics/Player Run/player run 48x48.png +crate.tscn::PackedScene::41931541512830250::1722019009::0::1::::<><>::uid://ddxm7hj323fta::::res://graphics/items/cannister.png +game.tscn::PackedScene::1738196330916037717::1722019009::0::1::::<><>::res://scripts/gamecontroller.gd<>uid://go4yc8hfo1gq::::res://scenes/character.tscn<>uid://dwb83f7uoweuy::::res://graphics/Terrain (32x32).png<>res://scripts/Trigger.gd<>uid://ukuu7p7vhlq::::res://scenes/crate.tscn ::res://scripts/::1721681291 bullet.gd::GDScript::-1::1721179661::0::1::::<>Area2D<>:: CharacterBody2D.gd::GDScript::-1::1721681291::0::1::::<>CharacterBody2D<>:: diff --git a/week3/updated_project/.godot/editor/script_editor_cache.cfg b/week3/updated_project/.godot/editor/script_editor_cache.cfg index 45883d9..4a671f1 100644 --- a/week3/updated_project/.godot/editor/script_editor_cache.cfg +++ b/week3/updated_project/.godot/editor/script_editor_cache.cfg @@ -21,7 +21,7 @@ state={ "folded_lines": Array[int]([]), "h_scroll_position": 0, "row": 46, -"scroll_position": 32.0, +"scroll_position": 0.0, "selection": false, "syntax_highlighter": "GDScript" }