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

Assets/Model/Weapons/Canon.glb.import

@@ -0,0 +1,45 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://df1p6wn43228a"
+path="res://.godot/imported/Canon.glb-2e2816fe12000dfedda548448b663bc3.scn"
+
+[deps]
+
+source_file="res://Assets/Model/Weapons/Canon.glb"
+dest_files=["res://.godot/imported/Canon.glb-2e2816fe12000dfedda548448b663bc3.scn"]
+
+[params]
+
+nodes/root_type="Node3D"
+nodes/root_name="Scene Root"
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+import_script/path=""
+_subresources={
+"materials": {
+"Copper": {
+"use_external/enabled": true,
+"use_external/path": "res://Assets/Textures/CopperOxidated/M_Copper.tres"
+},
+"CopperNew": {
+"use_external/enabled": true,
+"use_external/path": "res://Assets/Textures/CopperNew/CleanCopper.tres"
+},
+"Plank": {
+"use_external/enabled": true,
+"use_external/path": "res://Assets/Textures/Wood/M_Wood.tres"
+}
+}
+}

Assets/Sounds/_MUSIC_/GameJamGameLoop.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://c5jhukuk8r3mf"
+path="res://.godot/imported/GameJamGameLoop.wav-c8bcea87ea942fc39cb10efef3595ba4.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav"
+dest_files=["res://.godot/imported/GameJamGameLoop.wav-c8bcea87ea942fc39cb10efef3595ba4.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_MUSIC_/MenuGameJamLoop.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://bmawra1dgi812"
+path="res://.godot/imported/MenuGameJamLoop.wav-b78626804c2a97fb8c90da2879521b3d.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_MUSIC_/MenuGameJamLoop.wav"
+dest_files=["res://.godot/imported/MenuGameJamLoop.wav-b78626804c2a97fb8c90da2879521b3d.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/Explosion.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://fj0v7v4wuymk"
+path="res://.godot/imported/Explosion.wav-0ed45ecf181b161b48e733a79eab9436.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/Explosion.wav"
+dest_files=["res://.godot/imported/Explosion.wav-0ed45ecf181b161b48e733a79eab9436.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/GleiseLoop.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://n4ynf7hg2pcl"
+path="res://.godot/imported/GleiseLoop.wav-dc9bdee7692ae6f84a098acf2c0d9c00.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav"
+dest_files=["res://.godot/imported/GleiseLoop.wav-dc9bdee7692ae6f84a098acf2c0d9c00.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/Gunpowder.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://b52sd64x20ulv"
+path="res://.godot/imported/Gunpowder.wav-ecd59218797c519cfbd400864e841744.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav"
+dest_files=["res://.godot/imported/Gunpowder.wav-ecd59218797c519cfbd400864e841744.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/Kohle.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://di3yqwqsn5v5s"
+path="res://.godot/imported/Kohle.wav-3be444ffc5b94b44e1165ee607f5b311.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/Kohle.wav"
+dest_files=["res://.godot/imported/Kohle.wav-3be444ffc5b94b44e1165ee607f5b311.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/MotorAn+Laeuft.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ctumm3pwwj2lb"
+path="res://.godot/imported/MotorAn+Laeuft.wav-6e56719196a851ad47fc3aa6f3d1e6d1.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/MotorAn+Laeuft.wav"
+dest_files=["res://.godot/imported/MotorAn+Laeuft.wav-6e56719196a851ad47fc3aa6f3d1e6d1.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/MotorLaeuftLoop.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://i346p30578gj"
+path="res://.godot/imported/MotorLaeuftLoop.wav-271eab3018d7f781ef4d64cccb14ebfe.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/MotorLaeuftLoop.wav"
+dest_files=["res://.godot/imported/MotorLaeuftLoop.wav-271eab3018d7f781ef4d64cccb14ebfe.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/Muell.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://csenkrbfeeds7"
+path="res://.godot/imported/Muell.wav-0399d159285780c0b1ede2eca8ea93bd.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/Muell.wav"
+dest_files=["res://.godot/imported/Muell.wav-0399d159285780c0b1ede2eca8ea93bd.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/Reload.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dtbjuy3hs2wq7"
+path="res://.godot/imported/Reload.wav-16a3c1cc3c4147d16c001560fcd3725b.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/Reload.wav"
+dest_files=["res://.godot/imported/Reload.wav-16a3c1cc3c4147d16c001560fcd3725b.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/RepairMetal.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ba3o8fhxepgib"
+path="res://.godot/imported/RepairMetal.wav-b5168acc8936d40b0398d7769c9e09a7.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/RepairMetal.wav"
+dest_files=["res://.godot/imported/RepairMetal.wav-b5168acc8936d40b0398d7769c9e09a7.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/SOSloop.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://ck8g8frarx4o4"
+path="res://.godot/imported/SOSloop.wav-c6952e406703876d320ccd0595341bd2.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/SOSloop.wav"
+dest_files=["res://.godot/imported/SOSloop.wav-c6952e406703876d320ccd0595341bd2.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/SnowFoot.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dx6udmaih74hd"
+path="res://.godot/imported/SnowFoot.wav-09346a1dfa75de970df9dbcda5c5cb5b.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/SnowFoot.wav"
+dest_files=["res://.godot/imported/SnowFoot.wav-09346a1dfa75de970df9dbcda5c5cb5b.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/WindLoop.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://dovvnflvxtqpi"
+path="res://.godot/imported/WindLoop.wav-ecfe7d1bea31999d420cc5961c31f79a.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav"
+dest_files=["res://.godot/imported/WindLoop.wav-ecfe7d1bea31999d420cc5961c31f79a.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/crafted.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://drkqs0xu3k1n6"
+path="res://.godot/imported/crafted.wav-e69bedd2f6ab3fa9767e31813cc6ddc0.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/crafted.wav"
+dest_files=["res://.godot/imported/crafted.wav-e69bedd2f6ab3fa9767e31813cc6ddc0.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Sounds/_SOUNDFX_/somethingIDK.wav.import

@@ -0,0 +1,24 @@
+[remap]
+
+importer="wav"
+type="AudioStreamWAV"
+uid="uid://b51delj0a3lgs"
+path="res://.godot/imported/somethingIDK.wav-dd5ef85771ba1eb75ca511393863afa4.sample"
+
+[deps]
+
+source_file="res://Assets/Sounds/_SOUNDFX_/somethingIDK.wav"
+dest_files=["res://.godot/imported/somethingIDK.wav-dd5ef85771ba1eb75ca511393863afa4.sample"]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop_mode=0
+edit/loop_begin=0
+edit/loop_end=-1
+compress/mode=0

Assets/Textures/CopperNew/CleanCopper.tres

@@ -0,0 +1,13 @@
+[gd_resource type="StandardMaterial3D" load_steps=4 format=3 uid="uid://6iimuun6ruv4"]
+
+[ext_resource type="Texture2D" uid="uid://dbjxy01lkuvle" path="res://Assets/Textures/CopperNew/copper_Metallic.png" id="1_xkanr"]
+[ext_resource type="Texture2D" uid="uid://bh776vcqbunoi" path="res://Assets/Textures/CopperNew/copper_Normal.png" id="2_vx0hn"]
+[ext_resource type="Texture2D" uid="uid://dwlxmetf7l5gf" path="res://Assets/Textures/CopperNew/copper_Rougness.png" id="3_wnjt4"]
+
+[resource]
+albedo_color = Color(0.52549, 0.509804, 0.54902, 1)
+metallic = 1.0
+metallic_texture = ExtResource("1_xkanr")
+roughness_texture = ExtResource("3_wnjt4")
+normal_enabled = true
+normal_texture = ExtResource("2_vx0hn")

Assets/Textures/CopperNew/copper_Metallic.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dbjxy01lkuvle"
+path.s3tc="res://.godot/imported/copper_Metallic.png-ae3c85d788ee1e58cb36ec2a4a0a050b.s3tc.ctex"
+path.etc2="res://.godot/imported/copper_Metallic.png-ae3c85d788ee1e58cb36ec2a4a0a050b.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Textures/CopperNew/copper_Metallic.png"
+dest_files=["res://.godot/imported/copper_Metallic.png-ae3c85d788ee1e58cb36ec2a4a0a050b.s3tc.ctex", "res://.godot/imported/copper_Metallic.png-ae3c85d788ee1e58cb36ec2a4a0a050b.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/CopperNew/copper_Normal.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bh776vcqbunoi"
+path.s3tc="res://.godot/imported/copper_Normal.png-f6cf1169750e9a792adead9e1cb66c00.s3tc.ctex"
+path.etc2="res://.godot/imported/copper_Normal.png-f6cf1169750e9a792adead9e1cb66c00.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Textures/CopperNew/copper_Normal.png"
+dest_files=["res://.godot/imported/copper_Normal.png-f6cf1169750e9a792adead9e1cb66c00.s3tc.ctex", "res://.godot/imported/copper_Normal.png-f6cf1169750e9a792adead9e1cb66c00.etc2.ctex"]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/bptc_ldr=0
+compress/normal_map=1
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=1
+roughness/src_normal="res://Assets/Textures/CopperNew/copper_Normal.png"
+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/CopperNew/copper_Rougness.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dwlxmetf7l5gf"
+path.s3tc="res://.godot/imported/copper_Rougness.png-3cfd3f1bf077a4b823808a312e357c2c.s3tc.ctex"
+path.etc2="res://.godot/imported/copper_Rougness.png-3cfd3f1bf077a4b823808a312e357c2c.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/Textures/CopperNew/copper_Rougness.png"
+dest_files=["res://.godot/imported/copper_Rougness.png-3cfd3f1bf077a4b823808a312e357c2c.s3tc.ctex", "res://.godot/imported/copper_Rougness.png-3cfd3f1bf077a4b823808a312e357c2c.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

Nodes/Bin.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://iuoepenpnktv"]
+[gd_scene load_steps=4 format=3 uid="uid://bkpnrgcfr1jgl"]
 
 [ext_resource type="Texture2D" uid="uid://pwyskequsdls" path="res://bin.png" id="1_krl02"]
 [ext_resource type="Script" path="res://scripts/Modules/Bin.gd" id="1_saxpo"]

Nodes/Keys.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://7qppu15lvd1j"
+path.s3tc="res://.godot/imported/Keys.png-cbe66c8e5c30f379fc899081aa9795b6.s3tc.ctex"
+path.etc2="res://.godot/imported/Keys.png-cbe66c8e5c30f379fc899081aa9795b6.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Nodes/Keys.png"
+dest_files=["res://.godot/imported/Keys.png-cbe66c8e5c30f379fc899081aa9795b6.s3tc.ctex", "res://.godot/imported/Keys.png-cbe66c8e5c30f379fc899081aa9795b6.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

Nodes/Player.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=4 format=3 uid="uid://vwjd5od63jgh"]
+[gd_scene load_steps=5 format=3 uid="uid://vwjd5od63jgh"]
 
 [ext_resource type="Script" path="res://scripts/Player.gd" id="1_dta8q"]
+[ext_resource type="Texture2D" uid="uid://7qppu15lvd1j" path="res://Nodes/Keys.png" id="2_h1504"]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_h8ivv"]
 radius = 0.494048
@@ -21,3 +22,24 @@ shape = SubResource("CylinderShape3D_h8ivv")
 [node name="CollisionShape3D" type="CollisionShape3D" parent="HitBox"]
 transform = Transform3D(2.74062, 0, 0, 0, 2.24144, 0, 0, 0, 2.70992, 0, 0, 0)
 shape = SubResource("CylinderShape3D_8lrgm")
+
+[node name="MiniGameButton0" type="Sprite3D" parent="."]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, 6, 0)
+texture = ExtResource("2_h1504")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton1" type="Sprite3D" parent="."]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 1.5, 6, 0)
+texture = ExtResource("2_h1504")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton2" type="Sprite3D" parent="."]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 3, 6, 0)
+texture = ExtResource("2_h1504")
+hframes = 5
+vframes = 8
+frame = 26

Nodes/Train_P1.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=20 format=3 uid="uid://md2ofbviios3"]
+[gd_scene load_steps=22 format=3 uid="uid://md2ofbviios3"]
 
 [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"]
+[ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="3_1ix85"]
 [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="3_in6up"]
 [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="3_jmv6b"]
 [ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="4_5jw5g"]
@@ -14,6 +15,7 @@
 [ext_resource type="Texture2D" uid="uid://ctbxpx6p36bdi" path="res://walking_ball2.png" id="8_0u1e2"]
 [ext_resource type="Texture2D" uid="uid://ckdlv6b7okseq" path="res://walking_powder2.png" id="10_a137a"]
 [ext_resource type="Texture2D" uid="uid://b5ioch3ad8y6r" path="res://walking_coal2.png" id="11_1jgcf"]
+[ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="16_q3kvk"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_okaqh"]
 size = Vector3(1, 3.77669, 24)
@@ -122,4 +124,17 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, 0.876562
 currentType = 2
 
 [node name="Cannon" parent="." instance=ExtResource("5_vgxqe")]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.4817, 1.2303, 0.0486939)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.32927, 1.2303, 0.0486939)
+
+[node name="Cannon2" parent="." instance=ExtResource("5_vgxqe")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 4.38381, 1.2303, 5.95106)
+
+[node name="Engine" parent="." instance=ExtResource("3_1ix85")]
+transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, -3.45639, 1.1688, 9)
+
+[node name="Bin" parent="." instance=ExtResource("16_q3kvk")]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.70291, -0.287106, 10.1948)
+
+[node name="Storage3" parent="." instance=ExtResource("4_5jw5g")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.63306, -0.501894, -11.5457)
+currentType = 1

Nodes/UI.tscn

@@ -1,10 +1,12 @@
-[gd_scene load_steps=5 format=3 uid="uid://cys06pnxfjl2m"]
+[gd_scene load_steps=6 format=3 uid="uid://cys06pnxfjl2m"]
 
 [ext_resource type="Texture2D" uid="uid://b8rsm7uapp583" path="res://undefined - Imgur (1).png" id="1_cb7ct"]
 [ext_resource type="Texture2D" uid="uid://44lfs83sax35" path="res://undefined - Imgur.png" id="2_udann"]
 
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_fir3c"]
 
+[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_3mtn2"]
+
 [sub_resource type="StyleBoxTexture" id="StyleBoxTexture_oa1ad"]
 
 [node name="Control" type="Control"]
@@ -19,6 +21,7 @@ size_flags_horizontal = 4
 
 [node name="Panel" type="Panel" parent="."]
 custom_minimum_size = Vector2(15, 0)
+layout_mode = 1
 anchors_preset = 13
 anchor_left = 0.5
 anchor_right = 0.5
@@ -27,6 +30,7 @@ grow_horizontal = 2
 grow_vertical = 2
 
 [node name="VSlider" type="VSlider" parent="."]
+layout_mode = 1
 anchors_preset = 13
 anchor_left = 0.5
 anchor_right = 0.5
@@ -38,11 +42,13 @@ grow_vertical = 2
 pivot_offset = Vector2(32, 0)
 theme_override_icons/grabber_disabled = ExtResource("1_cb7ct")
 theme_override_styles/grabber_area = SubResource("StyleBoxTexture_fir3c")
+theme_override_styles/grabber_area_highlight = SubResource("StyleBoxTexture_3mtn2")
 max_value = 150.0
 editable = false
 scrollable = false
 
 [node name="VSlider2" type="VSlider" parent="."]
+layout_mode = 1
 anchors_preset = 13
 anchor_left = 0.5
 anchor_right = 0.5
@@ -53,6 +59,7 @@ grow_horizontal = 2
 grow_vertical = 2
 theme_override_icons/grabber_disabled = ExtResource("2_udann")
 theme_override_styles/grabber_area = SubResource("StyleBoxTexture_oa1ad")
+theme_override_styles/grabber_area_highlight = SubResource("StyleBoxTexture_3mtn2")
 max_value = 150.0
 value = 50.0
 editable = false

Nodes/cannon.tscn

@@ -1,16 +1,12 @@
-[gd_scene load_steps=4 format=3 uid="uid://byo1m0n20yl45"]
+[gd_scene load_steps=3 format=3 uid="uid://byo1m0n20yl45"]
 
 [ext_resource type="Script" path="res://scripts/Modules/Cannon.gd" id="1_vdn0s"]
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_2geka"]
-
-[sub_resource type="CylinderMesh" id="CylinderMesh_g6oe4"]
+[sub_resource type="BoxShape3D" id="BoxShape3D_sm3et"]
+size = Vector3(3.10406, 3, 2)
 
 [node name="Cannon" type="StaticBody3D"]
 script = ExtResource("1_vdn0s")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-shape = SubResource("CylinderShape3D_2geka")
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
-mesh = SubResource("CylinderMesh_g6oe4")
+shape = SubResource("BoxShape3D_sm3et")

Nodes/engine.tscn

@@ -0,0 +1,17 @@
+[gd_scene load_steps=4 format=3 uid="uid://bhivunrkj87cy"]
+
+[ext_resource type="Script" path="res://scripts/Modules/Engine.gd" id="1_8ew0t"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_qba77"]
+
+[sub_resource type="BoxMesh" id="BoxMesh_wu8t1"]
+
+[node name="Engine" type="StaticBody3D"]
+script = ExtResource("1_8ew0t")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(0.9, 0, 0, 0, 0.9, 0, 0, 0, 0.9, 0, 0, 0)
+shape = SubResource("BoxShape3D_qba77")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+mesh = SubResource("BoxMesh_wu8t1")

Nodes/game.tscn

@@ -42,7 +42,7 @@ near = 0.041
 transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, -10, 0, 0)
 
 [node name="Train2" parent="." instance=ExtResource("4_lmu0s")]
-transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 10, 0, 0)
+transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 9.90113, -0.0549407, -0.085681)
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(0.875944, -0.294781, 0.381872, -0.0210188, 0.767515, 0.640687, -0.481955, -0.569232, 0.666104, 0, 8.25958, 0)

Nodes/light_setup.tscn

@@ -0,0 +1,30 @@
+[gd_scene load_steps=4 format=3 uid="uid://crj1k7txwig77"]
+
+[sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ghq3e"]
+sky_top_color = Color(0.662745, 0.356863, 0.129412, 1)
+sky_horizon_color = Color(0.815686, 0.145098, 0.254902, 1)
+
+[sub_resource type="Sky" id="Sky_y00o5"]
+sky_material = SubResource("ProceduralSkyMaterial_ghq3e")
+process_mode = 1
+
+[sub_resource type="Environment" id="Environment_t4j8q"]
+background_mode = 2
+background_energy_multiplier = 0.78
+sky = SubResource("Sky_y00o5")
+ambient_light_source = 3
+tonemap_mode = 2
+ssao_enabled = true
+ssao_power = 9.0943
+ssao_detail = 1.31
+ssao_horizon = 0.21
+ssil_enabled = true
+
+[node name="LightSetup" type="Node"]
+
+[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
+transform = Transform3D(0.722372, -0.152892, 0.674391, -0.260844, 0.842959, 0.470511, -0.640421, -0.515795, 0.569048, 0, 8.25958, 0)
+shadow_enabled = true
+
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
+environment = SubResource("Environment_t4j8q")

Nodes/train.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://c1mymb38wqdg6"]
+[gd_scene load_steps=11 format=3 uid="uid://c1mymb38wqdg6"]
 
 [ext_resource type="PackedScene" uid="uid://by5dkvik2ti0a" path="res://Assets/Model/Train/TrainFloorTile4x4.glb" id="1_ruoy4"]
 [ext_resource type="PackedScene" uid="uid://bbt38m8mno0d2" path="res://Assets/Model/Train/TrainWall.glb" id="2_ph0y0"]
@@ -9,6 +9,7 @@
 [ext_resource type="PackedScene" uid="uid://gihk416gd7tx" path="res://Assets/Model/Train/TrainPillarArcExtention.glb" id="7_87n8g"]
 [ext_resource type="PackedScene" uid="uid://dfljj7kor8v2j" path="res://Assets/Model/Train/TrainPillarWood.glb" id="7_hd70v"]
 [ext_resource type="PackedScene" uid="uid://08f17h0im640" path="res://Assets/Model/Train/TrainWallInterior.glb" id="9_yvbc7"]
+[ext_resource type="PackedScene" uid="uid://df1p6wn43228a" path="res://Assets/Model/Weapons/Canon.glb" id="10_54n3n"]
 
 [node name="train" type="Node3D"]
 
@@ -127,3 +128,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6, 0, -2)
 
 [node name="TrainWallInterior3" parent="." instance=ExtResource("9_yvbc7")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8, 0, -2)
+
+[node name="Canon" parent="." instance=ExtResource("10_54n3n")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 6.14337, 0, 1.47043)
+
+[node name="Canon2" parent="." instance=ExtResource("10_54n3n")]
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 2.07371, 0, 1.47043)

menu/main_menu.tscn

@@ -34,27 +34,27 @@ grow_horizontal = 2
 grow_vertical = 2
 
 [node name="Start" type="Button" parent="VBoxContainer"]
-offset_right = 72.0
+offset_right = 87.0
 offset_bottom = 31.0
 text = "Start
 "
 
 [node name="Tutorial" type="Button" parent="VBoxContainer"]
 offset_top = 35.0
-offset_right = 72.0
+offset_right = 87.0
 offset_bottom = 66.0
 text = "Tutorial
 "
 
 [node name="Settings" type="Button" parent="VBoxContainer"]
 offset_top = 70.0
-offset_right = 72.0
+offset_right = 87.0
 offset_bottom = 101.0
 text = "Volume:"
 
 [node name="VolSlider" type="HSlider" parent="VBoxContainer"]
 offset_top = 105.0
-offset_right = 72.0
+offset_right = 87.0
 offset_bottom = 121.0
 min_value = -30.0
 max_value = 0.0
@@ -62,11 +62,14 @@ script = ExtResource("2_h85ei")
 
 [node name="Quit" type="Button" parent="VBoxContainer"]
 offset_top = 125.0
-offset_right = 72.0
+offset_right = 87.0
 offset_bottom = 156.0
 text = "Quit"
 
 [node name="FullScreen" type="Button" parent="VBoxContainer"]
+offset_top = 160.0
+offset_right = 87.0
+offset_bottom = 191.0
 text = "Fullscreen"
 
 [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"]

project.godot

@@ -29,7 +29,7 @@ _global_script_classes=[{
 "language": &"GDScript",
 "path": "res://scripts/Logic/MapNode.gd"
 }, {
-"base": "Node",
+"base": "StaticBody3D",
 "class": &"Module",
 "language": &"GDScript",
 "path": "res://scripts/Modules/Module.gd"
@@ -137,3 +137,8 @@ p2_interact={
 "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)
 ]
 }
+p1_extra={
+"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":88,"unicode":0,"echo":false,"script":null)
+]
+}

scripts/Modules/Bin.gd

@@ -6,4 +6,4 @@ class_name Bin
 
 #------------Methods-------------#
 func interact(player):
-	player.inventory = 0
+	player.clearInventory()

scripts/Modules/Cannon.gd

@@ -22,19 +22,17 @@ func interact(player):
 		if player.getResource() == 0:
 			if currentStashValue < maxStashValue:
 				currentStashValue += 1
+				player.clearInventory()
 			return
-		return
+		
 		if player.getResource() == 1:
 			if currentPowderStashValue < maxPowderStashValue:
 				currentPowderStashValue += 1
+				player.clearInventory()
 			return
 		return
 
 func shoot():
-	if not CAN_ENGAGE:
-		return false
-	CAN_ENGAGE = false
-	create_tween().tween_callback(func(): CAN_ENGAGE = true).set_delay(2)
 	if currentStashValue >= 1 and currentPowderStashValue >= 1 and currentState == STATE.INACTIVE:
 		currentState = STATE.SHOOTING
 		currentStashValue -= 1

scripts/Modules/Engine.gd

@@ -16,18 +16,24 @@ func _ready():
 	currentState = STATE.RUNNING
 #TODO: FINISH
 func interact(player):
+	if player.getResource() != 2:
+		return
 	if currentState == STATE.RUNNING:
 		if (train.current_speed + refuelRate) <= maxSpeed:
 			train.current_speed += refuelRate
+			player.clearInventory()
 		if train.current_speed >= maxSpeed:
 				train.current_speed = maxSpeed
-		return
-	#TODO: Repair Train
-	currentState = STATE.RUNNING
 				
-#
+		return
+
+
+
+
 func _process(delta):
 	if not train.is_dead():
 		train.current_speed -= 0.1 * delta
+		print(train.current_speed)
+		
 	
 

scripts/Modules/Module.gd

@@ -34,9 +34,9 @@ func _set_currentStashValue(newValue):
 func _get_currentStashValue():
 	return currentStashValue
 func _set_maxStashValue(newValue):
-	currentStashValue = newValue
+	maxStashValue = newValue
 func _get_maxStashValue():
-	return currentStashValue
+	return maxStashValue
 func _set_level(newValue):
 	level = newValue
 func _get_level():

scripts/Player.gd

@@ -14,10 +14,68 @@ var idle
 
 enum TYPE {AMMO, GUNPOWDER, FUEL}
 
+var P1inMiniGame = 0
+var P2inMiniGame = 0
+var MiniGame = [-1, -1, -1]
+var MiniGamePos = 0 
+var rng = RandomNumberGenerator.new()
 #---------------Methods--------------#
 func _ready():
 	walking = "walking"
 	idle = "idle"
+	$MiniGameButton0.hide()
+	$MiniGameButton1.hide()
+	$MiniGameButton2.hide()
+
+func miniGameColor(input: int, red: int):
+	if(input == 0):
+		$MiniGameButton0.modulate = Color(1,1,red)
+	if(input == 1):
+		$MiniGameButton1.modulate = Color(1,1,red)
+	if(input == 2):
+		$MiniGameButton2.modulate = Color(1,1,red)
+
+func miniGameReset():
+	MiniGamePos = 0
+	miniGameColor(0,1)
+	miniGameColor(1,1)
+	miniGameColor(2,1)
+	MiniGame[0] = rng.randi_range(0, 3)
+	miniGameSetArrow(0)
+	MiniGame[1] = rng.randi_range(0, 3)
+	miniGameSetArrow(1)
+	MiniGame[2] = rng.randi_range(0, 3)
+	miniGameSetArrow(2)
+
+func miniGameSetArrow(buttonNr: int):
+	if(buttonNr == 0):
+		$MiniGameButton0.frame = 26 + MiniGame[0]
+	if(buttonNr == 1):
+		$MiniGameButton1.frame = 26 + MiniGame[1]
+	if(buttonNr == 2):
+		$MiniGameButton2.frame = 26 + MiniGame[2]
+	
+func miniGameCheck(input : int):
+	if(input == MiniGame[MiniGamePos]):
+		miniGameColor(MiniGamePos, 0)
+		MiniGamePos = MiniGamePos +1
+	else:
+		miniGameReset()
+	
+	if(MiniGamePos >= 3):
+		$MiniGameButton0.hide()
+		$MiniGameButton1.hide()
+		$MiniGameButton2.hide()
+		P1inMiniGame = 0
+		miniGameReset()
+	
+func _process(delta):
+	if Input.is_action_just_pressed("p1_extra"):
+		if(P1inMiniGame == 0):
+			P1inMiniGame = 1
+			$MiniGameButton0.show()
+			$MiniGameButton1.show()
+			$MiniGameButton2.show()
 
 func _physics_process(delta):
 	if(velocity.length() > 0):
@@ -40,23 +98,43 @@ func _physics_process(delta):
 	
 func check_input():
 	if is_player1:
-		if Input.is_action_pressed("p1_left"):
-			movement.x -= 1
-		if Input.is_action_pressed("p1_right"):
-			movement.x += 1
-		if Input.is_action_pressed("p1_up"):
-			movement.z -= 1
-		if Input.is_action_pressed("p1_down"):
-			movement.z += 1
+		if(!P1inMiniGame):
+			if Input.is_action_pressed("p1_left"):
+				movement.x -= 1
+			if Input.is_action_pressed("p1_right"):
+				movement.x += 1
+			if Input.is_action_pressed("p1_up"):
+				movement.z -= 1
+			if Input.is_action_pressed("p1_down"):
+				movement.z += 1
+		else:
+			if Input.is_action_just_pressed("p1_up"):
+				miniGameCheck(0)
+			if Input.is_action_just_pressed("p1_right"):
+				miniGameCheck(1)
+			if Input.is_action_just_pressed("p1_down"):
+				miniGameCheck(2)
+			if Input.is_action_just_pressed("p1_left"):
+				miniGameCheck(3)
 	else:
-		if Input.is_action_pressed("p2_left"):
-			movement.x -= 1
-		if Input.is_action_pressed("p2_right"):
-			movement.x += 1
-		if Input.is_action_pressed("p2_up"):
-			movement.z -= 1
-		if Input.is_action_pressed("p2_down"):
-			movement.z += 1
+		if(!P2inMiniGame):
+			if Input.is_action_pressed("p2_left"):
+				movement.x -= 1
+			if Input.is_action_pressed("p2_right"):
+				movement.x += 1
+			if Input.is_action_pressed("p2_up"):
+				movement.z -= 1
+			if Input.is_action_pressed("p2_down"):
+				movement.z += 1
+		else:
+			if Input.is_action_just_pressed("p2_up"):
+				miniGameCheck(0)
+			if Input.is_action_just_pressed("p2_right"):
+				miniGameCheck(1)
+			if Input.is_action_just_pressed("p2_down"):
+				miniGameCheck(2)
+			if Input.is_action_just_pressed("p2_left"):
+				miniGameCheck(3)
 		
 func check_interaction():
 	var action
@@ -95,5 +173,7 @@ func getResource():
 	
 func clearInventory():
 	inventory = 0
+	print("cleared")
 	walking = "walking"
 	idle = "idle"
+	

scripts/Train.gd

@@ -33,3 +33,15 @@ func is_dead():
 		game_over.emit()
 		return true
 	return false
+	
+func on_pickup(type, amount):
+	for s in STORAGES:
+		if s.currentType == type:
+			if s.currentStashValue + amount <= s.maxStashValue:
+				s.currentStashValue += amount
+			else:
+				s.currentStashValue = s.maxStashValue
+			
+			return
+	
+