kookroach/SemesterGameJam2022
1
0
Fork 0
mirror of https://github.com/PfandBoss/SemesterGameJam2022.git synced 2025-11-12 12:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Lukas Moungos
2022-12-10 09:16:22 +01:00
parent 1a289951c1
commit e45e95b5ff
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project.godot
View File

@@ -48,11 +48,6 @@ _global_script_classes=[{
"class": &"TrainEngine", "class": &"TrainEngine",
"language": &"GDScript", "language": &"GDScript",
"path": "res://scripts/Modules/Engine.gd" "path": "res://scripts/Modules/Engine.gd"
}, {
"base": "StraightMapNode",
"class": &"TurnMapNode",
"language": &"GDScript",
"path": "res://scripts/Logic/TurnMapNode.gd"
}] }]
_global_script_class_icons={ _global_script_class_icons={
"Cannon": "", "Cannon": "",
@@ -62,8 +57,7 @@ _global_script_class_icons={
"Storage": "", "Storage": "",
"StraightMapNode": "", "StraightMapNode": "",
"Train": "", "Train": "",
"TrainEngine": "", "TrainEngine": ""
"TurnMapNode": ""
} }
[application] [application]

21
scripts/Logic/Game.gd
View File

@@ -1,10 +1,16 @@
extends Node extends Node
class_name Game class_name Game
const CHILL = 0
const FIGHTING = 1
#Signals #Signals
signal ammo_pickup signal ammo_pickup
signal shoot signal shoot
var fight_state = CHILL
var t = 0.0 var t = 0.0
@onready var p1_train = $Player1 as Train @onready var p1_train = $Player1 as Train
@@ -19,6 +25,7 @@ func _ready():
p2_node = StartNode p2_node = StartNode
p2_train.get_node("CharacterBody3D").is_player1 = false p2_train.get_node("CharacterBody3D").is_player1 = false
p2_train.is_P1 = false p2_train.is_P1 = false
p1_train.current_speed = 10
p1_train.hit.connect(_on_hit_player) p1_train.hit.connect(_on_hit_player)
p2_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_node = p2_node._on_train_exit(p2_train)
p2_train.current_distance = distance_delta 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"): if Input.is_action_pressed("test"):
emit_signal("shoot") emit_signal("shoot")