Merge branch 'main' of https://github.com/PfandBoss/SemesterGameJam2022

Assets/Model/Modules/maxresdefault.jpg.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bsxhdtbfplt15"
+path.s3tc="res://.godot/imported/maxresdefault.jpg-78d1b291af23f4f2adba21bbf86609fd.s3tc.ctex"
+path.etc2="res://.godot/imported/maxresdefault.jpg-78d1b291af23f4f2adba21bbf86609fd.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Model/Modules/maxresdefault.jpg"
+dest_files=["res://.godot/imported/maxresdefault.jpg-78d1b291af23f4f2adba21bbf86609fd.s3tc.ctex", "res://.godot/imported/maxresdefault.jpg-78d1b291af23f4f2adba21bbf86609fd.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/bptc_ldr=0
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=0

Assets/Textures/Gunpowder.png.import

@@ -2,26 +2,28 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://clemmheiw1kq"
+uid="uid://dv742ane2ga8j"
-path="res://.godot/imported/Gunpowder.png-f662122f3929411add4bcd12f4c21e21.ctex"
+path.s3tc="res://.godot/imported/Gunpowder.png-f662122f3929411add4bcd12f4c21e21.s3tc.ctex"
+path.etc2="res://.godot/imported/Gunpowder.png-f662122f3929411add4bcd12f4c21e21.etc2.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://Assets/Textures/Gunpowder.png"
-dest_files=["res://.godot/imported/Gunpowder.png-f662122f3929411add4bcd12f4c21e21.ctex"]
+dest_files=["res://.godot/imported/Gunpowder.png-f662122f3929411add4bcd12f4c21e21.s3tc.ctex", "res://.godot/imported/Gunpowder.png-f662122f3929411add4bcd12f4c21e21.etc2.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +33,4 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0

Assets/Textures/Kohle.png.import

@@ -2,26 +2,28 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://dfqal4ri4ftrf"
+uid="uid://c1n54mdavt5w6"
-path="res://.godot/imported/Kohle.png-2be21c5c26a72d51f2eb2ca2dbf16029.ctex"
+path.s3tc="res://.godot/imported/Kohle.png-2be21c5c26a72d51f2eb2ca2dbf16029.s3tc.ctex"
+path.etc2="res://.godot/imported/Kohle.png-2be21c5c26a72d51f2eb2ca2dbf16029.etc2.ctex"
 metadata={
-"vram_texture": false
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
 }
 
 [deps]
 
 source_file="res://Assets/Textures/Kohle.png"
-dest_files=["res://.godot/imported/Kohle.png-2be21c5c26a72d51f2eb2ca2dbf16029.ctex"]
+dest_files=["res://.godot/imported/Kohle.png-2be21c5c26a72d51f2eb2ca2dbf16029.s3tc.ctex", "res://.godot/imported/Kohle.png-2be21c5c26a72d51f2eb2ca2dbf16029.etc2.ctex"]
 
 [params]
 
-compress/mode=0
+compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/bptc_ldr=0
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=false
+mipmaps/generate=true
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""
@@ -31,4 +33,4 @@ process/normal_map_invert_y=false
 process/hdr_as_srgb=false
 process/hdr_clamp_exposure=false
 process/size_limit=0
-detect_3d/compress_to=1
+detect_3d/compress_to=0

Nodes/UI.gd

@@ -0,0 +1,11 @@
+extends Control
+
+
+func _on_button_pressed():
+	print("HELLO")
+	get_tree().change_scene_to_file("res://Nodes/game.tscn")
+
+
+func _on_button_2_pressed():
+	print("sddssds")
+	get_tree().change_scene_to_file("res://menu/main_menu.tscn")

Nodes/UI.tscn

@@ -1,9 +1,12 @@
-[gd_scene load_steps=8 format=3 uid="uid://cys06pnxfjl2m"]
+[gd_scene load_steps=12 format=3 uid="uid://cys06pnxfjl2m"]
 
 [ext_resource type="Texture2D" uid="uid://b8rsm7uapp583" path="res://undefined - Imgur (1).png" id="1_cb7ct"]
+[ext_resource type="Script" path="res://Nodes/UI.gd" id="1_dxr24"]
 [ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="2_udann"]
-[ext_resource type="PackedScene" path="res://menu/stats_player_1.tscn" id="3_yhsvf"]
+[ext_resource type="Texture2D" uid="uid://cxfybbp5idjwg" path="res://o_idle1.png" id="3_segqn"]
+[ext_resource type="PackedScene" uid="uid://dgr3cta6n1tg3" path="res://menu/stats_player_1.tscn" id="3_yhsvf"]
 [ext_resource type="PackedScene" path="res://menu/stats_player_2.tscn" id="4_c4m18"]
+[ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_uiyin"]
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_fir3c"]
 
@@ -11,15 +14,20 @@
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_oa1ad"]
 
+[sub_resource type="LabelSettings" id="LabelSettings_ot0gm"]
+font_size = 30
+shadow_size = 10
+shadow_color = Color(0, 0, 0, 0.858824)
+
 [node name="Control" type="Control"]
 layout_mode = 3
-anchors_preset = 13
+anchors_preset = 15
-anchor_left = 0.5
+anchor_right = 1.0
-anchor_right = 0.5
 anchor_bottom = 1.0
 grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 4
+script = ExtResource("1_dxr24")
 
 [node name="Panel" type="Panel" parent="."]
 custom_minimum_size = Vector2(15, 0)
@@ -64,19 +72,109 @@ value = 50.0
 editable = false
 scrollable = false
 
+[node name="GameOver" type="Control" parent="."]
+visible = false
+layout_mode = 3
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="Label" type="Label" parent="GameOver"]
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -46.0
+offset_top = -184.0
+offset_right = 46.0
+offset_bottom = -158.0
+grow_horizontal = 2
+grow_vertical = 2
+text = "GAME OVER"
+label_settings = SubResource("LabelSettings_ot0gm")
+horizontal_alignment = 1
+
+[node name="VBoxContainer" type="VBoxContainer" parent="GameOver"]
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -87.5
+offset_top = 194.0
+offset_right = 87.5
+offset_bottom = 260.0
+grow_horizontal = 2
+grow_vertical = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+
+[node name="Button" type="Button" parent="GameOver/VBoxContainer"]
+offset_right = 175.0
+offset_bottom = 31.0
+text = "RESTART"
+
+[node name="Button2" type="Button" parent="GameOver/VBoxContainer"]
+offset_top = 35.0
+offset_right = 175.0
+offset_bottom = 66.0
+text = "BACK TO MAIN MENU"
+
+[node name="BoxContainer" type="BoxContainer" parent="GameOver"]
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -502.0
+offset_top = -250.0
+offset_right = 502.0
+offset_bottom = 250.0
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="HBoxContainer" type="HBoxContainer" parent="GameOver/BoxContainer"]
+custom_minimum_size = Vector2(900, 500)
+offset_right = 1004.0
+offset_bottom = 500.0
+size_flags_horizontal = 4
+size_flags_vertical = 4
+
+[node name="TextureRect" type="TextureRect" parent="GameOver/BoxContainer/HBoxContainer"]
+custom_minimum_size = Vector2(500, 0)
+offset_right = 500.0
+offset_bottom = 500.0
+texture = ExtResource("3_segqn")
+ignore_texture_size = true
+
+[node name="TextureRect2" type="TextureRect" parent="GameOver/BoxContainer/HBoxContainer"]
+custom_minimum_size = Vector2(500, 0)
+offset_left = 504.0
+offset_right = 1004.0
+offset_bottom = 500.0
+texture = ExtResource("4_uiyin")
+ignore_texture_size = true
+
 [node name="Control" type="Control" parent="."]
 layout_mode = 3
-anchors_preset = 0
+anchors_preset = 15
-offset_left = -579.0
+anchor_right = 1.0
-offset_right = 575.0
+anchor_bottom = 1.0
-offset_bottom = 649.0
+grow_horizontal = 2
+grow_vertical = 2
 
 [node name="Stats_Player1" parent="Control" instance=ExtResource("3_yhsvf")]
-offset_right = 345.0
+anchors_preset = 0
-offset_bottom = -288.0
+anchor_bottom = 0.0
+offset_right = 0.0
+grow_vertical = 1
 scale = Vector2(0.6, 0.6)
 
 [node name="Stats_Player2" parent="Control" instance=ExtResource("4_c4m18")]
-offset_left = -187.0
-offset_right = 125.0
 scale = Vector2(0.6, 0.6)
+
+[connection signal="pressed" from="GameOver/VBoxContainer/Button" to="." method="_on_button_pressed"]
+[connection signal="pressed" from="GameOver/VBoxContainer/Button2" to="." method="_on_button_2_pressed"]

Nodes/game.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"]
+[gd_scene load_steps=10 format=3 uid="uid://b8u4bo4mklj55"]
 
 [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"]
 [ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"]
@@ -9,19 +9,6 @@
 [ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_wagg2"]
 [ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_c6uwu"]
 [ext_resource type="AudioStream" uid="uid://dovvnflvxtqpi" path="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav" id="9_q7v3t"]
-[ext_resource type="Shader" path="res://Nodes/game.gdshader" id="10_s0qsw"]
-[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="11_1bton"]
-
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_l0twu"]
-render_priority = 0
-shader = ExtResource("10_s0qsw")
-shader_parameter/albedo = ExtResource("11_1bton")
-shader_parameter/direction_and_speed = Vector2(0, 0)
-shader_parameter/flip = false
-shader_parameter/scale = Vector2(7, 7)
-
-[sub_resource type="BoxMesh" id="BoxMesh_ygh83"]
-material = SubResource("ShaderMaterial_l0twu")
 
 [node name="Game" type="Node"]
 script = ExtResource("1_dubwq")
@@ -47,7 +34,6 @@ transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 10.9011,
 
 [node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("7_wagg2")
-volume_db = -8.0
 autoplay = true
 
 [node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."]
@@ -56,10 +42,5 @@ autoplay = true
 
 [node name="AudioStreamPlayer3" type="AudioStreamPlayer" parent="."]
 stream = ExtResource("9_q7v3t")
+volume_db = -2.476
 autoplay = true
-
-[node name="Node3D" type="Node3D" parent="."]
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="Node3D"]
-transform = Transform3D(-1.21955e-05, 0, 243, 0, 1.168, 0, -279, 0, -1.06219e-05, 0, -1.88844, 0)
-mesh = SubResource("BoxMesh_ygh83")

Nodes/tutorial.tscn

@@ -0,0 +1,46 @@
+[gd_scene load_steps=10 format=3 uid="uid://bgwci5mt6p7tl"]
+
+[ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_3rjlq"]
+[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_dqvju"]
+[ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_exgxq"]
+[ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_vwrhp"]
+[ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_sqrdv"]
+[ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="6_pa4ds"]
+[ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_5xnbn"]
+[ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_r1pyb"]
+[ext_resource type="AudioStream" uid="uid://dovvnflvxtqpi" path="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav" id="9_k3f0t"]
+
+[node name="Game" type="Node"]
+script = ExtResource("1_3rjlq")
+
+[node name="LightSetup" parent="." instance=ExtResource("2_dqvju")]
+
+[node name="StartNode" parent="." instance=ExtResource("3_exgxq")]
+
+[node name="Camera3D" type="Camera3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0.5, 0.866025, 0, -0.866025, 0.5, 0, 44, 25.0132)
+current = true
+fov = 30.0
+size = 32.0
+near = 0.041
+
+[node name="Train1" parent="." instance=ExtResource("4_vwrhp")]
+transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -11, 0, 0)
+
+[node name="Train2" parent="." instance=ExtResource("5_sqrdv")]
+transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 10.9011, -0.0549407, -0.085681)
+
+[node name="Control" parent="." instance=ExtResource("6_pa4ds")]
+
+[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("7_5xnbn")
+autoplay = true
+
+[node name="AudioStreamPlayer2" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("8_r1pyb")
+autoplay = true
+
+[node name="AudioStreamPlayer3" type="AudioStreamPlayer" parent="."]
+stream = ExtResource("9_k3f0t")
+volume_db = -2.476
+autoplay = true

menu/stats_player_2.tscn

@@ -1,10 +1,8 @@
-[gd_scene load_steps=7 format=3 uid="uid://bpvxwo2otee3b"]
+[gd_scene load_steps=5 format=3 uid="uid://d3cmkdvgaiypf"]
 
 [ext_resource type="PackedScene" uid="uid://bxlhdan6h6qwi" path="res://menu/Speedometer_player1.tscn" id="1_8v7ps"]
 [ext_resource type="Script" path="res://menu/stats_player_2.gd" id="1_buc37"]
 [ext_resource type="Texture2D" uid="uid://qud0m3iwlyed" path="res://Assets/Textures/GUI/frame_player2.png" id="3_mx7a4"]
-[ext_resource type="Texture2D" uid="uid://dfqal4ri4ftrf" path="res://Assets/Textures/Kohle.png" id="3_tjc2l"]
-[ext_resource type="Texture2D" uid="uid://clemmheiw1kq" path="res://Assets/Textures/Gunpowder.png" id="4_jn38u"]
 [ext_resource type="Texture2D" uid="uid://bhmyyu0uhx541" path="res://Assets/Textures/Opera_senza_titolo (2).png" id="5_b5gk5"]
 
 [node name="Stats_Player2" type="Control"]
@@ -12,12 +10,11 @@ layout_mode = 3
 anchors_preset = 1
 anchor_left = 1.0
 anchor_right = 1.0
-offset_left = -312.0
-offset_bottom = 409.0
 grow_horizontal = 0
 script = ExtResource("1_buc37")
 
 [node name="Speedometer_player1" parent="." instance=ExtResource("1_8v7ps")]
+layout_mode = 1
 anchors_preset = 1
 anchor_left = 1.0
 anchor_right = 1.0
@@ -28,6 +25,7 @@ grow_horizontal = 0
 scale = Vector2(0.5, 0.5)
 
 [node name="Rahmen2" type="TextureRect" parent="."]
+layout_mode = 1
 anchors_preset = 1
 anchor_left = 1.0
 anchor_right = 1.0
@@ -40,6 +38,7 @@ texture = ExtResource("3_mx7a4")
 
 [node name="RessourcenBox" type="HBoxContainer" parent="."]
 visible = false
+layout_mode = 1
 anchors_preset = 3
 anchor_left = 1.0
 anchor_top = 1.0
@@ -55,50 +54,34 @@ scale = Vector2(0.05, 0.05)
 theme_override_constants/separation = 330
 
 [node name="Kohle" type="VBoxContainer" parent="RessourcenBox"]
-offset_right = 945.0
+layout_mode = 2
-offset_bottom = 1060.0
 theme_override_constants/separation = 10
 
 [node name="TextureRect" type="TextureRect" parent="RessourcenBox/Kohle"]
-offset_right = 945.0
+layout_mode = 2
-offset_bottom = 931.0
-texture = ExtResource("3_tjc2l")
 
 [node name="Label" type="Label" parent="RessourcenBox/Kohle"]
-offset_top = 941.0
+layout_mode = 2
-offset_right = 945.0
-offset_bottom = 967.0
 text = "5
 "
 
 [node name="GunPowder" type="VBoxContainer" parent="RessourcenBox"]
-offset_left = 1275.0
+layout_mode = 2
-offset_right = 2220.0
-offset_bottom = 1060.0
 
 [node name="TextureRect" type="TextureRect" parent="RessourcenBox/GunPowder"]
-offset_right = 945.0
+layout_mode = 2
-offset_bottom = 931.0
-texture = ExtResource("4_jn38u")
 
 [node name="Label" type="Label" parent="RessourcenBox/GunPowder"]
-offset_top = 935.0
+layout_mode = 2
-offset_right = 945.0
-offset_bottom = 958.0
 
 [node name="Munition" type="VBoxContainer" parent="RessourcenBox"]
-offset_left = 2550.0
+layout_mode = 2
-offset_right = 3495.0
-offset_bottom = 1060.0
 size_flags_stretch_ratio = 0.39
 
 [node name="MunitionSprite" type="TextureRect" parent="RessourcenBox/Munition"]
-offset_right = 945.0
+layout_mode = 2
-offset_bottom = 931.0
 texture = ExtResource("5_b5gk5")
 
 [node name="Label" type="Label" parent="RessourcenBox/Munition"]
-offset_top = 935.0
+layout_mode = 2
-offset_right = 945.0
-offset_bottom = 977.0
 theme_override_font_sizes/font_size = 30

project.godot

@@ -29,7 +29,7 @@ _global_script_classes=[{
 "language": &"GDScript",
 "path": "res://scripts/Logic/MapNode.gd"
 }, {
-"base": "StaticBody3D",
+"base": "Node",
 "class": &"Module",
 "language": &"GDScript",
 "path": "res://scripts/Modules/Module.gd"

scripts/Logic/Game.gd

@@ -37,7 +37,9 @@ func _ready():
 	p2_train.is_P1 = false
 	p1_train.hit.connect(_on_hit_player)
 	p2_train.hit.connect(_on_hit_player)
-	p1_train.current_speed = 9
+	p1_train.game_over.connect(_on_player_game_over)
+	p2_train.game_over.connect(_on_player_game_over)
+	p1_train.current_speed = 1
 	p2_train.current_speed = 6
 
 func getMapSize(node, is_start):
@@ -51,7 +53,15 @@ func getMapSize(node, is_start):
 	else:
 		getMapSize(node.next, false)
 		active_map_nodes += 1
-	
+
+func _on_player_game_over():
+	p1_train.current_speed = 0
+	p2_train.current_speed = 0
+	p1_train.visible = false
+	p2_train.visible = false
+	for child in $Control.get_children():
+		child.hide()
+	$Control/GameOver.visible = true
 
 func _on_turn_event():
 	#
@@ -68,10 +78,11 @@ func _set_starting_Positions():
 
 func _on_hit_player(player1,dmg):
 	if not player1:
-		p2_train.current_speed -= dmg
-	else:
 		p1_train.current_speed -= dmg
-	
+	else:
+		p2_train.current_speed -= dmg
+
+
 func _process(delta):
 	if(active_pickups.size() < 1):
 		fillPickups()