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

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"