skybldev
/
CTFAK
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed useless debug info, add time data to log

Browse Source
master
1987kostya 4 years ago
parent 50fbccbd84
commit 925f950022
19 changed files with 19 additions and 60 deletions
Show Stats Download Patch File Download Diff File

1
DotNetCTFDumper/GUI/MainForm.cs
Unescape Escape View File

@ -858,7 +858,6 @@ namespace DotNetCTFDumper.GUI
{
var node = (ChunkNode)imagesTreeView.SelectedNode;
var path = $"{Settings.ImagePath}\\{Helper.GetTreePath(imagesTreeView,(ChunkNode) imagesTreeView.SelectedNode)}";
Console.WriteLine(Helper.GetCurrentTime()+ "Saving "+path);
if (node == null) return;
ImageDumper.SaveFromNode(node);

2
DotNetCTFDumper/MMFParser/EXE/Loaders/AppMenu.cs
Unescape Escape View File

@ -159,7 +159,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
}
}
Console.WriteLine(Name);
}
public void Load()

15
DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/ImageBank.cs
Unescape Escape View File

@ -46,10 +46,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
Settings.DumpImages = cache;
}
public void Preload()
{
}
public void LoadByHandle(int handle)
{
@ -71,10 +68,11 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
NumberOfItems = Reader.ReadUInt32();
Console.WriteLine($"Found {NumberOfItems} images");
Logger.Log($"Found {NumberOfItems} images",true,ConsoleColor.Green);
//if (!Settings.DumpImages) return;
Logger.Log("Reading Images",true,ConsoleColor.Green);
for (int i = 0; i < NumberOfItems; i++)
{
if (MainForm.BreakImages)
@ -84,10 +82,11 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
}
var item = new ImageItem(Reader);
item.Read(!PreloadOnly);
tempImages.Add(item.Handle, item);
// if (SaveImages) item.Save($"{Settings.ImagePath}\\" + item.Handle.ToString() + ".png");
if (SaveImages) item.Save($"{Settings.ImagePath}\\" + item.Handle.ToString() + ".png");
OnImageSaved?.Invoke(i,(int) NumberOfItems);
@ -97,10 +96,10 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
//images[item.handle] = item;
}
Logger.Log("Images success",true,ConsoleColor.Green);
if (!MainForm.BreakImages) Images = tempImages;
MainForm.BreakImages = false;
Console.WriteLine("Len:"+Images.Keys.Count);
}
}

4
DotNetCTFDumper/MMFParser/EXE/Loaders/Banks/SoundBank.cs
Unescape Escape View File

@ -43,7 +43,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
Items = new List<SoundItem>();
NumOfItems = Reader.ReadInt32();
Logger.Log("Found " + NumOfItems + " sounds");
Logger.Log("Found " + NumOfItems + " sounds",true,ConsoleColor.Green);
//if (!Settings.DumpSounds) return;
for (int i = 0; i < NumOfItems; i++)
@ -63,6 +63,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
}
Logger.Log("Sounds Success",true,ConsoleColor.Green);
}
public void Write(ByteWriter writer)
{
@ -155,7 +156,6 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
if (Settings.DumpSounds)
{
Name = Helper.CleanInput(Name);
Console.WriteLine($"Dumping {Name}");
File.WriteAllBytes($"{Settings.SoundPath}\\{Name}.wav", Data);
}
//Save($"{Settings.DumpPath}\\SoundBank\\{Name}.wav");

18
DotNetCTFDumper/MMFParser/EXE/Loaders/Events/Events.cs
Unescape Escape View File

@ -179,23 +179,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events
}
Reader.Seek(currentPosition + Size);
Console.WriteLine("IF:");
if (Conditions != null)
{
foreach (var item in Conditions)
{
Console.WriteLine("\t" + item.ToString());
}
}
Console.WriteLine("DO:");
if (Actions != null)
{
foreach (var item in Actions)
{
Console.WriteLine("\t" + item.ToString());
}
}
}
public void Write(ByteWriter Writer)

2
DotNetCTFDumper/MMFParser/EXE/Loaders/Frame.cs
Unescape Escape View File

@ -98,7 +98,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
if (name != null) //Just to be sure
{
this.Name = name.Value;
Console.WriteLine("Reading Frame: "+Name);
Logger.Log("Reading Frame: "+Name,true,ConsoleColor.Green);
}
var password = Chunks.GetChunk<FramePassword>();
if (password != null) //Just to be sure

1
DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectInfo.cs
Unescape Escape View File

@ -107,7 +107,6 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
if (images.Images[firstFrameHandle].Bitmap == null)
{
Console.WriteLine("Preloading "+firstFrameHandle);
images.LoadByHandle(firstFrameHandle);
}

4
DotNetCTFDumper/MMFParser/EXE/Loaders/ObjectNames.cs
Unescape Escape View File

@ -23,8 +23,8 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders
while(true)
{
if (Reader.Tell() >= endpos+4) break;
Console.WriteLine(Reader.ReadWideString());
var name = Reader.ReadWideString();
}
}

2
DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs
Unescape Escape View File

@ -144,7 +144,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
Reader.Seek(currentPosition+_movementsOffset);
Movements = new Movements(Reader);
Movements.Read();
Console.WriteLine("Movements done");
//Console.WriteLine("Movements done");
}

6
DotNetCTFDumper/MMFParser/EXE/Loaders/Objects/Value.cs
Unescape Escape View File

@ -27,8 +27,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
var item = Reader.ReadInt32();
Items.Add(item);
Console.WriteLine("Found Value: "+item);
}
}
@ -64,8 +63,7 @@ namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
{
var item = Reader.ReadWideString();
Items.Add(item);
Console.WriteLine("Found String: "+item);
}
}

5
DotNetCTFDumper/MMFParser/MFA/Loaders/Events.cs
Unescape Escape View File

@ -63,7 +63,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{
string name = Reader.ReadAscii(4);
Console.WriteLine("Group: "+name+" "+Encoding.ASCII.GetBytes(name).GetHex()+", Position: "+Reader.Tell());
if (name == EventData)
{
uint size = Reader.ReadUInt32();
@ -210,7 +209,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
if (ObjectTypes != null)
{
Console.WriteLine("Writing ObjectTypes");
Writer.WriteAscii(ObjectListData);
Writer.WriteInt16(-1);
Writer.WriteInt16((short) ObjectTypes.Count);
@ -238,7 +236,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
//if (X != 0)
{
Console.WriteLine("Writing X");
Writer.WriteAscii(EditorPositionData);
Writer.WriteInt16(1);
Writer.WriteInt32((int) X);
@ -249,7 +246,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
}
//if (LineY != 0)
{
Console.WriteLine("Writing LineY");
Writer.WriteAscii(EditorLineData);
Writer.WriteInt16(1);
Writer.WriteUInt32(LineY);
@ -257,7 +253,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
Writer.WriteUInt32(EventLine);
Writer.WriteUInt32(EventLineY);
}
Console.WriteLine("Writing EventEditorData");
Writer.WriteAscii(EventEditorData);
Writer.WriteInt32(EditorDataUnk);
Writer.WriteInt16((short) ConditionWidth);

4
DotNetCTFDumper/MMFParser/MFA/Loaders/Frame.cs
Unescape Escape View File

@ -142,7 +142,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{
Handle = Reader.ReadInt32();
Name = Helper.AutoReadUnicode(Reader);
Console.WriteLine(Name);
SizeX = Reader.ReadInt32();
SizeY = Reader.ReadInt32();
Background = Reader.ReadColor();
@ -192,7 +191,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
var frameitem = new FrameItem(Reader);
frameitem.Read();
Items.Add(frameitem);
Console.WriteLine("Frameitem:" + frameitem.Name);
}
Folders = new List<ItemFolder>();
@ -220,9 +218,7 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
//}
Events = new Events(Reader);
Console.WriteLine("BeforeEventsPos: " + Reader.Tell());
Events.Read();
Console.WriteLine("AfterEventsPos: " + Reader.Tell());
Chunks = new ChunkList(Reader);
Chunks.Read();
MFA.emptyEvents = Events;

1
DotNetCTFDumper/MMFParser/MFA/Loaders/FrameInstance.cs
Unescape Escape View File

@ -33,7 +33,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
ParentType = Reader.ReadUInt32();
ItemHandle = Reader.ReadUInt32();
ParentHandle = (uint) Reader.ReadInt32();
Console.WriteLine($"ParentH:{ParentHandle}, ParentT: {ParentType}, Handle: {Handle}, Flags: {Flags}, ItemHandle: {ItemHandle}");
}
public override void Write(ByteWriter Writer)

1
DotNetCTFDumper/MMFParser/MFA/Loaders/FrameItem.cs
Unescape Escape View File

@ -52,7 +52,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
ObjectType = Reader.ReadInt32();
Handle = Reader.ReadInt32();
Name = Helper.AutoReadUnicode(Reader);
Console.WriteLine($"Name: {Name}");
Transparent = Reader.ReadInt32();
InkEffect = Reader.ReadInt32();

1
DotNetCTFDumper/MMFParser/MFA/Loaders/ItemFolder.cs
Unescape Escape View File

@ -23,7 +23,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
public override void Read()
{
UnkHeader = Reader.ReadUInt32();
Console.WriteLine("UNK HEADER: "+UnkHeader.ToString("X4"));
if (UnkHeader == 0x70000004)
{
Name = Reader.AutoReadUnicode();

4
DotNetCTFDumper/MMFParser/MFA/Loaders/Transition.cs
Unescape Escape View File

@ -27,13 +27,9 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders
public override void Read()
{
Module = Reader.AutoReadUnicode();
Console.WriteLine(Module);
Name = Reader.AutoReadUnicode();
Console.WriteLine(Name);
Id = Reader.ReadAscii(4);
Console.WriteLine(Id);
TransitionId = Reader.ReadAscii(4);
Console.WriteLine(TransitionId);
Duration = Reader.ReadInt32();
Flags = Reader.ReadInt32();
Color = Reader.ReadColor();

1
DotNetCTFDumper/MMFParser/MFA/Loaders/mfachunks/Movements.cs
Unescape Escape View File

@ -96,7 +96,6 @@ namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
MovingAtStart = Reader.ReadByte();
Reader.Skip(3);
DirectionAtStart = Reader.ReadInt32();
Console.WriteLine($"Player: {Player}, Type: {Type}, DirectionAtStart: {DirectionAtStart}, Identifier: {Identifier}");
extData = Reader.ReadBytes(DataSize-12);
//ONLY STATIC MOVEMENT IS SUPPORTED RN
//TODO:Movement Types

3
DotNetCTFDumper/Utils/ImageDumper.cs
Unescape Escape View File

@ -17,7 +17,6 @@ namespace DotNetCTFDumper.Utils
{
var bank = Exe.Instance.GameData.GameChunks.GetChunk<ImageBank>();
var fullPath = $"{Settings.ImagePath}\\Sorted\\{node.FullPath}";
Console.WriteLine("FULL PATH: "+fullPath);
if (fullPath == null) return;
if (!(node.loader is ImageItem)) Directory.CreateDirectory(fullPath);
@ -66,7 +65,6 @@ namespace DotNetCTFDumper.Utils
for (int i = 0; i < anim.DirectionDict[0].Frames.Count; i++)
{
var frame = dirpair.Value.Frames[i];
Console.WriteLine("Trying to save: "+$"{fullPath}\\Direction {anim.DirectionDict.ToList().IndexOf(dirpair)}\\{i}.png");
bank.Images[frame].Save($"{fullPath}\\Direction {anim.DirectionDict.ToList().IndexOf(dirpair)}\\{i}.png");
}
}
@ -76,7 +74,6 @@ namespace DotNetCTFDumper.Utils
for (int i = 0; i < anim.DirectionDict[0].Frames.Count; i++)
{
var frame = anim.DirectionDict[0].Frames[i];
Console.WriteLine("Trying to save: "+$"{fullPath}\\{i}.png");
bank.Images[frame].Save($"{fullPath}\\{i}.png");
}
}

4
DotNetCTFDumper/Utils/Logger.cs
Unescape Escape View File

@ -16,12 +16,12 @@ namespace DotNetCTFDumper.Utils
_writer.AutoFlush = true;
}
_writer.WriteLine(text);
_writer.WriteLine(Helper.GetCurrentTime()+ text);
if (logToScreen)
{
Console.ForegroundColor = color;
Console.WriteLine(text);
Console.WriteLine(Helper.GetCurrentTime()+text);
Console.ForegroundColor = ConsoleColor.White;
}

Write Preview
Loading…
Cancel
Save