blunderbus model added

assets/Models/blunderbus.blend.import

@@ -0,0 +1,51 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://bnqva66kyqdat"
+path="res://.godot/imported/blunderbus.blend-30c7af350e7dc207b1cf8df546f63764.scn"
+
+[deps]
+
+source_file="res://assets/Models/blunderbus.blend"
+dest_files=["res://.godot/imported/blunderbus.blend-30c7af350e7dc207b1cf8df546f63764.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+blender/nodes/visible=0
+blender/nodes/active_collection_only=false
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/colors=false
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true

assets/Models/blunderbus.metal.albedo.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cx4wjw3x8pa6q"
+path.s3tc="res://.godot/imported/blunderbus.metal.albedo.png-7f15b42c9059d432dda13c5cac845963.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/blunderbus.metal.albedo.png"
+dest_files=["res://.godot/imported/blunderbus.metal.albedo.png-7f15b42c9059d432dda13c5cac845963.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+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/Models/blunderbus.metal.normal.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://kr2nf55qooib"
+path.s3tc="res://.godot/imported/blunderbus.metal.normal.png-1f44e7fc2dd7f4fd14df42e54c355301.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/blunderbus.metal.normal.png"
+dest_files=["res://.godot/imported/blunderbus.metal.normal.png-1f44e7fc2dd7f4fd14df42e54c355301.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=1
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=1
+roughness/src_normal="res://assets/Models/blunderbus.metal.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/Models/blunderbus.stock.albedo.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dqgsiuy8wfxmv"
+path.s3tc="res://.godot/imported/blunderbus.stock.albedo.png-4061c90d8fe1a420322ecaab07095b04.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/blunderbus.stock.albedo.png"
+dest_files=["res://.godot/imported/blunderbus.stock.albedo.png-4061c90d8fe1a420322ecaab07095b04.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+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/Models/blunderbus.stock.normal.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bp3cr7eorynax"
+path.s3tc="res://.godot/imported/blunderbus.stock.normal.png-bb1eb5d3660249bc03083506230a1f2f.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/blunderbus.stock.normal.png"
+dest_files=["res://.godot/imported/blunderbus.stock.normal.png-bb1eb5d3660249bc03083506230a1f2f.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=1
+compress/channel_pack=0
+mipmaps/generate=true
+mipmaps/limit=-1
+roughness/mode=1
+roughness/src_normal="res://assets/Models/blunderbus.stock.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/Models/blunderbus_model.blend.import

@@ -0,0 +1,51 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://b6p5d300aafnh"
+path="res://.godot/imported/blunderbus_model.blend-c7ab2ddaddd1a24a8f6a8c9a244ceb3b.scn"
+
+[deps]
+
+source_file="res://assets/Models/blunderbus_model.blend"
+dest_files=["res://.godot/imported/blunderbus_model.blend-c7ab2ddaddd1a24a8f6a8c9a244ceb3b.scn"]
+
+[params]
+
+nodes/root_type=""
+nodes/root_name=""
+nodes/apply_root_scale=true
+nodes/root_scale=1.0
+nodes/import_as_skeleton_bones=false
+meshes/ensure_tangents=true
+meshes/generate_lods=true
+meshes/create_shadow_meshes=true
+meshes/light_baking=1
+meshes/lightmap_texel_size=0.2
+meshes/force_disable_compression=false
+skins/use_named_skins=true
+animation/import=true
+animation/fps=30
+animation/trimming=false
+animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
+import_script/path=""
+_subresources={}
+blender/nodes/visible=0
+blender/nodes/active_collection_only=false
+blender/nodes/punctual_lights=true
+blender/nodes/cameras=true
+blender/nodes/custom_properties=true
+blender/nodes/modifiers=1
+blender/meshes/colors=false
+blender/meshes/uvs=true
+blender/meshes/normals=true
+blender/meshes/tangents=true
+blender/meshes/skins=2
+blender/meshes/export_bones_deforming_mesh_only=false
+blender/materials/unpack_enabled=true
+blender/materials/export_materials=1
+blender/animation/limit_playback=true
+blender/animation/always_sample=true
+blender/animation/group_tracks=true

assets/blockout_2.tscn

@@ -3,7 +3,7 @@
 [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_sbpvn"]
 [ext_resource type="PackedScene" uid="uid://brl0bsqjl5dg3" path="res://assets/mac_10.tscn" id="2_fn4vb"]
 [ext_resource type="Texture2D" uid="uid://ckjcv72jcojjh" path="res://assets/materials/91_laurel hedge PBR texture-seamless_hr/91_laurel hedge_DIFF (Custom).jpg" id="3_3ov8a"]
-[ext_resource type="PackedScene" uid="uid://b5eclfg0cmmal" path="res://assets/revolver_1.tscn" id="3_7475s"]
+[ext_resource type="PackedScene" uid="uid://dqwkal3t4gf2p" path="res://blunderbus.tscn" id="3_52ywj"]
 [ext_resource type="LightmapGIData" uid="uid://bwpvltmeo4cfl" path="res://assets/LevelBlockouts/blockout_2.lmbake" id="3_d2pxn"]
 [ext_resource type="Texture2D" uid="uid://d210plbmb7a2o" path="res://assets/materials/91_laurel hedge PBR texture-seamless_hr/91_laurel hedge_NORM (Custom).jpg" id="4_5u2rd"]
 [ext_resource type="PackedScene" uid="uid://20csd6dmwj4y" path="res://assets/jump_platform.tscn" id="4_j47q8"]
@@ -1004,7 +1004,7 @@ player = NodePath("Player")
 money = 50
 start_health = 5
 gun_1 = ExtResource("2_fn4vb")
-gun_2 = ExtResource("3_7475s")
+gun_2 = ExtResource("3_52ywj")
 health_drop_enabled = false
 
 [node name="Player" parent="." instance=ExtResource("9_3usor")]

scripts/player.gd

@@ -312,27 +312,9 @@ func _physics_process(delta):
 			else:
 				held_item_rotation.y = clamp(held_item_rotation.y - deg_to_rad(45), deg_to_rad(0),deg_to_rad(360))
 				
-		# Weapon Swap by Numbers
+		for i in range(10):
-		if Input.is_action_just_pressed("numb_1"):
+			if Input.is_action_just_pressed("numb_" + str(i)):
-			weapon_select(0)
+				weapon_select((i - 1))
-		if Input.is_action_just_pressed("numb_2"):
-			weapon_select(1)
-		if Input.is_action_just_pressed("numb_3"):
-			weapon_select(2)
-		if Input.is_action_just_pressed("numb_4"):
-			weapon_select(3)
-		if Input.is_action_just_pressed("numb_5"):
-			weapon_select(4)
-		if Input.is_action_just_pressed("numb_6"):
-			weapon_select(5)
-		if Input.is_action_just_pressed("numb_7"):
-			weapon_select(6)
-		if Input.is_action_just_pressed("numb_8"):
-			weapon_select(7)
-		if Input.is_action_just_pressed("numb_9"):
-			weapon_select(8)
-		if Input.is_action_just_pressed("numb_0"):
-			weapon_select(9)
 		
 		#interact button
 		if Input.is_action_just_pressed("interact"):