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

Removed inappropriate comments and string,

Browse Source 
AppMenu fixes,
new project structure
master
1987kostya 4 years ago
parent 188a67e48c
commit 6117ea4db6
71 changed files with 382 additions and 276 deletions
Show Stats Download Patch File Download Diff File

120
NetMFAPatcher/DotNetCTFDumper.csproj
Unescape Escape View File

@ -156,73 +156,73 @@
<Compile Include="GUI\PackDataForm.Designer.cs"> <Compile Include="GUI\PackDataForm.Designer.cs">
<DependentUpon>PackDataForm.cs</DependentUpon> <DependentUpon>PackDataForm.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="MMFParser\ChunkLoaders\AppMenu.cs" /> <Compile Include="MMFParser\EXE\ChunkList.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Events.cs" /> <Compile Include="MMFParser\EXE\Loaders\AppHeader.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\EventsParts.cs" /> <Compile Include="MMFParser\EXE\Loaders\AppMenu.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Expressions\Expression.cs" /> <Compile Include="MMFParser\EXE\Loaders\Banks\FontBank.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Position.cs" /> <Compile Include="MMFParser\EXE\Loaders\Banks\ImageBank.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Int.cs" /> <Compile Include="MMFParser\EXE\Loaders\Banks\MusicBank.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\GlobalValue.cs" /> <Compile Include="MMFParser\EXE\Loaders\Banks\SoundBank.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\ParameterCommon.cs" /> <Compile Include="MMFParser\EXE\Loaders\ChunkLoader.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Float.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Events.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Every.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\EventsParts.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Sample.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Expressions\Expression.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Remark.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\AlterableValue.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Colour.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Colour.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Short.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Create.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\AlterableValue.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Every.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Create.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Float.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\Time.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\GlobalValue.cs" />
<Compile Include="MMFParser\ChunkLoaders\Events\Parameters\ParamObject.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Int.cs" />
<Compile Include="MMFParser\ChunkLoaders\ExtData.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\ParameterCommon.cs" />
<Compile Include="MMFParser\ChunkLoaders\Globals.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\ParamObject.cs" />
<Compile Include="MMFParser\ChunkLoaders\ObjectInfo.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Position.cs" />
<Compile Include="MMFParser\ChunkLoaders\FrameItems.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Remark.cs" />
<Compile Include="MMFParser\ChunkLoaders\ObjectNames.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Sample.cs" />
<Compile Include="MMFParser\ChunkLoaders\Objects\Animations.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Short.cs" />
<Compile Include="MMFParser\ChunkLoaders\Objects\Backdrop.cs" /> <Compile Include="MMFParser\EXE\Loaders\Events\Parameters\Time.cs" />
<Compile Include="MMFParser\ChunkLoaders\Objects\Counters.cs" /> <Compile Include="MMFParser\EXE\Loaders\ExtData.cs" />
<Compile Include="MMFParser\ChunkLoaders\Objects\ObjectCommon.cs" /> <Compile Include="MMFParser\EXE\Loaders\Frame.cs" />
<Compile Include="MMFParser\ChunkLoaders\Objects\Value.cs" /> <Compile Include="MMFParser\EXE\Loaders\FrameItems.cs" />
<Compile Include="MMFParser\Data\DataLoader.cs" /> <Compile Include="MMFParser\EXE\Loaders\Globals.cs" />
<Compile Include="MMFParser\Data\EXE.cs" /> <Compile Include="MMFParser\EXE\Loaders\ObjectInfo.cs" />
<Compile Include="MMFParser\Decompiling\MFAGenerator.cs" /> <Compile Include="MMFParser\EXE\Loaders\ObjectNames.cs" />
<Compile Include="MMFParser\Decompiling\PAME2MFA.cs" /> <Compile Include="MMFParser\EXE\Loaders\Objects\Animations.cs" />
<Compile Include="MMFParser\MFALoaders\ChunkList.cs" /> <Compile Include="MMFParser\EXE\Loaders\Objects\Backdrop.cs" />
<Compile Include="MMFParser\MFALoaders\Events.cs" /> <Compile Include="MMFParser\EXE\Loaders\Objects\Counters.cs" />
<Compile Include="MMFParser\MFALoaders\Frame.cs" /> <Compile Include="MMFParser\EXE\Loaders\Objects\ObjectCommon.cs" />
<Compile Include="MMFParser\MFALoaders\FrameInstance.cs" /> <Compile Include="MMFParser\EXE\Loaders\Objects\Value.cs" />
<Compile Include="MMFParser\MFALoaders\FrameItem.cs" /> <Compile Include="MMFParser\EXE\Loaders\StringChunk.cs" />
<Compile Include="MMFParser\MFALoaders\ItemFolder.cs" /> <Compile Include="MMFParser\EXE\Loaders\yves.cs" />
<Compile Include="MMFParser\MFALoaders\Layer.cs" /> <Compile Include="MMFParser\EXE\DataLoader.cs" />
<Compile Include="MMFParser\MFALoaders\mfachunks\Active.cs" /> <Compile Include="MMFParser\EXE\EXE.cs" />
<Compile Include="MMFParser\MFALoaders\mfachunks\AnimationObject.cs" /> <Compile Include="MMFParser\EXE\GameData.cs" />
<Compile Include="MMFParser\MFALoaders\mfachunks\Behaviours.cs" /> <Compile Include="MMFParser\EXE\PackData.cs" />
<Compile Include="MMFParser\MFALoaders\mfachunks\Movements.cs" />
<Compile Include="MMFParser\MFALoaders\mfachunks\ObjectLoader.cs" />
<Compile Include="MMFParser\MFALoaders\ValueList.cs" />
<Compile Include="MMFParser\MFALoaders\Controls.cs" />
<Compile Include="MMFParser\MFALoaders\ImageBank.cs" />
<Compile Include="MMFParser\Data\MFA.cs" />
<Compile Include="MMFParser\ChunkLoaders\AppHeader.cs" />
<Compile Include="MMFParser\ChunkLoaders\ChunkLoader.cs" />
<Compile Include="MMFParser\ChunkLoaders\Banks\FontBank.cs" />
<Compile Include="MMFParser\ChunkLoaders\Frame.cs" />
<Compile Include="MMFParser\ChunkLoaders\Banks\ImageBank.cs" />
<Compile Include="MMFParser\ChunkLoaders\Banks\MusicBank.cs" />
<Compile Include="MMFParser\ChunkLoaders\Banks\SoundBank.cs" />
<Compile Include="MMFParser\ChunkLoaders\StringChunk.cs" />
<Compile Include="MMFParser\ChunkLoaders\yves.cs" />
<Compile Include="MMFParser\Constants.cs" /> <Compile Include="MMFParser\Constants.cs" />
<Compile Include="MMFParser\MFA\Decompiling\MFAGenerator.cs" />
<Compile Include="MMFParser\MFA\Decompiling\PAME2MFA.cs" />
<Compile Include="MMFParser\MFA\MFA.cs" />
<Compile Include="MMFParser\MFA\Loaders\ChunkList.cs" />
<Compile Include="MMFParser\MFA\Loaders\Controls.cs" />
<Compile Include="MMFParser\MFA\Loaders\Events.cs" />
<Compile Include="MMFParser\MFA\Loaders\Frame.cs" />
<Compile Include="MMFParser\MFA\Loaders\FrameInstance.cs" />
<Compile Include="MMFParser\MFA\Loaders\FrameItem.cs" />
<Compile Include="MMFParser\MFA\Loaders\ImageBank.cs" />
<Compile Include="MMFParser\MFA\Loaders\ItemFolder.cs" />
<Compile Include="MMFParser\MFA\Loaders\Layer.cs" />
<Compile Include="MMFParser\MFA\Loaders\mfachunks\Active.cs" />
<Compile Include="MMFParser\MFA\Loaders\mfachunks\AnimationObject.cs" />
<Compile Include="MMFParser\MFA\Loaders\mfachunks\Behaviours.cs" />
<Compile Include="MMFParser\MFA\Loaders\mfachunks\Movements.cs" />
<Compile Include="MMFParser\MFA\Loaders\mfachunks\ObjectLoader.cs" />
<Compile Include="MMFParser\MFA\Loaders\ValueList.cs" />
<Compile Include="Settings.cs" /> <Compile Include="Settings.cs" />
<Compile Include="Utils\Backend.cs" /> <Compile Include="Utils\Backend.cs" />
<Compile Include="Utils\BitDict.cs" /> <Compile Include="Utils\BitDict.cs" />
<Compile Include="Utils\ByteFlag.cs" /> <Compile Include="Utils\ByteFlag.cs" />
<Compile Include="Utils\ByteWriter.cs" /> <Compile Include="Utils\ByteWriter.cs" />
<Compile Include="Utils\Helper.cs" /> <Compile Include="Utils\Helper.cs" />
<Compile Include="MMFParser\Data\ChunkList.cs" />
<Compile Include="MMFParser\Data\GameData.cs" />
<Compile Include="MMFParser\Data\PackData.cs" />
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Utils\ByteReader.cs" /> <Compile Include="Utils\ByteReader.cs" />

4
NetMFAPatcher/GUI/ChunkNode.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using System.Windows.Forms; using System.Windows.Forms;
using DotNetCTFDumper.MMFParser.ChunkLoaders; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE.Loaders;
namespace DotNetCTFDumper.GUI namespace DotNetCTFDumper.GUI
{ {

10
NetMFAPatcher/GUI/FrameViewer.cs
Unescape Escape View File

@ -3,12 +3,10 @@ using System.ComponentModel;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using DotNetCTFDumper.MMFParser.ChunkLoaders; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks; using DotNetCTFDumper.MMFParser.EXE.Loaders;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Objects; using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using DotNetCTFDumper.MMFParser.Data; using Frame = DotNetCTFDumper.MMFParser.EXE.Loaders.Frame;
using DotNetCTFDumper.MMFParser.MFALoaders;
using Frame = DotNetCTFDumper.MMFParser.ChunkLoaders.Frame;
namespace DotNetCTFDumper.GUI namespace DotNetCTFDumper.GUI
{ {

6
NetMFAPatcher/GUI/MainForm.cs
Unescape Escape View File

@ -4,10 +4,10 @@ using System.Diagnostics;
using System.Drawing; using System.Drawing;
using System.Threading; using System.Threading;
using System.Windows.Forms; using System.Windows.Forms;
using DotNetCTFDumper.MMFParser.ChunkLoaders;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.MMFParser.Decompiling; using DotNetCTFDumper.MMFParser.Decompiling;
using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.EXE.Loaders;
using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.GUI namespace DotNetCTFDumper.GUI

2
NetMFAPatcher/GUI/ObjectBox.cs
Unescape Escape View File

@ -1,5 +1,5 @@
using System.Windows.Forms; using System.Windows.Forms;
using DotNetCTFDumper.MMFParser.ChunkLoaders; using DotNetCTFDumper.MMFParser.EXE.Loaders;
namespace DotNetCTFDumper.GUI namespace DotNetCTFDumper.GUI
{ {

2
NetMFAPatcher/GUI/PackDataForm.cs
Unescape Escape View File

@ -3,7 +3,7 @@ using System.ComponentModel;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.GUI namespace DotNetCTFDumper.GUI

7
NetMFAPatcher/MMFParser/Data/ChunkList.cs → NetMFAPatcher/MMFParser/EXE/ChunkList.cs
Unescape Escape View File

@ -1,12 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Xml.Linq; using DotNetCTFDumper.MMFParser.EXE.Loaders;
using DotNetCTFDumper.MMFParser.ChunkLoaders; using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.Data namespace DotNetCTFDumper.MMFParser.EXE
{ {
public class ChunkList public class ChunkList
{ {

4
NetMFAPatcher/MMFParser/Data/DataLoader.cs → NetMFAPatcher/MMFParser/EXE/DataLoader.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.Data namespace DotNetCTFDumper.MMFParser.EXE
{ {
public abstract class DataLoader public abstract class DataLoader
{ {

2
NetMFAPatcher/MMFParser/Data/EXE.cs → NetMFAPatcher/MMFParser/EXE/EXE.cs
Unescape Escape View File

@ -2,7 +2,7 @@
using System.IO; using System.IO;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.Data namespace DotNetCTFDumper.MMFParser.EXE
{ {
public class Exe public class Exe
{ {

6
NetMFAPatcher/MMFParser/Data/GameData.cs → NetMFAPatcher/MMFParser/EXE/GameData.cs
Unescape Escape View File

@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.ChunkLoaders; using DotNetCTFDumper.MMFParser.EXE.Loaders;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks; using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.Data namespace DotNetCTFDumper.MMFParser.EXE
{ {
public class GameData public class GameData
{ {

4
NetMFAPatcher/mmfparser/chunkloaders/AppHeader.cs → NetMFAPatcher/MMFParser/EXE/Loaders/AppHeader.cs
Unescape Escape View File

@ -2,9 +2,9 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
public class AppHeader : ChunkLoader public class AppHeader : ChunkLoader
{ {

16
NetMFAPatcher/mmfparser/chunkloaders/AppMenu.cs → NetMFAPatcher/MMFParser/EXE/Loaders/AppMenu.cs
Unescape Escape View File

@ -1,11 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.Eventing;
using System.IO; using System.IO;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using Ionic.Zip; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
using static DotNetCTFDumper.MMFParser.Data.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
public class AppMenu : ChunkLoader public class AppMenu : ChunkLoader
{ {
@ -63,7 +63,7 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders
{ {
writer.WriteInt32(20); writer.WriteInt32(20);
writer.WriteInt32(20); writer.WriteInt32(20);
writer.WriteInt32(0); //writer.WriteInt32(0);
ByteWriter menuDataWriter = new ByteWriter(new MemoryStream()); ByteWriter menuDataWriter = new ByteWriter(new MemoryStream());
@ -72,20 +72,24 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders
item.Write(menuDataWriter); item.Write(menuDataWriter);
} }
writer.WriteUInt32((uint) menuDataWriter.BaseStream.Position);
writer.WriteUInt32((uint) menuDataWriter.BaseStream.Position+4);
//
writer.WriteUInt32((uint) (24 + menuDataWriter.BaseStream.Position)); writer.WriteUInt32((uint) (24 + menuDataWriter.BaseStream.Position));
writer.WriteInt32(AccelKey.Count * 8); writer.WriteInt32(AccelKey.Count * 8);
writer.WriteInt32(0); writer.WriteInt32(0);
writer.WriteWriter(menuDataWriter); writer.WriteWriter(menuDataWriter);
for (Int32 i = 0; i < AccelKey.Count; i++) for (Int32 i = 0; i < AccelKey.Count; i++)
{ {
writer.WriteInt8(AccelShift[i]); writer.WriteInt8(AccelShift[i]);
writer.WriteInt8(0); writer.WriteInt8(0);
writer.WriteInt16(AccelKey[i]); writer.WriteInt16(AccelKey[i]);
writer.WriteInt16(AccelId[i]); writer.WriteInt16(AccelId[i]);
writer.WriteInt8(0); writer.WriteInt16(0);
} }
} }
public void Load(ByteReader reader) public void Load(ByteReader reader)

6
NetMFAPatcher/mmfparser/chunkloaders/banks/FontBank.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Banks/FontBank.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Banks namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
{ {
public class FontBank : ChunkLoader public class FontBank : ChunkLoader
{ {
@ -23,7 +23,7 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Banks
public void Write(ByteWriter writer) public void Write(ByteWriter writer)
{ {
writer.WriteInt32(NumberOfItems); writer.WriteInt32(NumberOfItems);
//i am testing with no fonts suck pinus haha //i am testing with no fonts
} }
public FontBank(ByteReader reader) : base(reader) public FontBank(ByteReader reader) : base(reader)

5
NetMFAPatcher/mmfparser/chunkloaders/banks/ImageBank.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Banks/ImageBank.cs
Unescape Escape View File

@ -5,11 +5,10 @@ using System.Drawing.Imaging;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using DotNetCTFDumper.GUI; using DotNetCTFDumper.GUI;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Banks namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
{ {
public class ImageBank : ChunkLoader public class ImageBank : ChunkLoader
{ {

9
NetMFAPatcher/mmfparser/chunkloaders/banks/MusicBank.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Banks/MusicBank.cs
Unescape Escape View File

@ -1,13 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Net;
using System.Windows.Forms;
using DotNetCTFDumper.GUI; using DotNetCTFDumper.GUI;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Banks namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
{ {
public class MusicBank : ChunkLoader public class MusicBank : ChunkLoader
{ {
@ -33,8 +31,7 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Banks
public event MainForm.SaveHandler OnMusicSaved; public event MainForm.SaveHandler OnMusicSaved;
public override void Read() public override void Read()
{ {
//Someone is using this lol?
//Actually,yes
if (!Settings.DoMFA)Reader.Seek(0);//Reset the reader to avoid bugs when dumping more than once if (!Settings.DoMFA)Reader.Seek(0);//Reset the reader to avoid bugs when dumping more than once
Items = new List<MusicFile>(); Items = new List<MusicFile>();
NumOfItems = Reader.ReadInt32(); NumOfItems = Reader.ReadInt32();

5
NetMFAPatcher/mmfparser/chunkloaders/banks/SoundBank.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Banks/SoundBank.cs
Unescape Escape View File

@ -3,9 +3,9 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using DotNetCTFDumper.GUI; using DotNetCTFDumper.GUI;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Banks namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Banks
{ {
public class SoundBank : ChunkLoader public class SoundBank : ChunkLoader
{ {
@ -36,7 +36,6 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Banks
public event MainForm.SaveHandler OnSoundSaved; public event MainForm.SaveHandler OnSoundSaved;
public override void Read() public override void Read()
{ {
//Implementing for standalone-only because of my lazyness
if (!Settings.DoMFA)Reader.Seek(0);//Reset the reader to avoid bugs when dumping more than once if (!Settings.DoMFA)Reader.Seek(0);//Reset the reader to avoid bugs when dumping more than once

7
NetMFAPatcher/mmfparser/chunkloaders/ChunkLoader.cs → NetMFAPatcher/MMFParser/EXE/Loaders/ChunkLoader.cs
Unescape Escape View File

@ -1,8 +1,7 @@
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.Utils;
using DotNetCTFDumper.Utils; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
using static DotNetCTFDumper.MMFParser.Data.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
public abstract class ChunkLoader public abstract class ChunkLoader
{ {

62
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Events.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Events.cs
Unescape Escape View File

@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Security.Cryptography.X509Certificates; using System.IO;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events
{ {
public class Events : ChunkLoader public class Events : ChunkLoader
{ {
@ -50,12 +50,12 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
NumberOfConditions.Add(Reader.ReadInt16()); NumberOfConditions.Add(Reader.ReadInt16());
} }
var qualifierCount = Reader.ReadInt16(); //should be 0, so i dont give a fuck var qualifierCount = Reader.ReadInt16(); //should be 0, so i dont care
Quailifers = new Quailifer[qualifierCount + 1]; Quailifers = new Quailifer[qualifierCount + 1];
for (int i = 0; i < qualifierCount; i++) for (int i = 0; i < qualifierCount; i++)
{ {
var newQualifier = new Quailifer(Reader); var newQualifier = new Quailifer(Reader);
QualifiersList.Add(newQualifier); //fucking python types QualifiersList.Add(newQualifier); //i dont understand python types
//THIS IS NOT DONE //THIS IS NOT DONE
} }
} }
@ -114,13 +114,16 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
public class EventGroup : ChunkLoader public class EventGroup : ChunkLoader
{ {
public int Flags; public ushort Flags;
public int IsRestricted; public int IsRestricted;
public int RestrictCpt; public int RestrictCpt;
public int Identifier; public int Identifier;
public int Undo; public int Undo;
public List<Condition> Conditions = new List<Condition>(); public List<Condition> Conditions = new List<Condition>();
public List<Action> Actions = new List<Action>(); public List<Action> Actions = new List<Action>();
public int Size;
public byte NumberOfConditions;
public byte NumberOfActions;
public EventGroup(Chunk chunk) : base(chunk) public EventGroup(Chunk chunk) : base(chunk)
{ {
@ -143,10 +146,10 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
public override void Read() public override void Read()
{ {
var currentPosition = Reader.Tell(); var currentPosition = Reader.Tell();
var size = Reader.ReadInt16() * -1; Size = Reader.ReadInt16() * -1;
var numberOfConditions = Reader.ReadByte(); NumberOfConditions = Reader.ReadByte();
var numberOfActions = Reader.ReadByte(); NumberOfActions = Reader.ReadByte();
var flags = Reader.ReadUInt16(); Flags = Reader.ReadUInt16();
if (Settings.Build >= 284) if (Settings.Build >= 284)
{ {
var nop = Reader.ReadInt16(); var nop = Reader.ReadInt16();
@ -161,21 +164,21 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
Undo = Reader.ReadInt16(); Undo = Reader.ReadInt16();
} }
for (int i = 0; i < numberOfConditions; i++) for (int i = 0; i < NumberOfConditions; i++)
{ {
var item = new Condition(Reader); var item = new Condition(Reader);
item.Read(); item.Read();
Conditions.Add(item); Conditions.Add(item);
} }
for (int i = 0; i < numberOfActions; i++) for (int i = 0; i < NumberOfActions; i++)
{ {
var item = new Action(Reader); var item = new Action(Reader);
item.Read(); item.Read();
Actions.Add(item); Actions.Add(item);
} }
Reader.Seek(currentPosition + size); Reader.Seek(currentPosition + Size);
Console.WriteLine("IF:"); Console.WriteLine("IF:");
if (Conditions != null) if (Conditions != null)
{ {
@ -197,6 +200,39 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
public void Write(ByteWriter Writer) public void Write(ByteWriter Writer)
{ {
ByteWriter newWriter = new ByteWriter(new MemoryStream());
newWriter.WriteInt8((byte) Conditions.Count);
newWriter.WriteInt8((byte) Actions.Count);
newWriter.WriteUInt16(Flags);
if (Settings.Build >= 284)
{
newWriter.WriteInt16(0);
newWriter.WriteInt32(IsRestricted);
newWriter.WriteInt32(RestrictCpt);
}
else
{
newWriter.WriteInt16((short) IsRestricted);
newWriter.WriteInt16((short) RestrictCpt);
newWriter.WriteInt16((short) Identifier);
newWriter.WriteInt16((short) Undo);
}
foreach (Condition condition in Conditions)
{
condition.Write(newWriter);
}
foreach (Action action in Actions)
{
action.Write(newWriter);
}
Writer.WriteInt16((short) ((newWriter.Size()+2)*-1));
Writer.WriteWriter(newWriter);
} }
} }
} }

46
NetMFAPatcher/MMFParser/ChunkLoaders/Events/EventsParts.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/EventsParts.cs
Unescape Escape View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data; using System.IO;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events
{ {
public class Condition : DataLoader public class Condition : DataLoader
{ {
@ -17,10 +17,28 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
public int Identifier; public int Identifier;
public int ObjectInfoList; public int ObjectInfoList;
public List<Parameter> Items = new List<Parameter>(); public List<Parameter> Items = new List<Parameter>();
public Condition(ByteReader reader) : base(reader) { } public Condition(ByteReader reader) : base(reader) { }
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
throw new NotImplementedException(); ByteWriter newWriter = new ByteWriter(new MemoryStream());
newWriter.WriteInt16((short) ObjectType);
newWriter.WriteInt16((short) Num);
newWriter.WriteUInt16((ushort) ObjectInfo);
newWriter.WriteInt16((short) ObjectInfoList);
newWriter.WriteUInt8((sbyte) Flags);
newWriter.WriteUInt8((sbyte) OtherFlags);
newWriter.WriteUInt8((sbyte) Items.Count);
newWriter.WriteInt8((byte) DefType);
newWriter.WriteInt16((short) Identifier);
foreach (Parameter parameter in Items)
{
parameter.Write(newWriter);
}
Writer.WriteInt16((short) (newWriter.BaseStream.Position+2));
Writer.WriteWriter(newWriter);
} }
public override void Print() public override void Print()
@ -54,7 +72,7 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
} }
public override string ToString() public override string ToString()
{ {
return $"Condition {ObjectType}-{Num}-{(Items.Count > 0 ? Items[0].ToString() : "cock")}"; return $"Condition {ObjectType}-{Num}{(Items.Count > 0 ? "-"+Items[0].ToString() : " ")}";
} }
} }
@ -72,7 +90,23 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
public Action(ByteReader reader) : base(reader) { } public Action(ByteReader reader) : base(reader) { }
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
throw new NotImplementedException(); ByteWriter newWriter = new ByteWriter(new MemoryStream());
newWriter.WriteInt16((short) ObjectType);
newWriter.WriteInt16((short) Num);
newWriter.WriteUInt16((ushort) ObjectInfo);
newWriter.WriteInt16((short) ObjectInfoList);
newWriter.WriteUInt8((sbyte) Flags);
newWriter.WriteUInt8((sbyte) OtherFlags);
newWriter.WriteUInt8((sbyte) Items.Count);
newWriter.WriteInt8((byte) DefType);
foreach (Parameter parameter in Items)
{
parameter.Write(newWriter);
}
Writer.WriteInt16((short) (newWriter.BaseStream.Position+2));
Writer.WriteWriter(newWriter);
} }
public override void Print( ) public override void Print( )
@ -104,7 +138,7 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events
public override string ToString() public override string ToString()
{ {
return $"Action {ObjectType}-{Num}-{(Items.Count>0?Items[0].ToString():"cock")}"; return $"Action {ObjectType}-{Num}{(Items.Count > 0 ? "-"+Items[0].ToString() : " ")}";
} }
} }

3
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Expressions/Expression.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Expressions/Expression.cs
Unescape Escape View File

@ -1,8 +1,7 @@
using System; using System;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Expressions namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Expressions
{ {
class Expression : DataLoader class Expression : DataLoader
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/AlterableValue.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/AlterableValue.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using System; using System;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class AlterableValue : Short class AlterableValue : Short
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Colour.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Colour.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using System.Drawing; using System.Drawing;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Colour : ParameterCommon class Colour : ParameterCommon
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Create.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Create.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Create : ParameterCommon class Create : ParameterCommon
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Every.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Every.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Every : ParameterCommon class Every : ParameterCommon
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Float.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Float.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Float : ParameterCommon class Float : ParameterCommon
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/GlobalValue.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/GlobalValue.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using System; using System;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class GlobalValue : Short class GlobalValue : Short
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Int.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Int.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Int : Short class Int : Short
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/ParamObject.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/ParamObject.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class ParamObject : ParameterCommon class ParamObject : ParameterCommon
{ {

3
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/ParameterCommon.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/ParameterCommon.cs
Unescape Escape View File

@ -1,8 +1,7 @@
using System; using System;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class ParameterCommon : DataLoader class ParameterCommon : DataLoader
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Position.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Position.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Position : ParameterCommon class Position : ParameterCommon
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Remark.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Remark.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Remark : ParameterCommon class Remark : ParameterCommon
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Sample.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Sample.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Sample : ParameterCommon class Sample : ParameterCommon
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Short.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Short.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Short : ParameterCommon class Short : ParameterCommon
{ {

2
NetMFAPatcher/MMFParser/ChunkLoaders/Events/Parameters/Time.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Events/Parameters/Time.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters
{ {
class Time : ParameterCommon class Time : ParameterCommon
{ {

4
NetMFAPatcher/MMFParser/ChunkLoaders/ExtData.cs → NetMFAPatcher/MMFParser/EXE/Loaders/ExtData.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using System; using System;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
class ExtData : ChunkLoader class ExtData : ChunkLoader
{ {

7
NetMFAPatcher/mmfparser/chunkloaders/Frame.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Frame.cs
Unescape Escape View File

@ -1,11 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using ChunkList = DotNetCTFDumper.MMFParser.Data.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
class FrameName : StringChunk class FrameName : StringChunk
{ {
@ -76,7 +74,6 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders
Chunks.Verbose = false; Chunks.Verbose = false;
Chunks.Read(frameReader); Chunks.Read(frameReader);
//return;
var name = Chunks.GetChunk<FrameName>(); var name = Chunks.GetChunk<FrameName>();
if (name != null) //Just to be sure if (name != null) //Just to be sure
{ {
@ -213,7 +210,7 @@ namespace DotNetCTFDumper.MMFParser.ChunkLoaders
public override void Read() public override void Read()
{ {
CountOfObjects = (int)Reader.ReadUInt32(); CountOfObjects = Reader.ReadInt32();
for (int i = 0; i < CountOfObjects; i++) for (int i = 0; i < CountOfObjects; i++)
{ {
var item = new ObjectInstance(Reader); var item = new ObjectInstance(Reader);

5
NetMFAPatcher/mmfparser/chunkloaders/FrameItems.cs → NetMFAPatcher/MMFParser/EXE/Loaders/FrameItems.cs
Unescape Escape View File

@ -1,10 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
public class FrameItems : ChunkLoader public class FrameItems : ChunkLoader
{ {

4
NetMFAPatcher/MMFParser/ChunkLoaders/Globals.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Globals.cs
Unescape Escape View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
public class GlobalValues : ChunkLoader public class GlobalValues : ChunkLoader
{ {

11
NetMFAPatcher/mmfparser/chunkloaders/ObjectInfo.cs → NetMFAPatcher/MMFParser/EXE/Loaders/ObjectInfo.cs
Unescape Escape View File

@ -1,14 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using System.Windows.Forms; using DotNetCTFDumper.MMFParser.EXE.Loaders.Objects;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Objects;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
public class ObjectInfo : ChunkLoader public class ObjectInfo : ChunkLoader
{ {

4
NetMFAPatcher/MMFParser/ChunkLoaders/ObjectNames.cs → NetMFAPatcher/MMFParser/EXE/Loaders/ObjectNames.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using System; using System;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
class ObjectNames : ChunkLoader//Fucking trash class ObjectNames : ChunkLoader//Fucking trash
{ {

3
NetMFAPatcher/MMFParser/ChunkLoaders/Objects/Animations.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Objects/Animations.cs
Unescape Escape View File

@ -1,9 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Objects namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
{ {
public class Animations:ChunkLoader public class Animations:ChunkLoader
{ {

5
NetMFAPatcher/MMFParser/ChunkLoaders/Objects/Backdrop.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Objects/Backdrop.cs
Unescape Escape View File

@ -1,7 +1,6 @@
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.Utils;
using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Objects namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
{ {
public enum Obstacle public enum Obstacle
{ {

3
NetMFAPatcher/MMFParser/ChunkLoaders/Objects/Counters.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Objects/Counters.cs
Unescape Escape View File

@ -1,9 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Objects namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
{ {
public class Counter:ChunkLoader public class Counter:ChunkLoader
{ {

3
NetMFAPatcher/MMFParser/ChunkLoaders/Objects/ObjectCommon.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Objects/ObjectCommon.cs
Unescape Escape View File

@ -1,9 +1,8 @@
using System; using System;
using System.Drawing; using System.Drawing;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Objects namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
{ {
public class ObjectCommon : ChunkLoader public class ObjectCommon : ChunkLoader
{ {

3
NetMFAPatcher/MMFParser/ChunkLoaders/Objects/Value.cs → NetMFAPatcher/MMFParser/EXE/Loaders/Objects/Value.cs
Unescape Escape View File

@ -1,9 +1,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders.Objects namespace DotNetCTFDumper.MMFParser.EXE.Loaders.Objects
{ {
public class AlterableValues:ChunkLoader public class AlterableValues:ChunkLoader
{ {

4
NetMFAPatcher/mmfparser/chunkloaders/StringChunk.cs → NetMFAPatcher/MMFParser/EXE/Loaders/StringChunk.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using System; using System;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
public class StringChunk : ChunkLoader public class StringChunk : ChunkLoader
{ {

5
NetMFAPatcher/mmfparser/chunkloaders/yves.cs → NetMFAPatcher/MMFParser/EXE/Loaders/yves.cs
Unescape Escape View File

@ -2,12 +2,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Drawing.Imaging; using System.Drawing.Imaging;
using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.ChunkLoaders namespace DotNetCTFDumper.MMFParser.EXE.Loaders
{ {
public class AppIcon : ChunkLoader public class AppIcon : ChunkLoader
{ {

2
NetMFAPatcher/MMFParser/Data/PackData.cs → NetMFAPatcher/MMFParser/EXE/PackData.cs
Unescape Escape View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.Data namespace DotNetCTFDumper.MMFParser.EXE
{ {
public class PackData public class PackData
{ {

6
NetMFAPatcher/MMFParser/Decompiling/MFAGenerator.cs → NetMFAPatcher/MMFParser/MFA/Decompiling/MFAGenerator.cs
Unescape Escape View File

@ -1,6 +1,6 @@
using System; using System;
using System.IO; using System.IO;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.Decompiling namespace DotNetCTFDumper.MMFParser.Decompiling
@ -14,7 +14,7 @@ namespace DotNetCTFDumper.MMFParser.Decompiling
{ {
Settings.DoMFA = true; Settings.DoMFA = true;
var mfaReader = new ByteReader(TemplatePath, FileMode.Open); var mfaReader = new ByteReader(TemplatePath, FileMode.Open);
var template = new MFA(mfaReader); var template = new MFA.MFA(mfaReader);
template.Read(); //Loading template template.Read(); //Loading template
@ -32,7 +32,7 @@ namespace DotNetCTFDumper.MMFParser.Decompiling
public static void ReadTestMFA() public static void ReadTestMFA()
{ {
var mfaReader = new ByteReader(TemplatePath, FileMode.Open); var mfaReader = new ByteReader(TemplatePath, FileMode.Open);
var template = new MFA(mfaReader); var template = new MFA.MFA(mfaReader);
Settings.DoMFA = true; Settings.DoMFA = true;
template.Read(); template.Read();

4
NetMFAPatcher/MMFParser/Decompiling/PAME2MFA.cs → NetMFAPatcher/MMFParser/MFA/Decompiling/PAME2MFA.cs
Unescape Escape View File

@ -1,11 +1,11 @@
 
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
namespace DotNetCTFDumper.MMFParser.Decompiling namespace DotNetCTFDumper.MMFParser.Decompiling
{ {
public static class Pame2Mfa public static class Pame2Mfa
{ {
public static void Translate(ref MFA mfa, GameData game) public static void Translate(ref MFA.MFA mfa, GameData game)
{ {
//mfa.MfaBuild = 4; //mfa.MfaBuild = 4;

23
NetMFAPatcher/mmfparser/mfaloaders/ChunkList.cs → NetMFAPatcher/MMFParser/MFA/Loaders/ChunkList.cs
Unescape Escape View File

@ -1,17 +1,25 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
class ChunkList : DataLoader//This is used for MFA reading/writing public class ChunkList : DataLoader//This is used for MFA reading/writing
{ {
List<DataLoader> _items = new List<DataLoader>(); List<DataLoader> _items = new List<DataLoader>();
public byte[] Saved;
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
throw new NotImplementedException(); if (Saved != null)
{
Writer.WriteBytes(Saved);
}
else
{
Writer.WriteInt8(0);
}
} }
public override void Print() public override void Print()
@ -28,12 +36,11 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
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()));
} }
var size = Reader.Tell() - start;
Reader.Seek(start);
Saved = Reader.ReadBytes((int) size);
} }

4
NetMFAPatcher/mmfparser/mfaloaders/Controls.cs → NetMFAPatcher/MMFParser/MFA/Loaders/Controls.cs
Unescape Escape View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class Controls : DataLoader public class Controls : DataLoader
{ {

22
NetMFAPatcher/MMFParser/mfaloaders/Events.cs → NetMFAPatcher/MMFParser/MFA/Loaders/Events.cs
Unescape Escape View File

@ -1,13 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.IO; using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Events; using System.Text;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.EXE.Loaders.Events;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class Events:DataLoader public class Events:DataLoader
{ {
@ -40,17 +40,20 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
public uint LineItemType; public uint LineItemType;
public uint EventLine; public uint EventLine;
public uint EventLineY; public uint EventLineY;
public byte[] Saved;
public Events(ByteReader reader) : base(reader) public Events(ByteReader reader) : base(reader)
{ {
} }
public Events(Data.ChunkList.Chunk chunk) : base(chunk) public Events(EXE.ChunkList.Chunk chunk) : base(chunk)
{ {
} }
public override void Read() public override void Read()
{ {
Saved = Reader.ReadBytes(92);
return;
Version = Reader.ReadUInt16(); Version = Reader.ReadUInt16();
FrameType = Reader.ReadUInt16(); FrameType = Reader.ReadUInt16();
Items = new List<EventGroup>(); Items = new List<EventGroup>();
@ -59,6 +62,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
{ {
string name = Reader.ReadAscii(4); string name = Reader.ReadAscii(4);
Console.WriteLine("Group: "+name+" "+Encoding.ASCII.GetBytes(name).GetHex()+", Position: "+Reader.Tell());
if (name == EventData) if (name == EventData)
{ {
uint size = Reader.ReadUInt32(); uint size = Reader.ReadUInt32();
@ -174,11 +178,15 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
Writer.WriteBytes(Saved);
return;
Writer.WriteUInt16(Version); Writer.WriteUInt16(Version);
Writer.WriteInt16((short) FrameType); Writer.WriteInt16((short) FrameType);
Writer.WriteBytes(new byte[]{0x04,0x04,0x00,0x00});
if (Items != null) if (Items != null)
{ {
Writer.WriteAscii(EventData); Writer.WriteAscii(EventData);
ByteWriter newWriter = new ByteWriter(new MemoryStream()); ByteWriter newWriter = new ByteWriter(new MemoryStream());
foreach (EventGroup eventGroup in Items) foreach (EventGroup eventGroup in Items)
{ {
@ -275,7 +283,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
{ {
} }
public Comment(Data.ChunkList.Chunk chunk) : base(chunk) public Comment(EXE.ChunkList.Chunk chunk) : base(chunk)
{ {
} }
@ -315,7 +323,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
{ {
} }
public EventObject(Data.ChunkList.Chunk chunk) : base(chunk) public EventObject(EXE.ChunkList.Chunk chunk) : base(chunk)
{ {
} }

16
NetMFAPatcher/mmfparser/mfaloaders/Frame.cs → NetMFAPatcher/MMFParser/MFA/Loaders/Frame.cs
Unescape Escape View File

@ -1,10 +1,10 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class Frame : DataLoader public class Frame : DataLoader
{ {
@ -26,6 +26,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
public int ActiveLayer; public int ActiveLayer;
public List<Layer> Layers; public List<Layer> Layers;
public Events Events; public Events Events;
public ChunkList Chunks;
public Frame(ByteReader reader) : base(reader) public Frame(ByteReader reader) : base(reader)
{ {
@ -50,6 +51,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
{ {
Writer.WriteColor(item); Writer.WriteColor(item);
} }
Writer.WriteInt32(StampHandle); Writer.WriteInt32(StampHandle);
Writer.WriteInt32(ActiveLayer); Writer.WriteInt32(ActiveLayer);
Writer.WriteInt32(Layers.Count); Writer.WriteInt32(Layers.Count);
@ -57,6 +59,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
{ {
layer.Write(Writer); layer.Write(Writer);
} }
//TODO: Do transitions //TODO: Do transitions
Writer.WriteInt8(0); Writer.WriteInt8(0);
Writer.WriteInt8(0); Writer.WriteInt8(0);
@ -76,7 +79,10 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
{ {
item.Write(Writer); item.Write(Writer);
} }
Console.WriteLine("BeforeEventsPos: "+Writer.Tell());
Events.Write(Writer); Events.Write(Writer);
Console.WriteLine("AfterEventsPos: "+Writer.Tell());
Chunks.Write(Writer);
@ -112,9 +118,9 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
} }
StampHandle = Reader.ReadInt32(); StampHandle = Reader.ReadInt32();
ActiveLayer = Reader.ReadInt32(); ActiveLayer = Reader.ReadInt32();
var layersCunt = Reader.ReadInt32(); var layersCount = Reader.ReadInt32();
Layers = new List<Layer>(); Layers = new List<Layer>();
for (int i = 0; i < layersCunt; i++) for (int i = 0; i < layersCount; i++)
{ {
var layer = new Layer(Reader); var layer = new Layer(Reader);
layer.Read(); layer.Read();
@ -154,6 +160,8 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
} }
Events = new Events(Reader); Events = new Events(Reader);
Events.Read(); Events.Read();
Chunks = new ChunkList(Reader);
Chunks.Read();

6
NetMFAPatcher/MMFParser/mfaloaders/FrameInstance.cs → NetMFAPatcher/MMFParser/MFA/Loaders/FrameInstance.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class FrameInstance:DataLoader public class FrameInstance:DataLoader
{ {
@ -18,7 +18,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
{ {
} }
public FrameInstance(Data.ChunkList.Chunk chunk) : base(chunk) public FrameInstance(EXE.ChunkList.Chunk chunk) : base(chunk)
{ {
} }

28
NetMFAPatcher/mmfparser/mfaloaders/FrameItem.cs → NetMFAPatcher/MMFParser/MFA/Loaders/FrameItem.cs
Unescape Escape View File

@ -1,9 +1,9 @@
using System; using System;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.MFALoaders.mfachunks; using DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class FrameItem : DataLoader public class FrameItem : DataLoader
{ {
@ -16,6 +16,9 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
public int AntiAliasing; public int AntiAliasing;
public int Flags; public int Flags;
public int IconType; public int IconType;
public int IconHandle;
public ChunkList Chunks;
public Active Loader;
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
@ -25,6 +28,12 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
Writer.WriteInt32(Transparent); Writer.WriteInt32(Transparent);
Writer.WriteInt32(InkEffect); Writer.WriteInt32(InkEffect);
Writer.WriteInt32(InkEffectParameter); Writer.WriteInt32(InkEffectParameter);
Writer.WriteInt32(AntiAliasing);
Writer.WriteInt32(Flags);
Writer.WriteInt32(1);
Writer.WriteInt32(IconHandle);
Chunks.Write(Writer);
Loader.Write(Writer);
} }
@ -46,26 +55,27 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
AntiAliasing = Reader.ReadInt32(); AntiAliasing = Reader.ReadInt32();
Flags = Reader.ReadInt32(); Flags = Reader.ReadInt32();
IconType = Reader.ReadInt32(); IconType = Reader.ReadInt32();
if(IconType==1) if(IconType==1)
{ {
var iconHandle = Reader.ReadInt32(); IconHandle = Reader.ReadInt32();
} }
else else
{ {
throw new NotImplementedException("invalid icon"); throw new NotImplementedException("invalid icon");
} }
var chunks = new ChunkList(Reader); Chunks = new ChunkList(Reader);
chunks.Read(); Chunks.Read();
if(ObjectType>=32)//extension base if(ObjectType>=32)//extension base
{ {
//TODO: Nonactives //TODO: Nonactives
} }
else else if(ObjectType==2)
{ {
var loader = new Active(Reader); Loader = new Active(Reader);
loader.Read(); Loader.Read();
} }

8
NetMFAPatcher/mmfparser/mfaloaders/ImageBank.cs → NetMFAPatcher/MMFParser/MFA/Loaders/ImageBank.cs
Unescape Escape View File

@ -1,12 +1,12 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using static DotNetCTFDumper.MMFParser.Data.ChunkList; using static DotNetCTFDumper.MMFParser.EXE.ChunkList;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class AgmiBank : DataLoader public class AgmiBank : DataLoader
{ {

6
NetMFAPatcher/MMFParser/mfaloaders/ItemFolder.cs → NetMFAPatcher/MMFParser/MFA/Loaders/ItemFolder.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class ItemFolder:DataLoader public class ItemFolder:DataLoader
{ {
@ -13,7 +13,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
{ {
} }
public ItemFolder(Data.ChunkList.Chunk chunk) : base(chunk) public ItemFolder(EXE.ChunkList.Chunk chunk) : base(chunk)
{ {
} }

6
NetMFAPatcher/mmfparser/mfaloaders/Layer.cs → NetMFAPatcher/MMFParser/MFA/Loaders/Layer.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using System; using System;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class Layer : DataLoader public class Layer : DataLoader
{ {
@ -14,7 +14,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
Helper.AutoWriteUnicode(Writer,Name); Writer.AutoWriteUnicode(Name);
Writer.WriteInt32(Flags); Writer.WriteInt32(Flags);
Writer.WriteSingle(XCoefficient); Writer.WriteSingle(XCoefficient);
Writer.WriteSingle(YCoefficient); Writer.WriteSingle(YCoefficient);

4
NetMFAPatcher/mmfparser/mfaloaders/ValueList.cs → NetMFAPatcher/MMFParser/MFA/Loaders/ValueList.cs
Unescape Escape View File

@ -1,9 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders namespace DotNetCTFDumper.MMFParser.MFA.Loaders
{ {
public class ValueList : DataLoader public class ValueList : DataLoader
{ {

4
NetMFAPatcher/mmfparser/mfaloaders/mfachunks/Active.cs → NetMFAPatcher/MMFParser/MFA/Loaders/mfachunks/Active.cs
Unescape Escape View File

@ -1,8 +1,8 @@
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders.mfachunks namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
{ {
class Active : AnimationObject public class Active : AnimationObject
{ {
public override void Print() public override void Print()
{ {

7
NetMFAPatcher/mmfparser/mfaloaders/mfachunks/AnimationObject.cs → NetMFAPatcher/MMFParser/MFA/Loaders/mfachunks/AnimationObject.cs
Unescape Escape View File

@ -1,11 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders.mfachunks namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
{ {
class AnimationObject:ObjectLoader public class AnimationObject:ObjectLoader
{ {
List<Animation> _items = new List<Animation>(); List<Animation> _items = new List<Animation>();
public override void Read() public override void Read()
@ -24,6 +24,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders.mfachunks
} }
public AnimationObject(ByteReader reader) : base(reader) { } public AnimationObject(ByteReader reader) : base(reader) { }
} }
class Animation : DataLoader class Animation : DataLoader

6
NetMFAPatcher/mmfparser/mfaloaders/mfachunks/Behaviours.cs → NetMFAPatcher/MMFParser/MFA/Loaders/mfachunks/Behaviours.cs
Unescape Escape View File

@ -1,11 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders.mfachunks namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
{ {
class Behaviours : DataLoader public class Behaviours : DataLoader
{ {
List<Behaviour> _items = new List<Behaviour>(); List<Behaviour> _items = new List<Behaviour>();
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)

9
NetMFAPatcher/mmfparser/mfaloaders/mfachunks/Movements.cs → NetMFAPatcher/MMFParser/MFA/Loaders/mfachunks/Movements.cs
Unescape Escape View File

@ -1,11 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders.mfachunks namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
{ {
class Movements : DataLoader public class Movements : DataLoader
{ {
public List<Movement> Items = new List<Movement>(); public List<Movement> Items = new List<Movement>();
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
@ -33,7 +33,8 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders.mfachunks
} }
public Movements(ByteReader reader) : base(reader) { } public Movements(ByteReader reader) : base(reader) { }
} }
class Movement : DataLoader
public class Movement : DataLoader
{ {
public string Name="ERROR"; public string Name="ERROR";

8
NetMFAPatcher/mmfparser/mfaloaders/mfachunks/ObjectLoader.cs → NetMFAPatcher/MMFParser/MFA/Loaders/mfachunks/ObjectLoader.cs
Unescape Escape View File

@ -1,11 +1,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
namespace DotNetCTFDumper.MMFParser.MFALoaders.mfachunks namespace DotNetCTFDumper.MMFParser.MFA.Loaders.mfachunks
{ {
class ObjectLoader : DataLoader public class ObjectLoader : DataLoader
{ {
public int ObjectFlags; public int ObjectFlags;
public int NewObjectFlags; public int NewObjectFlags;
@ -18,7 +18,7 @@ namespace DotNetCTFDumper.MMFParser.MFALoaders.mfachunks
public override void Write(ByteWriter Writer) public override void Write(ByteWriter Writer)
{ {
throw new System.NotImplementedException();
} }
public override void Print() public override void Print()

43
NetMFAPatcher/MMFParser/Data/MFA.cs → NetMFAPatcher/MMFParser/MFA/MFA.cs
Unescape Escape View File

@ -2,15 +2,16 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.IO; using System.IO;
using System.Numerics; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.ChunkLoaders; using DotNetCTFDumper.MMFParser.EXE.Loaders;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks; using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using DotNetCTFDumper.MMFParser.MFALoaders; using DotNetCTFDumper.MMFParser.MFA.Loaders;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using Controls = DotNetCTFDumper.MMFParser.MFALoaders.Controls; using ChunkList = DotNetCTFDumper.MMFParser.MFA.Loaders.ChunkList;
using Frame = DotNetCTFDumper.MMFParser.MFALoaders.Frame; using Controls = DotNetCTFDumper.MMFParser.MFA.Loaders.Controls;
using Frame = DotNetCTFDumper.MMFParser.MFA.Loaders.Frame;
namespace DotNetCTFDumper.MMFParser.Data namespace DotNetCTFDumper.MMFParser.MFA
{ {
public class MFA : DataLoader public class MFA : DataLoader
{ {
@ -112,6 +113,7 @@ namespace DotNetCTFDumper.MMFParser.Data
public List<Tuple<int, string, string, int, byte[]>> Extensions; public List<Tuple<int, string, string, int, byte[]>> Extensions;
public List<Tuple<string, int>> CustomQuals; public List<Tuple<string, int>> CustomQuals;
public List<Frame> Frames; public List<Frame> Frames;
public ChunkList Chunks;
public override void Print() public override void Print()
@ -200,6 +202,7 @@ namespace DotNetCTFDumper.MMFParser.Data
Writer.WriteInt32(0); Writer.WriteInt32(0);
} }
Writer.WriteInt32(windowMenuIndex); Writer.WriteInt32(windowMenuIndex);
Writer.WriteInt32(menuImages.Count); Writer.WriteInt32(menuImages.Count);
foreach (KeyValuePair<int, int> valuePair in menuImages) foreach (KeyValuePair<int, int> valuePair in menuImages)
@ -217,10 +220,26 @@ namespace DotNetCTFDumper.MMFParser.Data
{ {
Writer.WriteInt32(iconImage); Writer.WriteInt32(iconImage);
} }
Writer.WriteInt32(0);//custom qualifiers Writer.WriteInt32(CustomQuals.Count);
Writer.WriteInt32(0); //extensions foreach (Tuple<string,int> customQual in CustomQuals)
{
Writer.AutoWriteUnicode(customQual.Item1);
Writer.WriteInt32(customQual.Item2);
}
Writer.WriteInt32(Extensions.Count);
foreach(var extension in Extensions)
{
Writer.WriteInt32(extension.Item1);
Writer.WriteUnicode(extension.Item2);
Writer.WriteUnicode(extension.Item3);
Writer.WriteInt32(extension.Item4);
Writer.WriteBytes(extension.Item5);
}
Writer.WriteInt32(Frames.Count); //frame Writer.WriteInt32(Frames.Count); //frame
var startPos = Reader.Tell() + 4 * Frames.Count + 4; var startPos = Reader.Tell() + 4 * Frames.Count + 4;
ByteWriter newWriter = new ByteWriter(new MemoryStream()); ByteWriter newWriter = new ByteWriter(new MemoryStream());
foreach (Frame frame in Frames) foreach (Frame frame in Frames)
{ {
@ -229,7 +248,7 @@ namespace DotNetCTFDumper.MMFParser.Data
} }
Writer.WriteUInt32((uint) (startPos+newWriter.Tell()+4)); Writer.WriteUInt32((uint) (startPos+newWriter.Tell()+4));
Writer.WriteWriter(newWriter); Writer.WriteWriter(newWriter);
Chunks.Write(Writer);
@ -378,8 +397,8 @@ namespace DotNetCTFDumper.MMFParser.Data
} }
Reader.Seek(nextOffset); Reader.Seek(nextOffset);
var chunks = new MFALoaders.ChunkList(Reader); Chunks = new ChunkList(Reader);
chunks.Read(); Chunks.Read();
return; return;
} }

2
NetMFAPatcher/Program.cs
Unescape Escape View File

@ -3,8 +3,8 @@ using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Forms; using System.Windows.Forms;
using DotNetCTFDumper.GUI; using DotNetCTFDumper.GUI;
using DotNetCTFDumper.MMFParser.Data;
using DotNetCTFDumper.MMFParser.Decompiling; using DotNetCTFDumper.MMFParser.Decompiling;
using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.Utils; using DotNetCTFDumper.Utils;
using Joveler.Compression.ZLib; using Joveler.Compression.ZLib;

4
NetMFAPatcher/Utils/Backend.cs
Unescape Escape View File

@ -1,7 +1,7 @@
using System.ComponentModel; using System.ComponentModel;
using DotNetCTFDumper.GUI; using DotNetCTFDumper.GUI;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks; using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using static DotNetCTFDumper.MMFParser.Data.Exe; using static DotNetCTFDumper.MMFParser.EXE.Exe;
namespace DotNetCTFDumper.Utils namespace DotNetCTFDumper.Utils
{ {

2
NetMFAPatcher/Utils/ByteWriter.cs
Unescape Escape View File

@ -59,6 +59,8 @@ namespace DotNetCTFDumper.Utils
} }
public void WriteInt8(byte value) => Write(value); public void WriteInt8(byte value) => Write(value);
public void WriteUInt8(sbyte value) => Write(value);
public void WriteInt16(short value) => Write(value); public void WriteInt16(short value) => Write(value);
public void WriteInt32(int value) => Write(value); public void WriteInt32(int value) => Write(value);
public void WriteInt64(long value) => Write(value); public void WriteInt64(long value) => Write(value);

6
NetMFAPatcher/Utils/Helper.cs
Unescape Escape View File

@ -7,9 +7,9 @@ using System.Runtime.InteropServices;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using DotNetCTFDumper.GUI; using DotNetCTFDumper.GUI;
using DotNetCTFDumper.MMFParser; using DotNetCTFDumper.MMFParser;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Events.Parameters; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Objects; using DotNetCTFDumper.MMFParser.EXE.Loaders.Events.Parameters;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE.Loaders.Objects;
namespace DotNetCTFDumper.Utils namespace DotNetCTFDumper.Utils
{ {

8
NetMFAPatcher/Utils/ImageDumper.cs
Unescape Escape View File

@ -2,10 +2,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using DotNetCTFDumper.MMFParser.ChunkLoaders; using DotNetCTFDumper.MMFParser.EXE;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Banks; using DotNetCTFDumper.MMFParser.EXE.Loaders;
using DotNetCTFDumper.MMFParser.ChunkLoaders.Objects; using DotNetCTFDumper.MMFParser.EXE.Loaders.Banks;
using DotNetCTFDumper.MMFParser.Data; using DotNetCTFDumper.MMFParser.EXE.Loaders.Objects;
namespace DotNetCTFDumper.Utils namespace DotNetCTFDumper.Utils
{ {

Write Preview
Loading…
Cancel
Save