From 5ffaba9ce91721f9fe57e567d03f4ed9e08b4215 Mon Sep 17 00:00:00 2001 From: OddlyTimbot Date: Mon, 11 May 2026 15:59:58 -0400 Subject: [PATCH] small bug fixes --- Scenes/game.tscn | 24 +++++++----------------- project.godot | 5 +++++ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Scenes/game.tscn b/Scenes/game.tscn index 2c62c04..772a779 100644 --- a/Scenes/game.tscn +++ b/Scenes/game.tscn @@ -4,14 +4,11 @@ [ext_resource type="PackedScene" uid="uid://bsroh4vsjwblh" path="res://Scenes/crate.tscn" id="2_wowpa"] [ext_resource type="PackedScene" uid="uid://dmk1mp1hqm62b" path="res://Scenes/player.tscn" id="3_i6g32"] [ext_resource type="Script" uid="uid://kb3v21msvi17" path="res://Scripts/trigger.gd" id="3_wrm1d"] -[ext_resource type="PackedScene" uid="uid://ceyxo0mrrrd6d" path="res://Scenes/grenade.tscn" id="4_3dryh"] [ext_resource type="Script" uid="uid://qhll446powxt" path="res://Scripts/scene_manager.gd" id="6_1l0tm"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_2poj3"] size = Vector2(82, 20) -[sub_resource type="RectangleShape2D" id="RectangleShape2D_ebmjs"] - [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_2poj3"] [sub_resource type="CircleShape2D" id="CircleShape2D_3dryh"] @@ -33,18 +30,6 @@ metadata/_edit_group_ = true [node name="CollisionShape2D" type="CollisionShape2D" parent="platfrom" unique_id=1022493365] shape = SubResource("RectangleShape2D_2poj3") -[node name="RigidBody2D" parent="." unique_id=2099388145 instance=ExtResource("2_wowpa")] -position = Vector2(331, 234) - -[node name="RigidBody2D2" type="RigidBody2D" parent="." unique_id=1977575109] -position = Vector2(428.99997, 26) -rotation = 0.54410887 -metadata/_edit_group_ = true - -[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D2" unique_id=1267574160] -shape = SubResource("RectangleShape2D_ebmjs") -debug_color = Color(0.8238579, 0.39945692, 0.031017382, 0.41960785) - [node name="StaticBody2D" type="StaticBody2D" parent="." unique_id=1443311972] position = Vector2(402, 247) metadata/_edit_group_ = true @@ -64,8 +49,13 @@ metadata/_edit_group_ = true shape = SubResource("CircleShape2D_3dryh") debug_color = Color(0.77940935, 0.23498747, 0.906131, 0.41960785) -[node name="Grenade" parent="." unique_id=1054741787 instance=ExtResource("4_3dryh")] -position = Vector2(346, 91) +[node name="Crates" type="Node2D" parent="." unique_id=381122866] + +[node name="crate1" parent="Crates" unique_id=2099388145 instance=ExtResource("2_wowpa")] +position = Vector2(331, 234) + +[node name="RigidBody2D" parent="Crates" unique_id=1094262304 instance=ExtResource("2_wowpa")] +position = Vector2(447, 47) [connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"] [connection signal="triggerActiveSignal" from="Area2D" to="." method="_on_triggerSignal"] diff --git a/project.godot b/project.godot index e54f4c0..b077bdf 100644 --- a/project.godot +++ b/project.godot @@ -43,6 +43,11 @@ right={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194321,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } +jump={ +"deadzone": 0.2, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) +] +} [physics]