From d427fa82f1bb77b322603a02333d768459e69ba5 Mon Sep 17 00:00:00 2001 From: Arthur Date: Sat, 10 Dec 2022 03:20:51 +0100 Subject: [PATCH 1/3] Update Storage.gd --- scripts/Modules/Storage.gd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Modules/Storage.gd b/scripts/Modules/Storage.gd index 54f8ac7..baf1804 100644 --- a/scripts/Modules/Storage.gd +++ b/scripts/Modules/Storage.gd @@ -14,10 +14,10 @@ func _ready(): currentStashValue = 0 func interact(): if currentStashValue >= 1: - --currentStashValue + currentStashValue -= 1 return func _on_signal_storing(): if currentStashValue < maxStashValue: - ++currentStashValue + currentStashValue += 1 return From 08de745774063df492afaf0d97a64a918ccf2ff2 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Sat, 10 Dec 2022 03:31:43 +0100 Subject: [PATCH 2/3] 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) From 35d1bf72f3e656203fd1aeb2aa7e927727c3f2a6 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Sat, 10 Dec 2022 03:43:27 +0100 Subject: [PATCH 3/3] Changes on Cannon.gd --- Nodes/cannon.tscn | 2 +- Nodes/game.tscn | 2 +- scripts/Logic/Game.gd | 5 +---- scripts/Modules/Cannon.gd | 10 ++++++++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Nodes/cannon.tscn b/Nodes/cannon.tscn index 6782155..1771df1 100644 --- a/Nodes/cannon.tscn +++ b/Nodes/cannon.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=2 format=3 uid="uid://kupfq75m0v37"] +[gd_scene load_steps=2 format=3 uid="uid://byo1m0n20yl45"] [ext_resource type="Script" path="res://scripts/Modules/Cannon.gd" id="1_vdn0s"] diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 8bf6463..5fdcbeb 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=5 format=3 uid="uid://bl1yrgr7g06db"] +[gd_scene load_steps=5 format=3 uid="uid://n7w0ff7u25yc"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"] diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd index 95d1e7d..76cdbfe 100644 --- a/scripts/Logic/Game.gd +++ b/scripts/Logic/Game.gd @@ -5,7 +5,6 @@ signal ammo_pickup signal shoot var t = 0.0 -var CAN_ENGAGE = true @onready var tween = create_tween() as Tween @@ -33,10 +32,8 @@ func _process(delta): speed_p1 = 5 start_tween() - if round(p1.position.distance_to(p2.position)) == 9 && CAN_ENGAGE: - CAN_ENGAGE = false + if round(p1.position.distance_to(p2.position)) == 9: emit_signal("shoot") - create_tween().tween_callback(func(): CAN_ENGAGE = true).set_delay(2) diff --git a/scripts/Modules/Cannon.gd b/scripts/Modules/Cannon.gd index 0cdf903..83e5b63 100644 --- a/scripts/Modules/Cannon.gd +++ b/scripts/Modules/Cannon.gd @@ -4,6 +4,8 @@ class_name Cannon enum STATE {INACTIVE, RELOADING, SHOOTING} +var CAN_ENGAGE = true + #------------Methods-------------# func _ready(): var root = get_tree().root.get_child(0) @@ -23,10 +25,14 @@ func interact(): return func _on_signal_shooting(): - print("hit") + if not CAN_ENGAGE: + return + CAN_ENGAGE = false + create_tween().tween_callback(func(): CAN_ENGAGE = true).set_delay(2) + if currentStashValue >= 1 and currentState == STATE.INACTIVE: currentState = STATE.SHOOTING currentStashValue -= 1 - #TODO: SHOOTING + print("hit") currentState = STATE.INACTIVE return