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

More cleanup

Browse Source
master
1987kostya 4 years ago
parent 651556a169
commit be8ede79b9
18 changed files with 69 additions and 138 deletions
Show Stats Download Patch File Download Diff File

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

@ -103,7 +103,7 @@ namespace CTFAK.MMFParser.EXE.Loaders
public string Name => _name.Value; public string Name => _name.Value;
public string Password => _password.Value; public string Password => _password.Value;
public Color Background => _header.Background; public Color Background => _header.Background;
public List<ObjectInstance> Objects => _objects.Items; public List<ObjectInstance> Objects => _objects?.Items ?? null;
public List<Color> Palette => _palette.Items; public List<Color> Palette => _palette.Items;
public Events.Events Events => _events; public Events.Events Events => _events;
public List<Layer> Layers => _layers.Items; public List<Layer> Layers => _layers.Items;

8
CTFAK/MMFParser/EXE/Loaders/ObjectInfo.cs
Unescape Escape View File

@ -133,7 +133,6 @@ namespace CTFAK.MMFParser.EXE.Loaders
} }
public override void Read(){} public override void Read(){}
public override void Print(bool ext){} public override void Print(bool ext){}
public override string[] GetReadableData() => null; public override string[] GetReadableData() => null;
} }
@ -155,10 +154,11 @@ namespace CTFAK.MMFParser.EXE.Loaders
{ {
Handle = Reader.ReadInt16(); Handle = Reader.ReadInt16();
ObjectType = Reader.ReadInt16(); ObjectType = Reader.ReadInt16();
Flags = Reader.ReadUInt16();
Int16 reserved = Reader.ReadInt16(); Int16 reserved = Reader.ReadInt16();
InkEffect = Reader.ReadUInt32(); Flags = Reader.ReadUInt16();
InkEffectParameter = Reader.ReadUInt32(); InkEffect = Reader.ReadByte();
InkEffectParameter = Reader.ReadByte();
Logger.Log("InkParam: "+InkEffectParameter);
} }
} }
} }

5
CTFAK/MMFParser/EXE/Loaders/Objects/Animations.cs
Unescape Escape View File

@ -50,10 +50,7 @@ namespace CTFAK.MMFParser.EXE.Loaders.Objects
} }
public override void Print(bool ext) public override void Print(bool ext){}
{
throw new System.NotImplementedException();
}
public override string[] GetReadableData() public override string[] GetReadableData()
{ {

2
CTFAK/MMFParser/MFA/Loaders/ChunkList.cs
Unescape Escape View File

@ -9,6 +9,7 @@ namespace CTFAK.MMFParser.MFA.Loaders
{ {
List<DataLoader> _items = new List<DataLoader>(); List<DataLoader> _items = new List<DataLoader>();
public byte[] Saved; public byte[] Saved;
public bool Log;
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
@ -33,6 +34,7 @@ namespace CTFAK.MMFParser.MFA.Loaders
while(true) while(true)
{ {
var id = Reader.ReadByte(); var id = Reader.ReadByte();
if(Log)Logger.Log("ChunkID: "+id);
if(id==0) break; if(id==0) break;
var data = new ByteReader(Reader.ReadBytes((int) Reader.ReadUInt32())); var data = new ByteReader(Reader.ReadBytes((int) Reader.ReadUInt32()));

12
CTFAK/MMFParser/MFA/Loaders/Controls.cs
Unescape Escape View File

@ -9,16 +9,8 @@ namespace CTFAK.MMFParser.MFA.Loaders
{ {
public List<PlayerControl> Items; public List<PlayerControl> Items;
public Controls(ByteReader reader) : base(reader) public Controls(ByteReader reader) : base(reader){}
{ public override void Print(){}
}
public override void Print()
{
throw new NotImplementedException();
}
public override void Read() public override void Read()
{ {
Items = new List<PlayerControl>(); Items = new List<PlayerControl>();

17
CTFAK/MMFParser/MFA/Loaders/Frame.cs
Unescape Escape View File

@ -117,12 +117,10 @@ namespace CTFAK.MMFParser.MFA.Loaders
for (int i = 0; i < Layers.Count-1; i++) for (int i = 0; i < Layers.Count-1; i++)
{ {
var rgb = Layers[i].RGBCoeff; Writer.WriteUInt32(Layers[i].Unk1);
Writer.WriteInt32(Layers[i].Unk1); Writer.WriteUInt32(Layers[i].Unk2);
Writer.WriteColor(rgb); Writer.WriteUInt32(Layers[i].Unk3);
Writer.WriteInt32(Layers[i].Unk2); Logger.Log($"{Layers[i].Unk1}-{Layers[i].Unk2}-{Layers[i].Unk3}");
Logger.Log($"{rgb.R},{rgb.G},{rgb.B},{rgb.A} - {Layers[i].Unk1} - {Layers[i].Unk2} ");
} }
Chunks.Write(Writer); Chunks.Write(Writer);
@ -211,10 +209,9 @@ namespace CTFAK.MMFParser.MFA.Loaders
Events.Read(); Events.Read();
for (int i=0;i<Layers.Count-1;i++) for (int i=0;i<Layers.Count-1;i++)
{ {
Layers[i].Unk1=Reader.ReadInt32(); Layers[i].Unk1=Reader.ReadUInt32();
Layers[i].RGBCoeff= Reader.ReadColor(); Layers[i].Unk2=Reader.ReadUInt32();
Layers[i].Unk2=Reader.ReadInt32(); Layers[i].Unk3=Reader.ReadUInt32();
} }
Chunks = new ChunkList(Reader); Chunks = new ChunkList(Reader);

17
CTFAK/MMFParser/MFA/Loaders/FrameInstance.cs
Unescape Escape View File

@ -14,14 +14,8 @@ namespace CTFAK.MMFParser.MFA.Loaders
public uint ParentHandle; public uint ParentHandle;
public uint ItemHandle; public uint ItemHandle;
public FrameInstance(ByteReader reader) : base(reader) public FrameInstance(ByteReader reader) : base(reader){}
{ public FrameInstance(EXE.ChunkList.Chunk chunk) : base(chunk){}
}
public FrameInstance(EXE.ChunkList.Chunk chunk) : base(chunk)
{
}
public override void Read() public override void Read()
{ {
X = Reader.ReadInt32(); X = Reader.ReadInt32();
@ -44,12 +38,9 @@ namespace CTFAK.MMFParser.MFA.Loaders
Writer.WriteUInt32(ParentType); Writer.WriteUInt32(ParentType);
Writer.WriteUInt32(ItemHandle); Writer.WriteUInt32(ItemHandle);
Writer.WriteInt32((int) ParentHandle); Writer.WriteInt32((int) ParentHandle);
} }
public override void Print() public override void Print(){}
{
throw new System.NotImplementedException();
}
} }
} }

3
CTFAK/MMFParser/MFA/Loaders/FrameItem.cs
Unescape Escape View File

@ -1,5 +1,6 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.Web.UI.WebControls;
using CTFAK.MMFParser.EXE; using CTFAK.MMFParser.EXE;
using CTFAK.MMFParser.MFA.Loaders.mfachunks; using CTFAK.MMFParser.MFA.Loaders.mfachunks;
using CTFAK.Utils; using CTFAK.Utils;
@ -72,7 +73,9 @@ namespace CTFAK.MMFParser.MFA.Loaders
throw new NotImplementedException("invalid icon"); throw new NotImplementedException("invalid icon");
} }
Chunks = new ChunkList(Reader); Chunks = new ChunkList(Reader);
Chunks.Log = true;
Chunks.Read(); Chunks.Read();
if (MFA.defaultObjChunks == null) MFA.defaultObjChunks = Chunks; if (MFA.defaultObjChunks == null) MFA.defaultObjChunks = Chunks;
if(ObjectType>=32)//extension base if(ObjectType>=32)//extension base
{ {

34
CTFAK/MMFParser/MFA/Loaders/ImageBank.cs
Unescape Escape View File

@ -16,22 +16,12 @@ namespace CTFAK.MMFParser.MFA.Loaders
public Dictionary<int, ImageItem> Items = new Dictionary<int, ImageItem>(); public Dictionary<int, ImageItem> Items = new Dictionary<int, ImageItem>();
public List<Color> Palette; public List<Color> Palette;
public override void Print() public override void Print(){}
{
throw new NotImplementedException();
}
public override void Read() public override void Read()
{ {
Logger.Log("TEX READ");
GraphicMode = Reader.ReadInt32(); GraphicMode = Reader.ReadInt32();
Logger.Log($"GraphicMode:{GraphicMode}");
PaletteVersion = Reader.ReadInt16(); PaletteVersion = Reader.ReadInt16();
Logger.Log($"PaletteVersion:{PaletteVersion}");
PaletteEntries = Reader.ReadInt16(); PaletteEntries = Reader.ReadInt16();
Logger.Log($"PaletteEntries:{PaletteEntries}");
Palette = new List<Color>(); Palette = new List<Color>();
for (int i = 0; i < 256; i++) for (int i = 0; i < 256; i++)
{ {
@ -46,7 +36,6 @@ namespace CTFAK.MMFParser.MFA.Loaders
var item = new ImageItem(Reader); var item = new ImageItem(Reader);
item.Debug = true; item.Debug = true;
item.Read(); item.Read();
//item.Save($"{Settings.ImagePath}\\{i}.png");
Items.Add(item.Handle, item); Items.Add(item.Handle, item);
} }
} }
@ -58,25 +47,12 @@ namespace CTFAK.MMFParser.MFA.Loaders
writer.WriteInt32(GraphicMode); writer.WriteInt32(GraphicMode);
writer.WriteInt16((short) PaletteVersion); writer.WriteInt16((short) PaletteVersion);
writer.WriteInt16((short) PaletteEntries); writer.WriteInt16((short) PaletteEntries);
for (int i = 0; i < 256; i++) for (int i = 0; i < 256; i++) writer.WriteColor(Palette[i]);
{
writer.WriteColor(Palette[i]);
}
writer.WriteInt32(Items.Count); writer.WriteInt32(Items.Count);
foreach (var key in Items.Keys) foreach (var key in Items.Keys) Items[key].Write(writer);
{
Items[key].Write(writer);
}
}
public AGMIBank(ByteReader reader) : base(reader)
{
} }
public AGMIBank(ByteReader reader) : base(reader){}
public AGMIBank(Chunk chunk) : base(chunk){}
public AGMIBank(Chunk chunk) : base(chunk)
{
}
} }
} }

19
CTFAK/MMFParser/MFA/Loaders/ItemFolder.cs
Unescape Escape View File

@ -11,14 +11,8 @@ namespace CTFAK.MMFParser.MFA.Loaders
public uint UnkHeader; public uint UnkHeader;
public bool isRetard; public bool isRetard;
public ItemFolder(ByteReader reader) : base(reader) public ItemFolder(ByteReader reader) : base(reader){}
{ public ItemFolder(EXE.ChunkList.Chunk chunk) : base(chunk){}
}
public ItemFolder(EXE.ChunkList.Chunk chunk) : base(chunk)
{
}
public override void Read() public override void Read()
{ {
UnkHeader = Reader.ReadUInt32(); UnkHeader = Reader.ReadUInt32();
@ -60,15 +54,8 @@ namespace CTFAK.MMFParser.MFA.Loaders
Writer.WriteUInt32(item); Writer.WriteUInt32(item);
} }
} }
} }
public override void Print(){}
public override void Print()
{
throw new System.NotImplementedException();
}
} }
} }

15
CTFAK/MMFParser/MFA/Loaders/Layer.cs
Unescape Escape View File

@ -25,8 +25,19 @@ namespace CTFAK.MMFParser.MFA.Loaders
); );
public Color RGBCoeff=Color.White; public Color RGBCoeff=Color.White;
public int Unk1=0; public uint Unk1;
public int Unk2=0; 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) public override void Write(ByteWriter Writer)

6
CTFAK/MMFParser/MFA/Loaders/Transition.cs
Unescape Escape View File

@ -49,9 +49,7 @@ namespace CTFAK.MMFParser.MFA.Loaders
Writer.WriteBytes(ParameterData); Writer.WriteBytes(ParameterData);
} }
public override void Print() public override void Print(){}
{
throw new System.NotImplementedException();
}
} }
} }

11
CTFAK/MMFParser/MFA/Loaders/ValueList.cs
Unescape Escape View File

@ -12,11 +12,8 @@ namespace CTFAK.MMFParser.MFA.Loaders
{ {
} }
public override void Print(){}
public override void Print()
{
throw new NotImplementedException();
}
public override void Read() public override void Read()
{ {
@ -32,11 +29,7 @@ namespace CTFAK.MMFParser.MFA.Loaders
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
Writer.WriteInt32(Items.Count); Writer.WriteInt32(Items.Count);
foreach (var item in Items) foreach (var item in Items) item.Write(Writer);
{
item.Write(Writer);
}
} }
} }
public class ValueItem: DataLoader public class ValueItem: DataLoader

5
CTFAK/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs
Unescape Escape View File

@ -118,10 +118,7 @@ namespace CTFAK.MMFParser.MFA.Loaders.mfachunks
} }
public override void Print() public override void Print(){}
{
throw new NotImplementedException();
}
public override void Read() public override void Read()
{ {

16
CTFAK/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs
Unescape Escape View File

@ -22,24 +22,14 @@ namespace CTFAK.MMFParser.MFA.Loaders.mfachunks
Writer.WriteInt32(NewObjectFlags); Writer.WriteInt32(NewObjectFlags);
Writer.WriteColor(BackgroundColor); Writer.WriteColor(BackgroundColor);
/*for (int i = 0; i < 9; i++) for (int i = 0; i < 9; i++)
{
try
{ {
var value = _qualifiers[i]; if(_qualifiers.Count<i) Writer.WriteInt16(_qualifiers[i]);
Writer.WriteInt16(-1); else
}
catch
{ {
Writer.WriteInt16(-1); Writer.WriteInt16(-1);
break; break;
} }
}*/
for (int i = 0; i < 9; i++)
{
Writer.WriteInt16(-1);//WTF HELP
} }
Values.Write(Writer); Values.Write(Writer);

6
CTFAK/MMFParser/MFA/Loaders/mfachunks/Text.cs
Unescape Escape View File

@ -82,9 +82,7 @@ namespace CTFAK.MMFParser.MFA.Loaders.mfachunks
Writer.WriteUInt32(Flags); Writer.WriteUInt32(Flags);
} }
public override void Print() public override void Print(){}
{
throw new System.NotImplementedException();
}
} }
} }

11
CTFAK/MMFParser/Translation/PAME2MFA.cs
Unescape Escape View File

@ -150,8 +150,7 @@ namespace CTFAK.MMFParser.Translation
newLayer.XCoefficient = layer.XCoeff; newLayer.XCoefficient = layer.XCoeff;
newLayer.YCoefficient = layer.YCoeff; newLayer.YCoefficient = layer.YCoeff;
newLayer.RGBCoeff = Color.FromArgb(255,0,0,255); newLayer.RGBCoeff = Color.FromArgb(255,0,0,255);
newLayer.Unk1 = 0;
newLayer.Unk2 = 65535;
newFrame.Layers.Add(newLayer); newFrame.Layers.Add(newLayer);
break; break;
// //
@ -338,7 +337,7 @@ namespace CTFAK.MMFParser.Translation
newItem.Name = item.Name; newItem.Name = item.Name;
newItem.ObjectType = (int)item.ObjectType; newItem.ObjectType = (int)item.ObjectType;
newItem.Handle = item.Handle; newItem.Handle = item.Handle;
newItem.Transparent = item.Transparent ? 1 : 0; newItem.Transparent = 1;
newItem.InkEffect = item.InkEffect; newItem.InkEffect = item.InkEffect;
newItem.InkEffectParameter = item.InkEffectValue; newItem.InkEffectParameter = item.InkEffectValue;
newItem.AntiAliasing = item.Antialias ? 1 : 0; newItem.AntiAliasing = item.Antialias ? 1 : 0;
@ -380,9 +379,9 @@ namespace CTFAK.MMFParser.Translation
Logger.Log("Translating Object: " + itemLoader.Parent.Name); Logger.Log("Translating Object: " + itemLoader.Parent.Name);
//CommonSection //CommonSection
var newObject = new ObjectLoader(null); var newObject = new ObjectLoader(null);
newObject.ObjectFlags = (int) (itemLoader?.Flags?.flag ?? 820); newObject.ObjectFlags = (int) (itemLoader.Flags.flag);
newObject.NewObjectFlags = (int) (itemLoader?.NewFlags?.flag ?? 8); newObject.NewObjectFlags = (int) (itemLoader.NewFlags.flag);
newObject.BackgroundColor = Color.Black; //itemLoader.BackColor; newObject.BackgroundColor = itemLoader.BackColor;
//newLoader.Qualifiers; //newLoader.Qualifiers;
newObject.Strings = ConvertStrings(itemLoader.Strings); newObject.Strings = ConvertStrings(itemLoader.Strings);
newObject.Values = ConvertValue(itemLoader.Values); newObject.Values = ConvertValue(itemLoader.Values);

4
CTFAK/Program.cs
Unescape Escape View File

@ -33,8 +33,8 @@ namespace CTFAK
LoadableSettings.FromFile("settings.sav"); LoadableSettings.FromFile("settings.sav");
// //
// MFAGenerator.WriteTestMFA(); // MFAGenerator.WriteTestMFA();
// MFAGenerator.ReadTestMFA(); MFAGenerator.ReadTestMFA();
// Environment.Exit(0); Environment.Exit(0);
AppDomain.CurrentDomain.FirstChanceException += (sender, eventArgs) => AppDomain.CurrentDomain.FirstChanceException += (sender, eventArgs) =>
{ {

Write Preview
Loading…
Cancel
Save