started playing with rigidbody, not colliding yet

This commit is contained in:
Derek
2024-07-23 20:13:38 -05:00
parent 356455ba29
commit 6e8666db74
8 changed files with 100 additions and 129 deletions

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=11 format=3 uid="uid://dqhltdnqyg8ni"] [gd_scene load_steps=12 format=3 uid="uid://dqhltdnqyg8ni"]
[ext_resource type="Script" path="res://scripts/bullet.gd" id="1_oj0f5"] [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"] [ext_resource type="Texture2D" uid="uid://dqytegxsmb5kg" path="res://assets/Models/bullet.transparency.png" id="2_0ks2n"]
@@ -72,7 +72,13 @@ emission_enabled = true
emission = Color(0.737886, 0.150238, 0.0835467, 1) emission = Color(0.737886, 0.150238, 0.0835467, 1)
emission_energy_multiplier = 8.0 emission_energy_multiplier = 8.0
[node name="Bullet" type="Node3D"] [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
script = ExtResource("1_oj0f5") script = ExtResource("1_oj0f5")
[node name="gunbullet1" type="Node3D" parent="."] [node name="gunbullet1" type="Node3D" parent="."]
@@ -121,4 +127,8 @@ autostart = true
[node name="HitIndicator" type="AudioStreamPlayer" parent="Audio"] [node name="HitIndicator" type="AudioStreamPlayer" parent="Audio"]
stream = ExtResource("3_6j0l2") stream = ExtResource("3_6j0l2")
[connection signal="timeout" from="Timer" to="." method="_on_timer_timeout"] [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"]

View File

@@ -6,7 +6,7 @@
[sub_resource type="LabelSettings" id="LabelSettings_ic2ps"] [sub_resource type="LabelSettings" id="LabelSettings_ic2ps"]
font = ExtResource("1_duhm0") font = ExtResource("1_duhm0")
font_size = 300 font_size = 300
font_color = Color(1, 1, 1, 0.156863) font_color = Color(1, 1, 1, 0)
[node name="PickupAnnounce" type="Label"] [node name="PickupAnnounce" type="Label"]
offset_right = 3440.0 offset_right = 3440.0

View File

@@ -105,7 +105,7 @@ texture = ExtResource("8_kupqh")
script = ExtResource("7_pnp4a") script = ExtResource("7_pnp4a")
[node name="BulletRay" type="RayCast3D" parent="Head/Camera3D"] [node name="BulletRay" type="RayCast3D" parent="Head/Camera3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.10121) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.89879)
target_position = Vector3(0, 0, -200) target_position = Vector3(0, 0, -200)
collision_mask = 7 collision_mask = 7
collide_with_areas = true collide_with_areas = true

View File

@@ -591,6 +591,7 @@ bullet = ExtResource("2_aew5r")
casing = ExtResource("3_6esjv") casing = ExtResource("3_6esjv")
bullet_speed = 75 bullet_speed = 75
bullet_drop = 0.01 bullet_drop = 0.01
bullet_damage = 0
[node name="TurretLook" type="RayCast3D" parent="."] [node name="TurretLook" type="RayCast3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00161432, 1.62046, 0.00134204) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00161432, 1.62046, 0.00134204)

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=53 format=3 uid="uid://dyop6vk3rgkkb"] [gd_scene load_steps=51 format=3 uid="uid://dyop6vk3rgkkb"]
[ext_resource type="Script" path="res://scripts/LevelManager.gd" id="1_orhgl"] [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"] [ext_resource type="Texture2D" uid="uid://dqs06ic3vjtwk" path="res://assets/Models/asphalt1.albedo.jpg" id="1_w4rag"]
@@ -10,8 +10,6 @@
[ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="6_xrg7k"] [ext_resource type="PackedScene" uid="uid://bpkmyd3wvqi5p" path="res://assets/boombox.tscn" id="6_xrg7k"]
[ext_resource type="AudioStream" uid="uid://jo4n05go5hdt" path="res://assets/Audio/train-pass-by-steady-loop-SBA-300156766.wav" id="7_00j8j"] [ext_resource type="AudioStream" uid="uid://jo4n05go5hdt" path="res://assets/Audio/train-pass-by-steady-loop-SBA-300156766.wav" id="7_00j8j"]
[ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="8_b57j8"] [ext_resource type="PackedScene" uid="uid://cnfc8rtk6l1d8" path="res://assets/crate1.tscn" id="8_b57j8"]
[ext_resource type="PackedScene" uid="uid://djr7vnr1hcx82" path="res://assets/spider2.tscn" id="12_12jy2"]
[ext_resource type="Script" path="res://scripts/EnemyHivemind1.gd" id="12_cl6n5"]
[ext_resource type="PackedScene" uid="uid://c7vrpfdh603kr" path="res://assets/bottle_1.tscn" id="15_3iv0j"] [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"] [ext_resource type="PackedScene" uid="uid://c6bpysq1tjhy4" path="res://vendingmahcine.tscn" id="16_4ykdi"]
@@ -615,42 +613,3 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.69462, 1.16757, 11.2398)
[node name="vendingmahcine" parent="." instance=ExtResource("16_4ykdi")] [node name="vendingmahcine" parent="." instance=ExtResource("16_4ykdi")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.992526, 41.9909, -2.56906) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.992526, 41.9909, -2.56906)
[node name="EnemyHivemind1" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.83258, -0.228641, 21.6357)
script = ExtResource("12_cl6n5")
[node name="spider" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
player_path = NodePath("../../Player")
[node name="spider2" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.86321, 0, 0.844511)
player_path = NodePath("../../Player")
[node name="spider3" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.57471, 0, 5.44732)
player_path = NodePath("../../Player")
[node name="spider4" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.67493, 0, -1.22724)
player_path = NodePath("../../Player")
[node name="spider5" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.53813, 0, -0.382725)
player_path = NodePath("../../Player")
[node name="spider6" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.24964, 0, 4.22008)
player_path = NodePath("../../Player")
[node name="spider7" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.13089, 0, 1.6692)
player_path = NodePath("../../Player")
[node name="spider8" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.8058, 0, 0.441959)
player_path = NodePath("../../Player")
[node name="spider9" parent="EnemyHivemind1" instance=ExtResource("12_12jy2")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.51731, 0, 5.04477)
player_path = NodePath("../../Player")

File diff suppressed because one or more lines are too long

View File

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

View File

@@ -225,6 +225,7 @@ func _headbob(time) -> Vector3:
func _on_pick_up_detection_body_entered(body): func _on_pick_up_detection_body_entered(body):
if body.is_in_group("pickup"):
if body.pickupType == "stamina": if body.pickupType == "stamina":
pickupmsg = pickup_announce.instantiate() pickupmsg = pickup_announce.instantiate()
pickupmsg.pickuptext = "stamina" pickupmsg.pickuptext = "stamina"