Fix clipping sprites for dropped item (same fix for thrown item), fix regression on inventory selection, fix action result menu box (glitched text font)

Fix animation name for Tepotztli, fix centering of unarmed strike
This commit is contained in:
2026-06-08 23:42:50 -07:00
parent 1a7ee21fb5
commit 31fcb275f5
5 changed files with 157 additions and 79 deletions
@@ -96,10 +96,10 @@ transparent_bg = true
handle_input_locally = false handle_input_locally = false
canvas_item_default_texture_filter = 0 canvas_item_default_texture_filter = 0
canvas_cull_mask = 4293918721 canvas_cull_mask = 4293918721
size = Vector2i(128, 128) size = Vector2i(500, 500)
render_target_update_mode = 4 render_target_update_mode = 4
[node name="Sprite" type="Sprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"] [node name="Sprite" type="Sprite2D" parent="Sprite3D/SubViewportContainer/SubViewport"]
unique_name_in_owner = true unique_name_in_owner = true
texture_filter = 1 texture_filter = 1
offset = Vector2(64, 64) offset = Vector2(250, 250)
+69 -69
View File
@@ -3181,73 +3181,6 @@ tracks/4/keys = {
} }
tracks/4/use_blend = true tracks/4/use_blend = true
[sub_resource type="Animation" id="Animation_r1e0i"]
resource_name = "Tepotzli"
length = 0.46667
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("../Collision/Hitbox/HitboxCollision:disabled")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.166667, 0.233333),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 1,
"values": [true, false, true]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Control/Weapon Animations 1080p:animation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"Regular Slash B"]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Control/Weapon Animations 1080p:frame")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 0.433333),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0, 22]
}
tracks/3/type = "audio"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("../Weapon Slashes")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0503,
"stream": ExtResource("11_m024w")
}],
"times": PackedFloat32Array(0)
}
tracks/3/use_blend = true
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("../Weapon Slashes:bus")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"SFX"]
}
[sub_resource type="Animation" id="Animation_fsw4h"] [sub_resource type="Animation" id="Animation_fsw4h"]
resource_name = "Unarmed" resource_name = "Unarmed"
length = 1.23334 length = 1.23334
@@ -3436,6 +3369,73 @@ tracks/4/keys = {
"values": [&"DELAY SFX"] "values": [&"DELAY SFX"]
} }
[sub_resource type="Animation" id="Animation_r1e0i"]
resource_name = "Tepotztli"
length = 0.46667
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("../Collision/Hitbox/HitboxCollision:disabled")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 0.166667, 0.233333),
"transitions": PackedFloat32Array(1, 1, 1),
"update": 1,
"values": [true, false, true]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("Control/Weapon Animations 1080p:animation")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"Regular Slash B"]
}
tracks/2/type = "value"
tracks/2/imported = false
tracks/2/enabled = true
tracks/2/path = NodePath("Control/Weapon Animations 1080p:frame")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(0, 0.433333),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0, 22]
}
tracks/3/type = "audio"
tracks/3/imported = false
tracks/3/enabled = true
tracks/3/path = NodePath("../Weapon Slashes")
tracks/3/interp = 1
tracks/3/loop_wrap = true
tracks/3/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0503,
"stream": ExtResource("11_m024w")
}],
"times": PackedFloat32Array(0)
}
tracks/3/use_blend = true
tracks/4/type = "value"
tracks/4/imported = false
tracks/4/enabled = true
tracks/4/path = NodePath("../Weapon Slashes:bus")
tracks/4/interp = 1
tracks/4/loop_wrap = true
tracks/4/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [&"SFX"]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ickvi"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_ickvi"]
_data = { _data = {
&"Cello": SubResource("Animation_mtb23"), &"Cello": SubResource("Animation_mtb23"),
@@ -3464,7 +3464,7 @@ _data = {
&"Shining Halberd": SubResource("Animation_ltyos"), &"Shining Halberd": SubResource("Animation_ltyos"),
&"Swan Sword; Odette": SubResource("Animation_s86wq"), &"Swan Sword; Odette": SubResource("Animation_s86wq"),
&"Talwar": SubResource("Animation_20xiu"), &"Talwar": SubResource("Animation_20xiu"),
&"Tepotzli": SubResource("Animation_r1e0i"), &"Tepotztli": SubResource("Animation_r1e0i"),
&"Unarmed": SubResource("Animation_fsw4h"), &"Unarmed": SubResource("Animation_fsw4h"),
&"Xiphos": SubResource("Animation_d2xqf"), &"Xiphos": SubResource("Animation_d2xqf"),
&"Yansã Blade": SubResource("Animation_l7c4m") &"Yansã Blade": SubResource("Animation_l7c4m")
@@ -13259,10 +13259,10 @@ animation = &"Cello"
frame = 16 frame = 16
[node name="Weapn Animation - Unarmed" type="AnimatedSprite2D" parent="ScreenFX/Control"] [node name="Weapn Animation - Unarmed" type="AnimatedSprite2D" parent="ScreenFX/Control"]
position = Vector2(-83, 20)
scale = Vector2(0.838309, 0.838309) scale = Vector2(0.838309, 0.838309)
sprite_frames = SubResource("SpriteFrames_0nb7q") sprite_frames = SubResource("SpriteFrames_0nb7q")
animation = &"Unarmed" animation = &"Unarmed"
offset = Vector2(0, 75)
[node name="Weapon Animations 1080p" type="AnimatedSprite2D" parent="ScreenFX/Control"] [node name="Weapon Animations 1080p" type="AnimatedSprite2D" parent="ScreenFX/Control"]
texture_filter = 2 texture_filter = 2
@@ -172,7 +172,7 @@ public partial class InventoryMenu : Control, IInventoryMenu
if (_currentlySelected.ItemSlot != null && !inventory.Contains(_currentlySelected.ItemSlot.Item.Value)) if (_currentlySelected.ItemSlot != null && !inventory.Contains(_currentlySelected.ItemSlot.Item.Value))
{ {
var newIndex = Mathf.Clamp(_currentlySelected.InventoryIndex, 0, _player.Inventory.Items.Count - 1); var newIndex = Mathf.Clamp(_currentlySelected.InventoryIndex, 0, Mathf.Max(0, _player.Inventory.Items.Count - 1));
_currentlySelected = (ItemSlots[newIndex], newIndex); _currentlySelected = (ItemSlots[newIndex], newIndex);
} }
@@ -221,7 +221,7 @@ public partial class InventoryMenu : Control, IInventoryMenu
ActionPanel.SetProcessInput(false); ActionPanel.SetProcessInput(false);
if (_player.Inventory.Items.Count > 0) if (_player.Inventory.Items.Count > 0)
{ {
var newIndex = Mathf.Clamp(_currentlySelected.InventoryIndex, 0, ItemSlots.Count - 1); var newIndex = Mathf.Clamp(_currentlySelected.InventoryIndex, 0, Mathf.Max(0, _player.Inventory.Items.Count - 1));
_currentlySelected = (ItemSlots[newIndex], newIndex); _currentlySelected = (ItemSlots[newIndex], newIndex);
_currentlySelected.ItemSlot.FocusItem(); _currentlySelected.ItemSlot.FocusItem();
} }
@@ -1,4 +1,4 @@
[gd_scene load_steps=42 format=4 uid="uid://cbxw70qa7gifp"] [gd_scene load_steps=43 format=4 uid="uid://cbxw70qa7gifp"]
[ext_resource type="Script" uid="uid://yh8qxmn058w2" path="res://src/ui/inventory_menu/InventoryMenu.cs" id="1_unikd"] [ext_resource type="Script" uid="uid://yh8qxmn058w2" path="res://src/ui/inventory_menu/InventoryMenu.cs" id="1_unikd"]
[ext_resource type="PackedScene" uid="uid://b648lhohtue70" path="res://src/ui/inventory_menu/ActionPanel.tscn" id="3_7co7g"] [ext_resource type="PackedScene" uid="uid://b648lhohtue70" path="res://src/ui/inventory_menu/ActionPanel.tscn" id="3_7co7g"]
@@ -2007,6 +2007,10 @@ outline_color = Color(0, 0, 0, 1)
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7co7g"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_7co7g"]
bg_color = Color(0, 0, 0, 0.745098) bg_color = Color(0, 0, 0, 0.745098)
[sub_resource type="LabelSettings" id="LabelSettings_7co7g"]
font = ExtResource("5_7co7g")
font_size = 25
[node name="InventoryMenu" type="PanelContainer"] [node name="InventoryMenu" type="PanelContainer"]
process_mode = 2 process_mode = 2
anchors_preset = 15 anchors_preset = 15
@@ -2498,7 +2502,7 @@ unique_name_in_owner = true
custom_minimum_size = Vector2(275, 125) custom_minimum_size = Vector2(275, 125)
layout_mode = 2 layout_mode = 2
text = "Mask of the Goddess of Suffering And Long Text Equipped." text = "Mask of the Goddess of Suffering And Long Text Equipped."
label_settings = ExtResource("7_we8a6") label_settings = SubResource("LabelSettings_7co7g")
horizontal_alignment = 1 horizontal_alignment = 1
vertical_alignment = 1 vertical_alignment = 1
autowrap_mode = 2 autowrap_mode = 2
File diff suppressed because one or more lines are too long