More fixes

Fixed timeline issues
KCL now has presets for games. This will fix crashing in Splatoon, MK9, and many more games
This commit is contained in:
KillzXGaming 2019-04-03 21:03:01 -04:00
parent 08370b8d1d
commit 1d99b14bfe
9 changed files with 12 additions and 39 deletions

Binary file not shown.

View file

@ -55,22 +55,8 @@ namespace FirstPlugin
public KCL() public KCL()
{ {
OdysseyPresetToolstrip = new STToolStripItem("Mario Odyssey", PresetChanged) { Checked = true };
Mk8PresetToolstrip = new STToolStripItem("Mario Kart 8 Wii U / Deluxe", PresetChanged);
Splatoon2PresetToolstrip = new STToolStripItem("Splatoon 2", PresetChanged);
SplatoonPresetToolstrip = new STToolStripItem("Splatoon", PresetChanged);
OtherPresetToolstrip = new STToolStripItem("Other", PresetChanged);
STToolStripItem GamePresetToolstrip = new STToolStripItem("Game Preset");
GamePresetToolstrip.DropDownItems.Add(OdysseyPresetToolstrip);
GamePresetToolstrip.DropDownItems.Add(Mk8PresetToolstrip);
GamePresetToolstrip.DropDownItems.Add(Splatoon2PresetToolstrip);
GamePresetToolstrip.DropDownItems.Add(SplatoonPresetToolstrip);
GamePresetToolstrip.DropDownItems.Add(OtherPresetToolstrip);
ContextMenuStrip = new STContextMenuStrip(); ContextMenuStrip = new STContextMenuStrip();
ContextMenuStrip.Items.Add(new STToolStripItem("Save", Save)); ContextMenuStrip.Items.Add(new STToolStripItem("Save", Save));
ContextMenuStrip.Items.Add(GamePresetToolstrip);
ContextMenuStrip.Items.Add(new STToolStripItem("Export", Export)); ContextMenuStrip.Items.Add(new STToolStripItem("Export", Export));
ContextMenuStrip.Items.Add(new STToolStripItem("Replace", Replace)); ContextMenuStrip.Items.Add(new STToolStripItem("Replace", Replace));
EndiannessToolstrip = new STToolStripItem("Big Endian Mode", SwapEndianess) { Checked = true }; EndiannessToolstrip = new STToolStripItem("Big Endian Mode", SwapEndianess) { Checked = true };
@ -79,26 +65,6 @@ namespace FirstPlugin
IFileInfo = new IFileInfo(); IFileInfo = new IFileInfo();
} }
public void PresetChanged(object sender, EventArgs args)
{
OdysseyPresetToolstrip.Checked = false;
Mk8PresetToolstrip.Checked = false;
Splatoon2PresetToolstrip.Checked = false;
SplatoonPresetToolstrip.Checked = false;
OtherPresetToolstrip.Checked = false;
if (sender is STToolStipMenuItem) {
((STToolStipMenuItem)sender).Checked = true;
}
ApplyPresets(data);
}
private void ApplyPresets(byte[] Data)
{
}
public void Load(System.IO.Stream stream) public void Load(System.IO.Stream stream)
{ {
Text = FileName; Text = FileName;

View file

@ -77,7 +77,6 @@ namespace Switch_Toolbox.Library
totalFrame.Value = frameCount; totalFrame.Value = frameCount;
currentFrameUpDown.Maximum = frameCount; currentFrameUpDown.Maximum = frameCount;
animationTrackBar.FrameCount = frameCount; animationTrackBar.FrameCount = frameCount;
currentFrameUpDown.Value = 1;
currentFrameUpDown.Value = 0; currentFrameUpDown.Value = 0;
} }
} }
@ -188,7 +187,7 @@ namespace Switch_Toolbox.Library
else else
Stop(); Stop();
} }
else else if (!animationTrackBar.Locked)
{ {
currentFrameUpDown.Value++; currentFrameUpDown.Value++;
} }
@ -348,7 +347,7 @@ namespace Switch_Toolbox.Library
//Add frames to the playing animation //Add frames to the playing animation
currentAnimation.Frame += 1f; currentAnimation.Frame += frameNum;
//Reset it when it reaches the total frame count //Reset it when it reaches the total frame count
if (currentAnimation.Frame >= currentAnimation.FrameCount) if (currentAnimation.Frame >= currentAnimation.FrameCount)
@ -363,11 +362,11 @@ namespace Switch_Toolbox.Library
currentFrameUpDown.Value = totalFrame.Value; currentFrameUpDown.Value = totalFrame.Value;
//Check locked state current frame will change during playing //Check locked state current frame will change during playing
if (animationTrackBar.Locked == false) if (!animationTrackBar.Locked)
{ {
animationTrackBar.CurrentFrame = (int)currentFrameUpDown.Value; animationTrackBar.CurrentFrame = (int)currentFrameUpDown.Value;
OnFrameAdvanced();
} }
OnFrameAdvanced();
} }
public void AnimationPanel_FormClosed() public void AnimationPanel_FormClosed()

Binary file not shown.

Binary file not shown.

View file

@ -31,3 +31,11 @@ C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.exe
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.exe C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.exe
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.pdb C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Updater.pdb
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Octokit.dll C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\bin\Release\Octokit.dll
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe.config
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.pdb
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csprojAssemblyReference.cache
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csproj.CoreCompileInputs.cache
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csproj.CopyComplete
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.exe
C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.pdb