Renamed Difs to VariantGrid

2DGAMELIB/_2DGAMELIB/Join.cs

@@ -94,16 +94,16 @@ namespace _2DGAMELIB
     		}
     	}
 
-    	public static JointsD GetJointsD(this Difs JoinRoot, IEnumerable<Difs> EnumDifs)
+    	public static JointsD GetJointsD(this VariantGrid JoinRoot, IEnumerable<VariantGrid> EnumDifs)
     	{
     		JointsD jointsD = new JointsD();
     		List<int> list = new List<int>();
-    		List<Difs> list2 = EnumDifs.ToList();
+    		List<VariantGrid> list2 = EnumDifs.ToList();
     		foreach (ShapePart item in JoinRoot.EnumAllPar())
     		{
     			int num = 0;
     			list.Clear();
-    			foreach (Difs item2 in list2)
+    			foreach (VariantGrid item2 in list2)
     			{
     				if (JoinRoot != item2)
     				{
@@ -141,7 +141,7 @@ namespace _2DGAMELIB
     		return jointsD;
     	}
 
-    	private static void GetJointsD(List<Difs> dl, JointsD jsd, List<int> del)
+    	private static void GetJointsD(List<VariantGrid> dl, JointsD jsd, List<int> del)
     	{
     		int num = -1;
     		int num2 = 0;
@@ -150,14 +150,14 @@ namespace _2DGAMELIB
     			num = jsd.Joins.Count;
     			for (int i = num2; i < num; i++)
     			{
-    				Difs difs = jsd.Joins[i].Difs1;
+    				VariantGrid variantGrid = jsd.Joins[i].Difs1;
-    				foreach (ShapePart item in difs.EnumAllPar())
+    				foreach (ShapePart item in variantGrid.EnumAllPar())
     				{
     					int num3 = 0;
     					del.Clear();
-    					foreach (Difs item2 in dl)
+    					foreach (VariantGrid item2 in dl)
     					{
-    						if (difs != item2)
+    						if (variantGrid != item2)
     						{
     							int num4 = 0;
     							foreach (JointPoint item3 in item.JP)
@@ -167,7 +167,7 @@ namespace _2DGAMELIB
     								{
     									if (v.DistanceSquared(item4.Position) <= IdentityDistance)
     									{
-    										jsd.Joins.Add(new JointD(difs, item, num4, item2));
+    										jsd.Joins.Add(new JointD(variantGrid, item, num4, item2));
     										if (!del.Contains(num3))
     										{
     											del.Add(num3);

2DGAMELIB/_2DGAMELIB/JointD.cs

@@ -6,15 +6,15 @@ namespace _2DGAMELIB
     [Serializable]
     public class JointD
     {
-    	public Difs Difs0;
+    	public VariantGrid Difs0;
 
     	public List<int> Path0;
 
     	public int Index;
 
-    	public Difs Difs1;
+    	public VariantGrid Difs1;
 
-    	public JointD(Difs Difs0, ShapePart Par0, int Index, Difs Difs1)
+    	public JointD(VariantGrid Difs0, ShapePart Par0, int Index, VariantGrid Difs1)
     	{
     		this.Difs0 = Difs0;
     		Path0 = Par0.GetPath();
@@ -22,7 +22,7 @@ namespace _2DGAMELIB
     		this.Difs1 = Difs1;
     	}
 
-    	public JointD(Difs Difs1)
+    	public JointD(VariantGrid Difs1)
     	{
     		this.Difs1 = Difs1;
     	}
@@ -41,7 +41,7 @@ namespace _2DGAMELIB
 
     	public void Set(JointS 接続元)
     	{
-    		Difs0 = 接続元.Difs;
+    		Difs0 = 接続元.VariantGrid;
     		Path0 = 接続元.Path;
     		Index = 接続元.Index;
     	}

2DGAMELIB/_2DGAMELIB/Joints.cs

@@ -27,15 +27,15 @@ namespace _2DGAMELIB
     [Serializable]
     public class JointS
     {
-    	public Difs Difs;
+    	public VariantGrid VariantGrid;
 
     	public List<int> Path;
 
     	public int Index;
 
-    	public JointS(Difs Difs, ShapePart ShapePart, int Index)
+    	public JointS(VariantGrid VariantGrid, ShapePart ShapePart, int Index)
     	{
-    		this.Difs = Difs;
+    		this.VariantGrid = VariantGrid;
     		Path = ShapePart.GetPath();
     		this.Index = Index;
     	}

2DGAMELIB/_2DGAMELIB/Obj.cs

@@ -11,17 +11,17 @@ namespace _2DGAMELIB
     {
     	public string Tag = "";
 
-    	public OrderedDictionary<string, Difs> Difss = new OrderedDictionary<string, Difs>();
+    	public OrderedDictionary<string, VariantGrid> Difss = new OrderedDictionary<string, VariantGrid>();
 
-    	private Difs r;
+    	private VariantGrid r;
 
     	private JointsD jsd;
 
     	public IEnumerable<string> Keys => Difss.Keys;
 
-    	public IEnumerable<Difs> Values => Difss.Values;
+    	public IEnumerable<VariantGrid> Values => Difss.Values;
 
-    	public Difs this[string Name]
+    	public VariantGrid this[string Name]
     	{
     		get
     		{
@@ -33,7 +33,7 @@ namespace _2DGAMELIB
     		}
     	}
 
-    	public Difs this[int Index]
+    	public VariantGrid this[int Index]
     	{
     		get
     		{
@@ -49,7 +49,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.PositionSize = value;
     			}
@@ -60,7 +60,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.PositionVector = value;
     			}
@@ -71,7 +71,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.AngleBase = value;
     			}
@@ -82,7 +82,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.AngleCont = value;
     			}
@@ -93,7 +93,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.SizeBase = value;
     			}
@@ -104,7 +104,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.SizeCont = value;
     			}
@@ -115,7 +115,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.SizeXBase = value;
     			}
@@ -126,7 +126,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.SizeXCont = value;
     			}
@@ -137,7 +137,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.SizeYBase = value;
     			}
@@ -148,7 +148,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.SizeYCont = value;
     			}
@@ -159,7 +159,7 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.Dra = value;
     			}
@@ -170,17 +170,17 @@ namespace _2DGAMELIB
     	{
     		set
     		{
-    			foreach (Difs value2 in Difss.Values)
+    			foreach (VariantGrid value2 in Difss.Values)
     			{
     				value2.Hit = value;
     			}
     		}
     	}
 
-    	public Difs JoinRoot => r;
+    	public VariantGrid JoinRoot => r;
     	public IEnumerable<ShapePart> EnumAllPar()
     	{
-    		foreach (Difs value in Difss.Values)
+    		foreach (VariantGrid value in Difss.Values)
     		{
     			foreach (ShapePart item in value.EnumAllPar())
     			{
@@ -191,7 +191,7 @@ namespace _2DGAMELIB
 
     	public Obj SetDefaultR()
     	{
-    		foreach (Difs value in Difss.Values)
+    		foreach (VariantGrid value in Difss.Values)
     		{
     			value.SetDefault();
     		}
@@ -206,24 +206,24 @@ namespace _2DGAMELIB
 
     	public void Draw(RenderArea Are)
     	{
-    		foreach (Difs value in Difss.Values)
+    		foreach (VariantGrid value in Difss.Values)
     		{
     			value.Draw(Are);
     		}
     	}
 
 
-    	private Difs GetJoinRootDifs()
+    	private VariantGrid GetJoinRootDifs()
     	{
-    		Difs[] array = Difss.Values.ToArray();
+    		VariantGrid[] array = Difss.Values.ToArray();
     		if (array.Length <= 1)
     		{
     			return array.FirstOrDefault();
     		}
     		ShapePart[] pa = EnumAllPar().ToArray();
-    		Difs[] array2 = array;
+    		VariantGrid[] array2 = array;
     		Vector2D p;
-    		foreach (Difs difs in array2)
+    		foreach (VariantGrid difs in array2)
     		{
     			if (difs.EnumJoinRoot.All(delegate(ShapePart p0)
     			{
@@ -239,8 +239,8 @@ namespace _2DGAMELIB
 
     	public void SetJoints()
     	{
-    		Difs[] array = Difss.Values.ToArray();
+    		VariantGrid[] array = Difss.Values.ToArray();
-    		Difs[] array2 = array;
+    		VariantGrid[] array2 = array;
     		for (int i = 0; i < array2.Length; i++)
     		{
     			array2[i].SetJoints();
@@ -265,7 +265,7 @@ namespace _2DGAMELIB
  
     	public void Dispose()
     	{
-    		foreach (Difs value in Difss.Values)
+    		foreach (VariantGrid value in Difss.Values)
     		{
     			value.Dispose();
     		}

2DGAMELIB/_2DGAMELIB/ObjExtensions.cs

@@ -33,7 +33,7 @@ namespace _2DGAMELIB
 
         public static void MigrateKeys(this Obj obj)
         {
-            var newDict = new OrderedDictionary<string, Difs>();
+            var newDict = new OrderedDictionary<string, VariantGrid>();
 
             foreach (var key in obj.Keys)
             {

2DGAMELIB/_2DGAMELIB/RemappedTypeBinder.cs

@@ -62,39 +62,44 @@ namespace _2DGAMELIB
 
         private string RemapTypeArgs(string typeName)
         {
-            var sb = new StringBuilder(typeName.Length);
+            // Find the generic arguments section: the outermost [...] containing [args]
-            int i = 0;
+            int outerStart = typeName.LastIndexOf('`');
-            while (i < typeName.Length)
+            if (outerStart < 0) return typeName;
+
+            int bracketStart = -1;
+            for (int i = outerStart + 1; i < typeName.Length; i++)
             {
-                int start = typeName.IndexOf('[', i);
+                if (typeName[i] == '[')
-                if (start < 0 || start + 1 >= typeName.Length || typeName[start + 1] != '[')
                 {
-                    sb.Append(typeName, i, typeName.Length - i);
+                    bracketStart = i;
                     break;
                 }
+            }
+            if (bracketStart < 0) return typeName;
 
-                sb.Append(typeName, i, start - i);
+            int depth = 0;
-
+            int bracketEnd = -1;
-                int end = typeName.IndexOf("]]", start);
+            for (int i = bracketStart; i < typeName.Length; i++)
-                if (end < 0)
             {
-                    sb.Append(typeName, start, typeName.Length - start);
+                if (typeName[i] == '[') depth++;
-                    break;
+                else if (typeName[i] == ']') depth--;
+                if (depth == 0) { bracketEnd = i; break; }
+            }
+            if (bracketEnd < 0) return typeName;
+
+            var inner = typeName.Substring(bracketStart, bracketEnd - bracketStart + 1);
+
+            // Replace mapped old type names (longest first to avoid partial prefix matches)
+            var sortedKeys = new List<string>(_typeOnlyMap.Keys);
+            sortedKeys.Sort((a, b) => b.Length.CompareTo(a.Length));
+            foreach (var old in sortedKeys)
+            {
+                var rep = _typeOnlyMap[old].FullName;
+                inner = inner.Replace(old + ",", rep + ",");
+                inner = inner.Replace(old + "]", rep + "]");
             }
 
-                var argFull = typeName.Substring(start + 2, end - start - 2);
+            return typeName.Substring(0, bracketStart) + inner + typeName.Substring(bracketEnd + 1);
-                var comma = argFull.IndexOf(',');
-                var argTypeName = comma >= 0 ? argFull.Substring(0, comma).Trim() : argFull.Trim();
-
-                if (_typeOnlyMap.TryGetValue(argTypeName, out var mapped))
-                    argFull = mapped.FullName + (comma >= 0 ? argFull.Substring(comma) : "");
-
-                sb.Append("[[").Append(argFull).Append("]]");
-
-                i = end + 2;
-            }
-
-            return sb.ToString();
         }
     }
 }

2DGAMELIB/_2DGAMELIB/Ser.cs

@@ -20,7 +20,8 @@ namespace _2DGAMELIB
             .Add("_2DGAMELIB.Pars", typeof(PartGroup))
             .Add("_2DGAMELIB.Out", typeof(CurveOutline))
             .Add("_2DGAMELIB.Joi", typeof(JointPoint))
-            .Add("_2DGAMELIB.Dif", typeof(MorphVariant));
+            .Add("_2DGAMELIB.Dif", typeof(MorphVariant))
+            .Add("_2DGAMELIB.Difs", typeof(VariantGrid));
 
         private static BinaryFormatter NewFormatter()
         {
@@ -36,7 +37,7 @@ namespace _2DGAMELIB
                 Formatting = Newtonsoft.Json.Formatting.Indented,
                 NullValueHandling = NullValueHandling.Ignore
             };
-            settings.Converters.Add(new OrderedDictionaryConverter<string, Difs>());
+            settings.Converters.Add(new OrderedDictionaryConverter<string, VariantGrid>());
             settings.Converters.Add(new OrderedDictionaryConverter<string, object>());
             settings.Converters.Add(new OrderedDictionaryConverter<string, But>());
             settings.Converters.Add(new OrderedDictionaryConverter<string, Lab>());

2DGAMELIB/_2DGAMELIB/VariantGrid.cs

@@ -7,7 +7,7 @@ using Newtonsoft.Json;
 namespace _2DGAMELIB
 {
     [Serializable]
-    public class Difs
+    public class VariantGrid
     {
     	public string Tag = "";
 
@@ -259,21 +259,21 @@ namespace _2DGAMELIB
     		}
     	}
 
-    	public Difs()
+    	public VariantGrid()
     	{
     	}
 
-    	public Difs(Difs Difs)
+    	public VariantGrid(VariantGrid VariantGrid)
     	{
-    		Copy(Difs);
+    		Copy(VariantGrid);
     	}
 
-    	private void Copy(Difs Difs)
+    	private void Copy(VariantGrid VariantGrid)
     	{
-    		Tag = Difs.Tag;
+    		Tag = VariantGrid.Tag;
-    		ValueX = Difs.ValueX;
+    		ValueX = VariantGrid.ValueX;
-    		ValueY = Difs.ValueY;
+    		ValueY = VariantGrid.ValueY;
-    		foreach (MorphVariant dif in Difs.difs)
+    		foreach (MorphVariant dif in VariantGrid.difs)
     		{
     			difs.Add(new MorphVariant(dif));
     		}

SlaveMatrix.Extract/Program.cs

@@ -577,24 +577,24 @@ class Program
         return result;
     }
 
-    static JObject ExportDifs(Difs difs)
+    static JObject ExportDifs(VariantGrid VariantGrid)
     {
-        int xCount = difs.CountX;
+        int xCount = VariantGrid.CountX;
-        int yCount = difs.CountY;
+        int yCount = VariantGrid.CountY;
 
         var result = new JObject
         {
-            ["Tag"] = difs.Tag ?? "",
+            ["Tag"] = VariantGrid.Tag ?? "",
-            ["ValueX"] = difs.ValueX,
+            ["ValueX"] = VariantGrid.ValueX,
-            ["ValueY"] = difs.ValueY,
+            ["ValueY"] = VariantGrid.ValueY,
             ["CountX"] = xCount,
             ["CountY"] = yCount,
-            ["Difs"] = new JArray()
+            ["VariantGrid"] = new JArray()
         };
 
         for (int x = 0; x < xCount; x++)
         {
-            var dif = difs[x];
+            var dif = VariantGrid[x];
             var difArr = new JArray();
 
             for (int y = 0; y < dif.Count; y++)
@@ -602,7 +602,7 @@ class Program
                 difArr.Add(ExportPars(dif[y]));
             }
 
-            ((JArray)result["Difs"]).Add(difArr);
+            ((JArray)result["VariantGrid"]).Add(difArr);
         }
 
         return result;

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs

@@ -384,7 +384,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "カル";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][3]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs

@@ -384,7 +384,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "ジグ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][0]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs

@@ -384,7 +384,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "ハネ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][1]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs

@@ -384,7 +384,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "パツ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][2]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs

@@ -307,7 +307,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "下げ1カル";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][7]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs

@@ -307,7 +307,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "下げ1ジグ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][4]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs

@@ -307,7 +307,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "下げ1ハネ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][5]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs

@@ -307,7 +307,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "下げ1パツ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][6]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs

@@ -351,7 +351,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "下げ2カル";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][11]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs

@@ -351,7 +351,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "下げ2ジグ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][8]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs

@@ -351,7 +351,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "下げ2ハネ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][9]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs

@@ -351,7 +351,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "下げ2パツ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][10]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs

@@ -604,7 +604,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み1カル";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][15]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs

@@ -604,7 +604,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み1ジグ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][12]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs

@@ -604,7 +604,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み1ハネ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][13]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs

@@ -604,7 +604,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み1パツ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][14]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs

@@ -1087,7 +1087,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み2カル";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][19]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs

@@ -1087,7 +1087,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み2ジグ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][16]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs

@@ -1087,7 +1087,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み2ハネ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][17]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs

@@ -1087,7 +1087,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み2パツ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][18]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs

@@ -145,7 +145,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "肢系";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][21]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs

@@ -287,7 +287,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "結い1カル";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][3]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs

@@ -287,7 +287,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "結い1ジグ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][0]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs

@@ -287,7 +287,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "結い1ハネ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][1]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs

@@ -287,7 +287,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "結い1パツ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][2]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs

@@ -264,7 +264,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "結い2カル";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][7]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs

@@ -264,7 +264,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "結い2ジグ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][4]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs

@@ -264,7 +264,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "結い2ハネ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][5]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs

@@ -264,7 +264,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "結い2パツ";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][6]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs

@@ -414,7 +414,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編結";
     		morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][20]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs

@@ -1416,7 +1416,7 @@ namespace SlaveMatrix
     	{
     		Chest Chest2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["胸郭"]);
+    		Body = new VariantGrid(Sta.胴体["胸郭"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_胸郭 = partGroup["胸郭"].ToPar();
     		PartGroup pars2 = partGroup["筋肉"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs

@@ -349,7 +349,7 @@ namespace SlaveMatrix
     	public Cough(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 咳D e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["Cough"]);
+    		Body = new VariantGrid(Sta.胴体["Cough"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_咳基 = partGroup["咳基"].ToPar();
     		X0Y0_雫1 = partGroup["雫1"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs

@@ -1037,7 +1037,7 @@ namespace SlaveMatrix
     	{
     		Head 頭2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["Head"]);
+    		Body = new VariantGrid(Sta.胴体["Head"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_Head = partGroup["頭"].ToPar();
     		PartGroup pars2 = partGroup["悪タトゥ"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs

@@ -5757,7 +5757,7 @@ namespace SlaveMatrix
     		Leg_人 Leg_人2 = this;
     		ThisType = GetType();
             //Leg but if renamed to Leg it broke game
-    		Body = new Difs(Sta.脚左["Leg"]);
+    		Body = new VariantGrid(Sta.脚左["Leg"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_Leg = partGroup["脚"].ToPar();
     		X0Y0_筋 = partGroup["筋"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs

@@ -276,7 +276,7 @@ namespace SlaveMatrix
     		Leg_獣 Leg_獣2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][0]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs

@@ -654,7 +654,7 @@ namespace SlaveMatrix
     		Leg_竜 Leg_竜2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][3]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs

@@ -276,7 +276,7 @@ namespace SlaveMatrix
     		Leg_蹄 Leg_蹄2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][1]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs

@@ -276,7 +276,7 @@ namespace SlaveMatrix
     		Leg_鳥 Leg_鳥2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][2]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs

@@ -4626,7 +4626,7 @@ namespace SlaveMatrix
     	{
     		LowerArm_人 LowerArm_人2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.腕左["LowerArm"]);
+    		Body = new VariantGrid(Sta.腕左["LowerArm"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_LowerArm = partGroup["下腕"].ToPar();
     		PartGroup pars2 = partGroup["筋肉"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs

@@ -457,7 +457,7 @@ namespace SlaveMatrix
     		LowerArm_獣 LowerArm_獣2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足LowerArm"][0]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs

@@ -564,7 +564,7 @@ namespace SlaveMatrix
     	{
     		LowerArm_蝙 LowerArm_蝙2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.腕左["獣翼LowerArm"]);
+    		Body = new VariantGrid(Sta.腕左["獣翼LowerArm"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_獣翼LowerArm = partGroup["獣翼下腕"].ToPar();
     		PartGroup pars2 = partGroup["鱗"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs

@@ -147,7 +147,7 @@ namespace SlaveMatrix
     		LowerArm_蹄 LowerArm_蹄2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足LowerArm"][1]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs

@@ -2079,7 +2079,7 @@ namespace SlaveMatrix
     	{
     		LowerArm_鳥 LowerArm_鳥2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.腕左["鳥翼LowerArm"]);
+    		Body = new VariantGrid(Sta.腕左["鳥翼LowerArm"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_鳥翼LowerArm = partGroup["鳥翼下腕"].ToPar();
     		PartGroup pars2 = partGroup["風切羽"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs

@@ -1173,7 +1173,7 @@ namespace SlaveMatrix
     	{
     		Neck Neck2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["Neck"]);
+    		Body = new VariantGrid(Sta.胴体["Neck"]);
     		PartGroup partGroup = Body[0][0];
     		PartGroup pars2 = partGroup["植性"].ToPars();
     		X0Y0_植性_蔦 = pars2["蔦"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs

@@ -311,7 +311,7 @@ namespace SlaveMatrix
     	{
     		Shoulder Shoulder2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.肩左["Shoulder"]);
+    		Body = new VariantGrid(Sta.肩左["Shoulder"]);
     		PartGroup partGroup = Body[0][0];
     		PartGroup pars2 = partGroup["脇"].ToPars();
     		X0Y0_脇_脇 = pars2["脇"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs

@@ -147,7 +147,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "カル";
     		morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][3]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs

@@ -147,7 +147,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "ジグ";
     		morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][0]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs

@@ -147,7 +147,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "ハネ";
     		morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][1]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs

@@ -147,7 +147,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "パツ";
     		morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][2]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs

@@ -420,7 +420,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "編み";
     		morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][4]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs

@@ -95,7 +95,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = "肢系";
     		morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][5]));
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs

@@ -292,7 +292,7 @@ namespace SlaveMatrix
     		Torso Torso2 = this;
     		ThisType = GetType();
             //This had no Torso (胴体)
-            Body = new Difs(Sta.胴体["Torso"]);
+            Body = new VariantGrid(Sta.胴体["Torso"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_Torso = partGroup["胴"].ToPar();
     		PartGroup pars2 = partGroup["筋肉"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs

@@ -337,7 +337,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = partGroup.Tag;
     		morphVariant.Add(partGroup);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup pars2 = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs

@@ -484,7 +484,7 @@ namespace SlaveMatrix
     		MorphVariant morphVariant = new MorphVariant();
     		morphVariant.Tag = partGroup.Tag;
     		morphVariant.Add(partGroup);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup pars2 = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs

@@ -485,7 +485,7 @@ namespace SlaveMatrix
     	public T剃刀(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, T剃刀D e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["T字剃刀"]);
+    		Body = new VariantGrid(Sta.カーソル["T字剃刀"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_ヘッド = partGroup["ヘッド"].ToPar();
     		PartGroup pars2 = partGroup["刃"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs

@@ -3447,7 +3447,7 @@ namespace SlaveMatrix
     	{
     		UpperArm_人 UpperArm_人2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.腕左["UpperArm"]);
+    		Body = new VariantGrid(Sta.腕左["UpperArm"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_筋肉上 = partGroup["筋肉上"].ToPar();
     		X0Y0_UpperArm = partGroup["上腕"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs

@@ -273,7 +273,7 @@ namespace SlaveMatrix
     		UpperArm_獣 UpperArm_獣2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足UpperArm"][0]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs

@@ -513,7 +513,7 @@ namespace SlaveMatrix
     		飛膜 = new 飛膜_根(DisUnit, 配色指定, 体配色);
     		飛膜.Par = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.腕左["獣翼UpperArm"]);
+    		Body = new VariantGrid(Sta.腕左["獣翼UpperArm"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_獣翼UpperArm = partGroup["獣翼上腕"].ToPar();
     		PartGroup pars2 = partGroup["鱗"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs

@@ -147,7 +147,7 @@ namespace SlaveMatrix
     		UpperArm_蹄 UpperArm_蹄2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足UpperArm"][1]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs

@@ -404,7 +404,7 @@ namespace SlaveMatrix
     	{
     		UpperArm_鳥 UpperArm_鳥2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.腕左["鳥翼UpperArm"]);
+    		Body = new VariantGrid(Sta.腕左["鳥翼UpperArm"]);
     		PartGroup partGroup = Body[0][0];
     		PartGroup pars2 = partGroup["風切羽"].ToPars();
     		X0Y0_風切羽_羽3 = pars2["羽3"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs

@@ -2155,7 +2155,7 @@ namespace SlaveMatrix
     	{
     		Waist Waist2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["Waist"]);
+    		Body = new VariantGrid(Sta.胴体["Waist"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_Waist = partGroup["腰"].ToPar();
     		X0Y0_股 = partGroup["股"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs

@@ -111,7 +111,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.スタンプ["ぶっかけ"][1]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs

@@ -111,7 +111,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.スタンプ["ぶっかけ"][0]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs

@@ -86,7 +86,7 @@ namespace SlaveMatrix
     	public キスマーク(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キスマークD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.スタンプ["キスマーク"]);
+    		Body = new VariantGrid(Sta.スタンプ["キスマーク"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_キスマーク = partGroup["キスマーク"].ToPar();
     		Body.SetJoints();

SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs

@@ -121,7 +121,7 @@ namespace SlaveMatrix
     	public キャップ1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キャップ1D e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.性器付["キャップ中"]);
+    		Body = new VariantGrid(Sta.性器付["キャップ中"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_根本 = partGroup["根本"].ToPar();
     		X0Y0_先端 = partGroup["先端"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs

@@ -121,7 +121,7 @@ namespace SlaveMatrix
     	public キャップ2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キャップ2D e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["キャップ左"]);
+    		Body = new VariantGrid(Sta.胴体["キャップ左"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_根本 = partGroup["根本"].ToPar();
     		X0Y0_先端 = partGroup["先端"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs

@@ -3798,7 +3798,7 @@ namespace SlaveMatrix
     	public ハンド(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, ハンドD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["ハンド"]);
+    		Body = new VariantGrid(Sta.カーソル["ハンド"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_親指 = partGroup["親指"].ToPar();
     		X0Y0_手 = partGroup["手"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs

@@ -560,7 +560,7 @@ namespace SlaveMatrix
     	public バイブ_アナル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_アナルD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["アナル"]);
+    		Body = new VariantGrid(Sta.カーソル["アナル"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_ヘッド = partGroup["ヘッド"].ToPar();
     		PartGroup pars2 = partGroup["ユニット"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs

@@ -974,7 +974,7 @@ namespace SlaveMatrix
     	public バイブ_コモン(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_コモンD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["コモン"]);
+    		Body = new VariantGrid(Sta.カーソル["コモン"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_ヘッド = partGroup["ヘッド"].ToPar();
     		X0Y0_イボ1 = partGroup["イボ1"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs

@@ -683,7 +683,7 @@ namespace SlaveMatrix
     	public バイブ_ディル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_ディルD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["ディル"]);
+    		Body = new VariantGrid(Sta.カーソル["ディル"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_ヘッド = partGroup["ヘッド"].ToPar();
     		X0Y0_血管1 = partGroup["血管1"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs

@@ -806,7 +806,7 @@ namespace SlaveMatrix
     	public バイブ_デンマ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_デンマD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["デンマ"]);
+    		Body = new VariantGrid(Sta.カーソル["デンマ"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_ヘッド = partGroup["ヘッド"].ToPar();
     		X0Y0_ヘッド線1 = partGroup["ヘッド線1"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs

@@ -2645,7 +2645,7 @@ namespace SlaveMatrix
     	public バイブ_ドリル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_ドリルD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["ドリル"]);
+    		Body = new VariantGrid(Sta.カーソル["ドリル"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_ヘッド = partGroup["ヘッド"].ToPar();
     		X0Y0_イボ1 = partGroup["イボ1"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs

@@ -995,7 +995,7 @@ namespace SlaveMatrix
     	public パール(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, パールD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["パール"]);
+    		Body = new VariantGrid(Sta.カーソル["パール"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_軸 = partGroup["軸"].ToPar();
     		X0Y0_玉境界 = partGroup["玉境界"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs

@@ -100,7 +100,7 @@ namespace SlaveMatrix
     	public ピアス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ピアスD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.性器付["ピアス"]);
+    		Body = new VariantGrid(Sta.性器付["ピアス"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_ピアス = partGroup["ピアス"].ToPar();
     		Body.SetJoints();

SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs

@@ -436,7 +436,7 @@ namespace SlaveMatrix
     	{
     		ペニス ペニス2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["ペニス"]);
+    		Body = new VariantGrid(Sta.カーソル["ペニス"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_陰嚢 = partGroup["陰嚢"].ToPar();
     		X0Y0_陰茎 = partGroup["陰茎"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs

@@ -422,7 +422,7 @@ namespace SlaveMatrix
     	{
     		ボテ腹_人 ボテ腹_人2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["ボテ腹"]);
+    		Body = new VariantGrid(Sta.胴体["ボテ腹"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_腹 = partGroup["腹"].ToPar();
     		X0Y0_ハイライト = partGroup["ハイライト"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs

@@ -161,7 +161,7 @@ namespace SlaveMatrix
     	{
     		ボテ腹_獣 ボテ腹_獣2 = this;
     		ThisType = GetType();
-    		Body = new Difs(Sta.半身["四足ボテ腹"]);
+    		Body = new VariantGrid(Sta.半身["四足ボテ腹"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_腹 = partGroup["腹"].ToPar();
     		X0Y0_臍 = partGroup["臍"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs

@@ -425,7 +425,7 @@ namespace SlaveMatrix
     	public ボテ腹板(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ボテ腹板D e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["ボテ腹板"]);
+    		Body = new VariantGrid(Sta.胴体["ボテ腹板"]);
     		PartGroup partGroup = Body[0][0];
     		PartGroup pars2 = partGroup["腹板4"].ToPars();
     		X0Y0_腹板4_腹板 = pars2["腹板"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs

@@ -332,7 +332,7 @@ namespace SlaveMatrix
     	public マウス(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, マウスD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["マウス"]);
+    		Body = new VariantGrid(Sta.カーソル["マウス"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_上唇 = partGroup["上唇"].ToPar();
     		X0Y0_下唇 = partGroup["下唇"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs

@@ -189,7 +189,7 @@ namespace SlaveMatrix
     	public ロータ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ロータD e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.カーソル["ロータ"]);
+    		Body = new VariantGrid(Sta.カーソル["ロータ"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_ロータ = partGroup["ロータ"].ToPar();
     		X0Y0_ロータ線 = partGroup["ロータ線"].ToPar();

SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs

@@ -698,7 +698,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着トップ"][2]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs

@@ -647,7 +647,7 @@ namespace SlaveMatrix
     		上着ボトム_クロス 上着ボトム_クロス2 = this;
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ボトム前"][0]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs

@@ -172,7 +172,7 @@ namespace SlaveMatrix
     	public 上着ボトム_クロス後(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着ボトム_クロス後D e)
     	{
     		ThisType = GetType();
-    		Body = new Difs(Sta.胴体["上着ボトム後"]);
+    		Body = new VariantGrid(Sta.胴体["上着ボトム後"]);
     		PartGroup partGroup = Body[0][0];
     		X0Y0_下地 = partGroup["下地"].ToPar();
     		PartGroup pars2 = partGroup["染み"].ToPars();

SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs

@@ -373,7 +373,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ボトム前"][1]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs

@@ -325,7 +325,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ミドル"][2]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs

@@ -592,7 +592,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][4]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs

@@ -536,7 +536,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][3]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs

@@ -448,7 +448,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][1]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs

@@ -2303,7 +2303,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][0]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs

@@ -448,7 +448,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][2]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];

SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs

@@ -2713,7 +2713,7 @@ namespace SlaveMatrix
     	{
     		ThisType = GetType();
     		MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着ボトム"][0]);
-    		Body = new Difs();
+    		Body = new VariantGrid();
     		Body.Tag = morphVariant.Tag;
     		Body.Add(morphVariant);
     		PartGroup partGroup = Body[0][0];