Added rename SideHair

2DGAMELIB/_2DGAMELIB/ObjExtensions.cs

@@ -15,7 +15,8 @@ namespace _2DGAMELIB
             ["首"] = "Neck",
             ["頭"] = "Head",
             ["後髪0"] = "BackHair0",
-            ["後髪1"] = "BackHair1"
+            ["後髪1"] = "BackHair1",
+            ["横髪"] = "SideHair"
         };
 
         public static void MigrateKeys(this Obj obj)

SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs

@@ -46,7 +46,7 @@ namespace SlaveMatrix
     	BackHair0_肢系_右3_接続,
     	BackHair0_肢系_右4_接続,
     	BackHair0_肢系_右5_接続,
-    	横髪_肢系_肢_接続,
+    	SideHair_肢系_肢_接続,
     	双目_瞼_接続,
     	瞼_宇_涙_接続,
     	単目_瞼_接続,

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair.cs

@@ -1,6 +1,6 @@
 namespace SlaveMatrix
 {
-    public class 横髪 : Ele
+    public class SideHair : Ele
     {
     	public override double 肥大
     	{

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHairD.cs

@@ -3,7 +3,7 @@ using System;
 namespace SlaveMatrix
 {
     [Serializable]
-    public class 横髪D : EleD
+    public class SideHairD : EleD
     {
     }
 }

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs

@@ -2,7 +2,7 @@ using _2DGAMELIB;
 
 namespace SlaveMatrix
 {
-    public class 横髪_カル : 横髪
+    public class SideHair_カル : SideHair
     {
     	public Par X0Y0_髪1;
 
@@ -141,7 +141,7 @@ namespace SlaveMatrix
     		}
     	}
 
-    	public 横髪_カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_カルD e)
+    	public SideHair_カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, SideHair_カルD e)
     	{
     		ThisType = GetType();
     		Dif dif = new Dif();

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs

@@ -4,7 +4,7 @@ using _2DGAMELIB;
 namespace SlaveMatrix
 {
     [Serializable]
-    public class 横髪_ジグD : 横髪D
+    public class SideHair_カルD : SideHairD
     {
     	public bool 髪1_表示 = true;
 
@@ -18,12 +18,12 @@ namespace SlaveMatrix
 
     	public double 広がり;
 
-    	public 横髪_ジグD()
+    	public SideHair_カルD()
     	{
     		ThisType = GetType();
     	}
 
-    	public 横髪_ジグD SetRandom()
+    	public SideHair_カルD SetRandom()
     	{
     		髪長1 = RNG.XS.NextDouble();
     		髪長2 = RNG.XS.NextDouble();
@@ -36,7 +36,7 @@ namespace SlaveMatrix
 
     	public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色)
     	{
-    		return new 横髪_ジグ(DisUnit, 配色指定, 体配色, Med, this);
+    		return new SideHair_カル(DisUnit, 配色指定, 体配色, Med, this);
     	}
     }
 }

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs

@@ -2,7 +2,7 @@ using _2DGAMELIB;
 
 namespace SlaveMatrix
 {
-    public class 横髪_ジグ : 横髪
+    public class SideHair_ジグ : SideHair
     {
     	public Par X0Y0_髪1;
 
@@ -141,7 +141,7 @@ namespace SlaveMatrix
     		}
     	}
 
-    	public 横髪_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_ジグD e)
+    	public SideHair_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, SideHair_ジグD e)
     	{
     		ThisType = GetType();
     		Dif dif = new Dif();

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs

@@ -4,7 +4,7 @@ using _2DGAMELIB;
 namespace SlaveMatrix
 {
     [Serializable]
-    public class 横髪_ハネD : 横髪D
+    public class SideHair_ジグD : SideHairD
     {
     	public bool 髪1_表示 = true;
 
@@ -18,12 +18,12 @@ namespace SlaveMatrix
 
     	public double 広がり;
 
-    	public 横髪_ハネD()
+    	public SideHair_ジグD()
     	{
     		ThisType = GetType();
     	}
 
-    	public 横髪_ハネD SetRandom()
+    	public SideHair_ジグD SetRandom()
     	{
     		髪長1 = RNG.XS.NextDouble();
     		髪長2 = RNG.XS.NextDouble();
@@ -36,7 +36,7 @@ namespace SlaveMatrix
 
     	public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色)
     	{
-    		return new 横髪_ハネ(DisUnit, 配色指定, 体配色, Med, this);
+    		return new SideHair_ジグ(DisUnit, 配色指定, 体配色, Med, this);
     	}
     }
 }

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs

@@ -2,7 +2,7 @@ using _2DGAMELIB;
 
 namespace SlaveMatrix
 {
-    public class 横髪_ハネ : 横髪
+    public class SideHair_ハネ : SideHair
     {
     	public Par X0Y0_髪1;
 
@@ -141,7 +141,7 @@ namespace SlaveMatrix
     		}
     	}
 
-    	public 横髪_ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_ハネD e)
+    	public SideHair_ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, SideHair_ハネD e)
     	{
     		ThisType = GetType();
     		Dif dif = new Dif();

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs

@@ -4,7 +4,7 @@ using _2DGAMELIB;
 namespace SlaveMatrix
 {
     [Serializable]
-    public class 横髪_パツD : 横髪D
+    public class SideHair_ハネD : SideHairD
     {
     	public bool 髪1_表示 = true;
 
@@ -18,12 +18,12 @@ namespace SlaveMatrix
 
     	public double 広がり;
 
-    	public 横髪_パツD()
+    	public SideHair_ハネD()
     	{
     		ThisType = GetType();
     	}
 
-    	public 横髪_パツD SetRandom()
+    	public SideHair_ハネD SetRandom()
     	{
     		髪長1 = RNG.XS.NextDouble();
     		髪長2 = RNG.XS.NextDouble();
@@ -36,7 +36,7 @@ namespace SlaveMatrix
 
     	public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色)
     	{
-    		return new 横髪_パツ(DisUnit, 配色指定, 体配色, Med, this);
+    		return new SideHair_ハネ(DisUnit, 配色指定, 体配色, Med, this);
     	}
     }
 }

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs

@@ -2,7 +2,7 @@ using _2DGAMELIB;
 
 namespace SlaveMatrix
 {
-    public class 横髪_パツ : 横髪
+    public class SideHair_パツ : SideHair
     {
     	public Par X0Y0_髪1;
 
@@ -141,7 +141,7 @@ namespace SlaveMatrix
     		}
     	}
 
-    	public 横髪_パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_パツD e)
+    	public SideHair_パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, SideHair_パツD e)
     	{
     		ThisType = GetType();
     		Dif dif = new Dif();

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs

@@ -4,7 +4,7 @@ using _2DGAMELIB;
 namespace SlaveMatrix
 {
     [Serializable]
-    public class 横髪_カルD : 横髪D
+    public class SideHair_パツD : SideHairD
     {
     	public bool 髪1_表示 = true;
 
@@ -18,12 +18,12 @@ namespace SlaveMatrix
 
     	public double 広がり;
 
-    	public 横髪_カルD()
+    	public SideHair_パツD()
     	{
     		ThisType = GetType();
     	}
 
-    	public 横髪_カルD SetRandom()
+    	public SideHair_パツD SetRandom()
     	{
     		髪長1 = RNG.XS.NextDouble();
     		髪長2 = RNG.XS.NextDouble();
@@ -36,7 +36,7 @@ namespace SlaveMatrix
 
     	public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色)
     	{
-    		return new 横髪_カル(DisUnit, 配色指定, 体配色, Med, this);
+    		return new SideHair_パツ(DisUnit, 配色指定, 体配色, Med, this);
     	}
     }
 }

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs

@@ -2,7 +2,7 @@ using _2DGAMELIB;
 
 namespace SlaveMatrix
 {
-    public class 横髪_編み : 横髪
+    public class SideHair_編み : SideHair
     {
     	public Par X0Y0_髪;
 
@@ -414,7 +414,7 @@ namespace SlaveMatrix
     		}
     	}
 
-    	public 横髪_編み(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_編みD e)
+    	public SideHair_編み(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, SideHair_編みD e)
     	{
     		ThisType = GetType();
     		Dif dif = new Dif();

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs

@@ -4,7 +4,7 @@ using _2DGAMELIB;
 namespace SlaveMatrix
 {
     [Serializable]
-    public class 横髪_編みD : 横髪D
+    public class SideHair_編みD : SideHairD
     {
     	public bool 髪_表示 = true;
 
@@ -42,12 +42,12 @@ namespace SlaveMatrix
 
     	public double 広がり;
 
-    	public 横髪_編みD()
+    	public SideHair_編みD()
     	{
     		ThisType = GetType();
     	}
 
-    	public 横髪_編みD SetRandom()
+    	public SideHair_編みD SetRandom()
     	{
     		髪長1 = RNG.XS.NextDouble();
     		髪長2 = RNG.XS.NextDouble();
@@ -60,7 +60,7 @@ namespace SlaveMatrix
 
     	public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色)
     	{
-    		return new 横髪_編み(DisUnit, 配色指定, 体配色, Med, this);
+    		return new SideHair_編み(DisUnit, 配色指定, 体配色, Med, this);
     	}
     }
 }

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs

@@ -3,7 +3,7 @@ using _2DGAMELIB;
 
 namespace SlaveMatrix
 {
-    public class 横髪_肢系 : 横髪
+    public class SideHair_肢系 : SideHair
     {
     	public Par X0Y0_髪;
 
@@ -88,9 +88,9 @@ namespace SlaveMatrix
 
     	public JointS 肢_接続点 => new JointS(本体, X0Y0_髪, 0);
 
-    	public 横髪_肢系(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_肢系D e)
+    	public SideHair_肢系(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, SideHair_肢系D e)
     	{
-    		横髪_肢系 横髪_肢系2 = this;
+    		SideHair_肢系 横髪_肢系2 = this;
     		ThisType = GetType();
     		Dif dif = new Dif();
     		dif.Tag = "肢系";
@@ -139,7 +139,7 @@ namespace SlaveMatrix
     			{
     				f = g.GetEle(DisUnit, Med, 体配色);
     				f.Par = 横髪_肢系2;
-    				f.ConnectionType = ConnectionInfo.横髪_肢系_肢_接続;
+    				f.ConnectionType = ConnectionInfo.SideHair_肢系_肢_接続;
     				f.接続(横髪_肢系2.肢_接続点);
     				return f;
     			}).ToArray();

SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs

@@ -5,13 +5,13 @@ using _2DGAMELIB;
 namespace SlaveMatrix
 {
     [Serializable]
-    public class 横髪_肢系D : 横髪D
+    public class SideHair_肢系D : SideHairD
     {
     	public bool 髪_表示 = true;
 
     	public List<EleD> 肢_接続 = new List<EleD>();
 
-    	public 横髪_肢系D()
+    	public SideHair_肢系D()
     	{
     		ThisType = GetType();
     	}
@@ -20,7 +20,7 @@ namespace SlaveMatrix
     	{
     		肢_接続.Add(e);
     		e.Par = this;
-    		e.接続情報 = ConnectionInfo.横髪_肢系_肢_接続;
+    		e.接続情報 = ConnectionInfo.SideHair_肢系_肢_接続;
     	}
 
     	public EleD SetRandom()
@@ -30,7 +30,7 @@ namespace SlaveMatrix
 
     	public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色)
     	{
-    		return new 横髪_肢系(DisUnit, 配色指定, 体配色, Med, this);
+    		return new SideHair_肢系(DisUnit, 配色指定, 体配色, Med, this);
     	}
     }
 }

SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs

@@ -1928,7 +1928,7 @@ namespace SlaveMatrix
     					後髪1D3.AlignR();
     				}
     			}
-    			横髪D 横髪D2 = Mix<横髪D>(母方, 父方, 右: false, i, 原種モード);
+    			SideHairD 横髪D2 = Mix<SideHairD>(母方, 父方, 右: false, i, 原種モード);
     			基髪D2.横髪左接続(横髪D2);
     			横髪D2.AlignR();
     			基髪D2.横髪右接続(横髪D2.Get逆());

SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs

@@ -66,9 +66,9 @@ namespace SlaveMatrix
 
     	public 前髪 前髪;
 
-    	public 横髪 横髪左;
+    	public SideHair 横髪左;
 
-    	public 横髪 横髪右;
+    	public SideHair 横髪右;
 
     	public BackHair1 後髪1;
 
@@ -2176,16 +2176,16 @@ namespace SlaveMatrix
     		set
     		{
     			横髪髪留i = value;
-    			if (横髪左 != null && 横髪左 is 横髪_編み)
+    			if (横髪左 != null && 横髪左 is SideHair_編み)
     			{
-    				横髪_編み obj = (横髪_編み)横髪左;
+    				SideHair_編み obj = (SideHair_編み)横髪左;
     				obj.髪縛1_表示 = value.髪留左.髪縛1_表示;
     				obj.髪縛2_表示 = value.髪留左.髪縛2_表示;
     				obj.髪留配色(value.髪留左.色);
     			}
-    			if (横髪右 != null && 横髪右 is 横髪_編み)
+    			if (横髪右 != null && 横髪右 is SideHair_編み)
     			{
-    				横髪_編み obj2 = (横髪_編み)横髪右;
+    				SideHair_編み obj2 = (SideHair_編み)横髪右;
     				obj2.髪縛1_表示 = value.髪留右.髪縛1_表示;
     				obj2.髪縛2_表示 = value.髪留右.髪縛2_表示;
     				obj2.髪留配色(value.髪留右.色);
@@ -4053,8 +4053,8 @@ namespace SlaveMatrix
     		if (基髪 != null)
     		{
     			前髪 = 基髪.前髪_接続.GetEle<前髪>();
-    			横髪左 = 基髪.横髪左_接続.GetEle<横髪>();
+    			横髪左 = 基髪.横髪左_接続.GetEle<SideHair>();
-    			横髪右 = 基髪.横髪右_接続.GetEle<横髪>();
+    			横髪右 = 基髪.横髪右_接続.GetEle<SideHair>();
     			後髪1 = 基髪.後髪_接続.GetEle<BackHair1>();
     			後髪0 = 基髪.後髪_接続.GetEle<BackHair0>();
     		}
@@ -4138,7 +4138,7 @@ namespace SlaveMatrix
     			Sort((from e in 基髪.頭頂左_接続.GetEles<植>()
     				select e.EnumEle()).JoinEnum(), 植左接続);
     			Sort((from e in 基髪.頭頂左_接続
-    				where !(e is 角2) && !(e is 獣耳) && !(e is 植) && !(e is 横髪)
+    				where !(e is 角2) && !(e is 獣耳) && !(e is 植) && !(e is SideHair)
     				select e.EnumEle()).JoinEnum(), 頭頂左後接続);
     		}
     		if (基髪.頭頂右_接続 != null)
@@ -4148,7 +4148,7 @@ namespace SlaveMatrix
     			Sort((from e in 基髪.頭頂右_接続.GetEles<植>()
     				select e.EnumEle()).JoinEnum(), 植右接続);
     			Sort((from e in 基髪.頭頂右_接続
-    				where !(e is 角2) && !(e is 獣耳) && !(e is 植) && !(e is 横髪)
+    				where !(e is 角2) && !(e is 獣耳) && !(e is 植) && !(e is SideHair)
     				select e.EnumEle()).JoinEnum(), 頭頂右後接続);
     		}
     		if (頭.顔面_接続 != null)

SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs

@@ -2067,7 +2067,7 @@ namespace SlaveMatrix
                 {
                     result.c = ContactType.Face;
                 }
-                else if (result.e is 横髪 || result.e is BackHair0 || result.e is BackHair1 || result.e is 基髪)
+                else if (result.e is SideHair || result.e is BackHair0 || result.e is BackHair1 || result.e is 基髪)
                 {
                     result.c = ContactType.Hair;
                 }

SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs

@@ -576,7 +576,7 @@ namespace SlaveMatrix
     		ConnectionInfo.BackHair0_肢系_右3_接続 => 1, 
     		ConnectionInfo.BackHair0_肢系_右4_接続 => 1, 
     		ConnectionInfo.BackHair0_肢系_右5_接続 => 1, 
-    		ConnectionInfo.横髪_肢系_肢_接続 => 1, 
+    		ConnectionInfo.SideHair_肢系_肢_接続 => 1, 
     		ConnectionInfo.双目_瞼_接続 => 1, 
     		ConnectionInfo.瞼_宇_涙_接続 => 1, 
     		ConnectionInfo.単目_瞼_接続 => 1, 

SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs

@@ -14,7 +14,7 @@ namespace SlaveMatrix
     	{
     		foreach (EleD item in 頭.EnumEleD())
     		{
-    			if (!(item is 後髪0D) && !(item is BackHair1D) && !(item is 横髪D) && !(item is 前髪D))
+    			if (!(item is 後髪0D) && !(item is BackHair1D) && !(item is SideHairD) && !(item is 前髪D))
     			{
     				item.尺度B *= 0.98;
     			}
@@ -4938,7 +4938,7 @@ namespace SlaveMatrix
     			広がり = 1.0
     		};
     		hair_description.後髪接続(backhair_description);
-    		横髪_カルD sidehair_description = new 横髪_カルD
+    		SideHair_カルD sidehair_description = new SideHair_カルD
     		{
     			髪長1 = 1.0,
     			髪長2 = 1.0,

SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs

@@ -182,27 +182,27 @@ namespace SlaveMatrix.GameClasses
         {
             return RNG.XS.NextM(5) switch
             {
-                0 => new 横髪_ジグD
+                0 => new SideHair_ジグD
                 {
                     右 = 右
                 }.SetRandom(),
-                1 => new 横髪_ハネD
+                1 => new SideHair_ハネD
                 {
                     右 = 右
                 }.SetRandom(),
-                2 => new 横髪_パツD
+                2 => new SideHair_パツD
                 {
                     右 = 右
                 }.SetRandom(),
-                3 => new 横髪_カルD
+                3 => new SideHair_カルD
                 {
                     右 = 右
                 }.SetRandom(),
-                4 => new 横髪_編みD
+                4 => new SideHair_編みD
                 {
                     右 = 右
                 }.SetRandom(),
-                _ => new 横髪_肢系D
+                _ => new SideHair_肢系D
                 {
                     右 = 右
                 },