Release v0.4.9.3.2 (Hotfix)

CLI, Tables

KKdBaseLib/A3DAKey.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib.Auth3D;
+using KKdBaseLib.Auth3D;
 
 namespace KKdBaseLib
 {

KKdBaseLib/Attributes.cs

@@ -0,0 +1,9 @@
+namespace KKdBaseLib
+{
+    public class HeadData : System.Attribute { }
+    public class Padding  : System.Attribute { }
+    public class Binary   : System.Attribute { }
+    public class Offset   : System.Attribute { }
+    public class Count    : System.Attribute { }
+    public class Flags    : System.Attribute { }
+}

KKdBaseLib/Auth2D.cs

@@ -1,4 +1,6 @@
-namespace KKdBaseLib.Auth2D
+//Original: AetSet.bt Version: 5.0 by samyuu
+
+namespace KKdBaseLib.Auth2D
 {
     public struct Header
     {
@@ -14,10 +16,10 @@
         public uint BackColor;
         public uint Width;
         public uint Height;
-        public Pointer<Vector2<CountPointer<KFT2>>> Camera;
-        public CountPointer<Composition> Compositions;
-        public CountPointer<Video      > Videos;
-        public CountPointer<Audio      > Audios;
+        public Pointer<Vec2<CountPointer<KFT2>>> Camera;
+        public CountPointer<Composition> Composition;
+        public CountPointer<Video      > Video;
+        public CountPointer<Audio      > Audio;
     }
 
     public struct Composition
@@ -45,9 +47,9 @@
         public AetLayerFlags   Flags;
         public AetLayerQuality Quality;
         public AetLayerType    Type;
-        public int VideoItemOffset;
+        public int VidItmOff; //VideoItemOffset
         public int ParentLayer;
-        public CountPointer<Marker> Markers;
+        public CountPointer<Marker> Marker;
         public Pointer<VideoData> Video;
         public Pointer<AudioData> Audio;
 
@@ -122,11 +124,46 @@
 
             public enum TransferBlendMode : byte
             {
-                Alpha                    = 3,
-                Additive                 = 5,
-                DstColorZero             = 6,
-                SrcAlphaOneMinusSrcColor = 7,
-                Transparent              = 8,
+                None              =  0,
+                Copy              =  1,
+                Behind            =  2,
+                Normal            =  3,
+                Dissolve          =  4,
+                Add               =  5,
+                Multiply          =  6,
+                Screen            =  7,
+                Overlay           =  8,
+                SoftLight         =  9,
+                HardLight         = 10,
+                Darken            = 11,
+                Lighten           = 12,
+                ClassicDifference = 13,
+                Hue               = 14,
+                Saturation        = 15,
+                Color             = 16,
+                Luminosity        = 17,
+                StenciilAlpha     = 18,
+                StencilLuma       = 19,
+                SilhouetteAlpha   = 20,
+                SilhouetteLuma    = 21,
+                LuminescentPremul = 22,
+                AlphaAdd          = 23,
+                ClassicColorDodge = 24,
+                ClassicColorBurn  = 25,
+                Exclusion         = 26,
+                Difference        = 27,
+                ColorDodge        = 28,
+                ColorBurn         = 29,
+                LinearDodge       = 30,
+                LinearBurn        = 31,
+                LinearLight       = 32,
+                VividLight        = 33,
+                PinLight          = 34,
+                HardMix           = 35,
+                LighterColor      = 36,
+                DarkerColor       = 37,
+                Subtract          = 38,
+                Divide            = 39,
             }
 
             public enum TransferFlags : byte
@@ -173,11 +210,11 @@
         public ushort Width;
         public ushort Height;
         public float Frames;
-        public CountPointer<Source> Sources;
+        public CountPointer<Identifier> Identifiers;
 
-        public override string ToString() => $"Width: {Width}; Height: {Height}; Color: {Color.ToString("X2")}";
+        public override string ToString() => $"Width: {Width}; Height: {Height}; Color: {Color:X2)}";
 
-        public struct Source
+        public struct Identifier
         {
             public Pointer<string> Name;
             public uint ID;

KKdBaseLib/Auth3D.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib.Auth3D
+namespace KKdBaseLib.Auth3D
 {
     public struct Data
     {
@@ -36,8 +36,8 @@
     public struct Ambient
     {
         public string Name;
-        public Vector4<Key>    LightDiffuse;
-        public Vector4<Key> RimLightDiffuse;
+        public Vec4<Key>    LightDiffuse;
+        public Vec4<Key> RimLightDiffuse;
     }
 
     public struct CameraAuxiliary
@@ -99,7 +99,7 @@
         public Key End;
         public Key Start;
         public Key Density;
-        public Vector4<Key> Diffuse;
+        public Vec4<Key> Diffuse;
     }
 
     public enum CompressF16 : int
@@ -145,10 +145,10 @@
             public string[] ValueList;
         }
 
-        public static Vector3<A3DAKey> ToA3DAKey(Vector3<     Key> k) =>
-            new Vector3<A3DAKey> { X = (A3DAKey)k.X, Y = (A3DAKey)k.Y, Z = (A3DAKey)k.Z };
-        public static Vector3<    Key> ToKey    (Vector3<A3DAKey> k) =>
-            new Vector3<    Key> { X = (    Key)k.X, Y = (    Key)k.Y, Z = (    Key)k.Z };
+        public static Vec3<A3DAKey> ToA3DAKey(Vec3<     Key> k) =>
+            new Vec3<A3DAKey> { X = (A3DAKey)k.X, Y = (A3DAKey)k.Y, Z = (A3DAKey)k.Z };
+        public static Vec3<    Key> ToKey    (Vec3<A3DAKey> k) =>
+            new Vec3<    Key> { X = (    Key)k.X, Y = (    Key)k.Y, Z = (    Key)k.Z };
 
         public static explicit operator Key(A3DAKey k)
         {
@@ -203,10 +203,10 @@
         public int? Id;
         public string Name;
         public string Type;
-        public Vector4<Key> Ambient;
-        public Vector4<Key> Diffuse;
-        public Vector4<Key> Specular;
-        public Vector4<Key> Incandescence;
+        public Vec4<Key> Ambient;
+        public Vec4<Key> Diffuse;
+        public Vec4<Key> Specular;
+        public Vec4<Key> Incandescence;
         public ModelTransform Position;
         public ModelTransform SpotDirection;
     }
@@ -216,15 +216,15 @@
         public string Name;
         public string HashName;
         public Key GlowIntensity;
-        public Vector4<Key> BlendColor;
-        public Vector4<Key> Incandescence;
+        public Vec4<Key> BlendColor;
+        public Vec4<Key> Incandescence;
     }
 
     public struct MObjectHRC
     {
         public string Name;
         public Node[] Node;
-        public Vector3<float?> JointOrient;
+        public Vec3<float?> JointOrient;
         public Instance[] Instances;
         public ModelTransform MT;
 
@@ -242,9 +242,9 @@
         public bool Writed;
         public int? BinOffset;
         public Key Visibility;
-        public Vector3<Key> Rot;
-        public Vector3<Key> Scale;
-        public Vector3<Key> Trans;
+        public Vec3<Key> Rot;
+        public Vec3<Key> Scale;
+        public Vec3<Key> Trans;
     }
 
     public struct Node
@@ -277,10 +277,10 @@
             public string Name;
             public Key Rotate;
             public Key RotateFrame;
-            public Vector2<Key> Offset;
-            public Vector2<Key> Repeat;
-            public Vector2<Key> Coverage;
-            public Vector2<Key> TranslateFrame;
+            public Vec2<Key> Offset;
+            public Vec2<Key> Repeat;
+            public Vec2<Key> Coverage;
+            public Vec2<Key> TranslateFrame;
         }
     }
 
@@ -290,7 +290,7 @@
         public string Name;
         public string UIDName;
         public Node[] Node;
-        public Vector3<float?> JointOrient;
+        public Vec3<float?> JointOrient;
     }
 
     public struct PlayControl
@@ -307,8 +307,8 @@
         public Key LensFlare;
         public Key LensGhost;
         public Key LensShaft;
-        public Vector4<Key> Ambient;
-        public Vector4<Key> Diffuse;
-        public Vector4<Key> Specular;
+        public Vec4<Key> Ambient;
+        public Vec4<Key> Diffuse;
+        public Vec4<Key> Specular;
     }
 }

KKdBaseLib/DCC.cs

@@ -1,4 +1,4 @@
-//Original research by Samyuu
+//Original research by Samyuu
 
 namespace KKdBaseLib
 {
@@ -39,50 +39,59 @@ namespace KKdBaseLib
             0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0,
         };
 
-        public static ushort CalculateChecksum(this byte[] data)
+        public static ushort CalculateChecksum(byte[] data,
+            int offset = 0, ushort seed = 0xFFFF)
         {
-            ushort result = 0xFFFF;
-            for (int i = 0; i < data.Length; i++)
+            int length = data.Length;
+            ushort result = seed;
+            for (int i = offset; i < length; i++)
                 result = (ushort)(ChecksumLookupTable[(result >> 8) ^ data[i]] ^ (result << 8));
             return result;
         }
 
-        public static uint CalculateChecksumUInt(this byte[] data)
+        public static uint CalculateChecksumU32(byte[] data,
+            int offset = 0, uint seed = 0xFFFFFFFF)
         {
-            uint result = 0xFFFFFFFF;
-            for (int i = 0; i < data.Length; i++)
+            int length = data.Length;
+            uint result = seed;
+            for (int i = offset; i < length; i++)
                 result = ChecksumLookupTable[(byte)(result >> 8) ^ data[i]] ^ (result << 8);
             return result;
         }
 
-        public static ulong CalculateChecksumULong(this byte[] data)
+        public static ulong CalculateChecksumU64(byte[] data,
+            int offset = 0, ulong seed = 0xFFFFFFFFFFFFFFFF)
         {
-            ulong result = 0xFFFFFFFFFFFFFFFF;
-            for (int i = 0; i < data.Length; i++)
+            int length = data.Length;
+            ulong result = seed;
+            for (int i = offset; i < length; i++)
                 result = ChecksumLookupTable[(byte)(result >> 8) ^ data[i]] ^ (result << 8);
             return result;
         }
 
-        public static unsafe ushort CalculateChecksum(byte* data, int length)
+        public static unsafe ushort CalculateChecksum(byte* data,
+            int length, int offset = 0, ushort seed = 0xFFFF)
         {
-            ushort result = 0xFFFF;
-            for (int i = 0; i < length; i++)
+            ushort result = seed;
+            for (int i = offset; i < length; i++)
                 result = (ushort)(ChecksumLookupTable[(result >> 8) ^ data[i]] ^ (result << 8));
             return result;
         }
 
-        public static unsafe uint CalculateChecksumUInt(byte* data, int length)
+        public static unsafe uint CalculateChecksumU32(byte* data,
+            int length, int offset = 0, uint seed = 0xFFFFFFFF)
         {
-            uint result = 0xFFFFFFFF;
-            for (int i = 0; i < length; i++)
+            uint result = seed;
+            for (int i = offset; i < length; i++)
                 result = ChecksumLookupTable[(byte)(result >> 8) ^ data[i]] ^ (result << 8);
             return result;
         }
 
-        public static unsafe ulong CalculateChecksumULong(byte* data, int length)
+        public static unsafe ulong CalculateChecksumU64(byte* data,
+            int length, int offset = 0, ulong seed = 0xFFFFFFFFFFFFFFFF)
         {
-            ulong result = 0xFFFFFFFFFFFFFFFF;
-            for (int i = 0; i < length; i++)
+            ulong result = seed;
+            for (int i = offset; i < length; i++)
                 result = ChecksumLookupTable[(byte)(result >> 8) ^ data[i]] ^ (result << 8);
             return result;
         }

KKdBaseLib/Extensions.cs

@@ -1,17 +1,13 @@
-using System;
+using System;
 
 namespace KKdBaseLib
 {
     public static unsafe class Extensions
     {
-        private const double RadPi = 180 / Math.PI;
-        public static double ToDegrees(this double val) => val * RadPi;
-        public static double ToRadians(this double val) => val / RadPi;
-
         public static double Acos   (this double d  ) =>     Math.Acos   (d  );
         public static double Asin   (this double d  ) =>     Math.Asin   (d  );
         public static double Atan   (this double d  ) =>     Math.Atan   (d  );
-        public static double Aсtg   (this double d  ) => 1 / Math.Atan   (d  );
+        public static double Actg   (this double d  ) => 1 / Math.Atan   (d  );
         public static double  Cos   (this double d  ) =>     Math.Cos    (d  );
         public static double  Cosh  (this double val) =>     Math.Cosh   (val);
         public static double  Sin   (this double a  ) =>     Math.Sin    (a  );
@@ -30,7 +26,6 @@ namespace KKdBaseLib
         public static    int Sign   (this double val) =>     Math.Sign   (val);
         public static double Sqrt   (this double d  ) =>     Math.Sqrt   (d  );
 
-
         public static double Atan2(this double y   , double x      ) => Math.Atan2(y   , x      );
         public static double Log  (this double val , double newBase) => Math.Log  (val , newBase);
         public static double Max  (this double val1, double val2   ) => Math.Max  (val1, val2   );
@@ -38,13 +33,10 @@ namespace KKdBaseLib
         public static double Pow  (this double x   , double y      ) => Math.Pow  (x   , y      );
         public static double Round(this double val ,    int d      ) => Math.Round(val , d      );
 
-        public static float ToDegrees(this float val) => (float)(val * RadPi);
-        public static float ToRadians(this float val) => (float)(val / RadPi);
-
         public static float Acos   (this float d  ) => (float)     Math.Acos   (d  ) ;
         public static float Asin   (this float d  ) => (float)     Math.Asin   (d  ) ;
         public static float Atan   (this float d  ) => (float)     Math.Atan   (d  ) ;
-        public static float Aсtg   (this float d  ) => (float)(1 / Math.Atan   (d  ));
+        public static float Actg   (this float d  ) => (float)(1 / Math.Atan   (d  ));
         public static float  Cos   (this float d  ) => (float)     Math.Cos    (d  ) ;
         public static float  Cosh  (this float val) => (float)     Math.Cosh   (val) ;
         public static float  Sin   (this float a  ) => (float)     Math.Sin    (a  ) ;
@@ -62,7 +54,6 @@ namespace KKdBaseLib
         public static float Round  (this float d  ) => (float)     Math.Round  (d  ) ;
         public static float Sqrt   (this float d  ) => (float)     Math.Sqrt   (d  ) ;
 
-
         public static float Atan2(this float y   , float x      ) => (float)Math.Atan2(y   , x      );
         public static float Log  (this float val , float newBase) => (float)Math.Log  (val , newBase);
         public static float Max  (this float val1, float val2   ) =>        Math.Max  (val1, val2   );
@@ -96,10 +87,29 @@ namespace KKdBaseLib
         public static byte[] E(this byte[] le, byte len, bool isBE)
         { if (isBE) { for (byte i = 0; i < len; i++) buf[i] = le[i];
                 for (byte i = 0; i < len; i++) le[len - i - 1] = buf[i]; } return le; }
+
+        public static  short E(this  short le)
+        { for (byte i = 0; i < 2; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 2; i++) { le = (short)((int)le | buf[i]); if (i < 1) le <<= 8; } return le; }
+        public static ushort E(this ushort le)
+        { for (byte i = 0; i < 2; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 2; i++) { le |= buf[i]; if (i < 1) le <<= 8; } return le; }
+        public static    int E(this    int le)
+        { for (byte i = 0; i < 4; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 4; i++) { le |= buf[i]; if (i < 3) le <<= 8; } return le; }
+        public static   uint E(this   uint le)
+        { for (byte i = 0; i < 4; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 4; i++) { le |= buf[i]; if (i < 3) le <<= 8; } return le; }
+        public static   long E(this   long le)
+        { for (byte i = 0; i < 8; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 8; i++) { le |= buf[i]; if (i < 7) le <<= 8; } return le; }
+        public static  ulong E(this  ulong le)
+        { for (byte i = 0; i < 8; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
+                for (byte i = 0; i < 8; i++) { le |= buf[i]; if (i < 7) le <<= 8; } return le; }
+
         public static  short E(this  short le, bool isBE)
         { if (isBE) { for (byte i = 0; i < 2; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
-                for (byte i = 0; i < 2; i++) { le = (short)((int)le |
-                        buf[i]); if (i < 1) le <<= 8; } } return le; }
+                for (byte i = 0; i < 2; i++) { le = (short)((int)le | buf[i]); if (i < 1) le <<= 8; } } return le; }
         public static ushort E(this ushort le, bool isBE)
         { if (isBE) { for (byte i = 0; i < 2; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
                 for (byte i = 0; i < 2; i++) { le |= buf[i]; if (i < 1) le <<= 8; } } return le; }
@@ -116,22 +126,38 @@ namespace KKdBaseLib
         { if (isBE) { for (byte i = 0; i < 8; i++) { buf[i] = (byte)le; le >>= 8; } le = 0;
                 for (byte i = 0; i < 8; i++) { le |= buf[i]; if (i < 7) le <<= 8; } } return le; }
 
-        public static  short TI16(this byte[] arr)
-        {  short val; fixed (byte* ptr = arr) val = *( short*)ptr; return val; }
-        public static ushort TU16(this byte[] arr)
-        { ushort val; fixed (byte* ptr = arr) val = *(ushort*)ptr; return val; }
-        public static    int TI32(this byte[] arr)
-        {    int val; fixed (byte* ptr = arr) val = *(   int*)ptr; return val; }
-        public static   uint TU32(this byte[] arr)
-        {   uint val; fixed (byte* ptr = arr) val = *(  uint*)ptr; return val; }
-        public static   long TI64(this byte[] arr)
-        {   long val; fixed (byte* ptr = arr) val = *(  long*)ptr; return val; }
-        public static  ulong TU64(this byte[] arr)
-        {  ulong val; fixed (byte* ptr = arr) val = *( ulong*)ptr; return val; }
-        public static  float TF32(this byte[] arr)
-        {  float val; fixed (byte* ptr = arr) val = *( float*)ptr; return val; }
-        public static double TF64(this byte[] arr)
-        { double val; fixed (byte* ptr = arr) val = *(double*)ptr; return val; }
+        public static  short TI16(this byte[] arr, int offset = 0)
+        {  short val; fixed (byte* ptr = arr) val = *( short*)(ptr + offset); return val; }
+        public static ushort TU16(this byte[] arr, int offset = 0)
+        { ushort val; fixed (byte* ptr = arr) val = *(ushort*)(ptr + offset); return val; }
+        public static    int TI24(this byte[] arr, int offset = 0)
+        {    int val; fixed (byte* ptr = arr) val = (*(ushort*)(ptr + offset))
+                    | ((( short)*(sbyte*)(ptr + offset + 2)) << 16); return val; }
+        public static   uint TU24(this byte[] arr, int offset = 0)
+        {   uint val; fixed (byte* ptr = arr) val = (*(ushort*)(ptr + offset))
+                    | (((  uint)*( byte*)(ptr + offset + 2)) << 16); return val; }
+        public static    int TI32(this byte[] arr, int offset = 0)
+        {    int val; fixed (byte* ptr = arr) val = *(   int*)(ptr + offset); return val; }
+        public static   uint TU32(this byte[] arr, int offset = 0)
+        {   uint val; fixed (byte* ptr = arr) val = *(  uint*)(ptr + offset); return val; }
+        public static   long TI64(this byte[] arr, int offset = 0)
+        {   long val; fixed (byte* ptr = arr) val = *(  long*)(ptr + offset); return val; }
+        public static  ulong TU64(this byte[] arr, int offset = 0)
+        {  ulong val; fixed (byte* ptr = arr) val = *( ulong*)(ptr + offset); return val; }
+        public static   Half TF16(this byte[] arr, int offset = 0)
+        {   Half val; fixed (byte* ptr = arr) val = *(  Half*)(ptr + offset); return val; }
+        public static  float TF32(this byte[] arr, int offset = 0)
+        {  float val; fixed (byte* ptr = arr) val = *( float*)(ptr + offset); return val; }
+        public static double TF64(this byte[] arr, int offset = 0)
+        { double val; fixed (byte* ptr = arr) val = *(double*)(ptr + offset); return val; }
+        public static   Vec2 TV2 (this byte[] arr, int offset = 0)
+        {   Vec2 val; fixed (byte* ptr = arr) val = *( Vec2*)(ptr + offset); return val; }
+        public static   Vec3 TV3 (this byte[] arr, int offset = 0)
+        {   Vec3 val; fixed (byte* ptr = arr) val = *( Vec3*)(ptr + offset); return val; }
+        public static   Vec4 TV4 (this byte[] arr, int offset = 0)
+        {   Vec4 val; fixed (byte* ptr = arr) val = *( Vec4*)(ptr + offset); return val; }
+        public static   Quat TQ (this byte[] arr, int offset = 0)
+        {   Quat val; fixed (byte* ptr = arr) val = *( Quat*)(ptr + offset); return val; }
 
         public static void GBy(this byte[] arr,  short val)
         { fixed (byte* ptr = arr) *( short*)ptr = val; }
@@ -145,10 +171,20 @@ namespace KKdBaseLib
         { fixed (byte* ptr = arr) *(  long*)ptr = val; }
         public static void GBy(this byte[] arr,  ulong val)
         { fixed (byte* ptr = arr) *( ulong*)ptr = val; }
+        public static void GBy(this byte[] arr,   Half val)
+        { fixed (byte* ptr = arr) *(  Half*)ptr = val; }
         public static void GBy(this byte[] arr,  float val)
         { fixed (byte* ptr = arr) *( float*)ptr = val; }
         public static void GBy(this byte[] arr, double val)
         { fixed (byte* ptr = arr) *(double*)ptr = val; }
+        public static void GBy(this byte[] arr,   Vec2 val)
+        { fixed (byte* ptr = arr) *(  Vec2*)ptr = val; }
+        public static void GBy(this byte[] arr,   Vec3 val)
+        { fixed (byte* ptr = arr) *(  Vec3*)ptr = val; }
+        public static void GBy(this byte[] arr,   Vec4 val)
+        { fixed (byte* ptr = arr) *(  Vec4*)ptr = val; }
+        public static void GBy(this byte[] arr,   Quat val)
+        { fixed (byte* ptr = arr) *(  Quat*)ptr = val; }
 
         public static  sbyte CITSB(this    int c)
         {                return ( sbyte)(c > 0x0000007F ?
@@ -270,5 +306,39 @@ namespace KKdBaseLib
         public static bool ToF64(this string s, out double? val)
         { val = null; if (s.Length < 1) return false; ulong d = 0; if (s[0] == '-') d = 0x8000000000000000;
           bool b = double.TryParse(s.Replace(".", NDS), out double t); if (b) val = (d | t.ToU64()).ToF64(); return b; }
+
+        public static T[] ReverseEndian<T>(this T[] a)
+        {
+            if (a == null || a.Length < 1) return a;
+
+            int length = a.Length;
+            T[] b = new T[length];
+            for (int i = 0; i < length; i++)
+                b[i] = (T)ReverseEndian(a[i]);
+            return b;
+        }
+
+        public static object ReverseEndian(this object a)
+        {
+            object c = default;
+            System.Reflection.FieldInfo[] d = a.GetType().GetFields();
+            foreach (System.Reflection.FieldInfo field in d)
+            {
+                object e = field.GetValue(a);
+                Type t = field.FieldType;
+                     if (t == typeof( short)) e = (( short)e).E();
+                else if (t == typeof(ushort)) e = ((ushort)e).E();
+                else if (t == typeof(   int)) e = ((   int)e).E();
+                else if (t == typeof(  uint)) e = ((  uint)e).E();
+                else if (t == typeof(  long)) e = ((  long)e).E();
+                else if (t == typeof( ulong)) e = (( ulong)e).E();
+                else if (t == typeof( float)) e = (( float)e).ToI32().E().ToF32();
+                else if (t == typeof(double)) e = ((double)e).ToI64().E().ToF64();
+                else if (t == typeof(  Half)) e = (Half)((ushort)(Half)e).E();
+                else e = ReverseEndian(e);
+                field.SetValue(a, e);
+            }
+            return c;
+        }
     }
 }

KKdBaseLib/F2/ENRS.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib.F2
+namespace KKdBaseLib.F2
 {
     public struct ENRS : INull
     {

KKdBaseLib/F2/Header.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib.F2
+namespace KKdBaseLib.F2
 {
     public struct Header
     {
@@ -13,9 +13,9 @@
         public int SectionSignature;
 
         public Format Format;
-        public bool NotUseDataSizeAsSectionSize;
+        public bool UseBigEndian;
+        public bool UseSectionSize;
 
-        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

@@ -1,4 +1,4 @@
-namespace KKdBaseLib.F2
+namespace KKdBaseLib.F2
 {
     public struct POF : INull
     {
@@ -16,24 +16,28 @@
             Offsets = KKdList<long>.New;
             fixed (byte* ptr = data)
             {
-                int i = 0, offset = 0, v = 0;
+                long offset = 0;
+                int i = 0, j = 0, v = 0;
                 byte bitShift = (byte)(shiftX ? 3 : 2);
 
                 int length = *(int*)ptr - 4;
-                byte* localPtr = ptr + 4;
+                byte* l = ptr + 4;
+                Offsets.Capacity = length;
                 while (length > i)
                 {
-                    v = *ptr & 0x3F;
-                    Val = (Value)(*ptr & 0xC0);
-                    localPtr++; i++;
-                         if (Val == Value.Int32  )
-                    { v = (v << 24) | (ptr[0] << 16) | (ptr[1] << 8) | ptr[2]; localPtr += 3; i += 3; }
-                    else if (Val == Value.Int16  )
-                    { v = (v <<  8) |  ptr[0];                                 localPtr += 1; i += 3; }
-                    else if (Val == Value.Invalid) break;
+                    v = *l & 0x3F;
+                    Val = (Value)(*l & 0xC0);
+                         if (Val == Value.Int32)
+                    { v = (v << 24) | (l[1] << 16) | (l[2] << 8) | l[3]; l += 4; i += 4; }
+                    else if (Val == Value.Int16)
+                    { v = (v <<  8) |  l[1];                             l += 2; i += 2; }
+                    else if (Val == Value.Int8 ) {                       l ++  ; i ++  ; }
+                    else break;
+                    j++;
                     offset += v;
                     Offsets.Add(offset << bitShift);
                 }
+                Offsets.Capacity = j;
             }
         }
 

KKdBaseLib/F2/Struct.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib.F2
+namespace KKdBaseLib.F2
 {
     public struct Struct
     {

KKdBaseLib/Format.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib
+namespace KKdBaseLib
 {
     public enum Format : byte
     {
@@ -9,11 +9,11 @@
         DTe  =  4,
         F    =  5,
         AFT  =  6,
-        F2LE =  7,
-        F2BE =  8,
-        MGF  =  9,
-        X    = 10,
-        XHD  = 11,
-        FT   = 12,
+        F2   =  7,
+        MGF  =  8,
+        X    =  9,
+        XHD  = 10,
+        FT   = 11,
+        M39  = 12,
     }
 }

KKdBaseLib/Half.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace KKdBaseLib
 {

KKdBaseLib/Interfaces.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib
+namespace KKdBaseLib
 {
     public interface IKF
     {

KKdBaseLib/Interpolation/A3DAI.cs

@@ -1,33 +1,32 @@
-using KKdBaseLib.Auth3D;
+using KKdBaseLib.Auth3D;
 
 namespace KKdBaseLib.Interpolation
 {
-    public struct A3DAI //A3DA Interpolation
+    public class A3DAI : IInterpolation<float> //A3DA Interpolation
     {
         private A3DAKey a3daKey;
 
         private float f;
-        private float last;
+        private float t;
+        private float v;
         private float df;
         private float @if;
         private float rf;
-        private float lastTime;
 
         private KFT3 firstKey;
         private KFT3  lastKey;
 
-        public float InterpolationFramerate { get => @if; set { @if = value; df = @if / rf; } }
-        public float     RequestedFramerate { get =>  rf; set {  rf = value; df = @if / rf; } }
+        public float RequestedFramerate { get =>  rf; set {  rf = value; df = @if / rf; } }
 
         public float Frame => f;
-        public float Value => last;
+        public float Time  => t;
+        public float Value => v;
         public bool  IsNull => a3daKey.Keys == null ?  true : a3daKey.Length < 1;
         public bool NotNull => a3daKey.Keys == null ? false : a3daKey.Length > 0;
 
         public A3DAI(Key key, float a3daFramerate = 60, float requestedFramerate = 60)
         {
-            lastTime = 0;
-            a3daKey = (A3DAKey)key; f = -1; df = last = rf = @if = 0;
+            a3daKey = (A3DAKey)key; f = -1; df = @if = rf = t = v = 0;
             @if = a3daFramerate;
             firstKey = lastKey = default;
             RequestedFramerate = requestedFramerate;
@@ -43,8 +42,8 @@ namespace KKdBaseLib.Interpolation
 
         public A3DAI(A3DAKey key, float a3daFramerate = 60, float requestedFramerate = 60)
         {
-            lastTime = 0;
-            a3daKey = key; f = -1; df = last = rf = @if = 0;
+            t = 0;
+            a3daKey = key; f = -1; df = v = rf = @if = 0;
             @if = a3daFramerate;
             firstKey = lastKey = default;
             RequestedFramerate = requestedFramerate;
@@ -60,50 +59,54 @@ namespace KKdBaseLib.Interpolation
 
         public float SetTime(float time)
         {
-                 if ((int)a3daKey.Type < 0 || (int)a3daKey.Type > 4) return 0.0f;
-            else if ((int)a3daKey.Type < 2) return a3daKey.Value;
-            else if (a3daKey.Length < 1) return 0.0f;
-
-            lastTime = time;
+            t = time;
             f = time * @if;
-            last = Interpolate(f);
-            return last;
+
+            int type = (int)a3daKey.Type;
+                 if (type < 0 || type > 4) v = 0.0f;
+            else if (type < 2)             v = a3daKey.Value;
+            else if (a3daKey.Length   < 1) v = 0.0f;
+            else                           v = Interpolate(f);
+            return v;
         }
 
         public float SetFrame(float frame)
         {
-                 if ((int)a3daKey.Type < 0 || (int)a3daKey.Type > 4) return 0.0f;
-            else if ((int)a3daKey.Type < 2) return a3daKey.Value;
-            else if (a3daKey.Length < 1) return 0.0f;
-
-            lastTime = frame / rf;
+            t = frame / rf;
             f = frame * df;
-            last = Interpolate(f);
-            return last;
+
+            int type = (int)a3daKey.Type;
+                 if (type < 0 || type > 4) v = 0.0f;
+            else if (type < 2)             v = a3daKey.Value;
+            else if (a3daKey.Length   < 1) v = 0.0f;
+            else                           v = Interpolate(f);
+            return v;
         }
 
         public float NextFrame(float time)
         {
-                 if ((int)a3daKey.Type < 0 || (int)a3daKey.Type > 4) return 0.0f;
-            else if ((int)a3daKey.Type < 2) return a3daKey.Value;
-            else if (a3daKey.Length < 1) return 0.0f;
+            t += time;
+            f = t * @if;
 
-            lastTime += time;
-            f = lastTime * @if;
-            last = Interpolate(f);
-            return last;
+            int type = (int)a3daKey.Type;
+                 if (type < 0 || type > 4) v = 0.0f;
+            else if (type < 2)             v = a3daKey.Value;
+            else if (a3daKey.Length   < 1) v = 0.0f;
+            else                           v = Interpolate(f);
+            return v;
         }
 
         public float NextFrame()
         {
-                 if ((int)a3daKey.Type < 0 || (int)a3daKey.Type > 4) return 0.0f;
-            else if ((int)a3daKey.Type < 2) return a3daKey.Value;
-            else if (a3daKey.Length < 1) return 0.0f;
-
             f += df;
-            lastTime = f / @if;
-            last = Interpolate(f);
-            return last;
+            t = f / @if;
+
+            int type = (int)a3daKey.Type;
+                 if (type < 0 || type > 4) v = 0.0f;
+            else if (type < 2)             v = a3daKey.Value;
+            else if (a3daKey.Length   < 1) v = 0.0f;
+            else                           v = Interpolate(f);
+            return v;
         }
 
         private float Interpolate(float frame)
@@ -148,19 +151,27 @@ namespace KKdBaseLib.Interpolation
                  if (f <= firstKey.F) return firstKey.V + ep;
             else if (f >=  lastKey.F) return  lastKey.V + ep;
 
-            long key = 0;
-            long length = a3daKey.Length;
-            long temp;
-            while (length > 0)
-                if (f > a3daKey.Keys[key + (temp = length >> 1)].F)
+            KFT3 c, n;
+            unsafe
+            {
+                fixed (KFT3* ptr = a3daKey.Keys)
                 {
-                       key += temp + 1;
-                    length -= temp + 1;
+                    long key = 0;
+                    long length = a3daKey.Length;
+                    long temp;
+                    while (length > 0)
+                        if (f > a3daKey.Keys[key + (temp = length >> 1)].F)
+                        {
+                               key += temp + 1;
+                            length -= temp + 1;
+                        }
+                        else length = temp;
+
+                    c = ptr[key - 1];
+                    n = ptr[key];
                 }
-                else length = temp;
+            }
 
-            ref KFT3 c = ref a3daKey.Keys[key - 1];
-            ref KFT3 n = ref a3daKey.Keys[key];
             float result;
             if (frame > c.F && frame < n.F)
             {
@@ -182,8 +193,8 @@ namespace KKdBaseLib.Interpolation
             return result + ep;
         }
 
-        public void ResetFrameCount() => f = -df;
+        public void ResetFrameCount() { f = -df; t = f / rf; }
 
-        public override string ToString() => $"Frame: {f}, Value: {last}";
+        public override string ToString() => $"F: {f}; T: {t}; V: {v}";
     }
 }

KKdBaseLib/Interpolation/IInterpolation.cs

@@ -1,17 +1,17 @@
-namespace KKdBaseLib.Interpolation
+namespace KKdBaseLib.Interpolation
 {
-    public interface IInterpolation : INull
+    public interface IInterpolation<T> : INull
     {
-        float     RequestedFramerate { get; set; }
-        float InterpolationFramerate { get; set; }
+        float RequestedFramerate { get; set; }
 
         float Frame { get; }
-        float Value { get; }
+        float  Time { get; }
+            T Value { get; }
 
-        float  SetTime (float  time);
-        float  SetFrame(float frame);
-        float NextFrame(float  time);
-        float NextFrame();
+        T  SetTime (float  time);
+        T  SetFrame(float frame);
+        T NextFrame(float  time);
+        T NextFrame();
         void ResetFrameCount();
     }
 }

KKdBaseLib/Interpolation/PDI.cs

@@ -1,31 +1,32 @@
-namespace KKdBaseLib.Interpolation
+namespace KKdBaseLib.Interpolation
 {
-    public struct PDI : IInterpolation //Project DIVA Interpolation
+    public class PDI : IInterpolation<float> //Project DIVA Interpolation
     {
         private KFT2[] array;
+        private int length;
 
         private float f;
-        private float last;
+        private float t;
+        private float v;
         private float df;
         private float @if;
         private float rf;
-        private float lastTime;
 
         private KFT2 firstKey;
         private KFT2  lastKey;
 
-        public float InterpolationFramerate { get => @if; set { @if = value; df = @if / rf; } }
-        public float     RequestedFramerate { get =>  rf; set {  rf = value; df = @if / rf; } }
+        public float RequestedFramerate { get =>  rf; set {  rf = value; df = @if / rf; } }
 
         public float Frame => f;
-        public float Value => last;
+        public float Time  => t;
+        public float Value => v;
         public bool  IsNull => array == null ?  true : array.Length < 1;
         public bool NotNull => array == null ? false : array.Length > 0;
 
         public PDI(KFT2[] array, float interpolationFramerate = 60, float requestedFramerate = 60)
         {
-            lastTime = 0;
-            this.array = array; f = -1; df = last = rf = @if = 0;
+            length = 0;
+            this.array = array; f = -1; df = @if = rf = t = v = 0;
             @if = interpolationFramerate;
             firstKey = lastKey = default;
             RequestedFramerate = requestedFramerate;
@@ -36,47 +37,52 @@
             {
                 firstKey = array[0];
                  lastKey = array[array.Length - 1];
+                  length = array.Length;
             }
         }
 
         public float SetTime(float time)
         {
-            if (array == null || array.Length < 1) return 0;
-
-            lastTime = time;
+            t = time;
             f = time * @if;
-            last = Interpolate(f);
-            return last;
+
+            if (array == null || length < 1) v = 0.0f;
+            else                             v = Interpolate(f);
+
+            return v;
         }
 
         public float SetFrame(float frame)
         {
-            if (array == null || array.Length < 1) return 0;
-
-            lastTime = frame / rf;
+            t = frame / rf;
             f = frame * df;
-            last = Interpolate(f);
-            return last;
+
+            if (array == null || length < 1) v = 0.0f;
+            else                             v = Interpolate(f);
+
+            return v;
         }
 
         public float NextFrame(float time)
         {
-            if (array == null || array.Length < 1) return 0;
+            t += time;
+            f = t * @if;
 
-            lastTime += time;
-            f = lastTime * @if;
-            last = Interpolate(f);
-            return last;
+            if (array == null || length < 1) v = 0.0f;
+            else                             v = Interpolate(f);
+
+            return v;
         }
 
         public float NextFrame()
         {
-            if (array == null || array.Length < 1) return 0;
-
             f += df;
-            lastTime = f / @if;
-            last = Interpolate(f);
-            return last;
+            t = f / @if;
+
+            if (array == null || length < 1) v = 0.0f;
+            else                             v = Interpolate(f);
+
+            return v;
         }
 
         private float Interpolate(float frame)
@@ -86,19 +92,27 @@
                  if (f <= firstKey.F) return firstKey.V;
             else if (f >=  lastKey.F) return  lastKey.V;
 
-            int key = 0;
-            int length = array.Length;
-            int temp;
-            while (length > 0)
-                if (f > array[key + (temp = length >> 1)].F)
+            KFT2 c, n;
+            unsafe
+            {
+                fixed (KFT2* ptr = array)
                 {
-                       key += temp + 1;
-                    length -= temp + 1;
+                    long key = 0;
+                    long length = this.length;
+                    long temp;
+                    while (length > 0)
+                        if (f > array[key + (temp = length >> 1)].F)
+                        {
+                               key += temp + 1;
+                            length -= temp + 1;
+                        }
+                        else length = temp;
+
+                    c = ptr[key - 1];
+                    n = ptr[key];
                 }
-                else length = temp;
+            }
 
-            ref KFT2 c = ref array[key - 1];
-            ref KFT2 n = ref array[key];
             float result;
             if (frame > c.F && frame < n.F)
             {
@@ -111,8 +125,8 @@
             return result;
         }
 
-        public void ResetFrameCount() => f = -df;
+        public void ResetFrameCount() { f = -df; t = f / rf; }
 
-        public override string ToString() => $"Frame: {f}, Value: {last}";
+        public override string ToString() => $"F: {f}; T: {t}; V: {v}";
     }
 }

KKdBaseLib/KF.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib
+namespace KKdBaseLib
 {
     public struct KFT0 : IKF
     {

KKdBaseLib/KKdBaseLib.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Authors>korenkonder</Authors>
@@ -6,12 +6,12 @@
     <Configuration></Configuration>
     <Copyright>korenkonder © 2019-2020</Copyright>
     <Description>A base library</Description>
-    <FileVersion>0.4.9.0</FileVersion>
+    <FileVersion>0.4.9.3</FileVersion>
     <PackageId>KKdBaseLib</PackageId>
     <Product>KKdBaseLib</Product>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <Title>KKdBaseLib</Title>
-    <Version>0.4.9.0</Version>
+    <Version>0.4.9.3</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -39,4 +39,7 @@
     <LangVersion>8.0</LangVersion>
     <NoWarn>IDE0004, IDE0044, IDE0045, IDE0046, IDE0055, IDE0059, IDE0069, IDE1006</NoWarn>
   </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
 </Project>

KKdBaseLib/KKdDict.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib
+namespace KKdBaseLib
 {
     public struct KKdDict<TKey, TValue> : System.IDisposable, System.Collections.IEnumerator, INull
     {
@@ -49,9 +49,17 @@
             set { if (keyArray != null && valArray != null && index < keyArray.Length &&
                     index < valArray.Length) { keyArray[index] = value.Key; valArray[index] = value.Value; } } }
 
+        public KeyValuePair<TKey, TValue> this[long index, bool list]
+        {   get =>    keyArray != null && valArray != null && index > -1 && index < keyArray.Length &&
+                index < valArray.Length ? new KeyValuePair<TKey, TValue>(keyArray[index], valArray[index]) : default;
+            set { if (keyArray != null && valArray != null && index > -1 && index < keyArray.Length &&
+                    index < valArray.Length) { keyArray[index] = value.Key; valArray[index] = value.Value; } } }
+
         public TValue this[TKey key]
-        {   get =>    valArray != null && valArray.Length > 0 && CK(key, out int index) ? valArray[index] : default;
-            set { if (valArray != null && valArray.Length > 0) if (CK(key, out int index)) valArray[index] = value; else Add(key, value); } }
+        {   get =>    valArray != null && valArray.Length > 0
+                    &&  CK(key, out int index) ? valArray[index] : default;
+            set { if (valArray != null && valArray.Length > 0)
+                    if (CK(key, out int index)) valArray[index] = value; else Add(key, value); } }
 
         public bool MoveNext()
         { if (index == count - 1) { index = 0; return false; }
@@ -209,6 +217,9 @@
                 else if (valArray[i].Equals(val)) return i;
             return -1;
         }
+
+        public override string ToString() =>
+            $"(Count: {Count}; Capacity: {Capacity}; Current: {Current})";
     }
 
     public struct KeyValuePair<TKey, TValue>
@@ -218,5 +229,8 @@
 
         public KeyValuePair(TKey key, TValue value)
         { Key = key; Value = value; }
+
+        public override string ToString() =>
+            $"(Key: {Key}; value: {Value})";
     }
 }

KKdBaseLib/KKdList.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
 namespace KKdBaseLib
@@ -43,6 +43,10 @@ namespace KKdBaseLib
         {   get =>    array != null && index < array.Length ? array[index] : default;
             set { if (array != null && index < array.Length)  array[index] =   value; } }
 
+        public T this[long index]
+        {   get =>    array != null && index < array.Length ? array[index] : default;
+            set { if (array != null && index < array.Length)  array[index] =   value; } }
+
         public IEnumerator GetEnumerator() => enumerator = new Enumerator(array);
 
         IEnumerator<T> IEnumerable<T>.GetEnumerator() => enumerator = new Enumerator(array);
@@ -111,20 +115,23 @@ namespace KKdBaseLib
         public static explicit operator    List<T>(KKdList<T> list)
         { List<T> outList = new List<T>(); for (int i = 0; i < list.Count; i++) outList.Add(list[i]); return outList; }
 
+        public override string ToString() =>
+            $"(Count: {Count}; Capacity: {Capacity}; Current: {Current})";
+
         public struct Enumerator : IEnumerator<T>, IEnumerator
         {
             private T[] array;
             private int index;
             private int count;
             private T current;
- 
-            internal Enumerator(T[] array) 
+
+            internal Enumerator(T[] array)
             { this.array = array; count = index = 0;   current = default;
               if (array != null && array.Length > 0) { current = array[0]; count = array.Length; } }
- 
+
             public void Dispose()
             { array = null; count = index = 0; current = default; }
- 
+
             public bool MoveNext()
             {
                 if (index < count) { current = array[index]; index++;           return  true; }
@@ -132,7 +139,7 @@ namespace KKdBaseLib
             }
 
             public T Current => current;
- 
+
             object IEnumerator.Current =>
                 (index == 0 || index == array.Length + 1) ? default : current;
 

KKdBaseLib/Mat2.cs

@@ -0,0 +1,130 @@
+using System.Runtime.InteropServices;
+
+namespace KKdBaseLib
+{
+    [StructLayout(LayoutKind.Explicit)]
+    public struct Mat2
+    {
+        [FieldOffset(0x00)] public Vec2 Row0;
+        [FieldOffset(0x08)] public Vec2 Row1;
+
+        public Vec2 Column0 { get => new Vec2(Row0.X, Row1.X);
+            set { Row0.X = value.X; Row1.X = value.Y; } }
+        public Vec2 Column1 { get => new Vec2(Row0.Y, Row1.X);
+            set { Row0.Y = value.X; Row1.Y = value.Y; } }
+
+        public static Mat2 Identity => new Mat2(new Vec2(1.0f, 0.0f),
+                                                new Vec2(0.0f, 1.0f));
+
+        public Mat2(Vec2 row0, Vec2 row1)
+        { Row0 = row0; Row1 = row1; }
+
+        public Mat2 Invert() => -this;
+
+        public static Mat2 operator +(Mat2 left, Mat2 right)
+        { left.Row0 += right.Row0; left.Row1 += right.Row1; return left; }
+
+        public static Mat2 operator -(Mat2 left, Mat2 right)
+        { left.Row0 -= right.Row0; left.Row1 -= right.Row1; return left; }
+
+        public static Mat2 operator -(Mat2 mat)
+        {
+            int[]   colIdx = {  0,  0 };
+            int[]   rowIdx = {  0,  0 };
+            int[] pivotIdx = { -1, -1 };
+
+            Mat2 result = mat;
+            float[,] inverse =
+            {
+                { mat.Row0.X, mat.Row0.Y },
+                { mat.Row1.X, mat.Row1.Y }
+            };
+            int icol = 0;
+            int irow = 0;
+            for (int i = 0; i < 2; i++)
+            {
+                float maxPivot = 0.0f;
+                for (int j = 0; j < 2; j++)
+                {
+                    if (pivotIdx[j] == 0) continue;
+
+                    for (int k = 0; k < 2; k++)
+                    {
+                        if (pivotIdx[k] == -1)
+                        {
+                            float absVal = System.Math.Abs(inverse[j, k]);
+                            if (absVal > maxPivot)
+                            {
+                                maxPivot = absVal;
+                                irow = j;
+                                icol = k;
+                            }
+                        }
+                        else if (pivotIdx[k] > 0)
+                            return result;
+                    }
+                }
+
+                pivotIdx[icol]++;
+
+                if (irow != icol)
+                    for (int k = 0; k < 2; k++)
+                    { float t = inverse[irow, k]; inverse[irow, k] = inverse[icol, k]; inverse[icol, k] = t; }
+
+                rowIdx[i] = irow;
+                colIdx[i] = icol;
+
+                float pivot = inverse[icol, icol];
+
+                float oneOverPivot = 1.0f / pivot;
+                inverse[icol, icol] = 1.0f;
+                for (int k = 0; k < 2; k++)
+                    inverse[icol, k] *= oneOverPivot;
+
+                for (int j = 0; j < 2; j++)
+                {
+                    if (icol == j) continue;
+
+                    float f = inverse[j, icol];
+                    inverse[j, icol] = 0.0f;
+                    for (int k = 0; k < 3; k++)
+                        inverse[j, k] -= inverse[icol, k] * f;
+                }
+            }
+
+            for (int j = 1; j >= 0; j--)
+            {
+                int ir = rowIdx[j];
+                int ic = colIdx[j];
+                for (int k = 0; k < 2; k++)
+                { float t = inverse[k, ic]; inverse[k, ic] = inverse[k, ir]; inverse[k, ir] = t; }
+            }
+
+            result.Row0.X = inverse[0, 0]; result.Row0.Y = inverse[0, 1];
+            result.Row1.X = inverse[1, 0]; result.Row1.Y = inverse[1, 1];
+            return result;
+        }
+
+        public static Mat2 operator *(Mat2 left, Mat2 right)
+        {
+            Mat2 result = default;
+            result.Row0 = left.Row0.X * right.Row0 + left.Row0.Y * right.Row1;
+            result.Row1 = left.Row1.X * right.Row0 + left.Row1.Y * right.Row1;
+            return result;
+        }
+
+        public static Mat2 operator *(Mat2 mat, float scale) =>
+            new Mat2(mat.Row0 * scale, mat.Row1 * scale);
+
+        public static bool operator ==(Mat2 A, Mat2 B) =>  A.Equals(B);
+        public static bool operator !=(Mat2 A, Mat2 B) => !A.Equals(B);
+
+        public bool Equals(Mat2 other) =>
+            Row0 == other.Row0 && Row1 == other.Row1;
+
+        public override bool Equals(object obj) => base.Equals(obj);
+        public override int GetHashCode() => base.GetHashCode();
+        public override string ToString() => $"({Row0}; {Row1})";
+        public string ToString(int d) => $"({Row0.ToString(d)}; {Row1.ToString(d)})";
+    }
+}

KKdBaseLib/Mat3.cs

@@ -0,0 +1,217 @@
+using System.Runtime.InteropServices;
+
+namespace KKdBaseLib
+{
+    [StructLayout(LayoutKind.Explicit)]
+    public struct Mat3
+    {
+        [FieldOffset(0x00)] public Vec3 Row0;
+        [FieldOffset(0x0C)] public Vec3 Row1;
+        [FieldOffset(0x18)] public Vec3 Row2;
+
+        public Vec3 Column0 { get => new Vec3(Row0.X, Row1.X, Row2.X);
+            set { Row0.X = value.X; Row1.X = value.Y; Row2.X = value.Z; } }
+        public Vec3 Column1 { get => new Vec3(Row0.Y, Row1.X, Row2.Y);
+            set { Row0.Y = value.X; Row1.Y = value.Y; Row2.Y = value.Z; } }
+        public Vec3 Column2 { get => new Vec3(Row0.Z, Row1.Z, Row2.Z);
+            set { Row0.Z = value.X; Row1.Z = value.Y; Row2.Z = value.Z;} }
+
+        public static Mat3 Identity => new Mat3(new Vec3(1.0f, 0.0f, 0.0f),
+                                                new Vec3(0.0f, 1.0f, 0.0f),
+                                                new Vec3(0.0f, 0.0f, 1.0f));
+
+        public Mat3(float m00, float m01, float m02, float m10, float m11, float m12, float m20, float m21, float m22)
+        { Row0 = new Vec3(m00, m01, m02); Row1 = new Vec3(m10, m11, m12); Row2 = new Vec3(m20, m21, m22);}
+
+        public Mat3(Vec3 row0, Vec3 row1, Vec3 row2)
+        { Row0 = row0; Row1 = row1; Row2 = row2; }
+
+        public Mat3(Mat4 mat)
+        { Row0 = new Vec3(mat.Row0); Row1 = new Vec3(mat.Row1); Row2 = new Vec3(mat.Row2); }
+
+        public Mat3(Quat q)
+        {
+            float qx = q.X;
+            float qy = q.Y;
+            float qz = q.Z;
+            float qw = q.W;
+            float g = qx + qx;
+            float h = qy + qy;
+            float k = qz + qz;
+            float a = qx * g;
+            float l = qx * h;
+            float m = qy * h;
+            qx *= k;
+            qy *= k;
+            qz *= k;
+
+            Row0 = new Vec3(1.0f - qz - m,    l - qw * k,   qx + qw * h);
+            Row1 = new Vec3(   l + qw * k, 1.0f - qz - a,   qy - qw * g);
+            Row2 = new Vec3(  qx - qw * h,   qy + qw * g, 1.0f -  m - a);
+        }
+
+        public Quat ToQuat()
+        {
+            Vec3 row0 = Row0;
+            Vec3 row1 = Row1;
+            Vec3 row2 = Row2;
+
+            Quat q = default;
+            var trace = 0.25 * (row0.X + row1.Y + row2.Z+ 1.0);
+
+            if (trace > 0)
+            {
+                double sq = System.Math.Sqrt(trace);
+
+                q.W = (float)sq;
+                sq = 1.0 / (4.0 * sq);
+                q.X = (float)((row1.Z - row2.Y) * sq);
+                q.Y = (float)((row2.X - row0.Z) * sq);
+                q.Z = (float)((row0.Y - row1.X) * sq);
+            }
+            else if (row0.X > row1.Y && row0.X > row2.Z)
+            {
+                double sq = 2.0 * System.Math.Sqrt(1.0 + row0.X - row1.Y - row2.Z);
+
+                q.X = (float)(0.25 * sq);
+                sq = 1.0 / sq;
+                q.W = (float)((row2.Y - row1.Z) * sq);
+                q.Y = (float)((row1.X + row0.Y) * sq);
+                q.Z = (float)((row2.X + row0.Z) * sq);
+            }
+            else if (row1.Y > row2.Z)
+            {
+                double sq = 2.0 * System.Math.Sqrt(1.0 + row1.Y - row0.X - row2.Z);
+
+                q.Y = (float)(0.25 * sq);
+                sq = 1.0 / sq;
+                q.W = (float)((row2.X - row0.Z) * sq);
+                q.X = (float)((row1.X + row0.Y) * sq);
+                q.Z = (float)((row2.Y + row1.Z) * sq);
+            }
+            else
+            {
+                double sq = 2.0 * System.Math.Sqrt(1.0 + row2.Z - row0.X - row1.Y);
+
+                q.Z = (float)(0.25 * sq);
+                sq = 1.0 / sq;
+                q.W = (float)((row1.X - row0.Y) * sq);
+                q.X = (float)((row2.X + row0.Z) * sq);
+                q.Y = (float)((row2.Y + row1.Z) * sq);
+            }
+
+            return q.Normalized;
+        }
+
+        public Mat3 Invert() => -this;
+
+        public static Mat3 operator +(Mat3 left, Mat3 right)
+        { left.Row0 += right.Row0; left.Row1 += right.Row1; left.Row2 += right.Row2; return left; }
+
+        public static Mat3 operator -(Mat3 left, Mat3 right)
+        { left.Row0 -= right.Row0; left.Row1 -= right.Row1; left.Row2 -= right.Row2; return left; }
+
+        public static Mat3 operator -(Mat3 mat)
+        {
+            int[]   colIdx = {  0,  0,  0 };
+            int[]   rowIdx = {  0,  0,  0 };
+            int[] pivotIdx = { -1, -1, -1 };
+
+            Mat3 result = mat;
+            float[,] inverse =
+            {
+                { mat.Row0.X, mat.Row0.Y, mat.Row0.Z },
+                { mat.Row1.X, mat.Row1.Y, mat.Row1.Z },
+                { mat.Row2.X, mat.Row2.Y, mat.Row2.Z }
+            };
+            int icol = 0;
+            int irow = 0;
+            for (int i = 0; i < 3; i++)
+            {
+                float maxPivot = 0.0f;
+                for (int j = 0; j < 3; j++)
+                {
+                    if (pivotIdx[j] == 0) continue;
+
+                    for (int k = 0; k < 3; k++)
+                    {
+                        if (pivotIdx[k] == -1)
+                        {
+                            float absVal = System.Math.Abs(inverse[j, k]);
+                            if (absVal > maxPivot)
+                            {
+                                maxPivot = absVal;
+                                irow = j;
+                                icol = k;
+                            }
+                        }
+                        else if (pivotIdx[k] > 0)
+                            return result;
+                    }
+                }
+
+                pivotIdx[icol]++;
+
+                if (irow != icol)
+                    for (int k = 0; k < 3; k++)
+                    { float t = inverse[irow, k]; inverse[irow, k] = inverse[icol, k]; inverse[icol, k] = t; }
+
+                rowIdx[i] = irow;
+                colIdx[i] = icol;
+
+                float pivot = inverse[icol, icol];
+
+                float oneOverPivot = 1.0f / pivot;
+                inverse[icol, icol] = 1.0f;
+                for (int k = 0; k < 3; k++)
+                    inverse[icol, k] *= oneOverPivot;
+
+                for (int j = 0; j < 3; j++)
+                {
+                    if (icol == j) continue;
+
+                    float f = inverse[j, icol];
+                    inverse[j, icol] = 0.0f;
+                    for (int k = 0; k < 3; k++)
+                        inverse[j, k] -= inverse[icol, k] * f;
+                }
+            }
+
+            for (int j = 2; j >= 0; j--)
+            {
+                int ir = rowIdx[j];
+                int ic = colIdx[j];
+                for (int k = 0; k < 3; k++)
+                { float t = inverse[k, ic]; inverse[k, ic] = inverse[k, ir]; inverse[k, ir] = t; }
+            }
+
+            result.Row0.X = inverse[0, 0]; result.Row0.Y = inverse[0, 1]; result.Row0.Z = inverse[0, 2];
+            result.Row1.X = inverse[1, 0]; result.Row1.Y = inverse[1, 1]; result.Row1.Z = inverse[1, 2];
+            result.Row2.X = inverse[2, 0]; result.Row2.Y = inverse[2, 1]; result.Row2.Z = inverse[2, 2];
+            return result;
+        }
+
+        public static Mat3 operator *(Mat3 left, Mat3 right)
+        {
+            Mat3 result = default;
+            result.Row0 = left.Row0.X * right.Row0 + left.Row0.Y * right.Row1 + left.Row0.Z * right.Row2;
+            result.Row1 = left.Row1.X * right.Row0 + left.Row1.Y * right.Row1 + left.Row1.Z * right.Row2;
+            result.Row2 = left.Row2.X * right.Row0 + left.Row2.Y * right.Row1 + left.Row2.Z * right.Row2;
+            return result;
+        }
+
+        public static Mat3 operator *(Mat3 mat, float scale) =>
+            new Mat3(mat.Row0 * scale, mat.Row1 * scale, mat.Row2 * scale);
+
+        public static bool operator ==(Mat3 A, Mat3 B) =>  A.Equals(B);
+        public static bool operator !=(Mat3 A, Mat3 B) => !A.Equals(B);
+
+        public bool Equals(Mat3 other) =>
+            Row0 == other.Row0 && Row1 == other.Row1 && Row2 == other.Row2;
+
+        public override bool Equals(object obj) => base.Equals(obj);
+        public override int GetHashCode() => base.GetHashCode();
+        public override string ToString() => $"({Row0}; {Row1}; {Row2})";
+        public string ToString(int d) => $"({Row0.ToString(d)}; {Row1.ToString(d)}; {Row2.ToString(d)})";
+    }
+}

KKdBaseLib/Mat4.cs

@@ -0,0 +1,254 @@
+using System.Runtime.InteropServices;
+
+namespace KKdBaseLib
+{
+    [StructLayout(LayoutKind.Explicit)]
+    public struct Mat4
+    {
+        [FieldOffset(0x00)] public Vec4 Row0;
+        [FieldOffset(0x10)] public Vec4 Row1;
+        [FieldOffset(0x20)] public Vec4 Row2;
+        [FieldOffset(0x30)] public Vec4 Row3;
+
+        public Vec4 Column0 { get => new Vec4(Row0.X, Row1.X, Row2.X, Row3.X);
+            set { Row0.X = value.X; Row1.X = value.Y; Row2.X = value.Z; Row3.X = value.W; } }
+        public Vec4 Column1 { get => new Vec4(Row0.Y, Row1.X, Row2.Y, Row3.Y);
+            set { Row0.Y = value.X; Row1.Y = value.Y; Row2.Y = value.Z; Row3.Y = value.W; } }
+        public Vec4 Column2 { get => new Vec4(Row0.Z, Row1.Z, Row2.Z, Row3.Z);
+            set { Row0.Z = value.X; Row1.Z = value.Y; Row2.Z = value.Z; Row3.Z = value.W; } }
+        public Vec4 Column3 { get => new Vec4(Row0.W, Row1.W, Row2.W, Row3.W);
+            set { Row0.W = value.X; Row1.W = value.Y; Row2.W = value.Z; Row3.W = value.W; } }
+
+        public static Mat4 Identity => new Mat4(new Vec4(1.0f, 0.0f, 0.0f, 0.0f),
+                                                new Vec4(0.0f, 1.0f, 0.0f, 0.0f),
+                                                new Vec4(0.0f, 0.0f, 1.0f, 0.0f),
+                                                new Vec4(0.0f, 0.0f, 0.0f, 1.0f));
+
+        public Mat4(float m00, float m01, float m02, float m03, float m10, float m11, float m12, float m13,
+                    float m20, float m21, float m22, float m23, float m30, float m31, float m32, float m33)
+        { Row0 = new Vec4(m00, m01, m02, m03); Row1 = new Vec4(m10, m11, m12, m13);
+          Row2 = new Vec4(m20, m21, m22, m23); Row3 = new Vec4(m30, m31, m32, m33); }
+
+        public Mat4(Vec4 row0, Vec4 row1, Vec4 row2, Vec4 row3)
+        { Row0 = row0; Row1 = row1; Row2 = row2; Row3 = row3; }
+
+        public Mat4(Mat3 mat)
+        { Row0 = new Vec4(mat.Row0); Row1 = new Vec4(mat.Row1);
+          Row2 = new Vec4(mat.Row2); Row3 = new Vec4(0.0f, 0.0f, 0.0f, 1.0f); }
+
+        public Mat4(Quat q)
+        { Row0 = Row1 = Row2 = Row3 = default; FromQuat(q); }
+
+        public Mat4(Quat q, Vec3 t)
+        { Row0 = Row1 = Row2 = Row3 = default; FromQuat(q); Row3 = new Vec4(t, 1.0f); }
+
+        public Mat4(Quat q, Vec4 t)
+        { Row0 = Row1 = Row2 = Row3 = default; FromQuat(q); Row3 = t; }
+
+        private void FromQuat(Quat q)
+        {
+            float qx = q.X;
+            float qy = q.Y;
+            float qz = q.Z;
+            float qw = q.W;
+
+            float g = qx + qx;
+            float h = qy + qy;
+            float k = qz + qz;
+            float a = qx * g;
+            float l = qx * h;
+            float m = qy * h;
+            qx *= k;
+            qy *= k;
+            qz *= k;
+
+            Row0 = new Vec4(1.0f - (qz + m),    l -  qw * k ,   qx + qw * h , 0.0f);
+            Row1 = new Vec4(   l +  qw * k , 1.0f - (qz + a),   qy - qw * g , 0.0f);
+            Row2 = new Vec4(  qx -  qw * h ,   qy +  qw * g , 1.0f - (a + m), 0.0f);
+            Row3 = new Vec4(0.0f           , 0.0f           , 0.0f          , 1.0f);
+        }
+
+        public Quat ToQuat()
+        {
+            Vec4 row0 = Row0;
+            Vec4 row1 = Row1;
+            Vec4 row2 = Row2;
+
+            Quat q = default;
+            var trace = 0.25 * (row0.X + row1.Y + row2.Z+ 1.0);
+
+            if (trace > 0)
+            {
+                double sq = System.Math.Sqrt(trace);
+
+                q.W = (float)sq;
+                sq = 1.0 / (4.0 * sq);
+                q.X = (float)((row1.Z - row2.Y) * sq);
+                q.Y = (float)((row2.X - row0.Z) * sq);
+                q.Z = (float)((row0.Y - row1.X) * sq);
+            }
+            else if (row0.X > row1.Y && row0.X > row2.Z)
+            {
+                double sq = 2.0 * System.Math.Sqrt(1.0 + row0.X - row1.Y - row2.Z);
+
+                q.X = (float)(0.25 * sq);
+                sq = 1.0 / sq;
+                q.W = (float)((row2.Y - row1.Z) * sq);
+                q.Y = (float)((row1.X + row0.Y) * sq);
+                q.Z = (float)((row2.X + row0.Z) * sq);
+            }
+            else if (row1.Y > row2.Z)
+            {
+                double sq = 2.0 * System.Math.Sqrt(1.0 + row1.Y - row0.X - row2.Z);
+
+                q.Y = (float)(0.25 * sq);
+                sq = 1.0 / sq;
+                q.W = (float)((row2.X - row0.Z) * sq);
+                q.X = (float)((row1.X + row0.Y) * sq);
+                q.Z = (float)((row2.Y + row1.Z) * sq);
+            }
+            else
+            {
+                double sq = 2.0 * System.Math.Sqrt(1.0 + row2.Z - row0.X - row1.Y);
+
+                q.Z = (float)(0.25 * sq);
+                sq = 1.0 / sq;
+                q.W = (float)((row1.X - row0.Y) * sq);
+                q.X = (float)((row2.X + row0.Z) * sq);
+                q.Y = (float)((row2.Y + row1.Z) * sq);
+            }
+
+            return q.Normalized;
+        }
+
+        public Mat4 Invert() => -this;
+
+        public Mat4 Translate(Vec3 vec)
+        { Row3 = new Vec4(vec, 1.0f) * this; return this; }
+
+        public Mat4 Translate(Vec4 vec)
+        { Row3 = vec * this; return this; }
+
+        public static Mat4 operator +(Mat4 left, Mat4 right)
+        { left.Row0 += right.Row0; left.Row1 += right.Row1;
+          left.Row2 += right.Row2; left.Row3 += right.Row3; return left; }
+
+        public static Mat4 operator -(Mat4 left, Mat4 right)
+        { left.Row0 -= right.Row0; left.Row1 -= right.Row1;
+          left.Row2 -= right.Row2; left.Row3 -= right.Row3; return left; }
+
+        public static Mat4 operator -(Mat4 mat)
+        {
+            int[]   colIdx = {  0,  0,  0,  0 };
+            int[]   rowIdx = {  0,  0,  0,  0 };
+            int[] pivotIdx = { -1, -1, -1, -1 };
+
+            Mat4 result = mat;
+            float[,] inverse =
+            {
+                { mat.Row0.X, mat.Row0.Y, mat.Row0.Z, mat.Row0.W },
+                { mat.Row1.X, mat.Row1.Y, mat.Row1.Z, mat.Row1.W },
+                { mat.Row2.X, mat.Row2.Y, mat.Row2.Z, mat.Row2.W },
+                { mat.Row3.X, mat.Row3.Y, mat.Row3.Z, mat.Row3.W }
+            };
+            int icol = 0;
+            int irow = 0;
+            for (int i = 0; i < 4; i++)
+            {
+                float maxPivot = 0.0f;
+                for (int j = 0; j < 4; j++)
+                {
+                    if (pivotIdx[j] == 0) continue;
+
+                    for (int k = 0; k < 4; k++)
+                    {
+                        if (pivotIdx[k] == -1)
+                        {
+                            float absVal = System.Math.Abs(inverse[j, k]);
+                            if (absVal > maxPivot)
+                            {
+                                maxPivot = absVal;
+                                irow = j;
+                                icol = k;
+                            }
+                        }
+                        else if (pivotIdx[k] > 0)
+                            return result;
+                    }
+                }
+
+                pivotIdx[icol]++;
+
+                if (irow != icol)
+                    for (int k = 0; k < 4; k++)
+                    { float t = inverse[irow, k]; inverse[irow, k] = inverse[icol, k]; inverse[icol, k] = t; }
+
+                rowIdx[i] = irow;
+                colIdx[i] = icol;
+
+                float pivot = inverse[icol, icol];
+
+                float oneOverPivot = 1.0f / pivot;
+                inverse[icol, icol] = 1.0f;
+                for (int k = 0; k < 4; k++)
+                    inverse[icol, k] *= oneOverPivot;
+
+                for (int j = 0; j < 4; j++)
+                {
+                    if (icol == j) continue;
+
+                    float f = inverse[j, icol];
+                    inverse[j, icol] = 0.0f;
+                    for (int k = 0; k < 4; k++)
+                        inverse[j, k] -= inverse[icol, k] * f;
+                }
+            }
+
+            for (int j = 3; j >= 0; j--)
+            {
+                int ir = rowIdx[j];
+                int ic = colIdx[j];
+                for (int k = 0; k < 4; k++)
+                { float t = inverse[k, ic]; inverse[k, ic] = inverse[k, ir]; inverse[k, ir] = t; }
+            }
+
+            result.Row0.X = inverse[0, 0]; result.Row0.Y = inverse[0, 1];
+            result.Row0.Z = inverse[0, 2]; result.Row0.W = inverse[0, 3];
+            result.Row1.X = inverse[1, 0]; result.Row1.Y = inverse[1, 1];
+            result.Row1.Z = inverse[1, 2]; result.Row1.W = inverse[1, 3];
+            result.Row2.X = inverse[2, 0]; result.Row2.Y = inverse[2, 1];
+            result.Row2.Z = inverse[2, 2]; result.Row2.W = inverse[2, 3];
+            result.Row3.X = inverse[3, 0]; result.Row3.Y = inverse[3, 1];
+            result.Row3.Z = inverse[3, 2]; result.Row3.W = inverse[3, 3];
+            return result;
+        }
+
+        public static Mat4 operator *(Mat4 left, Mat4 right)
+        {
+            Mat4 result = default;
+            result.Row0 = left.Row0.X * right.Row0 + left.Row0.Y * right.Row1
+                + left.Row0.Z * right.Row2 + left.Row0.W * right.Row3;
+            result.Row1 = left.Row1.X * right.Row0 + left.Row1.Y * right.Row1
+                + left.Row1.Z * right.Row2 + left.Row1.W * right.Row3;
+            result.Row2 = left.Row2.X * right.Row0 + left.Row2.Y * right.Row1
+                + left.Row2.Z * right.Row2 + left.Row2.W * right.Row3;
+            result.Row3 = left.Row3.X * right.Row0 + left.Row3.Y * right.Row1
+                + left.Row3.Z * right.Row2 + left.Row3.W * right.Row3;
+            return result;
+        }
+
+        public static Mat4 operator *(Mat4 mat, float scale) =>
+            new Mat4(mat.Row0 * scale, mat.Row1 * scale, mat.Row2 * scale, mat.Row3 * scale);
+
+        public static bool operator ==(Mat4 A, Mat4 B) =>  A.Equals(B);
+        public static bool operator !=(Mat4 A, Mat4 B) => !A.Equals(B);
+
+        public bool Equals(Mat4 other) =>
+            Row0 == other.Row0 && Row1 == other.Row1 && Row2 == other.Row2 && Row3 == other.Row3;
+
+        public override bool Equals(object obj) => base.Equals(obj);
+        public override int GetHashCode() => base.GetHashCode();
+        public override string ToString() => $"({Row0}; {Row1}; {Row2}; {Row3})";
+        public string ToString(int d) => $"({Row0.ToString(d)}; {Row1.ToString(d)}; {Row2.ToString(d)}; {Row3.ToString(d)})";
+    }
+}

KKdBaseLib/MsgPack.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace KKdBaseLib
 {
@@ -36,9 +36,13 @@ namespace KKdBaseLib
         {   get =>    Object is MsgPack[] Array  ? Array[index] : default;
             set { if (Object is MsgPack[] Array) { Array[index] =   value; Object = Array; } } }
 
+        public MsgPack this[long 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;
-            set { if (Object is KKdList<MsgPack> List && value.Object != null) 
+            set { if (Object is KKdList<MsgPack> List && value.Object != null)
                 { List.Add(value); Object = List; } } }
 
         public MsgPack this[string key, bool array]

KKdBaseLib/Pointer.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib
+namespace KKdBaseLib
 {
     public struct Pointer<T>
     {

KKdBaseLib/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTrademark("")]

KKdBaseLib/Quat.cs

@@ -0,0 +1,180 @@
+using System.Runtime.InteropServices;
+
+namespace KKdBaseLib
+{
+    [StructLayout(LayoutKind.Explicit)]
+    public struct Quat
+    {
+        [FieldOffset(0x00)] public float X;
+        [FieldOffset(0x04)] public float Y;
+        [FieldOffset(0x08)] public float Z;
+        [FieldOffset(0x0C)] public float W;
+
+        public static Quat Identity => new Quat(0.0f, 0.0f, 0.0f, 1.0f);
+
+        public Quat(float X, float Y, float Z)
+        {
+            X *= 0.5f;
+            Y *= 0.5f;
+            Z *= 0.5f;
+
+            var c1 = (float)System.Math.Cos(X);
+            var c2 = (float)System.Math.Cos(Y);
+            var c3 = (float)System.Math.Cos(Z);
+            var s1 = (float)System.Math.Sin(X);
+            var s2 = (float)System.Math.Sin(Y);
+            var s3 = (float)System.Math.Sin(Z);
+
+            this.X = s1 * c2 * c3 + c1 * s2 * s3;
+            this.Y = c1 * s2 * c3 - s1 * c2 * s3;
+            this.Z = c1 * c2 * s3 + s1 * s2 * c3;
+                 W = c1 * c2 * c3 - s1 * s2 * s3;
+        }
+
+        public Quat(Vec3 vec) : this(vec.X, vec.Y, vec.Z)
+        { }
+
+        public Quat(float X, float Y, float Z, float W)
+        { this.X = X; this.Y = Y; this.Z = Z; this.W = W; }
+
+        public Quat(Vec3 vec, float W)
+        { X = vec.X; Y = vec.Y; Z = vec.Z; this.W = W; }
+
+        public Quat(Vec4 vec)
+        { X = vec.X; Y = vec.Y; Z = vec.Z; W = vec.W; }
+
+        public Vec3 XYZ { get => new Vec3(X, Y, Z); set { X = value.X; Y = value.Y; Z = value.Z; } }
+
+        public float Length        => (X * X + Y * Y + Z * Z + W * W).Sqrt();
+        public float LengthSquared =>  X * X + Y * Y + Z * Z + W * W;
+        public Quat Normalized => new Quat(X, Y, Z, W) * (Length == 0.0f ? 1.0f : (1.0f / Length));
+        public Vec3 Euler { get
+            {
+                if (LengthSquared == 0) return default;
+
+                const float SINGULARITY_THRESHOLD = 0.4999995f;
+                const float HalfPI = (float)(System.Math.PI * 0.5);
+
+                float sqx = X * X, sqy = Y * Y, sqz = Z * Z, sqw = W * W;
+                float unit = sqx + sqy + sqz + sqw;
+                float singularityTest = X * Z + Y * W;
+
+                     if (singularityTest >  SINGULARITY_THRESHOLD * unit)
+                    return new Vec3(0.0f,  HalfPI,  (float)(System.Math.Atan2(X, W) * 2.0));
+                else if (singularityTest < -SINGULARITY_THRESHOLD * unit)
+                    return new Vec3(0.0f, -HalfPI, -(float)(System.Math.Atan2(X, W) * 2.0));
+                else
+                    return new Vec3((float)System.Math.Atan2(2 * (X * W - Y * Z), sqw - sqx - sqy + sqz),
+                                    (float)System.Math.Asin (2 * singularityTest / unit),
+                                    (float)System.Math.Atan2(2 * (Z * W - X * Y), sqw + sqx - sqy - sqz));
+            }
+        }
+        public Vec3 EulerDeg { get
+            {
+                if (LengthSquared == 0) return default;
+
+                const float SINGULARITY_THRESHOLD = 0.4999995f;
+                const float HalfPI = (float)(System.Math.PI * 0.5);
+
+                float sqx = X * X, sqy = Y * Y, sqz = Z * Z, sqw = W * W;
+                float unit = sqx + sqy + sqz + sqw;
+                float singularityTest = X * Z + Y * W;
+
+                     if (singularityTest >  SINGULARITY_THRESHOLD * unit)
+                    return new Vec3(0.0f,  HalfPI,  (float)(System.Math.Atan2(X, W) * 2.0));
+                else if (singularityTest < -SINGULARITY_THRESHOLD * unit)
+                    return new Vec3(0.0f, -HalfPI, -(float)(System.Math.Atan2(X, W) * 2.0));
+                else
+                    return new Vec3((float)System.Math.Atan2(2 * (X * W - Y * Z), sqw - sqx - sqy + sqz),
+                                    (float)System.Math.Asin (2 * singularityTest / unit),
+                                    (float)System.Math.Atan2(2 * (Z * W - X * Y), sqw + sqx - sqy - sqz))
+                        * (float)(180.0 / System.Math.PI);
+            }
+        }
+
+        public static Quat operator +(Quat left, Quat right)
+        { left.X += right.X; left.Y += right.Y; left.Z += right.Z; left.W += right.W; return left; }
+        public static Quat operator -(Quat left, Quat right)
+        { left.X -= right.X; left.Y -= right.Y; left.Z -= right.Z; left.W -= right.W; return left; }
+        public static Quat operator -(Quat quat) =>
+            new Quat(-quat.X, -quat.Y, -quat.Z, quat.W);
+        public static Quat operator *( Quat  quat, float scale)
+        { quat.X *= scale  ; quat.Y *= scale  ; quat.Z *= scale  ; quat.W *= scale  ; return quat; }
+        public static Quat operator *(float scale,  Quat  quat)
+        { quat.X *= scale  ; quat.Y *= scale  ; quat.Z *= scale  ; quat.W *= scale  ; return quat; }
+        public static Quat operator *( Quat  quat,  Vec4 scale)
+        { quat.X *= scale.X; quat.Y *= scale.Y; quat.Z *= scale.Z; quat.W *= scale.W; return quat; }
+        public static Quat operator *(  Quat left,  Quat right) =>
+            new Quat(right.W * left.XYZ + left.W * right.XYZ + Vec3.Cross(left.XYZ, right.XYZ),
+                left.W * right.W - Vec3.Dot(left.XYZ, right.XYZ)).Normalized;
+        public static Quat operator /(  Quat left,  Quat right) =>
+            left * -right;
+        public static bool operator ==(Quat A, Quat B) =>  A.Equals(B);
+        public static bool operator !=(Quat A, Quat B) => !A.Equals(B);
+
+        public static float Distance       (Vec4 left, Vec4 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)).Sqrt();
+        public static float DistanceSquared(Vec4 left, Vec4 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 float Dot(Vec4 left, Vec4 right) =>
+            left.X * right.X + left.Y * right.Y + left.Z * right.Z + left.W * right.W;
+        public Vec4 Round(     ) =>
+            new Vec4 { X = X.Round( ), Y = Y.Round( ), Z = Z.Round( ), W = W.Round( ) };
+        public Vec4 Round(int d) =>
+            new Vec4 { X = X.Round(d), Y = Y.Round(d), Z = Z.Round(d), W = W.Round(d) };
+
+        public static Quat Slerp(Quat q1, Quat q2, float blend)
+        {
+            if (q1.LengthSquared == 0.0f)
+                return q2.LengthSquared == 0.0f ? Identity : q2;
+            else if (q2.LengthSquared == 0.0f)
+                return q1;
+
+            float cosHalfAngle = Vec4.Dot((Vec4)q1, (Vec4)q2);
+
+            if (cosHalfAngle >= 1.0f || cosHalfAngle <= -1.0f)
+                return q1;
+
+            if (cosHalfAngle < 0.0f)
+            {
+                q2.XYZ = -q2.XYZ;
+                q2.W = -q2.W;
+                cosHalfAngle = -cosHalfAngle;
+            }
+
+            float blendA;
+            float blendB;
+            if (cosHalfAngle < 0.99f)
+            {
+                float halfAngle = (float)System.Math.Acos(cosHalfAngle);
+                float sinHalfAngle = (float)System.Math.Sin(halfAngle);
+                float oneOverSinHalfAngle = 1.0f / sinHalfAngle;
+                blendA = (float)System.Math.Sin(halfAngle * (1.0f - blend)) * oneOverSinHalfAngle;
+                blendB = (float)System.Math.Sin(halfAngle * blend) * oneOverSinHalfAngle;
+            }
+            else
+            {
+                blendA = 1.0f - blend;
+                blendB = blend;
+            }
+
+            Quat result = new Quat(blendA * q1.XYZ + blendB * q2.XYZ, blendA * q1.W + blendB * q2.W);
+            return result.Normalized;
+        }
+
+        public static explicit operator Vec4(Quat quat) =>
+            new Vec4(quat.XYZ, quat.W);
+        public static explicit operator Quat(Vec4  vec) =>
+            new Quat( vec.XYZ,  vec.W);
+
+        public bool Equals(Vec4 other) =>
+            X == other.X && Y == other.Y && Z == other.Z && W == other.W;
+
+        public override bool Equals(object obj) => base.Equals(obj);
+        public override int GetHashCode() => base.GetHashCode();
+        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/Tables.cs

@@ -1,4 +1,4 @@
-namespace KKdBaseLib
+namespace KKdBaseLib.Tables
 {
     public struct ButtonSE
     {
@@ -137,13 +137,13 @@
         public string   Name;
         public string SEName;
     }
-    
+
     public struct TableDate : INull
     {
         private int  year;
         private int month;
         private int  day;
-        
+
         public int  Year { get =>  year; set {  year = value; CheckDate(); } }
         public int Month { get => month; set { month = value; CheckDate(); } }
         public int   Day { get =>   day; set {   day = value; CheckDate(); } }
@@ -157,7 +157,7 @@
         public void SN () => Year =   -1;
         public void SDL() => Year = 2000;
         public void SDU() => Year = 2029;
-        
+
         public void SV(int? ymd, bool setDefaultUpper)
         {
             if (!setDefaultUpper) SDL();
@@ -170,9 +170,9 @@
                 CheckDate();
             }
         }
-        
+
         public int Int => NotNull ? (Year * 100 + Month) * 100 + Day : -1;
-        
+
         private void CheckDate()
         {
             if (year == -1 || month == -1 || day == -1) { year = -1; month = -1; day = -1; return; }
@@ -188,7 +188,7 @@
             else if (day > 29 && month == 2 && year % 4 == 0) day = 29;
             else if (day > 28 && month == 2 && year % 4 != 0) day = 28;
         }
-        
+
         public override string ToString() =>
                 $"{Year.ToString("d4")}-{Month.ToString("d2")}-{Day.ToString("d2")}";
     }

KKdBaseLib/Text.cs

@@ -1,4 +1,4 @@
-using System.Text;
+using System.Text;
 
 namespace KKdBaseLib
 {
@@ -7,10 +7,13 @@ namespace KKdBaseLib
         public readonly static Encoding ShiftJIS = Encoding.GetEncoding(932);
 
         public static string ToASCII(this byte[] Array) => Encoding.ASCII.GetString(Array ?? new byte[0]);
-        public static string ToUTF8 (this byte[] Array) => Encoding.UTF8 .GetString(Array ?? new byte[0]);
         public static byte[] ToASCII(this string Data ) => Encoding.ASCII.GetBytes (Data  ?? ""         );
-        public static byte[] ToUTF8 (this string Data ) => Encoding.UTF8 .GetBytes (Data  ?? ""         );
         public static byte[] ToASCII(this char[] Data ) => Encoding.ASCII.GetBytes (Data  ?? new char[0]);
+        public static string ToSJIS (this byte[] Array) =>       ShiftJIS.GetString(Array ?? new byte[0]);
+        public static byte[] ToSJIS (this string Data ) =>       ShiftJIS.GetBytes (Data  ?? ""         );
+        public static byte[] ToSJIS (this char[] Data ) =>       ShiftJIS.GetBytes (Data  ?? new char[0]);
+        public static string ToUTF8 (this byte[] Array) => Encoding.UTF8 .GetString(Array ?? new byte[0]);
+        public static byte[] ToUTF8 (this string Data ) => Encoding.UTF8 .GetBytes (Data  ?? ""         );
         public static byte[] ToUTF8 (this char[] Data ) => Encoding.UTF8 .GetBytes (Data  ?? new char[0]);
     }
 }

KKdBaseLib/Vec.cs

@@ -1,11 +1,11 @@
-namespace KKdBaseLib
+namespace KKdBaseLib
 {
-    public struct Vector2<T> : INull
+    public struct Vec2<T> : INull
     {
         public T X;
         public T Y;
 
-        public Vector2(T x, T y)
+        public Vec2(T x, T y)
         { X = x; Y = y; }
 
         public bool  IsNull => X == null && Y == null;
@@ -14,13 +14,13 @@
         public override string ToString() => $"({X}; {Y})";
     }
 
-    public struct Vector3<T> : INull
+    public struct Vec3<T> : INull
     {
         public T X;
         public T Y;
         public T Z;
 
-        public Vector3(T x, T y, T z)
+        public Vec3(T x, T y, T z)
         { X = x; Y = y; Z = z; }
 
         public bool  IsNull => X == null && Y == null && Z == null;
@@ -29,14 +29,14 @@
         public override string ToString() => $"({X}; {Y}; {Z})";
     }
 
-    public struct Vector4<T> : INull
+    public struct Vec4<T> : INull
     {
         public T X;
         public T Y;
         public T Z;
         public T W;
 
-        public Vector4(T x, T y, T z, T w)
+        public Vec4(T x, T y, T z, T w)
         { X = x; Y = y; Z = z; W = w; }
 
         public bool  IsNull => X == null && Y == null && Z == null && W == null;

KKdBaseLib/Vec2.cs

@@ -0,0 +1,70 @@
+using System.Runtime.InteropServices;
+
+namespace KKdBaseLib
+{
+    [StructLayout(LayoutKind.Explicit)]
+    public struct Vec2
+    {
+        [FieldOffset(0x00)] public float X;
+        [FieldOffset(0x04)] public float Y;
+
+        public Vec2(float val)
+        { X = val; Y = val; }
+
+        public Vec2(float X, float Y)
+        { this.X = X; this.Y = Y; }
+
+        public Vec2(Vec4 vec)
+        { X = vec.X; Y = vec.Y; }
+
+        public float Length        => (X * X + Y * Y).Sqrt();
+        public float LengthSquared =>  X * X + Y * Y;
+        public Vec2 Normalized => this = Length == 0.0f ? new Vec2() : this * (1.0f / Length);
+
+        public static Vec2 operator +(Vec2 left, Vec2 right)
+        { left.X += right.X; left.Y += right.Y; return left; }
+        public static Vec2 operator -(Vec2 left, Vec2 right)
+        { left.X -= right.X; left.Y -= right.Y; return left; }
+        public static Vec2 operator -(Vec2 vec)
+        { vec.X = -vec.X; vec.Y = -vec.Y; return vec; }
+        public static Vec2 operator *(Vec2   vec,   float scale)
+        { vec.X *= scale  ; vec.Y *= scale  ; return vec; }
+        public static Vec2 operator *(  float scale, Vec2   vec)
+        { vec.X *= scale  ; vec.Y *= scale  ; return vec; }
+        public static Vec2 operator *(Vec2   vec, Vec2 scale)
+        { vec.X *= scale.X; vec.Y *= scale.Y; return vec; }
+        public static Vec2 operator /(Vec2   vec,   float scale)
+        { vec.X /= scale  ; vec.Y /= scale  ; return vec; }
+        public static Vec2 operator /(Vec2   vec, Vec2 scale)
+        { vec.X /= scale.X; vec.Y /= scale.Y; return vec; }
+        public static bool operator ==(Vec2 A, Vec2 B) => A.X == B.X && A.Y == B.Y;
+        public static bool operator !=(Vec2 A, Vec2 B) => A.X != B.X || A.Y != B.Y;
+
+        public static Vec2 operator *(Vec2 vec, Mat2 mat) =>
+            new Vec2(vec.X * mat.Row0.X + vec.Y * mat.Row1.X,
+                     vec.X * mat.Row0.Y + vec.Y * mat.Row1.Y);
+
+        public static float Distance       (Vec2 left, Vec2 right) =>
+            (right.X - left.X) * (right.X - left.X) + (right.Y - left.Y) * (right.Y - left.Y).Sqrt();
+        public static float DistanceSquared(Vec2 left, Vec2 right) =>
+            (right.X - left.X) * (right.X - left.X) + (right.Y - left.Y) * (right.Y - left.Y);
+        public static float Dot(Vec2 left, Vec2 right) =>
+             left.X * right.X + left.Y * right.Y;
+        public static Vec2 Lerp(Vec2 a, Vec2 b,   float blend) =>
+            new Vec2 { X = blend   * (b.X - a.X) + a.X, Y = blend   * (b.Y - a.Y) + a.Y };
+        public static Vec2 Lerp(Vec2 a, Vec2 b, Vec2 blend) =>
+            new Vec2 { X = blend.X * (b.X - a.X) + a.X, Y = blend.Y * (b.Y - a.Y) + a.Y };
+        public Vec2 Round(     ) =>
+            new Vec2 { X = X.Round( ), Y = Y.Round( ) };
+        public Vec2 Round(int d) =>
+            new Vec2 { X = X.Round(d), Y = Y.Round(d) };
+
+        public bool Equals(Vec2 other) =>
+            X == other.X && Y == other.Y;
+
+        public override bool Equals(object obj) => base.Equals(obj);
+        public override int GetHashCode() => base.GetHashCode();
+        public override string ToString() => $"({X}; {Y})";
+        public string ToString(int d) => $"({X.Round(d)}; {Y.Round(d)})";
+    }
+}

KKdBaseLib/Vec3.cs

@@ -0,0 +1,93 @@
+using System.Runtime.InteropServices;
+
+namespace KKdBaseLib
+{
+    [StructLayout(LayoutKind.Explicit)]
+    public struct Vec3
+    {
+        [FieldOffset(0x00)] public float X;
+        [FieldOffset(0x04)] public float Y;
+        [FieldOffset(0x08)] public float Z;
+
+        public Vec3(float val)
+        { X = val; Y = val; Z = val; }
+
+        public Vec3(float X, float Y)
+        { this.X = X; this.Y = Y; Z = 0.0f; }
+
+        public Vec3(float X, float Y, float Z)
+        { this.X = X; this.Y = Y; this.Z = Z; }
+
+        public Vec3(Vec2 vec)
+        { X = vec.X; Y = vec.Y; Z = 0.0f; }
+
+        public Vec3(Vec2 vec, float Z)
+        { X = vec.X; Y = vec.Y; this.Z = Z; }
+
+        public Vec3(Vec4 vec)
+        { X = vec.X; Y = vec.Y; Z = vec.Z; }
+
+        public Vec2 XY => new Vec2(X, Y);
+
+        public float Length        => (X * X + Y * Y + Z * Z).Sqrt();
+        public float LengthSquared =>  X * X + Y * Y + Z * Z;
+        public Vec3 Normalized => this = Length == 0.0f ? new Vec3() : this * (1.0f / Length);
+
+        public static Vec3 operator +(Vec3 left, Vec3 right)
+        { left.X += right.X; left.Y += right.Y; left.Z += right.Z; return left; }
+        public static Vec3 operator -(Vec3 left, Vec3 right)
+        { left.X -= right.X; left.Y -= right.Y; left.Z -= right.Z; return left; }
+        public static Vec3 operator -(Vec3 vec)
+        { vec.X = -vec.X; vec.Y = -vec.Y; vec.Z = -vec.Z; return vec; }
+        public static Vec3 operator *( Vec3  vec, float scale)
+        { vec.X *= scale  ; vec.Y *= scale  ; vec.Z *= scale  ; return vec; }
+        public static Vec3 operator *(float scale, Vec3   vec)
+        { vec.X *= scale  ; vec.Y *= scale  ; vec.Z *= scale  ; return vec; }
+        public static Vec3 operator *( Vec3  vec,  Vec3 scale)
+        { vec.X *= scale.X; vec.Y *= scale.Y; vec.Z *= scale.Z; return vec; }
+        public static Vec3 operator /( Vec3  vec, float scale)
+        { vec.X /= scale  ; vec.Y /= scale  ; vec.Z /= scale  ; return vec; }
+        public static Vec3 operator /( Vec3  vec,  Vec3 scale)
+        { vec.X /= scale.X; vec.Y /= scale.Y; vec.Z /= scale.Z; return vec; }
+        public static bool operator ==(Vec3 A, Vec3 B) => A.X == B.X && A.Y == B.Y && A.Z == B.Z;
+        public static bool operator !=(Vec3 A, Vec3 B) => A.X != B.X || A.Y != B.Y || A.Z != B.Z;
+
+        public static Vec3 operator *(Vec3 vec, Mat3 mat) =>
+            new Vec3(vec.X * mat.Row0.X + vec.Y * mat.Row1.X + vec.Z * mat.Row2.X,
+                     vec.X * mat.Row0.Y + vec.Y * mat.Row1.Y + vec.Z * mat.Row2.Y,
+                     vec.X * mat.Row0.Z + vec.Y * mat.Row1.Z + vec.Z * mat.Row2.Z);
+
+        public static float Distance       (Vec3 left, Vec3 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)).Sqrt();
+        public static float DistanceSquared(Vec3 left, Vec3 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 float Dot(Vec3 left, Vec3 right) =>
+             left.X * right.X + left.Y * right.Y + left.Z * right.Z;
+        public static Vec3 Cross(Vec3 left, Vec3 right) =>
+            new Vec3 { 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 Vec3 Lerp(Vec3 a, Vec3 b,   float blend) =>
+            new Vec3 { 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 Vec3 Lerp(Vec3 a, Vec3 b, Vec3 blend) =>
+            new Vec3 { 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 };
+        public Vec3 Round(     ) =>
+            new Vec3 { X = X.Round( ), Y = Y.Round( ), Z = Z.Round( ) };
+        public Vec3 Round(int d) =>
+            new Vec3 { X = X.Round(d), Y = Y.Round(d), Z = Z.Round(d) };
+
+        public bool Equals(Vec3 other) =>
+            X == other.X && Y == other.Y && Z == other.Z;
+
+        public override bool Equals(object obj) => base.Equals(obj);
+        public override int GetHashCode() => base.GetHashCode();
+        public override string ToString() => $"({X}; {Y}; {Z})";
+        public string ToString(int d) => $"({X.Round(d)}; {Y.Round(d)}; {Z.Round(d)})";
+    }
+}

KKdBaseLib/Vec4.cs

@@ -0,0 +1,108 @@
+using System.Runtime.InteropServices;
+
+namespace KKdBaseLib
+{
+    [StructLayout(LayoutKind.Explicit)]
+    public struct Vec4
+    {
+        [FieldOffset(0x00)] public float X;
+        [FieldOffset(0x04)] public float Y;
+        [FieldOffset(0x08)] public float Z;
+        [FieldOffset(0x0C)] public float W;
+
+        public Vec4(float val)
+        { X = val; Y = val; Z = val; W = 0.0f; }
+
+        public Vec4(float X, float Y)
+        { this.X = X; this.Y = Y; Z = 0.0f; W = 0.0f; }
+
+        public Vec4(float X, float Y, float Z)
+        { this.X = X; this.Y = Y; this.Z = Z; W = 0.0f; }
+
+        public Vec4(float X, float Y, float Z, float W)
+        { this.X = X; this.Y = Y; this.Z = Z; this.W = W; }
+
+        public Vec4(Vec2 vec)
+        { X = vec.X; Y = vec.Y; Z = 0.0f; W = 0.0f; }
+
+        public Vec4(Vec2 vec, float Z)
+        { X = vec.X; Y = vec.Y; this.Z = Z; W = 0.0f; }
+
+        public Vec4(Vec2 vec, float Z, float W)
+        { X = vec.X; Y = vec.Y; this.Z = Z; this.W = W; }
+
+        public Vec4(Vec3 vec)
+        { X = vec.X; Y = vec.Y; Z = vec.Z; W = 0.0f; }
+
+        public Vec4(Vec3 vec, float W)
+        { X = vec.X; Y = vec.Y; Z = vec.Z; this.W = W; }
+
+        public Vec2 XY  { get => new Vec2(X, Y   ); set { X = value.X; Y = value.Y; } }
+        public Vec3 XYZ { get => new Vec3(X, Y, Z); set { X = value.X; Y = value.Y; Z = value.Z; } }
+
+        public float Length        => (X * X + Y * Y + Z * Z + W * W).Sqrt();
+        public float LengthSquared =>  X * X + Y * Y + Z * Z + W * W;
+        public Vec4 Normalized => new Vec4(X, Y, Z, W) * (Length == 0.0f ? 1.0f : (1.0f / Length));
+
+        public static Vec4 operator +(Vec4 left, Vec4 right)
+        { left.X += right.X; left.Y += right.Y; left.Z += right.Z; left.W += right.W; return left; }
+        public static Vec4 operator -(Vec4 left, Vec4 right)
+        { left.X -= right.X; left.Y -= right.Y; left.Z -= right.Z; left.W -= right.W; return left; }
+        public static Vec4 operator -(Vec4 vec)
+        { vec.X = -vec.X; vec.Y = -vec.Y; vec.Z = -vec.Z; vec.W = -vec.W; return vec; }
+        public static Vec4 operator *(  Vec4  vec, float scale)
+        { vec.X *= scale  ; vec.Y *= scale  ; vec.Z *= scale  ; vec.W *= scale  ; return vec; }
+        public static Vec4 operator *(float scale,  Vec4   vec)
+        { vec.X *= scale  ; vec.Y *= scale  ; vec.Z *= scale  ; vec.W *= scale  ; return vec; }
+        public static Vec4 operator *(  Vec4  vec,  Vec4 scale)
+        { vec.X *= scale.X; vec.Y *= scale.Y; vec.Z *= scale.Z; vec.W *= scale.W; return vec; }
+        public static Vec4 operator /(  Vec4  vec, float scale)
+        { vec.X /= scale  ; vec.Y /= scale  ; vec.Z /= scale  ; vec.W /= scale  ; return vec; }
+        public static Vec4 operator /(  Vec4  vec,  Vec4 scale)
+        { vec.X /= scale.X; vec.Y /= scale.Y; vec.Z /= scale.Z; vec.W /= scale.W; return vec; }
+        public static bool operator ==(Vec4 A, Vec4 B) =>  A.Equals(B);
+        public static bool operator !=(Vec4 A, Vec4 B) => !A.Equals(B);
+
+        public static Vec4 operator +(Vec4 left, Vec3 right)
+        { left.X += right.X; left.Y += right.Y; left.Z += right.Z; return left; }
+        public static Vec4 operator -(Vec4 left, Vec3 right)
+        { left.X -= right.X; left.Y -= right.Y; left.Z -= right.Z; return left; }
+        public static Vec4 operator *(  Vec4  vec,  Vec3 scale)
+        { vec.X *= scale.X; vec.Y *= scale.Y; vec.Z *= scale.Z; return vec; }
+        public static Vec4 operator /(  Vec4  vec,  Vec3 scale)
+        { vec.X /= scale.X; vec.Y /= scale.Y; vec.Z /= scale.Z; return vec; }
+
+        public static Vec4 operator *(Vec4 vec, Mat4 mat) =>
+            new Vec4(vec.X * mat.Row0.X + vec.Y * mat.Row1.X + vec.Z * mat.Row2.X + vec.W * mat.Row3.X,
+                     vec.X * mat.Row0.Y + vec.Y * mat.Row1.Y + vec.Z * mat.Row2.Y + vec.W * mat.Row3.Y,
+                     vec.X * mat.Row0.Z + vec.Y * mat.Row1.Z + vec.Z * mat.Row2.Z + vec.W * mat.Row3.Z,
+                     vec.X * mat.Row0.W + vec.Y * mat.Row1.W + vec.Z * mat.Row2.W + vec.W * mat.Row3.W);
+
+        public static float Distance       (Vec4 left, Vec4 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)).Sqrt();
+        public static float DistanceSquared(Vec4 left, Vec4 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 float Dot(Vec4 left, Vec4 right) =>
+            left.X * right.X + left.Y * right.Y + left.Z * right.Z + left.W * right.W;
+        public static Vec4 Lerp(Vec4 a, Vec4 b,   float blend) =>
+            new Vec4 { 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 Vec4 Lerp(Vec4 a, Vec4 b, Vec4 blend) =>
+            new Vec4 { 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, W = blend.W * (b.W - a.W) + a.W };
+        public Vec4 Round(     ) =>
+            new Vec4 { X = X.Round( ), Y = Y.Round( ), Z = Z.Round( ), W = W.Round( ) };
+        public Vec4 Round(int d) =>
+            new Vec4 { X = X.Round(d), Y = Y.Round(d), Z = Z.Round(d), W = W.Round(d) };
+
+        public bool Equals(Vec4 other) =>
+            X == other.X && Y == other.Y && Z == other.Z && W == other.W;
+
+        public override bool Equals(object obj) => base.Equals(obj);
+        public override int GetHashCode() => base.GetHashCode();
+        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/Vector3.cs

@@ -1,77 +0,0 @@
-namespace KKdBaseLib
-{
-    public struct Vector3
-    {
-        public float X;
-        public float Y;
-        public float Z;
-
-        public Vector3(float X, float Y, float Z)
-        { this.X = X; this.Y = Y; this.Z = Z; }
-
-        public float Length => (X * X + Y * Y + Z * Z).Sqrt();
-        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; }
-        public static Vector3 operator -(Vector3 left, Vector3 right)
-        { left.X -= right.X; left.Y -= right.Y; left.Z -= right.Z; return left; }
-        public static Vector3 operator -(Vector3 vec)
-        { vec.X = -vec.X; vec.Y = -vec.Y; vec.Z = -vec.Z; return vec; }
-        public static Vector3 operator *(Vector3   vec,   float scale)
-        { vec.X *= scale  ; vec.Y *= scale  ; vec.Z *= scale  ; return vec; }
-        public static Vector3 operator *(  float scale, Vector3   vec)
-        { vec.X *= scale  ; vec.Y *= scale  ; vec.Z *= scale  ; return vec; }
-        public static Vector3 operator *(Vector3   vec, Vector3 scale)
-        { vec.X *= scale.X; vec.Y *= scale.Y; vec.Z *= scale.Z; return vec; }
-        public static Vector3 operator /(Vector3   vec,   float scale)
-        { vec.X /= scale  ; vec.Y /= scale  ; vec.Z /= scale  ; return vec; }
-        public static Vector3 operator /(Vector3   vec, Vector3 scale)
-        { vec.X /= scale.X; vec.Y /= scale.Y; vec.Z /= scale.Z; return vec; }
-        public static bool operator ==(Vector3 A, Vector3 B) => A.X == B.X && A.Y == B.Y && A.Z == B.Z;
-        public static bool operator !=(Vector3 A, Vector3 B) => A.X != B.X || A.Y != B.Y || A.Z != B.Z;
-
-        public static double Distance       (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).Sqrt();
-        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 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,   float 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) =>
-            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 };
-        public Vector3 Round(     ) =>
-            new Vector3 { X = X.Round( ), Y = Y.Round( ), Z = Z.Round( ) };
-        public Vector3 Round(int d) =>
-            new Vector3 { X = X.Round(d), Y = Y.Round(d), Z = Z.Round(d) };
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = X.GetHashCode();
-                hashCode = (hashCode * 397) ^ Y.GetHashCode();
-                hashCode = (hashCode * 397) ^ Z.GetHashCode();
-                return hashCode;
-            }
-        }
-        public override bool Equals(object obj) =>
-            obj is Vector3 vec ? Equals(vec) : false;
-        public bool Equals(Vector3 other) =>
-            X == other.X && Y == other.Y && Z == other.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

@@ -1,77 +0,0 @@
-namespace KKdBaseLib
-{
-    public struct Vector4
-    {
-        public float X;
-        public float Y;
-        public float Z;
-        public float W;
-
-        public Vector4(float X, float Y, float Z, float W)
-        { this.X = X; this.Y = Y; this.Z = Z; this.W = W; }
-
-        public float Length => (X * X + Y * Y + Z * Z + W * W).Sqrt();
-        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; }
-        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; }
-        public static Vector4 operator -(Vector4 vec)
-        { vec.X = -vec.X; vec.Y = -vec.Y; vec.Z = -vec.Z; vec.W = -vec.W; return vec; }
-        public static Vector4 operator *(Vector4   vec,   float scale)
-        { vec.X *= scale  ; vec.Y *= scale  ; vec.Z *= scale  ; vec.W *= scale  ; return vec; }
-        public static Vector4 operator *(  float scale, Vector4   vec)
-        { vec.X *= scale  ; vec.Y *= scale  ; vec.Z *= scale  ; vec.W *= scale  ; return vec; }
-        public static Vector4 operator *(Vector4   vec, Vector4 scale)
-        { vec.X *= scale.X; vec.Y *= scale.Y; vec.Z *= scale.Z; vec.W *= scale.W; return vec; }
-        public static Vector4 operator /(Vector4   vec,   float scale)
-        { vec.X /= scale  ; vec.Y /= scale  ; vec.Z /= scale  ; vec.W /= scale  ; return vec; }
-        public static Vector4 operator /(Vector4   vec, Vector4 scale)
-        { vec.X /= scale.X; vec.Y /= scale.Y; vec.Z /= scale.Z; vec.W /= scale.W; return vec; }
-        public static bool operator ==(Vector4 A, Vector4 B) =>  A.Equals(B);
-        public static bool operator !=(Vector4 A, Vector4 B) => !A.Equals(B);
-
-        public static double Distance       (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)).Sqrt();
-        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,   float 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) =>
-            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,
-                          W = blend.W * (b.W - a.W) + a.W };
-        public Vector4 Round(     ) =>
-            new Vector4 { X = X.Round( ), Y = Y.Round( ), Z = Z.Round( ), W = W.Round( ) };
-        public Vector4 Round(int d) =>
-            new Vector4 { X = X.Round(d), Y = Y.Round(d), Z = Z.Round(d), W = W.Round(d) };
-
-        public override int GetHashCode()
-        {
-            unchecked
-            {
-                int hashCode = X.GetHashCode();
-                hashCode = (hashCode * 397) ^ Y.GetHashCode();
-                hashCode = (hashCode * 397) ^ Z.GetHashCode();
-                hashCode = (hashCode * 397) ^ W.GetHashCode();
-                return hashCode;
-            }
-        }
-        public override bool Equals(object obj) =>
-            obj is Vector4 vec ? Equals(vec) : false;
-        public bool Equals(Vector4 other) =>
-            X == other.X && Y == other.Y && Z == other.Z && W == other.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)})";
-    }
-}

KKdMainLib/A3DA.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdBaseLib;
 using KKdBaseLib.F2;
 using KKdBaseLib.Auth3D;
@@ -311,7 +311,7 @@ namespace KKdMainLib
 
                     if (dict.SW(name + "joint_orient"))
                     {
-                        Data.MObjectHRC[i0].JointOrient = new Vector3<float?>();
+                        Data.MObjectHRC[i0].JointOrient = new Vec3<float?>();
                         dict.FV(out Data.MObjectHRC[i0].JointOrient.X, name + "joint_orient.x");
                         dict.FV(out Data.MObjectHRC[i0].JointOrient.Y, name + "joint_orient.y");
                         dict.FV(out Data.MObjectHRC[i0].JointOrient.Z, name + "joint_orient.z");
@@ -446,7 +446,7 @@ namespace KKdMainLib
 
                     if (dict.SW(name + "joint_orient"))
                     {
-                        Data.ObjectHRC[i0].JointOrient = new Vector3<float?>();
+                        Data.ObjectHRC[i0].JointOrient = new Vec3<float?>();
                         dict.FV(out Data.ObjectHRC[i0].JointOrient.X, name + "joint_orient.x");
                         dict.FV(out Data.ObjectHRC[i0].JointOrient.Y, name + "joint_orient.y");
                         dict.FV(out Data.ObjectHRC[i0].JointOrient.Z, name + "joint_orient.z");
@@ -928,15 +928,15 @@ namespace KKdMainLib
             return mt;
         }
 
-        private Vector4<Key> RRGBAK(string str) =>
-            new Vector4<Key> { W = RK(str + "a" + d), Z = RK(str + "b" + d),
+        private Vec4<Key> RRGBAK(string str) =>
+            new Vec4<Key> { W = RK(str + "a" + d), Z = RK(str + "b" + d),
                                Y = RK(str + "g" + d), X = RK(str + "r" + d) };
 
-        private Vector3<Key> RV3(string str) =>
-            new Vector3<Key> { X = RK(str + "x" + d), Y = RK(str + "y" + d), Z = RK(str + "z" + d) };
+        private Vec3<Key> RV3(string str) =>
+            new Vec3<Key> { X = RK(str + "x" + d), Y = RK(str + "y" + d), Z = RK(str + "z" + d) };
 
-        private Vector2<Key> RKUV(string str) =>
-            new Vector2<Key> { X = RK(str + "U" + d), Y = RK(str + "V" + d) };
+        private Vec2<Key> RKUV(string str) =>
+            new Vec2<Key> { X = RK(str + "U" + d), Y = RK(str + "V" + d) };
 
         private Key RK(string str)
         {
@@ -1025,7 +1025,7 @@ namespace KKdMainLib
             }
         }
 
-        private void W(ref Vector4<Key> rgba, string str)
+        private void W(ref Vec4<Key> rgba, string str)
         {
             if (rgba.X.Type == null && rgba.Y.Type == null &&
                 rgba.Z.Type == null && rgba.W.Type == null) return;
@@ -1036,10 +1036,10 @@ namespace KKdMainLib
             W(ref rgba.X, str + d + "r" + d);
         }
 
-        private void W(ref Vector3<Key> key, string str)
+        private void W(ref Vec3<Key> key, string str)
         { W(ref key.X, str + "x" + d); W(ref key.Y, str + "y" + d); W(ref key.Z, str + "z" + d); }
 
-        private void W(ref Vector2<Key> uv, string str)
+        private void W(ref Vec2<Key> uv, string str)
         { W(ref uv.X, str + "U", true); W(ref uv.Y, str + "V", true); }
 
         private void W(ref Key Key, string Temp, bool setBoolean)
@@ -1489,7 +1489,7 @@ namespace KKdMainLib
                 _IO.WEOFC(0);
                 _IO.O   = 0;
                 _IO.P = 0;
-                Header header = new Header { Signature = 0x41443341, Format = Format.F2LE,
+                Header header = new Header { Signature = 0x41443341, Format = Format.F2,
                     DataSize = A3DCEnd, SectionSize = A3DCEnd, InnerSignature = 0x01131010 };
                 _IO.W(header, true);
             }
@@ -1516,14 +1516,14 @@ namespace KKdMainLib
             RK (ref mt.Visibility);
         }
 
-        private void RRGBAK(ref Vector4<Key> rgba)
+        private void RRGBAK(ref Vec4<Key> rgba)
         { RK(ref rgba.X); RK(ref rgba.Y);
           RK(ref rgba.Z); RK(ref rgba.W); }
 
-        private void RV3(ref Vector3<Key> key, bool f16 = false)
+        private void RV3(ref Vec3<Key> key, bool f16 = false)
         { RK(ref key.X, f16); RK(ref key.Y, f16); RK(ref key.Z, f16); }
 
-        private void RKUV(ref Vector2<Key> uv)
+        private void RKUV(ref Vec2<Key> uv)
         { RK(ref uv.X); RK(ref uv.Y); }
 
         private void RK(ref Key key, bool f16 = false)
@@ -1558,8 +1558,8 @@ namespace KKdMainLib
                                                  kf.T1 = _IO.RF32(); kf.T2 = _IO.RF32(); }
         }
 
-        private void ReadOffset(out Vector3<Key> key)
-        { key = new Vector3<Key> { X = new Key { BinOffset = _IO.RI32() },
+        private void ReadOffset(out Vec3<Key> key)
+        { key = new Vec3<Key> { X = new Key { BinOffset = _IO.RI32() },
                                    Y = new Key { BinOffset = _IO.RI32() },
                                    Z = new Key { BinOffset = _IO.RI32() }, }; }
 
@@ -1576,19 +1576,19 @@ namespace KKdMainLib
             else { mt.BinOffset = _IO.P; _IO.P += 0x30; _IO.L += 0x30; }
         }
 
-        private void WriteOffset(Vector3<Key> key)
+        private void WriteOffset(Vec3<Key> key)
         { _IO.W(key.X.BinOffset); _IO.W(key.Y.BinOffset); _IO.W(key.Z.BinOffset); }
 
         private void W(ref ModelTransform mt)
         { W(ref mt.Scale); W(ref mt.Rot, true); W(ref mt.Trans); W(ref mt.Visibility); }
 
-        private void W(ref Vector4<Key> rgba)
+        private void W(ref Vec4<Key> rgba)
         { W(ref rgba.X); W(ref rgba.Y); W(ref rgba.Z); W(ref rgba.W); }
 
-        private void W(ref Vector3<Key> key, bool f16 = false)
+        private void W(ref Vec3<Key> key, bool f16 = false)
         { W(ref key.X, f16); W(ref key.Y, f16); W(ref key.Z, f16); }
 
-        private void W(ref Vector2<Key> uv)
+        private void W(ref Vec2<Key> uv)
         { W(ref uv.X); W(ref uv.Y); }
 
         private void W(ref Key key, bool f16 = false)
@@ -1798,14 +1798,14 @@ namespace KKdMainLib
             MK (ref mt.Visibility, ref mMT.Visibility);
         }
 
-        private void MRGBAK(ref Vector4<Key> rgba, ref Vector4<Key> mRGBA)
+        private void MRGBAK(ref Vec4<Key> rgba, ref Vec4<Key> mRGBA)
         { MK(ref rgba.X, ref mRGBA.X); MK(ref rgba.Y, ref mRGBA.Y);
           MK(ref rgba.Z, ref mRGBA.Z); MK(ref rgba.W, ref mRGBA.W); }
 
-        private void MV3(ref Vector3<Key> key, ref Vector3<Key> mKey)
+        private void MV3(ref Vec3<Key> key, ref Vec3<Key> mKey)
         { MK(ref key.X, ref mKey.X); MK(ref key.Y, ref mKey.Y); MK(ref key.Z, ref mKey.Z); }
 
-        private void MKUV(ref Vector2<Key> uv, ref Vector2<Key> mUV)
+        private void MKUV(ref Vec2<Key> uv, ref Vec2<Key> mUV)
         { MK(ref uv.X, ref mUV.X); MK(ref uv.Y, ref mUV.Y); }
 
         private void MK(ref Key key, ref Key mKey)
@@ -2026,7 +2026,7 @@ namespace KKdMainLib
                     };
 
                     if ((temp1 = temp[i0]["JointOrient"]).NotNull)
-                        Data.MObjectHRC[i0].JointOrient = new Vector3<float?>
+                        Data.MObjectHRC[i0].JointOrient = new Vec3<float?>
                         {
                             X = temp1.RnF32("X"),
                             Y = temp1.RnF32("Y"),
@@ -2132,7 +2132,7 @@ namespace KKdMainLib
                     };
 
                     if ((temp1 = temp[i0]["JointOrient"]).NotNull)
-                        Data.ObjectHRC[i0].JointOrient = new Vector3<float?>
+                        Data.ObjectHRC[i0].JointOrient = new Vec3<float?>
                         {
                             X = temp1.RF32("X"),
                             Y = temp1.RF32("Y"),
@@ -2521,24 +2521,24 @@ namespace KKdMainLib
             new ModelTransform { Rot   = msgPack.RV3("Rot"  ), Scale      = msgPack.RV3("Scale"     ),
                                  Trans = msgPack.RV3("Trans"), Visibility = msgPack.RK ("Visibility") };
 
-        public static Vector4<Key> RRGBAK(this MsgPack msgPack, string name) =>
+        public static Vec4<Key> RRGBAK(this MsgPack msgPack, string name) =>
             msgPack[name].RRGBAK();
 
-        public static Vector4<Key> RRGBAK(this MsgPack msgPack) =>
-            new Vector4<Key> { X = msgPack.RK("R"), Y = msgPack.RK("G"),
+        public static Vec4<Key> RRGBAK(this MsgPack msgPack) =>
+            new Vec4<Key> { X = msgPack.RK("R"), Y = msgPack.RK("G"),
                                Z = msgPack.RK("B"), W = msgPack.RK("A") };
 
-        public static Vector3<Key> RV3(this MsgPack msgPack, string name) =>
+        public static Vec3<Key> RV3(this MsgPack msgPack, string name) =>
             msgPack[name].RV3();
 
-        public static Vector3<Key> RV3(this MsgPack msgPack) =>
-            new Vector3<Key> { X = msgPack.RK("X"), Y = msgPack.RK("Y"), Z = msgPack.RK("Z") };
+        public static Vec3<Key> RV3(this MsgPack msgPack) =>
+            new Vec3<Key> { X = msgPack.RK("X"), Y = msgPack.RK("Y"), Z = msgPack.RK("Z") };
 
-        public static Vector2<Key> RKUV(this MsgPack msgPack, string name) =>
+        public static Vec2<Key> RKUV(this MsgPack msgPack, string name) =>
             msgPack[name].RKUV();
 
-        public static Vector2<Key> RKUV(this MsgPack msgPack) =>
-            new Vector2<Key> { X = msgPack.RK("U"), Y = msgPack.RK("V") };
+        public static Vec2<Key> RKUV(this MsgPack msgPack) =>
+            new Vec2<Key> { X = msgPack.RK("U"), Y = msgPack.RK("V") };
 
         public static Key RK(this MsgPack msgPack, string name) =>
             msgPack[name].ReadKey();
@@ -2595,16 +2595,16 @@ namespace KKdMainLib
                                          .Add("Trans"     , ref mt.Trans     )
                                          .Add("Visibility", ref mt.Visibility));
 
-        public static MsgPack Add(this MsgPack msgPack, string name, ref Vector4<Key> rgba) =>
+        public static MsgPack Add(this MsgPack msgPack, string name, ref Vec4<Key> rgba) =>
             (rgba.X.Type == null && rgba.Y.Type == null &&
              rgba.Z.Type == null && rgba.W.Type == null) ? msgPack :
            msgPack.Add(new MsgPack(name).Add("R", ref rgba.X).Add("G", ref rgba.Y)
                                         .Add("B", ref rgba.Z).Add("A", ref rgba.W));
 
-        public static MsgPack Add(this MsgPack msgPack, string name, ref Vector3<Key> key) =>
+        public static MsgPack Add(this MsgPack msgPack, string name, ref Vec3<Key> key) =>
             msgPack.Add(new MsgPack(name).Add("X", ref key.X).Add("Y", ref key.Y).Add("Z", ref key.Z));
 
-        public static MsgPack Add(this MsgPack msgPack, string name, ref Vector2<Key> uv) =>
+        public static MsgPack Add(this MsgPack msgPack, string name, ref Vec2<Key> uv) =>
             (uv.X.Type == null && uv.Y.Type == null) ? msgPack :
             msgPack.Add(new MsgPack(name).Add("U", ref uv.X).Add("V", ref uv.Y));
 

KKdMainLib/AddParam.cs

@@ -0,0 +1,146 @@
+using KKdBaseLib;
+using KKdMainLib.IO;
+
+namespace KKdMainLib
+{
+    public unsafe struct AddParam : System.IDisposable
+    {
+        private long i;
+        private Stream _IO;
+
+        public HeaderData Header;
+
+        public void AddParamReader(string file)
+        {
+            Header = new HeaderData();
+
+            _IO = File.OpenReader(file + ".adp");
+            Header.Count      = _IO.RI64();
+            Header.DataLength = _IO.RI64();
+            Header.DataOffset = _IO.RI64();
+
+            if (Header.Count < 1 || Header.DataOffset > _IO.P || Header.DataLength > _IO.LI64
+                - Header.DataOffset || Header.Count * 0x20 > _IO.LI64 - Header.DataOffset) { _IO.C(); return; }
+
+            Header.Data = new HeaderData.Sub[Header.Count];
+            byte[] data = _IO.RBy(Header.DataLength, Header.DataOffset);
+            _IO.C();
+
+            fixed (byte* ptr = data)
+            {
+                HeaderData.Sub* hPtr = (HeaderData.Sub*)ptr;
+                for (i = 0; i < Header.Count; i++)
+                    Header.Data[i] = hPtr[i];
+            }
+
+            data = null;
+        }
+
+        public void AddParamWriter(string file)
+        {
+            if (Header.Data == null || Header.Data.LongLength < 1) return;
+
+            Header.Count = Header.Data.LongLength;
+            Header.DataLength = Header.Count * 0x20;
+            Header.DataOffset = 0x18L;
+
+            byte[] data = new byte[Header.DataLength];
+            fixed (byte* ptr = data)
+            {
+                HeaderData.Sub* hPtr = (HeaderData.Sub*)ptr;
+                for (i = 0; i < Header.Count; i++)
+                    hPtr[i] = Header.Data[i];
+            }
+
+            _IO = File.OpenWriter(file + ".adp", true);
+            _IO.W(Header.Count);
+            _IO.W(Header.DataLength);
+            _IO.W(Header.DataOffset);
+            _IO.W(data);
+            _IO.C();
+            data = null;
+        }
+
+        public void MsgPackReader(string file, bool json)
+        {
+            Header = new HeaderData();
+
+            MsgPack addParam;
+            MsgPack msgPack = file.ReadMPAllAtOnce(json);
+            if ((addParam = msgPack["AddParam", true]).IsNull) return;
+
+            Header.Count = addParam.Array.LongLength;
+            Header.Data = new HeaderData.Sub[Header.Count];
+            for (i = 0; i < Header.Count; i++)
+            {
+                ref HeaderData.Sub sub = ref Header.Data[i];
+                sub.Time  = addParam[i].RF32("Time");
+                sub.Flags = addParam[i].RI32("Flags");
+                sub.Frame = addParam[i].RI32("Frame");
+                sub.ID    = addParam[i].RI32("ID");
+                sub.Value = addParam[i].RF32("Value");
+
+                sub.PVBranch = addParam[i].RnI32("PVBranch") ?? 0;
+                float? f = addParam[i].RnF32("Value");
+                if (f.HasValue)
+                {
+                    if (sub.ID == 0) { float v = 0; *(uint*)&v = addParam[i].RU32("Value"); sub.Value = v; }
+                    else sub.Value = f.Value;
+                }
+                else { float v = 0; *(uint*)&v = 0xFFFFFFFF; sub.Value = v; }
+
+            }
+
+            msgPack.Dispose();
+        }
+
+        public void MsgPackWriter(string file, bool json)
+        {
+            if (Header.Data == null || Header.Data.LongLength < 1) return;
+
+            MsgPack addParam = new MsgPack(Header.Data.LongLength, "AddParam");
+            fixed (HeaderData.Sub* ptr = Header.Data)
+                for (i = 0; i < Header.Count; i++)
+                {
+                    ref HeaderData.Sub sub = ref Header.Data[i];
+                    addParam[i] = MsgPack.New.Add("Time", sub.Time).Add("Flags", sub.Flags).Add("Frame", sub.Frame);
+
+                    if (sub.PVBranch > 0)
+                        addParam[i] = addParam[i].Add("PVBranch", sub.PVBranch);
+
+                    addParam[i] = addParam[i].Add("ID", sub.ID);
+
+                    if (sub.ID == 0)
+                        addParam[i] = addParam[i].Add("Value", *(uint*)&ptr[i].Value);
+                    else if (*(uint*)&ptr[i].Value != 0xFFFFFFFF)
+                        addParam[i] = addParam[i].Add("Value", sub.Value);
+
+                }
+            addParam.WriteAfterAll(true, file, json);
+        }
+
+        public void Dispose()
+        { if (_IO != null) _IO.D(); _IO = null; Header = default; }
+
+        public struct HeaderData
+        {
+            public long Count;
+            public long DataLength;
+            public long DataOffset;
+
+            public Sub[] Data;
+
+            public struct Sub
+            {
+                public float Time;
+                public   int Flags;
+                public   int Frame;
+                public   int Pad0C;
+                public   int PVBranch;
+                public   int ID;
+                public float Value;
+                public   int Pad1C;
+            }
+        }
+    }
+}

KKdMainLib/Aet.cs

@@ -1,4 +1,4 @@
-//Original: AetSet.bt Version: 5.0 by samyuu
+//Original: AetSet.bt Version: 5.0 by samyuu
 
 using KKdBaseLib;
 using KKdBaseLib.Auth2D;
@@ -59,16 +59,16 @@ namespace KKdMainLib
             ref Scene aet = ref aetData.V;
 
             aet.Name = _IO.RPS();
-            aet.StartFrame = _IO.RF32();
-            aet.EndFrame   = _IO.RF32();
-            aet.FrameRate  = _IO.RF32();
-            aet.BackColor  = _IO.RU32();
-            aet.Width      = _IO.RU32();
-            aet.Height     = _IO.RU32();
-            aet.Camera       = _IO.RP<Vector2<CountPointer<KFT2>>>();
-            aet.Compositions = _IO.ReadCountPointer<Composition>();
-            aet.Videos       = _IO.ReadCountPointer<Video      >();
-            aet.Audios       = _IO.ReadCountPointer<Audio      >();
+            aet.StartFrame   = _IO.RF32();
+            aet.EndFrame     = _IO.RF32();
+            aet.FrameRate    = _IO.RF32();
+            aet.BackColor    = _IO.RU32();
+            aet.Width        = _IO.RU32();
+            aet.Height       = _IO.RU32();
+            aet.Camera       = _IO.RP<Vec2<CountPointer<KFT2>>>();
+            aet.Composition = _IO.ReadCountPointer<Composition>();
+            aet.Video        = _IO.ReadCountPointer<Video      >();
+            aet.Audio        = _IO.ReadCountPointer<Audio      >();
 
             if (aet.Camera.O > 0)
             {
@@ -79,63 +79,63 @@ namespace KKdMainLib
                 RKF(ref aet.Camera.V.Y);
             }
 
-            if (aet.Audios.O > 0)
+            if (aet.Audio.O > 0)
             {
-                _IO.P = aet.Audios.O;
-                for (i = 0; i < aet.Audios.C; i++)
+                _IO.P = aet.Audio.O;
+                for (i = 0; i < aet.Audio.C; i++)
                 {
-                    ref Audio aif = ref aet.Audios.E[i];
+                    ref Audio aif = ref aet.Audio.E[i];
                     aif.O = _IO.P;
                     aif.SoundID = _IO.RU32();
                 }
             }
 
-            _IO.P = aet.Compositions.O;
-            for (i = 0; i < aet.Compositions.C; i++)
-                aet.Compositions[i] = new Composition() { P = _IO.P, C = _IO.RI32(), O = _IO.RI32()};
+            _IO.P = aet.Composition.O;
+            for (i = 0; i < aet.Composition.C; i++)
+                aet.Composition[i] = new Composition() { P = _IO.P, C = _IO.RI32(), O = _IO.RI32()};
 
             i1 = 0;
-            RAL(ref aet.Compositions.E[aet.Compositions.C - 1]);
-            for (i = 0; i < aet.Compositions.C - 1; i++)
-                RAL(ref aet.Compositions.E[i]);
+            RAL(ref aet.Composition.E[aet.Composition.C - 1]);
+            for (i = 0; i < aet.Composition.C - 1; i++)
+                RAL(ref aet.Composition.E[i]);
 
-            _IO.P = aet.Videos.O;
-            for (i = 0; i < aet.Videos.C; i++)
-                aet.Videos[i] = new Video { O = _IO.P, Color = _IO.RU32(), Width = _IO.RU16(),
-                    Height = _IO.RU16(), Frames = _IO.RF32(), Sources = _IO.ReadCountPointer<Video.Source>() };
+            _IO.P = aet.Video.O;
+            for (i = 0; i < aet.Video.C; i++)
+                aet.Video[i] = new Video { O = _IO.P, Color = _IO.RU32(), Width = _IO.RU16(),
+                    Height = _IO.RU16(), Frames = _IO.RF32(), Identifiers = _IO.ReadCountPointer<Video.Identifier>() };
 
-            for (i = 0; i < aet.Videos.C; i++)
+            for (i = 0; i < aet.Video.C; i++)
             {
-                _IO.P = aet.Videos[i].Sources.O;
-                for (i0 = 0; i0 < aet.Videos[i].Sources.C; i0++)
-                    aet.Videos.E[i].Sources[i0] = new Video.Source { Name = _IO.RPS(), ID = _IO.RU32() };
+                _IO.P = aet.Video[i].Identifiers.O;
+                for (i0 = 0; i0 < aet.Video[i].Identifiers.C; i0++)
+                    aet.Video.E[i].Identifiers[i0] = new Video.Identifier { Name = _IO.RPS(), ID = _IO.RU32() };
             }
 
-            for (i = 0; i < aet.Compositions.C; i++)
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                for (i0 = 0; i0 < aet.Compositions[i].C; i0++)
+                for (i0 = 0; i0 < aet.Composition[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions[i].E[i0];
+                    ref Layer obj = ref aet.Composition[i].E[i0];
                     obj.DataID = -1;
-                    int dataOffset = obj.VideoItemOffset;
+                    int dataOffset = obj.VidItmOff;
                     if (dataOffset > 0)
                              if (obj.Type == Layer.AetLayerType.Video      )
-                            for (i1 = 0; i1 < aet.Videos      .C; i1++)
-                            { if (aet.Videos      [i1].O == dataOffset) { obj.DataID = i1; break; } }
+                            for (i1 = 0; i1 < aet.Video      .C; i1++)
+                            { if (aet.Video      [i1].O == dataOffset) { obj.DataID = i1; break; } }
                         else if (obj.Type == Layer.AetLayerType.Audio      )
-                            for (i1 = 0; i1 < aet.Audios      .C; i1++)
-                            { if (aet.Audios      [i1].O == dataOffset) { obj.DataID = i1; break; } }
+                            for (i1 = 0; i1 < aet.Audio      .C; i1++)
+                            { if (aet.Audio      [i1].O == dataOffset) { obj.DataID = i1; break; } }
                         else if (obj.Type == Layer.AetLayerType.Composition)
-                            for (i1 = 0; i1 < aet.Compositions.C; i1++)
-                            { if (aet.Compositions[i1].P == dataOffset) { obj.DataID = i1; break; } }
+                            for (i1 = 0; i1 < aet.Composition.C; i1++)
+                            { if (aet.Composition[i1].P == dataOffset) { obj.DataID = i1; break; } }
 
-                    ref int parentLayer = ref obj.ParentLayer;
+                    int parentLayer = obj.ParentLayer;
                     if (parentLayer > 0)
-                        for (i1 = 0; i1 < aet.Compositions.C; i1++)
+                        for (i1 = 0; i1 < aet.Composition.C; i1++)
                         {
-                            for (i2 = 0; i2 < aet.Compositions[i1].C; i2++)
-                                if (aet.Compositions[i1].E[i2].Offset == parentLayer)
-                                { obj.ParentLayer = aet.Compositions[i1].E[i2].ID; break; }
+                            for (i2 = 0; i2 < aet.Composition[i1].C; i2++)
+                                if (aet.Composition[i1].E[i2].Offset == parentLayer)
+                                { obj.ParentLayer = aet.Composition[i1].E[i2].ID; break; }
                             if (parentLayer != obj.ParentLayer) break;
                         }
                     if (parentLayer == obj.ParentLayer) obj.ParentLayer = -1;
@@ -147,92 +147,92 @@ namespace KKdMainLib
         {
             ref Scene aet = ref aetData.V;
 
-            for (i = 0; i < aet.Videos.C; i++)
+            for (i = 0; i < aet.Video.C; i++)
             {
-                ref Video region = ref aet.Videos.E[i];
-                if (region.Sources.C == 0) { region.Sources.O = 0; continue; }
-                if (region.Sources.C > 1) _IO.A(0x20);
-                region.Sources.O = _IO.P;
-                for (i0 = 0; i0 < region.Sources.C; i0++) _IO.W(0L);
+                ref Video region = ref aet.Video.E[i];
+                if (region.Identifiers.C == 0) { region.Identifiers.O = 0; continue; }
+                if (region.Identifiers.C > 1) _IO.A(0x20);
+                region.Identifiers.O = _IO.P;
+                for (i0 = 0; i0 < region.Identifiers.C; i0++) _IO.W(0L);
             }
 
             _IO.A(0x20);
-            aet.Videos.O = _IO.P;
-            for (i = 0; i < aet.Videos.C; i++)
+            aet.Video.O = _IO.P;
+            for (i = 0; i < aet.Video.C; i++)
             {
-                ref Video region = ref aet.Videos.E[i];
+                ref Video region = ref aet.Video.E[i];
                 region.O = _IO.P;
                 _IO.W(region.Color  );
                 _IO.W(region.Width  );
                 _IO.W(region.Height );
                 _IO.W(region.Frames );
-                _IO.W(region.Sources);
+                _IO.W(region.Identifiers);
             }
 
             _IO.A(0x20);
-            aet.Compositions.O = _IO.P;
-            for (i = 0; i < aet.Compositions.C; i++)
+            aet.Composition.O = _IO.P;
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                aet.Compositions.E[i].O = _IO.P;
+                aet.Composition.E[i].O = _IO.P;
                 _IO.W(0L);
             }
 
-            for (i = 0; i < aet.Compositions.C; i++)
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                if (aet.Compositions.E[i].C < 1) continue;
+                if (aet.Composition.E[i].C < 1) continue;
 
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
-                    ref VideoData data = ref obj.Video.V;
-                    ref VideoData.Video3DData persp = ref data.Video3D.V;
-                    ref AudioData extraData = ref obj.Audio.V;
-                    if (obj.Markers.C > 0)
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
+                    ref VideoData video = ref obj.Video.V;
+                    ref VideoData.Video3DData video3DData = ref video.Video3D.V;
+                    ref AudioData audio = ref obj.Audio.V;
+                    if (obj.Marker.C > 0)
                     {
-                        if (obj.Markers.C > 3) _IO.A(0x20);
-                        obj.Markers.O = _IO.P;
-                        for (i1 = 0; i1 < obj.Markers.C; i1++)
+                        if (obj.Marker.C > 3) _IO.A(0x20);
+                        obj.Marker.O = _IO.P;
+                        for (i1 = 0; i1 < obj.Marker.C; i1++)
                             _IO.W(0L);
                     }
 
                     if (obj.Video.V.Video3D.O > 0)
                     {
-                        W(ref persp.   AnchorZ);
-                        W(ref persp. PositionZ);
-                        W(ref persp.DirectionX);
-                        W(ref persp.DirectionY);
-                        W(ref persp.DirectionZ);
-                        W(ref persp. RotationX);
-                        W(ref persp. RotationY);
-                        W(ref persp.    ScaleZ);
+                        W(ref video3DData.   AnchorZ);
+                        W(ref video3DData. PositionZ);
+                        W(ref video3DData.DirectionX);
+                        W(ref video3DData.DirectionY);
+                        W(ref video3DData.DirectionZ);
+                        W(ref video3DData. RotationX);
+                        W(ref video3DData. RotationY);
+                        W(ref video3DData.    ScaleZ);
                     }
 
                     if (obj.Video.O > 0)
                     {
-                         W(ref data.  AnchorX);
-                         W(ref data.  AnchorY);
-                         W(ref data.PositionX);
-                         W(ref data.PositionY);
-                         W(ref data.Rotation );
-                         W(ref data.   ScaleX);
-                         W(ref data.   ScaleY);
-                         W(ref data. Opacity );
+                         W(ref video.  AnchorX);
+                         W(ref video.  AnchorY);
+                         W(ref video.PositionX);
+                         W(ref video.PositionY);
+                         W(ref video.Rotation );
+                         W(ref video.   ScaleX);
+                         W(ref video.   ScaleY);
+                         W(ref video. Opacity );
                     }
 
                     if (obj.Video.V.Video3D.O > 0)
                     {
                         _IO.A(0x20);
-                        data.Video3D.O = _IO.P;
+                        video.Video3D.O = _IO.P;
                         _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L);
                         _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L);
                     }
 
                     if (obj.Audio.O > 0)
                     {
-                        W(ref extraData.VolumeL);
-                        W(ref extraData.VolumeR);
-                        W(ref extraData.   PanL);
-                        W(ref extraData.   PanR);
+                        W(ref audio.VolumeL);
+                        W(ref audio.VolumeR);
+                        W(ref audio.   PanL);
+                        W(ref audio.   PanR);
                     }
 
                     if (obj.Video.O > 0)
@@ -252,10 +252,10 @@ namespace KKdMainLib
                 }
 
                 _IO.A(0x20);
-                aet.Compositions.E[i].E[0].Offset = _IO.P;
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+                aet.Composition.E[i].E[0].Offset = _IO.P;
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
                     obj.Offset = _IO.P;
                     _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L); _IO.W(0L);
                 }
@@ -263,7 +263,7 @@ namespace KKdMainLib
 
             if (aet.Camera.O > 0)
             {
-                ref Vector2<CountPointer<KFT2>> pos = ref aet.Camera.V;
+                ref Vec2<CountPointer<KFT2>> pos = ref aet.Camera.V;
                 _IO.A(0x10);
                 W(ref pos.X);
                 W(ref pos.Y);
@@ -287,25 +287,25 @@ namespace KKdMainLib
                 System.Collections.Generic.Dictionary<string, int> usedValues =
                     new System.Collections.Generic.Dictionary<string, int>();
 
-                for (i = 0; i < aet.Videos.C; i++)
+                for (i = 0; i < aet.Video.C; i++)
                 {
-                    ref Video region = ref aet.Videos.E[i];
-                    for (i0 = 0; i0 < region.Sources.C; i0++)
-                        WPS(ref usedValues, ref region.Sources.E[i0].Name);
+                    ref Video region = ref aet.Video.E[i];
+                    for (i0 = 0; i0 < region.Identifiers.C; i0++)
+                        WPS(ref usedValues, ref region.Identifiers.E[i0].Name);
                 }
 
                 //_IO.Align(0x4);
-                for (i = 0; i < aet.Compositions.C; i++)
+                for (i = 0; i < aet.Composition.C; i++)
                 {
-                    for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+                    for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                     {
-                        ref Layer obj = ref aet.Compositions.E[i].E[i0];
-                        for (i1 = 0; i1 < obj.Markers.C; i1++)
-                            WPS(ref usedValues, ref obj.Markers.E[i1].Name);
+                        ref Layer obj = ref aet.Composition.E[i].E[i0];
+                        for (i1 = 0; i1 < obj.Marker.C; i1++)
+                            WPS(ref usedValues, ref obj.Marker.E[i1].Name);
                     }
 
-                    for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
-                        WPS(ref usedValues, ref aet.Compositions.E[i].E[i0].Name);
+                    for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
+                        WPS(ref usedValues, ref aet.Composition.E[i].E[i0].Name);
                 }
 
                 //_IO.Align(0x4);
@@ -314,27 +314,27 @@ namespace KKdMainLib
                 _IO.SL(_IO.P);
             }
 
-            aet.Audios.O = 0;
-            if (aet.Audios.C > 0)
+            aet.Audio.O = 0;
+            if (aet.Audio.C > 0)
             {
                 _IO.A(0x10);
-                aet.Audios.O = _IO.P;
-                for (i = 0; i < aet.Audios.C; i++)
+                aet.Audio.O = _IO.P;
+                for (i = 0; i < aet.Audio.C; i++)
                 {
-                    aet.Audios.E[i].O = _IO.P;
-                    _IO.W(aet.Audios[i].SoundID);
+                    aet.Audio.E[i].O = _IO.P;
+                    _IO.W(aet.Audio[i].SoundID);
                 }
             }
 
-            for (i = 0; i < aet.Compositions.C; i++)
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+            for (i = 0; i < aet.Composition.C; i++)
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
-                         if (obj.Type == Layer.AetLayerType.Video      ) obj.VideoItemOffset = aet.Videos      [obj.DataID].O;
-                    else if (obj.Type == Layer.AetLayerType.Audio      ) obj.VideoItemOffset = aet.Audios      [obj.DataID].O;
-                    else if (obj.Type == Layer.AetLayerType.Composition) obj.VideoItemOffset = aet.Compositions[obj.DataID].O;
-                    else obj.VideoItemOffset = 0;
-                    if (obj.VideoItemOffset == 0)
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
+                         if (obj.Type == Layer.AetLayerType.Video      ) obj.VidItmOff = aet.Video      [obj.DataID].O;
+                    else if (obj.Type == Layer.AetLayerType.Audio      ) obj.VidItmOff = aet.Audio      [obj.DataID].O;
+                    else if (obj.Type == Layer.AetLayerType.Composition) obj.VidItmOff = aet.Composition[obj.DataID].O;
+                    else obj.VidItmOff = 0;
+                    if (obj.VidItmOff == 0)
                     {
 
                     }
@@ -346,56 +346,56 @@ namespace KKdMainLib
 
             _IO.F();
 
-            for (i = 0; i < aet.Compositions.C; i++)
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                if (aet.Compositions.E[i].C < 1) continue;
+                if (aet.Composition.E[i].C < 1) continue;
 
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
-                    ref VideoData data = ref obj.Video.V;
-                    ref VideoData.Video3DData persp = ref data.Video3D.V;
-                    ref AudioData extraData = ref obj.Audio.V;
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
+                    ref VideoData video = ref obj.Video.V;
+                    ref VideoData.Video3DData video3DData = ref video.Video3D.V;
+                    ref AudioData audio = ref obj.Audio.V;
 
                     if (obj.Video.V.Video3D.O > 0)
                     {
-                        _IO.P = data.Video3D.O;
-                        W(ref _IO, ref persp.   AnchorZ);
-                        W(ref _IO, ref persp. PositionZ);
-                        W(ref _IO, ref persp.DirectionX);
-                        W(ref _IO, ref persp.DirectionY);
-                        W(ref _IO, ref persp.DirectionZ);
-                        W(ref _IO, ref persp. RotationX);
-                        W(ref _IO, ref persp. RotationY);
-                        W(ref _IO, ref persp.    ScaleZ);
+                        _IO.P = video.Video3D.O;
+                        W(ref _IO, ref video3DData.   AnchorZ);
+                        W(ref _IO, ref video3DData. PositionZ);
+                        W(ref _IO, ref video3DData.DirectionX);
+                        W(ref _IO, ref video3DData.DirectionY);
+                        W(ref _IO, ref video3DData.DirectionZ);
+                        W(ref _IO, ref video3DData. RotationX);
+                        W(ref _IO, ref video3DData. RotationY);
+                        W(ref _IO, ref video3DData.    ScaleZ);
                     }
 
                     if (obj.Video.O > 0)
                     {
                         _IO.P = obj.Video.O;
-                        _IO.W((byte)data.TransferMode.BlendMode );
-                        _IO.W((byte)data.TransferMode.Flags     );
-                        _IO.W((byte)data.TransferMode.TrackMatte);
+                        _IO.W((byte)video.TransferMode.BlendMode );
+                        _IO.W((byte)video.TransferMode.Flags     );
+                        _IO.W((byte)video.TransferMode.TrackMatte);
                         _IO.W((byte)0);
 
-                        W(ref _IO, ref data.  AnchorX);
-                        W(ref _IO, ref data.  AnchorY);
-                        W(ref _IO, ref data.PositionX);
-                        W(ref _IO, ref data.PositionY);
-                        W(ref _IO, ref data.Rotation );
-                        W(ref _IO, ref data.   ScaleX);
-                        W(ref _IO, ref data.   ScaleY);
-                        W(ref _IO, ref data. Opacity );
-                        _IO.W(data.Video3D.O);
+                        W(ref _IO, ref video.  AnchorX);
+                        W(ref _IO, ref video.  AnchorY);
+                        W(ref _IO, ref video.PositionX);
+                        W(ref _IO, ref video.PositionY);
+                        W(ref _IO, ref video.Rotation );
+                        W(ref _IO, ref video.   ScaleX);
+                        W(ref _IO, ref video.   ScaleY);
+                        W(ref _IO, ref video. Opacity );
+                        _IO.W(video.Video3D.O);
                     }
 
                     if (obj.Audio.O > 0)
                     {
                         _IO.P = obj.Audio.O;
-                        W(ref _IO, ref extraData.VolumeL);
-                        W(ref _IO, ref extraData.VolumeR);
-                        W(ref _IO, ref extraData.   PanL);
-                        W(ref _IO, ref extraData.   PanR);
+                        W(ref _IO, ref audio.VolumeL);
+                        W(ref _IO, ref audio.VolumeR);
+                        W(ref _IO, ref audio.   PanL);
+                        W(ref _IO, ref audio.   PanR);
                     }
 
                     void W(ref Stream _IO, ref CountPointer<KFT2> keys)
@@ -414,10 +414,10 @@ namespace KKdMainLib
 
             _IO.F();
 
-            for (i = 0; i < aet.Compositions.C; i++)
-                for (i0 = 0; i0 < aet.Compositions.E[i].C; i0++)
+            for (i = 0; i < aet.Composition.C; i++)
+                for (i0 = 0; i0 < aet.Composition.E[i].C; i0++)
                 {
-                    ref Layer obj = ref aet.Compositions.E[i].E[i0];
+                    ref Layer obj = ref aet.Composition.E[i].E[i0];
 
                     _IO.P = obj.Offset;
                     _IO.W(obj.Name.O);
@@ -428,23 +428,23 @@ namespace KKdMainLib
                     _IO.W((ushort)obj.Flags  );
                     _IO.W((  byte)obj.Quality);
                     _IO.W((  byte)obj.Type   );
-                    _IO.W(obj.VideoItemOffset);
+                    _IO.W(obj.VidItmOff);
 
                     if (obj.ParentLayer > -1)
                     {
                         bool Found = false;
-                        for (i1 = 0; i1 < aet.Compositions.C; i1++)
-                            for (i2 = 0; i2 < aet.Compositions.E[i1].C; i2++)
-                                if (aet.Compositions[i1].E[i2].ID == obj.ParentLayer)
-                                { Found = true; _IO.W(aet.Compositions.E[i1].E[i2].Offset); break; }
+                        for (i1 = 0; i1 < aet.Composition.C; i1++)
+                            for (i2 = 0; i2 < aet.Composition.E[i1].C; i2++)
+                                if (aet.Composition[i1].E[i2].ID == obj.ParentLayer)
+                                { Found = true; _IO.W(aet.Composition.E[i1].E[i2].Offset); break; }
                         if (!Found) _IO.W(0);
                     }
                     else _IO.W(0);
-                    _IO.W(obj.Markers);
+                    _IO.W(obj.Marker);
                     _IO.W(obj.Video.O);
                     _IO.W(obj.Audio.O);
 
-                    ref CountPointer<Marker> Marker = ref obj.Markers;
+                    ref CountPointer<Marker> Marker = ref obj.Marker;
                     _IO.P = Marker.O;
                     for (i1 = 0; i1 < Marker.C; i1++)
                     {
@@ -455,25 +455,25 @@ namespace KKdMainLib
 
             _IO.F();
 
-            for (i = 0; i < aet.Videos.C; i++)
+            for (i = 0; i < aet.Video.C; i++)
             {
-                ref Video region = ref aet.Videos.E[i];
-                if (region.Sources.C == 0) continue;
-                _IO.P = region.Sources.O;
-                for (i0 = 0; i0 < region.Sources.C; i0++)
+                ref Video region = ref aet.Video.E[i];
+                if (region.Identifiers.C == 0) continue;
+                _IO.P = region.Identifiers.O;
+                for (i0 = 0; i0 < region.Identifiers.C; i0++)
                 {
-                    _IO.W(region.Sources[i0].Name.O);
-                    _IO.W(region.Sources[i0].ID);
+                    _IO.W(region.Identifiers[i0].Name.O);
+                    _IO.W(region.Identifiers[i0].ID);
                 }
             }
 
-            _IO.P = aet.Compositions.O;
-            for (i = 0; i < aet.Compositions.C; i++)
+            _IO.P = aet.Composition.O;
+            for (i = 0; i < aet.Composition.C; i++)
             {
-                if (aet.Compositions[i].C > 0)
+                if (aet.Composition[i].C > 0)
                 {
-                    _IO.W(aet.Compositions[i].C);
-                    _IO.W(aet.Compositions[i].E[0].Offset);
+                    _IO.W(aet.Composition[i].C);
+                    _IO.W(aet.Composition[i].E[0].Offset);
                 }
                 else _IO.W(0L);
             }
@@ -487,9 +487,9 @@ namespace KKdMainLib
             _IO.W(aet.Width);
             _IO.W(aet.Height);
             _IO.W(aet.Camera.O);
-            _IO.W(aet.Compositions);
-            _IO.W(aet.Videos);
-            _IO.W(aet.Audios);
+            _IO.W(aet.Composition);
+            _IO.W(aet.Video);
+            _IO.W(aet.Audio);
             _IO.W(0L);
         }
 
@@ -508,81 +508,81 @@ namespace KKdMainLib
                 obj.Flags   = (Layer.AetLayerFlags  )_IO.RU16();
                 obj.Quality = (Layer.AetLayerQuality)_IO.RU8 ();
                 obj.Type    = (Layer.AetLayerType   )_IO.RU8 ();
-                obj.VideoItemOffset  = _IO.RI32();
+                obj.VidItmOff  = _IO.RI32();
                 obj.ParentLayer = _IO.RI32();
-                obj.Markers = _IO.ReadCountPointer<Marker>();
+                obj.Marker = _IO.ReadCountPointer<Marker>();
                 obj.Video = _IO.RP<VideoData>();
                 obj.Audio = _IO.RP<AudioData>();
 
                 if (obj.Video.O > 0)
                 {
-                    ref VideoData data = ref obj.Video.V;
+                    ref VideoData video = ref obj.Video.V;
                     _IO.P = obj.Video.O;
-                    data.TransferMode.BlendMode  = (VideoData.VideoTransferMode.TransferBlendMode )_IO.RU8();
-                    data.TransferMode.Flags      = (VideoData.VideoTransferMode.TransferFlags     )_IO.RU8();
-                    data.TransferMode.TrackMatte = (VideoData.VideoTransferMode.TransferTrackMatte)_IO.RU8();
-                    data.Padding = _IO.RU8();
-                    data.  AnchorX = _IO.ReadCountPointer<KFT2>();
-                    data.  AnchorY = _IO.ReadCountPointer<KFT2>();
-                    data.PositionX = _IO.ReadCountPointer<KFT2>();
-                    data.PositionY = _IO.ReadCountPointer<KFT2>();
-                    data.Rotation  = _IO.ReadCountPointer<KFT2>();
-                    data.   ScaleX = _IO.ReadCountPointer<KFT2>();
-                    data.   ScaleY = _IO.ReadCountPointer<KFT2>();
-                    data.Opacity   = _IO.ReadCountPointer<KFT2>();
-                    data.Video3D = _IO.RP<VideoData.Video3DData>();
+                    video.TransferMode.BlendMode  = (VideoData.VideoTransferMode.TransferBlendMode )_IO.RU8();
+                    video.TransferMode.Flags      = (VideoData.VideoTransferMode.TransferFlags     )_IO.RU8();
+                    video.TransferMode.TrackMatte = (VideoData.VideoTransferMode.TransferTrackMatte)_IO.RU8();
+                    video.Padding = _IO.RU8();
+                    video.  AnchorX = _IO.ReadCountPointer<KFT2>();
+                    video.  AnchorY = _IO.ReadCountPointer<KFT2>();
+                    video.PositionX = _IO.ReadCountPointer<KFT2>();
+                    video.PositionY = _IO.ReadCountPointer<KFT2>();
+                    video.Rotation  = _IO.ReadCountPointer<KFT2>();
+                    video.   ScaleX = _IO.ReadCountPointer<KFT2>();
+                    video.   ScaleY = _IO.ReadCountPointer<KFT2>();
+                    video.Opacity   = _IO.ReadCountPointer<KFT2>();
+                    video.Video3D = _IO.RP<VideoData.Video3DData>();
 
-                    RKF(ref data.  AnchorX);
-                    RKF(ref data.  AnchorY);
-                    RKF(ref data.PositionX);
-                    RKF(ref data.PositionY);
-                    RKF(ref data.Rotation );
-                    RKF(ref data.   ScaleX);
-                    RKF(ref data.   ScaleY);
-                    RKF(ref data. Opacity );
+                    RKF(ref video.  AnchorX);
+                    RKF(ref video.  AnchorY);
+                    RKF(ref video.PositionX);
+                    RKF(ref video.PositionY);
+                    RKF(ref video.Rotation );
+                    RKF(ref video.   ScaleX);
+                    RKF(ref video.   ScaleY);
+                    RKF(ref video. Opacity );
 
-                    if (data.Video3D.O > 0)
+                    if (video.Video3D.O > 0)
                     {
-                        ref VideoData.Video3DData Persp = ref data.Video3D.V;
-                        _IO.P = data.Video3D.O;
-                        Persp.AnchorZ       = _IO.ReadCountPointer<KFT2>();
-                        Persp.PositionZ       = _IO.ReadCountPointer<KFT2>();
-                        Persp.DirectionX = _IO.ReadCountPointer<KFT2>();
-                        Persp.DirectionY = _IO.ReadCountPointer<KFT2>();
-                        Persp.DirectionZ = _IO.ReadCountPointer<KFT2>();
-                        Persp. RotationX = _IO.ReadCountPointer<KFT2>();
-                        Persp. RotationY = _IO.ReadCountPointer<KFT2>();
-                        Persp.    ScaleZ = _IO.ReadCountPointer<KFT2>();
+                        ref VideoData.Video3DData video3DData = ref video.Video3D.V;
+                        _IO.P = video.Video3D.O;
+                        video3DData.   AnchorZ = _IO.ReadCountPointer<KFT2>();
+                        video3DData. PositionZ = _IO.ReadCountPointer<KFT2>();
+                        video3DData.DirectionX = _IO.ReadCountPointer<KFT2>();
+                        video3DData.DirectionY = _IO.ReadCountPointer<KFT2>();
+                        video3DData.DirectionZ = _IO.ReadCountPointer<KFT2>();
+                        video3DData. RotationX = _IO.ReadCountPointer<KFT2>();
+                        video3DData. RotationY = _IO.ReadCountPointer<KFT2>();
+                        video3DData.    ScaleZ = _IO.ReadCountPointer<KFT2>();
 
-                        RKF(ref Persp.   AnchorZ);
-                        RKF(ref Persp. PositionZ);
-                        RKF(ref Persp.DirectionX);
-                        RKF(ref Persp.DirectionY);
-                        RKF(ref Persp.DirectionZ);
-                        RKF(ref Persp. RotationX);
-                        RKF(ref Persp. RotationY);
-                        RKF(ref Persp.    ScaleZ);
+                        RKF(ref video3DData.   AnchorZ);
+                        RKF(ref video3DData. PositionZ);
+                        RKF(ref video3DData.DirectionX);
+                        RKF(ref video3DData.DirectionY);
+                        RKF(ref video3DData.DirectionZ);
+                        RKF(ref video3DData. RotationX);
+                        RKF(ref video3DData. RotationY);
+                        RKF(ref video3DData.    ScaleZ);
                     }
                 }
 
                 if (obj.Audio.O > 0)
                 {
-                    ref AudioData extraData = ref obj.Audio.V;
+                    ref AudioData audio = ref obj.Audio.V;
                     _IO.P = obj.Audio.O;
-                    extraData.VolumeL = _IO.ReadCountPointer<KFT2>();
-                    extraData.VolumeR = _IO.ReadCountPointer<KFT2>();
-                    extraData.   PanL = _IO.ReadCountPointer<KFT2>();
-                    extraData.   PanR = _IO.ReadCountPointer<KFT2>();
+                    audio.VolumeL = _IO.ReadCountPointer<KFT2>();
+                    audio.VolumeR = _IO.ReadCountPointer<KFT2>();
+                    audio.   PanL = _IO.ReadCountPointer<KFT2>();
+                    audio.   PanR = _IO.ReadCountPointer<KFT2>();
 
-                    RKF(ref extraData.VolumeL);
-                    RKF(ref extraData.VolumeR);
-                    RKF(ref extraData.   PanL);
-                    RKF(ref extraData.   PanR);
+                    RKF(ref audio.VolumeL);
+                    RKF(ref audio.VolumeR);
+                    RKF(ref audio.   PanL);
+                    RKF(ref audio.   PanR);
                 }
 
-                _IO.P = obj.Markers.O;
-                for (i2 = 0; i2 < obj.Markers.C; i2++)
-                    obj.Markers[i2] = new Marker() { Frame = _IO.RF32(), Name = _IO.RPSSJIS() };
+                _IO.P = obj.Marker.O;
+                for (i2 = 0; i2 < obj.Marker.C; i2++)
+                    obj.Marker[i2] = new Marker() { Frame = _IO.RF32(), Name = _IO.RPSSJIS() };
             }
         }
 
@@ -671,62 +671,60 @@ namespace KKdMainLib
                 aet.Camera.V.Y = RKF(temp, "Y");
             }
 
-            if ((temp = msgPack["SoundEffect", true]).NotNull)
+            if ((temp = msgPack["Audio", true]).NotNull)
             {
-                aet.Audios.C = temp.Array.Length;
-                for (i = 0; i < aet.Audios.C; i++)
-                    aet.Audios.E[i] = new Audio { SoundID = temp[i].RU32("Unk") };
+                aet.Audio.C = temp.Array.Length;
+                for (i = 0; i < aet.Audio.C; i++)
+                    aet.Audio.E[i] = new Audio { SoundID = temp[i].RU32("SoundID") };
             }
 
-            if ((temp = msgPack["Surface", true]).NotNull)
+            if ((temp = msgPack["Video", true]).NotNull)
             {
-                aet.Videos.C = temp.Array.Length;
-                for (i = 0; i < aet.Videos.C; i++)
+                aet.Video.C = temp.Array.Length;
+                for (i = 0; i < aet.Video.C; i++)
                 {
-                    ref Video region = ref aet.Videos.E[i];
+                    ref Video region = ref aet.Video.E[i];
                     region = default;
                     region.Color  = temp[i].RU32("Color" );
                     region.Width  = temp[i].RU16("Width" );
                     region.Height = temp[i].RU16("Height");
                     region.Frames = temp[i].RF32("Frames");
 
-                    MsgPack sprite;
-                    if ((sprite = temp[i]["Sprite", true]).NotNull)
-                    {
-                        region.Sources.C = sprite.Array.Length;
-                        for (i0 = 0; i0 < region.Sources.C; i0++)
-                            region.Sources[i0] = new Video.Source() { Name = new Pointer<string>()
-                                { V = sprite[i0].RS("Name") }, ID = sprite[i0].RU32("ID") };
-                    }
-                    sprite.Dispose();
+                    using (MsgPack identifiers = temp[i]["Identifiers", true])
+                        if (identifiers.NotNull)
+                        {
+                            region.Identifiers.C = identifiers.Array.Length;
+                            for (i0 = 0; i0 < region.Identifiers.C; i0++)
+                                region.Identifiers[i0] = new Video.Identifier() { Name = new Pointer<string>()
+                                    { V = identifiers[i0].RS("Name") }, ID = identifiers[i0].RU32("ID") };
+                        }
                 }
             }
 
             if ((temp = msgPack["Composition", true]).NotNull)
             {
-                aet.Compositions.C = temp.Array.Length + 1;
-                for (i = 0; i < aet.Compositions.C - 1; i++)
+                aet.Composition.C = temp.Array.Length + 1;
+                for (i = 0; i < aet.Composition.C - 1; i++)
                 {
-                    ref Composition layer = ref aet.Compositions.E[i];
-                    layer = default;
-                    MsgPack @object;
-                    if ((@object = temp[i]["Object", true]).NotNull)
-                    {
-                        layer.C = @object.Array.Length;
-                        for (i0 = 0; i0 < layer.C; i0++)
-                            RAO(ref layer.E[i0], @object[i0]);
-                    }
-                    @object.Dispose();
+                    ref Composition l = ref aet.Composition.E[i];
+                    l = default;
+                    using (MsgPack layer = temp[i]["Layer", true])
+                        if (layer.NotNull)
+                        {
+                            l.C = layer.Array.Length;
+                            for (i0 = 0; i0 < l.C; i0++)
+                                RL(ref l.E[i0], layer[i0]);
+                        }
                 }
             }
-            else aet.Compositions.C = 1;
+            else aet.Composition.C = 1;
 
             if ((temp = msgPack["Root", true]).NotNull)
             {
-                i = aet.Compositions.C - 1;
-                aet.Compositions.E[i].C = temp.Array.Length;
-                for (i0 = 0; i0 < aet.Compositions[i].C; i0++)
-                    RAO(ref aet.Compositions.E[i].E[i0], temp[i0]);
+                i = aet.Composition.C - 1;
+                aet.Composition.E[i].C = temp.Array.Length;
+                for (i0 = 0; i0 < aet.Composition[i].C; i0++)
+                    RL(ref aet.Composition.E[i].E[i0], temp[i0]);
             }
             temp.Dispose();
         }
@@ -747,24 +745,24 @@ namespace KKdMainLib
                                                .Add(WMP(ref aet.Camera.V.Y, "Y")));
 
 
-            i = aet.Compositions.C - 1;
-            MsgPack rootLayer = new MsgPack(aet.Compositions[i].C, "Root");
-            for (i0 = 0; i0 < aet.Compositions[i].C; i0++)
-                rootLayer[i0] = WMP(ref aet.Compositions[i].E[i0]);
+            i = aet.Composition.C - 1;
+            MsgPack rootLayer = new MsgPack(aet.Composition[i].C, "Root");
+            for (i0 = 0; i0 < aet.Composition[i].C; i0++)
+                rootLayer[i0] = WL(ref aet.Composition[i].E[i0]);
             msgPack.Add(rootLayer);
 
-            if (aet.Compositions[i].C > 1)
+            if (aet.Composition[i].C > 1)
             {
-                MsgPack compositions = new MsgPack(aet.Compositions.C - 1, "Composition");
-                for (i = 0; i < aet.Compositions.C - 1; i++)
+                MsgPack compositions = new MsgPack(aet.Composition.C - 1, "Composition");
+                for (i = 0; i < aet.Composition.C - 1; i++)
                 {
-                    ref Composition composition = ref aet.Compositions.E[i];
+                    ref Composition composition = ref aet.Composition.E[i];
                     MsgPack compos = MsgPack.New.Add("ID", i);
                     if (composition.C > 0)
                     {
                         MsgPack objects = new MsgPack(composition.C, "Layer");
                         for (i0 = 0; i0 < composition.C; i0++)
-                            objects[i0] = WMP(ref composition.E[i0]);
+                            objects[i0] = WL(ref composition.E[i0]);
                         compos.Add(objects);
                     }
                     compositions[i] = compos;
@@ -772,35 +770,34 @@ namespace KKdMainLib
                 msgPack.Add(compositions);
             }
 
-            MsgPack videos = new MsgPack(aet.Videos.C, "Video");
-            for (i = 0; i < aet.Videos.C; i++)
+            MsgPack video = new MsgPack(aet.Video.C, "Video");
+            for (i = 0; i < aet.Video.C; i++)
             {
-                ref Video video = ref aet.Videos.E[i];
-                MsgPack entry = MsgPack.New.Add("ID", i).Add("Width", video.Width)
-                    .Add("Height", video.Height).Add("Color", video.Color);
+                ref Video v = ref aet.Video.E[i];
+                MsgPack entry = MsgPack.New.Add("ID", i).Add("Width", v.Width)
+                    .Add("Height", v.Height).Add("Color", v.Color);
 
-                if (video.Sources.C > 0)
+                if (v.Identifiers.C > 0)
                 {
-                    entry.Add("Frames", video.Frames);
-                    MsgPack source = new MsgPack(video.Sources.C, "Source");
-                    for (i0 = 0; i0 < video.Sources.C; i0++)
-                        source[i0] = MsgPack.New.Add("Name", video.Sources[i0]
-                            .Name.V).Add("ID", video.Sources[i0].ID);
-                    entry.Add(source);
+                    entry.Add("Frames", v.Frames);
+                    MsgPack identifiers = new MsgPack(v.Identifiers.C, "Identifiers");
+                    for (i0 = 0; i0 < v.Identifiers.C; i0++)
+                        identifiers[i0] = MsgPack.New.Add("Name", v.Identifiers[i0].Name.V).Add("ID", v.Identifiers[i0].ID);
+                    entry.Add(identifiers);
                 }
-                videos[i] = entry;
+                video[i] = entry;
             }
-            msgPack.Add(videos);
+            msgPack.Add(video);
 
-            MsgPack audios = new MsgPack(aet.Audios.C, "Audios");
-            for (i = 0; i < aet.Audios.C; i++)
-                audios[i] = MsgPack.New.Add("ID", i).Add("SoundID", aet.Audios[i].SoundID);
-            msgPack.Add(audios);
+            MsgPack audio = new MsgPack(aet.Audio.C, "Audio");
+            for (i = 0; i < aet.Audio.C; i++)
+                audio[i] = MsgPack.New.Add("ID", i).Add("SoundID", aet.Audio[i].SoundID);
+            msgPack.Add(audio);
 
             return msgPack;
         }
 
-        private Layer RAO(ref Layer layer, MsgPack msg)
+        private Layer RL(ref Layer layer, MsgPack msg)
         {
             uint i;
             layer = default;
@@ -817,13 +814,13 @@ namespace KKdMainLib
             layer.ParentLayer = msg.RnI32("ParentLayer") ?? -1;
 
             MsgPack temp;
-            if ((temp = msg["Markers", true]).NotNull)
+            if ((temp = msg["Marker", true]).NotNull)
             {
-                layer.Markers.C = temp.Array.Length;
-                for (i = 0; i < layer.Markers.C; i++)
+                layer.Marker.C = temp.Array.Length;
+                for (i = 0; i < layer.Marker.C; i++)
                 {
-                    layer.Markers.E[i].Frame   = temp[i].RF32("Frame");
-                    layer.Markers.E[i]. Name.V = temp[i].RS  ( "Name");
+                    layer.Marker.E[i].Frame   = temp[i].RF32("Frame");
+                    layer.Marker.E[i]. Name.V = temp[i].RS  ( "Name");
                 }
             }
 
@@ -861,7 +858,7 @@ namespace KKdMainLib
                 video3D.Dispose();
             }
 
-            if ((temp = msg["Audio"]).NotNull)
+            if ((temp = msg["AudioData"]).NotNull)
             {
                 layer.Audio.O = 1;
                 ref AudioData data = ref layer.Audio.V;
@@ -899,7 +896,7 @@ namespace KKdMainLib
             return kf;
         }
 
-        private MsgPack WMP(ref Layer layer, string name = null)
+        private MsgPack WL(ref Layer layer, string name = null)
         {
             int i;
             MsgPack layerData = new MsgPack(name).Add("ID", layer.ID).Add("Name", layer.Name.V)
@@ -911,13 +908,13 @@ namespace KKdMainLib
             if (layer.DataID      > -1) layerData.Add("DataID"     , layer.DataID     );
             if (layer.ParentLayer > -1) layerData.Add("ParentLayer", layer.ParentLayer);
 
-            if (layer.Markers.C > 0)
+            if (layer.Marker.C > 0)
             {
-                MsgPack markers = new MsgPack(layer.Markers.C, "Markers");
-                for (i = 0; i < layer.Markers.C; i++)
-                    markers[i] = MsgPack.New.Add("Frame", layer.Markers[i].Frame  )
-                                            .Add( "Name", layer.Markers[i]. Name.V);
-                layerData.Add(markers);
+                MsgPack Marker = new MsgPack(layer.Marker.C, "Marker");
+                for (i = 0; i < layer.Marker.C; i++)
+                    Marker[i] = MsgPack.New.Add("Frame", layer.Marker[i].Frame  )
+                                            .Add( "Name", layer.Marker[i]. Name.V);
+                layerData.Add(Marker);
             }
 
             if (layer.Video.O > 0)
@@ -928,8 +925,8 @@ namespace KKdMainLib
                     .Add("Flags"     , (byte)video.TransferMode.Flags)
                     .Add("TrackMatte", video.TransferMode.TrackMatte.ToString());
 
-                VideoData.Add(WMP(ref video.AnchorX  ,   "OriginX"));
-                VideoData.Add(WMP(ref video.AnchorY  ,   "OriginY"));
+                VideoData.Add(WMP(ref video.AnchorX  ,   "AnchorX"));
+                VideoData.Add(WMP(ref video.AnchorY  ,   "AnchorY"));
                 VideoData.Add(WMP(ref video.PositionX, "PositionX"));
                 VideoData.Add(WMP(ref video.PositionY, "PositionY"));
                 VideoData.Add(WMP(ref video.Rotation , "Rotation" ));
@@ -939,7 +936,7 @@ namespace KKdMainLib
                 if (video.Video3D.O > 0)
                 {
                     ref VideoData.Video3DData video3D = ref video.Video3D.V;
-                    MsgPack video3DData = new MsgPack("Persp");
+                    MsgPack video3DData = new MsgPack("Video3DData");
                     video3DData.Add(WMP(ref video3D.   AnchorZ,    "AnchorZ"));
                     video3DData.Add(WMP(ref video3D. PositionZ,  "PositionZ"));
                     video3DData.Add(WMP(ref video3D.DirectionX, "DirectionX"));
@@ -982,6 +979,6 @@ namespace KKdMainLib
 
         private bool disposed;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.Dispose(); AET = default; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; AET = default; disposed = true; } }
     }
 }

KKdMainLib/DB/Aet.cs

@@ -1,4 +1,4 @@
-//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
+//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
 
 using System.Collections.Generic;
 using KKdBaseLib;
@@ -218,7 +218,7 @@ namespace KKdMainLib.DB
 
         private bool disposed = false;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.D(); AetSets = null; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; AetSets = null; disposed = true; } }
 
         public struct AET
         {

KKdMainLib/DB/Auth.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdBaseLib;
 using KKdMainLib.IO;
 using A3DADict = System.Collections.Generic.Dictionary<string, object>;
@@ -151,7 +151,7 @@ namespace KKdMainLib.DB
 
         private bool disposed = false;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.D(); Category = null; UIDs = null; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; Category = null; UIDs = null; disposed = true; } }
 
         public struct UID
         {

KKdMainLib/DB/Spr.cs

@@ -1,4 +1,4 @@
-//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
+//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
 
 using System.Collections.Generic;
 using KKdBaseLib;
@@ -256,7 +256,7 @@ namespace KKdMainLib.DB
 
         private bool disposed = false;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.D(); SpriteSets = null; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; SpriteSets = null; disposed = true; } }
 
         public struct SpriteTexture
         {

KKdMainLib/DEX.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdBaseLib.F2;
 using KKdMainLib.IO;
 
@@ -75,15 +75,15 @@ namespace KKdMainLib
             _IO.C();
         }
 
-        public void DEXWriter(string filepath, Format Format)
+        public void DEXWriter(string filepath, Format format)
         {
             if (Dex == null || Dex.Length < 1) return;
 
             header = new Header();
-            _IO = File.OpenWriter(filepath + (Format > Format.F && Format < Format.FT ? ".dex" : ".bin"), true);
-            header.Format = _IO.Format = Format;
+            _IO = File.OpenWriter(filepath + (format > Format.F && format < Format.FT ? ".dex" : ".bin"), true);
+            header.Format = _IO.Format = format;
 
-            _IO.O = Format > Format.F ? 0x20 : 0;
+            _IO.O = format > Format.F ? 0x20 : 0;
             _IO.W(0x64);
             _IO.W(Dex.Length);
 
@@ -147,7 +147,7 @@ namespace KKdMainLib
             _IO.P = Position0 - (header.IsX ? 8 : 4);
             _IO.W(namesPosition);
 
-            if (Format > Format.F)
+            if (format > Format.F)
             {
                 int offset = _IO.L;
                 _IO.O = 0;
@@ -223,7 +223,7 @@ namespace KKdMainLib
 
         private bool disposed;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.Dispose(); Dex = null; header = default; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; Dex = null; header = default; disposed = true; } }
 
         public struct EXP
         {

KKdMainLib/DIVAFILE.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Security.Cryptography;
 using KKdBaseLib;
 using KKdMainLib.IO;

KKdMainLib/DataBank.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Net;
 using KKdBaseLib;
 using KKdMainLib.IO;
@@ -141,7 +141,7 @@ namespace KKdMainLib
 
         private bool disposed;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.Dispose(); psrData = null;
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; psrData = null;
                 pvList = null; Success = false; disposed = true; } }
 
         public struct PsrData
@@ -177,7 +177,7 @@ namespace KKdMainLib
                      .Add(p2.WriteMP("P2")).Add(p3.WriteMP("P3"));
 
             public override string ToString() =>
-                UrlEncode($"{p1.ToString()},{p2.ToString()},{p3.ToString()},{PV_ID}");
+                UrlEncode($"{p1},{p2},{p3},{PV_ID}");
         }
 
         public struct Player

KKdMainLib/Extensions.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdBaseLib.F2;
 using KKdMainLib.IO;
 
@@ -16,13 +16,12 @@ namespace KKdMainLib
 
         public static Header ReadHeader(this Stream stream, bool readSectionSignature = true)
         {
-            Header header = new Header { Format = Format.F2LE, Signature = stream.RI32(),
+            Header header = new Header { Format = Format.F2, Signature = stream.RI32(),
                 DataSize = stream.RI32(), Length = stream.RI32(), Flags = stream.RI32(),
-                Depth = stream.RI32(), SectionSize = stream.RI32(),
-                Mode = stream.RI32() };
+                Depth = stream.RI32(), SectionSize = stream.RI32(), Mode = stream.RI32() };
             stream.RI32();
-            if ((header.Flags & 0x08000000) == 0x08000000) header.Format = Format.F2BE;
-            header.NotUseDataSizeAsSectionSize = (header.Flags & 0x10000000) != 0x10000000;
+            header.UseBigEndian   = (header.Flags & 0x08000000) != 0;
+            header.UseSectionSize = (header.Flags & 0x10000000) != 0;
             if (header.Length == 0x40)
             {
                 stream.RI64();
@@ -39,8 +38,8 @@ namespace KKdMainLib
         public static void W(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);
+            header.Flags = (header.UseSectionSize ? 0x10000000 : 0) |
+                           (header.UseBigEndian   ? 0x08000000 : 0);
 
             stream.W(header.Signature);
             stream.W(header.DataSize);
@@ -52,9 +51,7 @@ namespace KKdMainLib
             stream.W(0x00);
             if (header.Length == 0x40)
             {
-                stream.W(header.Format < Format.MGF ? (int)((header.SectionSignature ^
-                    (header.DataSize * (long)header.Signature)) - header.Depth + header.SectionSize) : 0);
-                stream.W(0x00);
+                stream.W(0x00L);
                 stream.W(0x00L);
                 stream.W(header.InnerSignature);
                 stream.W(0x00);
@@ -71,7 +68,7 @@ namespace KKdMainLib
         public static void W(this Stream stream, POF pof, bool shiftX = false, int depth = 0)
         {
             byte[] data = pof.Write(shiftX);
-            Header header = new Header { Depth = depth, Format = Format.F2LE,
+            Header header = new Header { Depth = depth, Format = Format.F2,
                 Length = 0x20, Signature = shiftX ? 0x31464F50 : 0x30464F50 };
             header.DataSize = header.SectionSize = data.Length;
             stream.W(header);
@@ -84,7 +81,7 @@ namespace KKdMainLib
         public static void W(this Stream stream, ENRS enrs, int depth = 0)
         {
             byte[] data = enrs.Write();
-            Header header = new Header { Depth = depth, Format = Format.F2LE,
+            Header header = new Header { Depth = depth, Format = Format.F2,
                 Length = 0x20, Signature = 0x53524E45 };
             header.DataSize = header.SectionSize = data.Length;
             stream.W(header);
@@ -105,8 +102,9 @@ namespace KKdMainLib
 
         public static Struct RSt(this Stream stream, Header header)
         {
+            int l = header.UseSectionSize ? header.SectionSize : header.DataSize;
             Struct @struct = new Struct { Header = header, DataOffset =
-                stream.P, Data = stream.RBy(header.SectionSize) };
+                stream.P, Data = stream.RBy(l) };
             int depth = header.Depth;
 
             int lastSig = 0, sig;
@@ -117,19 +115,19 @@ namespace KKdMainLib
             {
                 header = stream.ReadHeader(false);
                 sig = header.Signature;
-                position += header.Length + header.SectionSize;
+                l = header.UseSectionSize ? header.SectionSize : header.DataSize;
+                position += header.Length + l;
                 if (sig == 0x43464F45 && header.Depth == depth + 1) break;
                 else if (sig == 0x53524E45 || (sig & 0xF0FFFFFF) == 0x30464F50)
                 {
-                    byte[] Data = stream.RBy(header.SectionSize);
+                    byte[] Data = stream.RBy(l);
                     if (sig == 0x53524E45) @struct.ENRS.Read(Data);
                     else                   @struct.POF .Read(Data, sig == 0x31464F50);
                 }
                 else if (header.Depth == 0 && sig == 0x43505854)
-                { subStructs.Add(new Struct { Header = header, DataOffset =
-                    stream.P, Data = stream.RBy(header.SectionSize) }); }
-                else if (header.Depth <= depth) { stream.PI64 -= header.Length; break; }
-                else subStructs.Add(stream.RSt(header));
+                    subStructs.Add(new Struct { Header = header, DataOffset = stream.P, Data = stream.RBy(l) });
+                else if (header.Depth > depth) subStructs.Add(stream.RSt(header));
+                else { stream.PI64 -= header.Length; break; }
                 lastSig = sig;
             }
 

KKdMainLib/F2/Bloom.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdBaseLib.F2;
 using KKdMainLib.IO;
 
@@ -60,12 +60,12 @@ namespace KKdMainLib.F2
 
         private bool disposed;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.Dispose(); BLTs = default; header = default; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; BLTs = default; header = default; disposed = true; } }
 
         public struct BLT
         {
-            public Vector3 Color;
-            public Vector3 Brightpass;
+            public Vec3 Color;
+            public Vec3 Brightpass;
             public float Range;
 
             public override string ToString() => Color     .ToString(6) + "," +

KKdMainLib/F2/ColorCorrection.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdBaseLib.F2;
 using KKdMainLib.IO;
 
@@ -62,7 +62,7 @@ namespace KKdMainLib.F2
 
         private bool disposed;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.Dispose(); CCTs = default; header = default; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; CCTs = default; header = default; disposed = true; } }
 
         public struct CCT
         {
@@ -70,7 +70,7 @@ namespace KKdMainLib.F2
             public float Saturation;
             public float Lightness;
             public float Exposure;
-            public Vector3 Gamma;
+            public Vec3 Gamma;
             public float Contrast;
 
             public override string ToString() => Hue       .ToS(6) + "," +

KKdMainLib/F2/DOF.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdBaseLib.F2;
 using KKdMainLib.IO;
 
@@ -60,7 +60,7 @@ namespace KKdMainLib.F2
 
         private bool disposed;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.Dispose(); DFTs = default; header = default; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; DFTs = default; header = default; disposed = true; } }
 
         public struct DFT
         {

KKdMainLib/F2/Light.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdBaseLib.F2;
 using KKdMainLib.IO;
 
@@ -91,11 +91,11 @@ namespace KKdMainLib.F2
             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 Vec4 Ambient;
+            public Vec4 Diffuse;
+            public Vec4 Specular;
+            public Vec3 Position;
+            public Vec3 ToneCurve;
 
             public override string ToString() => Flags == 0 ? ",,,,,,,,,,,,,,,," : Type + "," +
                 ((Flags & Flags.Ambient  ) == 0 ? ",,,"  : Ambient  .ToString(6) + ",") +
@@ -107,7 +107,7 @@ namespace KKdMainLib.F2
 
         private bool disposed;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.Dispose(); LITs = default; header = default; disposed = true; } }
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; LITs = default; header = default; disposed = true; } }
 
         public enum Id : int
         {

KKdMainLib/FARC.cs

@@ -1,4 +1,4 @@
-//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
+//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
 
 using System.IO.Compression;
 using System.Security.Cryptography;
@@ -57,9 +57,9 @@ namespace KKdMainLib
                 reader.RI32();
                 int farcMode = reader.RI32E(true);
 
-                Format = (FARCType & Type.ECB) != 0 && (farcMode & (farcMode - 1)) != 0 ? Format.FT : Format.DT;
+                Format = (FARCType & Type.Enc) != 0 && (farcMode & (farcMode - 1)) != 0 ? Format.FT : Format.DT;
 
-                if (Format == Format.FT && (FARCType & Type.ECB) != 0)
+                if (Format == Format.FT && (FARCType & Type.Enc) != 0)
                 {
                     reader.Dispose();
                     byte[] header = new byte[headerLength - 0x08];
@@ -155,18 +155,17 @@ namespace KKdMainLib
                 return file.Data;
             }
 
-            int FileSize = (FARCType & Type.ECB) != 0 || (file.Type & Type.ECB) != 0 ?
-                file.SizeComp.A(0x10) : ((FARCType & Type.GZip) != 0 || (file.Type & Type.GZip) != 0 ? file.SizeComp : file.SizeUnc);
+            int FileSize = ((FARCType | file.Type) & Type.Enc) != 0 ? file.SizeComp.A(0x10)
+                : (((FARCType | file.Type) & Type.GZip) != 0 ? file.SizeComp : file.SizeUnc);
             using (Stream stream = File.OpenReader(FilePath))
             {
                 stream.S(file.Offset, 0);
                 file.Data = stream.RBy(FileSize);
             }
 
-
-            if ((FARCType & Type.ECB) != 0)
+            if ((FARCType & Type.Enc) != 0)
             {
-                if (Format == Format.FT && (file.Type & Type.ECB) != 0)
+                if (Format == Format.FT && (file.Type & Type.Enc) != 0)
                 {
                     using (AesManaged aes = GetAes(true, null))
                     using (CryptoStream cryptoStream = new CryptoStream(new MSIO.MemoryStream(file.Data),
@@ -180,9 +179,8 @@ namespace KKdMainLib
                         aes.CreateDecryptor(), CryptoStreamMode.Read))
                         cryptoStream.Read(file.Data, 0, FileSize);
             }
-            
-            if (((Format == Format.FT && (file.Type & Type.GZip) != 0) ||
-                (FARCType & Type.GZip) != 0) && file.SizeUnc > 0)
+
+            if (((file.Type | FARCType) & Type.GZip) != 0 && file.SizeUnc > 0)
                 file.Data = file.Data.InflateGZip(file.SizeUnc);
 
             Files[i] = file;
@@ -223,7 +221,7 @@ namespace KKdMainLib
 
         public void Save()
         {
-            if (!HasFiles) return;
+            if (!HasFiles || (Signature != Farc.FArc && Signature != Farc.FArC && Signature != Farc.FARC)) return;
 
             for (int i = 0; i < Files.Count; i++)
             {
@@ -292,7 +290,7 @@ namespace KKdMainLib
                 file.SizeComp = data.Length;
             }
 
-            if (Signature == Farc.FARC && (FARCType & Type.ECB) != 0)
+            if (Signature == Farc.FARC && (FARCType & Type.Enc) != 0)
             {
                 int alignLength = data.Length.A(0x40);
                 byte[] tempData = new byte[alignLength];
@@ -347,7 +345,7 @@ namespace KKdMainLib
         {
             None = 0b000,
             GZip = 0b010,
-            ECB  = 0b100,
+            Enc  = 0b100,
         }
     }
 }

KKdMainLib/IO/DeflateInflate.cs

@@ -1,161 +1,163 @@
-using System.Runtime.InteropServices;
-
-namespace KKdMainLib.IO
-{
-    public static unsafe class DeflateInflate
-    {
-        private const string libDeflateString = "libdeflate.dll";
-
-        public static byte[] Deflate(this byte[] data, long compressionLevel)
-        {
-            void* c = libdeflate_alloc_compressor((int)compressionLevel);
-            int maxOutBytes = libdeflate_deflate_compress_bound(c, data.Length);
-            byte[] outData = new byte[maxOutBytes];
-            int actualOut = 0;
-            fixed (byte*  inPtr =    data)
-            fixed (byte* outPtr = outData)
-                actualOut = libdeflate_deflate_compress(c, inPtr, data.Length, outPtr, maxOutBytes);
-            libdeflate_free_compressor(c);
-            System.Array.Resize(ref outData, (int)actualOut);
-            return outData;
-        }
-
-        public static byte[] Inflate(this byte[] data, long length)
-        {
-            byte[] outData = new byte[length];
-
-            int actualOut = 0;
-            void* d = libdeflate_alloc_decompressor();
-            fixed (byte*  inPtr =    data)
-            fixed (byte* outPtr = outData)
-                libdeflate_deflate_decompress(d, inPtr, data.Length, outPtr, (int)length, (byte*)&actualOut);
-            libdeflate_free_decompressor(d);
-
-            if (actualOut == 0 || actualOut > length)
-                throw new System.Exception("DeflateInflate Error: specified input length" +
-                    " is less than it should be for current Deflate data");
-            else if (actualOut < length)
-                System.Array.Resize(ref outData, (int)actualOut);
-            return outData;
-        }
-
-        public static byte[] DeflateGZip(this byte[] data, long compressionLevel)
-        {
-            void* c = libdeflate_alloc_compressor((int)compressionLevel);
-            int maxOutBytes = libdeflate_deflate_compress_bound(c, data.Length);
-            byte[] outData = new byte[maxOutBytes];
-            int actualOut = 0;
-            fixed (byte*  inPtr =    data)
-            fixed (byte* outPtr = outData)
-                actualOut = libdeflate_gzip_compress(c, inPtr, data.Length, outPtr, maxOutBytes);
-            libdeflate_free_compressor(c);
-            System.Array.Resize(ref outData, (int)actualOut);
-            return outData;
-        }
-
-        public static byte[] InflateGZip(this byte[] data, long length)
-        {
-            byte[] outData = new byte[length];
-
-            int actualOut = 0;
-            void* d = libdeflate_alloc_decompressor();
-            fixed (byte*  inPtr =    data)
-            fixed (byte* outPtr = outData)
-                libdeflate_gzip_decompress(d, inPtr, data.Length, outPtr, (int)length, (byte*)&actualOut);
-            libdeflate_free_decompressor(d);
-
-            if (actualOut == 0 || actualOut > length)
-                throw new System.Exception("DeflateInflate Error: specified input length" +
-                    " is less than it should be for current Deflate data");
-            else if (actualOut < length)
-                System.Array.Resize(ref outData, (int)actualOut);
-            return outData;
-        }
-
-        public static byte[] DeflateZLib(this byte[] data, long compressionLevel)
-        {
-            void* c = libdeflate_alloc_compressor((int)compressionLevel);
-            int maxOutBytes = libdeflate_deflate_compress_bound(c, data.Length);
-            byte[] outData = new byte[maxOutBytes];
-            int actualOut = 0;
-            fixed (byte*  inPtr =    data)
-            fixed (byte* outPtr = outData)
-                actualOut = libdeflate_zlib_compress(c, inPtr, data.Length, outPtr, maxOutBytes);
-            libdeflate_free_compressor(c);
-            System.Array.Resize(ref outData, (int)actualOut);
-            return outData;
-        }
-
-        public static byte[] InflateZLib(this byte[] data, long length)
-        {
-            byte[] outData = new byte[length];
-
-            int actualOut = 0;
-            void* d = libdeflate_alloc_decompressor();
-            fixed (byte*  inPtr =    data)
-            fixed (byte* outPtr = outData)
-                libdeflate_zlib_decompress(d, inPtr, data.Length, outPtr, (int)length, (byte*)&actualOut);
-            libdeflate_free_decompressor(d);
-
-            if (actualOut == 0 || actualOut > length)
-                throw new System.Exception("DeflateInflate Error: specified input length" +
-                    " is less than it should be for current Deflate data");
-            else if (actualOut < length)
-                System.Array.Resize(ref outData, (int)actualOut);
-            return outData;
-        }
-
-        [DllImport(libDeflateString)]
-        private static extern void* libdeflate_alloc_compressor(int compressionLevel);
-
-        [DllImport(libDeflateString)]
-        private static extern void* libdeflate_alloc_decompressor();
-
-        [DllImport(libDeflateString)]
-        private static extern int libdeflate_deflate_compress_bound(void* c, int length);
-
-        [DllImport(libDeflateString)]
-        private static extern int libdeflate_deflate_compress(void* c, byte* inData, int inBytes,
-            byte* outData, int maxOutBytes);
-
-        [DllImport(libDeflateString)]
-        private static extern void libdeflate_deflate_decompress(void* d, byte* inData, int inBytes,
-            byte* outData, int outBytesAvail, byte* actualOutBytes);
-
-        [DllImport(libDeflateString)]
-        private static extern void libdeflate_deflate_decompress_ex(void* d, byte* inData, int inBytes,
-            byte* outData, int outBytesAvail, byte* actualInBytes, byte* actualOutBytes);
-
-        [DllImport(libDeflateString)]
-        private static extern int libdeflate_gzip_compress_bound(void* c, int length);
-
-        [DllImport(libDeflateString)]
-        private static extern int libdeflate_gzip_compress(void* c, byte* inData, int inBytes,
-            byte* outData, int maxOutBytes);
-
-        [DllImport(libDeflateString)]
-        private static extern void libdeflate_gzip_decompress(void* d, byte* inData, int inBytes,
-            byte* outData, int outBytesAvail, byte* actualOutBytes);
-
-        [DllImport(libDeflateString)]
-        private static extern void libdeflate_gzip_decompress_ex(void* d, byte* inData, int inBytes,
-            byte* outData, int outBytesAvail, byte* actualInBytes, byte* actualOutBytes);
-
-        [DllImport(libDeflateString)]
-        private static extern int libdeflate_zlib_compress_bound(void* c, int length);
-
-        [DllImport(libDeflateString)]
-        private static extern int libdeflate_zlib_compress(void* c, byte* inData, int inBytes,
-            byte* outData, int maxOutBytes);
-
-        [DllImport(libDeflateString)]
-        private static extern void libdeflate_zlib_decompress(void* d, byte* inData, int inBytes,
-            byte* outData, int outBytesAvail, byte* actualOutBytes);
-
-        [DllImport(libDeflateString)]
-        private static extern void libdeflate_free_compressor(void* c);
-
-        [DllImport(libDeflateString)]
-        private static extern void libdeflate_free_decompressor(void* d);
-    }
-}
+using System.Runtime.InteropServices;
+
+namespace KKdMainLib.IO
+{
+    public static unsafe class DeflateInflate
+    {
+        public static bool HasFile = false;
+
+        private const string libDeflateString = "libdeflate.dll";
+
+        public static byte[] Deflate(this byte[] data, long compressionLevel)
+        {
+            void* c = libdeflate_alloc_compressor((int)compressionLevel);
+            int maxOutBytes = libdeflate_deflate_compress_bound(c, data.Length);
+            byte[] outData = new byte[maxOutBytes];
+            int actualOut = 0;
+            fixed (byte*  inPtr =    data)
+            fixed (byte* outPtr = outData)
+                actualOut = libdeflate_deflate_compress(c, inPtr, data.Length, outPtr, maxOutBytes);
+            libdeflate_free_compressor(c);
+            System.Array.Resize(ref outData, (int)actualOut);
+            return outData;
+        }
+
+        public static byte[] Inflate(this byte[] data, long length)
+        {
+            byte[] outData = new byte[length];
+
+            int actualOut = 0;
+            void* d = libdeflate_alloc_decompressor();
+            fixed (byte*  inPtr =    data)
+            fixed (byte* outPtr = outData)
+                libdeflate_deflate_decompress(d, inPtr, data.Length, outPtr, (int)length, (byte*)&actualOut);
+            libdeflate_free_decompressor(d);
+
+            if (actualOut == 0 || actualOut > length)
+                throw new System.Exception("DeflateInflate Error: specified input length" +
+                    " is less than it should be for current Deflate data");
+            else if (actualOut < length)
+                System.Array.Resize(ref outData, (int)actualOut);
+            return outData;
+        }
+
+        public static byte[] DeflateGZip(this byte[] data, long compressionLevel)
+        {
+            void* c = libdeflate_alloc_compressor((int)compressionLevel);
+            int maxOutBytes = libdeflate_deflate_compress_bound(c, data.Length);
+            byte[] outData = new byte[maxOutBytes];
+            int actualOut = 0;
+            fixed (byte*  inPtr =    data)
+            fixed (byte* outPtr = outData)
+                actualOut = libdeflate_gzip_compress(c, inPtr, data.Length, outPtr, maxOutBytes);
+            libdeflate_free_compressor(c);
+            System.Array.Resize(ref outData, (int)actualOut);
+            return outData;
+        }
+
+        public static byte[] InflateGZip(this byte[] data, long length)
+        {
+            byte[] outData = new byte[length];
+
+            int actualOut = 0;
+            void* d = libdeflate_alloc_decompressor();
+            fixed (byte*  inPtr =    data)
+            fixed (byte* outPtr = outData)
+                libdeflate_gzip_decompress(d, inPtr, data.Length, outPtr, (int)length, (byte*)&actualOut);
+            libdeflate_free_decompressor(d);
+
+            if (actualOut == 0 || actualOut > length)
+                throw new System.Exception("DeflateInflate Error: specified input length" +
+                    " is less than it should be for current Deflate data");
+            else if (actualOut < length)
+                System.Array.Resize(ref outData, (int)actualOut);
+            return outData;
+        }
+
+        public static byte[] DeflateZLib(this byte[] data, long compressionLevel)
+        {
+            void* c = libdeflate_alloc_compressor((int)compressionLevel);
+            int maxOutBytes = libdeflate_deflate_compress_bound(c, data.Length);
+            byte[] outData = new byte[maxOutBytes];
+            int actualOut = 0;
+            fixed (byte*  inPtr =    data)
+            fixed (byte* outPtr = outData)
+                actualOut = libdeflate_zlib_compress(c, inPtr, data.Length, outPtr, maxOutBytes);
+            libdeflate_free_compressor(c);
+            System.Array.Resize(ref outData, (int)actualOut);
+            return outData;
+        }
+
+        public static byte[] InflateZLib(this byte[] data, long length)
+        {
+            byte[] outData = new byte[length];
+
+            int actualOut = 0;
+            void* d = libdeflate_alloc_decompressor();
+            fixed (byte*  inPtr =    data)
+            fixed (byte* outPtr = outData)
+                libdeflate_zlib_decompress(d, inPtr, data.Length, outPtr, (int)length, (byte*)&actualOut);
+            libdeflate_free_decompressor(d);
+
+            if (actualOut == 0 || actualOut > length)
+                throw new System.Exception("DeflateInflate Error: specified input length" +
+                    " is less than it should be for current Deflate data");
+            else if (actualOut < length)
+                System.Array.Resize(ref outData, (int)actualOut);
+            return outData;
+        }
+
+        [DllImport(libDeflateString)]
+        private static extern void* libdeflate_alloc_compressor(int compressionLevel);
+
+        [DllImport(libDeflateString)]
+        private static extern void* libdeflate_alloc_decompressor();
+
+        [DllImport(libDeflateString)]
+        private static extern int libdeflate_deflate_compress_bound(void* c, int length);
+
+        [DllImport(libDeflateString)]
+        private static extern int libdeflate_deflate_compress(void* c, byte* inData, int inBytes,
+            byte* outData, int maxOutBytes);
+
+        [DllImport(libDeflateString)]
+        private static extern void libdeflate_deflate_decompress(void* d, byte* inData, int inBytes,
+            byte* outData, int outBytesAvail, byte* actualOutBytes);
+
+        [DllImport(libDeflateString)]
+        private static extern void libdeflate_deflate_decompress_ex(void* d, byte* inData, int inBytes,
+            byte* outData, int outBytesAvail, byte* actualInBytes, byte* actualOutBytes);
+
+        [DllImport(libDeflateString)]
+        private static extern int libdeflate_gzip_compress_bound(void* c, int length);
+
+        [DllImport(libDeflateString)]
+        private static extern int libdeflate_gzip_compress(void* c, byte* inData, int inBytes,
+            byte* outData, int maxOutBytes);
+
+        [DllImport(libDeflateString)]
+        private static extern void libdeflate_gzip_decompress(void* d, byte* inData, int inBytes,
+            byte* outData, int outBytesAvail, byte* actualOutBytes);
+
+        [DllImport(libDeflateString)]
+        private static extern void libdeflate_gzip_decompress_ex(void* d, byte* inData, int inBytes,
+            byte* outData, int outBytesAvail, byte* actualInBytes, byte* actualOutBytes);
+
+        [DllImport(libDeflateString)]
+        private static extern int libdeflate_zlib_compress_bound(void* c, int length);
+
+        [DllImport(libDeflateString)]
+        private static extern int libdeflate_zlib_compress(void* c, byte* inData, int inBytes,
+            byte* outData, int maxOutBytes);
+
+        [DllImport(libDeflateString)]
+        private static extern void libdeflate_zlib_decompress(void* d, byte* inData, int inBytes,
+            byte* outData, int outBytesAvail, byte* actualOutBytes);
+
+        [DllImport(libDeflateString)]
+        private static extern void libdeflate_free_compressor(void* c);
+
+        [DllImport(libDeflateString)]
+        private static extern void libdeflate_free_decompressor(void* d);
+    }
+}

KKdMainLib/IO/Directory.cs

@@ -1,15 +1,102 @@
-using MSIO = System.IO;
+using MSIO = System.IO;
+using MSIOD = System.IO.Directory;
 
 namespace KKdMainLib.IO
 {
     public static class Directory
     {
-        public static bool Exists(string path) => MSIO.Directory.Exists(path);
-        public static void Delete(string path) => MSIO.Directory.Delete(path);
-        public static string GetCurrentDirectory() => MSIO.Directory.GetCurrentDirectory();
-        public static string[] GetFiles(string path) => MSIO.Directory.GetFiles(path);
-        public static string[] GetDirectories(string path) => MSIO.Directory.GetDirectories(path);
-        public static MSIO.DirectoryInfo CreateDirectory(string path) => MSIO.Directory.CreateDirectory(path);
+        public static MSIO.DirectoryInfo CreateDirectory(string path) =>
+            MSIOD.CreateDirectory(path);
+
+        public static void Delete(string path, bool recursive) =>
+            MSIOD.Delete(path, recursive);
+
+        public static void Delete(string path) =>
+            MSIOD.Delete(path);
+
+        public static bool Exists(string path) =>
+            MSIOD.Exists(path);
+
+        public static System.DateTime GetCreationTime(string path) =>
+            MSIOD.GetCreationTime(path);
+
+        public static System.DateTime GetCreationTimeUtc(string path) =>
+            MSIOD.GetCreationTimeUtc(path);
+
+        public static string GetCurrentDirectory() =>
+            MSIOD.GetCurrentDirectory();
+
+        public static string[] GetDirectories(string path, string searchPattern, MSIO.SearchOption searchOption) =>
+            MSIOD.GetDirectories(path, searchPattern, searchOption);
+
+        public static string[] GetDirectories(string path, string searchPattern) =>
+            MSIOD.GetDirectories(path, searchPattern);
+
+        public static string[] GetDirectories(string path) =>
+            MSIOD.GetDirectories(path);
+
+        public static string GetDirectoryRoot(string path) =>
+            MSIOD.GetDirectoryRoot(path);
+
+        public static string[] GetFiles(string path, string searchPattern, MSIO.SearchOption searchOption) =>
+            MSIOD.GetFiles(path, searchPattern, searchOption);
+
+        public static string[] GetFiles(string path) =>
+            MSIOD.GetFiles(path);
+
+        public static string[] GetFiles(string path, string searchPattern) =>
+            MSIOD.GetFiles(path, searchPattern);
+
+        public static string[] GetFileSystemEntries(string path) =>
+            MSIOD.GetFileSystemEntries(path);
+
+        public static string[] GetFileSystemEntries(string path, string searchPattern) =>
+            MSIOD.GetFileSystemEntries(path, searchPattern);
+
+        public static string[] GetFileSystemEntries(string path, string searchPattern, MSIO.SearchOption searchOption) =>
+            MSIOD.GetFileSystemEntries(path, searchPattern, searchOption);
+
+        public static System.DateTime GetLastAccessTime(string path) =>
+            MSIOD.GetLastAccessTime(path);
+
+        public static System.DateTime GetLastAccessTimeUtc(string path) =>
+            MSIOD.GetLastAccessTimeUtc(path);
+
+        public static System.DateTime GetLastWriteTime(string path) =>
+            MSIOD.GetLastWriteTime(path);
+
+        public static System.DateTime GetLastWriteTimeUtc(string path) =>
+            MSIOD.GetLastWriteTimeUtc(path);
+
+        public static string[] GetLogicalDrives() =>
+            MSIOD.GetLogicalDrives();
+
+        public static MSIO.DirectoryInfo GetParent(string path) =>
+            MSIOD.GetParent(path);
+
+        public static void Move(string sourceDirName, string destDirName) =>
+            MSIOD.Move(sourceDirName, destDirName);
+
+        public static void SetCreationTime(string path, System.DateTime creationTime) =>
+            MSIOD.SetCreationTime(path, creationTime);
+
+        public static void SetCreationTimeUtc(string path, System.DateTime creationTimeUtc) =>
+            MSIOD.SetCreationTimeUtc(path, creationTimeUtc);
+
+        public static void SetCurrentDirectory(string path) =>
+            MSIOD.SetCurrentDirectory(path);
+
+        public static void SetLastAccessTime(string path, System.DateTime lastAccessTime) =>
+            MSIOD.SetLastAccessTime(path, lastAccessTime);
+
+        public static void SetLastAccessTimeUtc(string path, System.DateTime lastAccessTimeUtc) =>
+            MSIOD.SetLastAccessTimeUtc(path, lastAccessTimeUtc);
+
+        public static void SetLastWriteTime(string path, System.DateTime lastWriteTime) =>
+            MSIOD.SetLastWriteTime(path, lastWriteTime);
+
+        public static void SetLastWriteTimeUtc(string path, System.DateTime lastWriteTimeUtc) =>
+            MSIOD.SetLastWriteTimeUtc(path, lastWriteTimeUtc);
     }
 }
 

KKdMainLib/IO/Extensions.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdBaseLib.F2;
 
 namespace KKdMainLib.IO
@@ -64,45 +64,60 @@ namespace KKdMainLib.IO
             return true;
         }
 
-        public static long RIX(this Stream stream           ) => stream.IsX ?
-            stream.RI64() : stream.RU32E(  );
-        public static long RIX(this Stream stream, bool isBE) => stream.IsX ?
-            stream.RI64() : stream.RU32E(isBE);
+        public static long RIX(this Stream stream           ) =>
+            stream.IsX ? stream.RI64() : stream.RI32E(  );
+        public static long RIX(this Stream stream, bool isBE) =>
+            stream.IsX ? stream.RI64() : stream.RI32E(isBE);
 
-        public static void WX(this Stream stream, long val, ref POF POF)
+        public static void WX(this Stream stream, long val, ref POF pof)
         {   if (stream.IsX) stream.W (     val);
-            else            stream.WE((int)val);       POF.Offsets.Add(stream.P); }
-        public static void WX(this Stream stream, long val, ref POF POF, bool IsBE)
+            else            stream.WE((int)val);       pof.Offsets.Add(stream.P); }
+        public static void WX(this Stream stream, long val, ref POF pof, bool isBE)
         {   if (stream.IsX) stream.W (     val      );
-            else            stream.WE((int)val, IsBE); POF.Offsets.Add(stream.P); }
+            else            stream.WE((int)val, isBE); pof.Offsets.Add(stream.P); }
 
         public static void WX(this Stream stream, long val)
         {   if (stream.IsX) stream.W (     val);
             else            stream.WE((int)val);       }
-        public static void WX(this Stream stream, long val, bool IsBE)
+        public static void WX(this Stream stream, long val, bool isBE)
         {   if (stream.IsX) stream.W (     val      );
-            else            stream.WE((int)val, IsBE); }
+            else            stream.WE((int)val, isBE); }
 
-        public static byte[] RaO(this Stream stream, long Offset = -1, long Length = -1)
+        public static byte[] RaO(this Stream stream, long offset = -1, long length = -1)
         {
             byte[] arr = null;
             long Position = stream.PI64;
-            if (Offset == -1) { Position += stream.IsX ? 8 : 4; Offset = stream.RIX(); }
-            stream.PI64 = Offset;
-            if (Length == -1) arr = stream.NT();
-            else              arr = stream.RBy(Length);
+            if (offset == -1) { Position += stream.IsX ? 8 : 4; offset = stream.RIX(); }
+            stream.PI64 = offset;
+            if (length == -1) arr = stream.NT();
+            else              arr = stream.RBy(length);
             stream.PI64 = Position;
             return arr;
         }
 
-        public static string RSaO(this Stream stream, long Offset = -1, long Length = -1)
+        public static string RSaO(this Stream stream)
+        {
+            long Position = stream.PI64 + (stream.IsX ? 8 : 4);
+            stream.PI64 = stream.RIX();
+            string s = stream.NTUTF8();
+            stream.PI64 = Position;
+            return s;
+        }
+
+        public static string RSaO(this Stream stream, long offset)
         {
-            string s = null;
             long Position = stream.PI64;
-            if (Offset == -1) { Position += stream.IsX ? 8 : 4; Offset = stream.RIX(); }
-            stream.PI64 = Offset;
-            if (Length == -1) s = stream.NTUTF8();
-            else              s = stream.RSUTF8(Length);
+            stream.PI64 = offset;
+            string s = stream.NTUTF8();
+            stream.PI64 = Position;
+            return s;
+        }
+
+        public static string RSaO(this Stream stream, long offset, long length)
+        {
+            long Position = stream.PI64;
+            stream.PI64 = offset;
+            string s = stream.RSUTF8(length);
             stream.PI64 = Position;
             return s;
         }
@@ -114,11 +129,11 @@ namespace KKdMainLib.IO
         public static void WPSSJIS(this Stream stream, ref Pointer<string> val)
         { val.O = stream.P; stream.WPSSJIS(val.V); }
 
-        public static string RPSSJIS(this Stream stream, long Offset = -1, long Length = -1) =>
-            Text.ShiftJIS.GetString(stream.RaO(Offset, Length));
+        public static string RPSSJIS(this Stream stream, long offset = -1, long length = -1) =>
+            Text.ShiftJIS.GetString(stream.RaO(offset, length));
 
-        public static void WPSSJIS(this Stream stream, string String) =>
-            stream.W(Text.ShiftJIS.GetBytes(String));
+        public static void WPSSJIS(this Stream stream, string val) =>
+            stream.W(val.ToSJIS());
 
         public static Pointer<string> RPS(this Stream stream)
         { Pointer<string> val = stream.RP<string>();

KKdMainLib/IO/File.cs

@@ -1,30 +1,41 @@
-using System;
 using MSIO = System.IO;
+using MSIOF = System.IO.File;
 
 namespace KKdMainLib.IO
 {
     public static class File
     {
-        public static Stream OpenReader(byte[] Data) => new Stream(new MSIO.MemoryStream(Data));
-        public static Stream OpenWriter(byte[] Data) => new Stream(new MSIO.MemoryStream(Data));
-        public static Stream OpenWriter(           ) => new Stream(new MSIO.MemoryStream(    ));
+        public static Stream OpenReadWriter(byte[] data) => new Stream(new MSIO.MemoryStream(data));
+        public static Stream OpenReader    (byte[] data) => new Stream(new MSIO.MemoryStream(data), canWrite: false);
+        public static Stream OpenWriter    (byte[] data) => new Stream(new MSIO.MemoryStream(data), canRead : false);
+        public static Stream OpenWriter    (           ) => new Stream(new MSIO.MemoryStream(    ), canRead : false);
 
-        public static Stream OpenReader(string file, bool ReadAllAtOnce)
-        { Stream _IO = OpenReader(file); if (ReadAllAtOnce) { byte[] data =
+        public static Stream OpenReadWriter(string file)
+        { bool exist = Exists(file);
+            Stream _IO = new Stream(new MSIO.FileStream(file, MSIO.FileMode.OpenOrCreate,
+            MSIO.FileAccess.ReadWrite, MSIO.FileShare.ReadWrite)) { File = file };
+            System.DateTime t = System.DateTime.UtcNow;
+            if (exist) MSIOF.SetCreationTimeUtc(file, t);
+            MSIOF. SetLastWriteTimeUtc(file, t);
+            MSIOF.SetLastAccessTimeUtc(file, t); return _IO; }
+        public static Stream OpenReader(string file, bool readAllAtOnce)
+        { Stream _IO = OpenReader(file); if (readAllAtOnce) { byte[] data =
                     _IO.ToArray(); _IO.Dispose(); 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; }
-        public static Stream OpenWriter(string file, bool SetLength0)
-        { Stream _IO = OpenWriter(file); if (SetLength0) _IO.SL(0); return _IO; }
-        public static Stream OpenWriter(string file, int SetLength)
-        { Stream _IO = OpenWriter(file); _IO.SL(SetLength); return _IO; }
+        { Stream _IO = new Stream(new MSIO.FileStream(file, MSIO.FileMode.Open, MSIO.FileAccess.Read,
+              MSIO.FileShare.ReadWrite), canWrite: false) { File = file }; return _IO; }
+        public static Stream OpenWriter(string file, bool setLength0)
+        { Stream _IO = OpenWriter(file); if (setLength0) _IO.SL(0); return _IO; }
+        public static Stream OpenWriter(string file, int setLength)
+        { Stream _IO = OpenWriter(file); _IO.SL(setLength); return _IO; }
         public static Stream OpenWriter(string file)
-        { Stream _IO = new Stream(new MSIO.FileStream(file,
-            MSIO.FileMode.OpenOrCreate, MSIO.FileAccess.ReadWrite, MSIO.FileShare.ReadWrite)) { File = file };
-            MSIO.File.  SetCreationTimeUtc(file, DateTime.UtcNow);
-            MSIO.File. SetLastWriteTimeUtc(file, DateTime.UtcNow);
-            MSIO.File.SetLastAccessTimeUtc(file, DateTime.UtcNow); return _IO; }
+        { bool exist = Exists(file);
+            Stream _IO = new Stream(new MSIO.FileStream(file, MSIO.FileMode.OpenOrCreate,
+                MSIO.FileAccess.ReadWrite, MSIO.FileShare.ReadWrite), canRead: false) { File = file };
+            System.DateTime t = System.DateTime.UtcNow;
+            if (!exist) MSIOF.SetCreationTimeUtc(file, t);
+            MSIOF. SetLastWriteTimeUtc(file, t);
+            MSIOF.SetLastAccessTimeUtc(file, t); return _IO; }
 
         public static   byte[] ReadAllBytes(string file, int length, int offset)
         { byte[] Data; using (Stream _IO = OpenReader(file)) Data = _IO.RBy(length, offset); return Data; }
@@ -49,7 +60,7 @@ namespace KKdMainLib.IO
         public static void WriteAllLines(string file, string[] data)
         { using Stream _IO = OpenWriter(file, true);
             if (data != null) for (int i = 0; i < data.Length; i++)
-                    if (data[i] != null) _IO.W(data[i] + "\r\n"); }
+                { if (data[i] != null) _IO.W(data[i]); } _IO.W("\r\n"); }
 
         public static void WriteAllBytes(string file,   byte[] data, long length)
         { using Stream _IO = OpenWriter(file, true); if (data != null) { _IO.W(data); _IO.LI64 = length; } }
@@ -59,10 +70,58 @@ namespace KKdMainLib.IO
 
         public static void WriteAllLines(string file, string[] data, long length)
         { using Stream _IO = OpenWriter(file, true);
-            if (data != null) { for (int i = 0; i < data.Length; i++)
-                    if (data[i] != null) _IO.W(data[i] + "\r\n"); } _IO.LI64 = length; }
+            if (data != null) for (int i = 0; i < data.Length; i++)
+                { if (data[i] != null) _IO.W(data[i]); _IO.W("\r\n"); } _IO.LI64 = length; }
 
-        public static bool Exists(string file) => MSIO.File.Exists(file);
-        public static void Delete(string file) => MSIO.File.Delete(file);
+        public static bool Exists(string file) =>
+            MSIOF.Exists(file);
+
+        public static void Delete(string file) =>
+            MSIOF.Delete(file);
+
+        public static MSIO.FileAttributes GetAttributes(string path) =>
+            MSIOF.GetAttributes(path);
+
+        public static System.DateTime GetCreationTime(string path) =>
+            MSIOF.GetCreationTime(path);
+
+        public static System.DateTime GetCreationTimeUtc(string path) =>
+            MSIOF.GetCreationTimeUtc(path);
+
+        public static System.DateTime GetLastAccessTime(string path) =>
+            MSIOF.GetLastAccessTime(path);
+
+        public static System.DateTime GetLastAccessTimeUtc(string path) =>
+            MSIOF.GetLastAccessTimeUtc(path);
+
+        public static System.DateTime GetLastWriteTime(string path) =>
+            MSIOF.GetLastWriteTime(path);
+
+        public static System.DateTime GetLastWriteTimeUtc(string path) =>
+            MSIOF.GetLastWriteTimeUtc(path);
+
+        public static void Move(string sourceFileName, string destFileName) =>
+            MSIOF.Move(sourceFileName, destFileName);
+
+        public static void SetAttributes(string path, MSIO.FileAttributes fileAttributes) =>
+            MSIOF.SetAttributes(path, fileAttributes);
+
+        public static void SetCreationTime(string path, System.DateTime creationTime) =>
+            MSIOF.SetCreationTime(path, creationTime);
+
+        public static void SetCreationTimeUtc(string path, System.DateTime creationTimeUtc) =>
+            MSIOF.SetCreationTimeUtc(path, creationTimeUtc);
+
+        public static void SetLastAccessTime(string path, System.DateTime lastAccessTime) =>
+            MSIOF.SetLastAccessTime(path, lastAccessTime);
+
+        public static void SetLastAccessTimeUtc(string path, System.DateTime lastAccessTimeUtc) =>
+            MSIOF.SetLastAccessTimeUtc(path, lastAccessTimeUtc);
+
+        public static void SetLastWriteTime(string path, System.DateTime lastWriteTime) =>
+            MSIOF.SetLastWriteTime(path, lastWriteTime);
+
+        public static void SetLastWriteTimeUtc(string path, System.DateTime lastWriteTimeUtc) =>
+            MSIOF.SetLastWriteTimeUtc(path, lastWriteTimeUtc);
     }
 }

KKdMainLib/IO/JSON.cs

@@ -1,4 +1,4 @@
-//Original or reader part: https://github.com/MarcosLopezC/LightJson/
+//Original or reader part: https://github.com/MarcosLopezC/LightJson/
 
 using KKdBaseLib;
 using BaseExtensions = KKdBaseLib.Extensions;

KKdMainLib/IO/MP.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 
 namespace KKdMainLib.IO
 {

KKdMainLib/IO/Path.cs

@@ -1,26 +1,66 @@
-using MSIO = System.IO;
+using MSIOP = System.IO.Path;
 
 namespace KKdMainLib.IO
 {
     public static class Path
     {
-        public static string GetFileName(string path) =>
-            MSIO.Path.GetFileName(path);
-        public static string GetFileNameWithoutExtension(string path) =>
-            MSIO.Path.GetFileNameWithoutExtension(path);
-        public static string GetExtension(string path) =>
-            MSIO.Path.GetExtension(path);
-        public static string GetFullPath(string path) =>
-            MSIO.Path.GetFullPath(path);
-        public static string Combine(string path1, string path2) =>
-            MSIO.Path.Combine(path1, path2);
+        public static char DirectorySeparatorChar => MSIOP.DirectorySeparatorChar;
+        public static char AltDirectorySeparatorChar => MSIOP.AltDirectorySeparatorChar;
+        public static char VolumeSeparatorChar => MSIOP.VolumeSeparatorChar;
+        public static char PathSeparator => MSIOP.PathSeparator;
+
+        public static string ChangeExtension(string path, string extension) =>
+            MSIOP.ChangeExtension(path, extension);
+
         public static string Combine(string path1, string path2, string path3) =>
-            MSIO.Path.Combine(path1, path2, path3);
+            MSIOP.Combine(path1, path2, path3);
+
+        public static string Combine(string path1, string path2) =>
+            MSIOP.Combine(path1, path2);
+
         public static string Combine(string path1, string path2, string path3, string path4) =>
-            MSIO.Path.Combine(path1, path2, path3, path4);
+            MSIOP.Combine(path1, path2, path3, path4);
+
         public static string Combine(params string[] paths) =>
-            MSIO.Path.Combine(paths);
+            MSIOP.Combine(paths);
+
         public static string GetDirectoryName(string path) =>
-            MSIO.Path.GetDirectoryName(path);
+            MSIOP.GetDirectoryName(path);
+
+        public static string GetExtension(string path) =>
+            MSIOP.GetExtension(path);
+
+        public static string GetFileName(string path) =>
+            MSIOP.GetFileName(path);
+
+        public static string GetFileNameWithoutExtension(string path) =>
+            MSIOP.GetFileNameWithoutExtension(path);
+
+        public static string GetFullPath(string path) =>
+            MSIOP.GetFullPath(path);
+
+        public static char[] GetInvalidFileNameChars() =>
+            MSIOP.GetInvalidFileNameChars();
+
+        public static char[] GetInvalidPathChars() =>
+            MSIOP.GetInvalidPathChars();
+
+        public static string GetPathRoot(string path) =>
+            MSIOP.GetPathRoot(path);
+
+        public static string GetRandomFileName() =>
+            MSIOP.GetRandomFileName();
+
+        public static string GetTempFileName() =>
+            MSIOP.GetTempFileName();
+
+        public static string GetTempPath() =>
+            MSIOP.GetTempPath();
+
+        public static bool HasExtension(string path) =>
+            MSIOP.HasExtension(path);
+
+        public static bool IsPathRooted(string path) =>
+            MSIOP.IsPathRooted(path);
     }
 }

KKdMainLib/IO/Stream.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdBaseLib;
 using MSIO = System.IO;
 using ENRSDict = System.Collections.Generic.Dictionary<long, int>;
@@ -11,15 +11,16 @@ namespace KKdMainLib.IO
         private byte[] b;
         private MSIO.Stream s;
 
+        private readonly bool canRead;
+        private readonly bool canWrite;
+
         private bool getENRS;
 
         private Format format = Format.NULL;
 
         public Format Format
-        {   get =>       format;
-            set {        format = value;
-                  IsBE = format == Format.F2BE;
-                  IsX  = format == Format.X || format == Format.XHD; } }
+        {   get => format;
+            set {  format = value; IsX  = format == Format.X || format == Format.XHD; } }
 
         public ENRSDict ENRSDict;
 
@@ -42,14 +43,14 @@ namespace KKdMainLib.IO
         public uint PU32 { get => (uint)s.Position - OU32; set => s.Position = value + OU32; }
         public long PI64 { get =>       s.Position - OI64; set => s.Position = value + OI64; }
 
-        public bool CanRead    => s.CanRead;
+        public bool CanRead    => canRead ;
         public bool CanSeek    => s.CanSeek;
         public bool CanTimeout => s.CanTimeout;
-        public bool CanWrite   => s.CanWrite;
+        public bool CanWrite   => s.CanWrite && canWrite;
 
         public string File = null;
 
-        public Stream(MSIO.Stream output = null, bool isBE = false)
+        public Stream(MSIO.Stream output = null, bool isBE = false, bool canRead = true, bool canWrite = true)
         {
             if (output == null) output = MSIO.Stream.Null;
             OI64 = 0;
@@ -59,6 +60,8 @@ namespace KKdMainLib.IO
             Format = Format.NULL;
             b = new byte[0x100];
             IsBE = isBE;
+            this.canRead  = s.CanRead  && canRead;
+            this.canWrite = s.CanWrite && canWrite;
         }
 
         public void C() => D(true);
@@ -108,56 +111,59 @@ namespace KKdMainLib.IO
             if (setLength1) s.SetLength(P + O);
         }
 
-        public   bool RBo () =>        s.ReadByte() != 0;
-        public  sbyte RI8 () => (sbyte)s.ReadByte();
-        public   byte RU8 () => ( byte)s.ReadByte();
-        public  short RI16() { s.Read(b, 0, 2); return b.TI16(); }
-        public ushort RU16() { s.Read(b, 0, 2); return b.TU16(); }
-        public    int RI32() { s.Read(b, 0, 4); return b.TI32(); }
-        public   uint RU32() { s.Read(b, 0, 4); return b.TU32(); }
-        public   long RI64() { s.Read(b, 0, 8); return b.TI64(); }
-        public  ulong RU64() { s.Read(b, 0, 8); return b.TU64(); }
-        public  float RF32() { s.Read(b, 0, 4); return b.TF32(); }
-        public double RF64() { s.Read(b, 0, 8); return b.TF64(); }
+        private void cR() { if (!canRead ) throw new Exception("Stream cannot be read!"); }
+        private void cW() { if (!canWrite) throw new Exception("Stream cannot be read!"); }
 
-        public  short RI16E() { s.Read(b, 0, 2); b.E(2, IsBE); return b.TI16(); }
-        public ushort RU16E() { s.Read(b, 0, 2); b.E(2, IsBE); return b.TU16(); }
-        public    int RI32E() { s.Read(b, 0, 4); b.E(4, IsBE); return b.TI32(); }
-        public   uint RU32E() { s.Read(b, 0, 4); b.E(4, IsBE); return b.TU32(); }
-        public   long RI64E() { s.Read(b, 0, 8); b.E(8, IsBE); return b.TI64(); }
-        public  ulong RU64E() { s.Read(b, 0, 8); b.E(8, IsBE); return b.TU64(); }
-        public  float RF32E() { s.Read(b, 0, 4); b.E(4, IsBE); return b.TF32(); }
-        public double RF64E() { s.Read(b, 0, 8); b.E(8, IsBE); return b.TF64(); }
+        public   bool RBo () { cR(); return        s.ReadByte() != 0; }
+        public  sbyte RI8 () { cR(); return (sbyte)s.ReadByte(); }
+        public   byte RU8 () { cR(); return ( byte)s.ReadByte(); }
+        public  short RI16() { cR(); s.Read(b, 0, 2); return b.TI16(); }
+        public ushort RU16() { cR(); s.Read(b, 0, 2); return b.TU16(); }
+        public    int RI32() { cR(); s.Read(b, 0, 4); return b.TI32(); }
+        public   uint RU32() { cR(); s.Read(b, 0, 4); return b.TU32(); }
+        public   long RI64() { cR(); s.Read(b, 0, 8); return b.TI64(); }
+        public  ulong RU64() { cR(); s.Read(b, 0, 8); return b.TU64(); }
+        public  float RF32() { cR(); s.Read(b, 0, 4); return b.TF32(); }
+        public double RF64() { cR(); s.Read(b, 0, 8); return b.TF64(); }
 
-        public  short RI16E(bool isBE) { s.Read(b, 0, 2); b.E(2, isBE); return b.TI16(); }
-        public ushort RU16E(bool isBE) { s.Read(b, 0, 2); b.E(2, isBE); return b.TU16(); }
-        public    int RI32E(bool isBE) { s.Read(b, 0, 4); b.E(4, isBE); return b.TI32(); }
-        public   uint RU32E(bool isBE) { s.Read(b, 0, 4); b.E(4, isBE); return b.TU32(); }
-        public   long RI64E(bool isBE) { s.Read(b, 0, 8); b.E(8, isBE); return b.TI64(); }
-        public  ulong RU64E(bool isBE) { s.Read(b, 0, 8); b.E(8, isBE); return b.TU64(); }
-        public  float RF32E(bool isBE) { s.Read(b, 0, 4); b.E(4, isBE); return b.TF32(); }
-        public double RF64E(bool isBE) { s.Read(b, 0, 8); b.E(8, isBE); return b.TF64(); }
+        public  short RI16E() { cR(); s.Read(b, 0, 2); b.E(2, IsBE); return b.TI16(); }
+        public ushort RU16E() { cR(); s.Read(b, 0, 2); b.E(2, IsBE); return b.TU16(); }
+        public    int RI32E() { cR(); s.Read(b, 0, 4); b.E(4, IsBE); return b.TI32(); }
+        public   uint RU32E() { cR(); s.Read(b, 0, 4); b.E(4, IsBE); return b.TU32(); }
+        public   long RI64E() { cR(); s.Read(b, 0, 8); b.E(8, IsBE); return b.TI64(); }
+        public  ulong RU64E() { cR(); s.Read(b, 0, 8); b.E(8, IsBE); return b.TU64(); }
+        public  float RF32E() { cR(); s.Read(b, 0, 4); b.E(4, IsBE); return b.TF32(); }
+        public double RF64E() { cR(); s.Read(b, 0, 8); b.E(8, IsBE); return b.TF64(); }
 
-        public void W(byte[] Val                        ) =>
-            s.Write(Val ?? new byte[0],      0, Val.Length);
-        public void W(byte[] Val,             int Length) =>
-            s.Write(Val ?? new byte[0],      0,     Length);
-        public void W(byte[] Val, int Offset, int Length) =>
-            s.Write(Val ?? new byte[0], Offset,     Length);
-        public void W(char[] val, bool UTF8 = true) =>
-            W(UTF8 ? val.ToUTF8() : val.ToASCII());
+        public  short RI16E(bool isBE) { cR(); s.Read(b, 0, 2); b.E(2, isBE); return b.TI16(); }
+        public ushort RU16E(bool isBE) { cR(); s.Read(b, 0, 2); b.E(2, isBE); return b.TU16(); }
+        public    int RI32E(bool isBE) { cR(); s.Read(b, 0, 4); b.E(4, isBE); return b.TI32(); }
+        public   uint RU32E(bool isBE) { cR(); s.Read(b, 0, 4); b.E(4, isBE); return b.TU32(); }
+        public   long RI64E(bool isBE) { cR(); s.Read(b, 0, 8); b.E(8, isBE); return b.TI64(); }
+        public  ulong RU64E(bool isBE) { cR(); s.Read(b, 0, 8); b.E(8, isBE); return b.TU64(); }
+        public  float RF32E(bool isBE) { cR(); s.Read(b, 0, 4); b.E(4, isBE); return b.TF32(); }
+        public double RF64E(bool isBE) { cR(); s.Read(b, 0, 8); b.E(8, isBE); return b.TF64(); }
 
-        public void W(  bool val) => s.WriteByte((byte)(val ? 1 : 0));
-        public void W( sbyte val) => s.WriteByte((byte) val);
-        public void W(  byte val) => s.WriteByte(       val);
-        public void W( short val) { b.GBy(val); s.Write(b, 0, 2); }
-        public void W(ushort val) { b.GBy(val); s.Write(b, 0, 2); }
-        public void W(   int val) { b.GBy(val); s.Write(b, 0, 4); }
-        public void W(  uint val) { b.GBy(val); s.Write(b, 0, 4); }
-        public void W(  long val) { b.GBy(val); s.Write(b, 0, 8); }
-        public void W( ulong val) { b.GBy(val); s.Write(b, 0, 8); }
-        public void W( float val) { b.GBy(val); s.Write(b, 0, 4); }
-        public void W(double val) { b.GBy(val); s.Write(b, 0, 8); }
+        public void W(byte[] val                        )
+        { cW(); s.Write(val ?? new byte[0],      0, val.Length); }
+        public void W(byte[] val,             int Length)
+        { cW(); s.Write(val ?? new byte[0],      0,     Length); }
+        public void W(byte[] val, int offset, int length)
+        { cW(); s.Write(val ?? new byte[0], offset,     length); }
+        public void W(char[] val, bool utf8 = true) =>
+            W(utf8 ? val.ToUTF8() : val.ToASCII());
+
+        public void W(  bool val) { cW(); s.WriteByte((byte)(val ? 1 : 0)); }
+        public void W( sbyte val) { cW(); s.WriteByte((byte) val); }
+        public void W(  byte val) { cW(); s.WriteByte(       val); }
+        public void W( short val) { cW(); b.GBy(val); s.Write(b, 0, 2); }
+        public void W(ushort val) { cW(); b.GBy(val); s.Write(b, 0, 2); }
+        public void W(   int val) { cW(); b.GBy(val); s.Write(b, 0, 4); }
+        public void W(  uint val) { cW(); b.GBy(val); s.Write(b, 0, 4); }
+        public void W(  long val) { cW(); b.GBy(val); s.Write(b, 0, 8); }
+        public void W( ulong val) { cW(); b.GBy(val); s.Write(b, 0, 8); }
+        public void W( float val) { cW(); b.GBy(val); s.Write(b, 0, 4); }
+        public void W(double val) { cW(); b.GBy(val); s.Write(b, 0, 8); }
 
         public void W( sbyte? val) => W(val ?? default);
         public void W(  byte? val) => W(val ?? default);
@@ -170,31 +176,31 @@ namespace KKdMainLib.IO
         public void W( float? val) => W(val ?? default);
         public void W(double? val) => W(val ?? default);
 
-        public void W(  char val, bool UTF8 = true) =>
-            W(UTF8 ? val.ToString().ToUTF8() : val.ToString().ToASCII());
-        public void W(string val, bool UTF8 = true) =>
-            W(UTF8 ? val           .ToUTF8() : val           .ToASCII());
+        public void W(  char val, bool utf8 = true) =>
+            W(utf8 ? val.ToString().ToUTF8() : val.ToString().ToASCII());
+        public void W(string val, bool utf8 = true) =>
+            W(utf8 ? val           .ToUTF8() : val           .ToASCII());
 
-        public void WE( short val) { b.GBy(val); b.E(2, IsBE); s.Write(b, 0, 2); }
-        public void WE(ushort val) { b.GBy(val); b.E(2, IsBE); s.Write(b, 0, 2); }
-        public void WE(   int val) { b.GBy(val); b.E(4, IsBE); s.Write(b, 0, 4); }
-        public void WE(  uint val) { b.GBy(val); b.E(4, IsBE); s.Write(b, 0, 4); }
-        public void WE(  long val) { b.GBy(val); b.E(8, IsBE); s.Write(b, 0, 8); }
-        public void WE( ulong val) { b.GBy(val); b.E(8, IsBE); s.Write(b, 0, 8); }
-        public void WE( float val) { b.GBy(val); b.E(4, IsBE); s.Write(b, 0, 4); }
-        public void WE(double val) { b.GBy(val); b.E(8, IsBE); s.Write(b, 0, 8); }
+        public void WE( short val) { cW(); b.GBy(val); b.E(2, IsBE); s.Write(b, 0, 2); }
+        public void WE(ushort val) { cW(); b.GBy(val); b.E(2, IsBE); s.Write(b, 0, 2); }
+        public void WE(   int val) { cW(); b.GBy(val); b.E(4, IsBE); s.Write(b, 0, 4); }
+        public void WE(  uint val) { cW(); b.GBy(val); b.E(4, IsBE); s.Write(b, 0, 4); }
+        public void WE(  long val) { cW(); b.GBy(val); b.E(8, IsBE); s.Write(b, 0, 8); }
+        public void WE( ulong val) { cW(); b.GBy(val); b.E(8, IsBE); s.Write(b, 0, 8); }
+        public void WE( float val) { cW(); b.GBy(val); b.E(4, IsBE); s.Write(b, 0, 4); }
+        public void WE(double val) { cW(); b.GBy(val); b.E(8, IsBE); s.Write(b, 0, 8); }
 
-        public void WE( short val, bool isBE) { b.GBy(val); b.E(2, isBE); s.Write(b, 0, 2); }
-        public void WE(ushort val, bool isBE) { b.GBy(val); b.E(2, isBE); s.Write(b, 0, 2); }
-        public void WE(   int val, bool isBE) { b.GBy(val); b.E(4, isBE); s.Write(b, 0, 4); }
-        public void WE(  uint val, bool isBE) { b.GBy(val); b.E(4, isBE); s.Write(b, 0, 4); }
-        public void WE(  long val, bool isBE) { b.GBy(val); b.E(8, isBE); s.Write(b, 0, 8); }
-        public void WE( ulong val, bool isBE) { b.GBy(val); b.E(8, isBE); s.Write(b, 0, 8); }
-        public void WE( float val, bool isBE) { b.GBy(val); b.E(4, isBE); s.Write(b, 0, 4); }
-        public void WE(double val, bool isBE) { b.GBy(val); b.E(8, isBE); s.Write(b, 0, 8); }
+        public void WE( short val, bool isBE) { cW(); b.GBy(val); b.E(2, isBE); s.Write(b, 0, 2); }
+        public void WE(ushort val, bool isBE) { cW(); b.GBy(val); b.E(2, isBE); s.Write(b, 0, 2); }
+        public void WE(   int val, bool isBE) { cW(); b.GBy(val); b.E(4, isBE); s.Write(b, 0, 4); }
+        public void WE(  uint val, bool isBE) { cW(); b.GBy(val); b.E(4, isBE); s.Write(b, 0, 4); }
+        public void WE(  long val, bool isBE) { cW(); b.GBy(val); b.E(8, isBE); s.Write(b, 0, 8); }
+        public void WE( ulong val, bool isBE) { cW(); b.GBy(val); b.E(8, isBE); s.Write(b, 0, 8); }
+        public void WE( float val, bool isBE) { cW(); b.GBy(val); b.E(4, isBE); s.Write(b, 0, 4); }
+        public void WE(double val, bool isBE) { cW(); b.GBy(val); b.E(8, isBE); s.Write(b, 0, 8); }
 
         private void RENRS(byte[] b, int c)
-        { if (getENRS) ENRSDict.Add(P, c); s.Read(b, 0, c); }
+        { cR(); if (getENRS) ENRSDict.Add(P, c); s.Read(b, 0, c); }
 
         public  short RI16ENRS() { RENRS(b, 2); return b.TI16(); }
         public ushort RU16ENRS() { RENRS(b, 2); return b.TU16(); }
@@ -224,7 +230,7 @@ namespace KKdMainLib.IO
         public double RF64ENRSE(bool isBE) { RENRS(b, 8); b.E(8, isBE); return b.TF64(); }
 
         private void WENRS(byte[] b, int c)
-        { if (getENRS) ENRSDict.Add(P, c); s.Write(b, 0, c); }
+        { if (getENRS) ENRSDict.Add(P, c); cR(); s.Write(b, 0, c); }
 
         public void WENRS( short val) { b.GBy(val); WENRS(b, 2); }
         public void WENRS(ushort val) { b.GBy(val); WENRS(b, 2); }
@@ -253,24 +259,114 @@ namespace KKdMainLib.IO
         public void WENRSE( float val, bool isBE) { b.GBy(val); b.E(4, isBE); WENRS(b, 4); }
         public void WENRSE(double val, bool isBE) { b.GBy(val); b.E(8, isBE); WENRS(b, 8); }
 
-        public Half RF16     (         ) { ushort a = RU16     (    ); return (Half)a; }
-        public Half RF16E    (         ) { ushort a = RU16E    (    ); return (Half)a; }
-        public Half RF16E    (bool isBE) { ushort a = RU16E    (isBE); return (Half)a; }
-        public Half RF16ENRS (         ) { ushort a = RU16E    (    ); return (Half)a; }
-        public Half RF16ENRSE(         ) { ushort a = RU16ENRSE(    ); return (Half)a; }
-        public Half RF16ENRSE(bool isBE) { ushort a = RU16ENRSE(isBE); return (Half)a; }
+        public  int RI24 (         ) { cR(); s.Read(b, 0, 3);               return b.TI24(); }
+        public uint RU24 (         ) { cR(); s.Read(b, 0, 3);               return b.TU24(); }
+        public  int RI24E(         ) { cR(); s.Read(b, 0, 3); b.E(3, IsBE); return b.TI24(); }
+        public uint RU24E(         ) { cR(); s.Read(b, 0, 3); b.E(3, IsBE); return b.TU24(); }
+        public  int RI24E(bool isBE) { cR(); s.Read(b, 0, 3); b.E(3, isBE); return b.TI24(); }
+        public uint RU24E(bool isBE) { cR(); s.Read(b, 0, 3); b.E(3, isBE); return b.TU24(); }
 
-        public void W     (Half val           ) => W     ((ushort)val      );
-        public void WE    (Half val           ) => WE    ((ushort)val      );
-        public void WE    (Half val, bool isBE) => WE    ((ushort)val, isBE);
-        public void WENRS (Half val           ) => WENRS ((ushort)val      );
-        public void WENRSE(Half val           ) => WENRSE((ushort)val      );
-        public void WENRSE(Half val, bool isBE) => WENRSE((ushort)val, isBE);
+        public Half RF16 (         ) { cR(); s.Read(b, 0, 2);               return b.TF16(); }
+        public Half RF16E(         ) { cR(); s.Read(b, 0, 2); b.E(2, IsBE); return b.TF16(); }
+        public Half RF16E(bool isBE) { cR(); s.Read(b, 0, 2); b.E(2, isBE); return b.TF16(); }
 
-        public char RC(bool utf8 = true) => utf8 ? RCUTF8() : (char)s.ReadByte();
+        public void W  (Half val           ) { cW(); b.GBy(val);               s.Write(b, 0, 2); }
+        public void WE (Half val           ) { cW(); b.GBy(val); b.E(2, IsBE); s.Write(b, 0, 2); }
+        public void WE (Half val, bool isBE) { cW(); b.GBy(val); b.E(2, isBE); s.Write(b, 0, 2); }
+
+        public Vec2 RV2  (         ) { cR(); s.Read(b, 0,  8);                return b.TV2(); }
+        public Vec3 RV3  (         ) { cR(); s.Read(b, 0, 12);                return b.TV3(); }
+        public Vec4 RV4  (         ) { cR(); s.Read(b, 0, 16);                return b.TV4(); }
+        public Vec2 RV2E (         ) { cR(); s.Read(b, 0,  8); b.E( 8, IsBE); return b.TV2(); }
+        public Vec3 RV3E (         ) { cR(); s.Read(b, 0, 12); b.E(12, IsBE); return b.TV3(); }
+        public Vec4 RV4E (         ) { cR(); s.Read(b, 0, 16); b.E(16, IsBE); return b.TV4(); }
+        public Vec2 RV2E (bool isBE) { cR(); s.Read(b, 0,  8); b.E( 8, isBE); return b.TV2(); }
+        public Vec3 RV3E (bool isBE) { cR(); s.Read(b, 0, 12); b.E(12, isBE); return b.TV3(); }
+        public Vec4 RV4E (bool isBE) { cR(); s.Read(b, 0, 16); b.E(16, isBE); return b.TV4(); }
+
+        public void W (Vec2 val           ) { cW(); b.GBy(val);                s.Write(b, 0,  8); }
+        public void W (Vec3 val           ) { cW(); b.GBy(val);                s.Write(b, 0, 12); }
+        public void W (Vec4 val           ) { cW(); b.GBy(val);                s.Write(b, 0, 16); }
+        public void WE(Vec2 val           ) { cW(); b.GBy(val); b.E( 8, IsBE); s.Write(b, 0,  8); }
+        public void WE(Vec3 val           ) { cW(); b.GBy(val); b.E(12, IsBE); s.Write(b, 0, 12); }
+        public void WE(Vec4 val           ) { cW(); b.GBy(val); b.E(16, IsBE); s.Write(b, 0, 16); }
+        public void WE(Vec2 val, bool isBE) { cW(); b.GBy(val); b.E( 8, isBE); s.Write(b, 0,  8); }
+        public void WE(Vec3 val, bool isBE) { cW(); b.GBy(val); b.E(12, isBE); s.Write(b, 0, 12); }
+        public void WE(Vec4 val, bool isBE) { cW(); b.GBy(val); b.E(16, isBE); s.Write(b, 0, 16); }
+
+        public Quat RQ  (         ) { cR(); s.Read(b, 0, 16);                return b.TQ(); }
+        public Quat RQE (         ) { cR(); s.Read(b, 0, 16); b.E(16, IsBE); return b.TQ(); }
+        public Quat RQE (bool isBE) { cR(); s.Read(b, 0, 16); b.E(16, isBE); return b.TQ(); }
+        public void W (Quat val           ) { cW(); b.GBy(val);                s.Write(b, 0, 16); }
+        public void WE(Quat val           ) { cW(); b.GBy(val); b.E(16, IsBE); s.Write(b, 0, 16); }
+        public void WE(Quat val, bool isBE) { cW(); b.GBy(val); b.E(16, isBE); s.Write(b, 0, 16); }
+
+        public T RT<T>(long offset = -1) where T : unmanaged
+        {
+            cR();
+            int sizeOfT = sizeof(T);
+            if (offset > -1) s.Position = offset;
+            byte[] buf = new byte[sizeOfT];
+            fixed (byte* ptr = buf)
+            {
+                cR(); s.Read(buf, 0, sizeOfT);
+                return *(T*)ptr;
+            }
+        }
+
+        public void WT<T>(T val, long offset = -1) where T : unmanaged
+        {
+            cR();
+            int sizeOfT = sizeof(T);
+            if (offset > -1) s.Position = offset;
+            byte[] buf = new byte[sizeOfT];
+            fixed (byte* ptr = buf)
+            {
+                *(T*)ptr = val;
+                s.Write(buf, 0, sizeOfT);
+            }
+        }
+
+        public T[] RA<T>(long length, long offset = -1) where T : unmanaged
+        {
+            cR();
+            int sizeOfT = sizeof(T);
+            if (offset > -1) s.Position = offset;
+            T[] array = new T[length];
+            byte[] buf = new byte[sizeOfT];
+            fixed (byte* ptr = buf)
+                for (i = 0; i < length; i++)
+                {
+                    cR(); s.Read(buf, 0, sizeOfT);
+                    array[i] = *(T*)ptr;
+                }
+
+            if (IsBE) array = array.ReverseEndian();
+            return array;
+        }
+
+        public void WA<T>(T[] array, long length, long offset = -1) where T : unmanaged
+        {
+            if (IsBE) array = array.ReverseEndian();
+
+            cW();
+            int sizeOfT = sizeof(T);
+            if (offset > -1) s.Position = offset;
+            byte[] buf = new byte[sizeOfT];
+            fixed (byte* ptr = buf)
+                for (i = 0; i < length; i++)
+                {
+                    *(T*)ptr = array[i];
+                    s.Write(buf, 0, sizeOfT);
+                }
+        }
+
+        public char RC(bool utf8 = true)
+        { cR(); return utf8 ? RCUTF8() : (char)s.ReadByte();}
 
         public char RCUTF8()
         {
+            cR();
             byte t;
             int T;
             int val = 0;
@@ -290,27 +386,26 @@ namespace KKdMainLib.IO
             return (char)val;
         }
 
-        public string RS(long Length, bool UTF8 = true) =>
-            UTF8 ? RSUTF8(Length) : RSASCII(Length);
+        public string RS(long Length, bool utf8 = true)
+        { cR(); return utf8 ? RSUTF8(Length) : RSASCII(Length);}
 
-        public string RSUTF8 (long length) => RBy(length).ToUTF8 ();
-        public string RSASCII(long length) => RBy(length).ToASCII();
+        public string RSUTF8 (long length) { cR(); return RBy(length).ToUTF8 (); }
+        public string RSASCII(long length) { cR(); return RBy(length).ToASCII(); }
 
+        public string RS(long? length, bool utf8 = true)
+        { cR(); return utf8? RSUTF8(length) : RSASCII(length); }
 
-        public string RS(long? length, bool utf8 = true) =>
-            utf8 ? RSUTF8(length) : RSASCII(length);
+        public string RSUTF8 (long? length) { cR(); return RBy(length).ToUTF8 (); }
+        public string RSASCII(long? length) { cR(); return RBy(length).ToASCII(); }
 
-        public string RSUTF8 (long? length) => RBy(length).ToUTF8 ();
-        public string RSASCII(long? length) => RBy(length).ToASCII();
-
-        public byte[] RBy(long length, int offset = -1)
-        { byte[] Buf = new byte[length]; if (offset > -1) s.Position = offset;
-            s.Read(Buf, 0, (int)length); return Buf; }
+        public byte[] RBy(long length, long offset = -1)
+        { cR(); byte[] buf = new byte[length]; if (offset > -1) s.Position = offset;
+            s.Read(buf, 0, (int)length); return buf; }
 
         public int RBy(long length, byte[] buf, long offset = -1)
-        { if (offset > -1) s.Position = offset; return s.Read(buf, 0, (int)length); }
+        { cR(); if (offset > -1) s.Position = offset; return s.Read(buf, 0, (int)length); }
 
-        public byte[] RBy(long? length, int offset = -1)
+        public byte[] RBy(long? length, long offset = -1)
         { if (length == null) return new byte[0]; else return RBy((long)length, offset); }
 
         public void RBy(long length, byte bits, byte[] buf, long offset = -1)
@@ -319,6 +414,7 @@ namespace KKdMainLib.IO
 
         public byte RBi(byte bits)
         {
+            cR();
             bitRead += bits;
             tempBitRead = 8 - bitRead;
             if (tempBitRead < 0)
@@ -334,6 +430,7 @@ namespace KKdMainLib.IO
 
         public void W(int val, byte bits)
         {
+            cW();
             val &= (1 << bits) - 1;
             bitWrite += bits;
             tempBitWrite = 8 - bitWrite;
@@ -349,19 +446,20 @@ namespace KKdMainLib.IO
         }
 
         public void CR() //CheckRead
-        { if (bitRead  > 0)                                valRead  = 0; bitRead  = 8;   }
+        { if (bitRead  > 0)                                      valRead  = 0; bitRead  = 8;   }
         public void CW() //CheckWrite
-        { if (bitWrite > 0) { s.WriteByte((byte)valWrite); valWrite = 0; bitWrite = 0; } }
+        { if (bitWrite > 0) { cW(); s.WriteByte((byte)valWrite); valWrite = 0; bitWrite = 0; } }
 
         public byte[] ToArray(bool close)
-        { byte[] Data = ToArray(); if (close) Dispose(); return Data; }
+        { byte[] data = ToArray(); if (close) Dispose(); return data; }
 
         public byte[] ToArray()
         {
-            long Position = s.Position;
-            byte[] Data = RBy(s.Length, 0);
-            s.Position = Position;
-            return Data;
+            long position = s.Position; s.Position = 0;
+            byte[] data = new byte[s.Length];
+            s.Read(data, 0, data.Length);
+            s.Position = position;
+            return data;
         }
     }
 

KKdMainLib/KKdMainLib.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Authors>korenkonder</Authors>
@@ -6,12 +6,12 @@
     <Configuration></Configuration>
     <Copyright>korenkonder © 2018-2020</Copyright>
     <Description>A simple library for working with Project Diva AC/DT/F/AFT/F2/X/FT/M39 files</Description>
-    <FileVersion>0.4.9.0</FileVersion>
+    <FileVersion>0.4.9.3</FileVersion>
     <PackageId>KKdMainLib</PackageId>
     <Product>KKdMainLib</Product>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <Title>KKdMainLib</Title>
-    <Version>0.4.9.0</Version>
+    <Version>0.4.9.3</Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -42,4 +42,17 @@
   <ItemGroup>
     <ProjectReference Include="..\KKdBaseLib\KKdBaseLib.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>

KKdMainLib/Main.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Globalization;
 using System.Collections.Generic;
@@ -93,7 +93,7 @@ namespace KKdMainLib
         { if (dict.FV(out string val  , args.Split('.'  )))
             { bool Val =  int.TryParse(val, out int _value);
                 value = _value; return Val; }         value =  null; return false; }
-        
+
         public static bool FV(this A3DADict dict, out  float? value, string   args)
         { if (dict.FV(out string val  , args.Split('.'  )))
                 return          val.ToF32(out value); value =  null; return false; }

KKdMainLib/Mot.cs

@@ -1,4 +1,4 @@
-//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
+//Original: https://github.com/blueskythlikesclouds/MikuMikuLibrary/
 
 using KKdBaseLib;
 using KKdMainLib.IO;

KKdMainLib/MotHead.cs

@@ -1,9 +1,9 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdMainLib.IO;
 
 namespace KKdMainLib
 {
-    public struct MotHead
+    public struct MotHead : System.IDisposable
     {
         private int i, i0, i1;
         private Stream _IO;
@@ -92,7 +92,8 @@ namespace KKdMainLib
                 for (i0 = 0; i0 < Header.Data[i].Array.Length; i0++)
                 {
                     ref HeaderData.Sub.Data Data = ref Header.Data[i].Array[i0];
-                    if (!GetSize(Data.Type, out i1)) goto RETURN;
+                    if ((i1 = GetSize(Data.Type)) < 1) continue;
+
 
                     if (Data.Offset > 0)
                     {
@@ -126,7 +127,7 @@ RETURN:
                     Header.  EndMotionID = Header.Data[i].MotionID;
             }
 
-            _IO = File.OpenWriter(file + ".bin");
+            _IO = File.OpenWriter(file + ".bin", true);
             _IO.W(0x01);
             _IO.W(0x20);
             _IO.A(0x20, true);
@@ -152,27 +153,25 @@ RETURN:
                         for (i0 = Header.Data[i].Array.Length - 1; i0 > -1; i0--)
                         {
                             ref HeaderData.Sub.Data data = ref Header.Data[i].Array[i0];
-                            if (data.Array != null)
-                                if (data.Array.Length > 0 &&
-                                    GetSize(data.Type, out int Size))
-                                {
-                                    if (data.Type == 0x3E) _IO.A(0x20, true);
-                                    data.Offset = _IO.P;
+                            int Size = GetSize(data.Type);
+                            if (data.Array == null || data.Array.Length < 1 || Size < 1) continue;
 
-                                         if (Size == 0x01) _IO.W(( byte)data.Array[0]);
-                                    else if (Size == 0x02) _IO.W((short)data.Array[0]);
-                                    else
-                                    {
-                                        if (_IO.P % 0x4 != 0) _IO.A(0x04, true);
-                                        Size /= 4;
+                            if (data.Type == 0x3E) _IO.A(0x20, true);
+                            data.Offset = _IO.P;
 
-                                        data.Offset = _IO.P;
-                                        for (i1 = 0; i1 < data.Array.Length && i1 < Size; i1++)
-                                            _IO.W(data.Array[i1]);
+                                 if (Size == 0x01) _IO.W(( byte)data.Array[0]);
+                            else if (Size == 0x02) _IO.W((short)data.Array[0]);
+                            else
+                            {
+                                if (_IO.P % 0x4 != 0) _IO.A(0x04, true);
+                                Size /= 4;
 
-                                        for (; i1 < Size; i1++) _IO.W(0);
-                                    }
-                                }
+                                data.Offset = _IO.P;
+                                for (i1 = 0; i1 < data.Array.Length && i1 < Size; i1++)
+                                    _IO.W(data.Array[i1]);
+
+                                for (; i1 < Size; i1++) _IO.W(0);
+                            }
                         }
 
                         if (Header.Data[i].Array2 != null)
@@ -678,16 +677,26 @@ RETURN:
             motHead.WriteAfterAll(true, file, json);
         }
 
-        private static bool GetSize(int Type, out int Size)
-        {
-            Size = Type switch
+        private static int GetSize(int Type) =>
+            Type switch
             {
+                0x02 => 0x02,
                 0x03 => 0x04,
+                0x04 => 0x04,
+                0x07 => 0x08,
+                0x08 => 0x08,
+                0x0D => 0x0C,
+                0x11 => 0x1C,
+                0x1D => 0x30,
+                0x20 => 0x10,
+                0x21 => 0x18,
                 0x35 => 0x14,
                 0x36 => 0x14,
                 0x37 => 0x14,
                 0x38 => 0x14,
                 0x39 => 0x14,
+                0x3A => 0x14,
+                0x3B => 0x04,
                 0x3C => 0x10,
                 0x3D => 0x08,
                 0x3E => 0x40,
@@ -705,12 +714,14 @@ RETURN:
                 0x4B => 0x34,
                 0x4C => 0x10,
                 0x4D => 0x04,
+                0x4E => 0x1C,
                 0x4F => 0x01,
-                0x50 => 0x04,
+                0x50 => 0x01,
                 _    => 0x00,
             };
-            return Size > 0;
-        }
+
+        public void Dispose()
+        { if (_IO != null) _IO.D(); _IO = null; Header = default; }
 
         public struct HeaderData
         {

KKdMainLib/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTrademark("")]

KKdMainLib/Properties/Resources.Designer.cs

@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -10,8 +10,8 @@
 
 namespace KKdMainLib.Properties {
     using System;
-    
-    
+
+
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -23,15 +23,15 @@ namespace KKdMainLib.Properties {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
-        
+
         private static global::System.Resources.ResourceManager resourceMan;
-        
+
         private static global::System.Globalization.CultureInfo resourceCulture;
-        
+
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
-        
+
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
@@ -45,7 +45,7 @@ namespace KKdMainLib.Properties {
                 return resourceMan;
             }
         }
-        
+
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
@@ -59,7 +59,7 @@ namespace KKdMainLib.Properties {
                 resourceCulture = value;
             }
         }
-        
+
         /// <summary>
         ///   Looks up a localized resource of type System.Byte[].
         /// </summary>

KKdMainLib/STR.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdBaseLib.F2;
 using KKdMainLib.IO;
 
@@ -64,7 +64,7 @@ namespace KKdMainLib
 
         public void STRWriter(string filepath)
         {
-            if (Strings == null || Strings.Length == 0 || header.Format > Format.F2BE) return;
+            if (Strings == null || Strings.Length == 0 || header.Format > Format.F2) return;
             uint offset = 0;
             uint currentOffset = 0;
             _IO = File.OpenWriter(filepath + (header.Format > Format.AFT &&
@@ -181,7 +181,7 @@ namespace KKdMainLib
 
         private bool disposed;
         public void Dispose()
-        { if (!disposed) { if (_IO != null) _IO.Dispose(); Strings = default;
+        { if (!disposed) { if (_IO != null) _IO.D(); _IO = null; Strings = default;
                 pof = default; header = default; disposed = true; } }
 
         public struct String

KKdMainLib/Tables.cs

@@ -1,5 +1,6 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdMainLib.IO;
+using KKdBaseLib.Tables;
 using TableDict = System.Collections.Generic.Dictionary<string, object>;
 
 namespace KKdMainLib
@@ -83,7 +84,7 @@ namespace KKdMainLib
                     dict.FV(out csld.     SortIndex, name +       "sort_index");
                     dict.FV(out csld.    SubSEName , name +     "sub_se_name" );
                     dict.FV(out csld.SuccessSEName , name + "success_se_name" );
-                    
+
                     csld.Start = GetStartTableDate(dict, name);
                     csld.End   =   GetEndTableDate(dict, name);
                 }
@@ -130,7 +131,7 @@ namespace KKdMainLib
                     dict.FV(out czitm.SellType , name + "sell_type" );
                     dict.FV(out czitm.ShopPrice, name + "shop_price");
                     dict.FV(out czitm.SortIndex, name + "sort_index");
-                    
+
                     czitm.ShopStart = GetStartTableDate(dict, name + "shop_");
                     czitm.ShopEnd   =   GetEndTableDate(dict, name + "shop_");
                 }
@@ -151,7 +152,7 @@ namespace KKdMainLib
                     dict.FV(out mdl.NG       , name + "ng"        );
                     dict.FV(out mdl.ShopPrice, name + "shop_price");
                     dict.FV(out mdl.SortIndex, name + "sort_index");
-                    
+
                     mdl.ShopStart = GetStartTableDate(dict, name + "shop_");
                     mdl.ShopEnd   =   GetEndTableDate(dict, name + "shop_");
                 }
@@ -190,10 +191,10 @@ namespace KKdMainLib
                     dict.FV(out pv.ID    , name + "id"    );
                     dict.FV(out pv.Ignore, name + "ignore");
                     dict.FV(out pv.Name  , name + "name"  );
-                    
+
                     pv.AdvStart = GetStartTableDate(dict, name + "adv_demo_");
                     pv.AdvEnd   =   GetEndTableDate(dict, name + "adv_demo_");
-                    
+
                     pv.Easy    = GetDifficulty(dict, name + "easy"    + c);
                     pv.Encore  = GetDifficulty(dict, name + "encore"  + c);
                     pv.Extreme = GetDifficulty(dict, name + "extreme" + c);
@@ -230,7 +231,7 @@ namespace KKdMainLib
                     dict.FV(out sld.    Name , name +      "name" );
                     dict.FV(out sld.  SEName , name +   "se_name" );
                     dict.FV(out sld.SortIndex, name + "sort_index");
-                    
+
                     sld.Start = GetStartTableDate(dict, name);
                     sld.End   =   GetEndTableDate(dict, name);
                 }
@@ -256,18 +257,18 @@ namespace KKdMainLib
             static TableDate GetStartTableDate(TableDict dict, string name)
             {
                 TableDate date = default; date.SDL(); int val;
-                if (dict.FV(out val, name + "st_day"  )) date.Day   = val;
-                if (dict.FV(out val, name + "st_month")) date.Month = val;
                 if (dict.FV(out val, name + "st_year" )) date.Year  = val;
+                if (dict.FV(out val, name + "st_month")) date.Month = val;
+                if (dict.FV(out val, name + "st_day"  )) date.Day   = val;
                 return date;
             }
 
             static TableDate GetEndTableDate(TableDict dict, string name)
             {
                 TableDate date = default; date.SDU(); int val;
-                if (dict.FV(out val, name + "ed_day"  )) date.Day   = val;
-                if (dict.FV(out val, name + "ed_month")) date.Month = val;
                 if (dict.FV(out val, name + "ed_year" )) date.Year  = val;
+                if (dict.FV(out val, name + "ed_month")) date.Month = val;
+                if (dict.FV(out val, name + "ed_day"  )) date.Day   = val;
                 return date;
             }
         }
@@ -458,27 +459,27 @@ namespace KKdMainLib
                     W(name + "id"    , pv.ID    );
                     W(name + "ignore", pv.Ignore);
                     W(name + "name"  , pv.Name  );
-                    WriteDifficulty(_IO, name + "extreme.", pv.Normal );
+                    WriteDifficulty(_IO, name +  "normal.", pv.Normal );
                 }
                 W("pv_list.data_list.length", length);
                 _IO.D();
 
                 static void WriteDifficulty(Stream _IO, string name, PV.Difficulty[] arr)
                 {
-                    if (arr == null) { _IO.W($"{name}.length=0\n"); return; }
+                    if (arr == null) { _IO.W($"{name}length=0\n"); return; }
 
                     int length = arr.Length;
                     int[] so = length.SW();
                     for (int i = 0; i < length; i++)
                     {
                         ref PV.Difficulty diff = ref arr[so[i]];
-                    
-                        WriteStartTableDate(_IO, $"{name}{i}.", diff.Start);
-                        _IO.W($"{name}{i}.edition" + $"={diff.Edition}\n");
+
                           WriteEndTableDate(_IO, $"{name}{i}.", diff.End  );
+                        _IO.W($"{name}{i}.edition" + $"={diff.Edition}\n");
+                        WriteStartTableDate(_IO, $"{name}{i}.", diff.Start);
                         _IO.W($"{name}{i}.ver"     + $"={diff.Version}\n");
                     }
-                    _IO.W($"{name}.length={length}\n");
+                    _IO.W($"{name}length={length}\n");
                 }
             }
             else if (SlideSETable != null)
@@ -528,14 +529,14 @@ namespace KKdMainLib
 
             static void WriteEmptyLines(Stream _IO, int count)
             { for (int i = 0; i < count; i++) _IO.W("#---------------------------------------------\n"); }
-            
+
             static void WriteStartTableDate(Stream _IO, string name, TableDate date)
             {
                 _IO.W(name + "st_day"   + "=" + date.Day   + "\n");
                 _IO.W(name + "st_month" + "=" + date.Month + "\n");
                 _IO.W(name + "st_year"  + "=" + date.Year  + "\n");
             }
-            
+
             static void WriteEndTableDate(Stream _IO, string name, TableDate date)
             {
                 _IO.W(name + "ed_day"   + "=" + date.Day   + "\n");
@@ -582,7 +583,7 @@ namespace KKdMainLib
                     ref ChainSlideSE csld = ref ChainSlideSETable[i0];
                     csld.End  .SV(csldMP.RnI32("End"  ),  true);
                     csld.Start.SV(csldMP.RnI32("Start"), false);
-                    
+
                     csldMP.R("FailureSEName" , out csld.FailureSEName );
                     csldMP.R(  "FirstSEName" , out csld.  FirstSEName );
                     csldMP.R(         "ID"   , out csld.         ID   );
@@ -601,7 +602,7 @@ namespace KKdMainLib
                     ref CollectionCard clcrd = ref CollectionCardTable[i0];
                     clcrd.End  .SV(clcrdMP.RnI32("End"  ),  true);
                     clcrd.Start.SV(clcrdMP.RnI32("Start"), false);
-                    
+
                     clcrdMP.R("Chara"       , out clcrd.Chara       );
                     clcrdMP.R("DispNum"     , out clcrd.DispNum     );
                     clcrdMP.R("DivaProParam", out clcrd.DivaProParam);
@@ -646,7 +647,7 @@ namespace KKdMainLib
                     ref Module mdl = ref ModuleTable[i0];
                     mdl.ShopEnd  .SV(mdlMP.RnI32("ShopEnd"  ),  true);
                     mdl.ShopStart.SV(mdlMP.RnI32("ShopStart"), false);
-                    
+
                     mdlMP.R("Attribute", out mdl.Attribute);
                     mdlMP.R("Costume"  , out mdl.Costume  );
                     mdlMP.R("Chara"    , out mdl.Chara    );
@@ -679,7 +680,7 @@ namespace KKdMainLib
                     pltMP.R("ShadowColorR", out plt.ShadowColorR);
                 }
             }
-            else if ((temp = msgPack["PV", true]).NotNull)
+            else if ((temp = msgPack["PVList", true]).NotNull)
             {
                 PVList = new PV[temp.Array.Length];
                 for (i0 = 0; i0 < PVList.Length; i0++)
@@ -688,7 +689,7 @@ namespace KKdMainLib
                     ref PV pv = ref PVList[i0];
                     pv.AdvEnd  .SV(pvMP.RnI32("AdvEnd"  ),  true);
                     pv.AdvStart.SV(pvMP.RnI32("AdvStart"), false);
-                    
+
                     pvMP.R("ID"    , out pv.ID    );
                     pvMP.R("Ignore", out pv.Ignore);
                     pvMP.R("Name"  , out pv.Name  );
@@ -704,7 +705,7 @@ namespace KKdMainLib
                 {
                     MsgPack t;
                     if ((t = mp[name, true]).IsNull) return null;
-                    
+
                     PV.Difficulty[] arr = new PV.Difficulty[t.Array.Length];
                     for (int i = 0; i < arr.Length; i++)
                     {
@@ -712,7 +713,7 @@ namespace KKdMainLib
                         ref PV.Difficulty diff = ref arr[i];
                         diff.End  .SV(pvMP.RnI32("End"  ),  true);
                         diff.Start.SV(pvMP.RnI32("Start"), false);
-                    
+
                         pvMP.R("Edition", out diff.Edition);
                         pvMP.R("Version", out diff.Version);
                     }
@@ -728,7 +729,7 @@ namespace KKdMainLib
                     ref SlideSE sld = ref SlideSETable[i0];
                     sld.End  .SV(sldMP.RnI32("End"  ),  true);
                     sld.Start.SV(sldMP.RnI32("Start"), false);
-                    
+
                     sldMP.R(    "ID"   , out sld.    ID   );
                     sldMP.R(    "Name" , out sld.    Name );
                     sldMP.R(  "SEName" , out sld.  SEName );
@@ -744,7 +745,7 @@ namespace KKdMainLib
                     ref SliderTouchSE sldt = ref SliderTouchSETable[i0];
                     sldt.End  .SV(TEMP.RnI32("End"  ),  true);
                     sldt.Start.SV(TEMP.RnI32("Start"), false);
-                    
+
                     TEMP.R(    "ID"   , out sldt.    ID   );
                     TEMP.R(    "Name" , out sldt.    Name );
                     TEMP.R(  "SEName" , out sldt.  SEName );
@@ -949,7 +950,7 @@ namespace KKdMainLib
         public void Dispose()
         {
             if (disposed) return;
-            if (_IO != null) { _IO.D(); _IO = null; }
+            if (_IO != null) _IO.D(); _IO = null;
             if (dict != null) { dict.Clear(); dict = null; }
             ButtonSETable = null; ChainSlideSETable = null; SlideSETable = null; SliderTouchSETable = null;
             CollectionCardTable = null; CustomizeItemTable = null;

KKdSoundLib/DIVA.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdMainLib.IO;
 
 namespace KKdSoundLib

KKdSoundLib/Extensions.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdMainLib.IO;
 
 namespace KKdSoundLib

KKdSoundLib/KKdSoundLib.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Authors>korenkonder</Authors>
@@ -9,7 +9,7 @@
     <FileVersion>0.1.2.0</FileVersion>
     <PackageId>KKdSoundLib</PackageId>
     <Product>KKdSoundLib</Product>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net461</TargetFramework>
     <Title>KKdSoundLib</Title>
     <Version>0.1.2.0</Version>
   </PropertyGroup>

KKdSoundLib/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTrademark("")]

KKdSoundLib/VAG.cs

@@ -1,4 +1,4 @@
-using KKdBaseLib;
+using KKdBaseLib;
 using KKdMainLib.IO;
 
 namespace KKdSoundLib
@@ -122,7 +122,7 @@ namespace KKdSoundLib
             writer.W((ushort)(HEVAG ? VAGData.Channels : 0x1));
             writer.W(name, 0x10);
             writer.P = 0x30;
-            
+
             int[] samp = new int[HEVAG ? ch * (PrNRCount > 29 ? 8 : 4) : 4];
             fixed (int* sampPtr = samp)
             fixed (int* HEVAG1 = VAG.HEVAG1)
@@ -170,7 +170,7 @@ namespace KKdSoundLib
                             }
 
                             if (h)
-                            { 
+                            {
                                 Calc4BitsHEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1 + c, v2 + c,
                                     v3 + c, v4 + c, tV1 + c, tV2 + c, tV3 + c, tV4 + c);
 
@@ -207,7 +207,7 @@ namespace KKdSoundLib
                             }
 
                             if (h)
-                            { 
+                            {
                                 Calc4BitsVAG(HEVAG1, HEVAG2, v1 + c, v2 + c, tV1 + c, tV2 + c);
 
                                 s = ((PrNR & 0xF) << 4) | (ShF & 0xF);
@@ -241,9 +241,9 @@ namespace KKdSoundLib
                             dataBuf[i] /= ch;
                             if (dataBuf[i] != 0) h = true;
                         }
-                        
+
                         if (h)
-                        { 
+                        {
                             Calc4BitsVAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
 
                             s = ((PrNR & 0xF) << 4) | (ShF & 0xF);
@@ -287,7 +287,7 @@ namespace KKdSoundLib
             }
             writer.C();
         }
-        
+
         private fixed int dataBuf[(int)BS];
         private fixed int fourBit[(int)BS];
         private fixed int tempBuf[(int)BS];
@@ -301,7 +301,7 @@ namespace KKdSoundLib
             for (j = 0; j < PrNRCount; j++)
             {
                 PrNR = j;
-                
+
                 Calc4Bits_VAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
 
                 s1 = *v1; s2 = *v2;
@@ -320,7 +320,7 @@ namespace KKdSoundLib
                 if (err < min) { PrNRf = j; min = err; }
             }
             PrNR = PrNRf;
-            
+
             Calc4Bits_VAG(HEVAG1, HEVAG2, v1, v2, tV1, tV2);
             * v1 =  s1; * v2 =  s2;
             *tV1 = tS1; *tV2 = tS2;
@@ -344,12 +344,12 @@ namespace KKdSoundLib
                 e = (e + g) ^ g;
                 if (e > max) max = e;
             }
-            
+
             for (ShF = 12, ShM = 0x400000; ShF > 0; ShF--, ShM >>= 1)
                 if ((ShM & (max + (ShM >> 4))) == ShM) break;
             ShFf = 8 + ShF;
             ShF = 12 - ShF;
-            
+
             tS1 = *tV1; tS2 = *tV2;
             for (i = 0; i < BS; i++)
             {
@@ -376,7 +376,7 @@ namespace KKdSoundLib
             for (j = 0; j < PrNRCount; j++)
             {
                 PrNR = j;
-                
+
                 Calc4Bits_HEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1, v2, v3, v4, tV1, tV2, tV3, tV4);
 
                 s1 = *v1; s2 = *v2; s3 = *v3; s4 = *v4;
@@ -395,7 +395,7 @@ namespace KKdSoundLib
                 if (err < min) { PrNRf = j; min = err; }
             }
             PrNR = PrNRf;
-            
+
             Calc4Bits_HEVAG(HEVAG1, HEVAG2, HEVAG3, HEVAG4, v1, v2, v3, v4, tV1, tV2, tV3, tV4);
             * v1 =  s1; * v2 =  s2; * v3 =  s3; * v4 =  s4;
             *tV1 = tS1; *tV2 = tS2; *tV3 = tS3; *tV4 = tS4;
@@ -427,7 +427,7 @@ namespace KKdSoundLib
                 if ((ShM & (max + (ShM >> 4))) == ShM) break;
             ShFf = 8 + ShF;
             ShF = 12 - ShF;
-            
+
             tS1 = *tV1; tS2 = *tV2; tS3 = *tV3; tS4 = *tV4;
             for (i = 0; i < BS; i++)
             {
@@ -741,7 +741,7 @@ namespace KKdSoundLib
             public byte[] Flags;
             public int[] Data;
         }
-        
+
         private static readonly int[] ShiftFactor =
         { 0, 1, 2, 3, 4, 5, 6, 7, -8, -7, -6, -5, -4, -3, -2, -1 };
 

KKdSoundLib/WAV.cs

@@ -1,4 +1,4 @@
-namespace KKdSoundLib
+namespace KKdSoundLib
 {
     public static class WAV
     {

PD_Tool/PD_Tool.csproj

@@ -1,183 +1,85 @@
-<?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>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7B5D5A3A-A6F8-4813-C97D-ACFC98F7397E}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>PD_Tool</RootNamespace>
-    <AssemblyName>PD_Tool</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <RunPostBuildEvent>Always</RunPostBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\build\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>8.0</LangVersion>
-    <NoWarn>IDE0004, IDE0044, IDE0045, IDE0046, IDE0055, IDE0059, IDE0069, IDE1006</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>embedded</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\build\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DebugSymbols>true</DebugSymbols>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>8.0</LangVersion>
-    <NoWarn>IDE0004, IDE0044, IDE0045, IDE0046, IDE0055, IDE0059, IDE0069, IDE1006</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="classes\A3D.cs" />
-    <Compile Include="classes\AET.cs" />
-    <Compile Include="classes\BLT.cs" />
-    <Compile Include="classes\CCT.cs" />
-    <Compile Include="classes\DataBase.cs" />
-    <Compile Include="classes\DB.cs" />
-    <Compile Include="classes\DEX.cs" />
-    <Compile Include="classes\DFT.cs" />
-    <Compile Include="classes\DIV.cs" />
-    <Compile Include="classes\DIVAFILE.cs" />
-    <Compile Include="classes\FARC.cs" />
-    <Compile Include="classes\LIT.cs" />
-    <Compile Include="classes\MHD.cs" />
-    <Compile Include="classes\MOT.cs" />
-    <Compile Include="classes\STR.cs" />
-    <Compile Include="classes\TBL.cs" />
-    <Compile Include="classes\VAG.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Windows.Forms" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\KKdBaseLib\KKdBaseLib.csproj">
-      <Project>{437f63f1-8c23-429e-ab14-38b85c9edb16}</Project>
-      <Name>KKdBaseLib</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\KKdMainLib\KKdMainLib.csproj">
-      <Project>{2ba7efc6-91d1-8bbc-c487-06c7f36cc789}</Project>
-      <Name>KKdMainLib</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\KKdSoundLib\KKdSoundLib.csproj">
-      <Project>{d8a3f2d7-10cc-5723-ec9a-45d3b9c2df77}</Project>
-      <Name>KKdSoundLib</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>del Microsoft.Win32.Primitives.dll
-del netstandard.dll
-del PD_Tool.exe.config
-del System.AppContext.dll
-del System.Collections.Concurrent.dll
-del System.Collections.dll
-del System.Collections.NonGeneric.dll
-del System.Collections.Specialized.dll
-del System.ComponentModel.dll
-del System.ComponentModel.EventBasedAsync.dll
-del System.ComponentModel.Primitives.dll
-del System.ComponentModel.TypeConverter.dll
-del System.Console.dll
-del System.Data.Common.dll
-del System.Diagnostics.Contracts.dll
-del System.Diagnostics.Debug.dll
-del System.Diagnostics.FileVersionInfo.dll
-del System.Diagnostics.Process.dll
-del System.Diagnostics.StackTrace.dll
-del System.Diagnostics.TextWriterTraceListener.dll
-del System.Diagnostics.Tools.dll
-del System.Diagnostics.TraceSource.dll
-del System.Diagnostics.Tracing.dll
-del System.Drawing.Primitives.dll
-del System.Dynamic.Runtime.dll
-del System.Globalization.Calendars.dll
-del System.Globalization.dll
-del System.Globalization.Extensions.dll
-del System.IO.Compression.dll
-del System.IO.Compression.ZipFile.dll
-del System.IO.dll
-del System.IO.FileSystem.dll
-del System.IO.FileSystem.DriveInfo.dll
-del System.IO.FileSystem.Primitives.dll
-del System.IO.FileSystem.Watcher.dll
-del System.IO.IsolatedStorage.dll
-del System.IO.MemoryMappedFiles.dll
-del System.IO.Pipes.dll
-del System.IO.UnmanagedMemoryStream.dll
-del System.Linq.dll
-del System.Linq.Expressions.dll
-del System.Linq.Parallel.dll
-del System.Linq.Queryable.dll
-del System.Net.Http.dll
-del System.Net.NameResolution.dll
-del System.Net.NetworkInformation.dll
-del System.Net.Ping.dll
-del System.Net.Primitives.dll
-del System.Net.Requests.dll
-del System.Net.Security.dll
-del System.Net.Sockets.dll
-del System.Net.WebHeaderCollection.dll
-del System.Net.WebSockets.Client.dll
-del System.Net.WebSockets.dll
-del System.ObjectModel.dll
-del System.Reflection.dll
-del System.Reflection.Extensions.dll
-del System.Reflection.Primitives.dll
-del System.Resources.Reader.dll
-del System.Resources.ResourceManager.dll
-del System.Resources.Writer.dll
-del System.Runtime.CompilerServices.VisualC.dll
-del System.Runtime.dll
-del System.Runtime.Extensions.dll
-del System.Runtime.Handles.dll
-del System.Runtime.InteropServices.dll
-del System.Runtime.InteropServices.RuntimeInformation.dll
-del System.Runtime.Numerics.dll
-del System.Runtime.Serialization.Formatters.dll
-del System.Runtime.Serialization.Json.dll
-del System.Runtime.Serialization.Primitives.dll
-del System.Runtime.Serialization.Xml.dll
-del System.Security.Claims.dll
-del System.Security.Cryptography.Algorithms.dll
-del System.Security.Cryptography.Csp.dll
-del System.Security.Cryptography.Encoding.dll
-del System.Security.Cryptography.Primitives.dll
-del System.Security.Cryptography.X509Certificates.dll
-del System.Security.Principal.dll
-del System.Security.SecureString.dll
-del System.Text.Encoding.dll
-del System.Text.Encoding.Extensions.dll
-del System.Text.RegularExpressions.dll
-del System.Threading.dll
-del System.Threading.Overlapped.dll
-del System.Threading.Tasks.dll
-del System.Threading.Tasks.Parallel.dll
-del System.Threading.Thread.dll
-del System.Threading.ThreadPool.dll
-del System.Threading.Timer.dll
-del System.ValueTuple.dll
-del System.Xml.ReaderWriter.dll
-del System.Xml.XDocument.dll
-del System.Xml.XmlDocument.dll
-del System.Xml.XmlSerializer.dll
-del System.Xml.XPath.dll
-del System.Xml.XPath.XDocument.dll</PostBuildEvent>
-  </PropertyGroup>
+<?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>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7B5D5A3A-A6F8-4813-C97D-ACFC98F7397E}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>PD_Tool</RootNamespace>
+    <AssemblyName>PD_Tool</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\build\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>8.0</LangVersion>
+    <NoWarn>IDE0004, IDE0044, IDE0045, IDE0046, IDE0055, IDE0059, IDE0069, IDE1006</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>embedded</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\build\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DebugSymbols>true</DebugSymbols>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <LangVersion>8.0</LangVersion>
+    <NoWarn>IDE0004, IDE0044, IDE0045, IDE0046, IDE0055, IDE0059, IDE0069, IDE1006</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="classes\A3D.cs" />
+    <Compile Include="classes\ADP.cs" />
+    <Compile Include="classes\AET.cs" />
+    <Compile Include="classes\BLT.cs" />
+    <Compile Include="classes\CCT.cs" />
+    <Compile Include="classes\DataBase.cs" />
+    <Compile Include="classes\DB.cs" />
+    <Compile Include="classes\DEX.cs" />
+    <Compile Include="classes\DFT.cs" />
+    <Compile Include="classes\DIV.cs" />
+    <Compile Include="classes\DIVAFILE.cs" />
+    <Compile Include="classes\FARC.cs" />
+    <Compile Include="classes\LIT.cs" />
+    <Compile Include="classes\MHD.cs" />
+    <Compile Include="classes\MOT.cs" />
+    <Compile Include="classes\STR.cs" />
+    <Compile Include="classes\TBL.cs" />
+    <Compile Include="classes\VAG.cs" />
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\KKdBaseLib\KKdBaseLib.csproj">
+      <Project>{437f63f1-8c23-429e-ab14-38b85c9edb16}</Project>
+      <Name>KKdBaseLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\KKdMainLib\KKdMainLib.csproj">
+      <Project>{2ba7efc6-91d1-8bbc-c487-06c7f36cc789}</Project>
+      <Name>KKdMainLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\KKdSoundLib\KKdSoundLib.csproj">
+      <Project>{d8a3f2d7-10cc-5723-ec9a-45d3b9c2df77}</Project>
+      <Name>KKdSoundLib</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

PD_Tool/Program.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows.Forms;
 using KKdMainLib;
 using KKdMainLib.IO;
@@ -18,6 +18,9 @@ namespace PD_Tool
         {
             SetProcessDPIAware();
 
+            Console. InputEncoding = System.Text.Encoding.Unicode;
+            Console.OutputEncoding = System.Text.Encoding.Unicode;
+
             Console.Title = "PD_Tool";
             if (args.Length == 0) { while (choose != "Q") MainMenu(); Exit(); }
 
@@ -43,9 +46,7 @@ namespace PD_Tool
 
         private static void MainMenu()
         {
-            Console. InputEncoding = System.Text.Encoding.Unicode;
-            Console.OutputEncoding = System.Text.Encoding.Unicode;
-            Console.Title = "PD_Tool";
+            Console.Title = "PD_Tool v0.4.9.3.2";
             Console.Clear();
 
             ConsoleDesign(true);
@@ -53,12 +54,12 @@ namespace PD_Tool
             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/FT        Converting Tools");
-            ConsoleDesign("8. X/XHD          Converting Tools");
+            ConsoleDesign("3. Decrypt/Encrypt from/to DIVAFILE");
+            ConsoleDesign("4. DB_Tools");
+            ConsoleDesign("5. AC/DT/F/AFT Converting Tools");
+            ConsoleDesign("6. F/F2/FT     Converting Tools");
+            ConsoleDesign("7. X/XHD       Converting Tools");
+            ConsoleDesign("8. FT/M39      Converting Tools");
             ConsoleDesign(json ? "9. MsgPack to JSON" : "9. JSON to MsgPack");
             ConsoleDesign(false);
             ConsoleDesign(json ? "M. MessagePack" : "J. JSON");
@@ -70,42 +71,51 @@ namespace PD_Tool
             choose = Console.ReadLine().ToUpper();
             bool isNumber = int.TryParse(choose, out int result);
             if (isNumber) Functions();
-                 if (choose == "M") json = false;
-            else if (choose == "J") json = true ;
+
+            if (choose == null || choose == "") return;
+                 if (choose[0] == 'M') json = false;
+            else if (choose[0] == 'J') json = true ;
         }
 
         private static void Functions()
         {
             Console.Clear();
-                 if (choose == "1" || choose == "2") FARC.Processor(choose == "1");
-            else if (choose == "3" || choose == "4")
+            if (choose == null || choose == "") return;
+
+                 if (choose[0] == '1' || choose[0] == '2') FARC.Processor(choose == "1");
+            else if (choose[0] == '3')
             {
                 Choose(1, "", out string[] FileNames);
                 foreach (string FileName in FileNames) DIVAFILE.Decrypt(FileName);
             }
-            else if (choose == "5") DataBase.Processor(json);
-            else if (choose == "6")
+            else if (choose[0] == '4') DataBase.Processor(json);
+            else if (choose[0] == '5')
             {
-                Console.Clear();
-                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. MotHead" );
-                ConsoleDesign("7. MOT"     );
-                ConsoleDesign("8. Table"   );
-                ConsoleDesign("9. STR"     );
-                ConsoleDesign(false);
-                ConsoleDesign("R. Return to Main Menu");
-                ConsoleDesign(false);
-                ConsoleDesign(true);
-                Console.WriteLine();
-                string localChoose = Console.ReadLine().ToUpper();
+                string localChoose = "";
+                if (choose.Length == 1)
+                {
+                    Console.Clear();
+                    Console.Title = "AC/DT/F/AFT 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. MotHead" );
+                    ConsoleDesign("7. MOT"     );
+                    ConsoleDesign("8. Table"   );
+                    ConsoleDesign("9. STR"     );
+                    ConsoleDesign(false);
+                    ConsoleDesign("R. Return to Main Menu");
+                    ConsoleDesign(false);
+                    ConsoleDesign(true);
+                    Console.WriteLine();
+                    localChoose = Console.ReadLine().ToUpper();
+                }
+                else localChoose = choose[1].ToString();
                      if (localChoose == "1") A3D.Processor(json);
                 else if (localChoose == "2") AET.Processor(json);
                 else if (localChoose == "3") DB .Processor(json);
@@ -117,27 +127,32 @@ namespace PD_Tool
                 else if (localChoose == "9") STR.Processor(json);
                 else choose = localChoose;
             }
-            else if (choose == "7")
+            else if (choose[0] == '6')
             {
-                Console.Clear();
-                Console.Title = "F/F2/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 localChoose = Console.ReadLine().ToUpper();
+                string localChoose = "";
+                if (choose.Length == 1)
+                {
+                    Console.Clear();
+                    Console.Title = "F/F2/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();
+                    localChoose = Console.ReadLine().ToUpper();
+                }
+                else localChoose = choose[1].ToString();
                      if (localChoose == "1") A3D.Processor(json);
                 else if (localChoose == "2") BLT.Processor();
                 else if (localChoose == "3") CCT.Processor();
@@ -148,27 +163,70 @@ namespace PD_Tool
                 else if (localChoose == "8") VAG.Processor();
                 else choose = localChoose;
             }
-            else if (choose == "8")
+            else if (choose[0] == '7')
             {
-                Console.Clear();
-                Console.Title = "X Converting Tools";
-                ConsoleDesign(true);
-                ConsoleDesign("               Choose converter:");
-                ConsoleDesign(false);
-                ConsoleDesign("1. A3DA"          );
-                ConsoleDesign("2. DEX"           );
-                ConsoleDesign("3. VAG"           );
-                ConsoleDesign(false);
-                ConsoleDesign("R. Return to Main Menu");
-                ConsoleDesign(false);
-                ConsoleDesign(true);
-                Console.WriteLine();
-                string localChoose = Console.ReadLine().ToUpper();
+                string localChoose = "";
+                if (choose.Length == 1)
+                {
+                    Console.Clear();
+                    Console.Title = "X/XHD Converting Tools";
+                    ConsoleDesign(true);
+                    ConsoleDesign("               Choose converter:");
+                    ConsoleDesign(false);
+                    ConsoleDesign("1. A3DA"          );
+                    ConsoleDesign("2. DEX"           );
+                    ConsoleDesign("3. VAG"           );
+                    ConsoleDesign(false);
+                    ConsoleDesign("R. Return to Main Menu");
+                    ConsoleDesign(false);
+                    ConsoleDesign(true);
+                    Console.WriteLine();
+                    localChoose = Console.ReadLine().ToUpper();
+                }
+                else localChoose = choose[1].ToString();
                      if (localChoose == "1") A3D.Processor(json);
                 else if (localChoose == "2") DEX.Processor(json);
                 else if (localChoose == "3") VAG.Processor();
                 else choose = localChoose;
             }
+            else if (choose[0] == '8')
+            {
+                string localChoose = "";
+                if (choose.Length == 1)
+                {
+                    Console.Clear();
+                    Console.Title = "FT/M39 Converting Tools";
+                    ConsoleDesign(true);
+                    ConsoleDesign("               Choose converter:");
+                    ConsoleDesign(false);
+                    ConsoleDesign("1. A3DA"    );
+                    ConsoleDesign("2. AddParam");
+                    ConsoleDesign("3. AET"     );
+                    ConsoleDesign("4. DEX"     );
+                    ConsoleDesign("5. DIVA"    );
+                    ConsoleDesign("6. MotHead" );
+                    ConsoleDesign("7. MOT"     );
+                    ConsoleDesign("8. Table"   );
+                    ConsoleDesign("9. STR"     );
+                    ConsoleDesign(false);
+                    ConsoleDesign("R. Return to Main Menu");
+                    ConsoleDesign(false);
+                    ConsoleDesign(true);
+                    Console.WriteLine();
+                    localChoose = Console.ReadLine().ToUpper();
+                }
+                else localChoose = choose[1].ToString();
+                     if (localChoose == "1") A3D.Processor(json);
+                else if (localChoose == "2") ADP.Processor(json);
+                else if (localChoose == "3") AET.Processor(json);
+                else if (localChoose == "4") DEX.Processor(json);
+                else if (localChoose == "5") DIV.Processor();
+                else if (localChoose == "6") MHD.Processor(json);
+                else if (localChoose == "7") MOT.Processor(json);
+                else if (localChoose == "8") TBL.Processor(json);
+                else if (localChoose == "9") STR.Processor(json);
+                else choose = localChoose;
+            }
             else if (choose == "9")
             {
                 Console.Title = json ? "MsgPack to JSON" : "JSON to MsgPack";
@@ -188,7 +246,7 @@ namespace PD_Tool
         }
 
         public static void Exit() => Environment.Exit(0);
-        
+
         public static void ConsoleDesign(string text, params string[] args)
         {
             text = string.Format(text, args);
@@ -259,7 +317,7 @@ namespace PD_Tool
                         bin + GetArgs("FARC Archives", true, "farc") + json + mp;
                 else if (filetype == "vag" ) Filter = GetArgs("VAG" , "vag", "wav") +
                         GetArgs("VAG", true, "vag") + 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;

PD_Tool/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("PD_Tool")]
@@ -11,5 +11,5 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("7B5D5A3A-A6F8-4813-C97D-ACFC98F7397E")]
-[assembly: AssemblyVersion("0.4.9.0")]
-[assembly: AssemblyFileVersion("0.4.9.0")]
+[assembly: AssemblyVersion("0.4.9.3")]
+[assembly: AssemblyFileVersion("0.4.9.3")]

PD_Tool/classes/A3D.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdBaseLib;
 using KKdMainLib.IO;
 using KKdA3DA = KKdMainLib.A3DA;
@@ -28,22 +28,22 @@ namespace PD_Tool
                 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("3. A3DA [AFT/FT/M39]");
+                Program.ConsoleDesign("4. A3DC [AFT/FT/M39]");
+                Program.ConsoleDesign("5. A3DC [F2]");
+                Program.ConsoleDesign("6. A3DC [MGF]");
+                Program.ConsoleDesign("7. A3DC [X]");
                 Program.ConsoleDesign(false);
                 Program.ConsoleDesign(true);
                 Console.WriteLine();
                 choose = Console.ReadLine().ToUpper();
-                     if (choose == "1") format = Format.DT  ;
-                else if (choose == "2") format = Format.F   ;
-                else if (choose == "3") format = Format.AFT ;
-                else if (choose == "4") format = Format.AFT ;
-                else if (choose == "5") format = Format.F2LE;
-                else if (choose == "6") format = Format.MGF ;
-                else if (choose == "7") format = Format.X   ;
+                     if (choose == "1") format = Format.DT ;
+                else if (choose == "2") format = Format.F  ;
+                else if (choose == "3") format = Format.AFT;
+                else if (choose == "4") format = Format.AFT;
+                else if (choose == "5") format = Format.F2;
+                else if (choose == "6") format = Format.MGF;
+                else if (choose == "7") format = Format.X  ;
                 else return;
             }
 

PD_Tool/classes/ADP.cs

@@ -0,0 +1,39 @@
+using System;
+using KKdMainLib;
+using KKdMainLib.IO;
+
+namespace PD_Tool
+{
+    public class ADP
+    {
+        public static void Processor(bool json)
+        {
+            Console.Title = "Add Param Converter";
+            Program.Choose(1, "adp", out string[] fileNames);
+            if (fileNames.Length < 1) return;
+
+            string filepath, ext;
+            AddParam adp;
+            foreach (string file in fileNames)
+            {
+                adp = new AddParam();
+                ext = Path.GetExtension(file);
+                filepath = file.Replace(ext, "");
+                ext = ext.ToLower();
+
+                Console.Title = "Add Param Converter: " + Path.GetFileNameWithoutExtension(file);
+                if (ext == ".adp")
+                {
+                    adp.AddParamReader(filepath);
+                    adp. MsgPackWriter(filepath, json);
+                }
+                else if (ext == ".mp" || ext == ".json")
+                {
+                    adp. MsgPackReader(filepath, ext == ".json");
+                    adp.AddParamWriter(filepath);
+                }
+                adp.Dispose();
+            }
+        }
+    }
+}

PD_Tool/classes/AET.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib;
 using KKdMainLib.IO;
 

PD_Tool/classes/BLT.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib.IO;
 using KKdMainLib.F2;
 

PD_Tool/classes/CCT.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib.IO;
 using KKdMainLib.F2;
 

PD_Tool/classes/DB.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib.IO;
 
 namespace PD_Tool
@@ -16,7 +16,7 @@ namespace PD_Tool
                      if (file.EndsWith(".mp"  )) { mp = false; break; }
                 else if (file.EndsWith(".json")) { mp = false; break; }
 
-            uint num2 = (uint)DateTime.Now.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
+            uint num2 = (uint)(DateTime.Now.Ticks / 10000000);
             string[] file_split;
             string filepath, ext;
             KKdMainLib.DataBank db;

PD_Tool/classes/DEX.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdBaseLib;
 using KKdMainLib.IO;
 using KKdDEX = KKdMainLib.DEX;
@@ -24,9 +24,9 @@ namespace PD_Tool
             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");
+            Program.ConsoleDesign("1. F/AFT/FT/M39 PS3/PS4/PSV/AC/NSW");
+            Program.ConsoleDesign("2. F2           PS3/PSV");
+            Program.ConsoleDesign("3. X            PS4/PSV");
             if ( mp   && !json) Program.ConsoleDesign("9. MessagePack");
             if (_json &&  json) Program.ConsoleDesign("9. JSON");
             Program.ConsoleDesign(false);
@@ -35,27 +35,27 @@ namespace PD_Tool
             choose = Console.ReadLine().ToUpper();
 
             Format format = Format.NULL;
-                 if (choose == "1") format = Format.F   ;
-            else if (choose == "2") format = Format.F2LE;
-            else if (choose == "3") format = Format.X   ;
+                 if (choose == "1") format = Format.F ;
+            else if (choose == "2") format = Format.F2;
+            else if (choose == "3") format = Format.X ;
             else if (choose == "9" && mp && _json) format = Format.NULL;
             else return;
 
             string filepath, ext;
-            KKdDEX DEX;
+            KKdDEX dex;
             foreach (string file in fileNames)
-                using (DEX = new KKdDEX())
+                using (dex = new KKdDEX())
                 {
                     ext      = Path.GetExtension(file);
                     filepath = file.Replace(ext, "");
                     ext = ext.ToLower();
 
                     Console.Title = "DEX Converter: " + Path.GetFileNameWithoutExtension(file);
-                    if (ext == ".bin" || ext == ".dex") DEX.    DEXReader(filepath, ext );
-                    else                                DEX.MsgPackReader(filepath, json);
+                    if (ext == ".bin" || ext == ".dex") dex.    DEXReader(filepath, ext );
+                    else                                dex.MsgPackReader(filepath, json);
 
-                    if (format > Format.NULL) DEX.    DEXWriter(filepath, format);
-                    else                      DEX.MsgPackWriter(filepath, json);
+                    if (format > Format.NULL) dex.    DEXWriter(filepath, format);
+                    else                      dex.MsgPackWriter(filepath, json);
                 }
         }
     }

PD_Tool/classes/DFT.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib.IO;
 using KKdMainLib.F2;
 

PD_Tool/classes/DIV.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using KKdSoundLib;
 

PD_Tool/classes/DIVAFILE.cs

@@ -1,4 +1,4 @@
-using KKdMainLib;
+using KKdMainLib;
 using KKdMainLib.IO;
 
 namespace PD_Tool

PD_Tool/classes/DataBase.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using Aet = KKdMainLib.DB.Aet;
 using Auth = KKdMainLib.DB.Auth;

PD_Tool/classes/FARC.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using KKdFARC = KKdMainLib.FARC;
 
@@ -64,7 +64,7 @@ namespace PD_Tool
                     Console.WriteLine();
                     choose = Console.ReadLine().ToUpper();
                     if (choose == "2" || choose == "4") farc.FARCType |= KKdFARC.Type.GZip;
-                    if (choose == "3" || choose == "4") farc.FARCType |= KKdFARC.Type.ECB ;
+                    if (choose == "3" || choose == "4") farc.FARCType |= KKdFARC.Type.Enc ;
                 }
                 else if (choose == "R") return;
                 else farc.Signature = KKdFARC.Farc.FArC;

PD_Tool/classes/LIT.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib.IO;
 using KKdMainLib.F2;
 

PD_Tool/classes/MHD.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib;
 using KKdMainLib.IO;
 
@@ -32,7 +32,7 @@ namespace PD_Tool
                     mhd.MsgPackReader(filepath, ext == ".json");
                     mhd.MotHeadWriter(filepath);
                 }
-                mhd = new MotHead();
+                mhd.Dispose();
             }
         }
     }

PD_Tool/classes/MOT.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib;
 using KKdMainLib.IO;
 

PD_Tool/classes/STR.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using KKdMainLib.IO;
 using KKdSTR = KKdMainLib.STR;
 

PD_Tool/classes/TBL.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using KKdBaseLib;
 using KKdMainLib;

PD_Tool/classes/VAG.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using KKdVAG = KKdSoundLib.VAG;
 

README.md

@@ -1,5 +1,5 @@
 # PD_Tool
-A simple tool for working with Project Diva AC/DT/F/AFT/F2/X/FT files
+A simple tool for working with Project Diva AC/DT/F/AFT/F2/X/FT/M39 files
 
 # Dependencies:
 + `.NET Standard 2.0`: Required to build KKdBaseLib, KKdMainLib and KKdSoundLib C# projects.
@@ -12,15 +12,17 @@ A simple tool for working with Project Diva AC/DT/F/AFT/F2/X/FT files
   - `Aet DB Converter`
   - `Auth DB Converter`
   - `Spr DB Converter`
-- `AC/DT/F/AFT/FT Converting Tools`
+- `AC/DT/F/AFT Converting Tools`
   - `A3DA Converter`
   - `AET Converter`
   - `DataBank Converter`
   - `DEX Converter`
   - `DIVA Converter`
+  - `MotHead Converter`
   - `MOT Converter`
+  - `Table Converter`
   - `STR Converter`
-- `F/F2/X/FT Converting Tools`
+- `F/F2/FT Converting Tools`
   - `A3DA Converter`
   - `Bloom Converter`
   - `Color Correction Converter`
@@ -29,3 +31,17 @@ A simple tool for working with Project Diva AC/DT/F/AFT/F2/X/FT files
   - `Light Converter`
   - `STR Converter`
   - `VAG Converter`
+- `X/XHD Converting Tools`
+  - `A3DA Converter`
+  - `DEX Converter`
+  - `VAG Converter`
+- `FT/M39 Converting Tools`
+  - `A3DA Converter`
+  - `AddParam Converter`
+  - `AET Converter`
+  - `DEX Converter`
+  - `DIVA Converter`
+  - `MotHead Converter`
+  - `MOT Converter`
+  - `Table Converter`
+  - `STR Converter`