Visual updates

master
1987kostya 4 years ago
parent c949a63843
commit 117c9cb94a

@ -33,12 +33,12 @@ namespace DotNetCTFDumper.GUI
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrameViewer));
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.infoMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.infoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.nameMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.nameMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.positionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.positionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.deleteObjBtn = new System.Windows.Forms.ToolStripMenuItem(); this.deleteObjBtn = new System.Windows.Forms.ToolStripMenuItem();
this.scrollableControl1 = new System.Windows.Forms.ScrollableControl();
this.contextMenuStrip1.SuspendLayout(); this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
@ -74,22 +74,13 @@ namespace DotNetCTFDumper.GUI
this.deleteObjBtn.Size = new System.Drawing.Size(107, 22); this.deleteObjBtn.Size = new System.Drawing.Size(107, 22);
this.deleteObjBtn.Text = "Delete"; this.deleteObjBtn.Text = "Delete";
// //
// scrollableControl1
//
this.scrollableControl1.AutoScroll = true;
this.scrollableControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.scrollableControl1.Location = new System.Drawing.Point(0, 0);
this.scrollableControl1.Name = "scrollableControl1";
this.scrollableControl1.Size = new System.Drawing.Size(1008, 733);
this.scrollableControl1.TabIndex = 1;
this.scrollableControl1.Text = "scrollableControl1";
//
// FrameViewer // FrameViewer
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScroll = true;
this.ClientSize = new System.Drawing.Size(1008, 733); this.ClientSize = new System.Drawing.Size(1008, 733);
this.Controls.Add(this.scrollableControl1); this.Icon = ((System.Drawing.Icon) (resources.GetObject("$this.Icon")));
this.Name = "FrameViewer"; this.Name = "FrameViewer";
this.Text = "FrameViewer"; this.Text = "FrameViewer";
this.contextMenuStrip1.ResumeLayout(false); this.contextMenuStrip1.ResumeLayout(false);
@ -101,7 +92,6 @@ namespace DotNetCTFDumper.GUI
private System.Windows.Forms.ToolStripMenuItem infoMenuItem; private System.Windows.Forms.ToolStripMenuItem infoMenuItem;
private System.Windows.Forms.ToolStripMenuItem nameMenuItem; private System.Windows.Forms.ToolStripMenuItem nameMenuItem;
private System.Windows.Forms.ToolStripMenuItem positionMenuItem; private System.Windows.Forms.ToolStripMenuItem positionMenuItem;
private System.Windows.Forms.ScrollableControl scrollableControl1;
#endregion #endregion
} }

@ -25,7 +25,7 @@ namespace DotNetCTFDumper.GUI
InitializeComponent(); InitializeComponent();
this.Width = frame.Width; this.Width = frame.Width;
this.Height = frame.Height; this.Height = frame.Height;
this.BackColor = Color.Black; this.BackColor = Color.FromArgb(255,frame.Background.R,frame.Background.G,frame.Background.B);
this.Text = "Frame Viewer: "+frame.Name; this.Text = "Frame Viewer: "+frame.Name;
images = imgs; images = imgs;
contextMenuStrip1.ItemClicked+= new ToolStripItemClickedEventHandler(MenuItemSelected); contextMenuStrip1.ItemClicked+= new ToolStripItemClickedEventHandler(MenuItemSelected);
@ -44,7 +44,7 @@ namespace DotNetCTFDumper.GUI
pictureBox1.ClientSize = new Size(img.Bitmap.Width, img.Bitmap.Height); pictureBox1.ClientSize = new Size(img.Bitmap.Width, img.Bitmap.Height);
pictureBox1.Image = img.Bitmap; pictureBox1.Image = img.Bitmap;
pictureBox1.MouseClick += new MouseEventHandler(OnObjectSelected); pictureBox1.MouseClick += new MouseEventHandler(OnObjectSelected);
scrollableControl1.Controls.Add(pictureBox1); Controls.Add(pictureBox1);
} }
} }
@ -68,7 +68,7 @@ namespace DotNetCTFDumper.GUI
private void LoadObjects(Frame frame) private void LoadObjects(Frame frame)
{ {
var size = new Size(Exe.Instance.GameData.Header.WindowWidth,Exe.Instance.GameData.Header.WindowHeight); var size = new Size(Exe.Instance.GameData.Header.WindowWidth,Exe.Instance.GameData.Header.WindowHeight);
scrollableControl1.Size = new Size(frame.Width,frame.Height);; //scrollableControl1.Size = new Size(frame.Width,frame.Height);;
ClientSize = size; ClientSize = size;
var list = frame.Objects.Items.OrderBy(x=>x.Handle); var list = frame.Objects.Items.OrderBy(x=>x.Handle);
foreach (var obj in list) foreach (var obj in list)

File diff suppressed because it is too large Load Diff

@ -104,11 +104,11 @@
this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.listBox1.Anchor = ((System.Windows.Forms.AnchorStyles) ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.listBox1.BackColor = System.Drawing.Color.Black; this.listBox1.BackColor = System.Drawing.Color.Black;
this.listBox1.BorderStyle = System.Windows.Forms.BorderStyle.None; this.listBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.listBox1.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (204))); this.listBox1.Font = new System.Drawing.Font("Courier New", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte) (204)));
this.listBox1.ForeColor = System.Drawing.Color.FromArgb(((int) (((byte) (255)))), ((int) (((byte) (128)))), ((int) (((byte) (0))))); this.listBox1.ForeColor = System.Drawing.Color.FromArgb(((int) (((byte) (255)))), ((int) (((byte) (128)))), ((int) (((byte) (0)))));
this.listBox1.FormattingEnabled = true; this.listBox1.FormattingEnabled = true;
this.listBox1.IntegralHeight = false; this.listBox1.IntegralHeight = false;
this.listBox1.ItemHeight = 14; this.listBox1.ItemHeight = 17;
this.listBox1.Location = new System.Drawing.Point(342, 9); this.listBox1.Location = new System.Drawing.Point(342, 9);
this.listBox1.Margin = new System.Windows.Forms.Padding(0); this.listBox1.Margin = new System.Windows.Forms.Padding(0);
this.listBox1.MaximumSize = new System.Drawing.Size(300, 50000); this.listBox1.MaximumSize = new System.Drawing.Size(300, 50000);

@ -59,13 +59,12 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
public override void Read() public override void Read()
{ {
Reader = new ByteReader(Chunk.ChunkData);
Size = Reader.ReadInt32(); Size = Reader.ReadInt32();
Flags.flag=(uint) Reader.ReadInt16(); Flags.flag=(uint) Reader.ReadInt16();
NewFlags.flag = (uint) Reader.ReadInt16(); NewFlags.flag = (uint) Reader.ReadInt16();
var graphicsMode = Reader.ReadInt16(); var graphicsMode = Reader.ReadInt16();
var otherflags = Reader.ReadInt16();// I am an asshole var otherflags = Reader.ReadInt16();
//TODO: Add OtherFlags //TODO: Add OtherFlags
WindowWidth = Reader.ReadInt16(); WindowWidth = Reader.ReadInt16();
@ -99,6 +98,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
$"Screen Resolution: {WindowWidth}x{WindowHeight}", $"Screen Resolution: {WindowWidth}x{WindowHeight}",
$"Initial Score: {InitialScore}", $"Initial Score: {InitialScore}",
$"Initial Lives: {InitialLives}", $"Initial Lives: {InitialLives}",
"",
$"Flags:;{Flags.ToString()}" $"Flags:;{Flags.ToString()}"
}; };
} }

@ -35,7 +35,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
item.Read(); item.Read();
ItemDict.Add(item.Handle, item); ItemDict.Add(item.Handle, item);
Names.Add(item.Name); Names.Add(item.Name);
Logger.Log($"Found FrameItem: '{item.Name}' with handle ({item.Handle})", true, ConsoleColor.Magenta); // Logger.Log($"Found FrameItem: '{item.Name}' with handle ({item.Handle})", true, ConsoleColor.Magenta);
} }
GameData.TestItems = this; GameData.TestItems = this;

@ -56,10 +56,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
infoChunk.Verbose = false; infoChunk.Verbose = false;
var loader = infoChunk.Loader; var loader = infoChunk.Loader;
if (loader != null)
{
Console.WriteLine($"Reading {loader.GetType().Name}");
}
if (loader is ObjectName) if (loader is ObjectName)
{ {
@ -155,7 +152,6 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
//TODO: Fix shit //TODO: Fix shit
Console.WriteLine("Reading properties of "+parent.Name);
if (ObjectType == 1)//Backdrop if (ObjectType == 1)//Backdrop
{ {
Loader = new Backdrop(Reader); Loader = new Backdrop(Reader);

@ -129,7 +129,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
{ {
var handle = Reader.ReadInt16(); var handle = Reader.ReadInt16();
Frames.Add(handle); Frames.Add(handle);
Console.WriteLine("Frame Found: "+handle);
} }

@ -141,7 +141,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
//Reader.Seek(currentPosition+_movementsOffset); //Reader.Seek(currentPosition+_movementsOffset);
//var movements = new Movements(Reader); //var movements = new Movements(Reader);
//movements.Read(); //movements.Read();
Console.WriteLine("Movements done"); // Console.WriteLine("Movements done");
} }
@ -150,7 +150,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
Reader.Seek(currentPosition + _valuesOffset); Reader.Seek(currentPosition + _valuesOffset);
AlterableValues values = new AlterableValues(Reader); AlterableValues values = new AlterableValues(Reader);
values.Read(); values.Read();
Console.WriteLine("Values done"); // Console.WriteLine("Values done");
} }
@ -159,7 +159,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
Reader.Seek(currentPosition + _stringsOffset); Reader.Seek(currentPosition + _stringsOffset);
AlterableStrings strings = new AlterableStrings(Reader); AlterableStrings strings = new AlterableStrings(Reader);
strings.Read(); strings.Read();
Console.WriteLine("Strings done"); // Console.WriteLine("Strings done");
} }
@ -168,7 +168,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
Reader.Seek(currentPosition + _animationsOffset); Reader.Seek(currentPosition + _animationsOffset);
Animations = new Animations(Reader); Animations = new Animations(Reader);
Animations.Read(); Animations.Read();
Console.WriteLine("Animations done"); // Console.WriteLine("Animations done");
} }
/*if (_counterOffset != 0) /*if (_counterOffset != 0)
@ -211,8 +211,8 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
} }
Console.WriteLine("SysObjOff: " + _systemObjectOffset); // Console.WriteLine("SysObjOff: " + _systemObjectOffset);
Console.WriteLine("ExtOff: " + _extensionOffset); // Console.WriteLine("ExtOff: " + _extensionOffset);
} }
public override void Print(bool ext) public override void Print(bool ext)

Loading…
Cancel
Save