diff --git a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs index 760a4a3..ec0a2bf 100644 --- a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs +++ b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs @@ -9,7 +9,8 @@ namespace _2DGAMELIB static readonly Dictionary KeyMap = new() { ["咳"] = "Cough", - ["腰"] = "Waist" + ["腰"] = "Waist", + ["胴"] = "Torso" }; public static void MigrateKeys(this Obj obj) 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 89bd2f6..42fb564 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胴 : Ele + public class Torso : Ele { public Par X0Y0_胴; @@ -287,13 +287,13 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(本体, X0Y0_胴, 2); - public 胴(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴D e) + public Torso(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴D e) { - 胴 胴2 = this; + Torso 胴2 = this; ThisType = GetType(); - 本体 = new Difs(Sta.胴体["胴"]); + 本体 = new Difs(Sta.胴体["Torso"]); Pars pars = 本体[0][0]; - X0Y0_胴 = pars["胴"].ToPar(); + X0Y0_胴 = pars["Torso"].ToPar(); Pars pars2 = pars["筋肉"].ToPars(); X0Y0_筋肉_筋肉左 = pars2["筋肉左"].ToPar(); X0Y0_筋肉_筋肉右 = pars2["筋肉右"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs index 875b4a2..9fff7c9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs @@ -205,7 +205,7 @@ namespace SlaveMatrix ThisType = GetType(); 本体 = new Difs(Sta.半身["四足胴"]); Pars pars = 本体[0][0]; - X0Y0_胴 = pars["胴"].ToPar(); + X0Y0_胴 = pars["Torso"].ToPar(); Pars pars2 = pars["筋肉"].ToPars(); X0Y0_筋肉_筋肉左 = pars2["筋肉左"].ToPar(); X0Y0_筋肉_筋肉右 = pars2["筋肉右"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs index 17d38f8..4d6924c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs @@ -111,7 +111,7 @@ namespace SlaveMatrix 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars = 本体[0][0]; - X0Y0_胴 = pars["胴"].ToPar(); + X0Y0_胴 = pars["Torso"].ToPar(); 本体.SetJoints(); 接続根 = new JointD(本体); 右 = e.右; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs index 94375d9..e74886b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs @@ -182,7 +182,7 @@ namespace SlaveMatrix 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars = 本体[0][0]; - X0Y0_胴 = pars["胴"].ToPar(); + X0Y0_胴 = pars["Torso"].ToPar(); X0Y0_胸版 = pars["胸版"].ToPar(); X0Y0_柄 = pars["柄"].ToPar(); 本体.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs index f7abb58..452c12a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix 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 6cc1e81..cbc27f5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs @@ -345,7 +345,7 @@ namespace SlaveMatrix X0Y0_胴_鱗 = pars3["鱗"].ToPar(); X0Y0_胴_鱗左 = pars3["鱗左"].ToPar(); X0Y0_胴_鱗右 = pars3["鱗右"].ToPar(); - X0Y0_胴_胴 = pars3["胴"].ToPar(); + X0Y0_胴_胴 = pars3["Torso"].ToPar(); pars3 = pars2["輪1"].ToPars(); X0Y0_輪_革 = pars3["革"].ToPar(); X0Y0_輪_金具1 = pars3["金具1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs index 76f5e4d..4ac4ab7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs @@ -492,7 +492,7 @@ namespace SlaveMatrix X0Y0_胴_背板 = pars3["背板"].ToPar(); X0Y0_胴_節 = pars3["節"].ToPar(); X0Y0_胴_胸板 = pars3["胸板"].ToPar(); - X0Y0_胴_胴 = pars3["胴"].ToPar(); + X0Y0_胴_胴 = pars3["Torso"].ToPar(); X0Y0_胴_瘤左2 = pars3["瘤左2"].ToPar(); X0Y0_胴_瘤左1 = pars3["瘤左1"].ToPar(); X0Y0_胴_瘤右2 = pars3["瘤右2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs index 0d897c2..6d00f8a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs @@ -6162,84 +6162,84 @@ namespace SlaveMatrix pars2 = pars["下顎頭部後"].ToPars(); X0Y0_下顎頭部後_頭2 = pars2["頭2"].ToPar(); X0Y0_下顎頭部後_頭1 = pars2["頭1"].ToPar(); - pars2 = pars["胴"].ToPars(); + pars2 = pars["Torso"].ToPars(); pars3 = pars2["節1"].ToPars(); - X0Y0_胴_節1_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節1_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節1_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節1_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節1_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節2"].ToPars(); - X0Y0_胴_節2_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節2_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節2_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節2_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節2_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節3"].ToPars(); - X0Y0_胴_節3_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節3_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節3_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節3_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節3_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節4"].ToPars(); - X0Y0_胴_節4_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節4_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節4_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節4_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節4_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節5"].ToPars(); - X0Y0_胴_節5_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節5_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節5_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節5_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節5_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節6"].ToPars(); - X0Y0_胴_節6_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節6_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節6_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節6_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節6_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節7"].ToPars(); - X0Y0_胴_節7_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節7_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節7_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節7_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節7_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節8"].ToPars(); - X0Y0_胴_節8_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節8_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節8_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節8_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節8_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節9"].ToPars(); - X0Y0_胴_節9_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節9_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節9_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節9_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節9_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節10"].ToPars(); - X0Y0_胴_節10_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節10_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節10_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節10_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節10_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節11"].ToPars(); - X0Y0_胴_節11_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節11_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節11_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節11_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節11_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節12"].ToPars(); - X0Y0_胴_節12_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節12_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節12_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節12_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節12_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節13"].ToPars(); - X0Y0_胴_節13_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節13_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節13_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節13_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節13_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節14"].ToPars(); - X0Y0_胴_節14_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節14_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節14_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節14_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節14_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節15"].ToPars(); - X0Y0_胴_節15_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節15_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節15_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節15_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節15_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節16"].ToPars(); - X0Y0_胴_節16_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節16_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節16_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節16_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節16_鱗2 = pars3["鱗2"].ToPar(); @@ -6251,12 +6251,12 @@ namespace SlaveMatrix X0Y0_胴_輪_金具左 = pars3["金具左"].ToPar(); X0Y0_胴_輪_金具右 = pars3["金具右"].ToPar(); pars3 = pars2["節17"].ToPars(); - X0Y0_胴_節17_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節17_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節17_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節17_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節17_鱗2 = pars3["鱗2"].ToPar(); pars3 = pars2["節18"].ToPars(); - X0Y0_胴_節18_胴 = pars3["胴"].ToPar(); + X0Y0_胴_節18_胴 = pars3["Torso"].ToPar(); X0Y0_胴_節18_鱗1 = pars3["鱗1"].ToPar(); X0Y0_胴_節18_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴_節18_鱗2 = pars3["鱗2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index 186563b..07cfec8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -315,7 +315,7 @@ namespace SlaveMatrix 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars2 = 本体[0][0]["胴1"].ToPars(); - X0Y0_胴1_胴 = pars2["胴"].ToPar(); + X0Y0_胴1_胴 = pars2["Torso"].ToPar(); X0Y0_胴1_鱗2 = pars2["鱗2"].ToPar(); X0Y0_胴1_鱗右 = pars2["鱗右"].ToPar(); X0Y0_胴1_鱗左 = pars2["鱗左"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index 732546b..c4b2c30 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -531,7 +531,7 @@ namespace SlaveMatrix Pars pars3 = pars2["胴1"].ToPars(); X0Y0_胴1_背板 = pars3["背板"].ToPar(); X0Y0_胴1_胸板 = pars3["胸板"].ToPar(); - X0Y0_胴1_胴 = pars3["胴"].ToPar(); + X0Y0_胴1_胴 = pars3["Torso"].ToPar(); X0Y0_胴1_瘤左2 = pars3["瘤左2"].ToPar(); X0Y0_胴1_瘤左1 = pars3["瘤左1"].ToPar(); X0Y0_胴1_瘤右2 = pars3["瘤右2"].ToPar(); @@ -539,7 +539,7 @@ namespace SlaveMatrix Pars pars4 = pars3["胴0"].ToPars(); X0Y0_胴1_胴0_背板 = pars4["背板"].ToPar(); X0Y0_胴1_胴0_胸板 = pars4["胸板"].ToPar(); - X0Y0_胴1_胴0_胴 = pars4["胴"].ToPar(); + X0Y0_胴1_胴0_胴 = pars4["Torso"].ToPar(); pars3 = pars2["輪1"].ToPars(); X0Y0_輪1_革 = pars3["革"].ToPar(); X0Y0_輪1_金具1 = pars3["金具1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs index e9f4dd1..2a9ff49 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs @@ -1914,7 +1914,7 @@ namespace SlaveMatrix X0Y0_胴6_鱗右_鱗2 = pars3["鱗2"].ToPar(); X0Y0_胴6_鱗右_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴6_鱗右_鱗4 = pars3["鱗4"].ToPar(); - X0Y0_胴6_胴 = pars2["胴"].ToPar(); + X0Y0_胴6_胴 = pars2["Torso"].ToPar(); pars2 = pars["胴5"].ToPars(); pars3 = pars2["鱗左"].ToPars(); X0Y0_胴5_鱗左_鱗1 = pars3["鱗1"].ToPar(); @@ -1926,7 +1926,7 @@ namespace SlaveMatrix X0Y0_胴5_鱗右_鱗2 = pars3["鱗2"].ToPar(); X0Y0_胴5_鱗右_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴5_鱗右_鱗4 = pars3["鱗4"].ToPar(); - X0Y0_胴5_胴 = pars2["胴"].ToPar(); + X0Y0_胴5_胴 = pars2["Torso"].ToPar(); pars2 = pars["輪2"].ToPars(); X0Y0_輪2_革 = pars2["革"].ToPar(); X0Y0_輪2_金具1 = pars2["金具1"].ToPar(); @@ -1945,7 +1945,7 @@ namespace SlaveMatrix X0Y0_胴4_鱗右_鱗2 = pars3["鱗2"].ToPar(); X0Y0_胴4_鱗右_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴4_鱗右_鱗4 = pars3["鱗4"].ToPar(); - X0Y0_胴4_胴 = pars2["胴"].ToPar(); + X0Y0_胴4_胴 = pars2["Torso"].ToPar(); pars2 = pars["胴3"].ToPars(); pars3 = pars2["鱗左"].ToPars(); X0Y0_胴3_鱗左_鱗1 = pars3["鱗1"].ToPar(); @@ -1957,7 +1957,7 @@ namespace SlaveMatrix X0Y0_胴3_鱗右_鱗2 = pars3["鱗2"].ToPar(); X0Y0_胴3_鱗右_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴3_鱗右_鱗4 = pars3["鱗4"].ToPar(); - X0Y0_胴3_胴 = pars2["胴"].ToPar(); + X0Y0_胴3_胴 = pars2["Torso"].ToPar(); pars2 = pars["胴2"].ToPars(); pars3 = pars2["鱗左"].ToPars(); X0Y0_胴2_鱗左_鱗1 = pars3["鱗1"].ToPar(); @@ -1969,7 +1969,7 @@ namespace SlaveMatrix X0Y0_胴2_鱗右_鱗2 = pars3["鱗2"].ToPar(); X0Y0_胴2_鱗右_鱗3 = pars3["鱗3"].ToPar(); X0Y0_胴2_鱗右_鱗4 = pars3["鱗4"].ToPar(); - X0Y0_胴2_胴 = pars2["胴"].ToPar(); + X0Y0_胴2_胴 = pars2["Torso"].ToPar(); pars2 = pars["胴1"].ToPars(); pars3 = pars2["鱗左2"].ToPars(); X0Y0_胴1_鱗左2_鱗1 = pars3["鱗1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs index 5064c99..bb9bbee 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs @@ -887,11 +887,11 @@ namespace SlaveMatrix 本体.Add(dif); Pars pars = 本体[0][0]; Pars pars2 = pars["胴6"].ToPars(); - X0Y0_胴6_胴 = pars2["胴"].ToPar(); + X0Y0_胴6_胴 = pars2["Torso"].ToPar(); X0Y0_胴6_柄 = pars2["柄"].ToPar(); X0Y0_胴6_縦影 = pars2["縦影"].ToPar(); pars2 = pars["胴5"].ToPars(); - X0Y0_胴5_胴 = pars2["胴"].ToPar(); + X0Y0_胴5_胴 = pars2["Torso"].ToPar(); X0Y0_胴5_柄 = pars2["柄"].ToPar(); X0Y0_胴5_縦影 = pars2["縦影"].ToPar(); pars2 = pars["輪2"].ToPars(); @@ -902,19 +902,19 @@ namespace SlaveMatrix X0Y0_輪2_金具左 = pars2["金具左"].ToPar(); X0Y0_輪2_金具右 = pars2["金具右"].ToPar(); pars2 = pars["胴4"].ToPars(); - X0Y0_胴4_胴 = pars2["胴"].ToPar(); + X0Y0_胴4_胴 = pars2["Torso"].ToPar(); X0Y0_胴4_柄 = pars2["柄"].ToPar(); X0Y0_胴4_縦影 = pars2["縦影"].ToPar(); pars2 = pars["胴3"].ToPars(); - X0Y0_胴3_胴 = pars2["胴"].ToPar(); + X0Y0_胴3_胴 = pars2["Torso"].ToPar(); X0Y0_胴3_柄 = pars2["柄"].ToPar(); X0Y0_胴3_縦影 = pars2["縦影"].ToPar(); pars2 = pars["胴2"].ToPars(); - X0Y0_胴2_胴 = pars2["胴"].ToPar(); + X0Y0_胴2_胴 = pars2["Torso"].ToPar(); X0Y0_胴2_柄 = pars2["柄"].ToPar(); X0Y0_胴2_縦影 = pars2["縦影"].ToPar(); pars2 = pars["胴1"].ToPars(); - X0Y0_胴1_胴 = pars2["胴"].ToPar(); + X0Y0_胴1_胴 = pars2["Torso"].ToPar(); X0Y0_胴1_柄 = pars2["柄"].ToPar(); X0Y0_胴1_縦影 = pars2["縦影"].ToPar(); pars2 = pars["輪1"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs index 016b266..ea05d82 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -54,7 +54,7 @@ namespace SlaveMatrix public Waist 腰; - public 胴 胴; + public Torso 胴; public 胸 胸; @@ -3272,7 +3272,7 @@ namespace SlaveMatrix { 翼獣.上腕.接着 = () => bod.胴.X0Y0_胴.ToGlobal(bod.胴.X0Y0_胴.BasePointBase); } - else if (p is 胴 || p is Waist) + else if (p is Torso || p is Waist) { 翼獣.上腕.接着 = () => bod.腰.X0Y0_腰.ToGlobal(bod.腰.X0Y0_腰.JP[4].Joint); } @@ -3665,7 +3665,7 @@ namespace SlaveMatrix { 翼獣.上腕.接着 = () => bod.胴.X0Y0_胴.ToGlobal(bod.胴.X0Y0_胴.BasePointBase); } - else if (p is 胴 || p is Waist) + else if (p is Torso || p is Waist) { 翼獣.上腕.接着 = () => bod.腰.X0Y0_腰.ToGlobal(bod.腰.X0Y0_腰.JP[4].Joint); } @@ -3829,7 +3829,7 @@ namespace SlaveMatrix 長胴n = 長胴.Count; if (腰 != null) { - 胴 = 腰.胴_接続.GetEle<胴>(); + 胴 = 腰.胴_接続.GetEle(); ボテ腹_人 = 腰.肌_接続.GetEle<ボテ腹_人>(); ボテ腹板_人 = ボテ腹_人.腹板_接続.GetEle<ボテ腹板>(); ボテ腹板_人.SetHitFalse(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index f725d53..41d7703 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -1163,7 +1163,7 @@ namespace SlaveMatrix EleDt = typeof(EleD); 胸t = typeof(胸); 肩t = typeof(肩); - 胴t = typeof(胴); + 胴t = typeof(Torso); 腰t = typeof(Waist); 尾_鯨t = typeof(尾_鯨); 上腕_人t = typeof(上腕_人);