diff --git a/DotNetCTFDumper.sln b/CTFAK.sln
similarity index 89%
rename from DotNetCTFDumper.sln
rename to CTFAK.sln
index cea16a0..e2b4e8c 100644
--- a/DotNetCTFDumper.sln
+++ b/CTFAK.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30517.126
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetCTFDumper", "DotNetCTFDumper\DotNetCTFDumper.csproj", "{86D99F9E-98FB-4E50-AB68-F5C115850C33}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CTFAK", "CTFAK\CTFAK.csproj", "{86D99F9E-98FB-4E50-AB68-F5C115850C33}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/DotNetCTFDumper/App.config b/CTFAK/App.config
similarity index 100%
rename from DotNetCTFDumper/App.config
rename to CTFAK/App.config
diff --git a/DotNetCTFDumper/DotNetCTFDumper.csproj b/CTFAK/CTFAK.csproj
similarity index 98%
rename from DotNetCTFDumper/DotNetCTFDumper.csproj
rename to CTFAK/CTFAK.csproj
index 0523840..0aada30 100644
--- a/DotNetCTFDumper/DotNetCTFDumper.csproj
+++ b/CTFAK/CTFAK.csproj
@@ -8,9 +8,9 @@
Debug
AnyCPU
{86D99F9E-98FB-4E50-AB68-F5C115850C33}
- Exe
- DotNetCTFDumper
- DotNetCTFDumper
+ WinExe
+ CTFAK
+ CTFAK
v4.7.2
512
true
@@ -282,10 +282,10 @@
md $(SolutionDir)\Build\
md $(SolutionDir)\Build\x64\
-copy $(TargetPath) $(SolutionDir)Build\DotNetCTFDumper.exe
+copy $(TargetPath) $(SolutionDir)Build\CTFAK.exe
copy $(SolutionDir)Dependencies\Decrypter-x64.dll $(SolutionDir)Build\Decrypter-x64.dll
copy $(TargetDir)\x64\zlibwapi.dll $(SolutionDir)Build\x64\zlibwapi.dll
-copy $(TargetDir)DotNetCTFDumper.pdb $(SolutionDir)Build\DotNetCTFDumper.pdb
+copy $(TargetDir)CTFAK.pdb $(SolutionDir)Build\CTFAK.pdb
copy $(TargetDir)Be.Windows.Forms.HexBox.dll $(SolutionDir)Build\Be.Windows.Forms.HexBox.dll
copy $(TargetDir)Joveler.Compression.ZLib.dll $(SolutionDir)Build\Joveler.Compression.ZLib.dll
copy $(TargetDir)Joveler.DynLoader.dll $(SolutionDir)Build\Joveler.DynLoader.dll
diff --git a/DotNetCTFDumper/GUI/ErrorLogBox.Designer.cs b/CTFAK/GUI/ErrorLogBox.Designer.cs
similarity index 67%
rename from DotNetCTFDumper/GUI/ErrorLogBox.Designer.cs
rename to CTFAK/GUI/ErrorLogBox.Designer.cs
index 79362c7..6b846c2 100644
--- a/DotNetCTFDumper/GUI/ErrorLogBox.Designer.cs
+++ b/CTFAK/GUI/ErrorLogBox.Designer.cs
@@ -32,6 +32,7 @@ namespace DotNetCTFDumper.GUI
private void InitializeComponent()
{
this.textBox1 = new System.Windows.Forms.TextBox();
+ this.exitButton = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// textBox1
@@ -47,11 +48,27 @@ namespace DotNetCTFDumper.GUI
this.textBox1.Size = new System.Drawing.Size(603, 274);
this.textBox1.TabIndex = 0;
//
+ // exitButton
+ //
+ this.exitButton.BackColor = System.Drawing.Color.Black;
+ this.exitButton.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.exitButton.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
+ this.exitButton.Font = new System.Drawing.Font("Ebrima", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (0)));
+ this.exitButton.ForeColor = System.Drawing.Color.FromArgb(((int) (((byte) (255)))), ((int) (((byte) (128)))), ((int) (((byte) (0)))));
+ this.exitButton.Location = new System.Drawing.Point(0, 246);
+ this.exitButton.Name = "exitButton";
+ this.exitButton.Size = new System.Drawing.Size(603, 28);
+ this.exitButton.TabIndex = 1;
+ this.exitButton.Text = "Exit";
+ this.exitButton.UseVisualStyleBackColor = false;
+ this.exitButton.Click += new System.EventHandler(this.exitButton_Click);
+ //
// ErrorLogBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(603, 274);
+ this.Controls.Add(this.exitButton);
this.Controls.Add(this.textBox1);
this.ForeColor = System.Drawing.Color.Red;
this.Name = "ErrorLogBox";
@@ -60,6 +77,8 @@ namespace DotNetCTFDumper.GUI
this.PerformLayout();
}
+ private System.Windows.Forms.Button exitButton;
+
private System.Windows.Forms.TextBox textBox1;
#endregion
diff --git a/DotNetCTFDumper/GUI/ErrorLogBox.cs b/CTFAK/GUI/ErrorLogBox.cs
similarity index 85%
rename from DotNetCTFDumper/GUI/ErrorLogBox.cs
rename to CTFAK/GUI/ErrorLogBox.cs
index 490078b..3541d0f 100644
--- a/DotNetCTFDumper/GUI/ErrorLogBox.cs
+++ b/CTFAK/GUI/ErrorLogBox.cs
@@ -28,5 +28,11 @@ namespace DotNetCTFDumper.GUI
//Console.ReadKey();
}
+
+ private void exitButton_Click(object sender, EventArgs e)
+ {
+ Logger.Log("Exiting because of exception");
+ Environment.Exit(-1);
+ }
}
}
\ No newline at end of file
diff --git a/DotNetCTFDumper/GUI/ErrorLogBox.resx b/CTFAK/GUI/ErrorLogBox.resx
similarity index 100%
rename from DotNetCTFDumper/GUI/ErrorLogBox.resx
rename to CTFAK/GUI/ErrorLogBox.resx
diff --git a/DotNetCTFDumper/GUI/FrameViewer.Designer.cs b/CTFAK/GUI/FrameViewer.Designer.cs
similarity index 100%
rename from DotNetCTFDumper/GUI/FrameViewer.Designer.cs
rename to CTFAK/GUI/FrameViewer.Designer.cs
diff --git a/DotNetCTFDumper/GUI/FrameViewer.cs b/CTFAK/GUI/FrameViewer.cs
similarity index 100%
rename from DotNetCTFDumper/GUI/FrameViewer.cs
rename to CTFAK/GUI/FrameViewer.cs
diff --git a/DotNetCTFDumper/GUI/FrameViewer.resx b/CTFAK/GUI/FrameViewer.resx
similarity index 100%
rename from DotNetCTFDumper/GUI/FrameViewer.resx
rename to CTFAK/GUI/FrameViewer.resx
diff --git a/DotNetCTFDumper/GUI/GUIComponents/ChunkNode.cs b/CTFAK/GUI/GUIComponents/ChunkNode.cs
similarity index 100%
rename from DotNetCTFDumper/GUI/GUIComponents/ChunkNode.cs
rename to CTFAK/GUI/GUIComponents/ChunkNode.cs
diff --git a/DotNetCTFDumper/GUI/GUIComponents/ObjectBox.cs b/CTFAK/GUI/GUIComponents/ObjectBox.cs
similarity index 100%
rename from DotNetCTFDumper/GUI/GUIComponents/ObjectBox.cs
rename to CTFAK/GUI/GUIComponents/ObjectBox.cs
diff --git a/DotNetCTFDumper/GUI/HexViewForm.Designer.cs b/CTFAK/GUI/HexViewForm.Designer.cs
similarity index 100%
rename from DotNetCTFDumper/GUI/HexViewForm.Designer.cs
rename to CTFAK/GUI/HexViewForm.Designer.cs
diff --git a/DotNetCTFDumper/GUI/HexViewForm.cs b/CTFAK/GUI/HexViewForm.cs
similarity index 100%
rename from DotNetCTFDumper/GUI/HexViewForm.cs
rename to CTFAK/GUI/HexViewForm.cs
diff --git a/DotNetCTFDumper/GUI/HexViewForm.resx b/CTFAK/GUI/HexViewForm.resx
similarity index 100%
rename from DotNetCTFDumper/GUI/HexViewForm.resx
rename to CTFAK/GUI/HexViewForm.resx
diff --git a/DotNetCTFDumper/GUI/MainConsole.Designer.cs b/CTFAK/GUI/MainConsole.Designer.cs
similarity index 100%
rename from DotNetCTFDumper/GUI/MainConsole.Designer.cs
rename to CTFAK/GUI/MainConsole.Designer.cs
diff --git a/DotNetCTFDumper/GUI/MainConsole.cs b/CTFAK/GUI/MainConsole.cs
similarity index 94%
rename from DotNetCTFDumper/GUI/MainConsole.cs
rename to CTFAK/GUI/MainConsole.cs
index ced1d0c..41fabc3 100644
--- a/DotNetCTFDumper/GUI/MainConsole.cs
+++ b/CTFAK/GUI/MainConsole.cs
@@ -1,7 +1,10 @@
using System;
+using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
+using System.Threading;
using System.Windows.Forms;
+using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.GUI
{
@@ -85,5 +88,10 @@ namespace DotNetCTFDumper.GUI
public short wBorderWidth;
public short wBorders;
}
+
+ private void MainConsole_Load(object sender, EventArgs e)
+ {
+
+ }
}
}
\ No newline at end of file
diff --git a/DotNetCTFDumper/GUI/MainConsole.resx b/CTFAK/GUI/MainConsole.resx
similarity index 100%
rename from DotNetCTFDumper/GUI/MainConsole.resx
rename to CTFAK/GUI/MainConsole.resx
diff --git a/DotNetCTFDumper/GUI/MainForm.Designer.cs b/CTFAK/GUI/MainForm.Designer.cs
similarity index 99%
rename from DotNetCTFDumper/GUI/MainForm.Designer.cs
rename to CTFAK/GUI/MainForm.Designer.cs
index 5bdf63f..b33d60b 100644
--- a/DotNetCTFDumper/GUI/MainForm.Designer.cs
+++ b/CTFAK/GUI/MainForm.Designer.cs
@@ -158,9 +158,9 @@
this.GameInfo.Location = new System.Drawing.Point(8, 36);
this.GameInfo.Margin = new System.Windows.Forms.Padding(5, 0, 3, 0);
this.GameInfo.Name = "GameInfo";
- this.GameInfo.Size = new System.Drawing.Size(182, 45);
+ this.GameInfo.Size = new System.Drawing.Size(182, 105);
this.GameInfo.TabIndex = 3;
- this.GameInfo.Text = "GameInfo will appear here\r\nSemenLine\r\nLine3\r\n";
+ this.GameInfo.Text = "GameInfo will appear here\r\nLine2\r\nLine3\r\nLine4\r\nLine5\r\nLine6\r\n\r\n";
this.GameInfo.Visible = false;
//
// label1
@@ -377,7 +377,7 @@
//
// SortedProgressBar
//
- this.SortedProgressBar.Location = new System.Drawing.Point(97, 216);
+ this.SortedProgressBar.Location = new System.Drawing.Point(97, 407);
this.SortedProgressBar.Name = "SortedProgressBar";
this.SortedProgressBar.Size = new System.Drawing.Size(209, 41);
this.SortedProgressBar.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
@@ -701,18 +701,20 @@
this.pluginLogBox.Multiline = true;
this.pluginLogBox.Name = "pluginLogBox";
this.pluginLogBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.pluginLogBox.Size = new System.Drawing.Size(405, 479);
+ this.pluginLogBox.Size = new System.Drawing.Size(405, 448);
this.pluginLogBox.TabIndex = 2;
//
// activatePluginBtn
//
- this.activatePluginBtn.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.activatePluginBtn.AutoSize = true;
+ this.activatePluginBtn.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+ this.activatePluginBtn.Dock = System.Windows.Forms.DockStyle.Bottom;
this.activatePluginBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.activatePluginBtn.Font = new System.Drawing.Font("Feast of Flesh BB", 12F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte) (77)));
this.activatePluginBtn.ForeColor = System.Drawing.Color.FromArgb(((int) (((byte) (255)))), ((int) (((byte) (128)))), ((int) (((byte) (0)))));
- this.activatePluginBtn.Location = new System.Drawing.Point(252, 0);
+ this.activatePluginBtn.Location = new System.Drawing.Point(252, 448);
this.activatePluginBtn.Name = "activatePluginBtn";
- this.activatePluginBtn.Size = new System.Drawing.Size(683, 479);
+ this.activatePluginBtn.Size = new System.Drawing.Size(683, 31);
this.activatePluginBtn.TabIndex = 1;
this.activatePluginBtn.Text = "Activate";
this.activatePluginBtn.UseVisualStyleBackColor = true;
diff --git a/DotNetCTFDumper/GUI/MainForm.cs b/CTFAK/GUI/MainForm.cs
similarity index 99%
rename from DotNetCTFDumper/GUI/MainForm.cs
rename to CTFAK/GUI/MainForm.cs
index e66bf94..be367a1 100644
--- a/DotNetCTFDumper/GUI/MainForm.cs
+++ b/CTFAK/GUI/MainForm.cs
@@ -40,10 +40,11 @@ namespace DotNetCTFDumper.GUI
- public MainForm()
+ public MainForm(Color color)
{
//Buttons
InitializeComponent();
+ ColorTheme = color;
foreach (Control item in Controls)
{
item.ForeColor = ColorTheme;
@@ -169,6 +170,7 @@ namespace DotNetCTFDumper.GUI
soundsButton.Visible = false;
musicsButton.Visible = false;
dumpSortedBtn.Visible = false;
+ Loaded = false;
@@ -312,10 +314,10 @@ namespace DotNetCTFDumper.GUI
GameInfo.Visible = true;
loadingLabel.Visible = false;
Loaded = true;
- InitKeyTab();
InitPackDataTab();
InitImages();
InitSounds();
+ InitKeyTab();
InitPlugins();
var toLog = "";
toLog += $"Title:{Exe.Instance.GameData.Name}\n";
diff --git a/DotNetCTFDumper/GUI/MainForm.resx b/CTFAK/GUI/MainForm.resx
similarity index 100%
rename from DotNetCTFDumper/GUI/MainForm.resx
rename to CTFAK/GUI/MainForm.resx
diff --git a/DotNetCTFDumper/Helper.cs b/CTFAK/Helper.cs
similarity index 100%
rename from DotNetCTFDumper/Helper.cs
rename to CTFAK/Helper.cs
diff --git a/DotNetCTFDumper/MMFParser/Constants.cs b/CTFAK/MMFParser/Constants.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/Constants.cs
rename to CTFAK/MMFParser/Constants.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/ChunkList.cs b/CTFAK/MMFParser/EXE/ChunkList.cs
similarity index 99%
rename from DotNetCTFDumper/MMFParser/EXE/ChunkList.cs
rename to CTFAK/MMFParser/EXE/ChunkList.cs
index 8159dc7..a392b85 100644
--- a/DotNetCTFDumper/MMFParser/EXE/ChunkList.cs
+++ b/CTFAK/MMFParser/EXE/ChunkList.cs
@@ -234,7 +234,6 @@ namespace DotNetCTFDumper.MMFParser.EXE
case 17478:
loader = new ObjectProperties(chunk);
return loader;
- break;
case 8788:
//loader = new ObjectNames(chunk);
break;
diff --git a/DotNetCTFDumper/MMFParser/EXE/DataLoader.cs b/CTFAK/MMFParser/EXE/DataLoader.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/DataLoader.cs
rename to CTFAK/MMFParser/EXE/DataLoader.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/EXE.cs b/CTFAK/MMFParser/EXE/EXE.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/EXE.cs
rename to CTFAK/MMFParser/EXE/EXE.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/GameData.cs b/CTFAK/MMFParser/EXE/GameData.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/GameData.cs
rename to CTFAK/MMFParser/EXE/GameData.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/AppHeader.cs b/CTFAK/MMFParser/EXE/Loaders/AppHeader.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/AppHeader.cs
rename to CTFAK/MMFParser/EXE/Loaders/AppHeader.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/AppMenu.cs b/CTFAK/MMFParser/EXE/Loaders/AppMenu.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/AppMenu.cs
rename to CTFAK/MMFParser/EXE/Loaders/AppMenu.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/FontBank.cs b/CTFAK/MMFParser/EXE/Loaders/Banks/FontBank.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/FontBank.cs
rename to CTFAK/MMFParser/EXE/Loaders/Banks/FontBank.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/ImageBank.cs b/CTFAK/MMFParser/EXE/Loaders/Banks/ImageBank.cs
similarity index 99%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/ImageBank.cs
rename to CTFAK/MMFParser/EXE/Loaders/Banks/ImageBank.cs
index 266c8e1..ac8c720 100644
--- a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/ImageBank.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/Banks/ImageBank.cs
@@ -178,7 +178,12 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
_bitmap = null;
Reader.Seek(Position);
ByteReader imageReader;
-
+ if (Settings.twofiveplus)
+ {
+
+ //Do 2.5+ decryption
+
+ }
// imageReader = Debug ? Reader : Decompressor.DecompressAsReader(Reader, out var a);
imageReader = Debug ? Reader : Decompressor.DecompressAsReader(Reader, out var a);
long start = imageReader.Tell();
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/MusicBank.cs b/CTFAK/MMFParser/EXE/Loaders/Banks/MusicBank.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/MusicBank.cs
rename to CTFAK/MMFParser/EXE/Loaders/Banks/MusicBank.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/SoundBank.cs b/CTFAK/MMFParser/EXE/Loaders/Banks/SoundBank.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/SoundBank.cs
rename to CTFAK/MMFParser/EXE/Loaders/Banks/SoundBank.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/ChunkLoader.cs b/CTFAK/MMFParser/EXE/Loaders/ChunkLoader.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/ChunkLoader.cs
rename to CTFAK/MMFParser/EXE/Loaders/ChunkLoader.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Events.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Events.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Events.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Events.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/EventsParts.cs b/CTFAK/MMFParser/EXE/Loaders/Events/EventsParts.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/EventsParts.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/EventsParts.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Create.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Create.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Create.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Create.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Every.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Every.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Every.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Every.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Float.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Float.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Float.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Float.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Int.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Int.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Int.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Int.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Position.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Position.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Position.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Position.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Short.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Short.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Short.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Short.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Time.cs b/CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Time.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Parameters/Time.cs
rename to CTFAK/MMFParser/EXE/Loaders/Events/Parameters/Time.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/ExtData.cs b/CTFAK/MMFParser/EXE/Loaders/ExtData.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/ExtData.cs
rename to CTFAK/MMFParser/EXE/Loaders/ExtData.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Frame.cs b/CTFAK/MMFParser/EXE/Loaders/Frame.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Frame.cs
rename to CTFAK/MMFParser/EXE/Loaders/Frame.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/FrameItems.cs b/CTFAK/MMFParser/EXE/Loaders/FrameItems.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/FrameItems.cs
rename to CTFAK/MMFParser/EXE/Loaders/FrameItems.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Globals.cs b/CTFAK/MMFParser/EXE/Loaders/Globals.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Globals.cs
rename to CTFAK/MMFParser/EXE/Loaders/Globals.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectInfo.cs b/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectInfo.cs
rename to CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectNames.cs b/CTFAK/MMFParser/EXE/Loaders/ObjectNames.cs
similarity index 93%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectNames.cs
rename to CTFAK/MMFParser/EXE/Loaders/ObjectNames.cs
index 1764d7d..9876ec2 100644
--- a/DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectNames.cs
+++ b/CTFAK/MMFParser/EXE/Loaders/ObjectNames.cs
@@ -22,7 +22,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
var endpos = start + Chunk.Size;
while(true)
{
- if (Reader.Tell() >= endpos+4) break;
+ if (Reader.Tell() >= endpos) break;
var name = Reader.ReadWideString();
}
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Animations.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Animations.cs
rename to CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Backdrop.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Backdrop.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Backdrop.cs
rename to CTFAK/MMFParser/EXE/Loaders/Objects/Backdrop.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Counters.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Counters.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Counters.cs
rename to CTFAK/MMFParser/EXE/Loaders/Objects/Counters.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Movements.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Movements.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Movements.cs
rename to CTFAK/MMFParser/EXE/Loaders/Objects/Movements.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs
rename to CTFAK/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Value.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Value.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Value.cs
rename to CTFAK/MMFParser/EXE/Loaders/Objects/Value.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/StringChunk.cs b/CTFAK/MMFParser/EXE/Loaders/StringChunk.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/StringChunk.cs
rename to CTFAK/MMFParser/EXE/Loaders/StringChunk.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/Transition.cs b/CTFAK/MMFParser/EXE/Loaders/Transition.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/Transition.cs
rename to CTFAK/MMFParser/EXE/Loaders/Transition.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/Loaders/yves.cs b/CTFAK/MMFParser/EXE/Loaders/yves.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/Loaders/yves.cs
rename to CTFAK/MMFParser/EXE/Loaders/yves.cs
diff --git a/DotNetCTFDumper/MMFParser/EXE/PackData.cs b/CTFAK/MMFParser/EXE/PackData.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/EXE/PackData.cs
rename to CTFAK/MMFParser/EXE/PackData.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/ChunkList.cs b/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/ChunkList.cs
rename to CTFAK/MMFParser/MFA/Loaders/ChunkList.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/Controls.cs b/CTFAK/MMFParser/MFA/Loaders/Controls.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/Controls.cs
rename to CTFAK/MMFParser/MFA/Loaders/Controls.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/Events.cs b/CTFAK/MMFParser/MFA/Loaders/Events.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/Events.cs
rename to CTFAK/MMFParser/MFA/Loaders/Events.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/Frame.cs b/CTFAK/MMFParser/MFA/Loaders/Frame.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/Frame.cs
rename to CTFAK/MMFParser/MFA/Loaders/Frame.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameInstance.cs b/CTFAK/MMFParser/MFA/Loaders/FrameInstance.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/FrameInstance.cs
rename to CTFAK/MMFParser/MFA/Loaders/FrameInstance.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/FrameItem.cs b/CTFAK/MMFParser/MFA/Loaders/FrameItem.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/FrameItem.cs
rename to CTFAK/MMFParser/MFA/Loaders/FrameItem.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/ImageBank.cs b/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/ImageBank.cs
rename to CTFAK/MMFParser/MFA/Loaders/ImageBank.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/ItemFolder.cs b/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/ItemFolder.cs
rename to CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/Layer.cs b/CTFAK/MMFParser/MFA/Loaders/Layer.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/Layer.cs
rename to CTFAK/MMFParser/MFA/Loaders/Layer.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/Transition.cs b/CTFAK/MMFParser/MFA/Loaders/Transition.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/Transition.cs
rename to CTFAK/MMFParser/MFA/Loaders/Transition.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/ValueList.cs b/CTFAK/MMFParser/MFA/Loaders/ValueList.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/ValueList.cs
rename to CTFAK/MMFParser/MFA/Loaders/ValueList.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Active.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Active.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Active.cs
rename to CTFAK/MMFParser/MFA/Loaders/mfachunks/Active.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs
rename to CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs
rename to CTFAK/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Movements.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/Movements.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Movements.cs
rename to CTFAK/MMFParser/MFA/Loaders/mfachunks/Movements.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs
rename to CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs
diff --git a/DotNetCTFDumper/MMFParser/MFA/MFA.cs b/CTFAK/MMFParser/MFA/MFA.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/MFA/MFA.cs
rename to CTFAK/MMFParser/MFA/MFA.cs
diff --git a/DotNetCTFDumper/MMFParser/Translation/MFAGenerator.cs b/CTFAK/MMFParser/Translation/MFAGenerator.cs
similarity index 96%
rename from DotNetCTFDumper/MMFParser/Translation/MFAGenerator.cs
rename to CTFAK/MMFParser/Translation/MFAGenerator.cs
index cf7fa5f..4727b87 100644
--- a/DotNetCTFDumper/MMFParser/Translation/MFAGenerator.cs
+++ b/CTFAK/MMFParser/Translation/MFAGenerator.cs
@@ -31,7 +31,6 @@ namespace DotNetCTFDumper.MMFParser.Translation
Pame2Mfa.Message("Writing is finished!");
return template;
- Logger.Log("MFA Done", true, ConsoleColor.Yellow);
}
public static void ReadTestMFA()
diff --git a/DotNetCTFDumper/MMFParser/Translation/PAME2MFA.cs b/CTFAK/MMFParser/Translation/PAME2MFA.cs
similarity index 100%
rename from DotNetCTFDumper/MMFParser/Translation/PAME2MFA.cs
rename to CTFAK/MMFParser/Translation/PAME2MFA.cs
diff --git a/DotNetCTFDumper/PluginAPI/IPlugin.cs b/CTFAK/PluginAPI/IPlugin.cs
similarity index 100%
rename from DotNetCTFDumper/PluginAPI/IPlugin.cs
rename to CTFAK/PluginAPI/IPlugin.cs
diff --git a/DotNetCTFDumper/PluginAPI/PluginAPI.cs b/CTFAK/PluginAPI/PluginAPI.cs
similarity index 100%
rename from DotNetCTFDumper/PluginAPI/PluginAPI.cs
rename to CTFAK/PluginAPI/PluginAPI.cs
diff --git a/DotNetCTFDumper/Program.cs b/CTFAK/Program.cs
similarity index 78%
rename from DotNetCTFDumper/Program.cs
rename to CTFAK/Program.cs
index 68456c2..80566fb 100644
--- a/DotNetCTFDumper/Program.cs
+++ b/CTFAK/Program.cs
@@ -21,9 +21,8 @@ namespace DotNetCTFDumper
[STAThread]
private static void Main(string[] args)
{
- var handle = Helper.GetConsoleWindow();
- Helper.ShowWindow(handle, Helper.SW_HIDE);
InitNativeLibrary();
+
// MFAGenerator.ReadTestMFA();
// Environment.Exit(0);
@@ -36,27 +35,22 @@ namespace DotNetCTFDumper
var error = new ErrorLogBox(eventArgs.Exception);
Application.Run(error);
};
- if (args.Length == 0)
+
+ Settings.UseGUI = true;
+
+ if (args.Length > 0)
{
-
- Settings.UseGUI = true;
- MyForm = new MainForm();
-
-
- Application.Run(MyForm);
-
-
-
+ MyForm = new MainForm(Color.FromName(args[0]));
}
+ else
+ {
+ MyForm = new MainForm(Color.FromArgb(223, 114, 38));
+ }
+ Application.Run(MyForm);
+
+
- if (args.Length > 0) path = args[0];
-
- if (args.Length > 1) bool.TryParse(args[1], out verbose);
-
- if (args.Length > 2) bool.TryParse(args[2], out dumpImages);
-
- if (args.Length > 3) bool.TryParse(args[3], out dumpSounds);
if (args.Length > 0 && (args[0] == "-h" || args[0] == "-help"))
{
@@ -74,13 +68,13 @@ namespace DotNetCTFDumper
Environment.Exit(0);
}
- if (args.Length > 0) ReadFile(path, verbose, dumpImages, dumpSounds);
+ if (args.Length > 1) ReadFile(path, verbose, dumpImages, dumpSounds);
}
public static void ReadFile(string path, bool verbose = false, bool dumpImages = false, bool dumpSounds = true)
{
Settings.GamePath = path;
-
+ Logger.Log("DecryptionLibExist: "+File.Exists("x64\\Decrypter-x64.dll"));
PrepareFolders();
Settings.DumpImages = dumpImages;
@@ -95,25 +89,7 @@ namespace DotNetCTFDumper
currentExe.ParseExe(exeReader);
stopWatch.Stop();
Logger.Log("Finished in "+stopWatch.Elapsed.ToString("g"), true, ConsoleColor.Yellow);
- return;
- if (File.Exists(path))
- {
- if (path.EndsWith(".exe"))
- {
- Settings.DoMFA = false;
-
-
- }
-
- else
- {
- Logger.Log($"File '{path}' is not a valid file", true, ConsoleColor.Red);
- }
- }
- else
- {
- Logger.Log($"File '{path}' does not exist", true, ConsoleColor.Red);
- }
+
}
public static void PrepareFolders()
diff --git a/DotNetCTFDumper/Properties/AssemblyInfo.cs b/CTFAK/Properties/AssemblyInfo.cs
similarity index 100%
rename from DotNetCTFDumper/Properties/AssemblyInfo.cs
rename to CTFAK/Properties/AssemblyInfo.cs
diff --git a/DotNetCTFDumper/Scanner.cs b/CTFAK/Scanner.cs
similarity index 100%
rename from DotNetCTFDumper/Scanner.cs
rename to CTFAK/Scanner.cs
diff --git a/DotNetCTFDumper/Settings.cs b/CTFAK/Settings.cs
similarity index 88%
rename from DotNetCTFDumper/Settings.cs
rename to CTFAK/Settings.cs
index edffbd4..f33347f 100644
--- a/DotNetCTFDumper/Settings.cs
+++ b/CTFAK/Settings.cs
@@ -10,6 +10,7 @@ namespace DotNetCTFDumper
public static bool SaveChunks;
public static bool Verbose;
public static bool Old;
+ public static bool twofiveplus;
public static string GamePath;
public static string GameName => Path.GetFileNameWithoutExtension(GamePath);
@@ -31,6 +32,6 @@ namespace DotNetCTFDumper
public static bool DoMFA;
public static bool UseGUI;
- public static string DumperVersion = "CTFAK 0.2-a Alpha";
+ public static string DumperVersion = true ? "CTFAK 0.2-b Alpha" : "CTFAK 0.2.1-a Debug";
}
}
\ No newline at end of file
diff --git a/DotNetCTFDumper/Utils/Backend.cs b/CTFAK/Utils/Backend.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/Backend.cs
rename to CTFAK/Utils/Backend.cs
diff --git a/DotNetCTFDumper/Utils/BitDict.cs b/CTFAK/Utils/BitDict.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/BitDict.cs
rename to CTFAK/Utils/BitDict.cs
diff --git a/DotNetCTFDumper/Utils/ByteFlag.cs b/CTFAK/Utils/ByteFlag.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/ByteFlag.cs
rename to CTFAK/Utils/ByteFlag.cs
diff --git a/DotNetCTFDumper/Utils/ByteReader.cs b/CTFAK/Utils/ByteReader.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/ByteReader.cs
rename to CTFAK/Utils/ByteReader.cs
diff --git a/DotNetCTFDumper/Utils/ByteWriter.cs b/CTFAK/Utils/ByteWriter.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/ByteWriter.cs
rename to CTFAK/Utils/ByteWriter.cs
diff --git a/DotNetCTFDumper/Utils/Decompressor.cs b/CTFAK/Utils/Decompressor.cs
similarity index 98%
rename from DotNetCTFDumper/Utils/Decompressor.cs
rename to CTFAK/Utils/Decompressor.cs
index 8f1cb6c..28a5df3 100644
--- a/DotNetCTFDumper/Utils/Decompressor.cs
+++ b/CTFAK/Utils/Decompressor.cs
@@ -47,7 +47,6 @@ namespace DotNetCTFDumper.Utils
MemoryStream decompressedStream = new MemoryStream(data);
MemoryStream compressedStream = new MemoryStream();
byte[] compressedData = null;
- Int32 compressed_size = 0;
ZLibStream zs = new ZLibStream(compressedStream, compOpts);
decompressedStream.CopyTo(zs);
zs.Close();
diff --git a/DotNetCTFDumper/Utils/Decryption.cs b/CTFAK/Utils/Decryption.cs
similarity index 90%
rename from DotNetCTFDumper/Utils/Decryption.cs
rename to CTFAK/Utils/Decryption.cs
index f875136..15a75e6 100644
--- a/DotNetCTFDumper/Utils/Decryption.cs
+++ b/CTFAK/Utils/Decryption.cs
@@ -84,17 +84,17 @@ namespace DotNetCTFDumper.Utils
return decodedChunk;
}
-
- [DllImport("Decrypter-x64.dll", EntryPoint = "decode_chunk", CharSet = CharSet.Auto)]
+ private const string _dllPath = "Decrypter-x64.dll";
+ [DllImport(_dllPath, EntryPoint = "decode_chunk", CharSet = CharSet.Auto)]
public static extern IntPtr decode_chunk(IntPtr chunkData, int chunkSize, byte magicChar, IntPtr wrapperKey);
- [DllImport("Decrypter-x64.dll", EntryPoint = "make_key", CharSet = CharSet.Auto)]
+ [DllImport(_dllPath, EntryPoint = "make_key", CharSet = CharSet.Auto)]
public static extern IntPtr make_key(IntPtr cTitle, IntPtr cCopyright, IntPtr cProject, byte magicChar);
- [DllImport("Decrypter-x64.dll", EntryPoint = "make_key_combined", CharSet = CharSet.Auto)]
+ [DllImport(_dllPath, EntryPoint = "make_key_combined", CharSet = CharSet.Auto)]
public static extern IntPtr make_key_combined(IntPtr data, byte magicChar);
- [DllImport("Decrypter-x64.dll", EntryPoint = "make_key_w_combined", CharSet = CharSet.Auto)]
+ [DllImport(_dllPath, EntryPoint = "make_key_w_combined", CharSet = CharSet.Auto)]
public static extern IntPtr make_key_w_combined(IntPtr data, byte magicChar);
}
}
\ No newline at end of file
diff --git a/DotNetCTFDumper/Utils/Helper.cs b/CTFAK/Utils/Helper.cs
similarity index 96%
rename from DotNetCTFDumper/Utils/Helper.cs
rename to CTFAK/Utils/Helper.cs
index 9a84d70..e49e258 100644
--- a/DotNetCTFDumper/Utils/Helper.cs
+++ b/CTFAK/Utils/Helper.cs
@@ -232,15 +232,7 @@ namespace DotNetCTFDumper.Utils
return chosenValue;
}
- public static string ActualName(this ChunkList.Chunk chunk)
- {
- return "Placeholder";
- var constName = ((Constants.ChunkNames) chunk.Id).ToString();
- int tempId = 0;
- int.TryParse(constName, out tempId);
- if (tempId != chunk.Id) return constName;
- else return $"Unknown-{chunk.Id}";
- }
+
public static ChunkNode GetChunkNode(ChunkList.Chunk chunk, string customName = "[DEFAULT-NAME]")
{
diff --git a/DotNetCTFDumper/Utils/ImageDumper.cs b/CTFAK/Utils/ImageDumper.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/ImageDumper.cs
rename to CTFAK/Utils/ImageDumper.cs
diff --git a/DotNetCTFDumper/Utils/ImageHelper.cs b/CTFAK/Utils/ImageHelper.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/ImageHelper.cs
rename to CTFAK/Utils/ImageHelper.cs
diff --git a/DotNetCTFDumper/Utils/Logger.cs b/CTFAK/Utils/Logger.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/Logger.cs
rename to CTFAK/Utils/Logger.cs
diff --git a/DotNetCTFDumper/Utils/WAVReading.cs b/CTFAK/Utils/WAVReading.cs
similarity index 100%
rename from DotNetCTFDumper/Utils/WAVReading.cs
rename to CTFAK/Utils/WAVReading.cs
diff --git a/DotNetCTFDumper/icon.ico b/CTFAK/icon.ico
similarity index 100%
rename from DotNetCTFDumper/icon.ico
rename to CTFAK/icon.ico
diff --git a/DotNetCTFDumper/packages.config b/CTFAK/packages.config
similarity index 100%
rename from DotNetCTFDumper/packages.config
rename to CTFAK/packages.config