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

Assets/Model/Modules/Coal.glb.import

@@ -3,7 +3,7 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://rpsw0254tsue"
+uid="uid://cbvbqqwwnkut5"
 path="res://.godot/imported/Coal.glb-c77b905b0589ddd35790ce18c5681109.scn"
 
 [deps]

Assets/Model/Modules/Coal_output.png.import

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

Nodes/Train_P1.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=16 format=3 uid="uid://lvlbpfnwlngv"]
+[gd_scene load_steps=20 format=3 uid="uid://md2ofbviios3"]
 
 [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"]
 [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="3_in6up"]
@@ -7,9 +7,13 @@
 [ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_c3xfc"]
 [ext_resource type="Texture2D" uid="uid://d1m2jplf8u0h0" path="res://Nodes/walking_ball1.png" id="5_rgwud"]
 [ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="5_vgxqe"]
+[ext_resource type="Texture2D" uid="uid://b5hai0ap763xu" path="res://walking_coal1.png" id="6_hoc8x"]
+[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://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"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_okaqh"]
 size = Vector3(1, 3.77669, 24)
@@ -35,6 +39,16 @@ animations = [{
 "name": &"idle_ball",
 "speed": 1.0
 }, {
+"frames": [ExtResource("6_hoc8x")],
+"loop": true,
+"name": &"idle_coal",
+"speed": 1.0
+}, {
+"frames": [ExtResource("6_kfxv2")],
+"loop": true,
+"name": &"idle_powder",
+"speed": 1.0
+}, {
 "frames": [ExtResource("6_m0hj7"), ExtResource("7_d8go0")],
 "loop": true,
 "name": &"walking",
@@ -44,6 +58,16 @@ animations = [{
 "loop": true,
 "name": &"walking_ball",
 "speed": 2.0
+}, {
+"frames": [ExtResource("6_hoc8x"), ExtResource("11_1jgcf")],
+"loop": true,
+"name": &"walking_coal",
+"speed": 2.0
+}, {
+"frames": [ExtResource("6_kfxv2"), ExtResource("10_a137a")],
+"loop": true,
+"name": &"walking_powder",
+"speed": 2.0
 }]
 
 [node name="Train1" type="Node3D"]
@@ -86,12 +110,16 @@ 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 = &"idle_ball"
+animation = &"walking_coal"
 speed_scale = 2.0
 playing = true
 
 [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)
 
+[node name="Storage2" parent="." instance=ExtResource("4_5jw5g")]
+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)

Nodes/Train_P2.tscn

@@ -1,13 +1,18 @@
-[gd_scene load_steps=14 format=3 uid="uid://ckkn7rha3voqv"]
+[gd_scene load_steps=19 format=3 uid="uid://bikdn7ep2vpxw"]
 
 [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"]
 [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="3_x8j45"]
-[ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_jkvql"]
-[ext_resource type="Texture2D" uid="uid://d1m2jplf8u0h0" path="res://Nodes/walking_ball1.png" id="5_agdvf"]
-[ext_resource type="Texture2D" uid="uid://eg0k8esm2scp" path="res://p5lFkJY.png" id="6_lxfv3"]
-[ext_resource type="Texture2D" uid="uid://du7d6fk4dabd7" path="res://cVOQuID.png" id="7_35jf0"]
-[ext_resource type="Texture2D" uid="uid://ctbxpx6p36bdi" path="res://walking_ball2.png" id="8_cgycp"]
+[ext_resource type="Texture2D" uid="uid://cxfybbp5idjwg" path="res://o_idle1.png" id="4_7ygjr"]
+[ext_resource type="Texture2D" uid="uid://dh6hvv1lfdnm1" path="res://o_idle2.png" id="5_p3dnb"]
+[ext_resource type="Texture2D" uid="uid://c1v5tc8lk8pdo" path="res://o_walking_ball1.png" id="6_feotg"]
+[ext_resource type="Texture2D" uid="uid://bjrhp4dqckoxf" path="res://o_walking1.png" id="7_4lb8v"]
+[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://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"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"]
 size = Vector3(1, 3.77669, 24)
@@ -23,25 +28,45 @@ size = Vector3(1, 6, 9.05915)
 
 [sub_resource type="SpriteFrames" id="SpriteFrames_ltjyh"]
 animations = [{
-"frames": [ExtResource("4_jkvql")],
+"frames": [ExtResource("4_7ygjr"), ExtResource("5_p3dnb")],
 "loop": true,
 "name": &"idle",
-"speed": 1.0
+"speed": 2.0
 }, {
-"frames": [ExtResource("5_agdvf")],
+"frames": [ExtResource("6_feotg")],
 "loop": true,
 "name": &"idle_ball",
 "speed": 1.0
 }, {
-"frames": [ExtResource("6_lxfv3"), ExtResource("7_35jf0")],
+"frames": [ExtResource("7_jsqie")],
+"loop": true,
+"name": &"idle_coal",
+"speed": 1.0
+}, {
+"frames": [ExtResource("7_lwj85")],
+"loop": true,
+"name": &"idle_powder",
+"speed": 1.0
+}, {
+"frames": [ExtResource("7_4lb8v"), ExtResource("8_isr5o")],
 "loop": true,
 "name": &"walking",
 "speed": 2.0
 }, {
-"frames": [ExtResource("5_agdvf"), ExtResource("8_cgycp")],
+"frames": [ExtResource("6_feotg"), ExtResource("9_rt6ws")],
 "loop": true,
 "name": &"walking_ball",
 "speed": 2.0
+}, {
+"frames": [ExtResource("7_jsqie"), ExtResource("12_581v4")],
+"loop": true,
+"name": &"walking_coal",
+"speed": 2.0
+}, {
+"frames": [ExtResource("7_lwj85"), ExtResource("11_eefgn")],
+"loop": true,
+"name": &"walking_powder",
+"speed": 2.0
 }]
 
 [node name="Train2" type="Node3D"]
@@ -84,6 +109,6 @@ 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 = &"idle_ball"
+animation = &"walking_coal"
 speed_scale = 2.0
 playing = true

Nodes/game.tscn

@@ -2,9 +2,9 @@
 
 [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"]
 [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="2_61aog"]
-[ext_resource type="PackedScene" uid="uid://lvlbpfnwlngv" path="res://Nodes/Train_P1.tscn" id="3_0be5n"]
+[ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="3_0be5n"]
 [ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="4_kxuy0"]
-[ext_resource type="PackedScene" uid="uid://ckkn7rha3voqv" path="res://Nodes/Train_P2.tscn" id="4_lmu0s"]
+[ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="4_lmu0s"]
 
 [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ghq3e"]
 sky_top_color = Color(0.662745, 0.356863, 0.129412, 1)

menu/main_menu.tscn

@@ -13,7 +13,6 @@ 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
@@ -22,7 +21,6 @@ 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
@@ -69,7 +67,6 @@ offset_bottom = 156.0
 text = "Quit"
 
 [node name="FullScreen" type="Button" parent="VBoxContainer"]
-layout_mode = 2
 text = "Fullscreen"
 
 [connection signal="pressed" from="VBoxContainer/Start" to="." method="_on_start_pressed"]

o_idle1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cxfybbp5idjwg"
+path="res://.godot/imported/o_idle1.png-9ad1e33384b578c92256776007ea4475.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://o_idle1.png"
+dest_files=["res://.godot/imported/o_idle1.png-9ad1e33384b578c92256776007ea4475.ctex"]
+
+[params]
+
+compress/mode=0
+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/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=1

o_idle2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dh6hvv1lfdnm1"
+path="res://.godot/imported/o_idle2.png-7afb0370a35b05edb0e1dd193916e55e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://o_idle2.png"
+dest_files=["res://.godot/imported/o_idle2.png-7afb0370a35b05edb0e1dd193916e55e.ctex"]
+
+[params]
+
+compress/mode=0
+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/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=1

o_walking1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bjrhp4dqckoxf"
+path="res://.godot/imported/o_walking1.png-a570560a8bd4e4a4c247cf9076ed1d3d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://o_walking1.png"
+dest_files=["res://.godot/imported/o_walking1.png-a570560a8bd4e4a4c247cf9076ed1d3d.ctex"]
+
+[params]
+
+compress/mode=0
+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/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=1

o_walking2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://j7jwtqmvg0m8"
+path="res://.godot/imported/o_walking2.png-1556805b62e7ad576cd1fdf859df52a4.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://o_walking2.png"
+dest_files=["res://.godot/imported/o_walking2.png-1556805b62e7ad576cd1fdf859df52a4.ctex"]
+
+[params]
+
+compress/mode=0
+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/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=1

o_walking_ball1.png.import

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

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://djsergj3l4t2c"
+path="res://.godot/imported/o_walking_ball2.png-24e87b674c9c350af889c915ece4444e.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://o_walking_ball2.png"
+dest_files=["res://.godot/imported/o_walking_ball2.png-24e87b674c9c350af889c915ece4444e.ctex"]
+
+[params]
+
+compress/mode=0
+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/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=1

o_walking_coal1.png.import

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

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

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

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

scripts/Modules/Storage.gd

@@ -2,10 +2,13 @@ extends Module
 
 class_name Storage
 
-enum TYPE {AMMO, GUNPOWDER, FUEL}
+enum TYPE {CANNONBALL, GUNPOWDER, COAL}
+
 
 @export var currentType: TYPE
 
+
+
 #------------Methods-------------#
 func _ready():
 	var root = get_tree().root.get_child(0)

scripts/Player.gd

@@ -84,4 +84,9 @@ func fill_inventory(type):
 		0:
 			walking = "walking_ball"
 			idle = "idle_ball"
-			
+		1:
+			walking = "walking_powder"
+			idle = "idle_powder"
+		2:
+			walking = "walking_coal"
+			idle = "idle_coal"

walking_coal1.png.import

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

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

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

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