Added rename Chest

This commit is contained in:
Absolutely disgusting
2025-11-04 09:39:25 +04:00
parent b7cd096825
commit b8fb901c18
23 changed files with 481 additions and 481 deletions

View File

@@ -19,8 +19,8 @@ namespace _2DGAMELIB
["横髪"] = "SideHair", ["横髪"] = "SideHair",
["脚"] = "Leg", ["脚"] = "Leg",
//["腕"] = "Arm" //["腕"] = "Arm"
["肩"] = "Shoulder" ["肩"] = "Shoulder",
//["胸"] = "Chest", ["胸"] = "Chest",
//["乳房"] = "Breast", //["乳房"] = "Breast",
//["腹"] = "Abdomen", //["腹"] = "Abdomen",
//["顔"] = "Face", //["顔"] = "Face",

View File

@@ -3,7 +3,7 @@ using _2DGAMELIB;
namespace SlaveMatrix namespace SlaveMatrix
{ {
public class : Ele public class Chest : Ele
{ {
public Par X0Y0_胸郭; public Par X0Y0_胸郭;
@@ -1412,9 +1412,9 @@ namespace SlaveMatrix
public JointS _接続点 => new JointS(, X0Y0_胸郭, 10); public JointS _接続点 => new JointS(, X0Y0_胸郭, 10);
public (double DisUnit, , , Med Med, D e) public Chest(double DisUnit, , , Med Med, ChestD e)
{ {
2 = this; Chest Chest2 = this;
ThisType = GetType(); ThisType = GetType();
= new Difs(Sta.["胸郭"]); = new Difs(Sta.["胸郭"]);
Pars pars = [0][0]; Pars pars = [0][0];
@@ -1596,9 +1596,9 @@ namespace SlaveMatrix
Neck_接続 = e.Neck_接続.Select(delegate(EleD g) Neck_接続 = e.Neck_接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._Neck_接続; f.ConnectionType = ConnectionInfo.Chest_Neck_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1607,9 +1607,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._肩左_接続; f.ConnectionType = ConnectionInfo.Chest_肩左_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1618,9 +1618,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._肩右_接続; f.ConnectionType = ConnectionInfo.Chest_肩右_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1629,9 +1629,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._胸左_接続; f.ConnectionType = ConnectionInfo.Chest_胸左_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1640,9 +1640,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._胸右_接続; f.ConnectionType = ConnectionInfo.Chest_胸右_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1651,9 +1651,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._肌_接続; f.ConnectionType = ConnectionInfo.Chest_肌_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1662,9 +1662,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._翼上左_接続; f.ConnectionType = ConnectionInfo.Chest_翼上左_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1673,9 +1673,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._翼上右_接続; f.ConnectionType = ConnectionInfo.Chest_翼上右_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1684,9 +1684,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._翼下左_接続; f.ConnectionType = ConnectionInfo.Chest_翼下左_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1695,9 +1695,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._翼下右_接続; f.ConnectionType = ConnectionInfo.Chest_翼下右_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }
@@ -1706,9 +1706,9 @@ namespace SlaveMatrix
_接続 = e._接続.Select(delegate(EleD g) _接続 = e._接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = Chest2;
f.ConnectionType = ConnectionInfo._背中_接続; f.ConnectionType = ConnectionInfo.Chest_背中_接続;
f.(2._接続点); f.(Chest2._接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }

View File

@@ -5,7 +5,7 @@ using _2DGAMELIB;
namespace SlaveMatrix namespace SlaveMatrix
{ {
[Serializable] [Serializable]
public class D : EleD public class ChestD : EleD
{ {
public bool _表示 = true; public bool _表示 = true;
@@ -155,7 +155,7 @@ namespace SlaveMatrix
public List<EleD> _接続 = new List<EleD>(); public List<EleD> _接続 = new List<EleD>();
public D() public ChestD()
{ {
ThisType = GetType(); ThisType = GetType();
} }
@@ -164,49 +164,49 @@ namespace SlaveMatrix
{ {
Neck_接続.Add(e); Neck_接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._Neck_接続; e. = ConnectionInfo.Chest_Neck_接続;
} }
public void (EleD e) public void (EleD e)
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._肩左_接続; e. = ConnectionInfo.Chest_肩左_接続;
} }
public void (EleD e) public void (EleD e)
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._肩右_接続; e. = ConnectionInfo.Chest_肩右_接続;
} }
public void (EleD e) public void (EleD e)
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._胸左_接続; e. = ConnectionInfo.Chest_胸左_接続;
} }
public void (EleD e) public void (EleD e)
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._胸右_接続; e. = ConnectionInfo.Chest_胸右_接続;
} }
public void (EleD e) public void (EleD e)
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._肌_接続; e. = ConnectionInfo.Chest_肌_接続;
} }
public void (EleD e) public void (EleD e)
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._翼上左_接続; e. = ConnectionInfo.Chest_翼上左_接続;
if (!(e is D)) if (!(e is D))
{ {
return; return;
@@ -221,7 +221,7 @@ namespace SlaveMatrix
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._翼上右_接続; e. = ConnectionInfo.Chest_翼上右_接続;
if (!(e is D)) if (!(e is D))
{ {
return; return;
@@ -236,7 +236,7 @@ namespace SlaveMatrix
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._翼下左_接続; e. = ConnectionInfo.Chest_翼下左_接続;
if (!(e is D)) if (!(e is D))
{ {
return; return;
@@ -251,7 +251,7 @@ namespace SlaveMatrix
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._翼下右_接続; e. = ConnectionInfo.Chest_翼下右_接続;
if (!(e is D)) if (!(e is D))
{ {
return; return;
@@ -266,7 +266,7 @@ namespace SlaveMatrix
{ {
_接続.Add(e); _接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo._背中_接続; e. = ConnectionInfo.Chest_背中_接続;
foreach (EleD item in e.EnumEleD()) foreach (EleD item in e.EnumEleD())
{ {
item.B = 1.0; item.B = 1.0;
@@ -275,7 +275,7 @@ namespace SlaveMatrix
public override Ele GetEle(double DisUnit, Med Med, ) public override Ele GetEle(double DisUnit, Med Med, )
{ {
return new (DisUnit, , , Med, this); return new Chest(DisUnit, , , Med, this);
} }
} }
} }

View File

@@ -58,20 +58,20 @@ namespace SlaveMatrix
_獣_鼻水右_接続, _獣_鼻水右_接続,
_吹出し_接続, _吹出し_接続,
Neck_Head_接続, Neck_Head_接続,
_Neck_接続, Chest_Neck_接続,
_肩左_接続, Chest_肩左_接続,
_肩右_接続, Chest_肩右_接続,
_胸左_接続, Chest_胸左_接続,
_胸右_接続, Chest_胸右_接続,
_肌_接続, Chest_肌_接続,
_翼上左_接続, Chest_翼上左_接続,
_翼上右_接続, Chest_翼上右_接続,
_翼下左_接続, Chest_翼下左_接続,
_翼下右_接続, Chest_翼下右_接続,
_背中_接続, Chest_背中_接続,
_噴乳_接続, _噴乳_接続,
Shoulder_上腕_接続, Shoulder_上腕_接続,
Torso__接続, Torso_Chest_接続,
Torso_肌_接続, Torso_肌_接続,
Torso_翼左_接続, Torso_翼左_接続,
Torso_翼右_接続, Torso_翼右_接続,

View File

@@ -18,7 +18,7 @@ namespace SlaveMatrix
{ {
private HashSet<string> = new HashSet<string> private HashSet<string> = new HashSet<string>
{ {
Sta.t.ToString(), Sta.Chestt.ToString(),
Sta.t.ToString(), Sta.t.ToString(),
Sta.Shouldert.ToString(), Sta.Shouldert.ToString(),
Sta.t.ToString() Sta.t.ToString()

View File

@@ -63,7 +63,7 @@ namespace SlaveMatrix
public W ; public W ;
public Ele[] _接続; public Ele[] Chest_接続;
public Ele[] _接続; public Ele[] _接続;
@@ -279,7 +279,7 @@ namespace SlaveMatrix
} }
} }
public JointS _接続点 => new JointS(, X0Y0_胴, 0); public JointS Chest_接続点 => new JointS(, X0Y0_胴, 0);
public JointS _接続点 => new JointS(, X0Y0_胴, 5); public JointS _接続点 => new JointS(, X0Y0_胴, 5);
@@ -349,14 +349,14 @@ namespace SlaveMatrix
= false; = false;
} }
Ele f; Ele f;
if (e._接続.Count > 0) if (e.Chest_接続.Count > 0)
{ {
_接続 = e._接続.Select(delegate(EleD g) Chest_接続 = e.Chest_接続.Select(delegate(EleD g)
{ {
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = 2;
f.ConnectionType = ConnectionInfo.Torso__接続; f.ConnectionType = ConnectionInfo.Torso_Chest_接続;
f.(2._接続点); f.(2.Chest_接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }

View File

@@ -27,7 +27,7 @@ namespace SlaveMatrix
public double = 1.0; public double = 1.0;
public List<EleD> _接続 = new List<EleD>(); public List<EleD> Chest_接続 = new List<EleD>();
public List<EleD> _接続 = new List<EleD>(); public List<EleD> _接続 = new List<EleD>();
@@ -42,9 +42,9 @@ namespace SlaveMatrix
public void Torso接続(EleD e) public void Torso接続(EleD e)
{ {
_接続.Add(e); Chest_接続.Add(e);
e.Par = this; e.Par = this;
e. = ConnectionInfo.Torso__接続; e. = ConnectionInfo.Torso_Chest_接続;
} }
public void (EleD e) public void (EleD e)

View File

@@ -320,7 +320,7 @@ namespace SlaveMatrix
public JointS _接続点 => new JointS(, X0Y0_胴_胴, 3); public JointS _接続点 => new JointS(, X0Y0_胴_胴, 3);
public JointS _接続点 => new JointS(, X0Y0_胴_胴, 1); public JointS Torso_接続点 => new JointS(, X0Y0_胴_胴, 1);
public JointS 1_ => new JointS(, X0Y0_輪_金具左, 0); public JointS 1_ => new JointS(, X0Y0_輪_金具左, 0);
@@ -425,7 +425,7 @@ namespace SlaveMatrix
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = _蛇2; f.Par = _蛇2;
f.ConnectionType = ConnectionInfo.Torso_蛇_Torso_接続; f.ConnectionType = ConnectionInfo.Torso_蛇_Torso_接続;
f.(_蛇2._接続点); f.(_蛇2.Torso_接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }

View File

@@ -467,7 +467,7 @@ namespace SlaveMatrix
public JointS _接続点 => new JointS(, X0Y0_胴_胴, 1); public JointS _接続点 => new JointS(, X0Y0_胴_胴, 1);
public JointS _接続点 => new JointS(, X0Y0_胴_胴, 3); public JointS Torso_接続点 => new JointS(, X0Y0_胴_胴, 3);
public JointS 1_ => new JointS(, X0Y0_輪_金具左, 0); public JointS 1_ => new JointS(, X0Y0_輪_金具左, 0);
@@ -585,7 +585,7 @@ namespace SlaveMatrix
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = _蟲2; f.Par = _蟲2;
f.ConnectionType = ConnectionInfo.Torso_蟲_Torso_接続; f.ConnectionType = ConnectionInfo.Torso_蟲_Torso_接続;
f.(_蟲2._接続点); f.(_蟲2.Torso_接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }

View File

@@ -2129,7 +2129,7 @@ namespace SlaveMatrix
} }
} }
public JointS _接続点 => new JointS(, X0Y0_腰, 0); public JointS Torso_接続点 => new JointS(, X0Y0_腰, 0);
public JointS _接続点 => new JointS(, X0Y0_腰, 1); public JointS _接続点 => new JointS(, X0Y0_腰, 1);
@@ -2523,7 +2523,7 @@ namespace SlaveMatrix
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = 2;
f.ConnectionType = ConnectionInfo.Waist_Torso_接続; f.ConnectionType = ConnectionInfo.Waist_Torso_接続;
f.(2._接続点); f.(2.Torso_接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }

View File

@@ -379,9 +379,9 @@ namespace SlaveMatrix
else if (k != null) else if (k != null)
{ {
k. = (k. + 0.05).Clamp(0.0, 1.0); k. = (k. + 0.05).Clamp(0.0, 1.0);
if (2.Bod.EI != null) if (2.Bod.EIChest != null)
{ {
2.Bod.EI.Updatef = true; 2.Bod.EIChest.Updatef = true;
} }
if (2.Bod.EI腕前 != null) if (2.Bod.EI腕前 != null)
{ {

View File

@@ -799,27 +799,27 @@ namespace SlaveMatrix
}, },
{ {
ConnectionInfo._肩左_接続, ConnectionInfo.Chest_肩左_接続,
}, },
{ {
ConnectionInfo._肩右_接続, ConnectionInfo.Chest_肩右_接続,
}, },
{ {
ConnectionInfo._翼上左_接続, ConnectionInfo.Chest_翼上左_接続,
}, },
{ {
ConnectionInfo._翼上右_接続, ConnectionInfo.Chest_翼上右_接続,
}, },
{ {
ConnectionInfo._翼下左_接続, ConnectionInfo.Chest_翼下左_接続,
}, },
{ {
ConnectionInfo._翼下右_接続, ConnectionInfo.Chest_翼下右_接続,
}, },
{ {
@@ -1167,7 +1167,7 @@ namespace SlaveMatrix
}, },
{ {
ConnectionInfo._背中_接続, ConnectionInfo.Chest_背中_接続,
}, },
{ {
@@ -1824,33 +1824,33 @@ namespace SlaveMatrix
D2.AlignC(); D2.AlignC();
NeckD D2 = Mix<NeckD>(, , i, ); NeckD D2 = Mix<NeckD>(, , i, );
D2.(D2); D2.(D2);
D D2 = Mix<D>(, , i, ); ChestD ChestD2 = Mix<ChestD>(, , i, );
D D2 = Mix<D>(, , : false, i, ); D D2 = Mix<D>(, , : false, i, );
D2.(new D()); D2.(new D());
D2.(new D()); D2.(new D());
D2.(new 2D()); D2.(new 2D());
D2.(new D()); D2.(new D());
D2.(D2); ChestD2.(D2);
D2.(D2.Get逆()); ChestD2.(D2.Get逆());
D2.(Mix<D>(, , i, )); ChestD2.(Mix<D>(, , i, ));
D2.(Mix<D>(, , i, )); ChestD2.(Mix<D>(, , i, ));
D D2; D D2;
D2.(D2 = Mix<D>(, , i, )); ChestD2.(D2 = Mix<D>(, , i, ));
D2.(new _チューブD()); ChestD2.(new _チューブD());
D2.(new _クロスD()); ChestD2.(new _クロスD());
D2.(new _ビキニD()); ChestD2.(new _ビキニD());
D2.(new _マイクロD()); ChestD2.(new _マイクロD());
D2.(new _ブラD()); ChestD2.(new _ブラD());
D2.(new _ドレスD()); ChestD2.(new _ドレスD());
D2.AlignC(); ChestD2.AlignC();
D2.(D2); ChestD2.(D2);
TorsoD D2 = Mix<TorsoD>(, , i, ); TorsoD D2 = Mix<TorsoD>(, , i, );
D D2; D D2;
D2.(D2 = Mix<D>(, , i, )); D2.(D2 = Mix<D>(, , i, ));
D2.(Mix<D>(, , i, )); D2.(Mix<D>(, , i, ));
D2.(new _ドレスD()); D2.(new _ドレスD());
D2.AlignC(); D2.AlignC();
D2.Torso接続(D2); D2.Torso接続(ChestD2);
WaistD = Mix<WaistD>(, , i, ); WaistD = Mix<WaistD>(, , i, );
.(new _人D()); .(new _人D());
.(new _人D()); .(new _人D());
@@ -2160,15 +2160,15 @@ namespace SlaveMatrix
D2.(, , i, ConnectionInfo.Head_顔面_接続, , , , ); D2.(, , i, ConnectionInfo.Head_顔面_接続, , , , );
D2.(, , i, ConnectionInfo.Head_頭頂_接続, , , , ); D2.(, , i, ConnectionInfo.Head_頭頂_接続, , , , );
D2.(, , i, ConnectionInfo.Head_触覚左_接続, , , , ); D2.(, , i, ConnectionInfo.Head_触覚左_接続, , , , );
D2.(, , i, ConnectionInfo._肩左_接続, , , , ); ChestD2.(, , i, ConnectionInfo.Chest_肩左_接続, , , , );
D2.(, , i, ConnectionInfo.Head_額_接続, , , , ); D2.(, , i, ConnectionInfo.Head_額_接続, , , , );
D2.(, , i, ConnectionInfo._翼上左_接続, , , , ); ChestD2.(, , i, ConnectionInfo.Chest_翼上左_接続, , , , );
D2.(, , i, ConnectionInfo._翼下左_接続, , , , ); ChestD2.(, , i, ConnectionInfo.Chest_翼下左_接続, , , , );
D2.(, , i, ConnectionInfo.Torso_翼左_接続, , , , ); D2.(, , i, ConnectionInfo.Torso_翼左_接続, , , , );
.(, , i, ConnectionInfo.Waist_翼左_接続, , , , ); .(, , i, ConnectionInfo.Waist_翼左_接続, , , , );
if () if ()
{ {
D2.(, , i, ConnectionInfo._背中_接続, , , , ); ChestD2.(, , i, ConnectionInfo.Chest_背中_接続, , , , );
} }
else else
{ {
@@ -2177,27 +2177,27 @@ namespace SlaveMatrix
if (eleD3 != null) if (eleD3 != null)
{ {
t = eleD3.GetType().ToString(); t = eleD3.GetType().ToString();
if (!D2._接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) if (!ChestD2._接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool())
{ {
D2.(eleD3); ChestD2.(eleD3);
} }
} }
eleD3 = Mix<D>(, , i, ); eleD3 = Mix<D>(, , i, );
if (eleD3 != null) if (eleD3 != null)
{ {
t = eleD3.GetType().ToString(); t = eleD3.GetType().ToString();
if (!D2._接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) if (!ChestD2._接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool())
{ {
D2.(eleD3); ChestD2.(eleD3);
} }
} }
eleD3 = Mix<D>(, , i, ); eleD3 = Mix<D>(, , i, );
if (eleD3 != null) if (eleD3 != null)
{ {
t = eleD3.GetType().ToString(); t = eleD3.GetType().ToString();
if (!D2._接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) if (!ChestD2._接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool())
{ {
D2.(eleD3); ChestD2.(eleD3);
} }
} }
} }

View File

@@ -790,7 +790,7 @@ namespace SlaveMatrix
public JointS _接続点 => new JointS(, X0Y0_胸郭, 1); public JointS _接続点 => new JointS(, X0Y0_胸郭, 1);
public JointS _接続点 => new JointS(, X0Y0_胸郭, 9); public JointS Torso_接続点 => new JointS(, X0Y0_胸郭, 9);
public JointS _接続点 => new JointS(, X0Y0_胸郭, 2); public JointS _接続点 => new JointS(, X0Y0_胸郭, 2);
@@ -950,7 +950,7 @@ namespace SlaveMatrix
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = 2; f.Par = 2;
f.ConnectionType = ConnectionInfo._Torso_接続; f.ConnectionType = ConnectionInfo._Torso_接続;
f.(2._接続点); f.(2.Torso_接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }

View File

@@ -299,7 +299,7 @@ namespace SlaveMatrix
public JointS _接続点 => new JointS(, X0Y0_胴1_胴, 3); public JointS _接続点 => new JointS(, X0Y0_胴1_胴, 3);
public JointS _接続点 => new JointS(, X0Y0_胴1_胴, 1); public JointS Torso_接続点 => new JointS(, X0Y0_胴1_胴, 1);
public _蛇(double DisUnit, , , Med Med, _蛇D e) public _蛇(double DisUnit, , , Med Med, _蛇D e)
{ {
@@ -396,7 +396,7 @@ namespace SlaveMatrix
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = _蛇2; f.Par = _蛇2;
f.ConnectionType = ConnectionInfo._蛇_Torso_接続; f.ConnectionType = ConnectionInfo._蛇_Torso_接続;
f.(_蛇2._接続点); f.(_蛇2.Torso_接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }

View File

@@ -507,7 +507,7 @@ namespace SlaveMatrix
public JointS 1_ => new JointS(, X0Y0_胴1_胴, 1); public JointS 1_ => new JointS(, X0Y0_胴1_胴, 1);
public JointS _接続点 => new JointS(, X0Y0_胴1_胴, 3); public JointS Torso_接続点 => new JointS(, X0Y0_胴1_胴, 3);
public JointS 1_ => new JointS(, X0Y0_輪1_金具左, 0); public JointS 1_ => new JointS(, X0Y0_輪1_金具左, 0);
@@ -651,7 +651,7 @@ namespace SlaveMatrix
f = g.GetEle(DisUnit, Med, ); f = g.GetEle(DisUnit, Med, );
f.Par = _蟲2; f.Par = _蟲2;
f.ConnectionType = ConnectionInfo._蟲_Torso_接続; f.ConnectionType = ConnectionInfo._蟲_Torso_接続;
f.(_蟲2._接続点); f.(_蟲2.Torso_接続点);
return f; return f;
}).ToArray(); }).ToArray();
} }

View File

@@ -56,7 +56,7 @@ namespace SlaveMatrix
public Torso ; public Torso ;
public ; public Chest Chest;
public Neck ; public Neck ;
@@ -250,7 +250,7 @@ namespace SlaveMatrix
public _蟲 ; public _蟲 ;
public _獣; public Chest_獣;
public _獣; public _獣;
@@ -560,7 +560,7 @@ namespace SlaveMatrix
private double asb2; private double asb2;
public EleI EI; public EleI EIChest;
public EleI EI髪; public EleI EI髪;
@@ -582,7 +582,7 @@ namespace SlaveMatrix
public bool Is髪; public bool Is髪;
public bool Is; public bool IsChest;
public bool Is腰; public bool Is腰;
@@ -990,8 +990,8 @@ namespace SlaveMatrix
{ {
get get
{ {
.P(); Chest.P();
return .X0Y0_胸郭.ToGlobal((.X0Y0_胸郭.OP[8].ps[2] + .X0Y0_胸郭.OP[2].ps[2]) * 0.5); return Chest.X0Y0_胸郭.ToGlobal((Chest.X0Y0_胸郭.OP[8].ps[2] + Chest.X0Y0_胸郭.OP[2].ps[2]) * 0.5);
} }
} }
@@ -1498,9 +1498,9 @@ namespace SlaveMatrix
{ {
EI髪.Updatef = true; EI髪.Updatef = true;
} }
else if (Is && EI.ElesH.Contains()) else if (IsChest && EIChest.ElesH.Contains())
{ {
EI.Updatef = true; EIChest.Updatef = true;
} }
else if (Is腰 && EI腰.ElesH.Contains()) else if (Is腰 && EI腰.ElesH.Contains())
{ {
@@ -1572,7 +1572,7 @@ namespace SlaveMatrix
{ {
get get
{ {
if (i <= 0 && i <= 0 && !Is腿犬 && !Is腿魚 && !Is腿獣 && (!Is獣 || _獣._接続 == null || _獣._接続.Length == 0) && !Is蜘 && !Is蠍) if (i <= 0 && i <= 0 && !Is腿犬 && !Is腿魚 && !Is腿獣 && (!Is獣 || Chest_獣._接続 == null || Chest_獣._接続.Length == 0) && !Is蜘 && !Is蠍)
{ {
return Is蟲; return Is蟲;
} }
@@ -3268,7 +3268,7 @@ namespace SlaveMatrix
{ {
.. = () => bod..X0Y0_頭.ToGlobal(bod..X0Y0_頭.BasePointBase); .. = () => bod..X0Y0_頭.ToGlobal(bod..X0Y0_頭.BasePointBase);
} }
else if (p is ) else if (p is Chest)
{ {
.. = () => bod..X0Y0_胴.ToGlobal(bod..X0Y0_胴.BasePointBase); .. = () => bod..X0Y0_胴.ToGlobal(bod..X0Y0_胴.BasePointBase);
} }
@@ -3284,7 +3284,7 @@ namespace SlaveMatrix
{ {
.. = () => bod._獣.X0Y0_腰.ToGlobal(bod..X0Y0_腰.JP[4].Joint); .. = () => bod._獣.X0Y0_腰.ToGlobal(bod..X0Y0_腰.JP[4].Joint);
} }
else if (pp != null && pp is ) else if (pp != null && pp is Chest)
{ {
.. = () => bod..X0Y0_腰.ToGlobal(bod..X0Y0_腰.BasePointBase); .. = () => bod..X0Y0_腰.ToGlobal(bod..X0Y0_腰.BasePointBase);
} }
@@ -3661,7 +3661,7 @@ namespace SlaveMatrix
{ {
.. = () => bod..X0Y0_頭.ToGlobal(bod..X0Y0_頭.BasePointBase); .. = () => bod..X0Y0_頭.ToGlobal(bod..X0Y0_頭.BasePointBase);
} }
else if (p is ) else if (p is Chest)
{ {
.. = () => bod..X0Y0_胴.ToGlobal(bod..X0Y0_胴.BasePointBase); .. = () => bod..X0Y0_胴.ToGlobal(bod..X0Y0_胴.BasePointBase);
} }
@@ -3677,7 +3677,7 @@ namespace SlaveMatrix
{ {
.. = () => bod._獣.X0Y0_腰.ToGlobal(bod..X0Y0_腰.JP[4].Joint); .. = () => bod._獣.X0Y0_腰.ToGlobal(bod..X0Y0_腰.JP[4].Joint);
} }
else if (pp != null && pp is ) else if (pp != null && pp is Chest)
{ {
.. = () => bod..X0Y0_腰.ToGlobal(bod..X0Y0_腰.BasePointBase); .. = () => bod..X0Y0_腰.ToGlobal(bod..X0Y0_腰.BasePointBase);
} }
@@ -3887,7 +3887,7 @@ namespace SlaveMatrix
} }
if ( != null) if ( != null)
{ {
= ._接続.GetEle<>(); Chest = .Chest_接続.GetEle<Chest>();
_人 = ._接続.GetEle<>(); _人 = ._接続.GetEle<>();
_人 = ._接続.GetEle<>(); _人 = ._接続.GetEle<>();
_人.SetHitFalse(); _人.SetHitFalse();
@@ -3895,15 +3895,15 @@ namespace SlaveMatrix
M_ドレス = ._接続.GetEle<_ドレス>(); M_ドレス = ._接続.GetEle<_ドレス>();
M_ドレス.SetHitFalse(); M_ドレス.SetHitFalse();
} }
if ( != null) if (Chest != null)
{ {
= .Neck_接続.GetEle<Neck>(); = Chest.Neck_接続.GetEle<Neck>();
_人 = ._接続.GetEle<>(); _人 = Chest._接続.GetEle<>();
_人 = ._接続.GetEle<>(); _人 = Chest._接続.GetEle<>();
_人 = ._接続.GetEle<>(); _人 = Chest._接続.GetEle<>();
_人.SetHitFalse(); _人.SetHitFalse();
_人.SetHitFalse(); _人.SetHitFalse();
= ._接続.GetEle<>(); = Chest._接続.GetEle<>();
= ._接続.GetEle<>(); = ._接続.GetEle<>();
= ._接続.GetEle<>(); = ._接続.GetEle<>();
2 = ._接続.GetEle<2>(); 2 = ._接続.GetEle<2>();
@@ -3911,7 +3911,7 @@ namespace SlaveMatrix
.SetHitFalse(); .SetHitFalse();
.SetHitFalse(); .SetHitFalse();
.SetHitFalse(); .SetHitFalse();
= ._接続.GetEle<>(); = Chest._接続.GetEle<>();
= ._接続.GetEle<>(); = ._接続.GetEle<>();
= ._接続.GetEle<>(); = ._接続.GetEle<>();
2 = ._接続.GetEle<2>(); 2 = ._接続.GetEle<2>();
@@ -3919,17 +3919,17 @@ namespace SlaveMatrix
.SetHitFalse(); .SetHitFalse();
.SetHitFalse(); .SetHitFalse();
.SetHitFalse(); .SetHitFalse();
T_チューブ = ._接続.GetEle<_チューブ>(); T_チューブ = Chest._接続.GetEle<_チューブ>();
T_クロス = ._接続.GetEle<_クロス>(); T_クロス = Chest._接続.GetEle<_クロス>();
T_ビキニ = ._接続.GetEle<_ビキニ>(); T_ビキニ = Chest._接続.GetEle<_ビキニ>();
T_マイクロ = ._接続.GetEle<_マイクロ>(); T_マイクロ = Chest._接続.GetEle<_マイクロ>();
T_ブラ = ._接続.GetEle<_ブラ>(); T_ブラ = Chest._接続.GetEle<_ブラ>();
T_チューブ.SetHitFalse(); T_チューブ.SetHitFalse();
T_クロス.SetHitFalse(); T_クロス.SetHitFalse();
T_ビキニ.SetHitFalse(); T_ビキニ.SetHitFalse();
T_マイクロ.SetHitFalse(); T_マイクロ.SetHitFalse();
T_ブラ.SetHitFalse(); T_ブラ.SetHitFalse();
T_ドレス = ._接続.GetEle<_ドレス>(); T_ドレス = Chest._接続.GetEle<_ドレス>();
T_ドレス.SetHitFalse(); T_ドレス.SetHitFalse();
} }
if ( != null) if ( != null)
@@ -4062,10 +4062,10 @@ namespace SlaveMatrix
sk.Add(.); sk.Add(.);
. = new W(Med, Are, Cha, this, wd, ); . = new W(Med, Are, Cha, this, wd, );
sw.Add(.); sw.Add(.);
. = new K(Med, Are, Cha, this, kd, ); Chest. = new K(Med, Are, Cha, this, kd, Chest);
sk.Add(.); sk.Add(Chest.);
. = new W(Med, Are, Cha, this, wd, ); Chest. = new W(Med, Are, Cha, this, wd, Chest);
sw.Add(.); sw.Add(Chest.);
. = new K(Med, Are, Cha, this, kd, ); . = new K(Med, Are, Cha, this, kd, );
sk.Add(.); sk.Add(.);
. = new W(Med, Are, Cha, this, wd, ); . = new W(Med, Are, Cha, this, wd, );
@@ -4178,9 +4178,9 @@ namespace SlaveMatrix
= ((_宇))._接続.GetEle<_宇>(); = ((_宇))._接続.GetEle<_宇>();
} }
} }
if (._接続 != null) if (Chest._接続 != null)
{ {
s = ._接続.GetEles<Shoulder>().ToArray(); s = Chest._接続.GetEles<Shoulder>().ToArray();
= s.LastOrDefault(); = s.LastOrDefault();
if (s.Length > 1) if (s.Length > 1)
{ {
@@ -4208,9 +4208,9 @@ namespace SlaveMatrix
s = s.Take(s.Length - 1).ToArray(); s = s.Take(s.Length - 1).ToArray();
} }
nsl = new bool[1 + ((s != null) ? s.Length : 0)]; nsl = new bool[1 + ((s != null) ? s.Length : 0)];
if (._接続 != null) if (Chest._接続 != null)
{ {
s = ._接続.GetEles<Shoulder>().ToArray(); s = Chest._接続.GetEles<Shoulder>().ToArray();
= s.LastOrDefault(); = s.LastOrDefault();
if (s.Length > 1) if (s.Length > 1)
{ {
@@ -4238,21 +4238,21 @@ namespace SlaveMatrix
s = s.Take(s.Length - 1).ToArray(); s = s.Take(s.Length - 1).ToArray();
} }
nsr = new bool[1 + ((s != null) ? s.Length : 0)]; nsr = new bool[1 + ((s != null) ? s.Length : 0)];
if (._接続 != null) if (Chest._接続 != null)
{ {
Sort(._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (._接続 != null) if (Chest._接続 != null)
{ {
Sort(._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (._接続 != null) if (Chest._接続 != null)
{ {
Sort(._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (._接続 != null) if (Chest._接続 != null)
{ {
Sort(._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (._接続 != null) if (._接続 != null)
{ {
@@ -4270,9 +4270,9 @@ namespace SlaveMatrix
{ {
Sort(._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (._接続 != null) if (Chest._接続 != null)
{ {
Sort(._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (._接続 != null) if (._接続 != null)
{ {
@@ -4469,7 +4469,7 @@ namespace SlaveMatrix
{ {
if (item22 is ) if (item22 is )
{ {
_獣 = ()item22; Chest_獣 = ()item22;
} }
else if (item22 is ) else if (item22 is )
{ {
@@ -4591,7 +4591,7 @@ namespace SlaveMatrix
_大_獣.SetHitFalse(); _大_獣.SetHitFalse();
尿_獣.SetHitFalse(); 尿_獣.SetHitFalse();
.SetHitFalse(); .SetHitFalse();
.CD.c2.Col2 = _獣.CD.c2.Col1; .CD.c2.Col2 = Chest_獣.CD.c2.Col1;
if (_獣 != null) if (_獣 != null)
{ {
1.Add(_獣); 1.Add(_獣);
@@ -4600,13 +4600,13 @@ namespace SlaveMatrix
{ {
1.Add(_獣); 1.Add(_獣);
} }
if (_獣 != null) if (Chest_獣 != null)
{ {
1.Add(new DE(_獣, _獣.)); 1.Add(new DE(Chest_獣, Chest_獣.));
} }
if (_獣 != null) if (Chest_獣 != null)
{ {
1.Add(new DE(_獣, _獣.)); 1.Add(new DE(Chest_獣, Chest_獣.));
} }
if (_獣 != null) if (_獣 != null)
{ {
@@ -4670,27 +4670,27 @@ namespace SlaveMatrix
Sort(_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
} }
if (_獣 != null) if (Chest_獣 != null)
{ {
if (_獣._接続 != null) if (Chest_獣._接続 != null)
{ {
Sort(_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (_獣._接続 != null) if (Chest_獣._接続 != null)
{ {
Sort(_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (_獣._接続 != null) if (Chest_獣._接続 != null)
{ {
Sort(_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (_獣._接続 != null) if (Chest_獣._接続 != null)
{ {
Sort(_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
if (_獣._接続 != null) if (Chest_獣._接続 != null)
{ {
Sort(_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), ); Sort(Chest_獣._接続.Select((Ele e) => e.EnumEle()).JoinEnum(), );
} }
} }
if (_獣 != null) if (_獣 != null)
@@ -5040,13 +5040,13 @@ namespace SlaveMatrix
Inserts(e.Par, 2 + num, e)?.Remove(e); Inserts(e.Par, 2 + num, e)?.Remove(e);
} }
} }
Ele ele5 = .LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo._肩左_接続); Ele ele5 = .LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.Chest_肩左_接続);
if (ele5 != null) if (ele5 != null)
{ {
.Add(ele5); .Add(ele5);
} }
HashSet<Ele> hashSet = new HashSet<Ele>(); HashSet<Ele> hashSet = new HashSet<Ele>();
foreach ( item38 in .Where(( e) => e..Par != null && e..Par.ConnectionType == ConnectionInfo._肩左_接続)) foreach ( item38 in .Where(( e) => e..Par != null && e..Par.ConnectionType == ConnectionInfo.Chest_肩左_接続))
{ {
hashSet.Add(item38..); hashSet.Add(item38..);
hashSet.Add(item38..); hashSet.Add(item38..);
@@ -5070,13 +5070,13 @@ namespace SlaveMatrix
{ {
.Remove(item41); .Remove(item41);
} }
ele5 = .LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo._肩右_接続); ele5 = .LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.Chest_肩右_接続);
if (ele5 != null) if (ele5 != null)
{ {
.Add(ele5); .Add(ele5);
} }
hashSet.Clear(); hashSet.Clear();
foreach ( item42 in .Where(( e) => e..Par != null && e..Par.ConnectionType == ConnectionInfo._肩右_接続)) foreach ( item42 in .Where(( e) => e..Par != null && e..Par.ConnectionType == ConnectionInfo.Chest_肩右_接続))
{ {
hashSet.Add(item42..); hashSet.Add(item42..);
hashSet.Add(item42..); hashSet.Add(item42..);
@@ -5307,10 +5307,10 @@ namespace SlaveMatrix
_獣 = new _獣(disUnit, .N0, Cha., Med, new _獣D()); _獣 = new _獣(disUnit, .N0, Cha., Med, new _獣D());
_獣. = Elements.Sum((Ele e) => e.) / (double)Elements.Length; _獣. = Elements.Sum((Ele e) => e.) / (double)Elements.Length;
_獣. = 0.0; _獣. = 0.0;
if (_獣._接続.IsEle<>()) if (Chest_獣._接続.IsEle<>())
{ {
_獣.X0Y0_胸郭.OP[0].Outline = false; Chest_獣.X0Y0_胸郭.OP[0].Outline = false;
_獣.X0Y0_胸郭.OP[9].Outline = false; Chest_獣.X0Y0_胸郭.OP[9].Outline = false;
} }
Vector2D positionCont3 = new Vector2D(0.0, 0.006); Vector2D positionCont3 = new Vector2D(0.0, 0.006);
_獣.X0Y0_湯気_湯気左1_湯気2.PositionCont = positionCont3; _獣.X0Y0_湯気_湯気左1_湯気2.PositionCont = positionCont3;
@@ -5433,7 +5433,7 @@ namespace SlaveMatrix
} }
.X0Y0_乳首.SizeBase = .X0Y0_乳首.SizeBase * 1.1; .X0Y0_乳首.SizeBase = .X0Y0_乳首.SizeBase * 1.1;
.X0Y0_乳首.SizeBase = .X0Y0_乳首.SizeBase * 1.1; .X0Y0_乳首.SizeBase = .X0Y0_乳首.SizeBase * 1.1;
if (._接続 == null) if (Chest._接続 == null)
{ {
_人._タトゥ左_表示 = false; _人._タトゥ左_表示 = false;
_人._タトゥ右_表示 = false; _人._タトゥ右_表示 = false;
@@ -5455,27 +5455,27 @@ namespace SlaveMatrix
Set腰(); Set腰();
if (.Count + .Count + .Count + .Count + .Count + .Count + .Count + .Count + .Count + s.Length + s.Length > 0) if (.Count + .Count + .Count + .Count + .Count + .Count + .Count + .Count + .Count + s.Length + s.Length > 0)
{ {
EI = new EleI(Med); EIChest = new EleI(Med);
EI.AddRange(); EIChest.AddRange();
EI.AddRange(); EIChest.AddRange();
EI.AddRange(); EIChest.AddRange();
EI.AddRange(); EIChest.AddRange();
EI.AddRange(); EIChest.AddRange();
EI.AddRange(); EIChest.AddRange();
EI.AddRange(); EIChest.AddRange();
EI.AddRange(); EIChest.AddRange();
EI.AddRange(); EIChest.AddRange();
List<Ele>[] array4 = s; List<Ele>[] array4 = s;
foreach (List<Ele> es in array4) foreach (List<Ele> es in array4)
{ {
EI.AddRange(es); EIChest.AddRange(es);
} }
array4 = s; array4 = s;
foreach (List<Ele> es2 in array4) foreach (List<Ele> es2 in array4)
{ {
EI.AddRange(es2); EIChest.AddRange(es2);
} }
EI. = delegate(RenderArea are) EIChest. = delegate(RenderArea are)
{ {
bod..0(are); bod..0(are);
bod..1(are); bod..1(are);
@@ -5518,8 +5518,8 @@ namespace SlaveMatrix
es4.1(are); es4.1(are);
} }
}; };
EI.Update(); EIChest.Update();
eis.Add(EI); eis.Add(EIChest);
} }
if (.Count > 0) if (.Count > 0)
{ {
@@ -5662,7 +5662,7 @@ namespace SlaveMatrix
eis.Add(EI腿); eis.Add(EI腿);
} }
Is髪 = EI髪 != null; Is髪 = EI髪 != null;
Is = EI != null; IsChest = EIChest != null;
Is腰 = EI腰 != null; Is腰 = EI腰 != null;
Is腕前 = EI腕前 != null; Is腕前 = EI腕前 != null;
Is半後 = EI半後 != null; Is半後 = EI半後 != null;
@@ -5677,9 +5677,9 @@ namespace SlaveMatrix
{ {
bod._人.(); bod._人.();
bod._人.0(are); bod._人.0(are);
if (bod.Is) if (bod.IsChest)
{ {
bod.EI.(are); bod.EIChest.(are);
} }
if (bod.Is腰) if (bod.Is腰)
{ {
@@ -5765,7 +5765,7 @@ namespace SlaveMatrix
bod..0(are); bod..0(are);
bod..1(are); bod..1(are);
bod..0(are); bod..0(are);
bod..0(are); bod.Chest.0(are);
bod..0(are); bod..0(are);
if (bod. != null) if (bod. != null)
{ {
@@ -6104,9 +6104,9 @@ namespace SlaveMatrix
} }
bod._人.(); bod._人.();
bod._人.0(are); bod._人.0(are);
if (bod.Is) if (bod.IsChest)
{ {
bod.EI.(are); bod.EIChest.(are);
} }
if (bod.Is腰) if (bod.Is腰)
{ {
@@ -6192,7 +6192,7 @@ namespace SlaveMatrix
bod..0(are); bod..0(are);
bod..1(are); bod..1(are);
bod..0(are); bod..0(are);
bod..0(are); bod.Chest.0(are);
bod..0(are); bod..0(are);
if (bod. != null) if (bod. != null)
{ {
@@ -6549,9 +6549,9 @@ namespace SlaveMatrix
bod..2(Are); bod..2(Are);
} }
} }
if (bod.Is) if (bod.IsChest)
{ {
bod.EI.(are); bod.EIChest.(are);
} }
if (bod.Is腰) if (bod.Is腰)
{ {
@@ -6619,7 +6619,7 @@ namespace SlaveMatrix
bod..0(are); bod..0(are);
bod..1(are); bod..1(are);
bod..0(are); bod..0(are);
bod..0(are); bod.Chest.0(are);
bod..0(are); bod..0(are);
if (bod. != null) if (bod. != null)
{ {
@@ -6957,9 +6957,9 @@ namespace SlaveMatrix
{ {
bod._人.(); bod._人.();
bod._人.0(are); bod._人.0(are);
if (bod.Is) if (bod.IsChest)
{ {
bod.EI.(are); bod.EIChest.(are);
} }
if (bod.Is腰) if (bod.Is腰)
{ {
@@ -7045,7 +7045,7 @@ namespace SlaveMatrix
bod..0(are); bod..0(are);
bod..1(are); bod..1(are);
bod..0(are); bod..0(are);
bod..0(are); bod.Chest.0(are);
bod..0(are); bod..0(are);
if (bod. != null) if (bod. != null)
{ {
@@ -7381,9 +7381,9 @@ namespace SlaveMatrix
} }
bod._人.(); bod._人.();
bod._人.0(are); bod._人.0(are);
if (bod.Is) if (bod.IsChest)
{ {
bod.EI.(are); bod.EIChest.(are);
} }
if (bod.Is腰) if (bod.Is腰)
{ {
@@ -7469,7 +7469,7 @@ namespace SlaveMatrix
bod..0(are); bod..0(are);
bod..1(are); bod..1(are);
bod..0(are); bod..0(are);
bod..0(are); bod.Chest.0(are);
bod..0(are); bod..0(are);
if (bod. != null) if (bod. != null)
{ {
@@ -7804,9 +7804,9 @@ namespace SlaveMatrix
{ {
bod._人.(); bod._人.();
bod._人.0(are); bod._人.0(are);
if (bod.Is) if (bod.IsChest)
{ {
bod.EI.(are); bod.EIChest.(are);
} }
if (bod.Is腰) if (bod.Is腰)
{ {
@@ -7892,7 +7892,7 @@ namespace SlaveMatrix
bod..0(are); bod..0(are);
bod..1(are); bod..1(are);
bod..0(are); bod..0(are);
bod..0(are); bod.Chest.0(are);
bod..0(are); bod..0(are);
if (bod. != null) if (bod. != null)
{ {
@@ -8240,9 +8240,9 @@ namespace SlaveMatrix
{ {
bod._人.(); bod._人.();
bod._人.0(are); bod._人.0(are);
if (bod.Is) if (bod.IsChest)
{ {
bod.EI.(are); bod.EIChest.(are);
} }
if (bod.Is腰) if (bod.Is腰)
{ {
@@ -8344,7 +8344,7 @@ namespace SlaveMatrix
bod._人.0(are); bod._人.0(are);
} }
bod..0(are); bod..0(are);
bod..0(are); bod.Chest.0(are);
bod..0(are); bod..0(are);
if (bod. != null) if (bod. != null)
{ {
@@ -8684,9 +8684,9 @@ namespace SlaveMatrix
bod.cb1 = bod.cb0 && !bod..; bod.cb1 = bod.cb0 && !bod..;
bod._人.(); bod._人.();
bod._人.0(are); bod._人.0(are);
if (bod.Is) if (bod.IsChest)
{ {
bod.EI.(are); bod.EIChest.(are);
} }
if (bod.Is腰) if (bod.Is腰)
{ {
@@ -8772,7 +8772,7 @@ namespace SlaveMatrix
bod..0(are); bod..0(are);
bod..1(are); bod..1(are);
bod..0(are); bod..0(are);
bod..0(are); bod.Chest.0(are);
bod..0(are); bod..0(are);
if (bod. != null) if (bod. != null)
{ {

View File

@@ -182,8 +182,8 @@ namespace SlaveMatrix
set set
{ {
_ = value; _ = value;
Bod..C = 0.99 + 0.02 * _; Bod.Chest.C = 0.99 + 0.02 * _;
Bod._人.C = Bod..C; Bod._人.C = Bod.Chest.C;
p.Y = y * _ * 0.5; p.Y = y * _ * 0.5;
if (Bod.Is髪) if (Bod.Is髪)
{ {
@@ -194,9 +194,9 @@ namespace SlaveMatrix
Bod.EI腕前.Position = p; Bod.EI腕前.Position = p;
} }
p.Y = y * _ * 0.28; p.Y = y * _ * 0.28;
if (Bod.Is) if (Bod.IsChest)
{ {
Bod.EI.Position = p; Bod.EIChest.Position = p;
} }
p.Y = 0.0 - p.Y; p.Y = 0.0 - p.Y;
Bod..C = p; Bod..C = p;
@@ -254,7 +254,7 @@ namespace SlaveMatrix
_ = Are.DisplayUnitScale; _ = Are.DisplayUnitScale;
Bod = new Bod(Med, Are, this); Bod = new Bod(Med, Are, this);
= Bod.Is髪 && Bod.EI髪.IsHeavy(); = Bod.Is髪 && Bod.EI髪.IsHeavy();
= Bod.Is && Bod.EI.IsHeavy(); = Bod.IsChest && Bod.EIChest.IsHeavy();
= Bod.Is腰 && Bod.EI腰.IsHeavy(); = Bod.Is腰 && Bod.EI腰.IsHeavy();
= Bod.Is腕前 && Bod.EI腕前.IsHeavy(); = Bod.Is腕前 && Bod.EI腕前.IsHeavy();
= Bod.Is半後 && Bod.EI半後.IsHeavy(); = Bod.Is半後 && Bod.EI半後.IsHeavy();
@@ -262,12 +262,12 @@ namespace SlaveMatrix
2 = Bod.Is半中2 && Bod.EI半中2.IsHeavy(); 2 = Bod.Is半中2 && Bod.EI半中2.IsHeavy();
= Bod.Is半前 && Bod.EI半前.IsHeavy(); = Bod.Is半前 && Bod.EI半前.IsHeavy();
= Bod.Is腿 && Bod.EI腿.IsHeavy(); = Bod.Is腿 && Bod.EI腿.IsHeavy();
double C = Bod..C; double C = Bod.Chest.C;
Bod..C = 0.99; Bod.Chest.C = 0.99;
double num = Bod..X0Y0_胸郭.ToGlobal(Bod..X0Y0_胸郭.JP[0].Joint).Y; double num = Bod.Chest.X0Y0_胸郭.ToGlobal(Bod.Chest.X0Y0_胸郭.JP[0].Joint).Y;
Bod..C = 1.01; Bod.Chest.C = 1.01;
double num2 = Bod..X0Y0_胸郭.ToGlobal(Bod..X0Y0_胸郭.JP[0].Joint).Y; double num2 = Bod.Chest.X0Y0_胸郭.ToGlobal(Bod.Chest.X0Y0_胸郭.JP[0].Joint).Y;
Bod..C = C; Bod.Chest.C = C;
y = num2 - num; y = num2 - num;
= new Mot(0.0, 1.0) = new Mot(0.0, 1.0)
{ {
@@ -1748,15 +1748,15 @@ namespace SlaveMatrix
cha.Bod.EI髪.Updatef = true; cha.Bod.EI髪.Updatef = true;
} }
} }
if (cha.Bod.Is) if (cha.Bod.IsChest)
{ {
if (cha.) if (cha.)
{ {
cha.Bod.EI.Position = p_; cha.Bod.EIChest.Position = p_;
} }
else else
{ {
cha.Bod.EI.Updatef = true; cha.Bod.EIChest.Updatef = true;
} }
} }
if (cha.Bod.Is腰) if (cha.Bod.Is腰)
@@ -1856,9 +1856,9 @@ namespace SlaveMatrix
{ {
cha.Bod.EI髪.Position = Dat.Vec2DZero; cha.Bod.EI髪.Position = Dat.Vec2DZero;
} }
if (cha.Bod.Is) if (cha.Bod.IsChest)
{ {
cha.Bod.EI.Position = Dat.Vec2DZero; cha.Bod.EIChest.Position = Dat.Vec2DZero;
} }
if (cha.Bod.Is腰) if (cha.Bod.Is腰)
{ {
@@ -2087,7 +2087,7 @@ namespace SlaveMatrix
{ {
result.c = ContactType.Chest; result.c = ContactType.Chest;
} }
else if (result.e is ) else if (result.e is Chest)
{ {
result.c = ContactType.Side; result.c = ContactType.Side;
} }

View File

@@ -587,20 +587,20 @@ namespace SlaveMatrix
ConnectionInfo._獣_鼻水左_接続 => 1, ConnectionInfo._獣_鼻水左_接続 => 1,
ConnectionInfo._獣_鼻水右_接続 => 1, ConnectionInfo._獣_鼻水右_接続 => 1,
ConnectionInfo.Neck_Head_接続 => 1, ConnectionInfo.Neck_Head_接続 => 1,
ConnectionInfo._Neck_接続 => 1, ConnectionInfo.Chest_Neck_接続 => 1,
ConnectionInfo._肩左_接続 => 1, ConnectionInfo.Chest_肩左_接続 => 1,
ConnectionInfo._肩右_接続 => 1, ConnectionInfo.Chest_肩右_接続 => 1,
ConnectionInfo._胸左_接続 => 1, ConnectionInfo.Chest_胸左_接続 => 1,
ConnectionInfo._胸右_接続 => 1, ConnectionInfo.Chest_胸右_接続 => 1,
ConnectionInfo._肌_接続 => 1, ConnectionInfo.Chest_肌_接続 => 1,
ConnectionInfo._翼上左_接続 => 0, ConnectionInfo.Chest_翼上左_接続 => 0,
ConnectionInfo._翼上右_接続 => 0, ConnectionInfo.Chest_翼上右_接続 => 0,
ConnectionInfo._翼下左_接続 => 0, ConnectionInfo.Chest_翼下左_接続 => 0,
ConnectionInfo._翼下右_接続 => 0, ConnectionInfo.Chest_翼下右_接続 => 0,
ConnectionInfo._背中_接続 => 0, ConnectionInfo.Chest_背中_接続 => 0,
ConnectionInfo._噴乳_接続 => 1, ConnectionInfo._噴乳_接続 => 1,
ConnectionInfo.Shoulder_上腕_接続 => 1, ConnectionInfo.Shoulder_上腕_接続 => 1,
ConnectionInfo.Torso__接続 => 1, ConnectionInfo.Torso_Chest_接続 => 1,
ConnectionInfo.Torso_肌_接続 => 1, ConnectionInfo.Torso_肌_接続 => 1,
ConnectionInfo.Torso_翼左_接続 => 0, ConnectionInfo.Torso_翼左_接続 => 0,
ConnectionInfo.Torso_翼右_接続 => 0, ConnectionInfo.Torso_翼右_接続 => 0,

File diff suppressed because it is too large Load Diff

View File

@@ -50,7 +50,7 @@ namespace SlaveMatrix
public static Type EleDt; public static Type EleDt;
public static Type t; public static Type Chestt;
public static Type Shouldert; public static Type Shouldert;
@@ -1164,7 +1164,7 @@ namespace SlaveMatrix
MaxAre = 0.0584246154149664; MaxAre = 0.0584246154149664;
Elet = typeof(Ele); Elet = typeof(Ele);
EleDt = typeof(EleD); EleDt = typeof(EleD);
t = typeof(); Chestt = typeof(Chest);
Shouldert = typeof(Shoulder); Shouldert = typeof(Shoulder);
t = typeof(Torso); t = typeof(Torso);
t = typeof(Waist); t = typeof(Waist);
@@ -1336,10 +1336,10 @@ namespace SlaveMatrix
ConnectionInfo._瞼_接続, ConnectionInfo._瞼_接続,
ConnectionInfo._吹出し_接続, ConnectionInfo._吹出し_接続,
ConnectionInfo.Neck_Head_接続, ConnectionInfo.Neck_Head_接続,
ConnectionInfo._Neck_接続, ConnectionInfo.Chest_Neck_接続,
ConnectionInfo._肌_接続, ConnectionInfo.Chest_肌_接続,
ConnectionInfo._背中_接続, ConnectionInfo.Chest_背中_接続,
ConnectionInfo.Torso__接続, ConnectionInfo.Torso_Chest_接続,
ConnectionInfo.Torso_肌_接続, ConnectionInfo.Torso_肌_接続,
ConnectionInfo.Waist_Torso_接続, ConnectionInfo.Waist_Torso_接続,
ConnectionInfo.Waist_肌_接続, ConnectionInfo.Waist_肌_接続,

View File

@@ -35,9 +35,9 @@ namespace SlaveMatrix
return obj; return obj;
} }
public static D () public static ChestD Chest()
{ {
D obj = new D(); ChestD obj = new ChestD();
obj.(new D()); obj.(new D());
obj.(new D()); obj.(new D());
obj.(new D()); obj.(new D());

View File

@@ -993,7 +993,7 @@ namespace SlaveMatrix
} }
if (eleD is D) if (eleD is D)
{ {
if (eleD. == ConnectionInfo._肌_接続) if (eleD. == ConnectionInfo.Chest_肌_接続)
{ {
D2 = (D)eleD; D2 = (D)eleD;
} }

View File

@@ -4,9 +4,9 @@ namespace SlaveMatrix.GameClasses
{ {
public static class _Con public static class _Con
{ {
public static D GetR() public static ChestD GetChestR()
{ {
D obj = Uni.(); ChestD obj = Uni.Chest();
Sta.SetValuesD(value: RNG.XS.NextDouble(), src: obj.EnumEleD(), s: "バスト"); Sta.SetValuesD(value: RNG.XS.NextDouble(), src: obj.EnumEleD(), s: "バスト");
return obj; return obj;
} }
@@ -276,17 +276,17 @@ namespace SlaveMatrix.GameClasses
return D2; return D2;
} }
public static D SetR(this TorsoD ) public static ChestD SetChestR(this TorsoD )
{ {
D D2 = GetR(); ChestD ChestD2 = GetChestR();
.Torso接続(D2); .Torso接続(ChestD2);
return D2; return ChestD2;
} }
public static NeckD Set首(this D ) public static NeckD Set首(this ChestD Chest)
{ {
NeckD D2 = new NeckD(); NeckD D2 = new NeckD();
.(D2); Chest.(D2);
return D2; return D2;
} }