adding assets and textures

assets/Models/brick1.normal.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dtccywxaqkqwk"
+path.s3tc="res://.godot/imported/brick1.normal.png-01aaf16db3e9ebf93f0d29868088a593.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/brick1.normal.png"
+dest_files=["res://.godot/imported/brick1.normal.png-01aaf16db3e9ebf93f0d29868088a593.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/brick1.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/brick1.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bu3w5slec6gib"
+path.s3tc="res://.godot/imported/brick1.png-b85697f1cab992e49cd7599390ce2146.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/brick1.png"
+dest_files=["res://.godot/imported/brick1.png-b85697f1cab992e49cd7599390ce2146.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/trashcan1.albedo.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://b87k47748j5kx"
+path.s3tc="res://.godot/imported/trashcan1.albedo.png-3ff741fed4a3097b520332b69fe326f5.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/trashcan1.albedo.png"
+dest_files=["res://.godot/imported/trashcan1.albedo.png-3ff741fed4a3097b520332b69fe326f5.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/trashcan1.normal.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://bpyvb66xkay4v"
+path.s3tc="res://.godot/imported/trashcan1.normal.png-92427bf9108638c4fe660748b2c51c34.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/trashcan1.normal.png"
+dest_files=["res://.godot/imported/trashcan1.normal.png-92427bf9108638c4fe660748b2c51c34.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/trashcan1.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/trashcan1.rough.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://2nr5bb6oxjmr"
+path.s3tc="res://.godot/imported/trashcan1.rough.png-a2fb45dea9fbc6dcc019d17ece06dffa.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/trashcan1.rough.png"
+dest_files=["res://.godot/imported/trashcan1.rough.png-a2fb45dea9fbc6dcc019d17ece06dffa.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/watertower1.normal.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://rclk463le56w"
+path.s3tc="res://.godot/imported/watertower1.normal.png-8a715bb7d4c8e3ac30f9ed3b17f7b824.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://assets/Models/watertower1.normal.png"
+dest_files=["res://.godot/imported/watertower1.normal.png-8a715bb7d4c8e3ac30f9ed3b17f7b824.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/watertower1.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/decoration_assets_pt_1.tscn

@@ -3,3 +3,6 @@
 [ext_resource type="PackedScene" uid="uid://bbu2xjd7fgvty" path="res://assets/Models/DecorationAssetsPt1.blend" id="1_l0n6l"]
 
 [node name="DecorationAssetsPt1" instance=ExtResource("1_l0n6l")]
+
+[node name="Water Tower" parent="." index="2"]
+visible = false

scenes/test_level_2v2.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=54 format=3 uid="uid://dyop6vk3rgkkb"]
+[gd_scene load_steps=55 format=3 uid="uid://dyop6vk3rgkkb"]
 
 [ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_orhgl"]
 [ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="1_w4rag"]
@@ -12,6 +12,7 @@
 [ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="8_b57j8"]
 [ext_resource type="Shader" path="res://assets/crtTest.gdshader" id="13_ur1vy"]
 [ext_resource type="PackedScene" uid="uid://by3n26uvps8tb" path="res://assets/water_tower.tscn" id="14_o37f0"]
+[ext_resource type="PackedScene" uid="uid://c0uv33kbndbvy" path="res://assets/trashcan.tscn" id="15_0omc5"]
 [ext_resource type="PackedScene" uid="uid://c7vrpfdh603kr" path="res://assets/bottle_1.tscn" id="15_3iv0j"]
 [ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="16_4ykdi"]
 
@@ -651,3 +652,6 @@ mouse_filter = 2
 
 [node name="Water Tower" parent="." instance=ExtResource("14_o37f0")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.5814, 0.043795, 59.857)
+
+[node name="Trashcan" parent="." instance=ExtResource("15_0omc5")]
+transform = Transform3D(1.2, 0, 0, 0, 1.2, 0, 0, 0, 1.2, -23.6616, 0.33903, 29.1895)

scripts/player.gd

@@ -88,7 +88,7 @@ func _unhandled_input(event):
 	if event is InputEventMouseMotion:
 		self.rotate_y(-event.relative.x * SENSITIVITY)
 		camera.rotate_x(-event.relative.y * SENSITIVITY)
-		camera.rotation.x = clamp(camera.rotation.x, deg_to_rad(-90), deg_to_rad(60))
+		camera.rotation.x = clamp(camera.rotation.x, deg_to_rad(-90), deg_to_rad(85))
 		mouse_input = event.relative
 
 
@@ -303,7 +303,7 @@ func weapon_bob(vel : float, delta):
 
 func weapon_recoil(delta):
 	var recoil_to = camera.rotation.x + gun.recoil_amount
-	camera.rotation.x = clamp(lerp(camera.rotation.x,recoil_to, .05), deg_to_rad(-90), deg_to_rad(60))
+	camera.rotation.x = clamp(lerp(camera.rotation.x,recoil_to, .05), deg_to_rad(-90), deg_to_rad(85))
 
 func die():
 	Engine.time_scale = .05

walltest.tscn

@@ -0,0 +1,51 @@
+[gd_scene load_steps=6 format=3 uid="uid://bsvm4iblmuaa"]
+
+[ext_resource type="Texture2D" uid="uid://bu3w5slec6gib" path="res://assets/Models/brick1.png" id="1_ugull"]
+[ext_resource type="Texture2D" uid="uid://dtccywxaqkqwk" path="res://assets/Models/brick1.normal.png" id="2_v5fic"]
+
+[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_t7m8f"]
+resource_name = "Brick"
+cull_mode = 2
+albedo_texture = ExtResource("1_ugull")
+normal_enabled = true
+normal_texture = ExtResource("2_v5fic")
+texture_filter = 2
+
+[sub_resource type="ArrayMesh" id="ArrayMesh_qxqqg"]
+_surfaces = [{
+"aabb": AABB(-1.5, 0, -1.5, 3, 1e-05, 3.00001),
+"format": 34896613377,
+"index_count": 6,
+"index_data": PackedByteArray(0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 3, 0),
+"name": "Brick",
+"primitive": 3,
+"uv_scale": Vector4(0, 0, 0, 0),
+"vertex_count": 4,
+"vertex_data": PackedByteArray(0, 0, 0, 0, 254, 255, 0, 0, 255, 255, 0, 0, 254, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 255, 255, 0, 0, 0, 0, 0, 0)
+}]
+blend_shape_mode = 0
+
+[sub_resource type="ArrayMesh" id="ArrayMesh_totmf"]
+resource_name = "DecorationAssetsPt1_Plane_002"
+_surfaces = [{
+"aabb": AABB(-1.5, 0, -1.5, 3, 1e-05, 3.00001),
+"attribute_data": PackedByteArray(0, 0, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 255, 255, 0, 0),
+"format": 34896613399,
+"index_count": 6,
+"index_data": PackedByteArray(0, 0, 3, 0, 1, 0, 0, 0, 2, 0, 3, 0),
+"material": SubResource("StandardMaterial3D_t7m8f"),
+"name": "Brick",
+"primitive": 3,
+"uv_scale": Vector4(0, 0, 0, 0),
+"vertex_count": 4,
+"vertex_data": PackedByteArray(0, 0, 0, 0, 254, 255, 255, 191, 255, 255, 0, 0, 254, 255, 255, 191, 0, 0, 0, 0, 0, 0, 255, 191, 255, 255, 0, 0, 0, 0, 255, 191, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127, 255, 255, 255, 127)
+}]
+blend_shape_mode = 0
+shadow_mesh = SubResource("ArrayMesh_qxqqg")
+
+[node name="brick" type="Node3D"]
+
+[node name="BrickPlane" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 0, -1, 0, 1, 0, 0, 1.5, 0)
+mesh = SubResource("ArrayMesh_totmf")
+skeleton = NodePath("")