minor tweaks to player collision and interact raycast

This commit is contained in:
Derek
2024-10-05 17:10:11 -05:00
parent 21b82f3d5c
commit 730b9cd1bf
12 changed files with 94 additions and 83 deletions

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=4 uid="uid://bpkmyd3wvqi5p"]
[gd_scene load_steps=10 format=4 uid="uid://bpkmyd3wvqi5p"]
[ext_resource type="Script" path="res://scripts/boombox.gd" id="1_ccqda"]
[ext_resource type="PackedScene" uid="uid://ccnnxudjaptb4" path="res://assets/boombox_broken.tscn" id="2_26e0l"]
@@ -78,6 +78,9 @@ _surfaces = [{
blend_shape_mode = 0
shadow_mesh = SubResource("ArrayMesh_nxwjy")
[sub_resource type="BoxShape3D" id="BoxShape3D_kg5u6"]
size = Vector3(2.10059, 1.23395, 0.909241)
[node name="Boombox" type="RigidBody3D" groups=["breakable", "scene_rigidbody"]]
collision_layer = 32
collision_mask = 125
@@ -101,10 +104,10 @@ transform = Transform3D(0.99997, 0.00767937, 0, -0.00767937, 0.99997, 0, 0, 0, 1
stream = ExtResource("3_cr686")
autoplay = true
[node name="Area3D" type="Area3D" parent="."]
[node name="Area3D" type="Area3D" parent="." groups=["interact"]]
collision_layer = 2
collision_mask = 2
[node name="CollisionShape3D2" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.433783, 0.16095)
shape = SubResource("BoxShape3D_1swe3")
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.00146484, 0.656586, 0.31308)
shape = SubResource("BoxShape3D_kg5u6")

View File

@@ -13,6 +13,7 @@ albedo_color = Color(0.983324, 0, 0.213816, 1)
data = PackedVector3Array(-0.5, 0.05, 0.5, 0.5, 0.05, 0.5, -0.5, -0.05, 0.5, 0.5, 0.05, 0.5, 0.5, -0.05, 0.5, -0.5, -0.05, 0.5, 0.5, 0.05, -0.5, -0.5, 0.05, -0.5, 0.5, -0.05, -0.5, -0.5, 0.05, -0.5, -0.5, -0.05, -0.5, 0.5, -0.05, -0.5, 0.5, 0.05, 0.5, 0.5, 0.05, -0.5, 0.5, -0.05, 0.5, 0.5, 0.05, -0.5, 0.5, -0.05, -0.5, 0.5, -0.05, 0.5, -0.5, 0.05, -0.5, -0.5, 0.05, 0.5, -0.5, -0.05, -0.5, -0.5, 0.05, 0.5, -0.5, -0.05, 0.5, -0.5, -0.05, -0.5, 0.5, 0.05, 0.5, -0.5, 0.05, 0.5, 0.5, 0.05, -0.5, -0.5, 0.05, 0.5, -0.5, 0.05, -0.5, 0.5, 0.05, -0.5, -0.5, -0.05, 0.5, 0.5, -0.05, 0.5, -0.5, -0.05, -0.5, 0.5, -0.05, 0.5, 0.5, -0.05, -0.5, -0.5, -0.05, -0.5)
[sub_resource type="BoxShape3D" id="BoxShape3D_t3rus"]
size = Vector3(1, 0.25, 1)
[node name="JumpPlatform" type="StaticBody3D"]
transform = Transform3D(2, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0.09984, 0)
@@ -30,7 +31,7 @@ collision_layer = 0
collision_mask = 2
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.147461, 0)
shape = SubResource("BoxShape3D_t3rus")
[node name="JumpSound" type="AudioStreamPlayer3D" parent="."]

View File

@@ -145,10 +145,10 @@ collision_mask = 5
collide_with_areas = true
[node name="InteractRay" type="RayCast3D" parent="Head/Recoil/Camera3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0521634, -0.764677)
target_position = Vector3(0, 0, -2)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.00322104, -0.0232438)
target_position = Vector3(0, 0, -2.5)
collision_mask = 34
hit_from_inside = true
hit_back_faces = false
collide_with_areas = true
[node name="Audio" type="Node3D" parent="Head/Recoil/Camera3D"]

View File

@@ -30,6 +30,7 @@ version_control/autoload_on_startup=true
pickup=""
enemy=""
weapon_pickup=""
interact="interactable objects"
[input]

View File

@@ -128,7 +128,7 @@ func die():
Engine.time_scale = .05
AudioServer.set_bus_effect_enabled(0,0,true)
var deadmsg = DEAD_ANNOUNCE.instantiate()
last_hit.add_child(deadmsg)
get_parent().add_child(deadmsg)
var instance_dead = dead_player.instantiate()
instance_dead.global_position = player.global_position
instance_dead.transform.basis = player.global_transform.basis

View File

@@ -1,8 +1,8 @@
extends CharacterBody3D
const WALK_TRANSITION_SPEED = 10
const WALK_TRANSITION_SPEED = 8
const MAX_AIR_DASH = 1
const FLASHLIGHT_BRIGHTNESS = 10
const FLASHLIGHT_BRIGHTNESS = 20
const KICK_AMOUNT = 10
var speed