diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0.cs index f3f5059..bb53b36 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class BackHair0 : Ele + public class BackHair0 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0D.cs index 7874ba2..0b5ebae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 後髪0D : EleD + public class 後髪0D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs index 5841c52..86b672c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs index 7824f1d..6e2100b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs index 0ca65e9..c75898f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後髪0_ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs index ee21d59..518b4bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs index 376608f..269d3dc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下1カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs index 2a61a4c..22985c7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後髪0_下1ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs index 78a835e..6b02a08 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下1ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs index 9e79836..248d0ac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下1パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs index 7cf6191..5422f7b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下2カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs index ea0e993..e17a5b3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下2ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs index 9c204f7..1970040 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下2ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs index 4dde3af..524185f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下2パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs index 4d895c4..389514a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編1カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs index c2cd700..7148bb2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編1ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs index 0e95446..58d9152 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編1ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs index 7344468..94e874a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後髪0_編1パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs index e1f4662..cf28085 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs @@ -117,7 +117,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後髪0_編2カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs index dde6515..1f57313 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs @@ -117,7 +117,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編2ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs index 97e7388..4740aad 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs @@ -117,7 +117,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編2ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs index eebb9fe..da1b3cf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs @@ -117,7 +117,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編2パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs index 6e88444..dda485f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs @@ -12,27 +12,27 @@ namespace SlaveMatrix public ColorP X0Y0_髪基CP; - public Ele[] 左5_接続; + public Element[] 左5_接続; - public Ele[] 左4_接続; + public Element[] 左4_接続; - public Ele[] 左3_接続; + public Element[] 左3_接続; - public Ele[] 左2_接続; + public Element[] 左2_接続; - public Ele[] 左1_接続; + public Element[] 左1_接続; - public Ele[] 中央_接続; + public Element[] 中央_接続; - public Ele[] 右1_接続; + public Element[] 右1_接続; - public Ele[] 右2_接続; + public Element[] 右2_接続; - public Ele[] 右3_接続; + public Element[] 右3_接続; - public Ele[] 右4_接続; + public Element[] 右4_接続; - public Ele[] 右5_接続; + public Element[] 右5_接続; public override bool 欠損 { @@ -187,10 +187,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左5_接続.Count > 0) { - 左5_接続 = e.左5_接続.Select(delegate(EleD g) + 左5_接続 = e.左5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -201,7 +201,7 @@ namespace SlaveMatrix } if (e.左4_接続.Count > 0) { - 左4_接続 = e.左4_接続.Select(delegate(EleD g) + 左4_接続 = e.左4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -212,7 +212,7 @@ namespace SlaveMatrix } if (e.左3_接続.Count > 0) { - 左3_接続 = e.左3_接続.Select(delegate(EleD g) + 左3_接続 = e.左3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -223,7 +223,7 @@ namespace SlaveMatrix } if (e.左2_接続.Count > 0) { - 左2_接続 = e.左2_接続.Select(delegate(EleD g) + 左2_接続 = e.左2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -234,7 +234,7 @@ namespace SlaveMatrix } if (e.左1_接続.Count > 0) { - 左1_接続 = e.左1_接続.Select(delegate(EleD g) + 左1_接続 = e.左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -245,7 +245,7 @@ namespace SlaveMatrix } if (e.中央_接続.Count > 0) { - 中央_接続 = e.中央_接続.Select(delegate(EleD g) + 中央_接続 = e.中央_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -256,7 +256,7 @@ namespace SlaveMatrix } if (e.右1_接続.Count > 0) { - 右1_接続 = e.右1_接続.Select(delegate(EleD g) + 右1_接続 = e.右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -267,7 +267,7 @@ namespace SlaveMatrix } if (e.右2_接続.Count > 0) { - 右2_接続 = e.右2_接続.Select(delegate(EleD g) + 右2_接続 = e.右2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -278,7 +278,7 @@ namespace SlaveMatrix } if (e.右3_接続.Count > 0) { - 右3_接続 = e.右3_接続.Select(delegate(EleD g) + 右3_接続 = e.右3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -289,7 +289,7 @@ namespace SlaveMatrix } if (e.右4_接続.Count > 0) { - 右4_接続 = e.右4_接続.Select(delegate(EleD g) + 右4_接続 = e.右4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -300,7 +300,7 @@ namespace SlaveMatrix } if (e.右5_接続.Count > 0) { - 右5_接続 = e.右5_接続.Select(delegate(EleD g) + 右5_接続 = e.右5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; @@ -342,75 +342,75 @@ namespace SlaveMatrix 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); } - public override IEnumerable EnumEle() + public override IEnumerable EnumEle() { yield return this; if (中央_接続 != null) { - foreach (Ele item in 中央_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item in 中央_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item; } } if (左1_接続 != null) { - foreach (Ele item2 in 左1_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item2 in 左1_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item2; } } if (右1_接続 != null) { - foreach (Ele item3 in 右1_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item3 in 右1_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item3; } } if (左2_接続 != null) { - foreach (Ele item4 in 左2_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item4 in 左2_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item4; } } if (右2_接続 != null) { - foreach (Ele item5 in 右2_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item5 in 右2_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item5; } } if (左3_接続 != null) { - foreach (Ele item6 in 左3_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item6 in 左3_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item6; } } if (右3_接続 != null) { - foreach (Ele item7 in 右3_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item7 in 右3_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item7; } } if (左4_接続 != null) { - foreach (Ele item8 in 左4_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item8 in 左4_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item8; } } if (右4_接続 != null) { - foreach (Ele item9 in 右4_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item9 in 右4_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item9; } } if (左5_接続 != null) { - foreach (Ele item10 in 左5_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item10 in 左5_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item10; } @@ -419,7 +419,7 @@ namespace SlaveMatrix { yield break; } - foreach (Ele item11 in 右5_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item11 in 右5_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item11; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs index 8b1a8e3..799b459 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs @@ -14,149 +14,149 @@ namespace SlaveMatrix public bool スライム; - public List 左5_接続 = new List(); + public List 左5_接続 = new List(); - public List 左4_接続 = new List(); + public List 左4_接続 = new List(); - public List 左3_接続 = new List(); + public List 左3_接続 = new List(); - public List 左2_接続 = new List(); + public List 左2_接続 = new List(); - public List 左1_接続 = new List(); + public List 左1_接続 = new List(); - public List 中央_接続 = new List(); + public List 中央_接続 = new List(); - public List 右1_接続 = new List(); + public List 右1_接続 = new List(); - public List 右2_接続 = new List(); + public List 右2_接続 = new List(); - public List 右3_接続 = new List(); + public List 右3_接続 = new List(); - public List 右4_接続 = new List(); + public List 右4_接続 = new List(); - public List 右5_接続 = new List(); + public List 右5_接続 = new List(); public BackHair0_肢系D() { ThisType = GetType(); } - public void 左5接続(EleD e) + public void 左5接続(ElementData e) { 左5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_左5_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 左4接続(EleD e) + public void 左4接続(ElementData e) { 左4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_左4_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 左3接続(EleD e) + public void 左3接続(ElementData e) { 左3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_左3_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 左2接続(EleD e) + public void 左2接続(ElementData e) { 左2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_左2_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 左1接続(EleD e) + public void 左1接続(ElementData e) { 左1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_左1_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 中央接続(EleD e) + public void 中央接続(ElementData e) { 中央_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_中央_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 右1接続(EleD e) + public void 右1接続(ElementData e) { 右1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_右1_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 右2接続(EleD e) + public void 右2接続(ElementData e) { 右2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_右2_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 右3接続(EleD e) + public void 右3接続(ElementData e) { 右3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_右3_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 右4接続(EleD e) + public void 右4接続(ElementData e) { 右4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_右4_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } } - public void 右5接続(EleD e) + public void 右5接続(ElementData e) { 右5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.BackHair0_肢系_右5_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } @@ -169,80 +169,80 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_肢系(DisUnit, 配色指定, 体配色, Med, this); } - public override IEnumerable EnumEleD() + public override IEnumerable EnumEleD() { yield return this; if (中央_接続 != null) { - foreach (EleD item in 中央_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item in 中央_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item; } } if (左1_接続 != null) { - foreach (EleD item2 in 左1_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item2 in 左1_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item2; } } if (右1_接続 != null) { - foreach (EleD item3 in 右1_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item3 in 右1_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item3; } } if (左2_接続 != null) { - foreach (EleD item4 in 左2_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item4 in 左2_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item4; } } if (右2_接続 != null) { - foreach (EleD item5 in 右2_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item5 in 右2_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item5; } } if (左3_接続 != null) { - foreach (EleD item6 in 左3_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item6 in 左3_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item6; } } if (右3_接続 != null) { - foreach (EleD item7 in 右3_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item7 in 右3_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item7; } } if (左4_接続 != null) { - foreach (EleD item8 in 左4_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item8 in 左4_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item8; } } if (右4_接続 != null) { - foreach (EleD item9 in 右4_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item9 in 右4_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item9; } } if (左5_接続 != null) { - foreach (EleD item10 in 左5_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item10 in 左5_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item10; } @@ -251,7 +251,7 @@ namespace SlaveMatrix { yield break; } - foreach (EleD item11 in 右5_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item11 in 右5_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item11; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1.cs index 96a5887..123084e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class BackHair1 : Ele + public class BackHair1 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1D.cs index 02a0bfb..2c8e121 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class BackHair1D : EleD + public class BackHair1D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs index 44f1d54..7b10ddf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs @@ -44,7 +44,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結1カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs index d8b21af..e202da7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs @@ -44,7 +44,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結1ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs index 84bb33e..6110973 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs @@ -44,7 +44,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結1ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs index 617a7d2..dc0e8d5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs @@ -44,7 +44,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結1パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs index 199250f..1ac5043 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結2カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs index 0f52e1b..6832a6d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結2ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs index 5b026ed..b7e79ff 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結2ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs index 546ddef..a6cbd0c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結2パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs index 2297ee9..3aa9184 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs @@ -52,7 +52,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_編結(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs index 7565aa0..5d3bf73 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class Chest : Ele + public class Chest : Element { public ShapePart X0Y0_胸郭; @@ -357,27 +357,27 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] Neck_接続; + public Element[] Neck_接続; - public Ele[] 肩左_接続; + public Element[] 肩左_接続; - public Ele[] 肩右_接続; + public Element[] 肩右_接続; - public Ele[] 胸左_接続; + public Element[] 胸左_接続; - public Ele[] 胸右_接続; + public Element[] 胸右_接続; - public Ele[] 肌_接続; + public Element[] 肌_接続; - public Ele[] 翼上左_接続; + public Element[] 翼上左_接続; - public Ele[] 翼上右_接続; + public Element[] 翼上右_接続; - public Ele[] 翼下左_接続; + public Element[] 翼下左_接続; - public Ele[] 翼下右_接続; + public Element[] 翼下右_接続; - public Ele[] 背中_接続; + public Element[] 背中_接続; public override bool 欠損 { @@ -1590,10 +1590,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.Neck_接続.Count > 0) { - Neck_接続 = e.Neck_接続.Select(delegate(EleD g) + Neck_接続 = e.Neck_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1604,7 +1604,7 @@ namespace SlaveMatrix } if (e.肩左_接続.Count > 0) { - 肩左_接続 = e.肩左_接続.Select(delegate(EleD g) + 肩左_接続 = e.肩左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1615,7 +1615,7 @@ namespace SlaveMatrix } if (e.肩右_接続.Count > 0) { - 肩右_接続 = e.肩右_接続.Select(delegate(EleD g) + 肩右_接続 = e.肩右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1626,7 +1626,7 @@ namespace SlaveMatrix } if (e.胸左_接続.Count > 0) { - 胸左_接続 = e.胸左_接続.Select(delegate(EleD g) + 胸左_接続 = e.胸左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1637,7 +1637,7 @@ namespace SlaveMatrix } if (e.胸右_接続.Count > 0) { - 胸右_接続 = e.胸右_接続.Select(delegate(EleD g) + 胸右_接続 = e.胸右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1648,7 +1648,7 @@ namespace SlaveMatrix } if (e.肌_接続.Count > 0) { - 肌_接続 = e.肌_接続.Select(delegate(EleD g) + 肌_接続 = e.肌_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1659,7 +1659,7 @@ namespace SlaveMatrix } if (e.翼上左_接続.Count > 0) { - 翼上左_接続 = e.翼上左_接続.Select(delegate(EleD g) + 翼上左_接続 = e.翼上左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1670,7 +1670,7 @@ namespace SlaveMatrix } if (e.翼上右_接続.Count > 0) { - 翼上右_接続 = e.翼上右_接続.Select(delegate(EleD g) + 翼上右_接続 = e.翼上右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1681,7 +1681,7 @@ namespace SlaveMatrix } if (e.翼下左_接続.Count > 0) { - 翼下左_接続 = e.翼下左_接続.Select(delegate(EleD g) + 翼下左_接続 = e.翼下左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1692,7 +1692,7 @@ namespace SlaveMatrix } if (e.翼下右_接続.Count > 0) { - 翼下右_接続 = e.翼下右_接続.Select(delegate(EleD g) + 翼下右_接続 = e.翼下右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; @@ -1703,7 +1703,7 @@ namespace SlaveMatrix } if (e.背中_接続.Count > 0) { - 背中_接続 = e.背中_接続.Select(delegate(EleD g) + 背中_接続 = e.背中_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Chest2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs index aaee1ac..be083e6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ChestD : EleD + public class ChestD : ElementData { public bool 胸郭_表示 = true; @@ -133,76 +133,76 @@ namespace SlaveMatrix public double ハイライト濃度 = 1.0; - public List Neck_接続 = new List(); + public List Neck_接続 = new List(); - public List 肩左_接続 = new List(); + public List 肩左_接続 = new List(); - public List 肩右_接続 = new List(); + public List 肩右_接続 = new List(); - public List 胸左_接続 = new List(); + public List 胸左_接続 = new List(); - public List 胸右_接続 = new List(); + public List 胸右_接続 = new List(); - public List 肌_接続 = new List(); + public List 肌_接続 = new List(); - public List 翼上左_接続 = new List(); + public List 翼上左_接続 = new List(); - public List 翼上右_接続 = new List(); + public List 翼上右_接続 = new List(); - public List 翼下左_接続 = new List(); + public List 翼下左_接続 = new List(); - public List 翼下右_接続 = new List(); + public List 翼下右_接続 = new List(); - public List 背中_接続 = new List(); + public List 背中_接続 = new List(); public ChestD() { ThisType = GetType(); } - public void 首接続(EleD e) + public void 首接続(ElementData e) { Neck_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Chest_Neck_接続; } - public void 肩左接続(EleD e) + public void 肩左接続(ElementData e) { 肩左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Chest_肩左_接続; } - public void 肩右接続(EleD e) + public void 肩右接続(ElementData e) { 肩右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Chest_肩右_接続; } - public void 胸左接続(EleD e) + public void 胸左接続(ElementData e) { 胸左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Chest_胸左_接続; } - public void 胸右接続(EleD e) + public void 胸右接続(ElementData e) { 胸右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Chest_胸右_接続; } - public void 肌接続(EleD e) + public void 肌接続(ElementData e) { 肌_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Chest_肌_接続; } - public void 翼上左接続(EleD e) + public void 翼上左接続(ElementData e) { 翼上左_接続.Add(e); e.Par = this; @@ -211,13 +211,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 翼上右接続(EleD e) + public void 翼上右接続(ElementData e) { 翼上右_接続.Add(e); e.Par = this; @@ -226,13 +226,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 翼下左接続(EleD e) + public void 翼下左接続(ElementData e) { 翼下左_接続.Add(e); e.Par = this; @@ -241,13 +241,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 翼下右接続(EleD e) + public void 翼下右接続(ElementData e) { 翼下右_接続.Add(e); e.Par = this; @@ -256,24 +256,24 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 背中接続(EleD e) + public void 背中接続(ElementData e) { 背中_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Chest_背中_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Chest(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ContactD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ContactD.cs index 68081fc..bbb0868 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ContactD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ContactD.cs @@ -6,7 +6,7 @@ namespace SlaveMatrix { public ContactType c; - public Ele e; + public Element e; public ShapePart p; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs index f35084d..0be8b2c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class Cough : Ele + public class Cough : Element { public ShapePart X0Y0_咳基; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs index 6d6fa99..130911c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs @@ -3,7 +3,7 @@ using System.Linq; namespace SlaveMatrix { - public class Head : Ele + public class Head : Element { public ShapePart X0Y0_Head; @@ -245,49 +245,49 @@ namespace SlaveMatrix public ColorP X0Y0_虫性_顎下CP; - public Ele[] 基髪_接続; + public Element[] 基髪_接続; - public Ele[] 目左_接続; + public Element[] 目左_接続; - public Ele[] 目右_接続; + public Element[] 目右_接続; - public Ele[] 鼻_接続; + public Element[] 鼻_接続; - public Ele[] 口_接続; + public Element[] 口_接続; - public Ele[] 頬左_接続; + public Element[] 頬左_接続; - public Ele[] 頬右_接続; + public Element[] 頬右_接続; - public Ele[] 額_接続; + public Element[] 額_接続; - public Ele[] 眉左_接続; + public Element[] 眉左_接続; - public Ele[] 眉右_接続; + public Element[] 眉右_接続; - public Ele[] 耳左_接続; + public Element[] 耳左_接続; - public Ele[] 耳右_接続; + public Element[] 耳右_接続; - public Ele[] 鼻肌_接続; + public Element[] 鼻肌_接続; - public Ele[] 単眼目_接続; + public Element[] 単眼目_接続; - public Ele[] 単眼眉_接続; + public Element[] 単眼眉_接続; - public Ele[] 大顎基_接続; + public Element[] 大顎基_接続; - public Ele[] 顔面_接続; + public Element[] 顔面_接続; - public Ele[] 頭頂_接続; + public Element[] 頭頂_接続; - public Ele[] 頬肌左_接続; + public Element[] 頬肌左_接続; - public Ele[] 頬肌右_接続; + public Element[] 頬肌右_接続; - public Ele[] 触覚左_接続; + public Element[] 触覚左_接続; - public Ele[] 触覚右_接続; + public Element[] 触覚右_接続; public override bool 欠損 { @@ -1170,10 +1170,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.基髪_接続.Count > 0) { - 基髪_接続 = e.基髪_接続.Select(delegate(EleD g) + 基髪_接続 = e.基髪_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1184,7 +1184,7 @@ namespace SlaveMatrix } if (e.目左_接続.Count > 0) { - 目左_接続 = e.目左_接続.Select(delegate(EleD g) + 目左_接続 = e.目左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1195,7 +1195,7 @@ namespace SlaveMatrix } if (e.目右_接続.Count > 0) { - 目右_接続 = e.目右_接続.Select(delegate(EleD g) + 目右_接続 = e.目右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1206,7 +1206,7 @@ namespace SlaveMatrix } if (e.鼻_接続.Count > 0) { - 鼻_接続 = e.鼻_接続.Select(delegate(EleD g) + 鼻_接続 = e.鼻_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1217,7 +1217,7 @@ namespace SlaveMatrix } if (e.口_接続.Count > 0) { - 口_接続 = e.口_接続.Select(delegate(EleD g) + 口_接続 = e.口_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1228,7 +1228,7 @@ namespace SlaveMatrix } if (e.頬左_接続.Count > 0) { - 頬左_接続 = e.頬左_接続.Select(delegate(EleD g) + 頬左_接続 = e.頬左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1239,7 +1239,7 @@ namespace SlaveMatrix } if (e.頬右_接続.Count > 0) { - 頬右_接続 = e.頬右_接続.Select(delegate(EleD g) + 頬右_接続 = e.頬右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1250,7 +1250,7 @@ namespace SlaveMatrix } if (e.額_接続.Count > 0) { - 額_接続 = e.額_接続.Select(delegate(EleD g) + 額_接続 = e.額_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1261,7 +1261,7 @@ namespace SlaveMatrix } if (e.眉左_接続.Count > 0) { - 眉左_接続 = e.眉左_接続.Select(delegate(EleD g) + 眉左_接続 = e.眉左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1272,7 +1272,7 @@ namespace SlaveMatrix } if (e.眉右_接続.Count > 0) { - 眉右_接続 = e.眉右_接続.Select(delegate(EleD g) + 眉右_接続 = e.眉右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1283,7 +1283,7 @@ namespace SlaveMatrix } if (e.耳左_接続.Count > 0) { - 耳左_接続 = e.耳左_接続.Select(delegate(EleD g) + 耳左_接続 = e.耳左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1294,7 +1294,7 @@ namespace SlaveMatrix } if (e.耳右_接続.Count > 0) { - 耳右_接続 = e.耳右_接続.Select(delegate(EleD g) + 耳右_接続 = e.耳右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1305,7 +1305,7 @@ namespace SlaveMatrix } if (e.鼻肌_接続.Count > 0) { - 鼻肌_接続 = e.鼻肌_接続.Select(delegate(EleD g) + 鼻肌_接続 = e.鼻肌_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1316,7 +1316,7 @@ namespace SlaveMatrix } if (e.単眼目_接続.Count > 0) { - 単眼目_接続 = e.単眼目_接続.Select(delegate(EleD g) + 単眼目_接続 = e.単眼目_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1327,7 +1327,7 @@ namespace SlaveMatrix } if (e.単眼眉_接続.Count > 0) { - 単眼眉_接続 = e.単眼眉_接続.Select(delegate(EleD g) + 単眼眉_接続 = e.単眼眉_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1338,7 +1338,7 @@ namespace SlaveMatrix } if (e.大顎基_接続.Count > 0) { - 大顎基_接続 = e.大顎基_接続.Select(delegate(EleD g) + 大顎基_接続 = e.大顎基_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1349,7 +1349,7 @@ namespace SlaveMatrix } if (e.顔面_接続.Count > 0) { - 顔面_接続 = e.顔面_接続.Select(delegate(EleD g) + 顔面_接続 = e.顔面_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1360,7 +1360,7 @@ namespace SlaveMatrix } if (e.頭頂_接続.Count > 0) { - 頭頂_接続 = e.頭頂_接続.Select(delegate(EleD g) + 頭頂_接続 = e.頭頂_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1371,7 +1371,7 @@ namespace SlaveMatrix } if (e.頬肌左_接続.Count > 0) { - 頬肌左_接続 = e.頬肌左_接続.Select(delegate(EleD g) + 頬肌左_接続 = e.頬肌左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1382,7 +1382,7 @@ namespace SlaveMatrix } if (e.頬肌右_接続.Count > 0) { - 頬肌右_接続 = e.頬肌右_接続.Select(delegate(EleD g) + 頬肌右_接続 = e.頬肌右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1393,7 +1393,7 @@ namespace SlaveMatrix } if (e.触覚左_接続.Count > 0) { - 触覚左_接続 = e.触覚左_接続.Select(delegate(EleD g) + 触覚左_接続 = e.触覚左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; @@ -1404,7 +1404,7 @@ namespace SlaveMatrix } if (e.触覚右_接続.Count > 0) { - 触覚右_接続 = e.触覚右_接続.Select(delegate(EleD g) + 触覚右_接続 = e.触覚右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs index 027a84a..3815d73 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class HeadD : EleD + public class HeadD : ElementData { public bool 頭_表示 = true; @@ -93,203 +93,203 @@ namespace SlaveMatrix public double 眉間; - public List 基髪_接続 = new List(); + public List 基髪_接続 = new List(); - public List 目左_接続 = new List(); + public List 目左_接続 = new List(); - public List 目右_接続 = new List(); + public List 目右_接続 = new List(); - public List 鼻_接続 = new List(); + public List 鼻_接続 = new List(); - public List 口_接続 = new List(); + public List 口_接続 = new List(); - public List 頬左_接続 = new List(); + public List 頬左_接続 = new List(); - public List 頬右_接続 = new List(); + public List 頬右_接続 = new List(); - public List 額_接続 = new List(); + public List 額_接続 = new List(); - public List 眉左_接続 = new List(); + public List 眉左_接続 = new List(); - public List 眉右_接続 = new List(); + public List 眉右_接続 = new List(); - public List 耳左_接続 = new List(); + public List 耳左_接続 = new List(); - public List 耳右_接続 = new List(); + public List 耳右_接続 = new List(); - public List 鼻肌_接続 = new List(); + public List 鼻肌_接続 = new List(); - public List 単眼目_接続 = new List(); + public List 単眼目_接続 = new List(); - public List 単眼眉_接続 = new List(); + public List 単眼眉_接続 = new List(); - public List 大顎基_接続 = new List(); + public List 大顎基_接続 = new List(); - public List 顔面_接続 = new List(); + public List 顔面_接続 = new List(); - public List 頭頂_接続 = new List(); + public List 頭頂_接続 = new List(); - public List 頬肌左_接続 = new List(); + public List 頬肌左_接続 = new List(); - public List 頬肌右_接続 = new List(); + public List 頬肌右_接続 = new List(); - public List 触覚左_接続 = new List(); + public List 触覚左_接続 = new List(); - public List 触覚右_接続 = new List(); + public List 触覚右_接続 = new List(); public HeadD() { ThisType = GetType(); } - public void 基髪接続(EleD e) + public void 基髪接続(ElementData e) { 基髪_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_基髪_接続; } - public void 目左接続(EleD e) + public void 目左接続(ElementData e) { 目左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_目左_接続; } - public void 目右接続(EleD e) + public void 目右接続(ElementData e) { 目右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_目右_接続; } - public void 鼻接続(EleD e) + public void 鼻接続(ElementData e) { 鼻_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_鼻_接続; } - public void 口接続(EleD e) + public void 口接続(ElementData e) { 口_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_口_接続; } - public void 頬左接続(EleD e) + public void 頬左接続(ElementData e) { 頬左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_頬左_接続; } - public void 頬右接続(EleD e) + public void 頬右接続(ElementData e) { 頬右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_頬右_接続; } - public void 額接続(EleD e) + public void 額接続(ElementData e) { 額_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_額_接続; } - public void 眉左接続(EleD e) + public void 眉左接続(ElementData e) { 眉左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_眉左_接続; } - public void 眉右接続(EleD e) + public void 眉右接続(ElementData e) { 眉右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_眉右_接続; } - public void 耳左接続(EleD e) + public void 耳左接続(ElementData e) { 耳左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_耳左_接続; } - public void 耳右接続(EleD e) + public void 耳右接続(ElementData e) { 耳右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_耳右_接続; } - public void 鼻肌接続(EleD e) + public void 鼻肌接続(ElementData e) { 鼻肌_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_鼻肌_接続; } - public void 単眼目接続(EleD e) + public void 単眼目接続(ElementData e) { 単眼目_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_単眼目_接続; } - public void 単眼眉接続(EleD e) + public void 単眼眉接続(ElementData e) { 単眼眉_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_単眼眉_接続; } - public void 大顎基接続(EleD e) + public void 大顎基接続(ElementData e) { 大顎基_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_大顎基_接続; } - public void 顔面接続(EleD e) + public void 顔面接続(ElementData e) { 顔面_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_顔面_接続; } - public void 頭頂接続(EleD e) + public void 頭頂接続(ElementData e) { 頭頂_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_頭頂_接続; } - public void 頬肌左接続(EleD e) + public void 頬肌左接続(ElementData e) { 頬肌左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_頬肌左_接続; } - public void 頬肌右接続(EleD e) + public void 頬肌右接続(ElementData e) { 頬肌右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_頬肌右_接続; } - public void 触覚左接続(EleD e) + public void 触覚左接続(ElementData e) { 触覚左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Head_触覚左_接続; } - public void 触覚右接続(EleD e) + public void 触覚右接続(ElementData e) { 触覚右_接続.Add(e); e.Par = this; @@ -302,7 +302,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Head(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg.cs index b776c48..ed24e5b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg.cs @@ -1,7 +1,7 @@ namespace SlaveMatrix { - public class Leg : Ele + public class Leg : Element { - public Ele[] 足_接続; + public Element[] 足_接続; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LegD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LegD.cs index 0db726e..68719fa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LegD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LegD.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class LegD : EleD + public class LegD : ElementData { - public List 足_接続 = new List(); + public List 足_接続 = new List(); - public virtual void 足接続(EleD e) + public virtual void 足接続(ElementData e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs index 40db3b0..8e3df6a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs @@ -1993,9 +1993,9 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 脚輪下_接続; + public Element[] 脚輪下_接続; - public Ele[] 脚輪上_接続; + public Element[] 脚輪上_接続; public override bool 欠損 { @@ -6594,10 +6594,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.足_接続.Count > 0) { - 足_接続 = e.足_接続.Select(delegate(EleD g) + 足_接続 = e.足_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Leg_人2; @@ -6608,7 +6608,7 @@ namespace SlaveMatrix } if (e.脚輪下_接続.Count > 0) { - 脚輪下_接続 = e.脚輪下_接続.Select(delegate(EleD g) + 脚輪下_接続 = e.脚輪下_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Leg_人2; @@ -6619,7 +6619,7 @@ namespace SlaveMatrix } if (e.脚輪上_接続.Count > 0) { - 脚輪上_接続 = e.脚輪上_接続.Select(delegate(EleD g) + 脚輪上_接続 = e.脚輪上_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Leg_人2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs index 2937387..a67d3cc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs @@ -439,37 +439,37 @@ namespace SlaveMatrix public bool 鎖表示; - public List 脚輪下_接続 = new List(); + public List 脚輪下_接続 = new List(); - public List 脚輪上_接続 = new List(); + public List 脚輪上_接続 = new List(); public Leg_人D() { ThisType = GetType(); } - public override void 足接続(EleD e) + public override void 足接続(ElementData e) { 足_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Leg_人_足_接続; } - public void 脚輪下接続(EleD e) + public void 脚輪下接続(ElementData e) { 脚輪下_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Leg_人_脚輪下_接続; } - public void 脚輪上接続(EleD e) + public void 脚輪上接続(ElementData e) { 脚輪上_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Leg_人_脚輪上_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs index e033a6d..89ea4e8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs @@ -331,8 +331,8 @@ namespace SlaveMatrix } if (e.足_接続.Count > 0) { - Ele f; - 足_接続 = e.足_接続.Select(delegate(EleD g) + Element f; + 足_接続 = e.足_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Leg_獣2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs index 50928d5..7485624 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs @@ -31,14 +31,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 足接続(EleD e) + public override void 足接続(ElementData e) { 足_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Leg_獣_足_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs index 8d2ae70..8a7c981 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs @@ -747,8 +747,8 @@ namespace SlaveMatrix } if (e.足_接続.Count > 0) { - Ele f; - 足_接続 = e.足_接続.Select(delegate(EleD g) + Element f; + 足_接続 = e.足_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Leg_竜2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs index 8c5b99d..7de3b78 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs @@ -67,14 +67,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 足接続(EleD e) + public override void 足接続(ElementData e) { 足_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Leg_竜_足_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs index 743392d..02875b0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs @@ -331,8 +331,8 @@ namespace SlaveMatrix } if (e.足_接続.Count > 0) { - Ele f; - 足_接続 = e.足_接続.Select(delegate(EleD g) + Element f; + 足_接続 = e.足_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Leg_蹄2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs index 9bae8de..bd5b1b7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs @@ -31,14 +31,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 足接続(EleD e) + public override void 足接続(ElementData e) { 足_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Leg_蹄_足_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs index 5c04dd4..8c00390 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs @@ -331,8 +331,8 @@ namespace SlaveMatrix } if (e.足_接続.Count > 0) { - Ele f; - 足_接続 = e.足_接続.Select(delegate(EleD g) + Element f; + 足_接続 = e.足_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Leg_鳥2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs index e7c17b7..5dfee38 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs @@ -31,14 +31,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 足接続(EleD e) + public override void 足接続(ElementData e) { 足_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Leg_鳥_足_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm.cs index a3a0ea5..a9176c8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm.cs @@ -1,8 +1,8 @@ namespace SlaveMatrix { - public class LowerArm : Ele + public class LowerArm : Element { - public Ele[] 手_接続; + public Element[] 手_接続; public virtual bool 肘部_外線 { get; set; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArmD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArmD.cs index a3ae824..50a2c54 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArmD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArmD.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class LowerArmD : EleD + public class LowerArmD : ElementData { - public List 手_接続 = new List(); + public List 手_接続 = new List(); - public virtual void 手接続(EleD e) + public virtual void 手接続(ElementData e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs index 3e6a143..edb687c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs @@ -819,9 +819,9 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 外腕_接続; + public Element[] 外腕_接続; - public Ele[] 虫鎌_接続; + public Element[] 虫鎌_接続; public override bool 欠損 { @@ -5092,10 +5092,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.OuterArm_接続.Count > 0) { - 外腕_接続 = e.OuterArm_接続.Select(delegate(EleD g) + 外腕_接続 = e.OuterArm_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = LowerArm_人2; @@ -5106,7 +5106,7 @@ namespace SlaveMatrix } if (e.手_接続.Count > 0) { - 手_接続 = e.手_接続.Select(delegate(EleD g) + 手_接続 = e.手_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = LowerArm_人2; @@ -5117,7 +5117,7 @@ namespace SlaveMatrix } if (e.虫鎌_接続.Count > 0) { - 虫鎌_接続 = e.虫鎌_接続.Select(delegate(EleD g) + 虫鎌_接続 = e.虫鎌_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = LowerArm_人2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人D.cs index 53cfe27..08c7485 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人D.cs @@ -433,37 +433,37 @@ namespace SlaveMatrix public bool 鎖表示; - public List OuterArm_接続 = new List(); + public List OuterArm_接続 = new List(); - public List 虫鎌_接続 = new List(); + public List 虫鎌_接続 = new List(); public LowerArm_人D() { ThisType = GetType(); } - public void 外腕接続(EleD e) + public void 外腕接続(ElementData e) { OuterArm_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.LowerArm_人_OuterArm_接続; } - public override void 手接続(EleD e) + public override void 手接続(ElementData e) { 手_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.LowerArm_人_手_接続; } - public void 虫鎌接続(EleD e) + public void 虫鎌接続(ElementData e) { 虫鎌_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.LowerArm_人_虫鎌_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs index 56752c5..d8da32a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs @@ -531,8 +531,8 @@ namespace SlaveMatrix } if (e.手_接続.Count > 0) { - Ele f; - 手_接続 = e.手_接続.Select(delegate(EleD g) + Element f; + 手_接続 = e.手_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = LowerArm_獣2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣D.cs index 0d6c5bb..0d636ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣D.cs @@ -47,14 +47,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 手接続(EleD e) + public override void 手接続(ElementData e) { 手_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.LowerArm_獣_手_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs index 9c8a824..6d5eb5a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs @@ -127,7 +127,7 @@ namespace SlaveMatrix public 拘束鎖 鎖1; - public Ele[] 腕輪_接続; + public Element[] 腕輪_接続; public override bool 欠損 { @@ -643,10 +643,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.手_接続.Count > 0) { - 手_接続 = e.手_接続.Select(delegate(EleD g) + 手_接続 = e.手_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = LowerArm_蝙2; @@ -657,7 +657,7 @@ namespace SlaveMatrix } if (e.腕輪_接続.Count > 0) { - 腕輪_接続 = e.腕輪_接続.Select(delegate(EleD g) + 腕輪_接続 = e.腕輪_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = LowerArm_蝙2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙D.cs index 103df61..69edc3b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙D.cs @@ -55,28 +55,28 @@ namespace SlaveMatrix public bool 鎖表示; - public List 腕輪_接続 = new List(); + public List 腕輪_接続 = new List(); public LowerArm_蝙D() { ThisType = GetType(); } - public override void 手接続(EleD e) + public override void 手接続(ElementData e) { 手_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.LowerArm_蝙_手_接続; } - public void 腕輪接続(EleD e) + public void 腕輪接続(ElementData e) { 腕輪_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.LowerArm_蝙_腕輪_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs index 0f66ca3..1c38998 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs @@ -192,8 +192,8 @@ namespace SlaveMatrix } if (e.手_接続.Count > 0) { - Ele f; - 手_接続 = e.手_接続.Select(delegate(EleD g) + Element f; + 手_接続 = e.手_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = LowerArm_蹄2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄D.cs index bc09a3b..74dffb5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄D.cs @@ -17,14 +17,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 手接続(EleD e) + public override void 手接続(ElementData e) { 手_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.LowerArm_蹄_手_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs index 73f44d7..5524609 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs @@ -2286,8 +2286,8 @@ namespace SlaveMatrix } if (e.手_接続.Count > 0) { - Ele f; - 手_接続 = e.手_接続.Select(delegate(EleD g) + Element f; + 手_接続 = e.手_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = LowerArm_鳥2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥D.cs index e1d601b..1d1e9bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥D.cs @@ -225,14 +225,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 手接続(EleD e) + public override void 手接続(ElementData e) { 手_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.LowerArm_鳥_手_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs index 53b69a0..986eaaa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class Neck : Ele + public class Neck : Element { public ShapePart X0Y0_植性_蔦; @@ -307,7 +307,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] Head_接続; + public Element[] Head_接続; public override bool 欠損 { @@ -1325,8 +1325,8 @@ namespace SlaveMatrix } if (e.Head_接続.Count > 0) { - Ele f; - Head_接続 = e.Head_接続.Select(delegate(EleD g) + Element f; + Head_接続 = e.Head_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Neck2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs index 0917943..518a688 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class NeckD : EleD + public class NeckD : ElementData { public bool 植性_蔦_表示; @@ -113,21 +113,21 @@ namespace SlaveMatrix public bool 鎖表示; - public List Head_接続 = new List(); + public List Head_接続 = new List(); public NeckD() { ThisType = GetType(); } - public void 頭接続(EleD e) + public void 頭接続(ElementData e) { Head_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Neck_Head_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Neck(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs index 6c0b1e5..32c7056 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class Shoulder : Ele + public class Shoulder : Element { public ShapePart X0Y0_脇_脇; @@ -75,7 +75,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] UpperArm_接続; + public Element[] UpperArm_接続; public override bool 欠損 { @@ -371,8 +371,8 @@ namespace SlaveMatrix } if (e.UpperArm_接続.Count > 0) { - Ele f; - UpperArm_接続 = e.UpperArm_接続.Select(delegate(EleD g) + Element f; + UpperArm_接続 = e.UpperArm_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Shoulder2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs index b088952..1b74c6a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ShoulderD : EleD + public class ShoulderD : ElementData { public bool 脇_脇_表示 = true; @@ -29,21 +29,21 @@ namespace SlaveMatrix public bool Shoulder_ナース_表示; - public List UpperArm_接続 = new List(); + public List UpperArm_接続 = new List(); public ShoulderD() { ThisType = GetType(); } - public void UpperArm接続(EleD e) + public void UpperArm接続(ElementData e) { UpperArm_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Shoulder_UpperArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Shoulder(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair.cs index 24d7494..5eb08eb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class SideHair : Ele + public class SideHair : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHairD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHairD.cs index e07b913..df310e2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHairD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHairD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class SideHairD : EleD + public class SideHairD : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs index 2cb11d2..5c38fff 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs @@ -34,7 +34,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs index 13836c3..0b8252d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs @@ -34,7 +34,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs index c715d2c..2304256 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs @@ -34,7 +34,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs index dbc3eee..cfe7e8c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs @@ -34,7 +34,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs index 31199f3..a009acc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs @@ -58,7 +58,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_編み(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs index 81ce994..96cb594 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs @@ -11,7 +11,7 @@ namespace SlaveMatrix public ColorP X0Y0_髪CP; - public Ele[] 肢_接続; + public Element[] 肢_接続; public override bool 欠損 { @@ -134,8 +134,8 @@ namespace SlaveMatrix } if (e.肢_接続.Count > 0) { - Ele f; - 肢_接続 = e.肢_接続.Select(delegate(EleD g) + Element f; + 肢_接続 = e.肢_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 横髪_肢系2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs index 8301b1f..3c1aabd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs @@ -9,26 +9,26 @@ namespace SlaveMatrix { public bool 髪_表示 = true; - public List 肢_接続 = new List(); + public List 肢_接続 = new List(); public SideHair_肢系D() { ThisType = GetType(); } - public void 肢接続(EleD e) + public void 肢接続(ElementData e) { 肢_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.SideHair_肢系_肢_接続; } - public EleD SetRandom() + public ElementData SetRandom() { return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_肢系(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs index 5c2a184..5a62011 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs @@ -7,9 +7,9 @@ namespace SlaveMatrix { public struct sep { - public Ele Sta; + public Element Sta; - public Ele Ele; + public Element Element; public ShapePart ShapePart; @@ -29,7 +29,7 @@ namespace SlaveMatrix public Body Bod; - protected EleD EleD; + protected ElementData ElementData; protected List sta = new List(); @@ -39,7 +39,7 @@ namespace SlaveMatrix protected Color2 c2; - protected Ele he; + protected Element he; protected sep sep; @@ -55,13 +55,13 @@ namespace SlaveMatrix { } - public Stamp(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, EleD EleD) + public Stamp(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, ElementData ElementData) { this.Med = Med; this.Are = Are; this.Cha = Cha; this.Bod = Bod; - this.EleD = EleD; + this.ElementData = ElementData; } public virtual void Dispose() @@ -83,7 +83,7 @@ namespace SlaveMatrix public void LegClear() { - sep[] array = sta.Where((sep e) => e.Ele is 腿_人 || e.Ele is Leg_人 || e.Ele is 足_人).ToArray(); + sep[] array = sta.Where((sep e) => e.Element is 腿_人 || e.Element is Leg_人 || e.Element is 足_人).ToArray(); for (int i = 0; i < array.Length; i++) { sep item = array[i]; @@ -92,7 +92,7 @@ namespace SlaveMatrix } } - public bool チェック1(Ele e) + public bool チェック1(Element e) { if (e != null && !(e is 性器) && !(e is 肛門)) { @@ -101,7 +101,7 @@ namespace SlaveMatrix return false; } - public bool チェック2(Ele e) + public bool チェック2(Element e) { if (e != null && !(e is 手_人) && !(e is 性器) && !(e is 肛門)) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs index 1ef71d8..a410d93 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs @@ -26,7 +26,7 @@ namespace SlaveMatrix private ryps[] 対象; - private List 全体 = new List(); + private List 全体 = new List(); private List 位置 = new List(); @@ -38,7 +38,7 @@ namespace SlaveMatrix private int i; - private Ele 汗; + private Element 汗; private Vector2D tp; @@ -72,8 +72,8 @@ namespace SlaveMatrix public Sweat(ModeEventDispatcher Med, RenderArea Are, Character Cha, Motions Mots) { - Ele[] es = null; - Ele n = null; + Element[] es = null; + Element n = null; bool re = false; 汗かき = new Motion(0.0, 1.0) { @@ -82,8 +82,8 @@ namespace SlaveMatrix { if (汗だし) { - es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); - Ele[] array5 = es; + es = 全体.Where((Element e) => e.Intensity != 0.0).ToArray(); + Element[] array5 = es; for (int num3 = 0; num3 < array5.Length; num3++) { array5[num3].Intensity = 0.0; @@ -94,7 +94,7 @@ namespace SlaveMatrix { if (汗だし) { - Ele[] array4 = es; + Element[] array4 = es; for (int num2 = 0; num2 < array4.Length; num2++) { array4[num2].Intensity = m.Value; @@ -113,14 +113,14 @@ namespace SlaveMatrix { if (汗だし) { - Ele[] array3 = es; + Element[] array3 = es; for (int l = 0; l < array3.Length; l++) { array3[l].Intensity = 1.0; } m.ResetValue(); 汗だし = false; - es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); + es = 全体.Where((Element e) => e.Intensity != 0.0).ToArray(); n = es[RNG.XS.Next(es.Length)]; } else @@ -134,12 +134,12 @@ namespace SlaveMatrix { n.Yv = 0.0; n.Intensity = 0.0; - es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); + es = 全体.Where((Element e) => e.Intensity != 0.0).ToArray(); if (es.Length != 0) { n = es[RNG.XS.Next(es.Length)]; } - es = 全体.Where((Ele e) => e.Intensity == 0.0).ToArray(); + es = 全体.Where((Element e) => e.Intensity == 0.0).ToArray(); if (es.Length != 0) { es[RNG.XS.Next(es.Length)].Intensity = 1.0; @@ -154,9 +154,9 @@ namespace SlaveMatrix { n.Yv = 0.0; n.Intensity = 0.0; - es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); + es = 全体.Where((Element e) => e.Intensity != 0.0).ToArray(); n = es[RNG.XS.Next(es.Length)]; - es = 全体.Where((Ele e) => e.Intensity == 0.0).ToArray(); + es = 全体.Where((Element e) => e.Intensity == 0.0).ToArray(); es[RNG.XS.Next(es.Length)].Intensity = 1.0; re = false; m.ResetValue(); @@ -170,11 +170,11 @@ namespace SlaveMatrix BaseSpeed = 1.0, OnStart = delegate { - es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); + es = 全体.Where((Element e) => e.Intensity != 0.0).ToArray(); }, OnUpdate = delegate(Motion m) { - Ele[] array2 = es; + Element[] array2 = es; for (int k = 0; k < array2.Length; k++) { array2[k].Intensity = m.Value.Inverse(); @@ -184,7 +184,7 @@ namespace SlaveMatrix { m.End(); m.ResetValue(); - Ele[] array = es; + Element[] array = es; for (int j = 0; j < array.Length; j++) { array[j].Intensity = 1.0; @@ -203,7 +203,7 @@ namespace SlaveMatrix int num = 0; 汗D e2 = new 汗D(); ryps ryps; - foreach (Ele item in Cha.Body.Elements.Where((Ele e) => 汗対象.Contains(e.GetType().ToString()))) + foreach (Element item in Cha.Body.Elements.Where((Element e) => 汗対象.Contains(e.GetType().ToString()))) { ryps = default(ryps); ryps.r = item.Body.CurJoinRoot; @@ -234,7 +234,7 @@ namespace SlaveMatrix public void Dispose() { - foreach (Ele item in 全体) + foreach (Element item in 全体) { item.Dispose(); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs index ab5baae..6265dce 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class Torso : Ele + public class Torso : Element { public ShapePart X0Y0_Torso; @@ -63,13 +63,13 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] Chest_接続; + public Element[] Chest_接続; - public Ele[] 肌_接続; + public Element[] 肌_接続; - public Ele[] 翼左_接続; + public Element[] 翼左_接続; - public Ele[] 翼右_接続; + public Element[] 翼右_接続; public override bool 欠損 { @@ -348,10 +348,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.Chest_接続.Count > 0) { - Chest_接続 = e.Chest_接続.Select(delegate(EleD g) + Chest_接続 = e.Chest_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso2; @@ -362,7 +362,7 @@ namespace SlaveMatrix } if (e.肌_接続.Count > 0) { - 肌_接続 = e.肌_接続.Select(delegate(EleD g) + 肌_接続 = e.肌_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso2; @@ -373,7 +373,7 @@ namespace SlaveMatrix } if (e.翼左_接続.Count > 0) { - 翼左_接続 = e.翼左_接続.Select(delegate(EleD g) + 翼左_接続 = e.翼左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso2; @@ -384,7 +384,7 @@ namespace SlaveMatrix } if (e.翼右_接続.Count > 0) { - 翼右_接続 = e.翼右_接続.Select(delegate(EleD g) + 翼右_接続 = e.翼右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs index 0313fdb..5963d4c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class TorsoD : EleD + public class TorsoD : ElementData { public bool Torso_表示 = true; @@ -27,34 +27,34 @@ namespace SlaveMatrix public double 筋肉濃度 = 1.0; - public List Chest_接続 = new List(); + public List Chest_接続 = new List(); - public List 肌_接続 = new List(); + public List 肌_接続 = new List(); - public List 翼左_接続 = new List(); + public List 翼左_接続 = new List(); - public List 翼右_接続 = new List(); + public List 翼右_接続 = new List(); public TorsoD() { ThisType = GetType(); } - public void 胴接続(EleD e) + public void 胴接続(ElementData e) { Chest_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_Chest_接続; } - public void 肌接続(EleD e) + public void 肌接続(ElementData e) { 肌_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_肌_接続; } - public void 翼左接続(EleD e) + public void 翼左接続(ElementData e) { 翼左_接続.Add(e); e.Par = this; @@ -63,13 +63,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 翼右接続(EleD e) + public void 翼右接続(ElementData e) { 翼右_接続.Add(e); e.Par = this; @@ -78,13 +78,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Torso(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs index 021718a..059e5af 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs @@ -69,11 +69,11 @@ namespace SlaveMatrix public 拘束鎖 鎖2; - public Ele[] 左_接続; + public Element[] 左_接続; - public Ele[] 右_接続; + public Element[] 右_接続; - public Ele[] Torso_接続; + public Element[] Torso_接続; public override bool 欠損 { @@ -395,10 +395,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左_接続.Count > 0) { - 左_接続 = e.左_接続.Select(delegate(EleD g) + 左_接続 = e.左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso_蛇2; @@ -409,7 +409,7 @@ namespace SlaveMatrix } if (e.右_接続.Count > 0) { - 右_接続 = e.右_接続.Select(delegate(EleD g) + 右_接続 = e.右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso_蛇2; @@ -420,7 +420,7 @@ namespace SlaveMatrix } if (e.Torso_接続.Count > 0) { - Torso_接続 = e.Torso_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso_蛇2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs index fc4c857..e09036b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs @@ -35,28 +35,28 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 左接続(EleD e) + public override void 左接続(ElementData e) { 左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_蛇_左_接続; } - public override void 右接続(EleD e) + public override void 右接続(ElementData e) { 右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_蛇_右_接続; } - public override void Torso接続(EleD e) + public override void Torso接続(ElementData e) { Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_蛇_Torso_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Torso_蛇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs index 9118ef2..97e4788 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs @@ -93,11 +93,11 @@ namespace SlaveMatrix public 拘束鎖 鎖2; - public Ele[] 左_接続; + public Element[] 左_接続; - public Ele[] 右_接続; + public Element[] 右_接続; - public Ele[] Torso_接続; + public Element[] Torso_接続; public override bool 欠損 { @@ -555,10 +555,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左_接続.Count > 0) { - 左_接続 = e.左_接続.Select(delegate(EleD g) + 左_接続 = e.左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso_蟲2; @@ -569,7 +569,7 @@ namespace SlaveMatrix } if (e.右_接続.Count > 0) { - 右_接続 = e.右_接続.Select(delegate(EleD g) + 右_接続 = e.右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso_蟲2; @@ -580,7 +580,7 @@ namespace SlaveMatrix } if (e.Torso_接続.Count > 0) { - Torso_接続 = e.Torso_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Torso_蟲2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs index 281547c..5633b9a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs @@ -53,28 +53,28 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 左接続(EleD e) + public override void 左接続(ElementData e) { 左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_蟲_左_接続; } - public override void 右接続(EleD e) + public override void 右接続(ElementData e) { 右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_蟲_右_接続; } - public override void Torso接続(EleD e) + public override void Torso接続(ElementData e) { Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_蟲_Torso_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Torso_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs index 61f1d14..b71083e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class T剃刀 : Ele + public class T剃刀 : Element { public ShapePart X0Y0_ヘッド; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs index 5112cd2..81cbe3d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class T剃刀D : EleD + public class T剃刀D : ElementData { public bool ヘッド_表示 = true; @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new T剃刀(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm.cs index 2ab6755..2aa6f5e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm.cs @@ -1,7 +1,7 @@ namespace SlaveMatrix { - public class UpperArm : Ele + public class UpperArm : Element { - public Ele[] LowerArm_接続; + public Element[] LowerArm_接続; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArmD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArmD.cs index 7450619..e1a9fcd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArmD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArmD.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class UpperArmD : EleD + public class UpperArmD : ElementData { - public List LowerArm_接続 = new List(); + public List LowerArm_接続 = new List(); - public virtual void LowerArm接続(EleD e) + public virtual void LowerArm接続(ElementData e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs index a4fb7f7..7006e1d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs @@ -3799,8 +3799,8 @@ namespace SlaveMatrix } if (e.LowerArm_接続.Count > 0) { - Ele f; - LowerArm_接続 = e.LowerArm_接続.Select(delegate(EleD g) + Element f; + LowerArm_接続 = e.LowerArm_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = UpperArm_人2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人D.cs index c9614a5..3b6f11a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人D.cs @@ -329,14 +329,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void LowerArm接続(EleD e) + public override void LowerArm接続(ElementData e) { LowerArm_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.UpperArm_人_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs index 826df2b..e18d61e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs @@ -331,8 +331,8 @@ namespace SlaveMatrix } if (e.LowerArm_接続.Count > 0) { - Ele f; - LowerArm_接続 = e.LowerArm_接続.Select(delegate(EleD g) + Element f; + LowerArm_接続 = e.LowerArm_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = UpperArm_獣2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣D.cs index 625c2aa..e491f90 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣D.cs @@ -29,14 +29,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void LowerArm接続(EleD e) + public override void LowerArm接続(ElementData e) { LowerArm_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.UpperArm_獣_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs index 9f064e8..4275cba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs @@ -568,8 +568,8 @@ namespace SlaveMatrix } if (e.LowerArm_接続.Count > 0) { - Ele f; - LowerArm_接続 = e.LowerArm_接続.Select(delegate(EleD g) + Element f; + LowerArm_接続 = e.LowerArm_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = UpperArm_蝙2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙D.cs index 7698160..095dcc1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙D.cs @@ -33,14 +33,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void LowerArm接続(EleD e) + public override void LowerArm接続(ElementData e) { LowerArm_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.UpperArm_蝙_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs index 668fd59..dd011fa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs @@ -191,8 +191,8 @@ namespace SlaveMatrix } if (e.LowerArm_接続.Count > 0) { - Ele f; - LowerArm_接続 = e.LowerArm_接続.Select(delegate(EleD g) + Element f; + LowerArm_接続 = e.LowerArm_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = UpperArm_蹄2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄D.cs index 3473e72..f09e6b8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄D.cs @@ -17,14 +17,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void LowerArm接続(EleD e) + public override void LowerArm接続(ElementData e) { LowerArm_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.UpperArm_蹄_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs index a73fa1c..52d34a0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs @@ -470,8 +470,8 @@ namespace SlaveMatrix } if (e.LowerArm_接続.Count > 0) { - Ele f; - LowerArm_接続 = e.LowerArm_接続.Select(delegate(EleD g) + Element f; + LowerArm_接続 = e.LowerArm_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = UpperArm_鳥2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥D.cs index 68f9453..c9d33a9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥D.cs @@ -47,14 +47,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void LowerArm接続(EleD e) + public override void LowerArm接続(ElementData e) { LowerArm_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.UpperArm_鳥_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs index 3c585a5..a9dcb79 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs @@ -3,7 +3,7 @@ using System.Linq; namespace SlaveMatrix { - public class Waist : Ele + public class Waist : Element { public ShapePart X0Y0_Waist; @@ -955,27 +955,27 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] Torso_接続; + public Element[] Torso_接続; - public Ele[] 腿左_接続; + public Element[] 腿左_接続; - public Ele[] 腿右_接続; + public Element[] 腿右_接続; - public Ele[] 膣基_接続; + public Element[] 膣基_接続; - public Ele[] 肛門_接続; + public Element[] 肛門_接続; - public Ele[] 尾_接続; + public Element[] 尾_接続; - public Ele[] 半身_接続; + public Element[] 半身_接続; - public Ele[] 上着_接続; + public Element[] 上着_接続; - public Ele[] 肌_接続; + public Element[] 肌_接続; - public Ele[] 翼左_接続; + public Element[] 翼左_接続; - public Ele[] 翼右_接続; + public Element[] 翼右_接続; public override bool 欠損 { @@ -2515,10 +2515,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.Torso_接続.Count > 0) { - Torso_接続 = e.Torso_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2529,7 +2529,7 @@ namespace SlaveMatrix } if (e.腿左_接続.Count > 0) { - 腿左_接続 = e.腿左_接続.Select(delegate(EleD g) + 腿左_接続 = e.腿左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2540,7 +2540,7 @@ namespace SlaveMatrix } if (e.腿右_接続.Count > 0) { - 腿右_接続 = e.腿右_接続.Select(delegate(EleD g) + 腿右_接続 = e.腿右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2551,7 +2551,7 @@ namespace SlaveMatrix } if (e.膣基_接続.Count > 0) { - 膣基_接続 = e.膣基_接続.Select(delegate(EleD g) + 膣基_接続 = e.膣基_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2562,7 +2562,7 @@ namespace SlaveMatrix } if (e.肛門_接続.Count > 0) { - 肛門_接続 = e.肛門_接続.Select(delegate(EleD g) + 肛門_接続 = e.肛門_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2573,7 +2573,7 @@ namespace SlaveMatrix } if (e.尾_接続.Count > 0) { - 尾_接続 = e.尾_接続.Select(delegate(EleD g) + 尾_接続 = e.尾_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2584,7 +2584,7 @@ namespace SlaveMatrix } if (e.半身_接続.Count > 0) { - 半身_接続 = e.半身_接続.Select(delegate(EleD g) + 半身_接続 = e.半身_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2595,7 +2595,7 @@ namespace SlaveMatrix } if (e.上着_接続.Count > 0) { - 上着_接続 = e.上着_接続.Select(delegate(EleD g) + 上着_接続 = e.上着_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2606,7 +2606,7 @@ namespace SlaveMatrix } if (e.肌_接続.Count > 0) { - 肌_接続 = e.肌_接続.Select(delegate(EleD g) + 肌_接続 = e.肌_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2617,7 +2617,7 @@ namespace SlaveMatrix } if (e.翼左_接続.Count > 0) { - 翼左_接続 = e.翼左_接続.Select(delegate(EleD g) + 翼左_接続 = e.翼左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; @@ -2628,7 +2628,7 @@ namespace SlaveMatrix } if (e.翼右_接続.Count > 0) { - 翼右_接続 = e.翼右_接続.Select(delegate(EleD g) + 翼右_接続 = e.翼右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = Waist2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs index 7b11bae..1a3f169 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class WaistD : EleD + public class WaistD : ElementData { public bool Waist_表示 = true; @@ -109,41 +109,41 @@ namespace SlaveMatrix public bool スライム; - public List Torso_接続 = new List(); + public List Torso_接続 = new List(); - public List 腿左_接続 = new List(); + public List 腿左_接続 = new List(); - public List 腿右_接続 = new List(); + public List 腿右_接続 = new List(); - public List 膣基_接続 = new List(); + public List 膣基_接続 = new List(); - public List 肛門_接続 = new List(); + public List 肛門_接続 = new List(); - public List 尾_接続 = new List(); + public List 尾_接続 = new List(); - public List 半身_接続 = new List(); + public List 半身_接続 = new List(); - public List 上着_接続 = new List(); + public List 上着_接続 = new List(); - public List 肌_接続 = new List(); + public List 肌_接続 = new List(); - public List 翼左_接続 = new List(); + public List 翼左_接続 = new List(); - public List 翼右_接続 = new List(); + public List 翼右_接続 = new List(); public WaistD() { ThisType = GetType(); } - public void 胴接続(EleD e) + public void 胴接続(ElementData e) { Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Waist_Torso_接続; } - public void 腿左接続(EleD e) + public void 腿左接続(ElementData e) { 腿左_接続.Add(e); e.Par = this; @@ -152,13 +152,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.9; } } - public void 腿右接続(EleD e) + public void 腿右接続(ElementData e) { 腿右_接続.Add(e); e.Par = this; @@ -167,67 +167,67 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.9; } } - public void 膣基接続(EleD e) + public void 膣基接続(ElementData e) { 膣基_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Waist_膣基_接続; } - public void 肛門接続(EleD e) + public void 肛門接続(ElementData e) { 肛門_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Waist_肛門_接続; } - public void 尾接続(EleD e) + public void 尾接続(ElementData e) { 尾_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Waist_尾_接続; if (e is 尾_ヘD || e is 尾_ウD || e is 尾_ガD || e is 尾_蟲D) { - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.6; } return; } - foreach (EleD item2 in e.EnumEleD()) + foreach (ElementData item2 in e.EnumEleD()) { item2.尺度B = 1.0; } } - public void 半身接続(EleD e) + public void 半身接続(ElementData e) { 半身_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Waist_半身_接続; } - public void 上着接続(EleD e) + public void 上着接続(ElementData e) { 上着_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Waist_上着_接続; } - public void 肌接続(EleD e) + public void 肌接続(ElementData e) { 肌_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Waist_肌_接続; } - public void 翼左接続(EleD e) + public void 翼左接続(ElementData e) { 翼左_接続.Add(e); e.Par = this; @@ -236,13 +236,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 翼右接続(EleD e) + public void 翼右接続(ElementData e) { 翼右_接続.Add(e); e.Par = this; @@ -251,13 +251,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Waist(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs index 736aa87..59ad929 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class ぶっかけ_大 : Ele + public class ぶっかけ_大 : Element { public ShapePart X0Y0_精液; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大D.cs index f991d37..a93995e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ぶっかけ_大D : EleD + public class ぶっかけ_大D : ElementData { public bool 精液_表示 = true; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return new ぶっかけ_大(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs index 22cb3b0..d4a26b8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class ぶっかけ_小 : Ele + public class ぶっかけ_小 : Element { public ShapePart X0Y0_精液; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小D.cs index ab1edf7..1eb77ec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ぶっかけ_小D : EleD + public class ぶっかけ_小D : ElementData { public bool 精液_表示 = true; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return new ぶっかけ_小(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs index bee695b..b6a4c86 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class キスマーク : Ele + public class キスマーク : Element { public ShapePart X0Y0_キスマーク; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs index 44925dd..5cd4084 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class キスマークD : EleD + public class キスマークD : ElementData { public bool キスマーク_表示 = true; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new キスマーク(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs index e2c2d44..b288f32 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class キャップ1 : Ele + public class キャップ1 : Element { public ShapePart X0Y0_根本; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs index 9936aa1..5ed37d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class キャップ1D : EleD + public class キャップ1D : ElementData { public bool 根本_表示; @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new キャップ1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs index c2f08bb..40f5ffe 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class キャップ2 : Ele + public class キャップ2 : Element { public ShapePart X0Y0_根本; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs index 293ff32..c47f0c1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class キャップ2D : EleD + public class キャップ2D : ElementData { public bool 根本_表示; @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new キャップ2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs index edbce91..85131f7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs @@ -18,7 +18,7 @@ namespace SlaveMatrix public CM キャップ3; - private Dictionary キャップ = new Dictionary(); + private Dictionary キャップ = new Dictionary(); private キャップ情報 キャップ着; @@ -128,7 +128,7 @@ namespace SlaveMatrix } } - public void 吸着(Ele 対象) + public void 吸着(Element 対象) { 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { @@ -136,7 +136,7 @@ namespace SlaveMatrix }); } - public void 吸脱(Ele 対象) + public void 吸脱(Element 対象) { 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { @@ -144,7 +144,7 @@ namespace SlaveMatrix }); } - public void 振動(Ele 対象) + public void 振動(Element 対象) { if ((対象 is キャップ1 && CP中.GetFlag(0.2)) || (対象 is キャップ2 && !対象.右 && CP左.GetFlag(0.2)) || (対象 is キャップ2 && 対象.右 && CP右.GetFlag(0.2))) { @@ -254,7 +254,7 @@ namespace SlaveMatrix キャップ3.Show = false; キャップ3.使用状態 = UsageStatus.Attach; } - 調教UI.Focus.Ele.位置B = p; + 調教UI.Focus.Element.位置B = p; if (!ハンドf) { 調教UI.Set持ち手(); @@ -273,7 +273,7 @@ namespace SlaveMatrix キャップ[Bod.キャップ1].DraShow = true; キャップ[Bod.キャップ1].StaShow = true; キャップ[Bod.キャップ1].描画Show = true; - キャップ[Bod.キャップ1].Ele.Intensity = 0.5; + キャップ[Bod.キャップ1].Element.Intensity = 0.5; キャップ[Bod.キャップ1].使用状態 = UsageStatus.Standby; キャップ.Remove(Bod.キャップ1); } @@ -376,7 +376,7 @@ namespace SlaveMatrix public void Down(ref MouseButtons mb, ref Vector2D cp, ref Vector2D op, ref Color hc, ref ContactD cd) { - if (調教UI.Focus.Ele.Intensity == 1.0) + if (調教UI.Focus.Element.Intensity == 1.0) { if (ハンドf) { @@ -419,7 +419,7 @@ namespace SlaveMatrix キャップ[Bod.キャップ1].DraShow = true; キャップ[Bod.キャップ1].StaShow = true; キャップ[Bod.キャップ1].描画Show = true; - キャップ[Bod.キャップ1].Ele.Intensity = 0.5; + キャップ[Bod.キャップ1].Element.Intensity = 0.5; キャップ[Bod.キャップ1].使用状態 = UsageStatus.Standby; キャップ.Remove(Bod.キャップ1); キャップ中着 = false; @@ -459,7 +459,7 @@ namespace SlaveMatrix キャップ[Bod.キャップ2左].DraShow = true; キャップ[Bod.キャップ2左].StaShow = true; キャップ[Bod.キャップ2左].描画Show = true; - キャップ[Bod.キャップ2左].Ele.Intensity = 0.5; + キャップ[Bod.キャップ2左].Element.Intensity = 0.5; キャップ[Bod.キャップ2左].使用状態 = UsageStatus.Standby; キャップ.Remove(Bod.キャップ2左); キャップ左着 = false; @@ -503,7 +503,7 @@ namespace SlaveMatrix キャップ[Bod.キャップ2右].DraShow = true; キャップ[Bod.キャップ2右].StaShow = true; キャップ[Bod.キャップ2右].描画Show = true; - キャップ[Bod.キャップ2右].Ele.Intensity = 0.5; + キャップ[Bod.キャップ2右].Element.Intensity = 0.5; キャップ[Bod.キャップ2右].使用状態 = UsageStatus.Standby; キャップ.Remove(Bod.キャップ2右); キャップ右着 = false; @@ -700,19 +700,19 @@ namespace SlaveMatrix キャップ1.DraShow = true; キャップ1.StaShow = true; キャップ1.描画Show = true; - キャップ1.Ele.Intensity = 0.5; + キャップ1.Element.Intensity = 0.5; キャップ1.使用状態 = UsageStatus.Standby; キャップ2.Show = true; キャップ2.DraShow = true; キャップ2.StaShow = true; キャップ2.描画Show = true; - キャップ2.Ele.Intensity = 0.5; + キャップ2.Element.Intensity = 0.5; キャップ2.使用状態 = UsageStatus.Standby; キャップ3.Show = true; キャップ3.DraShow = true; キャップ3.StaShow = true; キャップ3.描画Show = true; - キャップ3.Ele.Intensity = 0.5; + キャップ3.Element.Intensity = 0.5; キャップ3.使用状態 = UsageStatus.Standby; base.Reset(); CP中.Reset(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs index c03d26d..de6a1bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix { if (stum.Sta.表示) { - p = stum.Ele.Body.Current.GetPar(stum.Path); + p = stum.Element.Body.Current.GetPar(stum.Path); stum.Sta.位置B = p.ToGlobal(stum.Pos); stum.Sta.色更新(); stum.Sta.Body.Draw(Are); @@ -33,7 +33,7 @@ namespace SlaveMatrix } } - public void Add(Vector2D cp, Color hc, Dictionary> 参照) + public void Add(Vector2D cp, Color hc, Dictionary> 参照) { he = Bod.GetHitEle(hc); if (チェック2(he)) @@ -45,11 +45,11 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Sta.GameData.配色); + sep.Sta = ElementData.GetEle(Are.DisplayUnitScale, Med, Sta.GameData.配色); sep.Sta.SetHitFalse(); sep.Sta.Xv = RNG.XS.NextDouble(); sep.Sta.右 = RNG.XS.NextBool(); - sep.Ele = he; + sep.Element = he; sep.ShapePart = he.Body.GetHitPar_(hc); sep.Path = sep.ShapePart.GetPath(); sep.Pos = sep.ShapePart.ToLocal(cp); @@ -59,17 +59,17 @@ namespace SlaveMatrix } else { - 参照[he] = new List { sep.Sta }; + 参照[he] = new List { sep.Sta }; } sta.Add(sep); ぶっかけ垂れ.Start(); } } - public スタンプB(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, EleD EleD, Motions Mots) - : base(Med, Are, Cha, Bod, EleD) + public スタンプB(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, ElementData ElementData, Motions Mots) + : base(Med, Are, Cha, Bod, ElementData) { - Ele e = null; + Element e = null; ぶっかけ垂れ = new Motion(0.0, 1.0) { BaseSpeed = 1.0, @@ -93,7 +93,7 @@ namespace SlaveMatrix { } }; - Mots.Add(EleD.GetHashCode().ToString(), ぶっかけ垂れ); + Mots.Add(ElementData.GetHashCode().ToString(), ぶっかけ垂れ); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs index 4d63351..702a532 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs @@ -5,7 +5,7 @@ namespace SlaveMatrix { public class スタンプK : Stamp { - private Ele Par; + private Element Par; public override void Draw(RenderArea Are) { @@ -17,7 +17,7 @@ namespace SlaveMatrix } foreach (sep stum in sta) { - p = stum.Ele.Body.Current.GetPar(stum.Path); + p = stum.Element.Body.Current.GetPar(stum.Path); stum.Sta.角度B = p.AngleBase - stum.ShapePart.AngleBase; stum.Sta.位置B = p.ToGlobal(stum.Pos); stum.Sta.色更新(); @@ -29,7 +29,7 @@ namespace SlaveMatrix } } - public キスマーク Add(Vector2D cp, Color hc, Ele he) + public キスマーク Add(Vector2D cp, Color hc, Element he) { if (チェック1(he) && he == Par) { @@ -44,9 +44,9 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.ColorSet); + sep.Sta = ElementData.GetEle(Are.DisplayUnitScale, Med, Cha.ColorSet); sep.Sta.SetHitFalse(); - sep.Ele = he; + sep.Element = he; sep.ShapePart = p; sep.Path = sep.ShapePart.GetPath(); sep.Pos = sep.ShapePart.ToLocal(cp); @@ -57,8 +57,8 @@ namespace SlaveMatrix return null; } - public スタンプK(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, EleD EleD, Ele Par) - : base(Med, Are, Cha, Bod, EleD) + public スタンプK(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, ElementData ElementData, Element Par) + : base(Med, Are, Cha, Bod, ElementData) { this.Par = Par; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs index b42bb1c..c2f2762 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs @@ -5,7 +5,7 @@ namespace SlaveMatrix { public class スタンプW : Stamp { - private Ele Par; + private Element Par; public override void Draw(RenderArea Are) { @@ -17,7 +17,7 @@ namespace SlaveMatrix } foreach (sep stum in sta) { - p = stum.Ele.Body.Current.GetPar(stum.Path); + p = stum.Element.Body.Current.GetPar(stum.Path); stum.Sta.角度B = p.AngleBase - stum.ShapePart.AngleBase; stum.Sta.位置B = p.ToGlobal(stum.Pos); stum.Sta.色更新(); @@ -29,7 +29,7 @@ namespace SlaveMatrix } } - public bool Add(Vector2D cp, Color hc, Ele he) + public bool Add(Vector2D cp, Color hc, Element he) { if (チェック2(he) && he == Par) { @@ -44,10 +44,10 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.ColorSet); + sep.Sta = ElementData.GetEle(Are.DisplayUnitScale, Med, Cha.ColorSet); sep.Sta.SetHitFalse(); sep.Sta.角度C = 45.0 * (double)(RNG.XS.NextBool() ? 1 : (-1)) * RNG.XS.NextDouble(); - sep.Ele = he; + sep.Element = he; sep.ShapePart = p; sep.Path = sep.ShapePart.GetPath(); sep.Pos = sep.ShapePart.ToLocal(cp + (he.位置 - cp).newNormalize() * 0.01); @@ -58,11 +58,11 @@ namespace SlaveMatrix return false; } - public スタンプW(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, EleD EleD, Ele Par) - : base(Med, Are, Cha, Bod, EleD) + public スタンプW(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, ElementData ElementData, Element Par) + : base(Med, Are, Cha, Bod, ElementData) { this.Par = Par; - EleD.尺度B = 0.9; + ElementData.尺度B = 0.9; } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ドレス色更新.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ドレス色更新.cs index 92db91e..029a334 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ドレス色更新.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ドレス色更新.cs @@ -38,7 +38,7 @@ namespace SlaveMatrix ミドル.色更新(ドレスm, 縁左m, 縁右m); } - public bool Contains(Ele e) + public bool Contains(Element e) { if (トップ != e) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs index 49035ca..566f983 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class ハンド : Ele + public class ハンド : Element { public ShapePart X0Y0_親指; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンドD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンドD.cs index 04e4f51..58c2ff0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンドD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンドD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ハンドD : EleD + public class ハンドD : ElementData { public bool 親指_表示 = true; @@ -41,7 +41,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return new ハンド(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs index 85aef65..dac5688 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs @@ -118,8 +118,8 @@ namespace SlaveMatrix if (Med.Mode == "Training") { //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); } バスト初期化.Start(); @@ -168,8 +168,8 @@ namespace SlaveMatrix if (Med.Mode == "Training") { //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); } バスト初期化.Start(); @@ -207,8 +207,8 @@ namespace SlaveMatrix Addvl(ref 陰核位置); 核捏ね初 = true; //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); 核捏ねsi2(); @@ -224,8 +224,8 @@ namespace SlaveMatrix if (Med.Mode == "Training") { //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); } } @@ -269,8 +269,8 @@ namespace SlaveMatrix if (Med.Mode == "Training") { //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); } if (cd.c == ContactType.Crotch) @@ -368,7 +368,7 @@ namespace SlaveMatrix 調教UI.ハンド右.位置B = coord.TransformCoordinateBP(陰核位置, num2.RotationZ()); Bod.ピアス.位置C = (調教UI.ハンド右.位置B - Bod.ピアス.位置B) * 0.3; } - 対象.Ele.角度C = (100.0 * num).Clamp(-5.0, 5.0); + 対象.Element.角度C = (100.0 * num).Clamp(-5.0, 5.0); } private bool Is撫で() @@ -495,7 +495,7 @@ namespace SlaveMatrix if (調教UI.IsHitCha(ref cd)) { 調教UI.押し(ref cd); - 対象.Ele.角度C = (100.0 * x).Clamp(-45.0, 45.0); + 対象.Element.角度C = (100.0 * x).Clamp(-45.0, 45.0); 調教UI.Action(cd.c, ActionType.Contact, CurrentState.Continue, ToolType.Hand, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); @@ -505,7 +505,7 @@ namespace SlaveMatrix 調教UI.Action(cd.c, ActionType.Contact, CurrentState.Continue, ToolType.Hand, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; 調教UI.放し(); } 体撫でsi2(); @@ -616,7 +616,7 @@ namespace SlaveMatrix 調教UI.ハンド右.Yi = 0; 体撫でsi1(); } - else if (調教UI.ハンド右CM.Ele.Xi == 2 || 調教UI.ハンド右CM.Ele.Xi == 3 || 調教UI.ハンド右CM.Ele.Xi == 5 || 調教UI.ハンド右CM.Ele.Xi == 6 || 調教UI.ハンド右CM.Ele.Xi == 7 || 調教UI.ハンド右CM.Ele.Xi == 8 || 調教UI.ハンド右CM.Ele.Xi == 10) + else if (調教UI.ハンド右CM.Element.Xi == 2 || 調教UI.ハンド右CM.Element.Xi == 3 || 調教UI.ハンド右CM.Element.Xi == 5 || 調教UI.ハンド右CM.Element.Xi == 6 || 調教UI.ハンド右CM.Element.Xi == 7 || 調教UI.ハンド右CM.Element.Xi == 8 || 調教UI.ハンド右CM.Element.Xi == 10) { 調教UI.ハンド左表示 = false; 調教UI.ハンド右CM.Show = true; @@ -730,9 +730,9 @@ namespace SlaveMatrix 切り替え = false; return; } - 調教UI.Focus.Ele.Intensity = 0.5; + 調教UI.Focus.Element.Intensity = 0.5; 調教UI.Focus = 調教UI.ペニスCM; - 調教UI.ペニスCM.Ele.位置B = cp; + 調教UI.ペニスCM.Element.位置B = cp; 調教UI.ペニス処理.選択 = true; 調教UI.ペニス処理.Move(ref mb, ref cp, ref hc, ref cd); } @@ -751,9 +751,9 @@ namespace SlaveMatrix 切り替え = false; return; } - 調教UI.Focus.Ele.Intensity = 0.5; + 調教UI.Focus.Element.Intensity = 0.5; 調教UI.Focus = 調教UI.マウスCM; - 調教UI.マウスCM.Ele.位置B = cp; + 調教UI.マウスCM.Element.位置B = cp; 調教UI.マウス処理.Move(ref mb, ref cp, ref hc, ref cd); } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs index b90d9f6..13c58cc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class バイブ_アナル : Ele + public class バイブ_アナル : Element { public ShapePart X0Y0_ヘッド; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs index 46749cf..a74eb28 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class バイブ_アナルD : EleD + public class バイブ_アナルD : ElementData { public bool ヘッド_表示 = true; @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_アナル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs index 41ab1fa..db9b3cf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class バイブ_コモン : Ele + public class バイブ_コモン : Element { public ShapePart X0Y0_ヘッド; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs index 518254d..b9046b2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class バイブ_コモンD : EleD + public class バイブ_コモンD : ElementData { public bool ヘッド_表示 = true; @@ -57,7 +57,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_コモン(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs index 7f4830b..af65eb7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class バイブ_ディル : Ele + public class バイブ_ディル : Element { public ShapePart X0Y0_ヘッド; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs index 57cdfab..a5f65c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class バイブ_ディルD : EleD + public class バイブ_ディルD : ElementData { public bool ヘッド_表示 = true; @@ -41,7 +41,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_ディル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs index 22c1330..0924b07 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class バイブ_デンマ : Ele //baibu_denma + public class バイブ_デンマ : Element //baibu_denma { public ShapePart X0Y0_ヘッド; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs index 2e49d7b..2a0b85a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class バイブ_デンマD : EleD + public class バイブ_デンマD : ElementData { public bool ヘッド_表示 = true; @@ -47,7 +47,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_デンマ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs index 7dedf88..f2409ba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class バイブ_ドリル : Ele + public class バイブ_ドリル : Element { public ShapePart X0Y0_ヘッド; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs index 6ff4c3a..51c4bbc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class バイブ_ドリルD : EleD + public class バイブ_ドリルD : ElementData { public bool ヘッド_表示 = true; @@ -75,7 +75,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_ドリル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs index 3ea1587..4cb1556 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class パール : Ele + public class パール : Element { public ShapePart X0Y0_軸; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs index 9242bad..dacb914 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class パールD : EleD + public class パールD : ElementData { public bool 軸_表示 = true; @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new パール(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs index f21f022..c677629 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class ピアス : Ele + public class ピアス : Element { public ShapePart X0Y0_ピアス; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs index a1c92de..4c35dd9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ピアスD : EleD + public class ピアスD : ElementData { public bool ピアス_表示; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ピアス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs index 12eb4f0..da09272 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class ペニス : Ele + public class ペニス : Element { public ShapePart X0Y0_陰嚢; @@ -201,7 +201,7 @@ namespace SlaveMatrix public ColorP X1Y4_血管下CP; - public Ele[] 尿道_接続; + public Element[] 尿道_接続; public override bool 欠損 { @@ -531,8 +531,8 @@ namespace SlaveMatrix } if (e.尿道_接続.Count > 0) { - Ele f; - 尿道_接続 = e.尿道_接続.Select(delegate(EleD g) + Element f; + 尿道_接続 = e.尿道_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = ペニス2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニスD.cs index 796e1fa..fa09d79 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニスD.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class ペニスD : EleD + public class ペニスD : ElementData { public bool 陰嚢_表示 = true; @@ -16,14 +16,14 @@ namespace SlaveMatrix public bool 亀頭_表示 = true; - public List 尿道_接続 = new List(); + public List 尿道_接続 = new List(); public ペニスD() { ThisType = GetType(); } - public void 尿道接続(EleD e) + public void 尿道接続(ElementData e) { 尿道_接続.Add(e); e.Par = this; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs index f72987c..aab09bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs @@ -253,7 +253,7 @@ namespace SlaveMatrix Bod.乳房右.Yv = 0.2 + 0.4 * d; vc.Y = -0.002 * d; Bod.胸毛_人.位置C = vc; - 対象.Ele.角度C = (100.0 * x).Clamp(-5.0, 5.0); + 対象.Element.角度C = (100.0 * x).Clamp(-5.0, 5.0); if (yi != Bod.乳房左.Yi && Bod.乳房左.Yi == 1) { Bod.胸左右前後 = !Bod.胸左右前後; @@ -441,7 +441,7 @@ namespace SlaveMatrix if (!調教UI.ハンド挿入.Is挿入) { 持ち手 = false; - 調教UI.Focus.Ele.Intensity = 0.5; + 調教UI.Focus.Element.Intensity = 0.5; 調教UI.Focus = 調教UI.ハンド右CM; 調教UI.ハンド右.位置B = cp; 調教UI.ハンド処理.切り替え = true; @@ -456,9 +456,9 @@ namespace SlaveMatrix else if (mb == MouseButtons.Middle && !手コキ.Run && !パイズリ.Run && !足コキ.Run && !Isモード && !調教UI.マウス挿入.Is挿入) { 持ち手 = false; - 調教UI.Focus.Ele.Intensity = 0.5; + 調教UI.Focus.Element.Intensity = 0.5; 調教UI.Focus = 調教UI.マウスCM; - 調教UI.マウスCM.Ele.位置B = cp; + 調教UI.マウスCM.Element.位置B = cp; 調教UI.マウス処理.切り替え = true; 調教UI.マウス処理.Move(ref mb, ref cp, ref hc, ref cd); } @@ -484,8 +484,8 @@ namespace SlaveMatrix パイズリ.End(); } //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); 調教UI.ハンド処理.バスト初期化.Start(); @@ -494,7 +494,7 @@ namespace SlaveMatrix 調教UI.ハンド左表示 = false; 調教UI.ハンド右.位置C = DataConsts.Vec2DZero; 調教UI.ハンド左.位置C = DataConsts.Vec2DZero; - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; 持ち手 = false; Isパイズリ = false; 調教UI.放し(); @@ -548,19 +548,19 @@ namespace SlaveMatrix { ペニス処理 ペニス処理2 = this; double d = 調教UI.ペニス.X0Y4_陰嚢.BasePointBase.Y - 調教UI.ペニス.X0Y0_陰嚢.BasePointBase.Y; - Vector2D v = new Vector2D(対象.Ele.位置C.X, d); + Vector2D v = new Vector2D(対象.Element.位置C.X, d); チンピク = new Motion(0.0, 1.0) { BaseSpeed = 4.0, OnStart = delegate { - ペニス処理2.対象.Ele.Yi = 0; + ペニス処理2.対象.Element.Yi = 0; }, OnUpdate = delegate(Motion m) { - ペニス処理2.対象.Ele.Yv = m.Value; + ペニス処理2.対象.Element.Yv = m.Value; v.Y = d * m.Value; - ペニス処理2.対象.Ele.位置C = v; + ペニス処理2.対象.Element.位置C = v; }, OnReach = delegate { @@ -572,8 +572,8 @@ namespace SlaveMatrix OnEnd = delegate(Motion m) { m.ResetValue(); - ペニス処理2.対象.Ele.Yi = 0; - ペニス処理2.対象.Ele.位置C = DataConsts.Vec2DZero; + ペニス処理2.対象.Element.Yi = 0; + ペニス処理2.対象.Element.位置C = DataConsts.Vec2DZero; } }; 調教UI.Mots.Add(チンピク.GetHashCode().ToString(), チンピク); @@ -639,7 +639,7 @@ namespace SlaveMatrix }, OnEnd = delegate(Motion m) { - ペニス処理2.対象.Ele.尺度XC = 1.0; + ペニス処理2.対象.Element.尺度XC = 1.0; 調教UI.ペニス.位置C = DataConsts.Vec2DZero; 調教UI.射精.位置C = DataConsts.Vec2DZero; m.ResetValue(); @@ -765,7 +765,7 @@ namespace SlaveMatrix ペニス処理2.LowerArm.尺度XC = LowerArmXC * (0.9 + 0.1 * m.Value.Inverse()); if (ペニス処理2.LowerArm.虫鎌_接続 != null) { - Ele[] 虫鎌_接続2 = ペニス処理2.LowerArm.虫鎌_接続; + Element[] 虫鎌_接続2 = ペニス処理2.LowerArm.虫鎌_接続; for (int j = 0; j < 虫鎌_接続2.Length; j++) { 虫鎌_接続2[j].尺度XC = ペニス処理2.LowerArm.尺度XC; @@ -904,7 +904,7 @@ namespace SlaveMatrix ペニス処理2.LowerArm左.尺度XC = LowerArmXC + 0.2 * vl; if (ペニス処理2.LowerArm左.虫鎌_接続 != null) { - Ele[] 虫鎌_接続 = ペニス処理2.LowerArm左.虫鎌_接続; + Element[] 虫鎌_接続 = ペニス処理2.LowerArm左.虫鎌_接続; for (int i = 0; i < 虫鎌_接続.Length; i++) { 虫鎌_接続[i].尺度XC = ペニス処理2.LowerArm左.尺度XC; @@ -925,7 +925,7 @@ namespace SlaveMatrix ペニス処理2.LowerArm右.尺度XC = LowerArmXC + 0.2 * vr; if (ペニス処理2.LowerArm右.虫鎌_接続 != null) { - Ele[] 虫鎌_接続 = ペニス処理2.LowerArm右.虫鎌_接続; + Element[] 虫鎌_接続 = ペニス処理2.LowerArm右.虫鎌_接続; for (int i = 0; i < 虫鎌_接続.Length; i++) { 虫鎌_接続[i].尺度XC = ペニス処理2.LowerArm右.尺度XC; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹.cs index ac0b567..938a266 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class ボテ腹 : Ele + public class ボテ腹 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹D.cs index 9ef9789..fc04af2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class ボテ腹D : EleD + public class ボテ腹D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs index a382fdd..46abe07 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs @@ -163,7 +163,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 腹板_接続; + public Element[] 腹板_接続; public override bool 欠損 { @@ -504,8 +504,8 @@ namespace SlaveMatrix } if (e.腹板_接続.Count > 0) { - Ele f; - 腹板_接続 = e.腹板_接続.Select(delegate(EleD g) + Element f; + 腹板_接続 = e.腹板_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = ボテ腹_人2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs index b63d41f..2aa2ec5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs @@ -25,21 +25,21 @@ namespace SlaveMatrix public double ハイライト濃度 = 1.0; - public List 腹板_接続 = new List(); + public List 腹板_接続 = new List(); public ボテ腹_人D() { ThisType = GetType(); } - public void 腹板接続(EleD e) + public void 腹板接続(ElementData e) { 腹板_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.ボテ腹_人_腹板_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ボテ腹_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs index 1600164..97f1c61 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix public ColorP X0Y4_臍CP; - public Ele[] 腹板_接続; + public Element[] 腹板_接続; public override bool 欠損 { @@ -212,8 +212,8 @@ namespace SlaveMatrix } if (e.腹板_接続.Count > 0) { - Ele f; - 腹板_接続 = e.腹板_接続.Select(delegate(EleD g) + Element f; + 腹板_接続 = e.腹板_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = ボテ腹_獣2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs index 7ea51f0..358aef9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs @@ -11,21 +11,21 @@ namespace SlaveMatrix public bool 臍_表示; - public List 腹板_接続 = new List(); + public List 腹板_接続 = new List(); public ボテ腹_獣D() { ThisType = GetType(); } - public void 腹板接続(EleD e) + public void 腹板接続(ElementData e) { 腹板_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.ボテ腹_獣_腹板_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ボテ腹_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs index 633ecec..d785637 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class ボテ腹板 : Ele + public class ボテ腹板 : Element { public ShapePart X0Y0_腹板4_腹板; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs index 3760a1b..b363dbc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ボテ腹板D : EleD + public class ボテ腹板D : ElementData { public bool 腹板4_腹板_表示; @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ボテ腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs index 7abacd2..1b75910 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class マウス : Ele + public class マウス : Element { public ShapePart X0Y0_上唇; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウスD.cs index 163b346..d11d87e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウスD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class マウスD : EleD + public class マウスD : ElementData { public bool 上唇_表示 = true; @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return new マウス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs index 91cd5ad..f3ca35d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs @@ -38,7 +38,7 @@ namespace SlaveMatrix { 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { - 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.01), Sta.吸引.GetVal(1.0, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.2, b: true); + 調教UI.擬音.Sound(a, 対象.Element.位置.GetAreaPoint(0.01), Sta.吸引.GetVal(1.0, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.2, b: true); }); } @@ -89,8 +89,8 @@ namespace SlaveMatrix if (Is吸付) { //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置); } else if (Is舐め) @@ -112,21 +112,21 @@ namespace SlaveMatrix else if (cd.c == ContactType.Milk) { 調教UI.マウス.Xi = 0; - 調教UI.Set_乳首(対象.Ele, cd.e.右); + 調教UI.Set_乳首(対象.Element, cd.e.右); 箇所 = cd; オーバー時(GameText.乳首 + "\r\n", ref cd); } else if (cd.c == ContactType.Nucleus) { 調教UI.マウス.Xi = 0; - 調教UI.Set_陰核(対象.Ele); + 調教UI.Set_陰核(対象.Element); 箇所 = cd; オーバー時(GameText.陰核 + "\r\n", ref cd); } else if (Player.フェラ1 && cd.c == ContactType.Mouth) { 箇所 = cd; - 対象.Ele.Intensity = 0.5; + 対象.Element.Intensity = 0.5; 調教UI.マウス.Xi = 4; 調教UI.マウス挿入.Move(ref mb, ref cp, ref hc, ref cd); } @@ -155,7 +155,7 @@ namespace SlaveMatrix 調教UI.放し(); if (!(調教UI.X < cp.X) || !(cp.Y < 調教UI.Y)) { - 対象.Ele.Intensity = 1.0; + 対象.Element.Intensity = 1.0; } オーバー時("", ref cd); } @@ -178,39 +178,39 @@ namespace SlaveMatrix 箇所 = cd; if (cd.c == ContactType.Milk) { - 調教UI.Set_乳首(対象.Ele, cd.e.右); + 調教UI.Set_乳首(対象.Element, cd.e.右); 吸引時(GameText.乳首 + "\r\n"); 調教UI.乳首演出(); } else if (cd.c == ContactType.Nucleus) { - 調教UI.Set_陰核(対象.Ele); + 調教UI.Set_陰核(対象.Element); 吸引時(GameText.陰核 + "\r\n"); 調教UI.陰核演出(); } else if (cd.c == ContactType.Mouth) { - 対象.Ele.Intensity = 0.5; - 対象.Ele.角度C = (double)RNG.XS.NextSign() * 45.0; - 調教UI.Set_口(対象.Ele); + 対象.Element.Intensity = 0.5; + 対象.Element.角度C = (double)RNG.XS.NextSign() * 45.0; + 調教UI.Set_口(対象.Element); 吸引時(GameText.口腔 + "\r\n"); 調教UI.口腔演出(); } else if (cd.c == ContactType.Vagina) { - 調教UI.Set_膣口(対象.Ele); + 調教UI.Set_膣口(対象.Element); 吸引時(GameText.膣腔 + "\r\n"); 調教UI.膣腔演出(); } else if (cd.c == ContactType.Anal) { - 調教UI.Set_肛門(対象.Ele); + 調教UI.Set_肛門(対象.Element); 吸引時(GameText.肛門 + "\r\n"); 調教UI.肛門演出(); } else if (cd.c == ContactType.Thread) { - 調教UI.Set_出糸(対象.Ele); + 調教UI.Set_出糸(対象.Element); 吸引時(GameText.出糸 + "\r\n"); 調教UI.出糸演出(); } @@ -232,9 +232,9 @@ namespace SlaveMatrix { if (!Isモード && !調教UI.ペニス挿入.Is挿入) { - 調教UI.Focus.Ele.Intensity = 0.5; + 調教UI.Focus.Element.Intensity = 0.5; 調教UI.Focus = 調教UI.ペニスCM; - 調教UI.ペニスCM.Ele.位置B = cp; + 調教UI.ペニスCM.Element.位置B = cp; 調教UI.ペニス処理.選択 = true; 調教UI.ペニス処理.Move(ref mb, ref cp, ref hc, ref cd); } @@ -246,7 +246,7 @@ namespace SlaveMatrix 切り替え = false; return; } - 調教UI.Focus.Ele.Intensity = 0.5; + 調教UI.Focus.Element.Intensity = 0.5; 調教UI.Focus = 調教UI.ハンド右CM; 調教UI.ハンド右.位置B = cp; 調教UI.ハンド処理.切り替え = true; @@ -264,8 +264,8 @@ namespace SlaveMatrix 調教UI.マウス.Xi = 0; Is吸付 = false; キスモーション.End(); - 対象.Ele.Intensity = 1.0; - 対象.Ele.角度C = 0.0; + 対象.Element.Intensity = 1.0; + 対象.Element.角度C = 0.0; 調教UI.放し(); if (cd.c == ContactType.Mouth) { @@ -323,7 +323,7 @@ namespace SlaveMatrix 調教UI.マウス.Yi = (調教UI.マウス.Yi - dt.Sign() * 2).Clamp(0, 調教UI.マウス.Body.CountY); if (cd.c == ContactType.Mouth) { - 対象.Ele.Intensity = 0.5; + 対象.Element.Intensity = 0.5; } } } @@ -353,24 +353,24 @@ namespace SlaveMatrix { if (マウス処理2.箇所.c == ContactType.Milk) { - 調教UI.Set_乳首(マウス処理2.対象.Ele, マウス処理2.箇所.e.右); + 調教UI.Set_乳首(マウス処理2.対象.Element, マウス処理2.箇所.e.右); } else if (マウス処理2.箇所.c == ContactType.Nucleus) { - 調教UI.Set_陰核(マウス処理2.対象.Ele); + 調教UI.Set_陰核(マウス処理2.対象.Element); } if (f) { d = m.Value.Inverse(); - マウス処理2.対象.Ele.尺度C = s * d; + マウス処理2.対象.Element.尺度C = s * d; } - マウス処理2.対象.Ele.位置C = Oth.GetRandomVector() * d * 0.0005; + マウス処理2.対象.Element.位置C = Oth.GetRandomVector() * d * 0.0005; 調教UI.マウス.X2Y0_舌.PositionCont = Oth.GetRandomVector() * d * 0.001; if (sw.IsRunning) { if (sw.ElapsedMilliseconds > 250) { - cp = マウス処理2.対象.Ele.位置B; + cp = マウス処理2.対象.Element.位置B; hc = マウス処理2.Med.GetHitColor(マウス処理2.Med.FromBasePosition(cp)); k = マウス処理2.Bod.Addキスマーク(cp, hc); sw.Stop(); @@ -411,8 +411,8 @@ namespace SlaveMatrix OnEnd = delegate(Motion m) { m.ResetValue(); - マウス処理2.対象.Ele.尺度C = 1.0; - マウス処理2.対象.Ele.位置C = DataConsts.Vec2DZero; + マウス処理2.対象.Element.尺度C = 1.0; + マウス処理2.対象.Element.位置C = DataConsts.Vec2DZero; 調教UI.マウス.X2Y0_舌.PositionCont = DataConsts.Vec2DZero; } }; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs index df262a2..673fe1b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class ロータ : Ele + public class ロータ : Element { public ShapePart X0Y0_ロータ; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs index 56d41e8..63492d3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ロータD : EleD + public class ロータD : ElementData { public bool ロータ_表示 = true; @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ロータ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ.cs index 3aeecc6..c279253 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 上着トップ : Ele + public class 上着トップ : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップD.cs index 97bf6a7..8be08aa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 上着トップD : EleD + public class 上着トップD : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs index a2d3d4b..1f3e40b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs @@ -79,7 +79,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着トップ_ドレス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム.cs index 716a1c3..7200909 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 上着ボトム : Ele + public class 上着ボトム : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトムD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトムD.cs index cf53edf..27b8942 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトムD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトムD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 上着ボトムD : EleD + public class 上着ボトムD : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs index 6fff5c1..c418794 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs @@ -175,7 +175,7 @@ namespace SlaveMatrix public ColorP X0Y1_右_皺6CP; - public Ele[] 上着ボトム後_接続; + public Element[] 上着ボトム後_接続; public override bool 欠損 { @@ -751,8 +751,8 @@ namespace SlaveMatrix } if (e.上着ボトム後_接続.Count > 0) { - Ele f; - 上着ボトム後_接続 = e.上着ボトム後_接続.Select(delegate(EleD g) + Element f; + 上着ボトム後_接続 = e.上着ボトム後_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 上着ボトム_クロス2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs index 19211d0..cb10322 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs @@ -59,21 +59,21 @@ namespace SlaveMatrix public bool 中皺2表示; - public List 上着ボトム後_接続 = new List(); + public List 上着ボトム後_接続 = new List(); public 上着ボトム_クロスD() { ThisType = GetType(); } - public void 上着ボトム後接続(EleD e) + public void 上着ボトム後接続(ElementData e) { 上着ボトム後_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.上着ボトム_クロス_上着ボトム後_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着ボトム_クロス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs index b7d4bf1..3f2d5a9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 上着ボトム_クロス後D : EleD + public class 上着ボトム_クロス後D : ElementData { public bool 下地_表示; @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着ボトム_クロス後(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs index 0d8456a..287a1ab 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着ボトム_前掛け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル.cs index cbc617c..448d86f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 上着ミドル : Ele + public class 上着ミドル : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドルD.cs index 7b08a93..20a0217 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドルD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 上着ミドルD : EleD + public class 上着ミドルD : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs index f0a9bb0..24b7662 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着ミドル_ドレス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ.cs index f8910ef..894f093 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 下着トップ : Ele + public class 下着トップ : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップD.cs index 6a2a8fa..0b06df0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 下着トップD : EleD + public class 下着トップD : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs index 0308119..2d3850d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs @@ -65,7 +65,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_クロス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs index fbb7f54..881e55b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs @@ -61,7 +61,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_チューブ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs index beb6243..e21e8a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_ビキニ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs index 1f6883e..42e021c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs @@ -227,7 +227,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_ブラ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs index fab38e3..9920941 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_マイクロ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム.cs index 5fbb132..027aee3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 下着ボトム : Ele + public class 下着ボトム : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトムD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトムD.cs index a4c33ff..c606b12 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトムD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトムD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 下着ボトムD : EleD + public class 下着ボトムD : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs index 6bd0f2b..63f9721 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs @@ -161,7 +161,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着ボトム_ノーマル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs index 6763f33..ac5d960 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs @@ -101,7 +101,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着ボトム_マイクロ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs index 003f479..675ab21 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 下着乳首 : Ele + public class 下着乳首 : Element { public ShapePart X0Y0_乳首; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs index f73fe70..8f63ca3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 下着乳首D : EleD + public class 下着乳首D : ElementData { public bool 乳首_表示 = true; @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着乳首(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs index 4663c3d..fea17d6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 下着陰核 : Ele + public class 下着陰核 : Element { public ShapePart X0Y0_陰核; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs index 47387d4..d9deb70 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 下着陰核D : EleD + public class 下着陰核D : ElementData { public bool 陰核_表示 = true; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着陰核(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs index 6170c50..1021fd2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 乳房 : Ele + public class 乳房 : Element { public ShapePart X0Y0_乳房; @@ -287,7 +287,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 噴乳_接続; + public Element[] 噴乳_接続; public override bool 欠損 { @@ -924,8 +924,8 @@ namespace SlaveMatrix } if (e.噴乳_接続.Count > 0) { - Ele f; - 噴乳_接続 = e.噴乳_接続.Select(delegate(EleD g) + Element f; + 噴乳_接続 = e.噴乳_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 乳房2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs index cac6dc3..31071c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 乳房D : EleD + public class 乳房D : ElementData { public bool 乳房_表示 = true; @@ -47,21 +47,21 @@ namespace SlaveMatrix public bool 着衣; - public List 噴乳_接続 = new List(); + public List 噴乳_接続 = new List(); public 乳房D() { ThisType = GetType(); } - public void 噴乳接続(EleD e) + public void 噴乳接続(ElementData e) { 噴乳_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.乳房_噴乳_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 乳房(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs index dc1adda..a1974eb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs @@ -1653,7 +1653,7 @@ namespace SlaveMatrix bool flag = false; bool flag2 = false; bool flag3 = false; - foreach (EleD item8 in d.EnumEleD()) + foreach (ElementData item8 in d.EnumEleD()) { if (!flag && item8 is 双目D) { @@ -1719,7 +1719,7 @@ namespace SlaveMatrix bool flag4 = false; bool flag5 = false; bool flag6 = false; - foreach (EleD item9 in d.EnumEleD()) + foreach (ElementData item9 in d.EnumEleD()) { if (!flag4 && item9 is 双目D) { @@ -1871,27 +1871,27 @@ namespace SlaveMatrix TorsoD2.肥大 = Waist.肥大; if (RNG.XS.NextBool()) { - EleD eleD = SlaveMatrix.GameClasses._Con.Get後髪0R(); - 基髪D2.後髪接続(eleD); - eleD.AlignR(); - if (eleD is BackHair0_肢系D && 変異率.Lot()) + ElementData elementData = SlaveMatrix.GameClasses._Con.Get後髪0R(); + 基髪D2.後髪接続(elementData); + elementData.AlignR(); + if (elementData is BackHair0_肢系D && 変異率.Lot()) { - eleD.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左2_接続, 要素構成, 接続構成, 変異率, 原種モード); - eleD.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左3_接続, 要素構成, 接続構成, 変異率, 原種モード); - eleD.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左4_接続, 要素構成, 接続構成, 変異率, 原種モード); - eleD.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左5_接続, 要素構成, 接続構成, 変異率, 原種モード); + elementData.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左2_接続, 要素構成, 接続構成, 変異率, 原種モード); + elementData.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左3_接続, 要素構成, 接続構成, 変異率, 原種モード); + elementData.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左4_接続, 要素構成, 接続構成, 変異率, 原種モード); + elementData.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左5_接続, 要素構成, 接続構成, 変異率, 原種モード); } - if ((eleD is BackHair0_ジグD || eleD is BackHair0_ハネD || eleD is BackHair0_パツD || eleD is BackHair0_カルD || eleD is BackHair0_肢系D) && RNG.XS.NextBool()) + if ((elementData is BackHair0_ジグD || elementData is BackHair0_ハネD || elementData is BackHair0_パツD || elementData is BackHair0_カルD || elementData is BackHair0_肢系D) && RNG.XS.NextBool()) { - EleD e2 = SlaveMatrix.GameClasses._Con.Get後髪1R(); + ElementData e2 = SlaveMatrix.GameClasses._Con.Get後髪1R(); 基髪D2.後髪接続(e2); e2.AlignR(); } - EleD eleD2 = SlaveMatrix.GameClasses._Con.Get横髪R(右: false); + ElementData eleD2 = SlaveMatrix.GameClasses._Con.Get横髪R(右: false); 基髪D2.横髪左接続(eleD2); eleD2.AlignR(); 基髪D2.横髪右接続(eleD2.Get逆()); - EleD e3 = SlaveMatrix.GameClasses._Con.Get前髪R(); + ElementData e3 = SlaveMatrix.GameClasses._Con.Get前髪R(); 基髪D2.前髪接続(e3); e3.AlignR(); } @@ -2172,12 +2172,12 @@ namespace SlaveMatrix } else { - EleD eleD3 = Mix<背中D>(母方, 父方, i, 原種モード); + ElementData eleD3 = Mix<背中D>(母方, 父方, i, 原種モード); string t; if (eleD3 != null) { t = eleD3.GetType().ToString(); - if (!ChestD2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) + if (!ChestD2.背中_接続.Any((ElementData e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) { ChestD2.背中接続(eleD3); } @@ -2186,7 +2186,7 @@ namespace SlaveMatrix if (eleD3 != null) { t = eleD3.GetType().ToString(); - if (!ChestD2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) + if (!ChestD2.背中_接続.Any((ElementData e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) { ChestD2.背中接続(eleD3); } @@ -2195,7 +2195,7 @@ namespace SlaveMatrix if (eleD3 != null) { t = eleD3.GetType().ToString(); - if (!ChestD2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) + if (!ChestD2.背中_接続.Any((ElementData e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) { ChestD2.背中接続(eleD3); } @@ -2214,17 +2214,17 @@ namespace SlaveMatrix 長物_魚D2.接続(母方, 父方, i, ConnectionInfo.長物_魚_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); if (長物_魚D2.尾_接続.Count > 0) { - foreach (EleD item in 長物_魚D2.尾_接続) + foreach (ElementData item in 長物_魚D2.尾_接続) { item.AlignR(); } } double 尺度B2 = 長物_魚D2.尺度B; - foreach (EleD item2 in 長物_魚D2.左0_接続) + foreach (ElementData item2 in 長物_魚D2.左0_接続) { item2.尺度B = 尺度B2; } - foreach (EleD item3 in 長物_魚D2.右0_接続) + foreach (ElementData item3 in 長物_魚D2.右0_接続) { item3.尺度B = 尺度B2; } @@ -2234,11 +2234,11 @@ namespace SlaveMatrix 尺度B2 *= 0.9; 尺度B2 *= 0.9; 尺度B2 *= 0.9; - foreach (EleD item4 in 長物_魚D2.左6_接続) + foreach (ElementData item4 in 長物_魚D2.左6_接続) { item4.尺度B = 尺度B2; } - foreach (EleD item5 in 長物_魚D2.右6_接続) + foreach (ElementData item5 in 長物_魚D2.右6_接続) { item5.尺度B = 尺度B2; } @@ -2283,7 +2283,7 @@ namespace SlaveMatrix 鯨.接続(母方, 父方, i, ConnectionInfo.長物_鯨_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); if (鯨.尾_接続.Count > 0) { - foreach (EleD item6 in 鯨.尾_接続) + foreach (ElementData item6 in 鯨.尾_接続) { item6.AlignR(); } @@ -2293,11 +2293,11 @@ namespace SlaveMatrix e.柄 = 鯨.柄; }); double 尺度B3 = 鯨.尺度B; - foreach (EleD item7 in 鯨.左0_接続) + foreach (ElementData item7 in 鯨.左0_接続) { item7.尺度B = 尺度B3; } - foreach (EleD item8 in 鯨.右0_接続) + foreach (ElementData item8 in 鯨.右0_接続) { item8.尺度B = 尺度B3; } @@ -2307,11 +2307,11 @@ namespace SlaveMatrix 尺度B3 *= 0.9; 尺度B3 *= 0.9; 尺度B3 *= 0.9; - foreach (EleD item9 in 鯨.左6_接続) + foreach (ElementData item9 in 鯨.左6_接続) { item9.尺度B = 尺度B3; } - foreach (EleD item10 in 鯨.右6_接続) + foreach (ElementData item10 in 鯨.右6_接続) { item10.尺度B = 尺度B3; } @@ -2359,8 +2359,8 @@ namespace SlaveMatrix 長胴D 長胴D2 = (長胴D)Torso_蛇D2.Copy(); 長物_蛇D2.胴接続(Torso_蛇D2); int num11 = 2; - int num12 = 母方.EnumEleD().Count((EleD e) => e is 長胴D); - int num13 = 父方.EnumEleD().Count((EleD e) => e is 長胴D); + int num12 = 母方.EnumEleD().Count((ElementData e) => e is 長胴D); + int num13 = 父方.EnumEleD().Count((ElementData e) => e is 長胴D); num11 = (RNG.XS.NextBool() ? ((int)((double)(num12 + num13) * 0.5)) : ((!RNG.XS.NextBool()) ? num13 : num12)); num11 = (num11 + RNG.XS.NextSign() * RNG.XS.Next(4)).Clamp(0, 50); for (int l = 0; l < num11; l++) @@ -2456,8 +2456,8 @@ namespace SlaveMatrix 長胴D 長胴D3 = (長胴D)Torso_蟲D2.Copy(); 長物_蟲D2.胴接続(Torso_蟲D2); int num19 = 2; - int num20 = 母方.EnumEleD().Count((EleD e) => e is 長胴D); - int num21 = 父方.EnumEleD().Count((EleD e) => e is 長胴D); + int num20 = 母方.EnumEleD().Count((ElementData e) => e is 長胴D); + int num21 = 父方.EnumEleD().Count((ElementData e) => e is 長胴D); num19 = (RNG.XS.NextBool() ? ((int)((double)(num20 + num21) * 0.5)) : ((!RNG.XS.NextBool()) ? num21 : num20)); num19 = (num19 + RNG.XS.NextSign() * RNG.XS.Next(4)).Clamp(0, 50); for (int m = 0; m < num19; m++) @@ -2471,8 +2471,8 @@ namespace SlaveMatrix 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); } 長物_蟲D2.AlignC(); - Waist.翼左_接続.RemoveAll((EleD e) => e is 四足脇D); - Waist.翼右_接続.RemoveAll((EleD e) => e is 四足脇D); + Waist.翼左_接続.RemoveAll((ElementData e) => e is 四足脇D); + Waist.翼右_接続.RemoveAll((ElementData e) => e is 四足脇D); } else if (半身 is 四足胸D) { @@ -2575,8 +2575,8 @@ namespace SlaveMatrix 四足胸D2.接続(母方, 父方, i, ConnectionInfo.四足胸_背中_接続, 要素構成, 接続構成, 変異率, 原種モード); 四足腰D2.接続(母方, 父方, i, ConnectionInfo.四足腰_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); 四足腰D2.接続(母方, 父方, i, ConnectionInfo.四足腰_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); - Waist.翼左_接続.RemoveAll((EleD e) => e is 四足脇D); - Waist.翼右_接続.RemoveAll((EleD e) => e is 四足脇D); + Waist.翼左_接続.RemoveAll((ElementData e) => e is 四足脇D); + Waist.翼右_接続.RemoveAll((ElementData e) => e is 四足脇D); } else if (半身 is 多足_蛸D) { @@ -2650,7 +2650,7 @@ namespace SlaveMatrix bool 柄1_表示 = eleD5?.柄1_表示 ?? false; bool 柄2_表示 = eleD5?.柄2_表示 ?? false; bool 爪 = eleD5?.爪 ?? false; - foreach (EleD item12 in 多足_蜘D2.触肢左_接続) + foreach (ElementData item12 in 多足_蜘D2.触肢左_接続) { if (item12 is 節尾_鋏D || item12 is 大顎D) { @@ -2661,7 +2661,7 @@ namespace SlaveMatrix item12.反転Y = false; } } - foreach (EleD item13 in 多足_蜘D2.触肢右_接続) + foreach (ElementData item13 in 多足_蜘D2.触肢右_接続) { if (item13 is 節尾_鋏D || item13 is 大顎D) { @@ -2672,7 +2672,7 @@ namespace SlaveMatrix item13.反転Y = false; } } - foreach (EleD item14 in 多足_蜘D2.節足左1_接続) + foreach (ElementData item14 in 多足_蜘D2.節足左1_接続) { if (item14 is 節足_足蜘D) { @@ -2691,7 +2691,7 @@ namespace SlaveMatrix item14.反転Y = false; } } - foreach (EleD item15 in 多足_蜘D2.節足右1_接続) + foreach (ElementData item15 in 多足_蜘D2.節足右1_接続) { if (item15 is 節足_足蜘D) { @@ -2710,7 +2710,7 @@ namespace SlaveMatrix item15.反転Y = false; } } - foreach (EleD item16 in 多足_蜘D2.節足左2_接続) + foreach (ElementData item16 in 多足_蜘D2.節足左2_接続) { if (item16 is 節足_足蜘D) { @@ -2729,7 +2729,7 @@ namespace SlaveMatrix item16.反転Y = false; } } - foreach (EleD item17 in 多足_蜘D2.節足右2_接続) + foreach (ElementData item17 in 多足_蜘D2.節足右2_接続) { if (item17 is 節足_足蜘D) { @@ -2749,7 +2749,7 @@ namespace SlaveMatrix } } bool 反転Y = 多足_蜘D2.節足左3_接続.Count > 0 && 多足_蜘D2.節足左3_接続.First().反転Y; - foreach (EleD item18 in 多足_蜘D2.節足左3_接続) + foreach (ElementData item18 in 多足_蜘D2.節足左3_接続) { if (item18 is 節足_足蜘D) { @@ -2768,7 +2768,7 @@ namespace SlaveMatrix item18.反転Y = 反転Y; } } - foreach (EleD item19 in 多足_蜘D2.節足右3_接続) + foreach (ElementData item19 in 多足_蜘D2.節足右3_接続) { if (item19 is 節足_足蜘D) { @@ -2787,7 +2787,7 @@ namespace SlaveMatrix item19.反転Y = 反転Y; } } - foreach (EleD item20 in 多足_蜘D2.節足左4_接続) + foreach (ElementData item20 in 多足_蜘D2.節足左4_接続) { if (item20 is 節足_足蜘D) { @@ -2806,7 +2806,7 @@ namespace SlaveMatrix item20.反転Y = 反転Y; } } - foreach (EleD item21 in 多足_蜘D2.節足右4_接続) + foreach (ElementData item21 in 多足_蜘D2.節足右4_接続) { if (item21 is 節足_足蜘D) { @@ -2825,8 +2825,8 @@ namespace SlaveMatrix item21.反転Y = 反転Y; } } - Waist.翼左_接続.RemoveAll((EleD e) => e is 四足脇D); - Waist.翼右_接続.RemoveAll((EleD e) => e is 四足脇D); + Waist.翼左_接続.RemoveAll((ElementData e) => e is 四足脇D); + Waist.翼右_接続.RemoveAll((ElementData e) => e is 四足脇D); } else if (半身 is 多足_蠍D) { @@ -2841,7 +2841,7 @@ namespace SlaveMatrix 節足_足蠍D eleD6 = 多足_蠍D2.節足左1_接続.GetEleD<節足_足蠍D>(); bool 柄1_表示2 = eleD6?.柄1_表示 ?? false; bool 爪2 = eleD6?.爪 ?? false; - foreach (EleD item22 in 多足_蠍D2.触肢左_接続) + foreach (ElementData item22 in 多足_蠍D2.触肢左_接続) { if (item22 is 節尾_鋏D || item22 is 大顎D) { @@ -2852,7 +2852,7 @@ namespace SlaveMatrix item22.反転Y = false; } } - foreach (EleD item23 in 多足_蠍D2.触肢右_接続) + foreach (ElementData item23 in 多足_蠍D2.触肢右_接続) { if (item23 is 節尾_鋏D || item23 is 大顎D) { @@ -2863,7 +2863,7 @@ namespace SlaveMatrix item23.反転Y = false; } } - foreach (EleD item24 in 多足_蠍D2.節足左1_接続) + foreach (ElementData item24 in 多足_蠍D2.節足左1_接続) { if (item24 is 節足_足蠍D) { @@ -2876,7 +2876,7 @@ namespace SlaveMatrix item24.反転Y = true; } } - foreach (EleD item25 in 多足_蠍D2.節足右1_接続) + foreach (ElementData item25 in 多足_蠍D2.節足右1_接続) { if (item25 is 節足_足蠍D) { @@ -2889,7 +2889,7 @@ namespace SlaveMatrix item25.反転Y = true; } } - foreach (EleD item26 in 多足_蠍D2.節足左2_接続) + foreach (ElementData item26 in 多足_蠍D2.節足左2_接続) { if (item26 is 節足_足蠍D) { @@ -2902,7 +2902,7 @@ namespace SlaveMatrix item26.反転Y = true; } } - foreach (EleD item27 in 多足_蠍D2.節足右2_接続) + foreach (ElementData item27 in 多足_蠍D2.節足右2_接続) { if (item27 is 節足_足蠍D) { @@ -2915,7 +2915,7 @@ namespace SlaveMatrix item27.反転Y = true; } } - foreach (EleD item28 in 多足_蠍D2.節足左3_接続) + foreach (ElementData item28 in 多足_蠍D2.節足左3_接続) { if (item28 is 節足_足蠍D) { @@ -2928,7 +2928,7 @@ namespace SlaveMatrix item28.反転Y = true; } } - foreach (EleD item29 in 多足_蠍D2.節足右3_接続) + foreach (ElementData item29 in 多足_蠍D2.節足右3_接続) { if (item29 is 節足_足蠍D) { @@ -2941,7 +2941,7 @@ namespace SlaveMatrix item29.反転Y = true; } } - foreach (EleD item30 in 多足_蠍D2.節足左4_接続) + foreach (ElementData item30 in 多足_蠍D2.節足左4_接続) { if (item30 is 節足_足蠍D) { @@ -2954,7 +2954,7 @@ namespace SlaveMatrix item30.反転Y = true; } } - foreach (EleD item31 in 多足_蠍D2.節足右4_接続) + foreach (ElementData item31 in 多足_蠍D2.節足右4_接続) { if (item31 is 節足_足蠍D) { @@ -2967,8 +2967,8 @@ namespace SlaveMatrix item31.反転Y = true; } } - Waist.翼左_接続.RemoveAll((EleD e) => e is 四足脇D); - Waist.翼右_接続.RemoveAll((EleD e) => e is 四足脇D); + Waist.翼左_接続.RemoveAll((ElementData e) => e is 四足脇D); + Waist.翼右_接続.RemoveAll((ElementData e) => e is 四足脇D); } else if (半身 is 単足_植D) { @@ -3090,7 +3090,7 @@ namespace SlaveMatrix } bool flag3 = false; 顔面D 顔面D2 = null; - foreach (EleD item32 in Waist.EnumEleD()) + foreach (ElementData item32 in Waist.EnumEleD()) { if (顔面D2 == null && item32 is 顔面D) { @@ -3104,299 +3104,299 @@ namespace SlaveMatrix { num *= 0.9; } - foreach (EleD item33 in 尾_魚D2.左1_接続) + foreach (ElementData item33 in 尾_魚D2.左1_接続) { item33.尺度B = num; } - foreach (EleD item34 in 尾_魚D2.右1_接続) + foreach (ElementData item34 in 尾_魚D2.右1_接続) { item34.尺度B = num; } num *= 0.9; - foreach (EleD item35 in 尾_魚D2.左2_接続) + foreach (ElementData item35 in 尾_魚D2.左2_接続) { item35.尺度B = num; } - foreach (EleD item36 in 尾_魚D2.右2_接続) + foreach (ElementData item36 in 尾_魚D2.右2_接続) { item36.尺度B = num; } num *= 0.9; - foreach (EleD item37 in 尾_魚D2.左3_接続) + foreach (ElementData item37 in 尾_魚D2.左3_接続) { item37.尺度B = num; } - foreach (EleD item38 in 尾_魚D2.右3_接続) + foreach (ElementData item38 in 尾_魚D2.右3_接続) { item38.尺度B = num; } num *= 0.9; - foreach (EleD item39 in 尾_魚D2.左4_接続) + foreach (ElementData item39 in 尾_魚D2.左4_接続) { item39.尺度B = num; } - foreach (EleD item40 in 尾_魚D2.右4_接続) + foreach (ElementData item40 in 尾_魚D2.右4_接続) { item40.尺度B = num; } num *= 0.9; - foreach (EleD item41 in 尾_魚D2.左5_接続) + foreach (ElementData item41 in 尾_魚D2.左5_接続) { item41.尺度B = num; } - foreach (EleD item42 in 尾_魚D2.右5_接続) + foreach (ElementData item42 in 尾_魚D2.右5_接続) { item42.尺度B = num; } num *= 0.9; - foreach (EleD item43 in 尾_魚D2.左6_接続) + foreach (ElementData item43 in 尾_魚D2.左6_接続) { item43.尺度B = num; } - foreach (EleD item44 in 尾_魚D2.右6_接続) + foreach (ElementData item44 in 尾_魚D2.右6_接続) { item44.尺度B = num; } num *= 0.9; - foreach (EleD item45 in 尾_魚D2.左7_接続) + foreach (ElementData item45 in 尾_魚D2.左7_接続) { item45.尺度B = num; } - foreach (EleD item46 in 尾_魚D2.右7_接続) + foreach (ElementData item46 in 尾_魚D2.右7_接続) { item46.尺度B = num; } num *= 0.9; - foreach (EleD item47 in 尾_魚D2.左8_接続) + foreach (ElementData item47 in 尾_魚D2.左8_接続) { item47.尺度B = num; } - foreach (EleD item48 in 尾_魚D2.右8_接続) + foreach (ElementData item48 in 尾_魚D2.右8_接続) { item48.尺度B = num; } num *= 0.9; - foreach (EleD item49 in 尾_魚D2.左9_接続) + foreach (ElementData item49 in 尾_魚D2.左9_接続) { item49.尺度B = num; } - foreach (EleD item50 in 尾_魚D2.右9_接続) + foreach (ElementData item50 in 尾_魚D2.右9_接続) { item50.尺度B = num; } num *= 0.9; - foreach (EleD item51 in 尾_魚D2.左10_接続) + foreach (ElementData item51 in 尾_魚D2.左10_接続) { item51.尺度B = num; } - foreach (EleD item52 in 尾_魚D2.右10_接続) + foreach (ElementData item52 in 尾_魚D2.右10_接続) { item52.尺度B = num; } num *= 0.9; - foreach (EleD item53 in 尾_魚D2.左11_接続) + foreach (ElementData item53 in 尾_魚D2.左11_接続) { item53.尺度B = num; } - foreach (EleD item54 in 尾_魚D2.右11_接続) + foreach (ElementData item54 in 尾_魚D2.右11_接続) { item54.尺度B = num; } num *= 0.9; - foreach (EleD item55 in 尾_魚D2.左12_接続) + foreach (ElementData item55 in 尾_魚D2.左12_接続) { item55.尺度B = num; } - foreach (EleD item56 in 尾_魚D2.右12_接続) + foreach (ElementData item56 in 尾_魚D2.右12_接続) { item56.尺度B = num; } num *= 0.9; - foreach (EleD item57 in 尾_魚D2.左13_接続) + foreach (ElementData item57 in 尾_魚D2.左13_接続) { item57.尺度B = num; } - foreach (EleD item58 in 尾_魚D2.右13_接続) + foreach (ElementData item58 in 尾_魚D2.右13_接続) { item58.尺度B = num; } num *= 0.9; - foreach (EleD item59 in 尾_魚D2.左14_接続) + foreach (ElementData item59 in 尾_魚D2.左14_接続) { item59.尺度B = num; } - foreach (EleD item60 in 尾_魚D2.右14_接続) + foreach (ElementData item60 in 尾_魚D2.右14_接続) { item60.尺度B = num; } num *= 0.9; - foreach (EleD item61 in 尾_魚D2.左15_接続) + foreach (ElementData item61 in 尾_魚D2.左15_接続) { item61.尺度B = num; } - foreach (EleD item62 in 尾_魚D2.右15_接続) + foreach (ElementData item62 in 尾_魚D2.右15_接続) { item62.尺度B = num; } num *= 0.9; - foreach (EleD item63 in 尾_魚D2.左16_接続) + foreach (ElementData item63 in 尾_魚D2.左16_接続) { item63.尺度B = num; } - foreach (EleD item64 in 尾_魚D2.右16_接続) + foreach (ElementData item64 in 尾_魚D2.右16_接続) { item64.尺度B = num; } num *= 0.9; - foreach (EleD item65 in 尾_魚D2.左17_接続) + foreach (ElementData item65 in 尾_魚D2.左17_接続) { item65.尺度B = num; } - foreach (EleD item66 in 尾_魚D2.右17_接続) + foreach (ElementData item66 in 尾_魚D2.右17_接続) { item66.尺度B = num; } num *= 0.9; - foreach (EleD item67 in 尾_魚D2.左18_接続) + foreach (ElementData item67 in 尾_魚D2.左18_接続) { item67.尺度B = num; } - foreach (EleD item68 in 尾_魚D2.右18_接続) + foreach (ElementData item68 in 尾_魚D2.右18_接続) { item68.尺度B = num; } num *= 0.9; - foreach (EleD item69 in 尾_魚D2.左19_接続) + foreach (ElementData item69 in 尾_魚D2.左19_接続) { item69.尺度B = num; } - foreach (EleD item70 in 尾_魚D2.右19_接続) + foreach (ElementData item70 in 尾_魚D2.右19_接続) { item70.尺度B = num; } num *= 0.9; - foreach (EleD item71 in 尾_魚D2.左20_接続) + foreach (ElementData item71 in 尾_魚D2.左20_接続) { item71.尺度B = num; } - foreach (EleD item72 in 尾_魚D2.右20_接続) + foreach (ElementData item72 in 尾_魚D2.右20_接続) { item72.尺度B = num; } num *= 0.9; - foreach (EleD item73 in 尾_魚D2.左21_接続) + foreach (ElementData item73 in 尾_魚D2.左21_接続) { item73.尺度B = num; } - foreach (EleD item74 in 尾_魚D2.右21_接続) + foreach (ElementData item74 in 尾_魚D2.右21_接続) { item74.尺度B = num; } num *= 0.9; - foreach (EleD item75 in 尾_魚D2.左22_接続) + foreach (ElementData item75 in 尾_魚D2.左22_接続) { item75.尺度B = num; } - foreach (EleD item76 in 尾_魚D2.右22_接続) + foreach (ElementData item76 in 尾_魚D2.右22_接続) { item76.尺度B = num; } num *= 0.9; - foreach (EleD item77 in 尾_魚D2.左23_接続) + foreach (ElementData item77 in 尾_魚D2.左23_接続) { item77.尺度B = num; } - foreach (EleD item78 in 尾_魚D2.右23_接続) + foreach (ElementData item78 in 尾_魚D2.右23_接続) { item78.尺度B = num; } num *= 0.9; - foreach (EleD item79 in 尾_魚D2.左24_接続) + foreach (ElementData item79 in 尾_魚D2.左24_接続) { item79.尺度B = num; } - foreach (EleD item80 in 尾_魚D2.右24_接続) + foreach (ElementData item80 in 尾_魚D2.右24_接続) { item80.尺度B = num; } num *= 0.9; - foreach (EleD item81 in 尾_魚D2.左25_接続) + foreach (ElementData item81 in 尾_魚D2.左25_接続) { item81.尺度B = num; } - foreach (EleD item82 in 尾_魚D2.右25_接続) + foreach (ElementData item82 in 尾_魚D2.右25_接続) { item82.尺度B = num; } num *= 0.9; - foreach (EleD item83 in 尾_魚D2.左27_接続) + foreach (ElementData item83 in 尾_魚D2.左27_接続) { item83.尺度B = num; } - foreach (EleD item84 in 尾_魚D2.右27_接続) + foreach (ElementData item84 in 尾_魚D2.右27_接続) { item84.尺度B = num; } num *= 0.9; - foreach (EleD item85 in 尾_魚D2.左28_接続) + foreach (ElementData item85 in 尾_魚D2.左28_接続) { item85.尺度B = num; } - foreach (EleD item86 in 尾_魚D2.右28_接続) + foreach (ElementData item86 in 尾_魚D2.右28_接続) { item86.尺度B = num; } num *= 0.9; - foreach (EleD item87 in 尾_魚D2.左29_接続) + foreach (ElementData item87 in 尾_魚D2.左29_接続) { item87.尺度B = num; } - foreach (EleD item88 in 尾_魚D2.右29_接続) + foreach (ElementData item88 in 尾_魚D2.右29_接続) { item88.尺度B = num; } num *= 0.9; - foreach (EleD item89 in 尾_魚D2.左30_接続) + foreach (ElementData item89 in 尾_魚D2.左30_接続) { item89.尺度B = num; } - foreach (EleD item90 in 尾_魚D2.右30_接続) + foreach (ElementData item90 in 尾_魚D2.右30_接続) { item90.尺度B = num; } num *= 0.9; - foreach (EleD item91 in 尾_魚D2.左31_接続) + foreach (ElementData item91 in 尾_魚D2.左31_接続) { item91.尺度B = num; } - foreach (EleD item92 in 尾_魚D2.右31_接続) + foreach (ElementData item92 in 尾_魚D2.右31_接続) { item92.尺度B = num; } num *= 0.9; - foreach (EleD item93 in 尾_魚D2.左32_接続) + foreach (ElementData item93 in 尾_魚D2.左32_接続) { item93.尺度B = num; } - foreach (EleD item94 in 尾_魚D2.右32_接続) + foreach (ElementData item94 in 尾_魚D2.右32_接続) { item94.尺度B = num; } num *= 0.9; - foreach (EleD item95 in 尾_魚D2.左33_接続) + foreach (ElementData item95 in 尾_魚D2.左33_接続) { item95.尺度B = num; } - foreach (EleD item96 in 尾_魚D2.右33_接続) + foreach (ElementData item96 in 尾_魚D2.右33_接続) { item96.尺度B = num; } num *= 0.9; - foreach (EleD item97 in 尾_魚D2.左34_接続) + foreach (ElementData item97 in 尾_魚D2.左34_接続) { item97.尺度B = num; } - foreach (EleD item98 in 尾_魚D2.右34_接続) + foreach (ElementData item98 in 尾_魚D2.右34_接続) { item98.尺度B = num; } @@ -3421,299 +3421,299 @@ namespace SlaveMatrix { num2 *= 0.9; } - foreach (EleD item99 in 尾_鯨D2.左1_接続) + foreach (ElementData item99 in 尾_鯨D2.左1_接続) { item99.尺度B = num2; } - foreach (EleD item100 in 尾_鯨D2.右1_接続) + foreach (ElementData item100 in 尾_鯨D2.右1_接続) { item100.尺度B = num2; } num2 *= 0.9; - foreach (EleD item101 in 尾_鯨D2.左2_接続) + foreach (ElementData item101 in 尾_鯨D2.左2_接続) { item101.尺度B = num2; } - foreach (EleD item102 in 尾_鯨D2.右2_接続) + foreach (ElementData item102 in 尾_鯨D2.右2_接続) { item102.尺度B = num2; } num2 *= 0.9; - foreach (EleD item103 in 尾_鯨D2.左3_接続) + foreach (ElementData item103 in 尾_鯨D2.左3_接続) { item103.尺度B = num2; } - foreach (EleD item104 in 尾_鯨D2.右3_接続) + foreach (ElementData item104 in 尾_鯨D2.右3_接続) { item104.尺度B = num2; } num2 *= 0.9; - foreach (EleD item105 in 尾_鯨D2.左4_接続) + foreach (ElementData item105 in 尾_鯨D2.左4_接続) { item105.尺度B = num2; } - foreach (EleD item106 in 尾_鯨D2.右4_接続) + foreach (ElementData item106 in 尾_鯨D2.右4_接続) { item106.尺度B = num2; } num2 *= 0.9; - foreach (EleD item107 in 尾_鯨D2.左5_接続) + foreach (ElementData item107 in 尾_鯨D2.左5_接続) { item107.尺度B = num2; } - foreach (EleD item108 in 尾_鯨D2.右5_接続) + foreach (ElementData item108 in 尾_鯨D2.右5_接続) { item108.尺度B = num2; } num2 *= 0.9; - foreach (EleD item109 in 尾_鯨D2.左6_接続) + foreach (ElementData item109 in 尾_鯨D2.左6_接続) { item109.尺度B = num2; } - foreach (EleD item110 in 尾_鯨D2.右6_接続) + foreach (ElementData item110 in 尾_鯨D2.右6_接続) { item110.尺度B = num2; } num2 *= 0.9; - foreach (EleD item111 in 尾_鯨D2.左7_接続) + foreach (ElementData item111 in 尾_鯨D2.左7_接続) { item111.尺度B = num2; } - foreach (EleD item112 in 尾_鯨D2.右7_接続) + foreach (ElementData item112 in 尾_鯨D2.右7_接続) { item112.尺度B = num2; } num2 *= 0.9; - foreach (EleD item113 in 尾_鯨D2.左8_接続) + foreach (ElementData item113 in 尾_鯨D2.左8_接続) { item113.尺度B = num2; } - foreach (EleD item114 in 尾_鯨D2.右8_接続) + foreach (ElementData item114 in 尾_鯨D2.右8_接続) { item114.尺度B = num2; } num2 *= 0.9; - foreach (EleD item115 in 尾_鯨D2.左9_接続) + foreach (ElementData item115 in 尾_鯨D2.左9_接続) { item115.尺度B = num2; } - foreach (EleD item116 in 尾_鯨D2.右9_接続) + foreach (ElementData item116 in 尾_鯨D2.右9_接続) { item116.尺度B = num2; } num2 *= 0.9; - foreach (EleD item117 in 尾_鯨D2.左10_接続) + foreach (ElementData item117 in 尾_鯨D2.左10_接続) { item117.尺度B = num2; } - foreach (EleD item118 in 尾_鯨D2.右10_接続) + foreach (ElementData item118 in 尾_鯨D2.右10_接続) { item118.尺度B = num2; } num2 *= 0.9; - foreach (EleD item119 in 尾_鯨D2.左11_接続) + foreach (ElementData item119 in 尾_鯨D2.左11_接続) { item119.尺度B = num2; } - foreach (EleD item120 in 尾_鯨D2.右11_接続) + foreach (ElementData item120 in 尾_鯨D2.右11_接続) { item120.尺度B = num2; } num2 *= 0.9; - foreach (EleD item121 in 尾_鯨D2.左12_接続) + foreach (ElementData item121 in 尾_鯨D2.左12_接続) { item121.尺度B = num2; } - foreach (EleD item122 in 尾_鯨D2.右12_接続) + foreach (ElementData item122 in 尾_鯨D2.右12_接続) { item122.尺度B = num2; } num2 *= 0.9; - foreach (EleD item123 in 尾_鯨D2.左13_接続) + foreach (ElementData item123 in 尾_鯨D2.左13_接続) { item123.尺度B = num2; } - foreach (EleD item124 in 尾_鯨D2.右13_接続) + foreach (ElementData item124 in 尾_鯨D2.右13_接続) { item124.尺度B = num2; } num2 *= 0.9; - foreach (EleD item125 in 尾_鯨D2.左14_接続) + foreach (ElementData item125 in 尾_鯨D2.左14_接続) { item125.尺度B = num2; } - foreach (EleD item126 in 尾_鯨D2.右14_接続) + foreach (ElementData item126 in 尾_鯨D2.右14_接続) { item126.尺度B = num2; } num2 *= 0.9; - foreach (EleD item127 in 尾_鯨D2.左15_接続) + foreach (ElementData item127 in 尾_鯨D2.左15_接続) { item127.尺度B = num2; } - foreach (EleD item128 in 尾_鯨D2.右15_接続) + foreach (ElementData item128 in 尾_鯨D2.右15_接続) { item128.尺度B = num2; } num2 *= 0.9; - foreach (EleD item129 in 尾_鯨D2.左16_接続) + foreach (ElementData item129 in 尾_鯨D2.左16_接続) { item129.尺度B = num2; } - foreach (EleD item130 in 尾_鯨D2.右16_接続) + foreach (ElementData item130 in 尾_鯨D2.右16_接続) { item130.尺度B = num2; } num2 *= 0.9; - foreach (EleD item131 in 尾_鯨D2.左17_接続) + foreach (ElementData item131 in 尾_鯨D2.左17_接続) { item131.尺度B = num2; } - foreach (EleD item132 in 尾_鯨D2.右17_接続) + foreach (ElementData item132 in 尾_鯨D2.右17_接続) { item132.尺度B = num2; } num2 *= 0.9; - foreach (EleD item133 in 尾_鯨D2.左18_接続) + foreach (ElementData item133 in 尾_鯨D2.左18_接続) { item133.尺度B = num2; } - foreach (EleD item134 in 尾_鯨D2.右18_接続) + foreach (ElementData item134 in 尾_鯨D2.右18_接続) { item134.尺度B = num2; } num2 *= 0.9; - foreach (EleD item135 in 尾_鯨D2.左19_接続) + foreach (ElementData item135 in 尾_鯨D2.左19_接続) { item135.尺度B = num2; } - foreach (EleD item136 in 尾_鯨D2.右19_接続) + foreach (ElementData item136 in 尾_鯨D2.右19_接続) { item136.尺度B = num2; } num2 *= 0.9; - foreach (EleD item137 in 尾_鯨D2.左20_接続) + foreach (ElementData item137 in 尾_鯨D2.左20_接続) { item137.尺度B = num2; } - foreach (EleD item138 in 尾_鯨D2.右20_接続) + foreach (ElementData item138 in 尾_鯨D2.右20_接続) { item138.尺度B = num2; } num2 *= 0.9; - foreach (EleD item139 in 尾_鯨D2.左21_接続) + foreach (ElementData item139 in 尾_鯨D2.左21_接続) { item139.尺度B = num2; } - foreach (EleD item140 in 尾_鯨D2.右21_接続) + foreach (ElementData item140 in 尾_鯨D2.右21_接続) { item140.尺度B = num2; } num2 *= 0.9; - foreach (EleD item141 in 尾_鯨D2.左22_接続) + foreach (ElementData item141 in 尾_鯨D2.左22_接続) { item141.尺度B = num2; } - foreach (EleD item142 in 尾_鯨D2.右22_接続) + foreach (ElementData item142 in 尾_鯨D2.右22_接続) { item142.尺度B = num2; } num2 *= 0.9; - foreach (EleD item143 in 尾_鯨D2.左23_接続) + foreach (ElementData item143 in 尾_鯨D2.左23_接続) { item143.尺度B = num2; } - foreach (EleD item144 in 尾_鯨D2.右23_接続) + foreach (ElementData item144 in 尾_鯨D2.右23_接続) { item144.尺度B = num2; } num2 *= 0.9; - foreach (EleD item145 in 尾_鯨D2.左24_接続) + foreach (ElementData item145 in 尾_鯨D2.左24_接続) { item145.尺度B = num2; } - foreach (EleD item146 in 尾_鯨D2.右24_接続) + foreach (ElementData item146 in 尾_鯨D2.右24_接続) { item146.尺度B = num2; } num2 *= 0.9; - foreach (EleD item147 in 尾_鯨D2.左25_接続) + foreach (ElementData item147 in 尾_鯨D2.左25_接続) { item147.尺度B = num2; } - foreach (EleD item148 in 尾_鯨D2.右25_接続) + foreach (ElementData item148 in 尾_鯨D2.右25_接続) { item148.尺度B = num2; } num2 *= 0.9; - foreach (EleD item149 in 尾_鯨D2.左27_接続) + foreach (ElementData item149 in 尾_鯨D2.左27_接続) { item149.尺度B = num2; } - foreach (EleD item150 in 尾_鯨D2.右27_接続) + foreach (ElementData item150 in 尾_鯨D2.右27_接続) { item150.尺度B = num2; } num2 *= 0.9; - foreach (EleD item151 in 尾_鯨D2.左28_接続) + foreach (ElementData item151 in 尾_鯨D2.左28_接続) { item151.尺度B = num2; } - foreach (EleD item152 in 尾_鯨D2.右28_接続) + foreach (ElementData item152 in 尾_鯨D2.右28_接続) { item152.尺度B = num2; } num2 *= 0.9; - foreach (EleD item153 in 尾_鯨D2.左29_接続) + foreach (ElementData item153 in 尾_鯨D2.左29_接続) { item153.尺度B = num2; } - foreach (EleD item154 in 尾_鯨D2.右29_接続) + foreach (ElementData item154 in 尾_鯨D2.右29_接続) { item154.尺度B = num2; } num2 *= 0.9; - foreach (EleD item155 in 尾_鯨D2.左30_接続) + foreach (ElementData item155 in 尾_鯨D2.左30_接続) { item155.尺度B = num2; } - foreach (EleD item156 in 尾_鯨D2.右30_接続) + foreach (ElementData item156 in 尾_鯨D2.右30_接続) { item156.尺度B = num2; } num2 *= 0.9; - foreach (EleD item157 in 尾_鯨D2.左31_接続) + foreach (ElementData item157 in 尾_鯨D2.左31_接続) { item157.尺度B = num2; } - foreach (EleD item158 in 尾_鯨D2.右31_接続) + foreach (ElementData item158 in 尾_鯨D2.右31_接続) { item158.尺度B = num2; } num2 *= 0.9; - foreach (EleD item159 in 尾_鯨D2.左32_接続) + foreach (ElementData item159 in 尾_鯨D2.左32_接続) { item159.尺度B = num2; } - foreach (EleD item160 in 尾_鯨D2.右32_接続) + foreach (ElementData item160 in 尾_鯨D2.右32_接続) { item160.尺度B = num2; } num2 *= 0.9; - foreach (EleD item161 in 尾_鯨D2.左33_接続) + foreach (ElementData item161 in 尾_鯨D2.左33_接続) { item161.尺度B = num2; } - foreach (EleD item162 in 尾_鯨D2.右33_接続) + foreach (ElementData item162 in 尾_鯨D2.右33_接続) { item162.尺度B = num2; } num2 *= 0.9; - foreach (EleD item163 in 尾_鯨D2.左34_接続) + foreach (ElementData item163 in 尾_鯨D2.左34_接続) { item163.尺度B = num2; } - foreach (EleD item164 in 尾_鯨D2.右34_接続) + foreach (ElementData item164 in 尾_鯨D2.右34_接続) { item164.尺度B = num2; } @@ -3722,47 +3722,47 @@ namespace SlaveMatrix { 触手_蔦D 触手_蔦D2 = (触手_蔦D)item32; double 尺度B = 触手_蔦D2.尺度B; - foreach (EleD item165 in 触手_蔦D2.節3_接続) + foreach (ElementData item165 in 触手_蔦D2.節3_接続) { item165.尺度B = 尺度B; } 尺度B *= SpeciesDefaults.葉倍率; - foreach (EleD item166 in 触手_蔦D2.節5_接続) + foreach (ElementData item166 in 触手_蔦D2.節5_接続) { item166.尺度B = 尺度B; } 尺度B *= SpeciesDefaults.葉倍率; - foreach (EleD item167 in 触手_蔦D2.節7_接続) + foreach (ElementData item167 in 触手_蔦D2.節7_接続) { item167.尺度B = 尺度B; } 尺度B *= SpeciesDefaults.葉倍率; - foreach (EleD item168 in 触手_蔦D2.節9_接続) + foreach (ElementData item168 in 触手_蔦D2.節9_接続) { item168.尺度B = 尺度B; } 尺度B *= SpeciesDefaults.葉倍率; - foreach (EleD item169 in 触手_蔦D2.節11_接続) + foreach (ElementData item169 in 触手_蔦D2.節11_接続) { item169.尺度B = 尺度B; } 尺度B *= SpeciesDefaults.葉倍率; - foreach (EleD item170 in 触手_蔦D2.節13_接続) + foreach (ElementData item170 in 触手_蔦D2.節13_接続) { item170.尺度B = 尺度B; } 尺度B *= SpeciesDefaults.葉倍率; - foreach (EleD item171 in 触手_蔦D2.節15_接続) + foreach (ElementData item171 in 触手_蔦D2.節15_接続) { item171.尺度B = 尺度B; } 尺度B *= SpeciesDefaults.葉倍率; - foreach (EleD item172 in 触手_蔦D2.節17_接続) + foreach (ElementData item172 in 触手_蔦D2.節17_接続) { item172.尺度B = 尺度B; } 尺度B *= SpeciesDefaults.葉倍率; - foreach (EleD item173 in 触手_蔦D2.節19_接続) + foreach (ElementData item173 in 触手_蔦D2.節19_接続) { item173.尺度B = 尺度B; } @@ -3917,39 +3917,39 @@ namespace SlaveMatrix { if (RNG.XS.NextBool()) { - HeadD2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - HeadD2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); + HeadD2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + HeadD2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); } else { - 基髪D2.頭頂左_接続.RemoveAll((EleD e) => e is 触覚D); - 基髪D2.頭頂右_接続.RemoveAll((EleD e) => e is 触覚D); + 基髪D2.頭頂左_接続.RemoveAll((ElementData e) => e is 触覚D); + 基髪D2.頭頂右_接続.RemoveAll((ElementData e) => e is 触覚D); } } else if (flag12 && !flag13 && flag14) { if (RNG.XS.NextBool()) { - 顔面D2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - 顔面D2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); + 顔面D2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + 顔面D2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); } else { - 基髪D2.頭頂左_接続.RemoveAll((EleD e) => e is 触覚D); - 基髪D2.頭頂右_接続.RemoveAll((EleD e) => e is 触覚D); + 基髪D2.頭頂左_接続.RemoveAll((ElementData e) => e is 触覚D); + 基髪D2.頭頂右_接続.RemoveAll((ElementData e) => e is 触覚D); } } else if (flag12 && flag13 && !flag14) { if (RNG.XS.NextBool()) { - 顔面D2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - 顔面D2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); + 顔面D2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + 顔面D2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); } else { - HeadD2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - HeadD2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); + HeadD2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + HeadD2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); } } else if (flag12 && flag13 && flag14) @@ -3957,22 +3957,22 @@ namespace SlaveMatrix switch (RNG.XS.Next(2)) { case 0: - HeadD2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - HeadD2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); - 基髪D2.頭頂左_接続.RemoveAll((EleD e) => e is 触覚D); - 基髪D2.頭頂右_接続.RemoveAll((EleD e) => e is 触覚D); + HeadD2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + HeadD2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); + 基髪D2.頭頂左_接続.RemoveAll((ElementData e) => e is 触覚D); + 基髪D2.頭頂右_接続.RemoveAll((ElementData e) => e is 触覚D); break; case 1: - 顔面D2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - 顔面D2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); - 基髪D2.頭頂左_接続.RemoveAll((EleD e) => e is 触覚D); - 基髪D2.頭頂右_接続.RemoveAll((EleD e) => e is 触覚D); + 顔面D2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + 顔面D2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); + 基髪D2.頭頂左_接続.RemoveAll((ElementData e) => e is 触覚D); + 基髪D2.頭頂右_接続.RemoveAll((ElementData e) => e is 触覚D); break; case 2: - 顔面D2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - 顔面D2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); - HeadD2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - HeadD2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); + 顔面D2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + 顔面D2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); + HeadD2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + HeadD2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); break; } } @@ -3986,8 +3986,8 @@ namespace SlaveMatrix { 顔面D2.触覚右接続(eleD9); } - HeadD2.触覚左_接続.RemoveAll((EleD e) => e is 触覚D); - HeadD2.触覚右_接続.RemoveAll((EleD e) => e is 触覚D); + HeadD2.触覚左_接続.RemoveAll((ElementData e) => e is 触覚D); + HeadD2.触覚右_接続.RemoveAll((ElementData e) => e is 触覚D); } if (腰肌.陰毛_表示 && 腰肌.獣性_獣毛_表示) { @@ -4086,19 +4086,19 @@ namespace SlaveMatrix return Waist; } - public static EleD GetEleD(this IEnumerable src, Type t) + public static ElementData GetEleD(this IEnumerable src, Type t) { - return src?.FirstOrDefault((EleD e) => e.GetType().IsAssignableFrom(t)); + return src?.FirstOrDefault((ElementData e) => e.GetType().IsAssignableFrom(t)); } - public static EleD GetEleD(this IEnumerable src, bool 右, Type t) + public static ElementData GetEleD(this IEnumerable src, bool 右, Type t) { - return src?.FirstOrDefault((EleD e) => e.GetType().IsAssignableFrom(t) && e.右 == 右); + return src?.FirstOrDefault((ElementData e) => e.GetType().IsAssignableFrom(t) && e.右 == 右); } - public static EleD GetEleD(this IEnumerable src, Func con, Type t) + public static ElementData GetEleD(this IEnumerable src, Func con, Type t) { - return src?.FirstOrDefault((EleD e) => e.GetType().IsAssignableFrom(t) && con(e)); + return src?.FirstOrDefault((ElementData e) => e.GetType().IsAssignableFrom(t) && con(e)); } private static void Dou(this T e) @@ -4163,10 +4163,10 @@ namespace SlaveMatrix } } - private static T Sub(T e0, T e1) where T : EleD + private static T Sub(T e0, T e1) where T : ElementData { object obj = e0.GetType().GetConstructor(bi, Type.DefaultBinder, t0, null).Invoke(null); - EleD eleD = e0.Copy_以下無(); + ElementData elementData = e0.Copy_以下無(); Type type = e1.GetType(); FieldInfo[] fields = e0.GetType().GetFields(); foreach (FieldInfo fieldInfo in fields) @@ -4178,17 +4178,17 @@ namespace SlaveMatrix { bool num = (bool)fieldInfo.GetValue(e0); bool flag = num; - fieldInfo.SetValue(eleD, (num && (bool)field.GetValue(e1)) ? fieldInfo.GetValue(obj) : ((object)flag)); + fieldInfo.SetValue(elementData, (num && (bool)field.GetValue(e1)) ? fieldInfo.GetValue(obj) : ((object)flag)); } } } - return (T)eleD; + return (T)elementData; } - private static T Syn(T e0, T e1) where T : EleD + private static T Syn(T e0, T e1) where T : ElementData { e0.GetType().GetConstructor(bi, Type.DefaultBinder, t0, null).Invoke(null); - EleD eleD = e0.Copy_以下無(); + ElementData elementData = e0.Copy_以下無(); Type type = e1.GetType(); FieldInfo[] fields = e0.GetType().GetFields(); foreach (FieldInfo fieldInfo in fields) @@ -4198,14 +4198,14 @@ namespace SlaveMatrix FieldInfo field = type.GetField(fieldInfo.Name); if (field != null && field.FieldType.ToString() == Sta.bt) { - fieldInfo.SetValue(eleD, (bool)fieldInfo.GetValue(e0) || (bool)field.GetValue(e1)); + fieldInfo.SetValue(elementData, (bool)fieldInfo.GetValue(e0) || (bool)field.GetValue(e1)); } } } - return (T)eleD; + return (T)elementData; } - private static T Mix(T 母, T 父, int i, bool 原種モード) where T : EleD + private static T Mix(T 母, T 父, int i, bool 原種モード) where T : ElementData { T val = null; if (母 == null && 父 != null) @@ -4282,7 +4282,7 @@ namespace SlaveMatrix return val; } - private static T Mix(WaistD 母方, WaistD 父方, int i, bool 原種モード) where T : EleD + private static T Mix(WaistD 母方, WaistD 父方, int i, bool 原種モード) where T : ElementData { T eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4293,7 +4293,7 @@ namespace SlaveMatrix return Mix(eleD, eleD2, i, 原種モード); } - private static T Mix(WaistD 母方, WaistD 父方, bool 右, int i, bool 原種モード) where T : EleD + private static T Mix(WaistD 母方, WaistD 父方, bool 右, int i, bool 原種モード) where T : ElementData { T eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4304,7 +4304,7 @@ namespace SlaveMatrix return Mix(eleD, eleD2, i, 原種モード); } - private static T Mix(WaistD 母方, WaistD 父方, Func con, int i, bool 原種モード) where T : EleD + private static T Mix(WaistD 母方, WaistD 父方, Func con, int i, bool 原種モード) where T : ElementData { T eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4315,40 +4315,40 @@ namespace SlaveMatrix return Mix(eleD, eleD2, i, 原種モード); } - private static EleD Mix(WaistD 母方, WaistD 父方, int i, Type t, bool 原種モード) + private static ElementData Mix(WaistD 母方, WaistD 父方, int i, Type t, bool 原種モード) { - EleD eleD = (from e in 母方.EnumEleD() + ElementData elementData = (from e in 母方.EnumEleD() orderby RNG.XS.Next() select e).GetEleD(t); - EleD eleD2 = (from e in 父方.EnumEleD() + ElementData eleD2 = (from e in 父方.EnumEleD() orderby RNG.XS.Next() select e).GetEleD(t); - return Mix(eleD, eleD2, i, 原種モード); + return Mix(elementData, eleD2, i, 原種モード); } - private static EleD Mix(WaistD 母方, WaistD 父方, bool 右, int i, Type t, bool 原種モード) + private static ElementData Mix(WaistD 母方, WaistD 父方, bool 右, int i, Type t, bool 原種モード) { - EleD eleD = (from e in 母方.EnumEleD() + ElementData elementData = (from e in 母方.EnumEleD() orderby RNG.XS.Next() select e).GetEleD(右, t); - EleD eleD2 = (from e in 父方.EnumEleD() + ElementData eleD2 = (from e in 父方.EnumEleD() orderby RNG.XS.Next() select e).GetEleD(右, t); - return Mix(eleD, eleD2, i, 原種モード); + return Mix(elementData, eleD2, i, 原種モード); } - private static EleD Mix(WaistD 母方, WaistD 父方, Func con, int i, Type t, bool 原種モード) + private static ElementData Mix(WaistD 母方, WaistD 父方, Func con, int i, Type t, bool 原種モード) { - EleD eleD = (from e in 母方.EnumEleD() + ElementData elementData = (from e in 母方.EnumEleD() orderby RNG.XS.Next() select e).GetEleD(con, t); - EleD eleD2 = (from e in 父方.EnumEleD() + ElementData eleD2 = (from e in 父方.EnumEleD() orderby RNG.XS.Next() select e).GetEleD(con, t); - return Mix(eleD, eleD2, i, 原種モード); + return Mix(elementData, eleD2, i, 原種モード); } - public static void AlignR(this EleD e) + public static void AlignR(this ElementData e) { if (e == null) { @@ -4364,13 +4364,13 @@ namespace SlaveMatrix } } - public static void AlignC(this EleD e) + public static void AlignC(this ElementData e) { if (e == null) { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { FieldInfo[] fields = Sta.EleDt.GetFields(); foreach (FieldInfo fieldInfo in fields) @@ -4386,7 +4386,7 @@ namespace SlaveMatrix private static Dictionary> Get接続構成(WaistD 母方, WaistD 父方) { Dictionary> dictionary = new Dictionary>(); - foreach (EleD item in 母方.EnumEleD().Concat(父方.EnumEleD())) + foreach (ElementData item in 母方.EnumEleD().Concat(父方.EnumEleD())) { Type type = item.GetType(); if (!(item is 長胴D) && 接続範囲.ContainsKey(item.接続情報) && 接続範囲[item.接続情報].Contains(type.ToString())) @@ -4409,7 +4409,7 @@ namespace SlaveMatrix select e.GetType()).ToArray(); } - public static void 接続(this EleD e, WaistD 母方, WaistD 父方, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, bool 原種モード) + public static void 接続(this ElementData e, WaistD 母方, WaistD 父方, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, bool 原種モード) { string text = 接続.ToString(); if (text.Contains("左")) @@ -4417,7 +4417,7 @@ namespace SlaveMatrix ConnectionInfo 接続情報2 = 接続; ConnectionInfo 接続情報3 = text.Replace("左", "右").To接続情報(); { - foreach (EleD item in Enum接続肢(母方, 父方, 右: false, i, 接続, 要素構成, 接続構成, 変異率, 原種モード)) + foreach (ElementData item in Enum接続肢(母方, 父方, 右: false, i, 接続, 要素構成, 接続構成, 変異率, 原種モード)) { if (item != null) { @@ -4432,7 +4432,7 @@ namespace SlaveMatrix { return; } - foreach (EleD item2 in Enum接続肢(母方, 父方, 右: false, i, 接続, 要素構成, 接続構成, 変異率, 原種モード).Reverse()) + foreach (ElementData item2 in Enum接続肢(母方, 父方, 右: false, i, 接続, 要素構成, 接続構成, 変異率, 原種モード).Reverse()) { if (item2 != null) { @@ -4441,7 +4441,7 @@ namespace SlaveMatrix } } - public static IEnumerable Enum接続肢(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, bool 原種モード) + public static IEnumerable Enum接続肢(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, bool 原種モード) { double l = (接続.接続数(母方, 父方) + 接続.接続数(母方, 父方) + 接続.接続数(母方, 父方)) / 3; double num = 1.0 / ((double)接続構成.Count * 0.5); @@ -4481,7 +4481,7 @@ namespace SlaveMatrix } for (int j = 0; (double)j < l; j++) { - EleD e = Get接続肢(母方, 父方, 右, i, 接続, 要素構成, 接続構成, 変異率, j, 原種モード); + ElementData e = Get接続肢(母方, 父方, 右, i, 接続, 要素構成, 接続構成, 変異率, j, 原種モード); if (e != null) { yield return e; @@ -4497,54 +4497,54 @@ namespace SlaveMatrix { if (接続範囲.ContainsKey(接続情報)) { - IEnumerable source = from e in 母方.EnumEleD().Concat(父方.EnumEleD()) + IEnumerable source = from e in 母方.EnumEleD().Concat(父方.EnumEleD()) where e.Enum接続情報().Contains(接続情報) select e; int num = source.Count(); if (num != 0) { - return source.ElementAt(RNG.XS.Next(num)).Get接続(接続情報).Count((EleD e) => 接続範囲[接続情報].Contains(e.GetType().ToString())); + return source.ElementAt(RNG.XS.Next(num)).Get接続(接続情報).Count((ElementData e) => 接続範囲[接続情報].Contains(e.GetType().ToString())); } return 1; } return 0; } - public static EleD Get接続肢(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, int j, bool 原種モード) + public static ElementData Get接続肢(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, int j, bool 原種モード) { - EleD eleD = Get要素(母方, 父方, 右, i, 接続, 要素構成, 接続構成, 変異率, j, 原種モード); - if (eleD != null) + ElementData elementData = Get要素(母方, 父方, 右, i, 接続, 要素構成, 接続構成, 変異率, j, 原種モード); + if (elementData != null) { - foreach (ConnectionInfo item in eleD.Enum接続情報()) + foreach (ConnectionInfo item in elementData.Enum接続情報()) { string text = item.ToString(); if (text.Contains("左")) { ConnectionInfo 接続情報2 = item; ConnectionInfo 接続情報3 = text.Replace("左", "右").To接続情報(); - foreach (EleD item2 in Enum接続肢(母方, 父方, 右: false, i, item, 要素構成, 接続構成, 変異率, 原種モード)) + foreach (ElementData item2 in Enum接続肢(母方, 父方, 右: false, i, item, 要素構成, 接続構成, 変異率, 原種モード)) { if (item2 != null) { - eleD.接続(接続情報2, item2); - eleD.接続(接続情報3, item2.Get逆()); + elementData.接続(接続情報2, item2); + elementData.接続(接続情報3, item2.Get逆()); } } } else if (!text.Contains("右")) { - EleD eleD2 = Get接続肢(母方, 父方, 右, i, item, 要素構成, 接続構成, 変異率, j, 原種モード); + ElementData eleD2 = Get接続肢(母方, 父方, 右, i, item, 要素構成, 接続構成, 変異率, j, 原種モード); if (eleD2 != null) { - eleD.接続(item, eleD2); + elementData.接続(item, eleD2); } } } } - return eleD; + return elementData; } - public static EleD Get要素(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, int j, bool 原種モード) + public static ElementData Get要素(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, int j, bool 原種モード) { if (!原種モード && 変異率.Lot()) { @@ -4553,7 +4553,7 @@ namespace SlaveMatrix return Get要素0(母方, 父方, 右, i, 接続, 接続構成, j, 原種モード); } - public static EleD Get要素1(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, int j, bool 原種モード) + public static ElementData Get要素1(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, int j, bool 原種モード) { if (接続範囲.ContainsKey(接続)) { @@ -4571,7 +4571,7 @@ namespace SlaveMatrix return null; } - public static EleD Get要素0(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Dictionary> 接続構成, int j, bool 原種モード) + public static ElementData Get要素0(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Dictionary> 接続構成, int j, bool 原種モード) { if (接続構成.ContainsKey(接続)) { @@ -4749,7 +4749,7 @@ namespace SlaveMatrix unit.Name = unit.Race; unit.種族情報 = 母方.種族情報.Mix(父方.種族情報); unit.妊娠進行期間 = (母方.妊娠進行期間 + 父方.妊娠進行期間) / 2; - foreach (EleD item in unit.ChaD.body_tree.EnumEleD()) + foreach (ElementData item in unit.ChaD.body_tree.EnumEleD()) { item.SetValuesD("傷", false); item.欠損 = false; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs index d5308df..d495bac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix { 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { - 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.01), Sta.剃り.GetVal(Cha.CharacterData.現陰毛, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * RNG.XS.NextDouble(), b: true); + 調教UI.擬音.Sound(a, 対象.Element.位置.GetAreaPoint(0.01), Sta.剃り.GetVal(Cha.CharacterData.現陰毛, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * RNG.XS.NextDouble(), b: true); }); } } @@ -82,7 +82,7 @@ namespace SlaveMatrix a = 0.0 - v.Angle02π(-DataConsts.Vec2DUnitY).ToDegree(); if (!double.IsNaN(a)) { - 対象.Ele.角度C = a; + 対象.Element.角度C = a; } 調教UI.Action(cd.c, ActionType.Shaving, CurrentState.Continue, ToolType.Ｔ剃刀, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); @@ -98,7 +98,7 @@ namespace SlaveMatrix 調教UI.Action(cd.c, ActionType.Shaving, CurrentState.End, ToolType.Ｔ剃刀, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; 調教UI.放し(); } 押し当て時(); @@ -137,7 +137,7 @@ namespace SlaveMatrix else if (mb == MouseButtons.Right && !Is剃り) { Is剃り = false; - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; 調教UI.通常放し(); } } @@ -150,7 +150,7 @@ namespace SlaveMatrix Player.奴体力消費小(); Player.主精力消費小(); 調教UI.放し(); - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; Is剃り = false; 移動時(ref hc); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅.cs index e06e6d2..fafd20c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 前翅 : Ele + public class 前翅 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅D.cs index 49ccfc8..e756ddb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 前翅D : EleD + public class 前翅D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs index 3978376..923894e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs @@ -221,11 +221,11 @@ namespace SlaveMatrix public ColorP X0Y1_欠け3CP; - public Ele[] 軸1_接続; + public Element[] 軸1_接続; - public Ele[] 軸2_接続; + public Element[] 軸2_接続; - public Ele[] 軸3_接続; + public Element[] 軸3_接続; public override bool 欠損 { @@ -826,10 +826,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.軸1_接続.Count > 0) { - 軸1_接続 = e.軸1_接続.Select(delegate(EleD g) + 軸1_接続 = e.軸1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 前翅_甲2; @@ -840,7 +840,7 @@ namespace SlaveMatrix } if (e.軸2_接続.Count > 0) { - 軸2_接続 = e.軸2_接続.Select(delegate(EleD g) + 軸2_接続 = e.軸2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 前翅_甲2; @@ -851,7 +851,7 @@ namespace SlaveMatrix } if (e.軸3_接続.Count > 0) { - 軸3_接続 = e.軸3_接続.Select(delegate(EleD g) + 軸3_接続 = e.軸3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 前翅_甲2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs index 970c4b5..4c32c1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs @@ -57,39 +57,39 @@ namespace SlaveMatrix public double 展開; - public List 軸1_接続 = new List(); + public List 軸1_接続 = new List(); - public List 軸2_接続 = new List(); + public List 軸2_接続 = new List(); - public List 軸3_接続 = new List(); + public List 軸3_接続 = new List(); public 前翅_甲D() { ThisType = GetType(); } - public void 軸1接続(EleD e) + public void 軸1接続(ElementData e) { 軸1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.前翅_甲_軸1_接続; } - public void 軸2接続(EleD e) + public void 軸2接続(ElementData e) { 軸2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.前翅_甲_軸2_接続; } - public void 軸3接続(EleD e) + public void 軸3接続(ElementData e) { 軸3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.前翅_甲_軸3_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前翅_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs index cddba77..a96c68e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs @@ -73,7 +73,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前翅_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs index bcf0f9d..c80c32f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前翅_草(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs index f538d9f..fe4bf50 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前翅_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪.cs index 1554a96..1d93153 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 前髪 : Ele + public class 前髪 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪D.cs index 4f50aa7..23cb6b8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 前髪D : EleD + public class 前髪D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs index 9a2c068..a306b45 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs index f6f4e3d..60f7774 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_ジグ中寄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs index 0c53ea4..b917592 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_ジグ分け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs index 1b7df5b..8eab31a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_パッツン(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs index 407561b..114e77f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_モジャ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs index 2cf0092..f5fc5a2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs @@ -102,7 +102,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_三分1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs index 36fe6f4..9c8b74d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_三分2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs index 3a2c497..4965cfd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs @@ -88,7 +88,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ片(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs index ffc5861..aceb362 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ短1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs index e1a0e08..fdf7b10 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ短2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs index 6db6b47..d3f59f7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ長1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs index 6f4a40c..6ff3a62 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ長2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs index 27862ab..0adc6b7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs @@ -82,7 +82,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_中分け1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs index 2cf0d95..943165c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs @@ -82,7 +82,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_中分け2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs index a6d891f..746557e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_二分1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs index 78168fd..22b6263 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs @@ -94,7 +94,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_二分2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs index 7d4b3cd..5cd4c0b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs @@ -94,7 +94,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_横流し(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs index 86dc9c0..6e836b6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_目隠れ1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs index 75b66ee..56f57f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_目隠れ2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/半身.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/半身.cs index 9c21423..913a286 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/半身.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/半身.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 半身 : Ele + public class 半身 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/半身D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/半身D.cs index 5642671..01ad793 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/半身D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/半身D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 半身D : EleD + public class 半身D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs index adacd16..61a83b2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 単目 : Ele + public class 単目 : Element { public ShapePart X0Y0_白目; @@ -41,7 +41,7 @@ namespace SlaveMatrix public ColorP X0Y0_黒目_ハートCP; - public Ele[] 瞼_接続; + public Element[] 瞼_接続; public override bool 欠損 { @@ -281,8 +281,8 @@ namespace SlaveMatrix } if (e.瞼_接続.Count > 0) { - Ele f; - 瞼_接続 = e.瞼_接続.Select(delegate(EleD g) + Element f; + 瞼_接続 = e.瞼_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 単目2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs index b34b782..0c3d0fa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 単目D : EleD + public class 単目D : ElementData { public bool 白目_表示 = true; @@ -23,21 +23,21 @@ namespace SlaveMatrix public bool 蛸目; - public List 瞼_接続 = new List(); + public List 瞼_接続 = new List(); public 単目D() { ThisType = GetType(); } - public void 瞼接続(EleD e) + public void 瞼接続(ElementData e) { 瞼_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.単目_瞼_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs index a4902fb..e67f055 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 単眼眉 : Ele + public class 単眼眉 : Element { public ShapePart X0Y0_眉; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs index 0ef24a5..c185f97 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 単眼眉D : EleD + public class 単眼眉D : ElementData { public bool 眉_表示 = true; @@ -19,7 +19,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単眼眉(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs index c973bdd..e28177e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 単瞼 : Ele + public class 単瞼 : Element { public ShapePart X0Y0_瞼下; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs index d1e9fae..1c4292d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 単瞼D : EleD + public class 単瞼D : ElementData { public bool 瞼下_表示 = true; @@ -89,7 +89,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs index f453b94..3cf48e1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs @@ -238,15 +238,15 @@ namespace SlaveMatrix public 拘束鎖 鎖2; - public Ele[] 根外左_接続; + public Element[] 根外左_接続; - public Ele[] 根内左_接続; + public Element[] 根内左_接続; - public Ele[] 根中央_接続; + public Element[] 根中央_接続; - public Ele[] 根内右_接続; + public Element[] 根内右_接続; - public Ele[] 根外右_接続; + public Element[] 根外右_接続; public override bool 欠損 { @@ -1046,10 +1046,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.根外左_接続.Count > 0) { - 根外左_接続 = e.根外左_接続.Select(delegate(EleD g) + 根外左_接続 = e.根外左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 単足_植2; @@ -1060,7 +1060,7 @@ namespace SlaveMatrix } if (e.根内左_接続.Count > 0) { - 根内左_接続 = e.根内左_接続.Select(delegate(EleD g) + 根内左_接続 = e.根内左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 単足_植2; @@ -1071,7 +1071,7 @@ namespace SlaveMatrix } if (e.根中央_接続.Count > 0) { - 根中央_接続 = e.根中央_接続.Select(delegate(EleD g) + 根中央_接続 = e.根中央_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 単足_植2; @@ -1082,7 +1082,7 @@ namespace SlaveMatrix } if (e.根内右_接続.Count > 0) { - 根内右_接続 = e.根内右_接続.Select(delegate(EleD g) + 根内右_接続 = e.根内右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 単足_植2; @@ -1093,7 +1093,7 @@ namespace SlaveMatrix } if (e.根外右_接続.Count > 0) { - 根外右_接続 = e.根外右_接続.Select(delegate(EleD g) + 根外右_接続 = e.根外右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 単足_植2; @@ -1390,33 +1390,33 @@ namespace SlaveMatrix 鎖2.配色鎖(配色); } - public override IEnumerable EnumEle() + public override IEnumerable EnumEle() { yield return this; if (根外左_接続 != null) { - foreach (Ele item in 根外左_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item in 根外左_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item; } } if (根外右_接続 != null) { - foreach (Ele item2 in 根外右_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item2 in 根外右_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item2; } } if (根内左_接続 != null) { - foreach (Ele item3 in 根内左_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item3 in 根内左_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item3; } } if (根内右_接続 != null) { - foreach (Ele item4 in 根内右_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item4 in 根内右_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item4; } @@ -1425,7 +1425,7 @@ namespace SlaveMatrix { yield break; } - foreach (Ele item5 in 根中央_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item5 in 根中央_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item5; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs index 1a8f6cd..bc7fd8c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs @@ -88,88 +88,88 @@ namespace SlaveMatrix public bool 鎖表示; - public List 根外左_接続 = new List(); + public List 根外左_接続 = new List(); - public List 根内左_接続 = new List(); + public List 根内左_接続 = new List(); - public List 根中央_接続 = new List(); + public List 根中央_接続 = new List(); - public List 根内右_接続 = new List(); + public List 根内右_接続 = new List(); - public List 根外右_接続 = new List(); + public List 根外右_接続 = new List(); public 単足_植D() { ThisType = GetType(); } - public void 根外左接続(EleD e) + public void 根外左接続(ElementData e) { 根外左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.単足_植_根外左_接続; } - public void 根内左接続(EleD e) + public void 根内左接続(ElementData e) { 根内左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.単足_植_根内左_接続; } - public void 根中央接続(EleD e) + public void 根中央接続(ElementData e) { 根中央_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.単足_植_根中央_接続; } - public void 根内右接続(EleD e) + public void 根内右接続(ElementData e) { 根内右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.単足_植_根内右_接続; } - public void 根外右接続(EleD e) + public void 根外右接続(ElementData e) { 根外右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.単足_植_根外右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単足_植(DisUnit, 配色指定, 体配色, Med, this); } - public override IEnumerable EnumEleD() + public override IEnumerable EnumEleD() { yield return this; if (根外左_接続 != null) { - foreach (EleD item in 根外左_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item in 根外左_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item; } } if (根外右_接続 != null) { - foreach (EleD item2 in 根外右_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item2 in 根外右_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item2; } } if (根内左_接続 != null) { - foreach (EleD item3 in 根内左_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item3 in 根内左_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item3; } } if (根内右_接続 != null) { - foreach (EleD item4 in 根内右_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item4 in 根内右_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item4; } @@ -178,7 +178,7 @@ namespace SlaveMatrix { yield break; } - foreach (EleD item5 in 根中央_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item5 in 根中央_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item5; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs index 2c65744..500dfb7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs @@ -79,7 +79,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単足_粘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs index 1b8866f..bec05c3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 双目 : Ele + public class 双目 : Element { public ShapePart X0Y0_白目; @@ -41,7 +41,7 @@ namespace SlaveMatrix public ColorP X0Y0_黒目_ハイライト下CP; - public Ele[] 瞼_接続; + public Element[] 瞼_接続; public override bool 欠損 { @@ -281,8 +281,8 @@ namespace SlaveMatrix } if (e.瞼_接続.Count > 0) { - Ele f; - 瞼_接続 = e.瞼_接続.Select(delegate(EleD g) + Element f; + 瞼_接続 = e.瞼_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 双目2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs index fad849f..4277318 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 双目D : EleD + public class 双目D : ElementData { public bool 白目_表示 = true; @@ -23,21 +23,21 @@ namespace SlaveMatrix public bool 蛸目; - public List 瞼_接続 = new List(); + public List 瞼_接続 = new List(); public 双目D() { ThisType = GetType(); } - public void 瞼接続(EleD e) + public void 瞼接続(ElementData e) { 瞼_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.双目_瞼_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 双目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双瞼.cs index 1b5d156..bd919a9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双瞼.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 双瞼 : Ele + public class 双瞼 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双瞼D.cs index 036c0a0..05ece59 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双瞼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双瞼D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 双瞼D : EleD + public class 双瞼D : ElementData { public double 傾き; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口.cs index 3ae1c19..fdac83b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 口 : Ele + public class 口 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口D.cs index e364396..3fcf5dc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 口D : EleD + public class 口D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs index 87cd441..46482bc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs @@ -29,7 +29,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 口_裂け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs index f672a25..8b18c35 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 口_通常(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs index c480026..29e5894 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 吹出し : Ele + public class 吹出し : Element { public ShapePart X0Y0_吹出し; @@ -10,7 +10,7 @@ namespace SlaveMatrix public ColorP X0Y0_吹出しCP; - public Ele[] 吹出し_接続; + public Element[] 吹出し_接続; public override bool 欠損 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出しD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出しD.cs index 7217488..0adee95 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出しD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出しD.cs @@ -4,18 +4,18 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class 吹出しD : EleD + public class 吹出しD : ElementData { public bool 吹出し_表示; - public List 吹出し_接続 = new List(); + public List 吹出し_接続 = new List(); public 吹出しD() { ThisType = GetType(); } - public void 吹出し接続(EleD e) + public void 吹出し接続(ElementData e) { 吹出し_接続.Add(e); e.Par = this; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs index dc8a57a..67d34a6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 呼気 : Ele + public class 呼気 : Element { public ShapePart X0Y0_呼気左1_呼気1; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs index 7320a34..47a5e3c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 呼気D : EleD + public class 呼気D : ElementData { public bool 呼気左1_呼気1_表示; @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 呼気(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs index 8c622a8..d57032c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 咳D : EleD + public class 咳D : ElementData { public bool 咳基_表示; @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Cough(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs index 9402413..e2ba4a2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 噴乳 : Ele + public class 噴乳 : Element { public ShapePart X0Y0_母乳垂れ1; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs index 4d1ed48..ab93593 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 噴乳D : EleD + public class 噴乳D : ElementData { public bool 母乳垂れ1_表示; @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 噴乳(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs index 8ee9f28..3d3398e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 四足胴 : Ele + public class 四足胴 : Element { public ShapePart X0Y0_Torso; @@ -35,13 +35,13 @@ namespace SlaveMatrix public ColorP X0Y0_獣性_獣毛右CP; - public Ele[] Waist_接続; + public Element[] Waist_接続; - public Ele[] 肌_接続; + public Element[] 肌_接続; - public Ele[] 翼左_接続; + public Element[] 翼左_接続; - public Ele[] 翼右_接続; + public Element[] 翼右_接続; public override bool 欠損 { @@ -248,10 +248,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.Waist_接続.Count > 0) { - Waist_接続 = e.Waist_接続.Select(delegate(EleD g) + Waist_接続 = e.Waist_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胴2; @@ -262,7 +262,7 @@ namespace SlaveMatrix } if (e.肌_接続.Count > 0) { - 肌_接続 = e.肌_接続.Select(delegate(EleD g) + 肌_接続 = e.肌_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胴2; @@ -273,7 +273,7 @@ namespace SlaveMatrix } if (e.翼左_接続.Count > 0) { - 翼左_接続 = e.翼左_接続.Select(delegate(EleD g) + 翼左_接続 = e.翼左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胴2; @@ -284,7 +284,7 @@ namespace SlaveMatrix } if (e.翼右_接続.Count > 0) { - 翼右_接続 = e.翼右_接続.Select(delegate(EleD g) + 翼右_接続 = e.翼右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胴2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs index baec8cb..d0bc994 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 四足胴D : EleD + public class 四足胴D : ElementData { public bool Torso_表示 = true; @@ -19,56 +19,56 @@ namespace SlaveMatrix public double 筋肉濃度 = 1.0; - public List Waist_接続 = new List(); + public List Waist_接続 = new List(); - public List 肌_接続 = new List(); + public List 肌_接続 = new List(); - public List 翼左_接続 = new List(); + public List 翼左_接続 = new List(); - public List 翼右_接続 = new List(); + public List 翼右_接続 = new List(); public 四足胴D() { ThisType = GetType(); } - public void 腰接続(EleD e) + public void 腰接続(ElementData e) { Waist_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胴_Waist_接続; } - public void 肌接続(EleD e) + public void 肌接続(ElementData e) { 肌_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胴_肌_接続; } - public void 翼左接続(EleD e) + public void 翼左接続(ElementData e) { 翼左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胴_翼左_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public void 翼右接続(EleD e) + public void 翼右接続(ElementData e) { 翼右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胴_翼右_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 四足胴(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs index 9eda728..1b903e2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs @@ -197,27 +197,27 @@ namespace SlaveMatrix public ColorP X0Y0_竜性_右_鱗3CP; - public Ele[] 脇左_接続; + public Element[] 脇左_接続; - public Ele[] 脇右_接続; + public Element[] 脇右_接続; - public Ele[] Torso_接続; + public Element[] Torso_接続; - public Ele[] 胸左_接続; + public Element[] 胸左_接続; - public Ele[] 胸右_接続; + public Element[] 胸右_接続; - public Ele[] 肌_接続; + public Element[] 肌_接続; - public Ele[] 翼上左_接続; + public Element[] 翼上左_接続; - public Ele[] 翼上右_接続; + public Element[] 翼上右_接続; - public Ele[] 翼下左_接続; + public Element[] 翼下左_接続; - public Ele[] 翼下右_接続; + public Element[] 翼下右_接続; - public Ele[] 背中_接続; + public Element[] 背中_接続; public override bool 欠損 { @@ -920,10 +920,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.脇左_接続.Count > 0) { - 脇左_接続 = e.脇左_接続.Select(delegate(EleD g) + 脇左_接続 = e.脇左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -934,7 +934,7 @@ namespace SlaveMatrix } if (e.脇右_接続.Count > 0) { - 脇右_接続 = e.脇右_接続.Select(delegate(EleD g) + 脇右_接続 = e.脇右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -945,7 +945,7 @@ namespace SlaveMatrix } if (e.Torso_接続.Count > 0) { - Torso_接続 = e.Torso_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -956,7 +956,7 @@ namespace SlaveMatrix } if (e.胸左_接続.Count > 0) { - 胸左_接続 = e.胸左_接続.Select(delegate(EleD g) + 胸左_接続 = e.胸左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -967,7 +967,7 @@ namespace SlaveMatrix } if (e.胸右_接続.Count > 0) { - 胸右_接続 = e.胸右_接続.Select(delegate(EleD g) + 胸右_接続 = e.胸右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -978,7 +978,7 @@ namespace SlaveMatrix } if (e.肌_接続.Count > 0) { - 肌_接続 = e.肌_接続.Select(delegate(EleD g) + 肌_接続 = e.肌_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -989,7 +989,7 @@ namespace SlaveMatrix } if (e.翼上左_接続.Count > 0) { - 翼上左_接続 = e.翼上左_接続.Select(delegate(EleD g) + 翼上左_接続 = e.翼上左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -1000,7 +1000,7 @@ namespace SlaveMatrix } if (e.翼上右_接続.Count > 0) { - 翼上右_接続 = e.翼上右_接続.Select(delegate(EleD g) + 翼上右_接続 = e.翼上右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -1011,7 +1011,7 @@ namespace SlaveMatrix } if (e.翼下左_接続.Count > 0) { - 翼下左_接続 = e.翼下左_接続.Select(delegate(EleD g) + 翼下左_接続 = e.翼下左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -1022,7 +1022,7 @@ namespace SlaveMatrix } if (e.翼下右_接続.Count > 0) { - 翼下右_接続 = e.翼下右_接続.Select(delegate(EleD g) + 翼下右_接続 = e.翼下右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; @@ -1033,7 +1033,7 @@ namespace SlaveMatrix } if (e.背中_接続.Count > 0) { - 背中_接続 = e.背中_接続.Select(delegate(EleD g) + 背中_接続 = e.背中_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs index 31df30a..0e93923 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs @@ -73,131 +73,131 @@ namespace SlaveMatrix public double 筋肉濃度 = 1.0; - public List 脇左_接続 = new List(); + public List 脇左_接続 = new List(); - public List 脇右_接続 = new List(); + public List 脇右_接続 = new List(); - public List Torso_接続 = new List(); + public List Torso_接続 = new List(); - public List 胸左_接続 = new List(); + public List 胸左_接続 = new List(); - public List 胸右_接続 = new List(); + public List 胸右_接続 = new List(); - public List 肌_接続 = new List(); + public List 肌_接続 = new List(); - public List 翼上左_接続 = new List(); + public List 翼上左_接続 = new List(); - public List 翼上右_接続 = new List(); + public List 翼上右_接続 = new List(); - public List 翼下左_接続 = new List(); + public List 翼下左_接続 = new List(); - public List 翼下右_接続 = new List(); + public List 翼下右_接続 = new List(); - public List 背中_接続 = new List(); + public List 背中_接続 = new List(); public 四足胸D() { ThisType = GetType(); } - public void 脇左接続(EleD e) + public void 脇左接続(ElementData e) { 脇左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_脇左_接続; } - public void 脇右接続(EleD e) + public void 脇右接続(ElementData e) { 脇右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_脇右_接続; } - public void 胴接続(EleD e) + public void 胴接続(ElementData e) { Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_Torso_接続; } - public void 胸左接続(EleD e) + public void 胸左接続(ElementData e) { 胸左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_胸左_接続; } - public void 胸右接続(EleD e) + public void 胸右接続(ElementData e) { 胸右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_胸右_接続; } - public void 肌接続(EleD e) + public void 肌接続(ElementData e) { 肌_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_肌_接続; } - public void 翼上左接続(EleD e) + public void 翼上左接続(ElementData e) { 翼上左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_翼上左_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public void 翼上右接続(EleD e) + public void 翼上右接続(ElementData e) { 翼上右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_翼上右_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public void 翼下左接続(EleD e) + public void 翼下左接続(ElementData e) { 翼下左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_翼下左_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public void 翼下右接続(EleD e) + public void 翼下右接続(ElementData e) { 翼下右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_翼下右_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public void 背中接続(EleD e) + public void 背中接続(ElementData e) { 背中_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_背中_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 四足胸(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs index 953f2bb..d3e639a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs @@ -3,7 +3,7 @@ using System.Linq; namespace SlaveMatrix { - public class 四足脇 : Ele + public class 四足脇 : Element { public ShapePart X0Y0_脇; @@ -17,7 +17,7 @@ namespace SlaveMatrix public ColorP X0Y0_筋肉CP; - public Ele[] UpperArm_接続; + public Element[] UpperArm_接続; public override bool 欠損 { @@ -165,8 +165,8 @@ namespace SlaveMatrix } if (e.UpperArm_接続.Count > 0) { - Ele f; - UpperArm_接続 = e.UpperArm_接続.Select(delegate(EleD g) + Element f; + UpperArm_接続 = e.UpperArm_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足脇2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs index 5021eb5..211b95d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 四足脇D : EleD + public class 四足脇D : ElementData { public bool 脇_表示 = true; @@ -13,21 +13,21 @@ namespace SlaveMatrix public double 筋肉濃度 = 1.0; - public List UpperArm_接続 = new List(); + public List UpperArm_接続 = new List(); public 四足脇D() { ThisType = GetType(); } - public void UpperArm接続(EleD e) + public void UpperArm接続(ElementData e) { UpperArm_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足脇_UpperArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 四足脇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs index 213709c..9c733e2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 四足腰 : Ele + public class 四足腰 : Element { public ShapePart X0Y0_Waist; @@ -621,25 +621,25 @@ namespace SlaveMatrix public ColorP X0Y4_竜性_右_鱗2CP; - public Ele[] 腿左_接続; + public Element[] 腿左_接続; - public Ele[] 腿右_接続; + public Element[] 腿右_接続; - public Ele[] 膣基_接続; + public Element[] 膣基_接続; - public Ele[] 肛門_接続; + public Element[] 肛門_接続; - public Ele[] 尾_接続; + public Element[] 尾_接続; - public Ele[] 半身_接続; + public Element[] 半身_接続; - public Ele[] 上着_接続; + public Element[] 上着_接続; - public Ele[] 肌_接続; + public Element[] 肌_接続; - public Ele[] 翼左_接続; + public Element[] 翼左_接続; - public Ele[] 翼右_接続; + public Element[] 翼右_接続; public override bool 欠損 { @@ -1642,10 +1642,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.腿左_接続.Count > 0) { - 腿左_接続 = e.腿左_接続.Select(delegate(EleD g) + 腿左_接続 = e.腿左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1656,7 +1656,7 @@ namespace SlaveMatrix } if (e.腿右_接続.Count > 0) { - 腿右_接続 = e.腿右_接続.Select(delegate(EleD g) + 腿右_接続 = e.腿右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1667,7 +1667,7 @@ namespace SlaveMatrix } if (e.膣基_接続.Count > 0) { - 膣基_接続 = e.膣基_接続.Select(delegate(EleD g) + 膣基_接続 = e.膣基_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1678,7 +1678,7 @@ namespace SlaveMatrix } if (e.肛門_接続.Count > 0) { - 肛門_接続 = e.肛門_接続.Select(delegate(EleD g) + 肛門_接続 = e.肛門_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1689,7 +1689,7 @@ namespace SlaveMatrix } if (e.尾_接続.Count > 0) { - 尾_接続 = e.尾_接続.Select(delegate(EleD g) + 尾_接続 = e.尾_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1700,7 +1700,7 @@ namespace SlaveMatrix } if (e.半身_接続.Count > 0) { - 半身_接続 = e.半身_接続.Select(delegate(EleD g) + 半身_接続 = e.半身_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1711,7 +1711,7 @@ namespace SlaveMatrix } if (e.上着_接続.Count > 0) { - 上着_接続 = e.上着_接続.Select(delegate(EleD g) + 上着_接続 = e.上着_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1722,7 +1722,7 @@ namespace SlaveMatrix } if (e.肌_接続.Count > 0) { - 肌_接続 = e.肌_接続.Select(delegate(EleD g) + 肌_接続 = e.肌_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1733,7 +1733,7 @@ namespace SlaveMatrix } if (e.翼左_接続.Count > 0) { - 翼左_接続 = e.翼左_接続.Select(delegate(EleD g) + 翼左_接続 = e.翼左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; @@ -1744,7 +1744,7 @@ namespace SlaveMatrix } if (e.翼右_接続.Count > 0) { - 翼右_接続 = e.翼右_接続.Select(delegate(EleD g) + 翼右_接続 = e.翼右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足腰2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs index a7ac2fc..9259419 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 四足腰D : EleD + public class 四足腰D : ElementData { public bool Waist_表示 = true; @@ -65,32 +65,32 @@ namespace SlaveMatrix public double 筋肉濃度 = 1.0; - public List 腿左_接続 = new List(); + public List 腿左_接続 = new List(); - public List 腿右_接続 = new List(); + public List 腿右_接続 = new List(); - public List 膣基_接続 = new List(); + public List 膣基_接続 = new List(); - public List 肛門_接続 = new List(); + public List 肛門_接続 = new List(); - public List 尾_接続 = new List(); + public List 尾_接続 = new List(); - public List 半身_接続 = new List(); + public List 半身_接続 = new List(); - public List 上着_接続 = new List(); + public List 上着_接続 = new List(); - public List 肌_接続 = new List(); + public List 肌_接続 = new List(); - public List 翼左_接続 = new List(); + public List 翼左_接続 = new List(); - public List 翼右_接続 = new List(); + public List 翼右_接続 = new List(); public 四足腰D() { ThisType = GetType(); } - public void 腿左接続(EleD e) + public void 腿左接続(ElementData e) { 腿左_接続.Add(e); e.Par = this; @@ -101,7 +101,7 @@ namespace SlaveMatrix } } - public void 腿右接続(EleD e) + public void 腿右接続(ElementData e) { 腿右_接続.Add(e); e.Par = this; @@ -112,83 +112,83 @@ namespace SlaveMatrix } } - public void 膣基接続(EleD e) + public void 膣基接続(ElementData e) { 膣基_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足腰_膣基_接続; } - public void 肛門接続(EleD e) + public void 肛門接続(ElementData e) { 肛門_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足腰_肛門_接続; } - public void 尾接続(EleD e) + public void 尾接続(ElementData e) { 尾_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足腰_尾_接続; if (e is 尾_ヘD || e is 尾_ウD || e is 尾_ガD || e is 尾_蟲D) { - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 0.7; } return; } - foreach (EleD item2 in e.EnumEleD()) + foreach (ElementData item2 in e.EnumEleD()) { item2.尺度B = 1.1; } } - public void 半身接続(EleD e) + public void 半身接続(ElementData e) { 半身_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足腰_半身_接続; } - public void 上着接続(EleD e) + public void 上着接続(ElementData e) { 上着_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足腰_上着_接続; } - public void 肌接続(EleD e) + public void 肌接続(ElementData e) { 肌_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足腰_肌_接続; } - public void 翼左接続(EleD e) + public void 翼左接続(ElementData e) { 翼左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足腰_翼左_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public void 翼右接続(EleD e) + public void 翼右接続(ElementData e) { 翼右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足腰_翼右_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.1; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 四足腰(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs index 792ed99..3602124 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 基髪 : Ele + public class 基髪 : Element { public ShapePart X0Y0_髪; @@ -11,17 +11,17 @@ namespace SlaveMatrix public ColorP X0Y0_髪CP; - public Ele[] 頭頂左_接続; + public Element[] 頭頂左_接続; - public Ele[] 頭頂右_接続; + public Element[] 頭頂右_接続; - public Ele[] 横髪左_接続; + public Element[] 横髪左_接続; - public Ele[] 横髪右_接続; + public Element[] 横髪右_接続; - public Ele[] 前髪_接続; + public Element[] 前髪_接続; - public Ele[] 後髪_接続; + public Element[] 後髪_接続; public override bool 欠損 { @@ -161,10 +161,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.頭頂左_接続.Count > 0) { - 頭頂左_接続 = e.頭頂左_接続.Select(delegate(EleD g) + 頭頂左_接続 = e.頭頂左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 基髪2; @@ -175,7 +175,7 @@ namespace SlaveMatrix } if (e.頭頂右_接続.Count > 0) { - 頭頂右_接続 = e.頭頂右_接続.Select(delegate(EleD g) + 頭頂右_接続 = e.頭頂右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 基髪2; @@ -186,7 +186,7 @@ namespace SlaveMatrix } if (e.横髪左_接続.Count > 0) { - 横髪左_接続 = e.横髪左_接続.Select(delegate(EleD g) + 横髪左_接続 = e.横髪左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 基髪2; @@ -197,7 +197,7 @@ namespace SlaveMatrix } if (e.横髪右_接続.Count > 0) { - 横髪右_接続 = e.横髪右_接続.Select(delegate(EleD g) + 横髪右_接続 = e.横髪右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 基髪2; @@ -208,7 +208,7 @@ namespace SlaveMatrix } if (e.前髪_接続.Count > 0) { - 前髪_接続 = e.前髪_接続.Select(delegate(EleD g) + 前髪_接続 = e.前髪_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 基髪2; @@ -219,7 +219,7 @@ namespace SlaveMatrix } if (e.後髪_接続.Count > 0) { - 後髪_接続 = e.後髪_接続.Select(delegate(EleD g) + 後髪_接続 = e.後髪_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 基髪2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs index 881d57d..3a90eb9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs @@ -5,70 +5,70 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 基髪D : EleD + public class 基髪D : ElementData { public bool 髪_表示 = true; - public List 頭頂左_接続 = new List(); + public List 頭頂左_接続 = new List(); - public List 頭頂右_接続 = new List(); + public List 頭頂右_接続 = new List(); - public List 横髪左_接続 = new List(); + public List 横髪左_接続 = new List(); - public List 横髪右_接続 = new List(); + public List 横髪右_接続 = new List(); - public List 前髪_接続 = new List(); + public List 前髪_接続 = new List(); - public List 後髪_接続 = new List(); + public List 後髪_接続 = new List(); public 基髪D() { ThisType = GetType(); } - public void 頭頂左接続(EleD e) + public void 頭頂左接続(ElementData e) { 頭頂左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.基髪_頭頂左_接続; } - public void 頭頂右接続(EleD e) + public void 頭頂右接続(ElementData e) { 頭頂右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.基髪_頭頂右_接続; } - public void 横髪左接続(EleD e) + public void 横髪左接続(ElementData e) { 横髪左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.基髪_横髪左_接続; } - public void 横髪右接続(EleD e) + public void 横髪右接続(ElementData e) { 横髪右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.基髪_横髪右_接続; } - public void 前髪接続(EleD e) + public void 前髪接続(ElementData e) { 前髪_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.基髪_前髪_接続; } - public void 後髪接続(EleD e) + public void 後髪接続(ElementData e) { 後髪_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.基髪_後髪_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 基髪(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs index c5d5f21..3ece258 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs @@ -11,13 +11,13 @@ namespace SlaveMatrix public ColorP X0Y0_TorsoCP; - public Ele[] 軟体外左_接続; + public Element[] 軟体外左_接続; - public Ele[] 軟体外右_接続; + public Element[] 軟体外右_接続; - public Ele[] 軟体内左_接続; + public Element[] 軟体内左_接続; - public Ele[] 軟体内右_接続; + public Element[] 軟体内右_接続; public override bool 欠損 { @@ -144,10 +144,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.軟体外左_接続.Count > 0) { - 軟体外左_接続 = e.軟体外左_接続.Select(delegate(EleD g) + 軟体外左_接続 = e.軟体外左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蛸2; @@ -158,7 +158,7 @@ namespace SlaveMatrix } if (e.軟体外右_接続.Count > 0) { - 軟体外右_接続 = e.軟体外右_接続.Select(delegate(EleD g) + 軟体外右_接続 = e.軟体外右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蛸2; @@ -169,7 +169,7 @@ namespace SlaveMatrix } if (e.軟体内左_接続.Count > 0) { - 軟体内左_接続 = e.軟体内左_接続.Select(delegate(EleD g) + 軟体内左_接続 = e.軟体内左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蛸2; @@ -180,7 +180,7 @@ namespace SlaveMatrix } if (e.軟体内右_接続.Count > 0) { - 軟体内右_接続 = e.軟体内右_接続.Select(delegate(EleD g) + 軟体内右_接続 = e.軟体内右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蛸2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs index 7dd7263..379bf11 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs @@ -9,64 +9,64 @@ namespace SlaveMatrix { public bool Torso_表示 = true; - public List 軟体外左_接続 = new List(); + public List 軟体外左_接続 = new List(); - public List 軟体外右_接続 = new List(); + public List 軟体外右_接続 = new List(); - public List 軟体内左_接続 = new List(); + public List 軟体内左_接続 = new List(); - public List 軟体内右_接続 = new List(); + public List 軟体内右_接続 = new List(); public 多足_蛸D() { ThisType = GetType(); } - public void 軟体外左接続(EleD e) + public void 軟体外左接続(ElementData e) { 軟体外左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蛸_軟体外左_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 軟体外右接続(EleD e) + public void 軟体外右接続(ElementData e) { 軟体外右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蛸_軟体外右_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 軟体内左接続(EleD e) + public void 軟体内左接続(ElementData e) { 軟体内左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蛸_軟体内左_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public void 軟体内右接続(EleD e) + public void 軟体内右接続(ElementData e) { 軟体内右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蛸_軟体内右_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 多足_蛸(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs index 83b3747..34bfca6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs @@ -24,27 +24,27 @@ namespace SlaveMatrix public ColorP X0Y0_柄CP; - public Ele[] 触肢左_接続; + public Element[] 触肢左_接続; - public Ele[] 触肢右_接続; + public Element[] 触肢右_接続; - public Ele[] 節足左1_接続; + public Element[] 節足左1_接続; - public Ele[] 節足左2_接続; + public Element[] 節足左2_接続; - public Ele[] 節足左3_接続; + public Element[] 節足左3_接続; - public Ele[] 節足左4_接続; + public Element[] 節足左4_接続; - public Ele[] 節足右1_接続; + public Element[] 節足右1_接続; - public Ele[] 節足右2_接続; + public Element[] 節足右2_接続; - public Ele[] 節足右3_接続; + public Element[] 節足右3_接続; - public Ele[] 節足右4_接続; + public Element[] 節足右4_接続; - public Ele[] 尾_接続; + public Element[] 尾_接続; public override bool 欠損 { @@ -219,10 +219,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.触肢左_接続.Count > 0) { - 触肢左_接続 = e.触肢左_接続.Select(delegate(EleD g) + 触肢左_接続 = e.触肢左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -233,7 +233,7 @@ namespace SlaveMatrix } if (e.触肢右_接続.Count > 0) { - 触肢右_接続 = e.触肢右_接続.Select(delegate(EleD g) + 触肢右_接続 = e.触肢右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -244,7 +244,7 @@ namespace SlaveMatrix } if (e.節足左1_接続.Count > 0) { - 節足左1_接続 = e.節足左1_接続.Select(delegate(EleD g) + 節足左1_接続 = e.節足左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -255,7 +255,7 @@ namespace SlaveMatrix } if (e.節足左2_接続.Count > 0) { - 節足左2_接続 = e.節足左2_接続.Select(delegate(EleD g) + 節足左2_接続 = e.節足左2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -266,7 +266,7 @@ namespace SlaveMatrix } if (e.節足左3_接続.Count > 0) { - 節足左3_接続 = e.節足左3_接続.Select(delegate(EleD g) + 節足左3_接続 = e.節足左3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -277,7 +277,7 @@ namespace SlaveMatrix } if (e.節足左4_接続.Count > 0) { - 節足左4_接続 = e.節足左4_接続.Select(delegate(EleD g) + 節足左4_接続 = e.節足左4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -288,7 +288,7 @@ namespace SlaveMatrix } if (e.節足右1_接続.Count > 0) { - 節足右1_接続 = e.節足右1_接続.Select(delegate(EleD g) + 節足右1_接続 = e.節足右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -299,7 +299,7 @@ namespace SlaveMatrix } if (e.節足右2_接続.Count > 0) { - 節足右2_接続 = e.節足右2_接続.Select(delegate(EleD g) + 節足右2_接続 = e.節足右2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -310,7 +310,7 @@ namespace SlaveMatrix } if (e.節足右3_接続.Count > 0) { - 節足右3_接続 = e.節足右3_接続.Select(delegate(EleD g) + 節足右3_接続 = e.節足右3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -321,7 +321,7 @@ namespace SlaveMatrix } if (e.節足右4_接続.Count > 0) { - 節足右4_接続 = e.節足右4_接続.Select(delegate(EleD g) + 節足右4_接続 = e.節足右4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -332,7 +332,7 @@ namespace SlaveMatrix } if (e.尾_接続.Count > 0) { - 尾_接続 = e.尾_接続.Select(delegate(EleD g) + 尾_接続 = e.尾_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蜘2; @@ -396,75 +396,75 @@ namespace SlaveMatrix 柄CD = new ColorD(ref Col.Black, ref 体配色.体0O); } - public override IEnumerable EnumEle() + public override IEnumerable EnumEle() { yield return this; if (尾_接続 != null) { - foreach (Ele item in 尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item in 尾_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item; } } if (節足左4_接続 != null) { - foreach (Ele item2 in 節足左4_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item2 in 節足左4_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item2; } } if (節足右4_接続 != null) { - foreach (Ele item3 in 節足右4_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item3 in 節足右4_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item3; } } if (節足左3_接続 != null) { - foreach (Ele item4 in 節足左3_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item4 in 節足左3_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item4; } } if (節足右3_接続 != null) { - foreach (Ele item5 in 節足右3_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item5 in 節足右3_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item5; } } if (節足左2_接続 != null) { - foreach (Ele item6 in 節足左2_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item6 in 節足左2_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item6; } } if (節足右2_接続 != null) { - foreach (Ele item7 in 節足右2_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item7 in 節足右2_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item7; } } if (節足左1_接続 != null) { - foreach (Ele item8 in 節足左1_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item8 in 節足左1_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item8; } } if (節足右1_接続 != null) { - foreach (Ele item9 in 節足右1_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item9 in 節足右1_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item9; } } if (触肢左_接続 != null) { - foreach (Ele item10 in 触肢左_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item10 in 触肢左_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item10; } @@ -473,7 +473,7 @@ namespace SlaveMatrix { yield break; } - foreach (Ele item11 in 触肢右_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item11 in 触肢右_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item11; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs index 533a974..3e1f88b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs @@ -14,188 +14,188 @@ namespace SlaveMatrix public bool 柄_表示 = true; - public List 触肢左_接続 = new List(); + public List 触肢左_接続 = new List(); - public List 触肢右_接続 = new List(); + public List 触肢右_接続 = new List(); - public List 節足左1_接続 = new List(); + public List 節足左1_接続 = new List(); - public List 節足左2_接続 = new List(); + public List 節足左2_接続 = new List(); - public List 節足左3_接続 = new List(); + public List 節足左3_接続 = new List(); - public List 節足左4_接続 = new List(); + public List 節足左4_接続 = new List(); - public List 節足右1_接続 = new List(); + public List 節足右1_接続 = new List(); - public List 節足右2_接続 = new List(); + public List 節足右2_接続 = new List(); - public List 節足右3_接続 = new List(); + public List 節足右3_接続 = new List(); - public List 節足右4_接続 = new List(); + public List 節足右4_接続 = new List(); - public List 尾_接続 = new List(); + public List 尾_接続 = new List(); public 多足_蜘D() { ThisType = GetType(); } - public void 触肢左接続(EleD e) + public void 触肢左接続(ElementData e) { 触肢左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_触肢左_接続; } - public void 触肢右接続(EleD e) + public void 触肢右接続(ElementData e) { 触肢右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_触肢右_接続; } - public void 節足左1接続(EleD e) + public void 節足左1接続(ElementData e) { 節足左1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_節足左1_接続; } - public void 節足左2接続(EleD e) + public void 節足左2接続(ElementData e) { 節足左2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_節足左2_接続; } - public void 節足左3接続(EleD e) + public void 節足左3接続(ElementData e) { 節足左3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_節足左3_接続; } - public void 節足左4接続(EleD e) + public void 節足左4接続(ElementData e) { 節足左4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_節足左4_接続; } - public void 節足右1接続(EleD e) + public void 節足右1接続(ElementData e) { 節足右1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_節足右1_接続; } - public void 節足右2接続(EleD e) + public void 節足右2接続(ElementData e) { 節足右2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_節足右2_接続; } - public void 節足右3接続(EleD e) + public void 節足右3接続(ElementData e) { 節足右3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_節足右3_接続; } - public void 節足右4接続(EleD e) + public void 節足右4接続(ElementData e) { 節足右4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_節足右4_接続; } - public void 尾接続(EleD e) + public void 尾接続(ElementData e) { 尾_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蜘_尾_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.0; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 多足_蜘(DisUnit, 配色指定, 体配色, Med, this); } - public override IEnumerable EnumEleD() + public override IEnumerable EnumEleD() { yield return this; if (尾_接続 != null) { - foreach (EleD item in 尾_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item in 尾_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item; } } if (節足左4_接続 != null) { - foreach (EleD item2 in 節足左4_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item2 in 節足左4_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item2; } } if (節足右4_接続 != null) { - foreach (EleD item3 in 節足右4_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item3 in 節足右4_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item3; } } if (節足左3_接続 != null) { - foreach (EleD item4 in 節足左3_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item4 in 節足左3_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item4; } } if (節足右3_接続 != null) { - foreach (EleD item5 in 節足右3_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item5 in 節足右3_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item5; } } if (節足左2_接続 != null) { - foreach (EleD item6 in 節足左2_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item6 in 節足左2_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item6; } } if (節足右2_接続 != null) { - foreach (EleD item7 in 節足右2_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item7 in 節足右2_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item7; } } if (節足左1_接続 != null) { - foreach (EleD item8 in 節足左1_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item8 in 節足左1_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item8; } } if (節足右1_接続 != null) { - foreach (EleD item9 in 節足右1_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item9 in 節足右1_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item9; } } if (触肢左_接続 != null) { - foreach (EleD item10 in 触肢左_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item10 in 触肢左_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item10; } @@ -204,7 +204,7 @@ namespace SlaveMatrix { yield break; } - foreach (EleD item11 in 触肢右_接続.Select((EleD e) => e.EnumEleD()).JoinEnum()) + foreach (ElementData item11 in 触肢右_接続.Select((ElementData e) => e.EnumEleD()).JoinEnum()) { yield return item11; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs index 1af9ec3..9ec5e95 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs @@ -248,31 +248,31 @@ namespace SlaveMatrix private double くぱぁ_; - public Ele[] 触肢左_接続; + public Element[] 触肢左_接続; - public Ele[] 節足左1_接続; + public Element[] 節足左1_接続; - public Ele[] 節足左2_接続; + public Element[] 節足左2_接続; - public Ele[] 節足左3_接続; + public Element[] 節足左3_接続; - public Ele[] 節足左4_接続; + public Element[] 節足左4_接続; - public Ele[] 触肢右_接続; + public Element[] 触肢右_接続; - public Ele[] 節足右1_接続; + public Element[] 節足右1_接続; - public Ele[] 節足右2_接続; + public Element[] 節足右2_接続; - public Ele[] 節足右3_接続; + public Element[] 節足右3_接続; - public Ele[] 節足右4_接続; + public Element[] 節足右4_接続; - public Ele[] 櫛状板左_接続; + public Element[] 櫛状板左_接続; - public Ele[] 櫛状板右_接続; + public Element[] 櫛状板右_接続; - public Ele[] 尾_接続; + public Element[] 尾_接続; public override bool 欠損 { @@ -1104,10 +1104,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.触肢左_接続.Count > 0) { - 触肢左_接続 = e.触肢左_接続.Select(delegate(EleD g) + 触肢左_接続 = e.触肢左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1118,7 +1118,7 @@ namespace SlaveMatrix } if (e.節足左1_接続.Count > 0) { - 節足左1_接続 = e.節足左1_接続.Select(delegate(EleD g) + 節足左1_接続 = e.節足左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1129,7 +1129,7 @@ namespace SlaveMatrix } if (e.節足左2_接続.Count > 0) { - 節足左2_接続 = e.節足左2_接続.Select(delegate(EleD g) + 節足左2_接続 = e.節足左2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1140,7 +1140,7 @@ namespace SlaveMatrix } if (e.節足左3_接続.Count > 0) { - 節足左3_接続 = e.節足左3_接続.Select(delegate(EleD g) + 節足左3_接続 = e.節足左3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1151,7 +1151,7 @@ namespace SlaveMatrix } if (e.節足左4_接続.Count > 0) { - 節足左4_接続 = e.節足左4_接続.Select(delegate(EleD g) + 節足左4_接続 = e.節足左4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1162,7 +1162,7 @@ namespace SlaveMatrix } if (e.触肢右_接続.Count > 0) { - 触肢右_接続 = e.触肢右_接続.Select(delegate(EleD g) + 触肢右_接続 = e.触肢右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1173,7 +1173,7 @@ namespace SlaveMatrix } if (e.節足右1_接続.Count > 0) { - 節足右1_接続 = e.節足右1_接続.Select(delegate(EleD g) + 節足右1_接続 = e.節足右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1184,7 +1184,7 @@ namespace SlaveMatrix } if (e.節足右2_接続.Count > 0) { - 節足右2_接続 = e.節足右2_接続.Select(delegate(EleD g) + 節足右2_接続 = e.節足右2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1195,7 +1195,7 @@ namespace SlaveMatrix } if (e.節足右3_接続.Count > 0) { - 節足右3_接続 = e.節足右3_接続.Select(delegate(EleD g) + 節足右3_接続 = e.節足右3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1206,7 +1206,7 @@ namespace SlaveMatrix } if (e.節足右4_接続.Count > 0) { - 節足右4_接続 = e.節足右4_接続.Select(delegate(EleD g) + 節足右4_接続 = e.節足右4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1217,7 +1217,7 @@ namespace SlaveMatrix } if (e.櫛状板左_接続.Count > 0) { - 櫛状板左_接続 = e.櫛状板左_接続.Select(delegate(EleD g) + 櫛状板左_接続 = e.櫛状板左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1228,7 +1228,7 @@ namespace SlaveMatrix } if (e.櫛状板右_接続.Count > 0) { - 櫛状板右_接続 = e.櫛状板右_接続.Select(delegate(EleD g) + 櫛状板右_接続 = e.櫛状板右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1239,7 +1239,7 @@ namespace SlaveMatrix } if (e.尾_接続.Count > 0) { - 尾_接続 = e.尾_接続.Select(delegate(EleD g) + 尾_接続 = e.尾_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 多足_蠍2; @@ -1569,89 +1569,89 @@ namespace SlaveMatrix 生殖口_生殖口1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); } - public override IEnumerable EnumEle() + public override IEnumerable EnumEle() { yield return this; if (尾_接続 != null) { - foreach (Ele item in 尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item in 尾_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item; } } if (櫛状板左_接続 != null) { - foreach (Ele item2 in 櫛状板左_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item2 in 櫛状板左_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item2; } } if (櫛状板右_接続 != null) { - foreach (Ele item3 in 櫛状板右_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item3 in 櫛状板右_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item3; } } if (節足左4_接続 != null) { - foreach (Ele item4 in 節足左4_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item4 in 節足左4_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item4; } } if (節足右4_接続 != null) { - foreach (Ele item5 in 節足右4_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item5 in 節足右4_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item5; } } if (節足左3_接続 != null) { - foreach (Ele item6 in 節足左3_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item6 in 節足左3_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item6; } } if (節足右3_接続 != null) { - foreach (Ele item7 in 節足右3_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item7 in 節足右3_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item7; } } if (節足左2_接続 != null) { - foreach (Ele item8 in 節足左2_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item8 in 節足左2_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item8; } } if (節足右2_接続 != null) { - foreach (Ele item9 in 節足右2_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item9 in 節足右2_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item9; } } if (節足左1_接続 != null) { - foreach (Ele item10 in 節足左1_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item10 in 節足左1_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item10; } } if (節足右1_接続 != null) { - foreach (Ele item11 in 節足右1_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item11 in 節足右1_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item11; } } if (触肢左_接続 != null) { - foreach (Ele item12 in 触肢左_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item12 in 触肢左_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item12; } @@ -1660,7 +1660,7 @@ namespace SlaveMatrix { yield break; } - foreach (Ele item13 in 触肢右_接続.Select((Ele e) => e.EnumEle()).JoinEnum()) + foreach (Element item13 in 触肢右_接続.Select((Element e) => e.EnumEle()).JoinEnum()) { yield return item13; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs index 1fb9188..ed966a5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs @@ -89,45 +89,45 @@ namespace SlaveMatrix public double くぱぁ; - public List 触肢左_接続 = new List(); + public List 触肢左_接続 = new List(); - public List 節足左1_接続 = new List(); + public List 節足左1_接続 = new List(); - public List 節足左2_接続 = new List(); + public List 節足左2_接続 = new List(); - public List 節足左3_接続 = new List(); + public List 節足左3_接続 = new List(); - public List 節足左4_接続 = new List(); + public List 節足左4_接続 = new List(); - public List 触肢右_接続 = new List(); + public List 触肢右_接続 = new List(); - public List 節足右1_接続 = new List(); + public List 節足右1_接続 = new List(); - public List 節足右2_接続 = new List(); + public List 節足右2_接続 = new List(); - public List 節足右3_接続 = new List(); + public List 節足右3_接続 = new List(); - public List 節足右4_接続 = new List(); + public List 節足右4_接続 = new List(); - public List 櫛状板左_接続 = new List(); + public List 櫛状板左_接続 = new List(); - public List 櫛状板右_接続 = new List(); + public List 櫛状板右_接続 = new List(); - public List 尾_接続 = new List(); + public List 尾_接続 = new List(); public 多足_蠍D() { ThisType = GetType(); } - public void 触肢左接続(EleD e) + public void 触肢左接続(ElementData e) { 触肢左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蠍_触肢左_接続; } - public void 節足左1接続(EleD e) + public void 節足左1接続(ElementData e) { 節足左1_接続.Add(e); e.Par = this; @@ -136,13 +136,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度XB = 1.0; } } - public void 節足左2接続(EleD e) + public void 節足左2接続(ElementData e) { 節足左2_接続.Add(e); e.Par = this; @@ -151,13 +151,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度XB = 1.05; } } - public void 節足左3接続(EleD e) + public void 節足左3接続(ElementData e) { 節足左3_接続.Add(e); e.Par = this; @@ -166,13 +166,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度XB = 1.1; } } - public void 節足左4接続(EleD e) + public void 節足左4接続(ElementData e) { 節足左4_接続.Add(e); e.Par = this; @@ -181,20 +181,20 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度XB = 1.15; } } - public void 触肢右接続(EleD e) + public void 触肢右接続(ElementData e) { 触肢右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蠍_触肢右_接続; } - public void 節足右1接続(EleD e) + public void 節足右1接続(ElementData e) { 節足右1_接続.Add(e); e.Par = this; @@ -203,13 +203,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度XB = 1.0; } } - public void 節足右2接続(EleD e) + public void 節足右2接続(ElementData e) { 節足右2_接続.Add(e); e.Par = this; @@ -218,13 +218,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度XB = 1.05; } } - public void 節足右3接続(EleD e) + public void 節足右3接続(ElementData e) { 節足右3_接続.Add(e); e.Par = this; @@ -233,13 +233,13 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度XB = 1.1; } } - public void 節足右4接続(EleD e) + public void 節足右4接続(ElementData e) { 節足右4_接続.Add(e); e.Par = this; @@ -248,38 +248,38 @@ namespace SlaveMatrix { return; } - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度XB = 1.15; } } - public void 櫛状板左接続(EleD e) + public void 櫛状板左接続(ElementData e) { 櫛状板左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蠍_櫛状板左_接続; } - public void 櫛状板右接続(EleD e) + public void 櫛状板右接続(ElementData e) { 櫛状板右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蠍_櫛状板右_接続; } - public void 尾接続(EleD e) + public void 尾接続(ElementData e) { 尾_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.多足_蠍_尾_接続; - foreach (EleD item in e.EnumEleD()) + foreach (ElementData item in e.EnumEleD()) { item.尺度B = 1.3; } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 多足_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs index 1f31d91..15674cf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 大顎 : Ele + public class 大顎 : Element { public ShapePart X0Y0_棘_棘1; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs index f69ee8f..5787e18 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 大顎D : EleD + public class 大顎D : ElementData { public bool 刺_棘1_表示 = true; @@ -45,7 +45,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 大顎(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs index 56122ac..4bfedf2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 大顎上 : Ele + public class 大顎上 : Element { public ShapePart X0Y0_甲殻; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs index d5b3171..43bea62 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 大顎基 : Ele + public class 大顎基 : Element { public ShapePart X0Y0_甲殻下; @@ -13,9 +13,9 @@ namespace SlaveMatrix public ColorP X0Y0_甲殻下CP; - public Ele[] 顎左_接続; + public Element[] 顎左_接続; - public Ele[] 顎右_接続; + public Element[] 顎右_接続; public override bool 欠損 { @@ -165,7 +165,7 @@ namespace SlaveMatrix set { 位置C = new Vector2D(位置C.X, -0.013 * value); - foreach (Ele item in EnumEle()) + foreach (Element item in EnumEle()) { item.尺度YC = 1.0 - 0.05 * value; } @@ -451,10 +451,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.顎左_接続.Count > 0) { - 顎左_接続 = e.顎左_接続.Select(delegate(EleD g) + 顎左_接続 = e.顎左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 大顎基2; @@ -465,7 +465,7 @@ namespace SlaveMatrix } if (e.顎右_接続.Count > 0) { - 顎右_接続 = e.顎右_接続.Select(delegate(EleD g) + 顎右_接続 = e.顎右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 大顎基2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs index bb3b7c6..4822078 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 大顎基D : EleD + public class 大顎基D : ElementData { public bool 甲殻下_表示 = true; @@ -19,30 +19,30 @@ namespace SlaveMatrix public bool 刺右_表示 = true; - public List 顎左_接続 = new List(); + public List 顎左_接続 = new List(); - public List 顎右_接続 = new List(); + public List 顎右_接続 = new List(); public 大顎基D() { ThisType = GetType(); } - public void 顎左接続(EleD e) + public void 顎左接続(ElementData e) { 顎左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.大顎基_顎左_接続; } - public void 顎右接続(EleD e) + public void 顎右接続(ElementData e) { 顎右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.大顎基_顎右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 大顎基(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs index 5b12c32..94721c3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 射精 : Ele + public class 射精 : Element { public ShapePart X0Y0_精液; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精D.cs index d0f2a8f..09f1de0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 射精D : EleD + public class 射精D : ElementData { public bool 精液_表示 = true; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾.cs index 86869b2..9585772 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 尾 : Ele + public class 尾 : Element { public virtual IEnumerable Enum軸() { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾D.cs index d10daf4..90b7cfa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 尾D : EleD + public class 尾D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs index 6b61850..1252597 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs @@ -968,7 +968,7 @@ namespace SlaveMatrix public 拘束鎖 鎖4; - public Ele[] 尾先_接続; + public Element[] 尾先_接続; public override bool 欠損 { @@ -3888,8 +3888,8 @@ namespace SlaveMatrix } if (e.尾先_接続.Count > 0) { - Ele f; - 尾先_接続 = e.尾先_接続.Select(delegate(EleD g) + Element f; + 尾先_接続 = e.尾先_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_ウ2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs index 282472b..c0e5662 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs @@ -333,21 +333,21 @@ namespace SlaveMatrix public bool 鎖表示; - public List 尾先_接続 = new List(); + public List 尾先_接続 = new List(); public 尾_ウD() { ThisType = GetType(); } - public void 尾先接続(EleD e) + public void 尾先接続(ElementData e) { 尾先_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_ウ_尾先_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_ウ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs index b6bd779..b67db6c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs @@ -213,7 +213,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_ガ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs index cd27a57..03092d9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs @@ -1574,7 +1574,7 @@ namespace SlaveMatrix public 拘束鎖 鎖4; - public Ele[] 尾先_接続; + public Element[] 尾先_接続; public override bool 欠損 { @@ -6327,8 +6327,8 @@ namespace SlaveMatrix } if (e.尾先_接続.Count > 0) { - Ele f; - 尾先_接続 = e.尾先_接続.Select(delegate(EleD g) + Element f; + 尾先_接続 = e.尾先_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_ヘ2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs index b52b489..57f4943 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs @@ -535,21 +535,21 @@ namespace SlaveMatrix public bool 鎖表示; - public List 尾先_接続 = new List(); + public List 尾先_接続 = new List(); public 尾_ヘD() { ThisType = GetType(); } - public void 尾先接続(EleD e) + public void 尾先接続(ElementData e) { 尾先_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_ヘ_尾先_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_ヘ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs index a7978d2..8ee92fe 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs @@ -67,7 +67,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_悪(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs index df31f06..8dcfd5a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs @@ -137,7 +137,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_根(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs index 0c06af2..29cba53 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs @@ -67,7 +67,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_淫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs index 2fce063..5d53deb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs index 082f995..efeca6f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_犬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs index e740d0f..78ea1bc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_狐(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs index 2989c08..9070cf7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_猫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs index be0c6d4..a175b50 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_短(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs index ebd2871..9393298 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs @@ -79,7 +79,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs index 529f8c8..821da67 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs @@ -487,7 +487,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_腓(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs index 599e53c..d6185cc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs @@ -65,7 +65,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs index 9acea88..abc6fc0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs @@ -489,7 +489,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_蛇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs index 3b67395..6061126 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs @@ -110,7 +110,7 @@ namespace SlaveMatrix private bool 出糸_; - public Ele[] 出糸_接続; + public Element[] 出糸_接続; private Vector2D[] mm; @@ -530,8 +530,8 @@ namespace SlaveMatrix } if (e.出糸_接続.Count > 0) { - Ele f; - 出糸_接続 = e.出糸_接続.Select(delegate(EleD g) + Element f; + 出糸_接続 = e.出糸_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蜘2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs index bdd0f72..24e7e6f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs @@ -43,21 +43,21 @@ namespace SlaveMatrix public bool 出糸; - public List 出糸_接続 = new List(); + public List 出糸_接続 = new List(); public 尾_蜘D() { ThisType = GetType(); } - public void 出糸接続(EleD e) + public void 出糸接続(ElementData e) { 出糸_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蜘_出糸_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs index f03902b..538144b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs @@ -374,29 +374,29 @@ namespace SlaveMatrix public 拘束鎖 鎖4; - public Ele[] 左1_接続; + public Element[] 左1_接続; - public Ele[] 右1_接続; + public Element[] 右1_接続; - public Ele[] 左2_接続; + public Element[] 左2_接続; - public Ele[] 右2_接続; + public Element[] 右2_接続; - public Ele[] 左3_接続; + public Element[] 左3_接続; - public Ele[] 右3_接続; + public Element[] 右3_接続; - public Ele[] 左4_接続; + public Element[] 左4_接続; - public Ele[] 右4_接続; + public Element[] 右4_接続; - public Ele[] 左5_接続; + public Element[] 左5_接続; - public Ele[] 右5_接続; + public Element[] 右5_接続; - public Ele[] 尾左_接続; + public Element[] 尾左_接続; - public Ele[] 尾右_接続; + public Element[] 尾右_接続; public override bool 欠損 { @@ -1723,10 +1723,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左1_接続.Count > 0) { - 左1_接続 = e.左1_接続.Select(delegate(EleD g) + 左1_接続 = e.左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1737,7 +1737,7 @@ namespace SlaveMatrix } if (e.右1_接続.Count > 0) { - 右1_接続 = e.右1_接続.Select(delegate(EleD g) + 右1_接続 = e.右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1748,7 +1748,7 @@ namespace SlaveMatrix } if (e.左2_接続.Count > 0) { - 左2_接続 = e.左2_接続.Select(delegate(EleD g) + 左2_接続 = e.左2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1759,7 +1759,7 @@ namespace SlaveMatrix } if (e.右2_接続.Count > 0) { - 右2_接続 = e.右2_接続.Select(delegate(EleD g) + 右2_接続 = e.右2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1770,7 +1770,7 @@ namespace SlaveMatrix } if (e.左3_接続.Count > 0) { - 左3_接続 = e.左3_接続.Select(delegate(EleD g) + 左3_接続 = e.左3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1781,7 +1781,7 @@ namespace SlaveMatrix } if (e.右3_接続.Count > 0) { - 右3_接続 = e.右3_接続.Select(delegate(EleD g) + 右3_接続 = e.右3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1792,7 +1792,7 @@ namespace SlaveMatrix } if (e.左4_接続.Count > 0) { - 左4_接続 = e.左4_接続.Select(delegate(EleD g) + 左4_接続 = e.左4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1803,7 +1803,7 @@ namespace SlaveMatrix } if (e.右4_接続.Count > 0) { - 右4_接続 = e.右4_接続.Select(delegate(EleD g) + 右4_接続 = e.右4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1814,7 +1814,7 @@ namespace SlaveMatrix } if (e.左5_接続.Count > 0) { - 左5_接続 = e.左5_接続.Select(delegate(EleD g) + 左5_接続 = e.左5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1825,7 +1825,7 @@ namespace SlaveMatrix } if (e.右5_接続.Count > 0) { - 右5_接続 = e.右5_接続.Select(delegate(EleD g) + 右5_接続 = e.右5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1836,7 +1836,7 @@ namespace SlaveMatrix } if (e.尾左_接続.Count > 0) { - 尾左_接続 = e.尾左_接続.Select(delegate(EleD g) + 尾左_接続 = e.尾左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; @@ -1847,7 +1847,7 @@ namespace SlaveMatrix } if (e.尾右_接続.Count > 0) { - 尾右_接続 = e.尾右_接続.Select(delegate(EleD g) + 尾右_接続 = e.尾右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_蟲2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs index b1edbee..bff13e0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs @@ -143,120 +143,120 @@ namespace SlaveMatrix public bool 鎖表示; - public List 左1_接続 = new List(); + public List 左1_接続 = new List(); - public List 右1_接続 = new List(); + public List 右1_接続 = new List(); - public List 左2_接続 = new List(); + public List 左2_接続 = new List(); - public List 右2_接続 = new List(); + public List 右2_接続 = new List(); - public List 左3_接続 = new List(); + public List 左3_接続 = new List(); - public List 右3_接続 = new List(); + public List 右3_接続 = new List(); - public List 左4_接続 = new List(); + public List 左4_接続 = new List(); - public List 右4_接続 = new List(); + public List 右4_接続 = new List(); - public List 左5_接続 = new List(); + public List 左5_接続 = new List(); - public List 右5_接続 = new List(); + public List 右5_接続 = new List(); - public List 尾左_接続 = new List(); + public List 尾左_接続 = new List(); - public List 尾右_接続 = new List(); + public List 尾右_接続 = new List(); public 尾_蟲D() { ThisType = GetType(); } - public void 左1接続(EleD e) + public void 左1接続(ElementData e) { 左1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_左1_接続; } - public void 右1接続(EleD e) + public void 右1接続(ElementData e) { 右1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_右1_接続; } - public void 左2接続(EleD e) + public void 左2接続(ElementData e) { 左2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_左2_接続; } - public void 右2接続(EleD e) + public void 右2接続(ElementData e) { 右2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_右2_接続; } - public void 左3接続(EleD e) + public void 左3接続(ElementData e) { 左3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_左3_接続; } - public void 右3接続(EleD e) + public void 右3接続(ElementData e) { 右3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_右3_接続; } - public void 左4接続(EleD e) + public void 左4接続(ElementData e) { 左4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_左4_接続; } - public void 右4接続(EleD e) + public void 右4接続(ElementData e) { 右4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_右4_接続; } - public void 左5接続(EleD e) + public void 左5接続(ElementData e) { 左5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_左5_接続; } - public void 右5接続(EleD e) + public void 右5接続(ElementData e) { 右5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_右5_接続; } - public void 尾左接続(EleD e) + public void 尾左接続(ElementData e) { 尾左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_尾左_接続; } - public void 尾右接続(EleD e) + public void 尾右接続(ElementData e) { 尾右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_蟲_尾右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs index c71005b..5982882 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs @@ -87,7 +87,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs index 7abe2fc..7c03768 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs index f7ebbc4..ee1b652 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs @@ -1860,143 +1860,143 @@ namespace SlaveMatrix public bool Rパターン; - public Ele[] 左1_接続; + public Element[] 左1_接続; - public Ele[] 右1_接続; + public Element[] 右1_接続; - public Ele[] 左2_接続; + public Element[] 左2_接続; - public Ele[] 右2_接続; + public Element[] 右2_接続; - public Ele[] 左3_接続; + public Element[] 左3_接続; - public Ele[] 右3_接続; + public Element[] 右3_接続; - public Ele[] 左4_接続; + public Element[] 左4_接続; - public Ele[] 右4_接続; + public Element[] 右4_接続; - public Ele[] 左5_接続; + public Element[] 左5_接続; - public Ele[] 右5_接続; + public Element[] 右5_接続; - public Ele[] 左6_接続; + public Element[] 左6_接続; - public Ele[] 右6_接続; + public Element[] 右6_接続; - public Ele[] 左7_接続; + public Element[] 左7_接続; - public Ele[] 右7_接続; + public Element[] 右7_接続; - public Ele[] 左8_接続; + public Element[] 左8_接続; - public Ele[] 右8_接続; + public Element[] 右8_接続; - public Ele[] 左9_接続; + public Element[] 左9_接続; - public Ele[] 右9_接続; + public Element[] 右9_接続; - public Ele[] 左10_接続; + public Element[] 左10_接続; - public Ele[] 右10_接続; + public Element[] 右10_接続; - public Ele[] 左11_接続; + public Element[] 左11_接続; - public Ele[] 右11_接続; + public Element[] 右11_接続; - public Ele[] 左12_接続; + public Element[] 左12_接続; - public Ele[] 右12_接続; + public Element[] 右12_接続; - public Ele[] 左13_接続; + public Element[] 左13_接続; - public Ele[] 右13_接続; + public Element[] 右13_接続; - public Ele[] 左14_接続; + public Element[] 左14_接続; - public Ele[] 右14_接続; + public Element[] 右14_接続; - public Ele[] 左15_接続; + public Element[] 左15_接続; - public Ele[] 右15_接続; + public Element[] 右15_接続; - public Ele[] 左16_接続; + public Element[] 左16_接続; - public Ele[] 右16_接続; + public Element[] 右16_接続; - public Ele[] 左17_接続; + public Element[] 左17_接続; - public Ele[] 右17_接続; + public Element[] 右17_接続; - public Ele[] 左18_接続; + public Element[] 左18_接続; - public Ele[] 右18_接続; + public Element[] 右18_接続; - public Ele[] 左19_接続; + public Element[] 左19_接続; - public Ele[] 右19_接続; + public Element[] 右19_接続; - public Ele[] 左20_接続; + public Element[] 左20_接続; - public Ele[] 右20_接続; + public Element[] 右20_接続; - public Ele[] 左21_接続; + public Element[] 左21_接続; - public Ele[] 右21_接続; + public Element[] 右21_接続; - public Ele[] 左22_接続; + public Element[] 左22_接続; - public Ele[] 右22_接続; + public Element[] 右22_接続; - public Ele[] 左23_接続; + public Element[] 左23_接続; - public Ele[] 右23_接続; + public Element[] 右23_接続; - public Ele[] 左24_接続; + public Element[] 左24_接続; - public Ele[] 右24_接続; + public Element[] 右24_接続; - public Ele[] 左25_接続; + public Element[] 左25_接続; - public Ele[] 右25_接続; + public Element[] 右25_接続; - public Ele[] 左26_接続; + public Element[] 左26_接続; - public Ele[] 右26_接続; + public Element[] 右26_接続; - public Ele[] 左27_接続; + public Element[] 左27_接続; - public Ele[] 右27_接続; + public Element[] 右27_接続; - public Ele[] 左28_接続; + public Element[] 左28_接続; - public Ele[] 右28_接続; + public Element[] 右28_接続; - public Ele[] 左29_接続; + public Element[] 左29_接続; - public Ele[] 右29_接続; + public Element[] 右29_接続; - public Ele[] 左30_接続; + public Element[] 左30_接続; - public Ele[] 右30_接続; + public Element[] 右30_接続; - public Ele[] 左31_接続; + public Element[] 左31_接続; - public Ele[] 右31_接続; + public Element[] 右31_接続; - public Ele[] 左32_接続; + public Element[] 左32_接続; - public Ele[] 右32_接続; + public Element[] 右32_接続; - public Ele[] 左33_接続; + public Element[] 左33_接続; - public Ele[] 右33_接続; + public Element[] 右33_接続; - public Ele[] 左34_接続; + public Element[] 左34_接続; - public Ele[] 右34_接続; + public Element[] 右34_接続; - public Ele[] 尾先_接続; + public Element[] 尾先_接続; public override bool 欠損 { @@ -8160,10 +8160,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左1_接続.Count > 0) { - 左1_接続 = e.左1_接続.Select(delegate(EleD g) + 左1_接続 = e.左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8174,7 +8174,7 @@ namespace SlaveMatrix } if (e.右1_接続.Count > 0) { - 右1_接続 = e.右1_接続.Select(delegate(EleD g) + 右1_接続 = e.右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8185,7 +8185,7 @@ namespace SlaveMatrix } if (e.左2_接続.Count > 0) { - 左2_接続 = e.左2_接続.Select(delegate(EleD g) + 左2_接続 = e.左2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8196,7 +8196,7 @@ namespace SlaveMatrix } if (e.右2_接続.Count > 0) { - 右2_接続 = e.右2_接続.Select(delegate(EleD g) + 右2_接続 = e.右2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8207,7 +8207,7 @@ namespace SlaveMatrix } if (e.左3_接続.Count > 0) { - 左3_接続 = e.左3_接続.Select(delegate(EleD g) + 左3_接続 = e.左3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8218,7 +8218,7 @@ namespace SlaveMatrix } if (e.右3_接続.Count > 0) { - 右3_接続 = e.右3_接続.Select(delegate(EleD g) + 右3_接続 = e.右3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8229,7 +8229,7 @@ namespace SlaveMatrix } if (e.左4_接続.Count > 0) { - 左4_接続 = e.左4_接続.Select(delegate(EleD g) + 左4_接続 = e.左4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8240,7 +8240,7 @@ namespace SlaveMatrix } if (e.右4_接続.Count > 0) { - 右4_接続 = e.右4_接続.Select(delegate(EleD g) + 右4_接続 = e.右4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8251,7 +8251,7 @@ namespace SlaveMatrix } if (e.左5_接続.Count > 0) { - 左5_接続 = e.左5_接続.Select(delegate(EleD g) + 左5_接続 = e.左5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8262,7 +8262,7 @@ namespace SlaveMatrix } if (e.右5_接続.Count > 0) { - 右5_接続 = e.右5_接続.Select(delegate(EleD g) + 右5_接続 = e.右5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8273,7 +8273,7 @@ namespace SlaveMatrix } if (e.左6_接続.Count > 0) { - 左6_接続 = e.左6_接続.Select(delegate(EleD g) + 左6_接続 = e.左6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8284,7 +8284,7 @@ namespace SlaveMatrix } if (e.右6_接続.Count > 0) { - 右6_接続 = e.右6_接続.Select(delegate(EleD g) + 右6_接続 = e.右6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8295,7 +8295,7 @@ namespace SlaveMatrix } if (e.左7_接続.Count > 0) { - 左7_接続 = e.左7_接続.Select(delegate(EleD g) + 左7_接続 = e.左7_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8306,7 +8306,7 @@ namespace SlaveMatrix } if (e.右7_接続.Count > 0) { - 右7_接続 = e.右7_接続.Select(delegate(EleD g) + 右7_接続 = e.右7_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8317,7 +8317,7 @@ namespace SlaveMatrix } if (e.左8_接続.Count > 0) { - 左8_接続 = e.左8_接続.Select(delegate(EleD g) + 左8_接続 = e.左8_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8328,7 +8328,7 @@ namespace SlaveMatrix } if (e.右8_接続.Count > 0) { - 右8_接続 = e.右8_接続.Select(delegate(EleD g) + 右8_接続 = e.右8_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8339,7 +8339,7 @@ namespace SlaveMatrix } if (e.左9_接続.Count > 0) { - 左9_接続 = e.左9_接続.Select(delegate(EleD g) + 左9_接続 = e.左9_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8350,7 +8350,7 @@ namespace SlaveMatrix } if (e.右9_接続.Count > 0) { - 右9_接続 = e.右9_接続.Select(delegate(EleD g) + 右9_接続 = e.右9_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8361,7 +8361,7 @@ namespace SlaveMatrix } if (e.左10_接続.Count > 0) { - 左10_接続 = e.左10_接続.Select(delegate(EleD g) + 左10_接続 = e.左10_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8372,7 +8372,7 @@ namespace SlaveMatrix } if (e.右10_接続.Count > 0) { - 右10_接続 = e.右10_接続.Select(delegate(EleD g) + 右10_接続 = e.右10_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8383,7 +8383,7 @@ namespace SlaveMatrix } if (e.左11_接続.Count > 0) { - 左11_接続 = e.左11_接続.Select(delegate(EleD g) + 左11_接続 = e.左11_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8394,7 +8394,7 @@ namespace SlaveMatrix } if (e.右11_接続.Count > 0) { - 右11_接続 = e.右11_接続.Select(delegate(EleD g) + 右11_接続 = e.右11_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8405,7 +8405,7 @@ namespace SlaveMatrix } if (e.左12_接続.Count > 0) { - 左12_接続 = e.左12_接続.Select(delegate(EleD g) + 左12_接続 = e.左12_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8416,7 +8416,7 @@ namespace SlaveMatrix } if (e.右12_接続.Count > 0) { - 右12_接続 = e.右12_接続.Select(delegate(EleD g) + 右12_接続 = e.右12_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8427,7 +8427,7 @@ namespace SlaveMatrix } if (e.左13_接続.Count > 0) { - 左13_接続 = e.左13_接続.Select(delegate(EleD g) + 左13_接続 = e.左13_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8438,7 +8438,7 @@ namespace SlaveMatrix } if (e.右13_接続.Count > 0) { - 右13_接続 = e.右13_接続.Select(delegate(EleD g) + 右13_接続 = e.右13_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8449,7 +8449,7 @@ namespace SlaveMatrix } if (e.左14_接続.Count > 0) { - 左14_接続 = e.左14_接続.Select(delegate(EleD g) + 左14_接続 = e.左14_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8460,7 +8460,7 @@ namespace SlaveMatrix } if (e.右14_接続.Count > 0) { - 右14_接続 = e.右14_接続.Select(delegate(EleD g) + 右14_接続 = e.右14_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8471,7 +8471,7 @@ namespace SlaveMatrix } if (e.左15_接続.Count > 0) { - 左15_接続 = e.左15_接続.Select(delegate(EleD g) + 左15_接続 = e.左15_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8482,7 +8482,7 @@ namespace SlaveMatrix } if (e.右15_接続.Count > 0) { - 右15_接続 = e.右15_接続.Select(delegate(EleD g) + 右15_接続 = e.右15_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8493,7 +8493,7 @@ namespace SlaveMatrix } if (e.左16_接続.Count > 0) { - 左16_接続 = e.左16_接続.Select(delegate(EleD g) + 左16_接続 = e.左16_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8504,7 +8504,7 @@ namespace SlaveMatrix } if (e.右16_接続.Count > 0) { - 右16_接続 = e.右16_接続.Select(delegate(EleD g) + 右16_接続 = e.右16_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8515,7 +8515,7 @@ namespace SlaveMatrix } if (e.左17_接続.Count > 0) { - 左17_接続 = e.左17_接続.Select(delegate(EleD g) + 左17_接続 = e.左17_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8526,7 +8526,7 @@ namespace SlaveMatrix } if (e.右17_接続.Count > 0) { - 右17_接続 = e.右17_接続.Select(delegate(EleD g) + 右17_接続 = e.右17_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8537,7 +8537,7 @@ namespace SlaveMatrix } if (e.左18_接続.Count > 0) { - 左18_接続 = e.左18_接続.Select(delegate(EleD g) + 左18_接続 = e.左18_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8548,7 +8548,7 @@ namespace SlaveMatrix } if (e.右18_接続.Count > 0) { - 右18_接続 = e.右18_接続.Select(delegate(EleD g) + 右18_接続 = e.右18_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8559,7 +8559,7 @@ namespace SlaveMatrix } if (e.左19_接続.Count > 0) { - 左19_接続 = e.左19_接続.Select(delegate(EleD g) + 左19_接続 = e.左19_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8570,7 +8570,7 @@ namespace SlaveMatrix } if (e.右19_接続.Count > 0) { - 右19_接続 = e.右19_接続.Select(delegate(EleD g) + 右19_接続 = e.右19_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8581,7 +8581,7 @@ namespace SlaveMatrix } if (e.左20_接続.Count > 0) { - 左20_接続 = e.左20_接続.Select(delegate(EleD g) + 左20_接続 = e.左20_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8592,7 +8592,7 @@ namespace SlaveMatrix } if (e.右20_接続.Count > 0) { - 右20_接続 = e.右20_接続.Select(delegate(EleD g) + 右20_接続 = e.右20_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8603,7 +8603,7 @@ namespace SlaveMatrix } if (e.左21_接続.Count > 0) { - 左21_接続 = e.左21_接続.Select(delegate(EleD g) + 左21_接続 = e.左21_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8614,7 +8614,7 @@ namespace SlaveMatrix } if (e.右21_接続.Count > 0) { - 右21_接続 = e.右21_接続.Select(delegate(EleD g) + 右21_接続 = e.右21_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8625,7 +8625,7 @@ namespace SlaveMatrix } if (e.左22_接続.Count > 0) { - 左22_接続 = e.左22_接続.Select(delegate(EleD g) + 左22_接続 = e.左22_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8636,7 +8636,7 @@ namespace SlaveMatrix } if (e.右22_接続.Count > 0) { - 右22_接続 = e.右22_接続.Select(delegate(EleD g) + 右22_接続 = e.右22_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8647,7 +8647,7 @@ namespace SlaveMatrix } if (e.左23_接続.Count > 0) { - 左23_接続 = e.左23_接続.Select(delegate(EleD g) + 左23_接続 = e.左23_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8658,7 +8658,7 @@ namespace SlaveMatrix } if (e.右23_接続.Count > 0) { - 右23_接続 = e.右23_接続.Select(delegate(EleD g) + 右23_接続 = e.右23_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8669,7 +8669,7 @@ namespace SlaveMatrix } if (e.左24_接続.Count > 0) { - 左24_接続 = e.左24_接続.Select(delegate(EleD g) + 左24_接続 = e.左24_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8680,7 +8680,7 @@ namespace SlaveMatrix } if (e.右24_接続.Count > 0) { - 右24_接続 = e.右24_接続.Select(delegate(EleD g) + 右24_接続 = e.右24_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8691,7 +8691,7 @@ namespace SlaveMatrix } if (e.左25_接続.Count > 0) { - 左25_接続 = e.左25_接続.Select(delegate(EleD g) + 左25_接続 = e.左25_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8702,7 +8702,7 @@ namespace SlaveMatrix } if (e.右25_接続.Count > 0) { - 右25_接続 = e.右25_接続.Select(delegate(EleD g) + 右25_接続 = e.右25_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8713,7 +8713,7 @@ namespace SlaveMatrix } if (e.左26_接続.Count > 0) { - 左26_接続 = e.左26_接続.Select(delegate(EleD g) + 左26_接続 = e.左26_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8724,7 +8724,7 @@ namespace SlaveMatrix } if (e.右26_接続.Count > 0) { - 右26_接続 = e.右26_接続.Select(delegate(EleD g) + 右26_接続 = e.右26_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8735,7 +8735,7 @@ namespace SlaveMatrix } if (e.左27_接続.Count > 0) { - 左27_接続 = e.左27_接続.Select(delegate(EleD g) + 左27_接続 = e.左27_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8746,7 +8746,7 @@ namespace SlaveMatrix } if (e.右27_接続.Count > 0) { - 右27_接続 = e.右27_接続.Select(delegate(EleD g) + 右27_接続 = e.右27_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8757,7 +8757,7 @@ namespace SlaveMatrix } if (e.左28_接続.Count > 0) { - 左28_接続 = e.左28_接続.Select(delegate(EleD g) + 左28_接続 = e.左28_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8768,7 +8768,7 @@ namespace SlaveMatrix } if (e.右28_接続.Count > 0) { - 右28_接続 = e.右28_接続.Select(delegate(EleD g) + 右28_接続 = e.右28_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8779,7 +8779,7 @@ namespace SlaveMatrix } if (e.左29_接続.Count > 0) { - 左29_接続 = e.左29_接続.Select(delegate(EleD g) + 左29_接続 = e.左29_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8790,7 +8790,7 @@ namespace SlaveMatrix } if (e.右29_接続.Count > 0) { - 右29_接続 = e.右29_接続.Select(delegate(EleD g) + 右29_接続 = e.右29_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8801,7 +8801,7 @@ namespace SlaveMatrix } if (e.左30_接続.Count > 0) { - 左30_接続 = e.左30_接続.Select(delegate(EleD g) + 左30_接続 = e.左30_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8812,7 +8812,7 @@ namespace SlaveMatrix } if (e.右30_接続.Count > 0) { - 右30_接続 = e.右30_接続.Select(delegate(EleD g) + 右30_接続 = e.右30_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8823,7 +8823,7 @@ namespace SlaveMatrix } if (e.左31_接続.Count > 0) { - 左31_接続 = e.左31_接続.Select(delegate(EleD g) + 左31_接続 = e.左31_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8834,7 +8834,7 @@ namespace SlaveMatrix } if (e.右31_接続.Count > 0) { - 右31_接続 = e.右31_接続.Select(delegate(EleD g) + 右31_接続 = e.右31_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8845,7 +8845,7 @@ namespace SlaveMatrix } if (e.左32_接続.Count > 0) { - 左32_接続 = e.左32_接続.Select(delegate(EleD g) + 左32_接続 = e.左32_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8856,7 +8856,7 @@ namespace SlaveMatrix } if (e.右32_接続.Count > 0) { - 右32_接続 = e.右32_接続.Select(delegate(EleD g) + 右32_接続 = e.右32_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8867,7 +8867,7 @@ namespace SlaveMatrix } if (e.左33_接続.Count > 0) { - 左33_接続 = e.左33_接続.Select(delegate(EleD g) + 左33_接続 = e.左33_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8878,7 +8878,7 @@ namespace SlaveMatrix } if (e.右33_接続.Count > 0) { - 右33_接続 = e.右33_接続.Select(delegate(EleD g) + 右33_接続 = e.右33_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8889,7 +8889,7 @@ namespace SlaveMatrix } if (e.左34_接続.Count > 0) { - 左34_接続 = e.左34_接続.Select(delegate(EleD g) + 左34_接続 = e.左34_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8900,7 +8900,7 @@ namespace SlaveMatrix } if (e.右34_接続.Count > 0) { - 右34_接続 = e.右34_接続.Select(delegate(EleD g) + 右34_接続 = e.右34_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; @@ -8911,7 +8911,7 @@ namespace SlaveMatrix } if (e.尾先_接続.Count > 0) { - 尾先_接続 = e.尾先_接続.Select(delegate(EleD g) + 尾先_接続 = e.尾先_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_魚2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs index e66494b..8ab093e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs @@ -641,633 +641,633 @@ namespace SlaveMatrix public bool 鱗4 = true; - public List 左1_接続 = new List(); + public List 左1_接続 = new List(); - public List 右1_接続 = new List(); + public List 右1_接続 = new List(); - public List 左2_接続 = new List(); + public List 左2_接続 = new List(); - public List 右2_接続 = new List(); + public List 右2_接続 = new List(); - public List 左3_接続 = new List(); + public List 左3_接続 = new List(); - public List 右3_接続 = new List(); + public List 右3_接続 = new List(); - public List 左4_接続 = new List(); + public List 左4_接続 = new List(); - public List 右4_接続 = new List(); + public List 右4_接続 = new List(); - public List 左5_接続 = new List(); + public List 左5_接続 = new List(); - public List 右5_接続 = new List(); + public List 右5_接続 = new List(); - public List 左6_接続 = new List(); + public List 左6_接続 = new List(); - public List 右6_接続 = new List(); + public List 右6_接続 = new List(); - public List 左7_接続 = new List(); + public List 左7_接続 = new List(); - public List 右7_接続 = new List(); + public List 右7_接続 = new List(); - public List 左8_接続 = new List(); + public List 左8_接続 = new List(); - public List 右8_接続 = new List(); + public List 右8_接続 = new List(); - public List 左9_接続 = new List(); + public List 左9_接続 = new List(); - public List 右9_接続 = new List(); + public List 右9_接続 = new List(); - public List 左10_接続 = new List(); + public List 左10_接続 = new List(); - public List 右10_接続 = new List(); + public List 右10_接続 = new List(); - public List 左11_接続 = new List(); + public List 左11_接続 = new List(); - public List 右11_接続 = new List(); + public List 右11_接続 = new List(); - public List 左12_接続 = new List(); + public List 左12_接続 = new List(); - public List 右12_接続 = new List(); + public List 右12_接続 = new List(); - public List 左13_接続 = new List(); + public List 左13_接続 = new List(); - public List 右13_接続 = new List(); + public List 右13_接続 = new List(); - public List 左14_接続 = new List(); + public List 左14_接続 = new List(); - public List 右14_接続 = new List(); + public List 右14_接続 = new List(); - public List 左15_接続 = new List(); + public List 左15_接続 = new List(); - public List 右15_接続 = new List(); + public List 右15_接続 = new List(); - public List 左16_接続 = new List(); + public List 左16_接続 = new List(); - public List 右16_接続 = new List(); + public List 右16_接続 = new List(); - public List 左17_接続 = new List(); + public List 左17_接続 = new List(); - public List 右17_接続 = new List(); + public List 右17_接続 = new List(); - public List 左18_接続 = new List(); + public List 左18_接続 = new List(); - public List 右18_接続 = new List(); + public List 右18_接続 = new List(); - public List 左19_接続 = new List(); + public List 左19_接続 = new List(); - public List 右19_接続 = new List(); + public List 右19_接続 = new List(); - public List 左20_接続 = new List(); + public List 左20_接続 = new List(); - public List 右20_接続 = new List(); + public List 右20_接続 = new List(); - public List 左21_接続 = new List(); + public List 左21_接続 = new List(); - public List 右21_接続 = new List(); + public List 右21_接続 = new List(); - public List 左22_接続 = new List(); + public List 左22_接続 = new List(); - public List 右22_接続 = new List(); + public List 右22_接続 = new List(); - public List 左23_接続 = new List(); + public List 左23_接続 = new List(); - public List 右23_接続 = new List(); + public List 右23_接続 = new List(); - public List 左24_接続 = new List(); + public List 左24_接続 = new List(); - public List 右24_接続 = new List(); + public List 右24_接続 = new List(); - public List 左25_接続 = new List(); + public List 左25_接続 = new List(); - public List 右25_接続 = new List(); + public List 右25_接続 = new List(); - public List 左26_接続 = new List(); + public List 左26_接続 = new List(); - public List 右26_接続 = new List(); + public List 右26_接続 = new List(); - public List 左27_接続 = new List(); + public List 左27_接続 = new List(); - public List 右27_接続 = new List(); + public List 右27_接続 = new List(); - public List 左28_接続 = new List(); + public List 左28_接続 = new List(); - public List 右28_接続 = new List(); + public List 右28_接続 = new List(); - public List 左29_接続 = new List(); + public List 左29_接続 = new List(); - public List 右29_接続 = new List(); + public List 右29_接続 = new List(); - public List 左30_接続 = new List(); + public List 左30_接続 = new List(); - public List 右30_接続 = new List(); + public List 右30_接続 = new List(); - public List 左31_接続 = new List(); + public List 左31_接続 = new List(); - public List 右31_接続 = new List(); + public List 右31_接続 = new List(); - public List 左32_接続 = new List(); + public List 左32_接続 = new List(); - public List 右32_接続 = new List(); + public List 右32_接続 = new List(); - public List 左33_接続 = new List(); + public List 左33_接続 = new List(); - public List 右33_接続 = new List(); + public List 右33_接続 = new List(); - public List 左34_接続 = new List(); + public List 左34_接続 = new List(); - public List 右34_接続 = new List(); + public List 右34_接続 = new List(); - public List 尾先_接続 = new List(); + public List 尾先_接続 = new List(); public 尾_魚D() { ThisType = GetType(); } - public void 左1接続(EleD e) + public void 左1接続(ElementData e) { 左1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左1_接続; } - public void 右1接続(EleD e) + public void 右1接続(ElementData e) { 右1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右1_接続; } - public void 左2接続(EleD e) + public void 左2接続(ElementData e) { 左2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左2_接続; } - public void 右2接続(EleD e) + public void 右2接続(ElementData e) { 右2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右2_接続; } - public void 左3接続(EleD e) + public void 左3接続(ElementData e) { 左3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左3_接続; } - public void 右3接続(EleD e) + public void 右3接続(ElementData e) { 右3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右3_接続; } - public void 左4接続(EleD e) + public void 左4接続(ElementData e) { 左4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左4_接続; } - public void 右4接続(EleD e) + public void 右4接続(ElementData e) { 右4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右4_接続; } - public void 左5接続(EleD e) + public void 左5接続(ElementData e) { 左5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左5_接続; } - public void 右5接続(EleD e) + public void 右5接続(ElementData e) { 右5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右5_接続; } - public void 左6接続(EleD e) + public void 左6接続(ElementData e) { 左6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左6_接続; } - public void 右6接続(EleD e) + public void 右6接続(ElementData e) { 右6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右6_接続; } - public void 左7接続(EleD e) + public void 左7接続(ElementData e) { 左7_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左7_接続; } - public void 右7接続(EleD e) + public void 右7接続(ElementData e) { 右7_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右7_接続; } - public void 左8接続(EleD e) + public void 左8接続(ElementData e) { 左8_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左8_接続; } - public void 右8接続(EleD e) + public void 右8接続(ElementData e) { 右8_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右8_接続; } - public void 左9接続(EleD e) + public void 左9接続(ElementData e) { 左9_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左9_接続; } - public void 右9接続(EleD e) + public void 右9接続(ElementData e) { 右9_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右9_接続; } - public void 左10接続(EleD e) + public void 左10接続(ElementData e) { 左10_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左10_接続; } - public void 右10接続(EleD e) + public void 右10接続(ElementData e) { 右10_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右10_接続; } - public void 左11接続(EleD e) + public void 左11接続(ElementData e) { 左11_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左11_接続; } - public void 右11接続(EleD e) + public void 右11接続(ElementData e) { 右11_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右11_接続; } - public void 左12接続(EleD e) + public void 左12接続(ElementData e) { 左12_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左12_接続; } - public void 右12接続(EleD e) + public void 右12接続(ElementData e) { 右12_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右12_接続; } - public void 左13接続(EleD e) + public void 左13接続(ElementData e) { 左13_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左13_接続; } - public void 右13接続(EleD e) + public void 右13接続(ElementData e) { 右13_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右13_接続; } - public void 左14接続(EleD e) + public void 左14接続(ElementData e) { 左14_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左14_接続; } - public void 右14接続(EleD e) + public void 右14接続(ElementData e) { 右14_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右14_接続; } - public void 左15接続(EleD e) + public void 左15接続(ElementData e) { 左15_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左15_接続; } - public void 右15接続(EleD e) + public void 右15接続(ElementData e) { 右15_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右15_接続; } - public void 左16接続(EleD e) + public void 左16接続(ElementData e) { 左16_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左16_接続; } - public void 右16接続(EleD e) + public void 右16接続(ElementData e) { 右16_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右16_接続; } - public void 左17接続(EleD e) + public void 左17接続(ElementData e) { 左17_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左17_接続; } - public void 右17接続(EleD e) + public void 右17接続(ElementData e) { 右17_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右17_接続; } - public void 左18接続(EleD e) + public void 左18接続(ElementData e) { 左18_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左18_接続; } - public void 右18接続(EleD e) + public void 右18接続(ElementData e) { 右18_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右18_接続; } - public void 左19接続(EleD e) + public void 左19接続(ElementData e) { 左19_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左19_接続; } - public void 右19接続(EleD e) + public void 右19接続(ElementData e) { 右19_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右19_接続; } - public void 左20接続(EleD e) + public void 左20接続(ElementData e) { 左20_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左20_接続; } - public void 右20接続(EleD e) + public void 右20接続(ElementData e) { 右20_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右20_接続; } - public void 左21接続(EleD e) + public void 左21接続(ElementData e) { 左21_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左21_接続; } - public void 右21接続(EleD e) + public void 右21接続(ElementData e) { 右21_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右21_接続; } - public void 左22接続(EleD e) + public void 左22接続(ElementData e) { 左22_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左22_接続; } - public void 右22接続(EleD e) + public void 右22接続(ElementData e) { 右22_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右22_接続; } - public void 左23接続(EleD e) + public void 左23接続(ElementData e) { 左23_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左23_接続; } - public void 右23接続(EleD e) + public void 右23接続(ElementData e) { 右23_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右23_接続; } - public void 左24接続(EleD e) + public void 左24接続(ElementData e) { 左24_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左24_接続; } - public void 右24接続(EleD e) + public void 右24接続(ElementData e) { 右24_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右24_接続; } - public void 左25接続(EleD e) + public void 左25接続(ElementData e) { 左25_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左25_接続; } - public void 右25接続(EleD e) + public void 右25接続(ElementData e) { 右25_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右25_接続; } - public void 左26接続(EleD e) + public void 左26接続(ElementData e) { 左26_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左26_接続; } - public void 右26接続(EleD e) + public void 右26接続(ElementData e) { 右26_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右26_接続; } - public void 左27接続(EleD e) + public void 左27接続(ElementData e) { 左27_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左27_接続; } - public void 右27接続(EleD e) + public void 右27接続(ElementData e) { 右27_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右27_接続; } - public void 左28接続(EleD e) + public void 左28接続(ElementData e) { 左28_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左28_接続; } - public void 右28接続(EleD e) + public void 右28接続(ElementData e) { 右28_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右28_接続; } - public void 左29接続(EleD e) + public void 左29接続(ElementData e) { 左29_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左29_接続; } - public void 右29接続(EleD e) + public void 右29接続(ElementData e) { 右29_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右29_接続; } - public void 左30接続(EleD e) + public void 左30接続(ElementData e) { 左30_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左30_接続; } - public void 右30接続(EleD e) + public void 右30接続(ElementData e) { 右30_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右30_接続; } - public void 左31接続(EleD e) + public void 左31接続(ElementData e) { 左31_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左31_接続; } - public void 右31接続(EleD e) + public void 右31接続(ElementData e) { 右31_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右31_接続; } - public void 左32接続(EleD e) + public void 左32接続(ElementData e) { 左32_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左32_接続; } - public void 右32接続(EleD e) + public void 右32接続(ElementData e) { 右32_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右32_接続; } - public void 左33接続(EleD e) + public void 左33接続(ElementData e) { 左33_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左33_接続; } - public void 右33接続(EleD e) + public void 右33接続(ElementData e) { 右33_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右33_接続; } - public void 左34接続(EleD e) + public void 左34接続(ElementData e) { 左34_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_左34_接続; } - public void 右34接続(EleD e) + public void 右34接続(ElementData e) { 右34_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_右34_接続; } - public void 尾先接続(EleD e) + public void 尾先接続(ElementData e) { 尾先_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_魚_尾先_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs index 4a6af33..3234859 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs @@ -658,143 +658,143 @@ namespace SlaveMatrix public 拘束鎖 鎖2; - public Ele[] 左1_接続; + public Element[] 左1_接続; - public Ele[] 右1_接続; + public Element[] 右1_接続; - public Ele[] 左2_接続; + public Element[] 左2_接続; - public Ele[] 右2_接続; + public Element[] 右2_接続; - public Ele[] 左3_接続; + public Element[] 左3_接続; - public Ele[] 右3_接続; + public Element[] 右3_接続; - public Ele[] 左4_接続; + public Element[] 左4_接続; - public Ele[] 右4_接続; + public Element[] 右4_接続; - public Ele[] 左5_接続; + public Element[] 左5_接続; - public Ele[] 右5_接続; + public Element[] 右5_接続; - public Ele[] 左6_接続; + public Element[] 左6_接続; - public Ele[] 右6_接続; + public Element[] 右6_接続; - public Ele[] 左7_接続; + public Element[] 左7_接続; - public Ele[] 右7_接続; + public Element[] 右7_接続; - public Ele[] 左8_接続; + public Element[] 左8_接続; - public Ele[] 右8_接続; + public Element[] 右8_接続; - public Ele[] 左9_接続; + public Element[] 左9_接続; - public Ele[] 右9_接続; + public Element[] 右9_接続; - public Ele[] 左10_接続; + public Element[] 左10_接続; - public Ele[] 右10_接続; + public Element[] 右10_接続; - public Ele[] 左11_接続; + public Element[] 左11_接続; - public Ele[] 右11_接続; + public Element[] 右11_接続; - public Ele[] 左12_接続; + public Element[] 左12_接続; - public Ele[] 右12_接続; + public Element[] 右12_接続; - public Ele[] 左13_接続; + public Element[] 左13_接続; - public Ele[] 右13_接続; + public Element[] 右13_接続; - public Ele[] 左14_接続; + public Element[] 左14_接続; - public Ele[] 右14_接続; + public Element[] 右14_接続; - public Ele[] 左15_接続; + public Element[] 左15_接続; - public Ele[] 右15_接続; + public Element[] 右15_接続; - public Ele[] 左16_接続; + public Element[] 左16_接続; - public Ele[] 右16_接続; + public Element[] 右16_接続; - public Ele[] 左17_接続; + public Element[] 左17_接続; - public Ele[] 右17_接続; + public Element[] 右17_接続; - public Ele[] 左18_接続; + public Element[] 左18_接続; - public Ele[] 右18_接続; + public Element[] 右18_接続; - public Ele[] 左19_接続; + public Element[] 左19_接続; - public Ele[] 右19_接続; + public Element[] 右19_接続; - public Ele[] 左20_接続; + public Element[] 左20_接続; - public Ele[] 右20_接続; + public Element[] 右20_接続; - public Ele[] 左21_接続; + public Element[] 左21_接続; - public Ele[] 右21_接続; + public Element[] 右21_接続; - public Ele[] 左22_接続; + public Element[] 左22_接続; - public Ele[] 右22_接続; + public Element[] 右22_接続; - public Ele[] 左23_接続; + public Element[] 左23_接続; - public Ele[] 右23_接続; + public Element[] 右23_接続; - public Ele[] 左24_接続; + public Element[] 左24_接続; - public Ele[] 右24_接続; + public Element[] 右24_接続; - public Ele[] 左25_接続; + public Element[] 左25_接続; - public Ele[] 右25_接続; + public Element[] 右25_接続; - public Ele[] 左26_接続; + public Element[] 左26_接続; - public Ele[] 右26_接続; + public Element[] 右26_接続; - public Ele[] 左27_接続; + public Element[] 左27_接続; - public Ele[] 右27_接続; + public Element[] 右27_接続; - public Ele[] 左28_接続; + public Element[] 左28_接続; - public Ele[] 右28_接続; + public Element[] 右28_接続; - public Ele[] 左29_接続; + public Element[] 左29_接続; - public Ele[] 右29_接続; + public Element[] 右29_接続; - public Ele[] 左30_接続; + public Element[] 左30_接続; - public Ele[] 右30_接続; + public Element[] 右30_接続; - public Ele[] 左31_接続; + public Element[] 左31_接続; - public Ele[] 右31_接続; + public Element[] 右31_接続; - public Ele[] 左32_接続; + public Element[] 左32_接続; - public Ele[] 右32_接続; + public Element[] 右32_接続; - public Ele[] 左33_接続; + public Element[] 左33_接続; - public Ele[] 右33_接続; + public Element[] 右33_接続; - public Ele[] 左34_接続; + public Element[] 左34_接続; - public Ele[] 右34_接続; + public Element[] 右34_接続; - public Ele[] 尾先_接続; + public Element[] 尾先_接続; private ShapePart[] Pars; @@ -3123,10 +3123,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左1_接続.Count > 0) { - 左1_接続 = e.左1_接続.Select(delegate(EleD g) + 左1_接続 = e.左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3137,7 +3137,7 @@ namespace SlaveMatrix } if (e.右1_接続.Count > 0) { - 右1_接続 = e.右1_接続.Select(delegate(EleD g) + 右1_接続 = e.右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3148,7 +3148,7 @@ namespace SlaveMatrix } if (e.左2_接続.Count > 0) { - 左2_接続 = e.左2_接続.Select(delegate(EleD g) + 左2_接続 = e.左2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3159,7 +3159,7 @@ namespace SlaveMatrix } if (e.右2_接続.Count > 0) { - 右2_接続 = e.右2_接続.Select(delegate(EleD g) + 右2_接続 = e.右2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3170,7 +3170,7 @@ namespace SlaveMatrix } if (e.左3_接続.Count > 0) { - 左3_接続 = e.左3_接続.Select(delegate(EleD g) + 左3_接続 = e.左3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3181,7 +3181,7 @@ namespace SlaveMatrix } if (e.右3_接続.Count > 0) { - 右3_接続 = e.右3_接続.Select(delegate(EleD g) + 右3_接続 = e.右3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3192,7 +3192,7 @@ namespace SlaveMatrix } if (e.左4_接続.Count > 0) { - 左4_接続 = e.左4_接続.Select(delegate(EleD g) + 左4_接続 = e.左4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3203,7 +3203,7 @@ namespace SlaveMatrix } if (e.右4_接続.Count > 0) { - 右4_接続 = e.右4_接続.Select(delegate(EleD g) + 右4_接続 = e.右4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3214,7 +3214,7 @@ namespace SlaveMatrix } if (e.左5_接続.Count > 0) { - 左5_接続 = e.左5_接続.Select(delegate(EleD g) + 左5_接続 = e.左5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3225,7 +3225,7 @@ namespace SlaveMatrix } if (e.右5_接続.Count > 0) { - 右5_接続 = e.右5_接続.Select(delegate(EleD g) + 右5_接続 = e.右5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3236,7 +3236,7 @@ namespace SlaveMatrix } if (e.左6_接続.Count > 0) { - 左6_接続 = e.左6_接続.Select(delegate(EleD g) + 左6_接続 = e.左6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3247,7 +3247,7 @@ namespace SlaveMatrix } if (e.右6_接続.Count > 0) { - 右6_接続 = e.右6_接続.Select(delegate(EleD g) + 右6_接続 = e.右6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3258,7 +3258,7 @@ namespace SlaveMatrix } if (e.左7_接続.Count > 0) { - 左7_接続 = e.左7_接続.Select(delegate(EleD g) + 左7_接続 = e.左7_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3269,7 +3269,7 @@ namespace SlaveMatrix } if (e.右7_接続.Count > 0) { - 右7_接続 = e.右7_接続.Select(delegate(EleD g) + 右7_接続 = e.右7_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3280,7 +3280,7 @@ namespace SlaveMatrix } if (e.左8_接続.Count > 0) { - 左8_接続 = e.左8_接続.Select(delegate(EleD g) + 左8_接続 = e.左8_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3291,7 +3291,7 @@ namespace SlaveMatrix } if (e.右8_接続.Count > 0) { - 右8_接続 = e.右8_接続.Select(delegate(EleD g) + 右8_接続 = e.右8_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3302,7 +3302,7 @@ namespace SlaveMatrix } if (e.左9_接続.Count > 0) { - 左9_接続 = e.左9_接続.Select(delegate(EleD g) + 左9_接続 = e.左9_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3313,7 +3313,7 @@ namespace SlaveMatrix } if (e.右9_接続.Count > 0) { - 右9_接続 = e.右9_接続.Select(delegate(EleD g) + 右9_接続 = e.右9_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3324,7 +3324,7 @@ namespace SlaveMatrix } if (e.左10_接続.Count > 0) { - 左10_接続 = e.左10_接続.Select(delegate(EleD g) + 左10_接続 = e.左10_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3335,7 +3335,7 @@ namespace SlaveMatrix } if (e.右10_接続.Count > 0) { - 右10_接続 = e.右10_接続.Select(delegate(EleD g) + 右10_接続 = e.右10_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3346,7 +3346,7 @@ namespace SlaveMatrix } if (e.左11_接続.Count > 0) { - 左11_接続 = e.左11_接続.Select(delegate(EleD g) + 左11_接続 = e.左11_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3357,7 +3357,7 @@ namespace SlaveMatrix } if (e.右11_接続.Count > 0) { - 右11_接続 = e.右11_接続.Select(delegate(EleD g) + 右11_接続 = e.右11_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3368,7 +3368,7 @@ namespace SlaveMatrix } if (e.左12_接続.Count > 0) { - 左12_接続 = e.左12_接続.Select(delegate(EleD g) + 左12_接続 = e.左12_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3379,7 +3379,7 @@ namespace SlaveMatrix } if (e.右12_接続.Count > 0) { - 右12_接続 = e.右12_接続.Select(delegate(EleD g) + 右12_接続 = e.右12_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3390,7 +3390,7 @@ namespace SlaveMatrix } if (e.左13_接続.Count > 0) { - 左13_接続 = e.左13_接続.Select(delegate(EleD g) + 左13_接続 = e.左13_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3401,7 +3401,7 @@ namespace SlaveMatrix } if (e.右13_接続.Count > 0) { - 右13_接続 = e.右13_接続.Select(delegate(EleD g) + 右13_接続 = e.右13_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3412,7 +3412,7 @@ namespace SlaveMatrix } if (e.左14_接続.Count > 0) { - 左14_接続 = e.左14_接続.Select(delegate(EleD g) + 左14_接続 = e.左14_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3423,7 +3423,7 @@ namespace SlaveMatrix } if (e.右14_接続.Count > 0) { - 右14_接続 = e.右14_接続.Select(delegate(EleD g) + 右14_接続 = e.右14_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3434,7 +3434,7 @@ namespace SlaveMatrix } if (e.左15_接続.Count > 0) { - 左15_接続 = e.左15_接続.Select(delegate(EleD g) + 左15_接続 = e.左15_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3445,7 +3445,7 @@ namespace SlaveMatrix } if (e.右15_接続.Count > 0) { - 右15_接続 = e.右15_接続.Select(delegate(EleD g) + 右15_接続 = e.右15_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3456,7 +3456,7 @@ namespace SlaveMatrix } if (e.左16_接続.Count > 0) { - 左16_接続 = e.左16_接続.Select(delegate(EleD g) + 左16_接続 = e.左16_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3467,7 +3467,7 @@ namespace SlaveMatrix } if (e.右16_接続.Count > 0) { - 右16_接続 = e.右16_接続.Select(delegate(EleD g) + 右16_接続 = e.右16_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3478,7 +3478,7 @@ namespace SlaveMatrix } if (e.左17_接続.Count > 0) { - 左17_接続 = e.左17_接続.Select(delegate(EleD g) + 左17_接続 = e.左17_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3489,7 +3489,7 @@ namespace SlaveMatrix } if (e.右17_接続.Count > 0) { - 右17_接続 = e.右17_接続.Select(delegate(EleD g) + 右17_接続 = e.右17_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3500,7 +3500,7 @@ namespace SlaveMatrix } if (e.左18_接続.Count > 0) { - 左18_接続 = e.左18_接続.Select(delegate(EleD g) + 左18_接続 = e.左18_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3511,7 +3511,7 @@ namespace SlaveMatrix } if (e.右18_接続.Count > 0) { - 右18_接続 = e.右18_接続.Select(delegate(EleD g) + 右18_接続 = e.右18_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3522,7 +3522,7 @@ namespace SlaveMatrix } if (e.左19_接続.Count > 0) { - 左19_接続 = e.左19_接続.Select(delegate(EleD g) + 左19_接続 = e.左19_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3533,7 +3533,7 @@ namespace SlaveMatrix } if (e.右19_接続.Count > 0) { - 右19_接続 = e.右19_接続.Select(delegate(EleD g) + 右19_接続 = e.右19_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3544,7 +3544,7 @@ namespace SlaveMatrix } if (e.左20_接続.Count > 0) { - 左20_接続 = e.左20_接続.Select(delegate(EleD g) + 左20_接続 = e.左20_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3555,7 +3555,7 @@ namespace SlaveMatrix } if (e.右20_接続.Count > 0) { - 右20_接続 = e.右20_接続.Select(delegate(EleD g) + 右20_接続 = e.右20_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3566,7 +3566,7 @@ namespace SlaveMatrix } if (e.左21_接続.Count > 0) { - 左21_接続 = e.左21_接続.Select(delegate(EleD g) + 左21_接続 = e.左21_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3577,7 +3577,7 @@ namespace SlaveMatrix } if (e.右21_接続.Count > 0) { - 右21_接続 = e.右21_接続.Select(delegate(EleD g) + 右21_接続 = e.右21_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3588,7 +3588,7 @@ namespace SlaveMatrix } if (e.左22_接続.Count > 0) { - 左22_接続 = e.左22_接続.Select(delegate(EleD g) + 左22_接続 = e.左22_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3599,7 +3599,7 @@ namespace SlaveMatrix } if (e.右22_接続.Count > 0) { - 右22_接続 = e.右22_接続.Select(delegate(EleD g) + 右22_接続 = e.右22_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3610,7 +3610,7 @@ namespace SlaveMatrix } if (e.左23_接続.Count > 0) { - 左23_接続 = e.左23_接続.Select(delegate(EleD g) + 左23_接続 = e.左23_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3621,7 +3621,7 @@ namespace SlaveMatrix } if (e.右23_接続.Count > 0) { - 右23_接続 = e.右23_接続.Select(delegate(EleD g) + 右23_接続 = e.右23_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3632,7 +3632,7 @@ namespace SlaveMatrix } if (e.左24_接続.Count > 0) { - 左24_接続 = e.左24_接続.Select(delegate(EleD g) + 左24_接続 = e.左24_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3643,7 +3643,7 @@ namespace SlaveMatrix } if (e.右24_接続.Count > 0) { - 右24_接続 = e.右24_接続.Select(delegate(EleD g) + 右24_接続 = e.右24_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3654,7 +3654,7 @@ namespace SlaveMatrix } if (e.左25_接続.Count > 0) { - 左25_接続 = e.左25_接続.Select(delegate(EleD g) + 左25_接続 = e.左25_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3665,7 +3665,7 @@ namespace SlaveMatrix } if (e.右25_接続.Count > 0) { - 右25_接続 = e.右25_接続.Select(delegate(EleD g) + 右25_接続 = e.右25_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3676,7 +3676,7 @@ namespace SlaveMatrix } if (e.左26_接続.Count > 0) { - 左26_接続 = e.左26_接続.Select(delegate(EleD g) + 左26_接続 = e.左26_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3687,7 +3687,7 @@ namespace SlaveMatrix } if (e.右26_接続.Count > 0) { - 右26_接続 = e.右26_接続.Select(delegate(EleD g) + 右26_接続 = e.右26_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3698,7 +3698,7 @@ namespace SlaveMatrix } if (e.左27_接続.Count > 0) { - 左27_接続 = e.左27_接続.Select(delegate(EleD g) + 左27_接続 = e.左27_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3709,7 +3709,7 @@ namespace SlaveMatrix } if (e.右27_接続.Count > 0) { - 右27_接続 = e.右27_接続.Select(delegate(EleD g) + 右27_接続 = e.右27_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3720,7 +3720,7 @@ namespace SlaveMatrix } if (e.左28_接続.Count > 0) { - 左28_接続 = e.左28_接続.Select(delegate(EleD g) + 左28_接続 = e.左28_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3731,7 +3731,7 @@ namespace SlaveMatrix } if (e.右28_接続.Count > 0) { - 右28_接続 = e.右28_接続.Select(delegate(EleD g) + 右28_接続 = e.右28_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3742,7 +3742,7 @@ namespace SlaveMatrix } if (e.左29_接続.Count > 0) { - 左29_接続 = e.左29_接続.Select(delegate(EleD g) + 左29_接続 = e.左29_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3753,7 +3753,7 @@ namespace SlaveMatrix } if (e.右29_接続.Count > 0) { - 右29_接続 = e.右29_接続.Select(delegate(EleD g) + 右29_接続 = e.右29_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3764,7 +3764,7 @@ namespace SlaveMatrix } if (e.左30_接続.Count > 0) { - 左30_接続 = e.左30_接続.Select(delegate(EleD g) + 左30_接続 = e.左30_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3775,7 +3775,7 @@ namespace SlaveMatrix } if (e.右30_接続.Count > 0) { - 右30_接続 = e.右30_接続.Select(delegate(EleD g) + 右30_接続 = e.右30_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3786,7 +3786,7 @@ namespace SlaveMatrix } if (e.左31_接続.Count > 0) { - 左31_接続 = e.左31_接続.Select(delegate(EleD g) + 左31_接続 = e.左31_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3797,7 +3797,7 @@ namespace SlaveMatrix } if (e.右31_接続.Count > 0) { - 右31_接続 = e.右31_接続.Select(delegate(EleD g) + 右31_接続 = e.右31_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3808,7 +3808,7 @@ namespace SlaveMatrix } if (e.左32_接続.Count > 0) { - 左32_接続 = e.左32_接続.Select(delegate(EleD g) + 左32_接続 = e.左32_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3819,7 +3819,7 @@ namespace SlaveMatrix } if (e.右32_接続.Count > 0) { - 右32_接続 = e.右32_接続.Select(delegate(EleD g) + 右32_接続 = e.右32_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3830,7 +3830,7 @@ namespace SlaveMatrix } if (e.左33_接続.Count > 0) { - 左33_接続 = e.左33_接続.Select(delegate(EleD g) + 左33_接続 = e.左33_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3841,7 +3841,7 @@ namespace SlaveMatrix } if (e.右33_接続.Count > 0) { - 右33_接続 = e.右33_接続.Select(delegate(EleD g) + 右33_接続 = e.右33_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3852,7 +3852,7 @@ namespace SlaveMatrix } if (e.左34_接続.Count > 0) { - 左34_接続 = e.左34_接続.Select(delegate(EleD g) + 左34_接続 = e.左34_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3863,7 +3863,7 @@ namespace SlaveMatrix } if (e.右34_接続.Count > 0) { - 右34_接続 = e.右34_接続.Select(delegate(EleD g) + 右34_接続 = e.右34_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; @@ -3874,7 +3874,7 @@ namespace SlaveMatrix } if (e.尾先_接続.Count > 0) { - 尾先_接続 = e.尾先_接続.Select(delegate(EleD g) + 尾先_接続 = e.尾先_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 尾_鯨2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs index dffd2a5..f179192 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs @@ -233,633 +233,633 @@ namespace SlaveMatrix public bool 鎖表示; - public List 左1_接続 = new List(); + public List 左1_接続 = new List(); - public List 右1_接続 = new List(); + public List 右1_接続 = new List(); - public List 左2_接続 = new List(); + public List 左2_接続 = new List(); - public List 右2_接続 = new List(); + public List 右2_接続 = new List(); - public List 左3_接続 = new List(); + public List 左3_接続 = new List(); - public List 右3_接続 = new List(); + public List 右3_接続 = new List(); - public List 左4_接続 = new List(); + public List 左4_接続 = new List(); - public List 右4_接続 = new List(); + public List 右4_接続 = new List(); - public List 左5_接続 = new List(); + public List 左5_接続 = new List(); - public List 右5_接続 = new List(); + public List 右5_接続 = new List(); - public List 左6_接続 = new List(); + public List 左6_接続 = new List(); - public List 右6_接続 = new List(); + public List 右6_接続 = new List(); - public List 左7_接続 = new List(); + public List 左7_接続 = new List(); - public List 右7_接続 = new List(); + public List 右7_接続 = new List(); - public List 左8_接続 = new List(); + public List 左8_接続 = new List(); - public List 右8_接続 = new List(); + public List 右8_接続 = new List(); - public List 左9_接続 = new List(); + public List 左9_接続 = new List(); - public List 右9_接続 = new List(); + public List 右9_接続 = new List(); - public List 左10_接続 = new List(); + public List 左10_接続 = new List(); - public List 右10_接続 = new List(); + public List 右10_接続 = new List(); - public List 左11_接続 = new List(); + public List 左11_接続 = new List(); - public List 右11_接続 = new List(); + public List 右11_接続 = new List(); - public List 左12_接続 = new List(); + public List 左12_接続 = new List(); - public List 右12_接続 = new List(); + public List 右12_接続 = new List(); - public List 左13_接続 = new List(); + public List 左13_接続 = new List(); - public List 右13_接続 = new List(); + public List 右13_接続 = new List(); - public List 左14_接続 = new List(); + public List 左14_接続 = new List(); - public List 右14_接続 = new List(); + public List 右14_接続 = new List(); - public List 左15_接続 = new List(); + public List 左15_接続 = new List(); - public List 右15_接続 = new List(); + public List 右15_接続 = new List(); - public List 左16_接続 = new List(); + public List 左16_接続 = new List(); - public List 右16_接続 = new List(); + public List 右16_接続 = new List(); - public List 左17_接続 = new List(); + public List 左17_接続 = new List(); - public List 右17_接続 = new List(); + public List 右17_接続 = new List(); - public List 左18_接続 = new List(); + public List 左18_接続 = new List(); - public List 右18_接続 = new List(); + public List 右18_接続 = new List(); - public List 左19_接続 = new List(); + public List 左19_接続 = new List(); - public List 右19_接続 = new List(); + public List 右19_接続 = new List(); - public List 左20_接続 = new List(); + public List 左20_接続 = new List(); - public List 右20_接続 = new List(); + public List 右20_接続 = new List(); - public List 左21_接続 = new List(); + public List 左21_接続 = new List(); - public List 右21_接続 = new List(); + public List 右21_接続 = new List(); - public List 左22_接続 = new List(); + public List 左22_接続 = new List(); - public List 右22_接続 = new List(); + public List 右22_接続 = new List(); - public List 左23_接続 = new List(); + public List 左23_接続 = new List(); - public List 右23_接続 = new List(); + public List 右23_接続 = new List(); - public List 左24_接続 = new List(); + public List 左24_接続 = new List(); - public List 右24_接続 = new List(); + public List 右24_接続 = new List(); - public List 左25_接続 = new List(); + public List 左25_接続 = new List(); - public List 右25_接続 = new List(); + public List 右25_接続 = new List(); - public List 左26_接続 = new List(); + public List 左26_接続 = new List(); - public List 右26_接続 = new List(); + public List 右26_接続 = new List(); - public List 左27_接続 = new List(); + public List 左27_接続 = new List(); - public List 右27_接続 = new List(); + public List 右27_接続 = new List(); - public List 左28_接続 = new List(); + public List 左28_接続 = new List(); - public List 右28_接続 = new List(); + public List 右28_接続 = new List(); - public List 左29_接続 = new List(); + public List 左29_接続 = new List(); - public List 右29_接続 = new List(); + public List 右29_接続 = new List(); - public List 左30_接続 = new List(); + public List 左30_接続 = new List(); - public List 右30_接続 = new List(); + public List 右30_接続 = new List(); - public List 左31_接続 = new List(); + public List 左31_接続 = new List(); - public List 右31_接続 = new List(); + public List 右31_接続 = new List(); - public List 左32_接続 = new List(); + public List 左32_接続 = new List(); - public List 右32_接続 = new List(); + public List 右32_接続 = new List(); - public List 左33_接続 = new List(); + public List 左33_接続 = new List(); - public List 右33_接続 = new List(); + public List 右33_接続 = new List(); - public List 左34_接続 = new List(); + public List 左34_接続 = new List(); - public List 右34_接続 = new List(); + public List 右34_接続 = new List(); - public List 尾先_接続 = new List(); + public List 尾先_接続 = new List(); public 尾_鯨D() { ThisType = GetType(); } - public void 左1接続(EleD e) + public void 左1接続(ElementData e) { 左1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左1_接続; } - public void 右1接続(EleD e) + public void 右1接続(ElementData e) { 右1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右1_接続; } - public void 左2接続(EleD e) + public void 左2接続(ElementData e) { 左2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左2_接続; } - public void 右2接続(EleD e) + public void 右2接続(ElementData e) { 右2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右2_接続; } - public void 左3接続(EleD e) + public void 左3接続(ElementData e) { 左3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左3_接続; } - public void 右3接続(EleD e) + public void 右3接続(ElementData e) { 右3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右3_接続; } - public void 左4接続(EleD e) + public void 左4接続(ElementData e) { 左4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左4_接続; } - public void 右4接続(EleD e) + public void 右4接続(ElementData e) { 右4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右4_接続; } - public void 左5接続(EleD e) + public void 左5接続(ElementData e) { 左5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左5_接続; } - public void 右5接続(EleD e) + public void 右5接続(ElementData e) { 右5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右5_接続; } - public void 左6接続(EleD e) + public void 左6接続(ElementData e) { 左6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左6_接続; } - public void 右6接続(EleD e) + public void 右6接続(ElementData e) { 右6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右6_接続; } - public void 左7接続(EleD e) + public void 左7接続(ElementData e) { 左7_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左7_接続; } - public void 右7接続(EleD e) + public void 右7接続(ElementData e) { 右7_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右7_接続; } - public void 左8接続(EleD e) + public void 左8接続(ElementData e) { 左8_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左8_接続; } - public void 右8接続(EleD e) + public void 右8接続(ElementData e) { 右8_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右8_接続; } - public void 左9接続(EleD e) + public void 左9接続(ElementData e) { 左9_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左9_接続; } - public void 右9接続(EleD e) + public void 右9接続(ElementData e) { 右9_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右9_接続; } - public void 左10接続(EleD e) + public void 左10接続(ElementData e) { 左10_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左10_接続; } - public void 右10接続(EleD e) + public void 右10接続(ElementData e) { 右10_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右10_接続; } - public void 左11接続(EleD e) + public void 左11接続(ElementData e) { 左11_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左11_接続; } - public void 右11接続(EleD e) + public void 右11接続(ElementData e) { 右11_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右11_接続; } - public void 左12接続(EleD e) + public void 左12接続(ElementData e) { 左12_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左12_接続; } - public void 右12接続(EleD e) + public void 右12接続(ElementData e) { 右12_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右12_接続; } - public void 左13接続(EleD e) + public void 左13接続(ElementData e) { 左13_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左13_接続; } - public void 右13接続(EleD e) + public void 右13接続(ElementData e) { 右13_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右13_接続; } - public void 左14接続(EleD e) + public void 左14接続(ElementData e) { 左14_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左14_接続; } - public void 右14接続(EleD e) + public void 右14接続(ElementData e) { 右14_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右14_接続; } - public void 左15接続(EleD e) + public void 左15接続(ElementData e) { 左15_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左15_接続; } - public void 右15接続(EleD e) + public void 右15接続(ElementData e) { 右15_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右15_接続; } - public void 左16接続(EleD e) + public void 左16接続(ElementData e) { 左16_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左16_接続; } - public void 右16接続(EleD e) + public void 右16接続(ElementData e) { 右16_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右16_接続; } - public void 左17接続(EleD e) + public void 左17接続(ElementData e) { 左17_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左17_接続; } - public void 右17接続(EleD e) + public void 右17接続(ElementData e) { 右17_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右17_接続; } - public void 左18接続(EleD e) + public void 左18接続(ElementData e) { 左18_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左18_接続; } - public void 右18接続(EleD e) + public void 右18接続(ElementData e) { 右18_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右18_接続; } - public void 左19接続(EleD e) + public void 左19接続(ElementData e) { 左19_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左19_接続; } - public void 右19接続(EleD e) + public void 右19接続(ElementData e) { 右19_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右19_接続; } - public void 左20接続(EleD e) + public void 左20接続(ElementData e) { 左20_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左20_接続; } - public void 右20接続(EleD e) + public void 右20接続(ElementData e) { 右20_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右20_接続; } - public void 左21接続(EleD e) + public void 左21接続(ElementData e) { 左21_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左21_接続; } - public void 右21接続(EleD e) + public void 右21接続(ElementData e) { 右21_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右21_接続; } - public void 左22接続(EleD e) + public void 左22接続(ElementData e) { 左22_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左22_接続; } - public void 右22接続(EleD e) + public void 右22接続(ElementData e) { 右22_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右22_接続; } - public void 左23接続(EleD e) + public void 左23接続(ElementData e) { 左23_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左23_接続; } - public void 右23接続(EleD e) + public void 右23接続(ElementData e) { 右23_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右23_接続; } - public void 左24接続(EleD e) + public void 左24接続(ElementData e) { 左24_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左24_接続; } - public void 右24接続(EleD e) + public void 右24接続(ElementData e) { 右24_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右24_接続; } - public void 左25接続(EleD e) + public void 左25接続(ElementData e) { 左25_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左25_接続; } - public void 右25接続(EleD e) + public void 右25接続(ElementData e) { 右25_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右25_接続; } - public void 左26接続(EleD e) + public void 左26接続(ElementData e) { 左26_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左26_接続; } - public void 右26接続(EleD e) + public void 右26接続(ElementData e) { 右26_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右26_接続; } - public void 左27接続(EleD e) + public void 左27接続(ElementData e) { 左27_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左27_接続; } - public void 右27接続(EleD e) + public void 右27接続(ElementData e) { 右27_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右27_接続; } - public void 左28接続(EleD e) + public void 左28接続(ElementData e) { 左28_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左28_接続; } - public void 右28接続(EleD e) + public void 右28接続(ElementData e) { 右28_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右28_接続; } - public void 左29接続(EleD e) + public void 左29接続(ElementData e) { 左29_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左29_接続; } - public void 右29接続(EleD e) + public void 右29接続(ElementData e) { 右29_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右29_接続; } - public void 左30接続(EleD e) + public void 左30接続(ElementData e) { 左30_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左30_接続; } - public void 右30接続(EleD e) + public void 右30接続(ElementData e) { 右30_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右30_接続; } - public void 左31接続(EleD e) + public void 左31接続(ElementData e) { 左31_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左31_接続; } - public void 右31接続(EleD e) + public void 右31接続(ElementData e) { 右31_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右31_接続; } - public void 左32接続(EleD e) + public void 左32接続(ElementData e) { 左32_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左32_接続; } - public void 右32接続(EleD e) + public void 右32接続(ElementData e) { 右32_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右32_接続; } - public void 左33接続(EleD e) + public void 左33接続(ElementData e) { 左33_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左33_接続; } - public void 右33接続(EleD e) + public void 右33接続(ElementData e) { 右33_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右33_接続; } - public void 左34接続(EleD e) + public void 左34接続(ElementData e) { 左34_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_左34_接続; } - public void 右34接続(EleD e) + public void 右34接続(ElementData e) { 右34_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_右34_接続; } - public void 尾先接続(EleD e) + public void 尾先接続(ElementData e) { 尾先_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.尾_鯨_尾先_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs index 1c964ea..69d9ed7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs @@ -61,7 +61,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs index d7708cf..a049e9f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs @@ -123,7 +123,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_龍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭.cs index 49fffdd..ef099f1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 尾鰭 : Ele + public class 尾鰭 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭D.cs index 6fe3635..7ed738d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 尾鰭D : EleD + public class 尾鰭D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs index 06425c7..adbf8bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs @@ -43,7 +43,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾鰭_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs index 851aa26..5db22a9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾鰭_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅.cs index 11e8f91..26bcb1b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 後翅 : Ele + public class 後翅 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅D.cs index 9755b41..7fc0a58 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 後翅D : EleD + public class 後翅D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs index 6f56e77..7484b4b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後翅_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs index 7787266..10901ce 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後翅_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs index 020d3a9..7544933 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs @@ -101,7 +101,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後翅_草(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs index eaa0cc1..87f7679 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後翅_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器.cs index 5d1db63..f72b5d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 性器 : Ele + public class 性器 : Element { public virtual double くぱぁ { get; set; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器D.cs index 000e0b8..81ca458 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 性器D : EleD + public class 性器D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs index 64518bc..ba3260f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs @@ -503,11 +503,11 @@ namespace SlaveMatrix private double くぱぁ_; - public Ele[] 陰核_接続; + public Element[] 陰核_接続; - public Ele[] 尿道_接続; + public Element[] 尿道_接続; - public Ele[] 膣口_接続; + public Element[] 膣口_接続; public override bool 欠損 { @@ -1077,10 +1077,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.陰核_接続.Count > 0) { - 陰核_接続 = e.陰核_接続.Select(delegate(EleD g) + 陰核_接続 = e.陰核_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 性器_人2; @@ -1091,7 +1091,7 @@ namespace SlaveMatrix } if (e.尿道_接続.Count > 0) { - 尿道_接続 = e.尿道_接続.Select(delegate(EleD g) + 尿道_接続 = e.尿道_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 性器_人2; @@ -1102,7 +1102,7 @@ namespace SlaveMatrix } if (e.膣口_接続.Count > 0) { - 膣口_接続 = e.膣口_接続.Select(delegate(EleD g) + 膣口_接続 = e.膣口_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 性器_人2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs index d8e1828..031477e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs @@ -19,39 +19,39 @@ namespace SlaveMatrix public double くぱぁ; - public List 陰核_接続 = new List(); + public List 陰核_接続 = new List(); - public List 尿道_接続 = new List(); + public List 尿道_接続 = new List(); - public List 膣口_接続 = new List(); + public List 膣口_接続 = new List(); public 性器_人D() { ThisType = GetType(); } - public void 陰核接続(EleD e) + public void 陰核接続(ElementData e) { 陰核_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.性器_人_陰核_接続; } - public void 尿道接続(EleD e) + public void 尿道接続(ElementData e) { 尿道_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.性器_人_尿道_接続; } - public void 膣口接続(EleD e) + public void 膣口接続(ElementData e) { 膣口_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.性器_人_膣口_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 性器_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs index c1a9627..b8cf775 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs @@ -503,11 +503,11 @@ namespace SlaveMatrix private double くぱぁ_; - public Ele[] 陰核_接続; + public Element[] 陰核_接続; - public Ele[] 尿道_接続; + public Element[] 尿道_接続; - public Ele[] 膣口_接続; + public Element[] 膣口_接続; public override bool 欠損 { @@ -1077,10 +1077,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.陰核_接続.Count > 0) { - 陰核_接続 = e.陰核_接続.Select(delegate(EleD g) + 陰核_接続 = e.陰核_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 性器_獣2; @@ -1091,7 +1091,7 @@ namespace SlaveMatrix } if (e.尿道_接続.Count > 0) { - 尿道_接続 = e.尿道_接続.Select(delegate(EleD g) + 尿道_接続 = e.尿道_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 性器_獣2; @@ -1102,7 +1102,7 @@ namespace SlaveMatrix } if (e.膣口_接続.Count > 0) { - 膣口_接続 = e.膣口_接続.Select(delegate(EleD g) + 膣口_接続 = e.膣口_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 性器_獣2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs index 46f3e3e..220c2ab 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs @@ -19,39 +19,39 @@ namespace SlaveMatrix public double くぱぁ; - public List 陰核_接続 = new List(); + public List 陰核_接続 = new List(); - public List 尿道_接続 = new List(); + public List 尿道_接続 = new List(); - public List 膣口_接続 = new List(); + public List 膣口_接続 = new List(); public 性器_獣D() { ThisType = GetType(); } - public void 陰核接続(EleD e) + public void 陰核接続(ElementData e) { 陰核_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.性器_獣_陰核_接続; } - public void 尿道接続(EleD e) + public void 尿道接続(ElementData e) { 尿道_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.性器_獣_尿道_接続; } - public void 膣口接続(EleD e) + public void 膣口接続(ElementData e) { 膣口_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.性器_獣_膣口_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 性器_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液.cs index cb69588..baee853 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 性器精液 : Ele + public class 性器精液 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液D.cs index b5a73e9..ec494ac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 性器精液D : EleD + public class 性器精液D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs index 2e29cc6..c7cb9ad 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 性器精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs index ed2c832..23b72b5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 性器精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手.cs index 8683a5b..4164e6f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 手 : Ele + public class 手 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手D.cs index 1d7e3aa..90152a5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 手D : EleD + public class 手D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs index 6fddf5f..7bcca2b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs index 16135a7..bd4ee86 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs index 2fb7956..b86e9d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs index bf241e0..4f7b8fa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs index 6bf4194..f3e72fe 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs index 4152f8c..c50a498 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs @@ -211,7 +211,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs index 6d5e9d2..b987a42 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 拘束鎖 : Ele + public class 拘束鎖 : Element { public ShapePart X0Y0_鎖2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs index bbb21cb..892434a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs @@ -209,17 +209,17 @@ namespace SlaveMatrix { set { - if (対象.Ele is バイブ_アナル) + if (対象.Element is バイブ_アナル) { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, Bod.Is獣 ? A通常獣最大v : A通常人最大v); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, Bod.Is獣 ? A通常獣最大v : A通常人最大v); } - else if (対象.Ele is パール) + else if (対象.Element is パール) { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, Bod.Is獣 ? P通常獣最大v : P通常人最大v); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, Bod.Is獣 ? P通常獣最大v : P通常人最大v); } else { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, 1.0); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, 1.0); } } } @@ -231,22 +231,22 @@ namespace SlaveMatrix if (Bod.断面_表示) { dv = (dv + value).Clamp(0.0, 1.0); - dy = ((dv >= 1.0) ? (対象.Ele.Body.CountY - 1) : ((int)((double)対象.Ele.Body.CountY * dv))); - if (対象.Ele is バイブ_アナル) + dy = ((dv >= 1.0) ? (対象.Element.Body.CountY - 1) : ((int)((double)対象.Element.Body.CountY * dv))); + if (対象.Element is バイブ_アナル) { dy = dy.Limit(0, Bod.Is獣 ? A断面獣最大i : A断面人最大i); } - else if (対象.Ele is パール) + else if (対象.Element is パール) { dy = dy.Limit(0, Bod.Is獣 ? P断面獣最大i : P断面人最大i); } - if ((!(対象.Ele is ハンド) || (対象.Ele.Xi != 6 && 対象.Ele.Xi != 7)) && !(対象.Ele is マウス) && (!Bod.Is獣 || (!(対象.Ele is パール) && !(対象.Ele is ロータ)))) + if ((!(対象.Element is ハンド) || (対象.Element.Xi != 6 && 対象.Element.Xi != 7)) && !(対象.Element is マウス) && (!Bod.Is獣 || (!(対象.Element is パール) && !(対象.Element is ロータ)))) { - if (対象.Ele is バイブ_デンマ) + if (対象.Element is バイブ_デンマ) { Bod.断面.Yv = dv.Clamp(断面単位v, 断面単位v3); } - else if (対象.Ele is ロータ || 対象.Ele is ハンド) + else if (対象.Element is ロータ || 対象.Element is ハンド) { Bod.断面.Yv = dv.Clamp(0.0, 断面単位v2); } @@ -255,34 +255,34 @@ namespace SlaveMatrix Bod.断面.Yv = dv.Clamp(0.0, 1.0); } } - if (!Bod.Is獣 && !(対象.Ele is バイブ_デンマ) && !(対象.Ele is ハンド) && !(対象.Ele is マウス) && !(対象.Ele is ロータ)) + if (!Bod.Is獣 && !(対象.Element is バイブ_デンマ) && !(対象.Element is ハンド) && !(対象.Element is マウス) && !(対象.Element is ロータ)) { Bod.断面.膣サイズY = 1.0 + 0.2 * dv.Clamp(0.0, 1.0); Bod.VaginalCumDrip.尺度YC = Bod.断面.膣サイズY; Bod.膣基.尺度YC = Bod.断面.膣サイズY; } - if (!(対象.Ele is ハンド) || (対象.Ele.Xi != 6 && 対象.Ele.Xi != 7)) + if (!(対象.Element is ハンド) || (対象.Element.Xi != 6 && 対象.Element.Xi != 7)) { Bod.性器.Yv = dv.Clamp(性器単位v, 1.0); } } else { - if (対象.Ele is バイブ_アナル) + if (対象.Element is バイブ_アナル) { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, Bod.Is獣 ? A通常獣最大v : A通常人最大v); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, Bod.Is獣 ? A通常獣最大v : A通常人最大v); } - else if (対象.Ele is パール) + else if (対象.Element is パール) { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, Bod.Is獣 ? P通常獣最大v : P通常人最大v); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, Bod.Is獣 ? P通常獣最大v : P通常人最大v); } else { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, 1.0); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, 1.0); } - if (!(対象.Ele is ハンド) || (対象.Ele.Xi != 6 && 対象.Ele.Xi != 7)) + if (!(対象.Element is ハンド) || (対象.Element.Xi != 6 && 対象.Element.Xi != 7)) { - Bod.性器.Yv = 対象.Ele.Yv.Clamp(性器単位v, 1.0); + Bod.性器.Yv = 対象.Element.Yv.Clamp(性器単位v, 1.0); } } } @@ -292,7 +292,7 @@ namespace SlaveMatrix { set { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, 1.0); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, 1.0); } } @@ -300,17 +300,17 @@ namespace SlaveMatrix { set { - if (対象.Ele is バイブ_アナル) + if (対象.Element is バイブ_アナル) { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, A通常人最大v); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, A通常人最大v); } - else if (対象.Ele is パール) + else if (対象.Element is パール) { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, P通常人最大v); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, P通常人最大v); } else { - 対象.Ele.Yv = (対象.Ele.Yv + value).Clamp(0.0, 1.0); + 対象.Element.Yv = (対象.Element.Yv + value).Clamp(0.0, 1.0); } } } @@ -321,7 +321,7 @@ namespace SlaveMatrix { if (!Is膣 || !Bod.断面_表示) { - return 対象.Ele.Yv; + return 対象.Element.Yv; } return dv; } @@ -350,43 +350,43 @@ namespace SlaveMatrix { get { - if (対象.Ele is ハンド) + if (対象.Element is ハンド) { return ToolType.Hand; } - if (対象.Ele is マウス) + if (対象.Element is マウス) { return ToolType.マウス; } - if (対象.Ele is ペニス) + if (対象.Element is ペニス) { return ToolType.Penis; } - if (対象.Ele is バイブ_ディル) + if (対象.Element is バイブ_ディル) { return ToolType.Dildo; } - if (対象.Ele is バイブ_コモン) + if (対象.Element is バイブ_コモン) { return ToolType.Vibrator; } - if (対象.Ele is バイブ_ドリル) + if (対象.Element is バイブ_ドリル) { return ToolType.Drill; } - if (対象.Ele is バイブ_デンマ) + if (対象.Element is バイブ_デンマ) { return ToolType.デンマ; } - if (対象.Ele is バイブ_アナル) + if (対象.Element is バイブ_アナル) { return ToolType.AnalVibrator; } - if (対象.Ele is ロータ) + if (対象.Element is ロータ) { return ToolType.ロータ; } - if (対象.Ele is パール) + if (対象.Element is パール) { return ToolType.パール; } @@ -607,7 +607,7 @@ namespace SlaveMatrix { 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { - 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.04), Sta.振動.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * base.強度, b: true); + 調教UI.擬音.Sound(a, 対象.Element.位置.GetAreaPoint(0.04), Sta.振動.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * base.強度, b: true); }); } } @@ -625,7 +625,7 @@ namespace SlaveMatrix if (挿入箇所 == ContactType.Vagina) { 膣挿抜 = yr * Player.膣挿入度; - 調教UI.Action(ContactType.Vagina, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Ele.Yi, 1, 機械: false, 射精: false); + 調教UI.Action(ContactType.Vagina, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Element.Yi, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); 膣継続(); @@ -633,12 +633,12 @@ namespace SlaveMatrix else if (挿入箇所 == ContactType.Anal) { 肛挿抜 = yr * Player.肛挿入度; - 調教UI.Action(ContactType.Anal, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Ele.Yi, 1, 機械: false, 射精: false); + 調教UI.Action(ContactType.Anal, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Element.Yi, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); 肛継続(); } - 対象.Ele.角度C = (100.0 * xr).Clamp(-5.0, 5.0); + 対象.Element.角度C = (100.0 * xr).Clamp(-5.0, 5.0); or = vr; } } @@ -651,22 +651,22 @@ namespace SlaveMatrix } if (Is口) { - a = 対象.Ele.角度C; - 調教UI.Set_口(対象.Ele); - 対象.Ele.角度C = a; + a = 対象.Element.角度C; + 調教UI.Set_口(対象.Element); + 対象.Element.角度C = a; } else if (Is膣) { if (Bod.断面_表示) { Bod.性器.接続PA(); - 対象.Ele.位置B = Bod.性器.Body.Current.EnumAllPar().First((ShapePart p_) => p_.Tag.Contains("膣口")).Position; - p0 = 対象.Ele.Body.pr[対象.Ele.Body[対象.Ele.Body.IndexX][0]]; - py = 対象.Ele.Body.pr[対象.Ele.Body[対象.Ele.Body.IndexX][dy]]; + 対象.Element.位置B = Bod.性器.Body.Current.EnumAllPar().First((ShapePart p_) => p_.Tag.Contains("膣口")).Position; + p0 = 対象.Element.Body.pr[対象.Element.Body[対象.Element.Body.IndexX][0]]; + py = 対象.Element.Body.pr[対象.Element.Body[対象.Element.Body.IndexX][dy]]; if (pn) { bp = py.PositionBase; - py.PositionBase = 対象.Ele.位置B; + py.PositionBase = 対象.Element.位置B; y0 = py.ToGlobal(py.OP[0].ps[psi]).Y; py.PositionBase = bp; } @@ -674,37 +674,37 @@ namespace SlaveMatrix { y0 = py.ToGlobal(py.OP[0].ps[psi]).Y; } - 対象.Ele.位置B = 対象.Ele.位置B.AddY(p0.BasePointBase.Y - py.BasePointBase.Y); + 対象.Element.位置B = 対象.Element.位置B.AddY(p0.BasePointBase.Y - py.BasePointBase.Y); if (pn) { bp = p0.PositionBase; - p0.PositionBase = 対象.Ele.位置B; - 対象.Ele.位置B = 対象.Ele.位置B.AddY(y0 - p0.ToGlobal(p0.OP[0].ps[psi]).Y); + p0.PositionBase = 対象.Element.位置B; + 対象.Element.位置B = 対象.Element.位置B.AddY(y0 - p0.ToGlobal(p0.OP[0].ps[psi]).Y); p0.PositionBase = bp; } else { - 対象.Ele.位置B = 対象.Ele.位置B.AddY(y0 - p0.ToGlobal(p0.OP[0].ps[psi]).Y); + 対象.Element.位置B = 対象.Element.位置B.AddY(y0 - p0.ToGlobal(p0.OP[0].ps[psi]).Y); } } else { - a = 対象.Ele.角度C; - 調教UI.Set_膣口(対象.Ele); - 対象.Ele.角度C = a; + a = 対象.Element.角度C; + 調教UI.Set_膣口(対象.Element); + 対象.Element.角度C = a; } } else if (Is肛) { - a = 対象.Ele.角度C; - 調教UI.Set_肛門(対象.Ele); - 対象.Ele.角度C = a; + a = 対象.Element.角度C; + 調教UI.Set_肛門(対象.Element); + 対象.Element.角度C = a; } else if (Is糸) { - a = 対象.Ele.角度C; - 調教UI.Set_出糸(対象.Ele); - 対象.Ele.角度C = a; + a = 対象.Element.角度C; + 調教UI.Set_出糸(対象.Element); + 対象.Element.角度C = a; } } @@ -719,7 +719,7 @@ namespace SlaveMatrix { Bod.性器.Xi = 1; Bod.性器.Yi = 0; - if (!(対象.Ele is ハンド) || 対象.Ele.Xi != 7) + if (!(対象.Element is ハンド) || 対象.Element.Xi != 7) { Bod.性器.くぱぁ = くぱぁ; } @@ -741,15 +741,15 @@ namespace SlaveMatrix _ = Is糸; } 挿入箇所 = ContactType.none; - 対象.Ele.角度C = 0.0; - if (対象.Ele is ペニス) + 対象.Element.角度C = 0.0; + if (対象.Element is ペニス) { - 対象.Ele.Xi = 0; + 対象.Element.Xi = 0; } - 対象.Ele.Yi = 0; + 対象.Element.Yi = 0; if (調教UI.挿入処理s != null) { - 調教UI.挿入処理s.対象.Ele.角度C = 0.0; + 調教UI.挿入処理s.対象.Element.角度C = 0.0; 調教UI.挿入処理s.Insert = 1.0; } 調教UI.放し(); @@ -866,25 +866,25 @@ namespace SlaveMatrix { if (Bod.断面_表示) { - 対象.Ele.Yi = 0; + 対象.Element.Yi = 0; Bod.性器.Xi = 3; dv = v; - dy = ((dv >= 1.0) ? (対象.Ele.Body.CountY - 1) : ((int)((double)対象.Ele.Body.CountY * dv))); - if (対象.Ele is バイブ_アナル) + dy = ((dv >= 1.0) ? (対象.Element.Body.CountY - 1) : ((int)((double)対象.Element.Body.CountY * dv))); + if (対象.Element is バイブ_アナル) { dy = dy.Limit(0, Bod.Is獣 ? A断面獣最大i : A断面人最大i); } - else if (対象.Ele is パール) + else if (対象.Element is パール) { dy = dy.Limit(0, Bod.Is獣 ? P断面獣最大i : P断面人最大i); } - if ((!(対象.Ele is ハンド) || (対象.Ele.Xi != 6 && 対象.Ele.Xi != 7)) && !(対象.Ele is マウス) && (!Bod.Is獣 || (!(対象.Ele is パール) && !(対象.Ele is ロータ)))) + if ((!(対象.Element is ハンド) || (対象.Element.Xi != 6 && 対象.Element.Xi != 7)) && !(対象.Element is マウス) && (!Bod.Is獣 || (!(対象.Element is パール) && !(対象.Element is ロータ)))) { - if (対象.Ele is バイブ_デンマ) + if (対象.Element is バイブ_デンマ) { Bod.断面.Yv = dv.Clamp(断面単位v, 断面単位v3); } - else if (対象.Ele is ロータ || 対象.Ele is ハンド) + else if (対象.Element is ロータ || 対象.Element is ハンド) { Bod.断面.Yv = dv.Clamp(0.0, 断面単位v2); } @@ -893,13 +893,13 @@ namespace SlaveMatrix Bod.断面.Yv = dv.Clamp(0.0, 1.0); } } - if (!Bod.Is獣 && !(対象.Ele is バイブ_デンマ) && !(対象.Ele is ハンド) && !(対象.Ele is マウス) && !(対象.Ele is ロータ)) + if (!Bod.Is獣 && !(対象.Element is バイブ_デンマ) && !(対象.Element is ハンド) && !(対象.Element is マウス) && !(対象.Element is ロータ)) { Bod.断面.膣サイズY = 1.0 + 0.2 * dv.Clamp(0.0, 1.0); Bod.VaginalCumDrip.尺度YC = Bod.断面.膣サイズY; Bod.膣基.尺度YC = Bod.断面.膣サイズY; } - if (!(対象.Ele is ハンド) || (対象.Ele.Xi != 6 && 対象.Ele.Xi != 7)) + if (!(対象.Element is ハンド) || (対象.Element.Xi != 6 && 対象.Element.Xi != 7)) { Bod.性器.Yv = dv.Clamp(性器単位v, 1.0); } @@ -907,28 +907,28 @@ namespace SlaveMatrix else { Bod.性器.Xi = 2; - if (対象.Ele is バイブ_アナル) + if (対象.Element is バイブ_アナル) { - 対象.Ele.Yv = v.Clamp(0.0, Bod.Is獣 ? A通常獣最大v : A通常人最大v); + 対象.Element.Yv = v.Clamp(0.0, Bod.Is獣 ? A通常獣最大v : A通常人最大v); } - else if (対象.Ele is パール) + else if (対象.Element is パール) { - 対象.Ele.Yv = v.Clamp(0.0, Bod.Is獣 ? P通常獣最大v : P通常人最大v); + 対象.Element.Yv = v.Clamp(0.0, Bod.Is獣 ? P通常獣最大v : P通常人最大v); } else { - 対象.Ele.Yv = v.Clamp(0.0, 1.0); + 対象.Element.Yv = v.Clamp(0.0, 1.0); } - if (!(対象.Ele is ハンド) || (対象.Ele.Xi != 6 && 対象.Ele.Xi != 7)) + if (!(対象.Element is ハンド) || (対象.Element.Xi != 6 && 対象.Element.Xi != 7)) { - Bod.性器.Yv = 対象.Ele.Yv.Clamp(性器単位v, 1.0); + Bod.性器.Yv = 対象.Element.Yv.Clamp(性器単位v, 1.0); } } } public void 突き上げ() { - if (対象.Ele is ペニス && Insert > oi && Insert > 0.8) + if (対象.Element is ペニス && Insert > oi && Insert > 0.8) { Cha.BodySway.Start(); } @@ -967,18 +967,18 @@ namespace SlaveMatrix System.Diagnostics.Debug.WriteLine("x y diffs: {0} {1}", x, y); if (Is挿入) { - 対象.Ele.角度C = (100.0 * x).Clamp(-5.0, 5.0); + 対象.Element.角度C = (100.0 * x).Clamp(-5.0, 5.0); if (Is口) { 挿入中1(GameText.口腔); 口挿抜 = y * Player.口挿入度; - 調教UI.Action(ContactType.Mouth, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Ele.Yi, 1, 機械: false, 射精: false); + 調教UI.Action(ContactType.Mouth, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Element.Yi, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); 口継続(); - //if (mb != MouseButtons.Left && 対象.Ele.Yi == 0 && o.Y < v.Y && !挿抜モーション.Run) - if (mb != MouseButtons.Left && 対象.Ele.Yi == 0 && o.Y > v.Y && !挿抜モーション.Run) + //if (mb != MouseButtons.Left && 対象.Element.Yi == 0 && o.Y < v.Y && !挿抜モーション.Run) + if (mb != MouseButtons.Left && 対象.Element.Yi == 0 && o.Y > v.Y && !挿抜モーション.Run) { 調教UI.Action(ContactType.Mouth, ActionType.Insertion, CurrentState.End, アイテム情報, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); @@ -987,8 +987,8 @@ namespace SlaveMatrix 解除(); //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); 待機時1(); if (調教UI.ペニス処理.フェラ.Run) @@ -1019,12 +1019,12 @@ namespace SlaveMatrix { 挿入中1(GameText.肛門); 肛挿抜 = y * Player.肛挿入度; - 調教UI.Action(ContactType.Anal, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Ele.Yi, 1, 機械: false, 射精: false); + 調教UI.Action(ContactType.Anal, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Element.Yi, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); 肛継続(); - //if (mb != MouseButtons.Left && 対象.Ele.Yi == 0 && o.Y < v.Y && !挿抜モーション.Run) - if (mb != MouseButtons.Left && 対象.Ele.Yi == 0 && o.Y > v.Y && !挿抜モーション.Run) + //if (mb != MouseButtons.Left && 対象.Element.Yi == 0 && o.Y < v.Y && !挿抜モーション.Run) + if (mb != MouseButtons.Left && 対象.Element.Yi == 0 && o.Y > v.Y && !挿抜モーション.Run) { 調教UI.Action(ContactType.Anal, ActionType.Insertion, CurrentState.End, アイテム情報, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); @@ -1033,8 +1033,8 @@ namespace SlaveMatrix 解除(); //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); 待機時1(); if (調教UI.ペニス処理.中出し) @@ -1060,8 +1060,8 @@ namespace SlaveMatrix Player.主精力消費小(); 膣継続(); - //if (mb != MouseButtons.Left && (Bod.断面_表示 ? (dy == 0) : (対象.Ele.Yi == 0)) && o.Y < v.Y && !挿抜モーション.Run) - if (mb != MouseButtons.Left && (Bod.断面_表示 ? (dy == 0) : (対象.Ele.Yi == 0)) && o.Y > v.Y && !挿抜モーション.Run) + //if (mb != MouseButtons.Left && (Bod.断面_表示 ? (dy == 0) : (対象.Element.Yi == 0)) && o.Y < v.Y && !挿抜モーション.Run) + if (mb != MouseButtons.Left && (Bod.断面_表示 ? (dy == 0) : (対象.Element.Yi == 0)) && o.Y > v.Y && !挿抜モーション.Run) { 調教UI.Action(ContactType.Vagina, ActionType.Insertion, CurrentState.End, アイテム情報, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); @@ -1070,8 +1070,8 @@ namespace SlaveMatrix 解除(); //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); 待機時1(); if (調教UI.ペニス処理.中出し) @@ -1092,12 +1092,12 @@ namespace SlaveMatrix { 挿入中1(GameText.出糸); 糸挿抜 = y * Player.糸挿入度; - 調教UI.Action(ContactType.Thread, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Ele.Yi, 1, 機械: false, 射精: false); + 調教UI.Action(ContactType.Thread, ActionType.Insertion, CurrentState.Continue, アイテム情報, 対象.Element.Yi, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); 糸継続(); - //if (mb != MouseButtons.Left && 対象.Ele.Yi == 0 && o.Y < v.Y && !挿抜モーション.Run) - if (mb != MouseButtons.Left && 対象.Ele.Yi == 0 && o.Y > v.Y && !挿抜モーション.Run) + //if (mb != MouseButtons.Left && 対象.Element.Yi == 0 && o.Y < v.Y && !挿抜モーション.Run) + if (mb != MouseButtons.Left && 対象.Element.Yi == 0 && o.Y > v.Y && !挿抜モーション.Run) { 調教UI.Action(ContactType.Thread, ActionType.Insertion, CurrentState.End, アイテム情報, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); @@ -1105,8 +1105,8 @@ namespace SlaveMatrix 糸終了(); 解除(); //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); 待機時1(); if (調教UI.ペニス処理.中出し) @@ -1136,11 +1136,11 @@ namespace SlaveMatrix } if (対象 == 調教UI.ペニスCM) { - 対象.Ele.角度C = (100.0 * x).Clamp(-4.0, 4.0); + 対象.Element.角度C = (100.0 * x).Clamp(-4.0, 4.0); } else { - 対象.Ele.角度C = (100.0 * x).Clamp(-11.0, 11.0); + 対象.Element.角度C = (100.0 * x).Clamp(-11.0, 11.0); } 調教UI.Action(cd.c, ActionType.Contact, CurrentState.Continue, アイテム情報, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); @@ -1151,7 +1151,7 @@ namespace SlaveMatrix 調教UI.Action(cd.c, ActionType.Contact, CurrentState.End, アイテム情報, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; 調教UI.放し(); } 押付時(ref cd); @@ -1159,22 +1159,22 @@ namespace SlaveMatrix } else if (Player.フェラ1 && cd.c == ContactType.Mouth && !調教UI.SubFocus.Any((挿入処理 e) => e.Is口)) { - 調教UI.Set_口(対象.Ele); + 調教UI.Set_口(対象.Element); 挿入時(GameText.口腔); } else if (cd.c == ContactType.Anal && !調教UI.SubFocus.Any((挿入処理 e) => e.Is肛)) { - 調教UI.Set_肛門(対象.Ele); + 調教UI.Set_肛門(対象.Element); 挿入時(GameText.肛門); } else if (cd.c == ContactType.Vagina && !調教UI.SubFocus.Any((挿入処理 e) => e.Is膣)) { - 調教UI.Set_膣口(対象.Ele); + 調教UI.Set_膣口(対象.Element); 挿入時(GameText.膣腔); } else if (cd.c == ContactType.Thread && !調教UI.SubFocus.Any((挿入処理 e) => e.Is糸)) { - 調教UI.Set_出糸(対象.Ele); + 調教UI.Set_出糸(対象.Element); 挿入時(GameText.出糸); } else if (押し付け) @@ -1194,10 +1194,10 @@ namespace SlaveMatrix if (調教UI.Focus == 調教UI.ペニスCM || 調教UI.Focus == 調教UI.マウスCM) { 調教UI.挿入放し(); - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; if (調教UI.挿入処理s != null) { - 調教UI.挿入処理s.対象.Ele.角度C = 0.0; + 調教UI.挿入処理s.対象.Element.角度C = 0.0; 調教UI.挿入処理s.Insert = 1.0; } 調教UI.放し(); @@ -1219,11 +1219,11 @@ namespace SlaveMatrix 調教UI.押し(ref cd); Is挿入 = true; 挿入箇所 = cd.c; - if (対象.Ele is ペニス) + if (対象.Element is ペニス) { - 対象.Ele.Xi = 1; + 対象.Element.Xi = 1; } - 対象.Ele.Yi = 0; + 対象.Element.Yi = 0; Bod.口i = 13; if (Player.フェラ2) { @@ -1242,11 +1242,11 @@ namespace SlaveMatrix 調教UI.押し(ref cd); Is挿入 = true; 挿入箇所 = cd.c; - if (対象.Ele is ペニス) + if (対象.Element is ペニス) { - 対象.Ele.Xi = 1; + 対象.Element.Xi = 1; } - 対象.Ele.Yi = 0; + 対象.Element.Yi = 0; 対象.Under = true; 調教UI.Action(ContactType.Anal, ActionType.Insertion, CurrentState.Start, アイテム情報, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); @@ -1260,11 +1260,11 @@ namespace SlaveMatrix 調教UI.押し(ref cd); Is挿入 = true; 挿入箇所 = cd.c; - if (対象.Ele is ペニス) + if (対象.Element is ペニス) { - 対象.Ele.Xi = 1; + 対象.Element.Xi = 1; } - 対象.Ele.Yi = 0; + 対象.Element.Yi = 0; 対象.Under = true; if (Bod.断面_表示) { @@ -1275,7 +1275,7 @@ namespace SlaveMatrix Bod.性器.Xi = 2; } Bod.性器.Yi = 1; - if ((!(対象.Ele is ハンド) || 対象.Ele.Xi != 7) && !(対象.Ele is マウス)) + if ((!(対象.Element is ハンド) || 対象.Element.Xi != 7) && !(対象.Element is マウス)) { くぱぁ = Bod.性器.くぱぁ; Bod.性器.くぱぁ = 1.0; @@ -1292,11 +1292,11 @@ namespace SlaveMatrix 調教UI.押し(ref cd); Is挿入 = true; 挿入箇所 = cd.c; - if (対象.Ele is ペニス) + if (対象.Element is ペニス) { - 対象.Ele.Xi = 1; + 対象.Element.Xi = 1; } - 対象.Ele.Yi = 0; + 対象.Element.Yi = 0; 調教UI.Action(ContactType.Thread, ActionType.Insertion, CurrentState.Start, アイテム情報, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); @@ -1376,16 +1376,16 @@ namespace SlaveMatrix return; } _ = Is口; - if (Is挿入 && ((!Is膣 && 対象.Ele.Yi > 0) || (Is膣 && Bod.断面_表示 && dy > 0) || (!Bod.断面_表示 && 対象.Ele.Yi > 0))) + if (Is挿入 && ((!Is膣 && 対象.Element.Yi > 0) || (Is膣 && Bod.断面_表示 && dy > 0) || (!Bod.断面_表示 && 対象.Element.Yi > 0))) { if (調教UI.Focus != 調教UI.ハンド右CM && 調教UI.Focus != 調教UI.マウスCM && 調教UI.Focus != 調教UI.ペニスCM) { 挿抜モーション.End(); 調教UI.挿入放し(); - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; if (調教UI.挿入処理s != null) { - 調教UI.挿入処理s.対象.Ele.角度C = 0.0; + 調教UI.挿入処理s.対象.Element.角度C = 0.0; 調教UI.挿入処理s.Insert = 1.0; } 調教UI.放し(); @@ -1395,8 +1395,8 @@ namespace SlaveMatrix { 解除(); //~~TODO~~ fix? - //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Ele.位置B)); - Med.CursorPosition = Med.FromBasePosition(対象.Ele.位置B); + //Cursor.Position = Med.BaseControlC.PointToScreen(Med.FromBasePosition(対象.Element.位置B)); + Med.CursorPosition = Med.FromBasePosition(対象.Element.位置B); 調教UI.通常放し(); } } @@ -1410,7 +1410,7 @@ namespace SlaveMatrix Player.奴体力消費小(); Player.主精力消費小(); 調教UI.放し(); - 対象.Ele.角度C = 0.0; + 対象.Element.角度C = 0.0; Is押付 = false; if (調教UI.IsHitCha(ref cd)) { @@ -1474,37 +1474,37 @@ namespace SlaveMatrix : base(調教UI, 対象) { 挿入処理 挿入処理2 = this; - 振動機能 = !(対象.Ele is ペニス) && !(対象.Ele is マウス) && !(対象.Ele is ハンド) && !(対象.Ele is パール); + 振動機能 = !(対象.Element is ペニス) && !(対象.Element is マウス) && !(対象.Element is ハンド) && !(対象.Element is パール); if (振動機能) { double d = 0.0005; - if (対象.Ele is ロータ) + if (対象.Element is ロータ) { d *= 1.0; } - else if (対象.Ele is バイブ_ディル) + else if (対象.Element is バイブ_ディル) { d *= 1.1; } - else if (対象.Ele is バイブ_コモン) + else if (対象.Element is バイブ_コモン) { d *= 1.2; } - else if (対象.Ele is バイブ_ドリル) + else if (対象.Element is バイブ_ドリル) { d *= 1.2; } - else if (対象.Ele is バイブ_アナル) + else if (対象.Element is バイブ_アナル) { d *= 1.1; } - else if (対象.Ele is バイブ_デンマ) + else if (対象.Element is バイブ_デンマ) { d *= 1.5; } Vector2D p = DataConsts.Vec2DZero; - bool f = !(対象.Ele is ロータ); - bool v = 対象.Ele is バイブ_ディル || 対象.Ele is バイブ_コモン || 対象.Ele is バイブ_ドリル || 対象.Ele is バイブ_アナル || 対象.Ele is バイブ_デンマ; + bool f = !(対象.Element is ロータ); + bool v = 対象.Element is バイブ_ディル || 対象.Element is バイブ_コモン || 対象.Element is バイブ_ドリル || 対象.Element is バイブ_アナル || 対象.Element is バイブ_デンマ; 振動モーション = new Motion(-1.0, 1.0) { BaseSpeed = double.MaxValue, @@ -1516,12 +1516,12 @@ namespace SlaveMatrix p.X = m.Value * d * 挿入処理2.強度; if (v) { - 対象.Ele.位置C = p.MulX(0.5); - 対象.Ele.Body.Current.EnumAllPar().First((ShapePart e) => e.Tag.Contains("ヘッド")).PositionCont = p; + 対象.Element.位置C = p.MulX(0.5); + 対象.Element.Body.Current.EnumAllPar().First((ShapePart e) => e.Tag.Contains("ヘッド")).PositionCont = p; } else { - 対象.Ele.位置C = p; + 対象.Element.位置C = p; } if (f && 挿入処理2.Is挿入) { @@ -1538,7 +1538,7 @@ namespace SlaveMatrix } if (挿入処理2.Is挿入) { - 調教UI.Action(挿入処理2.挿入箇所, ActionType.Insertion, CurrentState.Continue, 挿入処理2.アイテム情報, 対象.Ele.Yi, 挿入処理2.強さ, 機械: true, 射精: false); + 調教UI.Action(挿入処理2.挿入箇所, ActionType.Insertion, CurrentState.Continue, 挿入処理2.アイテム情報, 対象.Element.Yi, 挿入処理2.強さ, 機械: true, 射精: false); Player.奴体力消費小(); } else if (挿入処理2.Is押付 && 調教UI.押し状態) @@ -1557,7 +1557,7 @@ namespace SlaveMatrix OnEnd = delegate(Motion m) { m.ResetValue(); - foreach (ShapePart item in 対象.Ele.Body.EnumAllPar()) + foreach (ShapePart item in 対象.Element.Body.EnumAllPar()) { item.PositionCont = DataConsts.Vec2DZero; } @@ -1566,7 +1566,7 @@ namespace SlaveMatrix }; 調教UI.Mots.Add(振動モーション.GetHashCode().ToString(), 振動モーション); } - 回転機能 = 対象.Ele is バイブ_ドリル; + 回転機能 = 対象.Element is バイブ_ドリル; if (回転機能) { 回転モーション = new Motion(0.0, 1.0) @@ -1574,15 +1574,15 @@ namespace SlaveMatrix BaseSpeed = 10.0 * base.強度, OnStart = delegate { - 対象.Ele.Xv = 0.0; + 対象.Element.Xv = 0.0; }, OnUpdate = delegate(Motion m) { - 対象.Ele.Xv = m.Value; - 対象.Ele.Body.JoinPA(); + 対象.Element.Xv = m.Value; + 対象.Element.Body.JoinPA(); if (挿入処理2.Is挿入) { - 調教UI.Action(挿入処理2.挿入箇所, ActionType.Insertion, CurrentState.Continue, 挿入処理2.アイテム情報, 対象.Ele.Yi, 挿入処理2.強さ, 機械: true, 射精: false); + 調教UI.Action(挿入処理2.挿入箇所, ActionType.Insertion, CurrentState.Continue, 挿入処理2.アイテム情報, 対象.Element.Yi, 挿入処理2.強さ, 機械: true, 射精: false); Player.奴体力消費小(); } else if (挿入処理2.Is押付 && 調教UI.押し状態) @@ -1602,7 +1602,7 @@ namespace SlaveMatrix OnEnd = delegate(Motion m) { m.ResetValue(); - 対象.Ele.Xv = 0.0; + 対象.Element.Xv = 0.0; } }; 調教UI.Mots.Add(回転モーション.GetHashCode().ToString(), 回転モーション); @@ -1636,16 +1636,16 @@ namespace SlaveMatrix break; } 挿入処理2.解除(); - 対象.Ele.Intensity = 0.5; + 対象.Element.Intensity = 0.5; 対象.StaShow = true; 対象.使用状態 = UsageStatus.Standby; - 対象.Ele.右 = false; - 対象.Ele.位置B = 対象.bp; - 対象.Ele.位置C = DataConsts.Vec2DZero; - 対象.Ele.角度B = 0.0; - 対象.Ele.角度C = 0.0; - 対象.Ele.Xi = 0; - 対象.Ele.Yi = 0; + 対象.Element.右 = false; + 対象.Element.位置B = 対象.bp; + 対象.Element.位置C = DataConsts.Vec2DZero; + 対象.Element.角度B = 0.0; + 対象.Element.角度C = 0.0; + 対象.Element.Xi = 0; + 対象.Element.Yi = 0; if (挿入処理2.振動機能) { 挿入処理2.振動 = false; @@ -1655,7 +1655,7 @@ namespace SlaveMatrix 挿入処理2.回転 = false; } 挿入処理2.選択 = false; - 対象.Ele.尺度C = 1.09; + 対象.Element.尺度C = 1.09; 調教UI.SubFocus.Remove(挿入処理2); m.End(); } @@ -1672,7 +1672,7 @@ namespace SlaveMatrix } }; 調教UI.Mots.Add(抜け落ち.GetHashCode().ToString(), 抜け落ち); - 押し付け = 振動機能 || 対象.Ele is ペニス; + 押し付け = 振動機能 || 対象.Element is ペニス; A断面獣最大i = 5; A断面人最大i = A断面獣最大i - 1; double num = 1.0 / (double)調教UI.アナル.Body.CountY; @@ -1683,8 +1683,8 @@ namespace SlaveMatrix double num2 = 1.0 / (double)調教UI.パール.Body.CountY; P通常獣最大v = num2 * (double)(P断面獣最大i - 1); P通常人最大v = num2 * (double)(P断面人最大i - 1); - psi = ((対象.Ele is ロータ) ? 2 : 0); - pn = 対象.Ele is ペニス; + psi = ((対象.Element is ロータ) ? 2 : 0); + pn = 対象.Element is ペニス; MouseButtons mb_ = MouseButtons.None; Vector2D cp_ = default(Vector2D); Color hc_ = default(Color); @@ -1743,16 +1743,16 @@ namespace SlaveMatrix break; } 解除(); - 対象.Ele.Intensity = 0.5; + 対象.Element.Intensity = 0.5; 対象.StaShow = true; 対象.使用状態 = UsageStatus.Standby; - 対象.Ele.右 = false; - 対象.Ele.位置B = 対象.bp; - 対象.Ele.位置C = DataConsts.Vec2DZero; - 対象.Ele.角度B = 0.0; - 対象.Ele.角度C = 0.0; - 対象.Ele.Xi = 0; - 対象.Ele.Yi = 0; + 対象.Element.右 = false; + 対象.Element.位置B = 対象.bp; + 対象.Element.位置C = DataConsts.Vec2DZero; + 対象.Element.角度B = 0.0; + 対象.Element.角度C = 0.0; + 対象.Element.Xi = 0; + 対象.Element.Yi = 0; if (振動機能) { 振動 = false; @@ -1762,7 +1762,7 @@ namespace SlaveMatrix 回転 = false; } 選択 = false; - 対象.Ele.尺度C = 1.09; + 対象.Element.尺度C = 1.09; 調教UI.SubFocus.Remove(this); } base.Reset(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿.cs index 0f87927..789a9bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 放尿 : Ele + public class 放尿 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿D.cs index 35c69c2..074b006 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 放尿D : EleD + public class 放尿D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs index f86350c..23c487d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 放尿_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs index 0f5e5b4..5489f2f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 放尿_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面.cs index 2dd5063..7d719ec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 断面 : Ele + public class 断面 : Element { public virtual double 精液濃度 { get; set; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面D.cs index 3094606..a5e99ed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 断面D : EleD + public class 断面D : ElementData { public double 精液濃度; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs index 4884e29..121c7ec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 断面_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs index 2b6bffd..889a55a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 断面_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み.cs index abffcad..68451d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 染み : Ele + public class 染み : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs index d51d13d..fa08ae8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 染み_人D : EleD + public class 染み_人D : ElementData { public bool 潮1_表示 = true; @@ -47,7 +47,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 染み_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs index 059949b..0fecc59 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 染み_獣D : EleD + public class 染み_獣D : ElementData { public bool 潮1_表示 = true; @@ -47,7 +47,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 染み_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs index 16c2d44..dc94406 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 植 : Ele + public class 植 : Element { public ShapePart X0Y0_披針葉4_通常_葉; @@ -167,7 +167,7 @@ namespace SlaveMatrix public ColorP X0Y0_心臓葉3_欠損_葉脈CP; - public Ele[] 花_接続; + public Element[] 花_接続; public override bool 欠損 { @@ -1317,8 +1317,8 @@ namespace SlaveMatrix } if (e.花_接続.Count > 0) { - Ele f; - 花_接続 = e.花_接続.Select(delegate(EleD g) + Element f; + 花_接続 = e.花_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 植2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs index 9eb13f8..3be7458 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 植D : EleD + public class 植D : ElementData { public bool 披針葉4_通常_葉_表示 = true; @@ -109,21 +109,21 @@ namespace SlaveMatrix public bool 心臓葉3_葉脈_表示 = true; - public List 花_接続 = new List(); + public List 花_接続 = new List(); public 植D() { ThisType = GetType(); } - public void 花接続(EleD e) + public void 花接続(ElementData e) { 花_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.植_花_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 植(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs index 27649e7..b615e6f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 汗 : Ele + public class 汗 : Element { public ShapePart X0Y0_汗0; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs index 10f5d5e..51673bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 汗D : EleD + public class 汗D : ElementData { public bool 汗0_表示 = true; @@ -19,7 +19,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 汗(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎.cs index 98ad5ee..eb5705c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 涎 : Ele + public class 涎 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎D.cs index 1f2eaff..537eff5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 涎D : EleD + public class 涎D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs index e3d996a..5c8b637 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 涎_裂け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs index f7e0b29..16bacc7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 涎_通常(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs index b56ec54..a51f9ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 涙 : Ele + public class 涙 : Element { public ShapePart X0Y0_涙0流れ0; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs index 0f1acae..274a3e0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 涙D : EleD + public class 涙D : ElementData { public bool 涙0流れ0_表示; @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 涙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大.cs index 099983a..696b46a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 潮吹_大 : Ele + public class 潮吹_大 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大D.cs index ba6ced6..81e8c35 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 潮吹_大D : EleD + public class 潮吹_大D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs index cf07d17..c668c19 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 潮吹_大_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs index 1c448ff..b09e733 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 潮吹_大_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小.cs index 5d407b9..0e5f516 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 潮吹_小 : Ele + public class 潮吹_小 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小D.cs index 4ed38e2..53c78b4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 潮吹_小D : EleD + public class 潮吹_小D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs index d26bc7b..362b2df 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 潮吹_小_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs index a671220..1193db3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 潮吹_小_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs index 647c3d0..5837d90 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 獣耳 : Ele + public class 獣耳 : Element { public ShapePart X0Y0_獣耳外; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs index d807cda..8955aab 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 獣耳D : EleD + public class 獣耳D : ElementData { public bool 獣耳外_表示 = true; @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 獣耳(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs index 549ac50..7658213 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 玉口枷 : Ele + public class 玉口枷 : Element { public ShapePart X0Y0_金具左上; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs index 6e0588f..6d0a1be 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 玉口枷D : EleD + public class 玉口枷D : ElementData { public bool 金具左上_表示; @@ -59,7 +59,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 玉口枷(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs index fed0749..c886731 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 目傷 : Ele + public class 目傷 : Element { public ShapePart X0Y0_傷上; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs index 2cbeece..32c2b19 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 目傷D : EleD + public class 目傷D : ElementData { public bool 傷上_表示; @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 目傷(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs index 12c1b2d..641cc59 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 目尻影 : Ele + public class 目尻影 : Element { public ShapePart X0Y0_目尻影; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs index 93ad355..989b611 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 目尻影D : EleD + public class 目尻影D : ElementData { public bool 目尻影_表示; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 目尻影(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs index 3c8a2de..dbc4393 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 目隠帯 : Ele + public class 目隠帯 : Element { public ShapePart X0Y0_革; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs index 1f650d0..d45ae91 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 目隠帯D : EleD + public class 目隠帯D : ElementData { public bool 革_表示; @@ -55,7 +55,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 目隠帯(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs index 15a4ee9..e22dc8f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 眉 : Ele + public class 眉 : Element { public ShapePart X0Y0_眉; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs index 484e732..2d1ac94 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 眉D : EleD + public class 眉D : ElementData { public bool 眉_表示 = true; @@ -21,7 +21,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 眉(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs index 7323350..09b3d7a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs @@ -52,7 +52,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_中(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs index 9393f75..43fa66f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix public ColorP X0Y4_瞬膜CP; - public Ele[] 涙_接続; + public Element[] 涙_接続; public override bool 欠損 { @@ -264,8 +264,8 @@ namespace SlaveMatrix } if (e.涙_接続.Count > 0) { - Ele f; - 涙_接続 = e.涙_接続.Select(delegate(EleD g) + Element f; + 涙_接続 = e.涙_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 瞼_宇2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs index 512cab0..1bfaf7f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs @@ -13,14 +13,14 @@ namespace SlaveMatrix public bool 瞬膜_表示 = true; - public List 涙_接続 = new List(); + public List 涙_接続 = new List(); public 瞼_宇D() { ThisType = GetType(); } - public void 涙接続(EleD e) + public void 涙接続(ElementData e) { 涙_接続.Add(e); e.Par = this; @@ -36,7 +36,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs index be37199..9928014 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs @@ -46,7 +46,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_弱(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs index f620253..74c77c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs @@ -52,7 +52,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_強(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs index bc7a1cd..6b5ac15 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs @@ -46,7 +46,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節.cs index af538fc..7cf601b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 節 : Ele + public class 節 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節D.cs index 7b618ba..d2f347a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 節D : EleD + public class 節D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs index e326914..983e9d5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節尾_曳航(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs index cec2aa3..37fecb2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節尾_鋏(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs index 50d09dc..1bb5658 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs @@ -41,7 +41,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節足_足百(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs index 2332066..fcc3840 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節足_足蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs index 43de423..b9f8455 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節足_足蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs index a447ae4..cd475c6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 紅潮 : Ele + public class 紅潮 : Element { public ShapePart X0Y0_紅潮0; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs index e3bdbd0..b16e25f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 紅潮D : EleD + public class 紅潮D : ElementData { public bool 紅潮0_表示 = true; @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 紅潮(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs index c0d5323..a011a8b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 縦目 : Ele + public class 縦目 : Element { public ShapePart X0Y0_白目; @@ -41,7 +41,7 @@ namespace SlaveMatrix public ColorP X0Y0_黒目_ハイライト下CP; - public Ele[] 瞼_接続; + public Element[] 瞼_接続; public override bool 欠損 { @@ -281,8 +281,8 @@ namespace SlaveMatrix } if (e.瞼_接続.Count > 0) { - Ele f; - 瞼_接続 = e.瞼_接続.Select(delegate(EleD g) + Element f; + 瞼_接続 = e.瞼_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 縦目2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs index 5cf6b75..cc84700 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 縦目D : EleD + public class 縦目D : ElementData { public bool 白目_表示 = true; @@ -23,21 +23,21 @@ namespace SlaveMatrix public bool 蛸目; - public List 瞼_接続 = new List(); + public List 瞼_接続 = new List(); public 縦目D() { ThisType = GetType(); } - public void 瞼接続(EleD e) + public void 瞼接続(ElementData e) { 瞼_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.縦目_瞼_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 縦目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs index c697d62..c2488ed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 縦瞼 : Ele + public class 縦瞼 : Element { public ShapePart X0Y0_瞼左_瞼; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs index 80094c1..9edc973 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 縦瞼D : EleD + public class 縦瞼D : ElementData { public bool 瞼左_瞼_表示 = true; @@ -48,7 +48,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 縦瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs index dc058cf..3631a0c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 羽根箒 : Ele + public class 羽根箒 : Element { public ShapePart X0Y0_羽根1; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs index 44f5c89..f73e7e5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 羽根箒D : EleD + public class 羽根箒D : ElementData { public bool 羽根1_表示 = true; @@ -25,7 +25,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 羽根箒(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs index f0f34de..7b5cd96 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs @@ -70,10 +70,10 @@ namespace SlaveMatrix 調教UI.放し(); } } - if (!対象.Ele.右 && cp.X < xc) + if (!対象.Element.右 && cp.X < xc) { - 対象.Ele.右 = !対象.Ele.右; - 対象.Ele.Body.JoinPA(); + 対象.Element.右 = !対象.Element.右; + 対象.Element.Body.JoinPA(); ハンド右.X11Y0_小指.ReverseX(); ハンド右.X11Y0_薬指.ReverseX(); ハンド右.X11Y0_中指.ReverseX(); @@ -90,10 +90,10 @@ namespace SlaveMatrix ハンド右.X11Y0_呪印_鎖3.ReverseX(); ハンド右.Body.JoinPA(); } - else if (対象.Ele.右 && cp.X > xc) + else if (対象.Element.右 && cp.X > xc) { - 対象.Ele.右 = !対象.Ele.右; - 対象.Ele.Body.JoinPA(); + 対象.Element.右 = !対象.Element.右; + 対象.Element.Body.JoinPA(); ハンド右.X11Y0_小指.ReverseX(); ハンド右.X11Y0_薬指.ReverseX(); ハンド右.X11Y0_中指.ReverseX(); @@ -142,7 +142,7 @@ namespace SlaveMatrix { Is擽り = false; 擽りモーション.End(); - if (対象.Ele.右) + if (対象.Element.右) { ハンド右.X11Y0_小指.ReverseX(); ハンド右.X11Y0_薬指.ReverseX(); @@ -222,7 +222,7 @@ namespace SlaveMatrix }, OnUpdate = delegate(Motion m) { - 羽根箒.Ele.角度C = 10.0 * m.Value; + 羽根箒.Element.角度C = 10.0 * m.Value; hc = 調教UI.羽根箒先端hc; 調教UI.Action(羽箒処理2.Cha.GetContact(ref hc).c, ActionType.Tickle, CurrentState.Continue, ToolType.羽根箒, 0, 羽箒処理2.強さ, 機械: false, 射精: false); Player.奴体力消費小(); @@ -237,7 +237,7 @@ namespace SlaveMatrix OnEnd = delegate(Motion m) { m.ResetValue(); - 羽根箒.Ele.角度C = 0.0; + 羽根箒.Element.角度C = 0.0; } }; 調教UI.Mots.Add(擽りモーション.GetHashCode().ToString(), 擽りモーション); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳.cs index 4763853..21d2a31 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 耳 : Ele + public class 耳 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳D.cs index c181bb1..790a557 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 耳D : EleD + public class 耳D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs index 168c879..ba0d650 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs index b77286b..6223028 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_尖(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs index 7f33f05..7ee79f9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs index fbee7d7..07a381e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs index 6ac745d..9ebdf25 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_長(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs index 4fad035..80b46b2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_鰭(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門.cs index 3ee7e1c..93d93db 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 肛門 : Ele + public class 肛門 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門D.cs index 228da40..2738dbc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 肛門D : EleD + public class 肛門D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs index 6727dde..0f591a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix public ColorP X0Y0_肛門1CP; - public Ele[] 肛門精液_接続; + public Element[] 肛門精液_接続; public override bool 欠損 { @@ -175,8 +175,8 @@ namespace SlaveMatrix } if (e.肛門精液_接続.Count > 0) { - Ele f; - 肛門精液_接続 = e.肛門精液_接続.Select(delegate(EleD g) + Element f; + 肛門精液_接続 = e.肛門精液_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 肛門_人2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs index e883132..67fa13b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs @@ -13,21 +13,21 @@ namespace SlaveMatrix public bool 肛門1_表示 = true; - public List 肛門精液_接続 = new List(); + public List 肛門精液_接続 = new List(); public 肛門_人D() { ThisType = GetType(); } - public void 肛門精液接続(EleD e) + public void 肛門精液接続(ElementData e) { 肛門精液_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.肛門_人_肛門精液_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 肛門_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs index 8dfb168..3694b4b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix public ColorP X0Y0_肛門1CP; - public Ele[] 肛門精液_接続; + public Element[] 肛門精液_接続; public override bool 欠損 { @@ -175,8 +175,8 @@ namespace SlaveMatrix } if (e.肛門精液_接続.Count > 0) { - Ele f; - 肛門精液_接続 = e.肛門精液_接続.Select(delegate(EleD g) + Element f; + 肛門精液_接続 = e.肛門精液_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 肛門_獣2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs index 3bddd83..7000d44 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs @@ -13,21 +13,21 @@ namespace SlaveMatrix public bool 肛門1_表示 = true; - public List 肛門精液_接続 = new List(); + public List 肛門精液_接続 = new List(); public 肛門_獣D() { ThisType = GetType(); } - public void 肛門精液接続(EleD e) + public void 肛門精液接続(ElementData e) { 肛門精液_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.肛門_獣_肛門精液_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 肛門_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液.cs index 01367cc..2de07cf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 肛門精液 : Ele + public class 肛門精液 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液D.cs index 77a213c..fc51a35 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 肛門精液D : EleD + public class 肛門精液D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs index 513852b..640201f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 肛門精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs index 285c0ae..5804dff 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 肛門精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中.cs index 113c2b8..51d5227 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 背中 : Ele + public class 背中 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中D.cs index 8648fb6..3f6cc67 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 背中D : EleD + public class 背中D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs index 0dc79bf..cd7b81c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 背中_光(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs index fc27808..5b99de9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs @@ -85,7 +85,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 背中_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs index 88c3d4f..cade7c6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 背中_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs index 20c90a4..a697dbc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胴肌 : Ele + public class 胴肌 : Element { public ShapePart X0Y0_植タトゥ_タトゥ花左; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs index c0400a6..4dc3780 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胴肌D : EleD + public class 胴肌D : ElementData { public bool 植タトゥ_タトゥ花左_表示; @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胴肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs index 58aacd6..f29e452 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胴腹板 : Ele + public class 胴腹板 : Element { public ShapePart X0Y0_虫性_腹板; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs index 573f015..206ac40 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胴腹板D : EleD + public class 胴腹板D : ElementData { public bool 虫性_腹板_表示; @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胴腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs index 8bb1b2c..84deeb5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胸毛 : Ele + public class 胸毛 : Element { public ShapePart X0Y0_獣性_胸毛; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs index 6de3768..3e0b948 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胸毛D : EleD + public class 胸毛D : ElementData { public bool 獣性_胸毛_表示; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胸毛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs index 66fca05..3bcb89b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胸肌 : Ele + public class 胸肌 : Element { public ShapePart X0Y0_虫性_甲殻2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs index 1f4e7d1..d29f996 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胸肌D : EleD + public class 胸肌D : ElementData { public bool 虫性_甲殻2_表示; @@ -83,7 +83,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胸肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs index f93d230..8dbc468 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胸腹板 : Ele + public class 胸腹板 : Element { public ShapePart X0Y0_虫性_腹板; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs index 952267d..21685d9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胸腹板D : EleD + public class 胸腹板D : ElementData { public bool 虫性_腹板_表示; @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胸腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs index 3c3ceb9..2774205 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 腰肌 : Ele + public class 腰肌 : Element { public ShapePart X0Y0_淫タトゥ_ハート_タトゥ左1; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs index 18b346a..d3faa69 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 腰肌D : EleD + public class 腰肌D : ElementData { public bool 淫タトゥ_ハート_タトゥ左1_表示; @@ -53,7 +53,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腰肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿.cs index ae0ded0..7c36ddd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿.cs @@ -1,7 +1,7 @@ namespace SlaveMatrix { - public class 腿 : Ele + public class 腿 : Element { - public Ele[] Leg_接続; + public Element[] Leg_接続; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿D.cs index 556ea27..8760985 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿D.cs @@ -4,11 +4,11 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class 腿D : EleD + public class 腿D : ElementData { - public List Leg_接続 = new List(); + public List Leg_接続 = new List(); - public virtual void Leg接続(EleD e) + public virtual void Leg接続(ElementData e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs index 757903d..8987464 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs @@ -3288,8 +3288,8 @@ namespace SlaveMatrix } if (e.Leg_接続.Count > 0) { - Ele f; - Leg_接続 = e.Leg_接続.Select(delegate(EleD g) + Element f; + Leg_接続 = e.Leg_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_人2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs index 89b4356..af98261 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs @@ -155,14 +155,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void Leg接続(EleD e) + public override void Leg接続(ElementData e) { Leg_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.腿_人_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs index c2551f8..3716816 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs @@ -201,8 +201,8 @@ namespace SlaveMatrix } if (e.Leg_接続.Count > 0) { - Ele f; - Leg_接続 = e.Leg_接続.Select(delegate(EleD g) + Element f; + Leg_接続 = e.Leg_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_獣2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs index 65fc864..874632e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs @@ -19,14 +19,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void Leg接続(EleD e) + public override void Leg接続(ElementData e) { Leg_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.腿_獣_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs index 3328d5a..e7b24bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs @@ -386,8 +386,8 @@ namespace SlaveMatrix } if (e.Leg_接続.Count > 0) { - Ele f; - Leg_接続 = e.Leg_接続.Select(delegate(EleD g) + Element f; + Leg_接続 = e.Leg_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_竜2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs index e257d79..3493c1d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs @@ -35,14 +35,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void Leg接続(EleD e) + public override void Leg接続(ElementData e) { Leg_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.腿_竜_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs index 906b5d2..a7973ac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs @@ -154,8 +154,8 @@ namespace SlaveMatrix } if (e.Leg_接続.Count > 0) { - Ele f; - Leg_接続 = e.Leg_接続.Select(delegate(EleD g) + Element f; + Leg_接続 = e.Leg_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_蹄2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs index bf94272..ab4c913 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs @@ -15,14 +15,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void Leg接続(EleD e) + public override void Leg接続(ElementData e) { Leg_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.腿_蹄_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs index 0da03bf..0dbbecb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs @@ -154,8 +154,8 @@ namespace SlaveMatrix } if (e.Leg_接続.Count > 0) { - Ele f; - Leg_接続 = e.Leg_接続.Select(delegate(EleD g) + Element f; + Leg_接続 = e.Leg_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_鳥2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs index 6b3d496..302e1b8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs @@ -15,14 +15,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void Leg接続(EleD e) + public override void Leg接続(ElementData e) { Leg_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.腿_鳥_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液.cs index 2488a90..8e1b263 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 膣内精液 : Ele + public class 膣内精液 : Element { public virtual bool 精液_表示 { get; set; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液D.cs index b4fff69..e35de31 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 膣内精液D : EleD + public class 膣内精液D : ElementData { public double 精液濃度; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs index 827739b..b0f59ac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 膣内精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs index ff08d06..9df295a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 膣内精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基.cs index a93473e..f3db5b7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 膣基 : Ele + public class 膣基 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基D.cs index f1ab210..50eff86 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 膣基D : EleD + public class 膣基D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs index 0b59812..78f30cd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 膣基_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs index 0c3bf5e..29d46a0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 膣基_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌.cs index 20208de..501146b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 舌 : Ele + public class 舌 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌D.cs index abfbe8e..c955daa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 舌D : EleD + public class 舌D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs index 30649ce..61fa0cb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 舌_短(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs index a001114..fd12cdf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs @@ -47,7 +47,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 舌_長(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花.cs index 339ca0f..1c5fdca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 花 : Ele + public class 花 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花D.cs index ca9f9fc..2347d49 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 花D : EleD + public class 花D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs index 089bd47..9be2c43 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs @@ -143,7 +143,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 花_百(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs index 9420b83..76f0f57 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs @@ -89,7 +89,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 花_薔(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉.cs index 5e20b04..677e392 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 葉 : Ele + public class 葉 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉D.cs index 34fd6cd..16f166c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 葉D : EleD + public class 葉D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs index 223169c..b1dba46 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 葉_心(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs index 0fee89a..e96ccc0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 葉_披(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs index 0485adb..aacdade 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 虫鎌 : Ele + public class 虫鎌 : Element { public ShapePart X0Y0_虫鎌節; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs index e1a57de..c74d8f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 虫鎌D : EleD + public class 虫鎌D : ElementData { public bool 虫鎌節_表示 = true; @@ -45,7 +45,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 虫鎌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs index 9668fa1..c52c22a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 虫顎 : Ele + public class 虫顎 : Element { public ShapePart X0Y0_顎; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs index 582c56f..2523f65 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 虫顎D : EleD + public class 虫顎D : ElementData { public bool 顎_表示 = true; @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 虫顎(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs index d94a2ab..02f60d7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 衝撃 : Ele + public class 衝撃 : Element { public ShapePart X0Y0_衝撃; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs index 8f911ce..6239914 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 衝撃D : EleD + public class 衝撃D : ElementData { public bool 衝撃_表示 = true; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 衝撃(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1.cs index d5fb2a5..65176ca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 角1 : Ele + public class 角1 : Element { public virtual double 展開 { get; set; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1D.cs index 4be7651..6213d25 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 角1D : EleD + public class 角1D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs index a3e11de..a8d9c80 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角1_一(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs index fc15e35..281df1e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs @@ -29,7 +29,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角1_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs index acef8f2..2de3de5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角1_鬼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs index 8c1ba3f..d0e8d80 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 角2 : Ele + public class 角2 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2D.cs index ad87f76..6b145a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 角2D : EleD + public class 角2D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs index bf8aa83..6ec9951 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs @@ -29,7 +29,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_山1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs index f324253..1fc9a60 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_山2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs index b76c5c5..48e1500 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_山3(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs index 4afa4f0..88a378f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs @@ -41,7 +41,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_巻(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs index 6e2dc01..6e5a1ea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs @@ -31,7 +31,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_牛1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs index 09263d7..85d3036 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_牛2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs index a01397f..1b5e1d7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_牛3(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs index da6358c..cb75822 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_牛4(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs index 015b42e..f5597db 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs index aa0c53d..b3b2b6b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs @@ -29,7 +29,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_鬼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手.cs index 754b980..a0553d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 触手 : Ele + public class 触手 : Element { public virtual IEnumerable Enum軸() { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手D.cs index ce3ed2c..27c80b9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 触手D : EleD + public class 触手D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs index 303af30..be56252 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs @@ -1680,19 +1680,19 @@ namespace SlaveMatrix public 拘束鎖 鎖5; - public Ele[] Head_接続; + public Element[] Head_接続; - public Ele[] UpperArm左_接続; + public Element[] UpperArm左_接続; - public Ele[] UpperArm右_接続; + public Element[] UpperArm右_接続; - public Ele[] LowerArm左_接続; + public Element[] LowerArm左_接続; - public Ele[] LowerArm右_接続; + public Element[] LowerArm右_接続; - public Ele[] 手左_接続; + public Element[] 手左_接続; - public Ele[] 手右_接続; + public Element[] 手右_接続; public override bool 欠損 { @@ -6745,10 +6745,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.Head_接続.Count > 0) { - Head_接続 = e.Head_接続.Select(delegate(EleD g) + Head_接続 = e.Head_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_犬2; @@ -6759,7 +6759,7 @@ namespace SlaveMatrix } if (e.UpperArm左_接続.Count > 0) { - UpperArm左_接続 = e.UpperArm左_接続.Select(delegate(EleD g) + UpperArm左_接続 = e.UpperArm左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_犬2; @@ -6770,7 +6770,7 @@ namespace SlaveMatrix } if (e.UpperArm右_接続.Count > 0) { - UpperArm右_接続 = e.UpperArm右_接続.Select(delegate(EleD g) + UpperArm右_接続 = e.UpperArm右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_犬2; @@ -6781,7 +6781,7 @@ namespace SlaveMatrix } if (e.LowerArm左_接続.Count > 0) { - LowerArm左_接続 = e.LowerArm左_接続.Select(delegate(EleD g) + LowerArm左_接続 = e.LowerArm左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_犬2; @@ -6792,7 +6792,7 @@ namespace SlaveMatrix } if (e.LowerArm右_接続.Count > 0) { - LowerArm右_接続 = e.LowerArm右_接続.Select(delegate(EleD g) + LowerArm右_接続 = e.LowerArm右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_犬2; @@ -6803,7 +6803,7 @@ namespace SlaveMatrix } if (e.手左_接続.Count > 0) { - 手左_接続 = e.手左_接続.Select(delegate(EleD g) + 手左_接続 = e.手左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_犬2; @@ -6814,7 +6814,7 @@ namespace SlaveMatrix } if (e.手右_接続.Count > 0) { - 手右_接続 = e.手右_接続.Select(delegate(EleD g) + 手右_接続 = e.手右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_犬2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs index 812c821..d9e685b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs @@ -575,75 +575,75 @@ namespace SlaveMatrix public bool 鎖表示; - public List Head_接続 = new List(); + public List Head_接続 = new List(); - public List UpperArm左_接続 = new List(); + public List UpperArm左_接続 = new List(); - public List UpperArm右_接続 = new List(); + public List UpperArm右_接続 = new List(); - public List LowerArm左_接続 = new List(); + public List LowerArm左_接続 = new List(); - public List LowerArm右_接続 = new List(); + public List LowerArm右_接続 = new List(); - public List 手左_接続 = new List(); + public List 手左_接続 = new List(); - public List 手右_接続 = new List(); + public List 手右_接続 = new List(); public 触手_犬D() { ThisType = GetType(); } - public void 頭接続(EleD e) + public void 頭接続(ElementData e) { Head_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_犬_Head_接続; } - public void UpperArm左接続(EleD e) + public void UpperArm左接続(ElementData e) { UpperArm左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_犬_UpperArm左_接続; } - public void UpperArm右接続(EleD e) + public void UpperArm右接続(ElementData e) { UpperArm右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_犬_UpperArm右_接続; } - public void LowerArm左接続(EleD e) + public void LowerArm左接続(ElementData e) { LowerArm左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_犬_LowerArm左_接続; } - public void LowerArm右接続(EleD e) + public void LowerArm右接続(ElementData e) { LowerArm右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_犬_LowerArm右_接続; } - public void 手左接続(EleD e) + public void 手左接続(ElementData e) { 手左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_犬_手左_接続; } - public void 手右接続(EleD e) + public void 手右接続(ElementData e) { 手右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_犬_手右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触手_犬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs index dcccb7e..c0a1195 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs @@ -866,55 +866,55 @@ namespace SlaveMatrix public 拘束鎖 鎖4; - public Ele[] 節1_接続; + public Element[] 節1_接続; - public Ele[] 節2_接続; + public Element[] 節2_接続; - public Ele[] 節3_接続; + public Element[] 節3_接続; - public Ele[] 節4_接続; + public Element[] 節4_接続; - public Ele[] 節5_接続; + public Element[] 節5_接続; - public Ele[] 節6_接続; + public Element[] 節6_接続; - public Ele[] 節7_接続; + public Element[] 節7_接続; - public Ele[] 節8_接続; + public Element[] 節8_接続; - public Ele[] 節9_接続; + public Element[] 節9_接続; - public Ele[] 節10_接続; + public Element[] 節10_接続; - public Ele[] 節11_接続; + public Element[] 節11_接続; - public Ele[] 節12_接続; + public Element[] 節12_接続; - public Ele[] 節13_接続; + public Element[] 節13_接続; - public Ele[] 節14_接続; + public Element[] 節14_接続; - public Ele[] 節15_接続; + public Element[] 節15_接続; - public Ele[] 節16_接続; + public Element[] 節16_接続; - public Ele[] 節17_接続; + public Element[] 節17_接続; - public Ele[] 節18_接続; + public Element[] 節18_接続; - public Ele[] 節19_接続; + public Element[] 節19_接続; - public Ele[] 節20_接続; + public Element[] 節20_接続; - public Ele[] 節21_接続; + public Element[] 節21_接続; - public Ele[] 節22_接続; + public Element[] 節22_接続; - public Ele[] 節23_接続; + public Element[] 節23_接続; - public Ele[] 節24_接続; + public Element[] 節24_接続; - public Ele[] 先端_接続; + public Element[] 先端_接続; public ShapePart[] Pars; @@ -3640,10 +3640,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.節1_接続.Count > 0) { - 節1_接続 = e.節1_接続.Select(delegate(EleD g) + 節1_接続 = e.節1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3654,7 +3654,7 @@ namespace SlaveMatrix } if (e.節2_接続.Count > 0) { - 節2_接続 = e.節2_接続.Select(delegate(EleD g) + 節2_接続 = e.節2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3665,7 +3665,7 @@ namespace SlaveMatrix } if (e.節3_接続.Count > 0) { - 節3_接続 = e.節3_接続.Select(delegate(EleD g) + 節3_接続 = e.節3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3676,7 +3676,7 @@ namespace SlaveMatrix } if (e.節4_接続.Count > 0) { - 節4_接続 = e.節4_接続.Select(delegate(EleD g) + 節4_接続 = e.節4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3687,7 +3687,7 @@ namespace SlaveMatrix } if (e.節5_接続.Count > 0) { - 節5_接続 = e.節5_接続.Select(delegate(EleD g) + 節5_接続 = e.節5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3698,7 +3698,7 @@ namespace SlaveMatrix } if (e.節6_接続.Count > 0) { - 節6_接続 = e.節6_接続.Select(delegate(EleD g) + 節6_接続 = e.節6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3709,7 +3709,7 @@ namespace SlaveMatrix } if (e.節7_接続.Count > 0) { - 節7_接続 = e.節7_接続.Select(delegate(EleD g) + 節7_接続 = e.節7_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3720,7 +3720,7 @@ namespace SlaveMatrix } if (e.節8_接続.Count > 0) { - 節8_接続 = e.節8_接続.Select(delegate(EleD g) + 節8_接続 = e.節8_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3731,7 +3731,7 @@ namespace SlaveMatrix } if (e.節9_接続.Count > 0) { - 節9_接続 = e.節9_接続.Select(delegate(EleD g) + 節9_接続 = e.節9_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3742,7 +3742,7 @@ namespace SlaveMatrix } if (e.節10_接続.Count > 0) { - 節10_接続 = e.節10_接続.Select(delegate(EleD g) + 節10_接続 = e.節10_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3753,7 +3753,7 @@ namespace SlaveMatrix } if (e.節11_接続.Count > 0) { - 節11_接続 = e.節11_接続.Select(delegate(EleD g) + 節11_接続 = e.節11_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3764,7 +3764,7 @@ namespace SlaveMatrix } if (e.節12_接続.Count > 0) { - 節12_接続 = e.節12_接続.Select(delegate(EleD g) + 節12_接続 = e.節12_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3775,7 +3775,7 @@ namespace SlaveMatrix } if (e.節13_接続.Count > 0) { - 節13_接続 = e.節13_接続.Select(delegate(EleD g) + 節13_接続 = e.節13_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3786,7 +3786,7 @@ namespace SlaveMatrix } if (e.節14_接続.Count > 0) { - 節14_接続 = e.節14_接続.Select(delegate(EleD g) + 節14_接続 = e.節14_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3797,7 +3797,7 @@ namespace SlaveMatrix } if (e.節15_接続.Count > 0) { - 節15_接続 = e.節15_接続.Select(delegate(EleD g) + 節15_接続 = e.節15_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3808,7 +3808,7 @@ namespace SlaveMatrix } if (e.節16_接続.Count > 0) { - 節16_接続 = e.節16_接続.Select(delegate(EleD g) + 節16_接続 = e.節16_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3819,7 +3819,7 @@ namespace SlaveMatrix } if (e.節17_接続.Count > 0) { - 節17_接続 = e.節17_接続.Select(delegate(EleD g) + 節17_接続 = e.節17_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3830,7 +3830,7 @@ namespace SlaveMatrix } if (e.節18_接続.Count > 0) { - 節18_接続 = e.節18_接続.Select(delegate(EleD g) + 節18_接続 = e.節18_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3841,7 +3841,7 @@ namespace SlaveMatrix } if (e.節19_接続.Count > 0) { - 節19_接続 = e.節19_接続.Select(delegate(EleD g) + 節19_接続 = e.節19_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3852,7 +3852,7 @@ namespace SlaveMatrix } if (e.節20_接続.Count > 0) { - 節20_接続 = e.節20_接続.Select(delegate(EleD g) + 節20_接続 = e.節20_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3863,7 +3863,7 @@ namespace SlaveMatrix } if (e.節21_接続.Count > 0) { - 節21_接続 = e.節21_接続.Select(delegate(EleD g) + 節21_接続 = e.節21_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3874,7 +3874,7 @@ namespace SlaveMatrix } if (e.節22_接続.Count > 0) { - 節22_接続 = e.節22_接続.Select(delegate(EleD g) + 節22_接続 = e.節22_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3885,7 +3885,7 @@ namespace SlaveMatrix } if (e.節23_接続.Count > 0) { - 節23_接続 = e.節23_接続.Select(delegate(EleD g) + 節23_接続 = e.節23_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3896,7 +3896,7 @@ namespace SlaveMatrix } if (e.節24_接続.Count > 0) { - 節24_接続 = e.節24_接続.Select(delegate(EleD g) + 節24_接続 = e.節24_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; @@ -3907,7 +3907,7 @@ namespace SlaveMatrix } if (e.先端_接続.Count > 0) { - 先端_接続 = e.先端_接続.Select(delegate(EleD g) + 先端_接続 = e.先端_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_蔦2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs index 1b338a6..0f627ff 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs @@ -301,237 +301,237 @@ namespace SlaveMatrix public bool 鎖表示; - public List 節1_接続 = new List(); + public List 節1_接続 = new List(); - public List 節2_接続 = new List(); + public List 節2_接続 = new List(); - public List 節3_接続 = new List(); + public List 節3_接続 = new List(); - public List 節4_接続 = new List(); + public List 節4_接続 = new List(); - public List 節5_接続 = new List(); + public List 節5_接続 = new List(); - public List 節6_接続 = new List(); + public List 節6_接続 = new List(); - public List 節7_接続 = new List(); + public List 節7_接続 = new List(); - public List 節8_接続 = new List(); + public List 節8_接続 = new List(); - public List 節9_接続 = new List(); + public List 節9_接続 = new List(); - public List 節10_接続 = new List(); + public List 節10_接続 = new List(); - public List 節11_接続 = new List(); + public List 節11_接続 = new List(); - public List 節12_接続 = new List(); + public List 節12_接続 = new List(); - public List 節13_接続 = new List(); + public List 節13_接続 = new List(); - public List 節14_接続 = new List(); + public List 節14_接続 = new List(); - public List 節15_接続 = new List(); + public List 節15_接続 = new List(); - public List 節16_接続 = new List(); + public List 節16_接続 = new List(); - public List 節17_接続 = new List(); + public List 節17_接続 = new List(); - public List 節18_接続 = new List(); + public List 節18_接続 = new List(); - public List 節19_接続 = new List(); + public List 節19_接続 = new List(); - public List 節20_接続 = new List(); + public List 節20_接続 = new List(); - public List 節21_接続 = new List(); + public List 節21_接続 = new List(); - public List 節22_接続 = new List(); + public List 節22_接続 = new List(); - public List 節23_接続 = new List(); + public List 節23_接続 = new List(); - public List 節24_接続 = new List(); + public List 節24_接続 = new List(); - public List 先端_接続 = new List(); + public List 先端_接続 = new List(); public 触手_蔦D() { ThisType = GetType(); } - public void 節1接続(EleD e) + public void 節1接続(ElementData e) { 節1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節1_接続; } - public void 節2接続(EleD e) + public void 節2接続(ElementData e) { 節2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節2_接続; } - public void 節3接続(EleD e) + public void 節3接続(ElementData e) { 節3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節3_接続; } - public void 節4接続(EleD e) + public void 節4接続(ElementData e) { 節4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節4_接続; } - public void 節5接続(EleD e) + public void 節5接続(ElementData e) { 節5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節5_接続; } - public void 節6接続(EleD e) + public void 節6接続(ElementData e) { 節6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節6_接続; } - public void 節7接続(EleD e) + public void 節7接続(ElementData e) { 節7_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節7_接続; } - public void 節8接続(EleD e) + public void 節8接続(ElementData e) { 節8_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節8_接続; } - public void 節9接続(EleD e) + public void 節9接続(ElementData e) { 節9_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節9_接続; } - public void 節10接続(EleD e) + public void 節10接続(ElementData e) { 節10_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節10_接続; } - public void 節11接続(EleD e) + public void 節11接続(ElementData e) { 節11_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節11_接続; } - public void 節12接続(EleD e) + public void 節12接続(ElementData e) { 節12_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節12_接続; } - public void 節13接続(EleD e) + public void 節13接続(ElementData e) { 節13_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節13_接続; } - public void 節14接続(EleD e) + public void 節14接続(ElementData e) { 節14_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節14_接続; } - public void 節15接続(EleD e) + public void 節15接続(ElementData e) { 節15_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節15_接続; } - public void 節16接続(EleD e) + public void 節16接続(ElementData e) { 節16_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節16_接続; } - public void 節17接続(EleD e) + public void 節17接続(ElementData e) { 節17_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節17_接続; } - public void 節18接続(EleD e) + public void 節18接続(ElementData e) { 節18_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節18_接続; } - public void 節19接続(EleD e) + public void 節19接続(ElementData e) { 節19_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節19_接続; } - public void 節20接続(EleD e) + public void 節20接続(ElementData e) { 節20_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節20_接続; } - public void 節21接続(EleD e) + public void 節21接続(ElementData e) { 節21_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節21_接続; } - public void 節22接続(EleD e) + public void 節22接続(ElementData e) { 節22_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節22_接続; } - public void 節23接続(EleD e) + public void 節23接続(ElementData e) { 節23_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節23_接続; } - public void 節24接続(EleD e) + public void 節24接続(ElementData e) { 節24_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_節24_接続; } - public void 先端接続(EleD e) + public void 先端接続(ElementData e) { 先端_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.触手_蔦_先端_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触手_蔦(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs index 3b52858..ca69b13 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs @@ -363,7 +363,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触手_触(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs index b76979f..42b4f47 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs @@ -701,7 +701,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触手_軟(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs index 9be6406..e5c0773 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触肢_肢蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs index af24e20..53d3e4b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触肢_肢蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚.cs index a2b0e25..952b396 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 触覚 : Ele + public class 触覚 : Element { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚D.cs index eacaa3c..c0952cb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 触覚D : EleD + public class 触覚D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs index 9f00af1..cf27481 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs index 321d29f..9f29c02 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs @@ -63,7 +63,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_節(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs index b039b1f..0f87f4e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs @@ -131,7 +131,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_線(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs index a011095..717640f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs @@ -313,7 +313,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_蛾(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs index d761ded..e8b5ef8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs @@ -81,7 +81,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs index 42e4d8d..f7b2491 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs index 714a9d5..039707c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 調教鞭 : Ele + public class 調教鞭 : Element { public ShapePart X0Y0_先; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs index d5b58da..43a91d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 調教鞭D : EleD + public class 調教鞭D : ElementData { public bool 先_表示 = true; @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 調教鞭(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs index bb9dcb2..499b0ab 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs @@ -26,7 +26,7 @@ namespace SlaveMatrix { 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { - 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.05), Sta.鞭振.GetVal(強さ_, 1.0), new Font("MS Gothic", 1f), Col.White, 0.2 + 0.2 * 強さ_, b: true); + 調教UI.擬音.Sound(a, 対象.Element.位置.GetAreaPoint(0.05), Sta.鞭振.GetVal(強さ_, 1.0), new Font("MS Gothic", 1f), Col.White, 0.2 + 0.2 * 強さ_, b: true); }); } @@ -54,10 +54,10 @@ namespace SlaveMatrix v = cp; x = (o.X - v.X).Sign(); o = v; - 対象.Ele.角度C = 0.0; - 対象.Ele.Xi = 0; - 対象.Ele.Yi = (対象.Ele.Yi + x).Limit(0, 対象.Ele.Body.CountY); - 対象.Ele.Body.JoinPA(); + 対象.Element.角度C = 0.0; + 対象.Element.Xi = 0; + 対象.Element.Yi = (対象.Element.Yi + x).Limit(0, 対象.Element.Body.CountY); + 対象.Element.Body.JoinPA(); 移動時(); } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足.cs index 1ea4302..5127f95 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 足 : Ele + public class 足 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足D.cs index 24f04c7..017596f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 足D : EleD + public class 足D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs index 5206f86..0e952ca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs @@ -249,7 +249,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs index 76dcf1a..ea4e2c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs @@ -45,7 +45,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs index 990f675..beb0934 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs @@ -61,7 +61,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs index be66885..2f1477d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs @@ -127,7 +127,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs index b98e57f..45bf4b1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs index b8bd432..4273293 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs @@ -183,7 +183,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs index c4ed740..e6e551e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 鎖 : Ele + public class 鎖 : Element { public ShapePart X0Y0_鎖2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs index b0aa472..801cb2d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 鎖D : EleD + public class 鎖D : ElementData { public bool 鎖2_表示 = true; @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鎖(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index b060199..60154c7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -65,11 +65,11 @@ namespace SlaveMatrix private bool ガード_; - public Ele[] 左_接続; + public Element[] 左_接続; - public Ele[] 右_接続; + public Element[] 右_接続; - public Ele[] Torso_接続; + public Element[] Torso_接続; public override bool 欠損 { @@ -366,10 +366,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左_接続.Count > 0) { - 左_接続 = e.左_接続.Select(delegate(EleD g) + 左_接続 = e.左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蛇2; @@ -380,7 +380,7 @@ namespace SlaveMatrix } if (e.右_接続.Count > 0) { - 右_接続 = e.右_接続.Select(delegate(EleD g) + 右_接続 = e.右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蛇2; @@ -391,7 +391,7 @@ namespace SlaveMatrix } if (e.Torso_接続.Count > 0) { - Torso_接続 = e.Torso_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蛇2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs index 7cd07f3..e4e2ad1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs @@ -29,39 +29,39 @@ namespace SlaveMatrix public bool ガード = true; - public List 左_接続 = new List(); + public List 左_接続 = new List(); - public List 右_接続 = new List(); + public List 右_接続 = new List(); - public List Torso_接続 = new List(); + public List Torso_接続 = new List(); public 長物_蛇D() { ThisType = GetType(); } - public void 左接続(EleD e) + public void 左接続(ElementData e) { 左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蛇_左_接続; } - public void 右接続(EleD e) + public void 右接続(ElementData e) { 右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蛇_右_接続; } - public void 胴接続(EleD e) + public void 胴接続(ElementData e) { Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蛇_Torso_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 長物_蛇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index a1bb80c..841d4f9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -105,15 +105,15 @@ namespace SlaveMatrix public 拘束鎖 鎖2; - public Ele[] 左0_接続; + public Element[] 左0_接続; - public Ele[] 右0_接続; + public Element[] 右0_接続; - public Ele[] 左1_接続; + public Element[] 左1_接続; - public Ele[] 右1_接続; + public Element[] 右1_接続; - public Ele[] Torso_接続; + public Element[] Torso_接続; public override bool 欠損 { @@ -599,10 +599,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左0_接続.Count > 0) { - 左0_接続 = e.左0_接続.Select(delegate(EleD g) + 左0_接続 = e.左0_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蟲2; @@ -613,7 +613,7 @@ namespace SlaveMatrix } if (e.右0_接続.Count > 0) { - 右0_接続 = e.右0_接続.Select(delegate(EleD g) + 右0_接続 = e.右0_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蟲2; @@ -624,7 +624,7 @@ namespace SlaveMatrix } if (e.左1_接続.Count > 0) { - 左1_接続 = e.左1_接続.Select(delegate(EleD g) + 左1_接続 = e.左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蟲2; @@ -635,7 +635,7 @@ namespace SlaveMatrix } if (e.右1_接続.Count > 0) { - 右1_接続 = e.右1_接続.Select(delegate(EleD g) + 右1_接続 = e.右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蟲2; @@ -646,7 +646,7 @@ namespace SlaveMatrix } if (e.Torso_接続.Count > 0) { - Torso_接続 = e.Torso_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蟲2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs index 48a56e0..7c9be48 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs @@ -51,57 +51,57 @@ namespace SlaveMatrix public bool 鎖表示; - public List 左0_接続 = new List(); + public List 左0_接続 = new List(); - public List 右0_接続 = new List(); + public List 右0_接続 = new List(); - public List 左1_接続 = new List(); + public List 左1_接続 = new List(); - public List 右1_接続 = new List(); + public List 右1_接続 = new List(); - public List Torso_接続 = new List(); + public List Torso_接続 = new List(); public 長物_蟲D() { ThisType = GetType(); } - public void 左0接続(EleD e) + public void 左0接続(ElementData e) { 左0_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蟲_左0_接続; } - public void 右0接続(EleD e) + public void 右0接続(ElementData e) { 右0_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蟲_右0_接続; } - public void 左1接続(EleD e) + public void 左1接続(ElementData e) { 左1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蟲_左1_接続; } - public void 右1接続(EleD e) + public void 右1接続(ElementData e) { 右1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蟲_右1_接続; } - public void 胴接続(EleD e) + public void 胴接続(ElementData e) { Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蟲_Torso_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 長物_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs index 53caa4c..b5d21a3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs @@ -466,35 +466,35 @@ namespace SlaveMatrix public bool Rパターン; - public Ele[] 左0_接続; + public Element[] 左0_接続; - public Ele[] 右0_接続; + public Element[] 右0_接続; - public Ele[] 左1_接続; + public Element[] 左1_接続; - public Ele[] 右1_接続; + public Element[] 右1_接続; - public Ele[] 左2_接続; + public Element[] 左2_接続; - public Ele[] 右2_接続; + public Element[] 右2_接続; - public Ele[] 左3_接続; + public Element[] 左3_接続; - public Ele[] 右3_接続; + public Element[] 右3_接続; - public Ele[] 左4_接続; + public Element[] 左4_接続; - public Ele[] 右4_接続; + public Element[] 右4_接続; - public Ele[] 左5_接続; + public Element[] 左5_接続; - public Ele[] 右5_接続; + public Element[] 右5_接続; - public Ele[] 左6_接続; + public Element[] 左6_接続; - public Ele[] 右6_接続; + public Element[] 右6_接続; - public Ele[] 尾_接続; + public Element[] 尾_接続; public override bool 欠損 { @@ -2114,10 +2114,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左0_接続.Count > 0) { - 左0_接続 = e.左0_接続.Select(delegate(EleD g) + 左0_接続 = e.左0_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2128,7 +2128,7 @@ namespace SlaveMatrix } if (e.右0_接続.Count > 0) { - 右0_接続 = e.右0_接続.Select(delegate(EleD g) + 右0_接続 = e.右0_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2139,7 +2139,7 @@ namespace SlaveMatrix } if (e.左1_接続.Count > 0) { - 左1_接続 = e.左1_接続.Select(delegate(EleD g) + 左1_接続 = e.左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2150,7 +2150,7 @@ namespace SlaveMatrix } if (e.右1_接続.Count > 0) { - 右1_接続 = e.右1_接続.Select(delegate(EleD g) + 右1_接続 = e.右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2161,7 +2161,7 @@ namespace SlaveMatrix } if (e.左2_接続.Count > 0) { - 左2_接続 = e.左2_接続.Select(delegate(EleD g) + 左2_接続 = e.左2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2172,7 +2172,7 @@ namespace SlaveMatrix } if (e.右2_接続.Count > 0) { - 右2_接続 = e.右2_接続.Select(delegate(EleD g) + 右2_接続 = e.右2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2183,7 +2183,7 @@ namespace SlaveMatrix } if (e.左3_接続.Count > 0) { - 左3_接続 = e.左3_接続.Select(delegate(EleD g) + 左3_接続 = e.左3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2194,7 +2194,7 @@ namespace SlaveMatrix } if (e.右3_接続.Count > 0) { - 右3_接続 = e.右3_接続.Select(delegate(EleD g) + 右3_接続 = e.右3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2205,7 +2205,7 @@ namespace SlaveMatrix } if (e.左4_接続.Count > 0) { - 左4_接続 = e.左4_接続.Select(delegate(EleD g) + 左4_接続 = e.左4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2216,7 +2216,7 @@ namespace SlaveMatrix } if (e.右4_接続.Count > 0) { - 右4_接続 = e.右4_接続.Select(delegate(EleD g) + 右4_接続 = e.右4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2227,7 +2227,7 @@ namespace SlaveMatrix } if (e.左5_接続.Count > 0) { - 左5_接続 = e.左5_接続.Select(delegate(EleD g) + 左5_接続 = e.左5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2238,7 +2238,7 @@ namespace SlaveMatrix } if (e.右5_接続.Count > 0) { - 右5_接続 = e.右5_接続.Select(delegate(EleD g) + 右5_接続 = e.右5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2249,7 +2249,7 @@ namespace SlaveMatrix } if (e.左6_接続.Count > 0) { - 左6_接続 = e.左6_接続.Select(delegate(EleD g) + 左6_接続 = e.左6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2260,7 +2260,7 @@ namespace SlaveMatrix } if (e.右6_接続.Count > 0) { - 右6_接続 = e.右6_接続.Select(delegate(EleD g) + 右6_接続 = e.右6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; @@ -2271,7 +2271,7 @@ namespace SlaveMatrix } if (e.尾_接続.Count > 0) { - 尾_接続 = e.尾_接続.Select(delegate(EleD g) + 尾_接続 = e.尾_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_魚2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs index 21f2ac7..608d05c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs @@ -175,147 +175,147 @@ namespace SlaveMatrix public bool 鎖表示; - public List 左0_接続 = new List(); + public List 左0_接続 = new List(); - public List 右0_接続 = new List(); + public List 右0_接続 = new List(); - public List 左1_接続 = new List(); + public List 左1_接続 = new List(); - public List 右1_接続 = new List(); + public List 右1_接続 = new List(); - public List 左2_接続 = new List(); + public List 左2_接続 = new List(); - public List 右2_接続 = new List(); + public List 右2_接続 = new List(); - public List 左3_接続 = new List(); + public List 左3_接続 = new List(); - public List 右3_接続 = new List(); + public List 右3_接続 = new List(); - public List 左4_接続 = new List(); + public List 左4_接続 = new List(); - public List 右4_接続 = new List(); + public List 右4_接続 = new List(); - public List 左5_接続 = new List(); + public List 左5_接続 = new List(); - public List 右5_接続 = new List(); + public List 右5_接続 = new List(); - public List 左6_接続 = new List(); + public List 左6_接続 = new List(); - public List 右6_接続 = new List(); + public List 右6_接続 = new List(); - public List 尾_接続 = new List(); + public List 尾_接続 = new List(); public 長物_魚D() { ThisType = GetType(); } - public void 左0接続(EleD e) + public void 左0接続(ElementData e) { 左0_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_左0_接続; } - public void 右0接続(EleD e) + public void 右0接続(ElementData e) { 右0_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_右0_接続; } - public void 左1接続(EleD e) + public void 左1接続(ElementData e) { 左1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_左1_接続; } - public void 右1接続(EleD e) + public void 右1接続(ElementData e) { 右1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_右1_接続; } - public void 左2接続(EleD e) + public void 左2接続(ElementData e) { 左2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_左2_接続; } - public void 右2接続(EleD e) + public void 右2接続(ElementData e) { 右2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_右2_接続; } - public void 左3接続(EleD e) + public void 左3接続(ElementData e) { 左3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_左3_接続; } - public void 右3接続(EleD e) + public void 右3接続(ElementData e) { 右3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_右3_接続; } - public void 左4接続(EleD e) + public void 左4接続(ElementData e) { 左4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_左4_接続; } - public void 右4接続(EleD e) + public void 右4接続(ElementData e) { 右4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_右4_接続; } - public void 左5接続(EleD e) + public void 左5接続(ElementData e) { 左5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_左5_接続; } - public void 右5接続(EleD e) + public void 右5接続(ElementData e) { 右5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_右5_接続; } - public void 左6接続(EleD e) + public void 左6接続(ElementData e) { 左6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_左6_接続; } - public void 右6接続(EleD e) + public void 右6接続(ElementData e) { 右6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_右6_接続; } - public void 尾接続(EleD e) + public void 尾接続(ElementData e) { 尾_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_魚_尾_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 長物_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs index 2811371..f625234 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs @@ -194,35 +194,35 @@ namespace SlaveMatrix public 拘束鎖 鎖4; - public Ele[] 左0_接続; + public Element[] 左0_接続; - public Ele[] 右0_接続; + public Element[] 右0_接続; - public Ele[] 左1_接続; + public Element[] 左1_接続; - public Ele[] 右1_接続; + public Element[] 右1_接続; - public Ele[] 左2_接続; + public Element[] 左2_接続; - public Ele[] 右2_接続; + public Element[] 右2_接続; - public Ele[] 左3_接続; + public Element[] 左3_接続; - public Ele[] 右3_接続; + public Element[] 右3_接続; - public Ele[] 左4_接続; + public Element[] 左4_接続; - public Ele[] 右4_接続; + public Element[] 右4_接続; - public Ele[] 左5_接続; + public Element[] 左5_接続; - public Ele[] 右5_接続; + public Element[] 右5_接続; - public Ele[] 左6_接続; + public Element[] 左6_接続; - public Ele[] 右6_接続; + public Element[] 右6_接続; - public Ele[] 尾_接続; + public Element[] 尾_接続; private ShapePart[] Pars; @@ -989,10 +989,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.左0_接続.Count > 0) { - 左0_接続 = e.左0_接続.Select(delegate(EleD g) + 左0_接続 = e.左0_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1003,7 +1003,7 @@ namespace SlaveMatrix } if (e.右0_接続.Count > 0) { - 右0_接続 = e.右0_接続.Select(delegate(EleD g) + 右0_接続 = e.右0_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1014,7 +1014,7 @@ namespace SlaveMatrix } if (e.左1_接続.Count > 0) { - 左1_接続 = e.左1_接続.Select(delegate(EleD g) + 左1_接続 = e.左1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1025,7 +1025,7 @@ namespace SlaveMatrix } if (e.右1_接続.Count > 0) { - 右1_接続 = e.右1_接続.Select(delegate(EleD g) + 右1_接続 = e.右1_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1036,7 +1036,7 @@ namespace SlaveMatrix } if (e.左2_接続.Count > 0) { - 左2_接続 = e.左2_接続.Select(delegate(EleD g) + 左2_接続 = e.左2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1047,7 +1047,7 @@ namespace SlaveMatrix } if (e.右2_接続.Count > 0) { - 右2_接続 = e.右2_接続.Select(delegate(EleD g) + 右2_接続 = e.右2_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1058,7 +1058,7 @@ namespace SlaveMatrix } if (e.左3_接続.Count > 0) { - 左3_接続 = e.左3_接続.Select(delegate(EleD g) + 左3_接続 = e.左3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1069,7 +1069,7 @@ namespace SlaveMatrix } if (e.右3_接続.Count > 0) { - 右3_接続 = e.右3_接続.Select(delegate(EleD g) + 右3_接続 = e.右3_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1080,7 +1080,7 @@ namespace SlaveMatrix } if (e.左4_接続.Count > 0) { - 左4_接続 = e.左4_接続.Select(delegate(EleD g) + 左4_接続 = e.左4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1091,7 +1091,7 @@ namespace SlaveMatrix } if (e.右4_接続.Count > 0) { - 右4_接続 = e.右4_接続.Select(delegate(EleD g) + 右4_接続 = e.右4_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1102,7 +1102,7 @@ namespace SlaveMatrix } if (e.左5_接続.Count > 0) { - 左5_接続 = e.左5_接続.Select(delegate(EleD g) + 左5_接続 = e.左5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1113,7 +1113,7 @@ namespace SlaveMatrix } if (e.右5_接続.Count > 0) { - 右5_接続 = e.右5_接続.Select(delegate(EleD g) + 右5_接続 = e.右5_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1124,7 +1124,7 @@ namespace SlaveMatrix } if (e.左6_接続.Count > 0) { - 左6_接続 = e.左6_接続.Select(delegate(EleD g) + 左6_接続 = e.左6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1135,7 +1135,7 @@ namespace SlaveMatrix } if (e.右6_接続.Count > 0) { - 右6_接続 = e.右6_接続.Select(delegate(EleD g) + 右6_接続 = e.右6_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; @@ -1146,7 +1146,7 @@ namespace SlaveMatrix } if (e.尾_接続.Count > 0) { - 尾_接続 = e.尾_接続.Select(delegate(EleD g) + 尾_接続 = e.尾_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_鯨2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs index 4586e08..d0175b9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs @@ -77,147 +77,147 @@ namespace SlaveMatrix public bool 鎖表示; - public List 左0_接続 = new List(); + public List 左0_接続 = new List(); - public List 右0_接続 = new List(); + public List 右0_接続 = new List(); - public List 左1_接続 = new List(); + public List 左1_接続 = new List(); - public List 右1_接続 = new List(); + public List 右1_接続 = new List(); - public List 左2_接続 = new List(); + public List 左2_接続 = new List(); - public List 右2_接続 = new List(); + public List 右2_接続 = new List(); - public List 左3_接続 = new List(); + public List 左3_接続 = new List(); - public List 右3_接続 = new List(); + public List 右3_接続 = new List(); - public List 左4_接続 = new List(); + public List 左4_接続 = new List(); - public List 右4_接続 = new List(); + public List 右4_接続 = new List(); - public List 左5_接続 = new List(); + public List 左5_接続 = new List(); - public List 右5_接続 = new List(); + public List 右5_接続 = new List(); - public List 左6_接続 = new List(); + public List 左6_接続 = new List(); - public List 右6_接続 = new List(); + public List 右6_接続 = new List(); - public List 尾_接続 = new List(); + public List 尾_接続 = new List(); public 長物_鯨D() { ThisType = GetType(); } - public void 左0接続(EleD e) + public void 左0接続(ElementData e) { 左0_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_左0_接続; } - public void 右0接続(EleD e) + public void 右0接続(ElementData e) { 右0_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_右0_接続; } - public void 左1接続(EleD e) + public void 左1接続(ElementData e) { 左1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_左1_接続; } - public void 右1接続(EleD e) + public void 右1接続(ElementData e) { 右1_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_右1_接続; } - public void 左2接続(EleD e) + public void 左2接続(ElementData e) { 左2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_左2_接続; } - public void 右2接続(EleD e) + public void 右2接続(ElementData e) { 右2_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_右2_接続; } - public void 左3接続(EleD e) + public void 左3接続(ElementData e) { 左3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_左3_接続; } - public void 右3接続(EleD e) + public void 右3接続(ElementData e) { 右3_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_右3_接続; } - public void 左4接続(EleD e) + public void 左4接続(ElementData e) { 左4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_左4_接続; } - public void 右4接続(EleD e) + public void 右4接続(ElementData e) { 右4_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_右4_接続; } - public void 左5接続(EleD e) + public void 左5接続(ElementData e) { 左5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_左5_接続; } - public void 右5接続(EleD e) + public void 右5接続(ElementData e) { 右5_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_右5_接続; } - public void 左6接続(EleD e) + public void 左6接続(ElementData e) { 左6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_左6_接続; } - public void 右6接続(EleD e) + public void 右6接続(ElementData e) { 右6_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_右6_接続; } - public void 尾接続(EleD e) + public void 尾接続(ElementData e) { 尾_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_鯨_尾_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 長物_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴.cs index 76961a8..1f118ca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 長胴 : Ele + public class 長胴 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs index b55e066..dbf6e53 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs @@ -4,23 +4,23 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class 長胴D : EleD + public class 長胴D : ElementData { - public List 左_接続 = new List(); + public List 左_接続 = new List(); - public List 右_接続 = new List(); + public List 右_接続 = new List(); - public List Torso_接続 = new List(); + public List Torso_接続 = new List(); - public virtual void 左接続(EleD e) + public virtual void 左接続(ElementData e) { } - public virtual void 右接続(EleD e) + public virtual void 右接続(ElementData e) { } - public virtual void Torso接続(EleD e) + public virtual void Torso接続(ElementData e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs index 40149bf..1357b31 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 鞭痕 : Ele + public class 鞭痕 : Element { public ShapePart X0Y0_鞭痕; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs index ffa85b4..9e38ff1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 鞭痕D : EleD + public class 鞭痕D : ElementData { public bool 鞭痕_表示 = true; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鞭痕(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs index 2267b4d..bbdfa5f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 頬目 : Ele + public class 頬目 : Element { public ShapePart X0Y0_白目; @@ -41,7 +41,7 @@ namespace SlaveMatrix public ColorP X0Y0_黒目_ハイライト下CP; - public Ele[] 瞼_接続; + public Element[] 瞼_接続; public override bool 欠損 { @@ -292,8 +292,8 @@ namespace SlaveMatrix } if (e.瞼_接続.Count > 0) { - Ele f; - 瞼_接続 = e.瞼_接続.Select(delegate(EleD g) + Element f; + 瞼_接続 = e.瞼_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頬目2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs index 1096a44..6d55bcd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 頬目D : EleD + public class 頬目D : ElementData { public bool 白目_表示 = true; @@ -25,21 +25,21 @@ namespace SlaveMatrix public double 傾き; - public List 瞼_接続 = new List(); + public List 瞼_接続 = new List(); public 頬目D() { ThisType = GetType(); } - public void 瞼接続(EleD e) + public void 瞼接続(ElementData e) { 瞼_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.頬目_瞼_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頬目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs index d268431..330dfe1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 頬瞼 : Ele + public class 頬瞼 : Element { public ShapePart X0Y0_瞼左_瞼; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs index 05ad9df..cdd35ea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 頬瞼D : EleD + public class 頬瞼D : ElementData { public bool 瞼左_瞼_表示 = true; @@ -51,7 +51,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頬瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs index 54166c6..299e88e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 頬肌 : Ele + public class 頬肌 : Element { public ShapePart X0Y0_淫タトゥ_ハート_タトゥ左; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs index c5fdb53..57e4adf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 頬肌D : EleD + public class 頬肌D : ElementData { public bool 淫タトゥ_ハート_タトゥ左_表示; @@ -75,7 +75,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頬肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭色更新.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭色更新.cs index d8c170d..9aba4f2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭色更新.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭色更新.cs @@ -8,7 +8,7 @@ namespace SlaveMatrix { public Head 頭; - private Ele[] 瞼; + private Element[] 瞼; private Vector2D[] mm; @@ -18,7 +18,7 @@ namespace SlaveMatrix 瞼 = EnumNoNull(単瞼, 瞼左, 瞼右, 額瞼, 頬左, 頬右).ToArray(); } - private IEnumerable EnumNoNull(単瞼 単瞼, 双瞼 瞼左, 双瞼 瞼右, 縦瞼 額瞼, 頬瞼 頬左, 頬瞼 頬右) + private IEnumerable EnumNoNull(単瞼 単瞼, 双瞼 瞼左, 双瞼 瞼右, 縦瞼 額瞼, 頬瞼 頬左, 頬瞼 頬右) { if (瞼 != null) { @@ -50,14 +50,14 @@ namespace SlaveMatrix { 頭.X0Y0_Head.GetMiY_MaY(out mm); 頭.色更新(mm); - Ele[] array = 瞼; + Element[] array = 瞼; for (int i = 0; i < array.Length; i++) { array[i].色更新(mm); } } - public bool Contains(Ele e) + public bool Contains(Element e) { if (e != 頭) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂.cs index 74c9d42..4ad46a8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 頭頂 : Ele + public class 頭頂 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂D.cs index 465b282..84a0c08 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 頭頂D : EleD + public class 頭頂D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs index 16f295f..0ec633e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頭頂_天(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs index 2a2a294..d3274a7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs @@ -493,7 +493,7 @@ namespace SlaveMatrix private bool 鱗_; - public Ele[] 頭部後_接続; + public Element[] 頭部後_接続; public override bool 欠損 { @@ -2080,8 +2080,8 @@ namespace SlaveMatrix } if (e.頭部後_接続.Count > 0) { - Ele f; - 頭部後_接続 = e.頭部後_接続.Select(delegate(EleD g) + Element f; + 頭部後_接続 = e.頭部後_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭頂_宇2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs index 6a2c2d0..6a25370 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs @@ -171,21 +171,21 @@ namespace SlaveMatrix public bool 鱗; - public List 頭部後_接続 = new List(); + public List 頭部後_接続 = new List(); public 頭頂_宇D() { ThisType = GetType(); } - public void 頭部後接続(EleD e) + public void 頭部後接続(ElementData e) { 頭部後_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.頭頂_宇_頭部後_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頭頂_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs index e8d4ac9..51d6187 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs @@ -25,7 +25,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頭頂_皿(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs index 525bee6..e4196ae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 頭頂後_宇 : Ele + public class 頭頂後_宇 : Element { public ShapePart X0Y0_頭部; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs index ce676e7..55a5e77 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 頭頂後_宇D : EleD + public class 頭頂後_宇D : ElementData { public bool 頭部_表示 = true; @@ -25,7 +25,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頭頂後_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs index 007b8d4..aa07411 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 顔ハイライト : Ele + public class 顔ハイライト : Element { public ShapePart X0Y0_ハイライト1; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs index e2b569c..6a1762d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 顔ハイライトD : EleD + public class 顔ハイライトD : ElementData { public bool ハイライト1_表示; @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 顔ハイライト(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面.cs index 0a3fd05..f5e99d9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面.cs @@ -2,13 +2,13 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 顔面 : Ele + public class 顔面 : Element { private double 展開; - public Ele[] 触覚左_接続; + public Element[] 触覚左_接続; - public Ele[] 触覚右_接続; + public Element[] 触覚右_接続; public double 展開0 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面D.cs index bfa6cc2..9f32b89 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面D.cs @@ -4,19 +4,19 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class 顔面D : EleD + public class 顔面D : ElementData { public double 展開0; - public List 触覚左_接続 = new List(); + public List 触覚左_接続 = new List(); - public List 触覚右_接続 = new List(); + public List 触覚右_接続 = new List(); - public virtual void 触覚左接続(EleD e) + public virtual void 触覚左接続(ElementData e) { } - public virtual void 触覚右接続(EleD e) + public virtual void 触覚右接続(ElementData e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs index 2bc5de2..e50d59a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs @@ -596,10 +596,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.触覚左_接続.Count > 0) { - 触覚左_接続 = e.触覚左_接続.Select(delegate(EleD g) + 触覚左_接続 = e.触覚左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 顔面_甲2; @@ -610,7 +610,7 @@ namespace SlaveMatrix } if (e.触覚右_接続.Count > 0) { - 触覚右_接続 = e.触覚右_接続.Select(delegate(EleD g) + 触覚右_接続 = e.触覚右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 顔面_甲2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs index 5977f70..a9b8ad4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs @@ -53,21 +53,21 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 触覚左接続(EleD e) + public override void 触覚左接続(ElementData e) { 触覚左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.顔面_甲_触覚左_接続; } - public override void 触覚右接続(EleD e) + public override void 触覚右接続(ElementData e) { 触覚右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.顔面_甲_触覚右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 顔面_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs index 2ddf71f..8729c96 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs @@ -738,10 +738,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.触覚左_接続.Count > 0) { - 触覚左_接続 = e.触覚左_接続.Select(delegate(EleD g) + 触覚左_接続 = e.触覚左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 顔面_虫2; @@ -752,7 +752,7 @@ namespace SlaveMatrix } if (e.触覚右_接続.Count > 0) { - 触覚右_接続 = e.触覚右_接続.Select(delegate(EleD g) + 触覚右_接続 = e.触覚右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 顔面_虫2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs index bf853e6..5ec8945 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs @@ -65,21 +65,21 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 触覚左接続(EleD e) + public override void 触覚左接続(ElementData e) { 触覚左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.顔面_虫_触覚左_接続; } - public override void 触覚右接続(EleD e) + public override void 触覚右接続(ElementData e) { 触覚右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.顔面_虫_触覚右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 顔面_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs index 0e33c79..6d1d610 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs @@ -945,10 +945,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.触覚左_接続.Count > 0) { - 触覚左_接続 = e.触覚左_接続.Select(delegate(EleD g) + 触覚左_接続 = e.触覚左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 顔面_蟲2; @@ -959,7 +959,7 @@ namespace SlaveMatrix } if (e.触覚右_接続.Count > 0) { - 触覚右_接続 = e.触覚右_接続.Select(delegate(EleD g) + 触覚右_接続 = e.触覚右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 顔面_蟲2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs index fec57e2..c5db9b7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs @@ -83,21 +83,21 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 触覚左接続(EleD e) + public override void 触覚左接続(ElementData e) { 触覚左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.顔面_蟲_触覚左_接続; } - public override void 触覚右接続(EleD e) + public override void 触覚右接続(ElementData e) { 触覚右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.顔面_蟲_触覚右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 顔面_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫.cs index ed0cd1e..4520799 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 飛沫 : Ele + public class 飛沫 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫D.cs index 43fbf90..bb19808 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 飛沫D : EleD + public class 飛沫D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs index c2ea036..6b31b0e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 飛沫_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs index c49bf25..f5e3b74 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 飛沫_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs index 6d8b2e1..fe18a39 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 飛膜_先 : Ele + public class 飛膜_先 : Element { public ShapePart X0Y0_飛膜; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs index 55abd04..997de61 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 飛膜_根 : Ele + public class 飛膜_根 : Element { public ShapePart X0Y0_飛膜; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鯨色更新.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鯨色更新.cs index 6036393..2c23d06 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鯨色更新.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鯨色更新.cs @@ -32,7 +32,7 @@ namespace SlaveMatrix 尾.色更新(鯨m); } - public bool Contains(Ele e) + public bool Contains(Element e) { if (長物 != e) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭.cs index e58bb5f..85da32a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 鰭 : Ele + public class 鰭 : Element { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭D.cs index 2cd57fd..e16a26f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 鰭D : EleD + public class 鰭D : ElementData { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs index 8e0ca44..5273a07 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鰭_豚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs index 10d9cba..f920146 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs @@ -19,7 +19,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鰭_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs index d3eab27..ea31cbc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鰭_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs index dcbce55..4e0fe33 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs @@ -137,7 +137,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鳳凰(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻.cs index 46bf50d..f1f2929 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻.cs @@ -1,10 +1,10 @@ namespace SlaveMatrix { - public class 鼻 : Ele + public class 鼻 : Element { - public Ele[] 鼻水左_接続; + public Element[] 鼻水左_接続; - public Ele[] 鼻水右_接続; + public Element[] 鼻水右_接続; public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻D.cs index 9f0af1c..7b8ddc1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻D.cs @@ -4,17 +4,17 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class 鼻D : EleD + public class 鼻D : ElementData { - public List 鼻水左_接続 = new List(); + public List 鼻水左_接続 = new List(); - public List 鼻水右_接続 = new List(); + public List 鼻水右_接続 = new List(); - public virtual void 鼻水左接続(EleD e) + public virtual void 鼻水左接続(ElementData e) { } - public virtual void 鼻水右接続(EleD e) + public virtual void 鼻水右接続(ElementData e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs index 4375531..97ed39e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs @@ -132,10 +132,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.鼻水左_接続.Count > 0) { - 鼻水左_接続 = e.鼻水左_接続.Select(delegate(EleD g) + 鼻水左_接続 = e.鼻水左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 鼻_人2; @@ -146,7 +146,7 @@ namespace SlaveMatrix } if (e.鼻水右_接続.Count > 0) { - 鼻水右_接続 = e.鼻水右_接続.Select(delegate(EleD g) + 鼻水右_接続 = e.鼻水右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 鼻_人2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs index b7aa21d..b7712ea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs @@ -13,21 +13,21 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 鼻水左接続(EleD e) + public override void 鼻水左接続(ElementData e) { 鼻水左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.鼻_人_鼻水左_接続; } - public override void 鼻水右接続(EleD e) + public override void 鼻水右接続(ElementData e) { 鼻水右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.鼻_人_鼻水右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鼻_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs index 03369d3..80fae53 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs @@ -132,10 +132,10 @@ namespace SlaveMatrix { 表示 = false; } - Ele f; + Element f; if (e.鼻水左_接続.Count > 0) { - 鼻水左_接続 = e.鼻水左_接続.Select(delegate(EleD g) + 鼻水左_接続 = e.鼻水左_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 鼻_獣2; @@ -146,7 +146,7 @@ namespace SlaveMatrix } if (e.鼻水右_接続.Count > 0) { - 鼻水右_接続 = e.鼻水右_接続.Select(delegate(EleD g) + 鼻水右_接続 = e.鼻水右_接続.Select(delegate(ElementData g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 鼻_獣2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs index 7ba2f25..e16135f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs @@ -13,21 +13,21 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 鼻水左接続(EleD e) + public override void 鼻水左接続(ElementData e) { 鼻水左_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.鼻_獣_鼻水左_接続; } - public override void 鼻水右接続(EleD e) + public override void 鼻水右接続(ElementData e) { 鼻水右_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.鼻_獣_鼻水右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鼻_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs index 32094af..5db853e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 鼻水 : Ele + public class 鼻水 : Element { public ShapePart X0Y0_鼻水; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs index 7d499fc..f298462 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 鼻水D : EleD + public class 鼻水D : ElementData { public bool 鼻水_表示; @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鼻水(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs index c451389..f606f6e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 鼻肌 : Ele + public class 鼻肌 : Element { public ShapePart X0Y0_紋柄_紋左_紋1; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs index 4e05e8f..5b1dd09 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 鼻肌D : EleD + public class 鼻肌D : ElementData { public bool 紋柄_紋左_紋1_表示; @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public override Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鼻肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs index 4eab8df..a655585 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs @@ -7,11 +7,11 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class DE : Ele + public class DE : Element { public Action 描画; - public DE(Ele src, Action 描画) + public DE(Element src, Action 描画) { Par = src; Body = src.Body; @@ -38,7 +38,7 @@ namespace SlaveMatrix public Character Cha; - public Ele[] Elements; + public Element[] Elements; private List<蝙通常> 蝙通常; @@ -50,7 +50,7 @@ namespace SlaveMatrix private IEnumerable<飛膜色更新> 飛膜色更新; - private IEnumerable 色更新; + private IEnumerable 色更新; public Waist Waist; @@ -310,95 +310,95 @@ namespace SlaveMatrix private bool 鼻描画; - private List 後髪接続 = new List(); + private List 後髪接続 = new List(); - private List 額接続 = new List(); + private List 額接続 = new List(); - private List 耳左接続 = new List(); + private List 耳左接続 = new List(); - private List 耳右接続 = new List(); + private List 耳右接続 = new List(); - private List 頬左接続 = new List(); + private List 頬左接続 = new List(); - private List 頬右接続 = new List(); + private List 頬右接続 = new List(); - private List 頭頂左後接続 = new List(); + private List 頭頂左後接続 = new List(); - private List 頭頂右後接続 = new List(); + private List 頭頂右後接続 = new List(); private List<角2> 角左接続 = new List<角2>(); private List<角2> 角右接続 = new List<角2>(); - private List 植左接続 = new List(); + private List 植左接続 = new List(); - private List 植右接続 = new List(); + private List 植右接続 = new List(); - private List 触覚左接続 = new List(); + private List 触覚左接続 = new List(); - private List 触覚右接続 = new List(); + private List 触覚右接続 = new List(); - private List 顔触覚左接続 = new List(); + private List 顔触覚左接続 = new List(); - private List 顔触覚右接続 = new List(); + private List 顔触覚右接続 = new List(); - private List 大顎基接続 = new List(); + private List 大顎基接続 = new List(); private Shoulder[] 後脇左s = new Shoulder[0]; private Shoulder[] 後脇右s = new Shoulder[0]; - public List[] 後腕左s = new List[0]; + public List[] 後腕左s = new List[0]; - public List[] 後腕右s = new List[0]; + public List[] 後腕右s = new List[0]; private Shoulder 肩左; private Shoulder 肩右; - private List 肩左飛膜 = new List(); + private List 肩左飛膜 = new List(); - private List 肩右飛膜 = new List(); + private List 肩右飛膜 = new List(); - private List 腕左 = new List(); + private List 腕左 = new List(); - private List 腕右 = new List(); + private List 腕右 = new List(); - private List LowerArm以降左 = new List(); + private List LowerArm以降左 = new List(); - private List LowerArm以降右 = new List(); + private List LowerArm以降右 = new List(); - private List 胸上左接続 = new List(); + private List 胸上左接続 = new List(); - private List 胸上右接続 = new List(); + private List 胸上右接続 = new List(); - private List 胸下左接続 = new List(); + private List 胸下左接続 = new List(); - private List 胸下右接続 = new List(); + private List 胸下右接続 = new List(); - private List 胴後左接続 = new List(); + private List 胴後左接続 = new List(); - private List 胴後右接続 = new List(); + private List 胴後右接続 = new List(); - private List 腰後左接続 = new List(); + private List 腰後左接続 = new List(); - private List 腰後右接続 = new List(); + private List 腰後右接続 = new List(); - private List 背中接続 = new List(); + private List 背中接続 = new List(); - private List 腿左接続 = new List(); + private List 腿左接続 = new List(); - private List 腿右接続 = new List(); + private List 腿右接続 = new List(); - private List 尾接続 = new List(); + private List 尾接続 = new List(); - private List 半身後接続 = new List(); + private List 半身後接続 = new List(); - private List 半身中1接続 = new List(); + private List 半身中1接続 = new List(); - private List 半身中2接続 = new List(); + private List 半身中2接続 = new List(); - private List 半身前接続 = new List(); + private List 半身前接続 = new List(); public 顔面 顔面; @@ -540,7 +540,7 @@ namespace SlaveMatrix public スタンプB ぶっかけ大; - private Dictionary> ぶっかけr = new Dictionary>(); + private Dictionary> ぶっかけr = new Dictionary>(); public TrainingUI カーソル; @@ -560,25 +560,25 @@ namespace SlaveMatrix private double asb2; - public EleI EIChest; + public ElementInstance EIChest; - public EleI EI髪; + public ElementInstance EI髪; - public EleI EIWaist; + public ElementInstance EIWaist; - public EleI EI半後; + public ElementInstance EI半後; - public EleI EI半中1; + public ElementInstance EI半中1; - public EleI EI半中2; + public ElementInstance EI半中2; - public EleI EI半前; + public ElementInstance EI半前; - public EleI EI腕前; + public ElementInstance EI腕前; - public EleI EI腿; + public ElementInstance EI腿; - public HashSet eis = new HashSet(); + public HashSet eis = new HashSet(); public bool Is髪; @@ -2237,8 +2237,8 @@ namespace SlaveMatrix { 拘束具i = value; object[] array = new object[1]; - Ele[] array2 = Elements; - foreach (Ele ele in array2) + Element[] array2 = Elements; + foreach (Element ele in array2) { MethodInfo[] methods = ele.GetType().GetMethods(); foreach (MethodInfo methodInfo in methods) @@ -2287,7 +2287,7 @@ namespace SlaveMatrix } } array2 = Elements; - foreach (Ele ele4 in array2) + foreach (Element ele4 in array2) { if (ele4 is 触手_蔦) { @@ -2915,9 +2915,9 @@ namespace SlaveMatrix ぶっかけ大.Clear(); } - public void Sort(IEnumerable ar, List li) + public void Sort(IEnumerable ar, List li) { - foreach (Ele item in ar) + foreach (Element item in ar) { int num; if ((num = li.IndexOf(item.Par)) > -1) @@ -2957,9 +2957,9 @@ namespace SlaveMatrix Arm人 腕人; 翼鳥 翼鳥; 翼獣 翼獣; - Ele p; - Ele pp; - foreach (Ele current_element in Elements.Reverse()) + Element p; + Element pp; + foreach (Element current_element in Elements.Reverse()) { FieldInfo[] fields = current_element.ThisType.GetFields(); foreach (FieldInfo fieldInfo in fields) @@ -4109,27 +4109,27 @@ namespace SlaveMatrix } if (頭.耳左_接続 != null) { - Sort(頭.耳左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 耳左接続); + Sort(頭.耳左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 耳左接続); } if (頭.耳右_接続 != null) { - Sort(頭.耳右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 耳右接続); + Sort(頭.耳右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 耳右接続); } if (頭.触覚左_接続 != null) { - Sort(頭.触覚左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 触覚左接続); + Sort(頭.触覚左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 触覚左接続); } if (頭.触覚右_接続 != null) { - Sort(頭.触覚右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 触覚右接続); + Sort(頭.触覚右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 触覚右接続); } if (頭.頬左_接続 != null) { - Sort(頭.頬左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 頬左接続); + Sort(頭.頬左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 頬左接続); } if (頭.頬右_接続 != null) { - Sort(頭.頬右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 頬右接続); + Sort(頭.頬右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 頬右接続); } if (基髪.頭頂左_接続 != null) { @@ -4158,17 +4158,17 @@ namespace SlaveMatrix { if (顔面.触覚左_接続 != null) { - Sort(顔面.触覚左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 顔触覚左接続); + Sort(顔面.触覚左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 顔触覚左接続); } if (顔面.触覚右_接続 != null) { - Sort(顔面.触覚右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 顔触覚右接続); + Sort(顔面.触覚右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 顔触覚右接続); } } } if (頭.大顎基_接続 != null) { - Sort(頭.大顎基_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 大顎基接続); + Sort(頭.大顎基_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 大顎基接続); } if (頭.頭頂_接続 != null) { @@ -4184,23 +4184,23 @@ namespace SlaveMatrix 肩左 = 後脇左s.LastOrDefault(); if (後脇左s.Length > 1) { - 後腕左s = new List[後脇左s.Length - 1]; + 後腕左s = new List[後脇左s.Length - 1]; for (int j = 0; j < 後腕左s.Length; j++) { - 後腕左s[j] = new List(); + 後腕左s[j] = new List(); Sort(後脇左s[j].EnumEle(), 後腕左s[j]); } if (肩左.UpperArm_接続 != null) { - Sort(肩左.UpperArm_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 腕左); + Sort(肩左.UpperArm_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 腕左); } } else if (後脇左s.Length == 1 && 肩左.UpperArm_接続 != null) { - 後腕左s = new List[肩左.UpperArm_接続.Length - 1]; + 後腕左s = new List[肩左.UpperArm_接続.Length - 1]; for (int k = 0; k < 後腕左s.Length; k++) { - 後腕左s[k] = new List(); + 後腕左s[k] = new List(); Sort(肩左.UpperArm_接続[k].EnumEle(), 後腕左s[k]); } Sort(肩左.UpperArm_接続.Last().EnumEle(), 腕左); @@ -4214,23 +4214,23 @@ namespace SlaveMatrix 肩右 = 後脇右s.LastOrDefault(); if (後脇右s.Length > 1) { - 後腕右s = new List[後脇右s.Length - 1]; + 後腕右s = new List[後脇右s.Length - 1]; for (int l = 0; l < 後腕右s.Length; l++) { - 後腕右s[l] = new List(); + 後腕右s[l] = new List(); Sort(後脇右s[l].EnumEle(), 後腕右s[l]); } if (肩右.UpperArm_接続 != null) { - Sort(肩右.UpperArm_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 腕右); + Sort(肩右.UpperArm_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 腕右); } } else if (後脇右s.Length == 1 && 肩右.UpperArm_接続 != null) { - 後腕右s = new List[肩右.UpperArm_接続.Length - 1]; + 後腕右s = new List[肩右.UpperArm_接続.Length - 1]; for (int m = 0; m < 後腕右s.Length; m++) { - 後腕右s[m] = new List(); + 後腕右s[m] = new List(); Sort(肩右.UpperArm_接続[m].EnumEle(), 後腕右s[m]); } Sort(肩右.UpperArm_接続.Last().EnumEle(), 腕右); @@ -4240,39 +4240,39 @@ namespace SlaveMatrix nsr = new bool[1 + ((後腕右s != null) ? 後腕右s.Length : 0)]; if (Chest.翼上左_接続 != null) { - Sort(Chest.翼上左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸上左接続); + Sort(Chest.翼上左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 胸上左接続); } if (Chest.翼下左_接続 != null) { - Sort(Chest.翼下左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸下左接続); + Sort(Chest.翼下左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 胸下左接続); } if (Chest.翼上右_接続 != null) { - Sort(Chest.翼上右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸上右接続); + Sort(Chest.翼上右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 胸上右接続); } if (Chest.翼下右_接続 != null) { - Sort(Chest.翼下右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸下右接続); + Sort(Chest.翼下右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 胸下右接続); } if (Torso.翼左_接続 != null) { - Sort(Torso.翼左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胴後左接続); + Sort(Torso.翼左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 胴後左接続); } if (Torso.翼右_接続 != null) { - Sort(Torso.翼右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胴後右接続); + Sort(Torso.翼右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 胴後右接続); } if (Waist.翼左_接続 != null) { - Sort(Waist.翼左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 腰後左接続); + Sort(Waist.翼左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 腰後左接続); } if (Waist.翼右_接続 != null) { - Sort(Waist.翼右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 腰後右接続); + Sort(Waist.翼右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 腰後右接続); } if (Chest.背中_接続 != null) { - Sort(Chest.背中_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 背中接続); + Sort(Chest.背中_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 背中接続); } if (Waist.腿左_接続 != null) { @@ -4292,7 +4292,7 @@ namespace SlaveMatrix } if (Waist.尾_接続 != null) { - Sort(Waist.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 尾接続); + Sort(Waist.尾_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 尾接続); } if (Waist.半身_接続 != null) { @@ -4305,7 +4305,7 @@ namespace SlaveMatrix 半身中1接続.Add(魚); if (魚.尾_接続 != null) { - Sort(魚.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(魚.尾_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (腕獣左.Count > 0 && 腕獣左.First().Shoulder.UpperArm_接続.IsEle<獣脚>()) { @@ -4318,14 +4318,14 @@ namespace SlaveMatrix Sort(from e in 魚.EnumEle().Skip(1) where !bod.半身後接続.Contains(e) select e, 半身中2接続); - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item in array) + Element[] array = 腿左接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item in array) { 腿左接続.Remove(item); 半身前接続.Add(item); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item2 in array) + array = 腿右接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item2 in array) { 腿右接続.Remove(item2); 半身前接続.Add(item2); @@ -4340,7 +4340,7 @@ namespace SlaveMatrix 半身中1接続.Add(鯨); if (鯨.尾_接続 != null) { - Sort(鯨.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(鯨.尾_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (腕獣左.Count > 0 && 腕獣左.First().Shoulder.UpperArm_接続.IsEle<獣脚>()) { @@ -4353,14 +4353,14 @@ namespace SlaveMatrix Sort(from e in 鯨.EnumEle().Skip(1) where !bod.半身後接続.Contains(e) select e, 半身中2接続); - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item3 in array) + Element[] array = 腿左接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item3 in array) { 腿左接続.Remove(item3); 半身前接続.Add(item3); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item4 in array) + array = 腿右接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item4 in array) { 腿右接続.Remove(item4); 半身前接続.Add(item4); @@ -4379,39 +4379,39 @@ namespace SlaveMatrix { if (item20.左_接続 != null) { - Sort(item20.左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); + Sort(item20.左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中2接続); } if (item20.右_接続 != null) { - Sort(item20.右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); + Sort(item20.右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中2接続); } } - Sort(from e in 蛇.Torso_接続.Select((Ele e) => e.EnumEle()).JoinEnum() + Sort(from e in 蛇.Torso_接続.Select((Element e) => e.EnumEle()).JoinEnum() where !bod.半身中2接続.Contains(e) select e, 半身後接続); } 蛇前 = new DE(蛇, 蛇.前描画); if (蛇.左_接続 != null) { - Sort(蛇.左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蛇.左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蛇.右_接続 != null) { - Sort(蛇.右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蛇.右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } 節足 ele2 = 半身中2接続.GetEle<節足>(); if (ele2 != null && (((ele2 is 節足_足蜘 || ele2 is 節足_足蠍) && !ele2.反転Y) || (ele2 is 節足_足百 && ele2.反転Y))) { 半身中2接続.Reverse(); } - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item5 in array) + Element[] array = 腿左接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item5 in array) { 腿左接続.Remove(item5); 半身前接続.Add(item5); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item6 in array) + array = 腿右接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item6 in array) { 腿右接続.Remove(item6); 半身前接続.Add(item6); @@ -4429,32 +4429,32 @@ namespace SlaveMatrix { if (item21.左_接続 != null) { - Sort(item21.左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); + Sort(item21.左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中2接続); } if (item21.右_接続 != null) { - Sort(item21.右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); + Sort(item21.右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中2接続); } } - Sort(from e in 蟲.Torso_接続.Select((Ele e) => e.EnumEle()).JoinEnum() + Sort(from e in 蟲.Torso_接続.Select((Element e) => e.EnumEle()).JoinEnum() where !bod.半身中2接続.Contains(e) select e, 半身後接続); } if (蟲.左1_接続 != null) { - Sort(蟲.左1_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蟲.左1_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蟲.右1_接続 != null) { - Sort(蟲.右1_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蟲.右1_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蟲.左0_接続 != null) { - Sort(蟲.左0_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蟲.左0_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蟲.右0_接続 != null) { - Sort(蟲.右0_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蟲.右0_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } 節足 ele3 = 半身中2接続.GetEle<節足>(); if (ele3 != null && (((ele3 is 節足_足蜘 || ele3 is 節足_足蠍) && !ele3.反転Y) || (ele3 is 節足_足百 && ele3.反転Y))) @@ -4465,7 +4465,7 @@ namespace SlaveMatrix else if (ele is 四足胸) { Is獣 = true; - foreach (Ele item22 in ele.EnumEle()) + foreach (Element item22 in ele.EnumEle()) { if (item22 is 四足胸) { @@ -4636,61 +4636,61 @@ namespace SlaveMatrix { if (Waist_獣.腿左_接続 != null) { - Sort(Waist_獣.腿左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(Waist_獣.腿左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (Waist_獣.腿右_接続 != null) { - Sort(Waist_獣.腿右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(Waist_獣.腿右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (Waist_獣.翼左_接続 != null) { - Sort(Waist_獣.翼左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Waist_獣.翼左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (Waist_獣.翼右_接続 != null) { - Sort(Waist_獣.翼右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Waist_獣.翼右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (Waist_獣.尾_接続 != null) { - Sort(Waist_獣.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中1接続); + Sort(Waist_獣.尾_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中1接続); } if (Waist_獣.半身_接続 != null) { - Sort(Waist_獣.半身_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中1接続); + Sort(Waist_獣.半身_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中1接続); } } if (Torso_獣 != null) { if (Torso_獣.翼左_接続 != null) { - Sort(Torso_獣.翼左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Torso_獣.翼左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (Torso_獣.翼右_接続 != null) { - Sort(Torso_獣.翼右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Torso_獣.翼右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } } if (Chest_獣 != null) { if (Chest_獣.背中_接続 != null) { - Sort(Chest_獣.背中_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.背中_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (Chest_獣.翼上左_接続 != null) { - Sort(Chest_獣.翼上左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.翼上左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (Chest_獣.翼下左_接続 != null) { - Sort(Chest_獣.翼下左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.翼下左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (Chest_獣.翼上右_接続 != null) { - Sort(Chest_獣.翼上右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.翼上右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } if (Chest_獣.翼下右_接続 != null) { - Sort(Chest_獣.翼下右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.翼下右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } } if (胸毛_獣 != null) @@ -4716,28 +4716,28 @@ namespace SlaveMatrix 半身中1接続.Add(蛸); if (蛸.軟体内左_接続 != null) { - Sort(蛸.軟体内左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); + Sort(蛸.軟体内左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中2接続); } if (蛸.軟体内右_接続 != null) { - Sort(蛸.軟体内右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); + Sort(蛸.軟体内右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中2接続); } if (蛸.軟体外左_接続 != null) { - Sort(蛸.軟体外左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); + Sort(蛸.軟体外左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中2接続); } if (蛸.軟体外右_接続 != null) { - Sort(蛸.軟体外右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); + Sort(蛸.軟体外右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身中2接続); } - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item7 in array) + Element[] array = 腿左接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item7 in array) { 腿左接続.Remove(item7); 半身前接続.Add(item7); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item8 in array) + array = 腿右接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item8 in array) { 腿右接続.Remove(item8); 半身前接続.Add(item8); @@ -4750,69 +4750,69 @@ namespace SlaveMatrix Waist.WaistCD.c2.Col2 = 蜘.柄CD.c2.Col2; if (蜘.尾_接続 != null) { - Sort(蜘.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(蜘.尾_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } 半身中1接続.Add(蜘); if (蜘.触肢左_接続 != null) { - Sort(蜘.触肢左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.触肢左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.触肢右_接続 != null) { - Sort(蜘.触肢右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.触肢右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足左1_接続 != null) { - Sort(蜘.節足左1_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足左1_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足右1_接続 != null) { - Sort(蜘.節足右1_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足右1_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足左2_接続 != null) { - Sort(蜘.節足左2_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足左2_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足右2_接続 != null) { - Sort(蜘.節足右2_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足右2_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } - if (蜘.節足左3_接続 != null && !蜘.節足左3_接続.IsEle<節足_足百>() && 蜘.節足左3_接続.Any((Ele e_) => e_.反転Y)) + if (蜘.節足左3_接続 != null && !蜘.節足左3_接続.IsEle<節足_足百>() && 蜘.節足左3_接続.Any((Element e_) => e_.反転Y)) { if (蜘.節足左4_接続 != null) { - Sort(蜘.節足左4_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足左4_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足右4_接続 != null) { - Sort(蜘.節足右4_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足右4_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足左3_接続 != null) { - Sort(蜘.節足左3_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足左3_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足右3_接続 != null) { - Sort(蜘.節足右3_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足右3_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } } else { if (蜘.節足左3_接続 != null) { - Sort(蜘.節足左3_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足左3_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足右3_接続 != null) { - Sort(蜘.節足右3_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足右3_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足左4_接続 != null) { - Sort(蜘.節足左4_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足左4_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蜘.節足右4_接続 != null) { - Sort(蜘.節足右4_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蜘.節足右4_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } } } @@ -4823,57 +4823,57 @@ namespace SlaveMatrix Waist.WaistCD.c2.Col2 = 蠍.前腹_腹節3_節0CD.c2.Col1; if (蠍.尾_接続 != null) { - Sort(蠍.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(蠍.尾_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身後接続); } 半身中1接続.Add(蠍); 蠍前 = new DE(蠍, 蠍.前描画); if (蠍.触肢左_接続 != null) { - Sort(蠍.触肢左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.触肢左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.節足左1_接続 != null) { - Sort(蠍.節足左1_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.節足左1_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.節足左2_接続 != null) { - Sort(蠍.節足左2_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.節足左2_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.節足左3_接続 != null) { - Sort(蠍.節足左3_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.節足左3_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.節足左4_接続 != null) { - Sort(蠍.節足左4_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.節足左4_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.櫛状板左_接続 != null) { - Sort(蠍.櫛状板左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.櫛状板左_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.触肢右_接続 != null) { - Sort(蠍.触肢右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.触肢右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.節足右1_接続 != null) { - Sort(蠍.節足右1_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.節足右1_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.節足右2_接続 != null) { - Sort(蠍.節足右2_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.節足右2_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.節足右3_接続 != null) { - Sort(蠍.節足右3_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.節足右3_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.節足右4_接続 != null) { - Sort(蠍.節足右4_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.節足右4_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } if (蠍.櫛状板右_接続 != null) { - Sort(蠍.櫛状板右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身前接続); + Sort(蠍.櫛状板右_接続.Select((Element e) => e.EnumEle()).JoinEnum(), 半身前接続); } } else if (ele is 単足_植) @@ -4881,14 +4881,14 @@ namespace SlaveMatrix Is植 = true; 植 = (単足_植)ele; Sort(植.EnumEle(), 半身中1接続); - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item9 in array) + Element[] array = 腿左接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item9 in array) { 腿左接続.Remove(item9); 半身前接続.Add(item9); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item10 in array) + array = 腿右接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item10 in array) { 腿右接続.Remove(item10); 半身前接続.Add(item10); @@ -4899,14 +4899,14 @@ namespace SlaveMatrix Is粘 = true; 粘 = (単足_粘)ele; Sort(粘.EnumEle(), 半身後接続); - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item11 in array) + Element[] array = 腿左接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item11 in array) { 腿左接続.Remove(item11); 半身前接続.Add(item11); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); - foreach (Ele item12 in array) + array = 腿右接続.Where((Element e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); + foreach (Element item12 in array) { 腿右接続.Remove(item12); 半身前接続.Add(item12); @@ -4922,90 +4922,90 @@ namespace SlaveMatrix 大顎基 ele4 = 大顎基接続.GetEle<大顎基>(); if (ele4 != null) { - Inserts(ele4, 1 + ((ele4.顎左_接続 != null) ? ele4.顎左_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0) + ((ele4.顎右_接続 != null) ? ele4.顎右_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), ele4.大顎上); + Inserts(ele4, 1 + ((ele4.顎左_接続 != null) ? ele4.顎左_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0) + ((ele4.顎右_接続 != null) ? ele4.顎右_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), ele4.大顎上); } foreach (Arm人 item24 in Arm人左) { if (item24.LowerArm != null) { - Inserts(item24.LowerArm, 1 + ((item24.LowerArm.手_接続 != null) ? item24.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0) + ((item24.LowerArm.虫鎌_接続 != null) ? item24.LowerArm.虫鎌_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item24.LowerArm, item24.LowerArm.外腕描画)); + Inserts(item24.LowerArm, 1 + ((item24.LowerArm.手_接続 != null) ? item24.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0) + ((item24.LowerArm.虫鎌_接続 != null) ? item24.LowerArm.虫鎌_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item24.LowerArm, item24.LowerArm.外腕描画)); } } foreach (Arm人 item25 in Arm人右) { if (item25.LowerArm != null) { - Inserts(item25.LowerArm, 1 + ((item25.LowerArm.手_接続 != null) ? item25.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0) + ((item25.LowerArm.虫鎌_接続 != null) ? item25.LowerArm.虫鎌_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item25.LowerArm, item25.LowerArm.外腕描画)); + Inserts(item25.LowerArm, 1 + ((item25.LowerArm.手_接続 != null) ? item25.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0) + ((item25.LowerArm.虫鎌_接続 != null) ? item25.LowerArm.虫鎌_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item25.LowerArm, item25.LowerArm.外腕描画)); } } foreach (Arm翼鳥 item26 in 腕翼鳥左) { if (item26.LowerArm != null) { - Inserts(item26.LowerArm, 1 + ((item26.LowerArm.手_接続 != null) ? item26.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item26.LowerArm, item26.LowerArm.小雨覆描画)); + Inserts(item26.LowerArm, 1 + ((item26.LowerArm.手_接続 != null) ? item26.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item26.LowerArm, item26.LowerArm.小雨覆描画)); } } foreach (翼鳥 item27 in 翼鳥左) { if (item27.LowerArm != null) { - Inserts(item27.LowerArm, 1 + ((item27.LowerArm.手_接続 != null) ? item27.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item27.LowerArm, item27.LowerArm.小雨覆描画)); + Inserts(item27.LowerArm, 1 + ((item27.LowerArm.手_接続 != null) ? item27.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item27.LowerArm, item27.LowerArm.小雨覆描画)); } } foreach (Arm翼鳥 item28 in 腕翼鳥右) { if (item28.LowerArm != null) { - Inserts(item28.LowerArm, 1 + ((item28.LowerArm.手_接続 != null) ? item28.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item28.LowerArm, item28.LowerArm.小雨覆描画)); + Inserts(item28.LowerArm, 1 + ((item28.LowerArm.手_接続 != null) ? item28.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item28.LowerArm, item28.LowerArm.小雨覆描画)); } } foreach (翼鳥 item29 in 翼鳥右) { if (item29.LowerArm != null) { - Inserts(item29.LowerArm, 1 + ((item29.LowerArm.手_接続 != null) ? item29.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item29.LowerArm, item29.LowerArm.小雨覆描画)); + Inserts(item29.LowerArm, 1 + ((item29.LowerArm.手_接続 != null) ? item29.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item29.LowerArm, item29.LowerArm.小雨覆描画)); } } foreach (Arm翼獣 item30 in 腕翼獣左) { if (item30.LowerArm != null) { - Inserts(item30.LowerArm, 1 + ((item30.LowerArm.手_接続 != null) ? item30.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item30.LowerArm, item30.LowerArm.腕輪描画)); + Inserts(item30.LowerArm, 1 + ((item30.LowerArm.手_接続 != null) ? item30.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item30.LowerArm, item30.LowerArm.腕輪描画)); } } foreach (翼獣 item31 in 翼獣左) { if (item31.LowerArm != null) { - Inserts(item31.LowerArm, 1 + ((item31.LowerArm.手_接続 != null) ? item31.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item31.LowerArm, item31.LowerArm.腕輪描画)); + Inserts(item31.LowerArm, 1 + ((item31.LowerArm.手_接続 != null) ? item31.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item31.LowerArm, item31.LowerArm.腕輪描画)); } } foreach (Arm翼獣 item32 in 腕翼獣右) { if (item32.LowerArm != null) { - Inserts(item32.LowerArm, 1 + ((item32.LowerArm.手_接続 != null) ? item32.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item32.LowerArm, item32.LowerArm.腕輪描画)); + Inserts(item32.LowerArm, 1 + ((item32.LowerArm.手_接続 != null) ? item32.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item32.LowerArm, item32.LowerArm.腕輪描画)); } } foreach (翼獣 item33 in 翼獣右) { if (item33.LowerArm != null) { - Inserts(item33.LowerArm, 1 + ((item33.LowerArm.手_接続 != null) ? item33.LowerArm.手_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item33.LowerArm, item33.LowerArm.腕輪描画)); + Inserts(item33.LowerArm, 1 + ((item33.LowerArm.手_接続 != null) ? item33.LowerArm.手_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item33.LowerArm, item33.LowerArm.腕輪描画)); } } foreach (脚人 item34 in 脚人左) { if (item34.Leg != null) { - Inserts(item34.Leg, 1 + ((item34.Leg.足_接続 != null) ? item34.Leg.足_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item34.Leg, item34.Leg.外描画)); + Inserts(item34.Leg, 1 + ((item34.Leg.足_接続 != null) ? item34.Leg.足_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item34.Leg, item34.Leg.外描画)); } } foreach (脚人 item35 in 脚人右) { if (item35.Leg != null) { - Inserts(item35.Leg, 1 + ((item35.Leg.足_接続 != null) ? item35.Leg.足_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item35.Leg, item35.Leg.外描画)); + Inserts(item35.Leg, 1 + ((item35.Leg.足_接続 != null) ? item35.Leg.足_接続.Select((Element f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item35.Leg, item35.Leg.外描画)); } } foreach (脚人 item36 in 脚人左) @@ -5028,7 +5028,7 @@ namespace SlaveMatrix { if (e.ConnectionType == ConnectionInfo.LowerArm_人_虫鎌_接続) { - int num = e.Par.EnumEle().Count((Ele f) => f.Par == e.Par); + int num = e.Par.EnumEle().Count((Element f) => f.Par == e.Par); Inserts(e.Par, 2 + num, e)?.Remove(e); } } @@ -5036,22 +5036,22 @@ namespace SlaveMatrix { if (e.ConnectionType == ConnectionInfo.LowerArm_人_虫鎌_接続) { - int num = e.Par.EnumEle().Count((Ele f) => f.Par == e.Par); + int num = e.Par.EnumEle().Count((Element f) => f.Par == e.Par); 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.Chest_肩左_接続); + Element ele5 = 腕左.LastOrDefault((Element e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.Chest_肩左_接続); if (ele5 != null) { LowerArm以降左.Add(ele5); } - HashSet hashSet = new HashSet(); + HashSet hashSet = new HashSet(); foreach (蝙通常 item38 in 蝙通常.Where((蝙通常 e) => e.UpperArm.Par != null && e.UpperArm.Par.ConnectionType == ConnectionInfo.Chest_肩左_接続)) { hashSet.Add(item38.UpperArm.飛膜); hashSet.Add(item38.手.飛膜); } - foreach (Ele item39 in 腕左) + foreach (Element item39 in 腕左) { if (hashSet.Contains(item39) || (item39 is DE && ((DE)item39).Par is 手_蝙)) { @@ -5062,15 +5062,15 @@ namespace SlaveMatrix LowerArm以降左.Add(item39); } } - foreach (Ele item40 in LowerArm以降左) + foreach (Element item40 in LowerArm以降左) { 腕左.Remove(item40); } - foreach (Ele item41 in 肩左飛膜) + foreach (Element item41 in 肩左飛膜) { 腕左.Remove(item41); } - ele5 = 腕右.LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.Chest_肩右_接続); + ele5 = 腕右.LastOrDefault((Element e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.Chest_肩右_接続); if (ele5 != null) { LowerArm以降右.Add(ele5); @@ -5081,7 +5081,7 @@ namespace SlaveMatrix hashSet.Add(item42.UpperArm.飛膜); hashSet.Add(item42.手.飛膜); } - foreach (Ele item43 in 腕右) + foreach (Element item43 in 腕右) { if (hashSet.Contains(item43) || (item43 is DE && ((DE)item43).Par is 手_蝙)) { @@ -5092,11 +5092,11 @@ namespace SlaveMatrix LowerArm以降右.Add(item43); } } - foreach (Ele item44 in LowerArm以降右) + foreach (Element item44 in LowerArm以降右) { 腕右.Remove(item44); } - foreach (Ele item45 in 肩右飛膜) + foreach (Element item45 in 肩右飛膜) { 腕右.Remove(item45); } @@ -5112,15 +5112,15 @@ namespace SlaveMatrix 肩右飛膜.Add(item14); 腕右.Remove(item14); } - foreach (Ele item46 in 腰後左接続.Where((Ele e) => e.ConnectionType == ConnectionInfo.四足脇_UpperArm_接続 || bod.半身前接続.Contains(e.Par))) + foreach (Element item46 in 腰後左接続.Where((Element e) => e.ConnectionType == ConnectionInfo.四足脇_UpperArm_接続 || bod.半身前接続.Contains(e.Par))) { 半身前接続.Add(item46); } - foreach (Ele item47 in 腰後右接続.Where((Ele e) => e.ConnectionType == ConnectionInfo.四足脇_UpperArm_接続 || bod.半身前接続.Contains(e.Par))) + foreach (Element item47 in 腰後右接続.Where((Element e) => e.ConnectionType == ConnectionInfo.四足脇_UpperArm_接続 || bod.半身前接続.Contains(e.Par))) { 半身前接続.Add(item47); } - foreach (Ele item48 in 半身前接続) + foreach (Element item48 in 半身前接続) { 腰後左接続.Remove(item48); 腰後右接続.Remove(item48); @@ -5129,8 +5129,8 @@ namespace SlaveMatrix 獣LowerArm LowerArm右l = ((腕獣右.Count > 0) ? 腕獣右[0].LowerArm : null); if (!Is蠍 && !Is蜘) { - Ele[] array = 半身前接続.Where((Ele e) => (e is LowerArm && LowerArm左l != e && LowerArm右l != e) || e is UpperArm || e is 触肢 || (e.ConnectionType == ConnectionInfo.四足脇_UpperArm_接続 && e is Leg)).ToArray(); - foreach (Ele item15 in array) + Element[] array = 半身前接続.Where((Element e) => (e is LowerArm && LowerArm左l != e && LowerArm右l != e) || e is UpperArm || e is 触肢 || (e.ConnectionType == ConnectionInfo.四足脇_UpperArm_接続 && e is Leg)).ToArray(); + foreach (Element item15 in array) { 半身前接続.Remove(item15); 半身中2接続.Add(item15); @@ -5182,8 +5182,8 @@ namespace SlaveMatrix } 耳左 = 頭.耳左_接続.GetEle<耳>(); 耳右 = 頭.耳右_接続.GetEle<耳>(); - IEnumerable src = 顔触覚左接続.Concat(触覚左接続); - IEnumerable src2 = 顔触覚右接続.Concat(触覚右接続); + IEnumerable src = 顔触覚左接続.Concat(触覚左接続); + IEnumerable src2 = 顔触覚右接続.Concat(触覚右接続); 触覚甲左 = src.GetEle<触覚_甲>(); 触覚甲右 = src2.GetEle<触覚_甲>(); if (触覚甲左 == null) @@ -5197,7 +5197,7 @@ namespace SlaveMatrix where e.Par != null && e.Par is 長物_鯨 && e is 尾_鯨 select new 鯨色更新((長物_鯨)e.Par, (尾_鯨)e); 飛膜色更新 = 蝙通常.Select((蝙通常 e) => new 飛膜色更新(e.UpperArm.飛膜, e.手.飛膜)); - 色更新 = Elements.Where((Ele e) => !bod.頭色更新.Contains(e) && !bod.ドレス色更新.Contains(e) && !bod.鯨色更新.Any((鯨色更新 f) => f.Contains(e))); + 色更新 = Elements.Where((Element e) => !bod.頭色更新.Contains(e) && !bod.ドレス色更新.Contains(e) && !bod.鯨色更新.Any((鯨色更新 f) => f.Contains(e))); Is双眉 = 眉左 != null; Is単眉 = 単眼眉 != null; Is人耳 = 耳左 != null; @@ -5246,11 +5246,11 @@ namespace SlaveMatrix 舌_表示 = false; if (Is頭頂_宇) { - foreach (Ele item51 in 顔触覚左接続) + foreach (Element item51 in 顔触覚左接続) { item51.接続(頭.触覚左_接続点); } - foreach (Ele item52 in 顔触覚右接続) + foreach (Element item52 in 顔触覚右接続) { item52.接続(頭.触覚右_接続点); } @@ -5277,7 +5277,7 @@ namespace SlaveMatrix 紅潮.X0Y0_紅潮線右.AngleBase = -20.0; } 染み_人 = new 染み_人(disUnit, 配色指定.N0, Cha.ColorSet, Med, new 染み_人D()); - 染み_人.サイズ = Elements.Sum((Ele e) => e.サイズ) / (double)Elements.Length; + 染み_人.サイズ = Elements.Sum((Element e) => e.サイズ) / (double)Elements.Length; 染み_人.Intensity = 0.0; Vector2D positionCont = DataConsts.Vec2DUnitY * -0.03; Vector2D positionCont2 = DataConsts.Vec2DUnitY * 0.03; @@ -5305,7 +5305,7 @@ namespace SlaveMatrix 性器精液_獣.精液配色(Sta.GameData.配色); 肛門精液_獣.精液配色(Sta.GameData.配色); 染み_獣 = new 染み_獣(disUnit, 配色指定.N0, Cha.ColorSet, Med, new 染み_獣D()); - 染み_獣.サイズ = Elements.Sum((Ele e) => e.サイズ) / (double)Elements.Length; + 染み_獣.サイズ = Elements.Sum((Element e) => e.サイズ) / (double)Elements.Length; 染み_獣.Intensity = 0.0; if (Chest_獣.脇左_接続.IsEle<四足脇>()) { @@ -5455,7 +5455,7 @@ namespace SlaveMatrix SetWaist(); if (背中接続.Count + 頭頂左後接続.Count + 頭頂右後接続.Count + 胸上左接続.Count + 胸上右接続.Count + 胸下左接続.Count + 胸下右接続.Count + 胴後左接続.Count + 胴後右接続.Count + 後腕左s.Length + 後腕右s.Length > 0) { - EIChest = new EleI(Med); + EIChest = new ElementInstance(Med); EIChest.AddRange(背中接続); EIChest.AddRange(頭頂左後接続); EIChest.AddRange(頭頂右後接続); @@ -5465,13 +5465,13 @@ namespace SlaveMatrix EIChest.AddRange(胸下右接続); EIChest.AddRange(胴後左接続); EIChest.AddRange(胴後右接続); - List[] array4 = 後腕左s; - foreach (List es in array4) + List[] array4 = 後腕左s; + foreach (List es in array4) { EIChest.AddRange(es); } array4 = 後腕右s; - foreach (List es2 in array4) + foreach (List es2 in array4) { EIChest.AddRange(es2); } @@ -5505,14 +5505,14 @@ namespace SlaveMatrix { array5[n].脇描画(are); } - List[] array6 = bod.後腕左s; - foreach (List es3 in array6) + List[] array6 = bod.後腕左s; + foreach (List es3 in array6) { es3.描画0(are); es3.描画1(are); } array6 = bod.後腕右s; - foreach (List es4 in array6) + foreach (List es4 in array6) { es4.描画0(are); es4.描画1(are); @@ -5523,7 +5523,7 @@ namespace SlaveMatrix } if (後髪接続.Count > 0) { - EI髪 = new EleI(Med); + EI髪 = new ElementInstance(Med); EI髪.AddRange(後髪接続); EI髪.描画処理 = delegate(RenderArea are) { @@ -5535,7 +5535,7 @@ namespace SlaveMatrix } if (腰後左接続.Count + 腰後右接続.Count > 0) { - EIWaist = new EleI(Med); + EIWaist = new ElementInstance(Med); EIWaist.AddRange(腰後左接続); EIWaist.AddRange(腰後右接続); EIWaist.描画処理 = delegate(RenderArea are) @@ -5550,7 +5550,7 @@ namespace SlaveMatrix } if (尾接続.Count + 半身後接続.Count > 0) { - EI半後 = new EleI(Med); + EI半後 = new ElementInstance(Med); EI半後.AddRange(尾接続); EI半後.AddRange(半身後接続); EI半後.描画処理 = delegate(RenderArea are) @@ -5565,7 +5565,7 @@ namespace SlaveMatrix } if (半身中1接続.Count > 0) { - EI半中1 = new EleI(Med); + EI半中1 = new ElementInstance(Med); EI半中1.AddRange(半身中1接続); EI半中1.描画処理 = delegate(RenderArea are) { @@ -5577,7 +5577,7 @@ namespace SlaveMatrix } if (半身中2接続.Count > 0) { - EI半中2 = new EleI(Med); + EI半中2 = new ElementInstance(Med); EI半中2.AddRange(半身中2接続); EI半中2.描画処理 = delegate(RenderArea are) { @@ -5589,7 +5589,7 @@ namespace SlaveMatrix } if (半身前接続.Count > 0) { - EI半前 = new EleI(Med); + EI半前 = new ElementInstance(Med); EI半前.AddRange(半身前接続); EI半前.描画処理 = delegate(RenderArea are) { @@ -5601,7 +5601,7 @@ namespace SlaveMatrix } if (LowerArm以降左.Count + LowerArm以降右.Count > 0) { - EI腕前 = new EleI(Med); + EI腕前 = new ElementInstance(Med); EI腕前.AddRange(LowerArm以降左); EI腕前.AddRange(LowerArm以降右); EI腕前.描画処理 = delegate(RenderArea are) @@ -5638,7 +5638,7 @@ namespace SlaveMatrix } if (腿左接続.Count + 腿右接続.Count > 0) { - EI腿 = new EleI(Med); + EI腿 = new ElementInstance(Med); EI腿.AddRange(腿左接続); EI腿.AddRange(腿右接続); EI腿.描画処理 = delegate(RenderArea are) @@ -9201,17 +9201,17 @@ namespace SlaveMatrix 腰肌_人.陰毛_ハートCD.不透明度 = Cha.CharacterData.現陰毛.Inverse() * Cha.CharacterData.最陰毛濃度; } - public Ele GetHitEle(Color hc) + public Element GetHitEle(Color hc) { - return EnumAllEle().FirstOrDefault((Ele e) => e.Body.IsHit(ref hc)); + return EnumAllEle().FirstOrDefault((Element e) => e.Body.IsHit(ref hc)); } public bool IsHit(Color hc) { - return EnumAllEle().Any((Ele e) => e.Body.IsHit(ref hc)); + return EnumAllEle().Any((Element e) => e.Body.IsHit(ref hc)); } - public IEnumerable EnumAllEle() + public IEnumerable EnumAllEle() { return Elements.Concat(from e in Elements.GetEles() select e.飛膜).Concat(from e in Elements.GetEles<手_蝙>() @@ -9221,7 +9221,7 @@ namespace SlaveMatrix public void Join() { - Ele[] array = Elements; + Element[] array = Elements; for (int i = 0; i < array.Length; i++) { array[i].接続PA(); @@ -9254,7 +9254,7 @@ namespace SlaveMatrix } if (色更新 != null) { - foreach (Ele item4 in 色更新) + foreach (Element item4 in 色更新) { item4.色更新(); } @@ -9275,23 +9275,23 @@ namespace SlaveMatrix public void Update() { - foreach (EleI ei in eis) + foreach (ElementInstance ei in eis) { ei.Updatef = true; } } - public bool Contains(Ele e) + public bool Contains(Element e) { - return eis.Any((EleI f) => f.ElesH.Contains(e)); + return eis.Any((ElementInstance f) => f.ElesH.Contains(e)); } - public bool IsUpdate(Ele e) + public bool IsUpdate(Element e) { - return eis.Any((EleI f) => f.IsUpdate(e)); + return eis.Any((ElementInstance f) => f.IsUpdate(e)); } - public List Inserts(Ele io, int i, Ele e) + public List Inserts(Element io, int i, Element e) { int num; if ((num = 後髪接続.IndexOf(io)) > -1) @@ -9454,8 +9454,8 @@ namespace SlaveMatrix 半身前接続.Insert((num + i).Clamp(0, 半身前接続.Count), e); return 半身前接続; } - List[] array = 後腕左s; - foreach (List list in array) + List[] array = 後腕左s; + foreach (List list in array) { if ((num = list.IndexOf(io)) > -1) { @@ -9464,7 +9464,7 @@ namespace SlaveMatrix } } array = 後腕右s; - foreach (List list2 in array) + foreach (List list2 in array) { if ((num = list2.IndexOf(io)) > -1) { @@ -9477,17 +9477,17 @@ namespace SlaveMatrix public キスマーク Addキスマーク(Vector2D cp, Color hc) { - Ele he = GetHitEle(hc); + Element he = GetHitEle(hc); スタンプK[] array = キスマーク; for (int i = 0; i < array.Length; i++) { キスマーク result; if ((result = array[i].Add(cp, hc, he)) != null) { - EleI eleI = eis.FirstOrDefault((EleI e) => e.ElesH.Contains(he)); - if (eleI != null) + ElementInstance elementInstance = eis.FirstOrDefault((ElementInstance e) => e.ElesH.Contains(he)); + if (elementInstance != null) { - eleI.Updatef = true; + elementInstance.Updatef = true; } return result; } @@ -9497,7 +9497,7 @@ namespace SlaveMatrix public void Add鞭痕(Vector2D cp, Color hc) { - Ele he = GetHitEle(hc); + Element he = GetHitEle(hc); if (he is LowerArm || he is Neck) { return; @@ -9507,10 +9507,10 @@ namespace SlaveMatrix { if (array[i].Add(cp, hc, he)) { - EleI eleI = eis.FirstOrDefault((EleI e) => e.ElesH.Contains(he)); - if (eleI != null) + ElementInstance elementInstance = eis.FirstOrDefault((ElementInstance e) => e.ElesH.Contains(he)); + if (elementInstance != null) { - eleI.Updatef = true; + elementInstance.Updatef = true; } break; } @@ -9541,12 +9541,12 @@ namespace SlaveMatrix { array2[i].Dispose(); } - Ele[] array3 = Elements; + Element[] array3 = Elements; for (int i = 0; i < array3.Length; i++) { array3[i].Dispose(); } - foreach (EleI ei in eis) + foreach (ElementInstance ei in eis) { ei.Dispose(); } @@ -9576,7 +9576,7 @@ namespace SlaveMatrix { cb0 = カーソル != null; cb1 = cb0 && !カーソル.コキ; - Ele[] array = Elements; + Element[] array = Elements; for (int i = 0; i < array.Length; i++) { array[i].接続PA(); @@ -9612,14 +9612,14 @@ namespace SlaveMatrix item3.色更新(); } } - foreach (Ele item4 in 色更新) + foreach (Element item4 in 色更新) { if (!Contains(item4) || IsUpdate(item4)) { item4.色更新(); } } - foreach (EleI ei in eis) + foreach (ElementInstance ei in eis) { ei.Update(); } @@ -9633,7 +9633,7 @@ namespace SlaveMatrix Col.GetSkinGrad(ref c, out var ret); ret.Col1 = col; ret.GetRep(out var ret2); - foreach (Ele item in EnumAllEle()) + foreach (Element item in EnumAllEle()) { foreach (FieldInfo item2 in from f in item.GetType().GetFields() where f.FieldType.ToString() == Sta.cdt @@ -9730,7 +9730,7 @@ namespace SlaveMatrix else if (後腕左s.Length != 0) { n = 後腕左s.Length - n; - Ele item = 後腕左s[n][1]; + Element item = 後腕左s[n][1]; 後腕左s[n].RemoveAt(1); 後腕左s[n].Add(item); } @@ -9745,7 +9745,7 @@ namespace SlaveMatrix else if (後腕左s.Length != 0) { n = 後腕左s.Length - n; - Ele item2 = 後腕左s[n].Last(); + Element item2 = 後腕左s[n].Last(); 後腕左s[n].RemoveAt(後腕左s[n].Count - 1); 後腕左s[n].Insert(1, item2); } @@ -9770,7 +9770,7 @@ namespace SlaveMatrix else if (後腕右s.Length != 0) { n = 後腕左s.Length - n; - Ele item = 後腕右s[n][1]; + Element item = 後腕右s[n][1]; 後腕右s[n].RemoveAt(1); 後腕右s[n].Add(item); } @@ -9785,7 +9785,7 @@ namespace SlaveMatrix else if (後腕右s.Length != 0) { n = 後腕左s.Length - n; - Ele item2 = 後腕右s[n].Last(); + Element item2 = 後腕右s[n].Last(); 後腕右s[n].RemoveAt(後腕右s[n].Count - 1); 後腕右s[n].Insert(1, item2); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs b/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs index d6640eb..455dbc2 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs @@ -6,7 +6,7 @@ namespace SlaveMatrix { private TrainingUI 調教UI; - public Ele Ele; + public Element Element; private UsageStatus v; @@ -33,20 +33,20 @@ namespace SlaveMatrix v = value; if (v == UsageStatus.InUse) { - Ele.SetHitFalse(); + Element.SetHitFalse(); } else { - Ele.SetHitTrue(); + Element.SetHitTrue(); } } } - public CM(ModeEventDispatcher Med, TrainingUI 調教UI, Ele Ele) + public CM(ModeEventDispatcher Med, TrainingUI 調教UI, Element Element) { this.調教UI = 調教UI; - this.Ele = Ele; - foreach (ShapePart item in Ele.Body.EnumAllPar()) + this.Element = Element; + foreach (ShapePart item in Element.Body.EnumAllPar()) { item.HitColor = Med.GetUniqueColor(); } @@ -54,9 +54,9 @@ namespace SlaveMatrix public void Reset() { - Ele.Xi = 0; - Ele.Yi = 0; - Ele.Intensity = 0.5; + Element.Xi = 0; + Element.Yi = 0; + Element.Intensity = 0.5; 使用状態 = UsageStatus.Standby; Under = false; 描画Show = true; @@ -70,10 +70,10 @@ namespace SlaveMatrix { if (Show && Under && 描画Show) { - Ele.Body.JoinPA(); - Ele.色更新(); + Element.Body.JoinPA(); + Element.色更新(); 調教UI.持ち手下描画(); - Ele.描画0(Are); + Element.描画0(Are); } } @@ -81,7 +81,7 @@ namespace SlaveMatrix { if (Show && Under && 描画Show) { - Ele.描画1(Are); + Element.描画1(Are); 調教UI.持ち手上描画(); } } @@ -90,9 +90,9 @@ namespace SlaveMatrix { if (Show && Under && 描画Show) { - Ele.Body.JoinPA(); - Ele.色更新(); - Ele.描画0(Are); + Element.Body.JoinPA(); + Element.色更新(); + Element.描画0(Are); } } @@ -100,7 +100,7 @@ namespace SlaveMatrix { if (Show && Under && 描画Show) { - Ele.描画1(Are); + Element.描画1(Are); } } @@ -108,10 +108,10 @@ namespace SlaveMatrix { if (Show && !Under && StaShow) { - Ele.Body.JoinPA(); - Ele.色更新(); - Ele.描画0(Are); - Ele.描画1(Are); + Element.Body.JoinPA(); + Element.色更新(); + Element.描画0(Are); + Element.描画1(Are); } } @@ -120,10 +120,10 @@ namespace SlaveMatrix if (Show && !Under && DraShow) { 調教UI.持ち手下描画(); - Ele.Body.JoinPA(); - Ele.色更新(); - Ele.描画0(Are); - Ele.描画1(Are); + Element.Body.JoinPA(); + Element.色更新(); + Element.描画0(Are); + Element.描画1(Are); 調教UI.持ち手上描画(); } } @@ -132,10 +132,10 @@ namespace SlaveMatrix { if (Show && !Under && DraShow) { - Ele.Body.JoinPA(); - Ele.色更新(); - Ele.描画0(Are); - Ele.描画1(Are); + Element.Body.JoinPA(); + Element.色更新(); + Element.描画0(Are); + Element.描画1(Are); } } } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs index 7b0e56d..f47388f 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs @@ -13,10 +13,10 @@ namespace SlaveMatrix { private sealed class BodyPartRef { - public EleI EI; + public ElementInstance EI; public bool Heavy; - public BodyPartRef(EleI ei, bool heavy) + public BodyPartRef(ElementInstance ei, bool heavy) { this.EI = ei; this.Heavy = heavy; @@ -1678,7 +1678,7 @@ namespace SlaveMatrix }; Motions.Add(Swallow.GetHashCode().ToString(), Swallow); Motions.Drive(Med.FPSF); - Med.SetUniqueColor(Body.Elements.Select((Ele e) => e.Body.EnumAllPar()).JoinEnum()); + Med.SetUniqueColor(Body.Elements.Select((Element e) => e.Body.EnumAllPar()).JoinEnum()); 汗掻き = new Sweat(Med, Are, this, Motions); 汗かき = 汗掻き.汗かき; Body.汗掻き = 汗掻き; @@ -1696,7 +1696,7 @@ namespace SlaveMatrix { Body.Dispose(); 汗掻き.Dispose(); - ModeEventDispatcher.RemUniqueColor(Body.Elements.Select((Ele e) => e.Body.EnumAllPar()).JoinEnum()); + ModeEventDispatcher.RemUniqueColor(Body.Elements.Select((Element e) => e.Body.EnumAllPar()).JoinEnum()); } public void Set衣装(IEnumerable 衣装) diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Element.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs rename to SlaveMatrix/SlaveMatrix/GameClasses/Element.cs index 4fdddde..6dfc597 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Element.cs @@ -6,9 +6,9 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class Ele : IDisposable + public class Element : IDisposable { - public Ele Par; + public Element Par; public ConnectionInfo ConnectionType; @@ -1000,7 +1000,7 @@ namespace SlaveMatrix 角度B = 0.0; } - public void SetAngle(Ele e) + public void SetAngle(Element e) { foreach (var item in Body.EnumAllPar().Zip(e.Body.EnumAllPar(), (ShapePart a0, ShapePart a1) => new { a0, a1 })) { @@ -1013,22 +1013,22 @@ namespace SlaveMatrix { } - public virtual IEnumerable EnumEle() + public virtual IEnumerable EnumEle() { yield return this; foreach (FieldInfo item in from e in ThisType.GetFields() where e.FieldType.ToString() == Sta.at select e) { - Ele[] array = (Ele[])item.GetValue(this); + Element[] array = (Element[])item.GetValue(this); if (array == null) { continue; } - Ele[] array2 = array; - foreach (Ele ele in array2) + Element[] array2 = array; + foreach (Element ele in array2) { - foreach (Ele item2 in ele.EnumEle()) + foreach (Element item2 in ele.EnumEle()) { yield return item2; } @@ -1036,12 +1036,12 @@ namespace SlaveMatrix } } - public IEnumerable EnumConnectionType(ConnectionInfo 接続情報) + public IEnumerable EnumConnectionType(ConnectionInfo 接続情報) { - Ele[] array = (Ele[])ThisType.GetField(接続情報.ToString().Remove(0, ThisType.Name.Length + 1)).GetValue(this); + Element[] array = (Element[])ThisType.GetField(接続情報.ToString().Remove(0, ThisType.Name.Length + 1)).GetValue(this); if (array != null) { - Ele[] array2 = array; + Element[] array2 = array; for (int i = 0; i < array2.Length; i++) { yield return array2[i]; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs b/SlaveMatrix/SlaveMatrix/GameClasses/ElementData.cs similarity index 73% rename from SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs rename to SlaveMatrix/SlaveMatrix/GameClasses/ElementData.cs index 8fb36ae..de4f5bd 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/ElementData.cs @@ -8,9 +8,9 @@ using System.Runtime.Serialization; namespace SlaveMatrix { [Serializable] - public class EleD + public class ElementData { - public EleD Par; + public ElementData Par; public ConnectionInfo 接続情報; @@ -87,12 +87,12 @@ namespace SlaveMatrix [OnDeserialized] private void OnDeserialized(StreamingContext _) => ThisType = GetType(); - public virtual Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) + public virtual Element GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return null; } - public virtual Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) + public virtual Element GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return null; } @@ -111,21 +111,21 @@ namespace SlaveMatrix return flag; } - public virtual IEnumerable EnumEleD() + public virtual IEnumerable EnumEleD() { yield return this; foreach (FieldInfo item in from e in ThisType.GetFields() where e.FieldType.ToString() == Sta.lt select e) { - List list = (List)item.GetValue(this); + List list = (List)item.GetValue(this); if (list == null) { continue; } - foreach (EleD item2 in list) + foreach (ElementData item2 in list) { - foreach (EleD item3 in item2.EnumEleD()) + foreach (ElementData item3 in item2.EnumEleD()) { yield return item3; } @@ -133,19 +133,19 @@ namespace SlaveMatrix } } - public EleD Copy() + public ElementData Copy() { - EleD r = (EleD)Activator.CreateInstance(ThisType); + ElementData r = (ElementData)Activator.CreateInstance(ThisType); FieldInfo[] fields = ThisType.GetFields(); - EleD ec; + ElementData ec; foreach (FieldInfo fieldInfo in fields) { if (fieldInfo.FieldType.ToString() == Sta.lt) { - List list = (List)fieldInfo.GetValue(this); + List list = (List)fieldInfo.GetValue(this); if (list != null) { - fieldInfo.SetValue(r, list.Select(delegate(EleD e) + fieldInfo.SetValue(r, list.Select(delegate(ElementData e) { ec = e.Copy(); ec.Par = r; @@ -161,30 +161,30 @@ namespace SlaveMatrix return r; } - public EleD Copy_以下無() + public ElementData Copy_以下無() { - EleD eleD = (EleD)Activator.CreateInstance(ThisType); + ElementData elementData = (ElementData)Activator.CreateInstance(ThisType); FieldInfo[] fields = ThisType.GetFields(); foreach (FieldInfo fieldInfo in fields) { if (!fieldInfo.Name.Contains("_接続")) { - fieldInfo.SetValue(eleD, fieldInfo.GetValue(this)); + fieldInfo.SetValue(elementData, fieldInfo.GetValue(this)); } } - return eleD; + return elementData; } - public EleD Get逆() + public ElementData Get逆() { - EleD eleD = Copy(); - foreach (EleD item in eleD.EnumEleD()) + ElementData elementData = Copy(); + foreach (ElementData item in elementData.EnumEleD()) { item.右 = !item.右; item.角度B = 0.0 - item.角度B; item.角度C = 0.0 - item.角度C; } - return eleD; + return elementData; } public IEnumerable Enum接続情報() @@ -200,18 +200,18 @@ namespace SlaveMatrix } } - public void 接続(ConnectionInfo 接続情報, EleD ed) + public void 接続(ConnectionInfo 接続情報, ElementData ed) { string text = ThisType.Name.Remove(ThisType.Name.Length - 1); var methodName = 接続情報.ToString().Remove(0, text.Length).Replace("_", ""); MethodInfo method = ThisType.GetMethod(接続情報.ToString().Remove(0, text.Length).Replace("_", "")); - object[] parameters = new EleD[1] { ed }; + object[] parameters = new ElementData[1] { ed }; method.Invoke(this, parameters); } - public List Get接続(ConnectionInfo 接続情報) + public List Get接続(ConnectionInfo 接続情報) { - return (List)ThisType.GetField(接続情報.ToString().Remove(0, ThisType.Name.Length)).GetValue(this); + return (List)ThisType.GetField(接続情報.ToString().Remove(0, ThisType.Name.Length)).GetValue(this); } } } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/ElementInstance.cs similarity index 79% rename from SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs rename to SlaveMatrix/SlaveMatrix/GameClasses/ElementInstance.cs index 129306e..cbf5b2e 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/ElementInstance.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class EleI : IDisposable + public class ElementInstance : IDisposable { public Vector2D Position = DataConsts.Vec2DZero; @@ -16,18 +16,18 @@ namespace SlaveMatrix public Action 描画処理; - public HashSet ElesH; + public HashSet ElesH; - public void AddRange(IEnumerable es) + public void AddRange(IEnumerable es) { - foreach (Ele e in es) + foreach (Element e in es) { ElesH.Add(e); } } - public bool IsUpdate(Ele e) + public bool IsUpdate(Element e) { if (Updatef) { @@ -36,10 +36,10 @@ namespace SlaveMatrix return false; } - public EleI(ModeEventDispatcher Med) + public ElementInstance(ModeEventDispatcher Med) { Lay = new RenderArea(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size + 0.0025, Med.DisQuality, Med.HitAccuracy); - ElesH = new HashSet(); + ElesH = new HashSet(); } public void 描画(RenderArea Are) diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs index 773d32d..3351cd3 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs @@ -2805,8 +2805,8 @@ namespace SlaveMatrix public static void SetInitialAngle(this Character Cha) { - Ele[] Elements = Cha.Body.Elements; - foreach (Ele obj in Elements) + Element[] Elements = Cha.Body.Elements; + foreach (Element obj in Elements) { obj.AngleAll = 0.0; obj.SetAngle0(); @@ -2815,13 +2815,13 @@ namespace SlaveMatrix public static void SetSymmetry(this Character Cha) { - Ele[] Elements = Cha.Body.Elements; + Element[] Elements = Cha.Body.Elements; try { - List list = new List(); - List list2 = new List(); - Ele[] array = Elements; - foreach (Ele ele in array) + List list = new List(); + List list2 = new List(); + Element[] array = Elements; + foreach (Element ele in array) { string text = ele.ConnectionType.ToString(); if (!(ele is 尾_鳥) && !ele.ConnectionType.Is左右無し()) @@ -2836,8 +2836,8 @@ namespace SlaveMatrix } } } - list.Sort((Ele x, Ele y) => x.ConnectionType.ToString().CompareTo(y.ConnectionType.ToString())); - list2.Sort((Ele x, Ele y) => x.ConnectionType.ToString().CompareTo(y.ConnectionType.ToString())); + list.Sort((Element x, Element y) => x.ConnectionType.ToString().CompareTo(y.ConnectionType.ToString())); + list2.Sort((Element x, Element y) => x.ConnectionType.ToString().CompareTo(y.ConnectionType.ToString())); if (list.Count <= list2.Count) { for (int j = 0; j < list.Count; j++) @@ -2855,7 +2855,7 @@ namespace SlaveMatrix list.Clear(); list2.Clear(); array = Elements; - foreach (Ele ele2 in array) + foreach (Element ele2 in array) { string text = ele2.ConnectionType.ToString(); if (!(ele2 is 尾_鳥) && !ele2.ConnectionType.Is左右無し()) @@ -2870,8 +2870,8 @@ namespace SlaveMatrix } } } - list.Sort((Ele x, Ele y) => x.ToString().CompareTo(y.ToString())); - list2.Sort((Ele x, Ele y) => x.ToString().CompareTo(y.ToString())); + list.Sort((Element x, Element y) => x.ToString().CompareTo(y.ToString())); + list2.Sort((Element x, Element y) => x.ToString().CompareTo(y.ToString())); if (list.Count <= list2.Count) { for (int j = 0; j < list.Count; j++) @@ -2892,13 +2892,13 @@ namespace SlaveMatrix } } - public static void 重複角度処理(this Ele e) + public static void 重複角度処理(this Element e) { int num = -1; int num2 = 0; bool flag = true; string text = e.GetType().ToString(); - foreach (Ele item in e.Par.EnumConnectionType(e.ConnectionType)) + foreach (Element item in e.Par.EnumConnectionType(e.ConnectionType)) { if (!(item.GetType().ToString() == text)) { @@ -4440,8 +4440,8 @@ namespace SlaveMatrix 腕人2.LowerArm.鎖1.反転Y = LowerArm反転Y; if (腕人2.LowerArm.虫鎌_接続 != null) { - Ele[] 虫鎌_接続 = 腕人2.LowerArm.虫鎌_接続; - foreach (Ele obj in 虫鎌_接続) + Element[] 虫鎌_接続 = 腕人2.LowerArm.虫鎌_接続; + foreach (Element obj in 虫鎌_接続) { obj.尺度XC = LowerArm尺度XC; obj.尺度C = LowerArm尺度C; @@ -4529,8 +4529,8 @@ namespace SlaveMatrix 腕人2.LowerArm.鎖1.反転Y = LowerArm反転Y; if (腕人2.LowerArm.虫鎌_接続 != null) { - Ele[] 虫鎌_接続 = 腕人2.LowerArm.虫鎌_接続; - foreach (Ele obj in 虫鎌_接続) + Element[] 虫鎌_接続 = 腕人2.LowerArm.虫鎌_接続; + foreach (Element obj in 虫鎌_接続) { obj.尺度XC = LowerArm尺度XC; obj.尺度C = LowerArm尺度C; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs b/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs index c5c51c3..6ce287c 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs @@ -10,14 +10,14 @@ namespace SlaveMatrix public static void AdjustScale(this WaistD Waist, HeadD 頭) { - foreach (EleD item in 頭.EnumEleD()) + foreach (ElementData item in 頭.EnumEleD()) { if (!(item is 後髪0D) && !(item is BackHair1D) && !(item is SideHairD) && !(item is 前髪D)) { item.尺度B *= 0.98; } } - foreach (EleD item2 in Waist.EnumEleD()) + foreach (ElementData item2 in Waist.EnumEleD()) { item2.尺度B *= 1.065; } @@ -129,7 +129,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D + ElementData eleD2 = new 獣耳D { 尺度B = 1.2 }; @@ -504,7 +504,7 @@ namespace SlaveMatrix 頭D2.Set口人(); 頭D2.Set舌短(); 頭D2.Set耳獣(); - EleD eleD2 = RNG.XS.Next(4) switch + ElementData eleD2 = RNG.XS.Next(4) switch { 0 => new 角2_牛1D(), 1 => new 角2_牛2D(), @@ -574,7 +574,7 @@ namespace SlaveMatrix 頭D2.Set口人(); 頭D2.Set舌短(); 頭D2.Set耳獣(); - EleD eleD2 = RNG.XS.Next(4) switch + ElementData eleD2 = RNG.XS.Next(4) switch { 0 => new 角2_山1D(), 1 => new 角2_山2D(), @@ -757,9 +757,9 @@ namespace SlaveMatrix { 長物_魚D 長物_魚D2 = new 長物_魚D(); WaistD2.半身接続(長物_魚D2); - EleD eleD = new 鰭_魚D(); - 長物_魚D2.左0接続(eleD); - 長物_魚D2.右0接続(eleD.Get逆()); + ElementData elementData = new 鰭_魚D(); + 長物_魚D2.左0接続(elementData); + 長物_魚D2.右0接続(elementData.Get逆()); 尾_魚D 尾_魚D2 = new 尾_魚D(); 長物_魚D2.尾接続(尾_魚D2); 尾_魚D2.尾先接続(new 尾鰭_魚D()); @@ -773,9 +773,9 @@ namespace SlaveMatrix 長物_蛇D2.くぱぁ = 1.0; 長物_蛇D2.ガード = false; } - EleD eleD = new 鰭_魚D(); - 長物_蛇D2.左接続(eleD); - 長物_蛇D2.右接続(eleD.Get逆()); + ElementData elementData = new 鰭_魚D(); + 長物_蛇D2.左接続(elementData); + 長物_蛇D2.右接続(elementData.Get逆()); Torso_蛇D Torso_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(Torso_蛇D2); 尾_ヘD 尾_ヘD2 = new 尾_ヘD(); @@ -811,9 +811,9 @@ namespace SlaveMatrix obj2.肩右接続(ShoulderD2.Get逆()); 長物_鯨D 長物_鯨D2 = new 長物_鯨D(); obj.半身接続(長物_鯨D2); - EleD eleD = new 鰭_豚D(); - 長物_鯨D2.左0接続(eleD); - 長物_鯨D2.右0接続(eleD.Get逆()); + ElementData elementData = new 鰭_豚D(); + 長物_鯨D2.左0接続(elementData); + 長物_鯨D2.右0接続(elementData.Get逆()); 尾_鯨D 尾_鯨D2 = new 尾_鯨D(); 長物_鯨D2.尾接続(尾_鯨D2); 尾_鯨D2.尾先接続(new 尾鰭_鯨D()); @@ -952,7 +952,7 @@ namespace SlaveMatrix 頭D2.Set口裂(); 頭D2.Set舌長(); 頭D2.Set耳鰭(); - EleD eleD2 = RNG.XS.Next(4) switch + ElementData eleD2 = RNG.XS.Next(4) switch { 0 => new 角2_牛1D(), 1 => new 角2_牛2D(), @@ -1028,9 +1028,9 @@ namespace SlaveMatrix obj.肩右接続(ShoulderD2.Get逆()); if (RNG.XS.NextBool()) { - EleD eleD = new 虫顎D(); - 頭D2.頬左接続(eleD); - 頭D2.頬右接続(eleD.Get逆()); + ElementData elementData = new 虫顎D(); + 頭D2.頬左接続(elementData); + 頭D2.頬右接続(elementData.Get逆()); } 多足_蜘D 多足_蜘D2 = new 多足_蜘D(); WaistD2.半身接続(多足_蜘D2); @@ -1040,10 +1040,10 @@ namespace SlaveMatrix 触肢_肢蜘D 触肢_肢蜘D2 = new 触肢_肢蜘D(); 節足_足蜘D 節足_足蜘D2 = new 節足_足蜘D(); 節足_足蜘D2.爪 = b; - EleD eleD2 = 節足_足蜘D2.Copy(); - EleD eleD3 = 節足_足蜘D2.Copy(); + ElementData eleD2 = 節足_足蜘D2.Copy(); + ElementData eleD3 = 節足_足蜘D2.Copy(); eleD3.反転Y = !尾_蜘D2.出糸; - EleD eleD4 = 節足_足蜘D2.Copy(); + ElementData eleD4 = 節足_足蜘D2.Copy(); eleD4.反転Y = eleD3.反転Y; 多足_蜘D2.触肢左接続(触肢_肢蜘D2); 多足_蜘D2.節足左1接続(節足_足蜘D2); @@ -1098,9 +1098,9 @@ namespace SlaveMatrix } if (RNG.XS.NextBool()) { - EleD eleD = new 虫顎D(); - 頭D2.頬左接続(eleD); - 頭D2.頬右接続(eleD.Get逆()); + ElementData elementData = new 虫顎D(); + 頭D2.頬左接続(elementData); + 頭D2.頬右接続(elementData.Get逆()); } 手_人D e = new 手_人D(); LowerArm_人D LowerArm_人D2 = new LowerArm_人D(); @@ -1120,9 +1120,9 @@ namespace SlaveMatrix 触肢_肢蠍D 触肢_肢蠍D2 = new 触肢_肢蠍D(); 節足_足蠍D 節足_足蠍D2 = new 節足_足蠍D(); 節足_足蠍D2.爪 = RNG.XS.NextBool(); - EleD eleD2 = 節足_足蠍D2.Copy(); - EleD eleD3 = 節足_足蠍D2.Copy(); - EleD eleD4 = 節足_足蠍D2.Copy(); + ElementData eleD2 = 節足_足蠍D2.Copy(); + ElementData eleD3 = 節足_足蠍D2.Copy(); + ElementData eleD4 = 節足_足蠍D2.Copy(); 多足_蠍D2.触肢左接続(触肢_肢蠍D2); 多足_蠍D2.節足左1接続(節足_足蠍D2); 多足_蠍D2.節足左2接続(eleD2); @@ -1135,9 +1135,9 @@ namespace SlaveMatrix 多足_蠍D2.節足右4接続(eleD4.Get逆()); if (RNG.XS.NextBool()) { - EleD eleD = new 触覚_蠍D(); - 多足_蠍D2.櫛状板左接続(eleD); - 多足_蠍D2.櫛状板右接続(eleD.Get逆()); + ElementData elementData = new 触覚_蠍D(); + 多足_蠍D2.櫛状板左接続(elementData); + 多足_蠍D2.櫛状板右接続(elementData.Get逆()); } 多足_蠍D2.尾接続(new 尾_蠍D()); WaistD2.EnumEleD().SetValuesD("タトゥ", true); @@ -1183,7 +1183,7 @@ namespace SlaveMatrix 頭D2.Set舌短(); 頭D2.Set耳尖(); 頭D2.額接続(new 角1_虫D()); - EleD eleD2 = new 角2_虫D(); + ElementData eleD2 = new 角2_虫D(); eleD2.SetValuesD("棘", true); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); @@ -1259,7 +1259,7 @@ namespace SlaveMatrix obj3.肩左接続(ShoulderD2); obj3.肩右接続(ShoulderD2.Get逆()); 植D 植D2 = new 植D(); - EleD eleD2 = SlaveMatrix.GameClasses._Con.Get花R(右: false); + ElementData eleD2 = SlaveMatrix.GameClasses._Con.Get花R(右: false); 植D2.花接続(eleD2); bool flag = RNG.XS.NextBool(); if (eleD2 is 花_百D) @@ -1289,7 +1289,7 @@ namespace SlaveMatrix 先端表示 = RNG.XS.NextBool() }; 触手_蔦D2.SetValuesD("棘", RNG.XS.NextBool()); - EleD eleD3 = (flag ? ((葉D)new 葉_披D()) : ((葉D)new 葉_心D())); + ElementData eleD3 = (flag ? ((葉D)new 葉_披D()) : ((葉D)new 葉_心D())); eleD3.尺度B *= 1.2; 触手_蔦D2.節3接続(eleD3); eleD3.尺度B *= 葉倍率; @@ -1309,7 +1309,7 @@ namespace SlaveMatrix eleD3.尺度B *= 葉倍率; 触手_蔦D2.節19接続(eleD3 = eleD3.Copy()); eleD3.尺度B *= 葉倍率; - EleD eleD4 = 触手_蔦D2.Copy(); + ElementData eleD4 = 触手_蔦D2.Copy(); obj2.翼左接続(触手_蔦D2); obj2.翼右接続(触手_蔦D2.Get逆()); obj.翼左接続(eleD4); @@ -1319,7 +1319,7 @@ namespace SlaveMatrix obj.腿右接続(腿_人D2.Get逆()); 単足_植D 単足_植D2 = new 単足_植D(); obj.半身接続(単足_植D2); - EleD eleD5 = new 尾_根D(); + ElementData eleD5 = new 尾_根D(); 単足_植D2.根外左接続(eleD5); 単足_植D2.根外右接続(eleD5.Copy()); 単足_植D2.根内左接続(eleD5.Copy()); @@ -1358,7 +1358,7 @@ namespace SlaveMatrix 頭D2.Set口人(); 頭D2.Set舌短(); 頭D2.Set耳長(); - EleD eleD2 = RNG.XS.Next(5) switch + ElementData eleD2 = RNG.XS.Next(5) switch { 0 => new 角2_山2D { @@ -1441,7 +1441,7 @@ namespace SlaveMatrix { 頭D2.Set耳長(); } - EleD eleD2 = RNG.XS.Next(8) switch + ElementData eleD2 = RNG.XS.Next(8) switch { 0 => new 角2_山1D(), 1 => new 角2_山2D(), @@ -1597,7 +1597,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D(); + ElementData eleD2 = new 獣耳D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 手_人D e = new 手_人D(); @@ -1648,7 +1648,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D + ElementData eleD2 = new 獣耳D { 尺度YB = 1.2 }; @@ -1701,7 +1701,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D(); + ElementData eleD2 = new 獣耳D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 手_人D e = new 手_人D(); @@ -1763,17 +1763,17 @@ namespace SlaveMatrix 腿_人D2.Leg接続(Leg_人D2); WaistD2.腿左接続(腿_人D2); WaistD2.腿右接続(腿_人D2.Get逆()); - EleD eleD; + ElementData elementData; if (RNG.XS.Next(2) == 0) { - eleD = new 尾_ヘD(); - eleD.尺度B = 0.6; + elementData = new 尾_ヘD(); + elementData.尺度B = 0.6; } else { - eleD = new 尾_龍D(); + elementData = new 尾_龍D(); } - WaistD2.尾接続(eleD); + WaistD2.尾接続(elementData); WaistD2.EnumEleD().SetValuesD("竜性", true); WaistD2.EnumEleD().SetValuesD("棘", false); WaistD2.EnumEleD().SetValuesD("肘2", false); @@ -1803,7 +1803,7 @@ namespace SlaveMatrix 頭D2.Set鼻人(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD e; + ElementData e; if (RNG.XS.NextBool()) { e = ((RNG.XS.Next(2) != 0) ? ((角1D)new 角1_鬼D()) : ((角1D)new 角1_一D())); @@ -1916,7 +1916,7 @@ namespace SlaveMatrix 頭D2.Set鼻人(); 頭D2.Set口R(); 頭D2.Set舌短(); - EleD e; + ElementData e; if (RNG.XS.NextBool()) { e = ((RNG.XS.Next(2) != 0) ? ((角1D)new 角1_鬼D()) : ((角1D)new 角1_一D())); @@ -2031,7 +2031,7 @@ namespace SlaveMatrix 頭D2.Set鼻人(); 頭D2.Set口R(); 頭D2.Set舌短(); - EleD e; + ElementData e; if (RNG.XS.NextBool()) { e = ((RNG.XS.Next(2) != 0) ? ((角1D)new 角1_鬼D()) : ((角1D)new 角1_一D())); @@ -2124,7 +2124,7 @@ namespace SlaveMatrix 頭D2.Set鼻人(); 頭D2.Set口R(); 頭D2.Set舌短(); - EleD e; + ElementData e; if (RNG.XS.NextBool()) { e = ((RNG.XS.Next(2) != 0) ? ((角1D)new 角1_鬼D()) : ((角1D)new 角1_一D())); @@ -2234,7 +2234,7 @@ namespace SlaveMatrix 頭D2.Set舌長(); 頭D2.Set耳鰭(); 頭D2.Set耳尖(); - EleD e; + ElementData e; if (RNG.XS.NextBool()) { e = ((RNG.XS.Next(2) != 0) ? ((角1D)new 角1_鬼D()) : ((角1D)new 角1_一D())); @@ -2282,7 +2282,7 @@ namespace SlaveMatrix 頭D2.Set口裂(); 頭D2.Set舌短(); 頭D2.Set耳人(); - EleD eleD2 = RNG.XS.Next(5) switch + ElementData eleD2 = RNG.XS.Next(5) switch { 0 => new 角2_山1D(), 1 => new 角2_山2D(), @@ -2358,7 +2358,7 @@ namespace SlaveMatrix 頭D2.Set舌長(); 頭D2.Set耳鰭(); 頭D2.Set耳尖(); - EleD eleD2 = new 角2_山2D(); + ElementData eleD2 = new 角2_山2D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); @@ -2474,7 +2474,7 @@ namespace SlaveMatrix break; } 植D 植D2 = new 植D(); - EleD eleD2 = SlaveMatrix.GameClasses._Con.Get花R(右: false); + ElementData eleD2 = SlaveMatrix.GameClasses._Con.Get花R(右: false); 植D2.花接続(eleD2); bool flag = RNG.XS.NextBool(); if (eleD2 is 花_百D) @@ -2510,7 +2510,7 @@ namespace SlaveMatrix ChestD2.肩右接続(ShoulderD2.Get逆()); if (b1) { - EleD eleD3 = new 前翅_羽D + ElementData eleD3 = new 前翅_羽D { 尺度B = 0.9 }; @@ -2525,7 +2525,7 @@ namespace SlaveMatrix } else { - EleD eleD3 = new 前翅_蝶D + ElementData eleD3 = new 前翅_蝶D { 尺度B = 0.9, 水青 = b2 @@ -2544,20 +2544,20 @@ namespace SlaveMatrix { if (b1) { - EleD eleD3 = new 触覚_線D(); + ElementData eleD3 = new 触覚_線D(); eleD3.尺度YB = 0.4; 頭D2.触覚左接続(eleD3); 頭D2.触覚右接続(eleD3.Get逆()); } else if (b2) { - EleD eleD3 = new 触覚_蛾D(); + ElementData eleD3 = new 触覚_蛾D(); 頭D2.触覚左接続(eleD3); 頭D2.触覚右接続(eleD3.Get逆()); } else { - EleD eleD3 = new 触覚_蝶D(); + ElementData eleD3 = new 触覚_蝶D(); 頭D2.触覚左接続(eleD3); 頭D2.触覚右接続(eleD3.Get逆()); } @@ -2593,7 +2593,7 @@ namespace SlaveMatrix { 頭D2 = 首D2.Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); - EleD eleD2 = new 角2_鬼D(); + ElementData eleD2 = new 角2_鬼D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); } @@ -3146,7 +3146,7 @@ namespace SlaveMatrix 頭D2.Set口人(); 頭D2.Set舌短(); 頭D2.Set耳獣(); - EleD eleD2 = new 角2_山2D + ElementData eleD2 = new 角2_山2D { 尺度YB = 1.5 }; @@ -3431,7 +3431,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D(); + ElementData eleD2 = new 獣耳D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); eleD2 = RNG.XS.Next(3) switch @@ -3506,7 +3506,7 @@ namespace SlaveMatrix 頭D2.Set耳人(); if (b) { - EleD e2 = (RNG.XS.NextBool() ? ((尾D)new 尾_牛D()) : ((尾D)new 尾_蛇D())); + ElementData e2 = (RNG.XS.NextBool() ? ((尾D)new 尾_牛D()) : ((尾D)new 尾_蛇D())); WaistD2.尾接続(e2); ChestD2.背中接続(new 背中_羽D { @@ -3586,7 +3586,7 @@ namespace SlaveMatrix 腿_獣D3.Leg接続(Leg_獣D3); 四足腰D2.腿左接続(腿_獣D3); 四足腰D2.腿右接続(腿_獣D3.Get逆()); - EleD e2 = (RNG.XS.NextBool() ? ((尾D)new 尾_牛D()) : ((尾D)new 尾_蛇D())); + ElementData e2 = (RNG.XS.NextBool() ? ((尾D)new 尾_牛D()) : ((尾D)new 尾_蛇D())); 四足腰D2.尾接続(e2); 四足胴D2.SetValuesD("獣毛", true); 四足胸D2.肌_接続.SetValuesD<胸毛D>("表示", true); @@ -3613,7 +3613,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D(); + ElementData eleD2 = new 獣耳D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 手_人D e = new 手_人D(); @@ -3678,7 +3678,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D(); + ElementData eleD2 = new 獣耳D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 手_人D e = new 手_人D(); @@ -3754,7 +3754,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D(); + ElementData eleD2 = new 獣耳D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 手_人D e = new 手_人D(); @@ -3818,7 +3818,7 @@ namespace SlaveMatrix 頭D2.Set鼻R(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D(); + ElementData eleD2 = new 獣耳D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 手_人D e = new 手_人D(); @@ -3896,16 +3896,16 @@ namespace SlaveMatrix 頭D2.Set口R(); 頭D2.Set舌短(); 頭D2.Set耳尖(); - EleD eleD = new 虫顎D(); - 頭D2.頬左接続(eleD); - 頭D2.頬右接続(eleD.Get逆()); + ElementData elementData = new 虫顎D(); + 頭D2.頬左接続(elementData); + 頭D2.頬右接続(elementData.Get逆()); 顔面_虫D 顔面_虫D2 = new 顔面_虫D(); - eleD = new 触覚_線D + elementData = new 触覚_線D { 尺度YB = 0.4 }; - 顔面_虫D2.触覚左接続(eleD); - 顔面_虫D2.触覚右接続(eleD.Get逆()); + 顔面_虫D2.触覚左接続(elementData); + 顔面_虫D2.触覚右接続(elementData.Get逆()); 頭D2.顔面接続(顔面_虫D2); 手_人D e = new 手_人D(); LowerArm_人D LowerArm_人D2 = new LowerArm_人D(); @@ -3918,12 +3918,12 @@ namespace SlaveMatrix obj2.肩右接続(ShoulderD2.Get逆()); obj2.肩左接続(ShoulderD2.Copy()); obj2.肩右接続(ShoulderD2.Get逆()); - eleD = new 前翅_羽D(); - obj2.翼上左接続(eleD); - obj2.翼上右接続(eleD.Get逆()); - eleD = new 後翅_羽D(); - obj2.翼下左接続(eleD); - obj2.翼下右接続(eleD.Get逆()); + elementData = new 前翅_羽D(); + obj2.翼上左接続(elementData); + obj2.翼上右接続(elementData.Get逆()); + elementData = new 後翅_羽D(); + obj2.翼下左接続(elementData); + obj2.翼下右接続(elementData.Get逆()); 足_人D e2 = new 足_人D(); Leg_人D Leg_人D2 = new Leg_人D(); Leg_人D2.足接続(e2); @@ -3931,8 +3931,8 @@ namespace SlaveMatrix 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); - eleD = new 尾_竜D(); - obj.尾接続(eleD); + elementData = new 尾_竜D(); + obj.尾接続(elementData); obj.EnumEleD().SetValuesD("虫性", true); obj.EnumEleD().SetValuesD("虫手", true); obj.EnumEleD().SetValuesD("虫足", true); @@ -3960,13 +3960,13 @@ namespace SlaveMatrix 頭D2.Set舌短(); 頭D2.Set耳尖(); 頭D2.額接続(new 角1_虫D()); - EleD eleD = new 虫顎D(); - 頭D2.頬左接続(eleD); - 頭D2.頬右接続(eleD.Get逆()); + ElementData elementData = new 虫顎D(); + 頭D2.頬左接続(elementData); + 頭D2.頬右接続(elementData.Get逆()); 顔面_甲D 顔面_甲D2 = new 顔面_甲D(); - eleD = new 触覚_甲D(); - 顔面_甲D2.触覚左接続(eleD); - 顔面_甲D2.触覚右接続(eleD.Get逆()); + elementData = new 触覚_甲D(); + 顔面_甲D2.触覚左接続(elementData); + 顔面_甲D2.触覚右接続(elementData.Get逆()); 頭D2.顔面接続(顔面_甲D2); 手_人D e = new 手_人D(); LowerArm_人D LowerArm_人D2 = new LowerArm_人D(); @@ -3979,13 +3979,13 @@ namespace SlaveMatrix obj2.肩右接続(ShoulderD2.Get逆()); obj2.肩左接続(ShoulderD2.Copy()); obj2.肩右接続(ShoulderD2.Get逆()); - eleD = new 後翅_甲D(); - obj2.翼上左接続(eleD); - obj2.翼上右接続(eleD.Get逆()); - eleD = new 前翅_甲D(); - eleD.SetValuesD("紋", RNG.XS.NextBool()); - obj2.翼上左接続(eleD); - obj2.翼上右接続(eleD.Get逆()); + elementData = new 後翅_甲D(); + obj2.翼上左接続(elementData); + obj2.翼上右接続(elementData.Get逆()); + elementData = new 前翅_甲D(); + elementData.SetValuesD("紋", RNG.XS.NextBool()); + obj2.翼上左接続(elementData); + obj2.翼上右接続(elementData.Get逆()); 足_人D e2 = new 足_人D(); Leg_人D Leg_人D2 = new Leg_人D(); Leg_人D2.足接続(e2); @@ -4021,18 +4021,18 @@ namespace SlaveMatrix 頭D2.Set口人(); 頭D2.Set舌短(); 頭D2.Set耳尖(); - EleD eleD = new 耳_尖D(); - 頭D2.耳左接続(eleD); - 頭D2.耳右接続(eleD.Get逆()); + ElementData elementData = new 耳_尖D(); + 頭D2.耳左接続(elementData); + 頭D2.耳右接続(elementData.Get逆()); 大顎基D 大顎基D2 = new 大顎基D(); - eleD = new 大顎D(); - 大顎基D2.顎左接続(eleD); - 大顎基D2.顎右接続(eleD.Get逆()); + elementData = new 大顎D(); + 大顎基D2.顎左接続(elementData); + 大顎基D2.顎右接続(elementData.Get逆()); 頭D2.大顎基接続(大顎基D2); 顔面_甲D 顔面_甲D2 = new 顔面_甲D(); - eleD = new 触覚_甲D(); - 顔面_甲D2.触覚左接続(eleD); - 顔面_甲D2.触覚右接続(eleD.Get逆()); + elementData = new 触覚_甲D(); + 顔面_甲D2.触覚左接続(elementData); + 顔面_甲D2.触覚右接続(elementData.Get逆()); 頭D2.顔面接続(顔面_甲D2); 手_人D e = new 手_人D(); LowerArm_人D LowerArm_人D2 = new LowerArm_人D(); @@ -4045,13 +4045,13 @@ namespace SlaveMatrix obj2.肩右接続(ShoulderD2.Get逆()); obj2.肩左接続(ShoulderD2.Copy()); obj2.肩右接続(ShoulderD2.Get逆()); - eleD = new 後翅_甲D(); - obj2.翼上左接続(eleD); - obj2.翼上右接続(eleD.Get逆()); - eleD = new 前翅_甲D(); - eleD.SetValuesD("紋", RNG.XS.NextBool()); - obj2.翼上左接続(eleD); - obj2.翼上右接続(eleD.Get逆()); + elementData = new 後翅_甲D(); + obj2.翼上左接続(elementData); + obj2.翼上右接続(elementData.Get逆()); + elementData = new 前翅_甲D(); + elementData.SetValuesD("紋", RNG.XS.NextBool()); + obj2.翼上左接続(elementData); + obj2.翼上右接続(elementData.Get逆()); 足_人D e2 = new 足_人D(); Leg_人D Leg_人D2 = new Leg_人D(); Leg_人D2.足接続(e2); @@ -4087,13 +4087,13 @@ namespace SlaveMatrix 頭D2.Set口R(); 頭D2.Set舌短(); 頭D2.Set耳尖(); - EleD eleD = new 虫顎D(); - 頭D2.頬左接続(eleD); - 頭D2.頬右接続(eleD.Get逆()); + ElementData elementData = new 虫顎D(); + 頭D2.頬左接続(elementData); + 頭D2.頬右接続(elementData.Get逆()); 顔面_虫D 顔面_虫D2 = new 顔面_虫D(); - eleD = new 触覚_線D(); - 顔面_虫D2.触覚左接続(eleD); - 顔面_虫D2.触覚右接続(eleD.Get逆()); + elementData = new 触覚_線D(); + 顔面_虫D2.触覚左接続(elementData); + 顔面_虫D2.触覚右接続(elementData.Get逆()); 頭D2.顔面接続(顔面_虫D2); 手_人D e = new 手_人D(); LowerArm_人D LowerArm_人D2 = new LowerArm_人D(); @@ -4105,13 +4105,13 @@ namespace SlaveMatrix LowerArm_人D2.虫鎌接続(new 虫鎌D()); obj3.肩左接続(ShoulderD2); obj3.肩右接続(ShoulderD2.Get逆()); - eleD = new 前翅_草D(); - eleD.SetValuesD("紋", RNG.XS.NextBool()); - obj2.翼左接続(eleD); - obj2.翼右接続(eleD.Get逆()); - eleD = new 後翅_草D(); - obj2.翼左接続(eleD); - obj2.翼右接続(eleD.Get逆()); + elementData = new 前翅_草D(); + elementData.SetValuesD("紋", RNG.XS.NextBool()); + obj2.翼左接続(elementData); + obj2.翼右接続(elementData.Get逆()); + elementData = new 後翅_草D(); + obj2.翼左接続(elementData); + obj2.翼右接続(elementData.Get逆()); 足_人D e2 = new 足_人D(); Leg_人D Leg_人D2 = new Leg_人D(); Leg_人D2.足接続(e2); @@ -4119,8 +4119,8 @@ namespace SlaveMatrix 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); - eleD = new 尾_虫D(); - obj.尾接続(eleD); + elementData = new 尾_虫D(); + obj.尾接続(elementData); obj.EnumEleD().SetValuesD("虫性", true); obj.EnumEleD().SetValuesD("虫手", true); obj.EnumEleD().SetValuesD("虫足", true); @@ -4206,7 +4206,7 @@ namespace SlaveMatrix HeadD 頭D2 = ChestD2.SetNeck().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); BackHair0_肢系D 後髪0_肢系D2 = new BackHair0_肢系D(); - EleD eleD2 = new 尾_蛇D(); + ElementData eleD2 = new 尾_蛇D(); 後髪0_肢系D2.左5接続(eleD2); 後髪0_肢系D2.左4接続(eleD2.Copy()); 後髪0_肢系D2.左3接続(eleD2.Copy()); @@ -4296,7 +4296,7 @@ namespace SlaveMatrix .Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); BackHair0_肢系D 後髪0_肢系D2 = new BackHair0_肢系D(); - EleD eleD2 = new 尾_蛇D(); + ElementData eleD2 = new 尾_蛇D(); 後髪0_肢系D2.左5接続(eleD2); 後髪0_肢系D2.左4接続(eleD2.Copy()); 後髪0_肢系D2.左3接続(eleD2.Copy()); @@ -4352,7 +4352,7 @@ namespace SlaveMatrix 頭D2.Set舌長(); 頭D2.Set耳人(); 頭D2.額接続(new 角1_虫D()); - EleD eleD2 = new 角2_虫D(); + ElementData eleD2 = new 角2_虫D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 顔面_甲D e = new 顔面_甲D(); @@ -4412,7 +4412,7 @@ namespace SlaveMatrix WaistD2.腿右接続(腿_人D2.Get逆()); if (RNG.XS.NextBool()) { - EleD e3 = new 尾_短D(); + ElementData e3 = new 尾_短D(); WaistD2.尾接続(e3); } WaistD2.EnumEleD().SetValuesD("腹板", true); @@ -4438,24 +4438,24 @@ namespace SlaveMatrix 頭D2.Set口R(); 頭D2.Set舌短(); 頭D2.Set耳人(); - EleD eleD; + ElementData elementData; if (RNG.XS.NextBool()) { - eleD = new 虫顎D + elementData = new 虫顎D { 尺度B = 1.1 }; - 頭D2.頬左接続(eleD); - 頭D2.頬右接続(eleD.Get逆()); + 頭D2.頬左接続(elementData); + 頭D2.頬右接続(elementData.Get逆()); } if (RNG.XS.NextBool()) { - eleD = new 触覚_節D + elementData = new 触覚_節D { 尺度B = 1.4 }; - 頭D2.触覚左接続(eleD); - 頭D2.触覚右接続(eleD.Get逆()); + 頭D2.触覚左接続(elementData); + 頭D2.触覚右接続(elementData.Get逆()); } 手_人D e = new 手_人D(); LowerArm_人D LowerArm_人D2 = new LowerArm_人D(); @@ -4475,33 +4475,33 @@ namespace SlaveMatrix } 長物_蟲D 長物_蟲D2 = new 長物_蟲D(); WaistD2.半身接続(長物_蟲D2); - eleD = new 節足_足百D(); - 長物_蟲D2.左0接続(eleD); - 長物_蟲D2.右0接続(eleD.Get逆()); - 長物_蟲D2.左1接続(eleD.Copy()); - 長物_蟲D2.右1接続(eleD.Get逆()); + elementData = new 節足_足百D(); + 長物_蟲D2.左0接続(elementData); + 長物_蟲D2.右0接続(elementData.Get逆()); + 長物_蟲D2.左1接続(elementData.Copy()); + 長物_蟲D2.右1接続(elementData.Get逆()); Torso_蟲D Torso_蟲D2 = new Torso_蟲D(); 長物_蟲D2.胴接続(Torso_蟲D2); - Torso_蟲D2.左接続(eleD.Copy()); - Torso_蟲D2.右接続(eleD.Get逆()); + Torso_蟲D2.左接続(elementData.Copy()); + Torso_蟲D2.右接続(elementData.Get逆()); for (int i = 0; i < 21; i++) { Torso_蟲D2.Torso接続(Torso_蟲D2 = new Torso_蟲D()); - Torso_蟲D2.左接続(eleD.Copy()); - Torso_蟲D2.右接続(eleD.Get逆()); + Torso_蟲D2.左接続(elementData.Copy()); + Torso_蟲D2.右接続(elementData.Get逆()); } 尾_蟲D 尾_蟲D2 = new 尾_蟲D(); 節尾_曳航D 節尾_曳航D2 = new 節尾_曳航D(); - 尾_蟲D2.左1接続(eleD.Copy()); - 尾_蟲D2.右1接続(eleD.Get逆()); - 尾_蟲D2.左2接続(eleD.Copy()); - 尾_蟲D2.右2接続(eleD.Get逆()); - 尾_蟲D2.左3接続(eleD.Copy()); - 尾_蟲D2.右3接続(eleD.Get逆()); - 尾_蟲D2.左4接続(eleD.Copy()); - 尾_蟲D2.右4接続(eleD.Get逆()); - 尾_蟲D2.左5接続(eleD.Copy()); - 尾_蟲D2.右5接続(eleD.Get逆()); + 尾_蟲D2.左1接続(elementData.Copy()); + 尾_蟲D2.右1接続(elementData.Get逆()); + 尾_蟲D2.左2接続(elementData.Copy()); + 尾_蟲D2.右2接続(elementData.Get逆()); + 尾_蟲D2.左3接続(elementData.Copy()); + 尾_蟲D2.右3接続(elementData.Get逆()); + 尾_蟲D2.左4接続(elementData.Copy()); + 尾_蟲D2.右4接続(elementData.Get逆()); + 尾_蟲D2.左5接続(elementData.Copy()); + 尾_蟲D2.右5接続(elementData.Get逆()); 尾_蟲D2.尾左接続(節尾_曳航D2); 尾_蟲D2.尾右接続(節尾_曳航D2.Get逆()); Torso_蟲D2.Torso接続(尾_蟲D2); @@ -4524,7 +4524,7 @@ namespace SlaveMatrix 頭D2.Set鼻人(); 頭D2.Set口人(); 頭D2.Set舌短(); - EleD eleD2 = new 獣耳D + ElementData eleD2 = new 獣耳D { 尺度B = 1.1, 尺度YB = 1.2 @@ -4711,7 +4711,7 @@ namespace SlaveMatrix 頭D2.Set舌短(); 頭D2.Set耳獣(); 頭D2.額接続(SlaveMatrix.GameClasses._Con.Get縦眼R()); - EleD eleD2 = new 角2_牛2D(); + ElementData eleD2 = new 角2_牛2D(); eleD.頭頂左接続(eleD2); eleD.頭頂右接続(eleD2.Get逆()); 手_人D e = new 手_人D(); @@ -4771,7 +4771,7 @@ namespace SlaveMatrix 頭D2.Set口人(); 頭D2.Set舌短(); 頭D2.Set耳獣(); - EleD eleD2 = RNG.XS.Next(4) switch + ElementData eleD2 = RNG.XS.Next(4) switch { 0 => new 角2_牛1D(), 1 => new 角2_牛2D(), @@ -4989,9 +4989,9 @@ namespace SlaveMatrix chest_description.肩左接続(shoulder_description); chest_description.肩右接続(shoulder_description.Get逆()); - EleD eleD = new 角2_牛4D(); - hair_description.頭頂左接続(eleD); - hair_description.頭頂右接続(eleD.Get逆()); + ElementData elementData = new 角2_牛4D(); + hair_description.頭頂左接続(elementData); + hair_description.頭頂右接続(elementData.Get逆()); 植D 植D2 = new 植D(); 花_薔D 花_薔D2 = new 花_薔D(); @@ -5031,7 +5031,7 @@ namespace SlaveMatrix }; 触手_蔦D2.SetValuesD("棘", true); - EleD eleD2 = new 葉_披D(); + ElementData eleD2 = new 葉_披D(); eleD2.尺度B *= 1.25; 触手_蔦D2.節3接続(eleD2 = eleD2.Copy()); eleD2.尺度B *= 葉倍率; @@ -5051,7 +5051,7 @@ namespace SlaveMatrix eleD2.尺度B *= 葉倍率; 触手_蔦D2.節19接続(eleD2 = eleD2.Copy()); eleD2.尺度B *= 葉倍率; - EleD eleD3 = 触手_蔦D2.Copy(); + ElementData eleD3 = 触手_蔦D2.Copy(); body_description.翼左接続(触手_蔦D2); body_description.翼右接続(触手_蔦D2.Get逆()); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index 36ed36c..ef0836a 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -558,39 +558,39 @@ namespace SlaveMatrix return MaxAngle * RNG.XS.NextDouble() * (double)(RNG.XS.NextBool() ? 1 : (-1)); } - public static T GetEleD(this IEnumerable src) where T : EleD + public static T GetEleD(this IEnumerable src) where T : ElementData { if (src == null) { return null; } - return (T)src.FirstOrDefault((EleD e) => e is T); + return (T)src.FirstOrDefault((ElementData e) => e is T); } - public static T GetEleD(this IEnumerable src, bool 右) where T : EleD + public static T GetEleD(this IEnumerable src, bool 右) where T : ElementData { if (src == null) { return null; } - return (T)src.FirstOrDefault((EleD e) => e is T && e.右 == 右); + return (T)src.FirstOrDefault((ElementData e) => e is T && e.右 == 右); } - public static T GetEleD(this IEnumerable src, Func con) where T : EleD + public static T GetEleD(this IEnumerable src, Func con) where T : ElementData { if (src == null) { return null; } - return (T)src.FirstOrDefault((EleD e) => e is T && con((T)e)); + return (T)src.FirstOrDefault((ElementData e) => e is T && con((T)e)); } - public static IEnumerable GetEleDs(this IEnumerable src) where T : EleD + public static IEnumerable GetEleDs(this IEnumerable src) where T : ElementData { - return src?.Where((EleD e) => e is T).Cast(); + return src?.Where((ElementData e) => e is T).Cast(); } - public static void SetEleD(this IEnumerable src, Action a) where T : EleD + public static void SetEleD(this IEnumerable src, Action a) where T : ElementData { T eleD = src.GetEleD(); if (eleD != null) @@ -599,7 +599,7 @@ namespace SlaveMatrix } } - public static void SetEleDs(this IEnumerable src, Action a) where T : EleD + public static void SetEleDs(this IEnumerable src, Action a) where T : ElementData { if (src == null) { @@ -611,12 +611,12 @@ namespace SlaveMatrix } } - public static bool IsEleD(this IEnumerable src) where T : EleD + public static bool IsEleD(this IEnumerable src) where T : ElementData { return src.GetEleD() != null; } - public static void SetValuesD(this EleD e, string s, object value) + public static void SetValuesD(this ElementData e, string s, object value) { if (e == null) { @@ -633,14 +633,14 @@ namespace SlaveMatrix } } - public static void SetValuesD(this IEnumerable src, string s, object value) + public static void SetValuesD(this IEnumerable src, string s, object value) { if (src == null) { return; } string text = value.GetType().ToString(); - foreach (EleD item in src) + foreach (ElementData item in src) { FieldInfo[] fields = item.GetType().GetFields(); foreach (FieldInfo fieldInfo in fields) @@ -653,7 +653,7 @@ namespace SlaveMatrix } } - public static void SetValuesD(this IEnumerable src, string s, object value) where T : EleD + public static void SetValuesD(this IEnumerable src, string s, object value) where T : ElementData { if (src == null) { @@ -673,30 +673,30 @@ namespace SlaveMatrix } } - public static T GetEle(this IEnumerable src) where T : Ele + public static T GetEle(this IEnumerable src) where T : Element { if (src == null) { return null; } - return (T)src.FirstOrDefault((Ele e) => e is T); + return (T)src.FirstOrDefault((Element e) => e is T); } - public static T GetEle(this IEnumerable src, bool 右) where T : Ele + public static T GetEle(this IEnumerable src, bool 右) where T : Element { if (src == null) { return null; } - return (T)src.FirstOrDefault((Ele e) => e is T && e.右 == 右); + return (T)src.FirstOrDefault((Element e) => e is T && e.右 == 右); } - public static IEnumerable GetEles(this IEnumerable src) where T : Ele + public static IEnumerable GetEles(this IEnumerable src) where T : Element { - return src?.Where((Ele e) => e is T).Cast(); + return src?.Where((Element e) => e is T).Cast(); } - public static void SetEle(this IEnumerable src, Action a) where T : Ele + public static void SetEle(this IEnumerable src, Action a) where T : Element { T ele = src.GetEle(); if (ele != null) @@ -705,7 +705,7 @@ namespace SlaveMatrix } } - public static void SetEles(this IEnumerable src, Action a) where T : Ele + public static void SetEles(this IEnumerable src, Action a) where T : Element { if (src == null) { @@ -717,12 +717,12 @@ namespace SlaveMatrix } } - public static bool IsEle(this IEnumerable src) where T : Ele + public static bool IsEle(this IEnumerable src) where T : Element { return src.GetEle() != null; } - public static void SetValues(this Ele e, string s, object value) + public static void SetValues(this Element e, string s, object value) { if (e == null) { @@ -739,14 +739,14 @@ namespace SlaveMatrix } } - public static void SetValues(this IEnumerable src, string s, object value) + public static void SetValues(this IEnumerable src, string s, object value) { if (src == null) { return; } string text = value.GetType().ToString(); - foreach (Ele item in src) + foreach (Element item in src) { PropertyInfo[] properties = item.GetType().GetProperties(); foreach (PropertyInfo propertyInfo in properties) @@ -759,17 +759,17 @@ namespace SlaveMatrix } } - public static void 描画0(this IEnumerable es, RenderArea Are) + public static void 描画0(this IEnumerable es, RenderArea Are) { - foreach (Ele e in es) + foreach (Element e in es) { e.描画0(Are); } } - public static void 描画1(this IEnumerable es, RenderArea Are) + public static void 描画1(this IEnumerable es, RenderArea Are) { - foreach (Ele e in es) + foreach (Element e in es) { e.描画1(Are); } @@ -786,9 +786,9 @@ namespace SlaveMatrix } } - public static void 配色T(this Ele ele, int i, string s, ref Color2 c1, ref Color2 c2) + public static void 配色T(this Element Element, int i, string s, ref Color2 c1, ref Color2 c2) { - Type type = ele.GetType(); + Type type = Element.GetType(); string ft = typeof(ColorD).ToString(); int num = 0; foreach (FieldInfo item in from e in type.GetFields() @@ -797,11 +797,11 @@ namespace SlaveMatrix { if (num % 2 == i) { - item.SetValue(ele, new ColorD(ref Col.Black, ref c1)); + item.SetValue(Element, new ColorD(ref Col.Black, ref c1)); } else { - item.SetValue(ele, new ColorD(ref Col.Black, ref c2)); + item.SetValue(Element, new ColorD(ref Col.Black, ref c2)); } num++; } @@ -826,7 +826,7 @@ namespace SlaveMatrix return Color.FromArgb((int)(255.0 * num4), (int)(((double)(int)Cs.R * num2 + (double)(int)Cd.R * num3 * num) / num4), (int)(((double)(int)Cs.G * num2 + (double)(int)Cd.G * num3 * num) / num4), (int)(((double)(int)Cs.B * num2 + (double)(int)Cd.B * num3 * num) / num4)); } - public static void SetHitFalse(this Ele e) + public static void SetHitFalse(this Element e) { foreach (ShapePart item in e.Body.EnumAllPar()) { @@ -834,7 +834,7 @@ namespace SlaveMatrix } } - public static void SetHitTrue(this Ele e) + public static void SetHitTrue(this Element e) { foreach (ShapePart item in e.Body.EnumAllPar()) { @@ -1165,8 +1165,8 @@ namespace SlaveMatrix //タイル = Serializer.UnJson("C:\\Users\\dave\\Documents\\タイル.json"); MaxAre = 0.0584246154149664; - Elet = typeof(Ele); - EleDt = typeof(EleD); + Elet = typeof(Element); + EleDt = typeof(ElementData); ChestType = typeof(Chest); ShoulderType = typeof(Shoulder); TorsoType = typeof(Torso); @@ -1311,8 +1311,8 @@ namespace SlaveMatrix 獣耳Dt = typeof(獣耳D); 植Dt = typeof(植D); 拘束鎖t = typeof(拘束鎖).ToString(); - lt = typeof(List).ToString(); - at = typeof(Ele[]).ToString(); + lt = typeof(List).ToString(); + at = typeof(Element[]).ToString(); cdt = typeof(ColorD).ToString(); cpt = typeof(ColorP).ToString(); Bodt = typeof(Body); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs index 967605e..eb3523e 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs @@ -8,7 +8,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class TrainingUI : Ele + public class TrainingUI : Element { private ulong 媚薬投与価格 = 10000000uL; @@ -259,7 +259,7 @@ namespace SlaveMatrix focus = value; focus.StaShow = false; focus.使用状態 = UsageStatus.InUse; - focus.Ele.Intensity = 1.0; + focus.Element.Intensity = 1.0; if (focus == 羽根箒CM) { 羽根箒.角度B = -90.0; @@ -482,12 +482,12 @@ namespace SlaveMatrix パール挿入.SetPosition(); } - private void Set_ペニス(Ele t) + private void Set_ペニス(Element t) { t.位置B = ペニス.AreM.Position; } - private void Set_ロータ(Ele t) + private void Set_ロータ(Element t) { switch (ロータ.Yi) { @@ -509,7 +509,7 @@ namespace SlaveMatrix } } - private void Set_コモン(Ele t) + private void Set_コモン(Element t) { switch (コモン.Yi) { @@ -531,7 +531,7 @@ namespace SlaveMatrix } } - private void Set_ディル(Ele t) + private void Set_ディル(Element t) { switch (ディル.Yi) { @@ -553,7 +553,7 @@ namespace SlaveMatrix } } - private void Set_アナル(Ele t) + private void Set_アナル(Element t) { switch (アナル.Yi) { @@ -575,7 +575,7 @@ namespace SlaveMatrix } } - private void Set_デンマ(Ele t) + private void Set_デンマ(Element t) { switch (デンマ.Yi) { @@ -597,7 +597,7 @@ namespace SlaveMatrix } } - private void Set_ドリル(Ele t) + private void Set_ドリル(Element t) { switch (ドリル.Xi) { @@ -664,7 +664,7 @@ namespace SlaveMatrix } } - private void Set_パール(Ele t) + private void Set_パール(Element t) { switch (パール.Yi) { @@ -722,13 +722,13 @@ namespace SlaveMatrix } } - private void Set_羽根箒(Ele t) + private void Set_羽根箒(Element t) { t.位置B = 羽根箒.X0Y0_柄.ToGlobal_nc(羽根箒.X0Y0_柄.JP[1].Joint); t.角度C = 羽根箒.X0Y0_柄.Angle; } - private void Set_調教鞭(Ele t) + private void Set_調教鞭(Element t) { int num = -45; if (調教鞭.Xi == 0) @@ -769,53 +769,53 @@ namespace SlaveMatrix } } - private void Set_T剃刀(Ele t) + private void Set_T剃刀(Element t) { t.位置B = T剃刀.X0Y0_グリップ_グリップ4.ToGlobal_nc(T剃刀.X0Y0_グリップ_グリップ4.JP[0].Joint); t.角度C = T剃刀.X0Y0_グリップ_グリップ4.Angle; } - public void Set_キャップ1(Ele t) + public void Set_キャップ1(Element t) { t.位置B = キャップ1.X0Y0_先端.ToGlobal_nc(キャップ1.X0Y0_先端.JP[0].Joint); } - public void Set_キャップ2(Ele t) + public void Set_キャップ2(Element t) { t.位置B = キャップ2.X0Y0_先端.ToGlobal_nc(キャップ2.X0Y0_先端.JP[0].Joint); } - public void Set_キャップ3(Ele t) + public void Set_キャップ3(Element t) { t.位置B = キャップ3.X0Y0_先端.ToGlobal_nc(キャップ3.X0Y0_先端.JP[0].Joint); } - public void Set_キャップ左(Ele t) + public void Set_キャップ左(Element t) { キャップ2 キャップ2左 = Bod.キャップ2左; t.位置B = キャップ2左.X0Y0_先端.ToGlobal_nc(キャップ2左.X0Y0_先端.JP[0].Joint); } - public void Set_キャップ右(Ele t) + public void Set_キャップ右(Element t) { キャップ2 キャップ2右 = Bod.キャップ2右; t.位置B = キャップ2右.X0Y0_先端.ToGlobal_nc(キャップ2右.X0Y0_先端.JP[0].Joint); } - public void Set_キャップ中(Ele t) + public void Set_キャップ中(Element t) { キャップ1 キャップ3 = Bod.キャップ1; t.位置B = キャップ3.X0Y0_先端.ToGlobal_nc(キャップ3.X0Y0_先端.JP[0].Joint); } - public void Set_口(Ele t) + public void Set_口(Element t) { ShapePart shapePart = Bod.口.Body.Current.EnumAllPar().First((ShapePart e) => e.Tag == "口"); Bod.口.接続PA(); t.位置B = shapePart.Position; } - public void Set_乳首(Ele t, bool 右) + public void Set_乳首(Element t, bool 右) { 乳房 乳房2 = (右 ? Bod.乳房右 : Bod.乳房左); 乳房2.接続PA(); @@ -839,7 +839,7 @@ namespace SlaveMatrix } } - public void Set_乳房(Ele t, bool 右) + public void Set_乳房(Element t, bool 右) { 乳房 乳房2 = (右 ? Bod.乳房右 : Bod.乳房左); 乳房2.接続PA(); @@ -863,33 +863,33 @@ namespace SlaveMatrix } } - public void Set_陰核(Ele t) + public void Set_陰核(Element t) { ShapePart shapePart = Bod.性器.Body.Current.EnumAllPar().First((ShapePart e) => e.Tag == "陰核"); Bod.性器.接続PA(); t.位置B = shapePart.Position; } - public void Set_膣口(Ele t) + public void Set_膣口(Element t) { ShapePart shapePart = Bod.性器.Body.Current.EnumAllPar().First((ShapePart e) => e.Tag == "膣口"); Bod.性器.接続PA(); t.位置B = shapePart.Position; } - public void Set_肛門(Ele t) + public void Set_肛門(Element t) { Bod.肛門.接続PA(); t.位置B = Bod.肛門.位置; } - public void Set_出糸(Ele t) + public void Set_出糸(Element t) { Bod.蜘尾.接続PA(); t.位置B = Bod.蜘尾.X0Y0_出糸突起後_出糸突起基.Position; } - public void Set_くぱぁ(Ele t, bool 右) + public void Set_くぱぁ(Element t, bool 右) { ShapePart shapePart = (Bod.Is獣 ? Bod.Waist_獣.Body.Current.EnumAllPar().First((ShapePart e) => e.Tag == "股") : Bod.Waist.Body.Current.EnumAllPar().First((ShapePart e) => e.Tag == "股")); Bod.Waist.接続PA(); @@ -1054,19 +1054,19 @@ namespace SlaveMatrix 放し(); focus.StaShow = true; focus.使用状態 = UsageStatus.Standby; - focus.Ele.Xi = 0; - focus.Ele.Yi = 0; - focus.Ele.位置B = focus.bp; - focus.Ele.位置C = DataConsts.Vec2DZero; - focus.Ele.角度B = 0.0; - focus.Ele.角度C = 0.0; - focus.Ele.右 = false; + focus.Element.Xi = 0; + focus.Element.Yi = 0; + focus.Element.位置B = focus.bp; + focus.Element.位置C = DataConsts.Vec2DZero; + focus.Element.角度B = 0.0; + focus.Element.角度C = 0.0; + focus.Element.右 = false; if (focus == 調教鞭CM) { 調教鞭.Yi = 2; - focus.Ele.角度C = 0.0; + focus.Element.角度C = 0.0; } - focus.Ele.Body.JoinPAall(); + focus.Element.Body.JoinPAall(); } public void Set持ち手() @@ -1338,7 +1338,7 @@ namespace SlaveMatrix public void 通常放し() { - focus.Ele.Intensity = 0.5; + focus.Element.Intensity = 0.5; Focus = ハンド右CM; if (Med.Mode == "Training") { @@ -1455,7 +1455,7 @@ namespace SlaveMatrix SubFocus.Add(パール挿入); パールCM.使用状態 = UsageStatus.Attach; } - Focus.Ele.SetHitTrue(); + Focus.Element.SetHitTrue(); Focus_nr = ハンド右CM; //~~TODO~~ fix? @@ -1508,7 +1508,7 @@ namespace SlaveMatrix { if (IsHitCha(ref cd) || focus == 羽根箒CM || focus == 調教鞭CM) { - focus.Ele.尺度C = 1.0; + focus.Element.尺度C = 1.0; if (持ち手 || ペニス処理.Isパイズリ) { ハンド右.尺度C = 1.0; @@ -1522,7 +1522,7 @@ namespace SlaveMatrix { if (!Is挿入) { - focus.Ele.尺度C = 1.09; + focus.Element.尺度C = 1.09; if (持ち手 || ペニス処理.Isパイズリ) { ハンド右.尺度C = 1.09; @@ -1628,37 +1628,37 @@ namespace SlaveMatrix } if (!Is挿入 && !ペニス処理.Isパイズリ && !マウス処理.Is吸付 && !コキ) { - Focus.Ele.位置B = cp; + Focus.Element.位置B = cp; } if (IsTool = X < cp.X && cp.Y < Y && mb != MouseButtons.Left && !Isモード) { Med.CursorShow(); - if (focus.Ele.Intensity == 1.0) + if (focus.Element.Intensity == 1.0) { - Focus.Ele.Intensity = 0.2; + Focus.Element.Intensity = 0.2; } In持ち手(); Color hc_ = hc; hcm = (from e in EnumCM() where e.使用状態 == UsageStatus.Standby - select e).FirstOrDefault((CM e) => e.Ele.Body.IsHit(ref hc_)); + select e).FirstOrDefault((CM e) => e.Element.Body.IsHit(ref hc_)); if (hcm != null) { foreach (CM item in from e in EnumCM() where e.使用状態 == UsageStatus.Standby select e) { - item.Ele.Intensity = 0.5; + item.Element.Intensity = 0.5; } - hcm.Ele.Intensity = 1.0; + hcm.Element.Intensity = 1.0; } else { foreach (CM item2 in from e in EnumCM() - where e.使用状態 == UsageStatus.Standby && e.Ele.Intensity == 1.0 + where e.使用状態 == UsageStatus.Standby && e.Element.Intensity == 1.0 select e) { - item2.Ele.Intensity = 0.5; + item2.Element.Intensity = 0.5; } } } @@ -1672,16 +1672,16 @@ namespace SlaveMatrix { Med.CursorHide(); } - if (focus.Ele.Intensity == 0.2) + if (focus.Element.Intensity == 0.2) { - Focus.Ele.Intensity = 1.0; + Focus.Element.Intensity = 1.0; } Out持ち手(); foreach (CM item3 in from e in EnumCM() - where e.使用状態 == UsageStatus.Standby && e.Ele.Intensity == 1.0 + where e.使用状態 == UsageStatus.Standby && e.Element.Intensity == 1.0 select e) { - item3.Ele.Intensity = 0.5; + item3.Element.Intensity = 0.5; } if (!Isモード) { @@ -1719,7 +1719,7 @@ namespace SlaveMatrix bool flag = true; foreach (挿入処理 item4 in SubFocus) { - if (flag = item4.対象.Ele.Body.IsHit(ref hc)) + if (flag = item4.対象.Element.Body.IsHit(ref hc)) { if (item4.対象 == ロータCM) { @@ -1916,13 +1916,13 @@ namespace SlaveMatrix Color hc_ = hc; CM cM = (from e in EnumCM() where e.使用状態 == UsageStatus.Standby - select e).FirstOrDefault((CM e) => e.Ele.Body.IsHit(ref hc_)); + select e).FirstOrDefault((CM e) => e.Element.Body.IsHit(ref hc_)); if (cM != null) { - Focus.Ele.Intensity = 0.5; + Focus.Element.Intensity = 0.5; Focus = cM; - Focus.Ele.Intensity = 0.2; - Focus.Ele.位置B = Med.CursorPosition; + Focus.Element.Intensity = 0.2; + Focus.Element.位置B = Med.CursorPosition; Set持ち手(); if (持ち手) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs index dc7677e..e827062 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs @@ -260,9 +260,9 @@ namespace SlaveMatrix return obj; } - public static EleD[] 人口D() + public static ElementData[] 人口D() { - return new EleD[6] + return new ElementData[6] { new 口_通常D(), new 涎_通常D(), @@ -276,9 +276,9 @@ namespace SlaveMatrix }; } - public static EleD[] 裂口D() + public static ElementData[] 裂口D() { - return new EleD[6] + return new ElementData[6] { new 口_裂けD(), new 涎_裂けD(), diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs index 3d5e71e..90e7029 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs @@ -289,13 +289,13 @@ namespace SlaveMatrix bool flag = false; while (!flag) { - foreach (EleD item in ChaD.body_tree.EnumEleD()) + foreach (ElementData item in ChaD.body_tree.EnumEleD()) { flag |= item.傷物処理(); } } { - foreach (EleD item2 in ChaD.body_tree.EnumEleD()) + foreach (ElementData item2 in ChaD.body_tree.EnumEleD()) { item2.欠損 = 0.3.Lot(); } @@ -306,7 +306,7 @@ namespace SlaveMatrix { ChaD.body_color.血統.Remove(GameText.傷物); } - foreach (EleD item3 in ChaD.body_tree.EnumEleD()) + foreach (ElementData item3 in ChaD.body_tree.EnumEleD()) { item3.SetValuesD("傷", false); item3.欠損 = false; @@ -951,7 +951,7 @@ namespace SlaveMatrix public void Set構成特性() { - EleD[] array = ChaD.body_tree.EnumEleD().ToArray(); + ElementData[] array = ChaD.body_tree.EnumEleD().ToArray(); int num = 0; int num2 = 0; int num3 = 0; @@ -961,8 +961,8 @@ namespace SlaveMatrix 胸肌D 胸肌D2 = null; 胸肌D 胸肌D3 = null; Is増殖可 = false; - EleD[] array2 = array; - foreach (EleD eleD in array2) + ElementData[] array2 = array; + foreach (ElementData eleD in array2) { if (eleD is 手_人D) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs b/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs index 192da30..c28b171 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs @@ -15,15 +15,15 @@ namespace SlaveMatrix.GameClasses { HeadD obj = Uni.頭().SetRandom(); 基髪D 基髪D2 = (基髪D)obj.基髪_接続[0]; - EleD eleD = Get後髪0R(); - 基髪D2.後髪接続(eleD); - if ((eleD is BackHair0_ジグD || eleD is BackHair0_ハネD || eleD is BackHair0_パツD || eleD is BackHair0_カルD || eleD is BackHair0_肢系D) && RNG.XS.NextBool()) + ElementData elementData = Get後髪0R(); + 基髪D2.後髪接続(elementData); + if ((elementData is BackHair0_ジグD || elementData is BackHair0_ハネD || elementData is BackHair0_パツD || elementData is BackHair0_カルD || elementData is BackHair0_肢系D) && RNG.XS.NextBool()) { 基髪D2.後髪接続(Get後髪1R()); } - eleD = Get横髪R(右: false); - 基髪D2.横髪左接続(eleD); - 基髪D2.横髪右接続(eleD.Get逆()); + elementData = Get横髪R(右: false); + 基髪D2.横髪左接続(elementData); + 基髪D2.横髪右接続(elementData.Get逆()); 基髪D2.前髪接続(Get前髪R()); return obj; } @@ -32,15 +32,15 @@ namespace SlaveMatrix.GameClasses { HeadD obj = Uni.頭().SetRandom(); 基髪D 基髪D2 = (基髪D)obj.基髪_接続[0]; - EleD eleD = Get後髪0R(); - 基髪D2.後髪接続(eleD); - if ((eleD is BackHair0_ジグD || eleD is BackHair0_ハネD || eleD is BackHair0_パツD || eleD is BackHair0_カルD || eleD is BackHair0_肢系D) && RNG.XS.NextBool()) + ElementData elementData = Get後髪0R(); + 基髪D2.後髪接続(elementData); + if ((elementData is BackHair0_ジグD || elementData is BackHair0_ハネD || elementData is BackHair0_パツD || elementData is BackHair0_カルD || elementData is BackHair0_肢系D) && RNG.XS.NextBool()) { 基髪D2.後髪接続(Get後髪1R()); } - eleD = Get横髪R(右: false); - 基髪D2.横髪左接続(eleD); - 基髪D2.横髪右接続(eleD.Get逆()); + elementData = Get横髪R(右: false); + 基髪D2.横髪左接続(elementData); + 基髪D2.横髪右接続(elementData.Get逆()); 基髪D2.前髪接続(Get前髪R1()); return obj; } @@ -116,7 +116,7 @@ namespace SlaveMatrix.GameClasses return obj; } - public static EleD Get鼻R() + public static ElementData Get鼻R() { if (RNG.XS.NextM(1) == 0) { @@ -125,7 +125,7 @@ namespace SlaveMatrix.GameClasses return Uni.獣鼻D(); } - public static EleD[] Get口R() + public static ElementData[] Get口R() { if (RNG.XS.NextM(1) == 0) { @@ -134,7 +134,7 @@ namespace SlaveMatrix.GameClasses return Uni.裂口D(); } - public static EleD Get後髪0R() + public static ElementData Get後髪0R() { return RNG.XS.NextM(20) switch { @@ -162,7 +162,7 @@ namespace SlaveMatrix.GameClasses }; } - public static EleD Get後髪1R() + public static ElementData Get後髪1R() { return RNG.XS.NextM(8) switch { @@ -178,7 +178,7 @@ namespace SlaveMatrix.GameClasses }; } - public static EleD Get横髪R(bool 右) + public static ElementData Get横髪R(bool 右) { return RNG.XS.NextM(5) switch { @@ -209,7 +209,7 @@ namespace SlaveMatrix.GameClasses }; } - public static EleD Get前髪R() + public static ElementData Get前髪R() { return RNG.XS.NextM(18) switch { @@ -235,7 +235,7 @@ namespace SlaveMatrix.GameClasses }; } - public static EleD Get前髪R1() + public static ElementData Get前髪R1() { return RNG.XS.NextM(12) switch { @@ -254,7 +254,7 @@ namespace SlaveMatrix.GameClasses }; } - public static EleD Get花R(bool 右) + public static ElementData Get花R(bool 右) { if (RNG.XS.NextM(1) == 0) { @@ -354,8 +354,8 @@ namespace SlaveMatrix.GameClasses public static void Set口R(this HeadD 頭) { - EleD[] array = Get口R(); - foreach (EleD e in array) + ElementData[] array = Get口R(); + foreach (ElementData e in array) { 頭.口接続(e); } @@ -363,8 +363,8 @@ namespace SlaveMatrix.GameClasses public static void Set口人(this HeadD 頭) { - EleD[] array = Uni.人口D(); - foreach (EleD e in array) + ElementData[] array = Uni.人口D(); + foreach (ElementData e in array) { 頭.口接続(e); } @@ -372,8 +372,8 @@ namespace SlaveMatrix.GameClasses public static void Set口裂(this HeadD 頭) { - EleD[] array = Uni.裂口D(); - foreach (EleD e in array) + ElementData[] array = Uni.裂口D(); + foreach (ElementData e in array) { 頭.口接続(e); }