added ammo type models

assets/Textures/ObjectTextures/heavy_ammo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://colliuhxv4eqg"
+path="res://.godot/imported/heavy_ammo.png-713fc26c950084c9cbb338d6838ac08b.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Textures/ObjectTextures/heavy_ammo.png"
+dest_files=["res://.godot/imported/heavy_ammo.png-713fc26c950084c9cbb338d6838ac08b.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+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

assets/Textures/ObjectTextures/medium_ammo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://chajreyjgucnq"
+path="res://.godot/imported/medium_ammo.png-9a243dfddc4a41d606c5bbcb3cdd5794.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Textures/ObjectTextures/medium_ammo.png"
+dest_files=["res://.godot/imported/medium_ammo.png-9a243dfddc4a41d606c5bbcb3cdd5794.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+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

assets/Textures/ObjectTextures/shotgun_ammo.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bofnaa5f26dcv"
+path="res://.godot/imported/shotgun_ammo.png-ce9a1709afe622129100c80fdcce09f2.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/Textures/ObjectTextures/shotgun_ammo.png"
+dest_files=["res://.godot/imported/shotgun_ammo.png-ce9a1709afe622129100c80fdcce09f2.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+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

assets/mac_10.tscn

@@ -702,7 +702,7 @@ audio_empty = NodePath("Audio/Empty")
 audio_reload = NodePath("Audio/Reload")
 
 [node name="mac10" parent="." index="0"]
-transform = Transform3D(-1.08301e-06, -8.05104e-08, -0.3, -0.0225093, 0.299154, 9.75766e-10, 0.299154, 0.0225093, -1.086e-06, -0.00876398, 0.0748287, -0.0557729)
+transform = Transform3D(-1.08301e-06, -8.051e-08, -0.3, -0.0225093, 0.299154, 9.76167e-10, 0.299154, 0.0225093, -1.086e-06, -0.00876398, 0.0748287, -0.0557729)
 cast_shadow = 0
 lod_bias = 10.0
 mesh = SubResource("ArrayMesh_pcg38")

assets/pickup_item_indicator.tscn

@@ -2,7 +2,7 @@
 
 [ext_resource type="Script" path="res://scripts/pickup_item_indicator.gd" id="1_3ji4d"]
 [ext_resource type="Texture2D" uid="uid://cmnhd40dvn3l3" path="res://assets/Textures/ObjectTextures/rocket.png" id="1_xksdo"]
-[ext_resource type="Theme" uid="uid://buma708jpxqrn" path="res://Clean_theme.tres" id="3_etc64"]
+[ext_resource type="Theme" uid="uid://clek42ofxr45f" path="res://DefaultTheme.tres" id="3_eqj3t"]
 
 [node name="PickupItemIndicator" type="Control"]
 z_index = -1
@@ -38,7 +38,7 @@ offset_bottom = 63.0
 grow_horizontal = 2
 grow_vertical = 2
 size_flags_horizontal = 4
-theme = ExtResource("3_etc64")
+theme = ExtResource("3_eqj3t")
 theme_override_colors/font_outline_color = Color(0, 0, 0, 1)
 theme_override_constants/outline_size = 19
 theme_override_font_sizes/font_size = 100

scenes/blockout_4.tscn

@@ -679,4 +679,4 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.4244, 1.087, -30.9826)
 transform = Transform3D(0.978792, -0.185004, 0.0879728, 0, 0.42944, 0.903096, -0.204855, -0.883943, 0.420332, 31.5816, 0.696903, -7.64441)
 CANNON_MIN_POWER = 20
 CANNON_MAX_POWER = 50
-TIMER_MAX = 1.0
+TIMER_MAX = 10.0

scripts/item_pickup_v2.gd

@@ -13,6 +13,9 @@ var ammo_type
 ## MESHES
 #AMMO
 @onready var light_ammo: MeshInstance3D = $Meshes/Ammo/light_ammo
+@onready var medium_ammo: MeshInstance3D = $Meshes/Ammo/medium_ammo
+@onready var heavy_ammo: MeshInstance3D = $Meshes/Ammo/heavy_ammo
+@onready var shotgun_ammo: MeshInstance3D = $Meshes/Ammo/shotgun_ammo
 @onready var rocket: MeshInstance3D = $Meshes/Ammo/rocket
 
 @onready var stamina: MeshInstance3D = $Meshes/stamina
@@ -40,11 +43,11 @@ func _ready():
 				0:
 					light_ammo.visible = true
 				1:
-					light_ammo.visible = true #medium
+					medium_ammo.visible = true #medium
 				2:
-					light_ammo.visible = true #heavy
+					heavy_ammo.visible = true #heavy
 				3:
-					light_ammo.visible = true #shotgun
+					shotgun_ammo.visible = true #shotgun
 				4:
 					rocket.visible = true #rocket
 		1:

scripts/pickup_item_indicator.gd

@@ -7,6 +7,9 @@ extends Control
 ## ITEM TEXTURES
 #AMMO
 const LIGHT_AMMO = preload("res://assets/Textures/ObjectTextures/light_ammo.png")
+const MEDIUM_AMMO = preload("res://assets/Textures/ObjectTextures/medium_ammo.png")
+const HEAVY_AMMO = preload("res://assets/Textures/ObjectTextures/heavy_ammo.png")
+const SHOTGUN_AMMO = preload("res://assets/Textures/ObjectTextures/shotgun_ammo.png")
 const ROCKET = preload("res://assets/Textures/ObjectTextures/rocket.png")
 
 const MONEY = preload("res://assets/Textures/ObjectTextures/money.png")
@@ -30,11 +33,11 @@ func _ready() -> void:
 				0:
 					image.texture = LIGHT_AMMO
 				1:
-					image.texture = LIGHT_AMMO #medium
+					image.texture = MEDIUM_AMMO #medium
 				2:
-					image.texture = LIGHT_AMMO #heavy
+					image.texture = HEAVY_AMMO #heavy
 				3:
-					image.texture = LIGHT_AMMO #shotgun
+					image.texture = SHOTGUN_AMMO #shotgun
 				4:
 					image.texture = ROCKET
 		1:
@@ -52,10 +55,10 @@ func _ready() -> void:
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta: float) -> void:
-	alpha_amt =  lerp(alpha_amt, 0.0,delta * 1)
+	alpha_amt =  lerp(alpha_amt, 0.0,delta * 1.5)
 	modulate = Color(1, 1, 1, alpha_amt)
-	position += random_point * delta * 2
+	position += random_point * delta * 1.5
-	scale -= Vector2(.2,.2) * delta
+	scale = lerp(scale,Vector2(0,0), delta * .5)
 	if alpha_amt <= .01:
 		queue_free()