made scene assets

assets/Models/garbagebin.albedo.png.import

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-[gd_scene load_steps=12 format=3 uid="uid://dqhltdnqyg8ni"]
+[gd_scene load_steps=11 format=3 uid="uid://dqhltdnqyg8ni"]
 
 [ext_resource type="Script" path="res://scripts/bullet.gd" id="1_oj0f5"]
 [ext_resource type="Texture2D" uid="uid://dqytegxsmb5kg" path="res://assets/Models/bullet.transparency.png" id="2_0ks2n"]
@@ -72,13 +72,7 @@ emission_enabled = true
 emission = Color(0.737886, 0.150238, 0.0835467, 1)
 emission_energy_multiplier = 8.0
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_w40h0"]
-size = Vector3(0.128906, 0.112305, 1.4917)
-
-[node name="Bullet" type="RigidBody3D"]
-collision_layer = 0
-collision_mask = 0
-mass = 0.1
+[node name="Bullet" type="Node3D"]
 script = ExtResource("1_oj0f5")
 
 [node name="gunbullet1" type="Node3D" parent="."]
@@ -126,9 +120,3 @@ autostart = true
 
 [node name="HitIndicator" type="AudioStreamPlayer" parent="Audio"]
 stream = ExtResource("3_6j0l2")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.0290527)
-shape = SubResource("BoxShape3D_w40h0")
-
-[connection signal="body_entered" from="." to="." method="_on_body_entered"]

scripts/bullet.gd

@@ -1,4 +1,4 @@
-extends RigidBody3D
+extends Node3D
 
 var bullet_speed
 var bullet_drop
@@ -32,46 +32,46 @@ func _ready():
 	av_x = deg_to_rad(rng.randf_range(-random_spread_amt,random_spread_amt))
 	av_y = deg_to_rad(rng.randf_range(-random_spread_amt,random_spread_amt))
 	av_z = deg_to_rad(rng.randf_range(-random_spread_amt,random_spread_amt))
-	#angular_velocity += Vector3(av_x,av_y,av_z)
-	linear_velocity += transform.basis * Vector3(0, 0, -bullet_speed)
+	rotation += Vector3(av_x,av_y,av_z)
 	timer.start()
 	visible = false
+	ray.target_position.z *= (bullet_speed/150)
 
-func MoveAndCollide():
-	pass
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
+	position += transform.basis * Vector3(0, 0, -bullet_speed) * delta
+	print(player_velocity)
+	rotation.x = clamp(rotation.x - delta * bullet_drop,deg_to_rad(-90),deg_to_rad(90))
+	
 	distance_from_player = abs(self.global_position - player_position)
 	
 	if distance_from_player.x > 2 or  distance_from_player.y > 2 or distance_from_player.z > 2:
 		visible = true
 	
-
-
-func _on_body_entered(body):
 	
-	if !body.is_in_group("player"):
+	if ray.is_colliding() and !ray.get_collider().is_in_group("player"):
+		
 		mesh.visible = false
 		ray.enabled = false
-	
-	#bullethole effect
-	body.add_child(instance_bullethole)
-	instance_bullethole.global_transform.origin = body.get_collision_point()
-	instance_bullethole.look_at(body.get_collision_point() + body.get_collision_normal(), Vector3.UP)
-	
-	##move rigidbodies
-	#if ray.get_collider().is_in_group("scene_rigidbody"):
-		#ray.get_collider().linear_velocity += transform.basis * Vector3(0,0,-1 * bullet_force_mod)
-	
-	if body.is_in_group("breakable"):
-		var current_velocity = transform.basis * Vector3(0,0,-1 * bullet_force_mod)
-		body.breaking(current_velocity)
+		
+		#bullethole effect
+		ray.get_collider().add_child(instance_bullethole)
+		instance_bullethole.global_transform.origin = ray.get_collision_point()
+		instance_bullethole.look_at(ray.get_collision_point() + ray.get_collision_normal(), Vector3.UP)
+		
+		#move rigidbodies
+		if ray.get_collider().is_in_group("scene_rigidbody"):
+			ray.get_collider().linear_velocity += transform.basis * Vector3(0,0,-1 * bullet_force_mod)
+		
+		if ray.get_collider().is_in_group("breakable"):
+			var current_velocity = transform.basis * Vector3(0,0,-1 * bullet_force_mod)
+			ray.get_collider().breaking(current_velocity)
 
-	
-	if body.is_in_group("enemy"):
-		hit_indicator.play()
-		enemy_particles.emitting = true
-		body.hit(bullet_damage)
-	await get_tree().create_timer(1.0).timeout
-	queue_free()
+		
+		if ray.get_collider().is_in_group("enemy"):
+			hit_indicator.play()
+			enemy_particles.emitting = true
+			ray.get_collider().hit(bullet_damage)
+		await get_tree().create_timer(1.0).timeout
+		queue_free()