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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Albion
2022-12-10 09:21:04 +01:00
parent 742e4e2abb 5990c2ad91
commit d12388e268
2 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
project.godot
View File

@@ -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"
@@ -51,6 +56,7 @@ _global_script_classes=[{
}]
_global_script_class_icons={
"Cannon": "",
"Game": "",
"MapNode": "",
"Module": "",
"Storage": "",
@@ -74,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)
]
}

21
scripts/Logic/Game.gd
View File

@@ -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")