Release v0.4.7.5

A3DA, Aet, AetDB, AuthDB, Databank, DEX, MOT, STR, VAG

.gitignore

@@ -1,5 +1,7 @@
 .vs
 build
+KKdBaseLib/bin
+KKdBaseLib/obj
 KKdMainLib/bin
 KKdMainLib/obj
 KKdMathLib/bin

KKdBaseLib/DCC.cs

@@ -2,7 +2,7 @@
 
 namespace KKdBaseLib
 {
-    public static class DCC //Databank_Checksum_Calculator
+    public static class DCC //Databank Checksum Calculator
     {
         private static readonly ushort[] ChecksumLookupTable = {
             0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
@@ -46,5 +46,13 @@ namespace KKdBaseLib
                 result = (ushort)(ChecksumLookupTable[(result >> 8) ^ data[i]] ^ (result << 8));
             return result;
         }
+
+        public static uint CalculateChecksumUInt(byte[] data)
+        {
+            uint result = 0xFFFFFFFF;
+            for (int i = 0; i < data.Length; i++)
+                result = ChecksumLookupTable[((ushort)result >> 8) ^ data[i]] ^ (result << 8);
+            return result;
+        }
     }
 }

KKdBaseLib/Extensions.cs

@@ -90,77 +90,98 @@ namespace KKdBaseLib
 
         public static byte[] buf    = new  byte[8];
         public static byte*  bufPtr = buf.GetPtr();
-
-        public static  long Endian(this   long LE, byte Len, bool IsBE)
-        { if (IsBE) { for (byte i = 0; i < Len; i++) { bufPtr[i] = (byte)LE; LE >>= 8; } LE = 0;
-                for (byte i = 0; i < Len; i++) { LE |= bufPtr[i]; if (i < Len - 1) LE <<= 8; } } return LE; }
-
-        public static ulong Endian(this  ulong LE, byte Len, bool IsBE)
-        { if (IsBE) { for (byte i = 0; i < Len; i++) { bufPtr[i] = (byte)LE; LE >>= 8; } LE = 0;
-                for (byte i = 0; i < Len; i++) { LE |= bufPtr[i]; if (i < Len - 1) LE <<= 8; } } return LE; }
         
+        public static byte[] Endian(this byte[] LE, byte Len)
+        { CFUTRM(buf, ref bufPtr);
+                      for (byte i = 0; i < Len; i++) bufPtr[i] = LE[i];
+            for (byte i = 0; i < Len; i++) LE[Len - i - 1] = bufPtr[i]; return LE; }
+        
+        public static byte[] Endian(this byte[] LE, byte Len, bool IsBE)
+        { CFUTRM(buf, ref bufPtr);
+          if (IsBE) { for (byte i = 0; i < Len; i++) bufPtr[i] = LE[i];
+                for (byte i = 0; i < Len; i++) LE[Len - i - 1] = bufPtr[i]; } return LE; }
+
+        public static  short Endian(this  short LE, bool IsBE)
+        { CFUTRM(buf, ref bufPtr);
+          if (IsBE) { int TLE = 0; for (byte i = 0; i < 2; i++) { bufPtr[i] = (byte)LE; LE >>= 8; } LE = 0;
+                for (byte i = 0; i < 2; i++) { TLE |= bufPtr[i]; if (i < 1) TLE <<= 8; } LE = (short)TLE; } return LE; }
+
+        public static ushort Endian(this ushort LE, bool IsBE)
+        { CFUTRM(buf, ref bufPtr);
+          if (IsBE) { for (byte i = 0; i < 2; i++) { bufPtr[i] = (byte)LE; LE >>= 8; } LE = 0;
+                for (byte i = 0; i < 2; i++) { LE |= bufPtr[i]; if (i < 1) LE <<= 8; } } return LE; }
+
+        public static    int Endian(this    int LE, bool IsBE)
+        { CFUTRM(buf, ref bufPtr);
+          if (IsBE) { for (byte i = 0; i < 4; i++) { bufPtr[i] = (byte)LE; LE >>= 8; } LE = 0;
+                for (byte i = 0; i < 4; i++) { LE |= bufPtr[i]; if (i < 3) LE <<= 8; } } return LE; }
+
+        public static   uint Endian(this   uint LE, bool IsBE)
+        { CFUTRM(buf, ref bufPtr);
+          if (IsBE) { for (byte i = 0; i < 4; i++) { bufPtr[i] = (byte)LE; LE >>= 8; } LE = 0;
+                for (byte i = 0; i < 4; i++) { LE |= bufPtr[i]; if (i < 3) LE <<= 8; } } return LE; }
+
+        public static   long Endian(this   long LE, bool IsBE)
+        { CFUTRM(buf, ref bufPtr);
+          if (IsBE) { for (byte i = 0; i < 8; i++) { bufPtr[i] = (byte)LE; LE >>= 8; } LE = 0;
+                for (byte i = 0; i < 8; i++) { LE |= bufPtr[i]; if (i < 7) LE <<= 8; } } return LE; }
+
+        public static  ulong Endian(this  ulong LE, bool IsBE)
+        { CFUTRM(buf, ref bufPtr);
+          if (IsBE) { for (byte i = 0; i < 8; i++) { bufPtr[i] = (byte)LE; LE >>= 8; } LE = 0;
+                for (byte i = 0; i < 8; i++) { LE |= bufPtr[i]; if (i < 7) LE <<= 8; } } return LE; }
         
         public static  sbyte CITSB(this    int c)
-        {                if (c >  0x0000007F) c =  0x0000007F;
-                    else if (c < -0x00000080) c = -0x00000080; return ( sbyte)c; }
+        {                return ( sbyte)(c > 0x0000007F ? 0x0000007F : c < -0x00000080 ? -0x00000080 : c); }
 
         public static   byte CITB (this    int c)
-        {                if (c >  0x000000FF) c =  0x000000FF;
-                    else if (c <  0x00000000) c =  0x00000000; return (  byte)c; }
+        {                return (  byte)(c > 0x000000FF ? 0x000000FF : c <  0x00000000 ?  0x00000000 : c); }
 
         public static  short CITS (this    int c)
-        {                if (c >  0x00007FFF) c =  0x00007FFF;
-                    else if (c < -0x00008000) c = -0x00008000; return ( short)c; }
+        {                return ( short)(c > 0x00007FFF ? 0x00007FFF : c < -0x00008000 ? -0x00008000 : c); }
 
         public static ushort CITUS(this    int c)
-        {                if (c >  0x0000FFFF) c =  0x0000FFFF;
-                    else if (c <  0x00000000) c =  0x00000000; return (ushort)c; }
+        {                return (ushort)(c > 0x0000FFFF ? 0x0000FFFF : c <  0x00000000 ?  0x00000000 : c); }
 
         public static  sbyte CFTSB(this  float c)
-        { c = c.Round(); if (c >  0x0000007F) c =  0x0000007F;
-                    else if (c < -0x00000080) c = -0x00000080; return ( sbyte)c; }
+        { c = c.Round(); return ( sbyte)(c > 0x0000007F ? 0x0000007F : c < -0x00000080 ? -0x00000080 : c); }
 
         public static   byte CFTB (this  float c)
-        { c = c.Round(); if (c >  0x000000FF) c =  0x000000FF;
-                    else if (c <  0x00000000) c =  0x00000000; return (  byte)c; }
+        { c = c.Round(); return (  byte)(c > 0x000000FF ? 0x000000FF : c <  0x00000000 ?  0x00000000 : c); }
 
         public static  short CFTS (this  float c)
-        { c = c.Round(); if (c >  0x00007FFF) c =  0x00007FFF;
-                    else if (c < -0x00008000) c = -0x00008000; return ( short)c; }
+        { c = c.Round(); return ( short)(c > 0x00007FFF ? 0x00007FFF : c < -0x00008000 ? -0x00008000 : c); }
 
         public static ushort CFTUS(this  float c)
-        { c = c.Round(); if (c >  0x0000FFFF) c =  0x0000FFFF;
-                    else if (c <  0x00000000) c =  0x00000000; return (ushort)c; }
-
-        public static    int CFTI (this  float c)
-        { c = c.Round();                                       return (   int)c; }
-
-        public static   uint CFTUI(this  float c)
-        { c = c.Round();                                       return (  uint)c; }
+        { c = c.Round(); return (ushort)(c > 0x0000FFFF ? 0x0000FFFF : c <  0x00000000 ?  0x00000000 : c); }
 
         public static  sbyte CFTSB(this double c)
-        { c = c.Round(); if (c >  0x0000007F) c =  0x0000007F;
-                    else if (c < -0x00000080) c = -0x00000080; return ( sbyte)c; }
+        { c = c.Round(); return ( sbyte)(c > 0x0000007F ? 0x0000007F : c < -0x00000080 ? -0x00000080 : c); }
 
         public static   byte CFTB (this double c)
-        { c = c.Round(); if (c >  0x000000FF) c =  0x000000FF;
-                    else if (c <  0x00000000) c =  0x00000000; return (  byte)c; }
+        { c = c.Round(); return (  byte)(c > 0x000000FF ? 0x000000FF : c <  0x00000000 ?  0x00000000 : c); }
 
         public static  short CFTS (this double c)
-        { c = c.Round(); if (c >  0x00007FFF) c =  0x00007FFF;
-                    else if (c < -0x00008000) c = -0x00008000; return ( short)c; }
+        { c = c.Round(); return ( short)(c > 0x00007FFF ? 0x00007FFF : c < -0x00008000 ? -0x00008000 : c); }
 
         public static ushort CFTUS(this double c)
-        { c = c.Round(); if (c >  0x0000FFFF) c =  0x0000FFFF;
-                    else if (c <  0x00000000) c =  0x00000000; return (ushort)c; }
+        { c = c.Round(); return (ushort)(c > 0x0000FFFF ? 0x0000FFFF : c <  0x00000000 ?  0x00000000 : c); }
 
         public static    int CFTI (this double c)
-        { c = c.Round(); if (c >  0x7FFFFFFF) c =  0x7FFFFFFF;
-                    else if (c < -0x80000000) c = -0x80000000; return (   int)c; }
+        { c = c.Round(); return (   int)(c > 0x7FFFFFFF ? 0x7FFFFFFF : c < -0x80000000 ? -0x80000000 : c); }
 
         public static   uint CFTUI(this double c)
-        { c = c.Round(); if (c >  0xFFFFFFFF) c =  0xFFFFFFFF;
-                    else if (c <  0x00000000) c =  0x00000000; return (  uint)c; }
+        { c = c.Round(); return (  uint)(c > 0xFFFFFFFF ? 0xFFFFFFFF : c <  0xFFFFFFFF ?  0x00000000 : c); }
+
+        public static    int  ToInt32(this  float f) => *(  int*)&f;
+        public static   uint ToUInt32(this  float f) => *( uint*)&f;
+        public static   long  ToInt64(this double f) => *( long*)&f;
+        public static  ulong ToUInt64(this double f) => *(ulong*)&f;
+
+        public static  float ToSingle(this   int i) => *( float*)&i;
+        public static  float ToSingle(this  uint i) => *( float*)&i;
+        public static double ToDouble(this  long i) => *(double*)&i;
+        public static double ToDouble(this ulong i) => *(double*)&i;
 
         public static  sbyte* GetPtr(this  sbyte[] array) { fixed ( sbyte* tempPtr = array) return tempPtr; }
         public static   byte* GetPtr(this   byte[] array) { fixed (  byte* tempPtr = array) return tempPtr; }
@@ -173,14 +194,26 @@ namespace KKdBaseLib
         public static  float* GetPtr(this  float[] array) { fixed ( float* tempPtr = array) return tempPtr; }
         public static double* GetPtr(this double[] array) { fixed (double* tempPtr = array) return tempPtr; }
 
+        public static IntPtr GetIntPtr(this  sbyte[] array) { fixed ( sbyte* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this   byte[] array) { fixed (  byte* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this  short[] array) { fixed ( short* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this ushort[] array) { fixed (ushort* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this    int[] array) { fixed (   int* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this   uint[] array) { fixed (  uint* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this   long[] array) { fixed (  long* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this  ulong[] array) { fixed ( ulong* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this  float[] array) { fixed ( float* tempPtr = array) return (IntPtr)tempPtr; }
+        public static IntPtr GetIntPtr(this double[] array) { fixed (double* tempPtr = array) return (IntPtr)tempPtr; }
+
         public static string ToString(this     int d, bool IsBE) =>
-            BitConverter.GetBytes((int)((long)d).Endian(4, IsBE)).ToASCII();
+            BitConverter.GetBytes(d.Endian(IsBE)).ToASCII();
         
         public static string ToString(this  object d)
         {
             if (d == null) return "Null";
-            else if (d is  float F32) return ToString(F32);
-            else if (d is double F64) return ToString(F64);
+            else if (d is   bool Boolean) return Boolean ? "true" : "false";
+            else if (d is  float F32    ) return ToString(F32);
+            else if (d is double F64    ) return ToString(F64);
             return d.ToString();
         }
 
@@ -229,5 +262,12 @@ namespace KKdBaseLib
         { bool Val = ToSingle(s, out  float val); value = val; return Val; }
         public static   bool ToDouble(this string s, out double? value)
         { bool Val = ToDouble(s, out double val); value = val; return Val; }
+        
+        [System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptions]
+        [System.Security.SecuritySafeCritical]
+        private static void CFUTRM(byte[] buf, ref byte* bufPtr) //CheckForUnableToReadMemory
+        { try { if (buf[0] != bufPtr[0] || bufPtr[1] != bufPtr[1] || bufPtr[2] != bufPtr[2] || buf[3] != bufPtr[3] ||
+                    buf[4] != bufPtr[4] || bufPtr[5] != bufPtr[5] || bufPtr[6] != bufPtr[6] || buf[7] != bufPtr[7])
+                    bufPtr = buf.GetPtr(); } catch (AccessViolationException) { bufPtr = buf.GetPtr(); } }
     }
 }

KKdBaseLib/F2/ENRS.cs

@@ -0,0 +1,251 @@
+namespace KKdBaseLib.F2
+{
+    public unsafe struct ENRSList : INull
+    {
+        public int Depth;
+        public KKdList<ENRS> List;
+
+        public int Length => length();
+
+        public bool  IsNull => List. IsNull;
+        public bool NotNull => List.NotNull;
+
+        public static ENRSList Read(byte[] data, int Depth = 0)
+        {
+            if (data == null || data.Length < 0x10) return default;
+            byte* ptr = data.GetPtr();
+            int i, i0;
+            int ENRSCount = ((int*)ptr)[1];
+            KKdList<ENRS> List = KKdList<ENRS>.New;
+            ptr += 0x10;
+            ENRS ENR;
+            ENRS.SubENRS Sub;
+
+            for (i = 0; i < ENRSCount; i++)
+            {
+                ENR = default;
+                ENR.Offset = ReadENRSValue(ref ptr);
+                ENR.Count  = ReadENRSValue(ref ptr);
+                ENR.Size   = ReadENRSValue(ref ptr);
+                ENR.Repeat = ReadENRSValue(ref ptr);
+
+                if (i > 0) ENR.Offset += List[List.Count - 1].Offset;
+
+                if (ENR.Repeat < 1) { ENR.Sub = null; List.Add(ENR); continue; }
+
+                ENR.Sub = new KKdList<ENRS.SubENRS> { Capacity = ENR.Count };
+                for (i0 = 0; i0 < ENR.Count; i0++)
+                {
+                    Sub = default;
+                    Sub.Skip    = ReadENRSValue(ref ptr, out Sub.Type);
+                    Sub.Reverse = ReadENRSValue(ref ptr);
+                    if (i0 > 0) Sub.Skip += ENR.Sub[i0 - 1].SizeSkip;
+                    ENR.Sub.Add(Sub);
+
+                    if (ENR.Sub[i0].Type == ENRS.Type.Invalid) return default;
+                }
+                List.Add(ENR);
+            }
+            return new ENRSList { Depth = Depth, List = List };
+        }
+
+        public static byte[] Write(ENRSList ENRS)
+        {
+            int i, i0;
+            byte[] data;
+            byte* ptr;
+
+            KKdList<ENRS> List = (System.Collections.Generic.List<ENRS>)ENRS.List;
+            if (ENRS.IsNull || ENRS.List.Count < 1) return new byte[0x20];
+
+            data = new byte[ENRS.Length];
+            ptr  = data.GetPtr();
+            ((int*)ptr)[1] = ENRS.List.Count;
+            ptr += 0x10;
+
+            for (i = 0; i < ENRS.List.Count; i++)
+            {
+                ENRS ENR = ENRS.List[i];
+                WriteENRSValue(ref ptr, i > 0 ? ENR.Offset - ENRS.List[i - 1].Offset : ENR.Offset);
+                WriteENRSValue(ref ptr, ENR.Count );
+                WriteENRSValue(ref ptr, ENR.Size  );
+                WriteENRSValue(ref ptr, ENR.Repeat);
+
+                if (ENR.Repeat < 1) continue;
+
+                for (i0 = 0; i0 < ENR.Count; i0++)
+                {
+                    if (ENR.Sub[i0].Type < ENRSList.ENRS.Type. WORD ||
+                        ENR.Sub[i0].Type > ENRSList.ENRS.Type.QWORD)
+                        return data;
+
+                    WriteENRSValue(ref ptr, i0 > 0 ? ENR.Sub[i0].Skip -
+                        ENR.Sub[i0 - 1].SizeSkip : ENR.Sub[i0].Skip, ENR.Sub[i0].Type);
+                    WriteENRSValue(ref ptr, ENR.Sub[i0].Reverse);
+                }
+                
+            }
+            return data;
+        }
+
+        private int length()
+        {
+            int i, i0;
+            int length = 0x10;
+            for (i = 0; i < List.Count; i++)
+            {
+                ENRS ENR = List[i];
+                length += GetSize(i > 0 ? ENR.Offset - List[i - 1].Offset : ENR.Offset);
+                length += GetSize(ENR.Count );
+                length += GetSize(ENR.Size  );
+                length += GetSize(ENR.Repeat);
+
+                if (ENR.Repeat < 1) continue;
+
+                for (i0 = 0; i0 < ENR.Count; i0++)
+                {
+                    if (ENR.Sub[i0].Type < ENRS.Type. WORD ||
+                        ENR.Sub[i0].Type > ENRS.Type.QWORD) return length.Align(0x10);
+
+                    length += GetSizeType(i0 > 0 ? ENR.Sub[i0].Skip - ENR.Sub[i0 - 1].SizeSkip : ENR.Sub[i0].Skip);
+                    length += GetSize(ENR.Sub[i0].Reverse);
+                }
+            }
+            return length.Align(0x10);
+
+            int GetSizeType(int Val) => Val < 0x00000010 ? 1 : Val < 0x00001000 ? 2 : 4;
+            int GetSize    (int Val) => Val < 0x00000040 ? 1 : Val < 0x00004000 ? 2 : 4; 
+        }
+
+        /*private static KKdList<ENRS.SubENRS> Optimize(KKdList<ENRS.SubENRS> Sub)
+        {
+            if (Sub.IsNull || Sub.Count < 2) return Sub;
+
+            for (int i = 1; i < Sub.Capacity; i++)
+                if (Sub[i - 1].Skip == Sub[i].Skip - Sub[i - 1].Size && Sub[i - 1].Type == Sub[i].Type)
+                {
+                    ENRS.SubENRS SubENRS = Sub[i - 1];
+                    SubENRS.Reverse++;
+                    Sub[i - 1] = SubENRS;
+                    Sub.RemoveAt(i);
+                    Sub.Capacity--;
+                    i--;
+                }
+            return Sub;
+        }*/
+
+        [System.ThreadStatic] private static ENRS.Value Value;
+
+        private static int ReadENRSValue(ref byte* ptr, out ENRS.Type Type)
+        {
+            int V = *ptr & 0xF;
+             Type = (ENRS. Type)((*ptr & 0x30) >> 4);
+            Value = (ENRS.Value)((*ptr & 0xC0) >> 6);
+            ptr++;
+                 if (Value == ENRS.Value.Int32  )
+            { V = (V << 24) | (ptr[0] << 16) | (ptr[1] << 8) | ptr[2]; ptr += 3; }
+            else if (Value == ENRS.Value.Int16  )
+            { V = (V <<  8) |  ptr[0];                                 ptr += 1; }
+            else if (Value == ENRS.Value.Invalid) V = 0;
+            return V;
+        }
+
+        private static int ReadENRSValue(ref byte* ptr)
+        {
+            int V = *ptr & 0x3F;
+            Value = (ENRS.Value)((*ptr & 0xC0) >> 6);
+            ptr++;
+                 if (Value == ENRS.Value.Int32  )
+            { V = (V << 24) | (ptr[0] << 16) | (ptr[1] << 8) | ptr[2]; ptr += 3; }
+            else if (Value == ENRS.Value.Int16  )
+            { V = (V <<  8) |  ptr[0];                                 ptr += 1; }
+            else if (Value == ENRS.Value.Invalid) V = 0;
+            return V;
+        }
+
+        private static void WriteENRSValue(ref byte* ptr, int Val, ENRS.Type Type)
+        {
+            Value = ENRS.Value.Invalid;
+                 if (Val < 0x00000040) Value = ENRS.Value.Int8 ;
+            else if (Val < 0x00004000) Value = ENRS.Value.Int16;
+            else if (Val < 0x40000000) Value = ENRS.Value.Int32;
+            *ptr = (byte)((((byte)Value << 6) & 0xC0) | (((byte)Type << 4) & 0x30));
+
+                 if (Val < 0x00000010)
+            { *ptr |= (byte)( Val        & 0x0F); }
+            else if (Val < 0x00001000)
+            { *ptr |= (byte)((Val >>  8) & 0x0F); ptr++;
+              *ptr  = (byte)( Val        & 0xFF); }
+            else if (Val < 0x10000000)
+            { *ptr |= (byte)((Val >> 24) & 0x0F); ptr++;
+              *ptr  = (byte)((Val >> 16) & 0xFF); ptr++;
+              *ptr  = (byte)((Val >>  8) & 0xFF); ptr++;
+              *ptr  = (byte)( Val        & 0xFF); }
+            ptr++;
+        }
+
+        private static void WriteENRSValue(ref byte* ptr, int Val)
+        {
+            Value = ENRS.Value.Invalid;
+                 if (Val < 0x00000040) Value = ENRS.Value.Int8 ;
+            else if (Val < 0x00004000) Value = ENRS.Value.Int16;
+            else if (Val < 0x40000000) Value = ENRS.Value.Int32;
+            *ptr = (byte)(((byte)Value << 6) & 0xC0);
+
+                 if (Val < 0x00000040)
+            { *ptr |= (byte)( Val        & 0x3F); }
+            else if (Val < 0x00004000)
+            { *ptr |= (byte)((Val >>  8) & 0x3F); ptr++;
+              *ptr  = (byte)( Val        & 0xFF); }
+            else if (Val < 0x40000000)
+            { *ptr |= (byte)((Val >> 24) & 0x3F); ptr++;
+              *ptr  = (byte)((Val >> 16) & 0xFF); ptr++;
+              *ptr  = (byte)((Val >>  8) & 0xFF); ptr++;
+              *ptr  = (byte)( Val        & 0xFF); }
+            ptr++;
+        }
+
+        public struct ENRS
+        {
+            public int Offset;
+            public int Count;
+            public int Size;
+            public int Repeat;
+            public KKdList<SubENRS> Sub;
+
+            public enum Type : byte
+            {
+                 WORD   = 0b00,
+                DWORD   = 0b01,
+                QWORD   = 0b10,
+                Invalid = 0b11,
+            }
+
+            public enum Value : byte
+            {
+                Int8    = 0b00,
+                Int16   = 0b01,
+                Int32   = 0b10,
+                Invalid = 0b11,
+            }
+
+            public struct SubENRS
+            {
+                public int Skip;
+                public int Reverse;
+                public Type Type;
+
+                public int SizeSkip => Skip + Reverse * (2 << (byte)Type);
+                public int Size     =>        Reverse * (2 << (byte)Type);
+
+                public override string ToString() => "Skip: " + Skip + "; Reverse: " + Reverse + "; Type: " + Type;
+            }
+
+            public override string ToString() =>
+                "Offset: " + Offset + "; Count: " + Count + "; " + "Size: " + Size + "; Repeat: " + Repeat;
+        }
+
+        public override string ToString() =>
+            $"Depth: {Depth}{(NotNull ? $"; ENRS Count: {List.Count}" : "")}";
+    }
+}

KKdBaseLib/F2/Header.cs

@@ -1,21 +1,22 @@
-using KKdBaseLib;
-
-namespace KKdMainLib.F2nd
+namespace KKdBaseLib.F2
 {
     public struct Header
     {
         public int Signature;
         public int DataSize;
         public int Length;
-        public Main.Format Format;
-        public int ID;
+        public int Flags;
+        public int Depth;
         public int SectionSize;
-        public int Count;
+        public int Mode;
         public int InnerSignature;
         public int SectionSignature;
-        public bool IsBE => Format == Main.Format.F2BE;
-        public bool IsX => Format == Main.Format.X || Format == Main.Format.XHD;
 
+        public Format Format;
+        public bool NotUseDataSizeAsSectionSize;
+
+        public bool IsBE => Format == Format.F2BE;
+        public bool IsX  => Format == Format.X || Format == Format.XHD;
 
         public override string ToString() => Signature.ToString(false);
     }

KKdBaseLib/F2/POF.cs

@@ -0,0 +1,102 @@
+namespace KKdBaseLib.F2
+{
+    public unsafe struct POF : INull
+    {
+        public int Depth;
+        public KKdList<long> Offsets;
+
+        public bool  IsNull => Offsets. IsNull;
+        public bool NotNull => Offsets.NotNull;
+
+        public int Length  => length(false).Align(0x10);
+        public int LengthX => length( true).Align(0x10);
+
+        public static POF Read(byte[] data, bool ShiftX, int Depth = 0)
+        {
+            Value Val = 0;
+            KKdList<long> Offsets = KKdList<long>.New;
+            byte* ptr = data.GetPtr();
+            int i = 0, Offset = 0, V = 0;
+            byte BitShift = (byte)(ShiftX ? 3 : 2);
+
+            int Length = *(int*)ptr - 4; ptr += 4;
+            while (Length > i)
+            {
+                V = *ptr & 0x3F;
+                Val = (Value)(*ptr & 0xC0);
+                ptr++; i++;
+                     if (Val == Value.Int32  )
+                { V = (V << 24) | (ptr[0] << 16) | (ptr[1] << 8) | ptr[2]; ptr += 3; i += 3; }
+                else if (Val == Value.Int16  )
+                { V = (V <<  8) |  ptr[0];                                 ptr += 1; i += 3; }
+                else if (Val == Value.Invalid) break;
+                Offset += V;
+                Offsets.Add(Offset << BitShift);
+            }
+            return new POF { Depth = Depth, Offsets = Offsets };
+        }
+
+        public static byte[] Write(POF POF, bool ShiftX)
+        {
+            POF.Offsets.Sort();
+            long Offset = 0;
+            byte BitShift = (byte)(ShiftX ? 3 : 2);
+            int Max1 = 0x00100 >> BitShift;
+            int Max2 = 0x10000 >> BitShift;
+
+            byte[] data = new byte[POF.Length];
+            byte* ptr = data.GetPtr();
+
+            byte Val = 0;
+            *(int*)ptr = POF.length(ShiftX); ptr += 4;
+            for (int i = 0; i < POF.Offsets.Count; i++)
+            {
+                Offset = POF.Offsets[i];
+                if (i > 0) { Offset -= POF.Offsets[i - 1]; if (Offset == 0) continue; }
+
+                Offset >>= BitShift;
+                Val = (byte)(Offset > Max2 ? Value.Int32 : Offset > Max1 ? Value.Int16 : Value.Int8);
+                     if (Offset < Max1)   *ptr = (byte)(Val |  Offset       );
+                else if (Offset < Max2) { *ptr = (byte)(Val | (Offset >>  8)); ptr++;
+                                          *ptr = (byte)        Offset        ; }
+                else                    { *ptr = (byte)(Val | (Offset >> 24)); ptr++;
+                                          *ptr = (byte)       (Offset >> 16) ; ptr++;
+                                          *ptr = (byte)       (Offset >>  8) ; ptr++; 
+                                          *ptr = (byte)        Offset        ; }
+                ptr++;
+            }
+            return data;
+        }
+
+        private int length(bool ShiftX = false)
+        {
+            int length = 5;
+            long Offset = 0;
+            byte BitShift = (byte)(ShiftX ? 3 : 2);
+            int Max1 = 0x00100 >> BitShift;
+            int Max2 = 0x10000 >> BitShift;
+            for (int i = 0; i < Offsets.Count; i++)
+            {
+                Offset = Offsets[i];
+                if (i > 0) { Offset -= Offsets[i - 1]; if (Offset == 0) continue; }
+
+                Offset >>= BitShift;
+                     if (Offset < Max1) length += 1;
+                else if (Offset < Max2) length += 2;
+                else                    length += 4;
+            }
+            return length; 
+        }
+
+        public enum Value : byte
+        {
+            Invalid = 0b00000000,
+            Int8    = 0b01000000,
+            Int16   = 0b10000000,
+            Int32   = 0b11000000,
+        }
+
+        public override string ToString() =>
+            $"Depth: {Depth}{(NotNull ? $"; Offsets Count: {Offsets.Count}" : "")}";
+    }
+}

KKdBaseLib/F2/Struct.cs

@@ -0,0 +1,48 @@
+namespace KKdBaseLib.F2
+{
+    public struct Struct
+    {
+        public Header Header;
+        public byte[] Data;
+        public Struct[] SubStructs;
+
+        public ENRSList ENRS;
+        public POF POF;
+        
+        public int Length  => length(false);
+        public int LengthX => length( true);
+
+        public int Depth => Header.Depth;
+
+        public bool HasPOF        => POF .NotNull;
+        public bool HasENRS       => ENRS.NotNull;
+        public bool HasSubStructs => SubStructs != null;
+
+        public long DataOffset;
+
+        public override string ToString() => $"{Header.ToString()}" +
+            $"{(HasSubStructs ? $"; SubStructs: {SubStructs.Length}" : "")}" +
+            $"{(HasENRS ? "; Has ENRS" : "")}{(HasPOF ? "; Has POF" : "")}";
+
+        private int length(bool ShiftX = false)
+        {
+            int length = Data != null ? Data.Length : 0;
+            if (HasPOF ) length += 0x20 + (ShiftX ? POF.LengthX : POF.Length);
+            if (HasENRS) length += 0x20 + ENRS.Length;
+
+            if (HasSubStructs)
+            {
+                for (int i = 0; i < SubStructs.Length; i++)
+                    length += (ShiftX ? SubStructs[i].LengthX : SubStructs[i].Length) + SubStructs[i].Header.Length;
+                length += 0x20;
+            }
+            return length; 
+        }
+
+        public void Update(bool ShiftX = false)
+        {
+            Header.SectionSize = Data != null ? Data.Length : 0;
+            Header.DataSize = length(ShiftX);
+        }
+    }
+}

KKdBaseLib/Format.cs

@@ -0,0 +1,18 @@
+namespace KKdBaseLib
+{
+    public enum Format : byte
+    {
+        NULL =  0,
+        DT   =  1,
+        PDA  =  2,
+        DT2  =  3,
+        DTe  =  4,
+        F    =  5,
+        FT   =  6,
+        F2LE =  7,
+        F2BE =  8,
+        MGF  =  9,
+        X    = 10,
+        XHD  = 11,
+    }
+}

KKdBaseLib/Half.cs

@@ -6,74 +6,82 @@ namespace KKdBaseLib
     {
         private ushort _value;
 
+        public static Half         NaN => new Half { _value = 0x7FFF };
+        public static Half PositiveNaN => new Half { _value = 0x7FFF };
+        public static Half NegativeNaN => new Half { _value = 0xFFFF };
+        public static Half PositiveZero => new Half { _value = 0x0000 };
+        public static Half NegativeZero => new Half { _value = 0x8000 };
+        public static Half PositiveInfinity => new Half { _value = 0x7C00 };
+        public static Half NegativeInfinity => new Half { _value = 0xFC00 };
+
         public static explicit operator Half(ushort bits) => new Half() { _value = bits };
 
         public static explicit operator ushort(Half bits) => bits._value;
 
-        public static explicit operator double(Half h)
+        public static unsafe implicit operator  float(Half h)
         {
-                 if (h._value       == 0x0000) return +0;
-            else if (h._value       == 0x8000) return -0;
-            else if (h._value       == 0x7C00) return  double.PositiveInfinity;
-            else if (h._value       == 0xFC00) return  double.NegativeInfinity;
-            else if (h._value >> 10 == 0x001F) return  double.NaN;
-            else if (h._value >> 10 == 0x003F) return -double.NaN;
+            int sign     =  (h._value >> 15) & 0x001;
+            int exponent = ((h._value >> 10) & 0x01F) + 127 - 15;
+            int mantissa =   h._value        & 0x3FF;
 
-            long exponent = ((h._value >> 10) & 0x1F);
-            long mantissa = (h._value & 0x3FF);
-            sbyte n = (sbyte)(((h._value >> 15 & 0x01) == 0) ? 1 : -1);
-
-            double m = (((long)1 << 10) | mantissa) / Math.Pow(2, 10);
-            double x = Math.Pow(2, exponent - (0x1F >> 1));
-            double d = n * m * x;
-            return d;
+            int si32 = (sign << 31) | (exponent << 23) | (mantissa << 13);
+            return *(float*)&si32;
         }
 
-        public static explicit operator Half(double val)
+        public static unsafe implicit operator Half(float val)
         {
-            Half h = new Half();
-                 if (val == +0                      ) h._value = 0x0000;
-            else if (val == -0                      ) h._value = 0x8000;
-            else if (val ==  double.PositiveInfinity) h._value = 0x7C00;
-            else if (val ==  double.NegativeInfinity) h._value = 0xFC00;
-            else if (val ==  double.NaN             ) h._value = 0x7FFF;
-            else if (val == -double.NaN             ) h._value = 0xFFFF;
-            else
-            {
-                ushort Sign = (ushort)(val < 0 ? 0x8000 : 0);
-                val = Math.Abs(val);
-                double Pow1 = 1;
-                double Pow2 = 1 << 10;
-                double x = 0;
+            int si32 = *(int*)&val;
+            ushort sign     = (ushort)( (si32 >> 16) & 0x8000);
+             short exponent = ( short)(((si32 >> 23) & 0x00FF) - 127 + 15);
+            ushort mantissa = (ushort)( (si32 >> 13) & 0x03FF);
 
-                int MaxPow = (1 << 4);
+                 if (exponent <  0) { exponent =  0; mantissa = 0; }
+            else if (exponent > 30)   exponent = 31;
 
-                int i = 0;
-                while (i < MaxPow && i > -MaxPow + 1)
-                {
-                    Pow1 = Math.Pow(2, i);
-                    x = val / Pow1;
-                    if (x >= 1 && x < 2)
-                    {
-                        ushort exponent_max = (ushort)Math.Ceiling(x * Pow2);
-                        ushort exponent_min = (ushort)Math.Floor  (x * Pow2);
-                        ushort exponent = Math.Abs(x - exponent_max / Pow2) >
-                            Math.Abs(x - exponent_min / Pow2) ? exponent_max : exponent_min;
-                        ushort mantissa = (ushort)(i + MaxPow - 1);
-                        h._value = (ushort)(Sign | ((mantissa & 0x001F) << 10) | (exponent & 0x03FF));
-                        return h;
-                    }
-                    if (val < 1) i--;
-                    else         i++;
-                }
-                h._value = (ushort)(Sign | 0x7C00);
-            }
-            return h;
+            return new Half { _value = (ushort)(sign | (exponent << 10) | mantissa) };
         }
 
+        public static unsafe implicit operator double(Half h) 
+        {
+            int sign     =  (h._value >> 15) & 0x001;
+            int exponent = ((h._value >> 10) & 0x01F) + 1023 - 15;
+            int mantissa =   h._value        & 0x3FF;
+
+            long si64 = ((long)sign << 63) | ((long)exponent << 52) | ((long)mantissa << 42);
+            return *(double*)&si64;
+        }
+
+        public static unsafe implicit operator Half(double val)
+        {
+            long si64 = *(long*)&val;
+            ushort sign     = (ushort) ((si64 >> 48) & 0x8000);
+             short exponent = ( short)(((si64 >> 52) & 0x07FF) - 1023 + 15);
+            ushort mantissa = (ushort) ((si64 >> 42) & 0x03FF);
+
+                 if (exponent <  0) { exponent =  0; mantissa = 0; }
+            else if (exponent > 30)   exponent = 31;
+
+            return new Half { _value = (ushort)(sign | (exponent << 10) | mantissa) };
+        }
+
+        public static Half operator + (Half a, Half b) => (float)a +  (float)b;
+        public static Half operator - (Half a, Half b) => (float)a -  (float)b;
+        public static Half operator * (Half a, Half b) => (float)a *  (float)b;
+        public static Half operator / (Half a, Half b) => (float)a /  (float)b;
+        public static bool operator > (Half a, Half b) => (float)a >  (float)b;
+        public static bool operator < (Half a, Half b) => (float)a <  (float)b;
+        public static bool operator >=(Half a, Half b) => (float)a >= (float)b;
+        public static bool operator <=(Half a, Half b) => (float)a <= (float)b;
+        public static bool operator ==(Half a, Half b) => (float)a == (float)b;
+        public static bool operator !=(Half a, Half b) => (float)a != (float)b;
+
+        public int CompareTo(object obj) => CompareTo((Half)obj);
+        public int CompareTo(Half h) => this == h ? 0 : (this > h ? 1 : -1);
+        public bool Equals(Half other) => this == other;
+        public override bool Equals(object obj) => base.Equals(obj);
         public override string ToString() => Extensions.ToString((double)this);
         public string ToString(string format, IFormatProvider formatProvider) =>
-            ((double)this).ToString(format, formatProvider);
+            ((float)this).ToString(format, formatProvider);
         public override int GetHashCode() => base.GetHashCode();
     }
 }

KKdBaseLib/IKeyFrame.cs

@@ -1,140 +0,0 @@
-namespace KKdBaseLib
-{
-    public interface IKeyFrame<TKey, TVal>
-    {
-        IKeyFrame<TKey, TVal> Check();
-        IKeyFrame<TKey, TVal> ToKeyFrameT0();
-        IKeyFrame<TKey, TVal> ToKeyFrameT1();
-        IKeyFrame<TKey, TVal> ToKeyFrameT2();
-        IKeyFrame<TKey, TVal> ToKeyFrameT3();
-        string ToString();
-        string ToString(bool Brackets);
-    }
-    
-    public struct KeyFrameT0<TKey, TVal> : IKeyFrame<TKey, TVal>
-    {
-        public TKey Frame;
-
-        public IKeyFrame<TKey, TVal> ToKeyFrameT0() =>
-            new KeyFrameT0<TKey, TVal> { Frame = Frame };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT1() =>
-            new KeyFrameT1<TKey, TVal> { Frame = Frame };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT2() =>
-            new KeyFrameT2<TKey, TVal> { Frame = Frame };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT3() =>
-            new KeyFrameT3<TKey, TVal> { Frame = Frame };
-
-        public IKeyFrame<TKey, TVal> Check() => this;
-
-        public override string ToString() =>
-            Extensions.ToString(Frame);
-        public string ToString(bool Brackets) =>
-            Extensions.ToString(Frame);
-    }
-    
-    public struct KeyFrameT1<TKey, TVal> : IKeyFrame<TKey, TVal>
-    {
-        public TKey Frame;
-        public TVal Value;
-
-        public IKeyFrame<TKey, TVal> ToKeyFrameT0() =>
-            new KeyFrameT0<TKey, TVal> { Frame = Frame };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT1() =>
-            new KeyFrameT1<TKey, TVal> { Frame = Frame, Value = Value };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT2() =>
-            new KeyFrameT2<TKey, TVal> { Frame = Frame, Value = Value };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT3() =>
-            new KeyFrameT3<TKey, TVal> { Frame = Frame, Value = Value };
-
-        public IKeyFrame<TKey, TVal> Check() =>
-            Value.Equals(default(TVal)) ? ToKeyFrameT0() : (this);
-
-        public override string ToString() => ToString(true);
-        public string ToString(bool Brackets) =>
-            (Brackets ? "(" : "") + Extensions.ToString(Frame) + "," +
-                Extensions.ToString(Value) + (Brackets ? ")" : "");
-    }
-    
-    public struct KeyFrameT2<TKey, TVal> : IKeyFrame<TKey, TVal>
-    {
-        public TKey Frame;
-        public TVal Value;
-        public TVal Interpolation;
-
-        public IKeyFrame<TKey, TVal> ToKeyFrameT0() =>
-            new KeyFrameT0<TKey, TVal> { Frame = Frame };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT1() =>
-            new KeyFrameT1<TKey, TVal> { Frame = Frame, Value = Value };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT2() =>
-            new KeyFrameT2<TKey, TVal> { Frame = Frame, Value = Value,
-                Interpolation  = Interpolation};
-        public IKeyFrame<TKey, TVal> ToKeyFrameT3() =>
-            new KeyFrameT3<TKey, TVal> { Frame = Frame, Value = Value,
-                Interpolation1 = Interpolation, Interpolation2 = Interpolation };
-
-        public IKeyFrame<TKey, TVal> ToKeyFrameT3(IKeyFrame<TKey, TVal> Previous) =>
-            Previous is KeyFrameT2<TKey, TVal> PreviousT2 ? 
-            new KeyFrameT3<TKey, TVal> { Frame = Frame, Value = Value,
-                Interpolation1 = PreviousT2.Interpolation, Interpolation2 = Interpolation } :
-            new KeyFrameT3<TKey, TVal> { Frame = Frame, Value = Value,
-                Interpolation1 =            Interpolation, Interpolation2 = Interpolation };
-
-        public IKeyFrame<TKey, TVal> Check()
-        {
-                 if (Value.Equals(default(TVal)) && Interpolation.Equals(default(TVal))) return ToKeyFrameT0();
-            else if (                               Interpolation.Equals(default(TVal))) return ToKeyFrameT1();
-            return this;
-        }
-
-        public override string ToString() => ToString(true);
-        public string ToString(bool Brackets) =>
-            (Brackets ? "(" : "") + Extensions.ToString(Frame) + "," + Extensions.
-            ToString(Value) + "," + Extensions.ToString(Interpolation) + (Brackets ? ")" : "");
-    }
-    
-    public struct KeyFrameT3<TKey, TVal> : IKeyFrame<TKey, TVal>
-    {
-        public TKey Frame;
-        public TVal Value;
-        public TVal Interpolation1;
-        public TVal Interpolation2;
-
-        public IKeyFrame<TKey, TVal> ToKeyFrameT0() =>
-            new KeyFrameT0<TKey, TVal> { Frame = Frame };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT1() =>
-            new KeyFrameT1<TKey, TVal> { Frame = Frame, Value = Value };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT2() =>
-            new KeyFrameT2<TKey, TVal> { Frame = Frame, Value = Value, Interpolation = Interpolation1 };
-        public IKeyFrame<TKey, TVal> ToKeyFrameT3() =>
-            new KeyFrameT3<TKey, TVal> { Frame = Frame, Value = Value,
-                Interpolation1 = Interpolation1, Interpolation2 = Interpolation2 };
-
-        public IKeyFrame<TKey, TVal> Check()
-        {
-                 if (Value.Equals(default(TVal)) && Interpolation1.Equals(default(TVal)) &&
-            Interpolation2.Equals(default(TVal))) return ToKeyFrameT0();
-            else if (Interpolation1.Equals(default(TVal)) &&
-            Interpolation2.Equals(default(TVal))) return ToKeyFrameT1();
-            else if (Interpolation1.Equals(Interpolation2))
-                                                  return ToKeyFrameT2();
-            return this;
-        }
-
-        public override string ToString() => ToString(true);
-        public string ToString(bool Brackets) =>
-            (Brackets ? "(" : "") + Extensions.ToString(Frame) + "," + Extensions.ToString(Value) + "," +
-            Extensions.ToString(Interpolation1) + "," + Extensions.ToString(Interpolation2) + (Brackets ? ")" : "");
-
-        public IKeyFrame<TKey, TVal> ToKeyFrameT2(IKeyFrame<TKey, TVal>
-            Previous, out IKeyFrame<TKey, TVal> Current)
-        {
-            Current = Previous is KeyFrameT2<TKey, TVal> PreviousT2
-                ? new KeyFrameT2<TKey, TVal> { Frame = PreviousT2.Frame,
-                    Value = PreviousT2.Value, Interpolation = Interpolation1 }
-                : new KeyFrameT2<TKey, TVal> { Frame = Frame,
-                    Value = Value, Interpolation = Interpolation1 };
-            return new KeyFrameT2<TKey, TVal> { Frame = Frame,
-                Value = Value, Interpolation = Interpolation2 };
-        }
-    }
-}

KKdBaseLib/Interfaces.cs

@@ -0,0 +1,22 @@
+namespace KKdBaseLib
+{
+    public interface IKF<TKey, TVal>
+    {
+        TKey F { get; set; }
+
+        KFT0<TKey, TVal> ToT0();
+        KFT1<TKey, TVal> ToT1();
+        KFT2<TKey, TVal> ToT2();
+        KFT3<TKey, TVal> ToT3();
+
+        IKF<TKey, TVal> Check();
+        string ToString();
+        string ToString(bool Brackets);
+    }
+
+    public interface INull
+    {
+        bool  IsNull { get; }
+        bool NotNull { get; }
+    }
+}

KKdBaseLib/KF.cs

@@ -0,0 +1,134 @@
+namespace KKdBaseLib
+{
+    public struct KFT0<TKey, TVal> : IKF<TKey, TVal>
+    {
+        public TKey F { get; set; }
+
+        public KFT0(TKey F = default)
+        { this.F = F; }
+
+        public KFT0<TKey, TVal> ToT0() => this;
+        public KFT1<TKey, TVal> ToT1() => this;
+        public KFT2<TKey, TVal> ToT2() => this;
+        public KFT3<TKey, TVal> ToT3() => this;
+
+        public IKF<TKey, TVal> Check() => this;
+
+        public override string ToString() => ToString(true);
+        public string ToString(bool Brackets = true) =>
+            Extensions.ToString(F);
+
+        public static implicit operator KFT1<TKey, TVal>(KFT0<TKey, TVal> KF) =>
+            new KFT1<TKey, TVal>(KF.F);
+        public static implicit operator KFT2<TKey, TVal>(KFT0<TKey, TVal> KF) =>
+            new KFT2<TKey, TVal>(KF.F);
+        public static implicit operator KFT3<TKey, TVal>(KFT0<TKey, TVal> KF) =>
+            new KFT3<TKey, TVal>(KF.F);
+    }
+    
+    public struct KFT1<TKey, TVal> : IKF<TKey, TVal>
+    {
+        public TKey F { get; set; }
+        public TVal V;
+
+        public KFT1(TKey F = default, TVal V = default)
+        { this.F = F; this.V = V; }
+
+        public KFT0<TKey, TVal> ToT0() => this;
+        public KFT1<TKey, TVal> ToT1() => this;
+        public KFT2<TKey, TVal> ToT2() => this;
+        public KFT3<TKey, TVal> ToT3() => this;
+
+        public IKF<TKey, TVal> Check() =>
+            V.Equals(default(TVal)) ? (KFT0<TKey, TVal>)this : (IKF<TKey, TVal>)this;
+
+        public override string ToString() => ToString(true);
+        public string ToString(bool Brackets = true) =>
+            (Brackets ? "(" : "") + Extensions.ToString(F) + "," +
+            Extensions.ToString(V) + (Brackets ? ")" : "");
+
+        public static implicit operator KFT0<TKey, TVal>(KFT1<TKey, TVal> KF) =>
+            new KFT0<TKey, TVal>(KF.F);
+        public static implicit operator KFT2<TKey, TVal>(KFT1<TKey, TVal> KF) =>
+            new KFT2<TKey, TVal>(KF.F, KF.V);
+        public static implicit operator KFT3<TKey, TVal>(KFT1<TKey, TVal> KF) =>
+            new KFT3<TKey, TVal>(KF.F, KF.V);
+    }
+    
+    public struct KFT2<TKey, TVal> : IKF<TKey, TVal>
+    {
+        public TKey F { get; set; }
+        public TVal V;
+        public TVal T;
+
+        public KFT2(TKey F = default, TVal V = default, TVal T = default)
+        { this.F = F; this.V = V; this.T = T; }
+
+        public KFT0<TKey, TVal> ToT0() => this;
+        public KFT1<TKey, TVal> ToT1() => this;
+        public KFT2<TKey, TVal> ToT2() => this;
+        public KFT3<TKey, TVal> ToT3() => this;
+
+        public KFT3<TKey, TVal> ToT3(IKF<TKey, TVal> Previous) =>
+            Previous is KFT2<TKey, TVal> PreviousT2 ? 
+            new KFT3<TKey, TVal>(F, V, PreviousT2.T, T) :
+            new KFT3<TKey, TVal>(F, V,            T, T);
+
+        public IKF<TKey, TVal> Check() =>
+            T.Equals(default(TVal)) ? (V.Equals(default(TVal)) ?
+            (KFT0<TKey, TVal>)this : (IKF<TKey, TVal>)this) : this;
+
+        public override string ToString() => ToString(true);
+        public string ToString(bool Brackets) =>
+            (Brackets ? "(" : "") + Extensions.ToString(F) + "," + Extensions.
+            ToString(V) + "," + Extensions.ToString(T) + (Brackets ? ")" : "");
+
+        public static implicit operator KFT0<TKey, TVal>(KFT2<TKey, TVal> KF) =>
+            new KFT0<TKey, TVal>(KF.F);
+        public static implicit operator KFT1<TKey, TVal>(KFT2<TKey, TVal> KF) =>
+            new KFT1<TKey, TVal>(KF.F, KF.V);
+        public static implicit operator KFT3<TKey, TVal>(KFT2<TKey, TVal> KF) =>
+            new KFT3<TKey, TVal>(KF.F, KF.V, KF.T, KF.T);
+    }
+    
+    public struct KFT3<TKey, TVal> : IKF<TKey, TVal>
+    {
+        public TKey F { get; set; }
+        public TVal V;
+        public TVal T1;
+        public TVal T2;
+
+        public KFT3(TKey F = default, TVal V = default, TVal T1 = default, TVal T2 = default)
+        { this.F = F; this.V = V; this.T1 = T1; this.T2 = T2; }
+
+        public KFT0<TKey, TVal> ToT0() => this;
+        public KFT1<TKey, TVal> ToT1() => this;
+        public KFT2<TKey, TVal> ToT2() => this;
+        public KFT3<TKey, TVal> ToT3() => this;
+
+        public IKF<TKey, TVal> Check() =>
+            T1.Equals(default(TVal)) && T2.Equals(default(TVal)) ? (V.Equals(default(TVal)) ?
+            (IKF<TKey, TVal>)(KFT0<TKey, TVal>)this : (KFT1<TKey, TVal>)this) :
+            T1.Equals(T2) ?  (KFT2<TKey, TVal>)this : (IKF <TKey, TVal>)this;
+
+        public override string ToString() => ToString(true);
+        public string ToString(bool Brackets) =>
+            (Brackets ? "(" : "") + Extensions.ToString(F) + "," + Extensions.ToString(V) + "," +
+            Extensions.ToString(T1) + "," + Extensions.ToString(T2) + (Brackets ? ")" : "");
+
+        public static implicit operator KFT0<TKey, TVal>(KFT3<TKey, TVal> KF) =>
+            new KFT0<TKey, TVal>(KF.F);
+        public static implicit operator KFT1<TKey, TVal>(KFT3<TKey, TVal> KF) =>
+            new KFT1<TKey, TVal>(KF.F, KF.V);
+        public static implicit operator KFT2<TKey, TVal>(KFT3<TKey, TVal> KF) =>
+            new KFT2<TKey, TVal>(KF.F, KF.V, KF.T1);
+
+        public IKF<TKey, TVal> ToT2(IKF<TKey, TVal> Previous, out IKF<TKey, TVal> Current)
+        {
+            Current = Previous is KFT2<TKey, TVal> PreviousT2
+                 ? new KFT2<TKey, TVal>(PreviousT2.F, PreviousT2.V, T1)
+                 : new KFT2<TKey, TVal>(F, V, T1);
+            return new KFT2<TKey, TVal>(F, V, T2);
+        }
+    }
+}

KKdBaseLib/KKdBaseLib.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -39,11 +39,18 @@
     <NoWarn>IDE0044, IDE0045, IDE0046, IDE0055, IDE0059, IDE1006</NoWarn>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="F2\ENRS.cs" />
+    <Compile Include="F2\Header.cs" />
+    <Compile Include="F2\POF.cs" />
+    <Compile Include="F2\Struct.cs" />
     <Compile Include="DCC.cs" />
     <Compile Include="Extensions.cs" />
+    <Compile Include="Format.cs" />
     <Compile Include="Half.cs" />
-    <Compile Include="IKeyFrame.cs" />
+    <Compile Include="Interfaces.cs" />
+    <Compile Include="KF.cs" />
     <Compile Include="KKdList.cs" />
+    <Compile Include="MsgPack.cs" />
     <Compile Include="Pointer.cs" />
     <Compile Include="Text.cs" />
     <Compile Include="Vector.cs" />

KKdBaseLib/KKdList.cs

@@ -1,12 +1,13 @@
 using System.Collections;
+using System.Collections.Generic;
 
 namespace KKdBaseLib
 {
-    public struct KKdList<T> : IEnumerator, IEnumerable
+    public struct KKdList<T> : System.IDisposable, IEnumerator, IEnumerable, INull
     {
         public static KKdList<T> Null => new KKdList<T>();
-        public static KKdList<T> New  => new KKdList<T>() { Capacity = 0 };
-        public static KKdList<T> NewReserve(int Capacity) => new KKdList<T>() { Capacity = Capacity };
+        public static KKdList<T> New  => new KKdList<T>() { Count = 0, Capacity = 0 };
+        public static KKdList<T> NewReserve(int Capacity) => new KKdList<T>() { Count = 0, Capacity = Capacity };
 
         private int index;
         private T[] array;
@@ -17,32 +18,28 @@ namespace KKdBaseLib
         public bool NotNull => array != null;
 
         public int Capacity { get => array != null ? array.Length : -1;
-            set
-            {
-                if (array != null) System.Array.Resize(ref array, value);
-                else array = new T[value];
-            }
-        }
+            set { if (array != null) System.Array.Resize(ref array, value); else array = new T[value];
+                if (Count >= value) Count = value; } }
 
 
         public KKdList(T[] Array)
-        {
-            index = 0;
-            Count = Array.Length;
-            array = Array;
-        }
+        { index = 0; Count = Array.Length; array = Array; }
 
         public T Current => index < Count ? array[index] : default;
 
         object IEnumerator.Current => Current;
 
-        public T this[int index]
+        public T this[ int index]
+        {   get =>    array != null && index > -1 ? array[index] : default;
+            set { if (array != null && index > -1)  array[index] =   value; } }
+
+        public T this[uint index]
         {   get =>    array != null ? array[index] : default;
             set { if (array != null)  array[index] =   value; } }
 
         public bool MoveNext()
-        { if (index == (Count - 1)) { index = 0; return false; }
-          else                      { index++  ; return  true; } }
+        { if (index == Count - 1) { index = 0; return false; }
+          else                    { index++  ; return  true; } }
 
         public IEnumerator GetEnumerator() => this;
 
@@ -66,15 +63,18 @@ namespace KKdBaseLib
 
             for (int i = index + 1; i < Count; i++)
                 array[i - 1] = array[i];
+            Count--;
         }
 
         public void RemoveRange(int IndexStart, int IndexEnd)
         {
-            if (IndexEnd - IndexStart < 1) return;
             if (IsNull) return;
+            if (IndexEnd - IndexStart < 1) return;
 
-            for (int i = IndexStart; i < Count; i++)
-                array[i] = array[i + IndexEnd - IndexStart];
+            if (IndexEnd - IndexStart != Count)
+                for (int i = IndexStart; i < Count; i++)
+                    array[i] = array[i + IndexEnd - IndexStart];
+            Count -= IndexEnd - IndexStart;
         }
 
         public T[] ToArray() => array;
@@ -98,5 +98,18 @@ namespace KKdBaseLib
                 else if (array[i]    .Equals(val)       ) return i;
             return -1;
         }
+
+        public void Sort()
+        { List<T> List = this; List.Sort(); array = List.ToArray(); Count = List.Count; }
+
+        public static implicit operator KKdList<T>(   List<T> List) =>
+            new KKdList<T> { array = List.ToArray(), Count = List.Count };
+
+        public static implicit operator    List<T>(KKdList<T> List)
+        {
+            List<T> list = new List<T>();
+            for (int i = 0; i < List.Count; i++) list.Add(List[i]);
+            return list;
+        }
     }
 }

KKdBaseLib/MsgPack.cs

@@ -1,20 +1,22 @@
 using System;
-using KKdBaseLib;
 
-namespace KKdMainLib.MessagePack
+namespace KKdBaseLib
 {
-    public struct MsgPack : IDisposable, IEquatable<MsgPack>
+    public struct MsgPack : IDisposable, IEquatable<MsgPack>, INull
     {
         public string Name;
         public object Object;
         
-        public         MsgPack[] Array => Object is         MsgPack[] List ? List :    null;
-        public KKdList<MsgPack>   List => Object is KKdList<MsgPack>  List ? List : default;
+        public         MsgPack[] Array => Object is         MsgPack[] Array ? Array :    null;
+        public KKdList<MsgPack>   List => Object is KKdList<MsgPack>   List ?  List : default;
 
         public static MsgPack New => new MsgPack { Object = KKdList<MsgPack>.New };
         public static MsgPack NewReserve(int Capacity) =>
             new MsgPack { Object = KKdList<MsgPack>.NewReserve(Capacity) };
 
+        public bool  IsNull => Array == null && List. IsNull;
+        public bool NotNull => Array != null || List.NotNull;
+
         public MsgPack(            string Name = null)
         { Object = KKdList<MsgPack>.New; this.Name = Name; }
 
@@ -29,6 +31,14 @@ namespace KKdMainLib.MessagePack
         public MsgPack this[int index]
         {   get =>    Object is MsgPack[] Array  ? Array[index] : default;
             set { if (Object is MsgPack[] Array) { Array[index] =   value; Object = Array; } } }
+
+        public MsgPack this[string key]
+        {   get =>    Object is KKdList<MsgPack> List  ? List[ElementIndex(key)] : default; }
+
+        public MsgPack this[string key, bool array]
+        {   get { if (!array) return this[key];
+                if (Object is KKdList<MsgPack> List) { MsgPack MsgPack = List[ElementIndex(key)];
+                    return MsgPack.Object is MsgPack[] ? MsgPack : default; } return default; } }
         
         public MsgPack Add(MsgPack obj)
         { if (Object is KKdList<MsgPack> List) { List.Add(obj); Object = List; } return this; }
@@ -44,22 +54,20 @@ namespace KKdMainLib.MessagePack
             (Array != null ? ((Name != null ? " " : "") + "Elements Count: " + Array.Length) :
             Object.ToString()));
 
-        public MsgPack Add(string Val, byte[] val) => val != null ? Add(new MsgPack(Val, val)) : this;
-        public MsgPack Add(string Val, string val) => val != null ? Add(new MsgPack(Val, val)) : this;
-
-        public static explicit operator MsgPack(byte[] val) => new MsgPack(null, val);
-        public static explicit operator MsgPack(string val) => new MsgPack(null, val);
-        public static explicit operator MsgPack( sbyte val) => new MsgPack(null, val);
-        public static explicit operator MsgPack(  byte val) => new MsgPack(null, val);
-        public static explicit operator MsgPack( short val) => new MsgPack(null, val);
-        public static explicit operator MsgPack(ushort val) => new MsgPack(null, val);
-        public static explicit operator MsgPack(   int val) => new MsgPack(null, val);
-        public static explicit operator MsgPack(  uint val) => new MsgPack(null, val);
-        public static explicit operator MsgPack(  long val) => new MsgPack(null, val);
-        public static explicit operator MsgPack( ulong val) => new MsgPack(null, val);
-        public static explicit operator MsgPack( float val) => new MsgPack(null, val);
-        public static explicit operator MsgPack(double val) => new MsgPack(null, val);
-
+        public static implicit operator MsgPack(byte[] val) => new MsgPack(null, val);
+        public static implicit operator MsgPack(string val) => new MsgPack(null, val);
+        public static implicit operator MsgPack( sbyte val) => new MsgPack(null, val);
+        public static implicit operator MsgPack(  byte val) => new MsgPack(null, val);
+        public static implicit operator MsgPack( short val) => new MsgPack(null, val);
+        public static implicit operator MsgPack(ushort val) => new MsgPack(null, val);
+        public static implicit operator MsgPack(   int val) => new MsgPack(null, val);
+        public static implicit operator MsgPack(  uint val) => new MsgPack(null, val);
+        public static implicit operator MsgPack(  long val) => new MsgPack(null, val);
+        public static implicit operator MsgPack( ulong val) => new MsgPack(null, val);
+        public static implicit operator MsgPack( float val) => new MsgPack(null, val);
+        public static implicit operator MsgPack(double val) => new MsgPack(null, val);
+        
+        public MsgPack Add(  bool? val) => val.HasValue ? Add(new MsgPack(null, val.Value)) : this;
         public MsgPack Add( sbyte? val) => val.HasValue ? Add(new MsgPack(null, val.Value)) : this;
         public MsgPack Add(  byte? val) => val.HasValue ? Add(new MsgPack(null, val.Value)) : this;
         public MsgPack Add( short? val) => val.HasValue ? Add(new MsgPack(null, val.Value)) : this;
@@ -85,6 +93,7 @@ namespace KKdMainLib.MessagePack
         public MsgPack Add( float  val) => Add(new MsgPack(null, val));
         public MsgPack Add(double  val) => Add(new MsgPack(null, val));
         
+        public MsgPack Add(string Val,   bool? val) => val.HasValue ? Add(Val, val.Value) : this;
         public MsgPack Add(string Val,  sbyte? val) => val.HasValue ? Add(Val, val.Value) : this;
         public MsgPack Add(string Val,   byte? val) => val.HasValue ? Add(Val, val.Value) : this;
         public MsgPack Add(string Val,  short? val) => val.HasValue ? Add(Val, val.Value) : this;
@@ -95,7 +104,9 @@ namespace KKdMainLib.MessagePack
         public MsgPack Add(string Val,  ulong? val) => val.HasValue ? Add(Val, val.Value) : this;
         public MsgPack Add(string Val,  float? val) => val.HasValue ? Add(Val, val.Value) : this;
         public MsgPack Add(string Val, double? val) => val.HasValue ? Add(Val, val.Value) : this;
-
+        
+        public MsgPack Add(string Val, byte[] val) => Add(new MsgPack(Val, val));
+        public MsgPack Add(string Val, string val) => Add(new MsgPack(Val, val));
         public MsgPack Add(string Val,   bool val) => Add(new MsgPack(Val, val));
         public MsgPack Add(string Val,  sbyte val) => Add(new MsgPack(Val, val));
         public MsgPack Add(string Val,   byte val) => Add(new MsgPack(Val, val));
@@ -107,7 +118,7 @@ namespace KKdMainLib.MessagePack
         public MsgPack Add(string Val,  ulong val) => Add(new MsgPack(Val, val));
         public MsgPack Add(string Val,  float val) => Add(new MsgPack(Val, val));
         public MsgPack Add(string Val, double val) => Add(new MsgPack(Val, val));
-        
+
         public   bool ReadBoolean(string Name) => ReadNBoolean(Name).GetValueOrDefault();
         public  sbyte    ReadInt8(string Name) =>    ReadNInt8(Name).GetValueOrDefault();
         public   byte   ReadUInt8(string Name) =>   ReadNUInt8(Name).GetValueOrDefault();
@@ -120,30 +131,126 @@ namespace KKdMainLib.MessagePack
         public  float  ReadSingle(string Name) =>  ReadNSingle(Name).GetValueOrDefault();
         public double  ReadDouble(string Name) =>  ReadNDouble(Name).GetValueOrDefault();
 
-        public   bool? ReadNBoolean(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack.ReadNBoolean() : null;
-        public  sbyte?    ReadNInt8(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack.  ReadNInt8 () : null;
-        public   byte?   ReadNUInt8(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack. ReadNUInt8 () : null;
-        public  short?   ReadNInt16(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack.  ReadNInt16() : null;
-        public ushort?  ReadNUInt16(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack. ReadNUInt16() : null;
-        public    int?   ReadNInt32(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack.  ReadNInt32() : null;
-        public   uint?  ReadNUInt32(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack. ReadNUInt32() : null;
-        public   long?   ReadNInt64(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack.  ReadNInt64() : null;
-        public  ulong?  ReadNUInt64(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack. ReadNUInt64() : null;
-        public  float?  ReadNSingle(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack. ReadNSingle() : null;
-        public double?  ReadNDouble(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack. ReadNDouble() : null;
-        public string    ReadString(string Name) =>
-            Element(Name, out MsgPack MsgPack) ? MsgPack.  ReadString() : null;
+        public   bool? ReadNBoolean(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is   bool Boolean) return         Boolean;
+            return null;
+        }
+        public  sbyte?    ReadNInt8(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return           Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return ( sbyte) UInt8 ;
+            return null;
+        }
+        public   byte?   ReadNUInt8(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return (  byte)  Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            return null;
+        }
+        public  short?   ReadNInt16(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return           Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            else if (MsgPack.Object is  short   Int16) return           Int16;
+            else if (MsgPack.Object is ushort  UInt16) return ( short) UInt16;
+            return null;
+        }
+        public ushort?  ReadNUInt16(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return (ushort)  Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            else if (MsgPack.Object is  short   Int16) return (ushort)  Int16;
+            else if (MsgPack.Object is ushort  UInt16) return          UInt16;
+            return null;
+        }
+        public    int?   ReadNInt32(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return           Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            else if (MsgPack.Object is  short   Int16) return           Int16;
+            else if (MsgPack.Object is ushort  UInt16) return          UInt16;
+            else if (MsgPack.Object is    int   Int32) return           Int32;
+            else if (MsgPack.Object is   uint  UInt32) return (   int) UInt32;
+            return null;
+        }
+        public   uint?  ReadNUInt32(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return (  uint)  Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            else if (MsgPack.Object is  short   Int16) return (  uint)  Int16;
+            else if (MsgPack.Object is ushort  UInt16) return          UInt16;
+            else if (MsgPack.Object is    int   Int32) return (  uint)  Int32;
+            else if (MsgPack.Object is   uint  UInt32) return          UInt32;
+            return null;
+        }
+        public   long?   ReadNInt64(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return           Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            else if (MsgPack.Object is  short   Int16) return           Int16;
+            else if (MsgPack.Object is ushort  UInt16) return          UInt16;
+            else if (MsgPack.Object is    int   Int32) return           Int32;
+            else if (MsgPack.Object is   uint  UInt32) return          UInt32;
+            else if (MsgPack.Object is   long   Int64) return           Int64;
+            else if (MsgPack.Object is  ulong  UInt64) return (  long) UInt64;
+            return null;
+        }
+        public  ulong?  ReadNUInt64(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return ( ulong)  Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            else if (MsgPack.Object is  short   Int16) return ( ulong)  Int16;
+            else if (MsgPack.Object is ushort  UInt16) return          UInt16;
+            else if (MsgPack.Object is    int   Int32) return ( ulong)  Int32;
+            else if (MsgPack.Object is   uint  UInt32) return          UInt32;
+            else if (MsgPack.Object is   long   Int64) return ( ulong)  Int64;
+            else if (MsgPack.Object is  ulong  UInt64) return          UInt64;
+            return null;
+        }
+        public  float?  ReadNSingle(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return           Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            else if (MsgPack.Object is  short   Int16) return           Int16;
+            else if (MsgPack.Object is ushort  UInt16) return          UInt16;
+            else if (MsgPack.Object is    int   Int32) return           Int32;
+            else if (MsgPack.Object is   uint  UInt32) return          UInt32;
+            else if (MsgPack.Object is   long   Int64) return           Int64;
+            else if (MsgPack.Object is  float Float32) return         Float32;
+            else if (MsgPack.Object is double Float64) return ( float)Float64;
+            return null;
+        }
+        public double?  ReadNDouble(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is  sbyte   Int8 ) return           Int8 ;
+            else if (MsgPack.Object is   byte  UInt8 ) return          UInt8 ;
+            else if (MsgPack.Object is  short   Int16) return           Int16;
+            else if (MsgPack.Object is ushort  UInt16) return          UInt16;
+            else if (MsgPack.Object is    int   Int32) return           Int32;
+            else if (MsgPack.Object is   uint  UInt32) return          UInt32;
+            else if (MsgPack.Object is   long   Int64) return           Int64;
+            else if (MsgPack.Object is  float Float32) return         Float32;
+            else if (MsgPack.Object is double Float64) return         Float64;
+            return null;
+        }
+        public string    ReadString(string Name)
+        {
+            MsgPack MsgPack = this[Name];
+                 if (MsgPack.Object is string  String) return          String;
+            return null;
+        }
 
         public   bool ReadBoolean() => ReadNBoolean().GetValueOrDefault();
         public  sbyte    ReadInt8() =>    ReadNInt8().GetValueOrDefault();
@@ -230,10 +337,10 @@ namespace KKdMainLib.MessagePack
         public string    ReadString()
         {        if (Object is string  String) return          String; return null; }
 
-        public bool ElementArray(string Name, out MsgPack MsgPack) =>
-            Element(Name, out MsgPack) ? MsgPack.Array != null : false;
+        public bool ElementArray1(string Name, out MsgPack MsgPack) =>
+            Element1(Name, out MsgPack) ? MsgPack.Array != null : false;
 
-        public bool Element(string Name, out MsgPack MsgPack)
+        public bool Element1(string Name, out MsgPack MsgPack)
         {
             MsgPack = New;
             if (List.IsNull) return false;
@@ -243,15 +350,27 @@ namespace KKdMainLib.MessagePack
             return false;
         }
 
-        public bool ContainsKey(string Name)
+        public MsgPack Element(string Name)
         {
-            if (List.IsNull) return false;
-            
-            for (int i = 0; i < List.Count ; i++)
-                if (List[i].Name == Name) return true;
-            return false;
+            if (List.IsNull) return default;
+
+            for (int i = 0; i < List.Count; i++)
+                if (List[i].Name == Name) return List[i];
+            return default;
         }
-        
+
+        public bool ContainsKey(string Name) => ElementIndex(Name) > -1;
+
+        public int ElementIndex(string Name)
+        {
+            if (List.IsNull) return -1;
+
+            for (int i = 0; i < List.Count; i++)
+                if (List[i].Name == Name) return i;
+            return -1;
+        }
+
+
         public struct Ext
         {
             public sbyte   Type;

KKdBaseLib/Pointer.cs

@@ -11,7 +11,7 @@
     public struct CountPointer<T>
     {
         public int Count { get => Entries != null ? Entries.Length : 0;
-                           set => Entries  =  new T[value]; }
+                           set => Entries = value < 0 ? null : new T[value]; }
         public int Offset;
         public T[] Entries;
         

KKdBaseLib/Properties/AssemblyInfo.cs

@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("437F63F1-8C23-429E-AB14-38B85C9EDB16")]
-[assembly: AssemblyVersion("0.0.1.0")]
-[assembly: AssemblyFileVersion("0.0.1.0")]
+[assembly: AssemblyVersion("0.4.7.5")]
+[assembly: AssemblyFileVersion("0.4.7.5")]

KKdBaseLib/Vector.cs

@@ -1,6 +1,6 @@
 namespace KKdBaseLib
 {
-    public struct Vector2<T>
+    public struct Vector2<T> : INull
     {
         public T X;
         public T Y;
@@ -8,12 +8,13 @@
         public Vector2(T X, T Y)
         { this.X = X; this.Y = Y; }
 
-        public bool NotNull => X != null && Y != null;
+        public bool  IsNull => X == null && Y == null;
+        public bool NotNull => X != null || Y != null;
 
         public override string ToString() => "X: " + X + "; Y: " + Y;
     }
     
-    public struct Vector3<T>
+    public struct Vector3<T> : INull
     {
         public T X;
         public T Y;
@@ -21,13 +22,14 @@
 
         public Vector3(T X, T Y, T Z)
         { this.X = X; this.Y = Y; this.Z = Z; }
-
-        public bool NotNull => X != null && Y != null && Z != null;
+        
+        public bool  IsNull => X == null && Y == null && Z == null;
+        public bool NotNull => X != null || Y != null || Z != null;
 
         public override string ToString() => "X: " + X + "; Y: " + Y + "; Z: " + Z;
     }
 
-    public struct Vector4<T>
+    public struct Vector4<T> : INull
     {
         public T X;
         public T Y;
@@ -36,8 +38,9 @@
 
         public Vector4(T X, T Y, T Z, T W)
         { this.X = X; this.Y = Y; this.Z = Z; this.W = W; }
-
-        public bool NotNull => X != null && Y != null && Z != null && W != null;
+        
+        public bool  IsNull => X == null && Y == null && Z == null && W == null;
+        public bool NotNull => X != null || Y != null || Z != null || W != null;
 
         public override string ToString() => "X: " + X + "; Y: " + Y + "; Z: " + Z + "; W: " + W;
     }

KKdBaseLib/Vector3.cs

@@ -10,8 +10,7 @@
         { this.X = X; this.Y = Y; this.Z = Z; }
 
         public double Length => (X * X + Y * Y + Z * Z).Sqrt();
-        public Vector3 Normalized => this = new Vector3()
-        { X = X * (1 / Length), Y = Y * (1 / Length), Z = Z * (1 / Length) };
+        public Vector3 Normalized => this = Length == 0 ? new Vector3() : this / Length;
 
         public static Vector3 operator +(Vector3 left, Vector3 right)
         { left.X += right.X; left.Y += right.Y; left.Z += right.Z; return left; }
@@ -38,17 +37,17 @@
         public static double DistanceSquared(Vector3 left, Vector3 right) =>
             (right.X - left.X) * (right.X - left.X) + (right.Y - left.Y) *
             (right.Y - left.Y) + (right.Z - left.Z) * (right.Z - left.Z);
-        public static double  Dot  (Vector3 left, Vector3 right) =>
-            (left.X * right.X) + (left.Y * right.Y) + (left.Z * right.Z);
+        public static double Dot(Vector3 left, Vector3 right) =>
+             left.X * right.X + left.Y * right.Y + left.Z * right.Z;
         public static Vector3 Cross(Vector3 left, Vector3 right) =>
-            new Vector3 { X = (left.Y * right.Z) - (left.Z * right.Y),
-                          Y = (left.Z * right.X) - (left.X * right.Z),
-                          Z = (left.X * right.Y) - (left.Y * right.X), };
-        public static Vector3 Lerp (Vector3    a, Vector3     b,  double blend) =>
+            new Vector3 { X = left.Y * right.Z - left.Z * right.Y,
+                          Y = left.Z * right.X - left.X * right.Z,
+                          Z = left.X * right.Y - left.Y * right.X, };
+        public static Vector3 Lerp(Vector3 a, Vector3 b,  double blend) =>
             new Vector3 { X = blend   * (b.X - a.X) + a.X,
                           Y = blend   * (b.Y - a.Y) + a.Y,
                           Z = blend   * (b.Z - a.Z) + a.Z };
-        public static Vector3 Lerp (Vector3    a, Vector3     b, Vector3 blend) =>
+        public static Vector3 Lerp(Vector3 a, Vector3 b, Vector3 blend) =>
             new Vector3 { X = blend.X * (b.X - a.X) + a.X,
                           Y = blend.Y * (b.Y - a.Y) + a.Y,
                           Z = blend.Z * (b.Z - a.Z) + a.Z };
@@ -72,6 +71,7 @@
         public bool Equals(Vector3 other) =>
             X == other.X && Y == other.Y && Z == other.Z;
 
-        public override string ToString() => "X: " + X + "; Y: " + Y + "; Z: " + Z;
+        public override string ToString() => $"{X},{Y},{Z}";
+        public string ToString(int d) => $"{X.Round(d)},{Y.Round(d)},{Z.Round(d)}";
     }
 }

KKdBaseLib/Vector4.cs

@@ -11,8 +11,7 @@
         { this.X = X; this.Y = Y; this.Z = Z; this.W = W; }
 
         public double Length => (X * X + Y * Y + Z * Z + W * W).Sqrt();
-        public Vector4 Normalized => this = new Vector4()
-        { X = X * (1 / Length), Y = Y * (1 / Length), Z = Z * (1 / Length), W = W * (1 / Length) };
+        public Vector4 Normalized => this = Length == 0 ? new Vector4() : this / Length;
 
         public static Vector4 operator +(Vector4 left, Vector4 right)
         { left.X += right.X; left.Y += right.Y; left.Z += right.Z; left.W += right.W; return left; }
@@ -39,14 +38,14 @@
         public static double DistanceSquared(Vector4 left, Vector4 right) =>
             (right.X - left.X) * (right.X - left.X) + (right.Y - left.Y) * (right.Y - left.Y) +
             (right.Z - left.Z) * (right.Z - left.Z) + (right.W - left.W) * (right.W - left.W);
-        public static double  Dot  (Vector4 left, Vector4 right) =>
-            (left.X * right.X) + (left.Y * right.Y) + (left.Z * right.Z) + (left.W * right.W);
-        public static Vector4 Lerp (Vector4    a, Vector4     b,  double blend) =>
-            new Vector4 { X = blend   * (b.X - a.X) + a.X,
+        public static double Dot(Vector4 left, Vector4 right) =>
+            left.X * right.X + left.Y * right.Y + left.Z * right.Z + left.W * right.W;
+        public static Vector4 Lerp(Vector4 a, Vector4 b,  double blend) =>
+            new Vector4 { X = blend * (b.X - a.X) + a.X,
                           Y = blend   * (b.Y - a.Y) + a.Y,
                           Z = blend   * (b.Z - a.Z) + a.Z,
                           W = blend   * (b.W - a.W) + a.W };
-        public static Vector4 Lerp (Vector4    a, Vector4     b, Vector4 blend) =>
+        public static Vector4 Lerp(Vector4 a, Vector4 b, Vector4 blend) =>
             new Vector4 { X = blend.X * (b.X - a.X) + a.X,
                           Y = blend.Y * (b.Y - a.Y) + a.Y,
                           Z = blend.Z * (b.Z - a.Z) + a.Z,
@@ -72,6 +71,7 @@
         public bool Equals(Vector4 other) =>
             X == other.X && Y == other.Y && Z == other.Z && W == other.W;
 
-        public override string ToString() => "X: " + X + "; Y: " + Y + "; Z: " + Z + "; W: " + W;
+        public override string ToString() => $"{X},{Y},{Z},{W}";
+        public string ToString(int d) => $"{X.Round(d)},{Y.Round(d)},{Z.Round(d)},{W.Round(d)}";
     }
 }

KKdBaseLib/obj/Release/KKdBaseLib.csproj.CoreCompileInputs.cache

@@ -1 +0,0 @@
-add7b87062355c62d41e72dacf09abaf3e41d478

KKdBaseLib/obj/Release/KKdBaseLib.csproj.FileListAbsolute.txt

@@ -1,3 +0,0 @@
-F:\Source\PD_Tool\KKdBaseLib\bin\KKdBaseLib.dll
-F:\Source\PD_Tool\KKdBaseLib\obj\Release\KKdBaseLib.csproj.CoreCompileInputs.cache
-F:\Source\PD_Tool\KKdBaseLib\obj\Release\KKdBaseLib.dll

KKdMainLib/Aet.cs

@@ -2,8 +2,6 @@
 
 using KKdBaseLib;
 using KKdMainLib.IO;
-using KKdMainLib.F2nd;
-using KKdMainLib.MessagePack;
 
 namespace KKdMainLib.Aet
 {
@@ -62,15 +60,23 @@ namespace KKdMainLib.Aet
             Aet.Unk       = IO.ReadSingle();
             Aet.Duration  = IO.ReadSingle();
             Aet.FrameRate = IO.ReadSingle();
-            IO.ReadInt32();
-            Aet.Width      = IO.ReadInt32();
-            Aet.Height     = IO.ReadInt32();
-            Aet.DontChange = IO.ReadInt32();
-            if (Aet.DontChange != 0) { IO.Close(); return; }
+            Aet.BackgroundColor = IO.ReadInt32();
+            Aet.Width           = IO.ReadInt32();
+            Aet.Height          = IO.ReadInt32();
+            Aet.Position = IO.ReadPointer<Vector2<KeyFrameEntry>>();
             Aet.Layers        = IO.ReadCountPointer<   AetLayer>();
             Aet.SpriteEntries = IO.ReadCountPointer<SpriteEntry>();
             Aet.Unknown = IO.ReadCountPointer<int>();
 
+            if (Aet.Position.Offset > 0)
+            {
+                IO.Position = Aet.Position.Offset;
+                Aet.Position.Value.X.Offset = IO.ReadInt32();
+                Aet.Position.Value.Y.Offset = IO.ReadInt32();
+                IO.ReadKeyFrameEntry(ref Aet.Position.Value.X);
+                IO.ReadKeyFrameEntry(ref Aet.Position.Value.Y);
+            }
+
             IO.Position = Aet.Layers.Offset;
             for (i = 0; i < Aet.Layers.Count; i++)
                 Aet.Layers[i] = new AetLayer() { Pointer = IO.Position,
@@ -150,16 +156,37 @@ namespace KKdMainLib.Aet
                 for (i0 = 0; i0 < Aet.Layers.Entries[i].Count; i0++)
                     IO.Write(ref Aet.Layers.Entries[i].Objects[i0]);
             }
-         
+
+            if (Aet.Position.Offset > 0)
+            {
+                IO.Align(0x10);
+                int Flags = 0;
+                Flags |= IO.Write(ref Aet.Position.Value.X) ? 0b10 : 0;
+                Flags |= IO.Write(ref Aet.Position.Value.Y) ? 0b01 : 0;
+
+                IO.Align(0x20);
+                Aet.Position.Offset = IO.Position;
+                IO.Write(Aet.Position.Value.X.Count );
+                if ((Flags & 0b10) == 0b10) NullValPointers.Add(IO.Position);
+                IO.Write(Aet.Position.Value.X.Offset);
+                IO.Write(Aet.Position.Value.X.Count );
+                if ((Flags & 0b01) == 0b01) NullValPointers.Add(IO.Position);
+                IO.Write(Aet.Position.Value.Y.Offset);
+
+                IO.Write(ref Aet.Position.Value.X);
+                IO.Write(ref Aet.Position.Value.Y);
+            }
+            else Aet.Position.Offset = 0;
+
             IO.Align(0x20);
             AET.Offset = IO.Position;
             IO.Write(0L);
             IO.Write(Aet.Duration);
             IO.Write(Aet.FrameRate);
-            IO.Write(0);
+            IO.Write(Aet.BackgroundColor);
             IO.Write(Aet.Width);
             IO.Write(Aet.Height);
-            IO.Write(0);
+            IO.Write(Aet.Position.Offset);
             IO.Write(0L);
             IO.Write(0L);
             IO.Write(0L);
@@ -201,8 +228,7 @@ namespace KKdMainLib.Aet
             {
                 IO.Align(0x10);
                 Aet.Unknown.Offset = IO.Position;
-                for (i = 0; i < Aet.Unknown.Count * 10; i++)
-                    IO.Write(0L);
+                for (i = 0; i < Aet.Unknown.Count * 10; i++) IO.Write(0L);
             }
 
             IO.Align(0x10);
@@ -214,7 +240,7 @@ namespace KKdMainLib.Aet
             for (i = 0; i < NullValPointers.Count; i++)
             {
                 IO.Position = NullValPointers[i];
-                IO.Write(ReturnPosition + i * 4);
+                IO.Write(ReturnPosition + (i << 2));
             }
 
             for (i = 0; i < Aet.Layers.Count; i++)
@@ -323,23 +349,21 @@ namespace KKdMainLib.Aet
             AET = new AetHeader();
 
             MsgPack MsgPack = file.ReadMPAllAtOnce(JSON);
-            if (!MsgPack.ElementArray("Aet", out MsgPack Aet)) { MsgPack.Dispose(); return; }
-
-            if (Aet.Array != null)
-                if (Aet.Array.Length > 0)
+            MsgPack Aet;
+            if ((Aet = MsgPack["Aet", true]).NotNull)
+                if (Aet.Array != null && Aet.Array.Length > 0)
                 {
                     AET.Data = new Pointer<AetData>[Aet.Array.Length];
                     for (int i = 0; i < AET.Data.Length; i++)
                         MsgPackReader(Aet.Array[i], ref AET.Data[i]);
                 }
-
+            Aet.Dispose();
             MsgPack.Dispose();
         }
 
         public void MsgPackWriter(string file, bool JSON)
         {
-            if (this.AET.Data == null) return;
-            if (this.AET.Data.Length == 0) return;
+            if (this.AET.Data == null || this.AET.Data.Length == 0) return;
 
             MsgPack AET = new MsgPack(this.AET.Data.Length, "Aet");
             for (int i = 0; i < this.AET.Data.Length; i++) AET[i] = MsgPackWriter(ref this.AET.Data[i]);
@@ -357,39 +381,44 @@ namespace KKdMainLib.Aet
             Aet.Unk        = AET.ReadSingle("Unk"      );
             Aet.Duration   = AET.ReadSingle("Duration" );
             Aet.FrameRate  = AET.ReadSingle("FrameRate");
-            Aet.Width  = AET.ReadInt32("Width" );
-            Aet.Height = AET.ReadInt32("Height");
+            Aet.BackgroundColor = AET.ReadInt32("BackgroundColor");
+            Aet.Width           = AET.ReadInt32("Width"          );
+            Aet.Height          = AET.ReadInt32("Height"         );
 
-            if (AET.Element("Unknown", out Temp))
+            if ((Temp = AET["Unknown"]).NotNull)
                 Aet.Unknown.Count = Temp.ReadInt32();
-
-
-            if (AET.ElementArray("SpriteEntries", out Temp))
+            
+            if ((Temp = AET["Position"]).NotNull)
+            {
+                Aet.Position.Offset = 1;
+                Aet.Position.Value.X.ReadMP(Temp, "X");
+                Aet.Position.Value.Y.ReadMP(Temp, "Y");
+            }
+            
+            if ((Temp = AET["SpriteEntries", true]).NotNull)
             {
                 Aet.SpriteEntries.Count = Temp.Array.Length;
                 for (i = 0; i < Aet.SpriteEntries.Count; i++)
                     Aet.SpriteEntries.Entries[i].ReadMP(Temp[i]);
             }
             else return;
-
-
-            if (AET.ElementArray("Layers", out Temp))
+            
+            if ((Temp = AET["Layers", true]).NotNull)
             {
                 Aet.Layers.Count = Temp.Array.Length + 1;
                 for (i = 0; i < Aet.Layers.Count - 1; i++)
                     Aet.Layers.Entries[i].ReadMP(Temp[i]);
             }
-            else return;
-
+            else Aet.Layers.Count = 1;
 
             i = Aet.Layers.Count - 1;
-            if (AET.ElementArray("RootLayer", out Temp))
+            if ((Temp = AET["RootLayer", true]).NotNull)
             {
                 Aet.Layers.Entries[i].Count = Temp.Array.Length;
                 for (i0 = 0; i0 < Aet.Layers[i].Count; i0++)
                     Aet.Layers.Entries[i].Objects[i0].ReadMP(Temp[i0]);
             }
-            else if (AET.Element("RootLayer", out Temp))
+            else if ((Temp = AET["RootLayer"]).NotNull)
             {
                 Aet.Layers.Entries[i].Count = 1;
                 Aet.Layers.Entries[i].Objects[0].ReadMP(Temp);
@@ -397,6 +426,7 @@ namespace KKdMainLib.Aet
             else return;
 
             AetData.Offset = 0;
+            Temp.Dispose();
         }
         
         public MsgPack MsgPackWriter(ref Pointer<AetData> AetData)
@@ -404,12 +434,16 @@ namespace KKdMainLib.Aet
             if (AetData.Offset <= 0) return MsgPack.New;
             ref AetData Aet = ref AetData.Value;
 
-            MsgPack AET = MsgPack.New.Add("Name", Aet.Name.Value).Add("Duration",
-                Aet.Duration).Add("FrameRate", Aet.FrameRate).Add("Width",
-                Aet.Width).Add("Height", Aet.Height).Add("Unk", Aet.Unk);
+            MsgPack AET = MsgPack.New.Add("Name", Aet.Name.Value).Add("Duration", Aet.Duration).
+                Add("FrameRate", Aet.FrameRate).Add("BackgroundColor", Aet.BackgroundColor).
+                Add("Width", Aet.Width).Add("Height", Aet.Height).Add("Unk", Aet.Unk);
             if (Aet.Unknown.Count > 0)
                 AET.Add("Unknown", Aet.Unknown.Count);
 
+            if (Aet.Position.Offset > 0)
+                AET.Add(new MsgPack("Position").Add(Aet.Position.Value.X.WriteMP("X"))
+                                               .Add(Aet.Position.Value.Y.WriteMP("Y")));
+
             i = Aet.Layers.Count - 1;
             if (Aet.Layers[i].Count == 1)
                 AET.Add(Aet.Layers[i][0].WriteMP(ref Aet, "RootLayer"));
@@ -419,12 +453,12 @@ namespace KKdMainLib.Aet
                 for (i0 = 0; i0 < Aet.Layers[i].Count; i0++)
                     RootLayer[i0] = Aet.Layers[i][i0].WriteMP(ref Aet);
                 AET.Add(RootLayer);
-            }
 
-            MsgPack Layers = new MsgPack(Aet.Layers.Count - 1, "Layers");
-            for (i = 0; i < Aet.Layers.Count - 1; i++)
-                Layers[i] = Aet.Layers[i].WriteMP(i, ref Aet);
-            AET.Add(Layers);
+                MsgPack Layers = new MsgPack(Aet.Layers.Count - 1, "Layers");
+                for (i = 0; i < Aet.Layers.Count - 1; i++)
+                    Layers[i] = Aet.Layers[i].WriteMP(i, ref Aet);
+                AET.Add(Layers);
+            }
 
             MsgPack SpriteEntries = new MsgPack(Aet.SpriteEntries.Count, "SpriteEntries");
             for (i = 0; i < Aet.SpriteEntries.Count; i++)
@@ -439,19 +473,21 @@ namespace KKdMainLib.Aet
     {
         public static MsgPack ReadMP(this MsgPack msg, ref CountPointer<float> val, string Name)
         {
+            MsgPack Temp;
             val.Offset = 0;
             val.Entries = null;
-            if (msg.ContainsKey(Name))
+            if ((Temp = msg[Name, true]).NotNull)
             {
                 val.Count = 1;
-                val[0] = msg.ReadSingle(Name);
+                val[0] = Temp.ReadSingle();
             }
-            else if(msg.ElementArray(Name, out MsgPack Temp))
+            else if ((Temp = msg[Name]).NotNull)
             {
                 val.Count = Temp.Array.Length;
                 for (int i = 0; i < val.Count; i++)
                     val[i] = Temp[i].ReadSingle();
             }
+            Temp.Dispose();
             return msg;
         }
 
@@ -461,7 +497,7 @@ namespace KKdMainLib.Aet
             else if (val.Count > 1)
             {
                 MsgPack Val = new MsgPack(val.Count, Name);
-                for (int i = 0; i < val.Count; i++) Val[i] = (MsgPack)val[i];
+                for (int i = 0; i < val.Count; i++) Val[i] = val[i];
                 return MsgPack.Add(Val);
             }
             return MsgPack;
@@ -827,7 +863,7 @@ namespace KKdMainLib.Aet
             if (entry.Count > 2) IO.Align(0x20);
             entry.Offset = IO.Position;
             if (entry.Count == 1) if (entry.Value == 0) return  true;
-                      else { IO.Write(entry.Value);     return false; }  
+                      else { IO.Write(entry.Value);     return false; }
 
             for (int i = 0; i < entry.Count; i++) IO.Write(entry.KeyFrame     [i]);
             for (int i = 0; i < entry.Count; i++)
@@ -837,17 +873,19 @@ namespace KKdMainLib.Aet
 
         public static void ReadMP(this CountPointer<Marker> mark, MsgPack msg)
         {
-            if (msg.Element("Marker", out MsgPack Marker))
+            MsgPack Temp;
+            if ((Temp = msg["Marker"]).NotNull)
             {
                 mark.Count = 1;
-                mark.Entries[0].ReadMP(Marker);
+                mark.Entries[0].ReadMP(Temp);
             }
-            else if (msg.ElementArray("Markers", out MsgPack Markers))
+            else if ((Temp = msg["Markers", true]).NotNull)
             {
-                mark.Count = Markers.Array.Length;
+                mark.Count = Temp.Array.Length;
                 for (int i = 0; i < mark.Count; i++)
-                    mark.Entries[i].ReadMP(Markers[i]);
+                    mark.Entries[i].ReadMP(Temp[i]);
             }
+            Temp.Dispose();
         }
 
         public static void WritePointerString(this Stream IO,
@@ -862,7 +900,6 @@ namespace KKdMainLib.Aet
     public struct AetHeader
     {
         public Pointer<AetData>[] Data;
-        public POF POF;
     }
 
     public struct AetData
@@ -871,9 +908,10 @@ namespace KKdMainLib.Aet
         public float Unk;
         public float Duration;
         public float FrameRate;
+        public int BackgroundColor;
         public int Width;
         public int Height;
-        public int DontChange;
+        public Pointer<Vector2<KeyFrameEntry>> Position;
         public CountPointer<   AetLayer> Layers;
         public CountPointer<SpriteEntry> SpriteEntries;
         public CountPointer<int> Unknown;
@@ -892,17 +930,19 @@ namespace KKdMainLib.Aet
 
         public void ReadMP(MsgPack msg)
         {
-            if (msg.Element("Object", out MsgPack Object))
+            MsgPack Temp;
+            if ((Temp = msg["Object"]).NotNull)
             {
                 Count = 1;
-                Objects[0].ReadMP(Object);
+                Objects[0].ReadMP(Temp);
             }
-            else if (msg.ElementArray("Objects", out MsgPack Objects))
+            else if ((Temp = msg["Objects", true]).NotNull)
             {
-                Count = Objects.Array.Length;
+                Count = Temp.Array.Length;
                 for (int i0 = 0; i0 < Count; i0++)
-                    this.Objects[i0].ReadMP(Objects[i0]);
+                    Objects[i0].ReadMP(Temp[i0]);
             }
+            Temp.Dispose();
         }
 
         public MsgPack WriteMP(int Id, ref AetData Aet)
@@ -954,13 +994,13 @@ namespace KKdMainLib.Aet
             Unk0 = msg.ReadUInt8("Unk0");
             Unk1 = msg.ReadUInt8("Unk1");
             Unk2 = msg.ReadUInt8("Unk2");
-                 if (msg.Element("Pic", out MsgPack Pic))
-            { Type = ObjType.Pic; this.Pic.Value.ReadMP(Pic); }
-            else if (msg.Element("Aif", out MsgPack Aif))
-            { Type = ObjType.Aif; this.Aif.Value.ReadMP(Aif); }
-            else if (msg.Element("Eff", out MsgPack Eff))
-            { Type = ObjType.Eff; this.Eff.Value.ReadMP(Eff); }
+
+            MsgPack Temp;
+                 if ((Temp = msg["Pic"]).NotNull) { Type = ObjType.Pic; Pic.Value.ReadMP(Temp); }
+            else if ((Temp = msg["Aif"]).NotNull) { Type = ObjType.Aif; Aif.Value.ReadMP(Temp); }
+            else if ((Temp = msg["Eff"]).NotNull) { Type = ObjType.Eff; Eff.Value.ReadMP(Temp); }
             else Type = ObjType.Nop;
+            Temp.Dispose();
         }
 
         public MsgPack WriteMP(ref AetData Aet, string name = null)
@@ -1000,18 +1040,20 @@ namespace KKdMainLib.Aet
                 if (ParentObjectID != null)
                     this.ParentObjectID = ParentObjectID.Value;
 
-                if (msg.Element("Marker", out MsgPack Marker))
+                MsgPack Temp;
+                if ((Temp = msg["Marker"]).NotNull)
                 {
-                    this.Marker.Count = 1;
-                    this.Marker.Entries[0].ReadMP(Marker);
+                    Marker.Count = 1;
+                    Marker.Entries[0].ReadMP(Temp);
                 }
-                else if (msg.ElementArray("Markers", out MsgPack Markers))
+                if ((Temp = msg["Markers", true]).NotNull)
                 {
-                    this.Marker.Count = Markers.Array.Length;
-                    for (int i = 0; i < Markers.Array.Length; i++)
-                        this.Marker.Entries[i].ReadMP(Markers[i]);
+                    Marker.Count = Temp.Array.Length;
+                    for (int i = 0; i < Marker.Count; i++)
+                        Marker.Entries[i].ReadMP(Temp[i]);
                 }
-                else this.Marker.Entries = null;
+                else Marker.Entries = null;
+                Temp.Dispose();
 
                 Data.Value.ReadMP(msg);
 
@@ -1084,18 +1126,20 @@ namespace KKdMainLib.Aet
                 if (ParentObjectID != null)
                     this.ParentObjectID = ParentObjectID.Value;
 
-                if (msg.Element("Marker", out MsgPack Marker))
+                MsgPack Temp;
+                if ((Temp = msg["Marker"]).NotNull)
                 {
-                    this.Marker.Count = 1;
-                    this.Marker.Entries[0].ReadMP(Marker);
+                    Marker.Count = 1;
+                    Marker.Entries[0].ReadMP(Temp);
                 }
-                else if (msg.ElementArray("Markers", out MsgPack Markers))
+                else if ((Temp = msg["Markers", true]).NotNull)
                 {
-                    this.Marker.Count = Markers.Array.Length;
-                    for (int i = 0; i < Markers.Array.Length; i++)
-                        this.Marker.Entries[i].ReadMP(Markers[i]);
+                    Marker.Count = Temp.Array.Length;
+                    for (int i = 0; i < Marker.Count; i++)
+                        Marker.Entries[i].ReadMP(Temp[i]);
                 }
-                else this.Marker.Entries = null;
+                else Marker.Entries = null;
+                Temp.Dispose();
 
                 Data.Value.ReadMP(msg);
             }
@@ -1106,11 +1150,10 @@ namespace KKdMainLib.Aet
                 for (int i = 0; i < Aet.Layers.Count; i++)
                     if (Aet.Layers[i].Pointer == LayerID)
                     { Eff.Add("LayerID", i); break; }
-                if (ParentObjectID > 0)
-                    for (int i = 0; i < Aet.Layers.Count; i++)
-                        for (int i1 = 0; i1 < Aet.Layers[i].Count; i1++)
-                            if (Aet.Layers[i][i1].Offset == ParentObjectID)
-                            { Eff.Add("ParentObjectID", Aet.Layers[i][i1].ID); break; }
+                for (int i = 0; ParentObjectID > 0 && i < Aet.Layers.Count; i++)
+                    for (int i1 = 0; i1 < Aet.Layers[i].Count; i1++)
+                        if (Aet.Layers[i][i1].Offset == ParentObjectID)
+                        { Eff.Add("ParentObjectID", Aet.Layers[i][i1].ID); break; }
 
                 if (Marker.Count == 1)
                     Eff.Add(Marker[0].WriteMP("Marker"));
@@ -1199,25 +1242,29 @@ namespace KKdMainLib.Aet
 
         public void ReadMP(MsgPack msg)
         {
-            if (!msg.Element("AnimationData", out MsgPack Data)) return;
+            MsgPack Data;
+            if ((Data = msg["AnimationData"]).NotNull)
+            {
+                System.Enum.TryParse(Data.ReadString("BlendMode"), out Mode);
+                Unk0           = Data.ReadUInt8  ("Unk0");
+                UseTextureMask = Data.ReadBoolean("UseTextureMask");
+                Unk1           = Data.ReadUInt8  ("Unk1");
+                
+                  OriginX.ReadMP(Data,   "OriginX");
+                  OriginY.ReadMP(Data,   "OriginY");
+                PositionX.ReadMP(Data, "PositionX");
+                PositionY.ReadMP(Data, "PositionY");
+                Rotation .ReadMP(Data, "Rotation" );
+                   ScaleX.ReadMP(Data,    "ScaleX");
+                   ScaleY.ReadMP(Data,    "ScaleY");
+                Opacity  .ReadMP(Data, "Opacity"  );
 
-            System.Enum.TryParse(Data.ReadString("BlendMode"), out Mode);
-            Unk0           = Data.ReadUInt8  ("Unk0");
-            UseTextureMask = Data.ReadBoolean("UseTextureMask");
-            Unk1           = Data.ReadUInt8  ("Unk1");
-            
-              OriginX.ReadMP(Data,   "OriginX");
-              OriginY.ReadMP(Data,   "OriginY");
-            PositionX.ReadMP(Data, "PositionX");
-            PositionY.ReadMP(Data, "PositionY");
-            Rotation .ReadMP(Data, "Rotation" );
-               ScaleX.ReadMP(Data,    "ScaleX");
-               ScaleY.ReadMP(Data,    "ScaleY");
-            Opacity  .ReadMP(Data, "Opacity"  );
-
-            this._3D.Offset = -1;
-            if (Data.Element("3D", out MsgPack _3D))
-            { this._3D.Offset = 0; this._3D.Value.ReadMP(_3D); }
+                MsgPack Temp;
+                _3D.Offset = -1;
+                if ((Temp = Data["3D"]).NotNull) { _3D.Offset = 0; _3D.Value.ReadMP(Temp); }
+                Temp.Dispose();
+            }
+            Data.Dispose();
         }
 
         public MsgPack WriteMP()
@@ -1234,8 +1281,7 @@ namespace KKdMainLib.Aet
             AnimationData.Add(   ScaleX.WriteMP(   "ScaleX"));
             AnimationData.Add(   ScaleY.WriteMP(   "ScaleY"));
             AnimationData.Add(Opacity  .WriteMP("Opacity"  ));
-            if (_3D.Offset > 0)
-                AnimationData.Add(_3D.Value.WriteMP());
+            if (_3D.Offset > 0) AnimationData.Add(_3D.Value.WriteMP());
             return AnimationData;
         }
 
@@ -1260,21 +1306,23 @@ namespace KKdMainLib.Aet
 
         public void ReadMP(MsgPack msg, string name)
         {
+            MsgPack Temp;
             float? Value = msg.ReadNSingle(name);
-            if (Value != null) { Count = 1; this.Value = Value.Value; return; }
-            if (!msg.ElementArray(name, out MsgPack Temp)) return;
-            
-            Count = Temp.Array.Length;
-            if (Count == 0) return;
-            ArrValue      = new float[Count];
-            KeyFrame      = new float[Count];
-            Interpolation = new float[Count];
-            for (int i = 0; i < Count; i++)
+            if (Value != null) { Count = 1; this.Value = Value.Value; }
+            if ((Temp = msg[name, true]).NotNull && Temp.Array.Length > 1)
             {
-                KeyFrame     [i] = Temp[i].ReadSingle("KeyFrame"     );
-                ArrValue     [i] = Temp[i].ReadSingle("Value"        );
-                Interpolation[i] = Temp[i].ReadSingle("Interpolation");
+                Count = Temp.Array.Length;
+                ArrValue      = new float[Count];
+                KeyFrame      = new float[Count];
+                Interpolation = new float[Count];
+                for (int i = 0; i < Count; i++)
+                {
+                    KeyFrame     [i] = Temp[i].ReadSingle("KeyFrame"     );
+                    ArrValue     [i] = Temp[i].ReadSingle("Value"        );
+                    Interpolation[i] = Temp[i].ReadSingle("Interpolation");
+                }
             }
+            Temp.Dispose();
         }
 
         public MsgPack WriteMP(string name)
@@ -1304,19 +1352,21 @@ namespace KKdMainLib.Aet
             Height  = msg.ReadInt16 ("Height" );
             Frames  = msg.ReadSingle("Frames" );
 
-            if (msg.Element("Sprite", out MsgPack Sprite))
+            MsgPack Temp;
+            if ((Temp = msg["Sprite"]).NotNull)
             {
                 Sprites.Count = 1;
                 Sprites[0] = new Sprite() { Name = new Pointer<string>()
-                { Value = Sprite.ReadString("Name") }, ID = Sprite.ReadInt32("ID") };
+                { Value = Temp.ReadString("Name") }, ID = Temp.ReadInt32("ID") };
             }
-            else if (msg.ElementArray("Sprites", out MsgPack Sprites))
+            else if ((Temp = msg["Sprites", true]).NotNull)
             {
-                this.Sprites.Count = Sprites.Array.Length;
-                for (int i0 = 0; i0 < this.Sprites.Count; i0++)
-                    this.Sprites[i0] = new Sprite() { Name = new Pointer<string>()
-                        { Value = Sprites[i0].ReadString("Name") }, ID = Sprites[i0].ReadInt32("ID") };
+                Sprites.Count = Temp.Array.Length;
+                for (int i0 = 0; i0 < Sprites.Count; i0++)
+                    Sprites[i0] = new Sprite() { Name = new Pointer<string>()
+                        { Value = Temp[i0].ReadString("Name") }, ID = Temp[i0].ReadInt32("ID") };
             }
+            Temp.Dispose();
         }
 
         public MsgPack WriteMP(int Id)

KKdMainLib/DB/Aet.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using KKdBaseLib;
 using KKdMainLib.IO;
-using KKdMainLib.MessagePack;
 
 namespace KKdMainLib.DB
 {
@@ -193,13 +192,15 @@ namespace KKdMainLib.DB
         {
             MsgPack MsgPack = file.ReadMPAllAtOnce(JSON);
 
-            if (MsgPack.ElementArray("AetDB", out MsgPack AetDB))
+            MsgPack Temp = default;
+            if ((Temp = MsgPack["AetDB", true]).NotNull)
             {
-                AetSets = new AetSet[AetDB.Array.Length];
+                AetSets = new AetSet[Temp.Array.Length];
                 for (int i = 0; i < AetSets.Length; i++)
-                    AetSets[i].ReadMsgPack(AetDB[i]);
+                    AetSets[i].ReadMsgPack(Temp[i]);
             }
-            MsgPack = MsgPack.New;
+            Temp.Dispose();
+            MsgPack.Dispose();
         }
 
 
@@ -247,12 +248,14 @@ namespace KKdMainLib.DB
                 NewId       = msg.ReadBoolean("NewId"      );
                 SpriteSetId = msg.ReadNUInt16("SpriteSetId");
 
-                if (msg.ElementArray("Aets", out MsgPack Aets))
+                MsgPack Temp;
+                if ((Temp = msg["Aets", true]).NotNull)
                 {
-                    this.Aets = new AET[Aets.Array.Length];
-                    for (int i0 = 0; i0 < this.Aets.Length; i0++)
-                        this.Aets[i0].ReadMsgPack(Aets[i0]);
+                    Aets = new AET[Temp.Array.Length];
+                    for (int i0 = 0; i0 < Aets.Length; i0++)
+                        Aets[i0].ReadMsgPack(Temp[i0]);
                 }
+                Temp.Dispose();
             }
 
             public MsgPack WriteMsgPack()

KKdMainLib/DB/Auth.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using KKdBaseLib;
 using KKdMainLib.IO;
 using KKdMainLib.A3DA;
-using KKdMainLib.MessagePack;
 
 namespace KKdMainLib.DB
 {
@@ -20,7 +20,7 @@ namespace KKdMainLib.DB
 
             IO = File.OpenReader(file + ".bin");
 
-            IO.Format = Main.Format.F;
+            IO.Format = Format.F;
             Signature = IO.ReadInt32();
             if (Signature != 0x44334123) return;
             Signature = IO.ReadInt32();
@@ -96,16 +96,18 @@ namespace KKdMainLib.DB
         {
             MsgPack MsgPack = file.ReadMPAllAtOnce(JSON);
 
-            if (MsgPack.Element("AuthDB", out MsgPack AuthDB))
+            MsgPack AuthDB;
+            if ((AuthDB = MsgPack["AuthDB"]).NotNull)
             {
-                if (AuthDB.ElementArray("Category", out MsgPack Temp))
+                MsgPack Temp;
+                if ((Temp = MsgPack["Category", true]).NotNull)
                 {
                     Category = new string[Temp.Array.Length];
                     for (int i = 0; i < Category.Length; i++)
                         Category[i] = Temp[i].ReadString();
                 }
 
-                if (AuthDB.ElementArray("UID", out Temp))
+                if ((Temp = MsgPack["UID", true]).NotNull)
                 {
                     _UID = new UID[Temp.Array.Length];
                     for (int i = 0; i < _UID.Length; i++)
@@ -116,8 +118,10 @@ namespace KKdMainLib.DB
                         _UID[i].Value    = Temp[i].ReadString("Value"   );
                     }
                 }
+                Temp.Dispose();
             }
-            MsgPack = MsgPack.New;
+            AuthDB.Dispose();
+            MsgPack.Dispose();
         }
 
         public void MsgPackWriter(string file, bool JSON)

KKdMainLib/DB/Spr.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using KKdBaseLib;
 using KKdMainLib.IO;
-using KKdMainLib.MessagePack;
 
 namespace KKdMainLib.DB
 {
@@ -85,8 +84,8 @@ namespace KKdMainLib.DB
             List<string> SetName     = new List<string>();
             List<string> SetFileName = new List<string>();
 
-            List<int>    Ids        = new List<int>();
-            List<int> SetIds        = new List<int>();
+            List<int>    Ids = new List<int>();
+            List<int> SetIds = new List<int>();
 
             List<int> NotAdd = new List<int>();
             SpriteTexture temp;
@@ -144,13 +143,13 @@ namespace KKdMainLib.DB
                 if (set.Id    == null) while (true)
                     { if (!SetIds.Contains(i1)) { SpriteSets[i].Id = i1; SetIds.Add(i1); break; } i1++; }
 
-                for (i0 = 0, i1 = 0; i0 < set. Sprites.Length; i0++)
-                    if (set. Sprites[i0].Id == null) while (true) { if (!Ids.Contains(i1))
-                            { SpriteSets[i]. Sprites[i0].Id = i1; Ids.Add(i1); break; } i1++; }
-
                 for (i0 = 0, i1 = 0; i0 < set.Textures.Length; i0++)
-                    if (set.Textures[i0].Id == null) while (true) { if (!Ids.Contains(i1))
-                            { SpriteSets[i].Textures[i0].Id = i1; Ids.Add(i1); break; } i1++; }
+                    while (set.Textures[i0].Id == null)
+                        if (!Ids.Contains(i1)) Ids.Add((int)(SpriteSets[i].Textures[i0].Id = i1)); else i1++;
+
+                for (i0 = 0, i1 = 0; i0 < set. Sprites.Length; i0++)
+                    while (set. Sprites[i0].Id == null)
+                        if (!Ids.Contains(i1)) Ids.Add((int)(SpriteSets[i]. Sprites[i0].Id = i1)); else i1++;
             }
 
                Ids = null;
@@ -176,18 +175,20 @@ namespace KKdMainLib.DB
             for (i = 0; i < SpriteSets.Length; i++)
             {
                 if (NotAdd.Contains(i)) continue;
-                SpriteSets[i].    NameOffset = IO.Position; IO.Write(SpriteSets[i].    Name + "\0");
-                SpriteSets[i].FileNameOffset = IO.Position; IO.Write(SpriteSets[i].FileName + "\0");
+                for (i0 = 0; i0 < SpriteSets[i].Textures.Length; i0++)
+                { SpriteSets[i].Textures[i0].NameOffset = IO.Position;
+                    IO.Write(SpriteSets[i].Textures[i0].Name + "\0"); }
+
+                for (i0 = 0; i0 < SpriteSets[i]. Sprites.Length; i0++)
+                { SpriteSets[i]. Sprites[i0].NameOffset = IO.Position;
+                    IO.Write(SpriteSets[i]. Sprites[i0].Name + "\0"); }
             }
 
             for (i = 0; i < SpriteSets.Length; i++)
             {
                 if (NotAdd.Contains(i)) continue;
-                for (i0 = 0; i0 < SpriteSets[i].Textures.Length; i0++)
-                { SpriteSets[i].Textures[i0].NameOffset = IO.Position; IO.Write(SpriteSets[i].Textures[i0].Name + "\0"); }
-
-                for (i0 = 0; i0 < SpriteSets[i]. Sprites.Length; i0++)
-                { SpriteSets[i]. Sprites[i0].NameOffset = IO.Position; IO.Write(SpriteSets[i]. Sprites[i0].Name + "\0"); }
+                SpriteSets[i].    NameOffset = IO.Position; IO.Write(SpriteSets[i].    Name + "\0");
+                SpriteSets[i].FileNameOffset = IO.Position; IO.Write(SpriteSets[i].FileName + "\0");
             }
             
             IO.Align(0x08, true);
@@ -230,13 +231,15 @@ namespace KKdMainLib.DB
         {
             MsgPack MsgPack = file.ReadMPAllAtOnce(JSON);
 
-            if (MsgPack.ElementArray("SprDB", out MsgPack SprDB))
+            MsgPack SprDB;
+            if ((SprDB = MsgPack["SprDB", true]).NotNull)
             {
                 SpriteSets = new SpriteSet[SprDB.Array.Length];
                 for (int i = 0; i < SpriteSets.Length; i++)
                     SpriteSets[i].ReadMsgPack(SprDB[i]);
             }
-            MsgPack = MsgPack.New;
+            SprDB.Dispose();
+            MsgPack.Dispose();
         }
 
         public void MsgPackWriter(string file, bool JSON)
@@ -281,19 +284,21 @@ namespace KKdMainLib.DB
                 Name         = msg.ReadString ("Name"    );
                 NewId        = msg.ReadBoolean("NewId"   );
 
-                if (msg.ElementArray( "Sprites", out MsgPack  Sprites))
+                MsgPack Temp;
+                if ((Temp = msg["Sprites", true]).NotNull)
                 {
-                    this.Sprites = new SpriteTexture[Sprites.Array.Length];
-                    for (int i0 = 0; i0 < this.Sprites.Length; i0++)
-                        this.Sprites[i0].ReadMsgPack(Sprites[i0]);
+                    Sprites = new SpriteTexture[Temp.Array.Length];
+                    for (int i0 = 0; i0 < Sprites.Length; i0++)
+                        Sprites[i0].ReadMsgPack(Temp[i0]);
                 }
 
-                if (msg.ElementArray("Textures", out MsgPack Textures))
+                if ((Temp = msg["Textures", true]).NotNull)
                 {
-                    this.Textures = new SpriteTexture[Textures.Array.Length];
-                    for (int i0 = 0; i0 < this.Textures.Length; i0++)
-                        this.Textures[i0].ReadMsgPack(Textures[i0]);
+                    Textures = new SpriteTexture[Temp.Array.Length];
+                    for (int i0 = 0; i0 < Textures.Length; i0++)
+                        Textures[i0].ReadMsgPack(Temp[i0]);
                 }
+                Temp.Dispose();
             }
 
             public MsgPack WriteMsgPack()

KKdMainLib/DEX.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using KKdBaseLib;
+using KKdBaseLib.F2;
 using KKdMainLib.IO;
-using KKdMainLib.F2nd;
-using KKdMainLib.MessagePack;
 
 namespace KKdMainLib
 {
@@ -21,23 +21,21 @@ namespace KKdMainLib
             Header = new Header();
             IO = File.OpenReader(filepath + ext);
 
-            Header.Format = Main.Format.F;
+            Header.Format = Format.F;
             Header.SectionSignature = IO.ReadInt32();
             if (Header.SectionSignature == 0x43505845)
-                Header = IO.ReadHeader(true);
-            if (Header.SectionSignature != 0x64)
-                return 0;
+                Header = IO.ReadHeader(true, true);
+            if (Header.SectionSignature != 0x64) return 0;
 
-            Offset = IO.Position - 0x4;
+            IO.Offset = IO.Position - 0x4;
             Dex = new EXP[IO.ReadInt32()];
             int DEXOffset = IO.ReadInt32();
-            if (IO.ReadInt32() == 0x00) Header.Format = Main.Format.X;
             int DEXNameOffset = IO.ReadInt32();
-            if (Header.IsX) IO.ReadInt32();
+            if (DEXNameOffset == 0x00) { Header.Format = Format.X; DEXNameOffset = (int)IO.ReadInt64(); }
 
-            IO.Seek(DEXOffset + Offset, 0);
+            IO.Seek(DEXOffset, 0);
             for (int i0 = 0; i0 < Dex.Length; i0++)
-                Dex[i0] = new EXP { Main = new List<EXPElement>(), Eyes = new List<EXPElement>() };
+                Dex[i0] = new EXP { Main = KKdList<EXPElement>.New, Eyes = KKdList<EXPElement>.New };
 
             for (int i0 = 0; i0 < Dex.Length; i0++)
             {
@@ -46,7 +44,7 @@ namespace KKdMainLib
                 Dex[i0].EyesOffset = IO.ReadInt32();
                 if (Header.IsX) IO.ReadInt32();
             }
-            IO.Seek(DEXNameOffset + Offset, 0);
+            IO.Seek(DEXNameOffset, 0);
             for (int i0 = 0; i0 < Dex.Length; i0++)
             {
                 Dex[i0].NameOffset = IO.ReadInt32();
@@ -70,7 +68,7 @@ namespace KKdMainLib
                         break;
                 }
 
-                IO.Seek(Dex[i0].EyesOffset + Offset, 0);
+                IO.Seek(Dex[i0].EyesOffset, 0);
                 while(true)
                 {
                     element.Frame = IO.ReadSingle();
@@ -80,25 +78,23 @@ namespace KKdMainLib
                     element.Trans = IO.ReadSingle();
                     Dex[i0].Eyes.Add(element);
 
-                    if (element.Frame == 999999 || element.Both == 0xFFFF)
-                        break;
+                    if (element.Frame == 999999 || element.Both == 0xFFFF) break;
                 }
 
-                IO.Seek(Dex[i0].NameOffset + Offset, 0);
-                Dex[i0].Name = IO.NullTerminatedUTF8();
+                Dex[i0].Name = IO.ReadStringAtOffset(Dex[i0].NameOffset);
             }
 
             IO.Close();
             return 1;
         }
 
-        public void DEXWriter(string filepath, Main.Format Format)
+        public void DEXWriter(string filepath, Format Format)
         {
             Header = new Header();
-            IO = File.OpenWriter(filepath + (Format > Main.Format.F ? ".dex" : ".bin"), true);
+            IO = File.OpenWriter(filepath + (Format > Format.F ? ".dex" : ".bin"), true);
             Header.Format = IO.Format = Format;
 
-            IO.Offset = Format > Main.Format.F ? 0x20 : 0;
+            IO.Offset = Format > Format.F ? 0x20 : 0;
             IO.Write(0x64);
             IO.Write(Dex.Length);
 
@@ -157,7 +153,7 @@ namespace KKdMainLib
             IO.Position = Position0 - (Header.IsX ? 8 : 4);
             IO.Write(Position1);
 
-            if (Format > Main.Format.F)
+            if (Format > Format.F)
             {
                 Offset = IO.Length;
                 IO.Offset = 0;
@@ -172,7 +168,7 @@ namespace KKdMainLib
             IO.Close();
         }
 
-        public void MsgPackReader(string file, bool JSON)
+        public int MsgPackReader(string file, bool JSON)
         {
             int i0 = 0;
             int i1 = 0;
@@ -180,34 +176,35 @@ namespace KKdMainLib
             Header = new Header();
 
             MsgPack MsgPack = file.ReadMPAllAtOnce(JSON);
-            if (!MsgPack.ElementArray("Dex", out MsgPack Dex)) return;
-
-            this.Dex = new EXP[Dex.Array.Length];
-            for (i0 = 0; i0 < this.Dex.Length; i0++)
+            MsgPack Dex;
+            if ((Dex = MsgPack["Dex", true]).NotNull)
             {
-                this.Dex[i0] = new EXP { Name = Dex[i0].ReadString("Name") };
+                this.Dex = new EXP[Dex.Array.Length];
+                for (i0 = 0; i0 < this.Dex.Length; i0++)
+                {
+                    this.Dex[i0] = new EXP { Name = Dex[i0].ReadString("Name") };
 
-                if (Dex[i0].ElementArray("Main", out MsgPack Main))
-                {
-                    this.Dex[i0].Main = new List<EXPElement>();
-                    for (i1 = 0; i1 < Main.Array.Length; i1++)
-                        this.Dex[i0].Main.Add(ReadEXP(Main[i1]));
-                }
-                if (Dex[i0].ElementArray("Eyes", out MsgPack Eyes))
-                {
-                    this.Dex[i0].Eyes = new List<EXPElement>();
-                    for (i1 = 0; i1 < Eyes.Array.Length; i1++)
-                        this.Dex[i0].Eyes.Add(ReadEXP(Eyes[i1]));
+                    MsgPack Temp;
+                    if ((Temp = MsgPack["Main", true]).NotNull)
+                    {
+                        this.Dex[i0].Main = KKdList<EXPElement>.New;
+                        for (i1 = 0; i1 < this.Dex[i0].Main.Count; i1++)
+                            this.Dex[i0].Main.Add(EXPElement.Read(Temp[i1]));
+                    }
+                    if ((Temp = MsgPack["Eyes", true]).NotNull)
+                    {
+                        this.Dex[i0].Eyes = KKdList<EXPElement>.New;
+                        for (i1 = 0; i1 < this.Dex[i0].Main.Count; i1++)
+                            this.Dex[i0].Eyes.Add(EXPElement.Read(Temp[i1]));
+                    }
+                    Temp.Dispose();
                 }
             }
-            MsgPack = MsgPack.New;
+            Dex.Dispose();
+            MsgPack.Dispose();
+            return 1;
         }
 
-        private EXPElement ReadEXP(MsgPack mp) =>
-            new EXPElement() { Frame = mp.ReadSingle("F"), Both  = mp.ReadUInt16("B"),
-                               ID    = mp.ReadUInt16("I"), Value = mp.ReadSingle("V"),
-                               Trans = mp.ReadSingle("T") };
-
         public void MsgPackWriter(string file, bool JSON)
         {
             int i0 = 0;
@@ -218,12 +215,12 @@ namespace KKdMainLib
                 MsgPack EXP = MsgPack.New.Add("Name", this.Dex[i0].Name);
                 MsgPack Main = new MsgPack(this.Dex[i0].Main.Count, "Main");
                 for (i1 = 0; i1 < this.Dex[i0].Main.Count; i1++)
-                    Main[i1] = WriteEXP(this.Dex[i0].Main[i1]);
+                    Main[i1] = this.Dex[i0].Main[i1].Write();
                 EXP.Add(Main);
 
                 MsgPack Eyes = new MsgPack(this.Dex[i0].Eyes.Count, "Eyes");
                 for (i1 = 0; i1 < this.Dex[i0].Eyes.Count; i1++)
-                    Eyes[i1] = WriteEXP(this.Dex[i0].Eyes[i1]);
+                    Eyes[i1] = this.Dex[i0].Eyes[i1].Write();
                 EXP.Add(Eyes);
                 Dex[i0] = EXP;
             }
@@ -231,18 +228,16 @@ namespace KKdMainLib
             Dex.Write(true, file, JSON);
         }
 
-        private MsgPack WriteEXP(EXPElement element) =>
-            MsgPack.New.Add("F", element.Frame).Add("B", element.Both ).Add("I", element.ID   )
-                         .Add("V", element.Value).Add("T", element.Trans);
-
         public struct EXP
         {
             public int MainOffset;
             public int EyesOffset;
             public int NameOffset;
             public string Name;
-            public List<EXPElement> Main;
-            public List<EXPElement> Eyes;
+            public KKdList<EXPElement> Main;
+            public KKdList<EXPElement> Eyes;
+
+            public override string ToString() => Name;
         }
 
         public struct EXPElement
@@ -252,6 +247,16 @@ namespace KKdMainLib
             public ushort ID;
             public  float Value;
             public  float Trans;
+
+            public static EXPElement Read(MsgPack msg) =>
+                new EXPElement() { Frame = msg.ReadSingle("F"), Both  = msg.ReadUInt16("B"),
+                                   ID    = msg.ReadUInt16("I"), Value = msg.ReadSingle("V"),
+                                   Trans = msg.ReadSingle("T"), };
+
+            public MsgPack Write() =>
+                MsgPack.New.Add("F", Frame).Add("B", Both )
+                           .Add("I",    ID).Add("V", Value)
+                           .Add("T", Trans);
         }
     }
 }

KKdMainLib/DIVAFILE.cs

@@ -14,7 +14,6 @@ namespace KKdMainLib
 
         public static void Decrypt(this string file)
         {
-            Console.Title = "DIVAFILE Decrypt - File: " + Path.GetFileName(file);
             Stream IO = File.OpenReader(file);
             if (IO.ReadInt64() != 0x454C494641564944)
             { IO.Close(); return; }
@@ -39,12 +38,11 @@ namespace KKdMainLib
 
         public static void Encrypt(this string file)
         {
-            Console.Title = "DIVAFILE Encrypt - File: " + Path.GetFileName(file);
             Stream IO = File.OpenReader(file);
             int FileLengthOrigin = IO.Length;
             int FileLength = FileLengthOrigin.Align(16);
+            byte[] In = IO.ToArray();
             IO.Close();
-            byte[] In = File.OpenReader(file).ToArray(true);
             byte[] Inalign = new byte[FileLength];
             for (int i = 0; i < In.Length; i++) Inalign[i] = In[i];
             In = null;

KKdMainLib/DataBank.cs

@@ -2,7 +2,6 @@
 using System.Net;
 using KKdBaseLib;
 using KKdMainLib.IO;
-using KKdMainLib.MessagePack;
 
 namespace KKdMainLib
 {
@@ -45,30 +44,28 @@ namespace KKdMainLib
             else if (file.Contains("PvList")) { pvList = null; Success = true; }
         }
 
-        public void DBWriter(string file)
+        public void DBWriter(string file, uint num2)
         {
             if (!Success) return;
 
             IO = File.OpenWriter();
             if (file.Contains("psrData"))
             {
-                if (psrDat != null || psrDat.Length > 0)
+                if (psrDat != null && psrDat.Length > 0)
                     for (i = 0; i < psrDat.Length; i++)
                         IO.Write(psrDat[i].ToString() + c);
             }
             else if (file.Contains("PvList"))
             {
-                if (pvList != null || pvList.Length > 0)
+                if (pvList != null && pvList.Length > 0)
                     for (i = 0; i < pvList.Length; i++)
                         IO.Write(UrlEncode(pvList[i].ToString() +
                             (i < pvList.Length ? c : "")));
+                else IO.Write("%2A%2A%2A");
             }
-            else IO.Write("%2A%2A%2A");
              
-
             byte[] data = IO.ToArray(true);
             ushort num = DCC.CalculateChecksum(data);
-            uint num2 = (uint)DateTime.Now.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
             File.WriteAllBytes(file + "_" + num + "_" + num2 + ".dat", data);
         }
 
@@ -80,34 +77,38 @@ namespace KKdMainLib
 
             if (file.Contains("psrData"))
             {
-                if (MsgPack.ElementArray("psrData", out MsgPack psrData))
+                MsgPack psrData;
+                if ((psrData = MsgPack["psrData", true]).NotNull)
                 {
                     psrDat = new psrData[psrData.Array.Length];
                     for (i = 0; i < psrDat.Length; i++)
                         psrDat[i].SetValue(psrData[i]);
                 }
-                else if (MsgPack.ContainsKey("psrData")) psrDat = null;
+                else if (MsgPack["psrData"].NotNull) psrDat = null;
                 Success = true;
+                psrData.Dispose();
             }
             else if (file.Contains("PvList"))
             {
-                if (MsgPack.ElementArray("PvList", out MsgPack PvList))
+                MsgPack PvList;
+                if ((PvList = MsgPack["PvList", true]).NotNull)
                 {
                     pvList = new PvList[PvList.Array.Length];
                     for (i = 0; i < pvList.Length; i++)
                         pvList[i].SetValue(PvList[i], compact);
                 }
-                else if (MsgPack.ContainsKey("PvList")) pvList = null;
+                else if (MsgPack["PvList"].NotNull) pvList = null;
                 Success = true;
+                PvList.Dispose();
             }
             
-            MsgPack = MsgPack.New;
+            MsgPack.Dispose();
         }
 
         public void MsgPackWriter(string file, bool JSON, bool Compact = true)
         {
             if (!Success) return;
-            MsgPack msgPack = MsgPack.New;
+            MsgPack MsgPack = MsgPack.New;
 
             if (file.Contains("psrData"))
             {
@@ -115,23 +116,23 @@ namespace KKdMainLib
                 {
                     MsgPack psrData = new MsgPack(psrDat.Length, "psrData");
                     for (i = 0; i < psrDat.Length; i++) psrData[i] = psrDat[i].WriteMP();
-                    msgPack.Add(psrData);
+                    MsgPack.Add(psrData);
                 }
-                else msgPack.Add(new MsgPack("psrData", null));
+                else MsgPack.Add(new MsgPack("psrData", null));
             }
             else if (file.Contains("PvList"))
             {
                 if (pvList != null)
                 {
-                    if (Compact) msgPack.Add("Compact", Compact);
+                    if (Compact) MsgPack.Add("Compact", Compact);
 
                     MsgPack PvList = new MsgPack(pvList.Length, "PvList");
                     for (i = 0; i < pvList.Length; i++) PvList[i] = pvList[i].WriteMP(Compact);
-                    msgPack.Add(PvList);
+                    MsgPack.Add(PvList);
                 }
-                else msgPack.Add(new MsgPack("PvList", null));
+                else MsgPack.Add(new MsgPack("PvList", null));
             }
-            msgPack.Write(file, JSON).Dispose();
+            MsgPack.Write(file, JSON).Dispose();
         }
 
         public static string UrlEncode(string value) =>
@@ -157,9 +158,11 @@ namespace KKdMainLib
                 int? ID = msg.ReadNInt32("PV_ID");
                 if (ID != null) PV_ID = (int)ID;
                 else { ID = msg.ReadNInt32("ID"); if (ID != null) PV_ID = (int)ID; }
-                if (msg.Element("P1", out MsgPack P1)) p1.SetValue(P1);
-                if (msg.Element("P2", out MsgPack P2)) p2.SetValue(P2);
-                if (msg.Element("P3", out MsgPack P3)) p3.SetValue(P3);
+                MsgPack Temp;
+                if ((Temp = msg["P1", true]).NotNull) p1.SetValue(Temp);
+                if ((Temp = msg["P2", true]).NotNull) p2.SetValue(Temp);
+                if ((Temp = msg["P3", true]).NotNull) p3.SetValue(Temp);
+                Temp.Dispose();
             }
 
             public MsgPack WriteMP() =>
@@ -252,7 +255,6 @@ namespace KKdMainLib
 
             public void SetValue(MsgPack msg, bool Compact)
             {
-                MsgPack Temp = MsgPack.New;
                 this.Enable =  true;
                 this.Extra  = false;
 
@@ -271,33 +273,35 @@ namespace KKdMainLib
                       EndShow   .SetValue(msg.ReadNInt32(  "EndShow"   ),  true);
                     return;
                 }
-                if (msg.Element("AdvDemoStart", out Temp)) AdvDemoStart.SetValue(Temp,  true);
-                if (msg.Element("AdvDemoEnd"  , out Temp)) AdvDemoEnd  .SetValue(Temp, false);
-                if (msg.Element("StartShow"   , out Temp)) StartShow   .SetValue(Temp, false);
-                if (msg.Element(  "EndShow"   , out Temp))   EndShow   .SetValue(Temp,  true);
+                MsgPack Temp;
+                if ((Temp = msg["AdvDemoStart", true]).NotNull) AdvDemoStart.SetValue(Temp,  true);
+                if ((Temp = msg["AdvDemoEnd"  , true]).NotNull) AdvDemoEnd  .SetValue(Temp, false);
+                if ((Temp = msg["StartShow"   , true]).NotNull) StartShow   .SetValue(Temp, false);
+                if ((Temp = msg[  "EndShow"   , true]).NotNull)   EndShow   .SetValue(Temp,  true);
+                Temp.Dispose();
             }
 
             public MsgPack WriteMP(bool Compact)
             {
-                MsgPack msgPack = MsgPack.New;
-                msgPack.Add("ID", PV_ID);
-                if (!Enable) msgPack.Add("Enable", Enable);
-                if ( Extra ) msgPack.Add("Extra" , Extra );
+                MsgPack MsgPack = MsgPack.New;
+                MsgPack.Add("ID", PV_ID);
+                if (!Enable) MsgPack.Add("Enable", Enable);
+                if ( Extra ) MsgPack.Add("Extra" , Extra );
                 if (Compact)
                 {
-                    if (AdvDemoStart.WriteLower) msgPack.Add("AdvDemoStart", AdvDemoStart.WriteInt());
-                    if (AdvDemoEnd  .WriteLower) msgPack.Add("AdvDemoEnd"  , AdvDemoEnd  .WriteInt());
-                    if (StartShow   .WriteLower) msgPack.Add("StartShow"   , StartShow   .WriteInt());
-                    if (  EndShow   .WriteUpper) msgPack.Add(  "EndShow"   ,   EndShow   .WriteInt());
+                    if (AdvDemoStart.WriteUpper) MsgPack.Add("AdvDemoStart", AdvDemoStart.WriteInt());
+                    if (AdvDemoEnd  .WriteLower) MsgPack.Add("AdvDemoEnd"  , AdvDemoEnd  .WriteInt());
+                    if (StartShow   .WriteLower) MsgPack.Add("StartShow"   , StartShow   .WriteInt());
+                    if (  EndShow   .WriteUpper) MsgPack.Add(  "EndShow"   ,   EndShow   .WriteInt());
                 }
                 else
                 {
-                    if (AdvDemoStart.WriteLower) msgPack.Add(AdvDemoStart.WriteMP("AdvDemoStart"));
-                    if (AdvDemoEnd  .WriteLower) msgPack.Add(AdvDemoEnd  .WriteMP("AdvDemoEnd"  ));
-                    if (StartShow   .WriteLower) msgPack.Add(StartShow   .WriteMP("StartShow"   ));
-                    if (  EndShow   .WriteUpper) msgPack.Add(  EndShow   .WriteMP(  "EndShow"   ));
+                    if (AdvDemoStart.WriteUpper) MsgPack.Add(AdvDemoStart.WriteMP("AdvDemoStart"));
+                    if (AdvDemoEnd  .WriteLower) MsgPack.Add(AdvDemoEnd  .WriteMP("AdvDemoEnd"  ));
+                    if (StartShow   .WriteLower) MsgPack.Add(StartShow   .WriteMP("StartShow"   ));
+                    if (  EndShow   .WriteUpper) MsgPack.Add(  EndShow   .WriteMP(  "EndShow"   ));
                 }
-                return msgPack;
+                return MsgPack;
             }
 
             public override string ToString() =>

KKdMainLib/Extensions.cs

@@ -1,7 +1,6 @@
-using System.Collections.Generic;
-using KKdBaseLib;
+using KKdBaseLib;
+using KKdBaseLib.F2;
 using KKdMainLib.IO;
-using KKdMainLib.F2nd;
 
 namespace KKdMainLib
 {
@@ -10,23 +9,20 @@ namespace KKdMainLib
         public static Header ReadHeader(this Stream stream, bool Seek, bool ReadSectionSignature = true)
         {
             if (Seek)
-                if (stream.Position > 4) stream.LongPosition -= 4;
-                else                     stream.LongPosition  = 0;
+                if (stream.LongPosition > 4) stream.LongPosition -= 4;
+                else                         stream.LongPosition  = 0;
             return stream.ReadHeader(ReadSectionSignature);
         }
 
         public static Header ReadHeader(this Stream stream, bool ReadSectionSignature = true)
         {
-            Header Header = new Header
-            { Format = Main.Format.F2LE, Signature = stream.ReadInt32(),
-                DataSize = stream.ReadInt32(),
-                Length = stream.ReadInt32() };
-            if (stream.ReadUInt32() == 0x18000000)
-            { Header.Format = Main.Format.F2BE; }
-            Header.ID = stream.ReadInt32();
-            Header.SectionSize = stream.ReadInt32();
-            Header.Count = stream.ReadInt32();
+            Header Header = new Header { Format = Format.F2LE, Signature = stream.ReadInt32(),
+                DataSize = stream.ReadInt32(), Length = stream.ReadInt32(), Flags = stream.ReadInt32(),
+                Depth = stream.ReadInt32(), SectionSize = stream.ReadInt32(),
+                Mode = stream.ReadInt32() };
             stream.ReadInt32();
+            if ((Header.Flags & 0x08000000) == 0x08000000) Header.Format = Format.F2BE;
+            Header.NotUseDataSizeAsSectionSize = (Header.Flags & 0x10000000) != 0x10000000;
             if (Header.Length == 0x40)
             {
                 stream.ReadInt64();
@@ -42,18 +38,22 @@ namespace KKdMainLib
 
         public static void Write(this Stream stream, Header Header, bool Extended = false)
         {
+            Header.Length = (Header.Format < Format.X && Extended) ? 0x40 : 0x20;
+            Header.Flags = (!Header.NotUseDataSizeAsSectionSize ? 0x10000000 : 0) |
+                            (Header.Format == Format.F2BE ? 0x08000000 : 0);
+
             stream.Write(Header.Signature);
             stream.Write(Header.DataSize);
-            stream.Write((Header.Format < Main.Format.X && Extended) ? 0x40 : 0x20);
-            stream.Write(Header.Format == Main.Format.F2BE ? 0x18000000 : 0x10000000);
-            stream.Write(Header.ID);
+            stream.Write(Header.Length);
+            stream.Write(Header.Flags);
+            stream.Write(Header.Depth);
             stream.Write(Header.SectionSize);
+            stream.Write(Header.Mode);
             stream.Write(0x00);
-            stream.Write(0x00);
-            if (Header.Format < Main.Format.X && Extended)
+            if (Header.Length == 0x40)
             {
-                stream.Write(Header.Format < Main.Format.MGF ? (int)((Header.SectionSignature ^
-                    (Header.DataSize * (long)Header.Signature)) - Header.ID + Header.SectionSize) : 0);
+                stream.Write(Header.Format < Format.MGF ? (int)((Header.SectionSignature ^
+                    (Header.DataSize * (long)Header.Signature)) - Header.Depth + Header.SectionSize) : 0);
                 stream.Write(0x00);
                 stream.Write(0x00L);
                 stream.Write(Header.InnerSignature);
@@ -63,119 +63,182 @@ namespace KKdMainLib
         }
 
         public static void WriteEOFC(this Stream stream, int ID = 0) =>
-            stream.Write(new Header { ID = ID, Length = 0x20, Signature = 0x43464F45 });
+            stream.Write(new Header { Depth = ID, Length = 0x20, Signature = 0x43464F45 });
     }
 
     public static class POFExtensions
     {
-        public static POF AddPOF(this Header Header) =>
-            new POF { Offsets = new List<long>(), Offset = Header.DataSize + Header.Length };
-
-        public static void GetOffset(this Stream stream, ref POF POF)
-        { if (stream.Format > Main.Format.F) POF.Offsets.Add(stream.Position + (stream.IsX ? stream.Offset : 0x00)); }
-
-        public static void ReadPOF(this Stream stream, ref POF POF)
+        public static void Write(this Stream stream, POF POF, bool ShiftX = false)
         {
-            if (stream.ReadString(3) == "POF")
+            byte[] data = POF.Write(POF, ShiftX);
+            Header Header = new Header { Depth = POF.Depth, Format = Format.F2LE,
+                Length = 0x20, Signature = ShiftX ? 0x31464F50 : 0x30464F50 };
+            Header.DataSize = Header.SectionSize = data.Length;
+            stream.Write(Header);
+            stream.Write(data);
+        }
+    }
+
+    public static class ENRSExtensions
+    {
+        public static void Write(this Stream stream, ENRSList ENRS)
+        {
+            byte[] data = ENRSList.Write(ENRS);
+            Header Header = new Header { Depth = ENRS.Depth,
+                Format = Format.F2LE, Length = 0x20, Signature = 0x53524E45 };
+            Header.DataSize = Header.SectionSize = data.Length;
+            stream.Write(Header);
+            stream.Write(data);
+        }
+    }
+
+    public static class StructExtensions
+    {
+        public static Struct ReadStruct(this byte[] Data)
+        {
+            if (Data == null || Data.Length < 1) return default;
+            Struct Struct;
+            using (Stream stream = File.OpenReader(Data))
+                Struct = stream.ReadStruct(stream.ReadHeader(false));
+            return Struct;
+        }
+
+        public static Struct ReadStruct(this Stream stream, Header Header)
+        {
+            Struct Struct = new Struct { Header = Header, DataOffset =
+                stream.Position, Data = stream.ReadBytes(Header.SectionSize) };
+            int Depth = Header.Depth;
+
+            int LastSig = 0, Sig;
+            long Length = stream.Length - stream.Position;
+            long Position = 0;
+            KKdList<Struct> SubStructs = KKdList<Struct>.New;
+            while (Length > Position)
             {
-                POF.Type = byte.Parse(stream.ReadString(1));
-                int IsX = POF.Type + 2;
-                stream.Seek(-4, SeekOrigin.Current);
-                POF.Header = stream.ReadHeader();
-                stream.Seek(POF.Offset + POF.Header.Length, 0);
-                POF.Length = stream.ReadInt32();
-                while (POF.Length + POF.Offset + POF.Header.Length > stream.Position)
+                Header = stream.ReadHeader(false);
+                Sig = Header.Signature;
+                Position += Header.Length + Header.SectionSize;
+                if (Sig == 0x43464F45 && Header.Depth == Depth + 1) break;
+                else if (Header.Depth == 0 &&  (Sig == 0x53524E45 ||
+                    (Sig & 0xF0FFFFFF) == 0x30464F50 || Sig == 0x43505854))
                 {
-                    int a = stream.ReadByte();
-                         if (a >> 6 == 0) break;
-                    else if (a >> 6 == 1) a = a & 0x3F;
-                    else if (a >> 6 == 2)
-                    {
-                        a = a & 0x3F;
-                        a = (a << 8) | stream.ReadByte();
-                    }
-                    else if (a >> 6 == 3)
-                    {
-                        a = a & 0x3F;
-                        a = (a << 8) | stream.ReadByte();
-                        a = (a << 8) | stream.ReadByte();
-                        a = (a << 8) | stream.ReadByte();
-                    }
-                    a <<= IsX;
-                    POF.LastOffset += a;
+                    byte[] Data = stream.ReadBytes(Header.SectionSize);
+                    if (Sig == 0x53524E45) Struct.ENRS = ENRSList.Read(Data,                    Header.Depth);
+                    else                   Struct.POF  = POF     .Read(Data, Sig == 0x31464F50, Header.Depth);
                 }
+                else if (Header.Depth <= Depth) { stream.LongPosition -= Header.Length; break; }
+                else SubStructs.Add(stream.ReadStruct(Header));
+                LastSig = Sig;
             }
+
+            if (SubStructs.Capacity > 0) Struct.SubStructs = SubStructs.ToArray();
+            return Struct;
+        }
+
+        public static byte[] Write(this Struct Struct, bool ShiftX = false)
+        {
+            byte[] Data;
+            using (Stream stream = File.OpenWriter()) { Struct.Update(ShiftX);
+                stream.Write(Struct, ShiftX); stream.WriteEOFC(); Data = stream.ToArray(); }
+            return Data;
+        }
+
+        public static void Write(this Stream stream, Struct Struct, bool ShiftX = false)
+        {
+            stream.Write(Struct.Header);
+            stream.Write(Struct.Data  );
+            if (Struct.HasPOF ) stream.Write(Struct.POF , ShiftX);
+            if (Struct.HasENRS) stream.Write(Struct.ENRS);
+            if (Struct.HasSubStructs)
+            {
+                for (int i = 0; i < Struct.SubStructs.Length; i++)
+                    stream.Write(Struct.SubStructs[i], ShiftX);
+                stream.WriteEOFC(Struct.Depth + 1);
+            }
+        }
+    }
+    
+    public static class MPExt
+    {
+        public static MsgPack ReadMP(this byte[] array, bool JSON = false)
+        {
+            MsgPack MsgPack;
+            if (JSON) using (JSON IO = new JSON(File.OpenReader(array))) MsgPack = IO.Read(    );
+            else      using (  MP IO = new   MP(File.OpenReader(array))) MsgPack = IO.Read(true);
+            return MsgPack;
+        }
+
+        public static MsgPack ReadMPAllAtOnce(this string file, bool JSON = false)
+        {
+            MsgPack MsgPack;
+            if (JSON) using (JSON IO = new JSON(File.OpenReader(file + ".json", true))) MsgPack = IO.Read(    );
+            else      using (  MP IO = new   MP(File.OpenReader(file + ".mp"  , true))) MsgPack = IO.Read(true);
+            return MsgPack;
+        }
+
+        public static MsgPack ReadMP(this string file, bool JSON = false)
+        {
+            MsgPack MsgPack;
+            if (JSON) using (JSON IO = new JSON(File.OpenReader(file + ".json"))) MsgPack = IO.Read(    );
+            else      using (  MP IO = new   MP(File.OpenReader(file + ".mp"  ))) MsgPack = IO.Read(true);
+            return MsgPack;
         }
         
-        public static void Write(this Stream stream, ref POF POF, int ID)
+        public static void Write(this MsgPack mp, bool Temp, string file, bool JSON = false)
+        { if (Temp) MsgPack.New.Add(mp).Write(file, JSON).Dispose();
+          else                      mp .Write(file, JSON); }
+
+        public static MsgPack Write(this MsgPack mp, string file, bool JSON = false)
         {
-            POF.Offsets.Sort();
-            long CurrentPOFOffset = 0;
-            long POFOffset = 0;
-            byte BitShift = (byte)(2 + POF.Type);
-            int Max1 = (0x00FF >> BitShift) << BitShift;
-            int Max2 = (0xFFFF >> BitShift) << BitShift;
-            POF.Length = 5 + ID;
-            for (int i = 0; i < POF.Offsets.Count; i++)
-            {
-                POFOffset = POF.Offsets[i] - CurrentPOFOffset;
-                CurrentPOFOffset = POF.Offsets[i];
-                     if (POFOffset <= Max1) POF.Length += 1;
-                else if (POFOffset <= Max2) POF.Length += 2;
-                else                        POF.Length += 4;
-                POF.Offsets[i] = POFOffset;
-            }
+            if (JSON) using (JSON IO = new JSON(File.OpenWriter(file + ".json", true))) IO.Write(mp, "\n", "  ");
+            else      using (  MP IO = new   MP(File.OpenWriter(file + ".json", true))) IO.Write(mp);
+            return mp;
+        }
 
-            long POFLengthAling = POF.Length.Align(16);
-            POF.Header = new Header { DataSize = (int)POFLengthAling, ID = ID, Format = Main.Format.F2LE,
-                Length = 0x20, SectionSize = (int)POFLengthAling, Signature = 0x30464F50 };
-            POF.Header.Signature += POF.Type << 24;
-            stream.Write(POF.Header);
+        public static void WriteAfterAll(this MsgPack mp, bool Temp, string file, bool JSON = false)
+        { if (Temp) MsgPack.New.Add(mp).WriteAfterAll(file, JSON).Dispose();
+          else                      mp .WriteAfterAll(file, JSON); }
 
-            stream.Write(POF.Length);
-            for (int i = 0; i < POF.Offsets.Count; i++)
-            {
-                POFOffset = POF.Offsets[i];
-                     if (POFOffset <= Max1) stream.Write      ((  byte)((1 <<  6) | (POFOffset >> BitShift)));
-                else if (POFOffset <= Max2) stream.WriteEndian((ushort)((2 << 14) | (POFOffset >> BitShift)), true);
-                else                        stream.WriteEndian((  uint)((3 << 30) | (POFOffset >> BitShift)), true);
-            }
-            stream.Write(0x00);
-            stream.Align(16, true);
-            stream.WriteEOFC(ID);
+        public static MsgPack WriteAfterAll(this MsgPack mp, string file, bool JSON = false)
+        {
+            byte[] data = null;
+            if (JSON) using (JSON IO = new JSON(File.OpenWriter())) { IO.Write(mp, true); data = IO.ToArray(); }
+            else      using (  MP IO = new   MP(File.OpenWriter())) { IO.Write(mp      ); data = IO.ToArray(); }
+            File.WriteAllBytes(file + (JSON ? ".json" : ".mp"), data);
+            return mp;
+        }
+
+        public static void ToJSON   (this string file) =>
+            file.ReadMP(    ).Write(file, true).Dispose();
+
+        public static void ToMsgPack(this string file) =>
+            file.ReadMP(true).Write(file      ).Dispose();
+    }
+
+    public static class IKFExt
+    {
+        public static IKF<float, float> Round(this IKF<float, float> KF, int d)
+        {
+                 if (KF is KFT0<float, float> KFT0) { KFT0.F = KFT0.F.Round(d);                   return KFT0; }
+            else if (KF is KFT1<float, float> KFT1) { KFT1.F = KFT1.F.Round(d);
+                KFT1.V = KFT1.V.Round(d);                                                         return KFT1; }
+            else if (KF is KFT2<float, float> KFT2) { KFT2.F = KFT2.F.Round(d);
+                KFT2.V = KFT2.V.Round(d); KFT2.T  = KFT2.T .Round(d);                             return KFT2; }
+            else if (KF is KFT3<float, float> KFT3) { KFT3.F = KFT3.F.Round(d);
+                KFT3.V = KFT3.V.Round(d); KFT3.T1 = KFT3.T1.Round(d); KFT3.T2 = KFT3.T2.Round(d); return KFT3; }
+            return   KF;
+        }
+
+        public static IKF<double, double> Round(this IKF<double, double> KF, int d)
+        {
+                 if (KF is KFT0<double, double> KFT0) { KFT0.F = KFT0.F.Round(d);                 return KFT0; }
+            else if (KF is KFT1<double, double> KFT1) { KFT1.F = KFT1.F.Round(d);
+                KFT1.V = KFT1.V.Round(d);                                                         return KFT1; }
+            else if (KF is KFT2<double, double> KFT2) { KFT2.F = KFT2.F.Round(d);
+                KFT2.V = KFT2.V.Round(d); KFT2.T  = KFT2.T .Round(d);                             return KFT2; }
+            else if (KF is KFT3<double, double> KFT3) { KFT3.F = KFT3.F.Round(d);
+                KFT3.V = KFT3.V.Round(d); KFT3.T1 = KFT3.T1.Round(d); KFT3.T2 = KFT3.T2.Round(d); return KFT3; }
+            return   KF;
         }
     }
-
-    public static class PointerExt
-    {
-        public static Pointer<T> ReadPointer<T>(this Stream IO) =>
-            new Pointer<T> { Offset = IO.ReadInt32() };
-
-        public static Pointer<string> ReadPointerString(this Stream IO)
-        { Pointer<string> val = IO.ReadPointer<string>();
-            val.Value = IO.ReadStringAtOffset(val.Offset); return val; }
-
-        public static CountPointer<T> ReadCountPointer<T>(this Stream IO) =>
-            new CountPointer<T> { Count = IO.ReadInt32(), Offset = IO.ReadInt32() };
-
-        public static Pointer<T> ReadPointerEndian<T>(this Stream IO) =>
-            new Pointer<T> { Offset = IO.ReadInt32Endian() };
-
-        public static Pointer<string> ReadPointerStringEndian(this Stream IO)
-        { Pointer<string> val = IO.ReadPointerEndian<string>();
-            val.Value = IO.ReadStringAtOffset(val.Offset); return val; }
-
-        public static CountPointer<T> ReadCountPointerEndian<T>(this Stream IO) =>
-            new CountPointer<T> { Count = IO.ReadInt32Endian(), Offset = IO.ReadInt32Endian() };
-
-        public static Pointer<T> ReadPointerX<T>(this Stream IO) =>
-            new Pointer<T> { Offset = (int)IO.ReadIntX() };
-
-        public static Pointer<string> ReadPointerStringX(this Stream IO)
-        { Pointer<string> val = IO.ReadPointerX<string>();
-            val.Value = IO.ReadStringAtOffset(val.Offset); return val; }
-
-        public static CountPointer<T> ReadCountPointerX<T>(this Stream IO) =>
-            new CountPointer<T> { Count = (int)IO.ReadIntX(), Offset = (int)IO.ReadIntX() };
-    }
 }

KKdMainLib/F2/Bloom.cs

@@ -0,0 +1,71 @@
+using KKdBaseLib;
+using KKdBaseLib.F2;
+using KKdMainLib.IO;
+
+namespace KKdMainLib.F2
+{
+    public struct Bloom
+    {
+        public CountPointer<BLT> BLTs;
+        private Stream IO;
+        private Header Header;
+        private int i;
+
+        public void BLTReader(string file)
+        {
+            BLTs = default;
+            IO = File.OpenReader(file + ".blt", true);
+            Header = IO.ReadHeader();
+            if (Header.Signature != 0x544D4C42 || Header.InnerSignature != 0x3) return;
+            IO.Position -= 0x4;
+
+            BLTs = IO.ReadCountPointerEndian<BLT>();
+            if (BLTs.Count < 1) { IO.Close(); BLTs.Count = -1; return; }
+
+            if (BLTs.Count > 0 && BLTs.Offset == 0) { IO.Close(); BLTs.Count = -1; return; }
+            /*{
+                IO.Format = Header.Format = Format.X;
+                IO.Offset = Header.Length;
+                IO.Position = BLTs.Offset;
+                BLTs = IO.ReadCountPointerX<BLT>();
+            }*/
+
+            IO.Position = BLTs.Offset;
+            for (i = 0; i < BLTs.Count; i++)
+            {
+                ref BLT BLT = ref BLTs.Entries[i];
+                IO.ReadInt32Endian();
+                BLT.Color     .X = IO.ReadSingleEndian();
+                BLT.Color     .Y = IO.ReadSingleEndian();
+                BLT.Color     .Z = IO.ReadSingleEndian();
+                BLT.Brightpass.X = IO.ReadSingleEndian();
+                BLT.Brightpass.Y = IO.ReadSingleEndian();
+                BLT.Brightpass.Z = IO.ReadSingleEndian();
+                BLT.Range        = IO.ReadSingleEndian();
+            }
+            IO.Close();
+        }
+
+        public void TXTWriter(string file)
+        {
+            if (BLTs.Count < 1) return;
+
+            IO = File.OpenWriter();
+            IO.WriteShiftJIS("ID,ColorR,ColorG,ColorB,BrightpassR,BrightpassG,BrightpassB,Range\n");
+            for (i = 0; i < BLTs.Count; i++)
+                IO.Write(i + "," + BLTs[i] + "\n");
+            File.WriteAllBytes(file + "_bloom.txt", IO.ToArray(true));
+        }
+
+        public struct BLT
+        {
+            public Vector3 Color;
+            public Vector3 Brightpass;
+            public float Range;
+
+            public override string ToString() => Color     .ToString(6) + "," +
+                                                 Brightpass.ToString(6) + "," +
+                                                 Range     .ToString(6);
+        }
+    }
+}

KKdMainLib/F2/ColorCorrection.cs

@@ -0,0 +1,79 @@
+using KKdBaseLib;
+using KKdBaseLib.F2;
+using KKdMainLib.IO;
+
+namespace KKdMainLib.F2
+{
+    public struct ColorCorrection
+    {
+        public CountPointer<CCT> CCTs;
+        private Stream IO;
+        private Header Header;
+        private int i;
+
+        public void CCTReader(string file)
+        {
+            CCTs = default;
+            IO = File.OpenReader(file + ".cct", true);
+            Header = IO.ReadHeader();
+            if (Header.Signature != 0x54524343 || Header.InnerSignature != 0x3) return;
+            IO.Position -= 0x4;
+
+            CCTs = IO.ReadCountPointerEndian<CCT>();
+            if (CCTs.Count < 1) { IO.Close(); CCTs.Count = -1; return; }
+
+            if (CCTs.Count > 0 && CCTs.Offset == 0) { IO.Close(); CCTs.Count = -1; return; }
+            /*{
+                IO.Format = Header.Format = Format.X;
+                IO.Offset = Header.Length;
+                IO.Position = CCTs.Offset;
+                CCTs = IO.ReadCountPointerX<CCT>();
+            }*/
+
+            IO.Position = CCTs.Offset;
+            for (i = 0; i < CCTs.Count; i++)
+            {
+                ref CCT CCT = ref CCTs.Entries[i];
+                IO.ReadInt32Endian();
+                CCT.Hue        = IO.ReadSingleEndian();
+                CCT.Saturation = IO.ReadSingleEndian();
+                CCT.Lightness  = IO.ReadSingleEndian();
+                CCT.Exposure   = IO.ReadSingleEndian();
+                CCT.Gamma.X    = IO.ReadSingleEndian();
+                CCT.Gamma.Y    = IO.ReadSingleEndian();
+                CCT.Gamma.Z    = IO.ReadSingleEndian();
+                CCT.Contrast   = IO.ReadSingleEndian();
+            }
+
+            IO.Close();
+        }
+
+        public void TXTWriter(string file)
+        {
+            if (CCTs.Count < 1) return;
+
+            IO = File.OpenWriter();
+            IO.WriteShiftJIS("ID,Hue,Saturation,Lightness,Exposure,GammaR,GammaG,GammaB,Contrast\n");
+            for (i = 0; i < CCTs.Count; i++)
+                IO.Write(i + "," + CCTs[i] + "\n");
+            File.WriteAllBytes(file + "_cc.txt", IO.ToArray(true));
+        }
+
+        public struct CCT
+        {
+            public float Hue;
+            public float Saturation;
+            public float Lightness;
+            public float Exposure;
+            public Vector3 Gamma;
+            public float Contrast;
+
+            public override string ToString() => Hue       .ToString(6) + "," +
+                                                 Saturation.ToString(6) + "," +
+                                                 Lightness .ToString(6) + "," +
+                                                 Exposure  .ToString(6) + "," +
+                                                 Gamma     .ToString(6) + "," +
+                                                 Contrast  .ToString(6);
+        }
+    }
+}

KKdMainLib/F2/DOF.cs

@@ -0,0 +1,75 @@
+using KKdBaseLib;
+using KKdBaseLib.F2;
+using KKdMainLib.IO;
+
+namespace KKdMainLib.F2
+{
+    public struct DOF
+    {
+        public CountPointer<DFT> DFTs;
+        private Stream IO;
+        private Header Header;
+        private int i;
+
+        public void DFTReader(string file)
+        {
+            DFTs = default;
+            IO = File.OpenReader(file + ".dft", true);
+            Header = IO.ReadHeader();
+            if (Header.Signature != 0x54464F44 || Header.InnerSignature != 0x3) return;
+            IO.Position -= 0x4;
+
+            DFTs = IO.ReadCountPointerEndian<DFT>();
+            if (DFTs.Count < 1) { IO.Close(); DFTs.Count = -1; return; }
+
+            if (DFTs.Count > 0 && DFTs.Offset == 0) { IO.Close(); DFTs.Count = -1; return; }
+            /*{
+                IO.Format = Header.Format = Format.X;
+                IO.Offset = Header.Length;
+                IO.Position = DFTs.Offset;
+                DFTs = IO.ReadCountPointerX<DFT>();
+            }*/
+
+            IO.Position = DFTs.Offset;
+            for (i = 0; i < DFTs.Count; i++)
+            {
+                ref DFT DFT = ref DFTs.Entries[i];
+                IO.ReadInt32Endian();
+                DFT.  Focus      = IO.ReadSingleEndian();
+                DFT.  FocusRange = IO.ReadSingleEndian();
+                DFT.FuzzingRange = IO.ReadSingleEndian();
+                DFT.Ratio        = IO.ReadSingleEndian();
+                DFT.Quality      = IO.ReadSingleEndian();
+                if (IO.IsX) IO.ReadInt32();
+            }
+
+            IO.Close();
+        }
+
+        public void TXTWriter(string file)
+        {
+            if (DFTs.Count < 1) return;
+
+            IO = File.OpenWriter();
+            IO.WriteShiftJIS("ID,Focus,FocusRange,FuzzingRange,Ratio,Quality\n");
+            for (i = 0; i < DFTs.Count; i++)
+                IO.Write(i + "," + DFTs[i] + "\n");
+            File.WriteAllBytes(file + "_dof.txt", IO.ToArray(true));
+        }
+
+        public struct DFT
+        {
+            public float Focus;
+            public float FocusRange;
+            public float FuzzingRange;
+            public float Ratio;
+            public float Quality;
+
+            public override string ToString() =>   Focus     .ToString(6) + "," +
+                                                   FocusRange.ToString(6) + "," +
+                                                 FuzzingRange.ToString(6) + "," +
+                                                 Ratio       .ToString(6) + "," +
+                                                 Quality     .ToString(6);
+        }
+    }
+}

KKdMainLib/F2/Light.cs

@@ -0,0 +1,137 @@
+using KKdBaseLib;
+using KKdBaseLib.F2;
+using KKdMainLib.IO;
+
+namespace KKdMainLib.F2
+{
+    public struct Light
+    {
+        public CountPointer<CountPointer<LIT>> LITs;
+        private Stream IO;
+        private Header Header;
+        private int i, i0;
+
+        public void LITReader(string file)
+        {
+            LITs = default;
+            IO = File.OpenReader(file + ".lit", true);
+            Header = IO.ReadHeader();
+            if (Header.Signature != 0x4354494C || Header.InnerSignature != 0x2 ||
+                Header.SectionSignature != 0x2) return;
+
+            LITs = IO.ReadCountPointerEndian<CountPointer<LIT>>();
+            if (LITs.Count < 1) { IO.Close(); LITs.Count = -1; return; }
+
+            IO.Position = LITs.Offset;
+            for (i = 0; i < LITs.Count; i++)
+            {
+                LITs[i] = IO.ReadCountPointerX<LIT>();
+                if ((LITs[i].Count > 0 || LITs[i].Offset == 0) && !IO.IsX) { IO.Close(); LITs.Count = -1; return; }
+                /*{
+                    IO.Format = Header.Format = Format.X;
+                    IO.Offset = Header.Length;
+                    IO.Position = LITs.Offset;
+                    LITs[i] = IO.ReadCountPointerX<LIT>();
+                }
+                if (IO.IsX) IO.ReadInt64();*/
+            }
+
+            for (i = 0; i < LITs.Count; i++)
+            {
+                IO.Position = LITs[i].Offset;
+                for (i0 = 0; i0 < LITs[i].Count; i0++)
+                {
+                    ref LIT LIT = ref LITs.Entries[i].Entries[i0];
+                    LIT.Id    = (Id   )IO.ReadInt32Endian();
+                    LIT.Flags = (Flags)IO.ReadInt32Endian();
+                    LIT.Type  = (Type )IO.ReadInt32Endian();
+                    if (IO.IsX) { IO.ReadInt64(); IO.ReadInt64(); IO.ReadInt64(); }
+                    LIT.Ambient  .X = IO.ReadSingleEndian();
+                    LIT.Ambient  .Y = IO.ReadSingleEndian();
+                    LIT.Ambient  .Z = IO.ReadSingleEndian();
+                    LIT.Ambient  .W = IO.ReadSingleEndian();
+                    LIT.Diffuse  .X = IO.ReadSingleEndian();
+                    LIT.Diffuse  .Y = IO.ReadSingleEndian();
+                    LIT.Diffuse  .Z = IO.ReadSingleEndian();
+                    LIT.Diffuse  .W = IO.ReadSingleEndian();
+                    LIT.Specular .X = IO.ReadSingleEndian();
+                    LIT.Specular .Y = IO.ReadSingleEndian();
+                    LIT.Specular .Z = IO.ReadSingleEndian();
+                    LIT.Specular .W = IO.ReadSingleEndian();
+                    LIT.Position .X = IO.ReadSingleEndian();
+                    LIT.Position .Y = IO.ReadSingleEndian();
+                    LIT.Position .Z = IO.ReadSingleEndian();
+                    LIT.ToneCurve.X = IO.ReadSingleEndian();
+                    LIT.ToneCurve.Y = IO.ReadSingleEndian();
+                    LIT.ToneCurve.Z = IO.ReadSingleEndian();
+                    if (IO.IsX) { IO.ReadInt64(); IO.ReadInt64(); IO.ReadInt64();
+                                  IO.ReadInt64(); IO.ReadInt64(); IO.ReadInt32(); }
+                }
+            }
+            IO.Close();
+        }
+
+        public void TXTWriter(string file)
+        {
+            i = 0;
+            if (LITs.Count < 1) return;
+
+            IO = File.OpenWriter();
+            IO.WriteShiftJIS("Type,AmbientR,AmbientG,AmbientB,DiffuseR,DiffuseG,DiffuseB,SpecularR,SpecularG," +
+                "SpecularB,SpecularA,PosX,PosY,PosZ,ToneCurveBegin,ToneCurveEnd,ToneCurveBlendRate," +
+                (file.EndsWith("_chara") ? "コメント" : "ID") + "\n");
+            for (i0 = 0; i0 < LITs[i].Count; i0++)
+                IO.Write(LITs[i][i0] + "," + i + "\n");
+            File.WriteAllBytes(file + "_light.txt", IO.ToArray(true));
+        }
+
+        public struct LIT
+        {
+            public Id Id;
+            public Flags Flags;
+            public Type Type;
+            public Vector4 Ambient;
+            public Vector4 Diffuse;
+            public Vector4 Specular;
+            public Vector3 Position;
+            public Vector3 ToneCurve;
+
+            public override string ToString() => Flags == 0 ? ",,,,,,,,,,,,,,,," : Type + "," +  
+                ((Flags & Flags.Ambient  ) == 0 ? ",,,"  : Ambient  .ToString(6) + ",") +
+                ((Flags & Flags.Diffuse  ) == 0 ? ",,,"  : Diffuse  .ToString(6) + ",") +
+                ((Flags & Flags.Specular ) == 0 ? ",,,," : Specular .ToString(6) + ",") +
+                ((Flags & Flags.Position ) == 0 ? ",,,"  : Position .ToString(6) + ",") +
+                ((Flags & Flags.ToneCurve) == 0 ? ",,,"  : ToneCurve.ToString(6));
+        }
+
+        public enum Id : int
+        {
+            CHARA       = 0,
+            STAGE       = 1,
+            SUN         = 2,
+            REFLECT     = 3,
+            SHADOW      = 4,
+            CHARA_COLOR = 5,
+            CHARA_F     = 6,
+            PROJECTION  = 7,
+        }
+
+        public enum Type : int
+        {
+            OFF      = 0,
+            PARALLEL = 1,
+            POINT    = 2,
+            SPOT     = 3,
+        }
+
+        public enum Flags : int
+        {
+            Type      = 0b0000000001,
+            Ambient   = 0b0000000010,
+            Diffuse   = 0b0000000100,
+            Specular  = 0b0000001000,
+            Position  = 0b0000010000,
+            ToneCurve = 0b1000000000,
+        }
+    }
+}

KKdMainLib/F2nd/POF.cs

@@ -1,14 +0,0 @@
-using System.Collections.Generic;
-
-namespace KKdMainLib.F2nd
-{
-    public struct POF
-    {
-        public byte Type;
-        public int Length;
-        public int Offset;
-        public int LastOffset;
-        public List<long> Offsets;
-        public Header Header;
-    }
-}

KKdMainLib/F2nd/Struct.cs

@@ -1,87 +0,0 @@
-using KKdBaseLib;
-using KKdMainLib.IO;
-
-namespace KKdMainLib.F2nd
-{
-    public struct Struct
-    {
-        public Header Header;
-        public byte[] Data;
-        public Struct[] SubStructs;
-        public bool HasEOFC;
-        public Mini POF;
-        public Mini ENRS;
-
-        public long DataOffset;
-
-        public override string ToString() => Header.ToString() + (SubStructs != null ? "; SubStructs: " +
-            SubStructs.Length : "") + (POF != null ? "; Has " + POF.Header.ToString() : "") +
-            (ENRS != null ? "; Has ENRS" : "") + (HasEOFC ? "; Has EOFC" : "");
-
-        public static Struct ReadStruct(byte[] Data)
-        {
-            Stream stream = File.OpenReader(Data);
-            Struct Struct = ReadStruct(ref stream, stream.ReadHeader(false));
-            stream.Close();
-            return Struct;
-        }
-
-        private static Struct ReadStruct(ref Stream stream, Header Header)
-        {
-            Struct Struct = new Struct { Header = Header, DataOffset =
-                stream.Position, Data = stream.ReadBytes(Header.SectionSize) };
-            int ID = Header.ID;
-
-            KKdList<Struct> SubStructs = KKdList<Struct>.New;
-            long Length = stream.Length - stream.Position;
-            long Position = 0;
-            while (Length > Position)
-            {
-                Header = stream.ReadHeader(false);
-                Position += Header.Length + Header.DataSize;
-                if (Header.ID == ID && Header.Signature == 0x43464F45)
-                { Struct.HasEOFC = true; break; }
-                else if (Header.ID == 0 && Header.Signature == 0x53524E45)
-                    SubStructs.Add(new Struct { Header = Header, DataOffset =
-                        stream.Position, Data = stream.ReadBytes(Header.SectionSize) });
-                else if (Header.ID <= ID)
-                { stream.LongPosition -= Header.Length; break; }
-                else SubStructs.Add(ReadStruct(ref stream, Header));
-                //(Header.Signature == 0x30464F50 || Header.Signature ==
-                //    0x31464F50 || Header.Signature == 0x53524E45)
-            }
-
-            for (int i = 0; i < SubStructs.Capacity; i++)
-            {
-                string Sig = SubStructs[i].Header.ToString();
-                if (Sig == "ENRS" || Sig == "POF0" || Sig == "POF1")
-                {
-                    if (Sig == "ENRS") Struct.ENRS = (Mini)SubStructs[i];
-                    else               Struct.POF  = (Mini)SubStructs[i];
-                    SubStructs.RemoveAt(i); SubStructs.Capacity--; i--;
-                }
-            }
-
-            if (SubStructs.Capacity > 0)
-            {
-                Struct.SubStructs = SubStructs.ToArray();
-            }
-            return Struct;
-        }
-
-        public class Mini
-        {
-            public Header Header;
-            public byte[] Data;
-            public bool HasEOFC;
-
-            public static explicit operator   Mini(Struct Struct) =>
-                new   Mini() { Header = Struct.Header, Data = Struct.Data, HasEOFC = Struct.HasEOFC };
-
-            public static explicit operator Struct(  Mini Struct) =>
-                new Struct() { Header = Struct.Header, Data = Struct.Data, HasEOFC = Struct.HasEOFC };
-
-            public override string ToString() => Header.ToString() + (HasEOFC ? "; Has EOFC" : "");
-        }
-    }
-}

KKdMainLib/FARC.cs

@@ -8,7 +8,7 @@ using MSIO = System.IO;
 
 namespace KKdMainLib
 {
-    public class FARC
+    public class FARC : System.IDisposable
     {
         public FARC() => NewFARC();
         public FARC(string File, bool IsDirectory = false)
@@ -29,13 +29,10 @@ namespace KKdMainLib
         private readonly byte[] KeyFT = { 0x13, 0x72, 0xD5, 0x7B, 0x6E, 0x9E,
             0x31, 0xEB, 0xA2, 0x39, 0xB8, 0x3C, 0x15, 0x57, 0xC6, 0xBB };
 
-        AesManaged GetAes(bool isFT, byte[] iv)
-        {
-            AesManaged AesManaged = new AesManaged { KeySize = 128, Key = isFT ? KeyFT : Key,
+        AesManaged GetAes(bool isFT, byte[] iv) =>
+            new AesManaged { KeySize = 128, Key = isFT ? KeyFT : Key,
                 BlockSize = 128, Mode = isFT ? CipherMode.CBC : CipherMode.ECB,
                 Padding = PaddingMode.Zeros, IV = iv ?? new byte[16] };
-            return AesManaged;
-        }
         
         public void UnPack(bool SaveToDisk = true)
         { if (HeaderReader()) { FileReader(); if (SaveToDisk) this.SaveToDisk(); } }
@@ -68,8 +65,9 @@ namespace KKdMainLib
                     MSIO.FileStream stream = new MSIO.FileStream(FilePath, MSIO.FileMode.Open,
                        MSIO.FileAccess.ReadWrite, MSIO.FileShare.ReadWrite) { Position = 0x10 };
 
+                    using (AesManaged aes = GetAes(true, null))
                     using (CryptoStream cryptoStream = new CryptoStream(stream,
-                        GetAes(true, null).CreateDecryptor(), CryptoStreamMode.Read))
+                        aes.CreateDecryptor(), CryptoStreamMode.Read))
                         cryptoStream.Read(Header, 0x00, HeaderLength - 0x08);
                     Header = SkipData(Header, 0x10);
                     reader = File.OpenReader(Header);
@@ -127,8 +125,8 @@ namespace KKdMainLib
                 if (Signature == Farc.FArC)
                     using (MSIO.MemoryStream memorystream = new MSIO.MemoryStream(
                         File.ReadAllBytes(FilePath, Files[i].SizeComp, Files[i].Offset)))
+                    using (GZipStream gZipStream = new GZipStream(memorystream, CompressionMode.Decompress))
                     {
-                        GZipStream gZipStream = new GZipStream(memorystream, CompressionMode.Decompress);
                         Files[i].Data = new byte[Files[i].SizeUnc];
                         gZipStream.Read(Files[i].Data, 0, Files[i].SizeUnc);
                     }
@@ -148,14 +146,16 @@ namespace KKdMainLib
             {
                 if ((FT && Files[i].Type.HasFlag(Type.ECB)) || CBC)
                 {
+                    using (AesManaged aes = GetAes(true, null))
                     using (CryptoStream cryptoStream = new CryptoStream(stream,
-                        GetAes(true, null).CreateDecryptor(), CryptoStreamMode.Read))
+                        aes.CreateDecryptor(), CryptoStreamMode.Read))
                         cryptoStream.Read(Files[i].Data, 0, FileSize);
                     Files[i].Data = SkipData(Files[i].Data, 0x10);
                 }
                 else
+                    using (AesManaged aes = GetAes(false, null))
                     using (CryptoStream cryptoStream = new CryptoStream(stream,
-                        GetAes(false, null).CreateDecryptor(), CryptoStreamMode.Read))
+                        aes.CreateDecryptor(), CryptoStreamMode.Read))
                         cryptoStream.Read(Files[i].Data, 0, FileSize);
                 Encrypted = true;
             }
@@ -164,14 +164,12 @@ namespace KKdMainLib
             if (((FT && Files[i].Type.HasFlag(Type.GZip)) ||
                 FARCType.HasFlag(Type.GZip)) && Files[i].SizeUnc > 0)
             {
-                GZipStream gZipStream;
-                if (Encrypted) { gZipStream = new GZipStream(new MSIO.MemoryStream(Files[i].Data),
-                    CompressionMode.Decompress); stream.Close(); }
-                else gZipStream = new GZipStream(stream, CompressionMode.Decompress);
+                GZipStream gZipStream = new GZipStream(Encrypted ? new MSIO.MemoryStream(Files[i].Data) :
+                    (MSIO.Stream)stream, CompressionMode.Decompress);
                 byte[] Temp = new byte[Files[i].SizeUnc];
                 gZipStream.Read(Temp, 0, Files[i].SizeUnc);
                 Files[i].Data = Temp;
-
+                gZipStream.Dispose();
                 Compressed = true;
             }
 
@@ -179,8 +177,8 @@ namespace KKdMainLib
             {
                 Files[i].Data = new byte[Files[i].SizeUnc];
                 stream.Read(Files[i].Data, 0, Files[i].SizeUnc);
-                stream.Close();
             }
+            stream.Dispose();
             return Files[i].Data;
         }
 
@@ -221,29 +219,30 @@ namespace KKdMainLib
             for (int i = 0; i < Files.Length; i++)
             {
                 string ext = Path.GetExtension(Files[i].Name).ToLower();
-                if (ext == ".a3da" || ext == ".diva" || ext == ".drs" || ext == ".dve" || ext == ".vag")
+                if (ext == ".a3da" || ext == ".diva" || ext == ".vag")
                 { Signature = Farc.FArc; break; }
             }
 
             Stream writer = File.OpenWriter(DirectoryPath + ".farc", true);
             writer.WriteEndian((int)Signature, true);
 
-            Stream HeaderWriter = File.OpenWriter();
-                 if (Signature == Farc.FArc) HeaderWriter.WriteEndian(0x20, true);
-            else if (Signature == Farc.FArC) HeaderWriter.WriteEndian(0x10, true);
-            else if (Signature == Farc.FARC)
+            using (Stream HeaderWriter = File.OpenWriter())
             {
-                HeaderWriter.WriteEndian((int)FARCType, true);
-                HeaderWriter.Write      (0x00);
-                HeaderWriter.WriteEndian(0x40, true);
-                HeaderWriter.Write      (0x00);
+                     if (Signature == Farc.FArc) HeaderWriter.WriteEndian(0x20, true);
+                else if (Signature == Farc.FArC) HeaderWriter.WriteEndian(0x10, true);
+                else if (Signature == Farc.FARC)
+                {
+                    HeaderWriter.WriteEndian((int)FARCType, true);
+                    HeaderWriter.Write      (0x00);
+                    HeaderWriter.WriteEndian(0x40, true);
+                    HeaderWriter.Write      (0x00);
+                }
+                int HeaderPartLength = Signature == Farc.FArc ? 0x09 : 0x0D;
+                for (int i = 0; i < Files.Length; i++)
+                    HeaderWriter.Length += Path.GetFileName(Files[i].Name).Length + HeaderPartLength;
+                writer.WriteEndian(HeaderWriter.Length, true);
+                writer.Write(HeaderWriter.ToArray(true));
             }
-            int HeaderPartLength = Signature == Farc.FArc ? 0x09 : 0x0D;
-            for (int i = 0; i < Files.Length; i++)
-                HeaderWriter.Length += Path.GetFileName(Files[i].Name).Length + HeaderPartLength;
-            writer.WriteEndian(HeaderWriter.Length, true);
-            writer.Write(HeaderWriter.ToArray(true));
-            HeaderWriter = null;
 
             int Align = writer.Position.Align(0x10) - writer.Position;
             for (int i1 = 0; i1 < Align; i1++)
@@ -305,12 +304,15 @@ namespace KKdMainLib
         private byte[] Encrypt(byte[] Data, bool isFT)
         {
             MSIO.MemoryStream stream = new MSIO.MemoryStream();
+            using (AesManaged aes = GetAes(isFT, null))
             using (CryptoStream cryptoStream = new CryptoStream(stream,
-                GetAes(isFT, null).CreateEncryptor(), CryptoStreamMode.Write))
+                aes.CreateEncryptor(), CryptoStreamMode.Write))
                 cryptoStream.Write(Data, 0, Data.Length);
             return stream.ToArray();
         }
 
+        public void Dispose() => NewFARC();
+
         public struct FARCFile
         {
             public int Offset;

KKdMainLib/IO/Directory.cs

@@ -1,5 +1,4 @@
-using System;
-using MSIO = System.IO;
+using MSIO = System.IO;
 
 namespace KKdMainLib.IO
 {

KKdMainLib/IO/Extensions.cs

@@ -0,0 +1,150 @@
+using KKdBaseLib;
+using KKdBaseLib.F2;
+
+namespace KKdMainLib.IO
+{
+    public static class Extensions
+    {
+        public static string NullTerminatedASCII(this Stream stream, byte End = 0) =>
+            stream.NullTerminated(End).ToASCII();
+        public static string NullTerminatedUTF8 (this Stream stream, byte End = 0) =>
+            stream.NullTerminated(End).ToUTF8 ();
+        public static byte[] NullTerminated     (this Stream stream, byte End = 0)
+        {
+            KKdList<byte> s = KKdList<byte>.New;
+            while (stream.LongPosition < stream.LongLength)
+            {
+                byte a = stream.ReadByte();
+                if (a == End) break;
+                else s.Add(a);
+            }
+            return s.ToArray();
+        }
+        
+        public static byte PeekByte     (this Stream stream)
+        { byte val = stream.ReadByte(); stream.LongPosition--; return       val; }
+        public static char PeekCharASCII(this Stream stream)
+        { byte val = stream.ReadByte(); stream.LongPosition--; return (char)val; }
+        public static char PeekCharUTF8 (this Stream stream)
+        {   long LongPosition = stream.LongPosition;   char val = stream.ReadCharUTF8();
+          stream.LongPosition =        LongPosition; return val; }
+
+        public static Stream SkipWhitespace(this Stream stream)
+        {
+            while (true)
+                if (char.IsWhiteSpace(stream.PeekCharUTF8())) stream.ReadCharUTF8();
+                else break;
+            return stream;
+        }
+
+		public static bool Assert(this Stream stream, byte next)
+		{ if (stream.PeekByte() == next) { stream.PeekByte(); return true; } else return false; }
+		public static bool Assert(this Stream stream, byte[] next)
+		{
+            for (var i = 0; i < next.Length; i++)
+                if (!stream.Assert(next[i])) return false;
+            return true;
+		}
+        
+		public static bool AssertASCII(this Stream stream, char next)
+		{ if (stream.PeekCharUTF8() == next) { stream.ReadCharUTF8(); return true; } else return false; }
+		public static bool AssertASCII(this Stream stream, string next)
+		{
+            for (var i = 0; i < next.Length; i++)
+                if (!stream.AssertASCII(next[i])) return false;
+            return true;
+		}
+
+		public static bool Assert(this Stream stream, char next)
+		{ if (stream.PeekCharUTF8() == next) { stream.ReadCharUTF8(); return true; } else return false; }
+		public static bool Assert(this Stream stream, string next)
+		{
+            for (var i = 0; i < next.Length; i++)
+                if (!stream.Assert(next[i])) return false;
+            return true;
+		}
+
+        public static long ReadIntX(this Stream stream           ) => stream.IsX ?
+            stream.ReadInt64() : stream.ReadUInt32Endian(    );
+        public static long ReadIntX(this Stream stream, bool IsBE) => stream.IsX ?
+            stream.ReadInt64() : stream.ReadUInt32Endian(IsBE);
+
+        public static void WriteX(this Stream stream, long val, ref POF POF)
+        {   if (stream.IsX) stream.Write      (     val);
+            else            stream.WriteEndian((int)val);       POF.Offsets.Add(stream.Position); }
+        public static void WriteX(this Stream stream, long val, ref POF POF, bool IsBE)
+        {   if (stream.IsX) stream.Write      (     val      );
+            else            stream.WriteEndian((int)val, IsBE); POF.Offsets.Add(stream.Position); }
+
+        public static void WriteX(this Stream stream, long val)
+        {   if (stream.IsX) stream.Write      (     val);
+            else            stream.WriteEndian((int)val);       }
+        public static void WriteX(this Stream stream, long val, bool IsBE)
+        {   if (stream.IsX) stream.Write      (     val      );
+            else            stream.WriteEndian((int)val, IsBE); }
+
+        public static byte[] ReadAtOffset(this Stream stream, long Offset = -1, long Length = -1)
+        {
+            byte[] arr = null;
+            long Position = stream.LongPosition;
+            if (Offset == -1) { Position += stream.IsX ? 8 : 4; Offset = stream.ReadIntX(); }
+            stream.LongPosition = Offset;
+            if (Length == -1) arr = stream.NullTerminated();
+            else              arr = stream.ReadBytes(Length);
+            stream.LongPosition = Position;
+            return arr;
+        }
+
+        public static string ReadStringAtOffset(this Stream stream, long Offset = -1, long Length = -1)
+        {
+            string s = null;
+            long Position = stream.LongPosition;
+            if (Offset == -1) { Position += stream.IsX ? 8 : 4; Offset = stream.ReadIntX(); }
+            stream.LongPosition = Offset;
+            if (Length == -1) s = stream.NullTerminatedUTF8();
+            else              s = stream.ReadStringUTF8(Length);
+            stream.LongPosition = Position;
+            return s;
+        }
+
+        public static Pointer<string> ReadPointerStringShiftJIS(this Stream stream)
+        { Pointer<string> val = stream.ReadPointer<string>();
+            val.Value = stream.ReadStringShiftJISAtOffset(val.Offset); return val; }
+
+        public static string ReadStringShiftJISAtOffset(this Stream stream, long Offset = 0, long Length = 0) =>
+            Text.ShiftJIS.GetString(stream.ReadAtOffset(Offset, Length));
+
+        public static void WriteShiftJIS(this Stream stream, string String) =>
+            stream.Write(Text.ShiftJIS.GetBytes(String));
+        
+        public static Pointer<T> ReadPointer<T>(this Stream stream) =>
+            new Pointer<T> { Offset = stream.ReadInt32() };
+
+        public static Pointer<string> ReadPointerString(this Stream stream)
+        { Pointer<string> val = stream.ReadPointer<string>();
+            val.Value = stream.ReadStringAtOffset(val.Offset); return val; }
+
+        public static CountPointer<T> ReadCountPointer<T>(this Stream stream) =>
+            new CountPointer<T> { Count = stream.ReadInt32(), Offset = stream.ReadInt32() };
+
+        public static Pointer<T> ReadPointerEndian<T>(this Stream stream) =>
+            new Pointer<T> { Offset = stream.ReadInt32Endian() };
+
+        public static Pointer<string> ReadPointerStringEndian(this Stream stream)
+        { Pointer<string> val = stream.ReadPointerEndian<string>();
+            val.Value = stream.ReadStringAtOffset(val.Offset); return val; }
+
+        public static CountPointer<T> ReadCountPointerEndian<T>(this Stream stream) =>
+            new CountPointer<T> { Count = stream.ReadInt32Endian(), Offset = stream.ReadInt32Endian() };
+
+        public static Pointer<T> ReadPointerX<T>(this Stream stream) =>
+            new Pointer<T> { Offset = (int)stream.ReadIntX() };
+
+        public static Pointer<string> ReadPointerStringX(this Stream stream)
+        { Pointer<string> val = stream.ReadPointerX<string>();
+            val.Value = stream.ReadStringAtOffset(val.Offset); return val; }
+
+        public static CountPointer<T> ReadCountPointerX<T>(this Stream stream) =>
+            new CountPointer<T> { Count = (int)stream.ReadIntX(), Offset = (int)stream.ReadIntX() };
+    }
+}

KKdMainLib/IO/File.cs

@@ -9,7 +9,8 @@ namespace KKdMainLib.IO
         public static Stream OpenWriter(           ) => new Stream(new MSIO.MemoryStream(    ));
 
         public static Stream OpenReader(string file, bool ReadAllAtOnce)
-        { Stream IO = OpenReader(file); if (ReadAllAtOnce) return OpenReader(IO.ToArray(true)); return IO; }
+        { Stream IO = OpenReader(file); if (ReadAllAtOnce) { byte[] data =
+                    IO.ToArray(); IO.Close(); return OpenReader(data); } return IO; }
         public static Stream OpenReader(string file)
         { Stream IO = new Stream(new MSIO.FileStream(file, MSIO.FileMode.Open, MSIO.FileAccess.ReadWrite,
               MSIO.FileShare.ReadWrite)) { File = file }; return IO; }

KKdMainLib/IO/IOExtensions.cs

@@ -1,87 +0,0 @@
-using KKdBaseLib;
-
-namespace KKdMainLib.IO
-{
-    public static class IOExtensions
-    {
-        public static string NullTerminatedASCII(this Stream stream, byte End = 0) =>
-            stream.NullTerminated(End).ToASCII();
-        public static string NullTerminatedUTF8 (this Stream stream, byte End = 0) =>
-            stream.NullTerminated(End).ToUTF8 ();
-        public static byte[] NullTerminated     (this Stream stream, byte End = 0)
-        {
-            KKdList<byte> s = KKdList<byte>.New;
-            while (stream.LongPosition < stream.LongLength)
-            {
-                byte a = stream.ReadByte();
-                if (a == End) break;
-                else s.Add(a);
-            }
-            return s.ToArray();
-        }
-        public static char PeekCharUTF8(this Stream stream)
-        {   long LongPosition = stream.LongPosition;   char val = stream.ReadCharUTF8();
-          stream.LongPosition =        LongPosition; return val; }
-        public static Stream SkipWhitespace(this Stream stream)
-        {
-            while (true)
-                if (char.IsWhiteSpace(stream.PeekCharUTF8())) stream.ReadCharUTF8();
-                else break;
-            return stream;
-        }
-		public static bool Assert(this Stream stream, char next)
-		{ if (stream.PeekCharUTF8() == next) { stream.ReadCharUTF8(); return true; } else return false; }
-		public static bool Assert(this Stream stream, string next)
-		{
-            for (var i = 0; i < next.Length; i++)
-                if (!stream.Assert(next[i])) return false;
-            return true;
-		}
-
-        public static long ReadIntX(this Stream stream           ) => stream.IsX ?
-            stream.ReadInt64() : stream.ReadUInt32Endian(    );
-        public static long ReadIntX(this Stream stream, bool IsBE) => stream.IsX ?
-            stream.ReadInt64() : stream.ReadUInt32Endian(IsBE);
-
-        public static void WriteX(this Stream stream, long val)
-        {   if (stream.IsX) stream.Write      (     val);
-            else            stream.WriteEndian((int)val);       }
-        public static void WriteX(this Stream stream, long val, bool IsBE)
-        {   if (stream.IsX) stream.Write      (     val      );
-            else            stream.WriteEndian((int)val, IsBE); }
-
-        public static byte[] ReadAtOffset(this Stream stream, long Offset = 0, long Length = 0)
-        {
-            byte[] arr = null;
-            long Position = stream.LongPosition;
-            if (Offset == 0) { Position += stream.IsX ? 8 : 4; Offset = stream.ReadIntX(); }
-            stream.LongPosition = Offset;
-            if (Length == 0) arr = stream.NullTerminated();
-            else             arr = stream.ReadBytes(Length);
-            stream.LongPosition = Position;
-            return arr;
-        }
-
-        public static string ReadStringAtOffset(this Stream stream, long Offset = 0, long Length = 0)
-        {
-            string s = null;
-            long Position = stream.LongPosition;
-            if (Offset == 0) { Position += stream.IsX ? 8 : 4; Offset = stream.ReadIntX(); }
-            stream.LongPosition = Offset;
-            if (Length == 0) s = stream.NullTerminatedUTF8();
-            else             s = stream.ReadStringUTF8(Length);
-            stream.LongPosition = Position;
-            return s;
-        }
-
-        public static Pointer<string> ReadPointerStringShiftJIS(this Stream IO)
-        { Pointer<string> val = IO.ReadPointer<string>();
-            val.Value = IO.ReadStringShiftJISAtOffset(val.Offset); return val; }
-
-        public static string ReadStringShiftJISAtOffset(this Stream IO, long Offset = 0, long Length = 0) =>
-            Text.ShiftJIS.GetString(IO.ReadAtOffset(Offset, Length));
-
-        public static void WriteShiftJIS(this Stream IO, string String) =>
-            IO.Write(Text.ShiftJIS.GetBytes(String));
-    }
-}

KKdMainLib/IO/JSON.cs

@@ -1,16 +1,15 @@
 //Original or reader part: https://github.com/MarcosLopezC/LightJson/
 
 using KKdBaseLib;
-using KKdMainLib.IO;
+using BaseExtensions = KKdBaseLib.Extensions;
 
-namespace KKdMainLib.MessagePack
+namespace KKdMainLib.IO
 {
-    public class JSONIO
+    public struct JSON : System.IDisposable
     {
-        public Stream _IO;
+        public JSON(Stream IO) => _IO = IO;
 
-        public JSONIO(         ) => _IO = File.OpenWriter();
-        public JSONIO(Stream IO) => _IO = IO;
+        private Stream _IO;
 
         public void Close() => _IO.Close();
 
@@ -66,7 +65,8 @@ namespace KKdMainLib.MessagePack
 					}
 				}
 				else if (c == '"') break;
-				else if (char.IsControl(c)) return null;
+				else if (char.IsControl(c))
+                    return null;
                 else s += c;
 			}
 
@@ -83,7 +83,8 @@ namespace KKdMainLib.MessagePack
         {
             KKdList<MsgPack> Obj = KKdList<MsgPack>.New;
             if (!_IO.Assert('{')) return KKdList<MsgPack>.Null;
-			if (_IO.SkipWhitespace().PeekCharUTF8() == '}') { _IO.ReadCharUTF8(); return KKdList<MsgPack>.Null; }
+			if (_IO.SkipWhitespace().PeekCharUTF8() == '}')
+            { _IO.ReadCharUTF8(); return KKdList<MsgPack>.Null; }
 
             string key;
             char c;
@@ -110,7 +111,8 @@ namespace KKdMainLib.MessagePack
         {
             KKdList<MsgPack> Obj = KKdList<MsgPack>.New;
             if (!_IO.Assert('[')) return null;
-            if (_IO.SkipWhitespace().PeekCharUTF8() == ']') { _IO.ReadCharUTF8(); return null; }
+            if (_IO.SkipWhitespace().PeekCharUTF8() == ']')
+            { _IO.ReadCharUTF8(); return null; }
 
             char c;
             while (true)
@@ -171,19 +173,19 @@ namespace KKdMainLib.MessagePack
         { string s = ""; while (char.IsDigit(_IO.SkipWhitespace().
             PeekCharUTF8())) s += _IO.ReadCharUTF8(); return s; }
 
-        public JSONIO Write(MsgPack MsgPack, string End = "\n", string TabChar = "  ")
-        { Write(MsgPack, End, TabChar, "", true); return this; }
+        public JSON Write(MsgPack MsgPack, string End = "\n", string TabChar = "  ") =>
+            Write(MsgPack, End, TabChar, "", true);
 
-        public JSONIO Write(MsgPack MsgPack, bool Style = false)
-        { Write(MsgPack, "\n", "  ", "", Style); return this; }
+        public JSON Write(MsgPack MsgPack, bool Style = false) =>
+                Write(MsgPack, "\n", "  ", "", Style);
 
-        private JSONIO Write(MsgPack MsgPack, string End, string TabChar, string Tab, bool Style, bool IsArray = false)
+        private JSON Write(MsgPack MsgPack, string End, string TabChar, string Tab, bool Style, bool IsArray = false)
         {
             string OldTab = Tab;
             Tab += TabChar;
             if (MsgPack.Name   != null && !IsArray) _IO.Write("\"" + MsgPack.Name + "\":" + (Style ? " " : ""));
             if (MsgPack.Object == null) { WriteNil(); return this; }
-            
+
             if (MsgPack.List.NotNull)
             {
                 WriteMap();
@@ -226,34 +228,15 @@ namespace KKdMainLib.MessagePack
                 if (Style) _IO.Write(OldTab);
                 WriteArr(true);
             }
-            else if (MsgPack.Object is MsgPack msg)
-                Write(msg, End, TabChar, Tab, Style);
-            else Write(MsgPack.Object, End, TabChar, Tab, Style);
+            else if (MsgPack.Object is MsgPack msg) Write(msg, End, TabChar, Tab, Style);
+            else if (MsgPack.Object is  string str) Write(str);
+            else _IO.Write(BaseExtensions.ToString(MsgPack.Object));
 
             return this;
         }
 
-        private void Write(object obj, string End, string TabChar, string Tab, bool Style)
-        {
-            if (obj == null) { WriteNil(); return; }
-            switch (obj)
-            {
-                case MsgPack val: Write(val, End, TabChar, Tab, Style); break;
-                case    bool val: Write(val); break;
-                case  string val: Write(val); break;
-                case   sbyte val: _IO.Write(Extensions.ToString(val)); break;
-                case    byte val: _IO.Write(Extensions.ToString(val)); break;
-                case   short val: _IO.Write(Extensions.ToString(val)); break;
-                case  ushort val: _IO.Write(Extensions.ToString(val)); break;
-                case     int val: _IO.Write(Extensions.ToString(val)); break;
-                case    uint val: _IO.Write(Extensions.ToString(val)); break;
-                case    long val: _IO.Write(Extensions.ToString(val)); break;
-                case   ulong val: _IO.Write(Extensions.ToString(val)); break;
-                case   float val: _IO.Write(Extensions.ToString(val)); break;
-                case  double val: _IO.Write(Extensions.ToString(val)); break;
-            }
-        }
-        private void Write(  bool val) => _IO.Write(val ? "true" : "false");
+        public void Dispose() => _IO.Close();
+
         private void Write(string val) => _IO.Write("\"" + val
             .Replace("\\", "\\\\").Replace("/" , "\\/").Replace("\"", "\\\"")
             .Replace("\0", "\\0" ).Replace("\b", "\\b").Replace("\f", "\\f" )

KKdMainLib/IO/MP.cs

@@ -1,15 +1,12 @@
-using System;
-using KKdBaseLib;
-using KKdMainLib.IO;
+using KKdBaseLib;
 
-namespace KKdMainLib.MessagePack
+namespace KKdMainLib.IO
 {
-    public class IO
+    public struct MP : System.IDisposable
     {
-        public Stream _IO;
+        public MP(Stream IO) => _IO = IO;
 
-        public IO(         ) => _IO = File.OpenWriter();
-        public IO(Stream IO) => _IO = IO;
+        private Stream _IO;
 
         public void Close() => _IO.Close();
 
@@ -19,50 +16,37 @@ namespace KKdMainLib.MessagePack
         {
             MsgPack MsgPack = MsgPack.New;
             byte Unk = _IO.ReadByte();
+            if (!Array) { MsgPack.Name = ReadString((Types)Unk); Unk = _IO.ReadByte(); }
             Types Type = (Types)Unk;
-            if (!Array)
-            {
-                MsgPack.Name = ReadString(Type);
-                if (MsgPack.Name != null) { Unk = _IO.ReadByte(); Type = (Types)Unk; }
-            }
 
-            bool FixArr = Type >= Types.FixArr && Type <= Types.FixArrMax;
-            bool FixMap = Type >= Types.FixMap && Type <= Types.FixMapMax;
-            bool FixStr = Type >= Types.FixStr && Type <= Types.FixStrMax;
-            bool PosInt = Type >= Types.PosInt && Type <= Types.PosIntMax;
-            bool NegInt = Type >= Types.NegInt && Type <= Types.NegIntMax;
-            if (FixArr || FixMap || FixStr || PosInt || NegInt)
+            if (Type >= Types.FixMap && Type <= Types.FixMapMax)
             {
-                if (FixMap)
-                {
-                    MsgPack.Object = KKdList<MsgPack>.New;
-                    for (int i = 0; i < Unk - (byte)Types.FixMap; i++) MsgPack.Add( Read(false));
-                }
-                else if (FixArr)
-                {
-                    MsgPack.Object = new MsgPack[Unk - (byte)Types.FixArr];
-                    for (int i = 0; i < Unk - (byte)Types.FixArr; i++) MsgPack[i] = Read( true);
-                }
-                else if (FixStr) MsgPack.Object = ReadString( Type);
-                else if (PosInt) MsgPack.Object =        Unk; 
-                else if (NegInt) MsgPack.Object = (sbyte)Unk;
-                return MsgPack;
+                MsgPack.Object = KKdList<MsgPack>.New;
+                for (int i = 0; i < Unk - (byte)Types.FixMap; i++) MsgPack.Add( Read(false));
             }
-            
-            while (true)
+            else if (Type >= Types.FixArr && Type <= Types.FixArrMax)
             {
-                if (ReadNil    (ref MsgPack, ref Type)) break;
-                if (ReadArr    (ref MsgPack, ref Type)) break;
-                if (ReadMap    (ref MsgPack, ref Type)) break;
-                if (ReadExt    (ref MsgPack, ref Type)) break;
-                if (ReadString (ref MsgPack, ref Type)) break;
-                if (ReadBoolean(ref MsgPack, ref Type)) break;
-                if (ReadBytes  (ref MsgPack, ref Type)) break;
-                if (ReadInt    (ref MsgPack, ref Type)) break;
-                if (ReadUInt   (ref MsgPack, ref Type)) break;
-                if (ReadFloat  (ref MsgPack, ref Type)) break;
-                break;
+                MsgPack.Object = new MsgPack[Unk - (byte)Types.FixArr];
+                for (int i = 0; i < Unk - (byte)Types.FixArr; i++) MsgPack[i] = Read( true);
             }
+            else if (Type >= Types.FixStr && Type <= Types.FixStrMax) MsgPack.Object = ReadString(Type);
+            else if (Type >= Types.PosInt && Type <= Types.PosIntMax) MsgPack.Object =        Unk;
+            else if (Type >= Types.NegInt && Type <= Types.NegIntMax) MsgPack.Object = (sbyte)Unk;
+            else
+                while (true)
+                {
+                    if (ReadNil    (ref MsgPack, ref Type)) break;
+                    if (ReadArr    (ref MsgPack, ref Type)) break;
+                    if (ReadMap    (ref MsgPack, ref Type)) break;
+                    if (ReadExt    (ref MsgPack, ref Type)) break;
+                    if (ReadString (ref MsgPack, ref Type)) break;
+                    if (ReadBoolean(ref MsgPack, ref Type)) break;
+                    if (ReadBytes  (ref MsgPack, ref Type)) break;
+                    if (ReadInt    (ref MsgPack, ref Type)) break;
+                    if (ReadUInt   (ref MsgPack, ref Type)) break;
+                    if (ReadFloat  (ref MsgPack, ref Type)) break;
+                    break;
+                }
             return MsgPack;
         }
 
@@ -127,7 +111,7 @@ namespace KKdMainLib.MessagePack
                 return _IO.ReadString(Val - Types.FixStr);
             else if (Val >= Types.   Str8 && Val <= Types.   Str32 )
             {
-                Enum.TryParse(Val.ToString(), out Types Type);
+                System.Enum.TryParse(Val.ToString(), out Types Type);
                 int Length = 0;
                      if (Type == Types.Str8 ) Length = _IO.ReadByte();
                 else if (Type == Types.Str16) Length = _IO.ReadInt16Endian(true);
@@ -182,7 +166,7 @@ namespace KKdMainLib.MessagePack
             return true;
         }
         
-        public IO Write(MsgPack MsgPack, bool IsArray = false)
+        public MP Write(MsgPack MsgPack, bool IsArray = false)
         {
             if   (MsgPack.Name != null && !IsArray) Write(MsgPack.Name);
             Write(MsgPack.Object);
@@ -311,6 +295,8 @@ namespace KKdMainLib.MessagePack
             _IO.Write(val.Type);
             _IO.Write(val.Data);
         }
+
+        public void Dispose() => _IO.Close();
     }
 
     public enum Types : byte

KKdMainLib/IO/Stream.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.InteropServices;
 using KKdBaseLib;
 using MSIO = System.IO;
 
@@ -7,18 +8,17 @@ namespace KKdMainLib.IO
     public unsafe class Stream : IDisposable
     {
         private MSIO.Stream stream;
-        private   int I, i, i0, TempBitRead, TempBitWrite;
-        private ushort ValRead;
-        private  byte BitRead, BitWrite, ValWrite;
+        private int I, i, BitRead, BitWrite, TempBitRead, TempBitWrite, ValRead, ValWrite;
         private byte[] buf;
+        private byte* ptr;
 
-        private Main.Format _format = Main.Format.NULL;
+        private Format _format = Format.NULL;
 
-        public Main.Format Format
+        public Format Format
         {   get =>       _format;
             set {        _format = value;
-                  IsBE = _format == Main.Format.F2BE;
-                  IsX  = _format == Main.Format.X || _format == Main.Format.XHD; } }
+                  IsBE = _format == Format.F2BE;
+                  IsX  = _format == Format.X || _format == Format.XHD; } }
 
         public bool IsBE = false;
         public bool IsX  = false;
@@ -27,9 +27,12 @@ namespace KKdMainLib.IO
         public uint UIntOffset { get => (uint)LongOffset; set => LongOffset = value; }
         public long LongOffset;
 
-        public  int       Length { get => ( int)stream.Length -     Offset; set => stream.SetLength(value +     Offset); }
-        public uint   UIntLength { get => (uint)stream.Length - UIntOffset; set => stream.SetLength(value + UIntOffset); }
-        public long   LongLength { get =>       stream.Length - LongOffset; set => stream.SetLength(value + LongOffset); }
+        public  int       Length { get => ( int)stream.Length -     Offset;
+            set => stream.SetLength(value +     Offset); }
+        public uint   UIntLength { get => (uint)stream.Length - UIntOffset;
+            set => stream.SetLength(value + UIntOffset); }
+        public long   LongLength { get =>       stream.Length - LongOffset;
+            set => stream.SetLength(value + LongOffset); }
 
         public  int     Position
         { get => ( int)stream.Position -     Offset; set => stream.Position = value +     Offset; }
@@ -52,8 +55,9 @@ namespace KKdMainLib.IO
             BitRead = 8;
             ValRead = ValRead = BitWrite = 0;
             stream = output;
-            Format = Main.Format.NULL;
-            buf = new byte[128];
+            Format = Format.NULL;
+            buf = new byte[0x100];
+            ptr = buf.GetPtr();
             IsBE = isBE;
         }
 
@@ -69,11 +73,10 @@ namespace KKdMainLib.IO
         public long? Seek(long? offset, SeekOrigin origin)
         { if (offset == null) return null; return stream.Seek((long)offset, (MSIO.SeekOrigin)(int)origin); }
 
-        public void Dispose()
-        { CheckWrited(); Dispose(true); }
+        public void Dispose() => Dispose(true);
 
-        private void Dispose(bool disposing)
-        { if (disposing && stream != MSIO.Stream.Null) stream.Flush(); stream.Dispose(); }
+        protected virtual void Dispose(bool dispose)
+        { CW(); if (stream != MSIO.Stream.Null) { stream.Flush(); stream.Dispose(); } if (dispose) GC.SuppressFinalize(this); }
 
         public MSIO.Stream BaseStream
         { get { stream.Flush(); return stream; } set { stream = value; } }
@@ -101,67 +104,64 @@ namespace KKdMainLib.IO
             if (SetLength1) stream.SetLength(Position + Offset);
         }
 
-        public   bool ReadBoolean() =>         stream.ReadByte() == 1;
+        public   bool ReadBoolean() =>         stream.ReadByte() != 0;
         public  sbyte   ReadSByte() => ( sbyte)stream.ReadByte();
         public   byte    ReadByte() => (  byte)stream.ReadByte();
-        public  sbyte    ReadInt8() => ( sbyte) IntFromArray(1);
-        public   byte   ReadUInt8() => (  byte)UIntFromArray(1);
-        public  short   ReadInt16() => ( short) IntFromArray(2);
-        public ushort  ReadUInt16() => (ushort)UIntFromArray(2);
-        public    int   ReadInt24() => (   int) IntFromArray(3);
-        public    int   ReadInt32() => (   int) IntFromArray(4);
-        public   uint  ReadUInt32() => (  uint)UIntFromArray(4);
-        public   long   ReadInt64() =>          IntFromArray(8);
-        public  ulong  ReadUInt64() =>         UIntFromArray(8);
-        public   Half   ReadHalf() { ushort a = ReadUInt16(); return  (  Half ) a; }
-        public  float ReadSingle() {   uint a = ReadUInt32(); return *( float*)&a; }
-        public double ReadDouble() {  ulong a = ReadUInt64(); return *(double*)&a; }
+        public  sbyte    ReadInt8() => ( sbyte)stream.ReadByte();
+        public   byte   ReadUInt8() => (  byte)stream.ReadByte();
+        public  short   ReadInt16() { CR(); stream.Read(buf, 0, 2); return *( short*)ptr; }
+        public ushort  ReadUInt16() { CR(); stream.Read(buf, 0, 2); return *(ushort*)ptr; }
+        public    int   ReadInt32() { CR(); stream.Read(buf, 0, 4); return *(   int*)ptr; }
+        public   uint  ReadUInt32() { CR(); stream.Read(buf, 0, 4); return *(  uint*)ptr; }
+        public   long   ReadInt64() { CR(); stream.Read(buf, 0, 8); return *(  long*)ptr; }
+        public  ulong  ReadUInt64() { CR(); stream.Read(buf, 0, 8); return *( ulong*)ptr; }
+        public  float  ReadSingle() { CR(); stream.Read(buf, 0, 4); return *( float*)ptr; }
+        public double  ReadDouble() { CR(); stream.Read(buf, 0, 8); return *(double*)ptr; }
         
-        public  short  ReadInt16Endian() => ( short) IntFromArray(2, IsBE);
-        public ushort ReadUInt16Endian() => (ushort)UIntFromArray(2, IsBE);
-        public    int  ReadInt24Endian() => (   int) IntFromArray(3, IsBE);
-        public    int  ReadInt32Endian() => (   int) IntFromArray(4, IsBE);
-        public   uint ReadUInt32Endian() => (  uint)UIntFromArray(4, IsBE);
-        public   long  ReadInt64Endian() =>          IntFromArray(8, IsBE);
-        public  ulong ReadUInt64Endian() =>         UIntFromArray(8, IsBE);
-        public   Half   ReadHalfEndian() { ushort a = ReadUInt16Endian(); return  (  Half ) a; }
-        public  float ReadSingleEndian() {   uint a = ReadUInt32Endian(); return *( float*)&a; }
-        public double ReadDoubleEndian() {  ulong a = ReadUInt64Endian(); return *(double*)&a; }
+        public  short  ReadInt16Endian() { CR(); stream.Read(buf, 0, 2); buf.Endian(2, IsBE); return *( short*)ptr; }
+        public ushort ReadUInt16Endian() { CR(); stream.Read(buf, 0, 2); buf.Endian(2, IsBE); return *(ushort*)ptr; }
+        public    int  ReadInt32Endian() { CR(); stream.Read(buf, 0, 4); buf.Endian(4, IsBE); return *(   int*)ptr; }
+        public   uint ReadUInt32Endian() { CR(); stream.Read(buf, 0, 4); buf.Endian(4, IsBE); return *(  uint*)ptr; }
+        public   long  ReadInt64Endian() { CR(); stream.Read(buf, 0, 8); buf.Endian(8, IsBE); return *(  long*)ptr; }
+        public  ulong ReadUInt64Endian() { CR(); stream.Read(buf, 0, 8); buf.Endian(8, IsBE); return *( ulong*)ptr; }
+        public  float ReadSingleEndian() { CR(); stream.Read(buf, 0, 4); buf.Endian(4, IsBE); return *( float*)ptr; }
+        public double ReadDoubleEndian() { CR(); stream.Read(buf, 0, 8); buf.Endian(8, IsBE); return *(double*)ptr; }
 
-        public  short  ReadInt16Endian(bool IsBE) => ( short) IntFromArray(2, IsBE);
-        public ushort ReadUInt16Endian(bool IsBE) => (ushort)UIntFromArray(2, IsBE);
-        public    int  ReadInt24Endian(bool IsBE) => (   int) IntFromArray(3, IsBE);
-        public    int  ReadInt32Endian(bool IsBE) => (   int) IntFromArray(4, IsBE);
-        public   uint ReadUInt32Endian(bool IsBE) => (  uint)UIntFromArray(4, IsBE);
-        public   long  ReadInt64Endian(bool IsBE) =>          IntFromArray(8, IsBE);
-        public  ulong ReadUInt64Endian(bool IsBE) =>         UIntFromArray(8, IsBE);
-        public   Half   ReadHalfEndian(bool IsBE)
-        { ushort a = ReadUInt16Endian(IsBE); return  (  Half ) a; }
+        public  short  ReadInt16Endian(bool IsBE)
+        { CR(); stream.Read(buf, 0, 2); buf.Endian(2, IsBE); return *( short*)ptr; }
+        public ushort ReadUInt16Endian(bool IsBE)
+        { CR(); stream.Read(buf, 0, 2); buf.Endian(2, IsBE); return *(ushort*)ptr; }
+        public    int  ReadInt32Endian(bool IsBE)
+        { CR(); stream.Read(buf, 0, 4); buf.Endian(4, IsBE); return *(   int*)ptr; }
+        public   uint ReadUInt32Endian(bool IsBE)
+        { CR(); stream.Read(buf, 0, 4); buf.Endian(4, IsBE); return *(  uint*)ptr; }
+        public   long  ReadInt64Endian(bool IsBE)
+        { CR(); stream.Read(buf, 0, 8); buf.Endian(8, IsBE); return *(  long*)ptr; }
+        public  ulong ReadUInt64Endian(bool IsBE)
+        { CR(); stream.Read(buf, 0, 8); buf.Endian(8, IsBE); return *( ulong*)ptr; }
         public  float ReadSingleEndian(bool IsBE)
-        {   uint a = ReadUInt32Endian(IsBE); return *( float*)&a; }
+        { CR(); stream.Read(buf, 0, 4); buf.Endian(4, IsBE); return *( float*)ptr; }
         public double ReadDoubleEndian(bool IsBE)
-        {  ulong a = ReadUInt64Endian(IsBE); return *(double*)&a; }
+        { CR(); stream.Read(buf, 0, 8); buf.Endian(8, IsBE); return *(double*)ptr; }
 
-        public void Write(byte[] Val)                         => stream.Write(Val, 0, Val. Length);
-        public void Write(byte[] Val,             int Length) => stream.Write(Val, 0     , Length);
-        public void Write(byte[] Val, int Offset, int Length) => stream.Write(Val, Offset, Length);
-        public void Write(char[] val, bool UTF8 = true)
-        { if (UTF8) Write(val.ToUTF8()); else Write(val.ToASCII()); }
+        public void Write(byte[] Val                        ) => stream.Write(Val ?? new byte[0],      0, Val.Length);
+        public void Write(byte[] Val,             int Length) => stream.Write(Val ?? new byte[0],      0,     Length);
+        public void Write(byte[] Val, int Offset, int Length) => stream.Write(Val ?? new byte[0], Offset,     Length);
+        public void Write(char[] val, bool UTF8 = true) => Write(UTF8 ? val.ToUTF8() : val.ToASCII());
 
         public void WriteByte(byte val) => stream.WriteByte(val);
 
         public void Write(  bool val) => stream.WriteByte((byte)(val ? 1 : 0));
         public void Write( sbyte val) => stream.WriteByte((byte) val);
         public void Write(  byte val) => stream.WriteByte(       val);
-        public void Write( short val) => ToArray(2,           val);
-        public void Write(ushort val) => ToArray(2,           val);
-        public void Write(   int val) => ToArray(4,           val);
-        public void Write(  uint val) => ToArray(4,           val);
-        public void Write(  long val) => ToArray(8,           val);
-        public void Write( ulong val) => ToArray(8,           val);
-        public void Write(  Half val) => ToArray(2,  (ushort) val);
-        public void Write( float val) => ToArray(4, *( uint*)&val);
-        public void Write(double val) => ToArray(8, *(ulong*)&val);
+        public void Write( short val) { CW(); *( short*)ptr = val; stream.Write(buf, 0, 2); }
+        public void Write(ushort val) { CW(); *(ushort*)ptr = val; stream.Write(buf, 0, 2); }
+        public void Write(   int val) { CW(); *(   int*)ptr = val; stream.Write(buf, 0, 4); }
+        public void Write(  uint val) { CW(); *(  uint*)ptr = val; stream.Write(buf, 0, 4); }
+        public void Write(  long val) { CW(); *(  long*)ptr = val; stream.Write(buf, 0, 8); }
+        public void Write( ulong val) { CW(); *( ulong*)ptr = val; stream.Write(buf, 0, 8); }
+        public void Write( float val) { CW(); *( float*)ptr = val; stream.Write(buf, 0, 4); }
+        public void Write(double val) { CW(); *(double*)ptr = val; stream.Write(buf, 0, 8); }
 
         public void Write( sbyte? val) => Write(val.GetValueOrDefault());
         public void Write(  byte? val) => Write(val.GetValueOrDefault());
@@ -173,125 +173,55 @@ namespace KKdMainLib.IO
         public void Write( ulong? val) => Write(val.GetValueOrDefault());
         public void Write( float? val) => Write(val.GetValueOrDefault());
         public void Write(double? val) => Write(val.GetValueOrDefault());
+
+        public void Write(  char val, bool UTF8 = true) =>
+            Write(UTF8 ? val.ToString().ToUTF8() : val.ToString().ToASCII());
+        public void Write(string val, bool UTF8 = true) =>
+            Write(UTF8 ? val           .ToUTF8() : val           .ToASCII());
         
-        public void Write(  bool* val, int Length)
-        { for (i = 0; i < Length; i++) stream.WriteByte((byte)(val[i] ? 1 : 0)); }
-        public void Write( sbyte* val, int Length)
-        { for (i = 0; i < Length; i++) stream.WriteByte((byte) val[i]); }
-        public void Write(  byte* val, int Length)
-        { for (i = 0; i < Length; i++) stream.WriteByte(       val[i]); }
-        public void Write( short* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(2,           val[i]); }
-        public void Write(ushort* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(2,           val[i]); }
-        public void Write(   int* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(4,           val[i]); }
-        public void Write(  uint* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(4,           val[i]); }
-        public void Write(  long* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(8,           val[i]); }
-        public void Write( ulong* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(8,           val[i]); }
-        public void Write( float* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(4, *( uint*)&val[i]); }
-        public void Write(double* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(4, *(ulong*)&val[i]); }
+        public void WriteEndian( short val) { CW(); *( short*)ptr = val; buf.Endian(2, IsBE); stream.Write(buf, 0, 2); }
+        public void WriteEndian(ushort val) { CW(); *(ushort*)ptr = val; buf.Endian(2, IsBE); stream.Write(buf, 0, 2); }
+        public void WriteEndian(   int val) { CW(); *(   int*)ptr = val; buf.Endian(4, IsBE); stream.Write(buf, 0, 4); }
+        public void WriteEndian(  uint val) { CW(); *(  uint*)ptr = val; buf.Endian(4, IsBE); stream.Write(buf, 0, 4); }
+        public void WriteEndian(  long val) { CW(); *(  long*)ptr = val; buf.Endian(8, IsBE); stream.Write(buf, 0, 8); }
+        public void WriteEndian( ulong val) { CW(); *( ulong*)ptr = val; buf.Endian(8, IsBE); stream.Write(buf, 0, 8); }
+        public void WriteEndian( float val) { CW(); *( float*)ptr = val; buf.Endian(4, IsBE); stream.Write(buf, 0, 4); }
+        public void WriteEndian(double val) { CW(); *(double*)ptr = val; buf.Endian(8, IsBE); stream.Write(buf, 0, 8); }
+
+        public void WriteEndian( short val, bool IsBE)
+        { CW(); *( short*)ptr = val; buf.Endian(2, IsBE); stream.Write(buf, 0, 2); }
+        public void WriteEndian(ushort val, bool IsBE)
+        { CW(); *(ushort*)ptr = val; buf.Endian(2, IsBE); stream.Write(buf, 0, 2); }
+        public void WriteEndian(   int val, bool IsBE)
+        { CW(); *(   int*)ptr = val; buf.Endian(4, IsBE); stream.Write(buf, 0, 4); }
+        public void WriteEndian(  uint val, bool IsBE)
+        { CW(); *(  uint*)ptr = val; buf.Endian(4, IsBE); stream.Write(buf, 0, 4); }
+        public void WriteEndian(  long val, bool IsBE)
+        { CW(); *(  long*)ptr = val; buf.Endian(8, IsBE); stream.Write(buf, 0, 8); }
+        public void WriteEndian( ulong val, bool IsBE)
+        { CW(); *( ulong*)ptr = val; buf.Endian(8, IsBE); stream.Write(buf, 0, 8); }
+        public void WriteEndian( float val, bool IsBE)
+        { CW(); *( float*)ptr = val; buf.Endian(4, IsBE); stream.Write(buf, 0, 4); }
+        public void WriteEndian(double val, bool IsBE)
+        { CW(); *(double*)ptr = val; buf.Endian(8, IsBE); stream.Write(buf, 0, 8); }
         
-        public void WriteEndian( short* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(2, Endian(val[i], 2, IsBE)); }
-        public void WriteEndian(ushort* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(2, Endian(val[i], 2, IsBE)); }
-        public void WriteEndian(   int* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(4, Endian(val[i], 4, IsBE)); }
-        public void WriteEndian(  uint* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(4, Endian(val[i], 4, IsBE)); }
-        public void WriteEndian(  long* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(8, Endian(val[i], 8, IsBE)); }
-        public void WriteEndian( ulong* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(8, Endian(val[i], 8, IsBE)); }
-        public void WriteEndian( float* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(4, Endian(*( uint*)&val[i], 4, IsBE)); }
-        public void WriteEndian(double* val, int Length)
-        { for (i = 0; i < Length; i++) ToArray(8, Endian(*(ulong*)&val[i], 8, IsBE)); }
 
-        public void WriteEndian( short* val, int Length, bool IsBE)
-        { for (i = 0; i < Length; i++) ToArray(2, Endian(val[i], 2, IsBE)); }
-        public void WriteEndian(ushort* val, int Length, bool IsBE)
-        { for (i = 0; i < Length; i++) ToArray(2, Endian(val[i], 2, IsBE)); }
-        public void WriteEndian(   int* val, int Length, bool IsBE)
-        { for (i = 0; i < Length; i++) ToArray(4, Endian(val[i], 4, IsBE)); }
-        public void WriteEndian(  uint* val, int Length, bool IsBE)
-        { for (i = 0; i < Length; i++) ToArray(4, Endian(val[i], 4, IsBE)); }
-        public void WriteEndian(  long* val, int Length, bool IsBE)
-        { for (i = 0; i < Length; i++) ToArray(8, Endian(val[i], 8, IsBE)); }
-        public void WriteEndian( ulong* val, int Length, bool IsBE)
-        { for (i = 0; i < Length; i++) ToArray(8, Endian(val[i], 8, IsBE)); }
-        public void WriteEndian( float* val, int Length, bool IsBE)
-        { for (i = 0; i < Length; i++) ToArray(4, Endian(*( uint*)&val[i], 4, IsBE)); }
-        public void WriteEndian(double* val, int Length, bool IsBE)
-        { for (i = 0; i < Length; i++) ToArray(8, Endian(*(ulong*)&val[i], 8, IsBE)); }
+        public Half ReadHalf      (         ) { ushort a = ReadUInt16      (    ); return (Half)a; }
+        public Half ReadHalfEndian(         ) { ushort a = ReadUInt16Endian(    ); return (Half)a; }
+        public Half ReadHalfEndian(bool IsBE) { ushort a = ReadUInt16Endian(IsBE); return (Half)a; }
 
-        public void Write(  char val, bool UTF8 = true)
-        { if (UTF8) Write(val.ToString().ToUTF8()); else Write(val.ToString().ToASCII()); }
-        public void Write(string val, bool UTF8 = true)
-        { if (UTF8) Write(val           .ToUTF8()); else Write(val           .ToASCII()); }
+        public void Write      (  Half val           ) => Write      ( (ushort ) val      );
+        public void WriteEndian(  Half val           ) => WriteEndian( (ushort ) val      );
+        public void WriteEndian(  Half val, bool IsBE) => WriteEndian( (ushort ) val, IsBE);
         
-        public void WriteEndian( short val) => ToArray(2, Endian(val, 2, IsBE));
-        public void WriteEndian(ushort val) => ToArray(2, Endian(val, 2, IsBE));
-        public void WriteEndian(   int val) => ToArray(4, Endian(val, 4, IsBE));
-        public void WriteEndian(  uint val) => ToArray(4, Endian(val, 4, IsBE));
-        public void WriteEndian(  long val) => ToArray(8, Endian(val, 8, IsBE));
-        public void WriteEndian( ulong val) => ToArray(8, Endian(val, 8, IsBE));
-        public void WriteEndian( float val) => ToArray(4, Endian(*( uint*)&val, 4, IsBE));
-        public void WriteEndian(double val) => ToArray(8, Endian(*(ulong*)&val, 8, IsBE));
-
-        public void WriteEndian( short val, bool IsBE) => ToArray(2, Endian(val, 2, IsBE));
-        public void WriteEndian(ushort val, bool IsBE) => ToArray(2, Endian(val, 2, IsBE));
-        public void WriteEndian(   int val, bool IsBE) => ToArray(4, Endian(val, 4, IsBE));
-        public void WriteEndian(  uint val, bool IsBE) => ToArray(4, Endian(val, 4, IsBE));
-        public void WriteEndian(  long val, bool IsBE) => ToArray(8, Endian(val, 8, IsBE));
-        public void WriteEndian( ulong val, bool IsBE) => ToArray(8, Endian(val, 8, IsBE));
-        public void WriteEndian( float val, bool IsBE) => ToArray(4, Endian(*( uint*)&val, 4, IsBE));
-        public void WriteEndian(double val, bool IsBE) => ToArray(8, Endian(*(ulong*)&val, 8, IsBE));
-
-        public   long Endian(  long BE, byte Length, bool IsBE)
-        { if (IsBE) { for (I = 0; I < Length; I++) { buf[I] = (byte)BE; BE >>= 8; } BE = 0;
-                      for (I = 0; I < Length; I++) { BE |= buf[I]; if (I < Length - 1) BE <<= 8; } } return BE; }
-
-        public  ulong Endian( ulong BE, byte Length, bool IsBE)
-        { if (IsBE) { for (I = 0; I < Length; I++) { buf[I] = (byte)BE; BE >>= 8; } BE = 0;
-                      for (I = 0; I < Length; I++) { BE |= buf[I]; if (I < Length - 1) BE <<= 8; } } return BE; }
-
-        private void ToArray(byte L,  long val)
-        { CheckWrited(); for (I = 0; I < L; I++) { buf[I] = (byte)val; val >>= 8; } stream.Write(buf, 0, L); }
-
-        private void ToArray(byte L, ulong val)
-        { CheckWrited(); for (I = 0; I < L; I++) { buf[I] = (byte)val; val >>= 8; } stream.Write(buf, 0, L); }
-
-        private  long  IntFromArray(byte L) { stream.Read(buf, 0, L);  long val = 0;
-                         for (I = L; I > 0; I--) { val <<= 8; val |= buf[I - 1]; } return val; }
-
-        private ulong UIntFromArray(byte L) { stream.Read(buf, 0, L); ulong val = 0;
-                         for (I = L; I > 0; I--) { val <<= 8; val |= buf[I - 1]; } return val; }
-
-        private  long  IntFromArray(byte L, bool IsBE) { stream.Read(buf, 0, L);  long val = 0; if (IsBE)
-                         for (I = 0; I < L; I++) { val <<= 8; val |= buf[I    ]; } else
-                         for (I = L; I > 0; I--) { val <<= 8; val |= buf[I - 1]; } return val; }
-
-        private ulong UIntFromArray(byte L, bool IsBE) { stream.Read(buf, 0, L); ulong val = 0; if (IsBE)
-                         for (I = 0; I < L; I++) { val <<= 8; val |= buf[I    ]; } else
-                         for (I = L; I > 0; I--) { val <<= 8; val |= buf[I - 1]; } return val; }
-        
-        public char ReadChar(bool UTF8 = true)
-        { if (UTF8) return ReadCharUTF8();
-          else      return (char)stream.ReadByte(); }
+        public char ReadChar(bool UTF8 = true) => UTF8 ? ReadCharUTF8() : (char)stream.ReadByte();
 
         public char ReadCharUTF8()
         {
             byte t;
             int T;
             int val = 0;
-            for (I = 0, i0 = 4; I < i0; I++)
+            for (I = 0, i = 4; I < i; I++)
             {
                 T = stream.ReadByte();
                 if (T == -1) return '\uFFFF';
@@ -299,42 +229,40 @@ namespace KKdMainLib.IO
 
                      if ((t & 0xC0) == 0x80 && I >  0)   val = (val << 6) | (t & 0x3F);
                 else if ((t & 0x80) == 0x00 && I == 0)   return (char)t;
-                else if ((t & 0xE0) == 0xC0 && I == 0) { val = t & 0x1F; i0 = 2; }
-                else if ((t & 0xF0) == 0xE0 && I == 0) { val = t & 0x0F; i0 = 3; }
-                else if ((t & 0xF8) == 0xF0 && I == 0) { val = t & 0x07; i0 = 4; }
+                else if ((t & 0xE0) == 0xC0 && I == 0) { val = t & 0x1F; i = 2; }
+                else if ((t & 0xF0) == 0xE0 && I == 0) { val = t & 0x0F; i = 3; }
+                else if ((t & 0xF8) == 0xF0 && I == 0) { val = t & 0x07; i = 4; }
                 else return '\uFFFF';
             }
             return (char)val;
         }
-        
-        public string ReadString(long Length, bool UTF8 = true)
-        { if (UTF8) return ReadStringUTF8 (Length);
-          else      return ReadStringASCII(Length); }
+
+        public string ReadString(long Length, bool UTF8 = true) =>
+            UTF8 ? ReadStringUTF8(Length) : ReadStringASCII(Length);
 
         public string ReadStringUTF8 (long Length) => ReadBytes(Length).ToUTF8 ();
         public string ReadStringASCII(long Length) => ReadBytes(Length).ToASCII();
         
         
-        public string ReadString(long? Length, bool UTF8 = true)
-        { if (UTF8) return ReadStringUTF8 (Length);
-          else      return ReadStringASCII(Length); }
+        public string ReadString(long? Length, bool UTF8 = true) =>
+            UTF8 ? ReadStringUTF8(Length) : ReadStringASCII(Length);
 
         public string ReadStringUTF8 (long? Length) => ReadBytes(Length).ToUTF8 ();
         public string ReadStringASCII(long? Length) => ReadBytes(Length).ToASCII();
         
-        public byte[] ReadBytes(long  Length, int Offset = 0)
-        { byte[] Buf = new byte[Length]; if (Offset > 0) stream.Position = Offset;
+        public byte[] ReadBytes(long Length, int Offset = -1)
+        { byte[] Buf = new byte[Length]; if (Offset > -1) stream.Position = Offset;
             stream.Read(Buf, 0, (int)Length); return Buf; }
         
-        public void ReadBytes(long  Length, byte[] Buf, long Offset = 0)
-        { if (Offset > 0) stream.Position = Offset; stream.Read(Buf, 0, (int)Length); }
+        public void ReadBytes(long Length, byte[] Buf, long Offset = -1)
+        { if (Offset > -1) stream.Position = Offset; stream.Read(Buf, 0, (int)Length); }
 
-        public byte[] ReadBytes(long? Length, int Offset = 0)
+        public byte[] ReadBytes(long? Length, int Offset = -1)
         { if (Length == null) return new byte[0]; else return ReadBytes((long)Length, Offset); }
 
-        public void ReadBytes(long Length, byte Bits, byte[] Buf, long Offset = 0)
-        { if (Offset > 0) stream.Seek(Offset, 0);
-                 if (Bits > 0 && Bits < 8) for (i0 = 0; i0 < Length; i0++) Buf[i0] = ReadBits(Bits); }
+        public void ReadBytes(long  Length, byte Bits, byte[] Buf, long Offset = -1)
+        { if (Offset > -1) stream.Seek(Offset, 0);
+                 if (Bits > 0 && Bits < 8) for (i = 0; i < Length; i++) Buf[i] = ReadBits(Bits); }
            
         public byte ReadBits(byte Bits)
         {
@@ -351,8 +279,9 @@ namespace KKdMainLib.IO
 
         public byte ReadHalfByte() => ReadBits(4);
         
-        public void Write(byte val, byte Bits)
+        public void Write(int val, byte Bits)
         {
+            val &= (1 << Bits) - 1;
             BitWrite += Bits;
             TempBitWrite = 8 - BitWrite;
             if (TempBitWrite < 0)
@@ -362,20 +291,29 @@ namespace KKdMainLib.IO
                 stream.WriteByte((byte)(ValWrite | (val >> BitWrite)));
                 ValWrite = 0;
             }
-            ValWrite |= (byte)(val << TempBitWrite);
+            ValWrite |= val << TempBitWrite;
+            ValWrite &= 0xFF;
         }
 
-        public void CheckRead  () { if (BitRead  > 0)                    ValRead  = 0; BitRead  = 8; }
-        public void CheckWrited() { if (BitWrite > 0) { Write(ValWrite); ValWrite =    BitWrite = 0; } }
+        public void CR() //CheckRead
+        { CFUTRM(); if (BitRead  > 0)                                     ValRead  = 0; BitRead  = 8;   }
+        public void CW() //CheckWrite
+        { CFUTRM(); if (BitWrite > 0) { stream.WriteByte((byte)ValWrite); ValWrite = 0; BitWrite = 0; } }
 
         public byte[] ToArray(bool Close)
-        { byte[] Data = ToArray(); if (Close) this.Close(); return Data; }
+        { byte[] Data = ToArray(); if (Close) Dispose(); return Data; }
+
+        [System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptions]
+        [System.Security.SecuritySafeCritical]
+        private void CFUTRM() //CheckForUnableToReadMemory
+        { try { if (buf[0] != ptr[0] || buf[1] != ptr[1] || buf[2] != ptr[2] || buf[3] != ptr[3] ||
+                    buf[4] != ptr[4] || buf[5] != ptr[5] || buf[6] != ptr[6] || buf[7] != ptr[7])
+                    ptr = buf.GetPtr(); } catch (AccessViolationException) { ptr = buf.GetPtr(); } }
 
         public byte[] ToArray()
         {
             long Position = stream.Position;
-            stream.Position = 0;
-            byte[] Data = ReadBytes(stream.Length);
+            byte[] Data = ReadBytes(stream.Length, 0);
             stream.Position = Position;
             return Data;
         }

KKdMainLib/KKdMainLib.csproj

@@ -42,18 +42,17 @@
     <Compile Include="DB\Aet.cs" />
     <Compile Include="DB\Auth.cs" />
     <Compile Include="DB\Spr.cs" />
-    <Compile Include="F2nd\Header.cs" />
-    <Compile Include="F2nd\POF.cs" />
-    <Compile Include="F2nd\Struct.cs" />
+    <Compile Include="F2\Bloom.cs" />
+    <Compile Include="F2\ColorCorrection.cs" />
+    <Compile Include="F2\DOF.cs" />
+    <Compile Include="F2\Light.cs" />
     <Compile Include="IO\Directory.cs" />
+    <Compile Include="IO\Extensions.cs" />
     <Compile Include="IO\File.cs" />
-    <Compile Include="IO\IOExtensions.cs" />
+    <Compile Include="IO\JSON.cs" />
+    <Compile Include="IO\MP.cs" />
     <Compile Include="IO\Path.cs" />
     <Compile Include="IO\Stream.cs" />
-    <Compile Include="MessagePack\JSONIO.cs" />
-    <Compile Include="MessagePack\MPExt.cs" />
-    <Compile Include="MessagePack\MsgPack.cs" />
-    <Compile Include="MessagePack\IO.cs" />
     <Compile Include="A3DA.cs" />
     <Compile Include="Aet.cs" />
     <Compile Include="DataBank.cs" />
@@ -62,6 +61,7 @@
     <Compile Include="Extensions.cs" />
     <Compile Include="FARC.cs" />
     <Compile Include="Main.cs" />
+    <Compile Include="Mot.cs" />
     <Compile Include="STR.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>

KKdMainLib/Main.cs

@@ -1,29 +1,13 @@
 using System;
 using System.Linq;
-using System.Windows.Forms;
 using System.Globalization;
 using System.Collections.Generic;
 using KKdBaseLib;
-using KKdMainLib.IO;
 
 namespace KKdMainLib
 {
     public static unsafe class Main
     {
-        public static void ConsoleDesign(string text, params string[] args)
-        {
-            text = string.Format(text, args);
-            string Text = "█                                                  █";
-            Text = Text.Remove(3) + text + Text.Remove(0, text.Length + 3);
-            Console.WriteLine(Text);
-        }
-
-        public static void ConsoleDesign(bool Fill)
-        {
-            if (Fill) Console.WriteLine("████████████████████████████████████████████████████");
-            else      Console.WriteLine("█                                                  █");
-        }
-
         public const string TimeFormatHHmmssfff = "{0:d2}:{1:d2}:{2:d2}.{3:d3}";
 
         public static void WriteTime(this TimeSpan time, bool WriteLine = false)
@@ -41,107 +25,6 @@ namespace KKdMainLib
             else           Console.Write    (TimeFormatHHmmssfff + " - " + Text,
                     time.Hours, time.Minutes, time.Seconds, time.Milliseconds);
         }
-
-        private static string GetArgs(string name, bool And, params string[] ext)
-        {
-            string Out = "";
-            if (And) Out = "|";
-            Out += name + " files (";
-            for (int i = 0; i < ext.Length; i++)
-            { Out += "*." + ext[i]; if (i + 1 < ext.Length) Out += ", "; }
-            Out += ")|";
-            for (int i = 0; i < ext.Length; i++)
-            { Out += "*." + ext[i]; if (i + 1 < ext.Length) Out += ";"; }
-
-            return Out;
-        }
-
-        private static string GetArgs(string name, params string[] ext)
-        {
-            string Out = name + " files (";
-            for (int i = 0; i < ext.Length; i++)
-            { Out += "*." + ext[i]; if (i + 1 < ext.Length) Out += ", "; }
-            Out += ")|";
-            for (int i = 0; i < ext.Length; i++)
-            { Out += "*." + ext[i]; if (i + 1 < ext.Length) Out += ";"; }
-
-            return Out;
-        }
-
-        public static string Choose(int code, string filetype, out string[] FileNames)
-        {
-            string MsgPack = GetArgs("MessagePack", true, "mp");
-            string JSON = GetArgs("JSON", true, "json");
-            string BIN = GetArgs("BIN", true, "bin");
-            string WAV = GetArgs("WAV", true, "wav");
-
-            FileNames = new string[0];
-            if (code == 1)
-            {
-                OpenFileDialog ofd = new OpenFileDialog { InitialDirectory = Application.StartupPath,
-                    Multiselect = true, Title = "Choose file(s) to open:" };
-
-                ofd.Filter = GetArgs("All;", false, "*");
-                    if (filetype == "a3da") ofd.Filter = GetArgs("A3DA", "a3da", "farc", "json", "mp") +
-                        GetArgs("A3DA", true, "a3da") + GetArgs("FARC", true, "farc") + JSON + MsgPack;
-                else if (filetype == "bin" ) ofd.Filter = GetArgs("BIN" , "bin", "json", "mp") +
-                        BIN + JSON + MsgPack;
-                else if (filetype == "bon" ) ofd.Filter = GetArgs("BON" , "bon", "bin", "json", "mp") +
-                        GetArgs("BON", true, "bon") + BIN + JSON + MsgPack;
-                else if (filetype == "databank") ofd.Filter = GetArgs("DAT", "dat", "json", "mp") +
-                        GetArgs("DAT", true, "dat") + JSON + MsgPack;
-                else if (filetype == "dex" ) ofd.Filter = GetArgs("DEX" , "dex", "bin", "json", "mp") +
-                        GetArgs("DEX", true, "dex") + BIN + JSON + MsgPack;
-                else if (filetype == "diva") ofd.Filter = GetArgs("DIVA", "diva", "wav") +
-                        GetArgs("DIVA", true, "diva") + GetArgs("WAV", true, "wav");
-                else if (filetype == "dsc" ) ofd.Filter = GetArgs("DSC" , "dsc", "json", "mp") +
-                        GetArgs("DSC", true, "dsc") + JSON + MsgPack;
-                else if (filetype == "farc") ofd.Filter = "FARC Archives (*.farc)|*.farc";
-                else if (filetype == "image") ofd.Filter = GetArgs("Image", "dds", "png") +
-                        GetArgs("DDS", true, "dds") + GetArgs("PNG", true, "png");
-                else if (filetype == "json") ofd.Filter = "JSON (*.json)|*.json";
-                else if (filetype == "kki" ) ofd.Filter = GetArgs("KKI", "kki");
-                else if (filetype == "mp"  ) ofd.Filter = GetArgs("MessagePack", "mp");
-                else if (filetype == "ppd" ) ofd.Filter = GetArgs("PPD", "ppd", "pak", "mod") +
-                        GetArgs("PPD", true, "ppd") + GetArgs("PAK", true, "pak") + GetArgs("MOD", true, "mod");
-                else if (filetype == "str" ) ofd.Filter = GetArgs("STR", "str", "bin", "json", "mp") +
-                        GetArgs("STR", true, "str") + BIN + JSON + MsgPack;
-                else if (filetype == "vag" ) ofd.Filter = GetArgs("VAG", "vag", "wav") +
-                        GetArgs("VAG", true, "vag") + GetArgs("WAV", true, "wav");
-
-                if (ofd.ShowDialog() == DialogResult.OK)
-                    FileNames = ofd.FileNames;
-            }
-            else if (code == 2)
-            {
-                OpenFileDialog ofd = new OpenFileDialog { InitialDirectory = Application.StartupPath,
-                    ValidateNames = false, CheckFileExists = false, Filter = " | ", CheckPathExists = true,
-                    Title = "Choose any file in folder:", FileName = "Folder Selection." };
-                if (ofd.ShowDialog() == DialogResult.OK)
-                    return Path.GetDirectoryName(ofd.FileName);
-            }
-            return "";
-        }
-
-        public static void ChooseSave(string filetype,
-            out string InitialDirectory, out string[] FileNames)
-        {
-            InitialDirectory = "";
-            FileNames = new string[0];
-            Console.WriteLine("Choose file to save:");
-            SaveFileDialog sfd = new SaveFileDialog { InitialDirectory = Application.StartupPath };
-            switch (filetype)
-            {
-                case "kki":
-                    sfd.Filter = "KKI file (*.kki)|*.kki";
-                    break;
-            }
-            if (sfd.ShowDialog() == DialogResult.OK)
-            {
-                InitialDirectory = sfd.InitialDirectory.ToString();
-                FileNames = sfd.FileNames;
-            }
-        }
         
         public static string NullTerminated(this string Source, ref int i, byte End)
         {
@@ -164,8 +47,10 @@ namespace KKdMainLib
         public static bool StartsWith(this Dictionary<string, object> Dict, string[] args)
         {
             Dictionary<string, object> bufDict = new Dictionary<string, object>();
-            if (Dict == null)
-                Dict = new Dictionary<string, object>();
+                 if (Dict == null)    return false;
+            else if (args.Length < 1) return false;
+
+            args[0] = args[0].ToLower();
             if (args.Length > 1)
             {
                 string[] NewArgs = new string[args.Length - 1];
@@ -231,10 +116,11 @@ namespace KKdMainLib
             out string  value, string[] args)
         {
             value = "";
-            if (Dict == null)         return false;
+                 if (Dict == null)    return false;
             else if (args.Length < 1) return false;
 
-            if (!Dict.ContainsKey(args[0])) return false;
+            args[0] = args[0].ToLower();
+                 if (!Dict.ContainsKey(args[0])) return false;
             else if (args.Length > 1)
             {
                 string[] NewArgs = new string[args.Length - 1];
@@ -260,7 +146,10 @@ namespace KKdMainLib
             string[] args, string value)
         {
             Dictionary<string, object> bufDict = new Dictionary<string, object>();
-            if (Dict == null) Dict = new Dictionary<string, object>();
+                 if (Dict == null) Dict = new Dictionary<string, object>();
+            else if (args.Length < 1) return;
+
+            args[0] = args[0].ToLower();
             if (args.Length > 1)
             {
                 string[] NewArgs = new string[args.Length - 1];
@@ -295,21 +184,5 @@ namespace KKdMainLib
             for (i = 0; i < Length; i++) B[i] = int.Parse(A[i]);
             return B;
         }
-        
-        public enum Format : byte
-        {
-            NULL =  0,
-            DT   =  1,
-            PDA  =  2,
-            DT2  =  3,
-            DTe  =  4,
-            F    =  5,
-            FT   =  6,
-            F2LE =  7,
-            F2BE =  8,
-            MGF  =  9,
-            X    = 10,
-            XHD  = 11,
-        }
     }
 }

KKdMainLib/MessagePack/MPExt.cs

@@ -1,70 +0,0 @@
-using KKdMainLib.IO;
-using MPIO = KKdMainLib.MessagePack.IO;
-
-namespace KKdMainLib.MessagePack
-{
-    public static class MPExt
-    {
-        public static MsgPack ReadMPAllAtOnce(this string file, bool JSON = false)
-        {
-            MsgPack MsgPack;
-            if (JSON)
-            { JSONIO IO = new JSONIO(File.OpenReader(file + ".json", true));
-                MsgPack = IO.Read(); IO.Close(); IO = null; }
-            else
-            {   MPIO IO = new   MPIO(File.OpenReader(file + ".mp"  , true));
-                MsgPack = IO.Read(); IO.Close(); IO = null; }
-            return MsgPack;
-        }
-
-        public static MsgPack ReadMP(this string file, bool JSON = false)
-        {
-            MsgPack MsgPack;
-            if (JSON)
-            { JSONIO IO = new JSONIO(File.OpenReader(file + ".json"));
-                MsgPack = IO.Read(); IO.Close(); IO = null; }
-            else
-            {   MPIO IO = new   MPIO(File.OpenReader(file + ".mp"  ));
-                MsgPack = IO.Read(); IO.Close(); IO = null; }
-            return MsgPack;
-        }
-        
-        public static void Write(this MsgPack mp, bool Temp, string file, bool JSON = false)
-        { if (Temp) MsgPack.New.Add(mp).Write(file, JSON).Dispose();
-          else                      mp .Write(file, JSON); }
-
-        public static MsgPack Write(this MsgPack mp, string file, bool JSON = false)
-        {
-            if (JSON)
-            { JSONIO IO = new JSONIO(File.OpenWriter(file + ".json", true));
-                IO.Write(mp, "\n", "  ").Close(); IO = null; }
-            else
-            {   MPIO IO = new   MPIO(File.OpenWriter(file + ".mp"  , true));
-                IO.Write(mp            ).Close(); IO = null; }
-            return mp;
-        }
-
-        public static void WriteAfterAll(this MsgPack mp, bool Temp, string file, bool JSON = false)
-        { if (Temp) MsgPack.New.Add(mp).WriteAfterAll(file, JSON).Dispose();
-          else                        mp .WriteAfterAll(file, JSON); }
-
-        public static MsgPack WriteAfterAll(this MsgPack mp, string file, bool JSON = false)
-        {
-            byte[] data = null;
-            if (JSON)
-            { JSONIO IO = new JSONIO(File.OpenWriter());
-                IO.Write(mp, true); data = IO.ToArray(true); }
-            else
-            {   MPIO IO = new   MPIO(File.OpenWriter());
-                IO.Write(mp      ); data = IO.ToArray(true); }
-            File.WriteAllBytes(file + (JSON ? ".json" : ".mp"), data);
-            return mp;
-        }
-
-        public static void ToJSON   (this string file) =>
-            file.ReadMP(    ).Write(file, true).Dispose();
-
-        public static void ToMsgPack(this string file) =>
-            file.ReadMP(true).Write(file      ).Dispose();
-    }
-}

KKdMainLib/Mot.cs

@@ -0,0 +1,325 @@
+//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
+
+using KKdBaseLib;
+using KKdMainLib.IO;
+
+namespace KKdMainLib
+{
+    public struct Mot
+    {
+        private int i, i0, i1;
+        private MotHeader[] MOT;
+        private Stream IO;
+
+        public void MOTReader(string file)
+        {
+            IO = File.OpenReader(file + ".bin");
+
+            i = 0;
+            while (true)
+                if    (IO.ReadInt64() == 0) break;
+                else { IO.ReadInt64(); i++; }
+            if (i == 0) return;
+
+            int MOTCount = i;
+            MsgPack m = new MsgPack(MOTCount, "Mot");
+            MOT = new MotHeader[MOTCount];
+            for (i = 0; i < MOTCount; i++)
+            {
+                ref MotHeader Mot = ref MOT[i];
+                Mot.KeySet    .Offset = IO.ReadInt32();
+                Mot.KeySetTypesOffset = IO.ReadInt32();
+                Mot.     KeySetOffset = IO.ReadInt32();
+                Mot.BoneInfo  .Offset = IO.ReadInt32();
+            }
+
+            for (i = 0; i < MOTCount; i++)
+            {
+                ref MotHeader Mot = ref MOT[i];
+
+                i0 = 1;
+                IO.Position = Mot.BoneInfo.Offset;
+                IO.ReadUInt16();
+                while (IO.ReadUInt16() != 0) i0++;
+
+                Mot.BoneInfo.Value = new BoneInfo[i0];
+                IO.Position = Mot.BoneInfo.Offset;
+                for (i0 = 0; i0 < Mot.BoneInfo.Value.Length; i0++)
+                    Mot.BoneInfo.Value[i0].Id = IO.ReadUInt16();
+
+                IO.Position = Mot.KeySet.Offset;
+                int info = IO.ReadUInt16();
+                Mot.HighBits = info >> 14;
+                Mot.FrameCount = IO.ReadUInt16();
+
+                Mot.KeySet.Value = new KeySet[info & 0x3FFF];
+                IO.Position = Mot.KeySetTypesOffset;
+                for (i0 = 0; i0 < Mot.KeySet.Value.Length; i0++)
+                {
+                    if (i0 % 8 == 0) i1 = IO.ReadUInt16();
+
+                    Mot.KeySet.Value[i0] = new KeySet { Type = (KeySetType)((i1 >> (i0 % 8 * 2)) & 0b11) };
+                }
+
+                IO.Position = Mot.KeySetOffset;
+                for (i0 = 0; i0 < Mot.KeySet.Value.Length; i0++)
+                {
+                    ref KeySet Key = ref Mot.KeySet.Value[i0];
+                    if (Key.Type == KeySetType.Static)
+                    {   Key.Keys = new KFT2<ushort, float>[1];
+                        Key.Keys[0].V = IO.ReadSingle(); }
+                    else if (Key.Type == KeySetType.Linear)
+                    {
+                        Key.Keys = new KFT2<ushort, float>[IO.ReadUInt16()];
+                        for (i1 = 0; i1 < Key.Keys.Length; i1++)
+                            Key.Keys[i1].F = IO.ReadUInt16();
+                        IO.Align(0x4);
+                        for (i1 = 0; i1 < Key.Keys.Length; i1++)
+                            Key.Keys[i1].V = IO.ReadSingle();
+                    }
+                    else if (Key.Type == KeySetType.Interpolated)
+                    {
+                        Key.Keys = new KFT2<ushort, float>[IO.ReadUInt16()];
+                        for (i1 = 0; i1 < Key.Keys.Length; i1++)
+                          Key.Keys[i].F = IO.ReadUInt16();
+                        IO.Align(0x4);
+                        for (i1 = 0; i1 < Key.Keys.Length; i1++)
+                        { Key.Keys[i1].V = IO.ReadSingle(); Key.Keys[i1].T = IO.ReadSingle(); }
+                    }
+                }
+            }
+            IO.Close();
+        }
+
+        public void MOTWriter(string file)
+        {
+            if (MOT == null) return;
+            IO = File.OpenWriter(file + ".bin");
+
+            int MOTCount = MOT.Length;
+            IO.Position = (MOTCount + 1) << 4;
+            for (i = 0; i < MOTCount; i++)
+            {
+                ref MotHeader Mot = ref MOT[i];
+                Mot.KeySet.Offset = IO.Position;
+                IO.Write((ushort)((Mot.HighBits << 14) | (Mot.KeySet.Value.Length & 0x3FFF)));
+                IO.Write((ushort)Mot.FrameCount);
+
+                Mot.KeySetTypesOffset = IO.Position;
+                for (i0 = 0, i1 = 0; i0 < Mot.KeySet.Value.Length; i0++)
+                {
+                    i1 |= ((byte)Mot.KeySet.Value[i0].Type << (i0 % 8 * 2)) & (0b11 << (i0 % 8 * 2));
+
+                    if (i0 % 8 == 7) { IO.Write((ushort)i1); i1 = 0; }
+                }
+                IO.Write((ushort)i1);
+
+                IO.Align(0x4);
+                Mot.KeySetOffset = IO.Position;
+                for (i0 = 0; i0 < Mot.KeySet.Value.Length; i0++)
+                {
+                    ref KeySet Key = ref Mot.KeySet.Value[i0];
+                    if (Key.Type == KeySetType.Static)
+                        IO.Write(Key.Keys[0].V); 
+                    else if (Key.Type == KeySetType.Linear)
+                    {
+                        IO.Write((ushort)Key.Keys.Length);
+                        for (i1 = 0; i1 < Key.Keys.Length; i1++)
+                            IO.Write(Key.Keys[i1].F);
+                        IO.Align(0x4);
+                        for (i1 = 0; i1 < Key.Keys.Length; i1++)
+                            IO.Write(Key.Keys[i1].V);
+                    }
+                    else if (Key.Type == KeySetType.Interpolated)
+                    {
+                        IO.Write((ushort)Key.Keys.Length);
+                        for (i1 = 0; i1 < Key.Keys.Length; i1++)
+                          IO.Write(Key.Keys[i1].F);
+                        IO.Align(0x4);
+                        for (i1 = 0; i1 < Key.Keys.Length; i1++)
+                        { IO.Write(Key.Keys[i1].V); IO.Write(Key.Keys[i1].T); }
+                    }
+                }
+                IO.Align(0x4);
+
+                Mot.BoneInfo.Offset = IO.Position;
+                for (i0 = 0; i0 < Mot.BoneInfo.Value.Length; i0++)
+                    IO.Write((ushort)Mot.BoneInfo.Value[i0].Id);
+                IO.Write((ushort)0);
+            }
+            IO.Align(0x4, true);
+
+            IO.Position = 0;
+            for (i = 0; i < MOTCount; i++)
+            {
+                ref MotHeader Mot = ref MOT[i];
+                IO.Write(Mot.KeySet    .Offset);
+                IO.Write(Mot.KeySetTypesOffset);
+                IO.Write(Mot.     KeySetOffset);
+                IO.Write(Mot.BoneInfo  .Offset);
+            }
+
+            IO.Close();
+        }
+
+        public void MsgPackReader(string file, bool JSON)
+        {
+            MOT = null;
+
+            MsgPack MsgPack = file.ReadMP(JSON);
+            MsgPack MOTS;
+            if ((MOTS = MsgPack["MOT"]).NotNull)
+            {
+                MOT = new MotHeader[MOTS.Array.Length];
+                for (int i = 0; i < MOT.Length; i++)
+                    MsgPackReader(MOTS.Array[i], ref MOT[i]);
+            }
+            MOTS.Dispose();
+            MsgPack.Dispose();
+        }
+
+        public void MsgPackWriter(string file, bool JSON)
+        {
+            int MOTCount = MOT.Length;
+            MsgPack MOTS = new MsgPack(MOTCount, "MOT");
+            for (i = 0; i < MOTCount; i++)
+                MOTS[i] = MsgPackWriter(ref MOT[i]);
+            MOTS.Write(true, file, JSON);
+        }
+
+        public void MsgPackReader(MsgPack MOT, ref MotHeader Mot)
+        {
+            MsgPack Temp = MsgPack.New;
+            Mot.HighBits   = MOT.ReadInt32("HighBits"  );
+            Mot.FrameCount = MOT.ReadInt32("FrameCount");
+
+            if ((Temp = MOT["KeySets", true]).IsNull) { Temp.Dispose(); return; }
+
+            Mot.KeySet.Value = new KeySet[Temp.Array.Length];
+            for (i0 = 0; i0 < Mot.KeySet.Value.Length; i0++)
+            {
+                ref KeySet KeySet = ref Mot.KeySet.Value[i0];
+
+                if (Temp.Array[i0].Array == null || Temp.Array[i0].Array.Length != 2) continue;
+                KeySet.Type = (KeySetType)Temp.Array[i0].Array[0].ReadInt32();
+
+                MsgPack keySet = Temp.Array[i0].Array[1];
+
+                if (keySet.Array == null) { KeySet.Type = 0; continue; }
+                else if (KeySet.Type == KeySetType.None) continue;
+                else if (KeySet.Type == KeySetType.Static)
+                {
+                    KeySet.Keys = new KFT2<ushort, float>[1];
+                    KeySet.Keys[0].F = keySet.Array[0][0].ReadUInt16();
+                    KeySet.Keys[0].V = keySet.Array[0][1].ReadSingle();
+                }
+                else if (KeySet.Type == KeySetType.Linear)
+                {
+                    KeySet.Keys = new KFT2<ushort, float>[keySet.Array.Length];
+                    for (i1 = 0; i1 < keySet.Array.Length; i1++)
+                    {
+                        KeySet.Keys[i1].F = keySet.Array[i1][0].ReadUInt16();
+                        KeySet.Keys[i1].V = keySet.Array[i1][1].ReadSingle();
+                    }
+                }
+                else if (KeySet.Type == KeySetType.Interpolated)
+                {
+                    KeySet.Keys = new KFT2<ushort, float>[keySet.Array.Length];
+                    for (i1 = 0; i1 < keySet.Array.Length; i1++)
+                    {
+                        KeySet.Keys[i1].F = keySet.Array[i1][0].ReadUInt16();
+                        KeySet.Keys[i1].V = keySet.Array[i1][1].ReadSingle();
+                        KeySet.Keys[i1].T = keySet.Array[i1][2].ReadSingle();
+                    }
+                }
+            }
+            
+            if ((Temp = MOT["BoneInfo", true]).NotNull)
+            {
+                Mot.BoneInfo.Value = new BoneInfo[Temp.Array.Length];
+                for (i = 0; i < Mot.BoneInfo.Value.Length; i++)
+                    Mot.BoneInfo.Value[i].Id = Temp[i].ReadInt32();
+            }
+            Temp.Dispose();
+        }
+
+        public MsgPack MsgPackWriter(ref MotHeader Mot)
+        {
+            MsgPack MOT = MsgPack.NewReserve(4).Add("FrameCount", Mot.FrameCount).Add("HighBits", Mot.HighBits);
+
+            MsgPack KeySets = new MsgPack(Mot.KeySet.Value.Length, "KeySets");
+            for (i0 = 0; i0 < Mot.KeySet.Value.Length; i0++)
+            {
+                ref KeySet KeySet = ref Mot.KeySet.Value[i0];
+                if (KeySet.Type == KeySetType.None) continue;
+
+                KeySets[i0] = new MsgPack(2);
+                KeySets[i0].Array[0] = (byte)KeySet.Type;
+                KeySets[i0].Array[1] = new MsgPack(KeySet.Keys.Length);
+                if (KeySet.Type == KeySetType.Static)
+                {
+                    KeySets[i0].Array[1][0] = new MsgPack(2);
+                    KeySets[i0].Array[1][0].Array[0] = KeySet.Keys[0].F;
+                    KeySets[i0].Array[1][0].Array[1] = KeySet.Keys[0].V;
+                }
+                else if (KeySet.Type == KeySetType.Linear)
+                    for (i1 = 0; i1 < KeySet.Keys.Length; i1++)
+                    {
+                        KeySets[i0].Array[1][i1] = new MsgPack(2);
+                        KeySets[i0].Array[1][i1].Array[0] = KeySet.Keys[i1].F;
+                        KeySets[i0].Array[1][i1].Array[1] = KeySet.Keys[i1].V;
+                    }
+                else
+                    for (i1 = 0; i1 < KeySet.Keys.Length; i1++)
+                    {
+                        KeySets[i0].Array[1][i1] = new MsgPack(3);
+                        KeySets[i0].Array[1][i1].Array[0] = KeySet.Keys[i1].F;
+                        KeySets[i0].Array[1][i1].Array[1] = KeySet.Keys[i1].V;
+                        KeySets[i0].Array[1][i1].Array[2] = KeySet.Keys[i1].T;
+                    }
+            }
+            MOT.Add(KeySets);
+
+            MsgPack BoneInfo = new MsgPack(Mot.BoneInfo.Value.Length, "BoneInfo");
+            for (i0 = 0; i0 < Mot.BoneInfo.Value.Length; i0++)
+                BoneInfo[i0] = Mot.BoneInfo.Value[i0].Id;
+            MOT.Add(BoneInfo);
+
+            return MOT;
+        }
+
+        public struct MotHeader
+        {
+            public int      KeySetOffset;
+            public int KeySetTypesOffset;
+            public Pointer< KeySet []>  KeySet ;
+            public Pointer<BoneInfo[]> BoneInfo;
+
+            public int HighBits;
+            public int FrameCount;
+        }
+
+        public struct KeySet
+        {
+            public KFT2<ushort, float>[] Keys;
+            public KeySetType Type;
+
+            public override string ToString() => $"Type: {Type}" + (Type == KeySetType.Static ?
+                $"; Value: {Keys[0].Check()}" : Type > KeySetType.Static ? $"; Keys: {Keys.Length}" : "");
+        }
+
+        public enum KeySetType : byte
+        {
+            None         = 0b00,
+            Static       = 0b01,
+            Linear       = 0b10,
+            Interpolated = 0b11,
+        }
+
+        public struct BoneInfo
+        {
+            public string Name;
+            public int Id;
+        }
+    }
+}

KKdMainLib/Properties/AssemblyInfo.cs

@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("2BA7EFC6-91D1-8BBC-C487-06C7F36CC789")]
-[assembly: AssemblyVersion("0.4.7.0")]
-[assembly: AssemblyFileVersion("0.4.7.0")]
+[assembly: AssemblyVersion("0.4.7.5")]
+[assembly: AssemblyFileVersion("0.4.7.5")]

KKdMainLib/STR.cs

@@ -1,7 +1,6 @@
 using KKdBaseLib;
+using KKdBaseLib.F2;
 using KKdMainLib.IO;
-using KKdMainLib.F2nd;
-using KKdMainLib.MessagePack;
 
 namespace KKdMainLib
 {
@@ -23,13 +22,12 @@ namespace KKdMainLib
             IO =  File.OpenReader(filepath + ext);
 
             Header = new Header();
-            IO.Format = Main.Format.F;
+            IO.Format = Format.F;
             Header.Signature = IO.ReadInt32();
             if (Header.Signature == 0x41525453)
             {
-                Header = IO.ReadHeader(true);
-                POF = Header.AddPOF();
-                IO.Position = Header.Length;
+                Header = IO.ReadHeader(true, false);
+                POF.Offsets = KKdList<long>.New;
                 
                 long Count = IO.ReadInt32Endian();
                 Offset = IO.ReadInt32Endian();
@@ -40,7 +38,7 @@ namespace KKdMainLib
                     OffsetX = IO.ReadInt64();
                     Count   = IO.ReadInt64();
                     IO.Offset = Header.Length;
-                    IO.Format = Main.Format.X;
+                    IO.Format = Format.X;
                     IO.LongOffset += Offset;
                     IO.Position = 0;
                 }
@@ -48,13 +46,16 @@ namespace KKdMainLib
 
                 STRs = new String[Count];
                 for (int i = 0; i < Count; i++)
-                    STRs[i].ID  = IO.ReadInt32Endian();
+                {
+                    STRs[i].Str.Offset = IO.ReadInt32Endian();
+                    STRs[i].ID         = IO.ReadInt32Endian();
+                }
 
                 if (IO.IsX)
                 {
-                    IO.Offset = Header.Length;
+                    IO.LongOffset = Header.Length + OffsetX;
                     for (int i = 0; i < Count; i++)
-                        STRs[i].Str.Value = IO.ReadStringAtOffset(STRs[i].Str.Offset + OffsetX);
+                        STRs[i].Str.Value = IO.ReadStringAtOffset(STRs[i].Str.Offset);
                 }
                 else
                 {
@@ -63,9 +64,6 @@ namespace KKdMainLib
                         STRs[i].Str.Value = STRs[i].Str.Offset > 0 ?
                             IO.ReadStringAtOffset(STRs[i].Str.Offset) : null;
                 }
-
-                IO.Position = POF.Offset;
-                IO.ReadPOF(ref POF);
             }
             else
             {
@@ -92,20 +90,19 @@ namespace KKdMainLib
 
         public void STRWriter(string filepath)
         {
-            if (STRs == null || STRs.Length == 0 || Header.Format > Main.Format.F2BE) return;
+            if (STRs == null || STRs.Length == 0 || Header.Format > Format.F2BE) return;
             uint Offset = 0;
             uint CurrentOffset = 0;
-            IO = File.OpenWriter(filepath + (Header.Format > Main.Format.FT ? ".str" : ".bin"), true);
+            IO = File.OpenWriter(filepath + (Header.Format > Format.FT ? ".str" : ".bin"), true);
             IO.Format = Header.Format;
-            POF = new POF();
-            IO.IsBE = IO.Format == Main.Format.F2BE;
+            POF.Offsets = KKdList<long>.New;
+            IO.IsBE = IO.Format == Format.F2BE;
 
             long Count = STRs.LongLength;
-            if (IO.Format > Main.Format.FT)
+            if (IO.Format > Format.FT)
             {
                 IO.Position = 0x40;
-                IO.WriteX(Count);
-                IO.GetOffset(ref POF);
+                IO.WriteX(Count, ref POF);
                 IO.WriteX(0x80);
                 IO.Position = 0x80;
                 for (int i = 0; i < Count; i++) IO.Write(0x00L);
@@ -120,6 +117,10 @@ namespace KKdMainLib
             KKdList<string> UsedSTR = KKdList<string>.New;
             KKdList<int> UsedSTRPos = KKdList<int>.New;
             int[] STRPos = new int[Count];
+
+            UsedSTRPos.Add(IO.Position);
+            UsedSTR.Add("");
+            IO.WriteByte(0);
             for (int i = 0; i < Count; i++)
             {
                 if (!UsedSTR.Contains(STRs[i].Str.Value))
@@ -127,35 +128,36 @@ namespace KKdMainLib
                     STRPos[i] = IO.Position;
                     UsedSTRPos.Add(STRPos[i]);
                     UsedSTR.Add(STRs[i].Str.Value);
-                    IO.Write(STRs[i].Str.Value + "\0");
+                    IO.Write(STRs[i].Str.Value);
+                    IO.WriteByte(0);
                 }
                 else
                     for (int i2 = 0; i2 < Count; i2++)
-                        if (UsedSTR[i2] == STRs[i].Str.Value)
-                        { STRPos[i] = UsedSTRPos[i2]; break; }
+                        if (UsedSTR[i2] == STRs[i].Str.Value) { STRPos[i] = UsedSTRPos[i2]; break; }
             }
 
-            if (IO.Format > Main.Format.FT)
+            if (IO.Format > Format.FT)
             {
                 IO.Align(0x10);
                 Offset = IO.UIntPosition;
                 IO.Position = 0x80;
                 for (int i = 0; i < Count; i++)
                 {
-                    IO.GetOffset(ref POF);
+                    POF.Offsets.Add(IO.Position);
                     IO.WriteEndian(STRPos[i]);
                     IO.WriteEndian(STRs[i].ID);
                 }
 
                 IO.UIntPosition = Offset;
-                IO.Write(ref POF, 1);
+                POF.Depth = 1;
+                IO.Write(POF);
                 CurrentOffset = IO.UIntPosition;
-                IO.WriteEOFC(0);
+                IO.WriteEOFC();
                 Header.DataSize = (int)(CurrentOffset - 0x40);
                 Header.Signature = 0x41525453;
                 Header.SectionSize = (int)(Offset - 0x40);
                 IO.Position = 0;
-                IO.Write(Header);
+                IO.Write(Header, true);
             }
             else
             {
@@ -167,21 +169,24 @@ namespace KKdMainLib
 
         public void MsgPackReader(string file, bool JSON)
         {
+            MsgPack Temp;
             MsgPack MsgPack = file.ReadMPAllAtOnce(JSON);
-            if (!MsgPack.Element("STR", out MsgPack STR)) return;
+            if ((Temp = MsgPack["STR"]).NotNull) return;
+
             Header = new Header();
-            System.Enum.TryParse(STR.ReadString("Format"), out Header.Format);
+            System.Enum.TryParse(Temp.ReadString("Format"), out Header.Format);
 
-            if (!STR.ElementArray("Strings", out MsgPack Strings)) return;
+            if ((Temp = MsgPack["Strings", true]).IsNull) return;
 
-            STRs = new String[Strings.Array.Length];
+            STRs = new String[Temp.Array.Length];
             for (int i = 0; i < STRs.Length; i++)
             {
-                STRs[i].ID        = Strings[i].ReadInt32 ("ID" );
-                STRs[i].Str.Value = Strings[i].ReadString("Str");
+                STRs[i].ID        = Temp[i].ReadInt32 ("ID" );
+                STRs[i].Str.Value = Temp[i].ReadString("Str");
+                if (STRs[i].Str.Value == null) STRs[i].Str.Value = "";
             }
 
-            MsgPack = MsgPack.New;
+            MsgPack.Dispose();
         }
 
         public void MsgPackWriter(string file, bool JSON)
@@ -192,8 +197,9 @@ namespace KKdMainLib
             for (int i = 0; i < STRs.Length; i++)
             {
                 Strings[i] = MsgPack.New.Add("ID", STRs[i].ID);
-                if (STRs[i].Str.Value != null || STRs[i].Str.Value != "")
-                    Strings[i] = Strings[i].Add("Str", STRs[i].Str.Value);
+                if (STRs[i].Str.Value != null)
+                    if (STRs[i].Str.Value != "")
+                        Strings[i] = Strings[i].Add("Str", STRs[i].Str.Value);
             }
             STR_.Add(Strings);
 

KKdSoundLib/DIVA.cs

@@ -95,7 +95,7 @@ namespace KKdSoundLib
                         ref currentclampPtr[c], ref stepindexPtr[c]);
                     writer.Write(value, 4);
                 }
-            writer.CheckWrited();
+            writer.CW();
 
             writer.LongPosition = 0x00;
             writer.Write("DIVA");

KKdSoundLib/Properties/AssemblyInfo.cs

@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("D8A3F2D7-10CC-5723-EC9A-45D3B9C2DFEA")]
-[assembly: AssemblyVersion("0.0.3.0")]
-[assembly: AssemblyFileVersion("0.0.3.0")]
+[assembly: AssemblyVersion("0.1.0.0")]
+[assembly: AssemblyFileVersion("0.1.0.0")]

KKdSoundLib/VAG.cs

@@ -89,7 +89,6 @@ namespace KKdSoundLib
                             VAGData.DataPtr[i  * ch + c] = temp_bufferPtr[i ];
                             VAGData.DataPtr[i2 * ch + c] = temp_bufferPtr[i2];
                         }
-
                     }
             else
                 for (i1 = 0; i1 < VAGData.Size; i1++, VAGData.DataPtr += VBS)
@@ -110,29 +109,7 @@ namespace KKdSoundLib
 
                     VAG_1 = HEVAG1Ptr[PrNR]; VAG_2 = HEVAG2Ptr[PrNR];
                     tS1 = S1Ptr[c]; tS2 = S2Ptr[c];
-
-                    i = 0; i2 = 1;
-                    while (i < BS)
-                    {
-                        d0 = four_bitPtr[i];
-                        d1 = four_bitPtr[i2];
-                        if (d0 > 7) d0 -= 16;
-                        if (d1 > 7) d1 -= 16;
-                        d0 = d0 << (20 - ShF);
-                        d1 = d1 << (20 - ShF);
-
-                        g = ((tS1 >> 8) * VAG_1 + (tS2 >> 8) * VAG_2) >> 5;
-                        tS2 = tS1; tS1 = g + d0;
-
-                        g = ((tS1 >> 8) * VAG_1 + (tS2 >> 8) * VAG_2) >> 5;
-                        tS2 = tS1; tS1 = g + d1;
-
-                        temp_bufferPtr[i ] = tS2;
-                        temp_bufferPtr[i2] = tS1;
-                        i  += 2;
-                        i2 += 2;
-                    }
-
+                    DecodeVAG();
                     S1Ptr[c] = tS1; S2Ptr[c] = tS2;
 
                     for (i = 0, i2 = 1; i < BS; i += 2, i2 += 2)
@@ -147,6 +124,31 @@ namespace KKdSoundLib
             Success = true;
         }
 
+        private void DecodeVAG()
+        {
+            i = 0; i2 = 1;
+            while (i < BS)
+            {
+                d0 = four_bitPtr[i];
+                d1 = four_bitPtr[i2];
+                if (d0 > 7) d0 -= 16;
+                if (d1 > 7) d1 -= 16;
+                d0 <<= 20 - ShF;
+                d1 <<= 20 - ShF;
+
+                g = ((tS1 >> 8) * VAG_1 + (tS2 >> 8) * VAG_2) >> 5;
+                tS2 = tS1; tS1 = g + d0;
+
+                g = ((tS1 >> 8) * VAG_1 + (tS2 >> 8) * VAG_2) >> 5;
+                tS2 = tS1; tS1 = g + d1;
+
+                temp_bufferPtr[i ] = tS2;
+                temp_bufferPtr[i2] = tS1;
+                i  += 2;
+                i2 += 2;
+            }
+        }
+
         private void DecodeHEVAG()
         {
             i = 0; i2 = 1;
@@ -156,8 +158,8 @@ namespace KKdSoundLib
                 d1 = four_bitPtr[i2];
                 if (d0 > 7) d0 -= 16;
                 if (d1 > 7) d1 -= 16;
-                d0 = d0 << (20 - ShF);
-                d1 = d1 << (20 - ShF);
+                d0 <<= 20 - ShF;
+                d1 <<= 20 - ShF;
 
                 g = ((tS1 >> 8) * HEVAG_1 + (tS2 >> 8) * HEVAG_2 +
                      (tS3 >> 8) * HEVAG_3 + (tS4 >> 8) * HEVAG_4) >> 5;
@@ -198,7 +200,7 @@ namespace KKdSoundLib
             for (i1 = 0, i2 = 0; i1 < VAGData.Size; i1++, VAGData.DataPtr += VBS)
             {
                 Flag = VAGData.Flags[i1];
-                if (!IgnoreEndFlags && Flag == 5 || Flag == 7) break;
+                if (!IgnoreEndFlags && (Flag == 5 || Flag == 7)) break;
                 if (Flag < 8)
                     for (i = 0; i < BS; i++)
                         for (c = 0; c < ch; c++)
@@ -249,7 +251,7 @@ namespace KKdSoundLib
             for (i1 = 1, i2 = 0; i1 < VAGData.Size; i1++, VAGData.DataPtr += VBS)
             {
                 Flag = VAGData.Flags[i1];
-                if (!IgnoreEndFlags && Flag == 5 || Flag == 7) break;
+                if (!IgnoreEndFlags && (Flag == 5 || Flag == 7)) break;
                 else if (!IgnoreEndFlags && Flag == 6)
                 {
                     Header = new WAV.Header { Bytes = 4, Channels = ch, Format = 3, SampleRate =
@@ -477,7 +479,6 @@ namespace KKdSoundLib
             four_bit    = new int[BS];           four_bitPtr = four_bit   .GetPtr();
             data_buffer = new int[BS];        data_bufferPtr = data_buffer.GetPtr();
             temp_buffer = new int[BS];        temp_bufferPtr = temp_buffer.GetPtr();
-            buffer = new int[PrNRCount, BS];
 
             writer.Write(0x70474156);
             if (HEVAG) writer.WriteEndian(0x00020001, true);
@@ -582,65 +583,81 @@ namespace KKdSoundLib
         private int min, ShM, S1, S2, S3, S4, tS1, tS2, tS3, tS4, PrNRf;
         private int VAG_1, VAG_2, HEVAG_1, HEVAG_2, HEVAG_3, HEVAG_4;
         private int[] data_buffer, error, four_bit, max, S_1, S_2, S_3, S_4, temp_buffer;
-        private int[,] buffer;
         private int* data_bufferPtr, errorPtr, four_bitPtr, maxPtr, temp_bufferPtr;
-
+        
         private void Calc4BitsVAG()
         {
-            ShF = min = 134217728;
-            for (j = 0; j < 5; j++)
+            PrNRf = 0;
+            min   = 134217728;
+            for (j = 0; j < PrNRCount; j++)
             {
-                maxPtr[j] = 0;
-                S1 = S1Ptr[c]; S2 = S2Ptr[c];
-                VAG_1 = HEVAG1Ptr[j]; VAG_2 = HEVAG2Ptr[j];
-                for (i = 0; i < 28; i++)
+                PrNR = j;
+
+                Calc4Bits_VAG();
+
+                tS1 = S1Ptr[c]; tS2 = S2Ptr[c];
+                DecodeVAG();
+                i = 0;
+                errorPtr[j] = 0;
+                while (i < BS)
                 {
-                    g = data_bufferPtr[i];
-                    e = ((S1 >> 8) * VAG_1 + (S2 >> 8) * VAG_2) >> 5;
-                    e = g - e;
-                    if (e >  7864319) e =  7864319;
-                    if (e < -7864320) e = -7864320;
-                    buffer[j, i] = e;
+                    e = data_bufferPtr[i] - temp_bufferPtr[i];
                     if (e < 0) e = -e;
-                    if (e > maxPtr[j]) maxPtr[j] = e;
-                    S2 = S1; S1 = g;
+                    errorPtr[j] += e;
+                    i++;
                 }
 
-                if (maxPtr[j] < min) { PrNR = j; min = maxPtr[j]; }
+                if (errorPtr[j] < min) { PrNRf = j; min = errorPtr[j]; }
             }
-            
-            S1Ptr[c] = S1; S2Ptr[c] = S2;
+            PrNR = PrNRf;
 
-            ShF = 0;
-            ShM = 0x4000;
-            min = min >> 8;
-            
-            while (ShF < 12)
+            Calc4Bits_VAG();
+            S1Ptr[c] =  S1; S2Ptr[c] =  S2;
+            S_1  [c] = tS1; S_2  [c] = tS2;
+        }
+
+        private void Calc4Bits_VAG()
+        {
+            S1 = S1Ptr[c]; S2 = S2Ptr[c];
+            VAG_1 = HEVAG1Ptr[PrNR]; HEVAG_2 = HEVAG2Ptr[PrNR];
+
+            i = 0;
+            maxPtr[PrNR] = 0;
+            while (i < BS)
             {
-                e = min + (ShM >> 3);
-                if ((ShM & e) == ShM)
-                    break;
-                ShF++;
-                ShM >>= 1;
+                g = data_bufferPtr[i];
+                e = ((S1 >> 8) * VAG_1 + (S2 >> 8) * VAG_2) >> 5;
+                e = g - e;
+                if (e >  7864319) e =  7864319;
+                if (e < -7864320) e = -7864320;
+                temp_bufferPtr[i] = e;
+                if (e < 0) e = -e;
+                if (e > maxPtr[PrNR]) maxPtr[PrNR] = e;
+                S2 = S1; S1 = g;
+                i++;
             }
 
-            S1 = S_1[c]; S2 = S_2[c];
-            for (i = 0; i < 28; i++)
+            for (ShF = 0, ShM = 0x400000; ShF < 15; ShF++, ShM >>= 1)
+            { e = maxPtr[PrNR] + (ShM >> 3); if ((ShM & e) == ShM) break; }
+
+            tS1 = S_1[c]; tS2 = S_2[c];
+            i = 0;
+            while (i < BS)
             {
-                g = buffer[PrNR, i];
-                e = ((S1 >> 8) * HEVAG1Ptr[PrNR] + (S2 >> 8) * HEVAG2Ptr[PrNR]) >> 5;
+                g = temp_bufferPtr[i];
+                e = ((tS1 >> 8) * VAG_1 + (tS2 >> 8) * VAG_2) >> 5;
                 e = g - e;
 
                 d1 = e << ShF;
-                d0 = (int)((uint)d1 + 0x80000) >> 20;
+                d0 = (d1 + 0x80000) >> 20;
                 if (d0 >  7) d0 =  7;
                 if (d0 < -8) d0 = -8;
                 four_bitPtr[i] = d0 & 0xF;
-                d0 = d0 << (20 - ShF);
+                d0 <<= 20 - ShF;
 
-                S2 = S1; S1 = d0 - e;
+                tS2 = tS1; tS1 = d0 - e;
+                i++;
             }
-            S_1[c] = S1; S_2[c] = S2;
         }
         
         private void Calc4BitsHEVAG()
@@ -714,7 +731,7 @@ namespace KKdSoundLib
                 if (d0 >  7) d0 =  7;
                 if (d0 < -8) d0 = -8;
                 four_bitPtr[i] = d0 & 0xF;
-                d0 = d0 << (20 - ShF);
+                d0 <<= 20 - ShF;
 
                 tS4 = tS3; tS3 = tS2; tS2 = tS1; tS1 = d0 - e;
                 i++;

PD_Tool/PD_Tool.csproj

@@ -39,14 +39,19 @@
     <NoWarn>IDE0044, IDE0045, IDE0046, IDE0055, IDE0059, IDE1006</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="classes\DataBase.cs" />
     <Compile Include="classes\Tools\A3D.cs" />
     <Compile Include="classes\Tools\AET.cs" />
+    <Compile Include="classes\Tools\BLT.cs" />
+    <Compile Include="classes\Tools\CCT.cs" />
     <Compile Include="classes\Tools\DB.cs" />
     <Compile Include="classes\Tools\DEX.cs" />
+    <Compile Include="classes\Tools\DFT.cs" />
     <Compile Include="classes\Tools\DIV.cs" />
+    <Compile Include="classes\Tools\LIT.cs" />
+    <Compile Include="classes\Tools\MOT.cs" />
     <Compile Include="classes\Tools\STR.cs" />
     <Compile Include="classes\Tools\VAG.cs" />
+    <Compile Include="classes\DataBase.cs" />
     <Compile Include="classes\DIVAFILE.cs" />
     <Compile Include="classes\FARC.cs" />
     <Compile Include="Program.cs" />

PD_Tool/Program.cs

@@ -1,24 +1,25 @@
-using System;
+using System;
+using System.Windows.Forms;
+using KKdMainLib;
 using KKdMainLib.IO;
-using KKdMain = KKdMainLib.Main;
 using KKdFARC = KKdMainLib.FARC;
 
 namespace PD_Tool
 {
     public static class Program
     {
+        [System.Runtime.InteropServices.DllImport("user32.dll")]
+        private static extern bool SetProcessDPIAware();
+
         [ThreadStatic] public static string function = "";
 
         [STAThread]
         public static void Main(string[] args)
         {
+            SetProcessDPIAware();
+            
             Console.Title = "PD_Tool";
-            if (args.Length == 0)
-            {
-                GC.Collect();
-                while (function != "Q") MainMenu();
-                Exit();
-            }
+            if (args.Length == 0) { while (function != "Q") MainMenu(); Exit(); }
 
             long header;
             Stream reader;
@@ -41,24 +42,27 @@ namespace PD_Tool
 
         private static void MainMenu()
         {
+            Console. InputEncoding = System.Text.Encoding.Unicode;
+            Console.OutputEncoding = System.Text.Encoding.Unicode;
             Console.Title = "PD_Tool";
             Console.Clear();
 
-            KKdMain.ConsoleDesign(true);
-            KKdMain.ConsoleDesign("                Choose action:");
-            KKdMain.ConsoleDesign(false);
-            KKdMain.ConsoleDesign("1. Extract FARC Archive");
-            KKdMain.ConsoleDesign("2. Create  FARC Archive");
-            KKdMain.ConsoleDesign("3. Decrypt from DIVAFILE");
-            KKdMain.ConsoleDesign("4. Encrypt to   DIVAFILE");
-            KKdMain.ConsoleDesign("5. DB_Tools");
-            KKdMain.ConsoleDesign("6. Converting Tools");
-            KKdMain.ConsoleDesign(JSON ? "7. MsgPack to JSON" : "7. JSON to MsgPack");
-            KKdMain.ConsoleDesign(false);
-            KKdMain.ConsoleDesign(JSON ? "M. MessagePack" : "J. JSON");
-            KKdMain.ConsoleDesign("Q. Quit");
-            KKdMain.ConsoleDesign(false);
-            KKdMain.ConsoleDesign(true);
+            ConsoleDesign(true);
+            ConsoleDesign("                Choose action:");
+            ConsoleDesign(false);
+            ConsoleDesign("1. Extract FARC Archive");
+            ConsoleDesign("2. Create  FARC Archive");
+            ConsoleDesign("3. Decrypt from DIVAFILE");
+            ConsoleDesign("4. Encrypt to   DIVAFILE");
+            ConsoleDesign("5. DB_Tools");
+            ConsoleDesign("6. AC/DT/F/AFT/FT Converting Tools");
+            ConsoleDesign("7. F/F2/X/FT      Converting Tools");
+            ConsoleDesign(JSON ? "8. MsgPack to JSON" : "9. JSON to MsgPack");
+            ConsoleDesign(false);
+            ConsoleDesign(JSON ? "M. MessagePack" : "J. JSON");
+            ConsoleDesign("Q. Quit");
+            ConsoleDesign(false);
+            ConsoleDesign(true);
             Console.WriteLine();
 
             function = Console.ReadLine().ToUpper();
@@ -74,28 +78,28 @@ namespace PD_Tool
                  if (function == "1" || function == "2") FARC.Processor(function == "1");
             else if (function == "3" || function == "4")
             {
-                KKdMain.Choose(1, "", out string[] FileNames);
+                Choose(1, "", out string[] FileNames);
                 foreach (string FileName in FileNames) DIVAFILE.Decrypt(FileName);
             }
             else if (function == "5") DataBase.Processor(JSON);
             else if (function == "6")
             {
                 Console.Clear();
-                Console.Title = "Converter Tools";
-                KKdMain.ConsoleDesign(true);
-                KKdMain.ConsoleDesign("                 Choose tool:");
-                KKdMain.ConsoleDesign(false);
-                KKdMain.ConsoleDesign("1. A3DA     Converter");
-                KKdMain.ConsoleDesign("2. AET      Converter");
-                KKdMain.ConsoleDesign("3. DataBank Converter");
-                KKdMain.ConsoleDesign("4. DEX      Converter");
-                KKdMain.ConsoleDesign("5. DIVA     Converter");
-                KKdMain.ConsoleDesign("6. STR      Converter");
-                KKdMain.ConsoleDesign("7. VAG      Converter");
-                KKdMain.ConsoleDesign(false);
-                KKdMain.ConsoleDesign("R. Return to Main Menu");
-                KKdMain.ConsoleDesign(false);
-                KKdMain.ConsoleDesign(true);
+                Console.Title = "AC/DT/F/AFT/FT Converting Tools";
+                ConsoleDesign(true);
+                ConsoleDesign("               Choose converter:");
+                ConsoleDesign(false);
+                ConsoleDesign("1. A3DA"    );
+                ConsoleDesign("2. AET"     );
+                ConsoleDesign("3. DataBank");
+                ConsoleDesign("4. DEX"     );
+                ConsoleDesign("5. DIVA"    );
+                ConsoleDesign("6. MOT"     );
+                ConsoleDesign("7. STR"     );
+                ConsoleDesign(false);
+                ConsoleDesign("R. Return to Main Menu");
+                ConsoleDesign(false);
+                ConsoleDesign(true);
                 Console.WriteLine();
                 string Function = Console.ReadLine();
                 Console.Clear();
@@ -104,20 +108,147 @@ namespace PD_Tool
                 else if (Function == "3") Tools.DB .Processor(JSON);
                 else if (Function == "4") Tools.DEX.Processor(JSON);
                 else if (Function == "5") Tools.DIV.Processor();
-                else if (Function == "6") Tools.STR.Processor(JSON);
-                else if (Function == "7") Tools.VAG.Processor();
+                else if (Function == "6") Tools.MOT.Processor(JSON);
+                else if (Function == "7") Tools.STR.Processor(JSON);
                 else     function = Function;
             }
             else if (function == "7")
             {
-                KKdMain.Choose(1, JSON ? "mp" : "json", out string[] FileNames);
-                if (JSON) foreach (string file in FileNames)
-                        KKdMainLib.MessagePack.MPExt.ToJSON   (file.Replace(Path.GetExtension(file), ""));
-                else      foreach (string file in FileNames)
-                        KKdMainLib.MessagePack.MPExt.ToMsgPack(file.Replace(Path.GetExtension(file), ""));
+                Console.Clear();
+                Console.Title = "F/F2/X/FT Converting Tools";
+                ConsoleDesign(true);
+                ConsoleDesign("               Choose converter:");
+                ConsoleDesign(false);
+                ConsoleDesign("1. A3DA"            );
+                ConsoleDesign("2. Bloom"           );
+                ConsoleDesign("3. Color Correction");
+                ConsoleDesign("4. DEX"             );
+                ConsoleDesign("5. DOF"             );
+                ConsoleDesign("6. Light"           );
+                ConsoleDesign("7. STR"             );
+                ConsoleDesign("8. VAG"             );
+                ConsoleDesign(false);
+                ConsoleDesign("R. Return to Main Menu");
+                ConsoleDesign(false);
+                ConsoleDesign(true);
+                Console.WriteLine();
+                string Function = Console.ReadLine();
+                Console.Clear();
+                     if (Function == "1") Tools.A3D.Processor(JSON);
+                else if (Function == "2") Tools.BLT.Processor();
+                else if (Function == "3") Tools.CCT.Processor();
+                else if (Function == "4") Tools.DEX.Processor(JSON);
+                else if (Function == "5") Tools.DFT.Processor();
+                else if (Function == "6") Tools.LIT.Processor();
+                else if (Function == "7") Tools.STR.Processor(JSON);
+                else if (Function == "8") Tools.VAG.Processor();
+                else     function = Function;
+            }
+            else if (function == "8")
+            {
+                Choose(1, JSON ? "mp" : "json", out string[] FileNames);
+                foreach (string file in FileNames)
+                    if (JSON)
+                    {
+                        Console.Title = "MsgPack to JSON: " + Path.GetFileNameWithoutExtension(file);
+                        MPExt.ToJSON   (file.Replace(Path.GetExtension(file), ""));
+                    }
+                    else
+                    {
+                        Console.Title = "JSON to MsgPack: " + Path.GetFileNameWithoutExtension(file);
+                        MPExt.ToMsgPack(file.Replace(Path.GetExtension(file), ""));
+                    }
             }
         }
 
         public static void Exit() => Environment.Exit(0);
+        
+        public static void ConsoleDesign(string text, params string[] args)
+        {
+            text = string.Format(text, args);
+            string Text = "█                                                  █";
+            Text = Text.Remove(3) + text + Text.Remove(0, text.Length + 3);
+            Console.WriteLine(Text);
+        }
+
+        public static void ConsoleDesign(bool Fill)
+        {
+            if (Fill) Console.WriteLine("████████████████████████████████████████████████████");
+            else      Console.WriteLine("█                                                  █");
+        }
+
+        private static string GetArgs(string name, bool And, params string[] ext)
+        {
+            int L = ext.Length;
+            string Out = (And ? "|" : "") + name + " files (";
+            for (int i = 0; i < L; i++) { Out += "*." + ext[i]; if (i + 1 < L) Out += ", "; }
+            Out += ")|";
+            for (int i = 0; i < L; i++) { Out += "*." + ext[i]; if (i + 1 < L) Out += ";" ; }
+            return Out;
+        }
+
+        private static string GetArgs(string name, params string[] ext)
+        {
+            int L = ext.Length;
+            string Out = name + " files (";
+            for (int i = 0; i < L; i++) { Out += "*." + ext[i]; if (i + 1 < L) Out += ", "; }
+            Out += ")|";
+            for (int i = 0; i < L; i++) { Out += "*." + ext[i]; if (i + 1 < L) Out += ";" ; }
+            return Out;
+        }
+
+        public static string Choose(int code, string filetype, out string[] FileNames)
+        {
+            string MsgPack = GetArgs("MessagePack", true, "mp"  );
+            string JSON    = GetArgs("JSON"       , true, "json");
+            string BIN     = GetArgs("BIN"        , true, "bin" );
+            string WAV     = GetArgs("WAV"        , true, "wav" );
+
+            FileNames = new string[0];
+            if (code == 1)
+            {
+                string Filter = GetArgs("All;", false, "*");
+                     if (filetype == "a3da") Filter = GetArgs("A3DA", "a3da", "farc", "json", "mp") +
+                        GetArgs("A3DA", true, "a3da") +   GetArgs("FARC", true, "farc") + JSON + MsgPack;
+                else if (filetype == "bin" ) Filter = GetArgs("BIN" , "bin", "json", "mp") +
+                        BIN + JSON + MsgPack;
+                else if (filetype == "blt" ) Filter = GetArgs("BLT" , "blt");
+                else if (filetype == "bon" ) Filter = GetArgs("BON" , "bon", "bin", "json", "mp") +
+                        GetArgs("BON", true, "bon") + BIN + JSON + MsgPack;
+                else if (filetype == "cct" ) Filter = GetArgs("CCT" , "cct");
+                else if (filetype == "databank") Filter = GetArgs("DAT", "dat", "json", "mp") +
+                        GetArgs("DAT", true, "dat") + JSON + MsgPack;
+                else if (filetype == "dex" ) Filter = GetArgs("DEX" , "dex", "bin", "json", "mp") +
+                        GetArgs("DEX", true, "dex") + BIN + JSON + MsgPack;
+                else if (filetype == "dft" ) Filter = GetArgs("DFT" , "dft");
+                else if (filetype == "diva") Filter = GetArgs("DIVA", "diva", "wav") +
+                        GetArgs("DIVA", true, "diva") + GetArgs("WAV", true, "wav");
+                else if (filetype == "dsc" ) Filter = GetArgs("DSC" , "dsc", "json", "mp") +
+                        GetArgs("DSC", true, "dsc") + JSON + MsgPack;
+                else if (filetype == "dve" ) Filter = GetArgs("Particles", "farc");
+                else if (filetype == "farc") Filter = "FARC Archives (*.farc)|*.farc";
+                else if (filetype == "json") Filter = GetArgs("JSON", "json");
+                else if (filetype == "mp"  ) Filter = GetArgs("MessagePack", "mp");
+                else if (filetype == "lit")  Filter = GetArgs("LIT" , "lit");
+                else if (filetype == "str" ) Filter = GetArgs("STR" , "str", "bin", "json", "mp") +
+                        GetArgs("STR", true, "str") + BIN + JSON + MsgPack;
+                else if (filetype == "vag" ) Filter = GetArgs("VAG" , "vag", "wav") +
+                        GetArgs("VAG", true, "vag") + GetArgs("WAV", true, "wav");
+                     
+                using (OpenFileDialog ofd = new OpenFileDialog { InitialDirectory = Application.StartupPath,
+                    Filter = Filter, Multiselect = true, Title = "Choose file(s) to open:" })
+                    if (ofd.ShowDialog() == DialogResult.OK) FileNames = ofd.FileNames;
+            }
+            else if (code == 2)
+            {
+                string Return = "";
+                using (OpenFileDialog ofd = new OpenFileDialog { InitialDirectory = Application.StartupPath,
+                    ValidateNames = false, CheckFileExists = false, Filter = " | ", CheckPathExists = true,
+                    Title = "Choose any file in folder:", FileName = "Folder Selection." })
+                    if (ofd.ShowDialog() == DialogResult.OK) Return = Path.GetDirectoryName(ofd.FileName);
+                return Return;
+            }
+            return "";
+        }
     }
 }

PD_Tool/Properties/AssemblyInfo.cs

@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("7B5D5A3A-A6F8-4813-C97D-ACFC98F7397E")]
-[assembly: AssemblyVersion("0.4.7.0")]
-[assembly: AssemblyFileVersion("0.4.7.0")]
+[assembly: AssemblyVersion("0.4.7.5")]
+[assembly: AssemblyFileVersion("0.4.7.5")]

PD_Tool/classes/DIVAFILE.cs

@@ -8,26 +8,20 @@ namespace PD_Tool
         public static void Decrypt(string file)
         {
             Stream reader = File.OpenReader(file);
-            if (reader.ReadInt64() != 0x454C494641564944)
-            {
-                reader.Close();
-                Encrypt(file);
-                return;
-            }
+            if (reader.ReadInt64() != 0x454C494641564944) { reader.Close(); return; }
             reader.Close();
+
+            System.Console.Title = "DIVAFILE Decrypt: " + Path.GetFileName(file);
             file.Decrypt();
         }
 
         public static void Encrypt(string file)
         {
             Stream reader = File.OpenReader(file);
-            if (reader.ReadInt64() == 0x454C494641564944)
-            {
-                reader.Close();
-                Decrypt(file);
-                return;
-            }
+            if (reader.ReadInt64() == 0x454C494641564944) { reader.Close(); return; }
+            reader.Close();
 
+            System.Console.Title = "DIVAFILE Encrypt: " + Path.GetFileName(file);
             file.Encrypt();
         }
     }

PD_Tool/classes/DataBase.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using KKdMainLib;
 using DB = KKdMainLib.DB;
 
 namespace PD_Tool
@@ -11,16 +10,16 @@ namespace PD_Tool
         {
             Console.Title = "DB Converter";
             Console.Clear();
-            Main.ConsoleDesign(true);
-            Main.ConsoleDesign("         Choose type of DataBase file:");
-            Main.ConsoleDesign(false);
-            Main.ConsoleDesign("1. Auth DB Converter");
-            Main.ConsoleDesign("2. AET DB Converter");
-            Main.ConsoleDesign("3. SPR DB Converter");
-            Main.ConsoleDesign(false);
-            Main.ConsoleDesign("R. Return to Main Menu");
-            Main.ConsoleDesign(false);
-            Main.ConsoleDesign(true);
+            Program.ConsoleDesign(true);
+            Program.ConsoleDesign("         Choose type of DataBase file:");
+            Program.ConsoleDesign(false);
+            Program.ConsoleDesign("1. Auth DB Converter");
+            Program.ConsoleDesign("2. AET DB Converter");
+            Program.ConsoleDesign("3. SPR DB Converter");
+            Program.ConsoleDesign(false);
+            Program.ConsoleDesign("R. Return to Main Menu");
+            Program.ConsoleDesign(false);
+            Program.ConsoleDesign(true);
             Console.WriteLine();
             string format = Console.ReadLine();
             if (format == "1") AuthDBProcessor(JSON);
@@ -32,7 +31,7 @@ namespace PD_Tool
         {
             Console.Title = "Auth DB Converter";
             DB.Auth Auth;
-            Main.Choose(1, "bin", out string[] FileNames);
+            Program.Choose(1, "bin", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext      = "";
@@ -62,7 +61,7 @@ namespace PD_Tool
         {
             Console.Title = "AET DB Converter";
             DB.Aet Aet;
-            Main.Choose(1, "bin", out string[] FileNames);
+            Program.Choose(1, "bin", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext      = "";
@@ -92,7 +91,7 @@ namespace PD_Tool
         {
             Console.Title = "SPR DB Converter";
             DB.Spr Spr;
-            Main.Choose(1, "bin", out string[] FileNames);
+            Program.Choose(1, "bin", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext      = "";

PD_Tool/classes/FARC.cs

@@ -14,29 +14,33 @@ namespace PD_Tool
             if (Extract)
             {
                 Console.Title = "FARC Extractor";
-                Main.Choose(1, "farc", out string[] FileNames);
-                foreach (string FileName in FileNames)
-                    if (FileName != "" && File.Exists(FileName))
-                        new KKdFARC(FileName).UnPack();
+                Program.Choose(1, "farc", out string[] FileNames);
+                foreach (string file in FileNames)
+                    if (file != "" && File.Exists(file))
+                    {
+                        Console.Title = "FARC Extractor: " + Path.GetFileNameWithoutExtension(file);
+                        new KKdFARC(file).UnPack();
+                    }
             }
             else
             {
-                string file = Main.Choose(2, "", out string[] FileNames);
+                string file = Program.Choose(2, "", out string[] FileNames);
                 Console.Clear();
                 Console.Title = "FARC Creator";
                 if (file != "")
                 {
+                    Console.Title = "FARC Creator: " + Path.GetDirectoryName(file);
                     FARC = new KKdFARC();
-                    Main.ConsoleDesign(true);
-                    Main.ConsoleDesign("         Choose type of created FARC:");
-                    Main.ConsoleDesign(false);
-                    Main.ConsoleDesign("1. FArc [DT/DT2nd/DTex/F/F2nd/X]");
-                    Main.ConsoleDesign("2. FArC [DT/DT2nd/DTex/F/F2nd/X] (Compressed)");
-                    Main.ConsoleDesign("3. FARC [F/F2nd/X]");
-                    Main.ConsoleDesign(false);
-                    Main.ConsoleDesign("R. Return to Main Menu");
-                    Main.ConsoleDesign(false);
-                    Main.ConsoleDesign(true);
+                    Program.ConsoleDesign(true);
+                    Program.ConsoleDesign("         Choose type of created FARC:");
+                    Program.ConsoleDesign(false);
+                    Program.ConsoleDesign("1. FArc [DT/DT2/DTex/F/F2/X]");
+                    Program.ConsoleDesign("2. FArC [DT/DT2/DTex/F/F2/X] (Compressed)");
+                    Program.ConsoleDesign("3. FARC [F/F2/X]");
+                    Program.ConsoleDesign(false);
+                    Program.ConsoleDesign("R. Return to Main Menu");
+                    Program.ConsoleDesign(false);
+                    Program.ConsoleDesign(true);
                     Console.WriteLine();
                     Console.WriteLine("Choosed folder: {0}", file);
                     Console.WriteLine();
@@ -47,15 +51,15 @@ namespace PD_Tool
                         FARC.Signature = KKdFARC.Farc.FARC;
 
                         Console.WriteLine();
-                        Main.ConsoleDesign(true);
-                        Main.ConsoleDesign("             Choose type of FARC:");
-                        Main.ConsoleDesign(false);
-                        Main.ConsoleDesign("1. FARC");
-                        Main.ConsoleDesign("2. FARC (Compressed)");
-                        Main.ConsoleDesign("3. FARC (Encrypted)");
-                        Main.ConsoleDesign("4. FARC (Compressed & Encrypted)");
-                        Main.ConsoleDesign(false);
-                        Main.ConsoleDesign(true);
+                        Program.ConsoleDesign(true);
+                        Program.ConsoleDesign("             Choose type of FARC:");
+                        Program.ConsoleDesign(false);
+                        Program.ConsoleDesign("1. FARC");
+                        Program.ConsoleDesign("2. FARC (Compressed)");
+                        Program.ConsoleDesign("3. FARC (Encrypted)");
+                        Program.ConsoleDesign("4. FARC (Compressed & Encrypted)");
+                        Program.ConsoleDesign(false);
+                        Program.ConsoleDesign(true);
                         Console.WriteLine();
                         type = Console.ReadLine();
                         if (type == "2" || type == "4") FARC.FARCType |= KKdFARC.Type.GZip;
@@ -63,7 +67,6 @@ namespace PD_Tool
                     }
                     else if (type == "R") return;
                     else FARC.Signature = KKdFARC.Farc.FArC;
-                    Console.Title = "FARC Creator - Directory: " + Path.GetDirectoryName(file);
                     new KKdFARC(file, true).Pack(FARC.Signature);
                 }
             }

PD_Tool/classes/Tools/A3D.cs

@@ -1,7 +1,6 @@
 using System;
-using KKdMainLib;
+using KKdBaseLib;
 using KKdMainLib.IO;
-using KKdMainLib.MessagePack;
 using KKdA3DA = KKdMainLib.A3DA.A3DA;
 using KKdFARC = KKdMainLib.FARC;
 
@@ -12,43 +11,41 @@ namespace PD_Tool.Tools
         public static void Processor(bool JSON)
         {
             Console.Title = "A3DA Converter";
-            Main.Choose(1, "a3da", out string[] FileNames);
+            Program.Choose(1, "a3da", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext      = "";
 
             bool MP = false;
             foreach (string file in FileNames)
-                     if (file.EndsWith(".mp"  )) { MP = true; break; }
-                else if (file.EndsWith(".json")) { MP = true; break; }
-                else if (file.EndsWith(".farc")) { MP = true; break; }
+                if (file.EndsWith(".mp") || file.EndsWith(".json") || file.EndsWith(".farc")) { MP = true; break; }
 
-            Main.Format Format = Main.Format.NULL;
+            Format Format = Format.NULL;
             string format = "";
             if (MP)
             {
                 Console.Clear();
-                Main.ConsoleDesign(true);
-                Main.ConsoleDesign("          Choose type of format to export:");
-                Main.ConsoleDesign(false);
-                Main.ConsoleDesign("1. A3DA [DT/AC/F]");
-                Main.ConsoleDesign("2. A3DC [DT/AC/F]");
-                Main.ConsoleDesign("3. A3DA [AFT/FT] ");
-                Main.ConsoleDesign("4. A3DC [AFT/FT] ");
-                Main.ConsoleDesign("5. A3DC [F2]     ");
-                Main.ConsoleDesign("6. A3DC [MGF]    ");
-                Main.ConsoleDesign("7. A3DC [X]      ");
-                Main.ConsoleDesign(false);
-                Main.ConsoleDesign(true);
+                Program.ConsoleDesign(true);
+                Program.ConsoleDesign("          Choose type of format to export:");
+                Program.ConsoleDesign(false);
+                Program.ConsoleDesign("1. A3DA [DT/AC/F]");
+                Program.ConsoleDesign("2. A3DC [DT/AC/F]");
+                Program.ConsoleDesign("3. A3DA [AFT/FT] ");
+                Program.ConsoleDesign("4. A3DC [AFT/FT] ");
+                Program.ConsoleDesign("5. A3DC [F2]     ");
+                Program.ConsoleDesign("6. A3DC [MGF]    ");
+                Program.ConsoleDesign("7. A3DC [X]      ");
+                Program.ConsoleDesign(false);
+                Program.ConsoleDesign(true);
                 Console.WriteLine();
                 format = Console.ReadLine();
-                     if (format == "1") Format = Main.Format.DT  ;
-                else if (format == "2") Format = Main.Format.F   ;
-                else if (format == "3") Format = Main.Format.FT  ;
-                else if (format == "4") Format = Main.Format.FT  ;
-                else if (format == "5") Format = Main.Format.F2LE;
-                else if (format == "6") Format = Main.Format.MGF ;
-                else if (format == "7") Format = Main.Format.X   ;
+                     if (format == "1") Format = Format.DT  ;
+                else if (format == "2") Format = Format.F   ;
+                else if (format == "3") Format = Format.FT  ;
+                else if (format == "4") Format = Format.FT  ;
+                else if (format == "5") Format = Format.F2LE;
+                else if (format == "6") Format = Format.MGF ;
+                else if (format == "7") Format = Format.X   ;
                 else return;
             }
 
@@ -63,32 +60,29 @@ namespace PD_Tool.Tools
 
                 Console.Title = "A3DA Converter: " + Path.GetFileNameWithoutExtension(file);
                 if (ext == ".farc")
-                {
-                    KKdFARC FARC = new KKdFARC(file);
-                    if (!FARC.HeaderReader()) continue;
-                    if (!FARC.HasFiles) continue;
-
-                    MsgPack A3DA = MsgPack.Null;
-                    byte[] data = null;
-                    for (int i = 0; i < FARC.Files.Length; i++)
+                    using (KKdFARC FARC = new KKdFARC(file))
                     {
-                        data = FARC.FileReader(i);
-                        state = A.A3DAReader(data);
-                        if (state == 1)
+                        if (!FARC.HeaderReader()) continue;
+                        if (!FARC.HasFiles) continue;
+
+                        MsgPack A3DA = MsgPack.Null;
+                        byte[] data = null;
+                        for (int i = 0; i < FARC.Files.Length; i++)
                         {
-                            A3DA = A.MsgPackWriter();
-                            A = new KKdA3DA();
-                            A.MsgPackReader(A3DA);
-                            A.IO = File.OpenWriter();
-                            A.Data._.CompressF16 = Format > Main.Format.FT ?
-                                Format == Main.Format.MGF ? 2 : 1 : 0;
-                            A.Data.Format = Format;
-                            FARC.Files[i].Data = (format != "1" &&
-                                format != "3") ? A.A3DCWriter() : A.A3DAWriter();
+                            data = FARC.FileReader(i);
+                            state = A.A3DAReader(data);
+                            if (state == 1)
+                            {
+                                A3DA = A.MsgPackWriter();
+                                A = new KKdA3DA();
+                                A.MsgPackReader(A3DA);
+                                A.Data._.CompressF16 = Format > Format.FT ? Format == Format.MGF ? 2 : 1 : 0;
+                                A.Data.Format = Format;
+                                FARC.Files[i].Data = (format != "1" && format != "3") ? A.A3DCWriter() : A.A3DAWriter();
+                            }
                         }
+                        FARC.Save();
                     }
-                    FARC.Save();
-                }
                 else if (ext == ".a3da")
                 {
                     state = A.A3DAReader(filepath);
@@ -97,8 +91,7 @@ namespace PD_Tool.Tools
                 else if (ext == ".mp" || ext == ".json")
                 {
                     A.MsgPackReader(filepath, ext == ".json");
-                    A.Data._.CompressF16 = Format > Main.Format.FT ?
-                        Format == Main.Format.MGF ? 2 : 1 : 0;
+                    A.Data._.CompressF16 = Format > Format.FT ? Format == Format.MGF ? 2 : 1 : 0;
                     A.Data.Format = Format;
 
                     File.WriteAllBytes(filepath + ".a3da", (format != "1" &&

PD_Tool/classes/Tools/AET.cs

@@ -1,5 +1,4 @@
 using System;
-using KKdMainLib;
 using KKdMainLib.IO;
 using KKdAet = KKdMainLib.Aet.Aet;
 
@@ -11,7 +10,7 @@ namespace PD_Tool.Tools
         {
             Console.Title = "AET Converter";
             KKdAet Aet;
-            Main.Choose(1, "bin", out string[] FileNames);
+            Program.Choose(1, "bin", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext = "";

PD_Tool/classes/Tools/BLT.cs

@@ -0,0 +1,32 @@
+using System;
+using KKdMainLib.IO;
+using KKdMainLib.F2;
+
+namespace PD_Tool.Tools
+{
+    public class BLT
+    {
+        public static void Processor()
+        {
+            Console.Title = "Bloom Converter";
+            Bloom Bloom;
+            Program.Choose(1, "blt", out string[] FileNames);
+            if (FileNames.Length < 1) return;
+            string filepath = "";
+            string ext = "";
+
+            foreach (string file in FileNames)
+            {
+                Bloom = new Bloom();
+                ext = Path.GetExtension(file);
+                filepath = file.Replace(ext, "");
+                ext = ext.ToLower();
+
+                Console.Title = "Bloom Converter: " + Path.GetFileNameWithoutExtension(file);
+                     if (ext == ".blt") { Bloom.BLTReader(filepath); Bloom.TXTWriter(filepath); }
+                //else if (ext == ".txt") { Bloom.TXTReader(filepath); Bloom.BLTWriter(filepath); }
+                Bloom = new Bloom();
+            }
+        }
+    }
+}

PD_Tool/classes/Tools/CCT.cs

@@ -0,0 +1,32 @@
+using System;
+using KKdMainLib.IO;
+using KKdMainLib.F2;
+
+namespace PD_Tool.Tools
+{
+    public class CCT
+    {
+        public static void Processor()
+        {
+            Console.Title = "Color Correction Converter";
+            ColorCorrection ColorCorrection;
+            Program.Choose(1, "cct", out string[] FileNames);
+            if (FileNames.Length < 1) return;
+            string filepath = "";
+            string ext = "";
+
+            foreach (string file in FileNames)
+            {
+                ColorCorrection = new ColorCorrection();
+                ext = Path.GetExtension(file);
+                filepath = file.Replace(ext, "");
+                ext = ext.ToLower();
+
+                Console.Title = "Color Correction Converter: " + Path.GetFileNameWithoutExtension(file);
+                     if (ext == ".cct") { ColorCorrection.CCTReader(filepath); ColorCorrection.TXTWriter(filepath); }
+                //else if (ext == ".txt") { ColorCorrection.TXTReader(filepath); ColorCorrection.BLTWriter(filepath); }
+                ColorCorrection = new ColorCorrection();
+            }
+        }
+    }
+}

PD_Tool/classes/Tools/DB.cs

@@ -1,5 +1,4 @@
 using System;
-using KKdMainLib;
 using KKdMainLib.IO;
 
 namespace PD_Tool.Tools
@@ -9,7 +8,7 @@ namespace PD_Tool.Tools
         public static void Processor(bool JSON)
         {
             Console.Title = "DataBank Converter";
-            Main.Choose(1, "databank", out string[] FileNames);
+            Program.Choose(1, "databank", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext = "";
@@ -23,18 +22,19 @@ namespace PD_Tool.Tools
             if (MP)
             {
                 Console.Clear();
-                Main.ConsoleDesign(true);
-                Main.ConsoleDesign("        Choose type of exporting file:");
-                Main.ConsoleDesign(false);
-                Main.ConsoleDesign("1. Compact");
-                Main.ConsoleDesign("2. Normal");
-                Main.ConsoleDesign(false);
-                Main.ConsoleDesign(true);
+                Program.ConsoleDesign(true);
+                Program.ConsoleDesign("        Choose type of exporting file:");
+                Program.ConsoleDesign(false);
+                Program.ConsoleDesign("1. Compact");
+                Program.ConsoleDesign("2. Normal");
+                Program.ConsoleDesign(false);
+                Program.ConsoleDesign(true);
                 Console.WriteLine();
                 format = Console.ReadLine();
             }
 
-            DataBank DB;
+            uint num2 = (uint)DateTime.Now.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+            KKdMainLib.DataBank DB;
             string[] file_split;
             foreach (string file in FileNames)
             {
@@ -44,7 +44,7 @@ namespace PD_Tool.Tools
 
                 string filename = Path.GetFileNameWithoutExtension(file);
                 file_split = filename.Split('_');
-                DB = new DataBank();
+                DB = new KKdMainLib.DataBank();
                 if (file_split.Length == 5 && ext == ".dat" && MP)
                 {
                     filepath = file.Replace(filename + ".dat", "");
@@ -53,11 +53,11 @@ namespace PD_Tool.Tools
                     DB.MsgPackWriter(filepath + file_split[0] + "_" + 
                         file_split[1] + "_" + file_split[2], JSON, format != "2");
                 }
-                else if (ext == ".mp" || ext == ".json" && !MP)
+                else if ((ext == ".mp" || ext == ".json") && !MP)
                 {
                     Console.Title = "DataBank Converter: " + filename;
                     DB.MsgPackReader(filepath, JSON);
-                    DB.     DBWriter(filepath);
+                    DB.     DBWriter(filepath, num2);
                 }
                 DB = null;
             }

PD_Tool/classes/Tools/DEX.cs

@@ -1,5 +1,5 @@
 using System;
-using KKdMainLib;
+using KKdBaseLib;
 using KKdMainLib.IO;
 using KKdDEX = KKdMainLib.DEX;
 
@@ -11,7 +11,7 @@ namespace PD_Tool.Tools
         {
             Console.Title = "DEX Converter";
             KKdDEX DEX;
-            Main.Choose(1, "dex", out string[] FileNames);
+            Program.Choose(1, "dex", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext      = "";
@@ -26,26 +26,27 @@ namespace PD_Tool.Tools
 
             Console.Clear();
             string format = "";
-            Main.ConsoleDesign(true);
-            Main.ConsoleDesign("        Choose type of exporting file:");
-            Main.ConsoleDesign(false);
-            Main.ConsoleDesign("1. F/FT PS3/PS4/PSVita");
-            Main.ConsoleDesign("2. F2nd PS3/PSVita");
-            Main.ConsoleDesign("3. X    PS4/PSVita");
-            if ( MP   && !JSON)   Main.ConsoleDesign("9. MessagePack");
-            if (_JSON &&  JSON)   Main.ConsoleDesign("9. JSON");
-            Main.ConsoleDesign(false);
-            Main.ConsoleDesign(true);
+            Program.ConsoleDesign(true);
+            Program.ConsoleDesign("        Choose type of exporting file:");
+            Program.ConsoleDesign(false);
+            Program.ConsoleDesign("1. F/FT PS3/PS4/PSVita");
+            Program.ConsoleDesign("2. F2   PS3/PSVita");
+            Program.ConsoleDesign("3. X    PS4/PSVita");
+            if ( MP   && !JSON) Program.ConsoleDesign("9. MessagePack");
+            if (_JSON &&  JSON) Program.ConsoleDesign("9. JSON");
+            Program.ConsoleDesign(false);
+            Program.ConsoleDesign(true);
             Console.WriteLine();
             format = Console.ReadLine();
             
-            Main.Format Format = Main.Format.NULL;
-                 if (format == "1") Format = Main.Format.F   ;
-            else if (format == "2") Format = Main.Format.F2LE;
-            else if (format == "3") Format = Main.Format.X   ;
-            else if (format == "9" && (MP && _JSON)) Format = Main.Format.NULL;
+            Format Format = Format.NULL;
+                 if (format == "1") Format = Format.F   ;
+            else if (format == "2") Format = Format.F2LE;
+            else if (format == "3") Format = Format.X   ;
+            else if (format == "9" && (MP && _JSON)) Format = Format.NULL;
             else return;
 
+            int state;
             foreach (string file in FileNames)
             {
                 DEX = new KKdDEX();
@@ -55,12 +56,15 @@ namespace PD_Tool.Tools
                 
                 Console.Title = "DEX Converter: " + Path.GetFileNameWithoutExtension(file);
                 if (ext == ".bin" || ext == ".dex")
-                     DEX.    DEXReader(filepath, ext );
-                else DEX.MsgPackReader(filepath, JSON);
+                     state = DEX.    DEXReader(filepath, ext );
+                else state = DEX.MsgPackReader(filepath, JSON);
 
-                if (Format > Main.Format.NULL)
-                     DEX.    DEXWriter(filepath, Format);
-                else DEX.MsgPackWriter(filepath, JSON  );
+                if (state == 1)
+                {
+                    if (Format > Format.NULL)
+                         DEX.    DEXWriter(filepath, Format);
+                    else DEX.MsgPackWriter(filepath, JSON);
+                }
                 DEX = null;
             }
         }

PD_Tool/classes/Tools/DFT.cs

@@ -0,0 +1,32 @@
+using System;
+using KKdMainLib.IO;
+using KKdMainLib.F2;
+
+namespace PD_Tool.Tools
+{
+    public class DFT
+    {
+        public static void Processor()
+        {
+            Console.Title = "DOF Converter";
+            DOF DOF;
+            Program.Choose(1, "dft", out string[] FileNames);
+            if (FileNames.Length < 1) return;
+            string filepath = "";
+            string ext = "";
+
+            foreach (string file in FileNames)
+            {
+                DOF = new DOF();
+                ext = Path.GetExtension(file);
+                filepath = file.Replace(ext, "");
+                ext = ext.ToLower();
+
+                Console.Title = "DOF Converter: " + Path.GetFileNameWithoutExtension(file);
+                     if (ext == ".dft") { DOF.DFTReader(filepath); DOF.TXTWriter(filepath); }
+                //else if (ext == ".txt") { DOF.TXTReader(filepath); DOF.DFTWriter(filepath); }
+                DOF = new DOF();
+            }
+        }
+    }
+}

PD_Tool/classes/Tools/DIV.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using KKdMainLib;
 using KKdSoundLib;
 
 namespace PD_Tool.Tools
@@ -10,7 +9,7 @@ namespace PD_Tool.Tools
         public static void Processor()
         {
             Console.Title = "DIVA Converter";
-            Main.Choose(1, "diva", out string[] FileNames);
+            Program.Choose(1, "diva", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext = "";

PD_Tool/classes/Tools/LIT.cs

@@ -0,0 +1,32 @@
+using System;
+using KKdMainLib.IO;
+using KKdMainLib.F2;
+
+namespace PD_Tool.Tools
+{
+    public class LIT
+    {
+        public static void Processor()
+        {
+            Console.Title = "Light Converter";
+            Light LIT;
+            Program.Choose(1, "lit", out string[] FileNames);
+            if (FileNames.Length < 1) return;
+            string filepath = "";
+            string ext = "";
+
+            foreach (string file in FileNames)
+            {
+                LIT = new Light();
+                ext = Path.GetExtension(file);
+                filepath = file.Replace(ext, "");
+                ext = ext.ToLower();
+
+                Console.Title = "Light Converter: " + Path.GetFileNameWithoutExtension(file);
+                     if (ext == ".lit") { LIT.LITReader(filepath); LIT.TXTWriter(filepath); }
+                //else if (ext == ".txt") { LIT.TXTReader(filepath); LIT.LITWriter(filepath); }
+                LIT = new Light();
+            }
+        }
+    }
+}

PD_Tool/classes/Tools/MOT.cs

@@ -0,0 +1,40 @@
+using System;
+using KKdMainLib;
+using KKdMainLib.IO;
+
+namespace PD_Tool.Tools
+{
+    public class MOT
+    {
+        public static void Processor(bool JSON)
+        {
+            Console.Title = "MOT Converter";
+            Mot Mot;
+            Program.Choose(1, "bin", out string[] FileNames);
+            if (FileNames.Length < 1) return;
+            string filepath = "";
+            string ext = "";
+            
+            foreach (string file in FileNames)
+            {
+                Mot = new Mot();
+                ext = Path.GetExtension(file);
+                filepath = file.Replace(ext, "");
+                ext = ext.ToLower();
+
+                Console.Title = "MOT Converter: " + Path.GetFileNameWithoutExtension(file);
+                if (ext == ".bin")
+                {
+                    Mot.    MOTReader(filepath);
+                    Mot.MsgPackWriter(filepath, JSON);
+                }
+                else if (ext == ".mp" || ext == ".json")
+                {
+                    Mot.MsgPackReader(filepath, ext == ".json");
+                    Mot.    MOTWriter(filepath);
+                }
+                Mot = new Mot();
+            }
+        }
+    }
+}

PD_Tool/classes/Tools/STR.cs

@@ -1,5 +1,4 @@
 using System;
-using KKdMainLib;
 using KKdMainLib.IO;
 using KKdSTR = KKdMainLib.STR;
 
@@ -10,7 +9,7 @@ namespace PD_Tool.Tools
         public static void Processor(bool JSON)
         {
             Console.Title = "STR Converter";
-            Main.Choose(1, "str", out string[] FileNames);
+            Program.Choose(1, "str", out string[] FileNames);
 
             KKdSTR Data;
             string filepath = "";

PD_Tool/classes/Tools/VAG.cs

@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using KKdMainLib;
 using KKdVAG = KKdSoundLib.VAG;
 
 namespace PD_Tool.Tools
@@ -10,7 +9,7 @@ namespace PD_Tool.Tools
         public static void Processor()
         {
             Console.Title = "VAG Converter";
-            Main.Choose(1, "vag", out string[] FileNames);
+            Program.Choose(1, "vag", out string[] FileNames);
             if (FileNames.Length < 1) return;
             string filepath = "";
             string ext = "";
@@ -24,13 +23,13 @@ namespace PD_Tool.Tools
             if (InputWAV)
             {
                 Console.Clear();
-                Main.ConsoleDesign(true);
-                Main.ConsoleDesign("          Choose type of format to export:");
-                Main.ConsoleDesign(false);
-                Main.ConsoleDesign("1. VAG (Downmix to 1 ch)");
-                Main.ConsoleDesign("2. HEVAG");
-                Main.ConsoleDesign(false);
-                Main.ConsoleDesign(true);
+                Program.ConsoleDesign(true);
+                Program.ConsoleDesign("          Choose type of format to export:");
+                Program.ConsoleDesign(false);
+                Program.ConsoleDesign("1. VAG (Downmix to 1 ch)");
+                Program.ConsoleDesign("2. HEVAG");
+                Program.ConsoleDesign(false);
+                Program.ConsoleDesign(true);
                 Console.WriteLine();
                 string format = Console.ReadLine();
                 HE_VAG = format == "2";