From f490a390aa59f69e0a2e5d8204cd953796756961 Mon Sep 17 00:00:00 2001 From: Zenny Date: Sun, 22 Sep 2024 15:40:43 -0700 Subject: [PATCH] Fix stuff --- src/items/dropped/DroppedItem.tscn | 3 ++- src/items/thrown/ThrownItem.cs | 10 +++++----- src/items/thrown/ThrownItem.tscn | 10 +++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/items/dropped/DroppedItem.tscn b/src/items/dropped/DroppedItem.tscn index 102ef949..3db64edc 100644 --- a/src/items/dropped/DroppedItem.tscn +++ b/src/items/dropped/DroppedItem.tscn @@ -6,7 +6,8 @@ [sub_resource type="SphereShape3D" id="SphereShape3D_28r8g"] [node name="DroppedItem" type="RigidBody3D"] -collision_layer = 4 +collision_layer = 0 +collision_mask = 5 axis_lock_angular_x = true axis_lock_angular_y = true axis_lock_angular_z = true diff --git a/src/items/thrown/ThrownItem.cs b/src/items/thrown/ThrownItem.cs index 1287825e..65f7d5de 100644 --- a/src/items/thrown/ThrownItem.cs +++ b/src/items/thrown/ThrownItem.cs @@ -17,7 +17,7 @@ public partial class ThrownItem : RigidBody3D public void OnResolved() { BodyEntered += ThrownItem_BodyEntered; - GlobalPosition = Game.Player.GlobalPosition + new Vector3(0, 1.5f, 0); + GlobalPosition = Game.Player.GlobalPosition + new Vector3(0, 1f, 0); Sprite.Texture = ThrownItemStats.Texture; AddCollisionExceptionWith((Node)Game.Player); } @@ -39,22 +39,22 @@ public partial class ThrownItem : RigidBody3D private void ThrowInternal(WeaponStats weaponStats) { - ApplyCentralImpulse(-Game.Player.GlobalBasis.Z.Normalized() * 5.0f); + ApplyCentralImpulse(-Game.Player.GlobalBasis.Z.Normalized() * 12.0f); } private void ThrowInternal(ArmorStats armorStats) { - ApplyCentralImpulse(-Game.Player.GlobalBasis.Z.Normalized() * 5.0f); + ApplyCentralImpulse(-Game.Player.GlobalBasis.Z.Normalized() * 12.0f); } private void ThrowInternal(AccessoryStats accessoryStats) { - ApplyCentralImpulse(-Game.Player.GlobalBasis.Z.Normalized() * 5.0f); + ApplyCentralImpulse(-Game.Player.GlobalBasis.Z.Normalized() * 12.0f); } private void ThrowInternal(ConsumableItemStats consumableItemStats) { - ApplyCentralImpulse(-Game.Player.GlobalBasis.Z.Normalized() * 5.0f); + ApplyCentralImpulse(-Game.Player.GlobalBasis.Z.Normalized() * 12.0f); } private void ThrowInternal(ThrowableItemStats throwableItemStats) diff --git a/src/items/thrown/ThrownItem.tscn b/src/items/thrown/ThrownItem.tscn index d968d7e4..583f1b13 100644 --- a/src/items/thrown/ThrownItem.tscn +++ b/src/items/thrown/ThrownItem.tscn @@ -4,18 +4,18 @@ [ext_resource type="Texture2D" uid="uid://mi70lolgtf3n" path="res://src/items/throwable/textures/GEOMANCER-DICE.png" id="2_alcjn"] [sub_resource type="BoxShape3D" id="BoxShape3D_s4ym5"] -size = Vector3(1.43084, 1.23022, 1.52861) +size = Vector3(0.884321, 0.999205, 1.52861) [node name="Hitbox" type="RigidBody3D"] -collision_layer = 17 -collision_mask = 16 +collision_layer = 16 +collision_mask = 25 gravity_scale = 0.25 contact_monitor = true -max_contacts_reported = 1 +max_contacts_reported = 50 script = ExtResource("1_wlplc") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0274667, 0.116821, 0.118644) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0347672, 0.152068, 0.118644) shape = SubResource("BoxShape3D_s4ym5") [node name="Sprite" type="Sprite3D" parent="."]