diff --git a/Zennysoft.Game.Ma/export_presets.cfg b/Zennysoft.Game.Ma/export_presets.cfg index f79bc47e8..a57b14697 100644 --- a/Zennysoft.Game.Ma/export_presets.cfg +++ b/Zennysoft.Game.Ma/export_presets.cfg @@ -9,7 +9,7 @@ custom_features="" export_filter="all_resources" include_filter="" exclude_filter="" -export_path="../../Export/Ma.exe" +export_path="../../Export/Export.exe" patches=PackedStringArray() encryption_include_filters="" encryption_exclude_filters="" diff --git a/Zennysoft.Game.Ma/src/items/dropped/DroppedItem.tscn b/Zennysoft.Game.Ma/src/items/dropped/DroppedItem.tscn index d79e6e32c..195768569 100644 --- a/Zennysoft.Game.Ma/src/items/dropped/DroppedItem.tscn +++ b/Zennysoft.Game.Ma/src/items/dropped/DroppedItem.tscn @@ -1,7 +1,6 @@ [gd_scene load_steps=8 format=3 uid="uid://bgln7hdyyk34r"] [ext_resource type="Script" uid="uid://c2sps6uamyyw2" path="res://src/items/dropped/DroppedItem.cs" id="1_67jk4"] -[ext_resource type="Texture2D" uid="uid://bhhxd7cphx0q2" path="res://src/items/armor/textures/Atoner's Adornments.png" id="2_x5q15"] [sub_resource type="SphereShape3D" id="SphereShape3D_28r8g"] @@ -46,6 +45,9 @@ _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 @@ -59,6 +61,7 @@ max_contacts_reported = 50 script = ExtResource("1_67jk4") [node name="CollisionShape3D" type="CollisionShape3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.155775, 0) shape = SubResource("SphereShape3D_28r8g") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] @@ -68,6 +71,7 @@ libraries = { [node name="Pickup" type="Area3D" parent="."] unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.02454, 0) collision_layer = 4 collision_mask = 0 @@ -78,6 +82,7 @@ shape = SubResource("CapsuleShape3D_eat5q") pixel_size = 0.005 billboard = 2 texture_filter = 0 +texture = SubResource("ViewportTexture_x5q15") [node name="SubViewportContainer" type="SubViewportContainer" parent="Sprite3D"] visibility_layer = 0 @@ -97,5 +102,4 @@ render_target_update_mode = 4 [node name="Sprite" type="Sprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"] unique_name_in_owner = true texture_filter = 1 -texture = ExtResource("2_x5q15") offset = Vector2(64, 64) diff --git a/Zennysoft.Game.Ma/src/ui/inventory_menu/ActionPanel.cs b/Zennysoft.Game.Ma/src/ui/inventory_menu/ActionPanel.cs index d0dd5c4a7..80793175a 100644 --- a/Zennysoft.Game.Ma/src/ui/inventory_menu/ActionPanel.cs +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/ActionPanel.cs @@ -138,6 +138,13 @@ public partial class ActionPanel : Panel InteractButton.Text = "Augment"; } + private void SetOptionsInternal(ThrowableItem equipable) + { + InteractButton.Text = string.Empty; + InteractButton.Disabled = true; + InteractButton.FocusMode = FocusModeEnum.None; + } + private void SetOptionsInternal(IBaseInventoryItem baseItem) { InteractButton.Text = "Use"; diff --git a/Zennysoft.Game.Ma/src/ui/inventory_menu/AugmentableItemsMenu.cs b/Zennysoft.Game.Ma/src/ui/inventory_menu/AugmentableItemsMenu.cs index fe2d6b149..5658cedfe 100644 --- a/Zennysoft.Game.Ma/src/ui/inventory_menu/AugmentableItemsMenu.cs +++ b/Zennysoft.Game.Ma/src/ui/inventory_menu/AugmentableItemsMenu.cs @@ -78,7 +78,9 @@ public partial class AugmentableItemsMenu : Control } Show(); - ItemSlots.First(x => x.Item.Value == validSelectableItems.First()).FocusItem(); + var itemToFocus = ItemSlots.FirstOrDefault(x => x.Item.Value == validSelectableItems.FirstOrDefault()); + if (itemToFocus != null) + itemToFocus.FocusItem(); } public override void _Input(InputEvent @event)