From ed321a375f4edc4de2ab16e42219290cdfd11d06 Mon Sep 17 00:00:00 2001 From: AbdulmanovAI Date: Fri, 24 Oct 2025 16:23:11 +0400 Subject: [PATCH] Renamed some connections (still does not work) --- 2DGAMELIB/_2DGAMELIB/ObjExtensions.cs | 15 +++++++- .../BodyPartClasses/ConnectionInfo.cs | 28 +++++++-------- .../SlaveMatrix/BodyPartClasses/Torso.cs | 11 +++--- .../SlaveMatrix/BodyPartClasses/Waist.cs | 8 ++--- .../SlaveMatrix/BodyPartClasses/WaistD.cs | 6 ++-- .../SlaveMatrix/BodyPartClasses/交配.cs | 36 +++++++++---------- .../SlaveMatrix/BodyPartClasses/四足胸.cs | 2 +- .../SlaveMatrix/BodyPartClasses/四足胸D.cs | 2 +- .../SlaveMatrix/BodyPartClasses/胴D.cs | 8 ++--- .../SlaveMatrix/BodyPartClasses/胴_蛇.cs | 6 ++-- .../SlaveMatrix/BodyPartClasses/胴_蛇D.cs | 6 ++-- .../SlaveMatrix/BodyPartClasses/胴_蟲.cs | 6 ++-- .../SlaveMatrix/BodyPartClasses/胴_蟲D.cs | 6 ++-- .../SlaveMatrix/BodyPartClasses/長物_蛇.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_蛇D.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_蟲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_蟲D.cs | 2 +- SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs | 2 +- SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs | 28 +++++++-------- SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs | 19 +++++----- 20 files changed, 107 insertions(+), 90 deletions(-) diff --git a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs index ec0a2bf..ec7800c 100644 --- a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs +++ b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs @@ -20,10 +20,23 @@ 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); - newDict.Add(newKey, obj.Difss[key]); } + var temp = newDict["Torso"]; + obj.Difss = newDict; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs index 94645b8..1db95db 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs @@ -71,11 +71,11 @@ namespace SlaveMatrix 胸_背中_接続, 乳房_噴乳_接続, 肩_上腕_接続, - 胴_胸_接続, - 胴_肌_接続, - 胴_翼左_接続, - 胴_翼右_接続, - Waist_胴_接続, + Torso_胸_接続, + Torso_肌_接続, + Torso_翼左_接続, + Torso_翼右_接続, + Waist_Torso_接続, Waist_腿左_接続, Waist_腿右_接続, Waist_膣基_接続, @@ -349,15 +349,15 @@ namespace SlaveMatrix 長物_鯨_尾_接続, 長物_蛇_左_接続, 長物_蛇_右_接続, - 長物_蛇_胴_接続, + 長物_蛇_Torso_接続, 長物_蟲_左0_接続, 長物_蟲_右0_接続, 長物_蟲_左1_接続, 長物_蟲_右1_接続, - 長物_蟲_胴_接続, + 長物_蟲_Torso_接続, 四足胸_脇左_接続, 四足胸_脇右_接続, - 四足胸_胴_接続, + 四足胸_Torso_接続, 四足胸_胸左_接続, 四足胸_胸右_接続, 四足胸_肌_接続, @@ -414,12 +414,12 @@ namespace SlaveMatrix 単足_植_根中央_接続, 単足_植_根内右_接続, 単足_植_根外右_接続, - 胴_蛇_左_接続, - 胴_蛇_右_接続, - 胴_蛇_胴_接続, - 胴_蟲_左_接続, - 胴_蟲_右_接続, - 胴_蟲_胴_接続, + Torso_蛇_左_接続, + Torso_蛇_右_接続, + Torso_蛇_Torso_接続, + Torso_蟲_左_接続, + Torso_蟲_右_接続, + Torso_蟲_Torso_接続, 大顎基_顎左_接続, 大顎基_顎右_接続, 植_花_接続, diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs index 42fb564..03e00d5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs @@ -291,7 +291,8 @@ namespace SlaveMatrix { Torso 胴2 = this; ThisType = GetType(); - 本体 = new Difs(Sta.胴体["Torso"]); + //This had no Torso (胴体) + 本体 = new Difs(Sta.胴体["Torso"]); Pars pars = 本体[0][0]; X0Y0_胴 = pars["Torso"].ToPar(); Pars pars2 = pars["筋肉"].ToPars(); @@ -354,7 +355,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴2; - f.ConnectionType = ConnectionInfo.胴_胸_接続; + f.ConnectionType = ConnectionInfo.Torso_胸_接続; f.接続(胴2.胸_接続点); return f; }).ToArray(); @@ -365,7 +366,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴2; - f.ConnectionType = ConnectionInfo.胴_肌_接続; + f.ConnectionType = ConnectionInfo.Torso_肌_接続; f.接続(胴2.肌_接続点); return f; }).ToArray(); @@ -376,7 +377,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴2; - f.ConnectionType = ConnectionInfo.胴_翼左_接続; + f.ConnectionType = ConnectionInfo.Torso_翼左_接続; f.接続(胴2.翼左_接続点); return f; }).ToArray(); @@ -387,7 +388,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴2; - f.ConnectionType = ConnectionInfo.胴_翼右_接続; + f.ConnectionType = ConnectionInfo.Torso_翼右_接続; f.接続(胴2.翼右_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs index c31d0aa..dbd8693 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs @@ -955,7 +955,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public Ele[] 腿左_接続; @@ -2516,13 +2516,13 @@ namespace SlaveMatrix 表示 = false; } Ele f; - 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; - f.ConnectionType = ConnectionInfo.Waist_胴_接続; + f.ConnectionType = ConnectionInfo.Waist_Torso_接続; f.接続(腰2.胴_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs index a29e0d4..b619a61 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs @@ -109,7 +109,7 @@ namespace SlaveMatrix public bool スライム; - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public List 腿左_接続 = new List(); @@ -138,9 +138,9 @@ namespace SlaveMatrix public void 胴接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.Waist_胴_接続; + e.接続情報 = ConnectionInfo.Waist_Torso_接続; } public void 腿左接続(EleD e) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs index 2f1d732..ab33e6f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs @@ -823,11 +823,11 @@ namespace SlaveMatrix 胸翼下人 }, { - ConnectionInfo.胴_翼左_接続, + ConnectionInfo.Torso_翼左_接続, 胴翼人 }, { - ConnectionInfo.胴_翼右_接続, + ConnectionInfo.Torso_翼右_接続, 胴翼人 }, { @@ -1055,11 +1055,11 @@ namespace SlaveMatrix 蛇 }, { - ConnectionInfo.胴_蛇_左_接続, + ConnectionInfo.Torso_蛇_左_接続, 蛇 }, { - ConnectionInfo.胴_蛇_右_接続, + ConnectionInfo.Torso_蛇_右_接続, 蛇 }, { @@ -1127,11 +1127,11 @@ namespace SlaveMatrix 蟲尾先 }, { - ConnectionInfo.胴_蟲_左_接続, + ConnectionInfo.Torso_蟲_左_接続, 蟲 }, { - ConnectionInfo.胴_蟲_右_接続, + ConnectionInfo.Torso_蟲_右_接続, 蟲 }, { @@ -1199,19 +1199,19 @@ namespace SlaveMatrix 尾鯨 }, { - ConnectionInfo.長物_蛇_胴_接続, + ConnectionInfo.長物_蛇_Torso_接続, 尾蛇 }, { - ConnectionInfo.長物_蟲_胴_接続, + ConnectionInfo.長物_蟲_Torso_接続, 尾蟲 }, { - ConnectionInfo.胴_蛇_胴_接続, + ConnectionInfo.Torso_蛇_Torso_接続, 尾蛇 }, { - ConnectionInfo.胴_蟲_胴_接続, + ConnectionInfo.Torso_蟲_Torso_接続, 尾蟲 }, { @@ -2164,7 +2164,7 @@ namespace SlaveMatrix 頭D2.接続(母方, 父方, i, ConnectionInfo.頭_額_接続, 要素構成, 接続構成, 変異率, 原種モード); 胸D2.接続(母方, 父方, i, ConnectionInfo.胸_翼上左_接続, 要素構成, 接続構成, 変異率, 原種モード); 胸D2.接続(母方, 父方, i, ConnectionInfo.胸_翼下左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胴D2.接続(母方, 父方, i, ConnectionInfo.胴_翼左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴D2.接続(母方, 父方, i, ConnectionInfo.Torso_翼左_接続, 要素構成, 接続構成, 変異率, 原種モード); 腰.接続(母方, 父方, i, ConnectionInfo.Waist_翼左_接続, 要素構成, 接続構成, 変異率, 原種モード); if (原種モード) { @@ -2355,7 +2355,7 @@ namespace SlaveMatrix 胴_蛇D 胴_蛇D2 = Mix<胴_蛇D>(母方, 父方, i, 原種モード); if (胴_蛇D2 != null) { - 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.胴_蛇_左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.Torso_蛇_左_接続, 要素構成, 接続構成, 変異率, 原種モード); 長胴D 長胴D2 = (長胴D)胴_蛇D2.Copy(); 長物_蛇D2.胴接続(胴_蛇D2); int num11 = 2; @@ -2367,7 +2367,7 @@ namespace SlaveMatrix { 胴_蛇D2.胴接続(胴_蛇D2 = (胴_蛇D)長胴D2.Copy()); } - 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.胴_蛇_胴_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.Torso_蛇_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); if (胴_蛇D2.EnumEleD().IsEleD<腿D>()) { IEnumerable<胴_蛇D> eleDs = 長物_蛇D2.EnumEleD().Skip(1).GetEleDs<胴_蛇D>(); @@ -2399,7 +2399,7 @@ namespace SlaveMatrix } else { - 長物_蛇D2.接続(母方, 父方, i, ConnectionInfo.長物_蛇_胴_接続, 要素構成, 接続構成, 変異率, 原種モード); + 長物_蛇D2.接続(母方, 父方, i, ConnectionInfo.長物_蛇_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); } 長物_蛇D2.AlignC(); if (長物_蛇D2.ガード) @@ -2452,7 +2452,7 @@ namespace SlaveMatrix 胴_蟲D 胴_蟲D2 = Mix<胴_蟲D>(母方, 父方, i, 原種モード); if (胴_蟲D2 != null) { - 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.胴_蟲_左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.Torso_蟲_左_接続, 要素構成, 接続構成, 変異率, 原種モード); 長胴D 長胴D3 = (長胴D)胴_蟲D2.Copy(); 長物_蟲D2.胴接続(胴_蟲D2); int num19 = 2; @@ -2464,11 +2464,11 @@ namespace SlaveMatrix { 胴_蟲D2.胴接続(胴_蟲D2 = (胴_蟲D)長胴D3.Copy()); } - 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.胴_蟲_胴_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.Torso_蟲_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); } else { - 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_胴_接続, 要素構成, 接続構成, 変異率, 原種モード); + 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); } 長物_蟲D2.AlignC(); 腰.翼左_接続.RemoveAll((EleD e) => e is 四足脇D); @@ -4475,7 +4475,7 @@ namespace SlaveMatrix l = 0.0; } } - if (l == 0.0 && (接続 == ConnectionInfo.四足脇_上腕_接続 || 接続 == ConnectionInfo.Waist_腿左_接続 || 接続 == ConnectionInfo.Waist_腿左_接続 || 接続 == ConnectionInfo.四足腰_腿左_接続 || 接続 == ConnectionInfo.四足腰_腿左_接続 || 接続 == ConnectionInfo.長物_魚_尾_接続 || 接続 == ConnectionInfo.長物_鯨_尾_接続 || 接続 == ConnectionInfo.長物_蛇_胴_接続 || 接続 == ConnectionInfo.長物_蟲_胴_接続 || 接続 == ConnectionInfo.胴_蛇_胴_接続 || 接続 == ConnectionInfo.胴_蟲_胴_接続 || 接続 == ConnectionInfo.多足_蛸_軟体外左_接続 || 接続 == ConnectionInfo.多足_蛸_軟体外右_接続 || 接続 == ConnectionInfo.多足_蛸_軟体内左_接続 || 接続 == ConnectionInfo.多足_蛸_軟体内右_接続 || 接続 == ConnectionInfo.単足_植_根外左_接続 || 接続 == ConnectionInfo.単足_植_根内左_接続 || 接続 == ConnectionInfo.単足_植_根中央_接続 || 接続 == ConnectionInfo.単足_植_根内右_接続 || 接続 == ConnectionInfo.単足_植_根外右_接続 || 接続 == ConnectionInfo.頭頂_宇_頭部後_接続 || (num * 1.1).Lot())) + if (l == 0.0 && (接続 == ConnectionInfo.四足脇_上腕_接続 || 接続 == ConnectionInfo.Waist_腿左_接続 || 接続 == ConnectionInfo.Waist_腿左_接続 || 接続 == ConnectionInfo.四足腰_腿左_接続 || 接続 == ConnectionInfo.四足腰_腿左_接続 || 接続 == ConnectionInfo.長物_魚_尾_接続 || 接続 == ConnectionInfo.長物_鯨_尾_接続 || 接続 == ConnectionInfo.長物_蛇_Torso_接続 || 接続 == ConnectionInfo.長物_蟲_Torso_接続 || 接続 == ConnectionInfo.Torso_蛇_Torso_接続 || 接続 == ConnectionInfo.Torso_蟲_Torso_接続 || 接続 == ConnectionInfo.多足_蛸_軟体外左_接続 || 接続 == ConnectionInfo.多足_蛸_軟体外右_接続 || 接続 == ConnectionInfo.多足_蛸_軟体内左_接続 || 接続 == ConnectionInfo.多足_蛸_軟体内右_接続 || 接続 == ConnectionInfo.単足_植_根外左_接続 || 接続 == ConnectionInfo.単足_植_根内左_接続 || 接続 == ConnectionInfo.単足_植_根中央_接続 || 接続 == ConnectionInfo.単足_植_根内右_接続 || 接続 == ConnectionInfo.単足_植_根外右_接続 || 接続 == ConnectionInfo.頭頂_宇_頭部後_接続 || (num * 1.1).Lot())) { l = 1.0; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs index 1a35111..f7bc497 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs @@ -949,7 +949,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; - f.ConnectionType = ConnectionInfo.四足胸_胴_接続; + f.ConnectionType = ConnectionInfo.四足胸_Torso_接続; f.接続(四足胸2.胴_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs index 87f0cdb..4a3abcf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs @@ -118,7 +118,7 @@ namespace SlaveMatrix { 胴_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.四足胸_胴_接続; + e.接続情報 = ConnectionInfo.四足胸_Torso_接続; } public void 胸左接続(EleD e) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs index 452c12a..c28c89a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs @@ -44,21 +44,21 @@ namespace SlaveMatrix { 胸_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_胸_接続; + e.接続情報 = ConnectionInfo.Torso_胸_接続; } public void 肌接続(EleD e) { 肌_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_肌_接続; + e.接続情報 = ConnectionInfo.Torso_肌_接続; } public void 翼左接続(EleD e) { 翼左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_翼左_接続; + e.接続情報 = ConnectionInfo.Torso_翼左_接続; if (!(e is 尾D)) { return; @@ -73,7 +73,7 @@ namespace SlaveMatrix { 翼右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_翼右_接続; + e.接続情報 = ConnectionInfo.Torso_翼右_接続; if (!(e is 尾D)) { return; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs index cbc27f5..e855428 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs @@ -402,7 +402,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蛇2; - f.ConnectionType = ConnectionInfo.胴_蛇_左_接続; + f.ConnectionType = ConnectionInfo.Torso_蛇_左_接続; f.接続(胴_蛇2.左_接続点); return f; }).ToArray(); @@ -413,7 +413,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蛇2; - f.ConnectionType = ConnectionInfo.胴_蛇_右_接続; + f.ConnectionType = ConnectionInfo.Torso_蛇_右_接続; f.接続(胴_蛇2.右_接続点); return f; }).ToArray(); @@ -424,7 +424,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蛇2; - f.ConnectionType = ConnectionInfo.胴_蛇_胴_接続; + f.ConnectionType = ConnectionInfo.Torso_蛇_Torso_接続; f.接続(胴_蛇2.胴_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs index 038cce3..f918065 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs @@ -39,21 +39,21 @@ namespace SlaveMatrix { 左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蛇_左_接続; + e.接続情報 = ConnectionInfo.Torso_蛇_左_接続; } public override void 右接続(EleD e) { 右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蛇_右_接続; + e.接続情報 = ConnectionInfo.Torso_蛇_右_接続; } public override void 胴接続(EleD e) { 胴_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蛇_胴_接続; + e.接続情報 = ConnectionInfo.Torso_蛇_Torso_接続; } public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs index 4ac4ab7..94b1ed8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs @@ -562,7 +562,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蟲2; - f.ConnectionType = ConnectionInfo.胴_蟲_左_接続; + f.ConnectionType = ConnectionInfo.Torso_蟲_左_接続; f.接続(胴_蟲2.左_接続点); return f; }).ToArray(); @@ -573,7 +573,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蟲2; - f.ConnectionType = ConnectionInfo.胴_蟲_右_接続; + f.ConnectionType = ConnectionInfo.Torso_蟲_右_接続; f.接続(胴_蟲2.右_接続点); return f; }).ToArray(); @@ -584,7 +584,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蟲2; - f.ConnectionType = ConnectionInfo.胴_蟲_胴_接続; + f.ConnectionType = ConnectionInfo.Torso_蟲_Torso_接続; f.接続(胴_蟲2.胴_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs index 79a1f27..1b042c0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs @@ -57,21 +57,21 @@ namespace SlaveMatrix { 左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蟲_左_接続; + e.接続情報 = ConnectionInfo.Torso_蟲_左_接続; } public override void 右接続(EleD e) { 右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蟲_右_接続; + e.接続情報 = ConnectionInfo.Torso_蟲_右_接続; } public override void 胴接続(EleD e) { 胴_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蟲_胴_接続; + e.接続情報 = ConnectionInfo.Torso_蟲_Torso_接続; } public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index 07cfec8..2c0f450 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -395,7 +395,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蛇2; - f.ConnectionType = ConnectionInfo.長物_蛇_胴_接続; + f.ConnectionType = ConnectionInfo.長物_蛇_Torso_接続; f.接続(長物_蛇2.胴_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs index 2c50dfd..1ab9e21 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs @@ -58,7 +58,7 @@ namespace SlaveMatrix { 胴_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.長物_蛇_胴_接続; + e.接続情報 = ConnectionInfo.長物_蛇_Torso_接続; } public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index c4b2c30..594e052 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -650,7 +650,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蟲2; - f.ConnectionType = ConnectionInfo.長物_蟲_胴_接続; + f.ConnectionType = ConnectionInfo.長物_蟲_Torso_接続; f.接続(長物_蟲2.胴_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs index 777aa02..ab8f86c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix { 胴_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.長物_蟲_胴_接続; + e.接続情報 = ConnectionInfo.長物_蟲_Torso_接続; } public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs index ea05d82..a821387 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs @@ -3829,7 +3829,7 @@ namespace SlaveMatrix 長胴n = 長胴.Count; if (腰 != null) { - 胴 = 腰.胴_接続.GetEle(); + 胴 = 腰.Torso_接続.GetEle(); ボテ腹_人 = 腰.肌_接続.GetEle<ボテ腹_人>(); ボテ腹板_人 = ボテ腹_人.腹板_接続.GetEle<ボテ腹板>(); ボテ腹板_人.SetHitFalse(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs index 9b94f56..0a56866 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs @@ -600,11 +600,11 @@ namespace SlaveMatrix ConnectionInfo.胸_背中_接続 => 0, ConnectionInfo.乳房_噴乳_接続 => 1, ConnectionInfo.肩_上腕_接続 => 1, - ConnectionInfo.胴_胸_接続 => 1, - ConnectionInfo.胴_肌_接続 => 1, - ConnectionInfo.胴_翼左_接続 => 0, - ConnectionInfo.胴_翼右_接続 => 0, - ConnectionInfo.Waist_胴_接続 => 1, + ConnectionInfo.Torso_胸_接続 => 1, + ConnectionInfo.Torso_肌_接続 => 1, + ConnectionInfo.Torso_翼左_接続 => 0, + ConnectionInfo.Torso_翼右_接続 => 0, + ConnectionInfo.Waist_Torso_接続 => 1, ConnectionInfo.Waist_腿左_接続 => 1, ConnectionInfo.Waist_腿右_接続 => 1, ConnectionInfo.Waist_膣基_接続 => 1, @@ -877,15 +877,15 @@ namespace SlaveMatrix ConnectionInfo.長物_鯨_尾_接続 => 0, ConnectionInfo.長物_蛇_左_接続 => 1, ConnectionInfo.長物_蛇_右_接続 => 1, - ConnectionInfo.長物_蛇_胴_接続 => 0, + ConnectionInfo.長物_蛇_Torso_接続 => 0, ConnectionInfo.長物_蟲_左0_接続 => 1, ConnectionInfo.長物_蟲_右0_接続 => 1, ConnectionInfo.長物_蟲_左1_接続 => 1, ConnectionInfo.長物_蟲_右1_接続 => 1, - ConnectionInfo.長物_蟲_胴_接続 => 0, + ConnectionInfo.長物_蟲_Torso_接続 => 0, ConnectionInfo.四足胸_脇左_接続 => 0, ConnectionInfo.四足胸_脇右_接続 => 0, - ConnectionInfo.四足胸_胴_接続 => 0, + ConnectionInfo.四足胸_Torso_接続 => 0, ConnectionInfo.四足胸_胸左_接続 => 1, ConnectionInfo.四足胸_胸右_接続 => 1, ConnectionInfo.四足胸_肌_接続 => 1, @@ -942,12 +942,12 @@ namespace SlaveMatrix ConnectionInfo.単足_植_根中央_接続 => 0, ConnectionInfo.単足_植_根内右_接続 => 0, ConnectionInfo.単足_植_根外右_接続 => 0, - ConnectionInfo.胴_蛇_左_接続 => 1, - ConnectionInfo.胴_蛇_右_接続 => 1, - ConnectionInfo.胴_蛇_胴_接続 => 0, - ConnectionInfo.胴_蟲_左_接続 => 1, - ConnectionInfo.胴_蟲_右_接続 => 1, - ConnectionInfo.胴_蟲_胴_接続 => 0, + ConnectionInfo.Torso_蛇_左_接続 => 1, + ConnectionInfo.Torso_蛇_右_接続 => 1, + ConnectionInfo.Torso_蛇_Torso_接続 => 0, + ConnectionInfo.Torso_蟲_左_接続 => 1, + ConnectionInfo.Torso_蟲_右_接続 => 1, + ConnectionInfo.Torso_蟲_Torso_接続 => 0, ConnectionInfo.大顎基_顎左_接続 => 1, ConnectionInfo.大顎基_顎右_接続 => 1, ConnectionInfo.植_花_接続 => 1, diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index 41d7703..5440f5d 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -1086,6 +1086,9 @@ namespace SlaveMatrix { var obj = Resources.胴体.ObjLoad(); obj.MigrateKeys(); + + var tmp = obj["Torso"]; + 胴体 = obj; //胴体.SaveExMod("C:\\Users\\dave\\Documents\\胴体"); @@ -1336,9 +1339,9 @@ namespace SlaveMatrix ConnectionInfo.胸_首_接続, ConnectionInfo.胸_肌_接続, ConnectionInfo.胸_背中_接続, - ConnectionInfo.胴_胸_接続, - ConnectionInfo.胴_肌_接続, - ConnectionInfo.Waist_胴_接続, + ConnectionInfo.Torso_胸_接続, + ConnectionInfo.Torso_肌_接続, + ConnectionInfo.Waist_Torso_接続, ConnectionInfo.Waist_肌_接続, ConnectionInfo.Waist_膣基_接続, ConnectionInfo.Waist_肛門_接続, @@ -1363,9 +1366,9 @@ namespace SlaveMatrix ConnectionInfo.尾_鯨_尾先_接続, ConnectionInfo.長物_魚_尾_接続, ConnectionInfo.長物_鯨_尾_接続, - ConnectionInfo.長物_蛇_胴_接続, - ConnectionInfo.長物_蟲_胴_接続, - ConnectionInfo.四足胸_胴_接続, + ConnectionInfo.長物_蛇_Torso_接続, + ConnectionInfo.長物_蟲_Torso_接続, + ConnectionInfo.四足胸_Torso_接続, ConnectionInfo.四足胸_肌_接続, ConnectionInfo.四足胸_背中_接続, ConnectionInfo.四足胴_腰_接続, @@ -1379,8 +1382,8 @@ namespace SlaveMatrix ConnectionInfo.多足_蜘_尾_接続, ConnectionInfo.多足_蠍_尾_接続, ConnectionInfo.単足_植_根中央_接続, - ConnectionInfo.胴_蛇_胴_接続, - ConnectionInfo.胴_蟲_胴_接続, + ConnectionInfo.Torso_蛇_Torso_接続, + ConnectionInfo.Torso_蟲_Torso_接続, ConnectionInfo.ペニス_尿道_接続 }); 接続情報t = typeof(ConnectionInfo);