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

Nodes/Player.tscn

@@ -1,7 +1,6 @@
-[gd_scene load_steps=5 format=3 uid="uid://vwjd5od63jgh"]
+[gd_scene load_steps=4 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
@@ -23,24 +22,3 @@ 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,7 +1,11 @@
-[gd_scene load_steps=23 format=3 uid="uid://md2ofbviios3"]
+<<<<<<< Updated upstream
+[gd_scene load_steps=24 format=3 uid="uid://md2ofbviios3"]
+=======
+[gd_scene load_steps=27 format=3 uid="uid://md2ofbviios3"]
+>>>>>>> Stashed changes
 
 [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" 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"]
@@ -12,11 +16,19 @@
 [ext_resource type="Texture2D" uid="uid://d35iaj0nq122a" path="res://walking_powder1.png" id="6_kfxv2"]
 [ext_resource type="Texture2D" uid="uid://eg0k8esm2scp" path="res://p5lFkJY.png" id="6_m0hj7"]
 [ext_resource type="Texture2D" uid="uid://du7d6fk4dabd7" path="res://cVOQuID.png" id="7_d8go0"]
+[ext_resource type="Texture2D" uid="uid://b4yysvn1ibspa" path="res://walking_giant1.png" id="7_vmdku"]
 [ext_resource type="Texture2D" uid="uid://ctbxpx6p36bdi" path="res://walking_ball2.png" id="8_0u1e2"]
+[ext_resource type="Texture2D" uid="uid://nbfs0w8tpjt4" path="res://walking_large1.png" id="8_mkx82"]
 [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"]
+<<<<<<< Updated upstream
+[ext_resource type="Texture2D" uid="uid://7qppu15lvd1j" path="res://Nodes/Keys.png" id="13_d8wle"]
+=======
+[ext_resource type="Texture2D" uid="uid://4hcjvygte1em" path="res://walking_giant2.png" id="14_3p5dx"]
+[ext_resource type="Texture2D" uid="uid://clgd25fer2yka" path="res://walking_large2.png" id="15_iuchn"]
+>>>>>>> Stashed changes
 [ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="16_q3kvk"]
-[ext_resource type="AudioStream" uid="uid://b52sd64x20ulv" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_ajifv"]
+[ext_resource type="AudioStream" uid="uid://bsc5ku8mloa6j" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_ajifv"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_okaqh"]
 size = Vector3(1, 3.77669, 24)
@@ -47,6 +59,16 @@ animations = [{
 "name": &"idle_coal",
 "speed": 1.0
 }, {
+"frames": [ExtResource("7_vmdku")],
+"loop": true,
+"name": &"idle_giant",
+"speed": 1.0
+}, {
+"frames": [ExtResource("8_mkx82")],
+"loop": true,
+"name": &"idle_large",
+"speed": 1.0
+}, {
 "frames": [ExtResource("6_kfxv2")],
 "loop": true,
 "name": &"idle_powder",
@@ -67,6 +89,16 @@ animations = [{
 "name": &"walking_coal",
 "speed": 2.0
 }, {
+"frames": [ExtResource("7_vmdku"), ExtResource("14_3p5dx")],
+"loop": true,
+"name": &"walking_giant",
+"speed": 2.0
+}, {
+"frames": [ExtResource("8_mkx82"), ExtResource("15_iuchn")],
+"loop": true,
+"name": &"walking_large",
+"speed": 2.0
+}, {
 "frames": [ExtResource("6_kfxv2"), ExtResource("10_a137a")],
 "loop": true,
 "name": &"walking_powder",
@@ -113,10 +145,52 @@ transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 3.19744e
 [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="CharacterBody3D"]
 transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0)
 frames = SubResource("SpriteFrames_6p0y6")
-animation = &"walking_coal"
+animation = &"walking_giant"
 speed_scale = 2.0
 playing = true
 
+[node name="MiniGameButton0" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, 6, 0)
+texture = ExtResource("13_d8wle")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton1" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 1.5, 6, 0)
+texture = ExtResource("13_d8wle")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton2" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 3, 6, 0)
+texture = ExtResource("13_d8wle")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton3" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
+texture = ExtResource("13_d8wle")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton4" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
+texture = ExtResource("13_d8wle")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton5" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
+texture = ExtResource("13_d8wle")
+hframes = 5
+vframes = 8
+frame = 26
+
 [node name="Storage" parent="." instance=ExtResource("4_5jw5g")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, -5.2771)
 

Nodes/Train_P2.tscn

@@ -1,4 +1,8 @@
-[gd_scene load_steps=24 format=3 uid="uid://bikdn7ep2vpxw"]
+<<<<<<< Updated upstream
+[gd_scene load_steps=25 format=3 uid="uid://bikdn7ep2vpxw"]
+=======
+[gd_scene load_steps=28 format=3 uid="uid://bikdn7ep2vpxw"]
+>>>>>>> Stashed changes
 
 [ext_resource type="Script" path="res://scripts/Train.gd" id="1_mcmgl"]
 [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="2_xoa1a"]
@@ -10,14 +14,26 @@
 [ext_resource type="Texture2D" uid="uid://ci4yd4vjr17o1" path="res://o_walking_coal1.png" id="7_jsqie"]
 [ext_resource type="Texture2D" uid="uid://os0kogn0mkus" path="res://o_walking_powder1.png" id="7_lwj85"]
 [ext_resource type="Texture2D" uid="uid://j7jwtqmvg0m8" path="res://o_walking2.png" id="8_isr5o"]
+[ext_resource type="Texture2D" uid="uid://86mwqq8jadtj" path="res://o_walking_giant1.png" id="8_t43v2"]
+[ext_resource type="Texture2D" uid="uid://ifauy3vee10v" path="res://o_walking_large1.png" id="9_b6l2s"]
 [ext_resource type="Texture2D" uid="uid://djsergj3l4t2c" path="res://o_walking_ball2.png" id="9_rt6ws"]
 [ext_resource type="Texture2D" uid="uid://ctssikrodjqvc" path="res://o_walking_powder2.png" id="11_eefgn"]
 [ext_resource type="Texture2D" uid="uid://nctqw3vt5q0y" path="res://o_walking_coal2.png" id="12_581v4"]
 [ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="14_n2rwc"]
+<<<<<<< Updated upstream
+[ext_resource type="Texture2D" uid="uid://7qppu15lvd1j" path="res://Nodes/Keys.png" id="14_otf4l"]
 [ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="15_sof53"]
 [ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="16_7dojn"]
+[ext_resource type="PackedScene" path="res://Nodes/engine.tscn" id="17_regf7"]
+[ext_resource type="AudioStream" uid="uid://bsc5ku8mloa6j" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_xnc4h"]
+=======
+[ext_resource type="Texture2D" uid="uid://ce5imf2m4w5y2" path="res://o_walking_giant2.png" id="15_jsgah"]
+[ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="15_sof53"]
+[ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="16_7dojn"]
+[ext_resource type="Texture2D" uid="uid://b3pb0trgav15s" path="res://o_walking_large2.png" id="16_a8x3b"]
 [ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="17_regf7"]
 [ext_resource type="AudioStream" uid="uid://b52sd64x20ulv" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_xnc4h"]
+>>>>>>> Stashed changes
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"]
 size = Vector3(1, 3.77669, 24)
@@ -48,6 +64,16 @@ animations = [{
 "name": &"idle_coal",
 "speed": 1.0
 }, {
+"frames": [ExtResource("8_t43v2")],
+"loop": true,
+"name": &"idle_giant",
+"speed": 1.0
+}, {
+"frames": [ExtResource("9_b6l2s")],
+"loop": true,
+"name": &"idle_large",
+"speed": 1.0
+}, {
 "frames": [ExtResource("7_lwj85")],
 "loop": true,
 "name": &"idle_powder",
@@ -68,6 +94,16 @@ animations = [{
 "name": &"walking_coal",
 "speed": 2.0
 }, {
+"frames": [ExtResource("8_t43v2"), ExtResource("15_jsgah")],
+"loop": true,
+"name": &"walking_giant",
+"speed": 2.0
+}, {
+"frames": [ExtResource("9_b6l2s"), ExtResource("16_a8x3b")],
+"loop": true,
+"name": &"walking_large",
+"speed": 2.0
+}, {
 "frames": [ExtResource("7_lwj85"), ExtResource("11_eefgn")],
 "loop": true,
 "name": &"walking_powder",
@@ -114,10 +150,52 @@ transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 2.84217e
 [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="CharacterBody3D"]
 transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0)
 frames = SubResource("SpriteFrames_ltjyh")
-animation = &"walking_coal"
+animation = &"walking_giant"
 speed_scale = 2.0
 playing = true
 
+[node name="MiniGameButton3" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, 6, 0)
+texture = ExtResource("14_otf4l")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton4" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 1.5, 6, 0)
+texture = ExtResource("14_otf4l")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton5" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 3, 6, 0)
+texture = ExtResource("14_otf4l")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton0" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
+texture = ExtResource("14_otf4l")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton1" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
+texture = ExtResource("14_otf4l")
+hframes = 5
+vframes = 8
+frame = 26
+
+[node name="MiniGameButton2" type="Sprite3D" parent="CharacterBody3D"]
+transform = Transform3D(8, 0, 0, 0, -3.93403e-07, 1, 0, -9, -4.37114e-08, 0, -50, 0)
+texture = ExtResource("14_otf4l")
+hframes = 5
+vframes = 8
+frame = 26
+
 [node name="Bin" parent="." instance=ExtResource("14_n2rwc")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.18577, 0.622175, 10.6544)
 

Nodes/game.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=10 format=3 uid="uid://db0pxwq1hvs45"]
 
 [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_gf730"]
-[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_8im8o"]
+[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_8im8o"]
 [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_s558u"]
 [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_05mbx"]
 [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_gee2r"]

menu/main_menu.tscn

@@ -13,6 +13,7 @@ grow_vertical = 2
 script = ExtResource("1_hyw8p")
 
 [node name="ColorRect" type="ColorRect" parent="."]
+layout_mode = 1
 anchors_preset = 15
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -21,6 +22,7 @@ grow_vertical = 2
 color = Color(0.513726, 0.403922, 0.27451, 1)
 
 [node name="VBoxContainer" type="VBoxContainer" parent="."]
+layout_mode = 1
 anchors_preset = 8
 anchor_left = 0.5
 anchor_top = 0.5
@@ -34,42 +36,31 @@ grow_horizontal = 2
 grow_vertical = 2
 
 [node name="Start" type="Button" parent="VBoxContainer"]
-offset_right = 87.0
+layout_mode = 2
-offset_bottom = 31.0
 text = "Start
 "
 
 [node name="Tutorial" type="Button" parent="VBoxContainer"]
-offset_top = 35.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 66.0
 text = "Tutorial
 "
 
 [node name="Settings" type="Button" parent="VBoxContainer"]
-offset_top = 70.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 101.0
 text = "Volume:"
 
 [node name="VolSlider" type="HSlider" parent="VBoxContainer"]
-offset_top = 105.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 121.0
 min_value = -30.0
 max_value = 0.0
 script = ExtResource("2_h85ei")
 
 [node name="Quit" type="Button" parent="VBoxContainer"]
-offset_top = 125.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 156.0
 text = "Quit"
 
 [node name="FullScreen" type="Button" parent="VBoxContainer"]
-offset_top = 160.0
+layout_mode = 2
-offset_right = 87.0
-offset_bottom = 191.0
 text = "Fullscreen"
 
 [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"]

o_walking_giant1.png.import

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

o_walking_giant2.png.import

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

o_walking_large1.png.import

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

o_walking_large2.png.import

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

project.godot

@@ -148,3 +148,8 @@ p1_extra={
 "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)
 ]
 }
+p2_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":90,"unicode":0,"echo":false,"script":null)
+]
+}

scripts/Modules/Cannon.gd

@@ -3,12 +3,11 @@ extends Module
 class_name Cannon
 
 enum STATE {INACTIVE, RELOADING, SHOOTING}
-enum AMMO {NORMAL, HEAVY, LIGHT}
-var currentAmmo: AMMO
 var currentPowderStashValue = 0
 var maxPowderStashValue = 3
 var CAN_ENGAGE = false
 var DAMAGE = 5
+var ammoType = -1
 @onready var train = get_parent() as Train
 
 #------------Methods-------------#
@@ -22,6 +21,7 @@ func interact(player):
 		if player.getResource() == 0:
 			if currentStashValue < maxStashValue:
 				currentStashValue += 1
+				ammoType = 0
 				player.clearInventory()
 				$AudioStreamPlayer2.play()
 			return
@@ -32,10 +32,41 @@ func interact(player):
 				player.clearInventory()
 				$AudioStreamPlayer2.play()
 			return
-		return
+		
+		if player.getResource() == 3:
+			if currentStashValue < maxStashValue:
+				currentStashValue += 1
+				ammoType = 1
+				player.clearInventory()
+				$AudioStreamPlayer2.play()
+			return
+			
+		if player.getResource() == 4:
+			if currentStashValue < maxStashValue:
+				currentStashValue += 1
+				ammoType = 2
+				player.clearInventory()
+				$AudioStreamPlayer2.play()
+			return
 
 func shoot():
-	if currentStashValue >= 1 and currentPowderStashValue >= 1 and currentState == STATE.INACTIVE:
+	if currentStashValue >= 1 and currentPowderStashValue >= 1 and currentState == STATE.INACTIVE and ammoType == 0:
+		currentState = STATE.SHOOTING
+		currentStashValue -= 1
+		currentPowderStashValue = 0
+		currentState = STATE.INACTIVE
+		$AudioStreamPlayer.play(0)
+		return true
+	
+	if currentStashValue >= 1 and currentPowderStashValue >= 2 and currentState == STATE.INACTIVE and ammoType == 1:
+		currentState = STATE.SHOOTING
+		currentStashValue -= 1
+		currentPowderStashValue = 0
+		currentState = STATE.INACTIVE
+		$AudioStreamPlayer.play(0)
+		return true
+		
+	if currentStashValue >= 1 and currentPowderStashValue >= 3 and currentState == STATE.INACTIVE and ammoType == 2:
 		currentState = STATE.SHOOTING
 		currentStashValue -= 1
 		currentPowderStashValue = 0

scripts/Modules/Storage.gd

@@ -2,7 +2,7 @@ extends Module
 
 class_name Storage
 
-enum TYPE {AMMO, GUNPOWDER, COAL}
+enum TYPE {AMMO, GUNPOWDER, COAL, LARGE, GIANT}
 
 
 @export var currentType: TYPE

scripts/Player.gd

@@ -13,11 +13,11 @@ var is_alive = true
 var walking
 var idle
 
-enum TYPE {AMMO, GUNPOWDER, FUEL}
+enum TYPE {AMMO, GUNPOWDER, FUEL, LARGE, GIANT}
 
 var P1inMiniGame = 0
 var P2inMiniGame = 0
-var MiniGame = [-1, -1, -1]
+var MiniGame = [0, 0, 0]
 var MiniGamePos = 0 
 var rng = RandomNumberGenerator.new()
 #---------------Methods--------------#
@@ -27,6 +27,12 @@ func _ready():
 	$MiniGameButton0.hide()
 	$MiniGameButton1.hide()
 	$MiniGameButton2.hide()
+	$MiniGameButton3.hide()
+	$MiniGameButton4.hide()
+	$MiniGameButton5.hide()
+	#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton0").hide() 
+	#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton1").hide()
+	#get_parent().find_child("CharacterBody3D").find_child("MiniGameButton2").hide()
 
 func miniGameColor(input: int, red: int):
 	if(input == 0):
@@ -35,18 +41,35 @@ func miniGameColor(input: int, red: int):
 		$MiniGameButton1.modulate = Color(1,1,red)
 	if(input == 2):
 		$MiniGameButton2.modulate = Color(1,1,red)
+	if(input == 3):
+		$MiniGameButton3.modulate = Color(1,1,red)
+	if(input == 4):
+		$MiniGameButton4.modulate = Color(1,1,red)
+	if(input == 5):
+		$MiniGameButton5.modulate = Color(1,1,red)
 
 func miniGameReset():
 	MiniGamePos = 0
-	miniGameColor(0,1)
+	if(is_player1):
-	miniGameColor(1,1)
+		miniGameColor(0,1)
-	miniGameColor(2,1)
+		miniGameColor(1,1)
-	MiniGame[0] = rng.randi_range(0, 3)
+		miniGameColor(2,1)
-	miniGameSetArrow(0)
+		MiniGame[0] = rng.randi_range(0, 3)
-	MiniGame[1] = rng.randi_range(0, 3)
+		miniGameSetArrow(0)
-	miniGameSetArrow(1)
+		MiniGame[1] = rng.randi_range(0, 3)
-	MiniGame[2] = rng.randi_range(0, 3)
+		miniGameSetArrow(1)
-	miniGameSetArrow(2)
+		MiniGame[2] = rng.randi_range(0, 3)
+		miniGameSetArrow(2)
+	else:
+		miniGameColor(3,1)
+		miniGameColor(4,1)
+		miniGameColor(5,1)
+		MiniGame[0] = rng.randi_range(0, 3)
+		miniGameSetArrow(3)
+		MiniGame[1] = rng.randi_range(0, 3)
+		miniGameSetArrow(4)
+		MiniGame[2] = rng.randi_range(0, 3)
+		miniGameSetArrow(5)
 
 func miniGameSetArrow(buttonNr: int):
 	if(buttonNr == 0):
@@ -55,20 +78,40 @@ func miniGameSetArrow(buttonNr: int):
 		$MiniGameButton1.frame = 26 + MiniGame[1]
 	if(buttonNr == 2):
 		$MiniGameButton2.frame = 26 + MiniGame[2]
+	if(buttonNr == 3):
+		$MiniGameButton3.frame = 26 + MiniGame[0]
+	if(buttonNr == 4):
+		$MiniGameButton4.frame = 26 + MiniGame[1]
+	if(buttonNr == 5):
+		$MiniGameButton5.frame = 26 + MiniGame[2]
 	
 func miniGameCheck(input : int):
-	if(input == MiniGame[MiniGamePos]):
+	if(is_player1):
-		miniGameColor(MiniGamePos, 0)
+		if(input == MiniGame[MiniGamePos]):
-		MiniGamePos = MiniGamePos +1
+			miniGameColor(MiniGamePos, 0)
-	else:
+			MiniGamePos = MiniGamePos +1
-		miniGameReset()
+		else:
+			miniGameReset()
 		
-	if(MiniGamePos >= 3):
+		if(MiniGamePos >= 3):
-		$MiniGameButton0.hide()
+			$MiniGameButton0.hide()
-		$MiniGameButton1.hide()
+			$MiniGameButton1.hide()
-		$MiniGameButton2.hide()
+			$MiniGameButton2.hide()
-		P1inMiniGame = 0
+			P1inMiniGame = 0
-		miniGameReset()
+			miniGameReset()
+	else:
+		if(input == MiniGame[MiniGamePos]):
+			miniGameColor(MiniGamePos+3, 0)
+			MiniGamePos = MiniGamePos +1
+		else:
+			miniGameReset()
+		
+		if(MiniGamePos >= 3):
+			$MiniGameButton3.hide()
+			$MiniGameButton4.hide()
+			$MiniGameButton5.hide()
+			P2inMiniGame = 0
+			miniGameReset()
 			
 func _process(delta):
 	if Input.is_action_just_pressed("p1_extra"):
@@ -78,6 +121,13 @@ func _process(delta):
 			$MiniGameButton1.show()
 			$MiniGameButton2.show()
 	
+	if Input.is_action_just_pressed("p2_extra"):
+		if(P2inMiniGame == 0):
+			P2inMiniGame = 1
+			$MiniGameButton3.show()
+			$MiniGameButton4.show()
+			$MiniGameButton5.show()
+
 func _physics_process(delta):
 	if(velocity.length() > 0):
 		$AnimatedSprite3D.play(walking)
@@ -167,6 +217,12 @@ func fill_inventory(type):
 		2:
 			walking = "walking_coal"
 			idle = "idle_coal"
+		3:
+			walking = "walking_large"
+			idle = "idle_large"
+		4:
+			walking = "walking_giant"
+			idle = "idle_giant"
 
 
 func getResource():

walking_giant1.png.import

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

walking_giant2.png.import

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

walking_large1.png.import

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

walking_large2.png.import

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