From 08de745774063df492afaf0d97a64a918ccf2ff2 Mon Sep 17 00:00:00 2001
From: Lukas Moungos <lukas.moungos@tum.de>
Date: Sat, 10 Dec 2022 03:31:43 +0100
Subject: [PATCH] Changes on Game.gd

---
 Nodes/game.tscn       |  2 +-
 project.godot         |  8 ++++++++
 scripts/Logic/Game.gd | 23 +++++++++++++++++++----
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/Nodes/game.tscn b/Nodes/game.tscn
index 02ab0d0..5fdcbeb 100644
--- a/Nodes/game.tscn
+++ b/Nodes/game.tscn
@@ -42,7 +42,7 @@ skeleton = NodePath("../..")
 curve = SubResource("Curve3D_ycdkn")
 
 [node name="PathFollow3D" type="PathFollow3D" parent="Player2Path"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -16)
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, -16)
 
 [node name="root" type="Node3D" parent="Player2Path/PathFollow3D"]
 transform = Transform3D(-0.0154456, -6.75146e-10, -0.999881, -5.21344e-12, 1, -6.75146e-10, 0.999881, -5.21341e-12, -0.0154456, 0, 0, 0)
diff --git a/project.godot b/project.godot
index 401df3a..e5b82ea 100644
--- a/project.godot
+++ b/project.godot
@@ -41,3 +41,11 @@ _global_script_class_icons={
 config/name="Semester Game Jam 2022"
 config/features=PackedStringArray("4.0", "Forward Plus")
 config/icon="res://icon.svg"
+
+[input]
+
+test={
+"deadzone": 0.5,
+"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":70,"unicode":0,"echo":false,"script":null)
+]
+}
diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd
index c5fb60f..95d1e7d 100644
--- a/scripts/Logic/Game.gd
+++ b/scripts/Logic/Game.gd
@@ -5,23 +5,38 @@ signal ammo_pickup
 signal shoot
 
 var t = 0.0
+var CAN_ENGAGE = true
+
 @onready var tween = create_tween() as Tween
+
 @onready var p1 = $Player1Path/PathFollow3D
 @onready var p2 = $Player2Path/PathFollow3D
 
+var speed_p1 = 10
+var speed_p2 = 10
 
 func _ready():
 	start_tween()
 
 func start_tween():
+	tween.stop()
+	tween = create_tween()
+	tween.set_parallel()
 	tween.set_trans(Tween.TRANS_LINEAR)	
-	tween.set_parallel(true)
-	tween.tween_property(p1, "progress_ratio", 1, 5)
-	tween.tween_property(p2, "progress_ratio", -1, 5)
+	tween.tween_property(p1, "progress_ratio", 1, speed_p1)
+	tween.tween_property(p2, "progress_ratio", -1, speed_p2)
+
+
 	
 func _process(delta):
-	if round(p1.position.distance_to(p2.position)) == 9:
+	if Input.is_action_pressed("test"):
+		speed_p1 = 5
+		start_tween()
+	
+	if round(p1.position.distance_to(p2.position)) == 9 && CAN_ENGAGE:
+		CAN_ENGAGE = false
 		emit_signal("shoot")
+		create_tween().tween_callback(func(): CAN_ENGAGE = true).set_delay(2)