From accd65888b9e91fad39b34b5c99f7df3d5692252 Mon Sep 17 00:00:00 2001 From: OddlyTimbot Date: Fri, 26 Jul 2024 13:44:33 -0400 Subject: [PATCH] cleaning up week 2 final example --- ...state-6d8e6ff1e6f20a36e0402d27c623c86c.cfg | 2 +- ...state-b6bd7a241034177d7fe082a7597ba8ea.cfg | 2 +- ...state-c2a7af834e91ff64325daddf58e45dc0.cfg | 2 +- ...lding-c2a7af834e91ff64325daddf58e45dc0.cfg | 4 +- week2/startpoint/scenes/game.tscn | 45 +++++-------------- 5 files changed, 16 insertions(+), 39 deletions(-) diff --git a/week2/startpoint/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg b/week2/startpoint/.godot/editor/bullet.tscn-editstate-6d8e6ff1e6f20a36e0402d27c623c86c.cfg index c574e5f..7e41eb7 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/Area2D")]) +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")]) diff --git a/week2/startpoint/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg b/week2/startpoint/.godot/editor/character.tscn-editstate-b6bd7a241034177d7fe082a7597ba8ea.cfg index 6918fec..cf8fc8c 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/Area2D")]) +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")]) diff --git a/week2/startpoint/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg b/week2/startpoint/.godot/editor/game.tscn-editstate-c2a7af834e91ff64325daddf58e45dc0.cfg index 5c855c4..cc4acb1 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/Area2D")]) +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")]) diff --git a/week2/startpoint/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg b/week2/startpoint/.godot/editor/game.tscn-folding-c2a7af834e91ff64325daddf58e45dc0.cfg index 71afb8a..91c9bd6 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("StaticBody2D"), PackedStringArray("Transform"), NodePath("RigidBody2D"), PackedStringArray("Transform"), NodePath("RigidBody2D/CollisionShape2D"), PackedStringArray("Transform"), NodePath("RigidBody2D/CollisionShape2D2"), 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("Area2D"), PackedStringArray("Transform")] -resource_unfolds=["res://scenes/game.tscn::WorldBoundaryShape2D_3u4a8", PackedStringArray("Resource"), "res://scenes/game.tscn::RectangleShape2D_4vo4d", PackedStringArray("Resource"), "res://scenes/game.tscn::RectangleShape2D_cq7kj", PackedStringArray("Resource"), "res://scenes/game.tscn::CircleShape2D_x8qck", PackedStringArray("Resource")] +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")] +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/game.tscn b/week2/startpoint/scenes/game.tscn index d981bd4..0c1405b 100644 --- a/week2/startpoint/scenes/game.tscn +++ b/week2/startpoint/scenes/game.tscn @@ -4,57 +4,26 @@ [ext_resource type="PackedScene" uid="uid://go4yc8hfo1gq" path="res://scenes/character.tscn" id="2_64ccm"] [ext_resource type="Script" path="res://scripts/Trigger.gd" id="2_nfj1w"] -[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_3u4a8"] - [sub_resource type="RectangleShape2D" id="RectangleShape2D_4vo4d"] size = Vector2(55, 55) [sub_resource type="RectangleShape2D" id="RectangleShape2D_cq7kj"] size = Vector2(91, 20) +[sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_3u4a8"] + [sub_resource type="CircleShape2D" id="CircleShape2D_x8qck"] radius = 60.2993 [node name="Game" type="Node2D"] script = ExtResource("1_77wyw") -[node name="StaticBody2D" type="StaticBody2D" parent="."] -position = Vector2(236, 415) -metadata/_edit_group_ = true - -[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] -shape = SubResource("WorldBoundaryShape2D_3u4a8") - [node name="RigidBody2D" type="RigidBody2D" parent="." groups=["boxes"]] -position = Vector2(139, 35) +position = Vector2(120, 93) rotation = 0.740513 metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] -position = Vector2(206.535, 208.174) -rotation = -0.555892 -shape = SubResource("RectangleShape2D_4vo4d") -debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) - -[node name="CollisionShape2D2" type="CollisionShape2D" parent="RigidBody2D"] -position = Vector2(206.535, 208.174) -rotation = -0.555892 -shape = SubResource("RectangleShape2D_4vo4d") -debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) - -[node name="RigidBody2D2" type="RigidBody2D" parent="." groups=["boxes"]] -position = Vector2(409, -6) -rotation = 0.740513 -metadata/_edit_group_ = true - -[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D2"] -position = Vector2(206.535, 208.174) -rotation = -0.555892 -shape = SubResource("RectangleShape2D_4vo4d") -debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) - -[node name="CollisionShape2D2" type="CollisionShape2D" parent="RigidBody2D2"] -position = Vector2(206.535, 208.174) rotation = -0.555892 shape = SubResource("RectangleShape2D_4vo4d") debug_color = Color(0.815686, 0.4, 0.207843, 0.419608) @@ -94,7 +63,15 @@ metadata/_edit_group_ = true position = Vector2(-1.5, 0) shape = SubResource("RectangleShape2D_cq7kj") +[node name="StaticBody2D" type="StaticBody2D" parent="level"] +position = Vector2(236, 415) +metadata/_edit_group_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="level/StaticBody2D"] +shape = SubResource("WorldBoundaryShape2D_3u4a8") + [node name="CharacterBody2D" parent="." groups=["player"] instance=ExtResource("2_64ccm")] +position = Vector2(36, 225) PUSH_FORCE = 550 [node name="Area2D" type="Area2D" parent="."]