From 2cb7d3d0dadad9b29bfcdc68d38ba69f881db9ad Mon Sep 17 00:00:00 2001 From: Absolutely disgusting Date: Sat, 25 Oct 2025 12:00:24 +0400 Subject: [PATCH] Renamed other Torso like classes. Should reanme Torso pair (how? Idk. Still not working) --- 2DGAMELIB/_2DGAMELIB/ObjExtensions.cs | 18 +--- .../SlaveMatrix/BodyPartClasses/Torso.cs | 2 +- .../BodyPartClasses/{胴D.cs => TorsoD.cs} | 6 +- .../BodyPartClasses/{胴_蛇.cs => Torso_蛇.cs} | 16 ++-- .../{胴_蛇D.cs => Torso_蛇D.cs} | 10 +-- .../BodyPartClasses/{胴_蟲.cs => Torso_蟲.cs} | 12 +-- .../{胴_蟲D.cs => Torso_蟲D.cs} | 10 +-- .../SlaveMatrix/BodyPartClasses/交配.cs | 20 ++--- .../SlaveMatrix/BodyPartClasses/四足胸.cs | 6 +- .../SlaveMatrix/BodyPartClasses/四足胸D.cs | 4 +- .../SlaveMatrix/BodyPartClasses/長物_蛇.cs | 10 +-- .../SlaveMatrix/BodyPartClasses/長物_蛇D.cs | 4 +- .../SlaveMatrix/BodyPartClasses/長物_蟲.cs | 6 +- .../SlaveMatrix/BodyPartClasses/長物_蟲D.cs | 4 +- .../SlaveMatrix/BodyPartClasses/長胴D.cs | 4 +- SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs | 26 +++--- SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs | 3 +- .../GameClasses/SpeciesDefaults.cs | 88 +++++++++---------- SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs | 4 +- SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs | 4 +- SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs | 8 +- 21 files changed, 128 insertions(+), 137 deletions(-) rename SlaveMatrix/SlaveMatrix/BodyPartClasses/{胴D.cs => TorsoD.cs} (95%) rename SlaveMatrix/SlaveMatrix/BodyPartClasses/{胴_蛇.cs => Torso_蛇.cs} (96%) rename SlaveMatrix/SlaveMatrix/BodyPartClasses/{胴_蛇D.cs => Torso_蛇D.cs} (84%) rename SlaveMatrix/SlaveMatrix/BodyPartClasses/{胴_蟲.cs => Torso_蟲.cs} (98%) rename SlaveMatrix/SlaveMatrix/BodyPartClasses/{胴_蟲D.cs => Torso_蟲D.cs} (87%) diff --git a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs index ec7800c..c82e085 100644 --- a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs +++ b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Reflection; using System.Text; namespace _2DGAMELIB @@ -20,24 +21,13 @@ namespace _2DGAMELIB foreach (var key in obj.Keys) { var newKey = KeyMap.TryGetValue(key, out var mapped) ? mapped : key; - var newDifs = obj.Difss[key]; - var newTag = KeyMap.TryGetValue(obj.Difss[key].Tag, out var mappedTag) ? mappedTag : obj.Difss[key].Tag; - - newDifs.Tag = newTag; - - for (var i = 0; i < newDifs.CountX; i++) - { - var newDifTag = KeyMap.TryGetValue(newDifs[i].Tag, out var mappedDifTag) ? mappedDifTag : newDifs[i].Tag; - newDifs[i].Tag = newDifTag; - } - - newDict.Add(newKey, newDifs); + var difs = obj.Difss[key]; + newDict.Add(newKey, difs); } - var temp = newDict["Torso"]; - obj.Difss = newDict; } + } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs index 03e00d5..669bd6f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs @@ -287,7 +287,7 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(本体, X0Y0_胴, 2); - public Torso(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴D e) + public Torso(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, TorsoD e) { Torso 胴2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs similarity index 95% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs index c28c89a..9d2b575 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胴D : EleD + public class TorsoD : EleD { public bool 胴_表示 = true; @@ -35,12 +35,12 @@ namespace SlaveMatrix public List 翼右_接続 = new List(); - public 胴D() + public TorsoD() { ThisType = GetType(); } - public void 胸接続(EleD e) + public void Torso接続(EleD e) { 胸_接続.Add(e); e.Par = this; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs similarity index 96% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs index e855428..d1c579b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胴_蛇 : 長胴 + public class Torso_蛇 : 長胴 { public Par X0Y0_胴_鱗; @@ -73,7 +73,7 @@ namespace SlaveMatrix public Ele[] 右_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public override bool 欠損 { @@ -326,9 +326,9 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 胴_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴_蛇D e) + public Torso_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, Torso_蛇D e) { - 胴_蛇 胴_蛇2 = this; + Torso_蛇 胴_蛇2 = this; ThisType = GetType(); Pars pars = new Pars(); pars.Tag = "蛇"; @@ -418,9 +418,9 @@ namespace SlaveMatrix return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蛇2; @@ -458,9 +458,9 @@ namespace SlaveMatrix Are.Draw(X0Y0_胴_鱗左); Are.Draw(X0Y0_胴_鱗右); Are.Draw(X0Y0_胴_胴); - if (胴_接続 != null && 胴_接続[0].拘束 && 胴_接続[0] is 胴_蛇) + if (Torso_接続 != null && Torso_接続[0].拘束 && Torso_接続[0] is Torso_蛇) { - ((胴_蛇)胴_接続[0]).拘束具描画(Are); + ((Torso_蛇)Torso_接続[0]).拘束具描画(Are); } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs similarity index 84% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs index f918065..a08062f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胴_蛇D : 長胴D + public class Torso_蛇D : 長胴D { public bool 胴_鱗_表示 = true; @@ -30,7 +30,7 @@ namespace SlaveMatrix public bool 鎖表示; - public 胴_蛇D() + public Torso_蛇D() { ThisType = GetType(); } @@ -49,16 +49,16 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Torso_蛇_右_接続; } - public override void 胴接続(EleD e) + public override void Torso接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_蛇_Torso_接続; } public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) { - return new 胴_蛇(DisUnit, 配色指定, 体配色, Med, this); + return new Torso_蛇(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs index 94b1ed8..165ee75 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胴_蟲 : 長胴 + public class Torso_蟲 : 長胴 { public Par X0Y0_胴_背板; @@ -97,7 +97,7 @@ namespace SlaveMatrix public Ele[] 右_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public override bool 欠損 { @@ -473,9 +473,9 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 胴_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴_蟲D e) + public Torso_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, Torso_蟲D e) { - 胴_蟲 胴_蟲2 = this; + Torso_蟲 胴_蟲2 = this; ThisType = GetType(); Pars pars = new Pars(); pars.Tag = "蟲"; @@ -578,9 +578,9 @@ namespace SlaveMatrix return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蟲2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs similarity index 87% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs index 1b042c0..627675f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胴_蟲D : 長胴D + public class Torso_蟲D : 長胴D { public bool 胴_背板_表示 = true; @@ -48,7 +48,7 @@ namespace SlaveMatrix public bool 鎖表示; - public 胴_蟲D() + public Torso_蟲D() { ThisType = GetType(); } @@ -67,16 +67,16 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Torso_蟲_右_接続; } - public override void 胴接続(EleD e) + public override void Torso接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.Torso_蟲_Torso_接続; } public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) { - return new 胴_蟲(DisUnit, 配色指定, 体配色, Med, this); + return new Torso_蟲(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs index ab33e6f..f8bf890 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs @@ -1844,13 +1844,13 @@ namespace SlaveMatrix 胸D2.肌接続(new 上着トップ_ドレスD()); 胸D2.AlignC(); 胸D2.首接続(首D2); - 胴D 胴D2 = Mix<胴D>(母方, 父方, i, 原種モード); + TorsoD 胴D2 = Mix(母方, 父方, i, 原種モード); 胴腹板D 胴腹板D2; 胴D2.肌接続(胴腹板D2 = Mix<胴腹板D>(母方, 父方, i, 原種モード)); 胴D2.肌接続(Mix<胴肌D>(母方, 父方, i, 原種モード)); 胴D2.肌接続(new 上着ミドル_ドレスD()); 胴D2.AlignC(); - 胴D2.胸接続(胸D2); + 胴D2.Torso接続(胸D2); WaistD 腰 = Mix(母方, 父方, i, 原種モード); 腰.膣基接続(new 膣基_人D()); 腰.膣基接続(new 膣内精液_人D()); @@ -2352,7 +2352,7 @@ namespace SlaveMatrix { 長物_蛇D 長物_蛇D2 = (長物_蛇D)半身; 長物_蛇D2.接続(母方, 父方, i, ConnectionInfo.長物_蛇_左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胴_蛇D 胴_蛇D2 = Mix<胴_蛇D>(母方, 父方, i, 原種モード); + Torso_蛇D 胴_蛇D2 = Mix(母方, 父方, i, 原種モード); if (胴_蛇D2 != null) { 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.Torso_蛇_左_接続, 要素構成, 接続構成, 変異率, 原種モード); @@ -2365,20 +2365,20 @@ namespace SlaveMatrix num11 = (num11 + RNG.XS.NextSign() * RNG.XS.Next(4)).Clamp(0, 50); for (int l = 0; l < num11; l++) { - 胴_蛇D2.胴接続(胴_蛇D2 = (胴_蛇D)長胴D2.Copy()); + 胴_蛇D2.Torso接続(胴_蛇D2 = (Torso_蛇D)長胴D2.Copy()); } 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.Torso_蛇_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); if (胴_蛇D2.EnumEleD().IsEleD<腿D>()) { - IEnumerable<胴_蛇D> eleDs = 長物_蛇D2.EnumEleD().Skip(1).GetEleDs<胴_蛇D>(); - foreach (胴_蛇D item11 in eleDs.Take(eleDs.Count() - 1)) + IEnumerable eleDs = 長物_蛇D2.EnumEleD().Skip(1).GetEleDs(); + foreach (Torso_蛇D item11 in eleDs.Take(eleDs.Count() - 1)) { item11.左_接続.Clear(); item11.右_接続.Clear(); } if (num11 < 2) { - 胴_蛇D obj = eleDs.Last(); + Torso_蛇D obj = eleDs.Last(); obj.左_接続.Clear(); obj.右_接続.Clear(); } @@ -2386,7 +2386,7 @@ namespace SlaveMatrix else { int num14 = 0; - foreach (胴_蛇D eleD7 in 長物_蛇D2.EnumEleD().Skip(1).GetEleDs<胴_蛇D>()) + foreach (Torso_蛇D eleD7 in 長物_蛇D2.EnumEleD().Skip(1).GetEleDs()) { if (num14 % 3 != 1) { @@ -2449,7 +2449,7 @@ namespace SlaveMatrix 長物_蟲D 長物_蟲D2 = (長物_蟲D)半身; 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_左0_接続, 要素構成, 接続構成, 変異率, 原種モード); 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_左1_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胴_蟲D 胴_蟲D2 = Mix<胴_蟲D>(母方, 父方, i, 原種モード); + Torso_蟲D 胴_蟲D2 = Mix(母方, 父方, i, 原種モード); if (胴_蟲D2 != null) { 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.Torso_蟲_左_接続, 要素構成, 接続構成, 変異率, 原種モード); @@ -2462,7 +2462,7 @@ namespace SlaveMatrix num19 = (num19 + RNG.XS.NextSign() * RNG.XS.Next(4)).Clamp(0, 50); for (int m = 0; m < num19; m++) { - 胴_蟲D2.胴接続(胴_蟲D2 = (胴_蟲D)長胴D3.Copy()); + 胴_蟲D2.Torso接続(胴_蟲D2 = (Torso_蟲D)長胴D3.Copy()); } 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.Torso_蟲_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs index f7bc497..0d2ec4f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs @@ -201,7 +201,7 @@ namespace SlaveMatrix public Ele[] 脇右_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public Ele[] 胸左_接続; @@ -943,9 +943,9 @@ namespace SlaveMatrix return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs index 4a3abcf..1dc35ad 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs @@ -77,7 +77,7 @@ namespace SlaveMatrix public List 脇右_接続 = new List(); - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public List 胸左_接続 = new List(); @@ -116,7 +116,7 @@ namespace SlaveMatrix public void 胴接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.四足胸_Torso_接続; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index 2c0f450..d36c9f4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -69,7 +69,7 @@ namespace SlaveMatrix public Ele[] 右_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public override bool 欠損 { @@ -389,9 +389,9 @@ namespace SlaveMatrix return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蛇2; @@ -419,9 +419,9 @@ namespace SlaveMatrix Are.Draw(X0Y0_胴1_鱗2); Are.Draw(X0Y0_胴1_鱗左2); Are.Draw(X0Y0_胴1_鱗右2); - if (胴_接続 != null && 胴_接続[0].拘束 && 胴_接続[0] is 胴_蛇) + if (Torso_接続 != null && Torso_接続[0].拘束 && Torso_接続[0] is Torso_蛇) { - ((胴_蛇)胴_接続[0]).拘束具描画(Are); + ((Torso_蛇)Torso_接続[0]).拘束具描画(Are); } if (くぱぁ_ == 1.0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs index 1ab9e21..2393f27 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix public List 右_接続 = new List(); - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public 長物_蛇D() { @@ -56,7 +56,7 @@ namespace SlaveMatrix public void 胴接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蛇_Torso_接続; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index 594e052..2ddfa3c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -113,7 +113,7 @@ namespace SlaveMatrix public Ele[] 右1_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public override bool 欠損 { @@ -644,9 +644,9 @@ namespace SlaveMatrix return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蟲2; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs index ab8f86c..f0e406f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs @@ -59,7 +59,7 @@ namespace SlaveMatrix public List 右1_接続 = new List(); - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public 長物_蟲D() { @@ -96,7 +96,7 @@ namespace SlaveMatrix public void 胴接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; e.接続情報 = ConnectionInfo.長物_蟲_Torso_接続; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs index 62202e6..b55e066 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs @@ -10,7 +10,7 @@ namespace SlaveMatrix public List 右_接続 = new List(); - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public virtual void 左接続(EleD e) { @@ -20,7 +20,7 @@ namespace SlaveMatrix { } - public virtual void 胴接続(EleD e) + public virtual void Torso接続(EleD e) { } } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs index a821387..a39e270 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs @@ -2259,7 +2259,7 @@ namespace SlaveMatrix if (Is蛇) { int num = 0; - 胴_蛇 ele2 = 蛇.胴_接続.GetEle<胴_蛇>(); + Torso_蛇 ele2 = 蛇.Torso_接続.GetEle(); while (ele2 != null) { if (num % 4 != 0) @@ -2267,14 +2267,14 @@ namespace SlaveMatrix ele2.拘束 = false; ele2.鎖表示 = false; } - ele2 = ele2.胴_接続.GetEle<胴_蛇>(); + ele2 = ele2.Torso_接続.GetEle(); num++; } } if (Is蟲) { int num2 = 0; - 胴_蟲 ele3 = 蟲.胴_接続.GetEle<胴_蟲>(); + Torso_蟲 ele3 = 蟲.Torso_接続.GetEle(); while (ele3 != null) { if (num2 % 2 == 0) @@ -2282,7 +2282,7 @@ namespace SlaveMatrix ele3.拘束 = false; ele3.鎖表示 = false; } - ele3 = ele3.胴_接続.GetEle<胴_蟲>(); + ele3 = ele3.Torso_接続.GetEle(); num2++; } } @@ -4373,9 +4373,9 @@ namespace SlaveMatrix 蛇 = (長物_蛇)ele; 腰.腰CD.c2.Col2 = 蛇.胴1_鱗1CD.c2.Col1; 半身中1接続.Add(ele); - if (蛇.胴_接続 != null) + if (蛇.Torso_接続 != null) { - foreach (胴_蛇 item20 in 蛇.EnumEle().GetEles<胴_蛇>().Reverse()) + foreach (Torso_蛇 item20 in 蛇.EnumEle().GetEles().Reverse()) { if (item20.左_接続 != null) { @@ -4386,7 +4386,7 @@ namespace SlaveMatrix Sort(item20.右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); } } - Sort(from e in 蛇.胴_接続.Select((Ele e) => e.EnumEle()).JoinEnum() + Sort(from e in 蛇.Torso_接続.Select((Ele e) => e.EnumEle()).JoinEnum() where !bod.半身中2接続.Contains(e) select e, 半身後接続); } @@ -4423,9 +4423,9 @@ namespace SlaveMatrix 蟲 = (長物_蟲)ele; 腰.腰CD.c2.Col2 = 蟲.胴1_胴CD.c2.Col1; 半身中1接続.Add(ele); - if (蟲.胴_接続 != null) + if (蟲.Torso_接続 != null) { - foreach (胴_蟲 item21 in 蟲.EnumEle().GetEles<胴_蟲>().Reverse()) + foreach (Torso_蟲 item21 in 蟲.EnumEle().GetEles().Reverse()) { if (item21.左_接続 != null) { @@ -4436,7 +4436,7 @@ namespace SlaveMatrix Sort(item21.右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); } } - Sort(from e in 蟲.胴_接続.Select((Ele e) => e.EnumEle()).JoinEnum() + Sort(from e in 蟲.Torso_接続.Select((Ele e) => e.EnumEle()).JoinEnum() where !bod.半身中2接続.Contains(e) select e, 半身後接続); } @@ -5415,12 +5415,12 @@ namespace SlaveMatrix item54.OP.OutlineFalse(); } } - Elements.SetEle(delegate(胴_蛇 e) + Elements.SetEle(delegate(Torso_蛇 e) { e.X0Y0_胴_胴.OP[1].ps[3] = e.X0Y0_胴_胴.OP[1].ps[3].AddY(0.04); - if (e.胴_接続 != null) + if (e.Torso_接続 != null) { - e.胴_接続.SetEle(delegate(胴_蛇 f) + e.Torso_接続.SetEle(delegate(Torso_蛇 f) { f.X0Y0_胴_胴.OP[1].ps[3] = f.X0Y0_胴_胴.OP[1].ps[3].AddY(0.04); }); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs index 5b4089f..0d2cc25 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs @@ -193,7 +193,8 @@ namespace SlaveMatrix public void 接続(ConnectionInfo 接続情報, EleD ed) { string text = ThisType.Name.Remove(ThisType.Name.Length - 1); - MethodInfo method = ThisType.GetMethod(接続情報.ToString().Remove(0, text.Length).Replace("_", "")); + var methodName = 接続情報.ToString().Remove(0, text.Length).Replace("_", ""); + MethodInfo method = ThisType.GetMethod(接続情報.ToString().Remove(0, text.Length).Replace("_", "")); object[] parameters = new EleD[1] { ed }; method.Invoke(this, parameters); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs b/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs index d317680..1e4dfa6 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs @@ -314,13 +314,13 @@ namespace SlaveMatrix 腰D2.半身接続(長物_蛇D2); 長物_蛇D2.くぱぁ = 1.0; 長物_蛇D2.ガード = false; - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 40; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD<舌_長D>("股舌表示", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -358,13 +358,13 @@ namespace SlaveMatrix 長物_蛇D2.くぱぁ = 1.0; 長物_蛇D2.ガード = false; } - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 40; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ウD()); + 胴_蛇D2.Torso接続(new 尾_ウD()); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD<舌_長D>("股舌表示", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -778,10 +778,10 @@ namespace SlaveMatrix EleD eleD = new 鰭_魚D(); 長物_蛇D2.左接続(eleD); 長物_蛇D2.右接続(eleD.Get逆()); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); 尾_ヘD 尾_ヘD2 = new 尾_ヘD(); - 胴_蛇D2.胴接続(尾_ヘD2); + 胴_蛇D2.Torso接続(尾_ヘD2); 尾_ヘD2.尾先接続(new 尾鰭_魚D()); } 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -1175,7 +1175,7 @@ namespace SlaveMatrix public static ChaD Getギルタブルル() { WaistD obj = Uni.腰(); - 胴D 胴D2 = obj.Set胴(); + TorsoD 胴D2 = obj.Set胴(); 胸D 胸D2 = 胴D2.Set胸R(); 頭D 頭D2 = 胸D2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); @@ -1242,7 +1242,7 @@ namespace SlaveMatrix public static ChaD Getアルラウネ() { WaistD obj = Uni.腰(); - 胴D obj2 = obj.Set胴(); + TorsoD obj2 = obj.Set胴(); 胸D obj3 = obj2.Set胸R(); 頭D 頭D2 = obj3.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); @@ -1351,7 +1351,7 @@ namespace SlaveMatrix public static ChaD Getサキュバス() { WaistD 腰D2 = Uni.腰(); - 胴D 胴D2 = 腰D2.Set胴(); + TorsoD 胴D2 = 腰D2.Set胴(); 胸D 胸D2 = 胴D2.Set胸R(); 頭D 頭D2 = 胸D2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); @@ -2254,13 +2254,13 @@ namespace SlaveMatrix eleD.頭頂右接続(e.Get逆()); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 40; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD<双目D>("猫目", RNG.XS.NextBool()); @@ -2328,17 +2328,17 @@ namespace SlaveMatrix 胸D2.肩右接続(肩D2.Get逆()); 長物_蟲D 長物_蟲D2 = new 長物_蟲D(); 腰D2.半身接続(長物_蟲D2); - 胴_蟲D 胴_蟲D2 = new 胴_蟲D(); + Torso_蟲D 胴_蟲D2 = new Torso_蟲D(); 長物_蟲D2.胴接続(胴_蟲D2); for (int i = 0; i < 21; i++) { - 胴_蟲D2.胴接続(胴_蟲D2 = new 胴_蟲D()); + 胴_蟲D2.Torso接続(胴_蟲D2 = new Torso_蟲D()); } 尾_蟲D 尾_蟲D2 = new 尾_蟲D(); 節D 節D2 = (RNG.XS.NextBool() ? ((節尾D)new 節尾_曳航D()) : ((節尾D)new 節尾_鋏D())); 尾_蟲D2.尾左接続(節D2); 尾_蟲D2.尾右接続(節D2.Get逆()); - 胴_蟲D2.胴接続(尾_蟲D2); + 胴_蟲D2.Torso接続(尾_蟲D2); 腰D2.EnumEleD().SetValuesD("虫性", true); 腰D2.EnumEleD().SetValuesD("配色", 配色指定.C0); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -2381,11 +2381,11 @@ namespace SlaveMatrix 四足脇D2.上腕接続(脚_竜D2); 腰D2.翼左接続(四足脇D2); 腰D2.翼右接続(四足脇D2.Get逆()); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 50; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } e = new 足_鳥D(); 脚_竜D2 = new 脚_竜D(); @@ -2396,7 +2396,7 @@ namespace SlaveMatrix 胴_蛇D2.右接続(腿_竜D2.Get逆()); 尾_ヘD 尾_ヘD2 = new 尾_ヘD(); 尾_ヘD2.尾先接続(new 尾鰭_魚D()); - 胴_蛇D2.胴接続(尾_ヘD2); + 胴_蛇D2.Torso接続(尾_ヘD2); 腰D2.EnumEleD().SetValuesD<頭D>("馬", true); 胸D2.肌_接続.SetValuesD<胸毛D>("表示", true); 腰D2.EnumEleD().SetValuesD("竜性", true); @@ -2636,7 +2636,7 @@ namespace SlaveMatrix 腰D2.EnumEleD().SetValuesD("ハート", false); 腰D2.SetValuesD("悪", true); 腰D2.EnumEleD().SetValuesD<胸D>("植", true); - 腰D2.EnumEleD().SetValuesD<胴D>("植", true); + 腰D2.EnumEleD().SetValuesD("植", true); 腰D2.EnumEleD().SetValuesD<胸D>("タトゥ2", false); 腰D2.EnumEleD().SetValuesD<下腕_人D>("手首", false); 腰D2.EnumEleD().SetValuesD<脚_人D>("足首", false); @@ -3497,7 +3497,7 @@ namespace SlaveMatrix public static ChaD Getスフィンクス(bool b) { WaistD 腰D2 = Uni.腰(); - 胴D e = 腰D2.Set胴(); + TorsoD e = 腰D2.Set胴(); 胸D 胸D2 = e.Set胸R(); 頭D 頭D2 = 胸D2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); @@ -4080,7 +4080,7 @@ namespace SlaveMatrix public static ChaD Getウェアマンティス() { WaistD obj = Uni.腰(); - 胴D obj2 = obj.Set胴(); + TorsoD obj2 = obj.Set胴(); 胸D obj3 = obj2.Set胸R(); 頭D 頭D2 = obj3.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); @@ -4184,13 +4184,13 @@ namespace SlaveMatrix obj.翼上右接続(上腕_鳥D2.Get逆()); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 45; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(RNG.XS.NextBool() ? ((尾D)new 尾_ヘD()) : ((尾D)new 尾_ガD())); + 胴_蛇D2.Torso接続(RNG.XS.NextBool() ? ((尾D)new 尾_ヘD()) : ((尾D)new 尾_ガD())); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD<舌_長D>("股舌表示", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -4324,13 +4324,13 @@ namespace SlaveMatrix 頭D2.頭頂接続(頭頂_宇D2); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 45; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD<舌_長D>("股舌表示", true); @@ -4361,13 +4361,13 @@ namespace SlaveMatrix 頭D2.顔面接続(e); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 40; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD("コア1", true); @@ -4482,13 +4482,13 @@ namespace SlaveMatrix 長物_蟲D2.右0接続(eleD.Get逆()); 長物_蟲D2.左1接続(eleD.Copy()); 長物_蟲D2.右1接続(eleD.Get逆()); - 胴_蟲D 胴_蟲D2 = new 胴_蟲D(); + Torso_蟲D 胴_蟲D2 = new Torso_蟲D(); 長物_蟲D2.胴接続(胴_蟲D2); 胴_蟲D2.左接続(eleD.Copy()); 胴_蟲D2.右接続(eleD.Get逆()); for (int i = 0; i < 21; i++) { - 胴_蟲D2.胴接続(胴_蟲D2 = new 胴_蟲D()); + 胴_蟲D2.Torso接続(胴_蟲D2 = new Torso_蟲D()); 胴_蟲D2.左接続(eleD.Copy()); 胴_蟲D2.右接続(eleD.Get逆()); } @@ -4506,7 +4506,7 @@ namespace SlaveMatrix 尾_蟲D2.右5接続(eleD.Get逆()); 尾_蟲D2.尾左接続(節尾_曳航D2); 尾_蟲D2.尾右接続(節尾_曳航D2.Get逆()); - 胴_蟲D2.胴接続(尾_蟲D2); + 胴_蟲D2.Torso接続(尾_蟲D2); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); 腰D2.EnumEleD().SetValuesD("身長", 頭D2.目高); @@ -4571,7 +4571,7 @@ namespace SlaveMatrix public static ChaD Getバジリスク() { WaistD 腰D2 = Uni.腰(); - 胴D obj = 腰D2.Set胴(); + TorsoD obj = 腰D2.Set胴(); 頭D 頭D2 = obj.Set胸R().Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); @@ -4620,13 +4620,13 @@ namespace SlaveMatrix 四足脇D2.上腕接続(脚_竜D2); 腰D2.翼左接続(四足脇D2); 腰D2.翼右接続(四足脇D2.Get逆()); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 30; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); @@ -4641,7 +4641,7 @@ namespace SlaveMatrix public static ChaD Getコカトリス() { WaistD 腰D2 = Uni.腰(); - 胴D obj = 腰D2.Set胴(); + TorsoD obj = 腰D2.Set胴(); 胸D 胸D2 = obj.Set胸R(); 頭D 頭D2 = 胸D2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); @@ -4679,13 +4679,13 @@ namespace SlaveMatrix 四足脇D2.上腕接続(脚_竜D2); 腰D2.翼左接続(四足脇D2); 腰D2.翼右接続(四足脇D2.Get逆()); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 30; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("獣性", true); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); @@ -4923,7 +4923,7 @@ namespace SlaveMatrix public static ChaD GetViola() { WaistD waist_description = Uni.腰(); - 胴D body_description = waist_description.Set胴(); + TorsoD body_description = waist_description.Set胴(); 胸D chest_description = body_description.Set胸R(); 首D neck_description = chest_description.Set首(); 頭D head_description = Uni.頭(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index 5440f5d..696671b 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -1298,8 +1298,8 @@ namespace SlaveMatrix 足_鳥Dt = typeof(足_鳥D); 足_竜Dt = typeof(足_竜D); 四足脇Dt = typeof(四足脇D); - 胴_蛇Dt = typeof(胴_蛇D); - 胴_蟲Dt = typeof(胴_蟲D); + 胴_蛇Dt = typeof(Torso_蛇D); + 胴_蟲Dt = typeof(Torso_蟲D); 大顎基Dt = typeof(大顎基D); 鳳凰Dt = typeof(鳳凰D); 大顎Dt = typeof(大顎D); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs index 339abe6..4dff333 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs @@ -53,9 +53,9 @@ namespace SlaveMatrix return obj; } - public static 胴D 胴() + public static TorsoD 胴() { - 胴D obj = new 胴D(); + TorsoD obj = new TorsoD(); obj.肌接続(new 胴腹板D()); obj.肌接続(new 胴肌D()); obj.肌接続(new 上着ミドル_ドレスD()); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs b/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs index 789ccb7..c2ba8b0 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs @@ -269,17 +269,17 @@ namespace SlaveMatrix.GameClasses }; } - public static 胴D Set胴(this WaistD 腰) + public static TorsoD Set胴(this WaistD 腰) { - 胴D 胴D2 = Uni.胴(); + TorsoD 胴D2 = Uni.胴(); 腰.胴接続(胴D2); return 胴D2; } - public static 胸D Set胸R(this 胴D 胴) + public static 胸D Set胸R(this TorsoD 胴) { 胸D 胸D2 = Get胸R(); - 胴.胸接続(胸D2); + 胴.Torso接続(胸D2); return 胸D2; }