diff --git a/CTFAK/MMFParser/EXE/Loaders/Frame.cs b/CTFAK/MMFParser/EXE/Loaders/Frame.cs index 4fd178e..ea16bd2 100644 --- a/CTFAK/MMFParser/EXE/Loaders/Frame.cs +++ b/CTFAK/MMFParser/EXE/Loaders/Frame.cs @@ -103,7 +103,7 @@ namespace CTFAK.MMFParser.EXE.Loaders public string Name => _name.Value; public string Password => _password.Value; public Color Background => _header.Background; - public List Objects => _objects.Items; + public List Objects => _objects?.Items ?? null; public List Palette => _palette.Items; public Events.Events Events => _events; public List Layers => _layers.Items; diff --git a/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs b/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs index a6265b8..3cd84ff 100644 --- a/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs +++ b/CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs @@ -133,7 +133,6 @@ namespace CTFAK.MMFParser.EXE.Loaders } public override void Read(){} public override void Print(bool ext){} - public override string[] GetReadableData() => null; } @@ -155,10 +154,11 @@ namespace CTFAK.MMFParser.EXE.Loaders { Handle = Reader.ReadInt16(); ObjectType = Reader.ReadInt16(); - Flags = Reader.ReadUInt16(); Int16 reserved = Reader.ReadInt16(); - InkEffect = Reader.ReadUInt32(); - InkEffectParameter = Reader.ReadUInt32(); + Flags = Reader.ReadUInt16(); + InkEffect = Reader.ReadByte(); + InkEffectParameter = Reader.ReadByte(); + Logger.Log("InkParam: "+InkEffectParameter); } } } \ No newline at end of file diff --git a/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs b/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs index 118edd1..c73b92b 100644 --- a/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs +++ b/CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs @@ -50,11 +50,8 @@ namespace CTFAK.MMFParser.EXE.Loaders.Objects } - public override void Print(bool ext) - { - throw new System.NotImplementedException(); - } - + public override void Print(bool ext){} + public override string[] GetReadableData() { throw new System.NotImplementedException(); diff --git a/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs b/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs index d077dfb..048a190 100644 --- a/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs +++ b/CTFAK/MMFParser/MFA/Loaders/ChunkList.cs @@ -9,6 +9,7 @@ namespace CTFAK.MMFParser.MFA.Loaders { List _items = new List(); public byte[] Saved; + public bool Log; public override void Write(ByteWriter Writer) { @@ -33,6 +34,7 @@ namespace CTFAK.MMFParser.MFA.Loaders while(true) { var id = Reader.ReadByte(); + if(Log)Logger.Log("ChunkID: "+id); if(id==0) break; var data = new ByteReader(Reader.ReadBytes((int) Reader.ReadUInt32())); diff --git a/CTFAK/MMFParser/MFA/Loaders/Controls.cs b/CTFAK/MMFParser/MFA/Loaders/Controls.cs index c8e4655..2383472 100644 --- a/CTFAK/MMFParser/MFA/Loaders/Controls.cs +++ b/CTFAK/MMFParser/MFA/Loaders/Controls.cs @@ -9,16 +9,8 @@ namespace CTFAK.MMFParser.MFA.Loaders { public List Items; - public Controls(ByteReader reader) : base(reader) - { - } - - - public override void Print() - { - throw new NotImplementedException(); - } - + public Controls(ByteReader reader) : base(reader){} + public override void Print(){} public override void Read() { Items = new List(); diff --git a/CTFAK/MMFParser/MFA/Loaders/Frame.cs b/CTFAK/MMFParser/MFA/Loaders/Frame.cs index 149e19f..2777009 100644 --- a/CTFAK/MMFParser/MFA/Loaders/Frame.cs +++ b/CTFAK/MMFParser/MFA/Loaders/Frame.cs @@ -117,12 +117,10 @@ namespace CTFAK.MMFParser.MFA.Loaders for (int i = 0; i < Layers.Count-1; i++) { - var rgb = Layers[i].RGBCoeff; - Writer.WriteInt32(Layers[i].Unk1); - Writer.WriteColor(rgb); - Writer.WriteInt32(Layers[i].Unk2); - Logger.Log($"{rgb.R},{rgb.G},{rgb.B},{rgb.A} - {Layers[i].Unk1} - {Layers[i].Unk2} "); - + Writer.WriteUInt32(Layers[i].Unk1); + Writer.WriteUInt32(Layers[i].Unk2); + Writer.WriteUInt32(Layers[i].Unk3); + Logger.Log($"{Layers[i].Unk1}-{Layers[i].Unk2}-{Layers[i].Unk3}"); } Chunks.Write(Writer); @@ -211,10 +209,9 @@ namespace CTFAK.MMFParser.MFA.Loaders Events.Read(); for (int i=0;i=32)//extension base { diff --git a/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs b/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs index 0466ee5..c597dea 100644 --- a/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs +++ b/CTFAK/MMFParser/MFA/Loaders/ImageBank.cs @@ -16,22 +16,12 @@ namespace CTFAK.MMFParser.MFA.Loaders public Dictionary Items = new Dictionary(); public List Palette; - public override void Print() - { - throw new NotImplementedException(); - } - + public override void Print(){} public override void Read() { - Logger.Log("TEX READ"); GraphicMode = Reader.ReadInt32(); - Logger.Log($"GraphicMode:{GraphicMode}"); PaletteVersion = Reader.ReadInt16(); - Logger.Log($"PaletteVersion:{PaletteVersion}"); - PaletteEntries = Reader.ReadInt16(); - Logger.Log($"PaletteEntries:{PaletteEntries}"); - Palette = new List(); for (int i = 0; i < 256; i++) { @@ -46,7 +36,6 @@ namespace CTFAK.MMFParser.MFA.Loaders var item = new ImageItem(Reader); item.Debug = true; item.Read(); - //item.Save($"{Settings.ImagePath}\\{i}.png"); Items.Add(item.Handle, item); } } @@ -58,25 +47,12 @@ namespace CTFAK.MMFParser.MFA.Loaders writer.WriteInt32(GraphicMode); writer.WriteInt16((short) PaletteVersion); writer.WriteInt16((short) PaletteEntries); - for (int i = 0; i < 256; i++) - { - writer.WriteColor(Palette[i]); - } - - + for (int i = 0; i < 256; i++) writer.WriteColor(Palette[i]); writer.WriteInt32(Items.Count); - foreach (var key in Items.Keys) - { - Items[key].Write(writer); - } - } - - public AGMIBank(ByteReader reader) : base(reader) - { - } - - public AGMIBank(Chunk chunk) : base(chunk) - { + foreach (var key in Items.Keys) Items[key].Write(writer); } + public AGMIBank(ByteReader reader) : base(reader){} + public AGMIBank(Chunk chunk) : base(chunk){} + } } \ No newline at end of file diff --git a/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs b/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs index 3b6b597..1c6f9ed 100644 --- a/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs +++ b/CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs @@ -11,14 +11,8 @@ namespace CTFAK.MMFParser.MFA.Loaders public uint UnkHeader; public bool isRetard; - public ItemFolder(ByteReader reader) : base(reader) - { - } - - public ItemFolder(EXE.ChunkList.Chunk chunk) : base(chunk) - { - } - + public ItemFolder(ByteReader reader) : base(reader){} + public ItemFolder(EXE.ChunkList.Chunk chunk) : base(chunk){} public override void Read() { UnkHeader = Reader.ReadUInt32(); @@ -60,15 +54,8 @@ namespace CTFAK.MMFParser.MFA.Loaders Writer.WriteUInt32(item); } } - - - - - } - - public override void Print() - { - throw new System.NotImplementedException(); } + public override void Print(){} + } } \ No newline at end of file diff --git a/CTFAK/MMFParser/MFA/Loaders/Layer.cs b/CTFAK/MMFParser/MFA/Loaders/Layer.cs index 1807c5d..e12ec5b 100644 --- a/CTFAK/MMFParser/MFA/Loaders/Layer.cs +++ b/CTFAK/MMFParser/MFA/Loaders/Layer.cs @@ -25,8 +25,19 @@ namespace CTFAK.MMFParser.MFA.Loaders ); public Color RGBCoeff=Color.White; - public int Unk1=0; - public int Unk2=0; + public uint Unk1; + public uint Unk2; + public uint Unk3; + public byte Unk4; + public byte Unk5; + public byte Unk6; + public byte Unk7; + public byte Unk8; + public byte Unk9; + public byte Unk10; + public byte Unk11; + public byte Unk12; + public override void Write(ByteWriter Writer) diff --git a/CTFAK/MMFParser/MFA/Loaders/Transition.cs b/CTFAK/MMFParser/MFA/Loaders/Transition.cs index 89abadc..2b3ff27 100644 --- a/CTFAK/MMFParser/MFA/Loaders/Transition.cs +++ b/CTFAK/MMFParser/MFA/Loaders/Transition.cs @@ -49,9 +49,7 @@ namespace CTFAK.MMFParser.MFA.Loaders Writer.WriteBytes(ParameterData); } - public override void Print() - { - throw new System.NotImplementedException(); - } + public override void Print(){} + } } \ No newline at end of file diff --git a/CTFAK/MMFParser/MFA/Loaders/ValueList.cs b/CTFAK/MMFParser/MFA/Loaders/ValueList.cs index accd3df..9b5da08 100644 --- a/CTFAK/MMFParser/MFA/Loaders/ValueList.cs +++ b/CTFAK/MMFParser/MFA/Loaders/ValueList.cs @@ -11,12 +11,9 @@ namespace CTFAK.MMFParser.MFA.Loaders public ValueList(ByteReader reader) : base(reader) { } - - - public override void Print() - { - throw new NotImplementedException(); - } + + public override void Print(){} + public override void Read() { @@ -32,11 +29,7 @@ namespace CTFAK.MMFParser.MFA.Loaders public override void Write(ByteWriter Writer) { Writer.WriteInt32(Items.Count); - foreach (var item in Items) - { - item.Write(Writer); - } - + foreach (var item in Items) item.Write(Writer); } } public class ValueItem: DataLoader diff --git a/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs index 38145f9..7be33f7 100644 --- a/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs +++ b/CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs @@ -118,11 +118,8 @@ namespace CTFAK.MMFParser.MFA.Loaders.mfachunks } - public override void Print() - { - throw new NotImplementedException(); - } - + public override void Print(){} + public override void Read() { Index = Reader.ReadInt32(); diff --git a/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs b/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs index eefb6cf..2c5c684 100644 --- a/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs +++ b/CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs @@ -22,26 +22,16 @@ namespace CTFAK.MMFParser.MFA.Loaders.mfachunks Writer.WriteInt32(NewObjectFlags); Writer.WriteColor(BackgroundColor); - /*for (int i = 0; i < 9; i++) + for (int i = 0; i < 9; i++) { - try - { - var value = _qualifiers[i]; - Writer.WriteInt16(-1); - - } - catch + if(_qualifiers.Count {