From 13c49d2605ef95fa4e573168da40a7e112a16a1e Mon Sep 17 00:00:00 2001 From: MayNL Date: Mon, 30 Mar 2026 14:49:16 -0400 Subject: [PATCH] End of an era Fixed previously unknown ANIM flag in Animation editor --- PCK-Studio/Controls/PckEditor.cs | 2 +- PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs | 8 ++++---- PCK-Studio/Forms/Editor/AnimationEditor.cs | 2 +- PckStudio.Core/Skin/SkinAnimMask.cs | 2 +- Vendor/OMI-Lib | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PCK-Studio/Controls/PckEditor.cs b/PCK-Studio/Controls/PckEditor.cs index 53927641..21ca3ab9 100644 --- a/PCK-Studio/Controls/PckEditor.cs +++ b/PCK-Studio/Controls/PckEditor.cs @@ -247,7 +247,7 @@ namespace PckStudio.Controls } if (!hasDefaultModel && !hasCustomModel) { - MessageBox.Show(this, $"Not Model found for: {modelName}"); + MessageBox.Show(this, $"No Model found for: {modelName}"); return; } diff --git a/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs b/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs index 7941ddce..7a4d5da7 100644 --- a/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs +++ b/PCK-Studio/Forms/Editor/ANIMEditor.Designer.cs @@ -452,12 +452,12 @@ this.unknownCheckBox.FontSize = MetroFramework.MetroCheckBoxSize.Medium; this.unknownCheckBox.Location = new System.Drawing.Point(126, 81); this.unknownCheckBox.Name = "unknownCheckBox"; - this.unknownCheckBox.Size = new System.Drawing.Size(84, 19); + this.unknownCheckBox.Size = new System.Drawing.Size(130, 19); this.unknownCheckBox.TabIndex = 13; - this.unknownCheckBox.Text = "Unknown"; + this.unknownCheckBox.Text = "Force Skin Effects"; this.unknownCheckBox.Theme = MetroFramework.MetroThemeStyle.Dark; - this.toolTip.SetToolTip(this.unknownCheckBox, " If you figure out what this is. Please reach out to MNL#8935 on Discord. (: " + - ""); + this.toolTip.SetToolTip(this.unknownCheckBox, "Forcefully display skin effects despite the game\'s \"Custom Skin Animation\" settin" + + "g"); this.unknownCheckBox.UseSelectable = true; // // crouchCheckBox diff --git a/PCK-Studio/Forms/Editor/AnimationEditor.cs b/PCK-Studio/Forms/Editor/AnimationEditor.cs index 15d607c0..c6c866c4 100644 --- a/PCK-Studio/Forms/Editor/AnimationEditor.cs +++ b/PCK-Studio/Forms/Editor/AnimationEditor.cs @@ -256,7 +256,7 @@ namespace PckStudio.Forms.Editor * it would replace the first instance of that frame and time * rather than the actual frame that was clicked. * I've just switched to passing the index to fix this for now. - * - Matt + * - MayNL */ EditorValue.SetFrame(frameTreeView.SelectedNode.Index, diag.FrameTextureIndex, diag.FrameTime); diff --git a/PckStudio.Core/Skin/SkinAnimMask.cs b/PckStudio.Core/Skin/SkinAnimMask.cs index 5daffe91..3fae61fe 100644 --- a/PckStudio.Core/Skin/SkinAnimMask.cs +++ b/PckStudio.Core/Skin/SkinAnimMask.cs @@ -15,7 +15,7 @@ namespace PckStudio.Core.Skin STATIC_LEGS = 1 << 2, // 0x04 BAD_SANTA = 1 << 3, // 0x08 - __BIT_4 = 1 << 4, // 0x10 - Unused?? + CUSTOM_ANIMATION_OVERRIDE = 1 << 4, // 0x10, Overrides the game's "Custom Skin Animation" setting (0x19 in Settings enum) SYNCED_LEGS = 1 << 5, // 0x20 SYNCED_ARMS = 1 << 6, // 0x40 STATUE_OF_LIBERTY = 1 << 7, // 0x80 diff --git a/Vendor/OMI-Lib b/Vendor/OMI-Lib index 056669c2..571a72c2 160000 --- a/Vendor/OMI-Lib +++ b/Vendor/OMI-Lib @@ -1 +1 @@ -Subproject commit 056669c296edaf9ed7d5cd448f66ac6d85df60b6 +Subproject commit 571a72c283593514994affa959484c28301225f7