working force push with raycast

2025-01-13 19:30:02 -05:00 · 2025-01-13 19:30:02 -05:00 · 08a1145c50
commit 08a1145c50
parent 25288b722b
5 changed files with 106 additions and 18 deletions
--- a/willowproject/Scenes/game.tscn
+++ b/willowproject/Scenes/game.tscn
@ -1,8 +1,8 @@
-[gd_scene load_steps=9 format=3 uid="uid://csqvvi0t51tkk"]
+[gd_scene load_steps=8 format=3 uid="uid://csqvvi0t51tkk"]

 [ext_resource type="PackedScene" uid="uid://dqsi0p3t8k43x" path="res://Scenes/crate.tscn" id="1_34u55"]
 [ext_resource type="Script" path="res://Scripts/gamecontroller.gd" id="1_pru2w"]
-[ext_resource type="Script" path="res://Scripts/charactercontroller.gd" id="2_543ck"]
+[ext_resource type="PackedScene" uid="uid://5p0tso7jy35l" path="res://Scenes/player.tscn" id="3_d2fxm"]
 [ext_resource type="Script" path="res://Scripts/Trigger.gd" id="3_wy0yn"]

 [sub_resource type="RectangleShape2D" id="RectangleShape2D_nbgu3"]
@ -10,8 +10,6 @@ size = Vector2(34, 14)

 [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_rywi2"]

-[sub_resource type="CircleShape2D" id="CircleShape2D_n1jqc"]
-
 [sub_resource type="CircleShape2D" id="CircleShape2D_5gjsm"]
 radius = 60.0167

@ -30,7 +28,7 @@ position = Vector2(515, 226)
 rotation = -0.722934

 [node name="RigidBody2D2" parent="." instance=ExtResource("1_34u55")]
-position = Vector2(508, 126)
+position = Vector2(286, 285)
 rotation = 0.295972

 [node name="RigidBody2D3" parent="." instance=ExtResource("1_34u55")]
@ -38,14 +36,14 @@ position = Vector2(427, 201)
 rotation = -2.25067

 [node name="RigidBody2D4" parent="." instance=ExtResource("1_34u55")]
-position = Vector2(436, 259)
+position = Vector2(224, 127)

 [node name="RigidBody2D5" parent="." instance=ExtResource("1_34u55")]
 position = Vector2(365, 241)
 rotation = -0.505816

 [node name="RigidBody2D6" parent="." instance=ExtResource("1_34u55")]
-position = Vector2(378, 136)
+position = Vector2(104, 103)
 rotation = 0.727138

 [node name="Floor" type="StaticBody2D" parent="."]
@ -55,13 +53,23 @@ metadata/_edit_group_ = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="Floor"]
 shape = SubResource("WorldBoundaryShape2D_rywi2")

-[node name="CharacterBody2D" type="CharacterBody2D" parent="."]
-position = Vector2(571, 162)
-script = ExtResource("2_543ck")
+[node name="Left Wall" type="StaticBody2D" parent="."]
+position = Vector2(0, 245)
+rotation = 1.5708
 metadata/_edit_group_ = true

-[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]
-shape = SubResource("CircleShape2D_n1jqc")
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Left Wall"]
+shape = SubResource("WorldBoundaryShape2D_rywi2")
+
+[node name="Right Wall" type="StaticBody2D" parent="."]
+position = Vector2(841, 225)
+rotation = 4.70835
+metadata/_edit_group_ = true
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Right Wall"]
+shape = SubResource("WorldBoundaryShape2D_rywi2")
+
+[node name="CharacterBody2D" parent="." instance=ExtResource("3_d2fxm")]

 [node name="Area2D" type="Area2D" parent="."]
 position = Vector2(663, 356)
--- a/willowproject/Scenes/player.tscn
+++ b/willowproject/Scenes/player.tscn
@ -0,0 +1,19 @@
+[gd_scene load_steps=3 format=3 uid="uid://5p0tso7jy35l"]
+
+[ext_resource type="Script" path="res://Scripts/charactercontroller.gd" id="1_tlb8a"]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_n1jqc"]
+
+[node name="CharacterBody2D" type="CharacterBody2D"]
+script = ExtResource("1_tlb8a")
+metadata/_edit_group_ = true
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource("CircleShape2D_n1jqc")
+
+[node name="RightRay" type="RayCast2D" parent="."]
+target_position = Vector2(33, 0)
+collide_with_areas = true
+
+[node name="LeftRay" type="RayCast2D" parent="."]
+target_position = Vector2(-33, 0)
--- a/willowproject/Scripts/charactercontroller.gd
+++ b/willowproject/Scripts/charactercontroller.gd
@ -3,7 +3,17 @@ extends CharacterBody2D

 const SPEED = 300.0
 const JUMP_VELOCITY = -450.0
-@export var PUSH_FORCE = 90
+@export var BUMP_FORCE = 90
+
+# Shove Attack Variables
+@onready var right_ray: RayCast2D = $RightRay
+@onready var left_ray: RayCast2D = $LeftRay
+var faceLeft = false
+var pushTarget
+var pushRightEnabled = false
+var pushLeftEnabled = false
+@export var PUSH_FORCE = 700
+

 func _physics_process(delta: float) -> void:
 	# Add the gravity.
@ -11,19 +21,48 @@ func _physics_process(delta: float) -> void:
 		velocity += get_gravity() * delta

 	# Handle jump.
-	if Input.is_action_just_pressed("ui_accept") and is_on_floor():
+	if Input.is_action_just_pressed("jump") and is_on_floor():
 		velocity.y = JUMP_VELOCITY

+# Shove Attack
+	if Input.is_action_just_pressed("shove"):
+		if pushRightEnabled && faceLeft == false:
+			pushTarget.apply_central_impulse(Vector2(1,0)* PUSH_FORCE * 2)
+		if pushLeftEnabled && faceLeft == true:
+			pushTarget.apply_central_impulse(Vector2(-1,0)*PUSH_FORCE * 2)
+
 	# Get the input direction and handle the movement/deceleration.
 	# As good practice, you should replace UI actions with custom gameplay actions.
-	var direction := Input.get_axis("ui_left", "ui_right")
+	var direction := Input.get_axis("left", "right")
 	if direction:
 		velocity.x = direction * SPEED
+		if direction <0:
+			faceLeft = true
+		if direction >0:
+			faceLeft = false
 	else:
 		velocity.x = move_toward(velocity.x, 0, SPEED)

 	move_and_slide()
+	if right_ray.is_colliding():
+		if not faceLeft:
+			var collider = right_ray.get_collider()
+			if collider is RigidBody2D:
+				pushTarget = collider
+				pushRightEnabled = true
+	else:
+		pushRightEnabled = false
+
+	if left_ray.is_colliding():
+		if faceLeft:
+			var collider = left_ray.get_collider()
+			if collider is RigidBody2D:
+				pushTarget = collider
+				pushLeftEnabled = true
+	else:
+		pushLeftEnabled = false
+	
 	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() * PUSH_FORCE)
+			c.get_collider().apply_central_impulse(-c.get_normal() * BUMP_FORCE)
--- a/willowproject/Scripts/gamecontroller.gd
+++ b/willowproject/Scripts/gamecontroller.gd
@ -10,10 +10,9 @@ func _ready() -> void:
 	timer.wait_time = 1
 	timer.one_shot = false
 	timer.connect("timeout", secondCounter)
-	timer.start()
+	# timer.start()

 func secondCounter():
-	print("one second")
 	countdown -=1
 	if countdown <=0:
 		print("YOU LOSE")
--- a/willowproject/project.godot
+++ b/willowproject/project.godot
@ -21,3 +21,26 @@ folder_colors={
 "res://Scenes/": "green",
 "res://Scripts/": "yellow"
 }
+
+[input]
+
+right={
+"deadzone": 0.5,
+"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":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
+]
+}
+left={
+"deadzone": 0.5,
+"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":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
+]
+}
+jump={
+"deadzone": 0.5,
+"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)
+]
+}
+shove={
+"deadzone": 0.5,
+"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":88,"key_label":0,"unicode":120,"location":0,"echo":false,"script":null)
+]
+}