From e45e95b5ff4330dacf5329ef8c9f7657d5dfc4e0 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Sat, 10 Dec 2022 09:16:22 +0100 Subject: [PATCH 1/2] revert --- project.godot | 8 +------- scripts/Logic/Game.gd | 23 ++++++++++++++++++++++- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/project.godot b/project.godot index 0b88a90..243c082 100644 --- a/project.godot +++ b/project.godot @@ -48,11 +48,6 @@ _global_script_classes=[{ "class": &"TrainEngine", "language": &"GDScript", "path": "res://scripts/Modules/Engine.gd" -}, { -"base": "StraightMapNode", -"class": &"TurnMapNode", -"language": &"GDScript", -"path": "res://scripts/Logic/TurnMapNode.gd" }] _global_script_class_icons={ "Cannon": "", @@ -62,8 +57,7 @@ _global_script_class_icons={ "Storage": "", "StraightMapNode": "", "Train": "", -"TrainEngine": "", -"TurnMapNode": "" +"TrainEngine": "" } [application] diff --git a/scripts/Logic/Game.gd b/scripts/Logic/Game.gd index 5db9c6b..0f68480 100644 --- a/scripts/Logic/Game.gd +++ b/scripts/Logic/Game.gd @@ -1,10 +1,16 @@ extends Node class_name Game +const CHILL = 0 +const FIGHTING = 1 + + #Signals signal ammo_pickup signal shoot +var fight_state = CHILL + var t = 0.0 @onready var p1_train = $Player1 as Train @@ -19,6 +25,7 @@ func _ready(): p2_node = StartNode p2_train.get_node("CharacterBody3D").is_player1 = false p2_train.is_P1 = false + p1_train.current_speed = 10 p1_train.hit.connect(_on_hit_player) p2_train.hit.connect(_on_hit_player) @@ -43,6 +50,20 @@ func _process(delta): p2_node = p2_node._on_train_exit(p2_train) p2_train.current_distance = distance_delta - + if(p1_node == p2_node && p1_train.current_distance - p2_train.current_distance < 2): + if(fight_state == CHILL): + var tween = create_tween() + tween.tween_property($Camera3D, "position", Vector3(0,10,0), 1) + fight_state = FIGHTING + else: + fight_state = CHILL + var tween = create_tween() + tween.tween_property($Camera3D, "position", Vector3(0,20,0), 1) + + if Input.is_action_pressed("test"): emit_signal("shoot") + + + + From 5990c2ad91e7a3538ef744adad3127e87aac1a23 Mon Sep 17 00:00:00 2001 From: Lukas Moungos Date: Sat, 10 Dec 2022 09:19:03 +0100 Subject: [PATCH 2/2] inputs --- project.godot | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 64 insertions(+), 1 deletion(-) diff --git a/project.godot b/project.godot index da5d962..0b88a90 100644 --- a/project.godot +++ b/project.godot @@ -15,6 +15,11 @@ _global_script_classes=[{ "path": "res://scripts/Modules/Cannon.gd" }, { "base": "Node", +"class": &"Game", +"language": &"GDScript", +"path": "res://scripts/Logic/Game.gd" +}, { +"base": "Node", "class": &"MapNode", "language": &"GDScript", "path": "res://scripts/Logic/MapNode.gd" @@ -43,20 +48,28 @@ _global_script_classes=[{ "class": &"TrainEngine", "language": &"GDScript", "path": "res://scripts/Modules/Engine.gd" +}, { +"base": "StraightMapNode", +"class": &"TurnMapNode", +"language": &"GDScript", +"path": "res://scripts/Logic/TurnMapNode.gd" }] _global_script_class_icons={ "Cannon": "", +"Game": "", "MapNode": "", "Module": "", "Storage": "", "StraightMapNode": "", "Train": "", -"TrainEngine": "" +"TrainEngine": "", +"TurnMapNode": "" } [application] config/name="Semester Game Jam 2022" +run/main_scene="res://node_3d.tscn" config/features=PackedStringArray("4.0", "Forward Plus") config/icon="res://icon.svg" @@ -67,3 +80,53 @@ test={ "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) ] } +p1_left={ +"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":65,"unicode":0,"echo":false,"script":null) +] +} +p1_right={ +"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":68,"unicode":0,"echo":false,"script":null) +] +} +p1_up={ +"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":87,"unicode":0,"echo":false,"script":null) +] +} +p1_down={ +"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":83,"unicode":0,"echo":false,"script":null) +] +} +p1_interact={ +"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":71,"unicode":0,"echo":false,"script":null) +] +} +p2_left={ +"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":4194319,"unicode":0,"echo":false,"script":null) +] +} +p2_right={ +"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":4194321,"unicode":0,"echo":false,"script":null) +] +} +p2_up={ +"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":4194320,"unicode":0,"echo":false,"script":null) +] +} +p2_down={ +"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":4194322,"unicode":0,"echo":false,"script":null) +] +} +p2_interact={ +"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":46,"unicode":0,"echo":false,"script":null) +] +}