From 659ddb7a104b91d20ef19af6d7417e1fcc065062 Mon Sep 17 00:00:00 2001 From: REDCODE Date: Sat, 13 Jun 2026 21:27:52 +0200 Subject: [PATCH] Renamed Difs to VariantGrid --- 2DGAMELIB/_2DGAMELIB/Join.cs | 18 +++--- 2DGAMELIB/_2DGAMELIB/JointD.cs | 10 ++-- 2DGAMELIB/_2DGAMELIB/Joints.cs | 6 +- 2DGAMELIB/_2DGAMELIB/Obj.cs | 56 +++++++++---------- 2DGAMELIB/_2DGAMELIB/ObjExtensions.cs | 2 +- 2DGAMELIB/_2DGAMELIB/RemappedTypeBinder.cs | 53 ++++++++++-------- 2DGAMELIB/_2DGAMELIB/Ser.cs | 5 +- .../_2DGAMELIB/{Difs.cs => VariantGrid.cs} | 18 +++--- SlaveMatrix.Extract/Program.cs | 18 +++--- .../BodyPartClasses/BackHair0_カル.cs | 2 +- .../BodyPartClasses/BackHair0_ジグ.cs | 2 +- .../BodyPartClasses/BackHair0_ハネ.cs | 2 +- .../BodyPartClasses/BackHair0_パツ.cs | 2 +- .../BodyPartClasses/BackHair0_下1カル.cs | 2 +- .../BodyPartClasses/BackHair0_下1ジグ.cs | 2 +- .../BodyPartClasses/BackHair0_下1ハネ.cs | 2 +- .../BodyPartClasses/BackHair0_下1パツ.cs | 2 +- .../BodyPartClasses/BackHair0_下2カル.cs | 2 +- .../BodyPartClasses/BackHair0_下2ジグ.cs | 2 +- .../BodyPartClasses/BackHair0_下2ハネ.cs | 2 +- .../BodyPartClasses/BackHair0_下2パツ.cs | 2 +- .../BodyPartClasses/BackHair0_編1カル.cs | 2 +- .../BodyPartClasses/BackHair0_編1ジグ.cs | 2 +- .../BodyPartClasses/BackHair0_編1ハネ.cs | 2 +- .../BodyPartClasses/BackHair0_編1パツ.cs | 2 +- .../BodyPartClasses/BackHair0_編2カル.cs | 2 +- .../BodyPartClasses/BackHair0_編2ジグ.cs | 2 +- .../BodyPartClasses/BackHair0_編2ハネ.cs | 2 +- .../BodyPartClasses/BackHair0_編2パツ.cs | 2 +- .../BodyPartClasses/BackHair0_肢系.cs | 2 +- .../BodyPartClasses/BackHair1_結1カル.cs | 2 +- .../BodyPartClasses/BackHair1_結1ジグ.cs | 2 +- .../BodyPartClasses/BackHair1_結1ハネ.cs | 2 +- .../BodyPartClasses/BackHair1_結1パツ.cs | 2 +- .../BodyPartClasses/BackHair1_結2カル.cs | 2 +- .../BodyPartClasses/BackHair1_結2ジグ.cs | 2 +- .../BodyPartClasses/BackHair1_結2ハネ.cs | 2 +- .../BodyPartClasses/BackHair1_結2パツ.cs | 2 +- .../BodyPartClasses/BackHair1_編結.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Chest.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Cough.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Head.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Leg_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Leg_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Leg_竜.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Leg_蹄.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Leg_鳥.cs | 2 +- .../BodyPartClasses/LowerArm_人.cs | 2 +- .../BodyPartClasses/LowerArm_獣.cs | 2 +- .../BodyPartClasses/LowerArm_蝙.cs | 2 +- .../BodyPartClasses/LowerArm_蹄.cs | 2 +- .../BodyPartClasses/LowerArm_鳥.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Neck.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Shoulder.cs | 2 +- .../BodyPartClasses/SideHair_カル.cs | 2 +- .../BodyPartClasses/SideHair_ジグ.cs | 2 +- .../BodyPartClasses/SideHair_ハネ.cs | 2 +- .../BodyPartClasses/SideHair_パツ.cs | 2 +- .../BodyPartClasses/SideHair_編み.cs | 2 +- .../BodyPartClasses/SideHair_肢系.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Torso.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Torso_蛇.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Torso_蟲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/T剃刀.cs | 2 +- .../BodyPartClasses/UpperArm_人.cs | 2 +- .../BodyPartClasses/UpperArm_獣.cs | 2 +- .../BodyPartClasses/UpperArm_蝙.cs | 2 +- .../BodyPartClasses/UpperArm_蹄.cs | 2 +- .../BodyPartClasses/UpperArm_鳥.cs | 2 +- .../SlaveMatrix/BodyPartClasses/Waist.cs | 2 +- .../BodyPartClasses/ぶっかけ_大.cs | 2 +- .../BodyPartClasses/ぶっかけ_小.cs | 2 +- .../SlaveMatrix/BodyPartClasses/キスマーク.cs | 2 +- .../SlaveMatrix/BodyPartClasses/キャップ1.cs | 2 +- .../SlaveMatrix/BodyPartClasses/キャップ2.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ハンド.cs | 2 +- .../BodyPartClasses/バイブ_アナル.cs | 2 +- .../BodyPartClasses/バイブ_コモン.cs | 2 +- .../BodyPartClasses/バイブ_ディル.cs | 2 +- .../BodyPartClasses/バイブ_デンマ.cs | 2 +- .../BodyPartClasses/バイブ_ドリル.cs | 2 +- .../SlaveMatrix/BodyPartClasses/パール.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ピアス.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ペニス.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ボテ腹_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ボテ腹板.cs | 2 +- .../SlaveMatrix/BodyPartClasses/マウス.cs | 2 +- .../SlaveMatrix/BodyPartClasses/ロータ.cs | 2 +- .../BodyPartClasses/上着トップ_ドレス.cs | 2 +- .../BodyPartClasses/上着ボトム_クロス.cs | 2 +- .../BodyPartClasses/上着ボトム_クロス後.cs | 2 +- .../BodyPartClasses/上着ボトム_前掛け.cs | 2 +- .../BodyPartClasses/上着ミドル_ドレス.cs | 2 +- .../BodyPartClasses/下着トップ_クロス.cs | 2 +- .../BodyPartClasses/下着トップ_チューブ.cs | 2 +- .../BodyPartClasses/下着トップ_ビキニ.cs | 2 +- .../BodyPartClasses/下着トップ_ブラ.cs | 2 +- .../BodyPartClasses/下着トップ_マイクロ.cs | 2 +- .../BodyPartClasses/下着ボトム_ノーマル.cs | 2 +- .../BodyPartClasses/下着ボトム_マイクロ.cs | 2 +- .../SlaveMatrix/BodyPartClasses/下着乳首.cs | 2 +- .../SlaveMatrix/BodyPartClasses/下着陰核.cs | 2 +- .../SlaveMatrix/BodyPartClasses/乳房.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前翅_甲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前翅_羽.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前翅_草.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前翅_蝶.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前髪_ジグ.cs | 2 +- .../BodyPartClasses/前髪_ジグ中寄.cs | 2 +- .../BodyPartClasses/前髪_ジグ分け.cs | 2 +- .../BodyPartClasses/前髪_パッツン.cs | 2 +- .../BodyPartClasses/前髪_モジャ.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前髪_三分1.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前髪_三分2.cs | 2 +- .../BodyPartClasses/前髪_上げ片.cs | 2 +- .../BodyPartClasses/前髪_上げ短1.cs | 2 +- .../BodyPartClasses/前髪_上げ短2.cs | 2 +- .../BodyPartClasses/前髪_上げ長1.cs | 2 +- .../BodyPartClasses/前髪_上げ長2.cs | 2 +- .../BodyPartClasses/前髪_中分け1.cs | 2 +- .../BodyPartClasses/前髪_中分け2.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前髪_二分1.cs | 2 +- .../SlaveMatrix/BodyPartClasses/前髪_二分2.cs | 2 +- .../BodyPartClasses/前髪_横流し.cs | 2 +- .../BodyPartClasses/前髪_目隠れ1.cs | 2 +- .../BodyPartClasses/前髪_目隠れ2.cs | 2 +- .../SlaveMatrix/BodyPartClasses/単目.cs | 2 +- .../SlaveMatrix/BodyPartClasses/単眼眉.cs | 2 +- .../SlaveMatrix/BodyPartClasses/単瞼.cs | 2 +- .../SlaveMatrix/BodyPartClasses/単足_植.cs | 2 +- .../SlaveMatrix/BodyPartClasses/単足_粘.cs | 2 +- .../SlaveMatrix/BodyPartClasses/双目.cs | 2 +- .../SlaveMatrix/BodyPartClasses/口_裂け.cs | 2 +- .../SlaveMatrix/BodyPartClasses/口_通常.cs | 2 +- .../SlaveMatrix/BodyPartClasses/吹出し.cs | 2 +- .../SlaveMatrix/BodyPartClasses/呼気.cs | 2 +- .../SlaveMatrix/BodyPartClasses/噴乳.cs | 2 +- .../SlaveMatrix/BodyPartClasses/四足胴.cs | 2 +- .../SlaveMatrix/BodyPartClasses/四足胸.cs | 2 +- .../SlaveMatrix/BodyPartClasses/四足脇.cs | 2 +- .../SlaveMatrix/BodyPartClasses/四足腰.cs | 2 +- .../SlaveMatrix/BodyPartClasses/基髪.cs | 2 +- .../SlaveMatrix/BodyPartClasses/多足_蛸.cs | 2 +- .../SlaveMatrix/BodyPartClasses/多足_蜘.cs | 2 +- .../SlaveMatrix/BodyPartClasses/多足_蠍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/大顎.cs | 2 +- .../SlaveMatrix/BodyPartClasses/大顎上.cs | 2 +- .../SlaveMatrix/BodyPartClasses/大顎基.cs | 2 +- .../SlaveMatrix/BodyPartClasses/射精.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_ウ.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_ガ.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_ヘ.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_悪.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_根.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_淫.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_牛.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_犬.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_狐.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_猫.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_短.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_竜.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_腓.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_虫.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_蛇.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_蜘.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_蟲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_蠍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_馬.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_魚.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_鯨.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_鳥.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾_龍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾鰭_魚.cs | 2 +- .../SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs | 2 +- .../SlaveMatrix/BodyPartClasses/後翅_甲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/後翅_羽.cs | 2 +- .../SlaveMatrix/BodyPartClasses/後翅_草.cs | 2 +- .../SlaveMatrix/BodyPartClasses/後翅_蝶.cs | 2 +- .../SlaveMatrix/BodyPartClasses/性器_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/性器_獣.cs | 2 +- .../BodyPartClasses/性器精液_人.cs | 2 +- .../BodyPartClasses/性器精液_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_牛.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_蝙.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_馬.cs | 2 +- .../SlaveMatrix/BodyPartClasses/手_鳥.cs | 2 +- .../SlaveMatrix/BodyPartClasses/拘束鎖.cs | 2 +- .../SlaveMatrix/BodyPartClasses/放尿_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/放尿_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/断面_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/断面_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/染み_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/染み_獣.cs | 2 +- SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs | 2 +- SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs | 2 +- .../SlaveMatrix/BodyPartClasses/涎_裂け.cs | 2 +- .../SlaveMatrix/BodyPartClasses/涎_通常.cs | 2 +- SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs | 2 +- .../SlaveMatrix/BodyPartClasses/潮吹_大_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/潮吹_小_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/獣耳.cs | 2 +- .../SlaveMatrix/BodyPartClasses/玉口枷.cs | 2 +- .../SlaveMatrix/BodyPartClasses/目傷.cs | 2 +- .../SlaveMatrix/BodyPartClasses/目尻影.cs | 2 +- .../SlaveMatrix/BodyPartClasses/目隠帯.cs | 2 +- SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs | 2 +- .../SlaveMatrix/BodyPartClasses/瞼_中.cs | 2 +- .../SlaveMatrix/BodyPartClasses/瞼_宇.cs | 2 +- .../SlaveMatrix/BodyPartClasses/瞼_弱.cs | 2 +- .../SlaveMatrix/BodyPartClasses/瞼_強.cs | 2 +- .../SlaveMatrix/BodyPartClasses/瞼_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節尾_曳航.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節尾_鋏.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節足_足百.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節足_足蜘.cs | 2 +- .../SlaveMatrix/BodyPartClasses/節足_足蠍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/紅潮.cs | 2 +- .../SlaveMatrix/BodyPartClasses/縦目.cs | 2 +- .../SlaveMatrix/BodyPartClasses/縦瞼.cs | 2 +- .../SlaveMatrix/BodyPartClasses/羽根箒.cs | 2 +- .../SlaveMatrix/BodyPartClasses/耳_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/耳_尖.cs | 2 +- .../SlaveMatrix/BodyPartClasses/耳_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/耳_羽.cs | 2 +- .../SlaveMatrix/BodyPartClasses/耳_長.cs | 2 +- .../SlaveMatrix/BodyPartClasses/耳_鰭.cs | 2 +- .../SlaveMatrix/BodyPartClasses/肛門_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/肛門_獣.cs | 2 +- .../BodyPartClasses/肛門精液_人.cs | 2 +- .../BodyPartClasses/肛門精液_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/背中_光.cs | 2 +- .../SlaveMatrix/BodyPartClasses/背中_甲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/背中_羽.cs | 2 +- .../SlaveMatrix/BodyPartClasses/胴肌.cs | 2 +- .../SlaveMatrix/BodyPartClasses/胴腹板.cs | 2 +- .../SlaveMatrix/BodyPartClasses/胸毛.cs | 2 +- .../SlaveMatrix/BodyPartClasses/胸肌.cs | 2 +- .../SlaveMatrix/BodyPartClasses/胸腹板.cs | 2 +- .../SlaveMatrix/BodyPartClasses/腰肌.cs | 2 +- .../SlaveMatrix/BodyPartClasses/腿_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/腿_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/腿_竜.cs | 2 +- .../SlaveMatrix/BodyPartClasses/腿_蹄.cs | 2 +- .../SlaveMatrix/BodyPartClasses/腿_鳥.cs | 2 +- .../BodyPartClasses/膣内精液_人.cs | 2 +- .../BodyPartClasses/膣内精液_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/膣基_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/膣基_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/舌_短.cs | 2 +- .../SlaveMatrix/BodyPartClasses/舌_長.cs | 2 +- .../SlaveMatrix/BodyPartClasses/花_百.cs | 2 +- .../SlaveMatrix/BodyPartClasses/花_薔.cs | 2 +- .../SlaveMatrix/BodyPartClasses/葉_心.cs | 2 +- .../SlaveMatrix/BodyPartClasses/葉_披.cs | 2 +- .../SlaveMatrix/BodyPartClasses/虫鎌.cs | 2 +- .../SlaveMatrix/BodyPartClasses/虫顎.cs | 2 +- .../SlaveMatrix/BodyPartClasses/衝撃.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角1_一.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角1_虫.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角1_鬼.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_山1.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_山2.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_山3.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_巻.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_牛1.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_牛2.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_牛3.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_牛4.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_虫.cs | 2 +- .../SlaveMatrix/BodyPartClasses/角2_鬼.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触手_犬.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触手_蔦.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触手_触.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触手_軟.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触覚_甲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触覚_節.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触覚_線.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触覚_蛾.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触覚_蝶.cs | 2 +- .../SlaveMatrix/BodyPartClasses/触覚_蠍.cs | 2 +- .../SlaveMatrix/BodyPartClasses/調教鞭.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_牛.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_竜.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_馬.cs | 2 +- .../SlaveMatrix/BodyPartClasses/足_鳥.cs | 2 +- SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_蛇.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_蟲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_魚.cs | 2 +- .../SlaveMatrix/BodyPartClasses/長物_鯨.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鞭痕.cs | 2 +- .../SlaveMatrix/BodyPartClasses/頬目.cs | 2 +- .../SlaveMatrix/BodyPartClasses/頬瞼.cs | 2 +- .../SlaveMatrix/BodyPartClasses/頬肌.cs | 2 +- .../SlaveMatrix/BodyPartClasses/頭頂_天.cs | 2 +- .../SlaveMatrix/BodyPartClasses/頭頂_宇.cs | 2 +- .../SlaveMatrix/BodyPartClasses/頭頂_皿.cs | 2 +- .../SlaveMatrix/BodyPartClasses/頭頂後_宇.cs | 2 +- .../BodyPartClasses/顔ハイライト.cs | 2 +- .../SlaveMatrix/BodyPartClasses/顔面_甲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/顔面_虫.cs | 2 +- .../SlaveMatrix/BodyPartClasses/顔面_蟲.cs | 2 +- .../SlaveMatrix/BodyPartClasses/飛沫_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/飛沫_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/飛膜_先.cs | 2 +- .../SlaveMatrix/BodyPartClasses/飛膜_根.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鰭_豚.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鰭_魚.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鰭_鯨.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鳳凰.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鼻_人.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鼻_獣.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鼻水.cs | 2 +- .../SlaveMatrix/BodyPartClasses/鼻肌.cs | 2 +- SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs | 2 +- 324 files changed, 411 insertions(+), 405 deletions(-) rename 2DGAMELIB/_2DGAMELIB/{Difs.cs => VariantGrid.cs} (95%) diff --git a/2DGAMELIB/_2DGAMELIB/Join.cs b/2DGAMELIB/_2DGAMELIB/Join.cs index 151f2ec..caecdda 100644 --- a/2DGAMELIB/_2DGAMELIB/Join.cs +++ b/2DGAMELIB/_2DGAMELIB/Join.cs @@ -94,16 +94,16 @@ namespace _2DGAMELIB } } - public static JointsD GetJointsD(this Difs JoinRoot, IEnumerable EnumDifs) + public static JointsD GetJointsD(this VariantGrid JoinRoot, IEnumerable EnumDifs) { JointsD jointsD = new JointsD(); List list = new List(); - List list2 = EnumDifs.ToList(); + List list2 = EnumDifs.ToList(); foreach (ShapePart item in JoinRoot.EnumAllPar()) { int num = 0; list.Clear(); - foreach (Difs item2 in list2) + foreach (VariantGrid item2 in list2) { if (JoinRoot != item2) { @@ -141,7 +141,7 @@ namespace _2DGAMELIB return jointsD; } - private static void GetJointsD(List dl, JointsD jsd, List del) + private static void GetJointsD(List dl, JointsD jsd, List del) { int num = -1; int num2 = 0; @@ -150,14 +150,14 @@ namespace _2DGAMELIB num = jsd.Joins.Count; for (int i = num2; i < num; i++) { - Difs difs = jsd.Joins[i].Difs1; - foreach (ShapePart item in difs.EnumAllPar()) + VariantGrid variantGrid = jsd.Joins[i].Difs1; + foreach (ShapePart item in variantGrid.EnumAllPar()) { int num3 = 0; del.Clear(); - foreach (Difs item2 in dl) + foreach (VariantGrid item2 in dl) { - if (difs != item2) + if (variantGrid != item2) { int num4 = 0; foreach (JointPoint item3 in item.JP) @@ -167,7 +167,7 @@ namespace _2DGAMELIB { if (v.DistanceSquared(item4.Position) <= IdentityDistance) { - jsd.Joins.Add(new JointD(difs, item, num4, item2)); + jsd.Joins.Add(new JointD(variantGrid, item, num4, item2)); if (!del.Contains(num3)) { del.Add(num3); diff --git a/2DGAMELIB/_2DGAMELIB/JointD.cs b/2DGAMELIB/_2DGAMELIB/JointD.cs index e4ede2f..7a82e02 100644 --- a/2DGAMELIB/_2DGAMELIB/JointD.cs +++ b/2DGAMELIB/_2DGAMELIB/JointD.cs @@ -6,15 +6,15 @@ namespace _2DGAMELIB [Serializable] public class JointD { - public Difs Difs0; + public VariantGrid Difs0; public List Path0; public int Index; - public Difs Difs1; + public VariantGrid Difs1; - public JointD(Difs Difs0, ShapePart Par0, int Index, Difs Difs1) + public JointD(VariantGrid Difs0, ShapePart Par0, int Index, VariantGrid Difs1) { this.Difs0 = Difs0; Path0 = Par0.GetPath(); @@ -22,7 +22,7 @@ namespace _2DGAMELIB this.Difs1 = Difs1; } - public JointD(Difs Difs1) + public JointD(VariantGrid Difs1) { this.Difs1 = Difs1; } @@ -41,7 +41,7 @@ namespace _2DGAMELIB public void Set(JointS 接続元) { - Difs0 = 接続元.Difs; + Difs0 = 接続元.VariantGrid; Path0 = 接続元.Path; Index = 接続元.Index; } diff --git a/2DGAMELIB/_2DGAMELIB/Joints.cs b/2DGAMELIB/_2DGAMELIB/Joints.cs index 0152c1a..1bf2388 100644 --- a/2DGAMELIB/_2DGAMELIB/Joints.cs +++ b/2DGAMELIB/_2DGAMELIB/Joints.cs @@ -27,15 +27,15 @@ namespace _2DGAMELIB [Serializable] public class JointS { - public Difs Difs; + public VariantGrid VariantGrid; public List Path; public int Index; - public JointS(Difs Difs, ShapePart ShapePart, int Index) + public JointS(VariantGrid VariantGrid, ShapePart ShapePart, int Index) { - this.Difs = Difs; + this.VariantGrid = VariantGrid; Path = ShapePart.GetPath(); this.Index = Index; } diff --git a/2DGAMELIB/_2DGAMELIB/Obj.cs b/2DGAMELIB/_2DGAMELIB/Obj.cs index 9180a52..220b5dc 100644 --- a/2DGAMELIB/_2DGAMELIB/Obj.cs +++ b/2DGAMELIB/_2DGAMELIB/Obj.cs @@ -11,17 +11,17 @@ namespace _2DGAMELIB { public string Tag = ""; - public OrderedDictionary Difss = new OrderedDictionary(); + public OrderedDictionary Difss = new OrderedDictionary(); - private Difs r; + private VariantGrid r; private JointsD jsd; public IEnumerable Keys => Difss.Keys; - public IEnumerable Values => Difss.Values; + public IEnumerable Values => Difss.Values; - public Difs this[string Name] + public VariantGrid this[string Name] { get { @@ -33,7 +33,7 @@ namespace _2DGAMELIB } } - public Difs this[int Index] + public VariantGrid this[int Index] { get { @@ -49,7 +49,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.PositionSize = value; } @@ -60,7 +60,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.PositionVector = value; } @@ -71,7 +71,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.AngleBase = value; } @@ -82,7 +82,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.AngleCont = value; } @@ -93,7 +93,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.SizeBase = value; } @@ -104,7 +104,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.SizeCont = value; } @@ -115,7 +115,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.SizeXBase = value; } @@ -126,7 +126,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.SizeXCont = value; } @@ -137,7 +137,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.SizeYBase = value; } @@ -148,7 +148,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.SizeYCont = value; } @@ -159,7 +159,7 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.Dra = value; } @@ -170,17 +170,17 @@ namespace _2DGAMELIB { set { - foreach (Difs value2 in Difss.Values) + foreach (VariantGrid value2 in Difss.Values) { value2.Hit = value; } } } - public Difs JoinRoot => r; + public VariantGrid JoinRoot => r; public IEnumerable EnumAllPar() { - foreach (Difs value in Difss.Values) + foreach (VariantGrid value in Difss.Values) { foreach (ShapePart item in value.EnumAllPar()) { @@ -191,7 +191,7 @@ namespace _2DGAMELIB public Obj SetDefaultR() { - foreach (Difs value in Difss.Values) + foreach (VariantGrid value in Difss.Values) { value.SetDefault(); } @@ -206,24 +206,24 @@ namespace _2DGAMELIB public void Draw(RenderArea Are) { - foreach (Difs value in Difss.Values) + foreach (VariantGrid value in Difss.Values) { value.Draw(Are); } } - private Difs GetJoinRootDifs() + private VariantGrid GetJoinRootDifs() { - Difs[] array = Difss.Values.ToArray(); + VariantGrid[] array = Difss.Values.ToArray(); if (array.Length <= 1) { return array.FirstOrDefault(); } ShapePart[] pa = EnumAllPar().ToArray(); - Difs[] array2 = array; + VariantGrid[] array2 = array; Vector2D p; - foreach (Difs difs in array2) + foreach (VariantGrid difs in array2) { if (difs.EnumJoinRoot.All(delegate(ShapePart p0) { @@ -239,8 +239,8 @@ namespace _2DGAMELIB public void SetJoints() { - Difs[] array = Difss.Values.ToArray(); - Difs[] array2 = array; + VariantGrid[] array = Difss.Values.ToArray(); + VariantGrid[] array2 = array; for (int i = 0; i < array2.Length; i++) { array2[i].SetJoints(); @@ -265,7 +265,7 @@ namespace _2DGAMELIB public void Dispose() { - foreach (Difs value in Difss.Values) + foreach (VariantGrid value in Difss.Values) { value.Dispose(); } diff --git a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs index cc92a37..a6ae3db 100644 --- a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs +++ b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs @@ -33,7 +33,7 @@ namespace _2DGAMELIB public static void MigrateKeys(this Obj obj) { - var newDict = new OrderedDictionary(); + var newDict = new OrderedDictionary(); foreach (var key in obj.Keys) { diff --git a/2DGAMELIB/_2DGAMELIB/RemappedTypeBinder.cs b/2DGAMELIB/_2DGAMELIB/RemappedTypeBinder.cs index f4f5aeb..6e9addb 100644 --- a/2DGAMELIB/_2DGAMELIB/RemappedTypeBinder.cs +++ b/2DGAMELIB/_2DGAMELIB/RemappedTypeBinder.cs @@ -62,39 +62,44 @@ namespace _2DGAMELIB private string RemapTypeArgs(string typeName) { - var sb = new StringBuilder(typeName.Length); - int i = 0; - while (i < typeName.Length) + // Find the generic arguments section: the outermost [...] containing [args] + int outerStart = typeName.LastIndexOf('`'); + if (outerStart < 0) return typeName; + + int bracketStart = -1; + for (int i = outerStart + 1; i < typeName.Length; i++) { - int start = typeName.IndexOf('[', i); - if (start < 0 || start + 1 >= typeName.Length || typeName[start + 1] != '[') + if (typeName[i] == '[') { - sb.Append(typeName, i, typeName.Length - i); + bracketStart = i; break; } + } + if (bracketStart < 0) return typeName; - sb.Append(typeName, i, start - i); + int depth = 0; + int bracketEnd = -1; + for (int i = bracketStart; i < typeName.Length; i++) + { + if (typeName[i] == '[') depth++; + else if (typeName[i] == ']') depth--; + if (depth == 0) { bracketEnd = i; break; } + } + if (bracketEnd < 0) return typeName; - int end = typeName.IndexOf("]]", start); - if (end < 0) - { - sb.Append(typeName, start, typeName.Length - start); - break; - } + var inner = typeName.Substring(bracketStart, bracketEnd - bracketStart + 1); - var argFull = typeName.Substring(start + 2, end - start - 2); - var comma = argFull.IndexOf(','); - var argTypeName = comma >= 0 ? argFull.Substring(0, comma).Trim() : argFull.Trim(); - - if (_typeOnlyMap.TryGetValue(argTypeName, out var mapped)) - argFull = mapped.FullName + (comma >= 0 ? argFull.Substring(comma) : ""); - - sb.Append("[[").Append(argFull).Append("]]"); - - i = end + 2; + // Replace mapped old type names (longest first to avoid partial prefix matches) + var sortedKeys = new List(_typeOnlyMap.Keys); + sortedKeys.Sort((a, b) => b.Length.CompareTo(a.Length)); + foreach (var old in sortedKeys) + { + var rep = _typeOnlyMap[old].FullName; + inner = inner.Replace(old + ",", rep + ","); + inner = inner.Replace(old + "]", rep + "]"); } - return sb.ToString(); + return typeName.Substring(0, bracketStart) + inner + typeName.Substring(bracketEnd + 1); } } } diff --git a/2DGAMELIB/_2DGAMELIB/Ser.cs b/2DGAMELIB/_2DGAMELIB/Ser.cs index ed8ee95..aa92ea1 100644 --- a/2DGAMELIB/_2DGAMELIB/Ser.cs +++ b/2DGAMELIB/_2DGAMELIB/Ser.cs @@ -20,7 +20,8 @@ namespace _2DGAMELIB .Add("_2DGAMELIB.Pars", typeof(PartGroup)) .Add("_2DGAMELIB.Out", typeof(CurveOutline)) .Add("_2DGAMELIB.Joi", typeof(JointPoint)) - .Add("_2DGAMELIB.Dif", typeof(MorphVariant)); + .Add("_2DGAMELIB.Dif", typeof(MorphVariant)) + .Add("_2DGAMELIB.Difs", typeof(VariantGrid)); private static BinaryFormatter NewFormatter() { @@ -36,7 +37,7 @@ namespace _2DGAMELIB Formatting = Newtonsoft.Json.Formatting.Indented, NullValueHandling = NullValueHandling.Ignore }; - settings.Converters.Add(new OrderedDictionaryConverter()); + settings.Converters.Add(new OrderedDictionaryConverter()); settings.Converters.Add(new OrderedDictionaryConverter()); settings.Converters.Add(new OrderedDictionaryConverter()); settings.Converters.Add(new OrderedDictionaryConverter()); diff --git a/2DGAMELIB/_2DGAMELIB/Difs.cs b/2DGAMELIB/_2DGAMELIB/VariantGrid.cs similarity index 95% rename from 2DGAMELIB/_2DGAMELIB/Difs.cs rename to 2DGAMELIB/_2DGAMELIB/VariantGrid.cs index a1a2bb4..91402ca 100644 --- a/2DGAMELIB/_2DGAMELIB/Difs.cs +++ b/2DGAMELIB/_2DGAMELIB/VariantGrid.cs @@ -7,7 +7,7 @@ using Newtonsoft.Json; namespace _2DGAMELIB { [Serializable] - public class Difs + public class VariantGrid { public string Tag = ""; @@ -259,21 +259,21 @@ namespace _2DGAMELIB } } - public Difs() + public VariantGrid() { } - public Difs(Difs Difs) + public VariantGrid(VariantGrid VariantGrid) { - Copy(Difs); + Copy(VariantGrid); } - private void Copy(Difs Difs) + private void Copy(VariantGrid VariantGrid) { - Tag = Difs.Tag; - ValueX = Difs.ValueX; - ValueY = Difs.ValueY; - foreach (MorphVariant dif in Difs.difs) + Tag = VariantGrid.Tag; + ValueX = VariantGrid.ValueX; + ValueY = VariantGrid.ValueY; + foreach (MorphVariant dif in VariantGrid.difs) { difs.Add(new MorphVariant(dif)); } diff --git a/SlaveMatrix.Extract/Program.cs b/SlaveMatrix.Extract/Program.cs index 6eac113..038050f 100644 --- a/SlaveMatrix.Extract/Program.cs +++ b/SlaveMatrix.Extract/Program.cs @@ -577,24 +577,24 @@ class Program return result; } - static JObject ExportDifs(Difs difs) + static JObject ExportDifs(VariantGrid VariantGrid) { - int xCount = difs.CountX; - int yCount = difs.CountY; + int xCount = VariantGrid.CountX; + int yCount = VariantGrid.CountY; var result = new JObject { - ["Tag"] = difs.Tag ?? "", - ["ValueX"] = difs.ValueX, - ["ValueY"] = difs.ValueY, + ["Tag"] = VariantGrid.Tag ?? "", + ["ValueX"] = VariantGrid.ValueX, + ["ValueY"] = VariantGrid.ValueY, ["CountX"] = xCount, ["CountY"] = yCount, - ["Difs"] = new JArray() + ["VariantGrid"] = new JArray() }; for (int x = 0; x < xCount; x++) { - var dif = difs[x]; + var dif = VariantGrid[x]; var difArr = new JArray(); for (int y = 0; y < dif.Count; y++) @@ -602,7 +602,7 @@ class Program difArr.Add(ExportPars(dif[y])); } - ((JArray)result["Difs"]).Add(difArr); + ((JArray)result["VariantGrid"]).Add(difArr); } return result; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs index 220c869..5c29dcd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs @@ -384,7 +384,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "カル"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][3])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs index f86db8d..272a05a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs @@ -384,7 +384,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs index 7cee3d3..28e95b7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs @@ -384,7 +384,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ハネ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs index 6447893..dbaf92c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs @@ -384,7 +384,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "パツ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs index 7207e91..bb501be 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs @@ -307,7 +307,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "下げ1カル"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][7])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs index 471305d..e9c6fea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs @@ -307,7 +307,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "下げ1ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][4])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs index c8ea3ea..46894eb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs @@ -307,7 +307,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "下げ1ハネ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][5])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs index 55ee7a7..4e05b49 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs @@ -307,7 +307,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "下げ1パツ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][6])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs index ca5d2b8..aabccb2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs @@ -351,7 +351,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "下げ2カル"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][11])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs index 8930d82..d0955bc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs @@ -351,7 +351,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "下げ2ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][8])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs index 81fdb3e..061d3dc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs @@ -351,7 +351,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "下げ2ハネ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][9])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs index a6bab52..2c66744 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs @@ -351,7 +351,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "下げ2パツ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][10])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs index 4b9ab2f..f8f7250 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs @@ -604,7 +604,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み1カル"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][15])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs index 35949c7..b31f420 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs @@ -604,7 +604,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み1ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][12])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs index 353ec3b..d27026d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs @@ -604,7 +604,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み1ハネ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][13])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs index 334edb6..21137b1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs @@ -604,7 +604,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み1パツ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][14])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs index b93a013..8681fbe 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs @@ -1087,7 +1087,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み2カル"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][19])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs index 5407cdc..ad39984 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs @@ -1087,7 +1087,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み2ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][16])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs index 1a18fe5..675a329 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs @@ -1087,7 +1087,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み2ハネ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][17])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs index ec9d652..271dfd7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs @@ -1087,7 +1087,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み2パツ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][18])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs index e5f1c9d..6e88444 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs @@ -145,7 +145,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "肢系"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][21])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs index 397fe82..c6ccbae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs @@ -287,7 +287,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "結い1カル"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][3])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs index 3a10237..d83c251 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs @@ -287,7 +287,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "結い1ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs index de16800..8ae72aa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs @@ -287,7 +287,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "結い1ハネ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs index fcd7ae9..24b181f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs @@ -287,7 +287,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "結い1パツ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs index 163aa22..d0fd26c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs @@ -264,7 +264,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "結い2カル"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][7])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs index d883df7..8e026ee 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs @@ -264,7 +264,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "結い2ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][4])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs index 7dfc03b..3fea186 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs @@ -264,7 +264,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "結い2ハネ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][5])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs index c176e97..fd8b3f7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs @@ -264,7 +264,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "結い2パツ"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair1"][0][6])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs index bd88c15..c97d1ba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs @@ -414,7 +414,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編結"; morphVariant.Add(new PartGroup(Sta.胴体["BackHair0"][0][20])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs index 7a4e2ee..7565aa0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs @@ -1416,7 +1416,7 @@ namespace SlaveMatrix { Chest Chest2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["胸郭"]); + Body = new VariantGrid(Sta.胴体["胸郭"]); PartGroup partGroup = Body[0][0]; X0Y0_胸郭 = partGroup["胸郭"].ToPar(); PartGroup pars2 = partGroup["筋肉"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs index 3fd4125..f35084d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs @@ -349,7 +349,7 @@ namespace SlaveMatrix public Cough(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 咳D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["Cough"]); + Body = new VariantGrid(Sta.胴体["Cough"]); PartGroup partGroup = Body[0][0]; X0Y0_咳基 = partGroup["咳基"].ToPar(); X0Y0_雫1 = partGroup["雫1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs index 4eddbd1..6d6fa99 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs @@ -1037,7 +1037,7 @@ namespace SlaveMatrix { Head 頭2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["Head"]); + Body = new VariantGrid(Sta.胴体["Head"]); PartGroup partGroup = Body[0][0]; X0Y0_Head = partGroup["頭"].ToPar(); PartGroup pars2 = partGroup["悪タトゥ"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs index 0f996f0..40db3b0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs @@ -5757,7 +5757,7 @@ namespace SlaveMatrix Leg_人 Leg_人2 = this; ThisType = GetType(); //Leg but if renamed to Leg it broke game - Body = new Difs(Sta.脚左["Leg"]); + Body = new VariantGrid(Sta.脚左["Leg"]); PartGroup partGroup = Body[0][0]; X0Y0_Leg = partGroup["脚"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs index 5b08547..e033a6d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs @@ -276,7 +276,7 @@ namespace SlaveMatrix Leg_獣 Leg_獣2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs index 8ed1e6e..8d2ae70 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs @@ -654,7 +654,7 @@ namespace SlaveMatrix Leg_竜 Leg_竜2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][3]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs index 259f31e..743392d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs @@ -276,7 +276,7 @@ namespace SlaveMatrix Leg_蹄 Leg_蹄2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs index bff6912..5c04dd4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs @@ -276,7 +276,7 @@ namespace SlaveMatrix Leg_鳥 Leg_鳥2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足脚"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs index 9b46ac3..3e6a143 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs @@ -4626,7 +4626,7 @@ namespace SlaveMatrix { LowerArm_人 LowerArm_人2 = this; ThisType = GetType(); - Body = new Difs(Sta.腕左["LowerArm"]); + Body = new VariantGrid(Sta.腕左["LowerArm"]); PartGroup partGroup = Body[0][0]; X0Y0_LowerArm = partGroup["下腕"].ToPar(); PartGroup pars2 = partGroup["筋肉"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs index 415e2a9..56752c5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs @@ -457,7 +457,7 @@ namespace SlaveMatrix LowerArm_獣 LowerArm_獣2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足LowerArm"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs index d93ab0d..9c8a824 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs @@ -564,7 +564,7 @@ namespace SlaveMatrix { LowerArm_蝙 LowerArm_蝙2 = this; ThisType = GetType(); - Body = new Difs(Sta.腕左["獣翼LowerArm"]); + Body = new VariantGrid(Sta.腕左["獣翼LowerArm"]); PartGroup partGroup = Body[0][0]; X0Y0_獣翼LowerArm = partGroup["獣翼下腕"].ToPar(); PartGroup pars2 = partGroup["鱗"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs index 0ecb462..0f66ca3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs @@ -147,7 +147,7 @@ namespace SlaveMatrix LowerArm_蹄 LowerArm_蹄2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足LowerArm"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs index bec901f..73f44d7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs @@ -2079,7 +2079,7 @@ namespace SlaveMatrix { LowerArm_鳥 LowerArm_鳥2 = this; ThisType = GetType(); - Body = new Difs(Sta.腕左["鳥翼LowerArm"]); + Body = new VariantGrid(Sta.腕左["鳥翼LowerArm"]); PartGroup partGroup = Body[0][0]; X0Y0_鳥翼LowerArm = partGroup["鳥翼下腕"].ToPar(); PartGroup pars2 = partGroup["風切羽"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs index 07875ed..53b69a0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs @@ -1173,7 +1173,7 @@ namespace SlaveMatrix { Neck Neck2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["Neck"]); + Body = new VariantGrid(Sta.胴体["Neck"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["植性"].ToPars(); X0Y0_植性_蔦 = pars2["蔦"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs index 3c7090b..6c0b1e5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs @@ -311,7 +311,7 @@ namespace SlaveMatrix { Shoulder Shoulder2 = this; ThisType = GetType(); - Body = new Difs(Sta.肩左["Shoulder"]); + Body = new VariantGrid(Sta.肩左["Shoulder"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["脇"].ToPars(); X0Y0_脇_脇 = pars2["脇"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs index 9ee72dc..39b4e06 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs @@ -147,7 +147,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "カル"; morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][3])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs index 2eeb88a..6bfadbc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs @@ -147,7 +147,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs index 721f6f5..e6fb8ad 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs @@ -147,7 +147,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ハネ"; morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs index b7d7e10..ec2b25e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs @@ -147,7 +147,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "パツ"; morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs index 3b19ade..d17cb5a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs @@ -420,7 +420,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "編み"; morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][4])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs index 811ad24..81ce994 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "肢系"; morphVariant.Add(new PartGroup(Sta.胴体["横髪左"][0][5])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs index 2fc0f5e..ab5baae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs @@ -292,7 +292,7 @@ namespace SlaveMatrix Torso Torso2 = this; ThisType = GetType(); //This had no Torso (胴体) - Body = new Difs(Sta.胴体["Torso"]); + Body = new VariantGrid(Sta.胴体["Torso"]); PartGroup partGroup = Body[0][0]; X0Y0_Torso = partGroup["胴"].ToPar(); PartGroup pars2 = partGroup["筋肉"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs index 8d2d9b5..021718a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs @@ -337,7 +337,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = partGroup.Tag; morphVariant.Add(partGroup); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup pars2 = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs index c41a629..9118ef2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs @@ -484,7 +484,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = partGroup.Tag; morphVariant.Add(partGroup); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup pars2 = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs index 81c8d23..61f1d14 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs @@ -485,7 +485,7 @@ namespace SlaveMatrix public T剃刀(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, T剃刀D e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["T字剃刀"]); + Body = new VariantGrid(Sta.カーソル["T字剃刀"]); PartGroup partGroup = Body[0][0]; X0Y0_ヘッド = partGroup["ヘッド"].ToPar(); PartGroup pars2 = partGroup["刃"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs index 900e61e..a4fb7f7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs @@ -3447,7 +3447,7 @@ namespace SlaveMatrix { UpperArm_人 UpperArm_人2 = this; ThisType = GetType(); - Body = new Difs(Sta.腕左["UpperArm"]); + Body = new VariantGrid(Sta.腕左["UpperArm"]); PartGroup partGroup = Body[0][0]; X0Y0_筋肉上 = partGroup["筋肉上"].ToPar(); X0Y0_UpperArm = partGroup["上腕"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs index 389ab47..826df2b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs @@ -273,7 +273,7 @@ namespace SlaveMatrix UpperArm_獣 UpperArm_獣2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足UpperArm"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs index 40e63fa..9f064e8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs @@ -513,7 +513,7 @@ namespace SlaveMatrix 飛膜 = new 飛膜_根(DisUnit, 配色指定, 体配色); 飛膜.Par = this; ThisType = GetType(); - Body = new Difs(Sta.腕左["獣翼UpperArm"]); + Body = new VariantGrid(Sta.腕左["獣翼UpperArm"]); PartGroup partGroup = Body[0][0]; X0Y0_獣翼UpperArm = partGroup["獣翼上腕"].ToPar(); PartGroup pars2 = partGroup["鱗"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs index 7db521e..668fd59 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs @@ -147,7 +147,7 @@ namespace SlaveMatrix UpperArm_蹄 UpperArm_蹄2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.腕左["四足UpperArm"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs index c7d7f9b..a73fa1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs @@ -404,7 +404,7 @@ namespace SlaveMatrix { UpperArm_鳥 UpperArm_鳥2 = this; ThisType = GetType(); - Body = new Difs(Sta.腕左["鳥翼UpperArm"]); + Body = new VariantGrid(Sta.腕左["鳥翼UpperArm"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["風切羽"].ToPars(); X0Y0_風切羽_羽3 = pars2["羽3"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs index 4cb3cdb..3c585a5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs @@ -2155,7 +2155,7 @@ namespace SlaveMatrix { Waist Waist2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["Waist"]); + Body = new VariantGrid(Sta.胴体["Waist"]); PartGroup partGroup = Body[0][0]; X0Y0_Waist = partGroup["腰"].ToPar(); X0Y0_股 = partGroup["股"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs index e8b8f9c..736aa87 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs @@ -111,7 +111,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.スタンプ["ぶっかけ"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs index a27c53b..22cb3b0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs @@ -111,7 +111,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.スタンプ["ぶっかけ"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs index 03ffdd0..bee695b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix public キスマーク(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キスマークD e) { ThisType = GetType(); - Body = new Difs(Sta.スタンプ["キスマーク"]); + Body = new VariantGrid(Sta.スタンプ["キスマーク"]); PartGroup partGroup = Body[0][0]; X0Y0_キスマーク = partGroup["キスマーク"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs index 9c3fa91..e2c2d44 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs @@ -121,7 +121,7 @@ namespace SlaveMatrix public キャップ1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キャップ1D e) { ThisType = GetType(); - Body = new Difs(Sta.性器付["キャップ中"]); + Body = new VariantGrid(Sta.性器付["キャップ中"]); PartGroup partGroup = Body[0][0]; X0Y0_根本 = partGroup["根本"].ToPar(); X0Y0_先端 = partGroup["先端"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs index 31a37ec..c2f08bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs @@ -121,7 +121,7 @@ namespace SlaveMatrix public キャップ2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キャップ2D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["キャップ左"]); + Body = new VariantGrid(Sta.胴体["キャップ左"]); PartGroup partGroup = Body[0][0]; X0Y0_根本 = partGroup["根本"].ToPar(); X0Y0_先端 = partGroup["先端"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs index 1b9d5db..49035ca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs @@ -3798,7 +3798,7 @@ namespace SlaveMatrix public ハンド(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, ハンドD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["ハンド"]); + Body = new VariantGrid(Sta.カーソル["ハンド"]); PartGroup partGroup = Body[0][0]; X0Y0_親指 = partGroup["親指"].ToPar(); X0Y0_手 = partGroup["手"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs index e4ee384..b90d9f6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs @@ -560,7 +560,7 @@ namespace SlaveMatrix public バイブ_アナル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_アナルD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["アナル"]); + Body = new VariantGrid(Sta.カーソル["アナル"]); PartGroup partGroup = Body[0][0]; X0Y0_ヘッド = partGroup["ヘッド"].ToPar(); PartGroup pars2 = partGroup["ユニット"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs index 781437e..41ab1fa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs @@ -974,7 +974,7 @@ namespace SlaveMatrix public バイブ_コモン(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_コモンD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["コモン"]); + Body = new VariantGrid(Sta.カーソル["コモン"]); PartGroup partGroup = Body[0][0]; X0Y0_ヘッド = partGroup["ヘッド"].ToPar(); X0Y0_イボ1 = partGroup["イボ1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs index 4424d6b..7f4830b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs @@ -683,7 +683,7 @@ namespace SlaveMatrix public バイブ_ディル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_ディルD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["ディル"]); + Body = new VariantGrid(Sta.カーソル["ディル"]); PartGroup partGroup = Body[0][0]; X0Y0_ヘッド = partGroup["ヘッド"].ToPar(); X0Y0_血管1 = partGroup["血管1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs index 13c65b6..22c1330 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs @@ -806,7 +806,7 @@ namespace SlaveMatrix public バイブ_デンマ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_デンマD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["デンマ"]); + Body = new VariantGrid(Sta.カーソル["デンマ"]); PartGroup partGroup = Body[0][0]; X0Y0_ヘッド = partGroup["ヘッド"].ToPar(); X0Y0_ヘッド線1 = partGroup["ヘッド線1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs index 2b62216..7dedf88 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs @@ -2645,7 +2645,7 @@ namespace SlaveMatrix public バイブ_ドリル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_ドリルD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["ドリル"]); + Body = new VariantGrid(Sta.カーソル["ドリル"]); PartGroup partGroup = Body[0][0]; X0Y0_ヘッド = partGroup["ヘッド"].ToPar(); X0Y0_イボ1 = partGroup["イボ1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs index f39d8da..3ea1587 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs @@ -995,7 +995,7 @@ namespace SlaveMatrix public パール(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, パールD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["パール"]); + Body = new VariantGrid(Sta.カーソル["パール"]); PartGroup partGroup = Body[0][0]; X0Y0_軸 = partGroup["軸"].ToPar(); X0Y0_玉境界 = partGroup["玉境界"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs index f574e77..f21f022 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs @@ -100,7 +100,7 @@ namespace SlaveMatrix public ピアス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ピアスD e) { ThisType = GetType(); - Body = new Difs(Sta.性器付["ピアス"]); + Body = new VariantGrid(Sta.性器付["ピアス"]); PartGroup partGroup = Body[0][0]; X0Y0_ピアス = partGroup["ピアス"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs index 115506f..12eb4f0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs @@ -436,7 +436,7 @@ namespace SlaveMatrix { ペニス ペニス2 = this; ThisType = GetType(); - Body = new Difs(Sta.カーソル["ペニス"]); + Body = new VariantGrid(Sta.カーソル["ペニス"]); PartGroup partGroup = Body[0][0]; X0Y0_陰嚢 = partGroup["陰嚢"].ToPar(); X0Y0_陰茎 = partGroup["陰茎"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs index abb5e9e..a382fdd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs @@ -422,7 +422,7 @@ namespace SlaveMatrix { ボテ腹_人 ボテ腹_人2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["ボテ腹"]); + Body = new VariantGrid(Sta.胴体["ボテ腹"]); PartGroup partGroup = Body[0][0]; X0Y0_腹 = partGroup["腹"].ToPar(); X0Y0_ハイライト = partGroup["ハイライト"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs index 5250336..1600164 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs @@ -161,7 +161,7 @@ namespace SlaveMatrix { ボテ腹_獣 ボテ腹_獣2 = this; ThisType = GetType(); - Body = new Difs(Sta.半身["四足ボテ腹"]); + Body = new VariantGrid(Sta.半身["四足ボテ腹"]); PartGroup partGroup = Body[0][0]; X0Y0_腹 = partGroup["腹"].ToPar(); X0Y0_臍 = partGroup["臍"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs index bed6989..633ecec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs @@ -425,7 +425,7 @@ namespace SlaveMatrix public ボテ腹板(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ボテ腹板D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["ボテ腹板"]); + Body = new VariantGrid(Sta.胴体["ボテ腹板"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["腹板4"].ToPars(); X0Y0_腹板4_腹板 = pars2["腹板"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs index c55e56c..7abacd2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs @@ -332,7 +332,7 @@ namespace SlaveMatrix public マウス(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, マウスD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["マウス"]); + Body = new VariantGrid(Sta.カーソル["マウス"]); PartGroup partGroup = Body[0][0]; X0Y0_上唇 = partGroup["上唇"].ToPar(); X0Y0_下唇 = partGroup["下唇"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs index aea67fd..df262a2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs @@ -189,7 +189,7 @@ namespace SlaveMatrix public ロータ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ロータD e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["ロータ"]); + Body = new VariantGrid(Sta.カーソル["ロータ"]); PartGroup partGroup = Body[0][0]; X0Y0_ロータ = partGroup["ロータ"].ToPar(); X0Y0_ロータ線 = partGroup["ロータ線"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs index cd6d994..45e3a50 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs @@ -698,7 +698,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着トップ"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs index f734f25..6fff5c1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs @@ -647,7 +647,7 @@ namespace SlaveMatrix 上着ボトム_クロス 上着ボトム_クロス2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ボトム前"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs index 9f090ee..008baaa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs @@ -172,7 +172,7 @@ namespace SlaveMatrix public 上着ボトム_クロス後(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着ボトム_クロス後D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["上着ボトム後"]); + Body = new VariantGrid(Sta.胴体["上着ボトム後"]); PartGroup partGroup = Body[0][0]; X0Y0_下地 = partGroup["下地"].ToPar(); PartGroup pars2 = partGroup["染み"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs index be722c9..d5c19bc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs @@ -373,7 +373,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ボトム前"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs index cb6122d..75c964b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs @@ -325,7 +325,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["上着ミドル"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs index 997ec43..c38c376 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs @@ -592,7 +592,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][4]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs index bfb462c..946fdf2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs @@ -536,7 +536,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][3]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs index 826e4e8..f704106 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs @@ -448,7 +448,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs index 1864021..d06702d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs @@ -2303,7 +2303,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs index d173302..d76cda6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs @@ -448,7 +448,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着トップ"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs index c1cb327..89ed701 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs @@ -2713,7 +2713,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着ボトム"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs index fc14b16..36c122e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs @@ -1788,7 +1788,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["下着ボトム"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs index f8277d4..003f479 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs @@ -180,7 +180,7 @@ namespace SlaveMatrix public 下着乳首(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着乳首D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["下着乳首左"]); + Body = new VariantGrid(Sta.胴体["下着乳首左"]); PartGroup partGroup = Body[0][0]; X0Y0_乳首 = partGroup["乳首"].ToPar(); X0Y0_染み2 = partGroup["染み2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs index 7fc8499..4663c3d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix public 下着陰核(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着陰核D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["下着陰核"]); + Body = new VariantGrid(Sta.胴体["下着陰核"]); PartGroup partGroup = Body[0][0]; X0Y0_陰核 = partGroup["陰核"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs index 00fe13f..6170c50 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs @@ -796,7 +796,7 @@ namespace SlaveMatrix { 乳房 乳房2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["胸左"]); + Body = new VariantGrid(Sta.胴体["胸左"]); PartGroup partGroup = Body[0][0]; X0Y0_乳房 = partGroup["乳房"].ToPar(); X0Y0_乳輪 = partGroup["乳輪"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs index 3b29904..3978376 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs @@ -714,7 +714,7 @@ namespace SlaveMatrix 前翅_甲 前翅_甲2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["前翅"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs index d7dcefa..11899c2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs @@ -904,7 +904,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["前翅"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["前翅"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs index d729809..6321db2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs @@ -402,7 +402,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["前翅"][3]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["前翅"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs index a070793..c9672ba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs @@ -668,7 +668,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["前翅"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["前翅"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs index 36bed53..5e7da9f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs @@ -818,7 +818,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ジグ"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs index 52d23a5..abfa0d0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs @@ -818,7 +818,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ジグ中寄"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs index b2f4d24..1f9196f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs @@ -818,7 +818,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ジグ分け"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs index 8c61826..8c22fed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs @@ -818,7 +818,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "パッツン"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][4])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs index 3d4ffa4..d56c3d0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs @@ -818,7 +818,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "モジャ"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][3])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs index 298d2cf..a376c5a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs @@ -862,7 +862,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "三分1"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][7])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs index 00b3868..25bcff9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs @@ -793,7 +793,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "三分2"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][9])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs index b9ceae5..3b30e37 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs @@ -727,7 +727,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "上げ片"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][16])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs index 56bfe56..992273f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs @@ -749,7 +749,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "上げ短1"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][12])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs index c56a4ec..7e2aa15 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs @@ -749,7 +749,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "上げ短2"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][13])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs index ef2072f..e4288f7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs @@ -749,7 +749,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "上げ長1"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][14])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs index 109fa6c..7062c44 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs @@ -749,7 +749,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "上げ長2"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][15])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs index 87812a5..8cc50ae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs @@ -665,7 +665,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "中分け1"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][10])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs index 61f443e..972a830 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs @@ -663,7 +663,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "中分け2"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][11])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs index 1e08add..3e338b9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs @@ -818,7 +818,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "二分1"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][6])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs index f0c6fdc..b97964e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs @@ -749,7 +749,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "二分2"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][8])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs index 6114bba..0fc0d0b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs @@ -772,7 +772,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "横流し"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][5])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs index 2d21963..8722c49 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs @@ -730,7 +730,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "目隠れ1"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][17])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs index 5e24a7a..43fc566 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs @@ -749,7 +749,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "目隠れ2"; morphVariant.Add(new PartGroup(Sta.胴体["前髪"][0][18])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs index afc8f8a..adacd16 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs @@ -225,7 +225,7 @@ namespace SlaveMatrix { 単目 単目2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["単眼目"]); + Body = new VariantGrid(Sta.胴体["単眼目"]); PartGroup partGroup = Body[0][0]; X0Y0_白目 = partGroup["白目"].ToPar(); PartGroup pars2 = partGroup["黒目"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs index f52bc46..a4902fb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs @@ -124,7 +124,7 @@ namespace SlaveMatrix public 単眼眉(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 単眼眉D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["単眼眉"]); + Body = new VariantGrid(Sta.胴体["単眼眉"]); PartGroup partGroup = Body[0][0]; X0Y0_眉 = partGroup["眉"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs index 42c532f..c973bdd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs @@ -1271,7 +1271,7 @@ namespace SlaveMatrix public 単瞼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 単瞼D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["単眼瞼"]); + Body = new VariantGrid(Sta.胴体["単眼瞼"]); PartGroup partGroup = Body[0][0]; X0Y0_瞼下 = partGroup["瞼下"].ToPar(); X0Y0_瞼上 = partGroup["瞼上"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs index 106964e..f453b94 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs @@ -930,7 +930,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "植"; morphVariant.Add(new PartGroup(Sta.半身["単足"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs index dc3df48..94653da 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs @@ -808,7 +808,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "粘"; morphVariant.Add(new PartGroup(Sta.半身["単足"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs index b2f5f46..1b8866f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs @@ -225,7 +225,7 @@ namespace SlaveMatrix { 双目 双目2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["目左"]); + Body = new VariantGrid(Sta.胴体["目左"]); PartGroup partGroup = Body[0][0]; X0Y0_白目 = partGroup["白目"].ToPar(); PartGroup pars2 = partGroup["黒目"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs index 71ad308..4b5eea0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs @@ -587,7 +587,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["口"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs index 3ada84c..4b538ce 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs @@ -791,7 +791,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.胴体["口"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs index 161e93b..c480026 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix public 吹出し(double DisUnit) { ThisType = GetType(); - Body = new Difs(Sta.胴体["吹出し"]); + Body = new VariantGrid(Sta.胴体["吹出し"]); PartGroup partGroup = Body[0][0]; X0Y0_吹出し = partGroup["吹出し"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs index 5600ead..dc8a57a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs @@ -403,7 +403,7 @@ namespace SlaveMatrix public 呼気(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 呼気D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["呼気"]); + Body = new VariantGrid(Sta.胴体["呼気"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["呼気左1"].ToPars(); X0Y0_呼気左1_呼気1 = pars2["呼気1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs index 97a4b96..9402413 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs @@ -347,7 +347,7 @@ namespace SlaveMatrix public 噴乳(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 噴乳D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["噴乳左"]); + Body = new VariantGrid(Sta.胴体["噴乳左"]); PartGroup partGroup = Body[0][0]; X0Y0_母乳垂れ1 = partGroup["母乳垂れ1"].ToPar(); X0Y0_母乳垂れ2 = partGroup["母乳垂れ2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs index 144d494..8ee9f28 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs @@ -203,7 +203,7 @@ namespace SlaveMatrix { 四足胴 四足胴2 = this; ThisType = GetType(); - Body = new Difs(Sta.半身["四足胴"]); + Body = new VariantGrid(Sta.半身["四足胴"]); PartGroup partGroup = Body[0][0]; X0Y0_Torso = partGroup["胴"].ToPar(); PartGroup pars2 = partGroup["筋肉"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs index 87269b3..9eda728 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs @@ -812,7 +812,7 @@ namespace SlaveMatrix { 四足胸 四足胸2 = this; ThisType = GetType(); - Body = new Difs(Sta.半身["四足胸郭"]); + Body = new VariantGrid(Sta.半身["四足胸郭"]); PartGroup partGroup = Body[0][0]; X0Y0_胸郭 = partGroup["胸郭"].ToPar(); PartGroup pars2 = partGroup["筋肉"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs index 15c9e03..953f2bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs @@ -126,7 +126,7 @@ namespace SlaveMatrix { 四足脇 四足脇2 = this; ThisType = GetType(); - Body = new Difs(Sta.肩左["四足脇"]); + Body = new VariantGrid(Sta.肩左["四足脇"]); PartGroup partGroup = Body[0][0]; X0Y0_脇 = partGroup["脇"].ToPar(); X0Y0_筋肉 = partGroup["筋肉"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs index 48ff1a2..213709c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs @@ -1392,7 +1392,7 @@ namespace SlaveMatrix { 四足腰 四足腰2 = this; ThisType = GetType(); - Body = new Difs(Sta.半身["四足腰"]); + Body = new VariantGrid(Sta.半身["四足腰"]); PartGroup partGroup = Body[0][0]; X0Y0_Waist = partGroup["腰"].ToPar(); X0Y0_股 = partGroup["股"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs index c04c2ca..792ed99 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs @@ -126,7 +126,7 @@ namespace SlaveMatrix { 基髪 基髪2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["基髪"]); + Body = new VariantGrid(Sta.胴体["基髪"]); PartGroup partGroup = Body[0][0]; X0Y0_髪 = partGroup["髪"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs index 5699902..c5d5f21 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蛸"; morphVariant.Add(new PartGroup(Sta.半身["多足"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs index 6b0d04b..83b3747 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs @@ -178,7 +178,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蜘"; morphVariant.Add(new PartGroup(Sta.半身["多足"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs index dbe7a7b..1af9ec3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs @@ -979,7 +979,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蠍"; morphVariant.Add(new PartGroup(Sta.半身["多足"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs index 0cbe41e..1f31d91 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs @@ -430,7 +430,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["虫顎"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs index db1e85f..56122ac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs @@ -170,7 +170,7 @@ namespace SlaveMatrix public 大顎上(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色) { ThisType = GetType(); - Body = new Difs(Sta.肢中["大顎上"]); + Body = new VariantGrid(Sta.肢中["大顎上"]); PartGroup partGroup = Body[0][0]; X0Y0_甲殻 = partGroup["甲殻"].ToPar(); X0Y0_線左 = partGroup["線左"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs index 0218689..d5b3171 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs @@ -410,7 +410,7 @@ namespace SlaveMatrix 大顎上 = new 大顎上(DisUnit, 配色指定, 体配色); 大顎上.Par = this; ThisType = GetType(); - Body = new Difs(Sta.肢中["大顎基"]); + Body = new VariantGrid(Sta.肢中["大顎基"]); PartGroup partGroup = Body[0][0]; X0Y0_甲殻下 = partGroup["甲殻下"].ToPar(); 大顎上.接続(大顎上_接続点); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs index 1f9ca65..5b12c32 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs @@ -263,7 +263,7 @@ namespace SlaveMatrix public 射精(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, 射精D e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["射精"]); + Body = new VariantGrid(Sta.カーソル["射精"]); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs index 7fbfdc5..6b61850 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs @@ -3507,7 +3507,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ウミ"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][18])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs index 1aa4570..c804192 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs @@ -2198,7 +2198,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ガラ"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][17])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs index 4aa4dfa..cd27a57 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs @@ -5729,7 +5729,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "ヘビ"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][16])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs index 9225fc6..caef080 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs @@ -660,7 +660,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "悪尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][7])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs index c1a13f6..864432b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs @@ -1395,7 +1395,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "根尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][22])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs index 53b76b0..8f898da 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs @@ -660,7 +660,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "淫尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][8])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs index b37ea24..7ddf33c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs @@ -1081,7 +1081,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "牛尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][4])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs index dfb2af4..2b4eb27 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs @@ -241,7 +241,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "犬尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs index 18d147c..f32259a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs @@ -325,7 +325,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "狐尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs index 12ee6bb..2901357 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs @@ -367,7 +367,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "猫尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs index bb34550..57d9ebb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs @@ -199,7 +199,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "短尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][15])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs index a5e667c..e83fa6b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs @@ -791,7 +791,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "竜尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][6])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs index f596a23..701e6dd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs @@ -5099,7 +5099,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "腓尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][14])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs index b90846b..3015b4f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs @@ -644,7 +644,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "虫尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][10])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs index c71ad53..8a9152c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs @@ -5096,7 +5096,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蛇尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][13])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs index be410fa..3b67395 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs @@ -454,7 +454,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蜘尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][11])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs index b6a62cf..f03902b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs @@ -1553,7 +1553,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蟲尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][21])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs index 1a66f65..93367cd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs @@ -875,7 +875,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蠍尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][12])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs index a024dbf..093f156 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs @@ -913,7 +913,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "馬尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][3])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs index c36da7a..f7ebbc4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs @@ -7402,7 +7402,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "魚尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][19])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs index 9cb5e1c..4a6af33 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs @@ -2833,7 +2833,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "鯨尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][20])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs index c75b7d2..6895657 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs @@ -604,7 +604,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "鳥尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][9])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs index b04e08e..f642f6d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs @@ -1253,7 +1253,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "龍尾"; morphVariant.Add(new PartGroup(Sta.尻尾["尾"][0][5])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs index 106037b..bc09b59 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs @@ -489,7 +489,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢中["尾"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs index 8f0d938..ed72fa5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs @@ -110,7 +110,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "鯨鰭"; morphVariant.Add(new PartGroup(Sta.肢中["尾"][1][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs index 54b1565..6f1a295 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs @@ -354,7 +354,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["後翅"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["後翅"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs index 472c970..976183f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs @@ -1039,7 +1039,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["後翅"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["後翅"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs index 1ff74d7..a8a36c2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs @@ -1286,7 +1286,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["後翅"][3]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["後翅"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs index 9439e33..1465316 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs @@ -662,7 +662,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["後翅"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]["後翅"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs index 2ea68c0..64518bc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs @@ -895,7 +895,7 @@ namespace SlaveMatrix { 性器_人 性器_人2 = this; ThisType = GetType(); - Body = new Difs(Sta.性器["性器"]); + Body = new VariantGrid(Sta.性器["性器"]); PartGroup partGroup = Body[0][0]; X0Y0_小陰唇 = partGroup["小陰唇"].ToPar(); X0Y0_性器基 = partGroup["性器基"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs index 201b8fb..c1a9627 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs @@ -895,7 +895,7 @@ namespace SlaveMatrix { 性器_獣 性器_獣2 = this; ThisType = GetType(); - Body = new Difs(Sta.性器["四足性器"]); + Body = new VariantGrid(Sta.性器["四足性器"]); PartGroup partGroup = Body[0][0]; X0Y0_小陰唇 = partGroup["小陰唇"].ToPar(); X0Y0_性器基 = partGroup["性器基"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs index d43c622..913d428 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs @@ -231,7 +231,7 @@ namespace SlaveMatrix public 性器精液_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 性器精液_人D e) { ThisType = GetType(); - Body = new Difs(Sta.性器付["性器精液垂れ"]); + Body = new VariantGrid(Sta.性器付["性器精液垂れ"]); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); X0Y0_血液1 = partGroup["血液1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs index 6ec760e..6b546fd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs @@ -231,7 +231,7 @@ namespace SlaveMatrix public 性器精液_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 性器精液_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.性器付["四足性器精液垂れ"]); + Body = new VariantGrid(Sta.性器付["四足性器精液垂れ"]); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); X0Y0_血液1 = partGroup["血液1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs index 29f946a..3bb7a93 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs @@ -2801,7 +2801,7 @@ namespace SlaveMatrix public 手_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_人D e) { ThisType = GetType(); - Body = new Difs(Sta.腕左["手"]); + Body = new VariantGrid(Sta.腕左["手"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["グローブ"].ToPars(); X0Y0_グローブ_グローブ = pars2["グローブ"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs index 5e671ae..b147d23 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs @@ -358,7 +358,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "牛"; morphVariant.Add(new PartGroup(Sta.腕左["四足手"][1][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs index 6a2e54d..776a56c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs @@ -362,7 +362,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "獣"; morphVariant.Add(new PartGroup(Sta.腕左["四足手"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs index 5069fb1..40189cb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs @@ -737,7 +737,7 @@ namespace SlaveMatrix 飛膜 = new 飛膜_先(DisUnit, 配色指定, 体配色); 飛膜.Par = this; ThisType = GetType(); - Body = new Difs(Sta.腕左["獣翼手"]); + Body = new VariantGrid(Sta.腕左["獣翼手"]); PartGroup partGroup = Body[0][0]; X0Y0_獣翼手 = partGroup["獣翼手"].ToPar(); PartGroup pars2 = partGroup["小指"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs index c174705..a38e4c9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs @@ -316,7 +316,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "馬"; morphVariant.Add(new PartGroup(Sta.腕左["四足手"][1][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs index 6ce93e7..19f6209 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs @@ -2067,7 +2067,7 @@ namespace SlaveMatrix public 手_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_鳥D e) { ThisType = GetType(); - Body = new Difs(Sta.腕左["鳥翼手"]); + Body = new VariantGrid(Sta.腕左["鳥翼手"]); PartGroup partGroup = Body[0][0]; X0Y0_鳥翼手 = partGroup["鳥翼手"].ToPar(); PartGroup pars2 = partGroup["風切羽"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs index fe4bc25..6d5e9d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs @@ -255,7 +255,7 @@ namespace SlaveMatrix public 拘束鎖(double DisUnit, bool 右, 配色指定 配色指定, BodyColorSet 体配色, bool Xasix) { ThisType = GetType(); - Body = new Difs(Sta.その他["拘束鎖"]); + Body = new VariantGrid(Sta.その他["拘束鎖"]); PartGroup partGroup = Body[0][0]; X0Y0_鎖2 = partGroup["鎖2"].ToPar(); X0Y0_鎖1 = partGroup["鎖1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs index 6c7f7e2..4929727 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs @@ -545,7 +545,7 @@ namespace SlaveMatrix public 放尿_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 放尿_人D e) { ThisType = GetType(); - Body = new Difs(Sta.性器付["放尿"]); + Body = new VariantGrid(Sta.性器付["放尿"]); PartGroup partGroup = Body[0][0]; X0Y0_尿 = partGroup["尿"].ToPar(); X0Y0_尿散り1 = partGroup["尿散り1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs index b66c1ef..4cce49c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs @@ -545,7 +545,7 @@ namespace SlaveMatrix public 放尿_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 放尿_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.性器付["四足放尿"]); + Body = new VariantGrid(Sta.性器付["四足放尿"]); PartGroup partGroup = Body[0][0]; X0Y0_尿 = partGroup["尿"].ToPar(); X0Y0_尿散り1 = partGroup["尿散り1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs index 97558a4..1803d32 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs @@ -619,7 +619,7 @@ namespace SlaveMatrix public 断面_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 断面_人D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["断面"]); + Body = new VariantGrid(Sta.胴体["断面"]); PartGroup partGroup = Body[0][0]; X0Y0_膣基 = partGroup["膣基"].ToPar(); X0Y0_膣壁左 = partGroup["膣壁左"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs index 20386e0..923c54e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs @@ -619,7 +619,7 @@ namespace SlaveMatrix public 断面_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 断面_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.半身["四足断面"]); + Body = new VariantGrid(Sta.半身["四足断面"]); PartGroup partGroup = Body[0][0]; X0Y0_膣基 = partGroup["膣基"].ToPar(); X0Y0_膣壁左 = partGroup["膣壁左"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs index 7dfd71c..0d5364d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs @@ -443,7 +443,7 @@ namespace SlaveMatrix public 染み_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 染み_人D e) { ThisType = GetType(); - Body = new Difs(Sta.その他["染み"]); + Body = new VariantGrid(Sta.その他["染み"]); PartGroup partGroup = Body[0][0]; X0Y0_潮1 = partGroup["潮1"].ToPar(); X0Y0_潮2 = partGroup["潮2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs index 9b1d641..21d8dac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs @@ -443,7 +443,7 @@ namespace SlaveMatrix public 染み_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 染み_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.その他["四足染み"]); + Body = new VariantGrid(Sta.その他["四足染み"]); PartGroup partGroup = Body[0][0]; X0Y0_潮1 = partGroup["潮1"].ToPar(); X0Y0_潮2 = partGroup["潮2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs index 4a392fc..16c2d44 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs @@ -1170,7 +1170,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "植"; morphVariant.Add(partGroup); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup pars2 = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs index 74d25d9..27649e7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs @@ -167,7 +167,7 @@ namespace SlaveMatrix public 汗(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 汗D e) { ThisType = GetType(); - Body = new Difs(Sta.スタンプ["汗"]); + Body = new VariantGrid(Sta.スタンプ["汗"]); PartGroup partGroup = Body[0][0]; X0Y0_汗0 = partGroup["汗0"].ToPar(); X0Y0_汗1 = partGroup["汗1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs index 8bb0523..3f1315c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs @@ -110,7 +110,7 @@ namespace SlaveMatrix public 涎_裂け(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 涎_裂けD e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["涎口裂け左"]); + Body = new VariantGrid(Sta.胴体["涎口裂け左"]); PartGroup partGroup = Body[0][0]; X0Y0_涎 = partGroup["涎"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs index cc8941f..46afbcf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs @@ -110,7 +110,7 @@ namespace SlaveMatrix public 涎_通常(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 涎_通常D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["涎左"]); + Body = new VariantGrid(Sta.胴体["涎左"]); PartGroup partGroup = Body[0][0]; X0Y0_涎 = partGroup["涎"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs index ee5a9d3..b56ec54 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs @@ -328,7 +328,7 @@ namespace SlaveMatrix public 涙(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 涙D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["涙左"]); + Body = new VariantGrid(Sta.胴体["涙左"]); PartGroup partGroup = Body[0][0]; X0Y0_涙0流れ0 = partGroup["涙0流れ0"].ToPar(); X0Y0_涙0 = partGroup["涙0"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs index 5bda689..5df3969 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs @@ -1515,7 +1515,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.性器付["潮吹"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs index 898df61..bf93483 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs @@ -1515,7 +1515,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.性器付["四足潮吹"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs index 018ae4e..ee993bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs @@ -135,7 +135,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.性器付["潮吹"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs index 9e60b20..ccb84de 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs @@ -135,7 +135,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.性器付["四足潮吹"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs index e374c7f..647c3d0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs @@ -219,7 +219,7 @@ namespace SlaveMatrix public 獣耳(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 獣耳D e) { ThisType = GetType(); - Body = new Difs(Sta.肢左["獣耳"]); + Body = new VariantGrid(Sta.肢左["獣耳"]); PartGroup partGroup = Body[0][0]; X0Y0_獣耳外 = partGroup["獣耳外"].ToPar(); X0Y0_獣耳内 = partGroup["獣耳内"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs index 04dba56..549ac50 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs @@ -569,7 +569,7 @@ namespace SlaveMatrix public 玉口枷(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 玉口枷D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["玉口枷"]); + Body = new VariantGrid(Sta.胴体["玉口枷"]); PartGroup partGroup = Body[0][0]; X0Y0_金具左上 = partGroup["金具左上"].ToPar(); X0Y0_金具左下 = partGroup["金具左下"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs index 0681680..fed0749 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs @@ -169,7 +169,7 @@ namespace SlaveMatrix public 目傷(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 目傷D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["目傷左"]); + Body = new VariantGrid(Sta.胴体["目傷左"]); PartGroup partGroup = Body[0][0]; X0Y0_傷上 = partGroup["傷上"].ToPar(); X0Y0_傷下 = partGroup["傷下"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs index 79fa776..12c1b2d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix public 目尻影(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 目尻影D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["目尻影左"]); + Body = new VariantGrid(Sta.胴体["目尻影左"]); PartGroup partGroup = Body[0][0]; X0Y0_目尻影 = partGroup["目尻影"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs index ffbc20a..3c8a2de 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs @@ -527,7 +527,7 @@ namespace SlaveMatrix public 目隠帯(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 目隠帯D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["目隠帯"]); + Body = new VariantGrid(Sta.胴体["目隠帯"]); PartGroup partGroup = Body[0][0]; X0Y0_革 = partGroup["革"].ToPar(); X0Y0_丸金具上中 = partGroup["丸金具上中"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs index 58404e2..15a4ee9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs @@ -151,7 +151,7 @@ namespace SlaveMatrix public 眉(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 眉D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["眉左"]); + Body = new VariantGrid(Sta.胴体["眉左"]); PartGroup partGroup = Body[0][0]; X0Y0_眉 = partGroup["眉"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs index cd20ebc..09dc23d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs @@ -601,7 +601,7 @@ namespace SlaveMatrix public 瞼_中(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_中D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["魔性中瞼左"]); + Body = new VariantGrid(Sta.胴体["魔性中瞼左"]); PartGroup partGroup = Body[0][0]; X0Y0_瞼 = partGroup["瞼"].ToPar(); X0Y0_二重 = partGroup["二重"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs index 914a48a..9393f75 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs @@ -206,7 +206,7 @@ namespace SlaveMatrix { 瞼_宇 瞼_宇2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["エイリアン目左"]); + Body = new VariantGrid(Sta.胴体["エイリアン目左"]); PartGroup partGroup = Body[0][0]; X0Y0_目 = partGroup["目"].ToPar(); X0Y0_ハイライト = partGroup["ハイライト"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs index 6ec305e..d996e74 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs @@ -509,7 +509,7 @@ namespace SlaveMatrix public 瞼_弱(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_弱D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["魔性弱瞼左"]); + Body = new VariantGrid(Sta.胴体["魔性弱瞼左"]); PartGroup partGroup = Body[0][0]; X0Y0_瞼 = partGroup["瞼"].ToPar(); X0Y0_二重 = partGroup["二重"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs index d0454df..16d4f67 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs @@ -601,7 +601,7 @@ namespace SlaveMatrix public 瞼_強(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_強D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["魔性強瞼左"]); + Body = new VariantGrid(Sta.胴体["魔性強瞼左"]); PartGroup partGroup = Body[0][0]; X0Y0_瞼 = partGroup["瞼"].ToPar(); X0Y0_二重 = partGroup["二重"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs index c3a8ac5..058ab02 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs @@ -509,7 +509,7 @@ namespace SlaveMatrix public 瞼_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["獣性瞼左"]); + Body = new VariantGrid(Sta.胴体["獣性瞼左"]); PartGroup partGroup = Body[0][0]; X0Y0_瞼 = partGroup["瞼"].ToPar(); X0Y0_二重 = partGroup["二重"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs index af5454f..9c7052a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs @@ -340,7 +340,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "曳航肢"; morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][5])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs index febf29f..5f57a02 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs @@ -319,7 +319,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "鋏"; morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][6])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs index 4e1eb6d..f98ca09 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs @@ -378,7 +378,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "節足百"; morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][4])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs index 2406aa6..ae97beb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs @@ -503,7 +503,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "節足蜘"; morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs index 89cfef7..fabf368 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs @@ -461,7 +461,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "節足蠍"; morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs index 395bf0b..a447ae4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs @@ -406,7 +406,7 @@ namespace SlaveMatrix public 紅潮(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 紅潮D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["紅潮"]); + Body = new VariantGrid(Sta.胴体["紅潮"]); PartGroup partGroup = Body[0][0]; X0Y0_紅潮0 = partGroup["紅潮0"].ToPar(); X0Y0_紅潮1 = partGroup["紅潮1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs index c479a6c..c0d5323 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs @@ -225,7 +225,7 @@ namespace SlaveMatrix { 縦目 縦目2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["額目"]); + Body = new VariantGrid(Sta.胴体["額目"]); PartGroup partGroup = Body[0][0]; X0Y0_白目 = partGroup["白目"].ToPar(); PartGroup pars2 = partGroup["黒目"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs index 57ad77a..c697d62 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs @@ -415,7 +415,7 @@ namespace SlaveMatrix public 縦瞼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 縦瞼D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["額瞼"]); + Body = new VariantGrid(Sta.胴体["額瞼"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["瞼左"].ToPars(); X0Y0_瞼左_瞼 = pars2["瞼"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs index e2a71c8..dc058cf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs @@ -212,7 +212,7 @@ namespace SlaveMatrix public 羽根箒(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 羽根箒D e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["羽根箒"]); + Body = new VariantGrid(Sta.カーソル["羽根箒"]); PartGroup partGroup = Body[0][0]; X0Y0_羽根1 = partGroup["羽根1"].ToPar(); X0Y0_羽根2 = partGroup["羽根2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs index bb06272..964b69e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs @@ -120,7 +120,7 @@ namespace SlaveMatrix public 耳_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_人D e) { ThisType = GetType(); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = "通"; Body.Add(new MorphVariant(Sta.肢左["耳"][0])); Body.Add(new MorphVariant(Sta.肢左["耳"][1])); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs index 8500df8..d97c18c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs @@ -168,7 +168,7 @@ namespace SlaveMatrix public 耳_尖(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_尖D e) { ThisType = GetType(); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = "尖"; Body.Add(new MorphVariant(Sta.肢左["耳"][2])); Body.Add(new MorphVariant(Sta.肢左["耳"][3])); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs index ecb4bf6..45bf372 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs @@ -219,7 +219,7 @@ namespace SlaveMatrix public 耳_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_獣D e) { ThisType = GetType(); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = "獣"; Body.Add(new MorphVariant(Sta.肢左["耳"][10])); Body.Add(new MorphVariant(Sta.肢左["耳"][11])); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs index 50a9674..328414b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs @@ -321,7 +321,7 @@ namespace SlaveMatrix public 耳_羽(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_羽D e) { ThisType = GetType(); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = "羽"; Body.Add(new MorphVariant(Sta.肢左["耳"][8])); Body.Add(new MorphVariant(Sta.肢左["耳"][9])); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs index 6b7af25..d5faa4e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs @@ -219,7 +219,7 @@ namespace SlaveMatrix public 耳_長(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_長D e) { ThisType = GetType(); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = "長"; Body.Add(new MorphVariant(Sta.肢左["耳"][4])); Body.Add(new MorphVariant(Sta.肢左["耳"][5])); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs index df96a3c..a2ea3f0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs @@ -386,7 +386,7 @@ namespace SlaveMatrix public 耳_鰭(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_鰭D e) { ThisType = GetType(); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = "鰭"; Body.Add(new MorphVariant(Sta.肢左["耳"][6])); Body.Add(new MorphVariant(Sta.肢左["耳"][7])); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs index c29f6a6..6727dde 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs @@ -134,7 +134,7 @@ namespace SlaveMatrix { 肛門_人 肛門_人2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["肛門"]); + Body = new VariantGrid(Sta.胴体["肛門"]); PartGroup partGroup = Body[0][0]; X0Y0_肛門3 = partGroup["肛門3"].ToPar(); X0Y0_肛門2 = partGroup["肛門2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs index 53e485d..8dfb168 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs @@ -134,7 +134,7 @@ namespace SlaveMatrix { 肛門_獣 肛門_獣2 = this; ThisType = GetType(); - Body = new Difs(Sta.半身["四足肛門"]); + Body = new VariantGrid(Sta.半身["四足肛門"]); PartGroup partGroup = Body[0][0]; X0Y0_肛門3 = partGroup["肛門3"].ToPar(); X0Y0_肛門2 = partGroup["肛門2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs index d828291..e0a698b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs @@ -116,7 +116,7 @@ namespace SlaveMatrix public 肛門精液_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 肛門精液_人D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["肛門精液垂れ"]); + Body = new VariantGrid(Sta.胴体["肛門精液垂れ"]); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs index 8a5c362..8feb92e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs @@ -116,7 +116,7 @@ namespace SlaveMatrix public 肛門精液_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 肛門精液_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.半身["四足肛門精液垂れ"]); + Body = new VariantGrid(Sta.半身["四足肛門精液垂れ"]); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs index 1485cae..423ff54 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs @@ -111,7 +111,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "後光"; morphVariant.Add(new PartGroup(Sta.肢中["背中"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs index 217f6b2..c72b184 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs @@ -860,7 +860,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "甲羅"; morphVariant.Add(new PartGroup(Sta.肢中["背中"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs index 20ca406..34e6365 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs @@ -110,7 +110,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "羽毛"; morphVariant.Add(new PartGroup(Sta.肢中["背中"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs index bb13387..20c90a4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs @@ -191,7 +191,7 @@ namespace SlaveMatrix public 胴肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胴肌D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["胴肌"]); + Body = new VariantGrid(Sta.胴体["胴肌"]); PartGroup partGroup = Body[0][0]["植タトゥ"].ToPars(); X0Y0_植タトゥ_タトゥ花左 = partGroup["タトゥ花左"].ToPar(); X0Y0_植タトゥ_タトゥ花右 = partGroup["タトゥ花右"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs index 41cf3a9..58aacd6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix public 胴腹板(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胴腹板D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["胴腹板"]); + Body = new VariantGrid(Sta.胴体["胴腹板"]); PartGroup partGroup = Body[0][0]; X0Y0_虫性_腹板 = partGroup["腹板"].ToPar(); X0Y0_虫性_縦線 = partGroup["縦線"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs index c2897ad..8bb1b2c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix public 胸毛(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胸毛D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["胸毛"]); + Body = new VariantGrid(Sta.胴体["胸毛"]); PartGroup partGroup = Body[0][0]["獣性"].ToPars(); X0Y0_獣性_胸毛 = partGroup["胸毛"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs index 98aaaa6..66fca05 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs @@ -821,7 +821,7 @@ namespace SlaveMatrix public 胸肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胸肌D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["胸郭肌"]); + Body = new VariantGrid(Sta.胴体["胸郭肌"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["甲殻"].ToPars(); X0Y0_虫性_甲殻2 = pars2["甲殻2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs index 5096da6..f93d230 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix public 胸腹板(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胸腹板D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["胸郭腹板"]); + Body = new VariantGrid(Sta.胴体["胸郭腹板"]); PartGroup partGroup = Body[0][0]; X0Y0_虫性_腹板 = partGroup["腹板"].ToPar(); X0Y0_虫性_縦線 = partGroup["縦線"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs index 5b14e19..3c3ceb9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs @@ -1010,7 +1010,7 @@ namespace SlaveMatrix public 腰肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 腰肌D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["腰肌"]); + Body = new VariantGrid(Sta.胴体["腰肌"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["淫タトゥ"].ToPars(); PartGroup pars3 = pars2["ハート"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs index a8bae83..757903d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs @@ -2829,7 +2829,7 @@ namespace SlaveMatrix { 腿_人 腿_人2 = this; ThisType = GetType(); - Body = new Difs(Sta.脚左["腿"]); + Body = new VariantGrid(Sta.脚左["腿"]); PartGroup partGroup = Body[0][0]; X0Y0_腿 = partGroup["腿"].ToPar(); X0Y0_筋 = partGroup["筋"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs index 37bf247..c2551f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs @@ -155,7 +155,7 @@ namespace SlaveMatrix 腿_獣 腿_獣2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足腿"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs index e981910..3328d5a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs @@ -323,7 +323,7 @@ namespace SlaveMatrix 腿_竜 腿_竜2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足腿"][3]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs index 0b0b7cd..906b5d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs @@ -113,7 +113,7 @@ namespace SlaveMatrix 腿_蹄 腿_蹄2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足腿"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs index 114b3f4..0da03bf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs @@ -113,7 +113,7 @@ namespace SlaveMatrix 腿_鳥 腿_鳥2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.脚左["四足腿"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs index a841240..60c99c3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs @@ -140,7 +140,7 @@ namespace SlaveMatrix public 膣内精液_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 膣内精液_人D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["膣内精液"]); + Body = new VariantGrid(Sta.胴体["膣内精液"]); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); X0Y0_血液1 = partGroup["血液1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs index 8438cca..20d87f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs @@ -140,7 +140,7 @@ namespace SlaveMatrix public 膣内精液_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 膣内精液_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.半身["四足膣内精液"]); + Body = new VariantGrid(Sta.半身["四足膣内精液"]); PartGroup partGroup = Body[0][0]; X0Y0_精液 = partGroup["精液"].ToPar(); X0Y0_血液1 = partGroup["血液1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs index bf078b3..f278b6b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix public 膣基_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 膣基_人D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["膣基"]); + Body = new VariantGrid(Sta.胴体["膣基"]); PartGroup partGroup = Body[0][0]; X0Y0_膣基 = partGroup["膣基"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs index f3dc824..78a1ccd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix public 膣基_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 膣基_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.半身["四足膣基"]); + Body = new VariantGrid(Sta.半身["四足膣基"]); PartGroup partGroup = Body[0][0]; X0Y0_膣基 = partGroup["膣基"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs index 5741fe5..1ca3af5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs @@ -177,7 +177,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "短"; morphVariant.Add(new PartGroup(Sta.胴体["舌"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs index bdcf72f..7cd0ed9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs @@ -452,7 +452,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "長"; morphVariant.Add(new PartGroup(Sta.胴体["舌"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs index c909e9f..8843214 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs @@ -1503,7 +1503,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "花"; morphVariant.Add(new PartGroup(partGroup)); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup pars3 = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs index 772419c..d4397e5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs @@ -918,7 +918,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "花"; morphVariant.Add(new PartGroup(partGroup)); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup pars3 = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs index 6a15088..df6d982 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs @@ -146,7 +146,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["葉"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs index d64caee..cfe2cd5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs @@ -146,7 +146,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["葉"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs index 7ee7540..0485adb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs @@ -443,7 +443,7 @@ namespace SlaveMatrix public 虫鎌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 虫鎌D e) { ThisType = GetType(); - Body = new Difs(Sta.肢左["虫鎌"]); + Body = new VariantGrid(Sta.肢左["虫鎌"]); PartGroup partGroup = Body[0][0]; X0Y0_虫鎌節 = partGroup["虫鎌節"].ToPar(); X0Y0_虫棘1 = partGroup["虫棘1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs index 056db4f..9668fa1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs @@ -171,7 +171,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["虫顎"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs index 0727c6c..d94a2ab 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix public 衝撃(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 衝撃D e) { ThisType = GetType(); - Body = new Difs(Sta.その他["衝撃"]); + Body = new VariantGrid(Sta.その他["衝撃"]); PartGroup partGroup = Body[0][0]; X0Y0_衝撃 = partGroup["衝撃"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs index 8c3f16a..172e800 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs @@ -370,7 +370,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢中["角"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs index e0a6a47..d1af0af 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs @@ -279,7 +279,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢中["角"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs index 2f91832..19d3744 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs @@ -253,7 +253,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢中["角"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs index 32e733f..12e3c64 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs @@ -286,7 +286,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs index 9698890..59dd006 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs @@ -334,7 +334,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs index 8ed77d0..329854e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs @@ -533,7 +533,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs index 5bd3a9d..cc0615a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs @@ -418,7 +418,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][3]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs index b07b9dd..67ea832 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs @@ -301,7 +301,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][4]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs index d457278..76daeb3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs @@ -253,7 +253,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][5]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs index e8174a1..7ec3d75 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs @@ -265,7 +265,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][6]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs index 8da59d3..2d9c220 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs @@ -322,7 +322,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][7]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs index c30588b..7a2636f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs @@ -352,7 +352,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][9]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs index d636ac4..471db33 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs @@ -274,7 +274,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["角"][8]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs index 28e8044..303af30 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs @@ -6066,7 +6066,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "スキュラ"; morphVariant.Add(new PartGroup(Sta.肢左["触手"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs index ff8b740..dcccb7e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs @@ -3286,7 +3286,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蔦"; morphVariant.Add(new PartGroup(Sta.肢左["触手"][0][3])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs index 3a73c60..783cc41 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs @@ -3777,7 +3777,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "触腕"; morphVariant.Add(new PartGroup(Sta.肢左["触手"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs index 66be42e..2494e53 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs @@ -7284,7 +7284,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "軟体"; morphVariant.Add(new PartGroup(Sta.肢左["触手"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs index 5c59e23..cf21371 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs @@ -357,7 +357,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "触肢蜘"; morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs index f081a69..5f4aa29 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs @@ -496,7 +496,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "触肢蠍"; morphVariant.Add(new PartGroup(Sta.肢左["節足"][0][3])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs index fd6f835..670cb1f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs @@ -300,7 +300,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "甲"; morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs index 4304c41..fa0f4ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs @@ -615,7 +615,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "節"; morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs index a73d2bf..8966f2d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs @@ -1329,7 +1329,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "線"; morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs index cf2b7d1..284deba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs @@ -3240,7 +3240,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蛾"; morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][4])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs index e9ee63c..bcac7f1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs @@ -804,7 +804,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蝶"; morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][3])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs index 787609e..bb8996b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs @@ -488,7 +488,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "蠍"; morphVariant.Add(new PartGroup(Sta.肢左["触覚"][0][5])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs index 6312e18..714a9d5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs @@ -968,7 +968,7 @@ namespace SlaveMatrix public 調教鞭(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 調教鞭D e) { ThisType = GetType(); - Body = new Difs(Sta.カーソル["調教鞭"]); + Body = new VariantGrid(Sta.カーソル["調教鞭"]); PartGroup partGroup = Body[0][0]; X0Y0_先 = partGroup["先"].ToPar(); X0Y0_柄 = partGroup["柄"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs index e4d5d47..3f27993 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs @@ -3172,7 +3172,7 @@ namespace SlaveMatrix public 足_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_人D e) { ThisType = GetType(); - Body = new Difs(Sta.脚左["足"]); + Body = new VariantGrid(Sta.脚左["足"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["ヒール0"].ToPars(); X0Y0_ヒール0_靴底 = pars2["靴底"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs index 0c545e1..67bfc86 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs @@ -421,7 +421,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "牛"; morphVariant.Add(new PartGroup(Sta.脚左["四足足"][1][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs index c0ede67..d10c9ae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs @@ -589,7 +589,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "獣"; morphVariant.Add(new PartGroup(Sta.脚左["四足足"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs index 1b62dba..074a0b9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs @@ -1282,7 +1282,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "竜"; morphVariant.Add(new PartGroup(Sta.脚左["四足足"][3][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs index 15c5ee2..ad5f56c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs @@ -337,7 +337,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "馬"; morphVariant.Add(new PartGroup(Sta.脚左["四足足"][1][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs index 81d1022..5d48552 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs @@ -1870,7 +1870,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "鳥"; morphVariant.Add(new PartGroup(Sta.脚左["四足足"][2][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs index 227d0d1..c4ed740 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix public 鎖(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鎖D e) { ThisType = GetType(); - Body = new Difs(Sta.その他["鎖"]); + Body = new VariantGrid(Sta.その他["鎖"]); PartGroup partGroup = Body[0][0]; X0Y0_鎖2 = partGroup["鎖2"].ToPar(); X0Y0_鎖1 = partGroup["鎖1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index 9459e81..b060199 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -311,7 +311,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = partGroup.Tag; morphVariant.Add(partGroup); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup pars2 = Body[0][0]["胴1"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index a792c76..a1bb80c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -524,7 +524,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = partGroup.Tag; morphVariant.Add(partGroup); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup pars2 = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs index 53a327b..53caa4c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs @@ -1899,7 +1899,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "魚"; morphVariant.Add(new PartGroup(Sta.半身["長物"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs index 3687914..2811371 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs @@ -882,7 +882,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "鯨"; morphVariant.Add(new PartGroup(Sta.半身["長物"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs index f83b6b8..40149bf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix public 鞭痕(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鞭痕D e) { ThisType = GetType(); - Body = new Difs(Sta.スタンプ["鞭痕"]); + Body = new VariantGrid(Sta.スタンプ["鞭痕"]); PartGroup partGroup = Body[0][0]; X0Y0_鞭痕 = partGroup["鞭痕"].ToPar(); Body.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs index 474dc68..2267b4d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs @@ -235,7 +235,7 @@ namespace SlaveMatrix { 頬目 頬目2 = this; ThisType = GetType(); - Body = new Difs(Sta.胴体["頬目左"]); + Body = new VariantGrid(Sta.胴体["頬目左"]); PartGroup partGroup = Body[0][0]; X0Y0_白目 = partGroup["白目"].ToPar(); PartGroup pars2 = partGroup["黒目"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs index ea4ad5e..d268431 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs @@ -425,7 +425,7 @@ namespace SlaveMatrix public 頬瞼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頬瞼D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["頬瞼左"]); + Body = new VariantGrid(Sta.胴体["頬瞼左"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["瞼左"].ToPars(); X0Y0_瞼左_瞼 = pars2["瞼"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs index 84e4aeb..54166c6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs @@ -737,7 +737,7 @@ namespace SlaveMatrix public 頬肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頬肌D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["頬肌左"]); + Body = new VariantGrid(Sta.胴体["頬肌左"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["淫タトゥ"].ToPars(); PartGroup pars3 = pars2["ハート"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs index 721fc69..79224df 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs @@ -111,7 +111,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "天輪"; morphVariant.Add(new PartGroup(Sta.肢中["頭部前"][0][2])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs index 1ab22f5..2a2a294 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs @@ -1862,7 +1862,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "エイリアン"; morphVariant.Add(new PartGroup(Sta.肢中["頭部前"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs index 8ab3d2e..bb0e3ba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs @@ -212,7 +212,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "皿"; morphVariant.Add(new PartGroup(Sta.肢中["頭部前"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs index 4e23ccb..525bee6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs @@ -215,7 +215,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "エイリアン"; morphVariant.Add(new PartGroup(Sta.肢中["頭部後"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs index 05790cb..007b8d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix public 顔ハイライト(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 顔ハイライトD e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["顔ハイライト左"]); + Body = new VariantGrid(Sta.胴体["顔ハイライト左"]); PartGroup partGroup = Body[0][0]; X0Y0_ハイライト1 = partGroup["ハイライト1"].ToPar(); X0Y0_ハイライト2 = partGroup["ハイライト2"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs index b614dae..2bc5de2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs @@ -510,7 +510,7 @@ namespace SlaveMatrix 顔面_甲 顔面_甲2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢中["顔面"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs index 03db25d..2ddf71f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs @@ -640,7 +640,7 @@ namespace SlaveMatrix 顔面_虫 顔面_虫2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢中["顔面"][1]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs index 05ee220..0e33c79 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs @@ -824,7 +824,7 @@ namespace SlaveMatrix 顔面_蟲 顔面_蟲2 = this; ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢中["顔面"][2]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs index f7bda6c..ba16e5a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs @@ -557,7 +557,7 @@ namespace SlaveMatrix public 飛沫_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 飛沫_人D e) { ThisType = GetType(); - Body = new Difs(Sta.性器付["飛沫"]); + Body = new VariantGrid(Sta.性器付["飛沫"]); PartGroup partGroup = Body[0][0]; X0Y0_飛沫基 = partGroup["飛沫基"].ToPar(); X0Y0_雫1 = partGroup["雫1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs index 8342091..d031206 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs @@ -557,7 +557,7 @@ namespace SlaveMatrix public 飛沫_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 飛沫_獣D e) { ThisType = GetType(); - Body = new Difs(Sta.性器付["四足飛沫"]); + Body = new VariantGrid(Sta.性器付["四足飛沫"]); PartGroup partGroup = Body[0][0]; X0Y0_飛沫基 = partGroup["飛沫基"].ToPar(); X0Y0_雫1 = partGroup["雫1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs index e650636..6d8b2e1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs @@ -106,7 +106,7 @@ namespace SlaveMatrix public 飛膜_先(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色) { ThisType = GetType(); - Body = new Difs(Sta.腕左["飛膜先"]); + Body = new VariantGrid(Sta.腕左["飛膜先"]); PartGroup partGroup = Body[0][0]; X0Y0_飛膜 = partGroup["飛膜"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs index 1ad4751..55abd04 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs @@ -106,7 +106,7 @@ namespace SlaveMatrix public 飛膜_根(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色) { ThisType = GetType(); - Body = new Difs(Sta.腕左["飛膜根"]); + Body = new VariantGrid(Sta.腕左["飛膜根"]); PartGroup partGroup = Body[0][0]; X0Y0_飛膜 = partGroup["飛膜"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs index e9ab63f..7eb69e9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs @@ -89,7 +89,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "豚鰭"; morphVariant.Add(new PartGroup(Sta.肢左["鰭"][1][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs index fcff15d..ac4efd0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs @@ -175,7 +175,7 @@ namespace SlaveMatrix { ThisType = GetType(); MorphVariant morphVariant = new MorphVariant(Sta.肢左["鰭"][0]); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs index 432df70..f3c6caf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs @@ -89,7 +89,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "鯨鰭"; morphVariant.Add(new PartGroup(Sta.肢左["鰭"][1][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs index 96b99b8..10adb7a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs @@ -1405,7 +1405,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "鳳凰"; morphVariant.Add(new PartGroup(Sta.肢中["尾"][2][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs index 29c091a..4375531 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "人"; morphVariant.Add(new PartGroup(Sta.胴体["鼻"][0][0])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs index 6fc6099..03369d3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix MorphVariant morphVariant = new MorphVariant(); morphVariant.Tag = "獣"; morphVariant.Add(new PartGroup(Sta.胴体["鼻"][0][1])); - Body = new Difs(); + Body = new VariantGrid(); Body.Tag = morphVariant.Tag; Body.Add(morphVariant); PartGroup partGroup = Body[0][0]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs index af21b3e..32094af 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs @@ -124,7 +124,7 @@ namespace SlaveMatrix public 鼻水(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鼻水D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["鼻水左"]); + Body = new VariantGrid(Sta.胴体["鼻水左"]); PartGroup partGroup = Body[0][0]; X0Y0_鼻水 = partGroup["鼻水"].ToPar(); partGroup = Body[0][1]; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs index 2600339..c451389 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs @@ -308,7 +308,7 @@ namespace SlaveMatrix public 鼻肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鼻肌D e) { ThisType = GetType(); - Body = new Difs(Sta.胴体["鼻肌"]); + Body = new VariantGrid(Sta.胴体["鼻肌"]); PartGroup partGroup = Body[0][0]; PartGroup pars2 = partGroup["紋柄"].ToPars(); PartGroup pars3 = pars2["紋左"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs index 263d9c6..4fdddde 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs @@ -12,7 +12,7 @@ namespace SlaveMatrix public ConnectionInfo ConnectionType; - public Difs Body; //本体 + public VariantGrid Body; //本体 public static double 肥大mi1 = -5E-07;