week2 prep, simple bullet creation

januaryproject/project.godot

@@ -20,3 +20,31 @@ config/icon="res://icon.svg"
 folder_colors={
 "res://scripts/": "red"
 }
+
+[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)
+]
+}
+push={
+"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)
+]
+}
+shoot={
+"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":90,"key_label":0,"unicode":122,"location":0,"echo":false,"script":null)
+]
+}

januaryproject/scenes/bullet.tscn

@@ -0,0 +1,13 @@
+[gd_scene load_steps=3 format=3 uid="uid://sh1w4h1sgw7g"]
+
+[ext_resource type="Script" path="res://scripts/bullet.gd" id="1_88s8x"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_f10ps"]
+size = Vector2(8, 4)
+
+[node name="Area2D" type="Area2D"]
+script = ExtResource("1_88s8x")
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_f10ps")
+debug_color = Color(0.93687, 0.231161, 0.261845, 0.42)

januaryproject/scenes/crate.tscn

@@ -2,7 +2,7 @@
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_jqoba"]
 
-[node name="RigidBody2D" type="RigidBody2D"]
+[node name="RigidBody2D" type="RigidBody2D" groups=["pushables"]]
 metadata/_edit_group_ = true
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]

januaryproject/scenes/game.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=9 format=3 uid="uid://r8jj43l4t6is"]
+[gd_scene load_steps=8 format=3 uid="uid://r8jj43l4t6is"]
 
 [ext_resource type="Script" path="res://scripts/gamecontroller.gd" id="1_8i1rq"]
 [ext_resource type="PackedScene" uid="uid://di3tq4f0xmdqc" path="res://scenes/crate.tscn" id="1_tfj4n"]
-[ext_resource type="Script" path="res://scripts/charactercontroller.gd" id="2_e3e8k"]
+[ext_resource type="PackedScene" uid="uid://xq3wqrcyvdhn" path="res://scenes/player.tscn" id="3_0kw1i"]
 [ext_resource type="Script" path="res://scripts/trigger.gd" id="3_hm0br"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_jk5qv"]
@@ -11,8 +11,6 @@ size = Vector2(66, 20)
 [sub_resource type="WorldBoundaryShape2D" id="WorldBoundaryShape2D_acecj"]
 distance = -430.0
 
-[sub_resource type="CircleShape2D" id="CircleShape2D_qrixx"]
-
 [sub_resource type="CircleShape2D" id="CircleShape2D_8j7te"]
 radius = 29.0
 
@@ -26,6 +24,13 @@ metadata/_edit_group_ = true
 [node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"]
 shape = SubResource("RectangleShape2D_jk5qv")
 
+[node name="StaticBody2D2" type="StaticBody2D" parent="."]
+position = Vector2(740, 416)
+metadata/_edit_group_ = true
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D2"]
+shape = SubResource("RectangleShape2D_jk5qv")
+
 [node name="RigidBody2D" parent="." instance=ExtResource("1_tfj4n")]
 position = Vector2(526, 297)
 rotation = 2.0228
@@ -46,15 +51,8 @@ rotation = 0.0531393
 [node name="CollisionShape2D" type="CollisionShape2D" parent="floor"]
 shape = SubResource("WorldBoundaryShape2D_acecj")
 
-[node name="CharacterBody2D" type="CharacterBody2D" parent="."]
+[node name="CharacterBody2D" parent="." instance=ExtResource("3_0kw1i")]
-position = Vector2(441, 314)
+position = Vector2(554, 334)
-script = ExtResource("2_e3e8k")
-PUSH_FORCE = 70
-metadata/_edit_group_ = true
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="CharacterBody2D"]
-shape = SubResource("CircleShape2D_qrixx")
-debug_color = Color(0.345561, 0.615334, 0.230675, 0.42)
 
 [node name="Area2D" type="Area2D" parent="."]
 position = Vector2(597, 419)
@@ -65,5 +63,7 @@ metadata/_edit_group_ = true
 shape = SubResource("CircleShape2D_8j7te")
 debug_color = Color(0.827271, 0.252084, 0.761388, 0.42)
 
+[node name="SceneManager" type="Node" parent="."]
+
 [connection signal="areaTrigger" from="Area2D" to="." method="_on_trigger"]
 [connection signal="body_entered" from="Area2D" to="Area2D" method="_on_body_entered"]

januaryproject/scenes/player.tscn

@@ -0,0 +1,25 @@
+[gd_scene load_steps=3 format=3 uid="uid://xq3wqrcyvdhn"]
+
+[ext_resource type="Script" path="res://scripts/charactercontroller.gd" id="1_kf287"]
+
+[sub_resource type="CircleShape2D" id="CircleShape2D_qrixx"]
+
+[node name="CharacterBody2D" type="CharacterBody2D"]
+script = ExtResource("1_kf287")
+metadata/_edit_group_ = true
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource("CircleShape2D_qrixx")
+debug_color = Color(0.345561, 0.615334, 0.230675, 0.42)
+
+[node name="RightRay" type="RayCast2D" parent="."]
+target_position = Vector2(16, -1)
+
+[node name="LeftRay" type="RayCast2D" parent="."]
+target_position = Vector2(-16, -1)
+
+[node name="RightTarget" type="Node2D" parent="."]
+position = Vector2(15, -10)
+
+[node name="LeftTarget" type="Node2D" parent="."]
+position = Vector2(-15, -10)

januaryproject/scripts/bullet.gd

@@ -0,0 +1,14 @@
+class_name Bullet extends Area2D
+
+var speed = 700
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	pass # Replace with function body.
+
+
+func _physics_process(delta: float) -> void:
+	position += transform.x * speed * delta
+	
+func setSpeed(val):
+	speed = val

januaryproject/scripts/charactercontroller.gd

@@ -3,27 +3,94 @@ extends CharacterBody2D
 
 const SPEED = 500.0
 const JUMP_VELOCITY = -600.0
-@export var PUSH_FORCE = 90
+@export var BUMP_FORCE = 90
+
+var faceLeft:bool = false
+#Force push variables
+var pushTarget
+@export var PUSH_FORCE = 750
+var pushLeftEnabled:= false
+var pushRightEnabled:= false
+@onready var right_ray: RayCast2D = $RightRay
+@onready var left_ray: RayCast2D = $LeftRay
+
+#Bullet variables
+@onready var right_target: Node2D = $RightTarget
+@onready var left_target: Node2D = $LeftTarget
+var bullet = preload("res://scenes/bullet.tscn")
+
 
 func _physics_process(delta: float) -> void:
 	# Add the gravity.
 	if not is_on_floor():
 		velocity += get_gravity() * delta
 
+	# Handle force push
+	if Input.is_action_just_pressed("push"):
+		#is there an object nearby?
+		if pushRightEnabled && faceLeft ==false:
+			pushTarget.apply_central_impulse(Vector2(1,0) * PUSH_FORCE * 2 )
+			pushRightEnabled = false
+		if pushLeftEnabled && faceLeft:
+			pushTarget.apply_central_impulse(Vector2(-1,0) * PUSH_FORCE * 2 )
+			pushLeftEnabled = false
+	# Handle Shoot
+	if Input.is_action_just_pressed("shoot"):
+		print("shooting")
+		var newBullet = bullet.instantiate()
+		owner.add_child(newBullet)
+		newBullet.transform = right_target.global_transform
+		if faceLeft:
+			newBullet.setSpeed(-750)
+			newBullet.transform = left_target.global_transform
+		
 	# 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
 
 	# 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
+		#track if the player is facing right or left
+		if direction > 0:
+			faceLeft = false
+		if direction < 0:
+			faceLeft = true
 	else:
 		velocity.x = move_toward(velocity.x, 0, SPEED)
 
 	move_and_slide()
+	#scan objects near player
+	if right_ray.is_colliding():
+		#we only care if the player is facing right
+		if not faceLeft:
+			var collider = right_ray.get_collider()
+				#we only care if the collider is a node
+			if collider is RigidBody2D:
+				print("This is a rigidbody")
+				#we only care if it is pushable
+				if collider.is_in_group("pushables"):
+					#mark the target for possible pushing
+					pushRightEnabled = true
+					pushTarget = collider
+			if collider is Area2D:
+				print("This is an area 2d")
+	else:
+		pushRightEnabled = false
+		
+	if left_ray.is_colliding():
+		if faceLeft:
+			var collider = left_ray.get_collider()
+			if collider is RigidBody2D:
+				if collider.is_in_group("pushables"):
+					pushLeftEnabled = true
+					pushTarget = collider
+	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)

januaryproject/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")