Fix dropped/thrown item behavior

This commit is contained in:
2026-02-10 14:57:41 -08:00
parent fdc4a6f2c1
commit 97198afe18
1138 changed files with 20375 additions and 4110 deletions

View File

@@ -24,15 +24,22 @@ public partial class DroppedItem : RigidBody3D, IDroppedItem
{
ContactMonitor = true;
Sprite.Texture = Item.GetTexture();
BodyEntered += DroppedItem_BodyEntered;
}
private void DroppedItem_BodyEntered(Node body)
{
AngularVelocity = Vector3.Zero;
LinearVelocity = Vector3.Zero;
}
public async void Drop()
{
AddCollisionExceptionWith((Node)Player);
Pickup.Monitorable = false;
Pickup.Monitoring = false;
GlobalPosition = Player.GlobalPosition + Vector3.Up;
ApplyCentralImpulse(-Player.GlobalBasis.Z.Normalized() * 5.0f);
GlobalPosition = new Vector3(Player.GlobalPosition.X, Player.GlobalPosition.Y + 1, Player.GlobalPosition.Z) + (-Player.GlobalBasis.Z * 2);
await ToSignal(GetTree().CreateTimer(1), "timeout");
RemoveCollisionExceptionWith((Node)Player);
Pickup.Monitorable = true;

View File

@@ -1,7 +1,6 @@
[gd_scene load_steps=8 format=3 uid="uid://brq11lswpqxei"]
[ext_resource type="Script" uid="uid://c2sps6uamyyw2" path="res://src/items/dropped/DroppedItem.cs" id="1_67jk4"]
[ext_resource type="Material" uid="uid://x2bv1q51mcjq" path="res://src/enemy/PixelMelt.tres" id="2_eat5q"]
[sub_resource type="SphereShape3D" id="SphereShape3D_28r8g"]
@@ -16,10 +15,10 @@ tracks/0/path = NodePath("Sprite3D:position")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1.99543),
"times": PackedFloat32Array(0, 2),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [Vector3(0.0207178, 0.192374, 0), Vector3(0.0207178, 1.26338, 0)]
"values": [Vector3(0, 0, 0), Vector3(0, 3, 0)]
}
[sub_resource type="Animation" id="Animation_eat5q"]
@@ -34,7 +33,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 0,
"values": [Vector3(0.0207178, 0.192374, 0)]
"values": [Vector3(0, 0, 0)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_eat5q"]
@@ -46,13 +45,17 @@ _data = {
[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_eat5q"]
radius = 0.47
[sub_resource type="ViewportTexture" id="ViewportTexture_x5q15"]
viewport_path = NodePath("Sprite3D/SubViewportContainer/SubViewport")
[node name="DroppedItem" type="RigidBody3D"]
process_mode = 1
collision_layer = 1024
collision_mask = 5
axis_lock_angular_x = true
axis_lock_angular_y = true
axis_lock_angular_z = true
gravity_scale = 0.8
gravity_scale = 0.5
contact_monitor = true
max_contacts_reported = 50
script = ExtResource("1_67jk4")
@@ -65,31 +68,6 @@ libraries = {
&"": SubResource("AnimationLibrary_eat5q")
}
[node name="Sprite3D" type="Sprite3D" parent="."]
transform = Transform3D(0.41, 0, 0, 0, 0.41, 0, 0, 0, 0.41, 0.0207178, 0.192374, 0)
billboard = 2
shaded = true
texture_filter = 0
render_priority = 100
[node name="SubViewportContainer" type="SubViewportContainer" parent="Sprite3D"]
visibility_layer = 0
offset_right = 40.0
offset_bottom = 40.0
[node name="SubViewport" type="SubViewport" parent="Sprite3D/SubViewportContainer"]
disable_3d = true
transparent_bg = true
handle_input_locally = false
render_target_update_mode = 4
[node name="Sprite" type="Sprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"]
unique_name_in_owner = true
material = ExtResource("2_eat5q")
scale = Vector2(0.1, 0.1)
centered = false
offset = Vector2(2000, 2000)
[node name="Pickup" type="Area3D" parent="."]
unique_name_in_owner = true
collision_layer = 4
@@ -97,3 +75,32 @@ collision_mask = 0
[node name="CollisionShape3D" type="CollisionShape3D" parent="Pickup"]
shape = SubResource("CapsuleShape3D_eat5q")
[node name="Sprite3D" type="Sprite3D" parent="."]
pixel_size = 0.025
billboard = 2
texture_filter = 0
texture = SubResource("ViewportTexture_x5q15")
[node name="SubViewportContainer" type="SubViewportContainer" parent="Sprite3D"]
visibility_layer = 0
anchors_preset = 15
anchor_right = 1.0
anchor_bottom = 1.0
grow_horizontal = 2
grow_vertical = 2
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="SubViewport" type="SubViewport" parent="Sprite3D/SubViewportContainer"]
transparent_bg = true
handle_input_locally = false
canvas_item_default_texture_filter = 0
canvas_cull_mask = 4293918721
size = Vector2i(30, 30)
render_target_update_mode = 4
[node name="Sprite" type="Sprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"]
unique_name_in_owner = true
texture_filter = 1
offset = Vector2(15, 15)