From 3607e63548ddb728391deae19d30be692a15e33f Mon Sep 17 00:00:00 2001 From: MarkYabut Date: Tue, 6 Oct 2026 20:58:01 -0400 Subject: [PATCH] fin --- project.godot | 8 ++++++ scenes/bullet.tscn | 16 ++++++++++++ scenes/game.tscn | 22 +++++++--------- scenes/player.tscn | 25 ++++++++++++++++++ scripts/bullet.gd | 17 ++++++++++++ scripts/bullet.gd.uid | 1 + scripts/gamecontroller.gd | 7 +++++ scripts/player.gd | 55 +++++++++++++++++++++++++++++++++++++-- scripts/scene_manager.gd | 2 ++ 9 files changed, 138 insertions(+), 15 deletions(-) create mode 100644 scenes/bullet.tscn create mode 100644 scenes/player.tscn create mode 100644 scripts/bullet.gd create mode 100644 scripts/bullet.gd.uid diff --git a/project.godot b/project.godot index 8140757..09aa1b8 100644 --- a/project.godot +++ b/project.godot @@ -27,6 +27,14 @@ folder_colors={ "res://scripts/": "red" } +[input] + +shove={ +"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":76,"key_label":0,"unicode":108,"location":0,"echo":false,"script":null) +] +} + [physics] 3d/physics_engine="Jolt Physics" diff --git a/scenes/bullet.tscn b/scenes/bullet.tscn new file mode 100644 index 0000000..72245a6 --- /dev/null +++ b/scenes/bullet.tscn @@ -0,0 +1,16 @@ +[gd_scene format=3 uid="uid://bdd87ih2rf4yk"] + +[ext_resource type="Script" uid="uid://ryrc3a88d0nh" path="res://scripts/bullet.gd" id="1_v7oki"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_rk402"] +size = Vector2(48, 6) + +[node name="Bullet" type="Area2D" unique_id=1365507081] +script = ExtResource("1_v7oki") +metadata/_edit_group_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=789397651] +shape = SubResource("RectangleShape2D_rk402") +debug_color = Color(0.8214046, 0, 0.03968804, 0.41960785) + +[connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/scenes/game.tscn b/scenes/game.tscn index c0cb45b..df627b2 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,16 +1,15 @@ [gd_scene format=3 uid="uid://cexci4ob8r45g"] [ext_resource type="Script" uid="uid://ct51411gsine2" path="res://scripts/gamecontroller.gd" id="1_lnu2h"] -[ext_resource type="Script" uid="uid://ct34rf6jscqmo" path="res://scripts/player.gd" id="1_uwrxv"] [ext_resource type="Script" uid="uid://dv2q4p6jb8h4s" path="res://scripts/scene_manager.gd" id="2_lbhrr"] [ext_resource type="PackedScene" uid="uid://b22qsgmtr231s" path="res://scenes/trigger.tscn" id="2_lnu2h"] [ext_resource type="PackedScene" uid="uid://5xgx7qarkj3o" path="res://scenes/crate.tscn" id="3_iywne"] +[ext_resource type="PackedScene" uid="uid://dtegcgc8xcxfg" path="res://scenes/player.tscn" id="4_iywne"] +[ext_resource type="PackedScene" uid="uid://bdd87ih2rf4yk" path="res://scenes/bullet.tscn" id="6_p57ef"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_rk402"] size = Vector2(336, 20) -[sub_resource type="CircleShape2D" id="CircleShape2D_3udav"] - [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_rk402"] [node name="Game" type="Node2D" unique_id=55511178] @@ -28,16 +27,10 @@ position = Vector2(134, 0) shape = SubResource("RectangleShape2D_rk402") [node name="Crate2" parent="." unique_id=643245962 instance=ExtResource("3_iywne")] -position = Vector2(318, 313) +position = Vector2(565, 386) -[node name="CharacterBody2D" type="CharacterBody2D" parent="." unique_id=1639753258] -position = Vector2(743, 389) -script = ExtResource("1_uwrxv") -metadata/_edit_group_ = true - -[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D" unique_id=1073881258] -shape = SubResource("CircleShape2D_3udav") -debug_color = Color(0.3147444, 0.626224, 7.70092e-07, 0.41960785) +[node name="Player" parent="." unique_id=196049189 instance=ExtResource("4_iywne")] +position = Vector2(649, 388) [node name="StaticBody2D2" type="StaticBody2D" parent="." unique_id=220630225] position = Vector2(622, 483) @@ -64,6 +57,9 @@ effect = "teleport" position = Vector2(407, 406) [node name="Crate" parent="." unique_id=329828405 instance=ExtResource("3_iywne")] -position = Vector2(410, 313) +position = Vector2(742, 388) + +[node name="Bullet" parent="." unique_id=1365507081 instance=ExtResource("6_p57ef")] +position = Vector2(469, 384) [connection signal="areaTriggered" from="Triggers/Trigger" to="." method="_on_trigger"] diff --git a/scenes/player.tscn b/scenes/player.tscn new file mode 100644 index 0000000..46fbdeb --- /dev/null +++ b/scenes/player.tscn @@ -0,0 +1,25 @@ +[gd_scene format=3 uid="uid://dtegcgc8xcxfg"] + +[ext_resource type="Script" uid="uid://ct34rf6jscqmo" path="res://scripts/player.gd" id="1_3vyb7"] + +[sub_resource type="CircleShape2D" id="CircleShape2D_3udav"] + +[node name="Player" type="CharacterBody2D" unique_id=196049189] +script = ExtResource("1_3vyb7") +metadata/_edit_group_ = true + +[node name="CollisionShape2D" type="CollisionShape2D" parent="." unique_id=2119336955] +shape = SubResource("CircleShape2D_3udav") +debug_color = Color(0.3147444, 0.626224, 7.70092e-07, 0.41960785) + +[node name="RightCast" type="RayCast2D" parent="." unique_id=2094112178] +target_position = Vector2(21, 0) + +[node name="LeftCast" type="RayCast2D" parent="." unique_id=696595381] +target_position = Vector2(-22, 0) + +[node name="RightSpawn" type="Marker2D" parent="." unique_id=1840944729] +position = Vector2(14, -6) + +[node name="LeftSpawn" type="Marker2D" parent="." unique_id=441180819] +position = Vector2(-13, -6) diff --git a/scripts/bullet.gd b/scripts/bullet.gd new file mode 100644 index 0000000..e1da75d --- /dev/null +++ b/scripts/bullet.gd @@ -0,0 +1,17 @@ +class_name Bullet extends Area2D + +var speed := 700 +signal bulletDamageSignal(body, bullet) + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + position += transform.x * speed * delta + + +func _on_body_entered(body: Node2D) -> void: + print("Bullet hit something " + body.to_string()) + bulletDamageSignal.emit(body, self) diff --git a/scripts/bullet.gd.uid b/scripts/bullet.gd.uid new file mode 100644 index 0000000..b2ebb42 --- /dev/null +++ b/scripts/bullet.gd.uid @@ -0,0 +1 @@ +uid://ryrc3a88d0nh diff --git a/scripts/gamecontroller.gd b/scripts/gamecontroller.gd index 63e4430..d12dbc6 100644 --- a/scripts/gamecontroller.gd +++ b/scripts/gamecontroller.gd @@ -22,3 +22,10 @@ func _on_trigger(effect: Variant, Object: Variant) -> void: print("Trigger wants to teleport") if Object is Crate: teleportSignal.emit(Object) + +func _on_bullet_hit(body, bullet) -> void: + print("GC knows bullet hit") + if body is Crate: + body.queue_free() + bullet.queue_free() + diff --git a/scripts/player.gd b/scripts/player.gd index 80f85c5..8adfa1b 100644 --- a/scripts/player.gd +++ b/scripts/player.gd @@ -1,15 +1,39 @@ class_name Player extends CharacterBody2D +@onready var right_cast: RayCast2D = $RightCast +@onready var left_cast: RayCast2D = $LeftCast +@onready var right_spawn: Marker2D = $RightSpawn +@onready var left_spawn: Marker2D = $LeftSpawn + +@export var shove_power:= 800 +@export var bump_power:= 50 + +enum FaceDirection {LEFT, RIGHT} +var facing: FaceDirection = FaceDirection.RIGHT + +var pushRightEnabled = false +var pushLeftEnabled = false +var pushTarget:Crate const SPEED = 300.0 const JUMP_VELOCITY = -400.0 - func _physics_process(delta: float) -> void: # Add the gravity. if not is_on_floor(): velocity += get_gravity() * delta + # Handle shove. + if Input.is_action_just_pressed("shove"): + print("Player shove!") + if pushRightEnabled and facing==FaceDirection.RIGHT: + # shove it right + pushTarget.apply_central_impulse(Vector2(1,0) * shove_power) + if pushLeftEnabled and facing==FaceDirection.LEFT: + # shove it left + pushTarget.apply_central_impulse(Vector2(-1,0) * shove_power) + + # Handle jump. if Input.is_action_just_pressed("ui_accept") and is_on_floor(): velocity.y = JUMP_VELOCITY @@ -19,6 +43,11 @@ func _physics_process(delta: float) -> void: var direction := Input.get_axis("ui_left", "ui_right") if direction: velocity.x = direction * SPEED + # set player direction + if direction < 0: + facing = FaceDirection.LEFT + if direction > 0: + facing = FaceDirection.RIGHT else: velocity.x = move_toward(velocity.x, 0, SPEED) @@ -27,4 +56,26 @@ func _physics_process(delta: float) -> void: for i in get_slide_collision_count(): var c = get_slide_collision(i) if c.get_collider() is RigidBody2D: - c.get_collider().apply_central_impulse(-c.get_normal() * 200) + c.get_collider().apply_central_impulse(-c.get_normal() * bump_power) + + if right_cast.is_colliding(): + print("Something on my right") + # get the thing i can shove + var collider = right_cast.get_collider() + if collider is Node: + pushRightEnabled = true + pushTarget = collider + else: + pushRightEnabled = false + + if left_cast.is_colliding(): + print("Something on my left") + # get the thing i can shove + var collider = left_cast.get_collider() + if collider is Node: + pushLeftEnabled = true + pushTarget = collider + else: + pushLeftEnabled = false + + diff --git a/scripts/scene_manager.gd b/scripts/scene_manager.gd index b8758aa..de7db68 100644 --- a/scripts/scene_manager.gd +++ b/scripts/scene_manager.gd @@ -2,11 +2,13 @@ class_name SceneManager extends Node2D @onready var triggers: Node2D = $"../Triggers" @onready var game: GameController = $".." +@onready var bullet: Bullet = $"../Bullet" # Called when the node enters the scene tree for the first time. func _ready() -> void: buildLevel() game.teleportSignal.connect(teleport) + bullet.bulletDamageSignal.connect(game._on_bullet_hit) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: