diff --git a/2DGAMELIB/_2DGAMELIB/Are.cs b/2DGAMELIB/_2DGAMELIB/Are.cs deleted file mode 100644 index 84a6c73..0000000 --- a/2DGAMELIB/_2DGAMELIB/Are.cs +++ /dev/null @@ -1,185 +0,0 @@ -using System.Drawing; -using System.Drawing.Drawing2D; -using System.Drawing.Imaging; - -namespace _2DGAMELIB -{ - public class Are : Rect - { - public Bitmap Dis; - public Bitmap Hit; - - protected Graphics gd; - protected Graphics gh; - - protected double unit; - protected double disUnit; - protected double hitUnit; - - protected Size WH = System.Drawing.Size.Empty; - protected Size WHH = System.Drawing.Size.Empty; - protected Size WHA = System.Drawing.Size.Empty; - - public Vector2D BasePoint = Dat.Vec2DZero; - public Vector2D Position = Dat.Vec2DZero; - - public Graphics GD => gd; - public Graphics GH => gh; - - public double Unit => unit; - public double DisUnit => disUnit; - - public Are() { } - public Are(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag) - { - Setting(Unit, XRatio, YRatio, Size, DisMag, HitMag); - } - - public Are(Med Med, bool Hit) - { - if (Hit) - { - Setting(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size, Med.DisQuality, Med.HitAccuracy); - } - else - { - Setting(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size, Med.DisQuality); - } - } - private void Setting(double Unit, double XRatio, double YRatio, double Size, double DisMag) - { - SetXYRatio(XRatio, YRatio); - base.Size = Size; - unit = Unit; - disUnit = Unit * DisMag; - WH.Width = (int)(base.LocalWidth * Unit); - WH.Height = (int)(base.LocalHeight * Unit); - WHA.Width = (int)(base.LocalWidth * disUnit); - WHA.Height = (int)(base.LocalHeight * disUnit); - Dis = new Bitmap((int)((double)WH.Width * DisMag), (int)((double)WH.Height * DisMag)); - gd = Graphics.FromImage(Dis); - - - gd.SmoothingMode = SmoothingMode.None; - gd.PixelOffsetMode = PixelOffsetMode.HighSpeed; - gd.InterpolationMode = InterpolationMode.NearestNeighbor; - //needed for text or smthn - gd.CompositingMode = CompositingMode.SourceOver; - } - private void Setting(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag) - { - Setting(Unit, XRatio, YRatio, Size, DisMag); - - hitUnit = Unit * HitMag; - WHH.Width = (int)(base.LocalWidth * hitUnit); - WHH.Height = (int)(base.LocalHeight * hitUnit); - Hit = new Bitmap(WHH.Width, WHH.Height); - gh = Graphics.FromImage(Hit); - - - gh.SmoothingMode = SmoothingMode.None; - gh.PixelOffsetMode = PixelOffsetMode.HighSpeed; - gh.InterpolationMode = InterpolationMode.NearestNeighbor; - gh.CompositingMode = CompositingMode.SourceOver; - } - - public Vector2D GetPosition() - { - return new Vector2D(Position.X - BasePoint.X * XRatio * Size, Position.Y - BasePoint.Y * YRatio * Size); - } - - - - - - public void Draw(Par Par) - { - Par.Draw(disUnit, gd); - if (gh != null) - { - Par.DrawH(hitUnit, gh); - } - } - - public void Draw(ParT ParT) - { - ParT.Draw(disUnit, gd); - if (gh != null) - { - ParT.DrawH(hitUnit, gh); - } - } - - public void Draw(Pars Pars) - { - Pars.Draw(disUnit, gd); - if (gh != null) - { - Pars.DrawH(hitUnit, gh); - } - } - - public void Draw(Are Are) - { - Vector2D p = Are.GetPosition(); - GD.DrawImage(Are.Dis, (float)(p.X * Are.disUnit), (float)(p.Y * Are.disUnit), Are.WHA.Width, Are.WHA.Height); - if (Are.gh != null && GH != null) - { - GH.DrawImage(Are.Hit, (int)(p.X * Are.hitUnit), (int)(p.Y * Are.hitUnit), Are.WHH.Width, Are.WHH.Height); - } - } - - - - - public void DrawTo(Graphics GD) - { - Vector2D p = GetPosition(); - GD.DrawImage(Dis, (int)(p.X * unit), (int)(p.Y * unit), WH.Width, WH.Height); - } - - public void DrawTo(Graphics GD, Graphics GH) - { - Vector2D p = GetPosition(); - GD.DrawImage(Dis, (int)(p.X * unit), (int)(p.Y * unit), WH.Width, WH.Height); - if (gh != null) - { - GH.DrawImage(Hit, (int)(p.X * hitUnit), (int)(p.Y * hitUnit), WHH.Width, WHH.Height); - } - } - - - - - - - public void Clear() - { - gd.Clear(Color.Transparent); - if (gh != null) - { - gh.Clear(Color.Transparent); - } - } - - public void Clear(Color Color) - { - gd.Clear(Color); - if (gh != null) - { - gh.Clear(Color.Transparent); - } - } - - public void Dispose() - { - Dis.Dispose(); - gd.Dispose(); - if (Hit != null) - { - Hit.Dispose(); - gh.Dispose(); - } - } - } -} diff --git a/2DGAMELIB/_2DGAMELIB/AreM.cs b/2DGAMELIB/_2DGAMELIB/AreM.cs index 68e5ec0..d8d6875 100644 --- a/2DGAMELIB/_2DGAMELIB/AreM.cs +++ b/2DGAMELIB/_2DGAMELIB/AreM.cs @@ -3,7 +3,7 @@ using System.Drawing.Drawing2D; namespace _2DGAMELIB { - public class AreM : Are + public class AreM : RenderArea { private double strength; @@ -13,38 +13,38 @@ namespace _2DGAMELIB { SetXYRatio(XRatio, YRatio); base.Size = Size; - unit = Unit; + unitScale = Unit; strength = Strength; - disUnit = Unit * DisMag; + displayUnitScale = Unit * DisMag; double num = 1.0 - Strength; - unitS = disUnit * num; + unitS = displayUnitScale * num; WH.Width = (int)(base.LocalWidth * Unit); WH.Height = (int)(base.LocalHeight * Unit); - WHA.Width = (int)(base.LocalWidth * disUnit); - WHA.Height = (int)(base.LocalHeight * disUnit); - Dis = new Bitmap((int)((double)WH.Width * DisMag * num), (int)((double)WH.Height * DisMag * num)); - gd = Graphics.FromImage(Dis); - gd.SmoothingMode = SmoothingMode.None; - gd.PixelOffsetMode = PixelOffsetMode.None; + WHA.Width = (int)(base.LocalWidth * displayUnitScale); + WHA.Height = (int)(base.LocalHeight * displayUnitScale); + DisplayLayer = new Bitmap((int)((double)WH.Width * DisMag * num), (int)((double)WH.Height * DisMag * num)); + displayGraphics = Graphics.FromImage(DisplayLayer); + displayGraphics.SmoothingMode = SmoothingMode.None; + displayGraphics.PixelOffsetMode = PixelOffsetMode.None; - hitUnit = Unit * HitMag; - WHH.Width = (int)(base.LocalWidth * hitUnit); - WHH.Height = (int)(base.LocalHeight * hitUnit); - Hit = new Bitmap(WHH.Width, WHH.Height); - gh = Graphics.FromImage(Hit); - gh.SmoothingMode = SmoothingMode.None; - gh.PixelOffsetMode = PixelOffsetMode.None; + hitUnitScale = Unit * HitMag; + WHH.Width = (int)(base.LocalWidth * hitUnitScale); + WHH.Height = (int)(base.LocalHeight * hitUnitScale); + HitLayer = new Bitmap(WHH.Width, WHH.Height); + hitGraphics = Graphics.FromImage(HitLayer); + hitGraphics.SmoothingMode = SmoothingMode.None; + hitGraphics.PixelOffsetMode = PixelOffsetMode.None; } public new void Draw(Pars Pars) { - Pars.Draw(unitS, gd); - if (gh != null) + Pars.Draw(unitS, displayGraphics); + if (hitGraphics != null) { - Pars.DrawH(hitUnit, gh); + Pars.DrawH(hitUnitScale, hitGraphics); } } } diff --git a/2DGAMELIB/_2DGAMELIB/But.cs b/2DGAMELIB/_2DGAMELIB/But.cs index 9184757..5ef40cb 100644 --- a/2DGAMELIB/_2DGAMELIB/But.cs +++ b/2DGAMELIB/_2DGAMELIB/But.cs @@ -109,7 +109,7 @@ namespace _2DGAMELIB return false; } - public void Draw(Are Are) + public void Draw(RenderArea Are) { if (dra) { @@ -117,7 +117,7 @@ namespace _2DGAMELIB } } - public void SetHitColor(Med Med) + public void SetHitColor(ModeEventDispatcher Med) { foreach (Par item in pars.EnumAllPar()) { diff --git a/2DGAMELIB/_2DGAMELIB/Buts.cs b/2DGAMELIB/_2DGAMELIB/Buts.cs index ae1f1b7..5d76d50 100644 --- a/2DGAMELIB/_2DGAMELIB/Buts.cs +++ b/2DGAMELIB/_2DGAMELIB/Buts.cs @@ -49,7 +49,7 @@ namespace _2DGAMELIB } } - public void SetHitColor(Med Med) + public void SetHitColor(ModeEventDispatcher Med) { foreach (But item in EnumBut) { @@ -57,7 +57,7 @@ namespace _2DGAMELIB } } - public void Draw(Are Are) + public void Draw(RenderArea Are) { foreach (But value in buts.Values) { diff --git a/2DGAMELIB/_2DGAMELIB/Difs.cs b/2DGAMELIB/_2DGAMELIB/Difs.cs index d65b555..7da8acf 100644 --- a/2DGAMELIB/_2DGAMELIB/Difs.cs +++ b/2DGAMELIB/_2DGAMELIB/Difs.cs @@ -285,7 +285,7 @@ namespace _2DGAMELIB } - public void Draw(Are Are) + public void Draw(RenderArea Are) { Are.Draw(Current); } diff --git a/2DGAMELIB/_2DGAMELIB/Lab.cs b/2DGAMELIB/_2DGAMELIB/Lab.cs index 5093a29..0171961 100644 --- a/2DGAMELIB/_2DGAMELIB/Lab.cs +++ b/2DGAMELIB/_2DGAMELIB/Lab.cs @@ -7,7 +7,7 @@ namespace _2DGAMELIB { private ParT parT; - private Are Are; + private RenderArea Are; private double Width; @@ -33,17 +33,17 @@ namespace _2DGAMELIB SetRect(); } - public Lab(Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor) + public Lab(RenderArea Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor) { Setting(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor); } - public Lab(Are Are, string Name, Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, Color FramColor) + public Lab(RenderArea Are, string Name, Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, Color FramColor) { Setting(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor); } - private void Setting(Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor) + private void Setting(RenderArea Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor) { this.Are = Are; this.Width = Width; @@ -84,7 +84,7 @@ namespace _2DGAMELIB SetText(Text); } - public void SetHitColor(Med Med) + public void SetHitColor(ModeEventDispatcher Med) { if (parT.HitColor != Color.Transparent) { @@ -98,7 +98,7 @@ namespace _2DGAMELIB if (!string.IsNullOrEmpty(parT.Text)) { parT.RectSize = new Vector2D(Width, 10.0); - Vector2D_2 stringRect = parT.GetStringRect(Are.DisUnit, Are.GD); + Vector2D_2 stringRect = parT.GetStringRect(Are.DisplayUnitScale, Are.DisplayGraphics); double x = ((stringRect.v2.X > Min) ? stringRect.v2.X : Min) + 0.07; parT.RectSize = new Vector2D(x, stringRect.v2.Y); } diff --git a/2DGAMELIB/_2DGAMELIB/Labs.cs b/2DGAMELIB/_2DGAMELIB/Labs.cs index 6475819..2c44c83 100644 --- a/2DGAMELIB/_2DGAMELIB/Labs.cs +++ b/2DGAMELIB/_2DGAMELIB/Labs.cs @@ -7,13 +7,13 @@ namespace _2DGAMELIB { private OrderedDictionary labs = new OrderedDictionary(); - private Med Med; + private ModeEventDispatcher Med; - private Are Are; + private RenderArea Are; public Lab this[string Name] => labs[Name]; - public Labs(Med Med, Are Are) + public Labs(ModeEventDispatcher Med, RenderArea Are) { this.Med = Med; this.Are = Are; @@ -24,7 +24,7 @@ namespace _2DGAMELIB labs.Add(Name, new Lab(Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor)); } - public void Draw(Are Are) + public void Draw(RenderArea Are) { foreach (Lab value in labs.Values) { diff --git a/2DGAMELIB/_2DGAMELIB/Med.cs b/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs similarity index 85% rename from 2DGAMELIB/_2DGAMELIB/Med.cs rename to 2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs index a37e144..a62277e 100644 --- a/2DGAMELIB/_2DGAMELIB/Med.cs +++ b/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs @@ -7,7 +7,7 @@ using System.Runtime.InteropServices; namespace _2DGAMELIB { - public class Med + public class ModeEventDispatcher { private GlImage baseControl; @@ -21,13 +21,13 @@ namespace _2DGAMELIB public bool ShowFPS; public bool Drive = true; - public Rect Base = new Rect(4.0, 3.0, 0.4); + public Rectangle Base = new Rectangle(4.0, 3.0, 0.4); - public Bitmap Dis; - public Graphics GD; + public Bitmap Display; + public Graphics DisplayGraphics; public Bitmap Hit; - public Graphics GH; + public Graphics HitGraphics; public Sce Sce; public FPS FPSF = new FPS(60.0); @@ -41,7 +41,7 @@ namespace _2DGAMELIB public string Modeb; private Dictionary Modes; - private Func> GetModes; + private Func> GetModes; public HashSet HitColors = new HashSet { @@ -78,31 +78,21 @@ namespace _2DGAMELIB baseControl.SetCursorPoint(FromBasePosition(value)); } } - public Med() + public ModeEventDispatcher() { } - - - - - public void FadeIn(double Rate) { - Sce.TransformAlpha(GD, Rate); + Sce.TransformAlpha(DisplayGraphics, Rate); } public void FadeOut(double Rate) { - Sce.TransD(GD, Rate); + Sce.TransD(DisplayGraphics, Rate); } - - - - - - public void InitializeModes(string Mode, Func> GetModes) + public void InitializeModes(string Mode, Func> GetModes) { mode = Mode; this.GetModes = GetModes; @@ -112,22 +102,22 @@ namespace _2DGAMELIB { baseControl = BaseControl; BaseSize = new Size((int)(Base.LocalWidth * Unit), (int)(Base.LocalHeight * Unit)); - Dis = new Bitmap(BaseSize.Width, BaseSize.Height); - GD = Graphics.FromImage(Dis); + Display = new Bitmap(BaseSize.Width, BaseSize.Height); + DisplayGraphics = Graphics.FromImage(Display); //GD.InterpolationMode = InterpolationMode.HighQualityBilinear; - GD.SmoothingMode = SmoothingMode.None; - GD.PixelOffsetMode = PixelOffsetMode.HighSpeed; - GD.InterpolationMode = InterpolationMode.NearestNeighbor; + DisplayGraphics.SmoothingMode = SmoothingMode.None; + DisplayGraphics.PixelOffsetMode = PixelOffsetMode.HighSpeed; + DisplayGraphics.InterpolationMode = InterpolationMode.NearestNeighbor; //needed for text or smthn - GD.CompositingMode = CompositingMode.SourceOver; + DisplayGraphics.CompositingMode = CompositingMode.SourceOver; - Hit = new Bitmap((int)((double)BaseSize.Width * HitAccuracy), (int)((double)BaseSize.Height * HitAccuracy)); - GH = Graphics.FromImage(Hit); + Hit = new Bitmap((int)(BaseSize.Width * HitAccuracy), (int)(BaseSize.Height * HitAccuracy)); + HitGraphics = Graphics.FromImage(Hit); //GH.InterpolationMode = InterpolationMode.Bilinear; - GH.SmoothingMode = SmoothingMode.None; - GH.PixelOffsetMode = PixelOffsetMode.HighSpeed; - GH.InterpolationMode = InterpolationMode.NearestNeighbor; - GH.CompositingMode = CompositingMode.SourceOver; + HitGraphics.SmoothingMode = SmoothingMode.None; + HitGraphics.PixelOffsetMode = PixelOffsetMode.HighSpeed; + HitGraphics.InterpolationMode = InterpolationMode.NearestNeighbor; + HitGraphics.CompositingMode = CompositingMode.SourceOver; WidthM = Hit.Width - 1; HeightM = Hit.Height - 1; @@ -230,8 +220,6 @@ namespace _2DGAMELIB return BaseSize; } - - public Vector2D ToBasePosition(Vector2D Position) { return new Vector2D(((double)Position.X - resVector.X) / Unit * resMag, ((double)Position.Y - resVector.Y) / Unit * resMag); @@ -288,12 +276,9 @@ namespace _2DGAMELIB return Hit.GetPixel(point.X, point.Y); } - - - public void Drawing() { - baseControl.BitmapSetting(Dis); + baseControl.BitmapSetting(Display); baseControl.SetTitle(UITitle); Modes[mode].Setting(); @@ -312,7 +297,7 @@ namespace _2DGAMELIB //DEBUG shows the hit lut //GD.DrawImage(Hit, new Point(0, 0)); - baseControl.SetBitmap(Dis); + baseControl.SetBitmap(Display); }; @@ -323,27 +308,25 @@ namespace _2DGAMELIB } } - - public void Draw(Are Are) + public void Draw(RenderArea Are) { //Note: this is terribly slow... //would be better to not copy the entire frame - Are.DrawTo(GD, GH); + Are.DrawTo(DisplayGraphics, HitGraphics); } - - //TODO fix? public void CursorHide() { - //TODO fix? - } + //TODO fix? + Glfw.SetInputMode(baseControl.window, InputMode.Cursor, (int)CursorMode.Hidden); + } public void CursorShow() { //TODO fix? - } - + Glfw.SetInputMode(baseControl.window, InputMode.Cursor, (int)CursorMode.Normal); + } //hit color stuff public Color GetUniqueColor() @@ -410,6 +393,6 @@ namespace _2DGAMELIB //return result; }*/ - static Med() {} + static ModeEventDispatcher() {} } } diff --git a/2DGAMELIB/_2DGAMELIB/Mots.cs b/2DGAMELIB/_2DGAMELIB/Mots.cs index 3751a3e..5264f87 100644 --- a/2DGAMELIB/_2DGAMELIB/Mots.cs +++ b/2DGAMELIB/_2DGAMELIB/Mots.cs @@ -25,8 +25,10 @@ namespace _2DGAMELIB public void Add(string Name, Mot Mot) { - ms.Add(Name, Mot); - } + //Broke some times here when adding existing keys + //ms.Add(Name, Mot); + ms.TryAdd(Name, Mot); + } public void Rem(string Name) { diff --git a/2DGAMELIB/_2DGAMELIB/Obj.cs b/2DGAMELIB/_2DGAMELIB/Obj.cs index 95ed4f0..621e275 100644 --- a/2DGAMELIB/_2DGAMELIB/Obj.cs +++ b/2DGAMELIB/_2DGAMELIB/Obj.cs @@ -204,7 +204,7 @@ namespace _2DGAMELIB - public void Draw(Are Are) + public void Draw(RenderArea Are) { foreach (Difs value in Difss.Values) { diff --git a/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs new file mode 100644 index 0000000..710860e --- /dev/null +++ b/2DGAMELIB/_2DGAMELIB/ObjExtensions.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Reflection; +using System.Text; + +namespace _2DGAMELIB +{ + public static class ObjExtensions + { + static readonly Dictionary KeyMap = new() + { + ["咳"] = "Cough", + ["腰"] = "Waist", + ["胴"] = "Torso", + ["首"] = "Neck", + ["頭"] = "Head", + ["後髪0"] = "BackHair0", + ["後髪1"] = "BackHair1", + ["横髪"] = "SideHair", + ["脚"] = "Leg", + //["腕"] = "Arm" + ["肩"] = "Shoulder", + ["胸"] = "Chest", + //["乳房"] = "Breast", + //["腹"] = "Abdomen", + //["顔"] = "Face", + //["目"] = "Eye", + //["眉"] = "Eyebrow", + //["瞼"] = "Eyelid", + //["鼻"] = "Nose", + //["口"] = "Mouth", + //["耳"] = "Ear", + //["触覚"] = "Antenna", + //["髪"] = "Hair", + //["基髪"] = "BaseHair", + //["吹出し"] = "SpeechBubble", + }; + + public static void MigrateKeys(this Obj obj) + { + var newDict = new OrderedDictionary(); + + foreach (var key in obj.Keys) + { + var newKey = KeyMap.TryGetValue(key, out var mapped) ? mapped : key; + var difs = obj.Difss[key]; + + newDict.Add(newKey, difs); + } + + obj.Difss = newDict; + } + + } +} diff --git a/2DGAMELIB/_2DGAMELIB/Oth.cs b/2DGAMELIB/_2DGAMELIB/Oth.cs index 8329d38..107a664 100644 --- a/2DGAMELIB/_2DGAMELIB/Oth.cs +++ b/2DGAMELIB/_2DGAMELIB/Oth.cs @@ -13,7 +13,6 @@ namespace _2DGAMELIB private static double s0; - public static Color Reverse(this Color c) { return Color.FromArgb(c.A, 255 - c.R, 255 - c.G, 255 - c.B); @@ -44,9 +43,9 @@ namespace _2DGAMELIB return Func(new Hsv(ref Color)).GetColor(); } - public static Rectangle GetRect(this Bitmap Bmp) + public static System.Drawing.Rectangle GetRect(this Bitmap Bmp) { - return new Rectangle(0, 0, Bmp.Width, Bmp.Height); + return new System.Drawing.Rectangle(0, 0, Bmp.Width, Bmp.Height); } public static LinearGradientBrush GetLGB(double Unit, Vector2D[] MM, Color Color1, Color Color2) @@ -159,10 +158,11 @@ namespace _2DGAMELIB public static Obj ObjLoad(this byte[] bd) { - return bd.Load().ToDeserialObject().SetDefaultR(); - } + return bd.Load().ToDeserialObject().SetDefaultR(); + } - public static bool Lot(this double p) + + public static bool Lot(this double p) { return RNG.XS.NextDouble() < p; } diff --git a/2DGAMELIB/_2DGAMELIB/Rect.cs b/2DGAMELIB/_2DGAMELIB/Rectangle.cs similarity index 88% rename from 2DGAMELIB/_2DGAMELIB/Rect.cs rename to 2DGAMELIB/_2DGAMELIB/Rectangle.cs index fba70ef..98694aa 100644 --- a/2DGAMELIB/_2DGAMELIB/Rect.cs +++ b/2DGAMELIB/_2DGAMELIB/Rectangle.cs @@ -1,6 +1,6 @@ namespace _2DGAMELIB { - public class Rect + public class Rectangle { public double XRatio = 1.0; @@ -14,9 +14,9 @@ namespace _2DGAMELIB public Vector2D LocalCenter => new Vector2D(LocalWidth * 0.5, LocalHeight * 0.5); - public Rect(){} + public Rectangle(){} - public Rect(double XRatio, double YRatio, double Size) + public Rectangle(double XRatio, double YRatio, double Size) { SetXYRatio(XRatio, YRatio); this.Size = Size; diff --git a/2DGAMELIB/_2DGAMELIB/RenderArea.cs b/2DGAMELIB/_2DGAMELIB/RenderArea.cs new file mode 100644 index 0000000..3fe5683 --- /dev/null +++ b/2DGAMELIB/_2DGAMELIB/RenderArea.cs @@ -0,0 +1,176 @@ +using System.Drawing; +using System.Drawing.Drawing2D; +using System.Drawing.Imaging; + +namespace _2DGAMELIB +{ + //Render Area + public class RenderArea : Rectangle + { + //Display Layer + public Bitmap DisplayLayer; + //Hit Layer + public Bitmap HitLayer; + + protected Graphics displayGraphics; + protected Graphics hitGraphics; + + protected double unitScale; + protected double displayUnitScale; + protected double hitUnitScale; + + protected Size WH = System.Drawing.Size.Empty; + protected Size WHH = System.Drawing.Size.Empty; + protected Size WHA = System.Drawing.Size.Empty; + + public Vector2D BasePoint = Dat.Vec2DZero; + public Vector2D Position = Dat.Vec2DZero; + + public Graphics DisplayGraphics => displayGraphics; + public Graphics HitGraphics => hitGraphics; + + public double UnitScale => unitScale; + public double DisplayUnitScale => displayUnitScale; + + public RenderArea() { } + public RenderArea(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag) + { + Setting(Unit, XRatio, YRatio, Size, DisMag, HitMag); + } + + public RenderArea(ModeEventDispatcher Med, bool Hit) + { + if (Hit) + { + Setting(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size, Med.DisQuality, Med.HitAccuracy); + } + else + { + Setting(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size, Med.DisQuality); + } + } + private void Setting(double Unit, double XRatio, double YRatio, double Size, double DisMag) + { + SetXYRatio(XRatio, YRatio); + base.Size = Size; + unitScale = Unit; + displayUnitScale = Unit * DisMag; + WH.Width = (int)(base.LocalWidth * Unit); + WH.Height = (int)(base.LocalHeight * Unit); + WHA.Width = (int)(base.LocalWidth * displayUnitScale); + WHA.Height = (int)(base.LocalHeight * displayUnitScale); + DisplayLayer = new Bitmap((int)((double)WH.Width * DisMag), (int)((double)WH.Height * DisMag)); + displayGraphics = Graphics.FromImage(DisplayLayer); + + + displayGraphics.SmoothingMode = SmoothingMode.None; + displayGraphics.PixelOffsetMode = PixelOffsetMode.HighSpeed; + displayGraphics.InterpolationMode = InterpolationMode.NearestNeighbor; + //needed for text or smthn + displayGraphics.CompositingMode = CompositingMode.SourceOver; + } + private void Setting(double Unit, double XRatio, double YRatio, double Size, double DisMag, double HitMag) + { + Setting(Unit, XRatio, YRatio, Size, DisMag); + + hitUnitScale = Unit * HitMag; + WHH.Width = (int)(base.LocalWidth * hitUnitScale); + WHH.Height = (int)(base.LocalHeight * hitUnitScale); + HitLayer = new Bitmap(WHH.Width, WHH.Height); + hitGraphics = Graphics.FromImage(HitLayer); + + + hitGraphics.SmoothingMode = SmoothingMode.None; + hitGraphics.PixelOffsetMode = PixelOffsetMode.HighSpeed; + hitGraphics.InterpolationMode = InterpolationMode.NearestNeighbor; + hitGraphics.CompositingMode = CompositingMode.SourceOver; + } + + public Vector2D GetPosition() + { + return new Vector2D(Position.X - BasePoint.X * XRatio * Size, Position.Y - BasePoint.Y * YRatio * Size); + } + + public void Draw(Par Par) + { + Par.Draw(displayUnitScale, displayGraphics); + if (hitGraphics != null) + { + Par.DrawH(hitUnitScale, hitGraphics); + } + } + + public void Draw(ParT ParT) + { + ParT.Draw(displayUnitScale, displayGraphics); + if (hitGraphics != null) + { + ParT.DrawH(hitUnitScale, hitGraphics); + } + } + + public void Draw(Pars Pars) + { + Pars.Draw(displayUnitScale, displayGraphics); + if (hitGraphics != null) + { + Pars.DrawH(hitUnitScale, hitGraphics); + } + } + + public void Draw(RenderArea Are) + { + Vector2D p = Are.GetPosition(); + DisplayGraphics.DrawImage(Are.DisplayLayer, (float)(p.X * Are.displayUnitScale), (float)(p.Y * Are.displayUnitScale), Are.WHA.Width, Are.WHA.Height); + if (Are.hitGraphics != null && HitGraphics != null) + { + HitGraphics.DrawImage(Are.HitLayer, (int)(p.X * Are.hitUnitScale), (int)(p.Y * Are.hitUnitScale), Are.WHH.Width, Are.WHH.Height); + } + } + + public void DrawTo(Graphics GD) + { + Vector2D p = GetPosition(); + GD.DrawImage(DisplayLayer, (int)(p.X * unitScale), (int)(p.Y * unitScale), WH.Width, WH.Height); + } + + public void DrawTo(Graphics displayGraphics, Graphics hitGraphics) + { + Vector2D p = GetPosition(); + displayGraphics.DrawImage(DisplayLayer, (int)(p.X * unitScale), (int)(p.Y * unitScale), WH.Width, WH.Height); + if (this.hitGraphics != null) + { + hitGraphics.DrawImage(HitLayer, (int)(p.X * hitUnitScale), (int)(p.Y * hitUnitScale), WHH.Width, WHH.Height); + } + } + + public void Clear() + { + displayGraphics.Clear(Color.Transparent); + if (hitGraphics != null) + { + hitGraphics.Clear(Color.Transparent); + } + } + + public void Clear(Color Color) + { + displayGraphics.Clear(Color); + if (hitGraphics != null) + { + hitGraphics.Clear(Color.Transparent); + } + } + + public void Dispose() + { + DisplayLayer.Dispose(); + displayGraphics.Dispose(); + if (HitLayer != null) + { + HitLayer.Dispose(); + hitGraphics.Dispose(); + } + } + } +} diff --git a/2DGAMELIB/_2DGAMELIB/Sce.cs b/2DGAMELIB/_2DGAMELIB/Sce.cs index c172960..58eb2bd 100644 --- a/2DGAMELIB/_2DGAMELIB/Sce.cs +++ b/2DGAMELIB/_2DGAMELIB/Sce.cs @@ -17,7 +17,7 @@ namespace _2DGAMELIB private int h; - private Rectangle r; + private System.Drawing.Rectangle r; private ColorMatrix cm = new ColorMatrix(); @@ -31,7 +31,7 @@ namespace _2DGAMELIB GS = Graphics.FromImage(Start); End = new Bitmap(w, h); GE = Graphics.FromImage(End); - r = new Rectangle(0, 0, w, h); + r = new System.Drawing.Rectangle(0, 0, w, h); } public void TransformAlpha(Graphics Graphics, double Rate) @@ -50,12 +50,12 @@ namespace _2DGAMELIB Graphics.DrawImage(Start, r, 0, 0, w, h, GraphicsUnit.Pixel, ia); } - public void DrawStart(Are Are) + public void DrawStart(RenderArea Are) { Are.DrawTo(GS); } - public void DrawEnd(Are Are) + public void DrawEnd(RenderArea Are) { Are.DrawTo(GE); } diff --git a/2DGAMELIB/_2DGAMELIB/Tex.cs b/2DGAMELIB/_2DGAMELIB/Tex.cs index d1b4587..b7b63b9 100644 --- a/2DGAMELIB/_2DGAMELIB/Tex.cs +++ b/2DGAMELIB/_2DGAMELIB/Tex.cs @@ -249,7 +249,7 @@ namespace _2DGAMELIB pars.Add(feed.Tag, feed); } - public void SetHitColor(Med Med) + public void SetHitColor(ModeEventDispatcher Med) { if (parT.HitColor != Color.Transparent) { diff --git a/2DGAMELIB/_2DGAMELIB/UI.cs b/2DGAMELIB/_2DGAMELIB/UI.cs index 3ab20bd..bafa10d 100644 --- a/2DGAMELIB/_2DGAMELIB/UI.cs +++ b/2DGAMELIB/_2DGAMELIB/UI.cs @@ -1,3 +1,4 @@ +using GLFW; using System; using System.ComponentModel; using System.IO; @@ -7,7 +8,7 @@ namespace _2DGAMELIB { public class UI //: Form { - private Med Med; + private ModeEventDispatcher modeEventDispatcher; private GlImage wpfImage1; @@ -17,16 +18,16 @@ namespace _2DGAMELIB private bool BigWindow; - public UI(Med Med) + public UI(ModeEventDispatcher Med) { - this.Med = Med; + this.modeEventDispatcher = Med; InitializeComponent(); } private void UI_Load(object sender, EventArgs e) { //base.ClientSize = - Med.Setting(wpfImage1); + modeEventDispatcher.Setting(wpfImage1); //base.ClientSize = new Size(1024, 768); try { @@ -53,7 +54,7 @@ namespace _2DGAMELIB private void UI_FormClosing() { - Med.Drive = false; + modeEventDispatcher.Drive = false; } private void UI_Resize(object sender, EventArgs e) @@ -107,10 +108,9 @@ namespace _2DGAMELIB //beauty this.wpfImage1.Closing = delegate () { UI_FormClosing(); }; - - //TODO fix? - //base.Load += new System.EventHandler(UI_Load); - UI_Load(null, null); + //TODO fix? + //base.Load += new System.EventHandler(UI_Load); + UI_Load(null, null); //base.Resize += new System.EventHandler(UI_Resize); //base.ResumeLayout(false); } diff --git a/2DGAMELIB/_2DGAMELIB/WPFImage.cs b/2DGAMELIB/_2DGAMELIB/WPFImage.cs index 4ce5857..d6985ac 100644 --- a/2DGAMELIB/_2DGAMELIB/WPFImage.cs +++ b/2DGAMELIB/_2DGAMELIB/WPFImage.cs @@ -97,7 +97,7 @@ namespace _2DGAMELIB gl.ActiveTexture(Silk.NET.OpenGL.GLEnum.Texture0); gl.BindTexture(Silk.NET.OpenGL.GLEnum.Texture2D, texture); - BitmapData data = bmp.LockBits(new Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); + BitmapData data = bmp.LockBits(new System.Drawing.Rectangle(0, 0, bmp.Width, bmp.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); gl.TexImage2D( Silk.NET.OpenGL.GLEnum.Texture2D, diff --git a/SlaveMatrix/SlaveMatrix.csproj.user b/SlaveMatrix/SlaveMatrix.csproj.user index f259d38..3323947 100644 --- a/SlaveMatrix/SlaveMatrix.csproj.user +++ b/SlaveMatrix/SlaveMatrix.csproj.user @@ -6,4 +6,9 @@ SlaveMatrix + + + Designer + + \ No newline at end of file diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0.cs similarity index 85% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0.cs index 60d3469..f3f5059 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 後髪1 : Ele + public class BackHair0 : Ele { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0D.cs similarity index 100% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0D.cs diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_カル.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs index cd27a47..32a4685 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_カル : 下ろし + public class BackHair0_カル : 下ろし { public Par X0Y0_髪基; @@ -378,12 +378,12 @@ namespace SlaveMatrix } } - public 後髪0_カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_カルD e) + public BackHair0_カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_カルD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "カル"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][3])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][3])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs similarity index 77% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_カルD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs index c413a00..f7c1ef4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_カルD : 下ろしD + public class BackHair0_カルD : 下ろしD { public bool 髪基_表示 = true; @@ -40,12 +40,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_カルD() + public BackHair0_カルD() { ThisType = GetType(); } - public 後髪0_カルD SetRandom() + public BackHair0_カルD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -55,9 +55,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_カル(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_カル(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ジグ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs index aa73da5..e4d9c49 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_ジグ : 下ろし + public class BackHair0_ジグ : 下ろし { public Par X0Y0_髪基; @@ -378,12 +378,12 @@ namespace SlaveMatrix } } - public 後髪0_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_ジグD e) + public BackHair0_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_ジグD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "ジグ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][0])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][0])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs similarity index 77% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ジグD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs index 98f40b2..8ff75d9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_ジグD : 下ろしD + public class BackHair0_ジグD : 下ろしD { public bool 髪基_表示 = true; @@ -40,12 +40,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_ジグD() + public BackHair0_ジグD() { ThisType = GetType(); } - public 後髪0_ジグD SetRandom() + public BackHair0_ジグD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -55,9 +55,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_ジグ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_ジグ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ハネ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs index 3fec94f..7d6a316 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs @@ -378,12 +378,12 @@ namespace SlaveMatrix } } - public 後髪0_ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_ハネD e) + public 後髪0_ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_ハネD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "ハネ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][1])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][1])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs similarity index 83% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ハネD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs index 466b59d..eb0f0b7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_ハネD : 下ろしD + public class BackHair0_ハネD : 下ろしD { public bool 髪基_表示 = true; @@ -40,12 +40,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_ハネD() + public BackHair0_ハネD() { ThisType = GetType(); } - public 後髪0_ハネD SetRandom() + public BackHair0_ハネD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 後髪0_ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_パツ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs index ece89fc..a8abe70 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_パツ : 下ろし + public class BackHair0_パツ : 下ろし { public Par X0Y0_髪基; @@ -378,12 +378,12 @@ namespace SlaveMatrix } } - public 後髪0_パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_パツD e) + public BackHair0_パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_パツD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "パツ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][2])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][2])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs similarity index 77% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_パツD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs index e6123c5..5a15f7c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_パツD : 下ろしD + public class BackHair0_パツD : 下ろしD { public bool 髪基_表示 = true; @@ -40,12 +40,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_パツD() + public BackHair0_パツD() { ThisType = GetType(); } - public 後髪0_パツD SetRandom() + public BackHair0_パツD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -55,9 +55,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_パツ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_パツ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1カル.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs index 5b51935..e5f50a3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_下1カル : お下げ1 + public class BackHair0_下1カル : お下げ1 { public Par X0Y0_髪基; @@ -301,12 +301,12 @@ namespace SlaveMatrix } } - public 後髪0_下1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_下1カルD e) + public BackHair0_下1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下1カルD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "下げ1カル"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][7])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][7])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs similarity index 75% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1カルD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs index 70b711e..bf29ce2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_下1カルD : お下げ1D + public class BackHair0_下1カルD : お下げ1D { public bool 髪基_表示 = true; @@ -34,12 +34,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_下1カルD() + public BackHair0_下1カルD() { ThisType = GetType(); } - public 後髪0_下1カルD SetRandom() + public BackHair0_下1カルD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -49,9 +49,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_下1カル(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_下1カル(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ジグ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs index 61c23f5..7ba6f66 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs @@ -301,12 +301,12 @@ namespace SlaveMatrix } } - public 後髪0_下1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_下1ジグD e) + public 後髪0_下1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下1ジグD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "下げ1ジグ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][4])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][4])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs similarity index 81% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ジグD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs index d7e5989..194695c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_下1ジグD : お下げ1D + public class BackHair0_下1ジグD : お下げ1D { public bool 髪基_表示 = true; @@ -34,12 +34,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_下1ジグD() + public BackHair0_下1ジグD() { ThisType = GetType(); } - public 後髪0_下1ジグD SetRandom() + public BackHair0_下1ジグD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 後髪0_下1ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ハネ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs index d4be2d2..df3b210 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_下1ハネ : お下げ1 + public class BackHair0_下1ハネ : お下げ1 { public Par X0Y0_髪基; @@ -301,12 +301,12 @@ namespace SlaveMatrix } } - public 後髪0_下1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_下1ハネD e) + public BackHair0_下1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下1ハネD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "下げ1ハネ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][5])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][5])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs similarity index 75% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ハネD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs index 90ee6c7..bcd0d03 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_下1ハネD : お下げ1D + public class BackHair0_下1ハネD : お下げ1D { public bool 髪基_表示 = true; @@ -34,12 +34,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_下1ハネD() + public BackHair0_下1ハネD() { ThisType = GetType(); } - public 後髪0_下1ハネD SetRandom() + public BackHair0_下1ハネD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -49,9 +49,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_下1ハネ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_下1ハネ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1パツ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs index 061e9eb..fdf1087 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_下1パツ : お下げ1 + public class BackHair0_下1パツ : お下げ1 { public Par X0Y0_髪基; @@ -301,12 +301,12 @@ namespace SlaveMatrix } } - public 後髪0_下1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_下1パツD e) + public BackHair0_下1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下1パツD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "下げ1パツ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][6])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][6])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs similarity index 75% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1パツD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs index 4f19a6d..5fddc4f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_下1パツD : お下げ1D + public class BackHair0_下1パツD : お下げ1D { public bool 髪基_表示 = true; @@ -34,12 +34,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_下1パツD() + public BackHair0_下1パツD() { ThisType = GetType(); } - public 後髪0_下1パツD SetRandom() + public BackHair0_下1パツD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -49,9 +49,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_下1パツ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_下1パツ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2カル.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs index 7103e07..b59d424 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_下2カル : お下げ2 + public class BackHair0_下2カル : お下げ2 { public Par X0Y0_髪基; @@ -345,12 +345,12 @@ namespace SlaveMatrix } } - public 後髪0_下2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_下2カルD e) + public BackHair0_下2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下2カルD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "下げ2カル"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][11])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][11])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs similarity index 77% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2カルD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs index 83b4a81..269f9e3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_下2カルD : お下げ2D + public class BackHair0_下2カルD : お下げ2D { public bool 髪基_表示 = true; @@ -38,12 +38,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_下2カルD() + public BackHair0_下2カルD() { ThisType = GetType(); } - public 後髪0_下2カルD SetRandom() + public BackHair0_下2カルD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -53,9 +53,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_下2カル(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_下2カル(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ジグ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs index 8107c25..a899cd4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_下2ジグ : お下げ2 + public class BackHair0_下2ジグ : お下げ2 { public Par X0Y0_髪基; @@ -345,12 +345,12 @@ namespace SlaveMatrix } } - public 後髪0_下2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_下2ジグD e) + public BackHair0_下2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下2ジグD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "下げ2ジグ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][8])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][8])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs similarity index 77% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ジグD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs index 466297a..37bc310 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_下2ジグD : お下げ2D + public class BackHair0_下2ジグD : お下げ2D { public bool 髪基_表示 = true; @@ -38,12 +38,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_下2ジグD() + public BackHair0_下2ジグD() { ThisType = GetType(); } - public 後髪0_下2ジグD SetRandom() + public BackHair0_下2ジグD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -53,9 +53,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_下2ジグ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_下2ジグ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ハネ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs index 679b17f..879eac9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_下2ハネ : お下げ2 + public class BackHair0_下2ハネ : お下げ2 { public Par X0Y0_髪基; @@ -345,12 +345,12 @@ namespace SlaveMatrix } } - public 後髪0_下2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_下2ハネD e) + public BackHair0_下2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_下2ハネD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "下げ2ハネ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][9])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][9])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs similarity index 87% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ハネD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs index 75f76c2..1cbbc0c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs @@ -53,9 +53,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_下2ハネ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_下2ハネ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2パツ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs index 92f3296..f86747f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_下2パツ : お下げ2 + public class BackHair0_下2パツ : お下げ2 { public Par X0Y0_髪基; @@ -345,12 +345,12 @@ namespace SlaveMatrix } } - public 後髪0_下2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_下2パツD e) + public BackHair0_下2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下2パツD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "下げ2パツ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][10])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][10])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs similarity index 77% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2パツD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs index 5890210..3da53ea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_下2パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_下2パツD : お下げ2D + public class BackHair0_下2パツD : お下げ2D { public bool 髪基_表示 = true; @@ -38,12 +38,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_下2パツD() + public BackHair0_下2パツD() { ThisType = GetType(); } - public 後髪0_下2パツD SetRandom() + public BackHair0_下2パツD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -53,9 +53,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_下2パツ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_下2パツ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1カル.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs index 0a8524b..168d761 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_編1カル : お下げ1 + public class BackHair0_編1カル : お下げ1 { public Par X0Y0_髪基; @@ -598,12 +598,12 @@ namespace SlaveMatrix } } - public 後髪0_編1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_編1カルD e) + public BackHair0_編1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_編1カルD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編み1カル"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][15])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][15])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs similarity index 84% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1カルD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs index a7fd0cd..675c283 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_編1カルD : お下げ1D + public class BackHair0_編1カルD : お下げ1D { public bool 髪基_表示 = true; @@ -60,12 +60,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_編1カルD() + public BackHair0_編1カルD() { ThisType = GetType(); } - public 後髪0_編1カルD SetRandom() + public BackHair0_編1カルD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -75,9 +75,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_編1カル(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_編1カル(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ジグ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs index 1b804cd..d939d6d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_編1ジグ : お下げ1 + public class BackHair0_編1ジグ : お下げ1 { public Par X0Y0_髪基; @@ -598,12 +598,12 @@ namespace SlaveMatrix } } - public 後髪0_編1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_編1ジグD e) + public BackHair0_編1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編1ジグD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編み1ジグ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][12])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][12])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs similarity index 91% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ジグD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs index 711ea27..6755f69 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs @@ -75,9 +75,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_編1ジグ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_編1ジグ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ハネ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs index 04bfbfb..c44d442 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_編1ハネ : お下げ1 + public class BackHair0_編1ハネ : お下げ1 { public Par X0Y0_髪基; @@ -598,12 +598,12 @@ namespace SlaveMatrix } } - public 後髪0_編1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_編1ハネD e) + public BackHair0_編1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編1ハネD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編み1ハネ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][13])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][13])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs similarity index 91% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ハネD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs index 1000af2..e3668f7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs @@ -75,9 +75,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_編1ハネ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_編1ハネ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1パツ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs index c55a058..9de46ed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs @@ -598,12 +598,12 @@ namespace SlaveMatrix } } - public 後髪0_編1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_編1パツD e) + public 後髪0_編1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_編1パツD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編み1パツ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][14])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][14])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs similarity index 88% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1パツD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs index 0046519..37051f4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_編1パツD : お下げ1D + public class BackHair0_編1パツD : お下げ1D { public bool 髪基_表示 = true; @@ -60,12 +60,12 @@ namespace SlaveMatrix public bool スライム; - public 後髪0_編1パツD() + public BackHair0_編1パツD() { ThisType = GetType(); } - public 後髪0_編1パツD SetRandom() + public BackHair0_編1パツD SetRandom() { 髪長0 = RNG.XS.NextDouble(); 髪長1 = RNG.XS.NextDouble(); @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 後髪0_編1パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2カル.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs index f6d4351..84f6296 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs @@ -1081,12 +1081,12 @@ namespace SlaveMatrix } } - public 後髪0_編2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_編2カルD e) + public 後髪0_編2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編2カルD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編み2カル"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][19])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][19])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2カルD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs index bd260f9..9fcb36b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs @@ -117,7 +117,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 後髪0_編2カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ジグ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs index f01a67a..2bcd3b5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_編2ジグ : お下げ2 + public class BackHair0_編2ジグ : お下げ2 { public Par X0Y0_髪基; @@ -1081,12 +1081,12 @@ namespace SlaveMatrix } } - public 後髪0_編2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_編2ジグD e) + public BackHair0_編2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編2ジグD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編み2ジグ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][16])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][16])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs similarity index 94% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ジグD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs index 9bb4c05..4abde20 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs @@ -117,9 +117,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_編2ジグ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_編2ジグ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ハネ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs index b023d7a..64b5abd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_編2ハネ : お下げ2 + public class BackHair0_編2ハネ : お下げ2 { public Par X0Y0_髪基; @@ -1081,12 +1081,12 @@ namespace SlaveMatrix } } - public 後髪0_編2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_編2ハネD e) + public BackHair0_編2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編2ハネD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編み2ハネ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][17])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][17])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs similarity index 94% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ハネD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs index 8abd6ee..af4eb30 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs @@ -117,9 +117,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_編2ハネ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_編2ハネ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2パツ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs index b88b8ad..ede727f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_編2パツ : お下げ2 + public class BackHair0_編2パツ : お下げ2 { public Par X0Y0_髪基; @@ -1081,12 +1081,12 @@ namespace SlaveMatrix } } - public 後髪0_編2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_編2パツD e) + public BackHair0_編2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編2パツD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編み2パツ"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][18])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][18])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs similarity index 94% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2パツD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs index 5f118c5..ff207df 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_編2パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs @@ -117,9 +117,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_編2パツ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_編2パツ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs similarity index 89% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_肢系.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs index f1e8094..7c6e753 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪0_肢系 : 下ろし + public class BackHair0_肢系 : 下ろし { public Par X0Y0_髪基; @@ -138,13 +138,13 @@ namespace SlaveMatrix public JointS 右5_接続点 => new JointS(本体, X0Y0_髪基, 6); - public 後髪0_肢系(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪0_肢系D e) + public BackHair0_肢系(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_肢系D e) { - 後髪0_肢系 後髪0_肢系2 = this; + BackHair0_肢系 後髪0_肢系2 = this; ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "肢系"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][21])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][21])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); @@ -194,7 +194,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_左5_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_左5_接続; f.接続(後髪0_肢系2.左5_接続点); return f; }).ToArray(); @@ -205,7 +205,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_左4_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_左4_接続; f.接続(後髪0_肢系2.左4_接続点); return f; }).ToArray(); @@ -216,7 +216,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_左3_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_左3_接続; f.接続(後髪0_肢系2.左3_接続点); return f; }).ToArray(); @@ -227,7 +227,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_左2_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_左2_接続; f.接続(後髪0_肢系2.左2_接続点); return f; }).ToArray(); @@ -238,7 +238,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_左1_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_左1_接続; f.接続(後髪0_肢系2.左1_接続点); return f; }).ToArray(); @@ -249,7 +249,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_中央_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_中央_接続; f.接続(後髪0_肢系2.中央_接続点); return f; }).ToArray(); @@ -260,7 +260,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_右1_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_右1_接続; f.接続(後髪0_肢系2.右1_接続点); return f; }).ToArray(); @@ -271,7 +271,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_右2_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_右2_接続; f.接続(後髪0_肢系2.右2_接続点); return f; }).ToArray(); @@ -282,7 +282,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_右3_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_右3_接続; f.接続(後髪0_肢系2.右3_接続点); return f; }).ToArray(); @@ -293,7 +293,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_右4_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_右4_接続; f.接続(後髪0_肢系2.右4_接続点); return f; }).ToArray(); @@ -304,7 +304,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 後髪0_肢系2; - f.ConnectionType = ConnectionInfo.後髪0_肢系_右5_接続; + f.ConnectionType = ConnectionInfo.BackHair0_肢系_右5_接続; f.接続(後髪0_肢系2.右5_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_肢系D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs similarity index 83% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_肢系D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs index f6ea50d..11ce807 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0_肢系D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs @@ -6,7 +6,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪0_肢系D : 下ろしD + public class BackHair0_肢系D : 下ろしD { public bool 髪基_表示 = true; @@ -36,7 +36,7 @@ namespace SlaveMatrix public List 右5_接続 = new List(); - public 後髪0_肢系D() + public BackHair0_肢系D() { ThisType = GetType(); } @@ -45,7 +45,7 @@ namespace SlaveMatrix { 左5_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_左5_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_左5_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -56,7 +56,7 @@ namespace SlaveMatrix { 左4_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_左4_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_左4_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -67,7 +67,7 @@ namespace SlaveMatrix { 左3_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_左3_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_左3_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -78,7 +78,7 @@ namespace SlaveMatrix { 左2_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_左2_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_左2_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -89,7 +89,7 @@ namespace SlaveMatrix { 左1_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_左1_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_左1_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -100,7 +100,7 @@ namespace SlaveMatrix { 中央_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_中央_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_中央_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -111,7 +111,7 @@ namespace SlaveMatrix { 右1_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_右1_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_右1_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -122,7 +122,7 @@ namespace SlaveMatrix { 右2_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_右2_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_右2_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -133,7 +133,7 @@ namespace SlaveMatrix { 右3_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_右3_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_右3_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -144,7 +144,7 @@ namespace SlaveMatrix { 右4_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_右4_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_右4_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; @@ -155,23 +155,23 @@ namespace SlaveMatrix { 右5_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.後髪0_肢系_右5_接続; + e.接続情報 = ConnectionInfo.BackHair0_肢系_右5_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 0.6; } } - public 後髪0_肢系D SetRandom() + public BackHair0_肢系D SetRandom() { 髪長0 = RNG.XS.NextDouble(); 右 = RNG.XS.NextBool(); return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪0_肢系(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair0_肢系(DisUnit, 配色指定, 体配色, Med, this); } public override IEnumerable EnumEleD() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1.cs similarity index 85% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1.cs index 5818ff1..96a5887 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 横髪 : Ele + public class BackHair1 : Ele { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1D.cs similarity index 67% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1D.cs index 3c64612..02a0bfb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 横髪D : EleD + public class BackHair1D : EleD { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1カル.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs index d74be9e..fdd5b1d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_結1カル : アップ + public class BackHair1_結1カル : アップ { public Par X0Y0_髪基; @@ -281,12 +281,12 @@ namespace SlaveMatrix } } - public 後髪1_結1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_結1カルD e) + public BackHair1_結1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結1カルD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "結い1カル"; - dif.Add(new Pars(Sta.胴体["後髪1"][0][3])); + dif.Add(new Pars(Sta.胴体["BackHair1"][0][3])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs similarity index 72% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1カルD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs index c496dbb..e920342 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_結1カルD : アップD + public class BackHair1_結1カルD : アップD { public bool 髪基_表示 = true; @@ -30,12 +30,12 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_結1カルD() + public BackHair1_結1カルD() { ThisType = GetType(); } - public 後髪1_結1カルD SetRandom() + public BackHair1_結1カルD SetRandom() { 髪長 = RNG.XS.NextDouble(); 毛量 = RNG.XS.NextDouble(); @@ -44,9 +44,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_結1カル(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_結1カル(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ジグ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs index a5e3e72..8723374 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_結1ジグ : アップ + public class BackHair1_結1ジグ : アップ { public Par X0Y0_髪基; @@ -281,12 +281,12 @@ namespace SlaveMatrix } } - public 後髪1_結1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_結1ジグD e) + public BackHair1_結1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結1ジグD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "結い1ジグ"; - dif.Add(new Pars(Sta.胴体["後髪1"][0][0])); + dif.Add(new Pars(Sta.胴体["BackHair1"][0][0])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs similarity index 72% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ジグD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs index a97795c..d9f088d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_結1ジグD : アップD + public class BackHair1_結1ジグD : アップD { public bool 髪基_表示 = true; @@ -30,12 +30,12 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_結1ジグD() + public BackHair1_結1ジグD() { ThisType = GetType(); } - public 後髪1_結1ジグD SetRandom() + public BackHair1_結1ジグD SetRandom() { 髪長 = RNG.XS.NextDouble(); 毛量 = RNG.XS.NextDouble(); @@ -44,9 +44,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_結1ジグ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_結1ジグ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ハネ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs index 9da9849..28536e0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_結1ハネ : アップ + public class BackHair1_結1ハネ : アップ { public Par X0Y0_髪基; @@ -281,12 +281,12 @@ namespace SlaveMatrix } } - public 後髪1_結1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_結1ハネD e) + public BackHair1_結1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結1ハネD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "結い1ハネ"; - dif.Add(new Pars(Sta.胴体["後髪1"][0][1])); + dif.Add(new Pars(Sta.胴体["BackHair1"][0][1])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs similarity index 72% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ハネD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs index 7f915e1..acbeeef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_結1ハネD : アップD + public class BackHair1_結1ハネD : アップD { public bool 髪基_表示 = true; @@ -30,12 +30,12 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_結1ハネD() + public BackHair1_結1ハネD() { ThisType = GetType(); } - public 後髪1_結1ハネD SetRandom() + public BackHair1_結1ハネD SetRandom() { 髪長 = RNG.XS.NextDouble(); 毛量 = RNG.XS.NextDouble(); @@ -44,9 +44,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_結1ハネ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_結1ハネ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1パツ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs index 1ccc480..b92a8fa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_結1パツ : アップ + public class BackHair1_結1パツ : アップ { public Par X0Y0_髪基; @@ -281,12 +281,12 @@ namespace SlaveMatrix } } - public 後髪1_結1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_結1パツD e) + public BackHair1_結1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結1パツD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "結い1パツ"; - dif.Add(new Pars(Sta.胴体["後髪1"][0][2])); + dif.Add(new Pars(Sta.胴体["BackHair1"][0][2])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs similarity index 72% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1パツD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs index e295147..8816947 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_結1パツD : アップD + public class BackHair1_結1パツD : アップD { public bool 髪基_表示 = true; @@ -30,12 +30,12 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_結1パツD() + public BackHair1_結1パツD() { ThisType = GetType(); } - public 後髪1_結1パツD SetRandom() + public BackHair1_結1パツD SetRandom() { 髪長 = RNG.XS.NextDouble(); 毛量 = RNG.XS.NextDouble(); @@ -44,9 +44,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_結1パツ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_結1パツ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2カル.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs index 1c2539d..e9f9dc7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_結2カル : サイド + public class BackHair1_結2カル : サイド { public Par X0Y0_髪基; @@ -258,12 +258,12 @@ namespace SlaveMatrix } } - public 後髪1_結2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_結2カルD e) + public BackHair1_結2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結2カルD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "結い2カル"; - dif.Add(new Pars(Sta.胴体["後髪1"][0][7])); + dif.Add(new Pars(Sta.胴体["BackHair1"][0][7])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs similarity index 72% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2カルD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs index 025644f..f65dfb2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_結2カルD : サイドD + public class BackHair1_結2カルD : サイドD { public bool 髪基_表示 = true; @@ -28,12 +28,12 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_結2カルD() + public BackHair1_結2カルD() { ThisType = GetType(); } - public 後髪1_結2カルD SetRandom() + public BackHair1_結2カルD SetRandom() { 髪長 = RNG.XS.NextDouble(); 毛量 = RNG.XS.NextDouble(); @@ -42,9 +42,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_結2カル(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_結2カル(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ジグ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs index 8ed5acf..bb01d7a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_結2ジグ : サイド + public class BackHair1_結2ジグ : サイド { public Par X0Y0_髪基; @@ -258,12 +258,12 @@ namespace SlaveMatrix } } - public 後髪1_結2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_結2ジグD e) + public BackHair1_結2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結2ジグD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "結い2ジグ"; - dif.Add(new Pars(Sta.胴体["後髪1"][0][4])); + dif.Add(new Pars(Sta.胴体["BackHair1"][0][4])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs similarity index 72% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ジグD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs index 5988ea0..d6d191a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_結2ジグD : サイドD + public class BackHair1_結2ジグD : サイドD { public bool 髪基_表示 = true; @@ -28,12 +28,12 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_結2ジグD() + public BackHair1_結2ジグD() { ThisType = GetType(); } - public 後髪1_結2ジグD SetRandom() + public BackHair1_結2ジグD SetRandom() { 髪長 = RNG.XS.NextDouble(); 毛量 = RNG.XS.NextDouble(); @@ -42,9 +42,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_結2ジグ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_結2ジグ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ハネ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs index a24be23..15af3eb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_結2ハネ : サイド + public class BackHair1_結2ハネ : サイド { public Par X0Y0_髪基; @@ -258,12 +258,12 @@ namespace SlaveMatrix } } - public 後髪1_結2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_結2ハネD e) + public BackHair1_結2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結2ハネD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "結い2ハネ"; - dif.Add(new Pars(Sta.胴体["後髪1"][0][5])); + dif.Add(new Pars(Sta.胴体["BackHair1"][0][5])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs similarity index 72% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ハネD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs index 9fa84cc..4b71267 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_結2ハネD : サイドD + public class BackHair1_結2ハネD : サイドD { public bool 髪基_表示 = true; @@ -28,12 +28,12 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_結2ハネD() + public BackHair1_結2ハネD() { ThisType = GetType(); } - public 後髪1_結2ハネD SetRandom() + public BackHair1_結2ハネD SetRandom() { 髪長 = RNG.XS.NextDouble(); 毛量 = RNG.XS.NextDouble(); @@ -42,9 +42,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_結2ハネ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_結2ハネ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2パツ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs index 593464d..0ed320f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_結2パツ : サイド + public class BackHair1_結2パツ : サイド { public Par X0Y0_髪基; @@ -258,12 +258,12 @@ namespace SlaveMatrix } } - public 後髪1_結2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_結2パツD e) + public BackHair1_結2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結2パツD e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "結い2パツ"; - dif.Add(new Pars(Sta.胴体["後髪1"][0][6])); + dif.Add(new Pars(Sta.胴体["BackHair1"][0][6])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs similarity index 72% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2パツD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs index 79234d3..9dc4934 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_結2パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_結2パツD : サイドD + public class BackHair1_結2パツD : サイドD { public bool 髪基_表示 = true; @@ -28,12 +28,12 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_結2パツD() + public BackHair1_結2パツD() { ThisType = GetType(); } - public 後髪1_結2パツD SetRandom() + public BackHair1_結2パツD SetRandom() { 髪長 = RNG.XS.NextDouble(); 毛量 = RNG.XS.NextDouble(); @@ -42,9 +42,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_結2パツ(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_結2パツ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_編結.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_編結.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs index 33ba309..1da193b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_編結.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 後髪1_編結 : アップ + public class BackHair1_編結 : アップ { public Par X0Y0_髪基; @@ -408,12 +408,12 @@ namespace SlaveMatrix } } - public 後髪1_編結(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後髪1_編結D e) + public BackHair1_編結(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_編結D e) { ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "編結"; - dif.Add(new Pars(Sta.胴体["後髪0"][0][20])); + dif.Add(new Pars(Sta.胴体["BackHair0"][0][20])); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_編結D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs similarity index 79% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_編結D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs index 8da81e2..a3baf2c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1_編結D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 後髪1_編結D : アップD + public class BackHair1_編結D : アップD { public bool 髪基_表示 = true; @@ -40,21 +40,21 @@ namespace SlaveMatrix public double 高さ; - public 後髪1_編結D() + public BackHair1_編結D() { ThisType = GetType(); } - public 後髪1_編結D SetRandom() + public BackHair1_編結D SetRandom() { 毛量 = RNG.XS.NextDouble(); 高さ = RNG.XS.NextDouble(); return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 後髪1_編結(DisUnit, 配色指定, 体配色, Med, this); + return new BackHair1_編結(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs similarity index 97% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胸.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs index 2e8bf70..ca4e209 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胸 : Ele + public class Chest : Ele { public Par X0Y0_胸郭; @@ -357,7 +357,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 首_接続; + public Ele[] Neck_接続; public Ele[] 肩左_接続; @@ -1412,9 +1412,9 @@ namespace SlaveMatrix public JointS 背中_接続点 => new JointS(本体, X0Y0_胸郭, 10); - public 胸(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胸D e) + public Chest(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ChestD e) { - 胸 胸2 = this; + Chest Chest2 = this; ThisType = GetType(); 本体 = new Difs(Sta.胴体["胸郭"]); Pars pars = 本体[0][0]; @@ -1591,14 +1591,14 @@ namespace SlaveMatrix 表示 = false; } Ele f; - if (e.首_接続.Count > 0) + if (e.Neck_接続.Count > 0) { - 首_接続 = e.首_接続.Select(delegate(EleD g) + Neck_接続 = e.Neck_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_首_接続; - f.接続(胸2.首_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_Neck_接続; + f.接続(Chest2.首_接続点); return f; }).ToArray(); } @@ -1607,9 +1607,9 @@ namespace SlaveMatrix 肩左_接続 = e.肩左_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_肩左_接続; - f.接続(胸2.肩左_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_肩左_接続; + f.接続(Chest2.肩左_接続点); return f; }).ToArray(); } @@ -1618,9 +1618,9 @@ namespace SlaveMatrix 肩右_接続 = e.肩右_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_肩右_接続; - f.接続(胸2.肩右_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_肩右_接続; + f.接続(Chest2.肩右_接続点); return f; }).ToArray(); } @@ -1629,9 +1629,9 @@ namespace SlaveMatrix 胸左_接続 = e.胸左_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_胸左_接続; - f.接続(胸2.胸左_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_胸左_接続; + f.接続(Chest2.胸左_接続点); return f; }).ToArray(); } @@ -1640,9 +1640,9 @@ namespace SlaveMatrix 胸右_接続 = e.胸右_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_胸右_接続; - f.接続(胸2.胸右_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_胸右_接続; + f.接続(Chest2.胸右_接続点); return f; }).ToArray(); } @@ -1651,9 +1651,9 @@ namespace SlaveMatrix 肌_接続 = e.肌_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_肌_接続; - f.接続(胸2.肌_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_肌_接続; + f.接続(Chest2.肌_接続点); return f; }).ToArray(); } @@ -1662,9 +1662,9 @@ namespace SlaveMatrix 翼上左_接続 = e.翼上左_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_翼上左_接続; - f.接続(胸2.翼上左_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_翼上左_接続; + f.接続(Chest2.翼上左_接続点); return f; }).ToArray(); } @@ -1673,9 +1673,9 @@ namespace SlaveMatrix 翼上右_接続 = e.翼上右_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_翼上右_接続; - f.接続(胸2.翼上右_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_翼上右_接続; + f.接続(Chest2.翼上右_接続点); return f; }).ToArray(); } @@ -1684,9 +1684,9 @@ namespace SlaveMatrix 翼下左_接続 = e.翼下左_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_翼下左_接続; - f.接続(胸2.翼下左_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_翼下左_接続; + f.接続(Chest2.翼下左_接続点); return f; }).ToArray(); } @@ -1695,9 +1695,9 @@ namespace SlaveMatrix 翼下右_接続 = e.翼下右_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_翼下右_接続; - f.接続(胸2.翼下右_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_翼下右_接続; + f.接続(Chest2.翼下右_接続点); return f; }).ToArray(); } @@ -1706,9 +1706,9 @@ namespace SlaveMatrix 背中_接続 = e.背中_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 胸2; - f.ConnectionType = ConnectionInfo.胸_背中_接続; - f.接続(胸2.背中_接続点); + f.Par = Chest2; + f.ConnectionType = ConnectionInfo.Chest_背中_接続; + f.接続(Chest2.背中_接続点); return f; }).ToArray(); } @@ -1781,7 +1781,7 @@ namespace SlaveMatrix 尺度YB = 0.99; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_胸郭); Are.Draw(X0Y0_筋肉_筋肉左); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs similarity index 85% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胸D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs index d24f90d..186f865 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胸D : EleD + public class ChestD : EleD { public bool 胸郭_表示 = true; @@ -133,7 +133,7 @@ namespace SlaveMatrix public double ハイライト濃度 = 1.0; - public List 首_接続 = new List(); + public List Neck_接続 = new List(); public List 肩左_接続 = new List(); @@ -155,58 +155,58 @@ namespace SlaveMatrix public List 背中_接続 = new List(); - public 胸D() + public ChestD() { ThisType = GetType(); } public void 首接続(EleD e) { - 首_接続.Add(e); + Neck_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_首_接続; + e.接続情報 = ConnectionInfo.Chest_Neck_接続; } public void 肩左接続(EleD e) { 肩左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_肩左_接続; + e.接続情報 = ConnectionInfo.Chest_肩左_接続; } public void 肩右接続(EleD e) { 肩右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_肩右_接続; + e.接続情報 = ConnectionInfo.Chest_肩右_接続; } public void 胸左接続(EleD e) { 胸左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_胸左_接続; + e.接続情報 = ConnectionInfo.Chest_胸左_接続; } public void 胸右接続(EleD e) { 胸右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_胸右_接続; + e.接続情報 = ConnectionInfo.Chest_胸右_接続; } public void 肌接続(EleD e) { 肌_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_肌_接続; + e.接続情報 = ConnectionInfo.Chest_肌_接続; } public void 翼上左接続(EleD e) { 翼上左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_翼上左_接続; + e.接続情報 = ConnectionInfo.Chest_翼上左_接続; if (!(e is 尾D)) { return; @@ -221,7 +221,7 @@ namespace SlaveMatrix { 翼上右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_翼上右_接続; + e.接続情報 = ConnectionInfo.Chest_翼上右_接続; if (!(e is 尾D)) { return; @@ -236,7 +236,7 @@ namespace SlaveMatrix { 翼下左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_翼下左_接続; + e.接続情報 = ConnectionInfo.Chest_翼下左_接続; if (!(e is 尾D)) { return; @@ -251,7 +251,7 @@ namespace SlaveMatrix { 翼下右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_翼下右_接続; + e.接続情報 = ConnectionInfo.Chest_翼下右_接続; if (!(e is 尾D)) { return; @@ -266,16 +266,16 @@ namespace SlaveMatrix { 背中_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胸_背中_接続; + e.接続情報 = ConnectionInfo.Chest_背中_接続; foreach (EleD item in e.EnumEleD()) { item.尺度B = 1.0; } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 胸(DisUnit, 配色指定, 体配色, Med, this); + return new Chest(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs index 2185496..e25bca7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs @@ -7,46 +7,46 @@ namespace SlaveMatrix public enum ConnectionInfo { none, - 頭_基髪_接続, - 頭_目左_接続, - 頭_目右_接続, - 頭_鼻_接続, - 頭_口_接続, - 頭_頬左_接続, - 頭_頬右_接続, - 頭_額_接続, - 頭_眉左_接続, - 頭_眉右_接続, - 頭_耳左_接続, - 頭_耳右_接続, - 頭_鼻肌_接続, - 頭_単眼目_接続, - 頭_単眼眉_接続, - 頭_大顎基_接続, - 頭_顔面_接続, - 頭_頭頂_接続, - 頭_頬肌左_接続, - 頭_頬肌右_接続, - 頭_触覚左_接続, - 頭_触覚右_接続, + Head_基髪_接続, + Head_目左_接続, + Head_目右_接続, + Head_鼻_接続, + Head_口_接続, + Head_頬左_接続, + Head_頬右_接続, + Head_額_接続, + Head_眉左_接続, + Head_眉右_接続, + Head_耳左_接続, + Head_耳右_接続, + Head_鼻肌_接続, + Head_単眼目_接続, + Head_単眼眉_接続, + Head_大顎基_接続, + Head_顔面_接続, + Head_頭頂_接続, + Head_頬肌左_接続, + Head_頬肌右_接続, + Head_触覚左_接続, + Head_触覚右_接続, 基髪_頭頂左_接続, 基髪_頭頂右_接続, 基髪_横髪左_接続, 基髪_横髪右_接続, 基髪_前髪_接続, 基髪_後髪_接続, - 後髪0_肢系_左5_接続, - 後髪0_肢系_左4_接続, - 後髪0_肢系_左3_接続, - 後髪0_肢系_左2_接続, - 後髪0_肢系_左1_接続, - 後髪0_肢系_中央_接続, - 後髪0_肢系_右1_接続, - 後髪0_肢系_右2_接続, - 後髪0_肢系_右3_接続, - 後髪0_肢系_右4_接続, - 後髪0_肢系_右5_接続, - 横髪_肢系_肢_接続, + BackHair0_肢系_左5_接続, + BackHair0_肢系_左4_接続, + BackHair0_肢系_左3_接続, + BackHair0_肢系_左2_接続, + BackHair0_肢系_左1_接続, + BackHair0_肢系_中央_接続, + BackHair0_肢系_右1_接続, + BackHair0_肢系_右2_接続, + BackHair0_肢系_右3_接続, + BackHair0_肢系_右4_接続, + BackHair0_肢系_右5_接続, + SideHair_肢系_肢_接続, 双目_瞼_接続, 瞼_宇_涙_接続, 単目_瞼_接続, @@ -57,35 +57,35 @@ namespace SlaveMatrix 鼻_獣_鼻水左_接続, 鼻_獣_鼻水右_接続, 吹出し_吹出し_接続, - 首_頭_接続, - 胸_首_接続, - 胸_肩左_接続, - 胸_肩右_接続, - 胸_胸左_接続, - 胸_胸右_接続, - 胸_肌_接続, - 胸_翼上左_接続, - 胸_翼上右_接続, - 胸_翼下左_接続, - 胸_翼下右_接続, - 胸_背中_接続, + Neck_Head_接続, + Chest_Neck_接続, + Chest_肩左_接続, + Chest_肩右_接続, + Chest_胸左_接続, + Chest_胸右_接続, + Chest_肌_接続, + Chest_翼上左_接続, + Chest_翼上右_接続, + Chest_翼下左_接続, + Chest_翼下右_接続, + Chest_背中_接続, 乳房_噴乳_接続, - 肩_上腕_接続, - 胴_胸_接続, - 胴_肌_接続, - 胴_翼左_接続, - 胴_翼右_接続, - 腰_胴_接続, - 腰_腿左_接続, - 腰_腿右_接続, - 腰_膣基_接続, - 腰_肛門_接続, - 腰_半身_接続, - 腰_尾_接続, - 腰_上着_接続, - 腰_肌_接続, - 腰_翼左_接続, - 腰_翼右_接続, + Shoulder_上腕_接続, + Torso_Chest_接続, + Torso_肌_接続, + Torso_翼左_接続, + Torso_翼右_接続, + Waist_Torso_接続, + Waist_腿左_接続, + Waist_腿右_接続, + Waist_膣基_接続, + Waist_肛門_接続, + Waist_半身_接続, + Waist_尾_接続, + Waist_上着_接続, + Waist_翼左_接続, + Waist_翼右_接続, + Waist_肌_接続, ボテ腹_人_腹板_接続, ボテ腹_獣_腹板_接続, 肛門_人_肛門精液_接続, @@ -260,7 +260,7 @@ namespace SlaveMatrix 前翅_甲_軸1_接続, 前翅_甲_軸2_接続, 前翅_甲_軸3_接続, - 触手_犬_頭_接続, + 触手_犬_Head_接続, 触手_犬_上腕左_接続, 触手_犬_上腕右_接続, 触手_犬_下腕左_接続, @@ -305,18 +305,18 @@ namespace SlaveMatrix 下腕_蝙_腕輪_接続, 下腕_獣_手_接続, 下腕_蹄_手_接続, - 腿_人_脚_接続, - 腿_獣_脚_接続, - 腿_蹄_脚_接続, - 腿_鳥_脚_接続, - 腿_竜_脚_接続, - 脚_人_足_接続, - 脚_人_脚輪下_接続, - 脚_人_脚輪上_接続, - 脚_獣_足_接続, - 脚_蹄_足_接続, - 脚_鳥_足_接続, - 脚_竜_足_接続, + 腿_人_Leg_接続, + 腿_獣_Leg_接続, + 腿_蹄_Leg_接続, + 腿_鳥_Leg_接続, + 腿_竜_Leg_接続, + Leg_人_足_接続, + Leg_人_脚輪下_接続, + Leg_人_脚輪上_接続, + Leg_獣_足_接続, + Leg_蹄_足_接続, + Leg_鳥_足_接続, + Leg_竜_足_接続, 長物_魚_左0_接続, 長物_魚_右0_接続, 長物_魚_左1_接続, @@ -349,15 +349,15 @@ namespace SlaveMatrix 長物_鯨_尾_接続, 長物_蛇_左_接続, 長物_蛇_右_接続, - 長物_蛇_胴_接続, + 長物_蛇_Torso_接続, 長物_蟲_左0_接続, 長物_蟲_右0_接続, 長物_蟲_左1_接続, 長物_蟲_右1_接続, - 長物_蟲_胴_接続, + 長物_蟲_Torso_接続, 四足胸_脇左_接続, 四足胸_脇右_接続, - 四足胸_胴_接続, + 四足胸_Torso_接続, 四足胸_胸左_接続, 四足胸_胸右_接続, 四足胸_肌_接続, @@ -414,12 +414,12 @@ namespace SlaveMatrix 単足_植_根中央_接続, 単足_植_根内右_接続, 単足_植_根外右_接続, - 胴_蛇_左_接続, - 胴_蛇_右_接続, - 胴_蛇_胴_接続, - 胴_蟲_左_接続, - 胴_蟲_右_接続, - 胴_蟲_胴_接続, + Torso_蛇_左_接続, + Torso_蛇_右_接続, + Torso_蛇_Torso_接続, + Torso_蟲_左_接続, + Torso_蟲_右_接続, + Torso_蟲_Torso_接続, 大顎基_顎左_接続, 大顎基_顎右_接続, 植_花_接続, diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/咳.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs index e909b53..84fa2a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 咳 : Ele + public class Cough : Ele { public Par X0Y0_咳基; @@ -346,10 +346,10 @@ namespace SlaveMatrix } } - public 咳(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 咳D e) + public Cough(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 咳D e) { ThisType = GetType(); - 本体 = new Difs(Sta.胴体["咳"]); + 本体 = new Difs(Sta.胴体["Cough"]); Pars pars = 本体[0][0]; X0Y0_咳基 = pars["咳基"].ToPar(); X0Y0_雫1 = pars["雫1"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs similarity index 96% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/頭.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs index 844fd7e..db9224b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 頭 : Ele + public class Head : Ele { public Par X0Y0_頭; @@ -1033,11 +1033,11 @@ namespace SlaveMatrix public JointS 触覚右_接続点 => new JointS(本体, X0Y0_頭, 18); - public 頭(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 頭D e) + public Head(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, HeadD e) { - 頭 頭2 = this; + Head 頭2 = this; ThisType = GetType(); - 本体 = new Difs(Sta.胴体["頭"]); + 本体 = new Difs(Sta.胴体["Head"]); Pars pars = 本体[0][0]; X0Y0_頭 = pars["頭"].ToPar(); Pars pars2 = pars["悪タトゥ"].ToPars(); @@ -1177,7 +1177,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_基髪_接続; + f.ConnectionType = ConnectionInfo.Head_基髪_接続; f.接続(頭2.基髪_接続点); return f; }).ToArray(); @@ -1188,7 +1188,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_目左_接続; + f.ConnectionType = ConnectionInfo.Head_目左_接続; f.接続(頭2.目左_接続点); return f; }).ToArray(); @@ -1199,7 +1199,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_目右_接続; + f.ConnectionType = ConnectionInfo.Head_目右_接続; f.接続(頭2.目右_接続点); return f; }).ToArray(); @@ -1210,7 +1210,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_鼻_接続; + f.ConnectionType = ConnectionInfo.Head_鼻_接続; f.接続(頭2.鼻_接続点); return f; }).ToArray(); @@ -1221,7 +1221,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_口_接続; + f.ConnectionType = ConnectionInfo.Head_口_接続; f.接続(頭2.口_接続点); return f; }).ToArray(); @@ -1232,7 +1232,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_頬左_接続; + f.ConnectionType = ConnectionInfo.Head_頬左_接続; f.接続(頭2.頬左_接続点); return f; }).ToArray(); @@ -1243,7 +1243,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_頬右_接続; + f.ConnectionType = ConnectionInfo.Head_頬右_接続; f.接続(頭2.頬右_接続点); return f; }).ToArray(); @@ -1254,7 +1254,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_額_接続; + f.ConnectionType = ConnectionInfo.Head_額_接続; f.接続(頭2.額_接続点); return f; }).ToArray(); @@ -1265,7 +1265,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_眉左_接続; + f.ConnectionType = ConnectionInfo.Head_眉左_接続; f.接続(頭2.眉左_接続点); return f; }).ToArray(); @@ -1276,7 +1276,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_眉右_接続; + f.ConnectionType = ConnectionInfo.Head_眉右_接続; f.接続(頭2.眉右_接続点); return f; }).ToArray(); @@ -1287,7 +1287,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_耳左_接続; + f.ConnectionType = ConnectionInfo.Head_耳左_接続; f.接続(頭2.耳左_接続点); return f; }).ToArray(); @@ -1298,7 +1298,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_耳右_接続; + f.ConnectionType = ConnectionInfo.Head_耳右_接続; f.接続(頭2.耳右_接続点); return f; }).ToArray(); @@ -1309,7 +1309,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_鼻肌_接続; + f.ConnectionType = ConnectionInfo.Head_鼻肌_接続; f.接続(頭2.鼻肌_接続点); return f; }).ToArray(); @@ -1320,7 +1320,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_単眼目_接続; + f.ConnectionType = ConnectionInfo.Head_単眼目_接続; f.接続(頭2.単眼目_接続点); return f; }).ToArray(); @@ -1331,7 +1331,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_単眼眉_接続; + f.ConnectionType = ConnectionInfo.Head_単眼眉_接続; f.接続(頭2.単眼眉_接続点); return f; }).ToArray(); @@ -1342,7 +1342,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_大顎基_接続; + f.ConnectionType = ConnectionInfo.Head_大顎基_接続; f.接続(頭2.大顎基_接続点); return f; }).ToArray(); @@ -1353,7 +1353,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_顔面_接続; + f.ConnectionType = ConnectionInfo.Head_顔面_接続; f.接続(頭2.顔面_接続点); return f; }).ToArray(); @@ -1364,7 +1364,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_頭頂_接続; + f.ConnectionType = ConnectionInfo.Head_頭頂_接続; f.接続(頭2.頭頂_接続点); return f; }).ToArray(); @@ -1375,7 +1375,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_頬肌左_接続; + f.ConnectionType = ConnectionInfo.Head_頬肌左_接続; f.接続(頭2.頬肌左_接続点); return f; }).ToArray(); @@ -1386,7 +1386,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_頬肌右_接続; + f.ConnectionType = ConnectionInfo.Head_頬肌右_接続; f.接続(頭2.頬肌右_接続点); return f; }).ToArray(); @@ -1397,7 +1397,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_触覚左_接続; + f.ConnectionType = ConnectionInfo.Head_触覚左_接続; f.接続(頭2.触覚左_接続点); return f; }).ToArray(); @@ -1408,7 +1408,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 頭2; - f.ConnectionType = ConnectionInfo.頭_触覚右_接続; + f.ConnectionType = ConnectionInfo.Head_触覚右_接続; f.接続(頭2.触覚右_接続点); return f; }).ToArray(); @@ -1460,12 +1460,12 @@ namespace SlaveMatrix X0Y0_頭.JP[9].Joint = X0Y0_頭.JP[9].Joint.AddX(0.00012); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_頭); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_悪タトゥ_逆十字_逆十字1); Are.Draw(X0Y0_悪タトゥ_逆十字_逆十字2); @@ -1507,7 +1507,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_羽虫_眼右_ハイライト); } - public override void 描画2(Are Are) + public override void 描画2(RenderArea Are) { Are.Draw(X0Y0_虫性_顎下); } @@ -1515,7 +1515,7 @@ namespace SlaveMatrix private void 開顎(double Rate) { double y = 0.0003 * Rate; - Par par = Sta.胴体["頭"][0][0]["頭"].ToPar(); + Par par = Sta.胴体["Head"][0][0]["頭"].ToPar(); Par x0Y0_頭 = X0Y0_頭; x0Y0_頭.OP[0].ps[3] = par.OP[0].ps[3].AddY(y); x0Y0_頭.OP[0].ps[4] = par.OP[0].ps[4].AddY(y); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs similarity index 78% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/頭D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs index 0a3698d..b7137e9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 頭D : EleD + public class HeadD : EleD { public bool 頭_表示 = true; @@ -137,7 +137,7 @@ namespace SlaveMatrix public List 触覚右_接続 = new List(); - public 頭D() + public HeadD() { ThisType = GetType(); } @@ -146,165 +146,165 @@ namespace SlaveMatrix { 基髪_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_基髪_接続; + e.接続情報 = ConnectionInfo.Head_基髪_接続; } public void 目左接続(EleD e) { 目左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_目左_接続; + e.接続情報 = ConnectionInfo.Head_目左_接続; } public void 目右接続(EleD e) { 目右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_目右_接続; + e.接続情報 = ConnectionInfo.Head_目右_接続; } public void 鼻接続(EleD e) { 鼻_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_鼻_接続; + e.接続情報 = ConnectionInfo.Head_鼻_接続; } public void 口接続(EleD e) { 口_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_口_接続; + e.接続情報 = ConnectionInfo.Head_口_接続; } public void 頬左接続(EleD e) { 頬左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_頬左_接続; + e.接続情報 = ConnectionInfo.Head_頬左_接続; } public void 頬右接続(EleD e) { 頬右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_頬右_接続; + e.接続情報 = ConnectionInfo.Head_頬右_接続; } public void 額接続(EleD e) { 額_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_額_接続; + e.接続情報 = ConnectionInfo.Head_額_接続; } public void 眉左接続(EleD e) { 眉左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_眉左_接続; + e.接続情報 = ConnectionInfo.Head_眉左_接続; } public void 眉右接続(EleD e) { 眉右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_眉右_接続; + e.接続情報 = ConnectionInfo.Head_眉右_接続; } public void 耳左接続(EleD e) { 耳左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_耳左_接続; + e.接続情報 = ConnectionInfo.Head_耳左_接続; } public void 耳右接続(EleD e) { 耳右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_耳右_接続; + e.接続情報 = ConnectionInfo.Head_耳右_接続; } public void 鼻肌接続(EleD e) { 鼻肌_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_鼻肌_接続; + e.接続情報 = ConnectionInfo.Head_鼻肌_接続; } public void 単眼目接続(EleD e) { 単眼目_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_単眼目_接続; + e.接続情報 = ConnectionInfo.Head_単眼目_接続; } public void 単眼眉接続(EleD e) { 単眼眉_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_単眼眉_接続; + e.接続情報 = ConnectionInfo.Head_単眼眉_接続; } public void 大顎基接続(EleD e) { 大顎基_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_大顎基_接続; + e.接続情報 = ConnectionInfo.Head_大顎基_接続; } public void 顔面接続(EleD e) { 顔面_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_顔面_接続; + e.接続情報 = ConnectionInfo.Head_顔面_接続; } public void 頭頂接続(EleD e) { 頭頂_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_頭頂_接続; + e.接続情報 = ConnectionInfo.Head_頭頂_接続; } public void 頬肌左接続(EleD e) { 頬肌左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_頬肌左_接続; + e.接続情報 = ConnectionInfo.Head_頬肌左_接続; } public void 頬肌右接続(EleD e) { 頬肌右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_頬肌右_接続; + e.接続情報 = ConnectionInfo.Head_頬肌右_接続; } public void 触覚左接続(EleD e) { 触覚左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_触覚左_接続; + e.接続情報 = ConnectionInfo.Head_触覚左_接続; } public void 触覚右接続(EleD e) { 触覚右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.頭_触覚右_接続; + e.接続情報 = ConnectionInfo.Head_触覚右_接続; } - public 頭D SetRandom() + public HeadD SetRandom() { 目高 = RNG.XS.NextDouble(); return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 頭(DisUnit, 配色指定, 体配色, Med, this); + return new Head(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs index b9a6381..ede0115 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/InfoPanel.cs @@ -7,9 +7,9 @@ namespace SlaveMatrix { public class InfoPanel { - public Are Are; + public RenderArea Are; - private Med Med; + private ModeEventDispatcher Med; public Par MaiB; @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public InfoPanel(Med Med, Are Are) + public InfoPanel(ModeEventDispatcher Med, RenderArea Are) { this.Med = Med; this.Are = Are; @@ -225,7 +225,7 @@ namespace SlaveMatrix yp.SizeBase = Mai.ParT.SizeBase; yp.Font = new Font("MS Gothic", 1f); yp.FontSize = Mai.ParT.FontSize; - yp.SetStringRectOutline(Are.Unit, Are.GD); + yp.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); yp.RectSize = new Vector2D(yp.OP[0].ps[1].X, yp.OP[0].ps[2].Y); yp.OP.ScalingY(yp.BasePointBase, 0.9); yp.OP.OutlineFalse(); @@ -245,7 +245,7 @@ namespace SlaveMatrix np.SizeBase = Mai.ParT.SizeBase; np.Font = new Font("MS Gothic", 1f); np.FontSize = Mai.ParT.FontSize; - np.SetStringRectOutline(Are.Unit, Are.GD); + np.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); np.RectSize = new Vector2D(np.OP[0].ps[1].X, np.OP[0].ps[2].Y); np.OP.ScalingY(np.BasePointBase, 0.9); np.OP.OutlineFalse(); @@ -262,7 +262,7 @@ namespace SlaveMatrix }); } - public void SetHitColor(Med Med) + public void SetHitColor(ModeEventDispatcher Med) { Mai.SetHitColor(Med); Sub.SetHitColor(Med); @@ -280,7 +280,7 @@ namespace SlaveMatrix private void SetButPos() { - yp.PositionBase = new Vector2D(yp.PositionBase.X, Mai.ParT.ToGlobal(Mai.ParT.GetStringRect(Are.Unit, Are.GD).v2).Y + 0.0025); + yp.PositionBase = new Vector2D(yp.PositionBase.X, Mai.ParT.ToGlobal(Mai.ParT.GetStringRect(Are.UnitScale, Are.DisplayGraphics).v2).Y + 0.0025); np.PositionBase = new Vector2D(np.PositionBase.X, yp.ToGlobal(yp.OP.Last().ps.Last()).Y + 0.0025); } @@ -310,7 +310,7 @@ namespace SlaveMatrix nb.Up(ref HitColor); } - public void Draw(Are Are, FPS FPS) + public void Draw(RenderArea Are, FPS FPS) { if (MaiShow) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg.cs similarity index 71% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg.cs index c96bf97..b776c48 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 脚 : Ele + public class Leg : Ele { public Ele[] 足_接続; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LegD.cs similarity index 88% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/LegD.cs index 56ebe2f..0db726e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LegD.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; namespace SlaveMatrix { [Serializable] - public class 脚D : EleD + public class LegD : EleD { public List 足_接続 = new List(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs index 7d75bf4..96219a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs @@ -3,9 +3,9 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 脚_人 : 脚 + public class Leg_人 : Leg { - public Par X0Y0_脚; + public Par X0Y0_Leg; public Par X0Y0_筋; @@ -401,7 +401,7 @@ namespace SlaveMatrix public Par X0Y0_脚輪下_金具右; - public Par X0Y1_脚; + public Par X0Y1_Leg; public Par X0Y1_筋; @@ -797,7 +797,7 @@ namespace SlaveMatrix public Par X0Y1_脚輪下_金具右; - public ColorD 脚CD; + public ColorD LegCD; public ColorD 筋CD; @@ -1193,7 +1193,7 @@ namespace SlaveMatrix public ColorD 脚輪下_金具右CD; - public ColorP X0Y0_脚CP; + public ColorP X0Y0_LegCP; public ColorP X0Y0_筋CP; @@ -1589,7 +1589,7 @@ namespace SlaveMatrix public ColorP X0Y0_脚輪下_金具右CP; - public ColorP X0Y1_脚CP; + public ColorP X0Y1_LegCP; public ColorP X0Y1_筋CP; @@ -2036,18 +2036,18 @@ namespace SlaveMatrix } } - public bool 脚_表示 + public bool Leg_表示 { get { - return X0Y0_脚.Dra; + return X0Y0_Leg.Dra; } set { - X0Y0_脚.Dra = value; - X0Y1_脚.Dra = value; - X0Y0_脚.Hit = value; - X0Y1_脚.Hit = value; + X0Y0_Leg.Dra = value; + X0Y1_Leg.Dra = value; + X0Y0_Leg.Hit = value; + X0Y1_Leg.Hit = value; } } @@ -5179,11 +5179,11 @@ namespace SlaveMatrix { get { - return 脚_表示; + return Leg_表示; } set { - 脚_表示 = value; + Leg_表示 = value; 筋_表示 = value; 淫タトゥ_足首_タトゥ_表示 = value; 淫タトゥ_足首_ハート1_タトゥ左_表示 = value; @@ -5390,11 +5390,11 @@ namespace SlaveMatrix { get { - return 脚CD.不透明度; + return LegCD.不透明度; } set { - 脚CD.不透明度 = value; + LegCD.不透明度 = value; 筋CD.不透明度 = value; 淫タトゥ_足首_タトゥCD.不透明度 = value; 淫タトゥ_足首_ハート1_タトゥ左CD.不透明度 = value; @@ -5738,11 +5738,11 @@ namespace SlaveMatrix } } - public JointS 足_接続点 => new JointS(本体, X0Y0_脚, 0); + public JointS 足_接続点 => new JointS(本体, X0Y0_Leg, 0); - public JointS 脚輪下_接続点 => new JointS(本体, X0Y0_脚, 2); + public JointS 脚輪下_接続点 => new JointS(本体, X0Y0_Leg, 2); - public JointS 脚輪上_接続点 => new JointS(本体, X0Y0_脚, 3); + public JointS 脚輪上_接続点 => new JointS(本体, X0Y0_Leg, 3); public JointS 鎖1_接続点 => new JointS(本体, X0Y0_脚輪上_金具左, 0); @@ -5752,13 +5752,14 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_脚輪下_金具右, 0); - public 脚_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 脚_人D e) + public Leg_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_人D e) { - 脚_人 脚_人2 = this; + Leg_人 Leg_人2 = this; ThisType = GetType(); - 本体 = new Difs(Sta.脚左["脚"]); + //Leg but if renamed to Leg it broke game + 本体 = new Difs(Sta.脚左["Leg"]); Pars pars = 本体[0][0]; - X0Y0_脚 = pars["脚"].ToPar(); + X0Y0_Leg = pars["脚"].ToPar(); X0Y0_筋 = pars["筋"].ToPar(); Pars pars2 = pars["淫タトゥ"].ToPars(); Pars pars3 = pars2["足首"].ToPars(); @@ -6056,7 +6057,7 @@ namespace SlaveMatrix X0Y0_脚輪下_金具左 = pars2["金具左"].ToPar(); X0Y0_脚輪下_金具右 = pars2["金具右"].ToPar(); pars = 本体[0][1]; - X0Y1_脚 = pars["脚"].ToPar(); + X0Y1_Leg = pars["脚"].ToPar(); X0Y1_筋 = pars["筋"].ToPar(); pars2 = pars["淫タトゥ"].ToPars(); pars3 = pars2["足首"].ToPars(); @@ -6377,7 +6378,7 @@ namespace SlaveMatrix サイズ = e.サイズ; サイズX = e.サイズX; サイズY = e.サイズY; - 脚_表示 = e.脚_表示; + Leg_表示 = e.Leg_表示; 筋_表示 = e.筋_表示; 淫タトゥ_足首_タトゥ_表示 = e.淫タトゥ_足首_タトゥ_表示; 淫タトゥ_足首_ハート1_タトゥ左_表示 = e.淫タトゥ_足首_ハート1_タトゥ左_表示; @@ -6599,9 +6600,9 @@ namespace SlaveMatrix 足_接続 = e.足_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 脚_人2; - f.ConnectionType = ConnectionInfo.脚_人_足_接続; - f.接続(脚_人2.足_接続点); + f.Par = Leg_人2; + f.ConnectionType = ConnectionInfo.Leg_人_足_接続; + f.接続(Leg_人2.足_接続点); return f; }).ToArray(); } @@ -6610,9 +6611,9 @@ namespace SlaveMatrix 脚輪下_接続 = e.脚輪下_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 脚_人2; - f.ConnectionType = ConnectionInfo.脚_人_脚輪下_接続; - f.接続(脚_人2.脚輪下_接続点); + f.Par = Leg_人2; + f.ConnectionType = ConnectionInfo.Leg_人_脚輪下_接続; + f.接続(Leg_人2.脚輪下_接続点); return f; }).ToArray(); } @@ -6621,15 +6622,15 @@ namespace SlaveMatrix 脚輪上_接続 = e.脚輪上_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 脚_人2; - f.ConnectionType = ConnectionInfo.脚_人_脚輪上_接続; - f.接続(脚_人2.脚輪上_接続点); + f.Par = Leg_人2; + f.ConnectionType = ConnectionInfo.Leg_人_脚輪上_接続; + f.接続(Leg_人2.脚輪上_接続点); return f; }).ToArray(); } base.配色指定 = 配色指定; 配色(体配色); - X0Y0_脚CP = new ColorP(X0Y0_脚, 脚CD, DisUnit, abj: true); + X0Y0_LegCP = new ColorP(X0Y0_Leg, LegCD, DisUnit, abj: true); X0Y0_筋CP = new ColorP(X0Y0_筋, 筋CD, DisUnit, abj: false); X0Y0_淫タトゥ_足首_タトゥCP = new ColorP(X0Y0_淫タトゥ_足首_タトゥ, 淫タトゥ_足首_タトゥCD, DisUnit, abj: true); X0Y0_淫タトゥ_足首_ハート1_タトゥ左CP = new ColorP(X0Y0_淫タトゥ_足首_ハート1_タトゥ左, 淫タトゥ_足首_ハート1_タトゥ左CD, DisUnit, abj: true); @@ -6827,7 +6828,7 @@ namespace SlaveMatrix X0Y0_脚輪下_金具3CP = new ColorP(X0Y0_脚輪下_金具3, 脚輪下_金具3CD, DisUnit, abj: true); X0Y0_脚輪下_金具左CP = new ColorP(X0Y0_脚輪下_金具左, 脚輪下_金具左CD, DisUnit, abj: true); X0Y0_脚輪下_金具右CP = new ColorP(X0Y0_脚輪下_金具右, 脚輪下_金具右CD, DisUnit, abj: true); - X0Y1_脚CP = new ColorP(X0Y1_脚, 脚CD, DisUnit, abj: true); + X0Y1_LegCP = new ColorP(X0Y1_Leg, LegCD, DisUnit, abj: true); X0Y1_筋CP = new ColorP(X0Y1_筋, 筋CD, DisUnit, abj: false); X0Y1_淫タトゥ_足首_タトゥCP = new ColorP(X0Y1_淫タトゥ_足首_タトゥ, 淫タトゥ_足首_タトゥCD, DisUnit, abj: true); X0Y1_淫タトゥ_足首_ハート1_タトゥ左CP = new ColorP(X0Y1_淫タトゥ_足首_ハート1_タトゥ左, 淫タトゥ_足首_ハート1_タトゥ左CD, DisUnit, abj: true); @@ -7052,11 +7053,11 @@ namespace SlaveMatrix 鎖3.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (本体.IndexY == 0) { - Are.Draw(X0Y0_脚); + Are.Draw(X0Y0_Leg); Are.Draw(X0Y0_筋); Are.Draw(X0Y0_獣性_獣毛1); Are.Draw(X0Y0_獣性_獣毛2); @@ -7154,7 +7155,7 @@ namespace SlaveMatrix } else { - Are.Draw(X0Y1_脚); + Are.Draw(X0Y1_Leg); Are.Draw(X0Y1_筋); Are.Draw(X0Y1_獣性_獣毛1); Are.Draw(X0Y1_獣性_獣毛2); @@ -7252,7 +7253,7 @@ namespace SlaveMatrix } } - public void 外描画(Are Are) + public void 外描画(RenderArea Are) { if (本体.IndexY == 0) { @@ -7478,8 +7479,8 @@ namespace SlaveMatrix public void 虫性() { - X0Y0_脚.OP[(!右) ? 6 : 0].Outline = true; - X0Y1_脚.OP[(!右) ? 6 : 0].Outline = true; + X0Y0_Leg.OP[(!右) ? 6 : 0].Outline = true; + X0Y1_Leg.OP[(!右) ? 6 : 0].Outline = true; } public void 開脚(腿_人 腿) @@ -7525,7 +7526,7 @@ namespace SlaveMatrix { if (本体.IndexY == 0) { - X0Y0_脚CP.Update(); + X0Y0_LegCP.Update(); X0Y0_筋CP.Update(); X0Y0_淫タトゥ_足首_タトゥCP.Update(); X0Y0_淫タトゥ_足首_ハート1_タトゥ左CP.Update(); @@ -7726,7 +7727,7 @@ namespace SlaveMatrix } else { - X0Y1_脚CP.Update(); + X0Y1_LegCP.Update(); X0Y1_筋CP.Update(); X0Y1_淫タトゥ_足首_タトゥCP.Update(); X0Y1_淫タトゥ_足首_ハート1_タトゥ左CP.Update(); @@ -7979,7 +7980,7 @@ namespace SlaveMatrix private void 配色N0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.人肌O); + LegCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -8181,7 +8182,7 @@ namespace SlaveMatrix private void 配色T1(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.人肌O); + LegCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -8383,7 +8384,7 @@ namespace SlaveMatrix private void 配色T0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.人肌O); + LegCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -8585,7 +8586,7 @@ namespace SlaveMatrix private void 配色B0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -8787,7 +8788,7 @@ namespace SlaveMatrix private void 配色BT1(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -8989,7 +8990,7 @@ namespace SlaveMatrix private void 配色BT0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -9191,7 +9192,7 @@ namespace SlaveMatrix private void 配色C0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.甲0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -9393,7 +9394,7 @@ namespace SlaveMatrix private void 配色CT1(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.甲0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -9595,7 +9596,7 @@ namespace SlaveMatrix private void 配色CT0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.甲0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -9797,7 +9798,7 @@ namespace SlaveMatrix private void 配色L0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.植1O); + LegCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -9999,7 +10000,7 @@ namespace SlaveMatrix private void 配色LT1(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.植1O); + LegCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -10201,7 +10202,7 @@ namespace SlaveMatrix private void 配色LT0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.植1O); + LegCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); 淫タトゥ_足首_タトゥCD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_足首_ハート1_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs similarity index 96% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs index 17b31fe..70b3d55 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs @@ -5,9 +5,9 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 脚_人D : 脚D + public class Leg_人D : LegD { - public bool 脚_表示 = true; + public bool Leg_表示 = true; public bool 筋_表示; @@ -443,7 +443,7 @@ namespace SlaveMatrix public List 脚輪上_接続 = new List(); - public 脚_人D() + public Leg_人D() { ThisType = GetType(); } @@ -452,26 +452,26 @@ namespace SlaveMatrix { 足_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.脚_人_足_接続; + e.接続情報 = ConnectionInfo.Leg_人_足_接続; } public void 脚輪下接続(EleD e) { 脚輪下_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.脚_人_脚輪下_接続; + e.接続情報 = ConnectionInfo.Leg_人_脚輪下_接続; } public void 脚輪上接続(EleD e) { 脚輪上_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.脚_人_脚輪上_接続; + e.接続情報 = ConnectionInfo.Leg_人_脚輪上_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 脚_人(DisUnit, 配色指定, 体配色, Med, this); + return new Leg_人(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs similarity index 90% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs index 8b3e9a0..d9c77f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs @@ -3,9 +3,9 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 脚_獣 : 獣脚 + public class Leg_獣 : 獣脚 { - public Par X0Y0_脚; + public Par X0Y0_Leg; public Par X0Y0_筋; @@ -21,7 +21,7 @@ namespace SlaveMatrix public Par X0Y0_脚輪_金具右; - public ColorD 脚CD; + public ColorD LegCD; public ColorD 筋CD; @@ -37,7 +37,7 @@ namespace SlaveMatrix public ColorD 脚輪_金具右CD; - public ColorP X0Y0_脚CP; + public ColorP X0Y0_LegCP; public ColorP X0Y0_筋CP; @@ -93,16 +93,16 @@ namespace SlaveMatrix } } - public bool 脚_表示 + public bool Leg_表示 { get { - return X0Y0_脚.Dra; + return X0Y0_Leg.Dra; } set { - X0Y0_脚.Dra = value; - X0Y0_脚.Hit = value; + X0Y0_Leg.Dra = value; + X0Y0_Leg.Hit = value; } } @@ -230,11 +230,11 @@ namespace SlaveMatrix { get { - return 脚_表示; + return Leg_表示; } set { - 脚_表示 = value; + Leg_表示 = value; 筋_表示 = value; 脚輪_革_表示 = value; 脚輪_金具1_表示 = value; @@ -250,11 +250,11 @@ namespace SlaveMatrix { get { - return 脚CD.不透明度; + return LegCD.不透明度; } set { - 脚CD.不透明度 = value; + LegCD.不透明度 = value; 筋CD.不透明度 = value; 脚輪_革CD.不透明度 = value; 脚輪_金具1CD.不透明度 = value; @@ -265,22 +265,22 @@ namespace SlaveMatrix } } - public JointS 足_接続点 => new JointS(本体, X0Y0_脚, 0); + public JointS 足_接続点 => new JointS(本体, X0Y0_Leg, 0); public JointS 鎖1_接続点 => new JointS(本体, X0Y0_脚輪_金具左, 0); public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 脚_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 脚_獣D e) + public Leg_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_獣D e) { - 脚_獣 脚_獣2 = this; + Leg_獣 Leg_獣2 = this; ThisType = GetType(); Dif dif = new Dif(Sta.脚左["四足脚"][0]); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars = 本体[0][0]; - X0Y0_脚 = pars["脚"].ToPar(); + X0Y0_Leg = pars["脚"].ToPar(); X0Y0_筋 = pars["筋"].ToPar(); Pars pars2 = pars["脚輪"].ToPars(); X0Y0_脚輪_革 = pars2["革"].ToPar(); @@ -313,7 +313,7 @@ namespace SlaveMatrix サイズ = e.サイズ; サイズX = e.サイズX; サイズY = e.サイズY; - 脚_表示 = e.脚_表示; + Leg_表示 = e.Leg_表示; 筋_表示 = e.筋_表示; 脚輪_革_表示 = e.脚輪_革_表示; 脚輪_金具1_表示 = e.脚輪_金具1_表示; @@ -335,15 +335,15 @@ namespace SlaveMatrix 足_接続 = e.足_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 脚_獣2; - f.ConnectionType = ConnectionInfo.脚_獣_足_接続; - f.接続(脚_獣2.足_接続点); + f.Par = Leg_獣2; + f.ConnectionType = ConnectionInfo.Leg_獣_足_接続; + f.接続(Leg_獣2.足_接続点); return f; }).ToArray(); } base.配色指定 = 配色指定; 配色(体配色); - X0Y0_脚CP = new ColorP(X0Y0_脚, 脚CD, DisUnit, abj: true); + X0Y0_LegCP = new ColorP(X0Y0_Leg, LegCD, DisUnit, abj: true); X0Y0_筋CP = new ColorP(X0Y0_筋, 筋CD, DisUnit, abj: false); X0Y0_脚輪_革CP = new ColorP(X0Y0_脚輪_革, 脚輪_革CD, DisUnit, abj: true); X0Y0_脚輪_金具1CP = new ColorP(X0Y0_脚輪_金具1, 脚輪_金具1CD, DisUnit, abj: true); @@ -359,7 +359,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); @@ -374,7 +374,7 @@ namespace SlaveMatrix public override void SetAngle0() { double num = (右 ? (-1.0) : 1.0); - X0Y0_脚.AngleBase = num * -136.0; + X0Y0_Leg.AngleBase = num * -136.0; 本体.JoinPAall(); } @@ -389,7 +389,7 @@ namespace SlaveMatrix public override void 色更新() { - X0Y0_脚CP.Update(); + X0Y0_LegCP.Update(); X0Y0_筋CP.Update(); X0Y0_脚輪_革CP.Update(); X0Y0_脚輪_金具1CP.Update(); @@ -408,7 +408,7 @@ namespace SlaveMatrix private void 配色N0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); 脚輪_革CD = new ColorD(); 脚輪_金具1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs similarity index 65% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs index 8e75e09..0d452ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs @@ -4,9 +4,9 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 脚_鳥D : 獣脚D + public class Leg_獣D : 獣脚D { - public bool 脚_表示 = true; + public bool Leg_表示 = true; public bool 筋_表示; @@ -26,7 +26,7 @@ namespace SlaveMatrix public bool 鎖表示; - public 脚_鳥D() + public Leg_獣D() { ThisType = GetType(); } @@ -35,12 +35,12 @@ namespace SlaveMatrix { 足_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.脚_鳥_足_接続; + e.接続情報 = ConnectionInfo.Leg_獣_足_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 脚_鳥(DisUnit, 配色指定, 体配色, Med, this); + return new Leg_獣(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs similarity index 96% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs index 6be8888..e974335 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs @@ -3,9 +3,9 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 脚_竜 : 獣脚 + public class Leg_竜 : 獣脚 { - public Par X0Y0_脚; + public Par X0Y0_Leg; public Par X0Y0_竜性_鱗脹_鱗1; @@ -57,7 +57,7 @@ namespace SlaveMatrix public Par X0Y0_脚輪_金具右; - public ColorD 脚CD; + public ColorD LegCD; public ColorD 竜性_鱗脹_鱗1CD; @@ -109,7 +109,7 @@ namespace SlaveMatrix public ColorD 脚輪_金具右CD; - public ColorP X0Y0_脚CP; + public ColorP X0Y0_LegCP; public ColorP X0Y0_竜性_鱗脹_鱗1CP; @@ -201,16 +201,16 @@ namespace SlaveMatrix } } - public bool 脚_表示 + public bool Leg_表示 { get { - return X0Y0_脚.Dra; + return X0Y0_Leg.Dra; } set { - X0Y0_脚.Dra = value; - X0Y0_脚.Hit = value; + X0Y0_Leg.Dra = value; + X0Y0_Leg.Hit = value; } } @@ -572,11 +572,11 @@ namespace SlaveMatrix { get { - return 脚_表示; + return Leg_表示; } set { - 脚_表示 = value; + Leg_表示 = value; 竜性_鱗脹_鱗1_表示 = value; 竜性_鱗脹_鱗2_表示 = value; 竜性_鱗脹_鱗3_表示 = value; @@ -610,11 +610,11 @@ namespace SlaveMatrix { get { - return 脚CD.不透明度; + return LegCD.不透明度; } set { - 脚CD.不透明度 = value; + LegCD.不透明度 = value; 竜性_鱗脹_鱗1CD.不透明度 = value; 竜性_鱗脹_鱗2CD.不透明度 = value; 竜性_鱗脹_鱗3CD.不透明度 = value; @@ -643,22 +643,22 @@ namespace SlaveMatrix } } - public JointS 足_接続点 => new JointS(本体, X0Y0_脚, 0); + public JointS 足_接続点 => new JointS(本体, X0Y0_Leg, 0); public JointS 鎖1_接続点 => new JointS(本体, X0Y0_脚輪_金具左, 0); public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 脚_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 脚_竜D e) + public Leg_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_竜D e) { - 脚_竜 脚_竜2 = this; + Leg_竜 Leg_竜2 = this; ThisType = GetType(); Dif dif = new Dif(Sta.脚左["四足脚"][3]); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars = 本体[0][0]; - X0Y0_脚 = pars["脚"].ToPar(); + X0Y0_Leg = pars["脚"].ToPar(); Pars pars2 = pars["鱗脹"].ToPars(); X0Y0_竜性_鱗脹_鱗1 = pars2["鱗1"].ToPar(); X0Y0_竜性_鱗脹_鱗2 = pars2["鱗2"].ToPar(); @@ -711,7 +711,7 @@ namespace SlaveMatrix サイズ = e.サイズ; サイズX = e.サイズX; サイズY = e.サイズY; - 脚_表示 = e.脚_表示; + Leg_表示 = e.Leg_表示; 竜性_鱗脹_鱗1_表示 = e.竜性_鱗脹_鱗1_表示; 竜性_鱗脹_鱗2_表示 = e.竜性_鱗脹_鱗2_表示; 竜性_鱗脹_鱗3_表示 = e.竜性_鱗脹_鱗3_表示; @@ -751,15 +751,15 @@ namespace SlaveMatrix 足_接続 = e.足_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 脚_竜2; - f.ConnectionType = ConnectionInfo.脚_竜_足_接続; - f.接続(脚_竜2.足_接続点); + f.Par = Leg_竜2; + f.ConnectionType = ConnectionInfo.Leg_竜_足_接続; + f.接続(Leg_竜2.足_接続点); return f; }).ToArray(); } base.配色指定 = 配色指定; 配色(体配色); - X0Y0_脚CP = new ColorP(X0Y0_脚, 脚CD, DisUnit, abj: true); + X0Y0_LegCP = new ColorP(X0Y0_Leg, LegCD, DisUnit, abj: true); X0Y0_竜性_鱗脹_鱗1CP = new ColorP(X0Y0_竜性_鱗脹_鱗1, 竜性_鱗脹_鱗1CD, DisUnit, abj: true); X0Y0_竜性_鱗脹_鱗2CP = new ColorP(X0Y0_竜性_鱗脹_鱗2, 竜性_鱗脹_鱗2CD, DisUnit, abj: true); X0Y0_竜性_鱗脹_鱗3CP = new ColorP(X0Y0_竜性_鱗脹_鱗3, 竜性_鱗脹_鱗3CD, DisUnit, abj: true); @@ -793,7 +793,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); @@ -808,7 +808,7 @@ namespace SlaveMatrix public override void SetAngle0() { double num = (右 ? (-1.0) : 1.0); - X0Y0_脚.AngleBase = num * -136.0; + X0Y0_Leg.AngleBase = num * -136.0; 本体.JoinPAall(); } @@ -823,7 +823,7 @@ namespace SlaveMatrix public override void 色更新() { - X0Y0_脚CP.Update(); + X0Y0_LegCP.Update(); X0Y0_竜性_鱗脹_鱗1CP.Update(); X0Y0_竜性_鱗脹_鱗2CP.Update(); X0Y0_竜性_鱗脹_鱗3CP.Update(); @@ -874,7 +874,7 @@ namespace SlaveMatrix private void 配色N0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗脹_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 竜性_鱗脹_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 竜性_鱗脹_鱗3CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -904,7 +904,7 @@ namespace SlaveMatrix private void 配色T0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗脹_鱗1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 竜性_鱗脹_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 竜性_鱗脹_鱗3CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -934,7 +934,7 @@ namespace SlaveMatrix private void 配色T1(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗脹_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 竜性_鱗脹_鱗2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 竜性_鱗脹_鱗3CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs similarity index 81% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs index bc081dd..b702229 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs @@ -4,9 +4,9 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 脚_竜D : 獣脚D + public class Leg_竜D : 獣脚D { - public bool 脚_表示 = true; + public bool Leg_表示 = true; public bool 竜性_鱗脹_鱗1_表示; @@ -62,7 +62,7 @@ namespace SlaveMatrix public bool 鎖表示; - public 脚_竜D() + public Leg_竜D() { ThisType = GetType(); } @@ -71,12 +71,12 @@ namespace SlaveMatrix { 足_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.脚_竜_足_接続; + e.接続情報 = ConnectionInfo.Leg_竜_足_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 脚_竜(DisUnit, 配色指定, 体配色, Med, this); + return new Leg_竜(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs similarity index 90% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs index 4b4729e..60097d0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs @@ -3,9 +3,9 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 脚_蹄 : 獣脚 + public class Leg_蹄 : 獣脚 { - public Par X0Y0_脚; + public Par X0Y0_Leg; public Par X0Y0_筋; @@ -21,7 +21,7 @@ namespace SlaveMatrix public Par X0Y0_脚輪_金具右; - public ColorD 脚CD; + public ColorD LegCD; public ColorD 筋CD; @@ -37,7 +37,7 @@ namespace SlaveMatrix public ColorD 脚輪_金具右CD; - public ColorP X0Y0_脚CP; + public ColorP X0Y0_LegCP; public ColorP X0Y0_筋CP; @@ -93,16 +93,16 @@ namespace SlaveMatrix } } - public bool 脚_表示 + public bool Leg_表示 { get { - return X0Y0_脚.Dra; + return X0Y0_Leg.Dra; } set { - X0Y0_脚.Dra = value; - X0Y0_脚.Hit = value; + X0Y0_Leg.Dra = value; + X0Y0_Leg.Hit = value; } } @@ -230,11 +230,11 @@ namespace SlaveMatrix { get { - return 脚_表示; + return Leg_表示; } set { - 脚_表示 = value; + Leg_表示 = value; 筋_表示 = value; 脚輪_革_表示 = value; 脚輪_金具1_表示 = value; @@ -250,11 +250,11 @@ namespace SlaveMatrix { get { - return 脚CD.不透明度; + return LegCD.不透明度; } set { - 脚CD.不透明度 = value; + LegCD.不透明度 = value; 筋CD.不透明度 = value; 脚輪_革CD.不透明度 = value; 脚輪_金具1CD.不透明度 = value; @@ -265,22 +265,22 @@ namespace SlaveMatrix } } - public JointS 足_接続点 => new JointS(本体, X0Y0_脚, 0); + public JointS 足_接続点 => new JointS(本体, X0Y0_Leg, 0); public JointS 鎖1_接続点 => new JointS(本体, X0Y0_脚輪_金具左, 0); public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 脚_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 脚_蹄D e) + public Leg_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_蹄D e) { - 脚_蹄 脚_蹄2 = this; + Leg_蹄 Leg_蹄2 = this; ThisType = GetType(); Dif dif = new Dif(Sta.脚左["四足脚"][1]); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars = 本体[0][0]; - X0Y0_脚 = pars["脚"].ToPar(); + X0Y0_Leg = pars["脚"].ToPar(); X0Y0_筋 = pars["筋"].ToPar(); Pars pars2 = pars["脚輪"].ToPars(); X0Y0_脚輪_革 = pars2["革"].ToPar(); @@ -313,7 +313,7 @@ namespace SlaveMatrix サイズ = e.サイズ; サイズX = e.サイズX; サイズY = e.サイズY; - 脚_表示 = e.脚_表示; + Leg_表示 = e.Leg_表示; 筋_表示 = e.筋_表示; 脚輪_革_表示 = e.脚輪_革_表示; 脚輪_金具1_表示 = e.脚輪_金具1_表示; @@ -335,15 +335,15 @@ namespace SlaveMatrix 足_接続 = e.足_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 脚_蹄2; - f.ConnectionType = ConnectionInfo.脚_蹄_足_接続; - f.接続(脚_蹄2.足_接続点); + f.Par = Leg_蹄2; + f.ConnectionType = ConnectionInfo.Leg_蹄_足_接続; + f.接続(Leg_蹄2.足_接続点); return f; }).ToArray(); } base.配色指定 = 配色指定; 配色(体配色); - X0Y0_脚CP = new ColorP(X0Y0_脚, 脚CD, DisUnit, abj: true); + X0Y0_LegCP = new ColorP(X0Y0_Leg, LegCD, DisUnit, abj: true); X0Y0_筋CP = new ColorP(X0Y0_筋, 筋CD, DisUnit, abj: false); X0Y0_脚輪_革CP = new ColorP(X0Y0_脚輪_革, 脚輪_革CD, DisUnit, abj: true); X0Y0_脚輪_金具1CP = new ColorP(X0Y0_脚輪_金具1, 脚輪_金具1CD, DisUnit, abj: true); @@ -359,7 +359,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); @@ -374,7 +374,7 @@ namespace SlaveMatrix public override void SetAngle0() { double num = (右 ? (-1.0) : 1.0); - X0Y0_脚.AngleBase = num * -136.0; + X0Y0_Leg.AngleBase = num * -136.0; 本体.JoinPAall(); } @@ -389,7 +389,7 @@ namespace SlaveMatrix public override void 色更新() { - X0Y0_脚CP.Update(); + X0Y0_LegCP.Update(); X0Y0_筋CP.Update(); X0Y0_脚輪_革CP.Update(); X0Y0_脚輪_金具1CP.Update(); @@ -408,7 +408,7 @@ namespace SlaveMatrix private void 配色N0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); 脚輪_革CD = new ColorD(); 脚輪_金具1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs similarity index 65% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs index 5faf147..2322d3b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs @@ -4,9 +4,9 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 脚_蹄D : 獣脚D + public class Leg_蹄D : 獣脚D { - public bool 脚_表示 = true; + public bool Leg_表示 = true; public bool 筋_表示; @@ -26,7 +26,7 @@ namespace SlaveMatrix public bool 鎖表示; - public 脚_蹄D() + public Leg_蹄D() { ThisType = GetType(); } @@ -35,12 +35,12 @@ namespace SlaveMatrix { 足_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.脚_蹄_足_接続; + e.接続情報 = ConnectionInfo.Leg_蹄_足_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 脚_蹄(DisUnit, 配色指定, 体配色, Med, this); + return new Leg_蹄(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs similarity index 90% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs index c27b595..039599f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs @@ -3,9 +3,9 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 脚_鳥 : 獣脚 + public class Leg_鳥 : 獣脚 { - public Par X0Y0_脚; + public Par X0Y0_Leg; public Par X0Y0_筋; @@ -21,7 +21,7 @@ namespace SlaveMatrix public Par X0Y0_脚輪_金具右; - public ColorD 脚CD; + public ColorD LegCD; public ColorD 筋CD; @@ -37,7 +37,7 @@ namespace SlaveMatrix public ColorD 脚輪_金具右CD; - public ColorP X0Y0_脚CP; + public ColorP X0Y0_LegCP; public ColorP X0Y0_筋CP; @@ -93,16 +93,16 @@ namespace SlaveMatrix } } - public bool 脚_表示 + public bool Leg_表示 { get { - return X0Y0_脚.Dra; + return X0Y0_Leg.Dra; } set { - X0Y0_脚.Dra = value; - X0Y0_脚.Hit = value; + X0Y0_Leg.Dra = value; + X0Y0_Leg.Hit = value; } } @@ -230,11 +230,11 @@ namespace SlaveMatrix { get { - return 脚_表示; + return Leg_表示; } set { - 脚_表示 = value; + Leg_表示 = value; 筋_表示 = value; 脚輪_革_表示 = value; 脚輪_金具1_表示 = value; @@ -250,11 +250,11 @@ namespace SlaveMatrix { get { - return 脚CD.不透明度; + return LegCD.不透明度; } set { - 脚CD.不透明度 = value; + LegCD.不透明度 = value; 筋CD.不透明度 = value; 脚輪_革CD.不透明度 = value; 脚輪_金具1CD.不透明度 = value; @@ -265,22 +265,22 @@ namespace SlaveMatrix } } - public JointS 足_接続点 => new JointS(本体, X0Y0_脚, 0); + public JointS 足_接続点 => new JointS(本体, X0Y0_Leg, 0); public JointS 鎖1_接続点 => new JointS(本体, X0Y0_脚輪_金具左, 0); public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 脚_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 脚_鳥D e) + public Leg_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_鳥D e) { - 脚_鳥 脚_鳥2 = this; + Leg_鳥 Leg_鳥2 = this; ThisType = GetType(); Dif dif = new Dif(Sta.脚左["四足脚"][2]); 本体 = new Difs(); 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars = 本体[0][0]; - X0Y0_脚 = pars["脚"].ToPar(); + X0Y0_Leg = pars["脚"].ToPar(); X0Y0_筋 = pars["筋"].ToPar(); Pars pars2 = pars["脚輪"].ToPars(); X0Y0_脚輪_革 = pars2["革"].ToPar(); @@ -313,7 +313,7 @@ namespace SlaveMatrix サイズ = e.サイズ; サイズX = e.サイズX; サイズY = e.サイズY; - 脚_表示 = e.脚_表示; + Leg_表示 = e.Leg_表示; 筋_表示 = e.筋_表示; 脚輪_革_表示 = e.脚輪_革_表示; 脚輪_金具1_表示 = e.脚輪_金具1_表示; @@ -335,15 +335,15 @@ namespace SlaveMatrix 足_接続 = e.足_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 脚_鳥2; - f.ConnectionType = ConnectionInfo.脚_鳥_足_接続; - f.接続(脚_鳥2.足_接続点); + f.Par = Leg_鳥2; + f.ConnectionType = ConnectionInfo.Leg_鳥_足_接続; + f.接続(Leg_鳥2.足_接続点); return f; }).ToArray(); } base.配色指定 = 配色指定; 配色(体配色); - X0Y0_脚CP = new ColorP(X0Y0_脚, 脚CD, DisUnit, abj: true); + X0Y0_LegCP = new ColorP(X0Y0_Leg, LegCD, DisUnit, abj: true); X0Y0_筋CP = new ColorP(X0Y0_筋, 筋CD, DisUnit, abj: false); X0Y0_脚輪_革CP = new ColorP(X0Y0_脚輪_革, 脚輪_革CD, DisUnit, abj: true); X0Y0_脚輪_金具1CP = new ColorP(X0Y0_脚輪_金具1, 脚輪_金具1CD, DisUnit, abj: true); @@ -359,7 +359,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); @@ -374,7 +374,7 @@ namespace SlaveMatrix public override void SetAngle0() { double num = (右 ? (-1.0) : 1.0); - X0Y0_脚.AngleBase = num * -136.0; + X0Y0_Leg.AngleBase = num * -136.0; 本体.JoinPAall(); } @@ -389,7 +389,7 @@ namespace SlaveMatrix public override void 色更新() { - X0Y0_脚CP.Update(); + X0Y0_LegCP.Update(); X0Y0_筋CP.Update(); X0Y0_脚輪_革CP.Update(); X0Y0_脚輪_金具1CP.Update(); @@ -408,7 +408,7 @@ namespace SlaveMatrix private void 配色N0(体配色 体配色) { - 脚CD = new ColorD(ref Col.Black, ref 体配色.毛0O); + LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); 脚輪_革CD = new ColorD(); 脚輪_金具1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs similarity index 65% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs index b84eb81..9eb540e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs @@ -4,9 +4,9 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 脚_獣D : 獣脚D + public class Leg_鳥D : 獣脚D { - public bool 脚_表示 = true; + public bool Leg_表示 = true; public bool 筋_表示; @@ -26,7 +26,7 @@ namespace SlaveMatrix public bool 鎖表示; - public 脚_獣D() + public Leg_鳥D() { ThisType = GetType(); } @@ -35,12 +35,12 @@ namespace SlaveMatrix { 足_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.脚_獣_足_接続; + e.接続情報 = ConnectionInfo.Leg_鳥_足_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 脚_獣(DisUnit, 配色指定, 体配色, Med, this); + return new Leg_鳥(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/首.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/首.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs index 930b2e3..8cc2373 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/首.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 首 : Ele + public class Neck : Ele { public Par X0Y0_植性_蔦; @@ -307,7 +307,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 頭_接続; + public Ele[] Head_接続; public override bool 欠損 { @@ -1169,11 +1169,11 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_首輪_金具右, 0); - public 首(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 首D e) + public Neck(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, NeckD e) { - 首 首2 = this; + Neck 首2 = this; ThisType = GetType(); - 本体 = new Difs(Sta.胴体["首"]); + 本体 = new Difs(Sta.胴体["Neck"]); Pars pars = 本体[0][0]; Pars pars2 = pars["植性"].ToPars(); X0Y0_植性_蔦 = pars2["蔦"].ToPar(); @@ -1323,14 +1323,14 @@ namespace SlaveMatrix { 表示 = false; } - if (e.頭_接続.Count > 0) + if (e.Head_接続.Count > 0) { Ele f; - 頭_接続 = e.頭_接続.Select(delegate(EleD g) + Head_接続 = e.Head_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 首2; - f.ConnectionType = ConnectionInfo.首_頭_接続; + f.ConnectionType = ConnectionInfo.Neck_Head_接続; f.接続(首2.頭_接続点); return f; }).ToArray(); @@ -1397,7 +1397,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_植性_蔦); Are.Draw(X0Y0_植性_棘左上); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/首D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs similarity index 89% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/首D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs index f5cedd3..088cebe 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/首D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 首D : EleD + public class NeckD : EleD { public bool 植性_蔦_表示; @@ -113,23 +113,23 @@ namespace SlaveMatrix public bool 鎖表示; - public List 頭_接続 = new List(); + public List Head_接続 = new List(); - public 首D() + public NeckD() { ThisType = GetType(); } public void 頭接続(EleD e) { - 頭_接続.Add(e); + Head_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.首_頭_接続; + e.接続情報 = ConnectionInfo.Neck_Head_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 首(DisUnit, 配色指定, 体配色, Med, this); + return new Neck(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs new file mode 100644 index 0000000..e5152b6 --- /dev/null +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs @@ -0,0 +1,478 @@ +using System.Linq; +using _2DGAMELIB; + +namespace SlaveMatrix +{ + public class Shoulder : Ele + { + public Par X0Y0_脇_脇; + + public Par X0Y0_脇_筋肉; + + public Par X0Y0_Shoulder_Shoulder; + + public Par X0Y0_Shoulder_虫性_甲殻1; + + public Par X0Y0_Shoulder_虫性_甲殻2; + + public Par X0Y0_Shoulder_傷I1; + + public Par X0Y0_Shoulder_傷I2; + + public Par X0Y0_Shoulder_傷I3; + + public Par X0Y0_Shoulder_傷I4; + + public Par X0Y0_Shoulder_シャツ; + + public Par X0Y0_Shoulder_ナース; + + public ColorD 脇_脇CD; + + public ColorD 脇_筋肉CD; + + public ColorD Shoulder_ShoulderCD; + + public ColorD Shoulder_虫性_甲殻1CD; + + public ColorD Shoulder_虫性_甲殻2CD; + + public ColorD Shoulder_傷I1CD; + + public ColorD Shoulder_傷I2CD; + + public ColorD Shoulder_傷I3CD; + + public ColorD Shoulder_傷I4CD; + + public ColorD Shoulder_シャツCD; + + public ColorD Shoulder_ナースCD; + + public ColorP X0Y0_脇_脇CP; + + public ColorP X0Y0_脇_筋肉CP; + + public ColorP X0Y0_Shoulder_ShoulderCP; + + public ColorP X0Y0_Shoulder_虫性_甲殻1CP; + + public ColorP X0Y0_Shoulder_虫性_甲殻2CP; + + public ColorP X0Y0_Shoulder_傷I1CP; + + public ColorP X0Y0_Shoulder_傷I2CP; + + public ColorP X0Y0_Shoulder_傷I3CP; + + public ColorP X0Y0_Shoulder_傷I4CP; + + public ColorP X0Y0_Shoulder_シャツCP; + + public ColorP X0Y0_Shoulder_ナースCP; + + public スタンプK キスマーク; + + public スタンプW 鞭痕; + + public Ele[] 上腕_接続; + + public override bool 欠損 + { + get + { + return 欠損_; + } + set + { + 欠損_ = value; + } + } + + public override bool 筋肉 + { + get + { + return 筋肉_; + } + set + { + 筋肉_ = value; + 脇_筋肉_表示 = 筋肉_; + X0Y0_脇_脇.OP.ExpansionXY(X0Y0_脇_脇.OP.GetCenter(), 0.0005); + X0Y0_脇_脇.JP.ExpansionXY(X0Y0_脇_脇.JP.GetCenter(), 0.0005); + X0Y0_Shoulder_Shoulder.OP.ExpansionXY(X0Y0_Shoulder_Shoulder.OP.GetCenter(), 0.0005); + X0Y0_Shoulder_Shoulder.JP.ExpansionXY(X0Y0_Shoulder_Shoulder.JP.GetCenter(), 0.0005); + } + } + + public override bool 拘束 + { + get + { + return 拘束_; + } + set + { + 拘束_ = value; + } + } + + public bool 脇_脇_表示 + { + get + { + return X0Y0_脇_脇.Dra; + } + set + { + X0Y0_脇_脇.Dra = value; + X0Y0_脇_脇.Hit = value; + } + } + + public bool 脇_筋肉_表示 + { + get + { + return X0Y0_脇_筋肉.Dra; + } + set + { + X0Y0_脇_筋肉.Dra = value; + X0Y0_脇_筋肉.Hit = value; + } + } + + public bool Shoulder_表示 + { + get + { + return X0Y0_Shoulder_Shoulder.Dra; + } + set + { + X0Y0_Shoulder_Shoulder.Dra = value; + X0Y0_Shoulder_Shoulder.Hit = value; + } + } + + public bool Shoulder_虫性_甲殻1_表示 + { + get + { + return X0Y0_Shoulder_虫性_甲殻1.Dra; + } + set + { + X0Y0_Shoulder_虫性_甲殻1.Dra = value; + X0Y0_Shoulder_虫性_甲殻1.Hit = value; + } + } + + public bool Shoulder_虫性_甲殻2_表示 + { + get + { + return X0Y0_Shoulder_虫性_甲殻2.Dra; + } + set + { + X0Y0_Shoulder_虫性_甲殻2.Dra = value; + X0Y0_Shoulder_虫性_甲殻2.Hit = value; + } + } + + public bool Shoulder_傷I1_表示 + { + get + { + return X0Y0_Shoulder_傷I1.Dra; + } + set + { + X0Y0_Shoulder_傷I1.Dra = value; + X0Y0_Shoulder_傷I1.Hit = value; + } + } + + public bool Shoulder_傷I2_表示 + { + get + { + return X0Y0_Shoulder_傷I2.Dra; + } + set + { + X0Y0_Shoulder_傷I2.Dra = value; + X0Y0_Shoulder_傷I2.Hit = value; + } + } + + public bool Shoulder_傷I3_表示 + { + get + { + return X0Y0_Shoulder_傷I3.Dra; + } + set + { + X0Y0_Shoulder_傷I3.Dra = value; + X0Y0_Shoulder_傷I3.Hit = value; + } + } + + public bool Shoulder_傷I4_表示 + { + get + { + return X0Y0_Shoulder_傷I4.Dra; + } + set + { + X0Y0_Shoulder_傷I4.Dra = value; + X0Y0_Shoulder_傷I4.Hit = value; + } + } + + public bool Shoulder_シャツ_表示 + { + get + { + return X0Y0_Shoulder_シャツ.Dra; + } + set + { + X0Y0_Shoulder_シャツ.Dra = value; + X0Y0_Shoulder_シャツ.Hit = value; + } + } + + public bool Shoulder_ナース_表示 + { + get + { + return X0Y0_Shoulder_ナース.Dra; + } + set + { + X0Y0_Shoulder_ナース.Dra = value; + X0Y0_Shoulder_ナース.Hit = value; + } + } + + public override bool 表示 + { + get + { + return 脇_脇_表示; + } + set + { + 脇_脇_表示 = value; + 脇_筋肉_表示 = value; + Shoulder_表示 = value; + Shoulder_虫性_甲殻1_表示 = value; + Shoulder_虫性_甲殻2_表示 = value; + Shoulder_傷I1_表示 = value; + Shoulder_傷I2_表示 = value; + Shoulder_傷I3_表示 = value; + Shoulder_傷I4_表示 = value; + Shoulder_シャツ_表示 = value; + Shoulder_ナース_表示 = value; + } + } + + public override double 濃度 + { + get + { + return 脇_脇CD.不透明度; + } + set + { + 脇_脇CD.不透明度 = value; + 脇_筋肉CD.不透明度 = value; + Shoulder_ShoulderCD.不透明度 = value; + Shoulder_虫性_甲殻1CD.不透明度 = value; + Shoulder_虫性_甲殻2CD.不透明度 = value; + Shoulder_傷I1CD.不透明度 = value; + Shoulder_傷I2CD.不透明度 = value; + Shoulder_傷I3CD.不透明度 = value; + Shoulder_傷I4CD.不透明度 = value; + Shoulder_シャツCD.不透明度 = value; + Shoulder_ナースCD.不透明度 = value; + } + } + + public JointS 上腕_接続点 => new JointS(本体, X0Y0_Shoulder_Shoulder, 1); + + public Shoulder(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ShoulderD e) + { + Shoulder Shoulder2 = this; + ThisType = GetType(); + 本体 = new Difs(Sta.肩左["Shoulder"]); + Pars pars = 本体[0][0]; + Pars pars2 = pars["脇"].ToPars(); + X0Y0_脇_脇 = pars2["脇"].ToPar(); + X0Y0_脇_筋肉 = pars2["筋肉"].ToPar(); + pars2 = pars["肩"].ToPars(); + X0Y0_Shoulder_Shoulder = pars2["肩"].ToPar(); + Pars pars3 = pars2["虫性"].ToPars(); + X0Y0_Shoulder_虫性_甲殻1 = pars3["甲殻1"].ToPar(); + X0Y0_Shoulder_虫性_甲殻2 = pars3["甲殻2"].ToPar(); + X0Y0_Shoulder_傷I1 = pars2["傷I1"].ToPar(); + X0Y0_Shoulder_傷I2 = pars2["傷I2"].ToPar(); + X0Y0_Shoulder_傷I3 = pars2["傷I3"].ToPar(); + X0Y0_Shoulder_傷I4 = pars2["傷I4"].ToPar(); + X0Y0_Shoulder_シャツ = pars2["シャツ"].ToPar(); + X0Y0_Shoulder_ナース = pars2["ナース"].ToPar(); + 本体.SetJoints(); + 接続根 = new JointD(本体); + 右 = e.右; + 反転X = e.反転X; + 反転Y = e.反転Y; + 基準C = e.基準C; + 位置C = e.位置C; + 角度B = e.角度B; + 角度C = e.角度C; + 尺度B = e.尺度B; + 尺度C = e.尺度C; + 尺度XB = e.尺度XB; + 尺度XC = e.尺度XC; + 尺度YB = e.尺度YB; + 尺度YC = e.尺度YC; + 肥大 = e.肥大; + 身長 = e.身長; + Xv = e.Xv; + Yv = e.Yv; + Xi = e.Xi; + Yi = e.Yi; + サイズ = e.サイズ; + サイズX = e.サイズX; + サイズY = e.サイズY; + 脇_脇_表示 = e.脇_脇_表示; + 脇_筋肉_表示 = e.脇_筋肉_表示; + Shoulder_表示 = e.Shoulder_表示; + Shoulder_虫性_甲殻1_表示 = e.Shoulder_虫性_甲殻1_表示; + Shoulder_虫性_甲殻2_表示 = e.Shoulder_虫性_甲殻2_表示; + Shoulder_傷I1_表示 = e.Shoulder_傷I1_表示; + Shoulder_傷I2_表示 = e.Shoulder_傷I2_表示; + Shoulder_傷I3_表示 = e.Shoulder_傷I3_表示; + Shoulder_傷I4_表示 = e.Shoulder_傷I4_表示; + Shoulder_シャツ_表示 = e.Shoulder_シャツ_表示; + Shoulder_ナース_表示 = e.Shoulder_ナース_表示; + 欠損 = e.欠損; + 筋肉 = e.筋肉; + 拘束 = e.拘束; + if (!e.表示) + { + 表示 = false; + } + if (e.上腕_接続.Count > 0) + { + Ele f; + 上腕_接続 = e.上腕_接続.Select(delegate(EleD g) + { + f = g.GetEle(DisUnit, Med, 体配色); + f.Par = Shoulder2; + f.ConnectionType = ConnectionInfo.Shoulder_上腕_接続; + f.接続(Shoulder2.上腕_接続点); + return f; + }).ToArray(); + } + base.配色指定 = 配色指定; + 配色(体配色); + X0Y0_脇_脇CP = new ColorP(X0Y0_脇_脇, 脇_脇CD, DisUnit, abj: true); + X0Y0_脇_筋肉CP = new ColorP(X0Y0_脇_筋肉, 脇_筋肉CD, DisUnit, abj: true); + X0Y0_Shoulder_ShoulderCP = new ColorP(X0Y0_Shoulder_Shoulder, Shoulder_ShoulderCD, DisUnit, abj: true); + X0Y0_Shoulder_虫性_甲殻1CP = new ColorP(X0Y0_Shoulder_虫性_甲殻1, Shoulder_虫性_甲殻1CD, DisUnit, abj: true); + X0Y0_Shoulder_虫性_甲殻2CP = new ColorP(X0Y0_Shoulder_虫性_甲殻2, Shoulder_虫性_甲殻2CD, DisUnit, abj: true); + X0Y0_Shoulder_傷I1CP = new ColorP(X0Y0_Shoulder_傷I1, Shoulder_傷I1CD, DisUnit, abj: true); + X0Y0_Shoulder_傷I2CP = new ColorP(X0Y0_Shoulder_傷I2, Shoulder_傷I2CD, DisUnit, abj: true); + X0Y0_Shoulder_傷I3CP = new ColorP(X0Y0_Shoulder_傷I3, Shoulder_傷I3CD, DisUnit, abj: true); + X0Y0_Shoulder_傷I4CP = new ColorP(X0Y0_Shoulder_傷I4, Shoulder_傷I4CD, DisUnit, abj: true); + X0Y0_Shoulder_シャツCP = new ColorP(X0Y0_Shoulder_シャツ, Shoulder_シャツCD, DisUnit, abj: true); + X0Y0_Shoulder_ナースCP = new ColorP(X0Y0_Shoulder_ナース, Shoulder_ナースCD, DisUnit, abj: true); + 濃度 = e.濃度; + X0Y0_脇_脇.BasePointBase = X0Y0_脇_脇.BasePointBase.AddY(-0.001); + } + + public void 脇描画(RenderArea Are) + { + Are.Draw(X0Y0_脇_脇); + Are.Draw(X0Y0_脇_筋肉); + } + + public void 服描画(RenderArea Are) + { + Are.Draw(X0Y0_Shoulder_シャツ); + Are.Draw(X0Y0_Shoulder_ナース); + } + + public override void 描画0(RenderArea Are) + { + Are.Draw(X0Y0_Shoulder_Shoulder); + Are.Draw(X0Y0_Shoulder_傷I1); + Are.Draw(X0Y0_Shoulder_傷I2); + Are.Draw(X0Y0_Shoulder_傷I3); + Are.Draw(X0Y0_Shoulder_傷I4); + キスマーク.Draw(Are); + 鞭痕.Draw(Are); + Are.Draw(X0Y0_Shoulder_虫性_甲殻1); + Are.Draw(X0Y0_Shoulder_虫性_甲殻2); + } + + public override bool Is布(Par p) + { + if (p != X0Y0_Shoulder_シャツ) + { + return p == X0Y0_Shoulder_ナース; + } + return true; + } + + public override void 色更新() + { + X0Y0_脇_脇CP.Update(); + X0Y0_脇_筋肉CP.Update(); + X0Y0_Shoulder_ShoulderCP.Update(); + X0Y0_Shoulder_虫性_甲殻1CP.Update(); + X0Y0_Shoulder_虫性_甲殻2CP.Update(); + X0Y0_Shoulder_傷I1CP.Update(); + X0Y0_Shoulder_傷I2CP.Update(); + X0Y0_Shoulder_傷I3CP.Update(); + X0Y0_Shoulder_傷I4CP.Update(); + } + + public void シャツ色更新(Vector2D[] シャツ) + { + X0Y0_Shoulder_シャツCP.Update(シャツ); + } + + public void ナース色更新(Vector2D[] ナース) + { + X0Y0_Shoulder_ナースCP.Update(ナース); + } + + private void 配色(体配色 体配色) + { + 配色N0(体配色); + } + + private void 配色N0(体配色 体配色) + { + 脇_脇CD = new ColorD(ref Col.Black, ref 体配色.人肌R); + 脇_筋肉CD = new ColorD(ref Col.Black, ref 体配色.人肌R); + Shoulder_ShoulderCD = new ColorD(ref Col.Black, ref 体配色.人肌O); + Shoulder_虫性_甲殻1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); + Shoulder_虫性_甲殻2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); + Shoulder_傷I1CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); + Shoulder_傷I2CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); + Shoulder_傷I3CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); + Shoulder_傷I4CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); + Shoulder_シャツCD = new ColorD(); + Shoulder_ナースCD = new ColorD(); + } + } +} diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs new file mode 100644 index 0000000..56a5ee7 --- /dev/null +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using _2DGAMELIB; + +namespace SlaveMatrix +{ + [Serializable] + public class ShoulderD : EleD + { + public bool 脇_脇_表示 = true; + + public bool 脇_筋肉_表示; + + public bool Shoulder_表示 = true; + + public bool Shoulder_虫性_甲殻1_表示; + + public bool Shoulder_虫性_甲殻2_表示; + + public bool Shoulder_傷I1_表示; + + public bool Shoulder_傷I2_表示; + + public bool Shoulder_傷I3_表示; + + public bool Shoulder_傷I4_表示; + + public bool Shoulder_シャツ_表示; + + public bool Shoulder_ナース_表示; + + public List 上腕_接続 = new List(); + + public ShoulderD() + { + ThisType = GetType(); + } + + public void 上腕接続(EleD e) + { + 上腕_接続.Add(e); + e.Par = this; + e.接続情報 = ConnectionInfo.Shoulder_上腕_接続; + } + + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + { + return new Shoulder(DisUnit, 配色指定, 体配色, Med, this); + } + } +} diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair.cs similarity index 85% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair.cs index f9bea87..24d7494 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪0.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 後髪0 : Ele + public class SideHair : Ele { public override double 肥大 { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHairD.cs similarity index 67% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHairD.cs index 9093c71..e07b913 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後髪1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHairD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 後髪1D : EleD + public class SideHairD : EleD { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs similarity index 95% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_カル.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs index a182783..44afb1b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 横髪_カル : 横髪 + public class SideHair_カル : SideHair { public Par X0Y0_髪1; @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public 横髪_カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_カルD e) + public SideHair_カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_カルD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs similarity index 66% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_カルD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs index 68b6007..2fcfaa4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 横髪_カルD : 横髪D + public class SideHair_カルD : SideHairD { public bool 髪1_表示 = true; @@ -18,12 +18,12 @@ namespace SlaveMatrix public double 広がり; - public 横髪_カルD() + public SideHair_カルD() { ThisType = GetType(); } - public 横髪_カルD SetRandom() + public SideHair_カルD SetRandom() { 髪長1 = RNG.XS.NextDouble(); 髪長2 = RNG.XS.NextDouble(); @@ -34,9 +34,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 横髪_カル(DisUnit, 配色指定, 体配色, Med, this); + return new SideHair_カル(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs similarity index 95% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ジグ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs index 410a10c..0a8a5d5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 横髪_ジグ : 横髪 + public class SideHair_ジグ : SideHair { public Par X0Y0_髪1; @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public 横髪_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_ジグD e) + public SideHair_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_ジグD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs similarity index 66% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ジグD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs index 716b225..f6d0407 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 横髪_ジグD : 横髪D + public class SideHair_ジグD : SideHairD { public bool 髪1_表示 = true; @@ -18,12 +18,12 @@ namespace SlaveMatrix public double 広がり; - public 横髪_ジグD() + public SideHair_ジグD() { ThisType = GetType(); } - public 横髪_ジグD SetRandom() + public SideHair_ジグD SetRandom() { 髪長1 = RNG.XS.NextDouble(); 髪長2 = RNG.XS.NextDouble(); @@ -34,9 +34,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 横髪_ジグ(DisUnit, 配色指定, 体配色, Med, this); + return new SideHair_ジグ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs similarity index 95% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ハネ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs index 4a48e75..c868c82 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 横髪_ハネ : 横髪 + public class SideHair_ハネ : SideHair { public Par X0Y0_髪1; @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public 横髪_ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_ハネD e) + public SideHair_ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_ハネD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs similarity index 66% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ハネD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs index e23b62e..88369b2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 横髪_ハネD : 横髪D + public class SideHair_ハネD : SideHairD { public bool 髪1_表示 = true; @@ -18,12 +18,12 @@ namespace SlaveMatrix public double 広がり; - public 横髪_ハネD() + public SideHair_ハネD() { ThisType = GetType(); } - public 横髪_ハネD SetRandom() + public SideHair_ハネD SetRandom() { 髪長1 = RNG.XS.NextDouble(); 髪長2 = RNG.XS.NextDouble(); @@ -34,9 +34,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 横髪_ハネ(DisUnit, 配色指定, 体配色, Med, this); + return new SideHair_ハネ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs similarity index 95% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_パツ.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs index 615c196..a16ecee 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 横髪_パツ : 横髪 + public class SideHair_パツ : SideHair { public Par X0Y0_髪1; @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public 横髪_パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_パツD e) + public SideHair_パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_パツD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs similarity index 66% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_パツD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs index cd3bfb3..95a1faf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 横髪_パツD : 横髪D + public class SideHair_パツD : SideHairD { public bool 髪1_表示 = true; @@ -18,12 +18,12 @@ namespace SlaveMatrix public double 広がり; - public 横髪_パツD() + public SideHair_パツD() { ThisType = GetType(); } - public 横髪_パツD SetRandom() + public SideHair_パツD SetRandom() { 髪長1 = RNG.XS.NextDouble(); 髪長2 = RNG.XS.NextDouble(); @@ -34,9 +34,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 横髪_パツ(DisUnit, 配色指定, 体配色, Med, this); + return new SideHair_パツ(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_編み.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs similarity index 98% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_編み.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs index bb96b4c..f4d6aef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_編み.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs @@ -2,7 +2,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 横髪_編み : 横髪 + public class SideHair_編み : SideHair { public Par X0Y0_髪; @@ -414,7 +414,7 @@ namespace SlaveMatrix } } - public 横髪_編み(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_編みD e) + public SideHair_編み(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_編みD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_編みD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs similarity index 79% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_編みD.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs index 63a0e1e..ada2dcd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_編みD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 横髪_編みD : 横髪D + public class SideHair_編みD : SideHairD { public bool 髪_表示 = true; @@ -42,12 +42,12 @@ namespace SlaveMatrix public double 広がり; - public 横髪_編みD() + public SideHair_編みD() { ThisType = GetType(); } - public 横髪_編みD SetRandom() + public SideHair_編みD SetRandom() { 髪長1 = RNG.XS.NextDouble(); 髪長2 = RNG.XS.NextDouble(); @@ -58,9 +58,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 横髪_編み(DisUnit, 配色指定, 体配色, Med, this); + return new SideHair_編み(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs similarity index 91% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_肢系.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs index da19844..7fbc61d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 横髪_肢系 : 横髪 + public class SideHair_肢系 : SideHair { public Par X0Y0_髪; @@ -88,9 +88,9 @@ namespace SlaveMatrix public JointS 肢_接続点 => new JointS(本体, X0Y0_髪, 0); - public 横髪_肢系(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 横髪_肢系D e) + public SideHair_肢系(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_肢系D e) { - 横髪_肢系 横髪_肢系2 = this; + SideHair_肢系 横髪_肢系2 = this; ThisType = GetType(); Dif dif = new Dif(); dif.Tag = "肢系"; @@ -139,7 +139,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 横髪_肢系2; - f.ConnectionType = ConnectionInfo.横髪_肢系_肢_接続; + f.ConnectionType = ConnectionInfo.SideHair_肢系_肢_接続; f.接続(横髪_肢系2.肢_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_肢系D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs similarity index 57% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_肢系D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs index 691fce2..58e6465 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/横髪_肢系D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs @@ -5,13 +5,13 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 横髪_肢系D : 横髪D + public class SideHair_肢系D : SideHairD { public bool 髪_表示 = true; public List 肢_接続 = new List(); - public 横髪_肢系D() + public SideHair_肢系D() { ThisType = GetType(); } @@ -20,7 +20,7 @@ namespace SlaveMatrix { 肢_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.横髪_肢系_肢_接続; + e.接続情報 = ConnectionInfo.SideHair_肢系_肢_接続; } public EleD SetRandom() @@ -28,9 +28,9 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 横髪_肢系(DisUnit, 配色指定, 体配色, Med, this); + return new SideHair_肢系(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SlaveText.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SlaveText.cs index 9d918c5..15e8006 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SlaveText.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SlaveText.cs @@ -4,11 +4,11 @@ namespace SlaveMatrix { public class SlaveText { - private Med Med; + private ModeEventDispatcher Med; private TextBubble hd; - public SlaveText(Med Med, TextBubble hd) + public SlaveText(ModeEventDispatcher Med, TextBubble hd) { this.Med = Med; this.hd = hd; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs index 78c0222..641ac01 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs @@ -21,9 +21,9 @@ namespace SlaveMatrix //three subclasses: one for bukkake, kiss marks, and whip marks public class Stamp { - public Med Med; + public ModeEventDispatcher Med; - public Are Are; + public RenderArea Are; public Cha Cha; @@ -43,7 +43,7 @@ namespace SlaveMatrix protected sep sep; - public virtual void Draw(Are Are) + public virtual void Draw(RenderArea Are) { } @@ -55,7 +55,7 @@ namespace SlaveMatrix { } - public Stamp(Med Med, Are Are, Cha Cha, Bod Bod, EleD EleD) + public Stamp(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD) { this.Med = Med; this.Are = Are; @@ -81,9 +81,9 @@ namespace SlaveMatrix sta.Clear(); } - public void 脚Clear() + public void LegClear() { - sep[] array = sta.Where((sep e) => e.Ele is 腿_人 || e.Ele is 脚_人 || e.Ele is 足_人).ToArray(); + sep[] array = sta.Where((sep e) => e.Ele is 腿_人 || e.Ele is Leg_人 || e.Ele is 足_人).ToArray(); for (int i = 0; i < array.Length; i++) { sep item = array[i]; @@ -96,7 +96,7 @@ namespace SlaveMatrix { if (e != null && !(e is 性器) && !(e is 肛門)) { - return !(e is 首); + return !(e is Neck); } return false; } @@ -105,7 +105,7 @@ namespace SlaveMatrix { if (e != null && !(e is 手_人) && !(e is 性器) && !(e is 肛門)) { - return !(e is 首); + return !(e is Neck); } return false; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs index d9a74f7..8abb867 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs @@ -18,9 +18,9 @@ namespace SlaveMatrix { private HashSet 汗対象 = new HashSet { - Sta.胸t.ToString(), + Sta.Chestt.ToString(), Sta.胴t.ToString(), - Sta.肩t.ToString(), + Sta.Shouldert.ToString(), Sta.腰t.ToString() }; @@ -42,7 +42,7 @@ namespace SlaveMatrix private Vector2D tp; - public void Draw(Are Are) + public void Draw(RenderArea Are) { if (!汗かき.Run && !汗ひき.Run) { @@ -70,7 +70,7 @@ namespace SlaveMatrix } } - public Sweat(Med Med, Are Are, Cha Cha, Mots Mots) + public Sweat(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Mots Mots) { Ele[] es = null; Ele n = null; @@ -216,7 +216,7 @@ namespace SlaveMatrix for (int i = 0; i < ps.Length; i++) { _ = ref ps[i]; - 汗 = new 汗(Are.DisUnit, 配色指定.N0, Cha.配色, Med, e2); + 汗 = new 汗(Are.DisplayUnitScale, 配色指定.N0, Cha.配色, Med, e2); 汗.SetHitFalse(); 汗.濃度 = ((RNG.XS.NextDouble() < 0.2) ? 1.0 : 0.0); 位置.Add(num switch diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs index 8880052..412c2ec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs @@ -41,9 +41,9 @@ namespace SlaveMatrix } } - public TextBubble(Are Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis, Color FeedColor, Action Action) + public TextBubble(RenderArea Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis, Color FeedColor, Action Action) { - 吹出し = new 吹出し(Are.DisUnit); + 吹出し = new 吹出し(Are.DisplayUnitScale); 吹出し.SetHitFalse(); 吹出し.右 = 右; 吹出し.吹出しCD.色 = new Color2(ref BackColor, ref Col.Empty); @@ -101,9 +101,9 @@ namespace SlaveMatrix } } - public TextBubble(Are Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis) + public TextBubble(RenderArea Are, bool 右, Font Font, double TextSize, string Text, Color TextColor, Color ShadColor, Color BackColor, double Speed, bool Dis) { - 吹出し = new 吹出し(Are.DisUnit); + 吹出し = new 吹出し(Are.DisplayUnitScale); 吹出し.SetHitFalse(); 吹出し.右 = 右; 吹出し.吹出しCD.色 = new Color2(ref BackColor, ref Col.Empty); @@ -132,11 +132,23 @@ namespace SlaveMatrix }, Runing = delegate(Mot m) { - v = m.Value.Inverse(); - 吹出し.X0Y0_吹出し.PenColor = Color.FromArgb((int)((double)pa * v), 吹出し.X0Y0_吹出し.PenColor); - 吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb((int)((double)ba * v), 吹出し.X0Y0_吹出し.BrushColor); - Tex.ParT.TextColor = Color.FromArgb((int)((double)ta * v), Tex.ParT.TextColor); - Tex.ParT.ShadColor = Color.FromArgb((int)((double)sa * v), Tex.ParT.ShadColor); + //After full training slave if i tried to train again game crahes here :3 + v = (m.Value >= 0) ? m.Value : m.Value.Inverse(); + + var penAlpha = (int)((double)pa * v); + var brushAlpha = (int)((double)ba * v); + var textAlpha = (int)((double)ta * v); + var shadeAlpha = (int)((double)sa * v); + + var correctPenAlpha = (penAlpha > 255) ? 255 : penAlpha; + var correctBrushAlpha = (brushAlpha > 255) ? 255 : brushAlpha; + var correctTextAlpha = (textAlpha > 255) ? 255 : textAlpha; + var correctShadeAlpha = (shadeAlpha > 255) ? 255 : shadeAlpha; + + 吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(correctPenAlpha, 吹出し.X0Y0_吹出し.PenColor); + 吹出し.X0Y0_吹出し.BrushColor = Color.FromArgb(correctBrushAlpha, 吹出し.X0Y0_吹出し.BrushColor); + Tex.ParT.TextColor = Color.FromArgb(correctTextAlpha, Tex.ParT.TextColor); + Tex.ParT.ShadColor = Color.FromArgb(correctShadeAlpha, Tex.ParT.ShadColor); }, Reaing = delegate(Mot m) { @@ -157,7 +169,7 @@ namespace SlaveMatrix } } - public void SetHitColor(Med Med) + public void SetHitColor(ModeEventDispatcher Med) { Tex.SetHitColor(Med); } @@ -184,7 +196,7 @@ namespace SlaveMatrix Tex.Position = 吹出し.X0Y0_吹出し.ToGlobal(吹出し.X0Y0_吹出し.JP[0].Joint); } - public void Draw(Are Are, FPS FPS) + public void Draw(RenderArea Are, FPS FPS) { Tex.Progression(FPS); if (Dis) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs similarity index 93% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs index 89bd2f6..2080381 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胴 : Ele + public class Torso : Ele { public Par X0Y0_胴; @@ -63,7 +63,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 胸_接続; + public Ele[] Chest_接続; public Ele[] 肌_接続; @@ -279,7 +279,7 @@ namespace SlaveMatrix } } - public JointS 胸_接続点 => new JointS(本体, X0Y0_胴, 0); + public JointS Chest_接続点 => new JointS(本体, X0Y0_胴, 0); public JointS 肌_接続点 => new JointS(本体, X0Y0_胴, 5); @@ -287,11 +287,12 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(本体, X0Y0_胴, 2); - public 胴(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴D e) + public Torso(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, TorsoD e) { - 胴 胴2 = this; + Torso 胴2 = this; ThisType = GetType(); - 本体 = new Difs(Sta.胴体["胴"]); + //This had no Torso (胴体) + 本体 = new Difs(Sta.胴体["Torso"]); Pars pars = 本体[0][0]; X0Y0_胴 = pars["胴"].ToPar(); Pars pars2 = pars["筋肉"].ToPars(); @@ -307,7 +308,7 @@ namespace SlaveMatrix pars3 = pars2["右"].ToPars(); X0Y0_植タトゥ_右_タトゥ2 = pars3["タトゥ2"].ToPar(); X0Y0_植タトゥ_右_タトゥ1 = pars3["タトゥ1"].ToPar(); - 本体.SetJoints(); + 本体.SetJoints(); 接続根 = new JointD(本体); 右 = e.右; 反転X = e.反転X; @@ -348,14 +349,14 @@ namespace SlaveMatrix 表示 = false; } Ele f; - if (e.胸_接続.Count > 0) + if (e.Chest_接続.Count > 0) { - 胸_接続 = e.胸_接続.Select(delegate(EleD g) + Chest_接続 = e.Chest_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴2; - f.ConnectionType = ConnectionInfo.胴_胸_接続; - f.接続(胴2.胸_接続点); + f.ConnectionType = ConnectionInfo.Torso_Chest_接続; + f.接続(胴2.Chest_接続点); return f; }).ToArray(); } @@ -365,7 +366,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴2; - f.ConnectionType = ConnectionInfo.胴_肌_接続; + f.ConnectionType = ConnectionInfo.Torso_肌_接続; f.接続(胴2.肌_接続点); return f; }).ToArray(); @@ -376,7 +377,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴2; - f.ConnectionType = ConnectionInfo.胴_翼左_接続; + f.ConnectionType = ConnectionInfo.Torso_翼左_接続; f.接続(胴2.翼左_接続点); return f; }).ToArray(); @@ -387,7 +388,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴2; - f.ConnectionType = ConnectionInfo.胴_翼右_接続; + f.ConnectionType = ConnectionInfo.Torso_翼右_接続; f.接続(胴2.翼右_接続点); return f; }).ToArray(); @@ -408,7 +409,7 @@ namespace SlaveMatrix 尺度YB = 0.9; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); キスマーク.Draw(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs similarity index 71% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs index f7abb58..2da3d11 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胴D : EleD + public class TorsoD : EleD { public bool 胴_表示 = true; @@ -27,7 +27,7 @@ namespace SlaveMatrix public double 筋肉濃度 = 1.0; - public List 胸_接続 = new List(); + public List Chest_接続 = new List(); public List 肌_接続 = new List(); @@ -35,30 +35,30 @@ namespace SlaveMatrix public List 翼右_接続 = new List(); - public 胴D() + public TorsoD() { ThisType = GetType(); } - public void 胸接続(EleD e) + public void Torso接続(EleD e) { - 胸_接続.Add(e); + Chest_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_胸_接続; + e.接続情報 = ConnectionInfo.Torso_Chest_接続; } public void 肌接続(EleD e) { 肌_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_肌_接続; + e.接続情報 = ConnectionInfo.Torso_肌_接続; } public void 翼左接続(EleD e) { 翼左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_翼左_接続; + e.接続情報 = ConnectionInfo.Torso_翼左_接続; if (!(e is 尾D)) { return; @@ -73,7 +73,7 @@ namespace SlaveMatrix { 翼右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_翼右_接続; + e.接続情報 = ConnectionInfo.Torso_翼右_接続; if (!(e is 尾D)) { return; @@ -84,9 +84,9 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 胴(DisUnit, 配色指定, 体配色, Med, this); + return new Torso(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs similarity index 94% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs index 6cc1e81..ca9db49 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胴_蛇 : 長胴 + public class Torso_蛇 : 長胴 { public Par X0Y0_胴_鱗; @@ -73,7 +73,7 @@ namespace SlaveMatrix public Ele[] 右_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public override bool 欠損 { @@ -320,15 +320,15 @@ namespace SlaveMatrix public JointS 右_接続点 => new JointS(本体, X0Y0_胴_胴, 3); - public JointS 胴_接続点 => new JointS(本体, X0Y0_胴_胴, 1); + public JointS Torso_接続点 => new JointS(本体, X0Y0_胴_胴, 1); public JointS 鎖1_接続点 => new JointS(本体, X0Y0_輪_金具左, 0); public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 胴_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴_蛇D e) + public Torso_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Torso_蛇D e) { - 胴_蛇 胴_蛇2 = this; + Torso_蛇 胴_蛇2 = this; ThisType = GetType(); Pars pars = new Pars(); pars.Tag = "蛇"; @@ -402,7 +402,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蛇2; - f.ConnectionType = ConnectionInfo.胴_蛇_左_接続; + f.ConnectionType = ConnectionInfo.Torso_蛇_左_接続; f.接続(胴_蛇2.左_接続点); return f; }).ToArray(); @@ -413,19 +413,19 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蛇2; - f.ConnectionType = ConnectionInfo.胴_蛇_右_接続; + f.ConnectionType = ConnectionInfo.Torso_蛇_右_接続; f.接続(胴_蛇2.右_接続点); return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蛇2; - f.ConnectionType = ConnectionInfo.胴_蛇_胴_接続; - f.接続(胴_蛇2.胴_接続点); + f.ConnectionType = ConnectionInfo.Torso_蛇_Torso_接続; + f.接続(胴_蛇2.Torso_接続点); return f; }).ToArray(); } @@ -452,19 +452,19 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_胴_鱗); Are.Draw(X0Y0_胴_鱗左); Are.Draw(X0Y0_胴_鱗右); Are.Draw(X0Y0_胴_胴); - if (胴_接続 != null && 胴_接続[0].拘束 && 胴_接続[0] is 胴_蛇) + if (Torso_接続 != null && Torso_接続[0].拘束 && Torso_接続[0] is Torso_蛇) { - ((胴_蛇)胴_接続[0]).拘束具描画(Are); + ((Torso_蛇)Torso_接続[0]).拘束具描画(Are); } } - public void 拘束具描画(Are Are) + public void 拘束具描画(RenderArea Are) { Are.Draw(X0Y0_輪_革); Are.Draw(X0Y0_輪_金具1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs similarity index 64% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs index 038cce3..12d8144 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胴_蛇D : 長胴D + public class Torso_蛇D : 長胴D { public bool 胴_鱗_表示 = true; @@ -30,7 +30,7 @@ namespace SlaveMatrix public bool 鎖表示; - public 胴_蛇D() + public Torso_蛇D() { ThisType = GetType(); } @@ -39,26 +39,26 @@ namespace SlaveMatrix { 左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蛇_左_接続; + e.接続情報 = ConnectionInfo.Torso_蛇_左_接続; } public override void 右接続(EleD e) { 右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蛇_右_接続; + e.接続情報 = ConnectionInfo.Torso_蛇_右_接続; } - public override void 胴接続(EleD e) + public override void Torso接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蛇_胴_接続; + e.接続情報 = ConnectionInfo.Torso_蛇_Torso_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 胴_蛇(DisUnit, 配色指定, 体配色, Med, this); + return new Torso_蛇(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs similarity index 96% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs index 76f5e4d..cbdbc35 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 胴_蟲 : 長胴 + public class Torso_蟲 : 長胴 { public Par X0Y0_胴_背板; @@ -97,7 +97,7 @@ namespace SlaveMatrix public Ele[] 右_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public override bool 欠損 { @@ -467,15 +467,15 @@ namespace SlaveMatrix public JointS 右_接続点 => new JointS(本体, X0Y0_胴_胴, 1); - public JointS 胴_接続点 => new JointS(本体, X0Y0_胴_胴, 3); + public JointS Torso_接続点 => new JointS(本体, X0Y0_胴_胴, 3); public JointS 鎖1_接続点 => new JointS(本体, X0Y0_輪_金具左, 0); public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 胴_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴_蟲D e) + public Torso_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Torso_蟲D e) { - 胴_蟲 胴_蟲2 = this; + Torso_蟲 胴_蟲2 = this; ThisType = GetType(); Pars pars = new Pars(); pars.Tag = "蟲"; @@ -492,7 +492,7 @@ namespace SlaveMatrix X0Y0_胴_背板 = pars3["背板"].ToPar(); X0Y0_胴_節 = pars3["節"].ToPar(); X0Y0_胴_胸板 = pars3["胸板"].ToPar(); - X0Y0_胴_胴 = pars3["胴"].ToPar(); + X0Y0_胴_胴 = pars3["Torso"].ToPar(); X0Y0_胴_瘤左2 = pars3["瘤左2"].ToPar(); X0Y0_胴_瘤左1 = pars3["瘤左1"].ToPar(); X0Y0_胴_瘤右2 = pars3["瘤右2"].ToPar(); @@ -562,7 +562,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蟲2; - f.ConnectionType = ConnectionInfo.胴_蟲_左_接続; + f.ConnectionType = ConnectionInfo.Torso_蟲_左_接続; f.接続(胴_蟲2.左_接続点); return f; }).ToArray(); @@ -573,19 +573,19 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蟲2; - f.ConnectionType = ConnectionInfo.胴_蟲_右_接続; + f.ConnectionType = ConnectionInfo.Torso_蟲_右_接続; f.接続(胴_蟲2.右_接続点); return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 胴_蟲2; - f.ConnectionType = ConnectionInfo.胴_蟲_胴_接続; - f.接続(胴_蟲2.胴_接続点); + f.ConnectionType = ConnectionInfo.Torso_蟲_Torso_接続; + f.接続(胴_蟲2.Torso_接続点); return f; }).ToArray(); } @@ -616,7 +616,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs similarity index 71% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs index 79a1f27..49ad05d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs @@ -4,7 +4,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 胴_蟲D : 長胴D + public class Torso_蟲D : 長胴D { public bool 胴_背板_表示 = true; @@ -48,7 +48,7 @@ namespace SlaveMatrix public bool 鎖表示; - public 胴_蟲D() + public Torso_蟲D() { ThisType = GetType(); } @@ -57,26 +57,26 @@ namespace SlaveMatrix { 左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蟲_左_接続; + e.接続情報 = ConnectionInfo.Torso_蟲_左_接続; } public override void 右接続(EleD e) { 右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蟲_右_接続; + e.接続情報 = ConnectionInfo.Torso_蟲_右_接続; } - public override void 胴接続(EleD e) + public override void Torso接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.胴_蟲_胴_接続; + e.接続情報 = ConnectionInfo.Torso_蟲_Torso_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 胴_蟲(DisUnit, 配色指定, 体配色, Med, this); + return new Torso_蟲(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs index 27f518c..90a7af8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs @@ -482,7 +482,7 @@ namespace SlaveMatrix } } - public T剃刀(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, T剃刀D e) + public T剃刀(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, T剃刀D e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["T字剃刀"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs index dbd27b9..a4e7c32 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new T剃刀(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ViolaText.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ViolaText.cs index 6d263d1..31e9fc3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ViolaText.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ViolaText.cs @@ -4,11 +4,11 @@ namespace SlaveMatrix { public class ViolaText { - private Med Med; + private ModeEventDispatcher Med; private TextBubble hd; - public ViolaText(Med Med, TextBubble hd) + public ViolaText(ModeEventDispatcher Med, TextBubble hd) { this.Med = Med; this.hd = hd; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/腰.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs index 0c64814..f1fd872 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs @@ -3,7 +3,7 @@ using _2DGAMELIB; namespace SlaveMatrix { - public class 腰 : Ele + public class Waist : Ele { public Par X0Y0_腰; @@ -955,7 +955,7 @@ namespace SlaveMatrix public スタンプW 鞭痕; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public Ele[] 腿左_接続; @@ -2129,7 +2129,7 @@ namespace SlaveMatrix } } - public JointS 胴_接続点 => new JointS(本体, X0Y0_腰, 0); + public JointS Torso_接続点 => new JointS(本体, X0Y0_腰, 0); public JointS 腿左_接続点 => new JointS(本体, X0Y0_腰, 1); @@ -2151,11 +2151,11 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(本体, X0Y0_腰, 9); - public 腰(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 腰D e) + public Waist(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, WaistD e) { - 腰 腰2 = this; + Waist 腰2 = this; ThisType = GetType(); - 本体 = new Difs(Sta.胴体["腰"]); + 本体 = new Difs(Sta.胴体["Waist"]); Pars pars = 本体[0][0]; X0Y0_腰 = pars["腰"].ToPar(); X0Y0_股 = pars["股"].ToPar(); @@ -2516,14 +2516,14 @@ namespace SlaveMatrix 表示 = false; } Ele f; - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_胴_接続; - f.接続(腰2.胴_接続点); + f.ConnectionType = ConnectionInfo.Waist_Torso_接続; + f.接続(腰2.Torso_接続点); return f; }).ToArray(); } @@ -2533,7 +2533,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_腿左_接続; + f.ConnectionType = ConnectionInfo.Waist_腿左_接続; f.接続(腰2.腿左_接続点); return f; }).ToArray(); @@ -2544,7 +2544,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_腿右_接続; + f.ConnectionType = ConnectionInfo.Waist_腿右_接続; f.接続(腰2.腿右_接続点); return f; }).ToArray(); @@ -2555,7 +2555,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_膣基_接続; + f.ConnectionType = ConnectionInfo.Waist_膣基_接続; f.接続(腰2.膣基_接続点); return f; }).ToArray(); @@ -2566,7 +2566,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_肛門_接続; + f.ConnectionType = ConnectionInfo.Waist_肛門_接続; f.接続(腰2.肛門_接続点); return f; }).ToArray(); @@ -2577,7 +2577,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_尾_接続; + f.ConnectionType = ConnectionInfo.Waist_尾_接続; f.接続(腰2.尾_接続点); return f; }).ToArray(); @@ -2588,7 +2588,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_半身_接続; + f.ConnectionType = ConnectionInfo.Waist_半身_接続; f.接続(腰2.半身_接続点); return f; }).ToArray(); @@ -2599,7 +2599,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_上着_接続; + f.ConnectionType = ConnectionInfo.Waist_上着_接続; f.接続(腰2.上着_接続点); return f; }).ToArray(); @@ -2610,7 +2610,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_肌_接続; + f.ConnectionType = ConnectionInfo.Waist_肌_接続; f.接続(腰2.肌_接続点); return f; }).ToArray(); @@ -2621,7 +2621,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_翼左_接続; + f.ConnectionType = ConnectionInfo.Waist_翼左_接続; f.接続(腰2.翼左_接続点); return f; }).ToArray(); @@ -2632,7 +2632,7 @@ namespace SlaveMatrix { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腰2; - f.ConnectionType = ConnectionInfo.腰_翼右_接続; + f.ConnectionType = ConnectionInfo.Waist_翼右_接続; f.接続(腰2.翼右_接続点); return f; }).ToArray(); @@ -2942,7 +2942,7 @@ namespace SlaveMatrix 本体.JoinPA(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { @@ -3014,7 +3014,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs similarity index 84% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/腰D.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs index b253661..b7a4ee4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class 腰D : EleD + public class WaistD : EleD { public bool 腰_表示 = true; @@ -109,7 +109,7 @@ namespace SlaveMatrix public bool スライム; - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public List 腿左_接続 = new List(); @@ -131,23 +131,23 @@ namespace SlaveMatrix public List 翼右_接続 = new List(); - public 腰D() + public WaistD() { ThisType = GetType(); } public void 胴接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_胴_接続; + e.接続情報 = ConnectionInfo.Waist_Torso_接続; } public void 腿左接続(EleD e) { 腿左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_腿左_接続; + e.接続情報 = ConnectionInfo.Waist_腿左_接続; if (!(e is 獣腿D)) { return; @@ -162,7 +162,7 @@ namespace SlaveMatrix { 腿右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_腿右_接続; + e.接続情報 = ConnectionInfo.Waist_腿右_接続; if (!(e is 獣腿D)) { return; @@ -177,21 +177,21 @@ namespace SlaveMatrix { 膣基_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_膣基_接続; + e.接続情報 = ConnectionInfo.Waist_膣基_接続; } public void 肛門接続(EleD e) { 肛門_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_肛門_接続; + e.接続情報 = ConnectionInfo.Waist_肛門_接続; } public void 尾接続(EleD e) { 尾_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_尾_接続; + e.接続情報 = ConnectionInfo.Waist_尾_接続; if (e is 尾_ヘD || e is 尾_ウD || e is 尾_ガD || e is 尾_蟲D) { foreach (EleD item in e.EnumEleD()) @@ -210,28 +210,28 @@ namespace SlaveMatrix { 半身_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_半身_接続; + e.接続情報 = ConnectionInfo.Waist_半身_接続; } public void 上着接続(EleD e) { 上着_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_上着_接続; + e.接続情報 = ConnectionInfo.Waist_上着_接続; } public void 肌接続(EleD e) { 肌_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_肌_接続; + e.接続情報 = ConnectionInfo.Waist_肌_接続; } public void 翼左接続(EleD e) { 翼左_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_翼左_接続; + e.接続情報 = ConnectionInfo.Waist_翼左_接続; if (!(e is 尾D)) { return; @@ -246,7 +246,7 @@ namespace SlaveMatrix { 翼右_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腰_翼右_接続; + e.接続情報 = ConnectionInfo.Waist_翼右_接続; if (!(e is 尾D)) { return; @@ -257,9 +257,9 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 腰(DisUnit, 配色指定, 体配色, Med, this); + return new Waist(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/お下げ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/お下げ1.cs index df1d1dd..0cd4f11 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/お下げ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/お下げ1.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class お下げ1 : 後髪0 + public class お下げ1 : BackHair0 { public virtual bool お下げ_髪縛1_表示 { get; set; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/お下げ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/お下げ2.cs index 667fcf5..678d86b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/お下げ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/お下げ2.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class お下げ2 : 後髪0 + public class お下げ2 : BackHair0 { public virtual bool お下げ左_髪縛1_表示 { get; set; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs index 2fd09e5..35ef855 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix } } - public ぶっかけ_大(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, Med Med, ぶっかけ_大D e) + public ぶっかけ_大(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, ぶっかけ_大D e) { ThisType = GetType(); Dif dif = new Dif(Sta.スタンプ["ぶっかけ"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大D.cs index 9d2ff95..f991d37 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 主人公配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return new ぶっかけ_大(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs index 8f6268b..23aef94 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix } } - public ぶっかけ_小(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, Med Med, ぶっかけ_小D e) + public ぶっかけ_小(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, ぶっかけ_小D e) { ThisType = GetType(); Dif dif = new Dif(Sta.スタンプ["ぶっかけ"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小D.cs index f090fb8..ab1edf7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 主人公配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return new ぶっかけ_小(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/アップ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/アップ.cs index d2ff941..a3b4ea3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/アップ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/アップ.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class アップ : 後髪1 + public class アップ : BackHair1 { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/アップD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/アップD.cs index 0edf2a8..d8e7905 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/アップD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/アップD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class アップD : 後髪1D + public class アップD : BackHair1D { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs index 82eced5..3503aea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public キスマーク(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, キスマークD e) + public キスマーク(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, キスマークD e) { ThisType = GetType(); 本体 = new Difs(Sta.スタンプ["キスマーク"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs index c825e9a..45e862f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new キスマーク(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs index 8821772..12319bc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs @@ -118,7 +118,7 @@ namespace SlaveMatrix } } - public キャップ1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, キャップ1D e) + public キャップ1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, キャップ1D e) { ThisType = GetType(); 本体 = new Difs(Sta.性器付["キャップ中"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs index a83b94e..ae1ba21 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new キャップ1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs index 42d29e6..1a6c074 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs @@ -118,7 +118,7 @@ namespace SlaveMatrix } } - public キャップ2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, キャップ2D e) + public キャップ2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, キャップ2D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["キャップ左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs index 0749b79..3226474 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new キャップ2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs index 8cd7c2b..7c96511 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs @@ -130,7 +130,7 @@ namespace SlaveMatrix public void 吸着(Ele 対象) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.位置.GetAreaPoint(0.01), Sta.吸着.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.2, b: true); }); @@ -138,7 +138,7 @@ namespace SlaveMatrix public void 吸脱(Ele 対象) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.位置.GetAreaPoint(0.01), Sta.吸脱.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.2, b: true); }); @@ -148,7 +148,7 @@ namespace SlaveMatrix { if ((対象 is キャップ1 && CP中.GetFlag(0.2)) || (対象 is キャップ2 && !対象.右 && CP左.GetFlag(0.2)) || (対象 is キャップ2 && 対象.右 && CP右.GetFlag(0.2))) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.位置.GetAreaPoint(0.02), Sta.振動.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.15, b: true); }); @@ -585,7 +585,7 @@ namespace SlaveMatrix : base(調教UI) { キャップ処理 キャップ処理2 = this; - double disUnit = 調教UI.Are.DisUnit; + double disUnit = 調教UI.Are.DisplayUnitScale; キャップ着.SetDefault(); キャップ1D e = new キャップ1D(); e.SetValuesD("表示", true); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/サイド.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/サイド.cs index f5b0e02..a9b8a1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/サイド.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/サイド.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class サイド : 後髪1 + public class サイド : BackHair1 { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/サイドD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/サイドD.cs index ffabba5..58d5b45 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/サイドD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/サイドD.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class サイドD : 後髪1D + public class サイドD : BackHair1D { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs index b49816c..4bab422 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs @@ -9,7 +9,7 @@ namespace SlaveMatrix { private Mot ぶっかけ垂れ; - public override void Draw(Are Are) + public override void Draw(RenderArea Are) { try { @@ -45,7 +45,7 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisUnit, Med, Sta.GameData.配色); + sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Sta.GameData.配色); sep.Sta.SetHitFalse(); sep.Sta.Xv = RNG.XS.NextDouble(); sep.Sta.右 = RNG.XS.NextBool(); @@ -66,7 +66,7 @@ namespace SlaveMatrix } } - public スタンプB(Med Med, Are Are, Cha Cha, Bod Bod, EleD EleD, Mots Mots) + public スタンプB(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Mots Mots) : base(Med, Are, Cha, Bod, EleD) { Ele e = null; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs index d74a23c..8126658 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs @@ -7,7 +7,7 @@ namespace SlaveMatrix { private Ele Par; - public override void Draw(Are Are) + public override void Draw(RenderArea Are) { try { @@ -44,7 +44,7 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisUnit, Med, Cha.配色); + sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.配色); sep.Sta.SetHitFalse(); sep.Ele = he; sep.Par = p; @@ -57,7 +57,7 @@ namespace SlaveMatrix return null; } - public スタンプK(Med Med, Are Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) + public スタンプK(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) : base(Med, Are, Cha, Bod, EleD) { this.Par = Par; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs index f9f7447..5634cbd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs @@ -7,7 +7,7 @@ namespace SlaveMatrix { private Ele Par; - public override void Draw(Are Are) + public override void Draw(RenderArea Are) { try { @@ -44,7 +44,7 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisUnit, Med, Cha.配色); + sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.配色); sep.Sta.SetHitFalse(); sep.Sta.角度C = 45.0 * (double)(RNG.XS.NextBool() ? 1 : (-1)) * RNG.XS.NextDouble(); sep.Ele = he; @@ -58,7 +58,7 @@ namespace SlaveMatrix return false; } - public スタンプW(Med Med, Are Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) + public スタンプW(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) : base(Med, Are, Cha, Bod, EleD) { this.Par = Par; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs index 6af10c4..4ba0738 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs @@ -3795,7 +3795,7 @@ namespace SlaveMatrix } } - public ハンド(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, Med Med, ハンドD e) + public ハンド(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, ハンドD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["ハンド"]); @@ -5226,7 +5226,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexX) { @@ -5784,7 +5784,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexX) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンドD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンドD.cs index f8a7a45..04e4f51 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンドD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンドD.cs @@ -41,7 +41,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 主人公配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return new ハンド(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs index 94ac38f..91fabf9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs @@ -58,7 +58,7 @@ namespace SlaveMatrix public void くぱ() { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.膣口位置.GetAreaPoint(0.01), Sta.くぱ.GetVal(Player.変化V_膣, Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.DeepPink.S(Player.変化V_膣.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_膣, b: true); }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs index 3ff1873..2fa17ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs @@ -557,7 +557,7 @@ namespace SlaveMatrix } } - public バイブ_アナル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, バイブ_アナルD e) + public バイブ_アナル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_アナルD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["アナル"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs index a7289d7..0562a80 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new バイブ_アナル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs index 4630f10..846a101 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs @@ -971,7 +971,7 @@ namespace SlaveMatrix } } - public バイブ_コモン(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, バイブ_コモンD e) + public バイブ_コモン(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_コモンD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["コモン"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs index b9be957..43ac07b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs @@ -57,7 +57,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new バイブ_コモン(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs index 67862cb..ff94b46 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs @@ -680,7 +680,7 @@ namespace SlaveMatrix } } - public バイブ_ディル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, バイブ_ディルD e) + public バイブ_ディル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_ディルD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["ディル"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs index 7cbe203..95d5b17 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs @@ -41,7 +41,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new バイブ_ディル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs index 537e3be..5eb39dd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs @@ -803,7 +803,7 @@ namespace SlaveMatrix } } - public バイブ_デンマ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, バイブ_デンマD e) + public バイブ_デンマ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_デンマD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["デンマ"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs index a738a5e..f818c81 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs @@ -47,7 +47,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new バイブ_デンマ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs index 61a8cfd..d0b966b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs @@ -2642,7 +2642,7 @@ namespace SlaveMatrix } } - public バイブ_ドリル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, バイブ_ドリルD e) + public バイブ_ドリル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_ドリルD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["ドリル"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs index 6f06f92..1d48e3e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new バイブ_ドリル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs index 419ab98..989729f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs @@ -992,7 +992,7 @@ namespace SlaveMatrix } } - public パール(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, パールD e) + public パール(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, パールD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["パール"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs index 96691c3..fcbf6a0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new パール(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs index 2d27978..6b9d5a8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs @@ -97,7 +97,7 @@ namespace SlaveMatrix } } - public ピアス(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, ピアスD e) + public ピアス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ピアスD e) { ThisType = GetType(); 本体 = new Difs(Sta.性器付["ピアス"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs index 65ef2d6..67b07f0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new ピアス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ブーツ情報.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ブーツ情報.cs index 4295338..bfcc58f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ブーツ情報.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ブーツ情報.cs @@ -5,7 +5,7 @@ namespace SlaveMatrix [Serializable] public struct ブーツ情報 { - public ブーツ_脚情報 脚; + public ブーツ_脚情報 Leg; public ブーツ_足情報 足; @@ -13,7 +13,7 @@ namespace SlaveMatrix public void SetDefault() { - 脚.SetDefault(); + Leg.SetDefault(); 足.SetDefault(); 色.SetDefault(); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs index 17256a5..1d28d68 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs @@ -432,7 +432,7 @@ namespace SlaveMatrix public JointS 尿道_接続点 => new JointS(本体, X0Y0_陰茎, 3); - public ペニス(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, Med Med, ペニスD e) + public ペニス(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, ペニスD e) { ペニス ペニス2 = this; ThisType = GetType(); @@ -618,7 +618,7 @@ namespace SlaveMatrix AreM.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { AreM.Clear(); 本体.Draw(AreM); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs index 8b5f27a..75cd062 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs @@ -62,11 +62,11 @@ namespace SlaveMatrix private ContactType 挿入箇所; - private 肩 肩; + private Shoulder Shoulder; - private 肩 肩左; + private Shoulder 肩左; - private 肩 肩右; + private Shoulder 肩右; private 上腕_人 上腕; @@ -90,9 +90,9 @@ namespace SlaveMatrix private 腿_人 腿右; - private 脚_人 脚左; + private Leg_人 脚左; - private 脚_人 脚右; + private Leg_人 脚右; private 足_人 足左; @@ -139,7 +139,7 @@ namespace SlaveMatrix public void 射精_() { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Sta.GetAreaPoint(ref 調教UI.ペニス.AreM.Position, 0.02), Sta.射精.GetVal(Player.変化V_射精, 1.0), new Font("MS Gothic", 1f), Color.White, 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_射精, b: true); }); @@ -740,7 +740,7 @@ namespace SlaveMatrix ペニス処理2.Cha.腕_人_手コキ右(0, 0.0, 0.0, 0.0, 0.0); } ペニス処理2.手固定 = true; - ペニス処理2.肩 = (ペニス処理2.手コキ左 ? ペニス処理2.肩左 : ペニス処理2.肩右); + ペニス処理2.Shoulder = (ペニス処理2.手コキ左 ? ペニス処理2.肩左 : ペニス処理2.肩右); ペニス処理2.上腕 = (ペニス処理2.手コキ左 ? ペニス処理2.上腕左 : ペニス処理2.上腕右); ペニス処理2.下腕 = (ペニス処理2.手コキ左 ? ペニス処理2.下腕左 : ペニス処理2.下腕右); ペニス処理2.手 = (ペニス処理2.手コキ左 ? ペニス処理2.手左 : ペニス処理2.手右); @@ -755,9 +755,9 @@ namespace SlaveMatrix }, Runing = delegate(Mot m) { - if (ペニス処理2.肩 != null) + if (ペニス処理2.Shoulder != null) { - ペニス処理2.肩.角度C = s * 5.0 * m.Value; + ペニス処理2.Shoulder.角度C = s * 5.0 * m.Value; } if (ペニス処理2.下腕 != null) { @@ -794,9 +794,9 @@ namespace SlaveMatrix { ペニス処理2.手固定 = false; 調教UI.コキ = false; - if (ペニス処理2.肩 != null) + if (ペニス処理2.Shoulder != null) { - ペニス処理2.肩.角度C = 0.0; + ペニス処理2.Shoulder.角度C = 0.0; } if (ペニス処理2.下腕 != null) { @@ -1106,11 +1106,11 @@ namespace SlaveMatrix Bod = Cha.Bod; if (Bod.腕人n > 0) { - 肩左 = Bod.腕人左[0].肩; + 肩左 = Bod.腕人左[0].Shoulder; 上腕左 = Bod.腕人左[0].上腕; 下腕左 = Bod.腕人左[0].下腕; 手左 = Bod.腕人左[0].手; - 肩右 = Bod.腕人右[0].肩; + 肩右 = Bod.腕人右[0].Shoulder; 上腕右 = Bod.腕人右[0].上腕; 下腕右 = Bod.腕人右[0].下腕; 手右 = Bod.腕人右[0].手; @@ -1118,10 +1118,10 @@ namespace SlaveMatrix if (Bod.脚人n > 0) { 腿左 = Bod.脚人左[0].腿; - 脚左 = Bod.脚人左[0].脚; + 脚左 = Bod.脚人左[0].Leg; 足左 = Bod.脚人左[0].足; 腿右 = Bod.脚人右[0].腿; - 脚右 = Bod.脚人右[0].脚; + 脚右 = Bod.脚人右[0].Leg; 足右 = Bod.脚人右[0].足; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs index 63bc165..135c3f1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs @@ -418,7 +418,7 @@ namespace SlaveMatrix public JointS 腹板_接続点 => new JointS(本体, X0Y0_腹, 0); - public ボテ腹_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, ボテ腹_人D e) + public ボテ腹_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ボテ腹_人D e) { ボテ腹_人 ボテ腹_人2 = this; ThisType = GetType(); @@ -589,7 +589,7 @@ namespace SlaveMatrix X0Y4_ハイライト.SizeXBase *= num; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); キスマーク.Draw(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs index 59ab509..3945f1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.ボテ腹_人_腹板_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new ボテ腹_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs index f78f1ce..6fafee1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs @@ -157,7 +157,7 @@ namespace SlaveMatrix public JointS 腹板_接続点 => new JointS(本体, X0Y0_腹, 0); - public ボテ腹_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, ボテ腹_獣D e) + public ボテ腹_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ボテ腹_獣D e) { ボテ腹_獣 ボテ腹_獣2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs index 7008aad..81e4dc1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs @@ -25,7 +25,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.ボテ腹_獣_腹板_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new ボテ腹_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs index da3c54a..5826696 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs @@ -422,7 +422,7 @@ namespace SlaveMatrix } } - public ボテ腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, ボテ腹板D e) + public ボテ腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ボテ腹板D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["ボテ腹板"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs index 37aa626..bfad6f2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new ボテ腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs index 3f45657..b3c4281 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs @@ -329,7 +329,7 @@ namespace SlaveMatrix } } - public マウス(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, Med Med, マウスD e) + public マウス(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, マウスD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["マウス"]); @@ -466,7 +466,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexX) { @@ -516,7 +516,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexX) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウスD.cs index 7cb3cc9..163b346 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウスD.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 主人公配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return new マウス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs index a887c5d..0c63b52 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs @@ -36,7 +36,7 @@ namespace SlaveMatrix public void 吸引() { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.01), Sta.吸引.GetVal(1.0, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.2, b: true); }); @@ -379,9 +379,9 @@ namespace SlaveMatrix else if (k != null) { k.濃度 = (k.濃度 + 0.05).Clamp(0.0, 1.0); - if (マウス処理2.Bod.EI胸 != null) + if (マウス処理2.Bod.EIChest != null) { - マウス処理2.Bod.EI胸.Updatef = true; + マウス処理2.Bod.EIChest.Updatef = true; } if (マウス処理2.Bod.EI腕前 != null) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs index 3ffcd81..af1ef54 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs @@ -186,7 +186,7 @@ namespace SlaveMatrix } } - public ロータ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, ロータD e) + public ロータ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ロータD e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["ロータ"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs index 33a5a6e..67a4bf2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new ロータ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs index ea306cd..bafdb0c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs @@ -694,7 +694,7 @@ namespace SlaveMatrix } } - public 上着トップ_ドレス(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上着トップ_ドレスD e) + public 上着トップ_ドレス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着トップ_ドレスD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["上着トップ"][2]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs index 46d6da8..d0103dd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs @@ -79,7 +79,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上着トップ_ドレス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs index 2cef197..16f62e8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs @@ -642,7 +642,7 @@ namespace SlaveMatrix public JointS 上着ボトム後_接続点 => new JointS(本体, X0Y0_中_下地, 4); - public 上着ボトム_クロス(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上着ボトム_クロスD e) + public 上着ボトム_クロス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着ボトム_クロスD e) { 上着ボトム_クロス 上着ボトム_クロス2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs index 3e91bc3..ab3cc11 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs @@ -73,7 +73,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.上着ボトム_クロス_上着ボトム後_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上着ボトム_クロス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs index 0aec550..5f1e315 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs @@ -169,7 +169,7 @@ namespace SlaveMatrix } } - public 上着ボトム_クロス後(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上着ボトム_クロス後D e) + public 上着ボトム_クロス後(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着ボトム_クロス後D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["上着ボトム後"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs index a97b76d..da31596 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上着ボトム_クロス後(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs index 8d3e0dc..d21225a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs @@ -369,7 +369,7 @@ namespace SlaveMatrix } } - public 上着ボトム_前掛け(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上着ボトム_前掛けD e) + public 上着ボトム_前掛け(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着ボトム_前掛けD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["上着ボトム前"][1]); @@ -472,7 +472,7 @@ namespace SlaveMatrix 尺度YB = 0.95; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (本体.IndexY == 0) { @@ -493,7 +493,7 @@ namespace SlaveMatrix Are.Draw(X0Y1_縁前_縁中); } - public void 前(Are Are) + public void 前(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs index b7a34df..3d90495 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上着ボトム_前掛け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs index 05d321f..bc2f146 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs @@ -321,7 +321,7 @@ namespace SlaveMatrix } } - public 上着ミドル_ドレス(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上着ミドル_ドレスD e) + public 上着ミドル_ドレス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着ミドル_ドレスD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["上着ミドル"][2]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs index 0ec3c60..4b4b9a8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上着ミドル_ドレス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人.cs index 19fa871..38b16b2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人.cs @@ -3443,7 +3443,7 @@ namespace SlaveMatrix public JointS 下腕_接続点 => new JointS(本体, X0Y0_上腕, 1); - public 上腕_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上腕_人D e) + public 上腕_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上腕_人D e) { 上腕_人 上腕_人2 = this; ThisType = GetType(); @@ -3929,7 +3929,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_筋肉上); Are.Draw(X0Y0_上腕); @@ -4034,7 +4034,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_植性_欠損_葉1); } - public void 鎧描画(Are Are) + public void 鎧描画(RenderArea Are) { Are.Draw(X0Y0_鎧_ベルト_ベルト1); Are.Draw(X0Y0_鎧_ベルト_ベルト2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人D.cs index e102217..352a60b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_人D.cs @@ -336,7 +336,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.上腕_人_下腕_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上腕_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_獣.cs index 38d544d..11ef7f1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_獣.cs @@ -268,7 +268,7 @@ namespace SlaveMatrix public JointS 下腕_接続点 => new JointS(本体, X0Y0_上腕, 1); - public 上腕_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上腕_獣D e) + public 上腕_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上腕_獣D e) { 上腕_獣 上腕_獣2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_獣D.cs index f3a5344..056a489 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_獣D.cs @@ -36,7 +36,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.上腕_獣_下腕_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上腕_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蝙.cs index 7d29714..899235d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蝙.cs @@ -507,7 +507,7 @@ namespace SlaveMatrix public JointS 下腕_接続点 => new JointS(本体, X0Y0_獣翼上腕, 0); - public 上腕_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上腕_蝙D e) + public 上腕_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上腕_蝙D e) { 上腕_蝙 上腕_蝙2 = this; 飛膜 = new 飛膜_根(DisUnit, 配色指定, 体配色); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蝙D.cs index b42a2e6..c2ddbd9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蝙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蝙D.cs @@ -40,7 +40,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.上腕_蝙_下腕_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上腕_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蹄.cs index cd7329d..f96d911 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蹄.cs @@ -142,7 +142,7 @@ namespace SlaveMatrix public JointS 下腕_接続点 => new JointS(本体, X0Y0_上腕, 1); - public 上腕_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上腕_蹄D e) + public 上腕_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上腕_蹄D e) { 上腕_蹄 上腕_蹄2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蹄D.cs index d5a2245..b46e8a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_蹄D.cs @@ -24,7 +24,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.上腕_蹄_下腕_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上腕_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥.cs index b6dd8b1..f4934d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥.cs @@ -400,7 +400,7 @@ namespace SlaveMatrix public JointS 下腕_接続点 => new JointS(本体, X0Y0_鳥翼上腕, 0); - public 上腕_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 上腕_鳥D e) + public 上腕_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上腕_鳥D e) { 上腕_鳥 上腕_鳥2 = this; ThisType = GetType(); @@ -506,7 +506,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_風切羽_羽3); Are.Draw(X0Y0_風切羽_羽2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥D.cs index a17481c..100421d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上腕_鳥D.cs @@ -54,7 +54,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.上腕_鳥_下腕_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 上腕_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下ろし.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下ろし.cs index 37794bd..7579b87 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下ろし.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下ろし.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 下ろし : 後髪0 + public class 下ろし : BackHair0 { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs index 25fd2f7..9026900 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs @@ -588,7 +588,7 @@ namespace SlaveMatrix } } - public 下着トップ_クロス(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着トップ_クロスD e) + public 下着トップ_クロス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_クロスD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][4]); @@ -708,7 +708,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_布_布左_布); Are.Draw(X0Y0_布_布左_皺_皺1); @@ -722,7 +722,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_布_布右_縁_縁2); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_カップ右_布); Are.Draw(X0Y0_カップ右_皺); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs index 250105b..78c9c84 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs @@ -65,7 +65,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着トップ_クロス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs index 16e3468..842867f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs @@ -532,7 +532,7 @@ namespace SlaveMatrix } } - public 下着トップ_チューブ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着トップ_チューブD e) + public 下着トップ_チューブ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_チューブD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][3]); @@ -642,7 +642,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_布_布左_布); Are.Draw(X0Y0_布_布左_皺_皺1); @@ -656,7 +656,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_布_布右_縁_縁2); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_布_布); Are.Draw(X0Y0_皺_皺1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs index f6469e5..6c6c9eb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs @@ -61,7 +61,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着トップ_チューブ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs index d54d28a..c2be727 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs @@ -444,7 +444,7 @@ namespace SlaveMatrix } } - public 下着トップ_ビキニ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着トップ_ビキニD e) + public 下着トップ_ビキニ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_ビキニD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][1]); @@ -540,12 +540,12 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_紐); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_カップ左_紐); Are.Draw(X0Y0_カップ左_カップ); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs index 71b0d26..a8f53c6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着トップ_ビキニ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs index e0632af..6fd68a3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs @@ -2299,7 +2299,7 @@ namespace SlaveMatrix } } - public 下着トップ_ブラ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着トップ_ブラD e) + public 下着トップ_ブラ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_ブラD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][0]); @@ -2643,7 +2643,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_バンド_バンド); Are.Draw(X0Y0_バンド_縁_下); @@ -2652,7 +2652,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_バンド_縁_右); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_カップ左_紐); Are.Draw(X0Y0_カップ左_ジャスター_ジャスター1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs index e3029a8..a3da56f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs @@ -227,7 +227,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着トップ_ブラ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs index 85f9abf..fa7db2e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs @@ -444,7 +444,7 @@ namespace SlaveMatrix } } - public 下着トップ_マイクロ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着トップ_マイクロD e) + public 下着トップ_マイクロ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_マイクロD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][2]); @@ -540,11 +540,11 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_紐); Are.Draw(X0Y0_カップ左_紐); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs index 6522333..411149d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着トップ_マイクロ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs index 0506096..facc1ce 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs @@ -2709,7 +2709,7 @@ namespace SlaveMatrix } } - public 下着ボトム_ノーマル(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着ボトム_ノーマルD e) + public 下着ボトム_ノーマル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着ボトム_ノーマルD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着ボトム"][0]); @@ -3469,7 +3469,7 @@ namespace SlaveMatrix X0Y4_下地.BasePointBase = X0Y4_下地.BasePointBase.AddY(y); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { @@ -3496,7 +3496,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs index 7a0760f..a3f0e1a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs @@ -161,7 +161,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着ボトム_ノーマル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs index 8888c3e..a5603af 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs @@ -1784,7 +1784,7 @@ namespace SlaveMatrix } } - public 下着ボトム_マイクロ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着ボトム_マイクロD e) + public 下着ボトム_マイクロ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着ボトム_マイクロD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着ボトム"][1]); @@ -2289,7 +2289,7 @@ namespace SlaveMatrix X0Y4_下地.BasePointBase = X0Y4_下地.BasePointBase.AddY(y); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { @@ -2316,7 +2316,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs index 6b3c3f3..5a176d0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs @@ -101,7 +101,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着ボトム_マイクロ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs index 64ba0f0..f827541 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs @@ -177,7 +177,7 @@ namespace SlaveMatrix } } - public 下着乳首(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着乳首D e) + public 下着乳首(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着乳首D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["下着乳首左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs index d770b58..a0dd1f6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着乳首(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs index 0596b6f..d184759 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 下着陰核(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下着陰核D e) + public 下着陰核(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着陰核D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["下着陰核"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs index 1a67da7..e6d42b3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下着陰核(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人.cs index 80efe4d..2aaaf36 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人.cs @@ -4622,7 +4622,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_腕輪_金具右, 0); - public 下腕_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下腕_人D e) + public 下腕_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下腕_人D e) { 下腕_人 下腕_人2 = this; ThisType = GetType(); @@ -5296,7 +5296,7 @@ namespace SlaveMatrix 鎖1.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_下腕); Are.Draw(X0Y0_筋肉_筋肉下); @@ -5316,7 +5316,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_竜性1_手首_鱗1); } - public void 外腕描画(Are Are) + public void 外腕描画(RenderArea Are) { Are.Draw(X0Y0_植性1_通常_花弁_花弁); Are.Draw(X0Y0_植性1_通常_花弁_影_花弁影1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人D.cs index 16d4092..107467f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_人D.cs @@ -463,7 +463,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.下腕_人_虫鎌_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下腕_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣.cs index 2f6f690..5a56bae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣.cs @@ -452,7 +452,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_腕輪_金具右, 0); - public 下腕_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下腕_獣D e) + public 下腕_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下腕_獣D e) { 下腕_獣 下腕_獣2 = this; ThisType = GetType(); @@ -567,7 +567,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣D.cs index be3d426..d6de871 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_獣D.cs @@ -54,7 +54,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.下腕_獣_手_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下腕_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙.cs index e3b9b45..6520030 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙.cs @@ -560,7 +560,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_腕輪_金具右, 0); - public 下腕_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下腕_蝙D e) + public 下腕_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下腕_蝙D e) { 下腕_蝙 下腕_蝙2 = this; ThisType = GetType(); @@ -708,7 +708,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_獣翼下腕); Are.Draw(X0Y0_竜性_鱗1); @@ -726,7 +726,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_竜性_鱗13); } - public void 腕輪描画(Are Are) + public void 腕輪描画(RenderArea Are) { Are.Draw(X0Y0_腕輪_革); Are.Draw(X0Y0_腕輪_金具1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙D.cs index 0f2f6e3..945cd3f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蝙D.cs @@ -76,7 +76,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.下腕_蝙_腕輪_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下腕_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蹄.cs index 7eb527c..654d321 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蹄.cs @@ -142,7 +142,7 @@ namespace SlaveMatrix public JointS 手_接続点 => new JointS(本体, X0Y0_下腕, 2); - public 下腕_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下腕_蹄D e) + public 下腕_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下腕_蹄D e) { 下腕_蹄 下腕_蹄2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蹄D.cs index 5da32c1..ab22f42 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_蹄D.cs @@ -24,7 +24,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.下腕_蹄_手_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下腕_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥.cs index d80168f..d949b1d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥.cs @@ -2075,7 +2075,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_腕輪_金具右, 0); - public 下腕_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 下腕_鳥D e) + public 下腕_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下腕_鳥D e) { 下腕_鳥 下腕_鳥2 = this; ThisType = GetType(); @@ -2420,7 +2420,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_鳥翼下腕); Are.Draw(X0Y0_風切羽_羽15); @@ -2467,7 +2467,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_中雨覆羽_羽1); } - public void 小雨覆描画(Are Are) + public void 小雨覆描画(RenderArea Are) { Are.Draw(X0Y0_小雨覆_小雨覆); Are.Draw(X0Y0_小雨覆_竜性_鱗1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥D.cs index 9e05b15..a5fffab 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下腕_鳥D.cs @@ -232,7 +232,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.下腕_鳥_手_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 下腕_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs index f6eec77..a564d62 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs @@ -792,7 +792,7 @@ namespace SlaveMatrix public JointS 噴乳_接続点 => new JointS(本体, X0Y0_乳首, 0); - public 乳房(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 乳房D e) + public 乳房(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 乳房D e) { 乳房 乳房2 = this; ThisType = GetType(); @@ -1004,7 +1004,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs index 659ee67..f4efb0d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs @@ -61,7 +61,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.乳房_噴乳_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 乳房(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs index b2e44e6..5d148ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs @@ -87,7 +87,7 @@ namespace SlaveMatrix Sta.鳳凰Dt.ToString() }; - private static HashSet 肩人 = new HashSet { Sta.肩Dt.ToString() }; + private static HashSet 肩人 = new HashSet { Sta.ShoulderDt.ToString() }; private static HashSet 胸翼上人 = new HashSet { @@ -579,8 +579,8 @@ namespace SlaveMatrix Sta.触肢_肢蠍Dt.ToString(), Sta.上腕_獣Dt.ToString(), Sta.上腕_蹄Dt.ToString(), - Sta.脚_鳥Dt.ToString(), - Sta.脚_竜Dt.ToString() + Sta.Leg_鳥Dt.ToString(), + Sta.Leg_竜Dt.ToString() }; private static HashSet 下腕人 = new HashSet @@ -613,38 +613,38 @@ namespace SlaveMatrix private static HashSet 虫鎌 = new HashSet { Sta.虫鎌Dt.ToString() }; - private static HashSet 脚人 = new HashSet { Sta.脚_人Dt.ToString() }; + private static HashSet 脚人 = new HashSet { Sta.Leg_人Dt.ToString() }; private static HashSet 脚獣 = new HashSet { - Sta.脚_獣Dt.ToString(), - Sta.脚_蹄Dt.ToString(), - Sta.脚_鳥Dt.ToString(), - Sta.脚_竜Dt.ToString() + Sta.Leg_獣Dt.ToString(), + Sta.Leg_蹄Dt.ToString(), + Sta.Leg_鳥Dt.ToString(), + Sta.Leg_竜Dt.ToString() }; private static HashSet 脚蹄 = new HashSet { - Sta.脚_獣Dt.ToString(), - Sta.脚_蹄Dt.ToString(), - Sta.脚_鳥Dt.ToString(), - Sta.脚_竜Dt.ToString() + Sta.Leg_獣Dt.ToString(), + Sta.Leg_蹄Dt.ToString(), + Sta.Leg_鳥Dt.ToString(), + Sta.Leg_竜Dt.ToString() }; private static HashSet 脚鳥 = new HashSet { - Sta.脚_獣Dt.ToString(), - Sta.脚_蹄Dt.ToString(), - Sta.脚_鳥Dt.ToString(), - Sta.脚_竜Dt.ToString() + Sta.Leg_獣Dt.ToString(), + Sta.Leg_蹄Dt.ToString(), + Sta.Leg_鳥Dt.ToString(), + Sta.Leg_竜Dt.ToString() }; private static HashSet 脚竜 = new HashSet { - Sta.脚_獣Dt.ToString(), - Sta.脚_蹄Dt.ToString(), - Sta.脚_鳥Dt.ToString(), - Sta.脚_竜Dt.ToString() + Sta.Leg_獣Dt.ToString(), + Sta.Leg_蹄Dt.ToString(), + Sta.Leg_鳥Dt.ToString(), + Sta.Leg_竜Dt.ToString() }; private static HashSet 足人 = new HashSet { Sta.足_人Dt.ToString() }; @@ -735,115 +735,115 @@ namespace SlaveMatrix 側頭 }, { - ConnectionInfo.頭_触覚左_接続, + ConnectionInfo.Head_触覚左_接続, 触覚 }, { - ConnectionInfo.頭_触覚右_接続, + ConnectionInfo.Head_触覚右_接続, 触覚 }, { - ConnectionInfo.頭_耳左_接続, + ConnectionInfo.Head_耳左_接続, 耳 }, { - ConnectionInfo.頭_耳右_接続, + ConnectionInfo.Head_耳右_接続, 耳 }, { - ConnectionInfo.頭_頬左_接続, + ConnectionInfo.Head_頬左_接続, 頬 }, { - ConnectionInfo.頭_頬右_接続, + ConnectionInfo.Head_頬右_接続, 頬 }, { - ConnectionInfo.後髪0_肢系_左5_接続, + ConnectionInfo.BackHair0_肢系_左5_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_右5_接続, + ConnectionInfo.BackHair0_肢系_右5_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_左4_接続, + ConnectionInfo.BackHair0_肢系_左4_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_右4_接続, + ConnectionInfo.BackHair0_肢系_右4_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_左3_接続, + ConnectionInfo.BackHair0_肢系_左3_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_右3_接続, + ConnectionInfo.BackHair0_肢系_右3_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_左2_接続, + ConnectionInfo.BackHair0_肢系_左2_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_右2_接続, + ConnectionInfo.BackHair0_肢系_右2_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_左1_接続, + ConnectionInfo.BackHair0_肢系_左1_接続, 後髪 }, { - ConnectionInfo.後髪0_肢系_右1_接続, + ConnectionInfo.BackHair0_肢系_右1_接続, 後髪 }, { - ConnectionInfo.胸_肩左_接続, + ConnectionInfo.Chest_肩左_接続, 肩人 }, { - ConnectionInfo.胸_肩右_接続, + ConnectionInfo.Chest_肩右_接続, 肩人 }, { - ConnectionInfo.胸_翼上左_接続, + ConnectionInfo.Chest_翼上左_接続, 胸翼上人 }, { - ConnectionInfo.胸_翼上右_接続, + ConnectionInfo.Chest_翼上右_接続, 胸翼上人 }, { - ConnectionInfo.胸_翼下左_接続, + ConnectionInfo.Chest_翼下左_接続, 胸翼下人 }, { - ConnectionInfo.胸_翼下右_接続, + ConnectionInfo.Chest_翼下右_接続, 胸翼下人 }, { - ConnectionInfo.胴_翼左_接続, + ConnectionInfo.Torso_翼左_接続, 胴翼人 }, { - ConnectionInfo.胴_翼右_接続, + ConnectionInfo.Torso_翼右_接続, 胴翼人 }, { - ConnectionInfo.腰_翼左_接続, + ConnectionInfo.Waist_翼左_接続, 腰翼人 }, { - ConnectionInfo.腰_翼右_接続, + ConnectionInfo.Waist_翼右_接続, 腰翼人 }, { - ConnectionInfo.腰_腿左_接続, + ConnectionInfo.Waist_腿左_接続, 腿人 }, { - ConnectionInfo.腰_腿右_接続, + ConnectionInfo.Waist_腿右_接続, 腿人 }, { @@ -1055,11 +1055,11 @@ namespace SlaveMatrix 蛇 }, { - ConnectionInfo.胴_蛇_左_接続, + ConnectionInfo.Torso_蛇_左_接続, 蛇 }, { - ConnectionInfo.胴_蛇_右_接続, + ConnectionInfo.Torso_蛇_右_接続, 蛇 }, { @@ -1127,11 +1127,11 @@ namespace SlaveMatrix 蟲尾先 }, { - ConnectionInfo.胴_蟲_左_接続, + ConnectionInfo.Torso_蟲_左_接続, 蟲 }, { - ConnectionInfo.胴_蟲_右_接続, + ConnectionInfo.Torso_蟲_右_接続, 蟲 }, { @@ -1159,15 +1159,15 @@ namespace SlaveMatrix 触覚蟲 }, { - ConnectionInfo.頭_頭頂_接続, + ConnectionInfo.Head_頭頂_接続, 頭頂 }, { - ConnectionInfo.頭_額_接続, + ConnectionInfo.Head_額_接続, 額 }, { - ConnectionInfo.胸_背中_接続, + ConnectionInfo.Chest_背中_接続, 背中人 }, { @@ -1175,7 +1175,7 @@ namespace SlaveMatrix 背中獣 }, { - ConnectionInfo.腰_尾_接続, + ConnectionInfo.Waist_尾_接続, 尾人 }, { @@ -1199,19 +1199,19 @@ namespace SlaveMatrix 尾鯨 }, { - ConnectionInfo.長物_蛇_胴_接続, + ConnectionInfo.長物_蛇_Torso_接続, 尾蛇 }, { - ConnectionInfo.長物_蟲_胴_接続, + ConnectionInfo.長物_蟲_Torso_接続, 尾蟲 }, { - ConnectionInfo.胴_蛇_胴_接続, + ConnectionInfo.Torso_蛇_Torso_接続, 尾蛇 }, { - ConnectionInfo.胴_蟲_胴_接続, + ConnectionInfo.Torso_蟲_Torso_接続, 尾蟲 }, { @@ -1239,15 +1239,15 @@ namespace SlaveMatrix 頭頂後 }, { - ConnectionInfo.頭_大顎基_接続, + ConnectionInfo.Head_大顎基_接続, 大顎基 }, { - ConnectionInfo.頭_顔面_接続, + ConnectionInfo.Head_顔面_接続, 顔面 }, { - ConnectionInfo.肩_上腕_接続, + ConnectionInfo.Shoulder_上腕_接続, 上腕人 }, { @@ -1299,43 +1299,43 @@ namespace SlaveMatrix 虫鎌 }, { - ConnectionInfo.腿_人_脚_接続, + ConnectionInfo.腿_人_Leg_接続, 脚人 }, { - ConnectionInfo.腿_獣_脚_接続, + ConnectionInfo.腿_獣_Leg_接続, 脚獣 }, { - ConnectionInfo.腿_蹄_脚_接続, + ConnectionInfo.腿_蹄_Leg_接続, 脚蹄 }, { - ConnectionInfo.腿_鳥_脚_接続, + ConnectionInfo.腿_鳥_Leg_接続, 脚鳥 }, { - ConnectionInfo.腿_竜_脚_接続, + ConnectionInfo.腿_竜_Leg_接続, 脚竜 }, { - ConnectionInfo.脚_人_足_接続, + ConnectionInfo.Leg_人_足_接続, 足人 }, { - ConnectionInfo.脚_獣_足_接続, + ConnectionInfo.Leg_獣_足_接続, 足獣 }, { - ConnectionInfo.脚_蹄_足_接続, + ConnectionInfo.Leg_蹄_足_接続, 足蹄 }, { - ConnectionInfo.脚_鳥_足_接続, + ConnectionInfo.Leg_鳥_足_接続, 足鳥 }, { - ConnectionInfo.脚_竜_足_接続, + ConnectionInfo.Leg_竜_足_接続, 足竜 }, { @@ -1351,7 +1351,7 @@ namespace SlaveMatrix 前翅甲軸3 }, { - ConnectionInfo.触手_犬_頭_接続, + ConnectionInfo.触手_犬_Head_接続, 犬頭 }, { @@ -1446,7 +1446,7 @@ namespace SlaveMatrix private static Type[] t0 = new Type[0]; - private static 体色 Mix(体色 母方, 体色 父方, double 変異率, 腰D d) + private static 体色 Mix(体色 母方, 体色 父方, double 変異率, WaistD d) { 体色 体色2 = new 体色(); switch (RNG.XS.Next(4)) @@ -1792,12 +1792,12 @@ namespace SlaveMatrix }; } - private static 腰D Mix(腰D 母方, 腰D 父方, double 変異率, bool 原種モード) + private static WaistD Mix(WaistD 母方, WaistD 父方, double 変異率, bool 原種モード) { int i = (原種モード ? RNG.XS.Next(3) : RNG.XS.Next(7)); Dictionary> 接続構成 = Get接続構成(母方, 父方); Type[] 要素構成 = Get要素構成(母方, 父方); - 頭D 頭D2 = Mix<頭D>(母方, 父方, i, 原種モード); + HeadD 頭D2 = Mix(母方, 父方, i, 原種モード); 基髪D 基髪D2 = new 基髪D(); 頭D2.基髪接続(基髪D2); 頭D2.目左接続(new 目傷D()); @@ -1822,36 +1822,36 @@ namespace SlaveMatrix 頭D2.単眼目接続(new 目隠帯D()); 頭D2.口接続(new 玉口枷D()); 頭D2.AlignC(); - 首D 首D2 = Mix<首D>(母方, 父方, i, 原種モード); + NeckD 首D2 = Mix(母方, 父方, i, 原種モード); 首D2.頭接続(頭D2); - 胸D 胸D2 = Mix<胸D>(母方, 父方, i, 原種モード); + ChestD ChestD2 = Mix(母方, 父方, i, 原種モード); 乳房D 乳房D2 = Mix<乳房D>(母方, 父方, 右: false, i, 原種モード); 乳房D2.噴乳接続(new 噴乳D()); 乳房D2.噴乳接続(new ピアスD()); 乳房D2.噴乳接続(new キャップ2D()); 乳房D2.噴乳接続(new 下着乳首D()); - 胸D2.胸左接続(乳房D2); - 胸D2.胸右接続(乳房D2.Get逆()); - 胸D2.肌接続(Mix<胸毛D>(母方, 父方, i, 原種モード)); - 胸D2.肌接続(Mix<胸肌D>(母方, 父方, i, 原種モード)); + ChestD2.胸左接続(乳房D2); + ChestD2.胸右接続(乳房D2.Get逆()); + ChestD2.肌接続(Mix<胸毛D>(母方, 父方, i, 原種モード)); + ChestD2.肌接続(Mix<胸肌D>(母方, 父方, i, 原種モード)); 胸腹板D 胸腹板D2; - 胸D2.肌接続(胸腹板D2 = Mix<胸腹板D>(母方, 父方, i, 原種モード)); - 胸D2.肌接続(new 下着トップ_チューブD()); - 胸D2.肌接続(new 下着トップ_クロスD()); - 胸D2.肌接続(new 下着トップ_ビキニD()); - 胸D2.肌接続(new 下着トップ_マイクロD()); - 胸D2.肌接続(new 下着トップ_ブラD()); - 胸D2.肌接続(new 上着トップ_ドレスD()); - 胸D2.AlignC(); - 胸D2.首接続(首D2); - 胴D 胴D2 = Mix<胴D>(母方, 父方, i, 原種モード); + ChestD2.肌接続(胸腹板D2 = Mix<胸腹板D>(母方, 父方, i, 原種モード)); + ChestD2.肌接続(new 下着トップ_チューブD()); + ChestD2.肌接続(new 下着トップ_クロスD()); + ChestD2.肌接続(new 下着トップ_ビキニD()); + ChestD2.肌接続(new 下着トップ_マイクロD()); + ChestD2.肌接続(new 下着トップ_ブラD()); + ChestD2.肌接続(new 上着トップ_ドレスD()); + ChestD2.AlignC(); + ChestD2.首接続(首D2); + TorsoD 胴D2 = Mix(母方, 父方, i, 原種モード); 胴腹板D 胴腹板D2; 胴D2.肌接続(胴腹板D2 = Mix<胴腹板D>(母方, 父方, i, 原種モード)); 胴D2.肌接続(Mix<胴肌D>(母方, 父方, i, 原種モード)); 胴D2.肌接続(new 上着ミドル_ドレスD()); 胴D2.AlignC(); - 胴D2.胸接続(胸D2); - 腰D 腰 = Mix<腰D>(母方, 父方, i, 原種モード); + 胴D2.Torso接続(ChestD2); + WaistD 腰 = Mix(母方, 父方, i, 原種モード); 腰.膣基接続(new 膣基_人D()); 腰.膣基接続(new 膣内精液_人D()); 腰.膣基接続(new 断面_人D()); @@ -1874,14 +1874,14 @@ namespace SlaveMatrix EleD eleD = SlaveMatrix.GameClasses._Con.Get後髪0R(); 基髪D2.後髪接続(eleD); eleD.AlignR(); - if (eleD is 後髪0_肢系D && 変異率.Lot()) + if (eleD is BackHair0_肢系D && 変異率.Lot()) { - eleD.接続(母方, 父方, i, ConnectionInfo.後髪0_肢系_左2_接続, 要素構成, 接続構成, 変異率, 原種モード); - eleD.接続(母方, 父方, i, ConnectionInfo.後髪0_肢系_左3_接続, 要素構成, 接続構成, 変異率, 原種モード); - eleD.接続(母方, 父方, i, ConnectionInfo.後髪0_肢系_左4_接続, 要素構成, 接続構成, 変異率, 原種モード); - eleD.接続(母方, 父方, i, ConnectionInfo.後髪0_肢系_左5_接続, 要素構成, 接続構成, 変異率, 原種モード); + eleD.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左2_接続, 要素構成, 接続構成, 変異率, 原種モード); + eleD.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左3_接続, 要素構成, 接続構成, 変異率, 原種モード); + eleD.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左4_接続, 要素構成, 接続構成, 変異率, 原種モード); + eleD.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左5_接続, 要素構成, 接続構成, 変異率, 原種モード); } - if ((eleD is 後髪0_ジグD || eleD is 後髪0_ハネD || eleD is 後髪0_パツD || eleD is 後髪0_カルD || eleD is 後髪0_肢系D) && RNG.XS.NextBool()) + if ((eleD is BackHair0_ジグD || eleD is BackHair0_ハネD || eleD is BackHair0_パツD || eleD is BackHair0_カルD || eleD is BackHair0_肢系D) && RNG.XS.NextBool()) { EleD e2 = SlaveMatrix.GameClasses._Con.Get後髪1R(); 基髪D2.後髪接続(e2); @@ -1902,16 +1902,16 @@ namespace SlaveMatrix { 基髪D2.後髪接続(後髪0D2); 後髪0D2.AlignR(); - if (後髪0D2 is 後髪0_肢系D && 変異率.Lot()) + if (後髪0D2 is BackHair0_肢系D && 変異率.Lot()) { - 後髪0D2.接続(母方, 父方, i, ConnectionInfo.後髪0_肢系_左2_接続, 要素構成, 接続構成, 変異率, 原種モード); - 後髪0D2.接続(母方, 父方, i, ConnectionInfo.後髪0_肢系_左3_接続, 要素構成, 接続構成, 変異率, 原種モード); - 後髪0D2.接続(母方, 父方, i, ConnectionInfo.後髪0_肢系_左4_接続, 要素構成, 接続構成, 変異率, 原種モード); - 後髪0D2.接続(母方, 父方, i, ConnectionInfo.後髪0_肢系_左5_接続, 要素構成, 接続構成, 変異率, 原種モード); + 後髪0D2.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左2_接続, 要素構成, 接続構成, 変異率, 原種モード); + 後髪0D2.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左3_接続, 要素構成, 接続構成, 変異率, 原種モード); + 後髪0D2.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左4_接続, 要素構成, 接続構成, 変異率, 原種モード); + 後髪0D2.接続(母方, 父方, i, ConnectionInfo.BackHair0_肢系_左5_接続, 要素構成, 接続構成, 変異率, 原種モード); } - if ((後髪0D2 is 後髪0_ジグD || 後髪0D2 is 後髪0_ハネD || 後髪0D2 is 後髪0_パツD || 後髪0D2 is 後髪0_カルD || 後髪0D2 is 後髪0_肢系D) && RNG.XS.NextBool()) + if ((後髪0D2 is BackHair0_ジグD || 後髪0D2 is BackHair0_ハネD || 後髪0D2 is BackHair0_パツD || 後髪0D2 is BackHair0_カルD || 後髪0D2 is BackHair0_肢系D) && RNG.XS.NextBool()) { - 後髪1D 後髪1D2 = Mix<後髪1D>(母方, 父方, i, 原種モード); + BackHair1D 後髪1D2 = Mix(母方, 父方, i, 原種モード); if (後髪1D2 != null) { 基髪D2.後髪接続(後髪1D2); @@ -1921,14 +1921,14 @@ namespace SlaveMatrix } else if (RNG.XS.NextBool()) { - 後髪1D 後髪1D3 = Mix<後髪1D>(母方, 父方, i, 原種モード); + BackHair1D 後髪1D3 = Mix(母方, 父方, i, 原種モード); if (後髪1D3 != null) { 基髪D2.後髪接続(後髪1D3); 後髪1D3.AlignR(); } } - 横髪D 横髪D2 = Mix<横髪D>(母方, 父方, 右: false, i, 原種モード); + SideHairD 横髪D2 = Mix(母方, 父方, 右: false, i, 原種モード); 基髪D2.横髪左接続(横髪D2); 横髪D2.AlignR(); 基髪D2.横髪右接続(横髪D2.Get逆()); @@ -2153,22 +2153,22 @@ namespace SlaveMatrix 頭D2.口接続(舌D2); } } - 頭D2.接続(母方, 父方, i, ConnectionInfo.頭_耳左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 頭D2.接続(母方, 父方, i, ConnectionInfo.Head_耳左_接続, 要素構成, 接続構成, 変異率, 原種モード); 基髪D2.接続(母方, 父方, i, ConnectionInfo.基髪_頭頂左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 頭D2.接続(母方, 父方, i, ConnectionInfo.頭_頬左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 頭D2.接続(母方, 父方, i, ConnectionInfo.頭_大顎基_接続, 要素構成, 接続構成, 変異率, 原種モード); - 頭D2.接続(母方, 父方, i, ConnectionInfo.頭_顔面_接続, 要素構成, 接続構成, 変異率, 原種モード); - 頭D2.接続(母方, 父方, i, ConnectionInfo.頭_頭頂_接続, 要素構成, 接続構成, 変異率, 原種モード); - 頭D2.接続(母方, 父方, i, ConnectionInfo.頭_触覚左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胸D2.接続(母方, 父方, i, ConnectionInfo.胸_肩左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 頭D2.接続(母方, 父方, i, ConnectionInfo.頭_額_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胸D2.接続(母方, 父方, i, ConnectionInfo.胸_翼上左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胸D2.接続(母方, 父方, i, ConnectionInfo.胸_翼下左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胴D2.接続(母方, 父方, i, ConnectionInfo.胴_翼左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 腰.接続(母方, 父方, i, ConnectionInfo.腰_翼左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 頭D2.接続(母方, 父方, i, ConnectionInfo.Head_頬左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 頭D2.接続(母方, 父方, i, ConnectionInfo.Head_大顎基_接続, 要素構成, 接続構成, 変異率, 原種モード); + 頭D2.接続(母方, 父方, i, ConnectionInfo.Head_顔面_接続, 要素構成, 接続構成, 変異率, 原種モード); + 頭D2.接続(母方, 父方, i, ConnectionInfo.Head_頭頂_接続, 要素構成, 接続構成, 変異率, 原種モード); + 頭D2.接続(母方, 父方, i, ConnectionInfo.Head_触覚左_接続, 要素構成, 接続構成, 変異率, 原種モード); + ChestD2.接続(母方, 父方, i, ConnectionInfo.Chest_肩左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 頭D2.接続(母方, 父方, i, ConnectionInfo.Head_額_接続, 要素構成, 接続構成, 変異率, 原種モード); + ChestD2.接続(母方, 父方, i, ConnectionInfo.Chest_翼上左_接続, 要素構成, 接続構成, 変異率, 原種モード); + ChestD2.接続(母方, 父方, i, ConnectionInfo.Chest_翼下左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴D2.接続(母方, 父方, i, ConnectionInfo.Torso_翼左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_翼左_接続, 要素構成, 接続構成, 変異率, 原種モード); if (原種モード) { - 胸D2.接続(母方, 父方, i, ConnectionInfo.胸_背中_接続, 要素構成, 接続構成, 変異率, 原種モード); + ChestD2.接続(母方, 父方, i, ConnectionInfo.Chest_背中_接続, 要素構成, 接続構成, 変異率, 原種モード); } else { @@ -2177,27 +2177,27 @@ namespace SlaveMatrix if (eleD3 != null) { t = eleD3.GetType().ToString(); - if (!胸D2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) + if (!ChestD2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) { - 胸D2.背中接続(eleD3); + ChestD2.背中接続(eleD3); } } eleD3 = Mix<背中D>(母方, 父方, i, 原種モード); if (eleD3 != null) { t = eleD3.GetType().ToString(); - if (!胸D2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) + if (!ChestD2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) { - 胸D2.背中接続(eleD3); + ChestD2.背中接続(eleD3); } } eleD3 = Mix<背中D>(母方, 父方, i, 原種モード); if (eleD3 != null) { t = eleD3.GetType().ToString(); - if (!胸D2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) + if (!ChestD2.背中_接続.Any((EleD e) => e.GetType().ToString() == t) && RNG.XS.NextBool()) { - 胸D2.背中接続(eleD3); + ChestD2.背中接続(eleD3); } } } @@ -2242,7 +2242,7 @@ namespace SlaveMatrix { item5.尺度B = 尺度B2; } - 腰.接続(母方, 父方, i, ConnectionInfo.腰_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); for (int num3 = 腰.腿左_接続.Count - 1; num3 > -1; num3--) { if (!(腰.腿左_接続[num3] is 触手_犬D)) @@ -2315,7 +2315,7 @@ namespace SlaveMatrix { item10.尺度B = 尺度B3; } - 腰.接続(母方, 父方, i, ConnectionInfo.腰_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); for (int num7 = 腰.腿左_接続.Count - 1; num7 > -1; num7--) { if (!(腰.腿左_接続[num7] is 触手_犬D)) @@ -2352,10 +2352,10 @@ namespace SlaveMatrix { 長物_蛇D 長物_蛇D2 = (長物_蛇D)半身; 長物_蛇D2.接続(母方, 父方, i, ConnectionInfo.長物_蛇_左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胴_蛇D 胴_蛇D2 = Mix<胴_蛇D>(母方, 父方, i, 原種モード); + Torso_蛇D 胴_蛇D2 = Mix(母方, 父方, i, 原種モード); if (胴_蛇D2 != null) { - 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.胴_蛇_左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.Torso_蛇_左_接続, 要素構成, 接続構成, 変異率, 原種モード); 長胴D 長胴D2 = (長胴D)胴_蛇D2.Copy(); 長物_蛇D2.胴接続(胴_蛇D2); int num11 = 2; @@ -2365,20 +2365,20 @@ namespace SlaveMatrix num11 = (num11 + RNG.XS.NextSign() * RNG.XS.Next(4)).Clamp(0, 50); for (int l = 0; l < num11; l++) { - 胴_蛇D2.胴接続(胴_蛇D2 = (胴_蛇D)長胴D2.Copy()); + 胴_蛇D2.Torso接続(胴_蛇D2 = (Torso_蛇D)長胴D2.Copy()); } - 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.胴_蛇_胴_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴_蛇D2.接続(母方, 父方, i, ConnectionInfo.Torso_蛇_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); if (胴_蛇D2.EnumEleD().IsEleD<腿D>()) { - IEnumerable<胴_蛇D> eleDs = 長物_蛇D2.EnumEleD().Skip(1).GetEleDs<胴_蛇D>(); - foreach (胴_蛇D item11 in eleDs.Take(eleDs.Count() - 1)) + IEnumerable eleDs = 長物_蛇D2.EnumEleD().Skip(1).GetEleDs(); + foreach (Torso_蛇D item11 in eleDs.Take(eleDs.Count() - 1)) { item11.左_接続.Clear(); item11.右_接続.Clear(); } if (num11 < 2) { - 胴_蛇D obj = eleDs.Last(); + Torso_蛇D obj = eleDs.Last(); obj.左_接続.Clear(); obj.右_接続.Clear(); } @@ -2386,7 +2386,7 @@ namespace SlaveMatrix else { int num14 = 0; - foreach (胴_蛇D eleD7 in 長物_蛇D2.EnumEleD().Skip(1).GetEleDs<胴_蛇D>()) + foreach (Torso_蛇D eleD7 in 長物_蛇D2.EnumEleD().Skip(1).GetEleDs()) { if (num14 % 3 != 1) { @@ -2399,7 +2399,7 @@ namespace SlaveMatrix } else { - 長物_蛇D2.接続(母方, 父方, i, ConnectionInfo.長物_蛇_胴_接続, 要素構成, 接続構成, 変異率, 原種モード); + 長物_蛇D2.接続(母方, 父方, i, ConnectionInfo.長物_蛇_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); } 長物_蛇D2.AlignC(); if (長物_蛇D2.ガード) @@ -2411,7 +2411,7 @@ namespace SlaveMatrix 腰肌.獣性_獣毛_表示 = false; 腰肌.陰毛_表示 = false; } - 腰.接続(母方, 父方, i, ConnectionInfo.腰_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); for (int num15 = 腰.腿左_接続.Count - 1; num15 > -1; num15--) { if (!(腰.腿左_接続[num15] is 触手_犬D)) @@ -2449,10 +2449,10 @@ namespace SlaveMatrix 長物_蟲D 長物_蟲D2 = (長物_蟲D)半身; 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_左0_接続, 要素構成, 接続構成, 変異率, 原種モード); 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_左1_接続, 要素構成, 接続構成, 変異率, 原種モード); - 胴_蟲D 胴_蟲D2 = Mix<胴_蟲D>(母方, 父方, i, 原種モード); + Torso_蟲D 胴_蟲D2 = Mix(母方, 父方, i, 原種モード); if (胴_蟲D2 != null) { - 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.胴_蟲_左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.Torso_蟲_左_接続, 要素構成, 接続構成, 変異率, 原種モード); 長胴D 長胴D3 = (長胴D)胴_蟲D2.Copy(); 長物_蟲D2.胴接続(胴_蟲D2); int num19 = 2; @@ -2462,13 +2462,13 @@ namespace SlaveMatrix num19 = (num19 + RNG.XS.NextSign() * RNG.XS.Next(4)).Clamp(0, 50); for (int m = 0; m < num19; m++) { - 胴_蟲D2.胴接続(胴_蟲D2 = (胴_蟲D)長胴D3.Copy()); + 胴_蟲D2.Torso接続(胴_蟲D2 = (Torso_蟲D)長胴D3.Copy()); } - 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.胴_蟲_胴_接続, 要素構成, 接続構成, 変異率, 原種モード); + 胴_蟲D2.接続(母方, 父方, i, ConnectionInfo.Torso_蟲_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); } else { - 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_胴_接続, 要素構成, 接続構成, 変異率, 原種モード); + 長物_蟲D2.接続(母方, 父方, i, ConnectionInfo.長物_蟲_Torso_接続, 要素構成, 接続構成, 変異率, 原種モード); } 長物_蟲D2.AlignC(); 腰.翼左_接続.RemoveAll((EleD e) => e is 四足脇D); @@ -2603,8 +2603,8 @@ namespace SlaveMatrix e.前足 = true; e.後足 = false; }); - 腰.接続(母方, 父方, i, ConnectionInfo.腰_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 腰.接続(母方, 父方, i, ConnectionInfo.腰_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); for (int num22 = 腰.腿左_接続.Count - 1; num22 > -1; num22--) { if (!(腰.腿左_接続[num22] is 触手_犬D)) @@ -2976,7 +2976,7 @@ namespace SlaveMatrix e5.接続(母方, 父方, i, ConnectionInfo.単足_植_根外左_接続, 要素構成, 接続構成, 変異率, 原種モード); e5.接続(母方, 父方, i, ConnectionInfo.単足_植_根内左_接続, 要素構成, 接続構成, 変異率, 原種モード); e5.接続(母方, 父方, i, ConnectionInfo.単足_植_根中央_接続, 要素構成, 接続構成, 変異率, 原種モード); - 腰.接続(母方, 父方, i, ConnectionInfo.腰_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); for (int num26 = 腰.腿左_接続.Count - 1; num26 > -1; num26--) { if (!(腰.腿左_接続[num26] is 触手_犬D)) @@ -3014,12 +3014,12 @@ namespace SlaveMatrix 腰.腿左接続(腿_人D2); 腰.腿右接続(腿_人D2.Get逆()); } - 腰.接続(母方, 父方, i, ConnectionInfo.腰_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); } else if (半身 is 単足_粘D) { _ = (単足_粘D)半身; - 腰.接続(母方, 父方, i, ConnectionInfo.腰_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); for (int num30 = 腰.腿左_接続.Count - 1; num30 > -1; num30--) { if (!(腰.腿左_接続[num30] is 触手_犬D)) @@ -3057,13 +3057,13 @@ namespace SlaveMatrix 腰.腿左接続(腿_人D3); 腰.腿右接続(腿_人D3.Get逆()); } - 腰.接続(母方, 父方, i, ConnectionInfo.腰_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); } }; Action action2 = delegate { - 腰.接続(母方, 父方, i, ConnectionInfo.腰_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); - 腰.接続(母方, 父方, i, ConnectionInfo.腰_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_腿左_接続, 要素構成, 接続構成, 変異率, 原種モード); + 腰.接続(母方, 父方, i, ConnectionInfo.Waist_尾_接続, 要素構成, 接続構成, 変異率, 原種モード); }; if (半身 != null) { @@ -3400,7 +3400,7 @@ namespace SlaveMatrix { item98.尺度B = num; } - if (item32.接続情報 != ConnectionInfo.腰_腿左_接続 && item32.接続情報 != ConnectionInfo.腰_腿右_接続) + if (item32.接続情報 != ConnectionInfo.Waist_腿左_接続 && item32.接続情報 != ConnectionInfo.Waist_腿右_接続) { 尾_魚D2.尾0_表示 = true; 尾_魚D2.尾0_鱗右_鱗1_表示 = true; @@ -3784,7 +3784,7 @@ namespace SlaveMatrix { ((上腕_蝙D)item32).竜性_鱗1_表示 = false; } - else if (item32 is 上腕D && item32.Par is 肩D) + else if (item32 is 上腕D && item32.Par is ShoulderD) { item32.AlignR(); } @@ -4282,7 +4282,7 @@ namespace SlaveMatrix return val; } - private static T Mix(腰D 母方, 腰D 父方, int i, bool 原種モード) where T : EleD + private static T Mix(WaistD 母方, WaistD 父方, int i, bool 原種モード) where T : EleD { T eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4293,7 +4293,7 @@ namespace SlaveMatrix return Mix(eleD, eleD2, i, 原種モード); } - private static T Mix(腰D 母方, 腰D 父方, bool 右, int i, bool 原種モード) where T : EleD + private static T Mix(WaistD 母方, WaistD 父方, bool 右, int i, bool 原種モード) where T : EleD { T eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4304,7 +4304,7 @@ namespace SlaveMatrix return Mix(eleD, eleD2, i, 原種モード); } - private static T Mix(腰D 母方, 腰D 父方, Func con, int i, bool 原種モード) where T : EleD + private static T Mix(WaistD 母方, WaistD 父方, Func con, int i, bool 原種モード) where T : EleD { T eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4315,7 +4315,7 @@ namespace SlaveMatrix return Mix(eleD, eleD2, i, 原種モード); } - private static EleD Mix(腰D 母方, 腰D 父方, int i, Type t, bool 原種モード) + private static EleD Mix(WaistD 母方, WaistD 父方, int i, Type t, bool 原種モード) { EleD eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4326,7 +4326,7 @@ namespace SlaveMatrix return Mix(eleD, eleD2, i, 原種モード); } - private static EleD Mix(腰D 母方, 腰D 父方, bool 右, int i, Type t, bool 原種モード) + private static EleD Mix(WaistD 母方, WaistD 父方, bool 右, int i, Type t, bool 原種モード) { EleD eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4337,7 +4337,7 @@ namespace SlaveMatrix return Mix(eleD, eleD2, i, 原種モード); } - private static EleD Mix(腰D 母方, 腰D 父方, Func con, int i, Type t, bool 原種モード) + private static EleD Mix(WaistD 母方, WaistD 父方, Func con, int i, Type t, bool 原種モード) { EleD eleD = (from e in 母方.EnumEleD() orderby RNG.XS.Next() @@ -4383,7 +4383,7 @@ namespace SlaveMatrix } } - private static Dictionary> Get接続構成(腰D 母方, 腰D 父方) + private static Dictionary> Get接続構成(WaistD 母方, WaistD 父方) { Dictionary> dictionary = new Dictionary>(); foreach (EleD item in 母方.EnumEleD().Concat(父方.EnumEleD())) @@ -4402,14 +4402,14 @@ namespace SlaveMatrix return dictionary; } - private static Type[] Get要素構成(腰D 母方, 腰D 父方) + private static Type[] Get要素構成(WaistD 母方, WaistD 父方) { return (from e in 母方.EnumEleD().Concat(父方.EnumEleD()) where 接続範囲.ContainsKey(e.接続情報) && 接続範囲[e.接続情報].Contains(e.GetType().ToString()) select e.GetType()).ToArray(); } - public static void 接続(this EleD e, 腰D 母方, 腰D 父方, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, bool 原種モード) + public static void 接続(this EleD e, WaistD 母方, WaistD 父方, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, bool 原種モード) { string text = 接続.ToString(); if (text.Contains("左")) @@ -4441,14 +4441,14 @@ namespace SlaveMatrix } } - public static IEnumerable Enum接続肢(腰D 母方, 腰D 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, bool 原種モード) + public static IEnumerable Enum接続肢(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, bool 原種モード) { double l = (接続.接続数(母方, 父方) + 接続.接続数(母方, 父方) + 接続.接続数(母方, 父方)) / 3; double num = 1.0 / ((double)接続構成.Count * 0.5); if (!原種モード) { string text = 接続.ToString(); - if (text.Contains("肩") || text.Contains("脇") || text.Contains("翼")) + if (text.Contains("Shoulder") || text.Contains("脇") || text.Contains("翼")) { if (num.Lot()) { @@ -4459,7 +4459,7 @@ namespace SlaveMatrix l = 3.0; } } - else if (接続 == ConnectionInfo.腰_尾_接続 || 接続 == ConnectionInfo.四足腰_尾_接続) + else if (接続 == ConnectionInfo.Waist_尾_接続 || 接続 == ConnectionInfo.四足腰_尾_接続) { if (num.Lot()) { @@ -4475,7 +4475,7 @@ namespace SlaveMatrix l = 0.0; } } - if (l == 0.0 && (接続 == ConnectionInfo.四足脇_上腕_接続 || 接続 == ConnectionInfo.腰_腿左_接続 || 接続 == ConnectionInfo.腰_腿左_接続 || 接続 == ConnectionInfo.四足腰_腿左_接続 || 接続 == ConnectionInfo.四足腰_腿左_接続 || 接続 == ConnectionInfo.長物_魚_尾_接続 || 接続 == ConnectionInfo.長物_鯨_尾_接続 || 接続 == ConnectionInfo.長物_蛇_胴_接続 || 接続 == ConnectionInfo.長物_蟲_胴_接続 || 接続 == ConnectionInfo.胴_蛇_胴_接続 || 接続 == ConnectionInfo.胴_蟲_胴_接続 || 接続 == ConnectionInfo.多足_蛸_軟体外左_接続 || 接続 == ConnectionInfo.多足_蛸_軟体外右_接続 || 接続 == ConnectionInfo.多足_蛸_軟体内左_接続 || 接続 == ConnectionInfo.多足_蛸_軟体内右_接続 || 接続 == ConnectionInfo.単足_植_根外左_接続 || 接続 == ConnectionInfo.単足_植_根内左_接続 || 接続 == ConnectionInfo.単足_植_根中央_接続 || 接続 == ConnectionInfo.単足_植_根内右_接続 || 接続 == ConnectionInfo.単足_植_根外右_接続 || 接続 == ConnectionInfo.頭頂_宇_頭部後_接続 || (num * 1.1).Lot())) + if (l == 0.0 && (接続 == ConnectionInfo.四足脇_上腕_接続 || 接続 == ConnectionInfo.Waist_腿左_接続 || 接続 == ConnectionInfo.Waist_腿左_接続 || 接続 == ConnectionInfo.四足腰_腿左_接続 || 接続 == ConnectionInfo.四足腰_腿左_接続 || 接続 == ConnectionInfo.長物_魚_尾_接続 || 接続 == ConnectionInfo.長物_鯨_尾_接続 || 接続 == ConnectionInfo.長物_蛇_Torso_接続 || 接続 == ConnectionInfo.長物_蟲_Torso_接続 || 接続 == ConnectionInfo.Torso_蛇_Torso_接続 || 接続 == ConnectionInfo.Torso_蟲_Torso_接続 || 接続 == ConnectionInfo.多足_蛸_軟体外左_接続 || 接続 == ConnectionInfo.多足_蛸_軟体外右_接続 || 接続 == ConnectionInfo.多足_蛸_軟体内左_接続 || 接続 == ConnectionInfo.多足_蛸_軟体内右_接続 || 接続 == ConnectionInfo.単足_植_根外左_接続 || 接続 == ConnectionInfo.単足_植_根内左_接続 || 接続 == ConnectionInfo.単足_植_根中央_接続 || 接続 == ConnectionInfo.単足_植_根内右_接続 || 接続 == ConnectionInfo.単足_植_根外右_接続 || 接続 == ConnectionInfo.頭頂_宇_頭部後_接続 || (num * 1.1).Lot())) { l = 1.0; } @@ -4493,7 +4493,7 @@ namespace SlaveMatrix } } - public static int 接続数(this ConnectionInfo 接続情報, 腰D 母方, 腰D 父方) + public static int 接続数(this ConnectionInfo 接続情報, WaistD 母方, WaistD 父方) { if (接続範囲.ContainsKey(接続情報)) { @@ -4510,7 +4510,7 @@ namespace SlaveMatrix return 0; } - public static EleD Get接続肢(腰D 母方, 腰D 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, int j, bool 原種モード) + public static EleD Get接続肢(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, int j, bool 原種モード) { EleD eleD = Get要素(母方, 父方, 右, i, 接続, 要素構成, 接続構成, 変異率, j, 原種モード); if (eleD != null) @@ -4544,7 +4544,7 @@ namespace SlaveMatrix return eleD; } - public static EleD Get要素(腰D 母方, 腰D 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, int j, bool 原種モード) + public static EleD Get要素(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, Dictionary> 接続構成, double 変異率, int j, bool 原種モード) { if (!原種モード && 変異率.Lot()) { @@ -4553,7 +4553,7 @@ namespace SlaveMatrix return Get要素0(母方, 父方, 右, i, 接続, 接続構成, j, 原種モード); } - public static EleD Get要素1(腰D 母方, 腰D 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, int j, bool 原種モード) + public static EleD Get要素1(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Type[] 要素構成, int j, bool 原種モード) { if (接続範囲.ContainsKey(接続)) { @@ -4571,7 +4571,7 @@ namespace SlaveMatrix return null; } - public static EleD Get要素0(腰D 母方, 腰D 父方, bool 右, int i, ConnectionInfo 接続, Dictionary> 接続構成, int j, bool 原種モード) + public static EleD Get要素0(WaistD 母方, WaistD 父方, bool 右, int i, ConnectionInfo 接続, Dictionary> 接続構成, int j, bool 原種モード) { if (接続構成.ContainsKey(接続)) { @@ -4592,7 +4592,7 @@ namespace SlaveMatrix public static ChaD Mix(this ChaD 母方, ChaD 父方, bool 原種モード) { double num = Mix(母方.魔力濃度, 父方.魔力濃度, 1.0); - 腰D d; + WaistD d; return new ChaD(d = Mix(母方.body_tree, 父方.body_tree, num, 原種モード), Mix(母方.body_color, 父方.body_color, num, d)) { Lust = Mix(母方.Lust, 父方.Lust, 0.6), diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs index 03a4da6..a360203 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs @@ -6,9 +6,9 @@ namespace SlaveMatrix { public TrainingUI 調教UI; - public Med Med; + public ModeEventDispatcher Med; - public Are Are; + public RenderArea Are; public Cha Cha; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs index a3c5018..63dda8b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs @@ -19,7 +19,7 @@ namespace SlaveMatrix { if (CP.GetFlag(0.1 * Cha.ChaD.現陰毛)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.01), Sta.剃り.GetVal(Cha.ChaD.現陰毛, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * RNG.XS.NextDouble(), b: true); }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs index e1d6617..51f7dc5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs @@ -709,7 +709,7 @@ namespace SlaveMatrix public JointS 軸3_接続点 => new JointS(本体, X0Y0_前翅_前翅軸_軸2, 0); - public 前翅_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前翅_甲D e) + public 前翅_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前翅_甲D e) { 前翅_甲 前翅_甲2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs index 0d24d0f..e473fb3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs @@ -89,7 +89,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.前翅_甲_軸3_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前翅_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs index 3538b37..3cb3bd2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs @@ -900,7 +900,7 @@ namespace SlaveMatrix } } - public 前翅_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前翅_羽D e) + public 前翅_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前翅_羽D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["前翅"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs index 850db64..4e85b47 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs @@ -73,7 +73,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前翅_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs index 31c9007..d9d5a72 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs @@ -398,7 +398,7 @@ namespace SlaveMatrix } } - public 前翅_草(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前翅_草D e) + public 前翅_草(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前翅_草D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["前翅"][3]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs index 848d44e..831fc26 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前翅_草(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs index e8564a3..2bbca5f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs @@ -664,7 +664,7 @@ namespace SlaveMatrix } } - public 前翅_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前翅_蝶D e) + public 前翅_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前翅_蝶D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["前翅"][2]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs index c8b6bae..c6617c8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前翅_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs index 91cd875..dfa04d3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_ジグD e) + public 前髪_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_ジグD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs index e16b6b1..8a81818 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs index 8232eb8..8972f8d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_ジグ中寄(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_ジグ中寄D e) + public 前髪_ジグ中寄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_ジグ中寄D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs index 13ccaa3..50f337b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_ジグ中寄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs index 7ff3d56..ae8eaf9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_ジグ分け(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_ジグ分けD e) + public 前髪_ジグ分け(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_ジグ分けD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs index ab32413..64362ff 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_ジグ分け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs index 4ea7a60..a32e734 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_パッツン(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_パッツンD e) + public 前髪_パッツン(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_パッツンD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs index 6e3b63f..54044f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_パッツン(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs index dba3709..9ae3531 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_モジャ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_モジャD e) + public 前髪_モジャ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_モジャD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs index 0241e3e..ca9cb25 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_モジャ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs index 7f56408..6b0b045 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs @@ -856,7 +856,7 @@ namespace SlaveMatrix } } - public 前髪_三分1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_三分1D e) + public 前髪_三分1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_三分1D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs index c0d9249..0ad895c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs @@ -102,7 +102,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_三分1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs index 7097f6f..8cdf665 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs @@ -787,7 +787,7 @@ namespace SlaveMatrix } } - public 前髪_三分2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_三分2D e) + public 前髪_三分2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_三分2D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs index 4cb0a0f..8bce44b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_三分2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs index 590f251..fe11ecf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs @@ -721,7 +721,7 @@ namespace SlaveMatrix } } - public 前髪_上げ片(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_上げ片D e) + public 前髪_上げ片(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ片D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs index 46e7f50..805c2e1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs @@ -88,7 +88,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_上げ片(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs index 3ffb870..a0be5df 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_上げ短1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_上げ短1D e) + public 前髪_上げ短1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ短1D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs index 97acf5a..51bb877 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_上げ短1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs index ee9210a..fc56f7c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_上げ短2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_上げ短2D e) + public 前髪_上げ短2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ短2D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs index 93d1952..8a687f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_上げ短2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs index 1f180c1..03f5f2b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_上げ長1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_上げ長1D e) + public 前髪_上げ長1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ長1D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs index 281664d..d5bdfdf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_上げ長1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs index 939e31b..24f656e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_上げ長2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_上げ長2D e) + public 前髪_上げ長2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ長2D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs index 818c33a..f35f98a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_上げ長2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs index c386139..b8c349a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs @@ -659,7 +659,7 @@ namespace SlaveMatrix } } - public 前髪_中分け1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_中分け1D e) + public 前髪_中分け1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_中分け1D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs index d5d7b46..3d3d9e4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs @@ -82,7 +82,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_中分け1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs index 6404722..057d601 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs @@ -657,7 +657,7 @@ namespace SlaveMatrix } } - public 前髪_中分け2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_中分け2D e) + public 前髪_中分け2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_中分け2D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs index 106dd6d..ff448d9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs @@ -82,7 +82,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_中分け2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs index 20ac091..30350e7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_二分1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_二分1D e) + public 前髪_二分1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_二分1D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs index eab4803..5286262 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs @@ -98,7 +98,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_二分1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs index fa59424..e25fa0c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_二分2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_二分2D e) + public 前髪_二分2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_二分2D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs index 93d1cc3..6e9414c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs @@ -94,7 +94,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_二分2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs index f481b45..850d6bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs @@ -766,7 +766,7 @@ namespace SlaveMatrix } } - public 前髪_横流し(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_横流しD e) + public 前髪_横流し(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_横流しD e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs index 78153d4..6a10d9a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs @@ -94,7 +94,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_横流し(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs index 5734ecb..242c9b3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs @@ -724,7 +724,7 @@ namespace SlaveMatrix } } - public 前髪_目隠れ1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_目隠れ1D e) + public 前髪_目隠れ1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_目隠れ1D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs index 51644d5..6b6562b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_目隠れ1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs index c4b282e..a9af060 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_目隠れ2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 前髪_目隠れ2D e) + public 前髪_目隠れ2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_目隠れ2D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs index 10ce512..42ae94f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs @@ -90,7 +90,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 前髪_目隠れ2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs index a62f1e4..0e7c68f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs @@ -221,7 +221,7 @@ namespace SlaveMatrix public JointS 瞼_接続点 => new JointS(本体, X0Y0_白目, 0); - public 単目(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 単目D e) + public 単目(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単目D e) { 単目 単目2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs index 6483475..2b7ae57 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.単目_瞼_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 単目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs index ce1caf5..785de61 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs @@ -121,7 +121,7 @@ namespace SlaveMatrix } } - public 単眼眉(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 単眼眉D e) + public 単眼眉(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単眼眉D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["単眼眉"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs index c73b307..91ba64e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs @@ -19,7 +19,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 単眼眉(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs index 8b67f80..0bdedaf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs @@ -1268,7 +1268,7 @@ namespace SlaveMatrix } } - public 単瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 単瞼D e) + public 単瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単瞼D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["単眼瞼"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs index d91de2d..638a393 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs @@ -89,7 +89,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 単瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs index ac3d580..8be5bb0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs @@ -923,7 +923,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 単足_植(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 単足_植D e) + public 単足_植(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単足_植D e) { 単足_植 単足_植2 = this; ThisType = GetType(); @@ -1167,7 +1167,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs index b9ba737..43e7514 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs @@ -138,7 +138,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.単足_植_根外右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 単足_植(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs index f4bddb8..3c70293 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs @@ -802,7 +802,7 @@ namespace SlaveMatrix } } - public 単足_粘(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 単足_粘D e) + public 単足_粘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単足_粘D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs index 3a58ea8..ad3b0c5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs @@ -79,7 +79,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 単足_粘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs index 2c819f4..d4ec121 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs @@ -221,7 +221,7 @@ namespace SlaveMatrix public JointS 瞼_接続点 => new JointS(本体, X0Y0_白目, 0); - public 双目(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 双目D e) + public 双目(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 双目D e) { 双目 双目2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs index 24a7dea..c0b1d94 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.双目_瞼_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 双目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs index 508bc11..d1f174c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs @@ -583,7 +583,7 @@ namespace SlaveMatrix } } - public 口_裂け(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 口_裂けD e) + public 口_裂け(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 口_裂けD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["口"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs index 0170a71..0a842c1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs @@ -29,7 +29,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 口_裂け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs index d8088cb..9f6ac71 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs @@ -787,7 +787,7 @@ namespace SlaveMatrix } } - public 口_通常(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 口_通常D e) + public 口_通常(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 口_通常D e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["口"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs index cb1bcbe..4613972 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 口_通常(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs index 4ce2cbc..3b42fe8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs @@ -400,7 +400,7 @@ namespace SlaveMatrix } } - public 呼気(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 呼気D e) + public 呼気(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 呼気D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["呼気"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs index 99410db..c713282 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 呼気(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs index 5697132..105584c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs @@ -23,9 +23,9 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { - return new 咳(DisUnit, 配色指定, 体配色, Med, this); + return new Cough(DisUnit, 配色指定, 体配色, Med, this); } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs index a52d85e..10aec90 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs @@ -344,7 +344,7 @@ namespace SlaveMatrix } } - public 噴乳(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 噴乳D e) + public 噴乳(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 噴乳D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["噴乳左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs index ccaef6a..a1a60c7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 噴乳(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs index 875b4a2..dc0d9e4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs @@ -199,13 +199,13 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(本体, X0Y0_胴, 1); - public 四足胴(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 四足胴D e) + public 四足胴(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 四足胴D e) { 四足胴 四足胴2 = this; ThisType = GetType(); 本体 = new Difs(Sta.半身["四足胴"]); Pars pars = 本体[0][0]; - X0Y0_胴 = pars["胴"].ToPar(); + X0Y0_胴 = pars["Torso"].ToPar(); Pars pars2 = pars["筋肉"].ToPars(); X0Y0_筋肉_筋肉左 = pars2["筋肉左"].ToPar(); X0Y0_筋肉_筋肉右 = pars2["筋肉右"].ToPar(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs index 0b16cd0..456d093 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs @@ -68,7 +68,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 四足胴(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs index 1a35111..35416c0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs @@ -201,7 +201,7 @@ namespace SlaveMatrix public Ele[] 脇右_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public Ele[] 胸左_接続; @@ -790,7 +790,7 @@ namespace SlaveMatrix public JointS 脇右_接続点 => new JointS(本体, X0Y0_胸郭, 1); - public JointS 胴_接続点 => new JointS(本体, X0Y0_胸郭, 9); + public JointS Torso_接続点 => new JointS(本体, X0Y0_胸郭, 9); public JointS 胸左_接続点 => new JointS(本体, X0Y0_胸郭, 2); @@ -808,7 +808,7 @@ namespace SlaveMatrix public JointS 背中_接続点 => new JointS(本体, X0Y0_胸郭, 10); - public 四足胸(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 四足胸D e) + public 四足胸(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 四足胸D e) { 四足胸 四足胸2 = this; ThisType = GetType(); @@ -943,14 +943,14 @@ namespace SlaveMatrix return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 四足胸2; - f.ConnectionType = ConnectionInfo.四足胸_胴_接続; - f.接続(四足胸2.胴_接続点); + f.ConnectionType = ConnectionInfo.四足胸_Torso_接続; + f.接続(四足胸2.Torso_接続点); return f; }).ToArray(); } @@ -1081,7 +1081,7 @@ namespace SlaveMatrix 尺度YB = 0.96; } - public void 胸描画(Are Are) + public void 胸描画(RenderArea Are) { Are.Draw(X0Y0_胸郭); Are.Draw(X0Y0_筋肉_筋肉左); @@ -1099,7 +1099,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_竜性_中_鱗2); } - public void 肌描画(Are Are) + public void 肌描画(RenderArea Are) { Are.Draw(X0Y0_紋柄_紋左_紋1); Are.Draw(X0Y0_紋柄_紋左_紋2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs index 87f0cdb..349b9de 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs @@ -77,7 +77,7 @@ namespace SlaveMatrix public List 脇右_接続 = new List(); - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public List 胸左_接続 = new List(); @@ -116,9 +116,9 @@ namespace SlaveMatrix public void 胴接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.四足胸_胴_接続; + e.接続情報 = ConnectionInfo.四足胸_Torso_接続; } public void 胸左接続(EleD e) @@ -197,7 +197,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 四足胸(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs index 6afcf0d..44fa668 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs @@ -122,7 +122,7 @@ namespace SlaveMatrix public JointS 上腕_接続点 => new JointS(本体, X0Y0_脇, 0); - public 四足脇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 四足脇D e) + public 四足脇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 四足脇D e) { 四足脇 四足脇2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs index 0b91687..a4e256d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.四足脇_上腕_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 四足脇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs index 778ca36..59ea67b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs @@ -1388,14 +1388,14 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(本体, X0Y0_腰, 8); - public 四足腰(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 四足腰D e) + public 四足腰(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 四足腰D e) { 四足腰 四足腰2 = this; ThisType = GetType(); 本体 = new Difs(Sta.半身["四足腰"]); Pars pars = 本体[0][0]; X0Y0_腰 = pars["腰"].ToPar(); - X0Y0_股 = pars["股"].ToPar(); + X0Y0_股 = pars["股"].ToPar(); X0Y0_下腹 = pars["下腹"].ToPar(); X0Y0_腰皺 = pars["腰皺"].ToPar(); Pars pars2 = pars["筋肉"].ToPars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs index a5c1d41..2bbcdb7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs @@ -188,7 +188,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 四足腰(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs index 7af8688..e6e1121 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs @@ -122,7 +122,7 @@ namespace SlaveMatrix public JointS 後髪_接続点 => new JointS(本体, X0Y0_髪, 3); - public 基髪(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 基髪D e) + public 基髪(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 基髪D e) { 基髪 基髪2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs index 201c1cf..bf3c54b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs @@ -68,7 +68,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.基髪_後髪_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 基髪(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs index 17d38f8..2c8a7e7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs @@ -100,7 +100,7 @@ namespace SlaveMatrix public JointS 軟体内右_接続点 => new JointS(本体, X0Y0_胴, 2); - public 多足_蛸(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 多足_蛸D e) + public 多足_蛸(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 多足_蛸D e) { 多足_蛸 多足_蛸2 = this; ThisType = GetType(); @@ -111,7 +111,7 @@ namespace SlaveMatrix 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars = 本体[0][0]; - X0Y0_胴 = pars["胴"].ToPar(); + X0Y0_胴 = pars["Torso"].ToPar(); 本体.SetJoints(); 接続根 = new JointD(本体); 右 = e.右; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs index 5886f1c..f817f92 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs @@ -66,7 +66,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 多足_蛸(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs index 94375d9..1e1b990 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs @@ -171,7 +171,7 @@ namespace SlaveMatrix public JointS 尾_接続点 => new JointS(本体, X0Y0_胴, 0); - public 多足_蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 多足_蜘D e) + public 多足_蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 多足_蜘D e) { 多足_蜘 多足_蜘2 = this; ThisType = GetType(); @@ -182,7 +182,7 @@ namespace SlaveMatrix 本体.Tag = dif.Tag; 本体.Add(dif); Pars pars = 本体[0][0]; - X0Y0_胴 = pars["胴"].ToPar(); + X0Y0_胴 = pars["Torso"].ToPar(); X0Y0_胸版 = pars["胸版"].ToPar(); X0Y0_柄 = pars["柄"].ToPar(); 本体.SetJoints(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs index 575efb6..dee2c76 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs @@ -122,7 +122,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 多足_蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs index f51e8aa..2c4ddcf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs @@ -972,7 +972,7 @@ namespace SlaveMatrix public JointS 尾_接続点 => new JointS(本体, X0Y0_前腹_腹節7_節0, 2); - public 多足_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 多足_蠍D e) + public 多足_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 多足_蠍D e) { 多足_蠍 多足_蠍2 = this; ThisType = GetType(); @@ -1326,7 +1326,7 @@ namespace SlaveMatrix yield return X0Y0_前腹_腹節7_節0; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_前腹_腹節7_節0); Are.Draw(X0Y0_前腹_腹節7_節1); @@ -1366,7 +1366,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_生殖口_生殖口1); } - public void 前描画(Are Are) + public void 前描画(RenderArea Are) { Are.Draw(X0Y0_基節_肢内突起左); Are.Draw(X0Y0_基節_肢内突起右); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs index e00729c..7d7ed31 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs @@ -279,7 +279,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 多足_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs index baf4e05..d1cd76d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs @@ -426,7 +426,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 大顎(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 大顎D e) + public 大顎(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 大顎D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["虫顎"][1]); @@ -543,7 +543,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); if (!欠損_) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs index 14699fc..f8f1cb5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs @@ -45,7 +45,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 大顎(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs index 8fdfb24..4762cd5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs @@ -404,7 +404,7 @@ namespace SlaveMatrix public JointS 大顎上_接続点 => new JointS(本体, X0Y0_甲殻下, 2); - public 大顎基(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 大顎基D e) + public 大顎基(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 大顎基D e) { 大顎基 大顎基2 = this; 大顎上 = new 大顎上(DisUnit, 配色指定, 体配色); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs index d34c1ee..82070a2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.大顎基_顎右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 大顎基(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs index 9a25b91..fe05d1b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs @@ -260,7 +260,7 @@ namespace SlaveMatrix } } - public 射精(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, Med Med, 射精D e) + public 射精(double DisUnit, 配色指定 配色指定, 主人公配色 体配色, ModeEventDispatcher Med, 射精D e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["射精"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs index 28d1238..e58599e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs @@ -3500,7 +3500,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_ウ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_ウD e) + public 尾_ウ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_ウD e) { 尾_ウ 尾_ウ2 = this; ThisType = GetType(); @@ -4076,7 +4076,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾20_尾); Are.Draw(X0Y0_尾20_鱗左5); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs index e8639e6..9e34464 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs @@ -347,7 +347,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.尾_ウ_尾先_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_ウ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs index a00d180..e6beef2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs @@ -2192,7 +2192,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_ガ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_ガD e) + public 尾_ガ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_ガD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -2570,7 +2570,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾); Are.Draw(X0Y0_尾9_尾); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs index 80a28f7..a8c1e53 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs @@ -213,7 +213,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_ガ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs index 183ff80..fb6e650 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs @@ -5722,7 +5722,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_ヘ(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_ヘD e) + public 尾_ヘ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_ヘD e) { 尾_ヘ 尾_ヘ2 = this; ThisType = GetType(); @@ -6616,7 +6616,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾35_尾); Are.Draw(X0Y0_尾35_鱗左3); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs index 7937de6..3c2b780 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs @@ -549,7 +549,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.尾_ヘ_尾先_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_ヘ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs index 69189b1..600152a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs @@ -654,7 +654,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 尾_悪(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_悪D e) + public 尾_悪(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_悪D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -795,7 +795,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾0); Are.Draw(X0Y0_尾1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs index 4a115af..a4b6ae5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs @@ -67,7 +67,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_悪(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs index 14d6fc2..e3e10e9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs @@ -1389,7 +1389,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 尾_根(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_根D e) + public 尾_根(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_根D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1651,7 +1651,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾0_尾); Are.Draw(X0Y0_尾0_線1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs index 52293c5..15b7762 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs @@ -137,7 +137,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_根(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs index e70aba0..cc9a12e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs @@ -654,7 +654,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 尾_淫(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_淫D e) + public 尾_淫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_淫D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -795,7 +795,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾0); Are.Draw(X0Y0_尾1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs index 341ac66..4215b9d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs @@ -67,7 +67,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_淫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs index 84c3894..02123c8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs @@ -1075,7 +1075,7 @@ namespace SlaveMatrix } } - public 尾_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_牛D e) + public 尾_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_牛D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs index 2ffd787..e941c66 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs index 328ab96..4d98937 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs @@ -235,7 +235,7 @@ namespace SlaveMatrix } } - public 尾_犬(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_犬D e) + public 尾_犬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_犬D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs index ba4c810..7155cda 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_犬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs index 67a994a..9b9d3a0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs @@ -319,7 +319,7 @@ namespace SlaveMatrix } } - public 尾_狐(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_狐D e) + public 尾_狐(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_狐D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs index 9a7fc26..d59c915 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_狐(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs index 96e15ae..175fad7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs @@ -361,7 +361,7 @@ namespace SlaveMatrix } } - public 尾_猫(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_猫D e) + public 尾_猫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_猫D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs index 6415c36..e79f307 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_猫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs index f0534d8..3676c99 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs @@ -193,7 +193,7 @@ namespace SlaveMatrix } } - public 尾_短(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_短D e) + public 尾_短(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_短D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs index 49e29f1..257a720 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_短(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs index a06c15c..d731182 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs @@ -785,7 +785,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_竜D e) + public 尾_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_竜D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -942,7 +942,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾17); Are.Draw(X0Y0_針); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs index 9c9c6a4..70cf214 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs @@ -79,7 +79,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs index f229640..7b89f7c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs @@ -5093,7 +5093,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_腓(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_腓D e) + public 尾_腓(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_腓D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -5914,7 +5914,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾1_根); Are.Draw(X0Y0_尾1_鱗); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs index 1e291fb..f28f3e6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs @@ -487,7 +487,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_腓(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs index 8300340..5f75b1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs @@ -638,7 +638,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_虫D e) + public 尾_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_虫D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -774,7 +774,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾10); Are.Draw(X0Y0_針); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs index b0fed25..d9e241a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs @@ -65,7 +65,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs index 587341d..cd1cbd1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs @@ -5090,7 +5090,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_蛇D e) + public 尾_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_蛇D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -5909,7 +5909,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾1_根); Are.Draw(X0Y0_尾1_鱗); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs index 9099067..34e3a0f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs @@ -489,7 +489,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_蛇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs index ddbe760..9a0533d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs @@ -447,7 +447,7 @@ namespace SlaveMatrix public JointS 出糸_接続点 => new JointS(本体, X0Y0_尾0, 0); - public 尾_蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_蜘D e) + public 尾_蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_蜘D e) { 尾_蜘 尾_蜘2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs index 739224d..2cfb3ee 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs @@ -57,7 +57,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.尾_蜘_出糸_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs index 154f69d..8f963eb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs @@ -1546,7 +1546,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_蟲D e) + public 尾_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_蟲D e) { 尾_蟲 尾_蟲2 = this; ThisType = GetType(); @@ -1935,7 +1935,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾5_背板); Are.Draw(X0Y0_尾5_節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs index ce72d39..033aec2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs @@ -256,7 +256,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.尾_蟲_尾右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs index b6f7817..07cec14 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs @@ -869,7 +869,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_蠍D e) + public 尾_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_蠍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1044,7 +1044,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_節1_尾); Are.Draw(X0Y0_節1_線); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs index 7c8a067..3a3b2d8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs @@ -87,7 +87,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs index c35ff76..8e3e094 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs @@ -907,7 +907,7 @@ namespace SlaveMatrix } } - public 尾_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_馬D e) + public 尾_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_馬D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs index f590880..2835b19 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs index 0f3e1f9..966504c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs @@ -7395,7 +7395,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 尾_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_魚D e) + public 尾_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_魚D e) { 尾_魚 尾_魚2 = this; ThisType = GetType(); @@ -9317,7 +9317,7 @@ namespace SlaveMatrix X0Y0_尾14_尾.AngleBase = 0.0; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (Rパターン) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs index 3558205..6394fe9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs @@ -1267,7 +1267,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.尾_魚_尾先_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs index c8526c6..ebe9af0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs @@ -2826,7 +2826,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 尾_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_鯨D e) + public 尾_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_鯨D e) { 尾_鯨 尾_鯨2 = this; ThisType = GetType(); @@ -4011,7 +4011,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾33_尾); Are.Draw(X0Y0_尾33_柄); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs index fe00f5a..35c4d4b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs @@ -859,7 +859,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.尾_鯨_尾先_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs index 74bda1f..d38f31c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public 尾_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_鳥D e) + public 尾_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_鳥D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs index 2aed154..4e1c3c6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs @@ -61,7 +61,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs index 9b92d3f..ce21793 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs @@ -1247,7 +1247,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 尾_龍(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾_龍D e) + public 尾_龍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_龍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1470,7 +1470,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_尾40); Are.Draw(X0Y0_尾39); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs index 578848f..2cd85fe 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs @@ -123,7 +123,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾_龍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs index f7de725..03edcbc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs @@ -485,7 +485,7 @@ namespace SlaveMatrix } } - public 尾鰭_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾鰭_魚D e) + public 尾鰭_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾鰭_魚D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢中["尾"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs index d97886e..81fee07 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs @@ -43,7 +43,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾鰭_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs index 5cbc320..b50791f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 尾鰭_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 尾鰭_鯨D e) + public 尾鰭_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾鰭_鯨D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs index c1ce7e2..bcfddee 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 尾鰭_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs index 5b9bc71..a4d9303 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs @@ -350,7 +350,7 @@ namespace SlaveMatrix } } - public 後翅_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後翅_甲D e) + public 後翅_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後翅_甲D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["後翅"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs index 4038c1e..8963c27 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 後翅_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs index a7efaa8..f47b29b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs @@ -1035,7 +1035,7 @@ namespace SlaveMatrix } } - public 後翅_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後翅_羽D e) + public 後翅_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後翅_羽D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["後翅"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs index 6d74cd5..5d478ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 後翅_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs index 6c9d075..b21408f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs @@ -1282,7 +1282,7 @@ namespace SlaveMatrix } } - public 後翅_草(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後翅_草D e) + public 後翅_草(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後翅_草D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["後翅"][3]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs index d0f6251..da828b6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs @@ -101,7 +101,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 後翅_草(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs index 67ef632..2e2ba2e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs @@ -658,7 +658,7 @@ namespace SlaveMatrix } } - public 後翅_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 後翅_蝶D e) + public 後翅_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後翅_蝶D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["後翅"][2]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs index 311e809..cc6fe4b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 後翅_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs index 8d67373..c5b3815 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs @@ -891,7 +891,7 @@ namespace SlaveMatrix public JointS 膣口_接続点 => new JointS(本体, X0Y0_性器基, 2); - public 性器_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 性器_人D e) + public 性器_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 性器_人D e) { 性器_人 性器_人2 = this; ThisType = GetType(); @@ -1252,7 +1252,7 @@ namespace SlaveMatrix AreM.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { AreM.Clear(); 位置B = AreMPos; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs index 3dbfad6..09d95e7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.性器_人_膣口_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 性器_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs index 3f953c7..96e1274 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs @@ -891,7 +891,7 @@ namespace SlaveMatrix public JointS 膣口_接続点 => new JointS(本体, X0Y0_性器基, 2); - public 性器_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 性器_獣D e) + public 性器_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 性器_獣D e) { 性器_獣 性器_獣2 = this; ThisType = GetType(); @@ -1252,7 +1252,7 @@ namespace SlaveMatrix AreM.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { AreM.Clear(); 位置B = AreMPos; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs index a34d69a..3cd9538 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.性器_獣_膣口_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 性器_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs index b5a4dbc..1b28247 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs @@ -228,7 +228,7 @@ namespace SlaveMatrix } } - public 性器精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 性器精液_人D e) + public 性器精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 性器精液_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.性器付["性器精液垂れ"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs index 917831e..7271cc2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 性器精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs index 9f7e062..09dd203 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs @@ -228,7 +228,7 @@ namespace SlaveMatrix } } - public 性器精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 性器精液_獣D e) + public 性器精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 性器精液_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.性器付["四足性器精液垂れ"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs index 3885f4e..d0ec0a6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 性器精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs index 28053c1..968340b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs @@ -2798,7 +2798,7 @@ namespace SlaveMatrix } } - public 手_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 手_人D e) + public 手_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.腕左["手"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs index c5fb21e..2322046 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 手_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs index fe589dc..c7d8c43 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs @@ -352,7 +352,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_腕輪_金具右, 0); - public 手_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 手_牛D e) + public 手_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_牛D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -444,7 +444,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs index 842f0fc..62bfa62 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 手_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs index 8cb9a78..0890d02 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs @@ -356,7 +356,7 @@ namespace SlaveMatrix } } - public 手_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 手_獣D e) + public 手_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_獣D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs index 686ef51..b77910f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 手_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs index e909fdf..7f069fb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs @@ -732,7 +732,7 @@ namespace SlaveMatrix } } - public 手_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 手_蝙D e) + public 手_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_蝙D e) { 飛膜 = new 飛膜_先(DisUnit, 配色指定, 体配色); 飛膜.Par = this; @@ -863,7 +863,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_獣翼手); Are.Draw(X0Y0_小指_指1); @@ -876,7 +876,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_親指_指3); } - public void 指先描画(Are Are) + public void 指先描画(RenderArea Are) { Are.Draw(X0Y0_小指_指2); Are.Draw(X0Y0_小指_指3); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs index 45581d7..464c3fc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 手_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs index b09ee7f..e579ea8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs @@ -310,7 +310,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_腕輪_金具右, 0); - public 手_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 手_馬D e) + public 手_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_馬D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -395,7 +395,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs index 78f79e3..49ca0be 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 手_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs index 355c43b..140f696 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs @@ -2064,7 +2064,7 @@ namespace SlaveMatrix } } - public 手_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 手_鳥D e) + public 手_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_鳥D e) { ThisType = GetType(); 本体 = new Difs(Sta.腕左["鳥翼手"]); @@ -2405,7 +2405,7 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_鳥翼手); Are.Draw(X0Y0_風切羽_羽10); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs index 4c72e64..7b53f30 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs @@ -211,7 +211,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 手_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs index 2e0a6cb..a47922e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs @@ -473,7 +473,7 @@ namespace SlaveMatrix { if (Player.変化V_口 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.口腔位置.GetAreaPoint(0.05), Sta.口挿.GetVal(clip(Player.変化V_口), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.HotPink.S(Player.変化V_口.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_口, b: true); }); @@ -484,7 +484,7 @@ namespace SlaveMatrix { if (Player.変化V_口 > 0.35 && CP挿入.GetFlag(0.1 + 0.1 * Player.変化V_口 * 0.8)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.口腔位置.GetAreaPoint(0.05), Sta.口中.GetVal(clip(Player.変化V_口), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.HotPink.S(Player.変化V_口.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_口, b: true); }); @@ -495,7 +495,7 @@ namespace SlaveMatrix { if (Player.変化V_口 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.口腔位置.GetAreaPoint(0.05), Sta.口抜.GetVal(clip(Player.変化V_口), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.HotPink.S(Player.変化V_口.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_口, b: true); }); @@ -506,7 +506,7 @@ namespace SlaveMatrix { if (Player.変化V_膣 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.膣口位置.GetAreaPoint(0.04), Sta.膣挿.GetVal(clip(Player.変化V_膣), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.DeepPink.S(Player.変化V_膣.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_膣, b: true); }); @@ -517,7 +517,7 @@ namespace SlaveMatrix { if (Player.変化V_膣 > 0.35 && CP挿入.GetFlag(0.1 + 0.1 * Player.変化V_膣 * 0.8)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.膣口位置.GetAreaPoint(0.04), Sta.膣中.GetVal(clip(Player.変化V_膣), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.DeepPink.S(Player.変化V_膣.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_膣, b: true); }); @@ -528,7 +528,7 @@ namespace SlaveMatrix { if (Player.変化V_膣 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.膣口位置.GetAreaPoint(0.04), Sta.膣抜.GetVal(clip(Player.変化V_膣), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.DeepPink.S(Player.変化V_膣.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_膣, b: true); }); @@ -539,7 +539,7 @@ namespace SlaveMatrix { if (Player.変化V_肛 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.肛門位置.GetAreaPoint(0.04), Sta.肛挿.GetVal(clip(Player.変化V_肛), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.Coral.S(Player.変化V_肛.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_肛, b: true); }); @@ -550,7 +550,7 @@ namespace SlaveMatrix { if (Player.変化V_肛 > 0.35 && CP挿入.GetFlag(0.1 + 0.1 * Player.変化V_肛 * 0.8)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.肛門位置.GetAreaPoint(0.04), Sta.肛中.GetVal(clip(Player.変化V_肛), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.Coral.S(Player.変化V_肛.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_肛, b: true); }); @@ -561,7 +561,7 @@ namespace SlaveMatrix { if (Player.変化V_肛 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.肛門位置.GetAreaPoint(0.04), Sta.肛抜.GetVal(clip(Player.変化V_肛), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.Coral.S(Player.変化V_肛.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_肛, b: true); }); @@ -572,7 +572,7 @@ namespace SlaveMatrix { if (Player.変化V_糸 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.出糸位置.GetAreaPoint(0.04), Sta.糸挿.GetVal(clip(Player.変化V_糸), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.MediumOrchid.S(Player.変化V_糸.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_糸, b: true); }); @@ -583,7 +583,7 @@ namespace SlaveMatrix { if (Player.変化V_糸 > 0.35 && CP挿入.GetFlag(0.1 + 0.1 * Player.変化V_糸 * 0.8)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.出糸位置.GetAreaPoint(0.04), Sta.糸中.GetVal(clip(Player.変化V_糸), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.MediumOrchid.S(Player.変化V_糸.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_糸, b: true); }); @@ -594,7 +594,7 @@ namespace SlaveMatrix { if (Player.変化V_糸 > 0.35) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Bod.出糸位置.GetAreaPoint(0.04), Sta.糸抜.GetVal(clip(Player.変化V_糸), Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.MediumOrchid.S(Player.変化V_糸.Clamp(0.5, 1.0)), 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_糸, b: true); }); @@ -605,7 +605,7 @@ namespace SlaveMatrix { if (CP振動.GetFlag(0.1 + 0.1 * base.強度)) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.04), Sta.振動.GetVal(1.0, 1.0), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * base.強度, b: true); }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs index 9074730..7baea0a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs @@ -542,7 +542,7 @@ namespace SlaveMatrix } } - public 放尿_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 放尿_人D e) + public 放尿_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 放尿_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.性器付["放尿"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs index e8a90a1..3794cbe 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 放尿_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs index f0b35e9..a8b8e8f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs @@ -542,7 +542,7 @@ namespace SlaveMatrix } } - public 放尿_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 放尿_獣D e) + public 放尿_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 放尿_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.性器付["四足放尿"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs index 1b26d51..9b4c6e3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 放尿_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs index 598248e..c33fce4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs @@ -616,7 +616,7 @@ namespace SlaveMatrix } } - public 断面_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 断面_人D e) + public 断面_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 断面_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["断面"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs index bf291a3..e72efb0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 断面_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs index 88dbe3a..422af79 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs @@ -616,7 +616,7 @@ namespace SlaveMatrix } } - public 断面_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 断面_獣D e) + public 断面_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 断面_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.半身["四足断面"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs index a381685..6fa5758 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 断面_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs index b966b82..7435f49 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs @@ -440,7 +440,7 @@ namespace SlaveMatrix } } - public 染み_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 染み_人D e) + public 染み_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 染み_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.その他["染み"]); @@ -542,7 +542,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_潮1); Are.Draw(X0Y0_潮2); @@ -552,7 +552,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_汗); } - public void 湯気描画(Are Are) + public void 湯気描画(RenderArea Are) { Are.Draw(X0Y0_湯気_湯気左1_湯気1); Are.Draw(X0Y0_湯気_湯気左1_湯気2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs index 8152b81..c13c262 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs @@ -47,7 +47,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 染み_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs index 55bdb4d..d978239 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs @@ -440,7 +440,7 @@ namespace SlaveMatrix } } - public 染み_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 染み_獣D e) + public 染み_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 染み_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.その他["四足染み"]); @@ -542,7 +542,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_潮1); Are.Draw(X0Y0_潮2); @@ -552,7 +552,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_汗); } - public void 湯気描画(Are Are) + public void 湯気描画(RenderArea Are) { Are.Draw(X0Y0_湯気_湯気左1_湯気1); Are.Draw(X0Y0_湯気_湯気左1_湯気2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs index b68a13f..f3b9e66 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs @@ -47,7 +47,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 染み_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs index ac263aa..a4b69be 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs @@ -1160,7 +1160,7 @@ namespace SlaveMatrix public JointS 花_接続点 => new JointS(本体, X0Y0_茎, 6); - public 植(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 植D e) + public 植(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 植D e) { 植 植2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs index 726ef90..71e140a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs @@ -123,7 +123,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.植_花_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 植(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs index 3553776..321f10d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs @@ -164,7 +164,7 @@ namespace SlaveMatrix } } - public 汗(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 汗D e) + public 汗(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 汗D e) { ThisType = GetType(); 本体 = new Difs(Sta.スタンプ["汗"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs index 01dc33a..2ebf8d9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs @@ -19,7 +19,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 汗(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs index 3587280..0a90ad5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix } } - public 涎_裂け(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 涎_裂けD e) + public 涎_裂け(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 涎_裂けD e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["涎口裂け左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs index 9c1fa35..62b41ff 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 涎_裂け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs index 5f229ee..d03d209 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix } } - public 涎_通常(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 涎_通常D e) + public 涎_通常(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 涎_通常D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["涎左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs index a125ddb..660ff3a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 涎_通常(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs index 9d95fde..b52a9a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs @@ -325,7 +325,7 @@ namespace SlaveMatrix } } - public 涙(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 涙D e) + public 涙(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 涙D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["涙左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs index 005f2b4..0af465b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 涙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs index 1dff35d..d71353d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs @@ -1511,7 +1511,7 @@ namespace SlaveMatrix } } - public 潮吹_大_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 潮吹_大_人D e) + public 潮吹_大_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 潮吹_大_人D e) { ThisType = GetType(); Dif dif = new Dif(Sta.性器付["潮吹"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs index e1ea318..9752069 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 潮吹_大_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs index 66a1056..ff09cc7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs @@ -1511,7 +1511,7 @@ namespace SlaveMatrix } } - public 潮吹_大_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 潮吹_大_獣D e) + public 潮吹_大_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 潮吹_大_獣D e) { ThisType = GetType(); Dif dif = new Dif(Sta.性器付["四足潮吹"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs index 7f40e92..0d02c89 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 潮吹_大_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs index 3aaa5c6..788a696 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs @@ -131,7 +131,7 @@ namespace SlaveMatrix } } - public 潮吹_小_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 潮吹_小_人D e) + public 潮吹_小_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 潮吹_小_人D e) { ThisType = GetType(); Dif dif = new Dif(Sta.性器付["潮吹"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs index 1808b39..f00ba5c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 潮吹_小_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs index d5d9451..c206db3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs @@ -131,7 +131,7 @@ namespace SlaveMatrix } } - public 潮吹_小_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 潮吹_小_獣D e) + public 潮吹_小_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 潮吹_小_獣D e) { ThisType = GetType(); Dif dif = new Dif(Sta.性器付["四足潮吹"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs index 00e20df..92ed689 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 潮吹_小_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs index a7490f9..fd8b288 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs @@ -216,7 +216,7 @@ namespace SlaveMatrix } } - public 獣耳(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 獣耳D e) + public 獣耳(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 獣耳D e) { ThisType = GetType(); 本体 = new Difs(Sta.肢左["獣耳"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs index 860b074..0eae277 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 獣耳(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣脚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣脚.cs index 8c0dc00..cd47dbb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣脚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣脚.cs @@ -1,6 +1,6 @@ namespace SlaveMatrix { - public class 獣脚 : 脚 + public class 獣脚 : Leg { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣脚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣脚D.cs index 5ad1a99..74aaca3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣脚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣脚D.cs @@ -3,7 +3,7 @@ using System; namespace SlaveMatrix { [Serializable] - public class 獣脚D : 脚D + public class 獣脚D : LegD { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs index c7307f1..2aa41ad 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs @@ -566,7 +566,7 @@ namespace SlaveMatrix } } - public 玉口枷(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 玉口枷D e) + public 玉口枷(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 玉口枷D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["玉口枷"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs index f2b4461..e4292ff 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs @@ -59,7 +59,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 玉口枷(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs index 0923831..7a0ab85 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs @@ -166,7 +166,7 @@ namespace SlaveMatrix } } - public 目傷(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 目傷D e) + public 目傷(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 目傷D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["目傷左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs index 6ad6ea7..6329f4d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 目傷(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs index 0756326..dadb29d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 目尻影(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 目尻影D e) + public 目尻影(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 目尻影D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["目尻影左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs index c0a4a37..bd6677a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 目尻影(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs index c3a81b4..cd602cc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs @@ -524,7 +524,7 @@ namespace SlaveMatrix } } - public 目隠帯(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 目隠帯D e) + public 目隠帯(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 目隠帯D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["目隠帯"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs index 2671783..f9fe801 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 目隠帯(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs index f1d4ca0..c54ee63 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs @@ -148,7 +148,7 @@ namespace SlaveMatrix } } - public 眉(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 眉D e) + public 眉(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 眉D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["眉左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs index f56e45e..e82250f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 眉(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs index 799b942..3131cad 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public 瞼_中(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 瞼_中D e) + public 瞼_中(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_中D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["魔性中瞼左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs index 1317961..a238410 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs @@ -52,7 +52,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 瞼_中(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs index 24fdb46..9172914 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs @@ -202,7 +202,7 @@ namespace SlaveMatrix public JointS 涙_接続点 => new JointS(本体, X0Y0_目, 2); - public 瞼_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 瞼_宇D e) + public 瞼_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_宇D e) { 瞼_宇 瞼_宇2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs index c1dbe6d..4fcf49e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs @@ -36,7 +36,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 瞼_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs index 8fbc968..c9a8e9f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs @@ -506,7 +506,7 @@ namespace SlaveMatrix } } - public 瞼_弱(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 瞼_弱D e) + public 瞼_弱(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_弱D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["魔性弱瞼左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs index 13ad91b..e7aa868 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs @@ -46,7 +46,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 瞼_弱(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs index 424070c..4034101 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public 瞼_強(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 瞼_強D e) + public 瞼_強(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_強D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["魔性強瞼左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs index 15a8dab..d1e837a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs @@ -52,7 +52,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 瞼_強(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs index fb204f1..c6d82f1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs @@ -506,7 +506,7 @@ namespace SlaveMatrix } } - public 瞼_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 瞼_獣D e) + public 瞼_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["獣性瞼左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs index 5940da4..130e06f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs @@ -46,7 +46,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 瞼_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs index 508bfd2..e885496 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs @@ -334,7 +334,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 節尾_曳航(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 節尾_曳航D e) + public 節尾_曳航(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節尾_曳航D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -421,7 +421,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_前腿節); Are.Draw(X0Y0_腿節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs index 0ab12ef..390e5ca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 節尾_曳航(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs index 84006bb..23aefda 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs @@ -313,7 +313,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 節尾_鋏(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 節尾_鋏D e) + public 節尾_鋏(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節尾_鋏D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -398,7 +398,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_牙); Are.Draw(X0Y0_輪_革); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs index c095f82..fa5fbef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 節尾_鋏(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs index 5e54263..c14ba3b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs @@ -372,7 +372,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 節足_足百(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 節足_足百D e) + public 節足_足百(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節足_足百D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -466,7 +466,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_基節); Are.Draw(X0Y0_転節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs index bf8c2b8..cd1ec92 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs @@ -41,7 +41,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 節足_足百(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs index 04a703a..48fda23 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs @@ -497,7 +497,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 節足_足蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 節足_足蜘D e) + public 節足_足蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節足_足蜘D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -608,7 +608,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_基節); Are.Draw(X0Y0_転節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs index def7010..1c3f14c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 節足_足蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs index 73550e3..583cfd9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs @@ -455,7 +455,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 節足_足蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 節足_足蠍D e) + public 節足_足蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節足_足蠍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -559,7 +559,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_転節); Are.Draw(X0Y0_腿節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs index 10a2d12..04db01d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 節足_足蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs index d9ac24a..12228ed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs @@ -403,7 +403,7 @@ namespace SlaveMatrix } } - public 紅潮(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 紅潮D e) + public 紅潮(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 紅潮D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["紅潮"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs index 338010d..a0cf680 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 紅潮(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs index b5d6a61..438f5b2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs @@ -221,7 +221,7 @@ namespace SlaveMatrix public JointS 瞼_接続点 => new JointS(本体, X0Y0_白目, 0); - public 縦目(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 縦目D e) + public 縦目(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 縦目D e) { 縦目 縦目2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs index fbff78e..4d74773 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.縦目_瞼_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 縦目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs index cead8c5..b7af502 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs @@ -412,7 +412,7 @@ namespace SlaveMatrix } } - public 縦瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 縦瞼D e) + public 縦瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 縦瞼D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["額瞼"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs index 3bfce5c..0f76e7c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs @@ -48,7 +48,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 縦瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs index de1f3c4..f7d893c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs @@ -209,7 +209,7 @@ namespace SlaveMatrix } } - public 羽根箒(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 羽根箒D e) + public 羽根箒(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 羽根箒D e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["羽根箒"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs index b2fa423..7b4cd84 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs @@ -25,7 +25,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 羽根箒(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs index 71de433..951b0dd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs @@ -117,7 +117,7 @@ namespace SlaveMatrix } } - public 耳_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 耳_人D e) + public 耳_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_人D e) { ThisType = GetType(); 本体 = new Difs(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs index 8a0cd32..040a0e1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 耳_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs index 022f4e1..625902a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs @@ -165,7 +165,7 @@ namespace SlaveMatrix } } - public 耳_尖(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 耳_尖D e) + public 耳_尖(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_尖D e) { ThisType = GetType(); 本体 = new Difs(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs index ee1d3d2..41bf19c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 耳_尖(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs index ca6791a..29cabc4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs @@ -216,7 +216,7 @@ namespace SlaveMatrix } } - public 耳_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 耳_獣D e) + public 耳_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_獣D e) { ThisType = GetType(); 本体 = new Difs(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs index 5ad11c4..3814c0e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 耳_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs index 947471a..fbefc05 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs @@ -318,7 +318,7 @@ namespace SlaveMatrix } } - public 耳_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 耳_羽D e) + public 耳_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_羽D e) { ThisType = GetType(); 本体 = new Difs(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs index 063db76..2af5fc8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 耳_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs index f0c5dc3..ba4af0d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs @@ -216,7 +216,7 @@ namespace SlaveMatrix } } - public 耳_長(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 耳_長D e) + public 耳_長(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_長D e) { ThisType = GetType(); 本体 = new Difs(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs index 7d059e3..3e66830 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 耳_長(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs index b61ec61..9e770d0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs @@ -383,7 +383,7 @@ namespace SlaveMatrix } } - public 耳_鰭(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 耳_鰭D e) + public 耳_鰭(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_鰭D e) { ThisType = GetType(); 本体 = new Difs(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs index 563326d..cc675a2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 耳_鰭(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs index 6e6b144..361eff0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs @@ -130,7 +130,7 @@ namespace SlaveMatrix public JointS 肛門精液_接続点 => new JointS(本体, X0Y0_肛門2, 0); - public 肛門_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 肛門_人D e) + public 肛門_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 肛門_人D e) { 肛門_人 肛門_人2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs index 98de21f..f1490a9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.肛門_人_肛門精液_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 肛門_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs index dc633c6..c76d0cc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs @@ -130,7 +130,7 @@ namespace SlaveMatrix public JointS 肛門精液_接続点 => new JointS(本体, X0Y0_肛門2, 0); - public 肛門_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 肛門_獣D e) + public 肛門_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 肛門_獣D e) { 肛門_獣 肛門_獣2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs index da0ae12..5947c3d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.肛門_獣_肛門精液_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 肛門_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs index 770ac8d..7c4f91f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs @@ -113,7 +113,7 @@ namespace SlaveMatrix } } - public 肛門精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 肛門精液_人D e) + public 肛門精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 肛門精液_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["肛門精液垂れ"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs index f965567..6d0d3d1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 肛門精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs index c9d58d6..635fd62 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs @@ -113,7 +113,7 @@ namespace SlaveMatrix } } - public 肛門精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 肛門精液_獣D e) + public 肛門精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 肛門精液_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.半身["四足肛門精液垂れ"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs index 6b8bc50..7fa5375 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 肛門精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs deleted file mode 100644 index bb3ea7b..0000000 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs +++ /dev/null @@ -1,478 +0,0 @@ -using System.Linq; -using _2DGAMELIB; - -namespace SlaveMatrix -{ - public class 肩 : Ele - { - public Par X0Y0_脇_脇; - - public Par X0Y0_脇_筋肉; - - public Par X0Y0_肩_肩; - - public Par X0Y0_肩_虫性_甲殻1; - - public Par X0Y0_肩_虫性_甲殻2; - - public Par X0Y0_肩_傷I1; - - public Par X0Y0_肩_傷I2; - - public Par X0Y0_肩_傷I3; - - public Par X0Y0_肩_傷I4; - - public Par X0Y0_肩_シャツ; - - public Par X0Y0_肩_ナース; - - public ColorD 脇_脇CD; - - public ColorD 脇_筋肉CD; - - public ColorD 肩_肩CD; - - public ColorD 肩_虫性_甲殻1CD; - - public ColorD 肩_虫性_甲殻2CD; - - public ColorD 肩_傷I1CD; - - public ColorD 肩_傷I2CD; - - public ColorD 肩_傷I3CD; - - public ColorD 肩_傷I4CD; - - public ColorD 肩_シャツCD; - - public ColorD 肩_ナースCD; - - public ColorP X0Y0_脇_脇CP; - - public ColorP X0Y0_脇_筋肉CP; - - public ColorP X0Y0_肩_肩CP; - - public ColorP X0Y0_肩_虫性_甲殻1CP; - - public ColorP X0Y0_肩_虫性_甲殻2CP; - - public ColorP X0Y0_肩_傷I1CP; - - public ColorP X0Y0_肩_傷I2CP; - - public ColorP X0Y0_肩_傷I3CP; - - public ColorP X0Y0_肩_傷I4CP; - - public ColorP X0Y0_肩_シャツCP; - - public ColorP X0Y0_肩_ナースCP; - - public スタンプK キスマーク; - - public スタンプW 鞭痕; - - public Ele[] 上腕_接続; - - public override bool 欠損 - { - get - { - return 欠損_; - } - set - { - 欠損_ = value; - } - } - - public override bool 筋肉 - { - get - { - return 筋肉_; - } - set - { - 筋肉_ = value; - 脇_筋肉_表示 = 筋肉_; - X0Y0_脇_脇.OP.ExpansionXY(X0Y0_脇_脇.OP.GetCenter(), 0.0005); - X0Y0_脇_脇.JP.ExpansionXY(X0Y0_脇_脇.JP.GetCenter(), 0.0005); - X0Y0_肩_肩.OP.ExpansionXY(X0Y0_肩_肩.OP.GetCenter(), 0.0005); - X0Y0_肩_肩.JP.ExpansionXY(X0Y0_肩_肩.JP.GetCenter(), 0.0005); - } - } - - public override bool 拘束 - { - get - { - return 拘束_; - } - set - { - 拘束_ = value; - } - } - - public bool 脇_脇_表示 - { - get - { - return X0Y0_脇_脇.Dra; - } - set - { - X0Y0_脇_脇.Dra = value; - X0Y0_脇_脇.Hit = value; - } - } - - public bool 脇_筋肉_表示 - { - get - { - return X0Y0_脇_筋肉.Dra; - } - set - { - X0Y0_脇_筋肉.Dra = value; - X0Y0_脇_筋肉.Hit = value; - } - } - - public bool 肩_表示 - { - get - { - return X0Y0_肩_肩.Dra; - } - set - { - X0Y0_肩_肩.Dra = value; - X0Y0_肩_肩.Hit = value; - } - } - - public bool 肩_虫性_甲殻1_表示 - { - get - { - return X0Y0_肩_虫性_甲殻1.Dra; - } - set - { - X0Y0_肩_虫性_甲殻1.Dra = value; - X0Y0_肩_虫性_甲殻1.Hit = value; - } - } - - public bool 肩_虫性_甲殻2_表示 - { - get - { - return X0Y0_肩_虫性_甲殻2.Dra; - } - set - { - X0Y0_肩_虫性_甲殻2.Dra = value; - X0Y0_肩_虫性_甲殻2.Hit = value; - } - } - - public bool 肩_傷I1_表示 - { - get - { - return X0Y0_肩_傷I1.Dra; - } - set - { - X0Y0_肩_傷I1.Dra = value; - X0Y0_肩_傷I1.Hit = value; - } - } - - public bool 肩_傷I2_表示 - { - get - { - return X0Y0_肩_傷I2.Dra; - } - set - { - X0Y0_肩_傷I2.Dra = value; - X0Y0_肩_傷I2.Hit = value; - } - } - - public bool 肩_傷I3_表示 - { - get - { - return X0Y0_肩_傷I3.Dra; - } - set - { - X0Y0_肩_傷I3.Dra = value; - X0Y0_肩_傷I3.Hit = value; - } - } - - public bool 肩_傷I4_表示 - { - get - { - return X0Y0_肩_傷I4.Dra; - } - set - { - X0Y0_肩_傷I4.Dra = value; - X0Y0_肩_傷I4.Hit = value; - } - } - - public bool 肩_シャツ_表示 - { - get - { - return X0Y0_肩_シャツ.Dra; - } - set - { - X0Y0_肩_シャツ.Dra = value; - X0Y0_肩_シャツ.Hit = value; - } - } - - public bool 肩_ナース_表示 - { - get - { - return X0Y0_肩_ナース.Dra; - } - set - { - X0Y0_肩_ナース.Dra = value; - X0Y0_肩_ナース.Hit = value; - } - } - - public override bool 表示 - { - get - { - return 脇_脇_表示; - } - set - { - 脇_脇_表示 = value; - 脇_筋肉_表示 = value; - 肩_表示 = value; - 肩_虫性_甲殻1_表示 = value; - 肩_虫性_甲殻2_表示 = value; - 肩_傷I1_表示 = value; - 肩_傷I2_表示 = value; - 肩_傷I3_表示 = value; - 肩_傷I4_表示 = value; - 肩_シャツ_表示 = value; - 肩_ナース_表示 = value; - } - } - - public override double 濃度 - { - get - { - return 脇_脇CD.不透明度; - } - set - { - 脇_脇CD.不透明度 = value; - 脇_筋肉CD.不透明度 = value; - 肩_肩CD.不透明度 = value; - 肩_虫性_甲殻1CD.不透明度 = value; - 肩_虫性_甲殻2CD.不透明度 = value; - 肩_傷I1CD.不透明度 = value; - 肩_傷I2CD.不透明度 = value; - 肩_傷I3CD.不透明度 = value; - 肩_傷I4CD.不透明度 = value; - 肩_シャツCD.不透明度 = value; - 肩_ナースCD.不透明度 = value; - } - } - - public JointS 上腕_接続点 => new JointS(本体, X0Y0_肩_肩, 1); - - public 肩(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 肩D e) - { - 肩 肩2 = this; - ThisType = GetType(); - 本体 = new Difs(Sta.肩左["肩"]); - Pars pars = 本体[0][0]; - Pars pars2 = pars["脇"].ToPars(); - X0Y0_脇_脇 = pars2["脇"].ToPar(); - X0Y0_脇_筋肉 = pars2["筋肉"].ToPar(); - pars2 = pars["肩"].ToPars(); - X0Y0_肩_肩 = pars2["肩"].ToPar(); - Pars pars3 = pars2["虫性"].ToPars(); - X0Y0_肩_虫性_甲殻1 = pars3["甲殻1"].ToPar(); - X0Y0_肩_虫性_甲殻2 = pars3["甲殻2"].ToPar(); - X0Y0_肩_傷I1 = pars2["傷I1"].ToPar(); - X0Y0_肩_傷I2 = pars2["傷I2"].ToPar(); - X0Y0_肩_傷I3 = pars2["傷I3"].ToPar(); - X0Y0_肩_傷I4 = pars2["傷I4"].ToPar(); - X0Y0_肩_シャツ = pars2["シャツ"].ToPar(); - X0Y0_肩_ナース = pars2["ナース"].ToPar(); - 本体.SetJoints(); - 接続根 = new JointD(本体); - 右 = e.右; - 反転X = e.反転X; - 反転Y = e.反転Y; - 基準C = e.基準C; - 位置C = e.位置C; - 角度B = e.角度B; - 角度C = e.角度C; - 尺度B = e.尺度B; - 尺度C = e.尺度C; - 尺度XB = e.尺度XB; - 尺度XC = e.尺度XC; - 尺度YB = e.尺度YB; - 尺度YC = e.尺度YC; - 肥大 = e.肥大; - 身長 = e.身長; - Xv = e.Xv; - Yv = e.Yv; - Xi = e.Xi; - Yi = e.Yi; - サイズ = e.サイズ; - サイズX = e.サイズX; - サイズY = e.サイズY; - 脇_脇_表示 = e.脇_脇_表示; - 脇_筋肉_表示 = e.脇_筋肉_表示; - 肩_表示 = e.肩_表示; - 肩_虫性_甲殻1_表示 = e.肩_虫性_甲殻1_表示; - 肩_虫性_甲殻2_表示 = e.肩_虫性_甲殻2_表示; - 肩_傷I1_表示 = e.肩_傷I1_表示; - 肩_傷I2_表示 = e.肩_傷I2_表示; - 肩_傷I3_表示 = e.肩_傷I3_表示; - 肩_傷I4_表示 = e.肩_傷I4_表示; - 肩_シャツ_表示 = e.肩_シャツ_表示; - 肩_ナース_表示 = e.肩_ナース_表示; - 欠損 = e.欠損; - 筋肉 = e.筋肉; - 拘束 = e.拘束; - if (!e.表示) - { - 表示 = false; - } - if (e.上腕_接続.Count > 0) - { - Ele f; - 上腕_接続 = e.上腕_接続.Select(delegate(EleD g) - { - f = g.GetEle(DisUnit, Med, 体配色); - f.Par = 肩2; - f.ConnectionType = ConnectionInfo.肩_上腕_接続; - f.接続(肩2.上腕_接続点); - return f; - }).ToArray(); - } - base.配色指定 = 配色指定; - 配色(体配色); - X0Y0_脇_脇CP = new ColorP(X0Y0_脇_脇, 脇_脇CD, DisUnit, abj: true); - X0Y0_脇_筋肉CP = new ColorP(X0Y0_脇_筋肉, 脇_筋肉CD, DisUnit, abj: true); - X0Y0_肩_肩CP = new ColorP(X0Y0_肩_肩, 肩_肩CD, DisUnit, abj: true); - X0Y0_肩_虫性_甲殻1CP = new ColorP(X0Y0_肩_虫性_甲殻1, 肩_虫性_甲殻1CD, DisUnit, abj: true); - X0Y0_肩_虫性_甲殻2CP = new ColorP(X0Y0_肩_虫性_甲殻2, 肩_虫性_甲殻2CD, DisUnit, abj: true); - X0Y0_肩_傷I1CP = new ColorP(X0Y0_肩_傷I1, 肩_傷I1CD, DisUnit, abj: true); - X0Y0_肩_傷I2CP = new ColorP(X0Y0_肩_傷I2, 肩_傷I2CD, DisUnit, abj: true); - X0Y0_肩_傷I3CP = new ColorP(X0Y0_肩_傷I3, 肩_傷I3CD, DisUnit, abj: true); - X0Y0_肩_傷I4CP = new ColorP(X0Y0_肩_傷I4, 肩_傷I4CD, DisUnit, abj: true); - X0Y0_肩_シャツCP = new ColorP(X0Y0_肩_シャツ, 肩_シャツCD, DisUnit, abj: true); - X0Y0_肩_ナースCP = new ColorP(X0Y0_肩_ナース, 肩_ナースCD, DisUnit, abj: true); - 濃度 = e.濃度; - X0Y0_脇_脇.BasePointBase = X0Y0_脇_脇.BasePointBase.AddY(-0.001); - } - - public void 脇描画(Are Are) - { - Are.Draw(X0Y0_脇_脇); - Are.Draw(X0Y0_脇_筋肉); - } - - public void 服描画(Are Are) - { - Are.Draw(X0Y0_肩_シャツ); - Are.Draw(X0Y0_肩_ナース); - } - - public override void 描画0(Are Are) - { - Are.Draw(X0Y0_肩_肩); - Are.Draw(X0Y0_肩_傷I1); - Are.Draw(X0Y0_肩_傷I2); - Are.Draw(X0Y0_肩_傷I3); - Are.Draw(X0Y0_肩_傷I4); - キスマーク.Draw(Are); - 鞭痕.Draw(Are); - Are.Draw(X0Y0_肩_虫性_甲殻1); - Are.Draw(X0Y0_肩_虫性_甲殻2); - } - - public override bool Is布(Par p) - { - if (p != X0Y0_肩_シャツ) - { - return p == X0Y0_肩_ナース; - } - return true; - } - - public override void 色更新() - { - X0Y0_脇_脇CP.Update(); - X0Y0_脇_筋肉CP.Update(); - X0Y0_肩_肩CP.Update(); - X0Y0_肩_虫性_甲殻1CP.Update(); - X0Y0_肩_虫性_甲殻2CP.Update(); - X0Y0_肩_傷I1CP.Update(); - X0Y0_肩_傷I2CP.Update(); - X0Y0_肩_傷I3CP.Update(); - X0Y0_肩_傷I4CP.Update(); - } - - public void シャツ色更新(Vector2D[] シャツ) - { - X0Y0_肩_シャツCP.Update(シャツ); - } - - public void ナース色更新(Vector2D[] ナース) - { - X0Y0_肩_ナースCP.Update(ナース); - } - - private void 配色(体配色 体配色) - { - 配色N0(体配色); - } - - private void 配色N0(体配色 体配色) - { - 脇_脇CD = new ColorD(ref Col.Black, ref 体配色.人肌R); - 脇_筋肉CD = new ColorD(ref Col.Black, ref 体配色.人肌R); - 肩_肩CD = new ColorD(ref Col.Black, ref 体配色.人肌O); - 肩_虫性_甲殻1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); - 肩_虫性_甲殻2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); - 肩_傷I1CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); - 肩_傷I2CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); - 肩_傷I3CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); - 肩_傷I4CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); - 肩_シャツCD = new ColorD(); - 肩_ナースCD = new ColorD(); - } - } -} diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩D.cs deleted file mode 100644 index d20f9ce..0000000 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肩D.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using _2DGAMELIB; - -namespace SlaveMatrix -{ - [Serializable] - public class 肩D : EleD - { - public bool 脇_脇_表示 = true; - - public bool 脇_筋肉_表示; - - public bool 肩_表示 = true; - - public bool 肩_虫性_甲殻1_表示; - - public bool 肩_虫性_甲殻2_表示; - - public bool 肩_傷I1_表示; - - public bool 肩_傷I2_表示; - - public bool 肩_傷I3_表示; - - public bool 肩_傷I4_表示; - - public bool 肩_シャツ_表示; - - public bool 肩_ナース_表示; - - public List 上腕_接続 = new List(); - - public 肩D() - { - ThisType = GetType(); - } - - public void 上腕接続(EleD e) - { - 上腕_接続.Add(e); - e.Par = this; - e.接続情報 = ConnectionInfo.肩_上腕_接続; - } - - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) - { - return new 肩(DisUnit, 配色指定, 体配色, Med, this); - } - } -} diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs index f145340..e1da329 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs @@ -105,7 +105,7 @@ namespace SlaveMatrix } } - public 背中_光(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 背中_光D e) + public 背中_光(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 背中_光D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs index a256787..86cf24d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 背中_光(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs index 4180833..815df5c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs @@ -854,7 +854,7 @@ namespace SlaveMatrix } } - public 背中_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 背中_甲D e) + public 背中_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 背中_甲D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs index c0d0961..b7ac58a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs @@ -85,7 +85,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 背中_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs index 675af5c..15ee3d9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 背中_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 背中_羽D e) + public 背中_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 背中_羽D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs index 44e55bc..718fbfd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 背中_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs index 6956115..34ae0ec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs @@ -188,7 +188,7 @@ namespace SlaveMatrix } } - public 胴肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴肌D e) + public 胴肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胴肌D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["胴肌"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs index 79cf893..9c79c61 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 胴肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs index 059b660..3ae1593 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 胴腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胴腹板D e) + public 胴腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胴腹板D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["胴腹板"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs index f5713d9..f94c0da 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 胴腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs index 8738a37..fae0fed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 胸毛(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胸毛D e) + public 胸毛(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胸毛D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["胸毛"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs index 4dc184e..d1e3e2e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 胸毛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs index 147e7db..4a0885d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs @@ -818,7 +818,7 @@ namespace SlaveMatrix } } - public 胸肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胸肌D e) + public 胸肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胸肌D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["胸郭肌"]); @@ -985,7 +985,7 @@ namespace SlaveMatrix 尺度YB = 0.99; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_虫性_甲殻2); Are.Draw(X0Y0_虫性_甲殻1_甲殻); @@ -1022,7 +1022,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_コア_コア1_ハイライト); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_コア_コア2_基); Are.Draw(X0Y0_コア_コア2_コア); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs index aac92c9..97ab80a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 胸肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs index a4fc685..c2cce78 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 胸腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 胸腹板D e) + public 胸腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胸腹板D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["胸郭腹板"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs index af4115a..bdd683a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 胸腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚人.cs index 8162d5e..8f345a7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚人.cs @@ -4,7 +4,7 @@ namespace SlaveMatrix { public 腿_人 腿; - public 脚_人 脚; + public Leg_人 Leg; public 足_人 足; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚獣.cs index eed5bc2..efcb59a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/脚獣.cs @@ -4,7 +4,7 @@ namespace SlaveMatrix { public 獣腿 腿; - public 獣脚 脚; + public 獣脚 Leg; public 獣足 足; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕人.cs index fce3e84..a422aeb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕人.cs @@ -2,7 +2,7 @@ namespace SlaveMatrix { public struct 腕人 { - public 肩 肩; + public Shoulder Shoulder; public 上腕_人 上腕; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕獣.cs index c5269d2..d5e0459 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕獣.cs @@ -2,7 +2,7 @@ namespace SlaveMatrix { public struct 腕獣 { - public 四足脇 肩; + public 四足脇 Shoulder; public 獣上腕 上腕; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼獣.cs index e3c664d..2af0080 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼獣.cs @@ -2,7 +2,7 @@ namespace SlaveMatrix { public struct 腕翼獣 { - public 肩 肩; + public Shoulder Shoulder; public 上腕_蝙 上腕; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼鳥.cs index 1b57c6d..e57631f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼鳥.cs @@ -2,7 +2,7 @@ namespace SlaveMatrix { public struct 腕翼鳥 { - public 肩 肩; + public Shoulder Shoulder; public 上腕_鳥 上腕; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs index 90e0d04..c75975d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs @@ -1007,7 +1007,7 @@ namespace SlaveMatrix } } - public 腰肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 腰肌D e) + public 腰肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腰肌D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["腰肌"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs index 33af8c2..61f0869 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 腰肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿.cs index d5a66ba..ae0ded0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿.cs @@ -2,6 +2,6 @@ namespace SlaveMatrix { public class 腿 : Ele { - public Ele[] 脚_接続; + public Ele[] Leg_接続; } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿D.cs index 7fbebb3..556ea27 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿D.cs @@ -6,9 +6,9 @@ namespace SlaveMatrix [Serializable] public class 腿D : EleD { - public List 脚_接続 = new List(); + public List Leg_接続 = new List(); - public virtual void 脚接続(EleD e) + public virtual void Leg接続(EleD e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs index e20fcbc..60c3101 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs @@ -2825,7 +2825,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(本体, X0Y0_腿, 0); - public 腿_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 腿_人D e) + public 腿_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_人D e) { 腿_人 腿_人2 = this; ThisType = GetType(); @@ -3286,14 +3286,14 @@ namespace SlaveMatrix { 表示 = false; } - if (e.脚_接続.Count > 0) + if (e.Leg_接続.Count > 0) { Ele f; - 脚_接続 = e.脚_接続.Select(delegate(EleD g) + Leg_接続 = e.Leg_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_人2; - f.ConnectionType = ConnectionInfo.腿_人_脚_接続; + f.ConnectionType = ConnectionInfo.腿_人_Leg_接続; f.接続(腿_人2.脚_接続点); return f; }).ToArray(); @@ -3576,7 +3576,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { switch (本体.IndexY) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs index e0cc060..f776836 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs @@ -155,14 +155,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 脚接続(EleD e) + public override void Leg接続(EleD e) { - 脚_接続.Add(e); + Leg_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腿_人_脚_接続; + e.接続情報 = ConnectionInfo.腿_人_Leg_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 腿_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs index 8833480..3725da7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs @@ -150,7 +150,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(本体, X0Y0_腿, 0); - public 腿_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 腿_獣D e) + public 腿_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_獣D e) { 腿_獣 腿_獣2 = this; ThisType = GetType(); @@ -199,14 +199,14 @@ namespace SlaveMatrix { 表示 = false; } - if (e.脚_接続.Count > 0) + if (e.Leg_接続.Count > 0) { Ele f; - 脚_接続 = e.脚_接続.Select(delegate(EleD g) + Leg_接続 = e.Leg_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_獣2; - f.ConnectionType = ConnectionInfo.腿_獣_脚_接続; + f.ConnectionType = ConnectionInfo.腿_獣_Leg_接続; f.接続(腿_獣2.脚_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs index 7c96dd3..7932dbc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs @@ -19,14 +19,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 脚接続(EleD e) + public override void Leg接続(EleD e) { - 脚_接続.Add(e); + Leg_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腿_獣_脚_接続; + e.接続情報 = ConnectionInfo.腿_獣_Leg_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 腿_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs index 2bea656..c53fc0b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs @@ -318,7 +318,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(本体, X0Y0_腿, 0); - public 腿_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 腿_竜D e) + public 腿_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_竜D e) { 腿_竜 腿_竜2 = this; ThisType = GetType(); @@ -384,14 +384,14 @@ namespace SlaveMatrix { 表示 = false; } - if (e.脚_接続.Count > 0) + if (e.Leg_接続.Count > 0) { Ele f; - 脚_接続 = e.脚_接続.Select(delegate(EleD g) + Leg_接続 = e.Leg_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_竜2; - f.ConnectionType = ConnectionInfo.腿_竜_脚_接続; + f.ConnectionType = ConnectionInfo.腿_竜_Leg_接続; f.接続(腿_竜2.脚_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs index 49185db..a7fd462 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs @@ -35,14 +35,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 脚接続(EleD e) + public override void Leg接続(EleD e) { - 脚_接続.Add(e); + Leg_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腿_竜_脚_接続; + e.接続情報 = ConnectionInfo.腿_竜_Leg_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 腿_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs index 70807d4..047192e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs @@ -108,7 +108,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(本体, X0Y0_腿, 0); - public 腿_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 腿_蹄D e) + public 腿_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_蹄D e) { 腿_蹄 腿_蹄2 = this; ThisType = GetType(); @@ -152,14 +152,14 @@ namespace SlaveMatrix { 表示 = false; } - if (e.脚_接続.Count > 0) + if (e.Leg_接続.Count > 0) { Ele f; - 脚_接続 = e.脚_接続.Select(delegate(EleD g) + Leg_接続 = e.Leg_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_蹄2; - f.ConnectionType = ConnectionInfo.腿_蹄_脚_接続; + f.ConnectionType = ConnectionInfo.腿_蹄_Leg_接続; f.接続(腿_蹄2.脚_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs index 0f79d26..ebd7e86 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs @@ -15,14 +15,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 脚接続(EleD e) + public override void Leg接続(EleD e) { - 脚_接続.Add(e); + Leg_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腿_蹄_脚_接続; + e.接続情報 = ConnectionInfo.腿_蹄_Leg_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 腿_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs index 36c351c..db2fc60 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs @@ -108,7 +108,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(本体, X0Y0_腿, 0); - public 腿_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 腿_鳥D e) + public 腿_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_鳥D e) { 腿_鳥 腿_鳥2 = this; ThisType = GetType(); @@ -152,14 +152,14 @@ namespace SlaveMatrix { 表示 = false; } - if (e.脚_接続.Count > 0) + if (e.Leg_接続.Count > 0) { Ele f; - 脚_接続 = e.脚_接続.Select(delegate(EleD g) + Leg_接続 = e.Leg_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 腿_鳥2; - f.ConnectionType = ConnectionInfo.腿_鳥_脚_接続; + f.ConnectionType = ConnectionInfo.腿_鳥_Leg_接続; f.接続(腿_鳥2.脚_接続点); return f; }).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs index 2296db0..ce0a753 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs @@ -15,14 +15,14 @@ namespace SlaveMatrix ThisType = GetType(); } - public override void 脚接続(EleD e) + public override void Leg接続(EleD e) { - 脚_接続.Add(e); + Leg_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.腿_鳥_脚_接続; + e.接続情報 = ConnectionInfo.腿_鳥_Leg_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 腿_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs index a595ec1..4bd6896 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs @@ -137,7 +137,7 @@ namespace SlaveMatrix } } - public 膣内精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 膣内精液_人D e) + public 膣内精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 膣内精液_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["膣内精液"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs index 1d3313f..7cbe8e7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 膣内精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs index 7bb740d..a096230 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs @@ -137,7 +137,7 @@ namespace SlaveMatrix } } - public 膣内精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 膣内精液_獣D e) + public 膣内精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 膣内精液_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.半身["四足膣内精液"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs index b5f5598..a530385 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 膣内精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs index 799eb3d..a7e9f23 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 膣基_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 膣基_人D e) + public 膣基_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 膣基_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["膣基"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs index 2da2574..b4742c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 膣基_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs index 64b5ae7..1c5bb01 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 膣基_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 膣基_獣D e) + public 膣基_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 膣基_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.半身["四足膣基"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs index 7bbfb65..d8c7cba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 膣基_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs index 8cfcc45..ab617d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs @@ -171,7 +171,7 @@ namespace SlaveMatrix } } - public 舌_短(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 舌_短D e) + public 舌_短(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 舌_短D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs index 2e0f98f..3a9aea4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 舌_短(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs index a61d508..216b600 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs @@ -446,7 +446,7 @@ namespace SlaveMatrix } } - public 舌_長(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 舌_長D e) + public 舌_長(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 舌_長D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs index 33f9de1..9c34c32 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs @@ -47,7 +47,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 舌_長(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs index df5c6d7..8873418 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs @@ -1492,7 +1492,7 @@ namespace SlaveMatrix } } - public 花_百(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 花_百D e) + public 花_百(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 花_百D e) { ThisType = GetType(); Pars pars = new Pars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs index e71b8d7..edfc862 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs @@ -143,7 +143,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 花_百(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs index 6e2dcbf..613ea9d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs @@ -907,7 +907,7 @@ namespace SlaveMatrix } } - public 花_薔(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 花_薔D e) + public 花_薔(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 花_薔D e) { ThisType = GetType(); Pars pars = new Pars(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs index de9466e..0ddd11a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs @@ -89,7 +89,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 花_薔(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs index fd39306..1bc5210 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs @@ -142,7 +142,7 @@ namespace SlaveMatrix } } - public 葉_心(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 葉_心D e) + public 葉_心(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 葉_心D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["葉"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs index e283daf..2e1c638 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 葉_心(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs index 066c978..bdb9fe4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs @@ -142,7 +142,7 @@ namespace SlaveMatrix } } - public 葉_披(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 葉_披D e) + public 葉_披(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 葉_披D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["葉"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs index 95a2f87..7ce1a3a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 葉_披(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs index 445cbc3..e129986 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs @@ -440,7 +440,7 @@ namespace SlaveMatrix } } - public 虫鎌(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 虫鎌D e) + public 虫鎌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 虫鎌D e) { ThisType = GetType(); 本体 = new Difs(Sta.肢左["虫鎌"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs index 19c4192..2c4f455 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs @@ -45,7 +45,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 虫鎌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs index 9ea13af..6518810 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs @@ -167,7 +167,7 @@ namespace SlaveMatrix } } - public 虫顎(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 虫顎D e) + public 虫顎(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 虫顎D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["虫顎"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs index f8348c3..652d970 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs @@ -21,7 +21,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 虫顎(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs index 6d717ca..2b23f20 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 衝撃(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 衝撃D e) + public 衝撃(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 衝撃D e) { ThisType = GetType(); 本体 = new Difs(Sta.その他["衝撃"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs index e191118..fb71f63 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 衝撃(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衣装.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衣装.cs index 9984800..30f1fc7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衣装.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衣装.cs @@ -48,7 +48,7 @@ namespace SlaveMatrix public static bool Isブーツ条件(this ChaD c) { - return c.body_tree.EnumEleD().IsEleD<脚_人D>(); + return c.body_tree.EnumEleD().IsEleD(); } public static IEnumerable Get髪留め(ChaD c) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs index 0214eb4..03eec19 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs @@ -366,7 +366,7 @@ namespace SlaveMatrix } } - public 角1_一(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角1_一D e) + public 角1_一(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角1_一D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢中["角"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs index 9ded1f8..1d81288 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角1_一(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs index bde24e7..7cb343c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs @@ -275,7 +275,7 @@ namespace SlaveMatrix } } - public 角1_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角1_虫D e) + public 角1_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角1_虫D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢中["角"][2]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs index 7a2beb0..770677d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs @@ -29,7 +29,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角1_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs index 72fefd6..621f98f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs @@ -249,7 +249,7 @@ namespace SlaveMatrix } } - public 角1_鬼(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角1_鬼D e) + public 角1_鬼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角1_鬼D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢中["角"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs index 1253fc8..0d812f2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角1_鬼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs index 6187885..6f122bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2.cs @@ -18,12 +18,12 @@ namespace SlaveMatrix } } - public virtual void 根描画(Are Are) + public virtual void 根描画(RenderArea Are) { 本体.Draw(Are); } - public virtual void 先描画(Are Are) + public virtual void 先描画(RenderArea Are) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs index 1527c2d..577999d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs @@ -282,7 +282,7 @@ namespace SlaveMatrix } } - public 角2_山1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_山1D e) + public 角2_山1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_山1D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs index f164d98..e9be139 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs @@ -29,7 +29,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_山1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs index 8b542ab..2a0479d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs @@ -330,7 +330,7 @@ namespace SlaveMatrix } } - public 角2_山2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_山2D e) + public 角2_山2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_山2D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][1]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs index 17046e3..b231937 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_山2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs index 20611f0..2effd56 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs @@ -529,7 +529,7 @@ namespace SlaveMatrix } } - public 角2_山3(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_山3D e) + public 角2_山3(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_山3D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][2]); @@ -651,7 +651,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 根描画(Are Are) + public override void 根描画(RenderArea Are) { if (本体.IndexY == 0) { @@ -681,7 +681,7 @@ namespace SlaveMatrix } } - public override void 先描画(Are Are) + public override void 先描画(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs index c6b1d7e..6d69473 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_山3(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs index 4c9a055..751b53d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs @@ -414,7 +414,7 @@ namespace SlaveMatrix } } - public 角2_巻(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_巻D e) + public 角2_巻(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_巻D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][3]); @@ -518,7 +518,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 根描画(Are Are) + public override void 根描画(RenderArea Are) { if (本体.IndexY == 0) { @@ -543,7 +543,7 @@ namespace SlaveMatrix } } - public override void 先描画(Are Are) + public override void 先描画(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs index 70e704b..8d4c942 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs @@ -41,7 +41,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_巻(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs index 5307dd0..4bdf259 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs @@ -297,7 +297,7 @@ namespace SlaveMatrix } } - public 角2_牛1(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_牛1D e) + public 角2_牛1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_牛1D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][4]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs index 4cfa6d3..2f0d0b0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs @@ -31,7 +31,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_牛1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs index 2372221..3c596bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs @@ -249,7 +249,7 @@ namespace SlaveMatrix } } - public 角2_牛2(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_牛2D e) + public 角2_牛2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_牛2D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][5]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs index d982f73..99e5743 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_牛2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs index e7b268a..df47ca5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs @@ -261,7 +261,7 @@ namespace SlaveMatrix } } - public 角2_牛3(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_牛3D e) + public 角2_牛3(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_牛3D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][6]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs index a26d30d..64c8f8b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_牛3(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs index 89a5e69..ffe5dd5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs @@ -318,7 +318,7 @@ namespace SlaveMatrix } } - public 角2_牛4(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_牛4D e) + public 角2_牛4(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_牛4D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][7]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs index 3d24893..87a9f49 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_牛4(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs index b3647cc..5bdf5bf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs @@ -348,7 +348,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 角2_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_虫D e) + public 角2_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_虫D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][9]); @@ -447,7 +447,7 @@ namespace SlaveMatrix 鎖1.Dispose(); } - public override void 根描画(Are Are) + public override void 根描画(RenderArea Are) { 本体.Draw(Are); if (!欠損_) @@ -456,7 +456,7 @@ namespace SlaveMatrix } } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); if (!欠損_) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs index 654abdf..c9f4149 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs index dc32494..8148388 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs @@ -270,7 +270,7 @@ namespace SlaveMatrix } } - public 角2_鬼(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 角2_鬼D e) + public 角2_鬼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_鬼D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][8]); @@ -356,11 +356,11 @@ namespace SlaveMatrix 本体.JoinPAall(); } - public override void 根描画(Are Are) + public override void 根描画(RenderArea Are) { } - public override void 先描画(Are Are) + public override void 先描画(RenderArea Are) { 本体.Draw(Are); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs index 8416ff7..7168a09 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs @@ -29,7 +29,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 角2_鬼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs index 0d897c2..35a7bc6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs @@ -1680,7 +1680,7 @@ namespace SlaveMatrix public 拘束鎖 鎖5; - public Ele[] 頭_接続; + public Ele[] Head_接続; public Ele[] 上腕左_接続; @@ -6059,7 +6059,7 @@ namespace SlaveMatrix public JointS 鎖6_接続点 => new JointS(本体, X0Y0_脚前_輪_金具右, 0); - public 触手_犬(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触手_犬D e) + public 触手_犬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触手_犬D e) { 触手_犬 触手_犬2 = this; ThisType = GetType(); @@ -6746,13 +6746,13 @@ namespace SlaveMatrix 表示 = false; } Ele f; - if (e.頭_接続.Count > 0) + if (e.Head_接続.Count > 0) { - 頭_接続 = e.頭_接続.Select(delegate(EleD g) + Head_接続 = e.Head_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 触手_犬2; - f.ConnectionType = ConnectionInfo.触手_犬_頭_接続; + f.ConnectionType = ConnectionInfo.触手_犬_Head_接続; f.接続(触手_犬2.頭_接続点); return f; }).ToArray(); @@ -7119,7 +7119,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_脚後_鰭_鰭膜1); Are.Draw(X0Y0_脚後_鰭_鰭条1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs index e1e1cb5..b5747ce 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs @@ -575,7 +575,7 @@ namespace SlaveMatrix public bool 鎖表示; - public List 頭_接続 = new List(); + public List Head_接続 = new List(); public List 上腕左_接続 = new List(); @@ -596,9 +596,9 @@ namespace SlaveMatrix public void 頭接続(EleD e) { - 頭_接続.Add(e); + Head_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.触手_犬_頭_接続; + e.接続情報 = ConnectionInfo.触手_犬_Head_接続; } public void 上腕左接続(EleD e) @@ -643,7 +643,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.触手_犬_手右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触手_犬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs index 16fdd2e..1effc61 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs @@ -3279,7 +3279,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 触手_蔦(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触手_蔦D e) + public 触手_蔦(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触手_蔦D e) { 触手_蔦 触手_蔦2 = this; ThisType = GetType(); @@ -4085,7 +4085,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_節1_節); Are.Draw(X0Y0_節1_棘1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs index bd6b1ba..e3d707c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs @@ -531,7 +531,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.触手_蔦_先端_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触手_蔦(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs index 8b49b27..982a9ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs @@ -3771,7 +3771,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_手先_輪2_金具右, 0); - public 触手_触(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触手_触D e) + public 触手_触(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触手_触D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -4443,7 +4443,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_腕部_節1_節); Are.Draw(X0Y0_腕部_節1_紋柄_紋柄1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs index 33a5f8a..4e1bc94 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs @@ -363,7 +363,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触手_触(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs index 07a2b81..0ebb21c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs @@ -7278,7 +7278,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 触手_軟(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触手_軟D e) + public 触手_軟(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触手_軟D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -8421,7 +8421,7 @@ namespace SlaveMatrix 節1_吸盤4_表示 = false; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_節1_節); Are.Draw(X0Y0_節1_紋柄1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs index 95bd2da..e793d27 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs @@ -701,7 +701,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触手_軟(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs index f50f109..debd339 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs @@ -351,7 +351,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪_金具右, 0); - public 触肢_肢蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触肢_肢蜘D e) + public 触肢_肢蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触肢_肢蜘D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -439,7 +439,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_基節); Are.Draw(X0Y0_転節); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs index 69ca359..12722d5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触肢_肢蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs index 6d00de2..5d1338d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs @@ -490,7 +490,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 触肢_肢蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触肢_肢蠍D e) + public 触肢_肢蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触肢_肢蠍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -608,7 +608,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_爪2); Are.Draw(X0Y0_爪1); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs index dccf66c..3aef0aa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触肢_肢蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs index 4a52c5f..6b611c7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs @@ -294,7 +294,7 @@ namespace SlaveMatrix } } - public 触覚_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触覚_甲D e) + public 触覚_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_甲D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs index 4f63f09..efb7efc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触覚_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs index c4a74bc..653a982 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs @@ -609,7 +609,7 @@ namespace SlaveMatrix } } - public 触覚_節(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触覚_節D e) + public 触覚_節(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_節D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs index 6c8fcf9..25b0eca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs @@ -63,7 +63,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触覚_節(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs index b280203..3bf6c3e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs @@ -1323,7 +1323,7 @@ namespace SlaveMatrix } } - public 触覚_線(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触覚_線D e) + public 触覚_線(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_線D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs index 336fb4c..9c7138d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs @@ -131,7 +131,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触覚_線(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs index 17c2bb4..8ec87ac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs @@ -3234,7 +3234,7 @@ namespace SlaveMatrix } } - public 触覚_蛾(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触覚_蛾D e) + public 触覚_蛾(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_蛾D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs index 6593077..16eb463 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs @@ -313,7 +313,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触覚_蛾(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs index cc277cd..f7c5383 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs @@ -798,7 +798,7 @@ namespace SlaveMatrix } } - public 触覚_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触覚_蝶D e) + public 触覚_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_蝶D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs index c88fc32..ec9d5a7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs @@ -81,7 +81,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触覚_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs index 162e5f4..2fd3547 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs @@ -482,7 +482,7 @@ namespace SlaveMatrix } } - public 触覚_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 触覚_蠍D e) + public 触覚_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_蠍D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs index 9dd6ef7..5c14c1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 触覚_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教背景.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教背景.cs index 8603006..e00a33b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教背景.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教背景.cs @@ -40,7 +40,7 @@ namespace SlaveMatrix } } - public void Draw(Are Are) + public void Draw(RenderArea Are) { c = 0; for (y = 0; y < 10; y++) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs index 637e9e2..dcfb034 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs @@ -965,7 +965,7 @@ namespace SlaveMatrix } } - public 調教鞭(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 調教鞭D e) + public 調教鞭(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 調教鞭D e) { ThisType = GetType(); 本体 = new Difs(Sta.カーソル["調教鞭"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs index 4f6a6d0..8f67518 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 調教鞭(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs index 890fb96..0fef941 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs @@ -24,7 +24,7 @@ namespace SlaveMatrix public void 振り() { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.05), Sta.鞭振.GetVal(強さ_, 1.0), new Font("MS Gothic", 1f), Col.White, 0.2 + 0.2 * 強さ_, b: true); }); @@ -32,7 +32,7 @@ namespace SlaveMatrix public void 打ち(Vector2D p) { - 調教UI.擬音キュー.Enqueue(delegate(Are a) + 調教UI.擬音キュー.Enqueue(delegate(RenderArea a) { 調教UI.擬音.Sound(a, Sta.GetAreaPoint(ref p, 0.01), Sta.鞭打.GetVal(強さ_, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Color.Red.S(強さ_.Clamp(0.5, 1.0)), 0.2 + 0.1 * 強さ_, b: true); }); @@ -194,7 +194,7 @@ namespace SlaveMatrix } }; 調教UI.Mots.Add(鞭撃モーション.GetHashCode().ToString(), 鞭撃モーション); - 衝撃 = new 衝撃(Are.DisUnit, 配色指定.N0, null, Med, new 衝撃D + 衝撃 = new 衝撃(Are.DisplayUnitScale, 配色指定.N0, null, Med, new 衝撃D { 表示 = false }); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs index bc557b3..d97aa33 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs @@ -3169,7 +3169,7 @@ namespace SlaveMatrix } } - public 足_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 足_人D e) + public 足_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.脚左["足"]); @@ -3862,7 +3862,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (本体.IndexY == 0) { @@ -3940,7 +3940,7 @@ namespace SlaveMatrix } } - public void 底描画(Are Are) + public void 底描画(RenderArea Are) { if (本体.IndexY == 0) { @@ -3963,7 +3963,7 @@ namespace SlaveMatrix Are.Draw(X0Y1_アーマ0_靴底); } - public void 靴描画(Are Are) + public void 靴描画(RenderArea Are) { if (本体.IndexY == 0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs index b26d295..8a22326 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs @@ -249,7 +249,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 足_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs index df8d80f..4e24586 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs @@ -415,7 +415,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 足_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 足_牛D e) + public 足_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_牛D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -514,7 +514,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs index a67b197..7b44454 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs @@ -45,7 +45,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 足_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs index 6ecf52c..6038489 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs @@ -583,7 +583,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 足_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 足_獣D e) + public 足_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_獣D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -710,7 +710,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs index 8af0f18..17bf45c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs @@ -61,7 +61,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 足_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs index 7726596..a55c621 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs @@ -1276,7 +1276,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 足_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 足_竜D e) + public 足_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_竜D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1516,7 +1516,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs index 930d6d9..7baf462 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs @@ -127,7 +127,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 足_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs index 59f6ed4..f160839 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs @@ -331,7 +331,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 足_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 足_馬D e) + public 足_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_馬D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -418,7 +418,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs index 8375842..f7dbdb1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs @@ -37,7 +37,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 足_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs index 181dab3..6451eb1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs @@ -1864,7 +1864,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(本体, X0Y0_脚輪_金具右, 0); - public 足_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 足_鳥D e) + public 足_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_鳥D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -2185,7 +2185,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_足); Are.Draw(X0Y0_筋); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs index 86d397c..25f0707 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs @@ -183,7 +183,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 足_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs index 741e88d..4ce233a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 鎖(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鎖D e) + public 鎖(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鎖D e) { ThisType = GetType(); 本体 = new Difs(Sta.その他["鎖"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs index a63f7d7..270d5f5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鎖(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index 186563b..9c42af8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -69,7 +69,7 @@ namespace SlaveMatrix public Ele[] 右_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public override bool 欠損 { @@ -299,9 +299,9 @@ namespace SlaveMatrix public JointS 右_接続点 => new JointS(本体, X0Y0_胴1_胴, 3); - public JointS 胴_接続点 => new JointS(本体, X0Y0_胴1_胴, 1); + public JointS Torso_接続点 => new JointS(本体, X0Y0_胴1_胴, 1); - public 長物_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 長物_蛇D e) + public 長物_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 長物_蛇D e) { 長物_蛇 長物_蛇2 = this; ThisType = GetType(); @@ -389,14 +389,14 @@ namespace SlaveMatrix return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蛇2; - f.ConnectionType = ConnectionInfo.長物_蛇_胴_接続; - f.接続(長物_蛇2.胴_接続点); + f.ConnectionType = ConnectionInfo.長物_蛇_Torso_接続; + f.接続(長物_蛇2.Torso_接続点); return f; }).ToArray(); } @@ -414,14 +414,14 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_胴1_鱗2); Are.Draw(X0Y0_胴1_鱗左2); Are.Draw(X0Y0_胴1_鱗右2); - if (胴_接続 != null && 胴_接続[0].拘束 && 胴_接続[0] is 胴_蛇) + if (Torso_接続 != null && Torso_接続[0].拘束 && Torso_接続[0] is Torso_蛇) { - ((胴_蛇)胴_接続[0]).拘束具描画(Are); + ((Torso_蛇)Torso_接続[0]).拘束具描画(Are); } if (くぱぁ_ == 1.0) { @@ -430,7 +430,7 @@ namespace SlaveMatrix } } - public void 前描画(Are Are) + public void 前描画(RenderArea Are) { if (くぱぁ_ != 1.0) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs index 2c50dfd..798439c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix public List 右_接続 = new List(); - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public 長物_蛇D() { @@ -56,12 +56,12 @@ namespace SlaveMatrix public void 胴接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.長物_蛇_胴_接続; + e.接続情報 = ConnectionInfo.長物_蛇_Torso_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 長物_蛇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index 732546b..1f0997b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -113,7 +113,7 @@ namespace SlaveMatrix public Ele[] 右1_接続; - public Ele[] 胴_接続; + public Ele[] Torso_接続; public override bool 欠損 { @@ -507,13 +507,13 @@ namespace SlaveMatrix public JointS 右1_接続点 => new JointS(本体, X0Y0_胴1_胴, 1); - public JointS 胴_接続点 => new JointS(本体, X0Y0_胴1_胴, 3); + public JointS Torso_接続点 => new JointS(本体, X0Y0_胴1_胴, 3); public JointS 鎖1_接続点 => new JointS(本体, X0Y0_輪1_金具左, 0); public JointS 鎖2_接続点 => new JointS(本体, X0Y0_輪1_金具右, 0); - public 長物_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 長物_蟲D e) + public 長物_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 長物_蟲D e) { 長物_蟲 長物_蟲2 = this; ThisType = GetType(); @@ -644,14 +644,14 @@ namespace SlaveMatrix return f; }).ToArray(); } - if (e.胴_接続.Count > 0) + if (e.Torso_接続.Count > 0) { - 胴_接続 = e.胴_接続.Select(delegate(EleD g) + Torso_接続 = e.Torso_接続.Select(delegate(EleD g) { f = g.GetEle(DisUnit, Med, 体配色); f.Par = 長物_蟲2; - f.ConnectionType = ConnectionInfo.長物_蟲_胴_接続; - f.接続(長物_蟲2.胴_接続点); + f.ConnectionType = ConnectionInfo.長物_蟲_Torso_接続; + f.接続(長物_蟲2.Torso_接続点); return f; }).ToArray(); } @@ -691,7 +691,7 @@ namespace SlaveMatrix 鎖2.Dispose(); } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 本体.Draw(Are); 鎖1.描画0(Are); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs index 777aa02..3af50aa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs @@ -59,7 +59,7 @@ namespace SlaveMatrix public List 右1_接続 = new List(); - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public 長物_蟲D() { @@ -96,12 +96,12 @@ namespace SlaveMatrix public void 胴接続(EleD e) { - 胴_接続.Add(e); + Torso_接続.Add(e); e.Par = this; - e.接続情報 = ConnectionInfo.長物_蟲_胴_接続; + e.接続情報 = ConnectionInfo.長物_蟲_Torso_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 長物_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs index e9f4dd1..0edc0fc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs @@ -1892,7 +1892,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 長物_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 長物_魚D e) + public 長物_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 長物_魚D e) { 長物_魚 長物_魚2 = this; ThisType = GetType(); @@ -2374,7 +2374,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { if (Rパターン) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs index 35ac7b3..11710ea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs @@ -315,7 +315,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.長物_魚_尾_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 長物_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs index 5064c99..6d70ba2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs @@ -875,7 +875,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(本体, X0Y0_輪2_金具右, 0); - public 長物_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 長物_鯨D e) + public 長物_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 長物_鯨D e) { 長物_鯨 長物_鯨2 = this; ThisType = GetType(); @@ -1205,7 +1205,7 @@ namespace SlaveMatrix 鎖表示 = e.鎖表示; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_胴6_胴); Are.Draw(X0Y0_胴6_柄); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs index 45a78a4..72f9ca4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs @@ -217,7 +217,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.長物_鯨_尾_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 長物_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs index 62202e6..b55e066 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長胴D.cs @@ -10,7 +10,7 @@ namespace SlaveMatrix public List 右_接続 = new List(); - public List 胴_接続 = new List(); + public List Torso_接続 = new List(); public virtual void 左接続(EleD e) { @@ -20,7 +20,7 @@ namespace SlaveMatrix { } - public virtual void 胴接続(EleD e) + public virtual void Torso接続(EleD e) { } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs index 2ee7c69..ef565f0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 鞭痕(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鞭痕D e) + public 鞭痕(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鞭痕D e) { ThisType = GetType(); 本体 = new Difs(Sta.スタンプ["鞭痕"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs index a3067f1..16e0a96 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鞭痕(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs index 0fd64c2..7e14cdd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs @@ -231,7 +231,7 @@ namespace SlaveMatrix public JointS 瞼_接続点 => new JointS(本体, X0Y0_白目, 0); - public 頬目(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 頬目D e) + public 頬目(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頬目D e) { 頬目 頬目2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs index 1f38236..c32eb00 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs @@ -39,7 +39,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.頬目_瞼_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 頬目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs index 649de3a..94a6380 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs @@ -422,7 +422,7 @@ namespace SlaveMatrix } } - public 頬瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 頬瞼D e) + public 頬瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頬瞼D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["頬瞼左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs index da2adbb..1304b7d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs @@ -51,7 +51,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 頬瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs index 4f4f2e6..85bd8ff 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs @@ -734,7 +734,7 @@ namespace SlaveMatrix } } - public 頬肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 頬肌D e) + public 頬肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頬肌D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["頬肌左"]); @@ -887,7 +887,7 @@ namespace SlaveMatrix 濃度 = e.濃度; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { Are.Draw(X0Y0_淫タトゥ_ハート_タトゥ左); Are.Draw(X0Y0_淫タトゥ_ハート_タトゥ右); @@ -920,7 +920,7 @@ namespace SlaveMatrix Are.Draw(X0Y0_傷_傷I3); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { Are.Draw(X0Y0_獣性_髭1); Are.Draw(X0Y0_獣性_髭2); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs index de0eb07..d01f6aa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 頬肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭色更新.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭色更新.cs index e723f9e..6dc8a29 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭色更新.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭色更新.cs @@ -6,13 +6,13 @@ namespace SlaveMatrix { public class 頭色更新 { - public 頭 頭; + public Head 頭; private Ele[] 瞼; private Vector2D[] mm; - public 頭色更新(頭 頭, 単瞼 単瞼, 双瞼 瞼左, 双瞼 瞼右, 縦瞼 額瞼, 頬瞼 頬左, 頬瞼 頬右) + public 頭色更新(Head 頭, 単瞼 単瞼, 双瞼 瞼左, 双瞼 瞼右, 縦瞼 額瞼, 頬瞼 頬左, 頬瞼 頬右) { this.頭 = 頭; 瞼 = EnumNoNull(単瞼, 瞼左, 瞼右, 額瞼, 頬左, 頬右).ToArray(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs index 9208513..b3538b3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs @@ -105,7 +105,7 @@ namespace SlaveMatrix } } - public 頭頂_天(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 頭頂_天D e) + public 頭頂_天(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頭頂_天D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs index 19ab876..a8bcbdc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 頭頂_天(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs index d1b2cd1..f6ec4ea 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs @@ -1855,7 +1855,7 @@ namespace SlaveMatrix public JointS 頭部後_接続点 => new JointS(本体, X0Y0_頭部, 0); - public 頭頂_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 頭頂_宇D e) + public 頭頂_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頭頂_宇D e) { 頭頂_宇 頭頂_宇2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs index 0a79fe1..0cbce7d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs @@ -185,7 +185,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.頭頂_宇_頭部後_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 頭頂_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs index b479ba0..f43b655 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs @@ -206,7 +206,7 @@ namespace SlaveMatrix } } - public 頭頂_皿(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 頭頂_皿D e) + public 頭頂_皿(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頭頂_皿D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs index b85457b..d214980 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs @@ -25,7 +25,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 頭頂_皿(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs index deb206d..20df07c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs @@ -209,7 +209,7 @@ namespace SlaveMatrix } } - public 頭頂後_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 頭頂後_宇D e) + public 頭頂後_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頭頂後_宇D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs index cffcd41..156fef3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs @@ -25,7 +25,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 頭頂後_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs index d58eb88..c1984f5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 顔ハイライト(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 顔ハイライトD e) + public 顔ハイライト(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 顔ハイライトD e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["顔ハイライト左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs index ef64e5b..9cfc256 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs @@ -15,7 +15,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 顔ハイライト(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs index 0f7775d..9c7e4f2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs @@ -505,7 +505,7 @@ namespace SlaveMatrix public JointS 触覚右_接続点 => new JointS(本体, X0Y0_面中0_付根右_付根2, 0); - public 顔面_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 顔面_甲D e) + public 顔面_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 顔面_甲D e) { 顔面_甲 顔面_甲2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs index 1a62e00..851c0a0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs @@ -67,7 +67,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.顔面_甲_触覚右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 顔面_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs index cb804cb..7b5f06f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs @@ -635,7 +635,7 @@ namespace SlaveMatrix public JointS 触覚右_接続点 => new JointS(本体, X0Y0_付根右_付根2, 0); - public 顔面_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 顔面_虫D e) + public 顔面_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 顔面_虫D e) { 顔面_虫 顔面_虫2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs index 5a53651..90a0be2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs @@ -79,7 +79,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.顔面_虫_触覚右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 顔面_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs index a0739a9..39ba0e5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs @@ -819,7 +819,7 @@ namespace SlaveMatrix public JointS 触覚右_接続点 => new JointS(本体, X0Y0_面, 1); - public 顔面_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 顔面_蟲D e) + public 顔面_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 顔面_蟲D e) { 顔面_蟲 顔面_蟲2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs index 6571559..115b1b1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs @@ -97,7 +97,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.顔面_蟲_触覚右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 顔面_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs index 48d477c..fc86c21 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs @@ -554,7 +554,7 @@ namespace SlaveMatrix } } - public 飛沫_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 飛沫_人D e) + public 飛沫_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 飛沫_人D e) { ThisType = GetType(); 本体 = new Difs(Sta.性器付["飛沫"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs index 495d955..4802fb6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 飛沫_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs index e5af7d1..e70388a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs @@ -554,7 +554,7 @@ namespace SlaveMatrix } } - public 飛沫_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 飛沫_獣D e) + public 飛沫_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 飛沫_獣D e) { ThisType = GetType(); 本体 = new Difs(Sta.性器付["四足飛沫"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs index c297310..5f490f4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs @@ -33,7 +33,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 飛沫_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs index e80c0c9..173a6bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs @@ -173,7 +173,7 @@ namespace SlaveMatrix } else { - if (上腕.ConnectionType == ConnectionInfo.肩_上腕_接続) + if (上腕.ConnectionType == ConnectionInfo.Shoulder_上腕_接続) { X0Y0_飛膜.OP[2].ps[3] = X0Y0_飛膜.ToLocal(上腕.X0Y0_獣翼上腕.ToGlobal(上腕.X0Y0_獣翼上腕.OP[3].ps[1])); } @@ -197,7 +197,7 @@ namespace SlaveMatrix X0Y0_飛膜.OP[2].ps[1] += (vector2D5 - X0Y0_飛膜.OP[2].ps[1]) * 0.3; X0Y0_飛膜.OP[2].ps[2] += (vector2D5 - X0Y0_飛膜.OP[2].ps[2]) * 0.3; } - if (上腕.ConnectionType != ConnectionInfo.肩_上腕_接続) + if (上腕.ConnectionType != ConnectionInfo.Shoulder_上腕_接続) { X0Y0_飛膜.OP[3].ps[0] = X0Y0_飛膜.OP[2].ps[3]; } @@ -263,7 +263,7 @@ namespace SlaveMatrix } else { - if (上腕.ConnectionType == ConnectionInfo.肩_上腕_接続) + if (上腕.ConnectionType == ConnectionInfo.Shoulder_上腕_接続) { X0Y0_飛膜.OP[6].ps[0] = X0Y0_飛膜.ToLocal(上腕.X0Y0_獣翼上腕.ToGlobal(上腕.X0Y0_獣翼上腕.OP[0].ps[4])); } @@ -287,7 +287,7 @@ namespace SlaveMatrix X0Y0_飛膜.OP[6].ps[2] += (vector2D5 - X0Y0_飛膜.OP[6].ps[2]) * 0.3; X0Y0_飛膜.OP[6].ps[1] += (vector2D5 - X0Y0_飛膜.OP[6].ps[1]) * 0.3; } - if (上腕.ConnectionType != ConnectionInfo.肩_上腕_接続) + if (上腕.ConnectionType != ConnectionInfo.Shoulder_上腕_接続) { X0Y0_飛膜.OP[5].ps[2] = X0Y0_飛膜.OP[6].ps[0]; } @@ -353,7 +353,7 @@ namespace SlaveMatrix } else { - if (上腕.ConnectionType == ConnectionInfo.肩_上腕_接続) + if (上腕.ConnectionType == ConnectionInfo.Shoulder_上腕_接続) { X0Y1_飛膜.OP[2].ps[3] = X0Y0_飛膜.ToLocal(上腕.X0Y0_獣翼上腕.ToGlobal(上腕.X0Y0_獣翼上腕.OP[3].ps[1])); } @@ -377,7 +377,7 @@ namespace SlaveMatrix X0Y1_飛膜.OP[2].ps[1] += (vector2D5 - X0Y1_飛膜.OP[2].ps[1]) * 0.3; X0Y1_飛膜.OP[2].ps[2] += (vector2D5 - X0Y1_飛膜.OP[2].ps[2]) * 0.3; } - if (上腕.ConnectionType != ConnectionInfo.肩_上腕_接続) + if (上腕.ConnectionType != ConnectionInfo.Shoulder_上腕_接続) { X0Y1_飛膜.OP[3].ps[0] = X0Y1_飛膜.OP[2].ps[3]; } @@ -487,7 +487,7 @@ namespace SlaveMatrix } else { - if (上腕.ConnectionType == ConnectionInfo.肩_上腕_接続) + if (上腕.ConnectionType == ConnectionInfo.Shoulder_上腕_接続) { X0Y1_飛膜.OP[40].ps[0] = X0Y0_飛膜.ToLocal(上腕.X0Y0_獣翼上腕.ToGlobal(上腕.X0Y0_獣翼上腕.OP[0].ps[4])); } @@ -511,7 +511,7 @@ namespace SlaveMatrix X0Y1_飛膜.OP[40].ps[2] += (vector2D5 - X0Y1_飛膜.OP[40].ps[2]) * 0.3; X0Y1_飛膜.OP[40].ps[1] += (vector2D5 - X0Y1_飛膜.OP[40].ps[1]) * 0.3; } - if (上腕.ConnectionType != ConnectionInfo.肩_上腕_接続) + if (上腕.ConnectionType != ConnectionInfo.Shoulder_上腕_接続) { X0Y1_飛膜.OP[39].ps[2] = X0Y1_飛膜.OP[40].ps[0]; } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs index e8d2300..2f71652 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 鰭_豚(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鰭_豚D e) + public 鰭_豚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鰭_豚D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs index f0b222d..2661d83 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鰭_豚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs index 7391cdf..f7a4c64 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs @@ -171,7 +171,7 @@ namespace SlaveMatrix } } - public 鰭_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鰭_魚D e) + public 鰭_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鰭_魚D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["鰭"][0]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs index f5f8696..cc25deb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs @@ -19,7 +19,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鰭_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs index 9a2ec3a..bed0054 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 鰭_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鰭_鯨D e) + public 鰭_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鰭_鯨D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs index 9ee1125..3cfe063 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鰭_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs index c7ef643..c17ce44 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs @@ -1399,7 +1399,7 @@ namespace SlaveMatrix } } - public 鳳凰(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鳳凰D e) + public 鳳凰(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鳳凰D e) { ThisType = GetType(); Dif dif = new Dif(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs index f95df06..00f2843 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs @@ -137,7 +137,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鳳凰(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs index 9568690..0d01b37 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs @@ -88,7 +88,7 @@ namespace SlaveMatrix public JointS 鼻水右_接続点 => new JointS(本体, X0Y0_鼻, 1); - public 鼻_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鼻_人D e) + public 鼻_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鼻_人D e) { 鼻_人 鼻_人2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs index 82e4d53..49f8961 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.鼻_人_鼻水右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鼻_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs index 3dc7107..709762b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs @@ -88,7 +88,7 @@ namespace SlaveMatrix public JointS 鼻水右_接続点 => new JointS(本体, X0Y0_鼻, 1); - public 鼻_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鼻_獣D e) + public 鼻_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鼻_獣D e) { 鼻_獣 鼻_獣2 = this; ThisType = GetType(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs index bd59029..573babf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.鼻_獣_鼻水右_接続; } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鼻_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs index 1930082..860e77e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs @@ -121,7 +121,7 @@ namespace SlaveMatrix } } - public 鼻水(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鼻水D e) + public 鼻水(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鼻水D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["鼻水左"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs index c50adac..fa11d7e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs @@ -13,7 +13,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鼻水(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs index aca0e2c..f74e2fc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs @@ -305,7 +305,7 @@ namespace SlaveMatrix } } - public 鼻肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 鼻肌D e) + public 鼻肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鼻肌D e) { ThisType = GetType(); 本体 = new Difs(Sta.胴体["鼻肌"]); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs index 8656af4..3145216 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix ThisType = GetType(); } - public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return new 鼻肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs index 99e2232..867cda2 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -9,32 +9,32 @@ namespace SlaveMatrix { public class DE : Ele { - public Action 描画; + public Action 描画; - public DE(Ele src, Action 描画) + public DE(Ele src, Action 描画) { Par = src; 本体 = src.本体; this.描画 = 描画; } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { 描画(Are); } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { } - public override void 描画2(Are Are) + public override void 描画2(RenderArea Are) { } } public class Bod { - public Med Med; + public ModeEventDispatcher Med; public Cha Cha; @@ -52,27 +52,27 @@ namespace SlaveMatrix private IEnumerable 色更新; - public 腰 腰; + public Waist 腰; - public 胴 胴; + public Torso 胴; - public 胸 胸; + public Chest Chest; - public 首 首; + public Neck 首; - public 頭 頭; + public Head 頭; public 基髪 基髪; public 前髪 前髪; - public 横髪 横髪左; + public SideHair 横髪左; - public 横髪 横髪右; + public SideHair 横髪右; - public 後髪1 後髪1; + public BackHair1 後髪1; - public 後髪0 後髪0; + public BackHair0 後髪0; public 単目 単眼目; @@ -120,7 +120,7 @@ namespace SlaveMatrix public 性器精液_人 口精液; - public 咳 咳; + public Cough 咳; public 呼気 呼気; @@ -250,7 +250,7 @@ namespace SlaveMatrix public 長物_蟲 蟲; - public 四足胸 胸_獣; + public 四足胸 Chest_獣; public 四足胴 胴_獣; @@ -344,17 +344,17 @@ namespace SlaveMatrix private List 大顎基接続 = new List(); - private 肩[] 後脇左s = new 肩[0]; + private Shoulder[] 後脇左s = new Shoulder[0]; - private 肩[] 後脇右s = new 肩[0]; + private Shoulder[] 後脇右s = new Shoulder[0]; public List[] 後腕左s = new List[0]; public List[] 後腕右s = new List[0]; - private 肩 肩左; + private Shoulder 肩左; - private 肩 肩右; + private Shoulder 肩右; private List 肩左飛膜 = new List(); @@ -560,7 +560,7 @@ namespace SlaveMatrix private double asb2; - public EleI EI胸; + public EleI EIChest; public EleI EI髪; @@ -582,7 +582,7 @@ namespace SlaveMatrix public bool Is髪; - public bool Is胸; + public bool IsChest; public bool Is腰; @@ -694,7 +694,7 @@ namespace SlaveMatrix public bool Is腿犬; - private Action Draw = delegate + private Action Draw = delegate { }; @@ -990,8 +990,8 @@ namespace SlaveMatrix { get { - 胸.接続P(); - return 胸.X0Y0_胸郭.ToGlobal((胸.X0Y0_胸郭.OP[8].ps[2] + 胸.X0Y0_胸郭.OP[2].ps[2]) * 0.5); + Chest.接続P(); + return Chest.X0Y0_胸郭.ToGlobal((Chest.X0Y0_胸郭.OP[8].ps[2] + Chest.X0Y0_胸郭.OP[2].ps[2]) * 0.5); } } @@ -1498,9 +1498,9 @@ namespace SlaveMatrix { EI髪.Updatef = true; } - else if (Is胸 && EI胸.ElesH.Contains(蜘尾)) + else if (IsChest && EIChest.ElesH.Contains(蜘尾)) { - EI胸.Updatef = true; + EIChest.Updatef = true; } else if (Is腰 && EI腰.ElesH.Contains(蜘尾)) { @@ -1572,7 +1572,7 @@ namespace SlaveMatrix { get { - if (左腿開きi <= 0 && 右腿開きi <= 0 && !Is腿犬 && !Is腿魚 && !Is腿獣 && (!Is獣 || 胸_獣.脇左_接続 == null || 胸_獣.脇左_接続.Length == 0) && !Is蜘 && !Is蠍) + if (左腿開きi <= 0 && 右腿開きi <= 0 && !Is腿犬 && !Is腿魚 && !Is腿獣 && (!Is獣 || Chest_獣.脇左_接続 == null || Chest_獣.脇左_接続.Length == 0) && !Is蜘 && !Is蠍) { return Is蟲; } @@ -1760,9 +1760,9 @@ namespace SlaveMatrix { 脚人 脚人2 = 脚人左[0]; 脚人2.腿.Yv = value; - if (脚人2.脚 != null) + if (脚人2.Leg != null) { - 脚人2.脚.開脚(脚人2.腿); + 脚人2.Leg.開脚(脚人2.腿); } if (脚人2.足 != null) { @@ -1773,9 +1773,9 @@ namespace SlaveMatrix { 脚人 脚人3 = 脚人右[0]; 脚人3.腿.Yv = value; - if (脚人3.脚 != null) + if (脚人3.Leg != null) { - 脚人3.脚.開脚(脚人3.腿); + 脚人3.Leg.開脚(脚人3.腿); } if (脚人3.足 != null) { @@ -1817,9 +1817,9 @@ namespace SlaveMatrix { 脚人 脚人2 = 脚人左[0]; 脚人2.腿.Yi = value; - if (脚人2.脚 != null) + if (脚人2.Leg != null) { - 脚人2.脚.開脚(脚人2.腿); + 脚人2.Leg.開脚(脚人2.腿); } if (脚人2.足 != null) { @@ -1830,9 +1830,9 @@ namespace SlaveMatrix { 脚人 脚人3 = 脚人右[0]; 脚人3.腿.Yi = value; - if (脚人3.脚 != null) + if (脚人3.Leg != null) { - 脚人3.脚.開脚(脚人3.腿); + 脚人3.Leg.開脚(脚人3.腿); } if (脚人3.足 != null) { @@ -1870,9 +1870,9 @@ namespace SlaveMatrix { 脚人 脚人2 = 脚人左[0]; 脚人2.腿.Yv = value; - if (脚人2.脚 != null) + if (脚人2.Leg != null) { - 脚人2.脚.開脚(脚人2.腿); + 脚人2.Leg.開脚(脚人2.腿); } if (脚人2.足 != null) { @@ -1898,7 +1898,7 @@ namespace SlaveMatrix { 脚人 脚人2 = 脚人左[0]; 脚人2.腿.Yi = value; - 脚人2.脚.開脚(脚人2.腿); + 脚人2.Leg.開脚(脚人2.腿); 脚人2.足.開脚(脚人2.腿); } } @@ -1920,9 +1920,9 @@ namespace SlaveMatrix { 脚人 脚人2 = 脚人右[0]; 脚人2.腿.Yv = value; - if (脚人2.脚 != null) + if (脚人2.Leg != null) { - 脚人2.脚.開脚(脚人2.腿); + 脚人2.Leg.開脚(脚人2.腿); } if (脚人2.足 != null) { @@ -1948,9 +1948,9 @@ namespace SlaveMatrix { 脚人 脚人2 = 脚人右[0]; 脚人2.腿.Yi = value; - if (脚人2.脚 != null) + if (脚人2.Leg != null) { - 脚人2.脚.開脚(脚人2.腿); + 脚人2.Leg.開脚(脚人2.腿); } if (脚人2.足 != null) { @@ -2176,16 +2176,16 @@ namespace SlaveMatrix set { 横髪髪留i = value; - if (横髪左 != null && 横髪左 is 横髪_編み) + if (横髪左 != null && 横髪左 is SideHair_編み) { - 横髪_編み obj = (横髪_編み)横髪左; + SideHair_編み obj = (SideHair_編み)横髪左; obj.髪縛1_表示 = value.髪留左.髪縛1_表示; obj.髪縛2_表示 = value.髪留左.髪縛2_表示; obj.髪留配色(value.髪留左.色); } - if (横髪右 != null && 横髪右 is 横髪_編み) + if (横髪右 != null && 横髪右 is SideHair_編み) { - 横髪_編み obj2 = (横髪_編み)横髪右; + SideHair_編み obj2 = (SideHair_編み)横髪右; obj2.髪縛1_表示 = value.髪留右.髪縛1_表示; obj2.髪縛2_表示 = value.髪留右.髪縛2_表示; obj2.髪留配色(value.髪留右.色); @@ -2259,7 +2259,7 @@ namespace SlaveMatrix if (Is蛇) { int num = 0; - 胴_蛇 ele2 = 蛇.胴_接続.GetEle<胴_蛇>(); + Torso_蛇 ele2 = 蛇.Torso_接続.GetEle(); while (ele2 != null) { if (num % 4 != 0) @@ -2267,14 +2267,14 @@ namespace SlaveMatrix ele2.拘束 = false; ele2.鎖表示 = false; } - ele2 = ele2.胴_接続.GetEle<胴_蛇>(); + ele2 = ele2.Torso_接続.GetEle(); num++; } } if (Is蟲) { int num2 = 0; - 胴_蟲 ele3 = 蟲.胴_接続.GetEle<胴_蟲>(); + Torso_蟲 ele3 = 蟲.Torso_接続.GetEle(); while (ele3 != null) { if (num2 % 2 == 0) @@ -2282,7 +2282,7 @@ namespace SlaveMatrix ele3.拘束 = false; ele3.鎖表示 = false; } - ele3 = ele3.胴_接続.GetEle<胴_蟲>(); + ele3 = ele3.Torso_接続.GetEle(); num2++; } } @@ -2749,10 +2749,10 @@ namespace SlaveMatrix ブーツi = value; foreach (脚人 item in 脚人左) { - if (item.脚 != null) + if (item.Leg != null) { - Set表示(item.脚, ブーツi.脚); - item.脚.ブーツ配色(ブーツi.色); + Set表示(item.Leg, ブーツi.Leg); + item.Leg.ブーツ配色(ブーツi.色); } if (item.足 != null) { @@ -2762,10 +2762,10 @@ namespace SlaveMatrix } foreach (脚人 item2 in 脚人右) { - if (item2.脚 != null) + if (item2.Leg != null) { - Set表示(item2.脚, ブーツi.脚); - item2.脚.ブーツ配色(ブーツi.色); + Set表示(item2.Leg, ブーツi.Leg); + item2.Leg.ブーツ配色(ブーツi.色); } if (item2.足 != null) { @@ -2931,13 +2931,13 @@ namespace SlaveMatrix } } - public Bod(Med Med, Are Are, Cha Cha) + public Bod(ModeEventDispatcher Med, RenderArea Are, Cha Cha) { Bod bod = this; this.Med = Med; this.Cha = Cha; - double disUnit = Are.DisUnit; - 腰 = (腰)Cha.ChaD.body_tree.GetEle(disUnit, Med, Cha.配色); + double disUnit = Are.DisplayUnitScale; + 腰 = (Waist)Cha.ChaD.body_tree.GetEle(disUnit, Med, Cha.配色); Elements = 腰.EnumEle().ToArray(); List<スタンプK> sk = new List<スタンプK>(); List<スタンプW> sw = new List<スタンプW>(); @@ -2947,7 +2947,7 @@ namespace SlaveMatrix }; 鞭痕D wd = new 鞭痕D(); 蝙通常 = new List<蝙通常>(); - 肩 人肩; + Shoulder 人肩; 腕獣 腕獣; 腿_人 人腿; 脚人 脚人; @@ -2982,9 +2982,9 @@ namespace SlaveMatrix } if (current_element.右) { - if (current_element is 肩) + if (current_element is Shoulder) { - 人肩 = (肩)current_element; + 人肩 = (Shoulder)current_element; 人肩.キスマーク = new スタンプK(Med, Are, Cha, this, kd, 人肩); sk.Add(人肩.キスマーク); 人肩.鞭痕 = new スタンプW(Med, Are, Cha, this, wd, 人肩); @@ -2998,7 +2998,7 @@ namespace SlaveMatrix current_element.表示 = false; } 腕獣 = default(腕獣); - 腕獣.肩 = 四足脇2; + 腕獣.Shoulder = 四足脇2; 四足脇2.上腕_接続.SetEle(delegate(獣上腕 上腕) { 腕獣.上腕 = 上腕; @@ -3022,7 +3022,7 @@ namespace SlaveMatrix sw.Add(人腿.鞭痕); 脚人 = default(脚人); 脚人.腿 = 人腿; - 人腿.脚_接続.SetEle(delegate(脚_人 脚) + 人腿.Leg_接続.SetEle(delegate(Leg_人 脚) { 脚.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 脚); sk.Add(脚.キスマーク); @@ -3030,13 +3030,13 @@ namespace SlaveMatrix sw.Add(脚.鞭痕); if (!人腿.X0Y0_腿.OP[0].Outline) { - 人腿.腿0CD.c2.Col2 = 脚.脚CD.c2.Col1; - 人腿.腿1CD.c2.Col2 = 脚.脚CD.c2.Col1; - 人腿.腿2CD.c2.Col1 = 脚.脚CD.c2.Col1; - 人腿.腿3CD.c2.Col1 = 脚.脚CD.c2.Col1; - 人腿.腿4CD.c2.Col1 = 脚.脚CD.c2.Col1; + 人腿.腿0CD.c2.Col2 = 脚.LegCD.c2.Col1; + 人腿.腿1CD.c2.Col2 = 脚.LegCD.c2.Col1; + 人腿.腿2CD.c2.Col1 = 脚.LegCD.c2.Col1; + 人腿.腿3CD.c2.Col1 = 脚.LegCD.c2.Col1; + 人腿.腿4CD.c2.Col1 = 脚.LegCD.c2.Col1; } - 脚人.脚 = 脚; + 脚人.Leg = 脚; 脚.足_接続.SetEle(delegate(足_人 足) { 足.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 足); @@ -3053,16 +3053,16 @@ namespace SlaveMatrix 獣腿 獣腿2 = (獣腿)current_element; 脚獣 = default(脚獣); 脚獣.腿 = 獣腿2; - 獣腿2.脚_接続.SetEle(delegate(獣脚 脚) + 獣腿2.Leg_接続.SetEle(delegate(獣脚 脚) { - 脚獣.脚 = 脚; + 脚獣.Leg = 脚; 脚.足_接続.SetEle(delegate(獣足 足) { 脚獣.足 = 足; }); }); 脚獣右.Add(脚獣); - if (獣腿2.ConnectionType == ConnectionInfo.腰_腿右_接続) + if (獣腿2.ConnectionType == ConnectionInfo.Waist_腿右_接続) { if (current_element is 腿_獣) { @@ -3102,8 +3102,8 @@ namespace SlaveMatrix { 脚獣 = default(脚獣); 脚獣.腿 = null; - 脚獣.脚 = (獣脚)current_element; - 脚獣.脚.足_接続.SetEle(delegate(獣足 足) + 脚獣.Leg = (獣脚)current_element; + 脚獣.Leg.足_接続.SetEle(delegate(獣足 足) { 脚獣.足 = 足; }); @@ -3111,13 +3111,13 @@ namespace SlaveMatrix } else if (current_element is 上腕) { - if (current_element.ConnectionType == ConnectionInfo.肩_上腕_接続) + if (current_element.ConnectionType == ConnectionInfo.Shoulder_上腕_接続) { - 人肩 = (肩)current_element.Par; + 人肩 = (Shoulder)current_element.Par; if (current_element is 上腕_鳥) { 腕翼鳥 = default(腕翼鳥); - 腕翼鳥.肩 = 人肩; + 腕翼鳥.Shoulder = 人肩; 人肩.上腕_接続.SetEle(delegate(上腕_鳥 上腕) { 上腕.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 上腕); @@ -3140,10 +3140,10 @@ namespace SlaveMatrix else if (current_element is 上腕_蝙) { 腕翼獣 = default(腕翼獣); - 腕翼獣.肩 = 人肩; + 腕翼獣.Shoulder = 人肩; 人肩.上腕_接続.SetEle(delegate(上腕_蝙 上腕) { - 上腕.獣翼上腕CD.c2.Col1 = 人肩.肩_肩CD.c2.Col1; + 上腕.獣翼上腕CD.c2.Col1 = 人肩.Shoulder_ShoulderCD.c2.Col1; 腕翼獣.上腕 = 上腕; 上腕.下腕_接続.SetEle(delegate(下腕_蝙 下腕) { @@ -3161,7 +3161,7 @@ namespace SlaveMatrix else { 腕人 = default(腕人); - 腕人.肩 = 人肩; + 腕人.Shoulder = 人肩; 人肩.上腕_接続.SetEle(delegate(上腕_人 上腕) { 上腕.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 上腕); @@ -3268,11 +3268,11 @@ namespace SlaveMatrix { 翼獣.上腕.接着 = () => bod.頭.X0Y0_頭.ToGlobal(bod.頭.X0Y0_頭.BasePointBase); } - else if (p is 胸) + else if (p is Chest) { 翼獣.上腕.接着 = () => bod.胴.X0Y0_胴.ToGlobal(bod.胴.X0Y0_胴.BasePointBase); } - else if (p is 胴 || p is 腰) + else if (p is Torso || p is Waist) { 翼獣.上腕.接着 = () => bod.腰.X0Y0_腰.ToGlobal(bod.腰.X0Y0_腰.JP[4].Joint); } @@ -3284,7 +3284,7 @@ namespace SlaveMatrix { 翼獣.上腕.接着 = () => bod.腰_獣.X0Y0_腰.ToGlobal(bod.腰.X0Y0_腰.JP[4].Joint); } - else if (pp != null && pp is 胸) + else if (pp != null && pp is Chest) { 翼獣.上腕.接着 = () => bod.腰.X0Y0_腰.ToGlobal(bod.腰.X0Y0_腰.BasePointBase); } @@ -3375,9 +3375,9 @@ namespace SlaveMatrix 触手右.Add((触手)current_element); } } - else if (current_element is 肩) + else if (current_element is Shoulder) { - 人肩 = (肩)current_element; + 人肩 = (Shoulder)current_element; 人肩.キスマーク = new スタンプK(Med, Are, Cha, this, kd, 人肩); sk.Add(人肩.キスマーク); 人肩.鞭痕 = new スタンプW(Med, Are, Cha, this, wd, 人肩); @@ -3391,7 +3391,7 @@ namespace SlaveMatrix current_element.表示 = false; } 腕獣 = default(腕獣); - 腕獣.肩 = 四足脇2; + 腕獣.Shoulder = 四足脇2; 四足脇2.上腕_接続.SetEle(delegate(獣上腕 上腕) { 腕獣.上腕 = 上腕; @@ -3415,7 +3415,7 @@ namespace SlaveMatrix sw.Add(人腿.鞭痕); 脚人 = default(脚人); 脚人.腿 = 人腿; - 人腿.脚_接続.SetEle(delegate(脚_人 脚) + 人腿.Leg_接続.SetEle(delegate(Leg_人 脚) { 脚.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 脚); sk.Add(脚.キスマーク); @@ -3423,13 +3423,13 @@ namespace SlaveMatrix sw.Add(脚.鞭痕); if (!人腿.X0Y0_腿.OP[4].Outline) { - 人腿.腿0CD.c2.Col2 = 脚.脚CD.c2.Col1; - 人腿.腿1CD.c2.Col2 = 脚.脚CD.c2.Col1; - 人腿.腿2CD.c2.Col1 = 脚.脚CD.c2.Col1; - 人腿.腿3CD.c2.Col1 = 脚.脚CD.c2.Col1; - 人腿.腿4CD.c2.Col1 = 脚.脚CD.c2.Col1; + 人腿.腿0CD.c2.Col2 = 脚.LegCD.c2.Col1; + 人腿.腿1CD.c2.Col2 = 脚.LegCD.c2.Col1; + 人腿.腿2CD.c2.Col1 = 脚.LegCD.c2.Col1; + 人腿.腿3CD.c2.Col1 = 脚.LegCD.c2.Col1; + 人腿.腿4CD.c2.Col1 = 脚.LegCD.c2.Col1; } - 脚人.脚 = 脚; + 脚人.Leg = 脚; 脚.足_接続.SetEle(delegate(足_人 足) { 足.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 足); @@ -3446,16 +3446,16 @@ namespace SlaveMatrix 獣腿 獣腿2 = (獣腿)current_element; 脚獣 = default(脚獣); 脚獣.腿 = 獣腿2; - 獣腿2.脚_接続.SetEle(delegate(獣脚 脚) + 獣腿2.Leg_接続.SetEle(delegate(獣脚 脚) { - 脚獣.脚 = 脚; + 脚獣.Leg = 脚; 脚.足_接続.SetEle(delegate(獣足 足) { 脚獣.足 = 足; }); }); 脚獣左.Add(脚獣); - if (獣腿2.ConnectionType == ConnectionInfo.腰_腿左_接続) + if (獣腿2.ConnectionType == ConnectionInfo.Waist_腿左_接続) { if (current_element is 腿_獣) { @@ -3495,8 +3495,8 @@ namespace SlaveMatrix { 脚獣 = default(脚獣); 脚獣.腿 = null; - 脚獣.脚 = (獣脚)current_element; - 脚獣.脚.足_接続.SetEle(delegate(獣足 足) + 脚獣.Leg = (獣脚)current_element; + 脚獣.Leg.足_接続.SetEle(delegate(獣足 足) { 脚獣.足 = 足; }); @@ -3504,13 +3504,13 @@ namespace SlaveMatrix } else if (current_element is 上腕) { - if (current_element.ConnectionType == ConnectionInfo.肩_上腕_接続) + if (current_element.ConnectionType == ConnectionInfo.Shoulder_上腕_接続) { - 人肩 = (肩)current_element.Par; + 人肩 = (Shoulder)current_element.Par; if (current_element is 上腕_鳥) { 腕翼鳥 = default(腕翼鳥); - 腕翼鳥.肩 = 人肩; + 腕翼鳥.Shoulder = 人肩; 人肩.上腕_接続.SetEle(delegate(上腕_鳥 上腕) { 上腕.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 上腕); @@ -3533,10 +3533,10 @@ namespace SlaveMatrix else if (current_element is 上腕_蝙) { 腕翼獣 = default(腕翼獣); - 腕翼獣.肩 = 人肩; + 腕翼獣.Shoulder = 人肩; 人肩.上腕_接続.SetEle(delegate(上腕_蝙 上腕) { - 上腕.獣翼上腕CD.c2.Col1 = 人肩.肩_肩CD.c2.Col1; + 上腕.獣翼上腕CD.c2.Col1 = 人肩.Shoulder_ShoulderCD.c2.Col1; 腕翼獣.上腕 = 上腕; 上腕.下腕_接続.SetEle(delegate(下腕_蝙 下腕) { @@ -3554,7 +3554,7 @@ namespace SlaveMatrix else { 腕人 = default(腕人); - 腕人.肩 = 人肩; + 腕人.Shoulder = 人肩; 人肩.上腕_接続.SetEle(delegate(上腕_人 上腕) { 上腕.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 上腕); @@ -3661,11 +3661,11 @@ namespace SlaveMatrix { 翼獣.上腕.接着 = () => bod.頭.X0Y0_頭.ToGlobal(bod.頭.X0Y0_頭.BasePointBase); } - else if (p is 胸) + else if (p is Chest) { 翼獣.上腕.接着 = () => bod.胴.X0Y0_胴.ToGlobal(bod.胴.X0Y0_胴.BasePointBase); } - else if (p is 胴 || p is 腰) + else if (p is Torso || p is Waist) { 翼獣.上腕.接着 = () => bod.腰.X0Y0_腰.ToGlobal(bod.腰.X0Y0_腰.JP[4].Joint); } @@ -3677,7 +3677,7 @@ namespace SlaveMatrix { 翼獣.上腕.接着 = () => bod.腰_獣.X0Y0_腰.ToGlobal(bod.腰.X0Y0_腰.JP[4].Joint); } - else if (pp != null && pp is 胸) + else if (pp != null && pp is Chest) { 翼獣.上腕.接着 = () => bod.腰.X0Y0_腰.ToGlobal(bod.腰.X0Y0_腰.BasePointBase); } @@ -3774,7 +3774,7 @@ namespace SlaveMatrix { continue; } - if (current_element.Par is 腰) + if (current_element.Par is Waist) { if (current_element.右) { @@ -3829,7 +3829,7 @@ namespace SlaveMatrix 長胴n = 長胴.Count; if (腰 != null) { - 胴 = 腰.胴_接続.GetEle<胴>(); + 胴 = 腰.Torso_接続.GetEle(); ボテ腹_人 = 腰.肌_接続.GetEle<ボテ腹_人>(); ボテ腹板_人 = ボテ腹_人.腹板_接続.GetEle<ボテ腹板>(); ボテ腹板_人.SetHitFalse(); @@ -3887,7 +3887,7 @@ namespace SlaveMatrix } if (胴 != null) { - 胸 = 胴.胸_接続.GetEle<胸>(); + Chest = 胴.Chest_接続.GetEle(); 胴腹板_人 = 胴.肌_接続.GetEle<胴腹板>(); 胴肌_人 = 胴.肌_接続.GetEle<胴肌>(); 胴腹板_人.SetHitFalse(); @@ -3895,15 +3895,15 @@ namespace SlaveMatrix 上着M_ドレス = 胴.肌_接続.GetEle<上着ミドル_ドレス>(); 上着M_ドレス.SetHitFalse(); } - if (胸 != null) + if (Chest != null) { - 首 = 胸.首_接続.GetEle<首>(); - 胸腹板_人 = 胸.肌_接続.GetEle<胸腹板>(); - 胸肌_人 = 胸.肌_接続.GetEle<胸肌>(); - 胸毛_人 = 胸.肌_接続.GetEle<胸毛>(); + 首 = Chest.Neck_接続.GetEle(); + 胸腹板_人 = Chest.肌_接続.GetEle<胸腹板>(); + 胸肌_人 = Chest.肌_接続.GetEle<胸肌>(); + 胸毛_人 = Chest.肌_接続.GetEle<胸毛>(); 胸腹板_人.SetHitFalse(); 胸肌_人.SetHitFalse(); - 乳房左 = 胸.胸左_接続.GetEle<乳房>(); + 乳房左 = Chest.胸左_接続.GetEle<乳房>(); 噴乳左 = 乳房左.噴乳_接続.GetEle<噴乳>(); ピアス左 = 乳房左.噴乳_接続.GetEle<ピアス>(); キャップ2左 = 乳房左.噴乳_接続.GetEle<キャップ2>(); @@ -3911,7 +3911,7 @@ namespace SlaveMatrix 噴乳左.SetHitFalse(); ピアス左.SetHitFalse(); 下着乳首左.SetHitFalse(); - 乳房右 = 胸.胸右_接続.GetEle<乳房>(); + 乳房右 = Chest.胸右_接続.GetEle<乳房>(); 噴乳右 = 乳房右.噴乳_接続.GetEle<噴乳>(); ピアス右 = 乳房右.噴乳_接続.GetEle<ピアス>(); キャップ2右 = 乳房右.噴乳_接続.GetEle<キャップ2>(); @@ -3919,22 +3919,22 @@ namespace SlaveMatrix 噴乳右.SetHitFalse(); ピアス右.SetHitFalse(); 下着乳首右.SetHitFalse(); - 下着T_チューブ = 胸.肌_接続.GetEle<下着トップ_チューブ>(); - 下着T_クロス = 胸.肌_接続.GetEle<下着トップ_クロス>(); - 下着T_ビキニ = 胸.肌_接続.GetEle<下着トップ_ビキニ>(); - 下着T_マイクロ = 胸.肌_接続.GetEle<下着トップ_マイクロ>(); - 下着T_ブラ = 胸.肌_接続.GetEle<下着トップ_ブラ>(); + 下着T_チューブ = Chest.肌_接続.GetEle<下着トップ_チューブ>(); + 下着T_クロス = Chest.肌_接続.GetEle<下着トップ_クロス>(); + 下着T_ビキニ = Chest.肌_接続.GetEle<下着トップ_ビキニ>(); + 下着T_マイクロ = Chest.肌_接続.GetEle<下着トップ_マイクロ>(); + 下着T_ブラ = Chest.肌_接続.GetEle<下着トップ_ブラ>(); 下着T_チューブ.SetHitFalse(); 下着T_クロス.SetHitFalse(); 下着T_ビキニ.SetHitFalse(); 下着T_マイクロ.SetHitFalse(); 下着T_ブラ.SetHitFalse(); - 上着T_ドレス = 胸.肌_接続.GetEle<上着トップ_ドレス>(); + 上着T_ドレス = Chest.肌_接続.GetEle<上着トップ_ドレス>(); 上着T_ドレス.SetHitFalse(); } if (首 != null) { - 頭 = 首.頭_接続.GetEle<頭>(); + 頭 = 首.Head_接続.GetEle(); } if (頭 != null) { @@ -4009,7 +4009,7 @@ namespace SlaveMatrix 涎右.SetHitFalse(); 口精液 = 頭.口_接続.GetEle<性器精液_人>(); 口精液.SetHitFalse(); - 咳 = 頭.口_接続.GetEle<咳>(); + 咳 = 頭.口_接続.GetEle(); 咳.SetHitFalse(); 呼気 = 頭.口_接続.GetEle<呼気>(); 呼気.SetHitFalse(); @@ -4053,19 +4053,19 @@ namespace SlaveMatrix if (基髪 != null) { 前髪 = 基髪.前髪_接続.GetEle<前髪>(); - 横髪左 = 基髪.横髪左_接続.GetEle<横髪>(); - 横髪右 = 基髪.横髪右_接続.GetEle<横髪>(); - 後髪1 = 基髪.後髪_接続.GetEle<後髪1>(); - 後髪0 = 基髪.後髪_接続.GetEle<後髪0>(); + 横髪左 = 基髪.横髪左_接続.GetEle(); + 横髪右 = 基髪.横髪右_接続.GetEle(); + 後髪1 = 基髪.後髪_接続.GetEle(); + 後髪0 = 基髪.後髪_接続.GetEle(); } 首.キスマーク = new スタンプK(Med, Are, Cha, this, kd, 首); sk.Add(首.キスマーク); 首.鞭痕 = new スタンプW(Med, Are, Cha, this, wd, 首); sw.Add(首.鞭痕); - 胸.キスマーク = new スタンプK(Med, Are, Cha, this, kd, 胸); - sk.Add(胸.キスマーク); - 胸.鞭痕 = new スタンプW(Med, Are, Cha, this, wd, 胸); - sw.Add(胸.鞭痕); + Chest.キスマーク = new スタンプK(Med, Are, Cha, this, kd, Chest); + sk.Add(Chest.キスマーク); + Chest.鞭痕 = new スタンプW(Med, Are, Cha, this, wd, Chest); + sw.Add(Chest.鞭痕); 胴.キスマーク = new スタンプK(Med, Are, Cha, this, kd, 胴); sk.Add(胴.キスマーク); 胴.鞭痕 = new スタンプW(Med, Are, Cha, this, wd, 胴); @@ -4138,7 +4138,7 @@ namespace SlaveMatrix Sort((from e in 基髪.頭頂左_接続.GetEles<植>() select e.EnumEle()).JoinEnum(), 植左接続); Sort((from e in 基髪.頭頂左_接続 - where !(e is 角2) && !(e is 獣耳) && !(e is 植) && !(e is 横髪) + where !(e is 角2) && !(e is 獣耳) && !(e is 植) && !(e is SideHair) select e.EnumEle()).JoinEnum(), 頭頂左後接続); } if (基髪.頭頂右_接続 != null) @@ -4148,7 +4148,7 @@ namespace SlaveMatrix Sort((from e in 基髪.頭頂右_接続.GetEles<植>() select e.EnumEle()).JoinEnum(), 植右接続); Sort((from e in 基髪.頭頂右_接続 - where !(e is 角2) && !(e is 獣耳) && !(e is 植) && !(e is 横髪) + where !(e is 角2) && !(e is 獣耳) && !(e is 植) && !(e is SideHair) select e.EnumEle()).JoinEnum(), 頭頂右後接続); } if (頭.顔面_接続 != null) @@ -4178,9 +4178,9 @@ namespace SlaveMatrix 頭頂後 = ((頭頂_宇)頭頂).頭部後_接続.GetEle<頭頂後_宇>(); } } - if (胸.肩左_接続 != null) + if (Chest.肩左_接続 != null) { - 後脇左s = 胸.肩左_接続.GetEles<肩>().ToArray(); + 後脇左s = Chest.肩左_接続.GetEles().ToArray(); 肩左 = 後脇左s.LastOrDefault(); if (後脇左s.Length > 1) { @@ -4208,9 +4208,9 @@ namespace SlaveMatrix 後脇左s = 後脇左s.Take(後脇左s.Length - 1).ToArray(); } nsl = new bool[1 + ((後腕左s != null) ? 後腕左s.Length : 0)]; - if (胸.肩右_接続 != null) + if (Chest.肩右_接続 != null) { - 後脇右s = 胸.肩右_接続.GetEles<肩>().ToArray(); + 後脇右s = Chest.肩右_接続.GetEles().ToArray(); 肩右 = 後脇右s.LastOrDefault(); if (後脇右s.Length > 1) { @@ -4238,21 +4238,21 @@ namespace SlaveMatrix 後脇右s = 後脇右s.Take(後脇右s.Length - 1).ToArray(); } nsr = new bool[1 + ((後腕右s != null) ? 後腕右s.Length : 0)]; - if (胸.翼上左_接続 != null) + if (Chest.翼上左_接続 != null) { - Sort(胸.翼上左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸上左接続); + Sort(Chest.翼上左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸上左接続); } - if (胸.翼下左_接続 != null) + if (Chest.翼下左_接続 != null) { - Sort(胸.翼下左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸下左接続); + Sort(Chest.翼下左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸下左接続); } - if (胸.翼上右_接続 != null) + if (Chest.翼上右_接続 != null) { - Sort(胸.翼上右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸上右接続); + Sort(Chest.翼上右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸上右接続); } - if (胸.翼下右_接続 != null) + if (Chest.翼下右_接続 != null) { - Sort(胸.翼下右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸下右接続); + Sort(Chest.翼下右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 胸下右接続); } if (胴.翼左_接続 != null) { @@ -4270,9 +4270,9 @@ namespace SlaveMatrix { Sort(腰.翼右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 腰後右接続); } - if (胸.背中_接続 != null) + if (Chest.背中_接続 != null) { - Sort(胸.背中_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 背中接続); + Sort(Chest.背中_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 背中接続); } if (腰.腿左_接続 != null) { @@ -4307,7 +4307,7 @@ namespace SlaveMatrix { Sort(魚.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); } - if (腕獣左.Count > 0 && 腕獣左.First().肩.上腕_接続.IsEle<獣脚>()) + if (腕獣左.Count > 0 && 腕獣左.First().Shoulder.上腕_接続.IsEle<獣脚>()) { Sort(from e in 魚.EnumEle().Skip(1) where !bod.半身後接続.Contains(e) @@ -4318,13 +4318,13 @@ namespace SlaveMatrix Sort(from e in 魚.EnumEle().Skip(1) where !bod.半身後接続.Contains(e) select e, 半身中2接続); - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item in array) { 腿左接続.Remove(item); 半身前接続.Add(item); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item2 in array) { 腿右接続.Remove(item2); @@ -4342,7 +4342,7 @@ namespace SlaveMatrix { Sort(鯨.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); } - if (腕獣左.Count > 0 && 腕獣左.First().肩.上腕_接続.IsEle<獣脚>()) + if (腕獣左.Count > 0 && 腕獣左.First().Shoulder.上腕_接続.IsEle<獣脚>()) { Sort(from e in 鯨.EnumEle().Skip(1) where !bod.半身後接続.Contains(e) @@ -4353,13 +4353,13 @@ namespace SlaveMatrix Sort(from e in 鯨.EnumEle().Skip(1) where !bod.半身後接続.Contains(e) select e, 半身中2接続); - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item3 in array) { 腿左接続.Remove(item3); 半身前接続.Add(item3); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item4 in array) { 腿右接続.Remove(item4); @@ -4373,9 +4373,9 @@ namespace SlaveMatrix 蛇 = (長物_蛇)ele; 腰.腰CD.c2.Col2 = 蛇.胴1_鱗1CD.c2.Col1; 半身中1接続.Add(ele); - if (蛇.胴_接続 != null) + if (蛇.Torso_接続 != null) { - foreach (胴_蛇 item20 in 蛇.EnumEle().GetEles<胴_蛇>().Reverse()) + foreach (Torso_蛇 item20 in 蛇.EnumEle().GetEles().Reverse()) { if (item20.左_接続 != null) { @@ -4386,7 +4386,7 @@ namespace SlaveMatrix Sort(item20.右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); } } - Sort(from e in 蛇.胴_接続.Select((Ele e) => e.EnumEle()).JoinEnum() + Sort(from e in 蛇.Torso_接続.Select((Ele e) => e.EnumEle()).JoinEnum() where !bod.半身中2接続.Contains(e) select e, 半身後接続); } @@ -4404,13 +4404,13 @@ namespace SlaveMatrix { 半身中2接続.Reverse(); } - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item5 in array) { 腿左接続.Remove(item5); 半身前接続.Add(item5); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item6 in array) { 腿右接続.Remove(item6); @@ -4423,9 +4423,9 @@ namespace SlaveMatrix 蟲 = (長物_蟲)ele; 腰.腰CD.c2.Col2 = 蟲.胴1_胴CD.c2.Col1; 半身中1接続.Add(ele); - if (蟲.胴_接続 != null) + if (蟲.Torso_接続 != null) { - foreach (胴_蟲 item21 in 蟲.EnumEle().GetEles<胴_蟲>().Reverse()) + foreach (Torso_蟲 item21 in 蟲.EnumEle().GetEles().Reverse()) { if (item21.左_接続 != null) { @@ -4436,7 +4436,7 @@ namespace SlaveMatrix Sort(item21.右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); } } - Sort(from e in 蟲.胴_接続.Select((Ele e) => e.EnumEle()).JoinEnum() + Sort(from e in 蟲.Torso_接続.Select((Ele e) => e.EnumEle()).JoinEnum() where !bod.半身中2接続.Contains(e) select e, 半身後接続); } @@ -4469,7 +4469,7 @@ namespace SlaveMatrix { if (item22 is 四足胸) { - 胸_獣 = (四足胸)item22; + Chest_獣 = (四足胸)item22; } else if (item22 is 四足胴) { @@ -4591,7 +4591,7 @@ namespace SlaveMatrix 潮吹_大_獣.SetHitFalse(); 放尿_獣.SetHitFalse(); ピアス.SetHitFalse(); - 腰.腰CD.c2.Col2 = 胸_獣.胸郭CD.c2.Col1; + 腰.腰CD.c2.Col2 = Chest_獣.胸郭CD.c2.Col1; if (腰_獣 != null) { 半身中1接続.Add(腰_獣); @@ -4600,13 +4600,13 @@ namespace SlaveMatrix { 半身中1接続.Add(胴_獣); } - if (胸_獣 != null) + if (Chest_獣 != null) { - 半身中1接続.Add(new DE(胸_獣, 胸_獣.胸描画)); + 半身中1接続.Add(new DE(Chest_獣, Chest_獣.胸描画)); } - if (胸_獣 != null) + if (Chest_獣 != null) { - 半身中1接続.Add(new DE(胸_獣, 胸_獣.肌描画)); + 半身中1接続.Add(new DE(Chest_獣, Chest_獣.肌描画)); } if (ボテ腹_獣 != null) { @@ -4670,27 +4670,27 @@ namespace SlaveMatrix Sort(胴_獣.翼右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); } } - if (胸_獣 != null) + if (Chest_獣 != null) { - if (胸_獣.背中_接続 != null) + if (Chest_獣.背中_接続 != null) { - Sort(胸_獣.背中_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.背中_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); } - if (胸_獣.翼上左_接続 != null) + if (Chest_獣.翼上左_接続 != null) { - Sort(胸_獣.翼上左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.翼上左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); } - if (胸_獣.翼下左_接続 != null) + if (Chest_獣.翼下左_接続 != null) { - Sort(胸_獣.翼下左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.翼下左_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); } - if (胸_獣.翼上右_接続 != null) + if (Chest_獣.翼上右_接続 != null) { - Sort(胸_獣.翼上右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.翼上右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); } - if (胸_獣.翼下右_接続 != null) + if (Chest_獣.翼下右_接続 != null) { - Sort(胸_獣.翼下右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); + Sort(Chest_獣.翼下右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続); } } if (胸毛_獣 != null) @@ -4730,13 +4730,13 @@ namespace SlaveMatrix { Sort(蛸.軟体外右_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身中2接続); } - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item7 in array) { 腿左接続.Remove(item7); 半身前接続.Add(item7); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item8 in array) { 腿右接続.Remove(item8); @@ -4881,13 +4881,13 @@ namespace SlaveMatrix Is植 = true; 植 = (単足_植)ele; Sort(植.EnumEle(), 半身中1接続); - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item9 in array) { 腿左接続.Remove(item9); 半身前接続.Add(item9); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item10 in array) { 腿右接続.Remove(item10); @@ -4899,13 +4899,13 @@ namespace SlaveMatrix Is粘 = true; 粘 = (単足_粘)ele; Sort(粘.EnumEle(), 半身後接続); - Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + Ele[] array = 腿左接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item11 in array) { 腿左接続.Remove(item11); 半身前接続.Add(item11); } - array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is 脚) | (e.Par is 足))).ToArray(); + array = 腿右接続.Where((Ele e) => !(e is 腿) && !(e.Par is 腿) && !((e.Par is Leg) | (e.Par is 足))).ToArray(); foreach (Ele item12 in array) { 腿右接続.Remove(item12); @@ -4996,16 +4996,16 @@ namespace SlaveMatrix } foreach (脚人 item34 in 脚人左) { - if (item34.脚 != null) + if (item34.Leg != null) { - Inserts(item34.脚, 1 + ((item34.脚.足_接続 != null) ? item34.脚.足_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item34.脚, item34.脚.外描画)); + Inserts(item34.Leg, 1 + ((item34.Leg.足_接続 != null) ? item34.Leg.足_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item34.Leg, item34.Leg.外描画)); } } foreach (脚人 item35 in 脚人右) { - if (item35.脚 != null) + if (item35.Leg != null) { - Inserts(item35.脚, 1 + ((item35.脚.足_接続 != null) ? item35.脚.足_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item35.脚, item35.脚.外描画)); + Inserts(item35.Leg, 1 + ((item35.Leg.足_接続 != null) ? item35.Leg.足_接続.Select((Ele f) => f.EnumEle()).JoinEnum().Count() : 0), new DE(item35.Leg, item35.Leg.外描画)); } } foreach (脚人 item36 in 脚人左) @@ -5040,13 +5040,13 @@ namespace SlaveMatrix Inserts(e.Par, 2 + num, e)?.Remove(e); } } - Ele ele5 = 腕左.LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.胸_肩左_接続); + Ele ele5 = 腕左.LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.Chest_肩左_接続); if (ele5 != null) { 下腕以降左.Add(ele5); } HashSet hashSet = new HashSet(); - foreach (蝙通常 item38 in 蝙通常.Where((蝙通常 e) => e.上腕.Par != null && e.上腕.Par.ConnectionType == ConnectionInfo.胸_肩左_接続)) + foreach (蝙通常 item38 in 蝙通常.Where((蝙通常 e) => e.上腕.Par != null && e.上腕.Par.ConnectionType == ConnectionInfo.Chest_肩左_接続)) { hashSet.Add(item38.上腕.飛膜); hashSet.Add(item38.手.飛膜); @@ -5070,13 +5070,13 @@ namespace SlaveMatrix { 腕左.Remove(item41); } - ele5 = 腕右.LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.胸_肩右_接続); + ele5 = 腕右.LastOrDefault((Ele e) => e.Par != null && e.Par.Par != null && e.Par.Par.ConnectionType == ConnectionInfo.Chest_肩右_接続); if (ele5 != null) { 下腕以降右.Add(ele5); } hashSet.Clear(); - foreach (蝙通常 item42 in 蝙通常.Where((蝙通常 e) => e.上腕.Par != null && e.上腕.Par.ConnectionType == ConnectionInfo.胸_肩右_接続)) + foreach (蝙通常 item42 in 蝙通常.Where((蝙通常 e) => e.上腕.Par != null && e.上腕.Par.ConnectionType == ConnectionInfo.Chest_肩右_接続)) { hashSet.Add(item42.上腕.飛膜); hashSet.Add(item42.手.飛膜); @@ -5129,7 +5129,7 @@ namespace SlaveMatrix 獣下腕 下腕右l = ((腕獣右.Count > 0) ? 腕獣右[0].下腕 : null); if (!Is蠍 && !Is蜘) { - Ele[] array = 半身前接続.Where((Ele e) => (e is 下腕 && 下腕左l != e && 下腕右l != e) || e is 上腕 || e is 触肢 || (e.ConnectionType == ConnectionInfo.四足脇_上腕_接続 && e is 脚)).ToArray(); + Ele[] array = 半身前接続.Where((Ele e) => (e is 下腕 && 下腕左l != e && 下腕右l != e) || e is 上腕 || e is 触肢 || (e.ConnectionType == ConnectionInfo.四足脇_上腕_接続 && e is Leg)).ToArray(); foreach (Ele item15 in array) { 半身前接続.Remove(item15); @@ -5307,10 +5307,10 @@ namespace SlaveMatrix 染み_獣 = new 染み_獣(disUnit, 配色指定.N0, Cha.配色, Med, new 染み_獣D()); 染み_獣.サイズ = Elements.Sum((Ele e) => e.サイズ) / (double)Elements.Length; 染み_獣.濃度 = 0.0; - if (胸_獣.脇左_接続.IsEle<四足脇>()) + if (Chest_獣.脇左_接続.IsEle<四足脇>()) { - 胸_獣.X0Y0_胸郭.OP[0].Outline = false; - 胸_獣.X0Y0_胸郭.OP[9].Outline = false; + Chest_獣.X0Y0_胸郭.OP[0].Outline = false; + Chest_獣.X0Y0_胸郭.OP[9].Outline = false; } Vector2D positionCont3 = new Vector2D(0.0, 0.006); 染み_獣.X0Y0_湯気_湯気左1_湯気2.PositionCont = positionCont3; @@ -5415,12 +5415,12 @@ namespace SlaveMatrix item54.OP.OutlineFalse(); } } - Elements.SetEle(delegate(胴_蛇 e) + Elements.SetEle(delegate(Torso_蛇 e) { e.X0Y0_胴_胴.OP[1].ps[3] = e.X0Y0_胴_胴.OP[1].ps[3].AddY(0.04); - if (e.胴_接続 != null) + if (e.Torso_接続 != null) { - e.胴_接続.SetEle(delegate(胴_蛇 f) + e.Torso_接続.SetEle(delegate(Torso_蛇 f) { f.X0Y0_胴_胴.OP[1].ps[3] = f.X0Y0_胴_胴.OP[1].ps[3].AddY(0.04); }); @@ -5433,7 +5433,7 @@ namespace SlaveMatrix } 下着乳首左.X0Y0_乳首.SizeBase = 乳房左.X0Y0_乳首.SizeBase * 1.1; 下着乳首右.X0Y0_乳首.SizeBase = 乳房右.X0Y0_乳首.SizeBase * 1.1; - if (胸.肩左_接続 == null) + if (Chest.肩左_接続 == null) { 胸肌_人.淫タトゥ_タトゥ左_表示 = false; 胸肌_人.淫タトゥ_タトゥ右_表示 = false; @@ -5455,27 +5455,27 @@ namespace SlaveMatrix Set腰(); if (背中接続.Count + 頭頂左後接続.Count + 頭頂右後接続.Count + 胸上左接続.Count + 胸上右接続.Count + 胸下左接続.Count + 胸下右接続.Count + 胴後左接続.Count + 胴後右接続.Count + 後腕左s.Length + 後腕右s.Length > 0) { - EI胸 = new EleI(Med); - EI胸.AddRange(背中接続); - EI胸.AddRange(頭頂左後接続); - EI胸.AddRange(頭頂右後接続); - EI胸.AddRange(胸上左接続); - EI胸.AddRange(胸上右接続); - EI胸.AddRange(胸下左接続); - EI胸.AddRange(胸下右接続); - EI胸.AddRange(胴後左接続); - EI胸.AddRange(胴後右接続); + EIChest = new EleI(Med); + EIChest.AddRange(背中接続); + EIChest.AddRange(頭頂左後接続); + EIChest.AddRange(頭頂右後接続); + EIChest.AddRange(胸上左接続); + EIChest.AddRange(胸上右接続); + EIChest.AddRange(胸下左接続); + EIChest.AddRange(胸下右接続); + EIChest.AddRange(胴後左接続); + EIChest.AddRange(胴後右接続); List[] array4 = 後腕左s; foreach (List es in array4) { - EI胸.AddRange(es); + EIChest.AddRange(es); } array4 = 後腕右s; foreach (List es2 in array4) { - EI胸.AddRange(es2); + EIChest.AddRange(es2); } - EI胸.描画処理 = delegate(Are are) + EIChest.描画処理 = delegate(RenderArea are) { bod.背中接続.描画0(are); bod.背中接続.描画1(are); @@ -5495,7 +5495,7 @@ namespace SlaveMatrix bod.頭頂左後接続.描画1(are); bod.頭頂右後接続.描画0(are); bod.頭頂右後接続.描画1(are); - 肩[] array5 = bod.後脇左s; + Shoulder[] array5 = bod.後脇左s; for (int n = 0; n < array5.Length; n++) { array5[n].脇描画(are); @@ -5518,14 +5518,14 @@ namespace SlaveMatrix es4.描画1(are); } }; - EI胸.Update(); - eis.Add(EI胸); + EIChest.Update(); + eis.Add(EIChest); } if (後髪接続.Count > 0) { EI髪 = new EleI(Med); EI髪.AddRange(後髪接続); - EI髪.描画処理 = delegate(Are are) + EI髪.描画処理 = delegate(RenderArea are) { bod.後髪接続.描画0(are); bod.後髪接続.描画1(are); @@ -5538,7 +5538,7 @@ namespace SlaveMatrix EI腰 = new EleI(Med); EI腰.AddRange(腰後左接続); EI腰.AddRange(腰後右接続); - EI腰.描画処理 = delegate(Are are) + EI腰.描画処理 = delegate(RenderArea are) { bod.腰後左接続.描画0(are); bod.腰後左接続.描画1(are); @@ -5553,7 +5553,7 @@ namespace SlaveMatrix EI半後 = new EleI(Med); EI半後.AddRange(尾接続); EI半後.AddRange(半身後接続); - EI半後.描画処理 = delegate(Are are) + EI半後.描画処理 = delegate(RenderArea are) { bod.尾接続.描画0(are); bod.尾接続.描画1(are); @@ -5567,7 +5567,7 @@ namespace SlaveMatrix { EI半中1 = new EleI(Med); EI半中1.AddRange(半身中1接続); - EI半中1.描画処理 = delegate(Are are) + EI半中1.描画処理 = delegate(RenderArea are) { bod.半身中1接続.描画0(are); bod.半身中1接続.描画1(are); @@ -5579,7 +5579,7 @@ namespace SlaveMatrix { EI半中2 = new EleI(Med); EI半中2.AddRange(半身中2接続); - EI半中2.描画処理 = delegate(Are are) + EI半中2.描画処理 = delegate(RenderArea are) { bod.半身中2接続.描画0(are); bod.半身中2接続.描画1(are); @@ -5591,7 +5591,7 @@ namespace SlaveMatrix { EI半前 = new EleI(Med); EI半前.AddRange(半身前接続); - EI半前.描画処理 = delegate(Are are) + EI半前.描画処理 = delegate(RenderArea are) { bod.半身前接続.描画0(are); bod.半身前接続.描画1(are); @@ -5604,7 +5604,7 @@ namespace SlaveMatrix EI腕前 = new EleI(Med); EI腕前.AddRange(下腕以降左); EI腕前.AddRange(下腕以降右); - EI腕前.描画処理 = delegate(Are are) + EI腕前.描画処理 = delegate(RenderArea are) { if (bod.腕左右前後) { @@ -5641,7 +5641,7 @@ namespace SlaveMatrix EI腿 = new EleI(Med); EI腿.AddRange(腿左接続); EI腿.AddRange(腿右接続); - EI腿.描画処理 = delegate(Are are) + EI腿.描画処理 = delegate(RenderArea are) { if (bod.腿左右前後) { @@ -5662,7 +5662,7 @@ namespace SlaveMatrix eis.Add(EI腿); } Is髪 = EI髪 != null; - Is胸 = EI胸 != null; + IsChest = EIChest != null; Is腰 = EI腰 != null; Is腕前 = EI腕前 != null; Is半後 = EI半後 != null; @@ -5673,13 +5673,13 @@ namespace SlaveMatrix Update(); if (Is海洋) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); - if (bod.Is胸) + if (bod.IsChest) { - bod.EI胸.描画(are); + bod.EIChest.描画(are); } if (bod.Is腰) { @@ -5765,7 +5765,7 @@ namespace SlaveMatrix bod.腰.描画0(are); bod.腰.描画1(are); bod.胴.描画0(are); - bod.胸.描画0(are); + bod.Chest.描画0(are); bod.首.描画0(are); if (bod.肩左 != null) { @@ -6092,7 +6092,7 @@ namespace SlaveMatrix } if (Is長物) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { if (bod.Is蛇) { @@ -6104,9 +6104,9 @@ namespace SlaveMatrix } bod.染み_人.色更新(); bod.染み_人.描画0(are); - if (bod.Is胸) + if (bod.IsChest) { - bod.EI胸.描画(are); + bod.EIChest.描画(are); } if (bod.Is腰) { @@ -6192,7 +6192,7 @@ namespace SlaveMatrix bod.腰.描画0(are); bod.腰.描画1(are); bod.胴.描画0(are); - bod.胸.描画0(are); + bod.Chest.描画0(are); bod.首.描画0(are); if (bod.肩左 != null) { @@ -6523,7 +6523,7 @@ namespace SlaveMatrix } if (Is獣) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); @@ -6549,9 +6549,9 @@ namespace SlaveMatrix bod.カーソル.描画2(Are); } } - if (bod.Is胸) + if (bod.IsChest) { - bod.EI胸.描画(are); + bod.EIChest.描画(are); } if (bod.Is腰) { @@ -6619,7 +6619,7 @@ namespace SlaveMatrix bod.腰.描画0(are); bod.腰.描画1(are); bod.胴.描画0(are); - bod.胸.描画0(are); + bod.Chest.描画0(are); bod.首.描画0(are); if (bod.肩左 != null) { @@ -6953,13 +6953,13 @@ namespace SlaveMatrix } if (Is蛸) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); - if (bod.Is胸) + if (bod.IsChest) { - bod.EI胸.描画(are); + bod.EIChest.描画(are); } if (bod.Is腰) { @@ -7045,7 +7045,7 @@ namespace SlaveMatrix bod.腰.描画0(are); bod.腰.描画1(are); bod.胴.描画0(are); - bod.胸.描画0(are); + bod.Chest.描画0(are); bod.首.描画0(are); if (bod.肩左 != null) { @@ -7372,7 +7372,7 @@ namespace SlaveMatrix } if (Is多足) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { if (bod.Is蠍) { @@ -7381,9 +7381,9 @@ namespace SlaveMatrix } bod.染み_人.色更新(); bod.染み_人.描画0(are); - if (bod.Is胸) + if (bod.IsChest) { - bod.EI胸.描画(are); + bod.EIChest.描画(are); } if (bod.Is腰) { @@ -7469,7 +7469,7 @@ namespace SlaveMatrix bod.腰.描画0(are); bod.腰.描画1(are); bod.胴.描画0(are); - bod.胸.描画0(are); + bod.Chest.描画0(are); bod.首.描画0(are); if (bod.肩左 != null) { @@ -7800,13 +7800,13 @@ namespace SlaveMatrix } if (Is植) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); - if (bod.Is胸) + if (bod.IsChest) { - bod.EI胸.描画(are); + bod.EIChest.描画(are); } if (bod.Is腰) { @@ -7892,7 +7892,7 @@ namespace SlaveMatrix bod.腰.描画0(are); bod.腰.描画1(are); bod.胴.描画0(are); - bod.胸.描画0(are); + bod.Chest.描画0(are); bod.首.描画0(are); if (bod.肩左 != null) { @@ -8236,13 +8236,13 @@ namespace SlaveMatrix } if (Is粘) { - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.染み_人.色更新(); bod.染み_人.描画0(are); - if (bod.Is胸) + if (bod.IsChest) { - bod.EI胸.描画(are); + bod.EIChest.描画(are); } if (bod.Is腰) { @@ -8344,7 +8344,7 @@ namespace SlaveMatrix bod.断面_人.描画0(are); } bod.胴.描画0(are); - bod.胸.描画0(are); + bod.Chest.描画0(are); bod.首.描画0(are); if (bod.肩左 != null) { @@ -8678,15 +8678,15 @@ namespace SlaveMatrix }; return; } - Draw = delegate(Are are) + Draw = delegate(RenderArea are) { bod.cb0 = bod.カーソル != null; bod.cb1 = bod.cb0 && !bod.カーソル.コキ; bod.染み_人.色更新(); bod.染み_人.描画0(are); - if (bod.Is胸) + if (bod.IsChest) { - bod.EI胸.描画(are); + bod.EIChest.描画(are); } if (bod.Is腰) { @@ -8772,7 +8772,7 @@ namespace SlaveMatrix bod.腰.描画0(are); bod.腰.描画1(are); bod.胴.描画0(are); - bod.胸.描画0(are); + bod.Chest.描画0(are); bod.首.描画0(are); if (bod.肩左 != null) { @@ -9498,7 +9498,7 @@ namespace SlaveMatrix public void Add鞭痕(Vector2D cp, Color hc) { Ele he = GetHitEle(hc); - if (he is 下腕 || he is 首) + if (he is 下腕 || he is Neck) { return; } @@ -9572,7 +9572,7 @@ namespace SlaveMatrix } } - public void 描画(Are Are) + public void 描画(RenderArea Are) { cb0 = カーソル != null; cb1 = cb0 && !カーソル.コキ; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs b/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs index 2f8d914..520938e 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix } } - public CM(Med Med, TrainingUI 調教UI, Ele Ele) + public CM(ModeEventDispatcher Med, TrainingUI 調教UI, Ele Ele) { this.調教UI = 調教UI; this.Ele = Ele; @@ -66,7 +66,7 @@ namespace SlaveMatrix bp = default(Vector2D); } - public void 描画0(Are Are) + public void 描画0(RenderArea Are) { if (Show && Under && 描画Show) { @@ -77,7 +77,7 @@ namespace SlaveMatrix } } - public void 描画1(Are Are) + public void 描画1(RenderArea Are) { if (Show && Under && 描画Show) { @@ -86,7 +86,7 @@ namespace SlaveMatrix } } - public void 描画0s(Are Are) + public void 描画0s(RenderArea Are) { if (Show && Under && 描画Show) { @@ -96,7 +96,7 @@ namespace SlaveMatrix } } - public void 描画1s(Are Are) + public void 描画1s(RenderArea Are) { if (Show && Under && 描画Show) { @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public void 待機描画(Are Are) + public void 待機描画(RenderArea Are) { if (Show && !Under && StaShow) { @@ -115,7 +115,7 @@ namespace SlaveMatrix } } - public void Draw(Are Are) + public void Draw(RenderArea Are) { if (Show && !Under && DraShow) { @@ -128,7 +128,7 @@ namespace SlaveMatrix } } - public void Draws(Are Are) + public void Draws(RenderArea Are) { if (Show && !Under && DraShow) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs index 78dc3df..762da63 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs @@ -10,9 +10,9 @@ namespace SlaveMatrix { public class Cha { - public Med Med; + public ModeEventDispatcher Med; - public Are Are; + public RenderArea Are; public Bod Bod; @@ -182,8 +182,8 @@ namespace SlaveMatrix set { 呼吸_ = value; - Bod.胸.尺度C = 0.99 + 0.02 * 呼吸_; - Bod.胸肌_人.尺度C = Bod.胸.尺度C; + Bod.Chest.尺度C = 0.99 + 0.02 * 呼吸_; + Bod.胸肌_人.尺度C = Bod.Chest.尺度C; p.Y = y * 呼吸_ * 0.5; if (Bod.Is髪) { @@ -194,9 +194,9 @@ namespace SlaveMatrix Bod.EI腕前.Position = p; } p.Y = y * 呼吸_ * 0.28; - if (Bod.Is胸) + if (Bod.IsChest) { - Bod.EI胸.Position = p; + Bod.EIChest.Position = p; } p.Y = 0.0 - p.Y; Bod.腰.位置C = p; @@ -244,17 +244,17 @@ namespace SlaveMatrix 放尿強制終了_(); } - public Cha(Med Med, Are Are, ChaD ChaD) + public Cha(ModeEventDispatcher Med, RenderArea Are, ChaD ChaD) { Cha cha = this; this.Med = Med; this.Are = Are; this.ChaD = ChaD; 配色 = new 体配色(ChaD.body_color); - _ = Are.DisUnit; + _ = Are.DisplayUnitScale; Bod = new Bod(Med, Are, this); 重髪 = Bod.Is髪 && Bod.EI髪.IsHeavy(); - 重胸 = Bod.Is胸 && Bod.EI胸.IsHeavy(); + 重胸 = Bod.IsChest && Bod.EIChest.IsHeavy(); 重腰 = Bod.Is腰 && Bod.EI腰.IsHeavy(); 重腕前 = Bod.Is腕前 && Bod.EI腕前.IsHeavy(); 重半後 = Bod.Is半後 && Bod.EI半後.IsHeavy(); @@ -262,12 +262,12 @@ namespace SlaveMatrix 重半中2 = Bod.Is半中2 && Bod.EI半中2.IsHeavy(); 重半前 = Bod.Is半前 && Bod.EI半前.IsHeavy(); 重腿 = Bod.Is腿 && Bod.EI腿.IsHeavy(); - double 尺度C = Bod.胸.尺度C; - Bod.胸.尺度C = 0.99; - double num = Bod.胸.X0Y0_胸郭.ToGlobal(Bod.胸.X0Y0_胸郭.JP[0].Joint).Y; - Bod.胸.尺度C = 1.01; - double num2 = Bod.胸.X0Y0_胸郭.ToGlobal(Bod.胸.X0Y0_胸郭.JP[0].Joint).Y; - Bod.胸.尺度C = 尺度C; + double 尺度C = Bod.Chest.尺度C; + Bod.Chest.尺度C = 0.99; + double num = Bod.Chest.X0Y0_胸郭.ToGlobal(Bod.Chest.X0Y0_胸郭.JP[0].Joint).Y; + Bod.Chest.尺度C = 1.01; + double num2 = Bod.Chest.X0Y0_胸郭.ToGlobal(Bod.Chest.X0Y0_胸郭.JP[0].Joint).Y; + Bod.Chest.尺度C = 尺度C; y = num2 - num; 呼吸 = new Mot(0.0, 1.0) { @@ -1748,15 +1748,15 @@ namespace SlaveMatrix cha.Bod.EI髪.Updatef = true; } } - if (cha.Bod.Is胸) + if (cha.Bod.IsChest) { if (cha.重胸) { - cha.Bod.EI胸.Position = p_; + cha.Bod.EIChest.Position = p_; } else { - cha.Bod.EI胸.Updatef = true; + cha.Bod.EIChest.Updatef = true; } } if (cha.Bod.Is腰) @@ -1856,9 +1856,9 @@ namespace SlaveMatrix { cha.Bod.EI髪.Position = Dat.Vec2DZero; } - if (cha.Bod.Is胸) + if (cha.Bod.IsChest) { - cha.Bod.EI胸.Position = Dat.Vec2DZero; + cha.Bod.EIChest.Position = Dat.Vec2DZero; } if (cha.Bod.Is腰) { @@ -1994,7 +1994,7 @@ namespace SlaveMatrix this.SetInitialAngle(); } - public void Draw(Are Are, FPS FPS) + public void Draw(RenderArea Are, FPS FPS) { this.FPS = FPS.Value; Mots.Drive(FPS); @@ -2050,7 +2050,7 @@ namespace SlaveMatrix { result.p = result.e.本体.GetHitPar_(HitColor); bool flag = false; - bool flag2 = result.e is 肩 || result.e is 上腕 || result.e is 下腕 || result.e is 手 || result.e is 四足脇 || result.e is 腿 || result.e is 脚 || result.e is 足 || result.e is 鰭 || result.e is 葉 || result.e is 前翅 || result.e is 後翅 || result.e is 触肢 || result.e is 節足 || result.e is 節尾 || result.e is 大顎 || result.e is 虫顎 || result.e is 虫鎌 || result.e is 触手; + bool flag2 = result.e is Shoulder || result.e is 上腕 || result.e is 下腕 || result.e is 手 || result.e is 四足脇 || result.e is 腿 || result.e is Leg || result.e is 足 || result.e is 鰭 || result.e is 葉 || result.e is 前翅 || result.e is 後翅 || result.e is 触肢 || result.e is 節足 || result.e is 節尾 || result.e is 大顎 || result.e is 虫顎 || result.e is 虫鎌 || result.e is 触手; if (result.e is 前髪 || result.e is 頭頂) { result.c = ContactType.Head; @@ -2063,19 +2063,19 @@ namespace SlaveMatrix { result.c = ContactType.Mouth; } - else if (result.e is 頭) + else if (result.e is Head) { result.c = ContactType.Face; } - else if (result.e is 横髪 || result.e is 後髪0 || result.e is 後髪1 || result.e is 基髪) + else if (result.e is SideHair || result.e is BackHair0 || result.e is BackHair1 || result.e is 基髪) { result.c = ContactType.Hair; } - else if (result.e is 首) + else if (result.e is Neck) { result.c = ContactType.Neck; } - else if (result.e is 肩) + else if (result.e is Shoulder) { result.c = ContactType.Shoulder; } @@ -2087,11 +2087,11 @@ namespace SlaveMatrix { result.c = ContactType.Chest; } - else if (result.e is 胸) + else if (result.e is Chest) { result.c = ContactType.Side; } - else if (((result.e is 腰 || result.e is 四足腰) && result.p != null && result.p.Tag == "下腹") || result.e is ボテ腹) + else if (((result.e is Waist || result.e is 四足腰) && result.p != null && result.p.Tag == "下腹") || result.e is ボテ腹) { result.c = ContactType.Stomache; } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/ChaD.cs b/SlaveMatrix/SlaveMatrix/GameClasses/ChaD.cs index 4082d8d..6bfd538 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/ChaD.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/ChaD.cs @@ -9,7 +9,7 @@ namespace SlaveMatrix { public Unit Parent; - public 腰D body_tree; + public WaistD body_tree; public 体色 body_color; @@ -129,7 +129,7 @@ namespace SlaveMatrix return false; } - public ChaD(腰D 構成, 体色 体色) + public ChaD(WaistD 構成, 体色 体色) { this.body_tree = 構成; this.body_color = 体色; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs index ec9732a..3a98ec8 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs @@ -296,13 +296,13 @@ namespace SlaveMatrix { item.SizeBase *= num2; } - else if (item.Tag.Contains("吸盤") || this is 膣基 || this is 膣内精液 || this is 断面 || this is 性器 || this is 肛門 || this is 乳房 || this is 下着トップ || this is 腰 || this is 腰肌 || this is 四足腰 || this is 下着ボトム || this is 上着ボトム || this is 手 || this is 噴乳 || this is 飛沫 || this is 潮吹_小 || this is 潮吹_大 || this is 放尿 || this is 半身 || this is 頭頂_天 || this is 背中_光 || this is ボテ腹) + else if (item.Tag.Contains("吸盤") || this is 膣基 || this is 膣内精液 || this is 断面 || this is 性器 || this is 肛門 || this is 乳房 || this is 下着トップ || this is Waist || this is 腰肌 || this is 四足腰 || this is 下着ボトム || this is 上着ボトム || this is 手 || this is 噴乳 || this is 飛沫 || this is 潮吹_小 || this is 潮吹_大 || this is 放尿 || this is 半身 || this is 頭頂_天 || this is 背中_光 || this is ボテ腹) { item.SizeBase *= num; } else if (Xasix) { - if (this is 頭 || this is 目隠帯 || this is 玉口枷) + if (this is Head || this is 目隠帯 || this is 玉口枷) { item.OP.ExpansionX(item.OP.GetCenter(), rate); } @@ -311,7 +311,7 @@ namespace SlaveMatrix item.SizeXBase *= num; } } - else if (this is 頭 || this is 目隠帯 || this is 玉口枷) + else if (this is Head || this is 目隠帯 || this is 玉口枷) { item.OP.ExpansionY(item.OP.GetCenter(), rate); } @@ -336,9 +336,9 @@ namespace SlaveMatrix double num = 身長mi2 + 身長d2 * 身長_; foreach (Par item in 本体.EnumAllPar()) { - if (!item.Parent.Tag.Contains("眼") && !item.Parent.Tag.Contains("コア") && !item.Tag.Contains("傷") && !item.Tag.Contains("ボタン") && !item.Parent.Tag.Contains("輪") && !item.Tag.Contains("吸盤") && !(this is 膣基) && !(this is 膣内精液) && !(this is 断面) && !(this is 性器) && !(this is 肛門) && !(this is 乳房) && !(this is 下着トップ) && !(this is 腰) && !(this is 腰肌) && !(this is 四足腰) && !(this is 下着ボトム) && !(this is 上着ボトム) && !(this is 手) && !(this is 噴乳) && !(this is 飛沫) && !(this is 潮吹_小) && !(this is 潮吹_大) && !(this is 放尿) && !(this is 頭) && !(this is 目隠帯) && !(this is 玉口枷) && !(this is 半身) && !(this is 頭頂) && !(this is 背中_光) && !(this is ボテ腹)) + if (!item.Parent.Tag.Contains("眼") && !item.Parent.Tag.Contains("コア") && !item.Tag.Contains("傷") && !item.Tag.Contains("ボタン") && !item.Parent.Tag.Contains("輪") && !item.Tag.Contains("吸盤") && !(this is 膣基) && !(this is 膣内精液) && !(this is 断面) && !(this is 性器) && !(this is 肛門) && !(this is 乳房) && !(this is 下着トップ) && !(this is Waist) && !(this is 腰肌) && !(this is 四足腰) && !(this is 下着ボトム) && !(this is 上着ボトム) && !(this is 手) && !(this is 噴乳) && !(this is 飛沫) && !(this is 潮吹_小) && !(this is 潮吹_大) && !(this is 放尿) && !(this is Head) && !(this is 目隠帯) && !(this is 玉口枷) && !(this is 半身) && !(this is 頭頂) && !(this is 背中_光) && !(this is ボテ腹)) { - if (this is 頭 || this is 目隠帯 || this is 玉口枷) + if (this is Head || this is 目隠帯 || this is 玉口枷) { if (num < 1.0) { @@ -542,41 +542,41 @@ namespace SlaveMatrix public int 描画前後 => ConnectionType switch { - ConnectionInfo.頭_基髪_接続 => 1, - ConnectionInfo.頭_目左_接続 => 1, - ConnectionInfo.頭_目右_接続 => 1, - ConnectionInfo.頭_鼻_接続 => 1, - ConnectionInfo.頭_口_接続 => 1, - ConnectionInfo.頭_頬左_接続 => 1, - ConnectionInfo.頭_頬右_接続 => 1, - ConnectionInfo.頭_額_接続 => 1, - ConnectionInfo.頭_眉左_接続 => 1, - ConnectionInfo.頭_眉右_接続 => 1, - ConnectionInfo.頭_耳左_接続 => 1, - ConnectionInfo.頭_耳右_接続 => 1, - ConnectionInfo.頭_鼻肌_接続 => 1, - ConnectionInfo.頭_単眼目_接続 => 1, - ConnectionInfo.頭_単眼眉_接続 => 1, - ConnectionInfo.頭_頬肌左_接続 => 1, - ConnectionInfo.頭_頬肌右_接続 => 1, - ConnectionInfo.頭_触覚左_接続 => 1, - ConnectionInfo.頭_触覚右_接続 => 1, + ConnectionInfo.Head_基髪_接続 => 1, + ConnectionInfo.Head_目左_接続 => 1, + ConnectionInfo.Head_目右_接続 => 1, + ConnectionInfo.Head_鼻_接続 => 1, + ConnectionInfo.Head_口_接続 => 1, + ConnectionInfo.Head_頬左_接続 => 1, + ConnectionInfo.Head_頬右_接続 => 1, + ConnectionInfo.Head_額_接続 => 1, + ConnectionInfo.Head_眉左_接続 => 1, + ConnectionInfo.Head_眉右_接続 => 1, + ConnectionInfo.Head_耳左_接続 => 1, + ConnectionInfo.Head_耳右_接続 => 1, + ConnectionInfo.Head_鼻肌_接続 => 1, + ConnectionInfo.Head_単眼目_接続 => 1, + ConnectionInfo.Head_単眼眉_接続 => 1, + ConnectionInfo.Head_頬肌左_接続 => 1, + ConnectionInfo.Head_頬肌右_接続 => 1, + ConnectionInfo.Head_触覚左_接続 => 1, + ConnectionInfo.Head_触覚右_接続 => 1, ConnectionInfo.基髪_頭頂左_接続 => 1, ConnectionInfo.基髪_頭頂右_接続 => 1, ConnectionInfo.基髪_前髪_接続 => 1, ConnectionInfo.基髪_後髪_接続 => 0, - ConnectionInfo.後髪0_肢系_左5_接続 => 1, - ConnectionInfo.後髪0_肢系_左4_接続 => 1, - ConnectionInfo.後髪0_肢系_左3_接続 => 1, - ConnectionInfo.後髪0_肢系_左2_接続 => 1, - ConnectionInfo.後髪0_肢系_左1_接続 => 1, - ConnectionInfo.後髪0_肢系_中央_接続 => 1, - ConnectionInfo.後髪0_肢系_右1_接続 => 1, - ConnectionInfo.後髪0_肢系_右2_接続 => 1, - ConnectionInfo.後髪0_肢系_右3_接続 => 1, - ConnectionInfo.後髪0_肢系_右4_接続 => 1, - ConnectionInfo.後髪0_肢系_右5_接続 => 1, - ConnectionInfo.横髪_肢系_肢_接続 => 1, + ConnectionInfo.BackHair0_肢系_左5_接続 => 1, + ConnectionInfo.BackHair0_肢系_左4_接続 => 1, + ConnectionInfo.BackHair0_肢系_左3_接続 => 1, + ConnectionInfo.BackHair0_肢系_左2_接続 => 1, + ConnectionInfo.BackHair0_肢系_左1_接続 => 1, + ConnectionInfo.BackHair0_肢系_中央_接続 => 1, + ConnectionInfo.BackHair0_肢系_右1_接続 => 1, + ConnectionInfo.BackHair0_肢系_右2_接続 => 1, + ConnectionInfo.BackHair0_肢系_右3_接続 => 1, + ConnectionInfo.BackHair0_肢系_右4_接続 => 1, + ConnectionInfo.BackHair0_肢系_右5_接続 => 1, + ConnectionInfo.SideHair_肢系_肢_接続 => 1, ConnectionInfo.双目_瞼_接続 => 1, ConnectionInfo.瞼_宇_涙_接続 => 1, ConnectionInfo.単目_瞼_接続 => 1, @@ -586,35 +586,35 @@ namespace SlaveMatrix ConnectionInfo.鼻_人_鼻水右_接続 => 1, ConnectionInfo.鼻_獣_鼻水左_接続 => 1, ConnectionInfo.鼻_獣_鼻水右_接続 => 1, - ConnectionInfo.首_頭_接続 => 1, - ConnectionInfo.胸_首_接続 => 1, - ConnectionInfo.胸_肩左_接続 => 1, - ConnectionInfo.胸_肩右_接続 => 1, - ConnectionInfo.胸_胸左_接続 => 1, - ConnectionInfo.胸_胸右_接続 => 1, - ConnectionInfo.胸_肌_接続 => 1, - ConnectionInfo.胸_翼上左_接続 => 0, - ConnectionInfo.胸_翼上右_接続 => 0, - ConnectionInfo.胸_翼下左_接続 => 0, - ConnectionInfo.胸_翼下右_接続 => 0, - ConnectionInfo.胸_背中_接続 => 0, + ConnectionInfo.Neck_Head_接続 => 1, + ConnectionInfo.Chest_Neck_接続 => 1, + ConnectionInfo.Chest_肩左_接続 => 1, + ConnectionInfo.Chest_肩右_接続 => 1, + ConnectionInfo.Chest_胸左_接続 => 1, + ConnectionInfo.Chest_胸右_接続 => 1, + ConnectionInfo.Chest_肌_接続 => 1, + ConnectionInfo.Chest_翼上左_接続 => 0, + ConnectionInfo.Chest_翼上右_接続 => 0, + ConnectionInfo.Chest_翼下左_接続 => 0, + ConnectionInfo.Chest_翼下右_接続 => 0, + ConnectionInfo.Chest_背中_接続 => 0, ConnectionInfo.乳房_噴乳_接続 => 1, - ConnectionInfo.肩_上腕_接続 => 1, - ConnectionInfo.胴_胸_接続 => 1, - ConnectionInfo.胴_肌_接続 => 1, - ConnectionInfo.胴_翼左_接続 => 0, - ConnectionInfo.胴_翼右_接続 => 0, - ConnectionInfo.腰_胴_接続 => 1, - ConnectionInfo.腰_腿左_接続 => 1, - ConnectionInfo.腰_腿右_接続 => 1, - ConnectionInfo.腰_膣基_接続 => 1, - ConnectionInfo.腰_肛門_接続 => 1, - ConnectionInfo.腰_尾_接続 => 0, - ConnectionInfo.腰_半身_接続 => 1, - ConnectionInfo.腰_上着_接続 => 0, - ConnectionInfo.腰_肌_接続 => 1, - ConnectionInfo.腰_翼左_接続 => 0, - ConnectionInfo.腰_翼右_接続 => 0, + ConnectionInfo.Shoulder_上腕_接続 => 1, + ConnectionInfo.Torso_Chest_接続 => 1, + ConnectionInfo.Torso_肌_接続 => 1, + ConnectionInfo.Torso_翼左_接続 => 0, + ConnectionInfo.Torso_翼右_接続 => 0, + ConnectionInfo.Waist_Torso_接続 => 1, + ConnectionInfo.Waist_腿左_接続 => 1, + ConnectionInfo.Waist_腿右_接続 => 1, + ConnectionInfo.Waist_膣基_接続 => 1, + ConnectionInfo.Waist_肛門_接続 => 1, + ConnectionInfo.Waist_尾_接続 => 0, + ConnectionInfo.Waist_半身_接続 => 1, + ConnectionInfo.Waist_上着_接続 => 0, + ConnectionInfo.Waist_肌_接続 => 1, + ConnectionInfo.Waist_翼左_接続 => 0, + ConnectionInfo.Waist_翼右_接続 => 0, ConnectionInfo.ボテ腹_人_腹板_接続 => 1, ConnectionInfo.ボテ腹_獣_腹板_接続 => 1, ConnectionInfo.肛門_人_肛門精液_接続 => 1, @@ -788,7 +788,7 @@ namespace SlaveMatrix ConnectionInfo.前翅_甲_軸1_接続 => 1, ConnectionInfo.前翅_甲_軸2_接続 => 1, ConnectionInfo.前翅_甲_軸3_接続 => 1, - ConnectionInfo.触手_犬_頭_接続 => 1, + ConnectionInfo.触手_犬_Head_接続 => 1, ConnectionInfo.触手_犬_上腕左_接続 => 1, ConnectionInfo.触手_犬_上腕右_接続 => 1, ConnectionInfo.触手_犬_下腕左_接続 => 1, @@ -833,18 +833,18 @@ namespace SlaveMatrix ConnectionInfo.下腕_蝙_腕輪_接続 => 1, ConnectionInfo.下腕_獣_手_接続 => 1, ConnectionInfo.下腕_蹄_手_接続 => 1, - ConnectionInfo.腿_人_脚_接続 => 1, - ConnectionInfo.腿_獣_脚_接続 => 1, - ConnectionInfo.腿_蹄_脚_接続 => 1, - ConnectionInfo.腿_鳥_脚_接続 => 1, - ConnectionInfo.腿_竜_脚_接続 => 1, - ConnectionInfo.脚_人_足_接続 => 1, - ConnectionInfo.脚_人_脚輪下_接続 => 1, - ConnectionInfo.脚_人_脚輪上_接続 => 1, - ConnectionInfo.脚_獣_足_接続 => 1, - ConnectionInfo.脚_蹄_足_接続 => 1, - ConnectionInfo.脚_鳥_足_接続 => 1, - ConnectionInfo.脚_竜_足_接続 => 1, + ConnectionInfo.腿_人_Leg_接続 => 1, + ConnectionInfo.腿_獣_Leg_接続 => 1, + ConnectionInfo.腿_蹄_Leg_接続 => 1, + ConnectionInfo.腿_鳥_Leg_接続 => 1, + ConnectionInfo.腿_竜_Leg_接続 => 1, + ConnectionInfo.Leg_人_足_接続 => 1, + ConnectionInfo.Leg_人_脚輪下_接続 => 1, + ConnectionInfo.Leg_人_脚輪上_接続 => 1, + ConnectionInfo.Leg_獣_足_接続 => 1, + ConnectionInfo.Leg_蹄_足_接続 => 1, + ConnectionInfo.Leg_鳥_足_接続 => 1, + ConnectionInfo.Leg_竜_足_接続 => 1, ConnectionInfo.長物_魚_左0_接続 => 1, ConnectionInfo.長物_魚_右0_接続 => 1, ConnectionInfo.長物_魚_左1_接続 => 1, @@ -877,15 +877,15 @@ namespace SlaveMatrix ConnectionInfo.長物_鯨_尾_接続 => 0, ConnectionInfo.長物_蛇_左_接続 => 1, ConnectionInfo.長物_蛇_右_接続 => 1, - ConnectionInfo.長物_蛇_胴_接続 => 0, + ConnectionInfo.長物_蛇_Torso_接続 => 0, ConnectionInfo.長物_蟲_左0_接続 => 1, ConnectionInfo.長物_蟲_右0_接続 => 1, ConnectionInfo.長物_蟲_左1_接続 => 1, ConnectionInfo.長物_蟲_右1_接続 => 1, - ConnectionInfo.長物_蟲_胴_接続 => 0, + ConnectionInfo.長物_蟲_Torso_接続 => 0, ConnectionInfo.四足胸_脇左_接続 => 0, ConnectionInfo.四足胸_脇右_接続 => 0, - ConnectionInfo.四足胸_胴_接続 => 0, + ConnectionInfo.四足胸_Torso_接続 => 0, ConnectionInfo.四足胸_胸左_接続 => 1, ConnectionInfo.四足胸_胸右_接続 => 1, ConnectionInfo.四足胸_肌_接続 => 1, @@ -942,12 +942,12 @@ namespace SlaveMatrix ConnectionInfo.単足_植_根中央_接続 => 0, ConnectionInfo.単足_植_根内右_接続 => 0, ConnectionInfo.単足_植_根外右_接続 => 0, - ConnectionInfo.胴_蛇_左_接続 => 1, - ConnectionInfo.胴_蛇_右_接続 => 1, - ConnectionInfo.胴_蛇_胴_接続 => 0, - ConnectionInfo.胴_蟲_左_接続 => 1, - ConnectionInfo.胴_蟲_右_接続 => 1, - ConnectionInfo.胴_蟲_胴_接続 => 0, + ConnectionInfo.Torso_蛇_左_接続 => 1, + ConnectionInfo.Torso_蛇_右_接続 => 1, + ConnectionInfo.Torso_蛇_Torso_接続 => 0, + ConnectionInfo.Torso_蟲_左_接続 => 1, + ConnectionInfo.Torso_蟲_右_接続 => 1, + ConnectionInfo.Torso_蟲_Torso_接続 => 0, ConnectionInfo.大顎基_顎左_接続 => 1, ConnectionInfo.大顎基_顎右_接続 => 1, ConnectionInfo.植_花_接続 => 1, @@ -959,16 +959,16 @@ namespace SlaveMatrix 接続根.Set(接続元); } - public virtual void 描画0(Are Are) + public virtual void 描画0(RenderArea Are) { 本体.Draw(Are); } - public virtual void 描画1(Are Are) + public virtual void 描画1(RenderArea Are) { } - public virtual void 描画2(Are Are) + public virtual void 描画2(RenderArea Are) { } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs index 5b4089f..7697436 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs @@ -1,8 +1,9 @@ +using _2DGAMELIB; using System; using System.Collections.Generic; using System.Linq; using System.Reflection; -using _2DGAMELIB; +using System.Runtime.Serialization; namespace SlaveMatrix { @@ -73,16 +74,25 @@ namespace SlaveMatrix public double 濃度 = 1.0; - //TODO this broke loading saves + //TODO this broke loading saves [NonSerialized] public Type ThisType; - public virtual Ele GetEle(double DisUnit, Med Med, 体配色 体配色) + //Some how fixes saves (thx GPT) + + //So how I am understend it (description) + //This Type is empty on deserialization because Type is not serializable + //We need just init it after deserialization + + [OnDeserialized] + private void OnDeserialized(StreamingContext _) => ThisType = GetType(); + + public virtual Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) { return null; } - public virtual Ele GetEle(double DisUnit, Med Med, 主人公配色 体配色) + public virtual Ele GetEle(double DisUnit, ModeEventDispatcher Med, 主人公配色 体配色) { return null; } @@ -193,7 +203,8 @@ namespace SlaveMatrix public void 接続(ConnectionInfo 接続情報, EleD ed) { string text = ThisType.Name.Remove(ThisType.Name.Length - 1); - MethodInfo method = ThisType.GetMethod(接続情報.ToString().Remove(0, text.Length).Replace("_", "")); + var methodName = 接続情報.ToString().Remove(0, text.Length).Replace("_", ""); + MethodInfo method = ThisType.GetMethod(接続情報.ToString().Remove(0, text.Length).Replace("_", "")); object[] parameters = new EleD[1] { ed }; method.Invoke(this, parameters); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs index 8311d0d..791a3eb 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/EleI.cs @@ -10,11 +10,11 @@ namespace SlaveMatrix public Vector2D PositionCont = Dat.Vec2DZero; - public Are Lay; + public RenderArea Lay; public bool Updatef = true; - public Action 描画処理; + public Action 描画処理; public HashSet ElesH; @@ -36,13 +36,13 @@ namespace SlaveMatrix return false; } - public EleI(Med Med) + public EleI(ModeEventDispatcher Med) { - Lay = new Are(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size + 0.0025, Med.DisQuality, Med.HitAccuracy); + Lay = new RenderArea(Med.Unit, Med.Base.XRatio, Med.Base.YRatio, Med.Base.Size + 0.0025, Med.DisQuality, Med.HitAccuracy); ElesH = new HashSet(); } - public void 描画(Are Are) + public void 描画(RenderArea Are) { Vec.Add(ref Position, ref PositionCont, out Lay.Position); Are.Draw(Lay); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/GameText.cs b/SlaveMatrix/SlaveMatrix/GameClasses/GameText.cs index 5f01693..e000eb9 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/GameText.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/GameText.cs @@ -1142,7 +1142,7 @@ namespace SlaveMatrix public class SubInfo { - private Med Med; + private ModeEventDispatcher Med; private InfoPanel ip; @@ -1162,7 +1162,7 @@ namespace SlaveMatrix private string[] 日数進行; - public SubInfo(Med Med, InfoPanel ip) + public SubInfo(ModeEventDispatcher Med, InfoPanel ip) { this.Med = Med; this.ip = ip; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/ListView.cs b/SlaveMatrix/SlaveMatrix/GameClasses/ListView.cs index 45b0fec..25a7b59 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/ListView.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/ListView.cs @@ -23,7 +23,7 @@ namespace SlaveMatrix //list of buttons public class ListView { - private Are Are; + private RenderArea Are; private ParT[] pt; @@ -70,7 +70,7 @@ namespace SlaveMatrix } } - public ListView(Are Are, Vector2D Position, double Space, Font Font, double TextSize, Color TextColor, Color ShadColor, Color BackColor, Color FramColor, params TA[] acts) + public ListView(RenderArea Are, Vector2D Position, double Space, Font Font, double TextSize, Color TextColor, Color ShadColor, Color BackColor, Color FramColor, params TA[] acts) { this.Are = Are; this.Space = Space; @@ -84,7 +84,7 @@ namespace SlaveMatrix pt[i].Font = Font; pt[i].FontSize = TextSize; pt[i].RectSize = new Vector2D(100.0, 100.0); - pt[i].SetStringRectOutline(Are.Unit, Are.GD); + pt[i].SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); pt[i].Closed = true; pt[i].TextColor = TextColor; if (!ShadColor.IsEmpty) @@ -99,7 +99,7 @@ namespace SlaveMatrix LocalHeight = Are.LocalHeight; } - public void SetHitColor(Med Med) + public void SetHitColor(ModeEventDispatcher Med) { ParT[] array = pt; foreach (ParT obj in array) @@ -129,7 +129,7 @@ namespace SlaveMatrix bs.Up(ref HitColor); } - public void Draw(Are Are) + public void Draw(RenderArea Are) { bs.Draw(Are); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs index e95b0ee..e49c859 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs @@ -17,7 +17,7 @@ namespace SlaveMatrix public static class MyUI { //normal rectangular buttons - public static But1 Button(Med med, Are buffer, string text, Vector2D pos, Action on_click) { + public static But1 Button(ModeEventDispatcher med, RenderArea buffer, string text, Vector2D pos, Action on_click) { ParT parT = new ParT(); parT.Font = new Font("MS Gothic", 0.1f); @@ -75,7 +75,7 @@ namespace SlaveMatrix } //rhombus shaped buttons - public static But1 Button2(Med med, Are buffer, string text, Vector2D pos, Action on_click) { + public static But1 Button2(ModeEventDispatcher med, RenderArea buffer, string text, Vector2D pos, Action on_click) { ParT parT = new ParT(); parT.Font = new Font("MS Gothic", 0.1f); parT.PositionBase = buffer.GetPosition(pos); @@ -96,7 +96,7 @@ namespace SlaveMatrix return new But1(parT, on_click); } - public static ListView Select(Are buffer, Vector2D pos, params TA[] acts) { + public static ListView Select(RenderArea buffer, Vector2D pos, params TA[] acts) { return new ListView( buffer, buffer.GetPosition(pos), @@ -111,7 +111,7 @@ namespace SlaveMatrix ); } - public static Lab Label(Med med, Are buffer, string text, Vector2D pos) { + public static Lab Label(ModeEventDispatcher med, RenderArea buffer, string text, Vector2D pos) { return new Lab( buffer, "", @@ -151,30 +151,30 @@ namespace SlaveMatrix //buffers - public static Are DrawBuffer; - public static Are BlackBackground; - public static Are BasementBackground; - public static Are OfficeBackground; - public static Are drawArea; + public static RenderArea DrawBuffer; + public static RenderArea BlackBackground; + public static RenderArea BasementBackground; + public static RenderArea OfficeBackground; + public static RenderArea drawArea; - private static Action メインフォーム描画; - private static Action 調教描画; - public static Action 撮影描画; - private static Action 対象描画; - private static Action DrawBlessing; - private static Action DrawOffice; - private static Action DrawDebt; - private static Action DrawSlaveShop; - private static Action DrawToolShop; - private static Action 中継描画; - private static Action DrawOP0; - private static Action DrawOP1; - private static Action 説明描画; - private static Action 初事務所描画; - private static Action 返済イベント描画; - private static Action 日数進行描画; - private static Action PlayerInformationSliders; + private static Action メインフォーム描画; + private static Action 調教描画; + public static Action 撮影描画; + private static Action 対象描画; + private static Action DrawBlessing; + private static Action DrawOffice; + private static Action DrawDebt; + private static Action DrawSlaveShop; + private static Action DrawToolShop; + private static Action 中継描画; + private static Action DrawOP0; + private static Action DrawOP1; + private static Action 説明描画; + private static Action 初事務所描画; + private static Action 返済イベント描画; + private static Action 日数進行描画; + private static Action PlayerInformationSliders; private static Action 対象UI初期化; private static Action 奴隷UI初期化; @@ -201,7 +201,7 @@ namespace SlaveMatrix public static int MaxRoomNumber => 135; - public static Dictionary GetMods(Med Med) + public static Dictionary GetMods(ModeEventDispatcher Med) { Sta.LoadConfig(); Sta.タイル準備(); @@ -209,17 +209,17 @@ namespace SlaveMatrix Sta.Set喘ぎ(); //setup buffers - drawArea = new Are(Med, Hit: false); - DrawBuffer = new Are(Med, Hit: true); + drawArea = new RenderArea(Med, Hit: false); + DrawBuffer = new RenderArea(Med, Hit: true); - BlackBackground = new Are(Med, Hit: true); + BlackBackground = new RenderArea(Med, Hit: true); BlackBackground.Clear(Col.Black); - BasementBackground = new Are(Med, Hit: true); - BasementBackground.GD.DrawImage(new Bitmap(new MemoryStream(Resources.dangeon01_ex2)), BasementBackground.Dis.GetRect()); + BasementBackground = new RenderArea(Med, Hit: true); + BasementBackground.DisplayGraphics.DrawImage(new Bitmap(new MemoryStream(Resources.dangeon01_ex2)), BasementBackground.DisplayLayer.GetRect()); - OfficeBackground = new Are(Med, Hit: true); - OfficeBackground.GD.DrawImage(new Bitmap(new MemoryStream(Resources.li_room10a_c_ex2)), OfficeBackground.Dis.GetRect()); + OfficeBackground = new RenderArea(Med, Hit: true); + OfficeBackground.DisplayGraphics.DrawImage(new Bitmap(new MemoryStream(Resources.li_room10a_c_ex2)), OfficeBackground.DisplayLayer.GetRect()); SaveData = new ListView( DrawBuffer, @@ -526,7 +526,7 @@ namespace SlaveMatrix }; static double v = 0.0; - private static void SwitchMode(Med Med, Are Are, FPS FPS, Action 描画) + private static void SwitchMode(ModeEventDispatcher Med, RenderArea Are, FPS FPS, Action 描画) { if (fade_in) { @@ -552,7 +552,7 @@ namespace SlaveMatrix } } - public static void SwitchMode(this Med Med, string Mode, Are Are, Action 描画) + public static void SwitchMode(this ModeEventDispatcher Med, string Mode, RenderArea Are, Action 描画) { Med.Mode = Mode; 描画(drawArea, Med.FPSF); @@ -561,7 +561,7 @@ namespace SlaveMatrix fade_in = true; } - public static void flash(this Med Med) + public static void flash(this ModeEventDispatcher Med) { 調教描画(drawArea, Med.FPSF); Color col = Color.FromArgb(128, Color.White); @@ -596,12 +596,12 @@ namespace SlaveMatrix // save/load handling //TODO: fix - public static void SetSLlv(Med Med) + public static void SetSLlv(ModeEventDispatcher Med) { SaveData.Acts = sllv(Med); } - private static IEnumerable sllv(Med Med) + private static IEnumerable sllv(ModeEventDispatcher Med) { int j = 0; string[] array = Sta.SDPaths(); @@ -638,7 +638,7 @@ namespace SlaveMatrix Sta.GDSave(0); } - private static void Save(string Path, int i, Med Med) + private static void Save(string Path, int i, ModeEventDispatcher Med) { ip.SubInfoIm = GameText.セーブ中です + "\r\n" + GameText.しばらくお待ちください; @@ -653,7 +653,7 @@ namespace SlaveMatrix //Med.InvokeL(Sounds.完了.Play); } - private static void Load(string Path, int i, Med Med) + private static void Load(string Path, int i, ModeEventDispatcher Med) { ip.SubInfoIm = GameText.ロード中です + "\r\n" + GameText.しばらくお待ちください; @@ -694,12 +694,12 @@ namespace SlaveMatrix } - public static void SetJSLlv(Med med) + public static void SetJSLlv(ModeEventDispatcher med) { SaveData.Acts = jsllv(med); } - private static IEnumerable jsllv(Med med) + private static IEnumerable jsllv(ModeEventDispatcher med) { int k = 0; string[] array = Sta.JSDPaths(); @@ -724,7 +724,7 @@ namespace SlaveMatrix } } - private static void JsonSave(string Path, int i, Med med) + private static void JsonSave(string Path, int i, ModeEventDispatcher med) { ip.SubInfoIm = GameText.セーブ中です + "\r\n" + GameText.しばらくお待ちください; @@ -738,7 +738,7 @@ namespace SlaveMatrix ip.SubInfoIm = i + ": " + Sta.GameData.GetSaveDateString() + "\r\n" + GameText.セーブしました; //Sounds.完了.Play(); } - private static void JsonLoad(string Path, int i, Med med) + private static void JsonLoad(string Path, int i, ModeEventDispatcher med) { ip.SubInfoIm = GameText.ロード中です + "\r\n" + GameText.しばらくお待ちください; @@ -958,7 +958,7 @@ namespace SlaveMatrix Sta.GameData.新日 = true; } } - public static bool PassTime(Med Med) + public static bool PassTime(ModeEventDispatcher Med) { bool flag = Sta.GameData.時間帯 == GameText.夜; Player.RecoverPlayerStamina(); @@ -1006,7 +1006,7 @@ namespace SlaveMatrix } return flag; } - public static void PassDay(Med Med) + public static void PassDay(ModeEventDispatcher Med) { while (!PassTime(Med)) { @@ -1078,7 +1078,7 @@ namespace SlaveMatrix TrainingTarget.Bod.Update(); } - public static void SetTrainingTarget(Med Med, Unit u) + public static void SetTrainingTarget(ModeEventDispatcher Med, Unit u) { Sta.GameData.TrainingTarget = u; if (TrainingTarget != null) @@ -1159,7 +1159,7 @@ namespace SlaveMatrix //modules - public static Module Start(Med Med) + public static Module Start(ModeEventDispatcher Med) { return new Module { @@ -1170,7 +1170,7 @@ namespace SlaveMatrix }; } - public static Module Credit(Med Med) { + public static Module Credit(ModeEventDispatcher Med) { MotV mv = new MotV(0.0, 1.0){BaseSpeed = 0.5}; double v = 0.0; @@ -1250,7 +1250,7 @@ namespace SlaveMatrix }; } - public static Module Title(Med Med) + public static Module Title(ModeEventDispatcher Med) { MotV mv = new MotV(0.0, 1.0) { @@ -1404,7 +1404,7 @@ namespace SlaveMatrix }; } - public static Module メインフォーム(Med Med) + public static Module メインフォーム(ModeEventDispatcher Med) { Buts bs = new Buts(); @@ -1470,12 +1470,12 @@ namespace SlaveMatrix } })); - メインフォーム描画 = delegate (Are a, FPS FPS) + メインフォーム描画 = delegate (RenderArea a, FPS FPS) { - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BasementBackground); if (TrainingTarget != null) @@ -1633,11 +1633,11 @@ namespace SlaveMatrix }; } - public static Module Training(Med Med) + public static Module Training(ModeEventDispatcher Med) { 調教背景 BackgroundDrawing = new 調教背景(); - Are TrainingBackground = new Are(Med, Hit: false); - TrainingBackground.GD.Clear(Color.Gray); + RenderArea TrainingBackground = new RenderArea(Med, Hit: false); + TrainingBackground.DisplayGraphics.Clear(Color.Gray); Player.UI = new TrainingUI(Med, DrawBuffer, ip); Player.UI.調教終了.Action = delegate @@ -1691,13 +1691,13 @@ namespace SlaveMatrix ContactD cd = default(ContactD); Vector2D op = Dat.Vec2DZero; - 調教描画 = delegate (Are a, FPS FPS) + 調教描画 = delegate (RenderArea a, FPS FPS) { Player.UI.Mots.Drive(FPS); - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(TrainingBackground); TrainingTarget.Draw(a, FPS); @@ -1724,7 +1724,7 @@ namespace SlaveMatrix 調教済みチェック = false; } }; - 撮影描画 = delegate (Are a, FPS FPS) + 撮影描画 = delegate (RenderArea a, FPS FPS) { a.Draw(TrainingBackground); TrainingTarget.Draw(a, FPS); @@ -1733,7 +1733,7 @@ namespace SlaveMatrix return new Module { Setting = delegate { - TrainingBackground.GD.Clear(Color.Gray); + TrainingBackground.DisplayGraphics.Clear(Color.Gray); BackgroundDrawing.Reset(); BackgroundDrawing.Draw(TrainingBackground); ip.MaiShow = false; @@ -1819,14 +1819,14 @@ namespace SlaveMatrix }; } - public static Module 調教中継行(Med Med) + public static Module 調教中継行(ModeEventDispatcher Med) { - 中継描画 = delegate(Are a, FPS FPS) + 中継描画 = delegate(RenderArea a, FPS FPS) { - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BlackBackground); ip.Draw(a, FPS); @@ -1869,7 +1869,7 @@ namespace SlaveMatrix }; } - public static Module 調教中継帰(Med Med) + public static Module 調教中継帰(ModeEventDispatcher Med) { bool Result2 = false; bool Result3 = false; @@ -2003,7 +2003,7 @@ namespace SlaveMatrix }; } - public static Module 対象(Med Med) + public static Module 対象(ModeEventDispatcher Med) { try { @@ -3277,12 +3277,12 @@ namespace SlaveMatrix bs.SetHitColor(Med); - 対象描画 = delegate (Are a, FPS FPS) + 対象描画 = delegate (RenderArea a, FPS FPS) { - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BasementBackground); if (TrainingTarget != null) @@ -3316,7 +3316,7 @@ namespace SlaveMatrix } } - public static Module Blessing(Med Med) + public static Module Blessing(ModeEventDispatcher Med) { Cha 祝福 = null; bool d = false; @@ -3496,12 +3496,12 @@ namespace SlaveMatrix } }; - DrawBlessing = delegate (Are a, FPS FPS) + DrawBlessing = delegate (RenderArea a, FPS FPS) { - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BasementBackground); if (祝福 != null) @@ -3647,7 +3647,7 @@ namespace SlaveMatrix }; } - public static Module Office(Med Med) + public static Module Office(ModeEventDispatcher Med) { Module mod = new Module(); Buts bs = new Buts(); @@ -3883,11 +3883,11 @@ namespace SlaveMatrix } } }; - DrawOffice = delegate(Are a, FPS FPS) + DrawOffice = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -3912,7 +3912,7 @@ namespace SlaveMatrix return mod; } - public static Module Debt(Med Med) + public static Module Debt(ModeEventDispatcher Med) { Module mod = new Module(); Vector2D position = DrawBuffer.GetPosition(0.15, 0.37); @@ -4391,12 +4391,12 @@ namespace SlaveMatrix bs["nr"].Dra = Sta.GameData.借金 != 0; } }; - DrawDebt = delegate(Are a, FPS FPS) + DrawDebt = delegate(RenderArea a, FPS FPS) { - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -4421,7 +4421,7 @@ namespace SlaveMatrix return mod; } - public static Module SlaveShop(Med Med) + public static Module SlaveShop(ModeEventDispatcher Med) { Module mod = new Module(); Cha PurchasTarget = null; @@ -5070,12 +5070,12 @@ namespace SlaveMatrix si.Set(bre: false); } }; - DrawSlaveShop = delegate(Are a, FPS FPS) + DrawSlaveShop = delegate(RenderArea a, FPS FPS) { - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); if (u != null) @@ -5112,7 +5112,7 @@ namespace SlaveMatrix return mod; } - public static Module ToolShop(Med Med) + public static Module ToolShop(ModeEventDispatcher Med) { Module mod = new Module(); Buts bs = new Buts(); @@ -5437,12 +5437,12 @@ namespace SlaveMatrix subinfo(); } }; - DrawToolShop = delegate(Are a, FPS FPS) + DrawToolShop = delegate(RenderArea a, FPS FPS) { - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); lv.Draw(a); @@ -5467,7 +5467,7 @@ namespace SlaveMatrix return mod; } - public static Module StartOfDay(Med Med) + public static Module StartOfDay(ModeEventDispatcher Med) { Module obj = new Module { @@ -5526,16 +5526,16 @@ namespace SlaveMatrix si.Set(bre: false); } }; - 日数進行描画 = delegate(Are a, FPS FPS) + 日数進行描画 = delegate(RenderArea a, FPS FPS) { if (TrainingTarget != null) { TrainingTarget.Mots.Drive(FPS); } - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BlackBackground); ip.Draw(a, FPS); @@ -5551,7 +5551,7 @@ namespace SlaveMatrix return obj; } - public static Module PlayerInformation(Med Med) + public static Module PlayerInformation(ModeEventDispatcher Med) { Module mod = new Module(); double num = 0.2; @@ -5616,57 +5616,57 @@ namespace SlaveMatrix ls.Add("ラベル13", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.005)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, GameText.体格, Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); ls.Add("ラベル14", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.045)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, "H:", Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); ls.Add("ラベル15", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.086)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, "W:", Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); - Gau H肌 = new Gau("H肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H肌 = new Gau("H肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H肌.Gauge.PenColor = Col.White; H肌.Frame1.PenColor = Col.White; H肌.Knob.PenColor = Col.White; H肌.Knob.HitColor = Med.GetUniqueColor(); - Gau S肌 = new Gau("S肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S肌 = new Gau("S肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S肌.Gauge.PenColor = Col.White; S肌.Frame1.PenColor = Col.White; S肌.Knob.PenColor = Col.White; S肌.Knob.HitColor = Med.GetUniqueColor(); - Gau V肌 = new Gau("V肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V肌 = new Gau("V肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V肌.Gauge.PenColor = Col.White; V肌.Frame1.PenColor = Col.White; V肌.Knob.PenColor = Col.White; V肌.Knob.HitColor = Med.GetUniqueColor(); - Gau H髪 = new Gau("H髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H髪 = new Gau("H髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H髪.Gauge.PenColor = Col.White; H髪.Frame1.PenColor = Col.White; H髪.Knob.PenColor = Col.White; H髪.Knob.HitColor = Med.GetUniqueColor(); - Gau S髪 = new Gau("S髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S髪 = new Gau("S髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S髪.Gauge.PenColor = Col.White; S髪.Frame1.PenColor = Col.White; S髪.Knob.PenColor = Col.White; S髪.Knob.HitColor = Med.GetUniqueColor(); - Gau V髪 = new Gau("V髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V髪 = new Gau("V髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V髪.Gauge.PenColor = Col.White; V髪.Frame1.PenColor = Col.White; V髪.Knob.PenColor = Col.White; V髪.Knob.HitColor = Med.GetUniqueColor(); - Gau H瞳 = new Gau("H瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H瞳 = new Gau("H瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H瞳.Gauge.PenColor = Col.White; H瞳.Frame1.PenColor = Col.White; H瞳.Knob.PenColor = Col.White; H瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau S瞳 = new Gau("S瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S瞳 = new Gau("S瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S瞳.Gauge.PenColor = Col.White; S瞳.Frame1.PenColor = Col.White; S瞳.Knob.PenColor = Col.White; S瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau V瞳 = new Gau("V瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V瞳 = new Gau("V瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V瞳.Gauge.PenColor = Col.White; V瞳.Frame1.PenColor = Col.White; V瞳.Knob.PenColor = Col.White; V瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau 身長 = new Gau("身長", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau 身長 = new Gau("身長", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); 身長.Gauge.PenColor = Col.White; 身長.Frame1.PenColor = Col.White; 身長.Knob.PenColor = Col.White; 身長.Knob.HitColor = Med.GetUniqueColor(); - Gau 体重 = new Gau("体重", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau 体重 = new Gau("体重", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisplayUnitScale, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); 体重.Gauge.PenColor = Col.White; 体重.Frame1.PenColor = Col.White; 体重.Knob.PenColor = Col.White; @@ -5850,12 +5850,12 @@ namespace SlaveMatrix ls["ラベル14"].Text = "H:" + $"{身長.Value:0.00}"; ls["ラベル15"].Text = "W:" + $"{体重.Value:0.00}"; }; - PlayerInformationSliders = delegate(Are a, FPS FPS) + PlayerInformationSliders = delegate(RenderArea a, FPS FPS) { - Med.GH.Clear(Col.Transparent); - if (a.GH != null) + Med.HitGraphics.Clear(Col.Transparent); + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BlackBackground); ls.Draw(a); @@ -5896,7 +5896,7 @@ namespace SlaveMatrix return mod; } - public static Module OP0(Med Med) + public static Module OP0(ModeEventDispatcher Med) { Module mod = new Module(); int i = 0; @@ -5947,11 +5947,11 @@ namespace SlaveMatrix ip.Text = tsp[i]; ip.SubInfo = sub[i]; }; - DrawOP0 = delegate(Are a, FPS FPS) + DrawOP0 = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BlackBackground); dbs.Draw(a); @@ -5968,7 +5968,7 @@ namespace SlaveMatrix return mod; } - public static Module OP1(Med Med) + public static Module OP1(ModeEventDispatcher Med) { Module mod = new Module(); int i = 0; @@ -6212,7 +6212,7 @@ namespace SlaveMatrix Viola.両目_見つめ(); Viola.Set基本姿勢(); }; - DrawOP1 = delegate(Are a, FPS FPS) + DrawOP1 = delegate(RenderArea a, FPS FPS) { a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -6231,7 +6231,7 @@ namespace SlaveMatrix return mod; } - public static Module 説明(Med Med) + public static Module 説明(ModeEventDispatcher Med) { Module mod = new Module(); int i = 0; @@ -6365,11 +6365,11 @@ namespace SlaveMatrix ip.Text = tsp[i]; ip.SubInfo = sub[i]; }; - 説明描画 = delegate(Are a, FPS FPS) + 説明描画 = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(BasementBackground); Viola.Draw(a, FPS); @@ -6388,7 +6388,7 @@ namespace SlaveMatrix return mod; } - public static Module 初事務所(Med Med) + public static Module 初事務所(ModeEventDispatcher Med) { Module mod = new Module(); int i = 0; @@ -6672,11 +6672,11 @@ namespace SlaveMatrix ip.Text = tsp[i]; ip.SubInfo = sub[i]; }; - 初事務所描画 = delegate(Are a, FPS FPS) + 初事務所描画 = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -6695,7 +6695,7 @@ namespace SlaveMatrix return mod; } - public static Module RepaymentEvent1(Med Med) + public static Module RepaymentEvent1(ModeEventDispatcher Med) { Module mod = new Module(); int i = 0; @@ -6780,11 +6780,11 @@ namespace SlaveMatrix ip.Text = tsp[i]; ip.SubInfo = sub[i]; }; - 返済イベント描画 = delegate(Are a, FPS FPS) + 返済イベント描画 = delegate(RenderArea a, FPS FPS) { - if (a.GH != null) + if (a.HitGraphics != null) { - a.GH.Clear(Col.Transparent); + a.HitGraphics.Clear(Col.Transparent); } a.Draw(OfficeBackground); Viola.Draw(a, FPS); @@ -6803,7 +6803,7 @@ namespace SlaveMatrix return mod; } - public static Module RepaymentEvent2(Med Med) + public static Module RepaymentEvent2(ModeEventDispatcher Med) { Module mod = new Module(); int i = 0; @@ -6904,7 +6904,7 @@ namespace SlaveMatrix return mod; } - public static Module RepaymentEvent3(Med Med) + public static Module RepaymentEvent3(ModeEventDispatcher Med) { Module mod = new Module(); bool yes = false; @@ -7195,7 +7195,7 @@ namespace SlaveMatrix return mod; } - public static Module ViolaBlessing(Med Med) + public static Module ViolaBlessing(ModeEventDispatcher Med) { Module mod = new Module(); int i = 0; @@ -7330,7 +7330,7 @@ namespace SlaveMatrix //buttons added by the other guy - public static void NewButtons(Med med) + public static void NewButtons(ModeEventDispatcher med) { if (Sta.SensesButton) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs index dcb60fe..1b160d8 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs @@ -11,7 +11,7 @@ namespace SlaveMatrix private List del = new List(); - public void Sound(Are Are, Vector2D p, string s, Font f, Color c, double d, bool b) + public void Sound(RenderArea Are, Vector2D p, string s, Font f, Color c, double d, bool b) { ParT pt = new ParT { @@ -26,11 +26,11 @@ namespace SlaveMatrix Brush = null, Hit = false }; - pt.SetStringRectOutline(Are.Unit, Are.GD); + pt.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); pt.BasePointBase = pt.OP.GetCenter(); Mot mot = new Mot(0.0, 1.0); string n = mot.GetHashCode().ToString(); - TextRenderingHint tr = Are.GD.TextRenderingHint; + TextRenderingHint tr = Are.DisplayGraphics.TextRenderingHint; mot.BaseSpeed = 0.1; mot.Runing = delegate(Mot m) { @@ -39,9 +39,9 @@ namespace SlaveMatrix pt.PositionCont = Oth.GetRandomVector() * 0.0025 * d; } pt.TextColor = Color.FromArgb((int)((double)(int)pt.TextColor.A * m.Value.Inverse()), pt.TextColor); - Are.GD.TextRenderingHint = TextRenderingHint.AntiAlias; + Are.DisplayGraphics.TextRenderingHint = TextRenderingHint.AntiAlias; Are.Draw(pt); - Are.GD.TextRenderingHint = tr; + Are.DisplayGraphics.TextRenderingHint = tr; }; mot.Reaing = delegate(Mot m) { @@ -49,7 +49,7 @@ namespace SlaveMatrix }; mot.Ending = delegate { - Are.GD.TextRenderingHint = tr; + Are.DisplayGraphics.TextRenderingHint = tr; pt.Dispose(); del.Add(n); }; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs index 95d79f8..e9be5bb 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs @@ -18,12 +18,12 @@ namespace SlaveMatrix percent = 47.0; } - Med med = new Med + ModeEventDispatcher med = new ModeEventDispatcher { UITitle = GameText.スレイブマトリクス, Unit = Sta.HighQuality ? 2203.0 : 1101.5, ShowFPS = Sta.ShowFPS, - Base = new Rect(4.0, 3.0, percent / 100.0), + Base = new Rectangle(4.0, 3.0, percent / 100.0), DisQuality = 1.0, HitAccuracy = 0.3 }; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs index b065d49..522e6e3 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs @@ -4421,8 +4421,8 @@ namespace SlaveMatrix public static void 腕_人左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B, double 上腕尺度XC, double 下腕尺度XC, double 手尺度XC, double 下腕尺度C, double 手尺度C, bool 上腕外線, bool 下腕外線, bool 下腕反転Y, int 手Yi, bool 前後) { 腕人 腕人2 = Cha.Bod.腕人左[n]; - 腕人2.肩.SetAngle0(); - 腕人2.肩.角度B = 肩角度B + u1; + 腕人2.Shoulder.SetAngle0(); + 腕人2.Shoulder.角度B = 肩角度B + u1; if (腕人2.上腕 != null) { 腕人2.上腕.肘部_外線 = 上腕外線; @@ -4504,14 +4504,14 @@ namespace SlaveMatrix } } } - 腕人2.肩.重複角度処理(); + 腕人2.Shoulder.重複角度処理(); } public static void 腕_人右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B, double 上腕尺度XC, double 下腕尺度XC, double 手尺度XC, double 下腕尺度C, double 手尺度C, bool 上腕外線, bool 下腕外線, bool 下腕反転Y, int 手Yi, bool 前後) { 腕人 腕人2 = Cha.Bod.腕人右[n]; - 腕人2.肩.SetAngle0(); - 腕人2.肩.角度B = 0.0 - 肩角度B + (0.0 - u1); + 腕人2.Shoulder.SetAngle0(); + 腕人2.Shoulder.角度B = 0.0 - 肩角度B + (0.0 - u1); if (腕人2.上腕 != null) { 腕人2.上腕.肘部_外線 = 上腕外線; @@ -4593,7 +4593,7 @@ namespace SlaveMatrix } } } - 腕人2.肩.重複角度処理(); + 腕人2.Shoulder.重複角度処理(); } public static void 腕_人_腕置き左(this Cha Cha, int n, double u1, double u2, double u3, double u4) @@ -4997,7 +4997,7 @@ namespace SlaveMatrix { foreach (腕人 item in Cha.Bod.腕人左) { - item.肩.角度C = a * RNG.XS.NextDouble(); + item.Shoulder.角度C = a * RNG.XS.NextDouble(); if (item.上腕 == null) { continue; @@ -5014,7 +5014,7 @@ namespace SlaveMatrix } foreach (腕人 item2 in Cha.Bod.腕人右) { - item2.肩.角度C = (0.0 - a) * RNG.XS.NextDouble(); + item2.Shoulder.角度C = (0.0 - a) * RNG.XS.NextDouble(); if (item2.上腕 == null) { continue; @@ -5034,10 +5034,10 @@ namespace SlaveMatrix public static void 腕_翼鳥左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 上腕展開, double 下腕展開, double 手展開, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B) { 腕翼鳥 腕翼鳥2 = Cha.Bod.腕翼鳥左[n]; - 腕翼鳥2.肩.SetAngle0(); + 腕翼鳥2.Shoulder.SetAngle0(); if (n == 0) { - 腕翼鳥2.肩.角度B = 肩角度B + u1; + 腕翼鳥2.Shoulder.角度B = 肩角度B + u1; } if (腕翼鳥2.上腕 != null) { @@ -5057,16 +5057,16 @@ namespace SlaveMatrix } } } - 腕翼鳥2.肩.重複角度処理(); + 腕翼鳥2.Shoulder.重複角度処理(); } public static void 腕_翼鳥右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 上腕展開, double 下腕展開, double 手展開, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B) { 腕翼鳥 腕翼鳥2 = Cha.Bod.腕翼鳥右[n]; - 腕翼鳥2.肩.SetAngle0(); + 腕翼鳥2.Shoulder.SetAngle0(); if (n == 0) { - 腕翼鳥2.肩.角度B = 0.0 - 肩角度B + (0.0 - u1); + 腕翼鳥2.Shoulder.角度B = 0.0 - 肩角度B + (0.0 - u1); } if (腕翼鳥2.上腕 != null) { @@ -5086,7 +5086,7 @@ namespace SlaveMatrix } } } - 腕翼鳥2.肩.重複角度処理(); + 腕翼鳥2.Shoulder.重複角度処理(); } public static void 腕_翼鳥_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4) @@ -5247,21 +5247,21 @@ namespace SlaveMatrix { foreach (腕翼鳥 item in Cha.Bod.腕翼鳥左) { - item.肩.角度C = a * RNG.XS.NextDouble(); + item.Shoulder.角度C = a * RNG.XS.NextDouble(); } foreach (腕翼鳥 item2 in Cha.Bod.腕翼鳥右) { - item2.肩.角度C = (0.0 - a) * RNG.XS.NextDouble(); + item2.Shoulder.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } public static void 腕_翼獣左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 上腕展開, double 下腕展開, double 手展開, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B) { 腕翼獣 腕翼獣2 = Cha.Bod.腕翼獣左[n]; - 腕翼獣2.肩.SetAngle0(); + 腕翼獣2.Shoulder.SetAngle0(); if (n == 0) { - 腕翼獣2.肩.角度B = 肩角度B + u1; + 腕翼獣2.Shoulder.角度B = 肩角度B + u1; } if (腕翼獣2.上腕 != null) { @@ -5281,16 +5281,16 @@ namespace SlaveMatrix } } } - 腕翼獣2.肩.重複角度処理(); + 腕翼獣2.Shoulder.重複角度処理(); } public static void 腕_翼獣右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 上腕展開, double 下腕展開, double 手展開, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B) { 腕翼獣 腕翼獣2 = Cha.Bod.腕翼獣右[n]; - 腕翼獣2.肩.SetAngle0(); + 腕翼獣2.Shoulder.SetAngle0(); if (n == 0) { - 腕翼獣2.肩.角度B = 0.0 - 肩角度B + (0.0 - u1); + 腕翼獣2.Shoulder.角度B = 0.0 - 肩角度B + (0.0 - u1); } if (腕翼獣2.上腕 != null) { @@ -5310,7 +5310,7 @@ namespace SlaveMatrix } } } - 腕翼獣2.肩.重複角度処理(); + 腕翼獣2.Shoulder.重複角度処理(); } public static void 腕_翼獣_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4) @@ -5439,18 +5439,18 @@ namespace SlaveMatrix { foreach (腕翼獣 item in Cha.Bod.腕翼獣左) { - item.肩.角度C = a * RNG.XS.NextDouble(); + item.Shoulder.角度C = a * RNG.XS.NextDouble(); } foreach (腕翼獣 item2 in Cha.Bod.腕翼獣右) { - item2.肩.角度C = (0.0 - a) * RNG.XS.NextDouble(); + item2.Shoulder.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } public static void 腕_獣左(this Cha Cha, int n, double u2, double u3, double u4, double 上腕角度B, double 下腕角度B, double 手角度B, double 上腕尺度XC, double 下腕尺度XC, double 手尺度XC) { 腕獣 腕獣2 = Cha.Bod.腕獣左[n]; - 腕獣2.肩.SetAngle0(); + 腕獣2.Shoulder.SetAngle0(); if (腕獣2.上腕 != null) { 腕獣2.上腕.SetAngle0(); @@ -5469,13 +5469,13 @@ namespace SlaveMatrix } } } - 腕獣2.肩.重複角度処理(); + 腕獣2.Shoulder.重複角度処理(); } public static void 腕_獣右(this Cha Cha, int n, double u2, double u3, double u4, double 上腕角度B, double 下腕角度B, double 手角度B, double 上腕尺度XC, double 下腕尺度XC, double 手尺度XC) { 腕獣 腕獣2 = Cha.Bod.腕獣右[n]; - 腕獣2.肩.SetAngle0(); + 腕獣2.Shoulder.SetAngle0(); if (腕獣2.上腕 != null) { 腕獣2.上腕.SetAngle0(); @@ -5494,7 +5494,7 @@ namespace SlaveMatrix } } } - 腕獣2.肩.重複角度処理(); + 腕獣2.Shoulder.重複角度処理(); } public static void 腕_獣_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4) @@ -5629,12 +5629,12 @@ namespace SlaveMatrix 脚人2.腿.SetAngle0(); 脚人2.腿.尺度YC = 腿尺度YC; 脚人2.腿.角度B += 腿角度B + u1; - if (脚人2.脚 != null) + if (脚人2.Leg != null) { - 脚人2.脚.SetAngle0(); - 脚人2.脚.角度B = 0.0 - 脚人2.腿.角度B; - 脚人2.脚.尺度YC = 脚尺度YC; - 脚人2.脚.角度B += 脚角度B + u2; + 脚人2.Leg.SetAngle0(); + 脚人2.Leg.角度B = 0.0 - 脚人2.腿.角度B; + 脚人2.Leg.尺度YC = 脚尺度YC; + 脚人2.Leg.角度B += 脚角度B + u2; if (脚人2.足 != null) { 脚人2.足.SetAngle0(); @@ -5651,12 +5651,12 @@ namespace SlaveMatrix 脚人2.腿.SetAngle0(); 脚人2.腿.尺度YC = 腿尺度YC; 脚人2.腿.角度B += 0.0 - 腿角度B + (0.0 - u1); - if (脚人2.脚 != null) + if (脚人2.Leg != null) { - 脚人2.脚.SetAngle0(); - 脚人2.脚.角度B = 0.0 - 脚人2.腿.角度B; - 脚人2.脚.尺度YC = 脚尺度YC; - 脚人2.脚.角度B += 0.0 - 脚角度B + (0.0 - u2); + 脚人2.Leg.SetAngle0(); + 脚人2.Leg.角度B = 0.0 - 脚人2.腿.角度B; + 脚人2.Leg.尺度YC = 脚尺度YC; + 脚人2.Leg.角度B += 0.0 - 脚角度B + (0.0 - u2); if (脚人2.足 != null) { 脚人2.足.SetAngle0(); @@ -5667,121 +5667,121 @@ namespace SlaveMatrix } } - public static void 脚_人_上開き左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上開き左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 3; Cha.脚_人左(n, u1, u2, u3, 0.0, 5.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_上開き右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上開き右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 3; Cha.脚_人右(n, u1, u2, u3, 0.0, 5.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_上閉じ左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上閉じ左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 4; Cha.脚_人左(n, u1, u2, u3, 3.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_上閉じ右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上閉じ右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 4; Cha.脚_人右(n, u1, u2, u3, 3.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_上閉じ内左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上閉じ内左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 4; Cha.脚_人左(n, u1, u2, u3, 3.0, 10.0, -15.0, 1.0, 1.0, 1.0); } - public static void 脚_人_上閉じ内右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上閉じ内右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 4; Cha.脚_人右(n, u1, u2, u3, 3.0, 10.0, -15.0, 1.0, 1.0, 1.0); } - public static void 脚_人_脱力左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_脱力左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 1; Cha.脚_人左(n, u1, u2, u3, 0.0, -5.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_脱力右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_脱力右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 1; Cha.脚_人右(n, u1, u2, u3, 0.0, -5.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_内股左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_内股左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 0; Cha.脚_人左(n, u1, u2, u3, -5.0, 15.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_内股右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_内股右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 0; Cha.脚_人右(n, u1, u2, u3, -5.0, 15.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_直立左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_直立左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 0; Cha.脚_人左(n, u1, u2, u3, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_直立右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_直立右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 0; Cha.脚_人右(n, u1, u2, u3, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_がに股左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_がに股左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 2; Cha.脚_人左(n, u1, u2, u3, 0.0, -10.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_がに股右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_がに股右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 2; Cha.脚_人右(n, u1, u2, u3, 0.0, -10.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_おっぴろげ左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_おっぴろげ左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 2; Cha.脚_人左(n, u1, u2, u3, 10.0, 10.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_おっぴろげ右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_おっぴろげ右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 2; Cha.脚_人右(n, u1, u2, u3, 10.0, 10.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_M字開脚左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_M字開脚左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 3; Cha.脚_人左(n, u1, u2, u3, -10.0, 10.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_M字開脚右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_M字開脚右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 3; Cha.脚_人右(n, u1, u2, u3, -10.0, 10.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_人_足コキ左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_足コキ左(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.左腿開きi = 2; Cha.脚_人左(n, u1, u2, u3, -23.0, -68.0, 47.0, 1.0, 1.0, 1.0); } - public static void 脚_人_足コキ右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_足コキ右(this Cha Cha, int n, double u1, double u2, double u3) { Cha.Bod.右腿開きi = 2; Cha.脚_人右(n, u1, u2, u3, -23.0, -68.0, 47.0, 1.0, 1.0, 1.0); @@ -5793,8 +5793,8 @@ namespace SlaveMatrix double u2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double u3 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); Cha.Bod.腿開きi = 2; - Cha.脚_人_足コキ左(n, u, u2, u3); - Cha.脚_人_足コキ右(n, u, u2, u3); + Cha.Leg_人_足コキ左(n, u, u2, u3); + Cha.Leg_人_足コキ右(n, u, u2, u3); } public static void 両脚人_0(this Cha Cha, int n, bool 同角, int i1, int i2) @@ -5848,34 +5848,34 @@ namespace SlaveMatrix switch (i) { case 0: - c.脚_人_上開き左(n, u1, u2, u3); + c.Leg_人_上開き左(n, u1, u2, u3); break; case 1: - c.脚_人_上閉じ左(n, u1, u2, u3); + c.Leg_人_上閉じ左(n, u1, u2, u3); break; case 2: - c.脚_人_上閉じ内左(n, u1, u2, u3); + c.Leg_人_上閉じ内左(n, u1, u2, u3); break; case 3: - c.脚_人_脱力左(n, u1, u2, u3); + c.Leg_人_脱力左(n, u1, u2, u3); break; case 4: - c.脚_人_内股左(n, u1, u2, u3); + c.Leg_人_内股左(n, u1, u2, u3); break; case 5: - c.脚_人_直立左(n, u1, u2, u3); + c.Leg_人_直立左(n, u1, u2, u3); break; case 6: - c.脚_人_がに股左(n, u1, u2, u3); + c.Leg_人_がに股左(n, u1, u2, u3); break; case 7: - c.脚_人_おっぴろげ左(n, u1, u2, u3); + c.Leg_人_おっぴろげ左(n, u1, u2, u3); break; case 8: - c.脚_人_M字開脚左(n, u1, u2, u3); + c.Leg_人_M字開脚左(n, u1, u2, u3); break; case 9: - c.脚_人_足コキ左(n, u1, u2, u3); + c.Leg_人_足コキ左(n, u1, u2, u3); break; } } @@ -5885,34 +5885,34 @@ namespace SlaveMatrix switch (i) { case 0: - c.脚_人_上開き右(n, u1, u2, u3); + c.Leg_人_上開き右(n, u1, u2, u3); break; case 1: - c.脚_人_上閉じ右(n, u1, u2, u3); + c.Leg_人_上閉じ右(n, u1, u2, u3); break; case 2: - c.脚_人_上閉じ内右(n, u1, u2, u3); + c.Leg_人_上閉じ内右(n, u1, u2, u3); break; case 3: - c.脚_人_脱力右(n, u1, u2, u3); + c.Leg_人_脱力右(n, u1, u2, u3); break; case 4: - c.脚_人_内股右(n, u1, u2, u3); + c.Leg_人_内股右(n, u1, u2, u3); break; case 5: - c.脚_人_直立右(n, u1, u2, u3); + c.Leg_人_直立右(n, u1, u2, u3); break; case 6: - c.脚_人_がに股右(n, u1, u2, u3); + c.Leg_人_がに股右(n, u1, u2, u3); break; case 7: - c.脚_人_おっぴろげ右(n, u1, u2, u3); + c.Leg_人_おっぴろげ右(n, u1, u2, u3); break; case 8: - c.脚_人_M字開脚右(n, u1, u2, u3); + c.Leg_人_M字開脚右(n, u1, u2, u3); break; case 9: - c.脚_人_足コキ右(n, u1, u2, u3); + c.Leg_人_足コキ右(n, u1, u2, u3); break; } } @@ -5922,9 +5922,9 @@ namespace SlaveMatrix foreach (脚人 item in Cha.Bod.脚人左) { item.腿.角度C = a * RNG.XS.NextDouble(); - if (item.脚 != null) + if (item.Leg != null) { - item.脚.角度C = a * RNG.XS.NextDouble(); + item.Leg.角度C = a * RNG.XS.NextDouble(); if (item.足 != null) { item.足.角度C = a * RNG.XS.NextDouble(); @@ -5934,9 +5934,9 @@ namespace SlaveMatrix foreach (脚人 item2 in Cha.Bod.脚人右) { item2.腿.角度C = (0.0 - a) * RNG.XS.NextDouble(); - if (item2.脚 != null) + if (item2.Leg != null) { - item2.脚.角度C = (0.0 - a) * RNG.XS.NextDouble(); + item2.Leg.角度C = (0.0 - a) * RNG.XS.NextDouble(); if (item2.足 != null) { item2.足.角度C = (0.0 - a) * RNG.XS.NextDouble(); @@ -5945,7 +5945,7 @@ namespace SlaveMatrix } } - public static void 脚_獣左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 腿角度B, double 脚角度B, double 足角度B, double 腿尺度YC, double 脚尺度YC, double 足尺度YC) + public static void Leg_獣左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 腿角度B, double 脚角度B, double 足角度B, double 腿尺度YC, double 脚尺度YC, double 足尺度YC) { 脚獣 脚獣2 = Cha.Bod.脚獣左[n]; if (脚獣2.腿 != null) @@ -5954,17 +5954,17 @@ namespace SlaveMatrix 脚獣2.腿.尺度YC = 腿尺度YC; 脚獣2.腿.角度B += 腿角度B + u1; } - if (脚獣2.脚 == null) + if (脚獣2.Leg == null) { return; } - 脚獣2.脚.SetAngle0(); - 脚獣2.脚.尺度YC = 脚尺度YC; + 脚獣2.Leg.SetAngle0(); + 脚獣2.Leg.尺度YC = 脚尺度YC; if (脚獣2.腿 == null) { - 脚獣2.脚.角度B += 145.0; + 脚獣2.Leg.角度B += 145.0; } - 脚獣2.脚.角度B += 脚角度B + u2; + 脚獣2.Leg.角度B += 脚角度B + u2; if (脚獣2.足 != null) { 脚獣2.足.SetAngle0(); @@ -5987,7 +5987,7 @@ namespace SlaveMatrix } } - public static void 脚_獣右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 腿角度B, double 脚角度B, double 足角度B, double 腿尺度YC, double 脚尺度YC, double 足尺度YC) + public static void Leg_獣右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 腿角度B, double 脚角度B, double 足角度B, double 腿尺度YC, double 脚尺度YC, double 足尺度YC) { 脚獣 脚獣2 = Cha.Bod.脚獣右[n]; if (脚獣2.腿 != null) @@ -5996,17 +5996,17 @@ namespace SlaveMatrix 脚獣2.腿.尺度YC = 腿尺度YC; 脚獣2.腿.角度B += 0.0 - 腿角度B + (0.0 - u1); } - if (脚獣2.脚 == null) + if (脚獣2.Leg == null) { return; } - 脚獣2.脚.SetAngle0(); - 脚獣2.脚.尺度YC = 脚尺度YC; + 脚獣2.Leg.SetAngle0(); + 脚獣2.Leg.尺度YC = 脚尺度YC; if (脚獣2.腿 == null) { - 脚獣2.脚.角度B += -145.0; + 脚獣2.Leg.角度B += -145.0; } - 脚獣2.脚.角度B += 0.0 - 脚角度B + (0.0 - u2); + 脚獣2.Leg.角度B += 0.0 - 脚角度B + (0.0 - u2); if (脚獣2.足 != null) { 脚獣2.足.SetAngle0(); @@ -6029,34 +6029,34 @@ namespace SlaveMatrix } } - public static void 脚_獣_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4) { - Cha.脚_獣左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); + Cha.Leg_獣左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_獣_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4) { - Cha.脚_獣右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); + Cha.Leg_獣右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void 脚_獣_萎縮左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_萎縮左(this Cha Cha, int n, double u1, double u2, double u3, double u4) { - Cha.脚_獣左(n, u1, u2, u3, u4, 12.0, -12.0, 12.0, 1.0, 1.0, 1.0); + Cha.Leg_獣左(n, u1, u2, u3, u4, 12.0, -12.0, 12.0, 1.0, 1.0, 1.0); } - public static void 脚_獣_萎縮右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_萎縮右(this Cha Cha, int n, double u1, double u2, double u3, double u4) { - Cha.脚_獣右(n, u1, u2, u3, u4, 12.0, -12.0, 12.0, 1.0, 1.0, 1.0); + Cha.Leg_獣右(n, u1, u2, u3, u4, 12.0, -12.0, 12.0, 1.0, 1.0, 1.0); } - public static void 脚_獣_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4) { - Cha.脚_獣左(n, u1, u2, u3, u4, -10.0, 10.0, -10.0, 1.0, 1.0, 1.0); + Cha.Leg_獣左(n, u1, u2, u3, u4, -10.0, 10.0, -10.0, 1.0, 1.0, 1.0); } - public static void 脚_獣_脱力右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_脱力右(this Cha Cha, int n, double u1, double u2, double u3, double u4) { - Cha.脚_獣右(n, u1, u2, u3, u4, -10.0, 10.0, -10.0, 1.0, 1.0, 1.0); + Cha.Leg_獣右(n, u1, u2, u3, u4, -10.0, 10.0, -10.0, 1.0, 1.0, 1.0); } public static void 両脚獣_0(this Cha Cha, int n, bool 同角, int i1, int i2) @@ -6092,13 +6092,13 @@ namespace SlaveMatrix switch (i) { case 0: - c.脚_獣_基本左(n, u1, u2, u3, u4); + c.Leg_獣_基本左(n, u1, u2, u3, u4); break; case 1: - c.脚_獣_萎縮左(n, u1, u2, u3, u4); + c.Leg_獣_萎縮左(n, u1, u2, u3, u4); break; case 2: - c.脚_獣_脱力左(n, u1, u2, u3, u4); + c.Leg_獣_脱力左(n, u1, u2, u3, u4); break; } } @@ -6108,13 +6108,13 @@ namespace SlaveMatrix switch (i) { case 0: - c.脚_獣_基本右(n, u1, u2, u3, u4); + c.Leg_獣_基本右(n, u1, u2, u3, u4); break; case 1: - c.脚_獣_萎縮右(n, u1, u2, u3, u4); + c.Leg_獣_萎縮右(n, u1, u2, u3, u4); break; case 2: - c.脚_獣_脱力右(n, u1, u2, u3, u4); + c.Leg_獣_脱力右(n, u1, u2, u3, u4); break; } } @@ -6127,9 +6127,9 @@ namespace SlaveMatrix { item.腿.角度C = a * RNG.XS.NextDouble(); } - if (item.脚 != null) + if (item.Leg != null) { - item.脚.角度C = a * RNG.XS.NextDouble(); + item.Leg.角度C = a * RNG.XS.NextDouble(); if (item.足 != null) { item.足.角度C = a * RNG.XS.NextDouble(); @@ -6142,9 +6142,9 @@ namespace SlaveMatrix { item2.腿.角度C = (0.0 - a) * RNG.XS.NextDouble(); } - if (item2.脚 != null) + if (item2.Leg != null) { - item2.脚.角度C = (0.0 - a) * RNG.XS.NextDouble(); + item2.Leg.角度C = (0.0 - a) * RNG.XS.NextDouble(); if (item2.足 != null) { item2.足.角度C = (0.0 - a) * RNG.XS.NextDouble(); @@ -9451,7 +9451,7 @@ namespace SlaveMatrix } c.Bod.腿左右前後 = RNG.XS.NextBool(); c.腕(); - c.脚(); + c.Leg(); c.翼(); c.鰭(); c.葉(); @@ -9484,7 +9484,7 @@ namespace SlaveMatrix c.腕(); break; case 1: - c.脚(); + c.Leg(); break; case 2: c.翼(); @@ -9611,7 +9611,7 @@ namespace SlaveMatrix } } - public static void 脚(this Cha c) + public static void Leg(this Cha c) { if (Player.UI.ペニス処理.足コキ.Run) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs b/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs index 133d2b8..039e81f 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs @@ -10,11 +10,11 @@ namespace SlaveMatrix { public static double 葉倍率 = 0.8; - public static void AdjustScale(this 腰D 腰, 頭D 頭) + public static void AdjustScale(this WaistD 腰, HeadD 頭) { foreach (EleD item in 頭.EnumEleD()) { - if (!(item is 後髪0D) && !(item is 後髪1D) && !(item is 横髪D) && !(item is 前髪D)) + if (!(item is 後髪0D) && !(item is BackHair1D) && !(item is SideHairD) && !(item is 前髪D)) { item.尺度B *= 0.98; } @@ -25,7 +25,7 @@ namespace SlaveMatrix } } - public static void SetLowerHair(this 腰D 腰) + public static void SetLowerHair(this WaistD 腰) { 腰肌D eleD = 腰.肌_接続.GetEleD<腰肌D>(); if (eleD.獣性_獣毛_表示) @@ -51,9 +51,9 @@ namespace SlaveMatrix public static ChaD GetHarpy() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -88,16 +88,16 @@ namespace SlaveMatrix シャープ = 下腕_鳥D2.シャープ }; 上腕_鳥D2.下腕接続(下腕_鳥D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_鳥D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); - 胸D2.背中接続(new 背中_羽D()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_鳥D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); + ChestD2.背中接続(new 背中_羽D()); 足_鳥D e = new 足_鳥D(); - 脚_鳥D 脚_鳥D2 = new 脚_鳥D(); - 脚_鳥D2.足接続(e); + Leg_鳥D Leg_鳥D2 = new Leg_鳥D(); + Leg_鳥D2.足接続(e); 腿_鳥D 腿_鳥D2 = new 腿_鳥D(); - 腿_鳥D2.脚接続(脚_鳥D2); + 腿_鳥D2.Leg接続(Leg_鳥D2); 腰D2.腿左接続(腿_鳥D2); 腰D2.腿右接続(腿_鳥D2.Get逆()); 腰D2.尾接続(new 尾_鳥D()); @@ -123,9 +123,9 @@ namespace SlaveMatrix public static ChaD Getアフール() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -142,15 +142,15 @@ namespace SlaveMatrix 下腕_蝙D2.手接続(e); 上腕_蝙D 上腕_蝙D2 = new 上腕_蝙D(); 上腕_蝙D2.下腕接続(下腕_蝙D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_蝙D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_蝙D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_獣D e2 = new 足_獣D(); - 脚_獣D 脚_獣D2 = new 脚_獣D(); - 脚_獣D2.足接続(e2); + Leg_獣D Leg_獣D2 = new Leg_獣D(); + Leg_獣D2.足接続(e2); 腿_獣D 腿_獣D2 = new 腿_獣D(); - 腿_獣D2.脚接続(脚_獣D2); + 腿_獣D2.Leg接続(Leg_獣D2); obj.腿左接続(腿_獣D2); obj.腿右接続(腿_獣D2.Get逆()); obj.尾接続(new 尾_悪D()); @@ -168,9 +168,9 @@ namespace SlaveMatrix public static ChaD Getハルピュイア() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -189,10 +189,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 手_蝙D e2 = new 手_蝙D { シャープ = 1.0 @@ -225,9 +225,9 @@ namespace SlaveMatrix public static ChaD GetPhoenix() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -248,16 +248,16 @@ namespace SlaveMatrix シャープ = 下腕_鳥D2.シャープ }; 上腕_鳥D2.下腕接続(下腕_鳥D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_鳥D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_鳥D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); obj2.背中接続(new 背中_羽D()); 足_鳥D e = new 足_鳥D(); - 脚_鳥D 脚_鳥D2 = new 脚_鳥D(); - 脚_鳥D2.足接続(e); + Leg_鳥D Leg_鳥D2 = new Leg_鳥D(); + Leg_鳥D2.足接続(e); 腿_鳥D 腿_鳥D2 = new 腿_鳥D(); - 腿_鳥D2.脚接続(脚_鳥D2); + 腿_鳥D2.Leg接続(Leg_鳥D2); obj.腿左接続(腿_鳥D2); obj.腿右接続(腿_鳥D2.Get逆()); obj.尾接続(new 鳳凰D()); @@ -285,9 +285,9 @@ namespace SlaveMatrix public static ChaD Getラミア() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -306,21 +306,21 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); 長物_蛇D2.くぱぁ = 1.0; 長物_蛇D2.ガード = false; - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 40; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD<舌_長D>("股舌表示", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -333,9 +333,9 @@ namespace SlaveMatrix public static ChaD Getシーラミア() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -347,10 +347,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); if (RNG.XS.NextBool()) @@ -358,13 +358,13 @@ namespace SlaveMatrix 長物_蛇D2.くぱぁ = 1.0; 長物_蛇D2.ガード = false; } - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 40; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ウD()); + 胴_蛇D2.Torso接続(new 尾_ウD()); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD<舌_長D>("股舌表示", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -376,9 +376,9 @@ namespace SlaveMatrix public static ChaD Getオノケンタウレ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -390,10 +390,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -410,10 +410,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_馬D e3 = new 足_馬D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_牛D()); @@ -431,9 +431,9 @@ namespace SlaveMatrix public static ChaD Getヒッポケンタウレ() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -452,10 +452,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -472,16 +472,16 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_馬D e3 = new 足_馬D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_馬D()); if (RNG.XS.NextBool()) { - 腰D2.EnumEleD().SetValuesD<頭D>("馬", RNG.XS.NextBool()); + 腰D2.EnumEleD().SetValuesD("馬", RNG.XS.NextBool()); } 腰D2.EnumEleD().SetValuesD<性器_人D>("表示", false); 腰D2.EnumEleD().SetValuesD<肛門_人D>("表示", false); @@ -497,9 +497,9 @@ namespace SlaveMatrix public static ChaD Getブケンタウレ() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -520,10 +520,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -540,10 +540,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_牛D e3 = new 足_牛D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_牛D()); @@ -567,9 +567,9 @@ namespace SlaveMatrix public static ChaD Getカプラケンタウレ() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -590,10 +590,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -614,10 +614,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_牛D e3 = new 足_牛D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_犬D()); @@ -637,9 +637,9 @@ namespace SlaveMatrix public static ChaD Getマーメイド() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -651,10 +651,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 長物_魚D 長物_魚D2 = new 長物_魚D(); obj.半身接続(長物_魚D2); 尾_魚D 尾_魚D2 = new 尾_魚D(); @@ -669,9 +669,9 @@ namespace SlaveMatrix public static ChaD Getドルフィンマーメイド() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -683,10 +683,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 長物_鯨D 長物_鯨D2 = new 長物_鯨D(); obj.半身接続(長物_鯨D2); 尾_鯨D 尾_鯨D2 = new 尾_鯨D(); @@ -701,9 +701,9 @@ namespace SlaveMatrix public static ChaD Getオールドマーメイド() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -715,10 +715,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 尾_魚D 尾_魚D2 = new 尾_魚D(); 尾_魚D2.尺度B = 1.2; 尾_魚D2.尺度YB = 1.5; @@ -737,9 +737,9 @@ namespace SlaveMatrix public static ChaD Getイクテュオケンタウレ(bool b) { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -751,10 +751,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); if (b) { 長物_魚D 長物_魚D2 = new 長物_魚D(); @@ -778,10 +778,10 @@ namespace SlaveMatrix EleD eleD = new 鰭_魚D(); 長物_蛇D2.左接続(eleD); 長物_蛇D2.右接続(eleD.Get逆()); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); 尾_ヘD 尾_ヘD2 = new 尾_ヘD(); - 胴_蛇D2.胴接続(尾_ヘD2); + 胴_蛇D2.Torso接続(尾_ヘD2); 尾_ヘD2.尾先接続(new 尾鰭_魚D()); } 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -793,9 +793,9 @@ namespace SlaveMatrix public static ChaD Getデルピヌスケンタウレ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -807,10 +807,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 長物_鯨D 長物_鯨D2 = new 長物_鯨D(); obj.半身接続(長物_鯨D2); EleD eleD = new 鰭_豚D(); @@ -829,9 +829,9 @@ namespace SlaveMatrix public static ChaD Getスキュラ() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -850,10 +850,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 多足_蛸D 多足_蛸D2 = new 多足_蛸D(); 腰D2.半身接続(多足_蛸D2); 触手_軟D 触手_軟D2 = new 触手_軟D @@ -894,9 +894,9 @@ namespace SlaveMatrix public static ChaD Getオールドスキュラ(bool b) { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -915,12 +915,12 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 触手_犬D 触手_犬D2 = new 触手_犬D(); - 触手_犬D2.SetValuesD("脚", b); + 触手_犬D2.SetValuesD("Leg", b); if (b) { 触手_犬D2.SetValuesD("鰭", RNG.XS.NextBool()); @@ -945,9 +945,9 @@ namespace SlaveMatrix public static ChaD Getカリュブディス() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -968,10 +968,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 長物_鯨D 長物_鯨D2 = new 長物_鯨D(); 腰D2.半身接続(長物_鯨D2); eleD2 = new 鰭_鯨D(); @@ -989,8 +989,8 @@ namespace SlaveMatrix 腰D2.EnumEleD().SetValuesD<手_人D>("悪", false); 腰D2.EnumEleD().SetValuesD("逆十字", false); 腰D2.EnumEleD().SetValuesD<上腕_人D>("淫", true); - 腰D2.EnumEleD().SetValuesD<腰D>("鱗", false); - 腰D2.EnumEleD().SetValuesD<腰D>("毛", false); + 腰D2.EnumEleD().SetValuesD("鱗", false); + 腰D2.EnumEleD().SetValuesD("毛", false); 腰D2.EnumEleD().SetValuesD<腰肌D>("鱗", false); 腰D2.EnumEleD().SetValuesD<腰肌D>("毛", false); 腰D2.EnumEleD().SetValuesD<手_人D>("配色", 配色指定.S0); @@ -1003,9 +1003,9 @@ namespace SlaveMatrix public static ChaD Getアラクネ(bool b) { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1024,10 +1024,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); if (RNG.XS.NextBool()) { EleD eleD = new 虫顎D(); @@ -1065,7 +1065,7 @@ namespace SlaveMatrix { 多足_蜘D2.EnumEleD().SetValuesD("柄", true); } - 腰D2.EnumEleD().SetValuesD<頭D>("蜘", 頭D2.頬左_接続.IsEleD<虫顎D>() || RNG.XS.NextBool()); + 腰D2.EnumEleD().SetValuesD("蜘", 頭D2.頬左_接続.IsEleD<虫顎D>() || RNG.XS.NextBool()); 腰D2.EnumEleD().SetValuesD<頬肌D>("蜘", RNG.XS.NextBool()); 腰D2.EnumEleD().SetValuesD<胸肌D>("蜘", RNG.XS.NextBool()); if (頭D2.頬左_接続.IsEleD<虫顎D>()) @@ -1082,9 +1082,9 @@ namespace SlaveMatrix public static ChaD Getギルタブリル() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1109,10 +1109,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 多足_蠍D 多足_蠍D2 = new 多足_蠍D(); 腰D2.半身接続(多足_蠍D2); 多足_蠍D2.前腹_腹節3_節線_表示 = RNG.XS.NextBool(); @@ -1148,7 +1148,7 @@ namespace SlaveMatrix 腰D2.EnumEleD().SetValuesD<上腕_人D>("淫", false); 腰D2.EnumEleD().SetValuesD<上腕_人D>("植", false); 腰D2.EnumEleD().SetValuesD<頬肌D>("タトゥ", false); - 腰D2.EnumEleD().SetValuesD<胸D>("植", false); + 腰D2.EnumEleD().SetValuesD("植", false); 腰D2.EnumEleD().SetValuesD<手_人D>("悪", false); if (RNG.XS.NextBool()) { @@ -1158,7 +1158,7 @@ namespace SlaveMatrix { 多足_蠍D2.EnumEleD().SetValuesD("柄", true); } - 腰D2.EnumEleD().SetValuesD<頭D>("蜘", 頭D2.頬左_接続.IsEleD<虫顎D>() || RNG.XS.NextBool()); + 腰D2.EnumEleD().SetValuesD("蜘", 頭D2.頬左_接続.IsEleD<虫顎D>() || RNG.XS.NextBool()); 腰D2.EnumEleD().SetValuesD<頬肌D>("蜘", RNG.XS.NextBool()); if (頭D2.頬左_接続.IsEleD<虫顎D>()) { @@ -1174,10 +1174,10 @@ namespace SlaveMatrix public static ChaD Getギルタブルル() { - 腰D obj = Uni.腰(); - 胴D 胴D2 = obj.Set胴(); - 胸D 胸D2 = 胴D2.Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + TorsoD 胴D2 = obj.Set胴(); + ChestD ChestD2 = 胴D2.SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1196,10 +1196,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e2); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); if (RNG.XS.NextBool()) { 手_鳥D e3 = new 手_鳥D(); @@ -1207,14 +1207,14 @@ namespace SlaveMatrix 下腕_鳥D2.手接続(e3); 上腕_鳥D 上腕_鳥D2 = new 上腕_鳥D(); 上腕_鳥D2.下腕接続(下腕_鳥D2); - 胸D2.翼上左接続(上腕_鳥D2); - 胸D2.翼上右接続(上腕_鳥D2.Get逆()); + ChestD2.翼上左接続(上腕_鳥D2); + ChestD2.翼上右接続(上腕_鳥D2.Get逆()); } 足_鳥D e4 = new 足_鳥D(); - 脚_鳥D 脚_鳥D2 = new 脚_鳥D(); - 脚_鳥D2.足接続(e4); + Leg_鳥D Leg_鳥D2 = new Leg_鳥D(); + Leg_鳥D2.足接続(e4); 腿_鳥D 腿_鳥D2 = new 腿_鳥D(); - 腿_鳥D2.脚接続(脚_鳥D2); + 腿_鳥D2.Leg接続(Leg_鳥D2); obj.腿左接続(腿_鳥D2); obj.腿右接続(腿_鳥D2.Get逆()); obj.尾接続(new 尾_鳥D()); @@ -1225,11 +1225,11 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("タトゥ", true); obj.EnumEleD().SetValuesD("ハート", false); obj.EnumEleD().SetValuesD<手_人D>("タトゥ", false); - obj.EnumEleD().SetValuesD<胸D>("植", false); + obj.EnumEleD().SetValuesD("植", false); obj.EnumEleD().SetValuesD<胸肌D>("植", false); - obj.EnumEleD().SetValuesD<頭D>("逆十字", false); - obj.EnumEleD().SetValuesD<頭D>("顎下", true); - obj.EnumEleD().SetValuesD<腰D>("獣", true); + obj.EnumEleD().SetValuesD("逆十字", false); + obj.EnumEleD().SetValuesD("顎下", true); + obj.EnumEleD().SetValuesD("獣", true); obj.EnumEleD().SetValuesD<腰肌D>("獣", true); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); obj.EnumEleD().SetValuesD("身長", 頭D2.目高); @@ -1241,10 +1241,10 @@ namespace SlaveMatrix public static ChaD Getアルラウネ() { - 腰D obj = Uni.腰(); - 胴D obj2 = obj.Set胴(); - 胸D obj3 = obj2.Set胸R(); - 頭D 頭D2 = obj3.Set首().Set頭R(); + WaistD obj = Uni.腰(); + TorsoD obj2 = obj.Set胴(); + ChestD obj3 = obj2.SetChestR(); + HeadD 頭D2 = obj3.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1256,10 +1256,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj3.肩左接続(肩D2); - obj3.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj3.肩左接続(ShoulderD2); + obj3.肩右接続(ShoulderD2.Get逆()); 植D 植D2 = new 植D(); EleD eleD2 = SlaveMatrix.GameClasses._Con.Get花R(右: false); 植D2.花接続(eleD2); @@ -1350,10 +1350,10 @@ namespace SlaveMatrix public static ChaD Getサキュバス() { - 腰D 腰D2 = Uni.腰(); - 胴D 胴D2 = 腰D2.Set胴(); - 胸D 胸D2 = 胴D2.Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + TorsoD 胴D2 = 腰D2.Set胴(); + ChestD ChestD2 = 胴D2.SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1390,10 +1390,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 手_蝙D e2 = new 手_蝙D { シャープ = 1.0 @@ -1405,15 +1405,15 @@ namespace SlaveMatrix 胴D2.翼左接続(上腕_蝙D2); 胴D2.翼右接続(上腕_蝙D2.Get逆()); 足_人D e3 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e3); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e3); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); 腰D2.尾接続(new 尾_淫D()); 腰D2.EnumEleD().SetValuesD("淫", true); - 腰D2.EnumEleD().SetValuesD<胸D>("植", true); + 腰D2.EnumEleD().SetValuesD("植", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); 腰D2.EnumEleD().SetValuesD("身長", 頭D2.目高); 腰D2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); @@ -1427,9 +1427,9 @@ namespace SlaveMatrix public static ChaD Getデビル() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1461,10 +1461,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); if (RNG.XS.NextBool()) { 手_蝙D e2 = new 手_蝙D @@ -1475,8 +1475,8 @@ namespace SlaveMatrix 下腕_蝙D2.手接続(e2); 上腕_蝙D 上腕_蝙D2 = new 上腕_蝙D(); 上腕_蝙D2.下腕接続(下腕_蝙D2); - 胸D2.翼上左接続(上腕_蝙D2); - 胸D2.翼上右接続(上腕_蝙D2.Get逆()); + ChestD2.翼上左接続(上腕_蝙D2); + ChestD2.翼上右接続(上腕_蝙D2.Get逆()); } else { @@ -1485,26 +1485,26 @@ namespace SlaveMatrix 下腕_鳥D2.手接続(e3); 上腕_鳥D 上腕_鳥D2 = new 上腕_鳥D(); 上腕_鳥D2.下腕接続(下腕_鳥D2); - 胸D2.翼上左接続(上腕_鳥D2); - 胸D2.翼上右接続(上腕_鳥D2.Get逆()); + ChestD2.翼上左接続(上腕_鳥D2); + ChestD2.翼上右接続(上腕_鳥D2.Get逆()); } if (RNG.XS.NextBool()) { 足_人D e4 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e4); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e4); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); } else { 足_牛D e5 = new 足_牛D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e5); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e5); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 腰D2.腿左接続(腿_蹄D2); 腰D2.腿右接続(腿_蹄D2.Get逆()); 腰D2.EnumEleD().SetValuesD<腰肌D>("獣性", true); @@ -1529,9 +1529,9 @@ namespace SlaveMatrix public static ChaD Getエンジェル(bool b) { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1544,17 +1544,17 @@ namespace SlaveMatrix } else { - 胸D2.背中接続(new 背中_光D()); + ChestD2.背中接続(new 背中_光D()); } 手_人D e = new 手_人D(); 下腕_人D 下腕_人D2 = new 下腕_人D(); 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 手_鳥D 手_鳥D2 = new 手_鳥D { シャープ = RNG.XS.NextDouble() @@ -1571,14 +1571,14 @@ namespace SlaveMatrix 上腕_鳥D2.下腕接続(下腕_鳥D2); for (int i = 0; i < RNG.XS.Next(2) + 1; i++) { - 胸D2.翼上左接続(上腕_鳥D2.Copy()); - 胸D2.翼上右接続(上腕_鳥D2.Get逆()); + ChestD2.翼上左接続(上腕_鳥D2.Copy()); + ChestD2.翼上右接続(上腕_鳥D2.Get逆()); } 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -1591,9 +1591,9 @@ namespace SlaveMatrix public static ChaD Getウェアキャット() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -1607,15 +1607,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.尾接続(new 尾_猫D()); @@ -1630,7 +1630,7 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD<口_通常D>("牙", true); obj.EnumEleD().SetValuesD<下腕_人D>("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD<手_人D>("配色指定", 配色指定.B0); - obj.EnumEleD().SetValuesD<脚_人D>("配色指定", 配色指定.B0); + obj.EnumEleD().SetValuesD("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD<足_人D>("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); obj.EnumEleD().SetValuesD("身長", 頭D2.目高); @@ -1642,9 +1642,9 @@ namespace SlaveMatrix public static ChaD Getウェアフォックス() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -1661,15 +1661,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.尾接続(new 尾_狐D()); @@ -1683,7 +1683,7 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD<口_通常D>("牙", true); obj.EnumEleD().SetValuesD<下腕_人D>("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD<手_人D>("配色指定", 配色指定.B0); - obj.EnumEleD().SetValuesD<脚_人D>("配色指定", 配色指定.B0); + obj.EnumEleD().SetValuesD("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD<足_人D>("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); obj.EnumEleD().SetValuesD("身長", 頭D2.目高); @@ -1695,9 +1695,9 @@ namespace SlaveMatrix public static ChaD Getウェアウルフ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -1711,15 +1711,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.尾接続(new 尾_犬D()); @@ -1728,7 +1728,7 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD<口_通常D>("牙", true); obj.EnumEleD().SetValuesD<下腕_人D>("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD<手_人D>("配色指定", 配色指定.B0); - obj.EnumEleD().SetValuesD<脚_人D>("配色指定", 配色指定.B0); + obj.EnumEleD().SetValuesD("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD<足_人D>("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); obj.EnumEleD().SetValuesD("身長", 頭D2.目高); @@ -1740,9 +1740,9 @@ namespace SlaveMatrix public static ChaD Getリザードマン() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1754,15 +1754,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); EleD eleD; @@ -1784,7 +1784,7 @@ namespace SlaveMatrix { f.竜性 = false; }); - 腰D2.EnumEleD().SetValuesD<脚_人D>("棘", false); + 腰D2.EnumEleD().SetValuesD("棘", false); 腰D2.EnumEleD().SetValuesD<双目D>("猫目", true); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -1797,9 +1797,9 @@ namespace SlaveMatrix public static ChaD Getドラゴニュート() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1829,10 +1829,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e2); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); if (RNG.XS.NextBool()) { if (RNG.XS.NextBool()) @@ -1845,8 +1845,8 @@ namespace SlaveMatrix 下腕_蝙D2.手接続(e3); 上腕_蝙D 上腕_蝙D2 = new 上腕_蝙D(); 上腕_蝙D2.下腕接続(下腕_蝙D2); - 胸D2.翼上左接続(上腕_蝙D2); - 胸D2.翼上右接続(上腕_蝙D2.Get逆()); + ChestD2.翼上左接続(上腕_蝙D2); + ChestD2.翼上右接続(上腕_蝙D2.Get逆()); 頭D2.Set耳長(); } else @@ -1865,8 +1865,8 @@ namespace SlaveMatrix シャープ = 下腕_鳥D2.シャープ }; 上腕_鳥D2.下腕接続(下腕_鳥D2); - 胸D2.翼上左接続(上腕_鳥D2); - 胸D2.翼上右接続(上腕_鳥D2.Get逆()); + ChestD2.翼上左接続(上腕_鳥D2); + ChestD2.翼上右接続(上腕_鳥D2.Get逆()); 頭D2.Set耳獣(); } } @@ -1875,10 +1875,10 @@ namespace SlaveMatrix 頭D2.Set耳尖(); } 足_人D e4 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e4); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e4); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); switch (RNG.XS.Next(3)) @@ -1910,9 +1910,9 @@ namespace SlaveMatrix public static ChaD Getドラゴン() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -1942,10 +1942,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e2); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -1985,10 +1985,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_竜D e6 = new 足_竜D(); - 脚_竜D 脚_竜D2 = new 脚_竜D(); - 脚_竜D2.足接続(e6); + Leg_竜D Leg_竜D2 = new Leg_竜D(); + Leg_竜D2.足接続(e6); 腿_竜D 腿_竜D2 = new 腿_竜D(); - 腿_竜D2.脚接続(脚_竜D2); + 腿_竜D2.Leg接続(Leg_竜D2); 四足腰D2.腿左接続(腿_竜D2); 四足腰D2.腿右接続(腿_竜D2.Get逆()); switch (RNG.XS.Next(5)) @@ -2025,9 +2025,9 @@ namespace SlaveMatrix public static ChaD Getドラコケンタウレ() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -2057,10 +2057,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e2); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -2078,10 +2078,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_竜D e4 = new 足_竜D(); - 脚_竜D 脚_竜D2 = new 脚_竜D(); - 脚_竜D2.足接続(e4); + Leg_竜D Leg_竜D2 = new Leg_竜D(); + Leg_竜D2.足接続(e4); 腿_竜D 腿_竜D2 = new 腿_竜D(); - 腿_竜D2.脚接続(脚_竜D2); + 腿_竜D2.Leg接続(Leg_竜D2); 四足腰D2.腿左接続(腿_竜D2); 四足腰D2.腿右接続(腿_竜D2.Get逆()); switch (RNG.XS.Next(5)) @@ -2118,9 +2118,9 @@ namespace SlaveMatrix public static ChaD Getワイバーン() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -2159,10 +2159,10 @@ namespace SlaveMatrix 尺度B = 1.1 }; 上腕_蝙D2.下腕接続(下腕_蝙D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_蝙D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_蝙D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 頭D2.Set耳長(); } else @@ -2182,18 +2182,18 @@ namespace SlaveMatrix 尺度B = 1.1 }; 上腕_鳥D2.下腕接続(下腕_鳥D2); - 肩D 肩D3 = new 肩D(); - 肩D3.上腕接続(上腕_鳥D2); - 胸D2.肩左接続(肩D3); - 胸D2.肩右接続(肩D3.Get逆()); - 胸D2.背中接続(new 背中_羽D()); + ShoulderD ShoulderD3 = new ShoulderD(); + ShoulderD3.上腕接続(上腕_鳥D2); + ChestD2.肩左接続(ShoulderD3); + ChestD2.肩右接続(ShoulderD3.Get逆()); + ChestD2.背中接続(new 背中_羽D()); 頭D2.Set耳獣(); } 足_鳥D e4 = new 足_鳥D(); - 脚_竜D 脚_竜D2 = new 脚_竜D(); - 脚_竜D2.足接続(e4); + Leg_竜D Leg_竜D2 = new Leg_竜D(); + Leg_竜D2.足接続(e4); 腿_竜D 腿_竜D2 = new 腿_竜D(); - 腿_竜D2.脚接続(脚_竜D2); + 腿_竜D2.Leg接続(Leg_竜D2); 腰D2.腿左接続(腿_竜D2); 腰D2.腿右接続(腿_竜D2.Get逆()); 腰D2.尾接続(RNG.XS.Next(5) switch @@ -2226,8 +2226,8 @@ namespace SlaveMatrix public static ChaD Getワーム() { - 腰D 腰D2 = Uni.腰(); - 頭D 頭D2 = 腰D2.Set胴().Set胸R().Set首() + WaistD 腰D2 = Uni.腰(); + HeadD 頭D2 = 腰D2.Set胴().SetChestR().Set首() .Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); @@ -2254,13 +2254,13 @@ namespace SlaveMatrix eleD.頭頂右接続(e.Get逆()); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 40; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD<双目D>("猫目", RNG.XS.NextBool()); @@ -2275,9 +2275,9 @@ namespace SlaveMatrix public static ChaD Getサンドワーム() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -2317,28 +2317,28 @@ namespace SlaveMatrix 下腕_人D 下腕_人D2 = new 下腕_人D(); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); 下腕_人D2.虫鎌接続(new 虫鎌D()); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); - 胸D2.肩左接続(肩D2.Copy()); - 胸D2.肩右接続(肩D2.Get逆()); - 胸D2.肩左接続(肩D2.Copy()); - 胸D2.肩右接続(肩D2.Get逆()); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); + ChestD2.肩左接続(ShoulderD2.Copy()); + ChestD2.肩右接続(ShoulderD2.Get逆()); + ChestD2.肩左接続(ShoulderD2.Copy()); + ChestD2.肩右接続(ShoulderD2.Get逆()); 長物_蟲D 長物_蟲D2 = new 長物_蟲D(); 腰D2.半身接続(長物_蟲D2); - 胴_蟲D 胴_蟲D2 = new 胴_蟲D(); + Torso_蟲D 胴_蟲D2 = new Torso_蟲D(); 長物_蟲D2.胴接続(胴_蟲D2); for (int i = 0; i < 21; i++) { - 胴_蟲D2.胴接続(胴_蟲D2 = new 胴_蟲D()); + 胴_蟲D2.Torso接続(胴_蟲D2 = new Torso_蟲D()); } 尾_蟲D 尾_蟲D2 = new 尾_蟲D(); 節D 節D2 = (RNG.XS.NextBool() ? ((節尾D)new 節尾_曳航D()) : ((節尾D)new 節尾_鋏D())); 尾_蟲D2.尾左接続(節D2); 尾_蟲D2.尾右接続(節D2.Get逆()); - 胴_蟲D2.胴接続(尾_蟲D2); + 胴_蟲D2.Torso接続(尾_蟲D2); 腰D2.EnumEleD().SetValuesD("虫性", true); 腰D2.EnumEleD().SetValuesD("配色", 配色指定.C0); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -2350,9 +2350,9 @@ namespace SlaveMatrix public static ChaD Getリュウ() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -2369,36 +2369,36 @@ namespace SlaveMatrix { 尺度B = 1.1 }; - 脚_竜D 脚_竜D2 = new 脚_竜D + Leg_竜D Leg_竜D2 = new Leg_竜D { 尺度B = 1.1 }; - 脚_竜D2.足接続(e); + Leg_竜D2.足接続(e); 四足脇D 四足脇D2 = new 四足脇D { 尺度B = 1.1 }; - 四足脇D2.上腕接続(脚_竜D2); + 四足脇D2.上腕接続(Leg_竜D2); 腰D2.翼左接続(四足脇D2); 腰D2.翼右接続(四足脇D2.Get逆()); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 50; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } e = new 足_鳥D(); - 脚_竜D2 = new 脚_竜D(); - 脚_竜D2.足接続(e); + Leg_竜D2 = new Leg_竜D(); + Leg_竜D2.足接続(e); 腿_竜D 腿_竜D2 = new 腿_竜D(); - 腿_竜D2.脚接続(脚_竜D2); + 腿_竜D2.Leg接続(Leg_竜D2); 胴_蛇D2.左接続(腿_竜D2); 胴_蛇D2.右接続(腿_竜D2.Get逆()); 尾_ヘD 尾_ヘD2 = new 尾_ヘD(); 尾_ヘD2.尾先接続(new 尾鰭_魚D()); - 胴_蛇D2.胴接続(尾_ヘD2); - 腰D2.EnumEleD().SetValuesD<頭D>("馬", true); - 胸D2.肌_接続.SetValuesD<胸毛D>("表示", true); + 胴_蛇D2.Torso接続(尾_ヘD2); + 腰D2.EnumEleD().SetValuesD("馬", true); + ChestD2.肌_接続.SetValuesD<胸毛D>("表示", true); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD<双目D>("猫目", true); @@ -2412,9 +2412,9 @@ namespace SlaveMatrix public static ChaD Getスライム() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set口人(); @@ -2425,10 +2425,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 腿_人D 腿_人D2 = new 腿_人D { スライム = true @@ -2455,9 +2455,9 @@ namespace SlaveMatrix public static ChaD Getフェアリー(bool b1, bool b2) { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -2506,24 +2506,24 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); if (b1) { EleD eleD3 = new 前翅_羽D { 尺度B = 0.9 }; - 胸D2.翼上左接続(eleD3); - 胸D2.翼上右接続(eleD3.Get逆()); + ChestD2.翼上左接続(eleD3); + ChestD2.翼上右接続(eleD3.Get逆()); eleD3 = new 後翅_羽D { 尺度B = 0.9 }; - 胸D2.翼下左接続(eleD3); - 胸D2.翼下右接続(eleD3.Get逆()); + ChestD2.翼下左接続(eleD3); + ChestD2.翼下右接続(eleD3.Get逆()); } else { @@ -2532,15 +2532,15 @@ namespace SlaveMatrix 尺度B = 0.9, 水青 = b2 }; - 胸D2.翼上左接続(eleD3); - 胸D2.翼上右接続(eleD3.Get逆()); + ChestD2.翼上左接続(eleD3); + ChestD2.翼上右接続(eleD3.Get逆()); eleD3 = new 後翅_蝶D { 尺度B = 0.9, 水青 = b2 }; - 胸D2.翼下左接続(eleD3); - 胸D2.翼下右接続(eleD3.Get逆()); + ChestD2.翼下左接続(eleD3); + ChestD2.翼下右接続(eleD3.Get逆()); } if (RNG.XS.NextBool()) { @@ -2565,10 +2565,10 @@ namespace SlaveMatrix } } 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); 腰D2.EnumEleD().SetValuesD("肥大", 0.0); @@ -2581,10 +2581,10 @@ namespace SlaveMatrix public static ChaD Getオーグリス(bool b) { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 首D 首D2 = obj.Set首(); - 頭D 頭D2; + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + NeckD 首D2 = obj.Set首(); + HeadD 頭D2; if (b) { 頭D2 = 首D2.Set頭R1(); @@ -2616,15 +2616,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); if (RNG.XS.NextBool()) @@ -2635,11 +2635,11 @@ namespace SlaveMatrix 腰D2.EnumEleD().SetValuesD("淫", true); 腰D2.EnumEleD().SetValuesD("ハート", false); 腰D2.SetValuesD("悪", true); - 腰D2.EnumEleD().SetValuesD<胸D>("植", true); - 腰D2.EnumEleD().SetValuesD<胴D>("植", true); - 腰D2.EnumEleD().SetValuesD<胸D>("タトゥ2", false); + 腰D2.EnumEleD().SetValuesD("植", true); + 腰D2.EnumEleD().SetValuesD("植", true); + 腰D2.EnumEleD().SetValuesD("タトゥ2", false); 腰D2.EnumEleD().SetValuesD<下腕_人D>("手首", false); - 腰D2.EnumEleD().SetValuesD<脚_人D>("足首", false); + 腰D2.EnumEleD().SetValuesD("足首", false); } 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -2652,9 +2652,9 @@ namespace SlaveMatrix public static ChaD Getサイクロプス() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R1(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R1(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set単目R(); 頭D2.Set鼻人(); @@ -2673,15 +2673,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -2694,9 +2694,9 @@ namespace SlaveMatrix public static ChaD Getエイリアン() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set目宇R(); 頭D2.Set鼻人(); @@ -2711,11 +2711,11 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); 下腕_人D2.虫鎌接続(new 虫鎌D()); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 多足_蛸D 多足_蛸D2 = new 多足_蛸D(); 腰D2.半身接続(多足_蛸D2); 触手_軟D 触手_軟D2 = new 触手_軟D @@ -2736,8 +2736,8 @@ namespace SlaveMatrix 多足_蛸D2.軟体外右接続(触手_軟D3.Get逆()); 腰D2.EnumEleD().SetValuesD("コア1", true); 腰D2.EnumEleD().SetValuesD("虫性", true); - 腰D2.EnumEleD().SetValuesD<頭D>("虫性", false); - 腰D2.EnumEleD().SetValuesD<胸D>("器官", false); + 腰D2.EnumEleD().SetValuesD("虫性", false); + 腰D2.EnumEleD().SetValuesD("器官", false); 腰D2.EnumEleD().SetValuesD<手_人D>("宇手", true); if (RNG.XS.NextBool()) { @@ -2753,9 +2753,9 @@ namespace SlaveMatrix public static ChaD Getクラーケン() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -2767,10 +2767,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 多足_蛸D 多足_蛸D2 = new 多足_蛸D(); 腰D2.半身接続(多足_蛸D2); 触手_軟D 触手_軟D2 = new 触手_軟D @@ -2808,9 +2808,9 @@ namespace SlaveMatrix public static ChaD Getセイレーン(int i) { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -2828,10 +2828,10 @@ namespace SlaveMatrix 下腕_人D4.手接続(e4); 上腕_人D 上腕_人D4 = new 上腕_人D(); 上腕_人D4.下腕接続(下腕_人D4); - 肩D 肩D4 = new 肩D(); - 肩D4.上腕接続(上腕_人D4); - 胸D2.肩左接続(肩D4); - 胸D2.肩右接続(肩D4.Get逆()); + ShoulderD ShoulderD4 = new ShoulderD(); + ShoulderD4.上腕接続(上腕_人D4); + ChestD2.肩左接続(ShoulderD4); + ChestD2.肩右接続(ShoulderD4.Get逆()); } 手_鳥D e5 = new 手_鳥D { @@ -2847,13 +2847,13 @@ namespace SlaveMatrix シャープ = 1.0 }; 上腕_鳥D3.下腕接続(下腕_鳥D3); - 胸D2.翼上左接続(上腕_鳥D3); - 胸D2.翼上右接続(上腕_鳥D3.Get逆()); + ChestD2.翼上左接続(上腕_鳥D3); + ChestD2.翼上右接続(上腕_鳥D3.Get逆()); 足_鳥D e6 = new 足_鳥D(); - 脚_鳥D 脚_鳥D3 = new 脚_鳥D(); - 脚_鳥D3.足接続(e6); + Leg_鳥D Leg_鳥D3 = new Leg_鳥D(); + Leg_鳥D3.足接続(e6); 腿_鳥D 腿_鳥D3 = new 腿_鳥D(); - 腿_鳥D3.脚接続(脚_鳥D3); + 腿_鳥D3.Leg接続(Leg_鳥D3); 腰D2.腿左接続(腿_鳥D3); 腰D2.腿右接続(腿_鳥D3.Get逆()); 腰D2.EnumEleD().SetValuesD<腰肌D>("獣毛", true); @@ -2867,10 +2867,10 @@ namespace SlaveMatrix 下腕_人D3.手接続(e3); 上腕_人D 上腕_人D3 = new 上腕_人D(); 上腕_人D3.下腕接続(下腕_人D3); - 肩D 肩D3 = new 肩D(); - 肩D3.上腕接続(上腕_人D3); - 胸D2.肩左接続(肩D3); - 胸D2.肩右接続(肩D3.Get逆()); + ShoulderD ShoulderD3 = new ShoulderD(); + ShoulderD3.上腕接続(上腕_人D3); + ChestD2.肩左接続(ShoulderD3); + ChestD2.肩右接続(ShoulderD3.Get逆()); 尾_魚D 尾_魚D2 = new 尾_魚D { 尺度B = 1.2, @@ -2882,7 +2882,7 @@ namespace SlaveMatrix 尾_魚D2.尾先接続(new 尾鰭_魚D()); 腰D2.腿左接続(尾_魚D2); 腰D2.腿右接続(尾_魚D2.Get逆()); - 腰D2.EnumEleD().SetValuesD<腰D>("鱗", true); + 腰D2.EnumEleD().SetValuesD("鱗", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("鱗", true); break; } @@ -2894,10 +2894,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -2918,10 +2918,10 @@ namespace SlaveMatrix 四足胸D2.翼上左接続(上腕_鳥D2); 四足胸D2.翼上右接続(上腕_鳥D2.Get逆()); 足_鳥D e2 = new 足_鳥D(); - 脚_鳥D 脚_鳥D2 = new 脚_鳥D(); - 脚_鳥D2.足接続(e2); + Leg_鳥D Leg_鳥D2 = new Leg_鳥D(); + Leg_鳥D2.足接続(e2); 腿_鳥D 腿_鳥D2 = new 腿_鳥D(); - 腿_鳥D2.脚接続(脚_鳥D2); + 腿_鳥D2.Leg接続(Leg_鳥D2); 四足腰D2.腿左接続(腿_鳥D2); 四足腰D2.腿右接続(腿_鳥D2.Get逆()); 四足腰D2.尾接続(new 尾_鳥D()); @@ -2942,9 +2942,9 @@ namespace SlaveMatrix public static ChaD Getユニコーン() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R1(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R1(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -2957,10 +2957,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -2977,14 +2977,14 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_馬D e3 = new 足_馬D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_馬D()); - obj.EnumEleD().SetValuesD<頭D>("馬", RNG.XS.NextBool()); + obj.EnumEleD().SetValuesD("馬", RNG.XS.NextBool()); obj.EnumEleD().SetValuesD<性器_人D>("表示", false); obj.EnumEleD().SetValuesD<肛門_人D>("表示", false); obj.EnumEleD().SetValuesD<腰肌D>("獣性", true); @@ -2999,9 +2999,9 @@ namespace SlaveMatrix public static ChaD Getモノケロス() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R1(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R1(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3017,10 +3017,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3041,18 +3041,18 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_牛D e3 = new 足_牛D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_牛D()); - obj.EnumEleD().SetValuesD<頭D>("馬", true); + obj.EnumEleD().SetValuesD("馬", true); obj.EnumEleD().SetValuesD("胸毛", true); obj.EnumEleD().SetValuesD<頬肌D>("獣毛", true); - obj.EnumEleD().SetValuesD<胸D>("獣毛", true); - obj.EnumEleD().SetValuesD<腰D>("獣毛", true); + obj.EnumEleD().SetValuesD("獣毛", true); + obj.EnumEleD().SetValuesD("獣毛", true); obj.EnumEleD().SetValuesD<性器_人D>("表示", false); obj.EnumEleD().SetValuesD<肛門_人D>("表示", false); obj.EnumEleD().SetValuesD<腰肌D>("獣性", true); @@ -3066,9 +3066,9 @@ namespace SlaveMatrix public static ChaD Getアリコーン() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R1(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R1(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3081,10 +3081,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3117,14 +3117,14 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_馬D e3 = new 足_馬D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_馬D()); - obj.EnumEleD().SetValuesD<頭D>("馬", RNG.XS.NextBool()); + obj.EnumEleD().SetValuesD("馬", RNG.XS.NextBool()); obj.EnumEleD().SetValuesD<性器_人D>("表示", false); obj.EnumEleD().SetValuesD<肛門_人D>("表示", false); obj.EnumEleD().SetValuesD<腰肌D>("獣性", true); @@ -3139,9 +3139,9 @@ namespace SlaveMatrix public static ChaD Getバイコーン() { - 腰D obj = Uni.腰(); - 胸D 胸D2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD ChestD2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3159,10 +3159,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3179,15 +3179,15 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_馬D e3 = new 足_馬D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_馬D()); - obj.EnumEleD().SetValuesD<頭D>("馬", RNG.XS.NextBool()); - 胸D2.肌_接続.SetValuesD("胸毛", true); + obj.EnumEleD().SetValuesD("馬", RNG.XS.NextBool()); + ChestD2.肌_接続.SetValuesD("胸毛", true); obj.EnumEleD().SetValuesD<性器_人D>("表示", false); obj.EnumEleD().SetValuesD<肛門_人D>("表示", false); obj.EnumEleD().SetValuesD<腰肌D>("獣性", true); @@ -3202,9 +3202,9 @@ namespace SlaveMatrix public static ChaD Getペガサス() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3216,10 +3216,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3252,14 +3252,14 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_馬D e3 = new 足_馬D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_馬D()); - obj.EnumEleD().SetValuesD<頭D>("馬", RNG.XS.NextBool()); + obj.EnumEleD().SetValuesD("馬", RNG.XS.NextBool()); obj.EnumEleD().SetValuesD<性器_人D>("表示", false); obj.EnumEleD().SetValuesD<肛門_人D>("表示", false); obj.EnumEleD().SetValuesD<腰肌D>("獣性", true); @@ -3274,9 +3274,9 @@ namespace SlaveMatrix public static ChaD Getグリフォン() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3288,10 +3288,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3317,18 +3317,18 @@ namespace SlaveMatrix 四足胸D2.翼上右接続(上腕_鳥D2.Get逆()); 四足胸D2.背中接続(new 背中_羽D()); 足_鳥D e2 = new 足_鳥D(); - 脚_鳥D 脚_鳥D2 = new 脚_鳥D(); - 脚_鳥D2.足接続(e2); - 脚_鳥D2.尺度B = 1.3; + Leg_鳥D Leg_鳥D2 = new Leg_鳥D(); + Leg_鳥D2.足接続(e2); + Leg_鳥D2.尺度B = 1.3; 四足脇D 四足脇D2 = new 四足脇D(); - 四足脇D2.上腕接続(脚_鳥D2); + 四足脇D2.上腕接続(Leg_鳥D2); 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_獣D e3 = new 足_獣D(); - 脚_獣D 脚_獣D2 = new 脚_獣D(); - 脚_獣D2.足接続(e3); + Leg_獣D Leg_獣D2 = new Leg_獣D(); + Leg_獣D2.足接続(e3); 腿_獣D 腿_獣D2 = new 腿_獣D(); - 腿_獣D2.脚接続(脚_獣D2); + 腿_獣D2.Leg接続(Leg_獣D2); 四足腰D2.腿左接続(腿_獣D2); 四足腰D2.腿右接続(腿_獣D2.Get逆()); 四足腰D2.尾接続(new 尾_牛D()); @@ -3347,9 +3347,9 @@ namespace SlaveMatrix public static ChaD Getヒッポグリフ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3361,10 +3361,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3390,24 +3390,24 @@ namespace SlaveMatrix 四足胸D2.翼上右接続(上腕_鳥D2.Get逆()); 四足胸D2.背中接続(new 背中_羽D()); 足_鳥D e2 = new 足_鳥D(); - 脚_鳥D 脚_鳥D2 = new 脚_鳥D + Leg_鳥D Leg_鳥D2 = new Leg_鳥D { 尺度B = 1.3 }; - 脚_鳥D2.足接続(e2); + Leg_鳥D2.足接続(e2); 四足脇D 四足脇D2 = new 四足脇D(); - 四足脇D2.上腕接続(脚_鳥D2); + 四足脇D2.上腕接続(Leg_鳥D2); 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_馬D e3 = new 足_馬D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_馬D()); - obj.EnumEleD().SetValuesD<頭D>("馬", RNG.XS.NextBool()); + obj.EnumEleD().SetValuesD("馬", RNG.XS.NextBool()); 四足胴D2.SetValuesD("獣毛", true); obj.EnumEleD().SetValuesD<腰肌D>("獣毛", true); obj.EnumEleD().SetValuesD<胸毛D>("表示", true); @@ -3425,9 +3425,9 @@ namespace SlaveMatrix public static ChaD Getキマイラ() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -3449,10 +3449,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3473,10 +3473,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_牛D e3 = new 足_牛D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_蛇D()); @@ -3496,10 +3496,10 @@ namespace SlaveMatrix public static ChaD Getスフィンクス(bool b) { - 腰D 腰D2 = Uni.腰(); - 胴D e = 腰D2.Set胴(); - 胸D 胸D2 = e.Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + TorsoD e = 腰D2.Set胴(); + ChestD ChestD2 = e.SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3510,7 +3510,7 @@ namespace SlaveMatrix { EleD e2 = (RNG.XS.NextBool() ? ((尾D)new 尾_牛D()) : ((尾D)new 尾_蛇D())); 腰D2.尾接続(e2); - 胸D2.背中接続(new 背中_羽D + ChestD2.背中接続(new 背中_羽D { 毛 = true }); @@ -3519,10 +3519,10 @@ namespace SlaveMatrix 下腕_鳥D2.手接続(e3); 上腕_鳥D 上腕_鳥D2 = new 上腕_鳥D(); 上腕_鳥D2.下腕接続(下腕_鳥D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_鳥D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_鳥D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 手_獣D e4 = new 手_獣D { 尺度B = 0.9 @@ -3534,20 +3534,20 @@ namespace SlaveMatrix 下腕_獣D2.手接続(e4); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_獣D2); - 肩D 肩D3 = new 肩D(); - 肩D3.上腕接続(上腕_人D2); + ShoulderD ShoulderD3 = new ShoulderD(); + ShoulderD3.上腕接続(上腕_人D2); 上腕_人D2.EnumEleD().SetValuesD("獣性", true); - 胸D2.肩左接続(肩D3); - 胸D2.肩右接続(肩D3.Get逆()); + ChestD2.肩左接続(ShoulderD3); + ChestD2.肩右接続(ShoulderD3.Get逆()); 足_獣D e5 = new 足_獣D(); - 脚_獣D 脚_獣D2 = new 脚_獣D(); - 脚_獣D2.足接続(e5); + Leg_獣D Leg_獣D2 = new Leg_獣D(); + Leg_獣D2.足接続(e5); 腿_獣D 腿_獣D2 = new 腿_獣D(); - 腿_獣D2.脚接続(脚_獣D2); + 腿_獣D2.Leg接続(Leg_獣D2); 腰D2.腿左接続(腿_獣D2); 腰D2.腿右接続(腿_獣D2.Get逆()); - 胸D2.肌_接続.SetValuesD<胸毛D>("表示", true); - 胸D2.SetValuesD("獣性", true); + ChestD2.肌_接続.SetValuesD<胸毛D>("表示", true); + ChestD2.SetValuesD("獣性", true); e.SetValuesD("獣性", true); 腰D2.SetValuesD("獣性", true); } @@ -3558,10 +3558,10 @@ namespace SlaveMatrix 下腕_鳥D3.手接続(e6); 上腕_鳥D 上腕_鳥D3 = new 上腕_鳥D(); 上腕_鳥D3.下腕接続(下腕_鳥D3); - 肩D 肩D4 = new 肩D(); - 肩D4.上腕接続(上腕_鳥D3); - 胸D2.肩左接続(肩D4); - 胸D2.肩右接続(肩D4.Get逆()); + ShoulderD ShoulderD4 = new ShoulderD(); + ShoulderD4.上腕接続(上腕_鳥D3); + ChestD2.肩左接続(ShoulderD4); + ChestD2.肩右接続(ShoulderD4.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3582,10 +3582,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_獣D e8 = new 足_獣D(); - 脚_獣D 脚_獣D3 = new 脚_獣D(); - 脚_獣D3.足接続(e8); + Leg_獣D Leg_獣D3 = new Leg_獣D(); + Leg_獣D3.足接続(e8); 腿_獣D 腿_獣D3 = new 腿_獣D(); - 腿_獣D3.脚接続(脚_獣D3); + 腿_獣D3.Leg接続(Leg_獣D3); 四足腰D2.腿左接続(腿_獣D3); 四足腰D2.腿右接続(腿_獣D3.Get逆()); EleD e2 = (RNG.XS.NextBool() ? ((尾D)new 尾_牛D()) : ((尾D)new 尾_蛇D())); @@ -3607,9 +3607,9 @@ namespace SlaveMatrix public static ChaD Getレオントケンタウレ() { - 腰D obj = Uni.腰(); - 胸D 胸D2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD ChestD2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -3623,10 +3623,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3647,17 +3647,17 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_獣D e3 = new 足_獣D(); - 脚_獣D 脚_獣D2 = new 脚_獣D(); - 脚_獣D2.足接続(e3); + Leg_獣D Leg_獣D2 = new Leg_獣D(); + Leg_獣D2.足接続(e3); 腿_獣D 腿_獣D2 = new 腿_獣D(); - 腿_獣D2.脚接続(脚_獣D2); + 腿_獣D2.Leg接続(Leg_獣D2); 四足腰D2.腿左接続(腿_獣D2); 四足腰D2.腿右接続(腿_獣D2.Get逆()); 四足腰D2.尾接続(new 尾_牛D()); obj.EnumEleD().SetValuesD("獣性", true); obj.EnumEleD().SetValuesD<下腕_人D>("配色指定", 配色指定.B0); obj.EnumEleD().SetValuesD<手_人D>("配色指定", 配色指定.B0); - 胸D2.肌_接続.SetValuesD("胸毛", false); + ChestD2.肌_接続.SetValuesD("胸毛", false); obj.EnumEleD().SetValuesD<頬肌D>("髭", 頭D2.鼻_接続.IsEleD<鼻_獣D>()); obj.EnumEleD().SetValuesD<口_通常D>("牙", true); obj.EnumEleD().SetValuesD<性器_人D>("表示", false); @@ -3672,9 +3672,9 @@ namespace SlaveMatrix public static ChaD Getティグリスケンタウレ() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -3688,10 +3688,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3708,10 +3708,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_獣D e3 = new 足_獣D(); - 脚_獣D 脚_獣D2 = new 脚_獣D(); - 脚_獣D2.足接続(e3); + Leg_獣D Leg_獣D2 = new Leg_獣D(); + Leg_獣D2.足接続(e3); 腿_獣D 腿_獣D2 = new 腿_獣D(); - 腿_獣D2.脚接続(脚_獣D2); + 腿_獣D2.Leg接続(Leg_獣D2); 四足腰D2.腿左接続(腿_獣D2); 四足腰D2.腿右接続(腿_獣D2.Get逆()); 四足腰D2.尾接続(new 尾_猫D()); @@ -3748,9 +3748,9 @@ namespace SlaveMatrix public static ChaD Getパンテーラケンタウレ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -3764,10 +3764,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -3784,10 +3784,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_獣D e3 = new 足_獣D(); - 脚_獣D 脚_獣D2 = new 脚_獣D(); - 脚_獣D2.足接続(e3); + Leg_獣D Leg_獣D2 = new Leg_獣D(); + Leg_獣D2.足接続(e3); 腿_獣D 腿_獣D2 = new 腿_獣D(); - 腿_獣D2.脚接続(脚_獣D2); + 腿_獣D2.Leg接続(Leg_獣D2); 四足腰D2.腿左接続(腿_獣D2); 四足腰D2.腿右接続(腿_獣D2.Get逆()); 四足腰D2.尾接続(new 尾_猫D()); @@ -3812,9 +3812,9 @@ namespace SlaveMatrix public static ChaD Getチータケンタウレ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻R(); @@ -3828,10 +3828,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); double num = 0.95; 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); @@ -3853,11 +3853,11 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_獣D e3 = new 足_獣D(); - 脚_獣D 脚_獣D2 = new 脚_獣D(); - 脚_獣D2.足接続(e3); + Leg_獣D Leg_獣D2 = new Leg_獣D(); + Leg_獣D2.足接続(e3); 腿_獣D 腿_獣D2 = new 腿_獣D(); - 腿_獣D2.脚接続(脚_獣D2); - 脚_獣D2.EnumEleD().SetValuesD("尺度YB", num); + 腿_獣D2.Leg接続(Leg_獣D2); + Leg_獣D2.EnumEleD().SetValuesD("尺度YB", num); 腿_獣D2.尺度XB = num; 四足腰D2.腿左接続(腿_獣D2); 四足腰D2.腿右接続(腿_獣D2.Get逆()); @@ -3889,9 +3889,9 @@ namespace SlaveMatrix public static ChaD Getウェアドラゴンフライ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3914,12 +3914,12 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); - obj2.肩左接続(肩D2.Copy()); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); + obj2.肩左接続(ShoulderD2.Copy()); + obj2.肩右接続(ShoulderD2.Get逆()); eleD = new 前翅_羽D(); obj2.翼上左接続(eleD); obj2.翼上右接続(eleD.Get逆()); @@ -3927,10 +3927,10 @@ namespace SlaveMatrix obj2.翼下左接続(eleD); obj2.翼下右接続(eleD.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); eleD = new 尾_竜D(); @@ -3952,9 +3952,9 @@ namespace SlaveMatrix public static ChaD Getウェアビートル() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -3975,12 +3975,12 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); - obj2.肩左接続(肩D2.Copy()); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); + obj2.肩左接続(ShoulderD2.Copy()); + obj2.肩右接続(ShoulderD2.Get逆()); eleD = new 後翅_甲D(); obj2.翼上左接続(eleD); obj2.翼上右接続(eleD.Get逆()); @@ -3989,10 +3989,10 @@ namespace SlaveMatrix obj2.翼上左接続(eleD); obj2.翼上右接続(eleD.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.EnumEleD().SetValuesD("虫性", true); @@ -4014,9 +4014,9 @@ namespace SlaveMatrix public static ChaD Getウェアスタッグビートル() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4041,12 +4041,12 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); - obj2.肩左接続(肩D2.Copy()); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); + obj2.肩左接続(ShoulderD2.Copy()); + obj2.肩右接続(ShoulderD2.Get逆()); eleD = new 後翅_甲D(); obj2.翼上左接続(eleD); obj2.翼上右接続(eleD.Get逆()); @@ -4055,10 +4055,10 @@ namespace SlaveMatrix obj2.翼上左接続(eleD); obj2.翼上右接続(eleD.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.EnumEleD().SetValuesD("虫性", true); @@ -4068,7 +4068,7 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD<手_人D>("鱗", true); obj.EnumEleD().SetValuesD<足_人D>("鱗", true); obj.EnumEleD().SetValuesD("配色", 配色指定.C0); - obj.EnumEleD().SetValuesD<脚_人D>("棘", false); + obj.EnumEleD().SetValuesD("棘", false); obj.EnumEleD().SetValuesD<双目D>("瞳孔", false); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); obj.EnumEleD().SetValuesD("身長", 頭D2.目高); @@ -4079,10 +4079,10 @@ namespace SlaveMatrix public static ChaD Getウェアマンティス() { - 腰D obj = Uni.腰(); - 胴D obj2 = obj.Set胴(); - 胸D obj3 = obj2.Set胸R(); - 頭D 頭D2 = obj3.Set首().Set頭R(); + WaistD obj = Uni.腰(); + TorsoD obj2 = obj.Set胴(); + ChestD obj3 = obj2.SetChestR(); + HeadD 頭D2 = obj3.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4102,11 +4102,11 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); 下腕_人D2.虫鎌接続(new 虫鎌D()); - obj3.肩左接続(肩D2); - obj3.肩右接続(肩D2.Get逆()); + obj3.肩左接続(ShoulderD2); + obj3.肩右接続(ShoulderD2.Get逆()); eleD = new 前翅_草D(); eleD.SetValuesD("紋", RNG.XS.NextBool()); obj2.翼左接続(eleD); @@ -4115,10 +4115,10 @@ namespace SlaveMatrix obj2.翼左接続(eleD); obj2.翼右接続(eleD.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); eleD = new 尾_虫D(); @@ -4129,8 +4129,8 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD<手_人D>("鱗", true); obj.EnumEleD().SetValuesD<足_人D>("鱗", true); obj.EnumEleD().SetValuesD("配色", 配色指定.C0); - obj.EnumEleD().SetValuesD<脚_人D>("棘2", false); - obj.EnumEleD().SetValuesD<脚_人D>("棘3", false); + obj.EnumEleD().SetValuesD("棘2", false); + obj.EnumEleD().SetValuesD("棘3", false); obj.EnumEleD().SetValuesD<双目D>("瞳孔", false); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); obj.EnumEleD().SetValuesD("身長", 頭D2.目高); @@ -4141,9 +4141,9 @@ namespace SlaveMatrix public static ChaD Getエキドナ() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4162,10 +4162,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 手_鳥D 手_鳥D2 = new 手_鳥D { シャープ = RNG.XS.NextDouble() @@ -4184,13 +4184,13 @@ namespace SlaveMatrix obj.翼上右接続(上腕_鳥D2.Get逆()); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 45; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(RNG.XS.NextBool() ? ((尾D)new 尾_ヘD()) : ((尾D)new 尾_ガD())); + 胴_蛇D2.Torso接続(RNG.XS.NextBool() ? ((尾D)new 尾_ヘD()) : ((尾D)new 尾_ガD())); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD<舌_長D>("股舌表示", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -4203,11 +4203,11 @@ namespace SlaveMatrix public static ChaD Getゴルゴン() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); - 後髪0_肢系D 後髪0_肢系D2 = new 後髪0_肢系D(); + BackHair0_肢系D 後髪0_肢系D2 = new BackHair0_肢系D(); EleD eleD2 = new 尾_蛇D(); 後髪0_肢系D2.左5接続(eleD2); 後髪0_肢系D2.左4接続(eleD2.Copy()); @@ -4243,10 +4243,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); 腰D2.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -4270,10 +4270,10 @@ namespace SlaveMatrix 四足胸D2.翼上左接続(上腕_鳥D2); 四足胸D2.翼上右接続(上腕_鳥D2.Get逆()); 足_馬D e2 = new 足_馬D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e2); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e2); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_馬D()); @@ -4293,11 +4293,11 @@ namespace SlaveMatrix public static ChaD Getヒュドラ() { - 腰D 腰D2 = Uni.腰(); - 頭D 頭D2 = 腰D2.Set胴().Set胸R().Set首() + WaistD 腰D2 = Uni.腰(); + HeadD 頭D2 = 腰D2.Set胴().SetChestR().Set首() .Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); - 後髪0_肢系D 後髪0_肢系D2 = new 後髪0_肢系D(); + BackHair0_肢系D 後髪0_肢系D2 = new BackHair0_肢系D(); EleD eleD2 = new 尾_蛇D(); 後髪0_肢系D2.左5接続(eleD2); 後髪0_肢系D2.左4接続(eleD2.Copy()); @@ -4324,13 +4324,13 @@ namespace SlaveMatrix 頭D2.頭頂接続(頭頂_宇D2); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 45; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD<舌_長D>("股舌表示", true); @@ -4344,8 +4344,8 @@ namespace SlaveMatrix public static ChaD Getウロボロス() { - 腰D 腰D2 = Uni.腰(); - 頭D 頭D2 = 腰D2.Set胴().Set胸R().Set首() + WaistD 腰D2 = Uni.腰(); + HeadD 頭D2 = 腰D2.Set胴().SetChestR().Set首() .Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); @@ -4361,13 +4361,13 @@ namespace SlaveMatrix 頭D2.顔面接続(e); 長物_蛇D 長物_蛇D2 = new 長物_蛇D(); 腰D2.半身接続(長物_蛇D2); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 40; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD("コア1", true); @@ -4382,9 +4382,9 @@ namespace SlaveMatrix public static ChaD Getカッパ() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4396,20 +4396,20 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 頭D2.頭頂接続(new 頭頂_皿D()); obj.背中接続(new 背中_甲D { 縁側角 = RNG.XS.NextDouble() }); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); if (RNG.XS.NextBool()) @@ -4431,9 +4431,9 @@ namespace SlaveMatrix public static ChaD Getムカデジョウロウ() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4464,16 +4464,16 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); if (RNG.XS.NextBool()) { - 胸D2.肩左接続(肩D2.Copy()); - 胸D2.肩右接続(肩D2.Get逆()); - 胸D2.肩左接続(肩D2.Copy()); - 胸D2.肩右接続(肩D2.Get逆()); + ChestD2.肩左接続(ShoulderD2.Copy()); + ChestD2.肩右接続(ShoulderD2.Get逆()); + ChestD2.肩左接続(ShoulderD2.Copy()); + ChestD2.肩右接続(ShoulderD2.Get逆()); } 長物_蟲D 長物_蟲D2 = new 長物_蟲D(); 腰D2.半身接続(長物_蟲D2); @@ -4482,13 +4482,13 @@ namespace SlaveMatrix 長物_蟲D2.右0接続(eleD.Get逆()); 長物_蟲D2.左1接続(eleD.Copy()); 長物_蟲D2.右1接続(eleD.Get逆()); - 胴_蟲D 胴_蟲D2 = new 胴_蟲D(); + Torso_蟲D 胴_蟲D2 = new Torso_蟲D(); 長物_蟲D2.胴接続(胴_蟲D2); 胴_蟲D2.左接続(eleD.Copy()); 胴_蟲D2.右接続(eleD.Get逆()); for (int i = 0; i < 21; i++) { - 胴_蟲D2.胴接続(胴_蟲D2 = new 胴_蟲D()); + 胴_蟲D2.Torso接続(胴_蟲D2 = new Torso_蟲D()); 胴_蟲D2.左接続(eleD.Copy()); 胴_蟲D2.右接続(eleD.Get逆()); } @@ -4506,7 +4506,7 @@ namespace SlaveMatrix 尾_蟲D2.右5接続(eleD.Get逆()); 尾_蟲D2.尾左接続(節尾_曳航D2); 尾_蟲D2.尾右接続(節尾_曳航D2.Get逆()); - 胴_蟲D2.胴接続(尾_蟲D2); + 胴_蟲D2.Torso接続(尾_蟲D2); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); 腰D2.EnumEleD().SetValuesD("身長", 頭D2.目高); @@ -4518,9 +4518,9 @@ namespace SlaveMatrix public static ChaD Getカーバンクル() { - 腰D 腰D2 = Uni.腰(); - 胸D obj = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = obj.Set首().Set頭R1(); + WaistD 腰D2 = Uni.腰(); + ChestD obj = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = obj.Set首().Set頭R1(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4543,15 +4543,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj.肩左接続(肩D2); - obj.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj.肩左接続(ShoulderD2); + obj.肩右接続(ShoulderD2.Get逆()); 足_獣D e2 = new 足_獣D(); - 脚_獣D 脚_獣D2 = new 脚_獣D(); - 脚_獣D2.足接続(e2); + Leg_獣D Leg_獣D2 = new Leg_獣D(); + Leg_獣D2.足接続(e2); 腿_獣D 腿_獣D2 = new 腿_獣D(); - 腿_獣D2.脚接続(脚_獣D2); + 腿_獣D2.Leg接続(Leg_獣D2); 腰D2.腿左接続(腿_獣D2); 腰D2.腿右接続(腿_獣D2.Get逆()); 腰D2.EnumEleD().SetValuesD("獣性", true); @@ -4570,9 +4570,9 @@ namespace SlaveMatrix public static ChaD Getバジリスク() { - 腰D 腰D2 = Uni.腰(); - 胴D obj = 腰D2.Set胴(); - 頭D 頭D2 = obj.Set胸R().Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + TorsoD obj = 腰D2.Set胴(); + HeadD 頭D2 = obj.SetChestR().Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4608,25 +4608,25 @@ namespace SlaveMatrix { 尺度B = 1.1 }; - 脚_竜D 脚_竜D2 = new 脚_竜D + Leg_竜D Leg_竜D2 = new Leg_竜D { 尺度B = 1.1 }; - 脚_竜D2.足接続(e); + Leg_竜D2.足接続(e); 四足脇D 四足脇D2 = new 四足脇D { 尺度B = 1.1 }; - 四足脇D2.上腕接続(脚_竜D2); + 四足脇D2.上腕接続(Leg_竜D2); 腰D2.翼左接続(四足脇D2); 腰D2.翼右接続(四足脇D2.Get逆()); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 30; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); 腰D2.EnumEleD().SetValuesD<口_通常D>("牙", true); @@ -4640,10 +4640,10 @@ namespace SlaveMatrix public static ChaD Getコカトリス() { - 腰D 腰D2 = Uni.腰(); - 胴D obj = 腰D2.Set胴(); - 胸D 胸D2 = obj.Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + TorsoD obj = 腰D2.Set胴(); + ChestD ChestD2 = obj.SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4657,7 +4657,7 @@ namespace SlaveMatrix 上腕_蝙D2.下腕接続(下腕_蝙D2); obj.翼左接続(上腕_蝙D2); obj.翼右接続(上腕_蝙D2.Get逆()); - 胸D2.背中接続(new 背中_羽D + ChestD2.背中接続(new 背中_羽D { 毛 = true }); @@ -4667,25 +4667,25 @@ namespace SlaveMatrix { 尺度B = 1.1 }; - 脚_竜D 脚_竜D2 = new 脚_竜D + Leg_竜D Leg_竜D2 = new Leg_竜D { 尺度B = 1.1 }; - 脚_竜D2.足接続(e2); + Leg_竜D2.足接続(e2); 四足脇D 四足脇D2 = new 四足脇D { 尺度B = 1.1 }; - 四足脇D2.上腕接続(脚_竜D2); + 四足脇D2.上腕接続(Leg_竜D2); 腰D2.翼左接続(四足脇D2); 腰D2.翼右接続(四足脇D2.Get逆()); - 胴_蛇D 胴_蛇D2 = new 胴_蛇D(); + Torso_蛇D 胴_蛇D2 = new Torso_蛇D(); 長物_蛇D2.胴接続(胴_蛇D2); for (int i = 0; i < 30; i++) { - 胴_蛇D2.胴接続(胴_蛇D2 = new 胴_蛇D()); + 胴_蛇D2.Torso接続(胴_蛇D2 = new Torso_蛇D()); } - 胴_蛇D2.胴接続(new 尾_ヘD()); + 胴_蛇D2.Torso接続(new 尾_ヘD()); 腰D2.EnumEleD().SetValuesD("獣性", true); 腰D2.EnumEleD().SetValuesD("竜性", true); 腰D2.EnumEleD().SetValuesD<腰肌D>("竜性", false); @@ -4701,9 +4701,9 @@ namespace SlaveMatrix public static ChaD Getカトブレパス() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); eleD.前髪_接続.RemoveAt(0); eleD.前髪接続(new 前髪_目隠れ1D()); @@ -4721,10 +4721,10 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 四足胸D 四足胸D2 = Uni.四足胸(); obj.半身接続(四足胸D2); 四足胴D 四足胴D2 = Uni.四足胴(); @@ -4741,10 +4741,10 @@ namespace SlaveMatrix 四足胸D2.脇左接続(四足脇D2); 四足胸D2.脇右接続(四足脇D2.Get逆()); 足_牛D e3 = new 足_牛D(); - 脚_蹄D 脚_蹄D2 = new 脚_蹄D(); - 脚_蹄D2.足接続(e3); + Leg_蹄D Leg_蹄D2 = new Leg_蹄D(); + Leg_蹄D2.足接続(e3); 腿_蹄D 腿_蹄D2 = new 腿_蹄D(); - 腿_蹄D2.脚接続(脚_蹄D2); + 腿_蹄D2.Leg接続(Leg_蹄D2); 四足腰D2.腿左接続(腿_蹄D2); 四足腰D2.腿右接続(腿_蹄D2.Get逆()); 四足腰D2.尾接続(new 尾_牛D()); @@ -4764,9 +4764,9 @@ namespace SlaveMatrix public static ChaD Getミノタウロス() { - 腰D 腰D2 = Uni.腰(); - 胸D 胸D2 = 腰D2.Set胴().Set胸R(); - 頭D 頭D2 = 胸D2.Set首().Set頭R(); + WaistD 腰D2 = Uni.腰(); + ChestD ChestD2 = 腰D2.Set胴().SetChestR(); + HeadD 頭D2 = ChestD2.Set首().Set頭R(); 基髪D eleD = 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4787,15 +4787,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - 胸D2.肩左接続(肩D2); - 胸D2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + ChestD2.肩左接続(ShoulderD2); + ChestD2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); 腰D2.腿左接続(腿_人D2); 腰D2.腿右接続(腿_人D2.Get逆()); 腰D2.尾接続(new 尾_牛D()); @@ -4804,7 +4804,7 @@ namespace SlaveMatrix 腰D2.EnumEleD().SetValuesD<手_人D>("肉球", false); 腰D2.EnumEleD().SetValuesD("獣毛2", false); 腰D2.EnumEleD().SetValuesD<下腕_人D>("配色指定", 配色指定.B0); - 腰D2.EnumEleD().SetValuesD<脚_人D>("配色指定", 配色指定.B0); + 腰D2.EnumEleD().SetValuesD("配色指定", 配色指定.B0); 腰D2.EnumEleD().SetValuesD<足_人D>("配色指定", 配色指定.B0); 腰D2.EnumEleD().SetValuesD("バスト", 1.0); 腰D2.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -4817,9 +4817,9 @@ namespace SlaveMatrix public static ChaD Getリリン() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4831,15 +4831,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -4852,9 +4852,9 @@ namespace SlaveMatrix public static ChaD Getエルフ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4866,15 +4866,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -4887,9 +4887,9 @@ namespace SlaveMatrix public static ChaD Getドワーフ() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -4901,15 +4901,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.EnumEleD().SetValuesD("肥大", 1.0); @@ -4922,15 +4922,15 @@ namespace SlaveMatrix public static ChaD GetViola() { - 腰D waist_description = Uni.腰(); - 胴D body_description = waist_description.Set胴(); - 胸D chest_description = body_description.Set胸R(); - 首D neck_description = chest_description.Set首(); - 頭D head_description = Uni.頭(); + WaistD waist_description = Uni.腰(); + TorsoD body_description = waist_description.Set胴(); + ChestD chest_description = body_description.SetChestR(); + NeckD neck_description = chest_description.Set首(); + HeadD head_description = Uni.頭(); neck_description.頭接続(head_description); head_description.目高 = 0.85; 基髪D hair_description = (基髪D)head_description.基髪_接続[0]; - 後髪0_カルD backhair_description = new 後髪0_カルD + BackHair0_カルD backhair_description = new BackHair0_カルD { 髪長0 = 1.0, 髪長1 = 1.0, @@ -4938,7 +4938,7 @@ namespace SlaveMatrix 広がり = 1.0 }; hair_description.後髪接続(backhair_description); - 横髪_カルD sidehair_description = new 横髪_カルD + SideHair_カルD sidehair_description = new SideHair_カルD { 髪長1 = 1.0, 髪長2 = 1.0, @@ -4986,7 +4986,7 @@ namespace SlaveMatrix 上腕_人D upperarm_description = new 上腕_人D(); upperarm_description.下腕接続(lowerarm_description); - 肩D shoulder_description = new 肩D(); + ShoulderD shoulder_description = new ShoulderD(); shoulder_description.上腕接続(upperarm_description); chest_description.肩左接続(shoulder_description); chest_description.肩右接続(shoulder_description.Get逆()); @@ -5060,10 +5060,10 @@ namespace SlaveMatrix waist_description.翼左接続(eleD3); waist_description.翼右接続(eleD3.Get逆()); 足_人D foot_description = new 足_人D(); - 脚_人D legs_description = new 脚_人D(); + Leg_人D legs_description = new Leg_人D(); legs_description.足接続(foot_description); 腿_人D thigh_description = new 腿_人D(); - thigh_description.脚接続(legs_description); + thigh_description.Leg接続(legs_description); waist_description.腿左接続(thigh_description); waist_description.腿右接続(thigh_description.Get逆()); @@ -5075,9 +5075,9 @@ namespace SlaveMatrix waist_description.EnumEleD().SetValuesD<下腕_人D>("淫", false); waist_description.EnumEleD().SetValuesD<腰肌D>("ハート", false); waist_description.EnumEleD().SetValuesD<頬肌D>("ハート", false); - waist_description.EnumEleD().SetValuesD<頭D>("隈取", true); + waist_description.EnumEleD().SetValuesD("隈取", true); waist_description.EnumEleD().SetValuesD<腿_人D>("悪", true); - waist_description.EnumEleD().SetValuesD<腰D>("悪", true); + waist_description.EnumEleD().SetValuesD("悪", true); waist_description.EnumEleD().SetValuesD<腿_人D>("葉1", false); waist_description.EnumEleD().SetValuesD("猫目", true); waist_description.EnumEleD().SetValuesD("バスト", 0.85); @@ -5110,9 +5110,9 @@ namespace SlaveMatrix public static ChaD Getヒューマン() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set双目R(); 頭D2.Set鼻人(); @@ -5124,15 +5124,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.EnumEleD().SetValuesD("肥大", RNG.XS.NextDouble()); @@ -5145,9 +5145,9 @@ namespace SlaveMatrix public static ChaD Getプレーヤー() { - 腰D obj = Uni.腰(); - 胸D obj2 = obj.Set胴().Set胸R(); - 頭D 頭D2 = obj2.Set首().Set頭R(); + WaistD obj = Uni.腰(); + ChestD obj2 = obj.Set胴().SetChestR(); + HeadD 頭D2 = obj2.Set首().Set頭R(); 頭D2.EnumEleD().GetEleD<基髪D>(); 頭D2.Set目弱R(); 頭D2.Set鼻人(); @@ -5159,15 +5159,15 @@ namespace SlaveMatrix 下腕_人D2.手接続(e); 上腕_人D 上腕_人D2 = new 上腕_人D(); 上腕_人D2.下腕接続(下腕_人D2); - 肩D 肩D2 = new 肩D(); - 肩D2.上腕接続(上腕_人D2); - obj2.肩左接続(肩D2); - obj2.肩右接続(肩D2.Get逆()); + ShoulderD ShoulderD2 = new ShoulderD(); + ShoulderD2.上腕接続(上腕_人D2); + obj2.肩左接続(ShoulderD2); + obj2.肩右接続(ShoulderD2.Get逆()); 足_人D e2 = new 足_人D(); - 脚_人D 脚_人D2 = new 脚_人D(); - 脚_人D2.足接続(e2); + Leg_人D Leg_人D2 = new Leg_人D(); + Leg_人D2.足接続(e2); 腿_人D 腿_人D2 = new 腿_人D(); - 腿_人D2.脚接続(脚_人D2); + 腿_人D2.Leg接続(Leg_人D2); obj.腿左接続(腿_人D2); obj.腿右接続(腿_人D2.Get逆()); obj.EnumEleD().SetValuesD("肥大", Sta.GameData.体重); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index 6f5b9cb..be03602 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -16,9 +16,9 @@ namespace SlaveMatrix { public static class Sta { - public static Obj 胴体; + public static Obj 胴体; //胴体 - public static Obj 肩左; + public static Obj 肩左; public static Obj 腕左; @@ -50,9 +50,9 @@ namespace SlaveMatrix public static Type EleDt; - public static Type 胸t; + public static Type Chestt; - public static Type 肩t; + public static Type Shouldert; public static Type 胴t; @@ -88,7 +88,7 @@ namespace SlaveMatrix public static Type 耳_獣Dt; - public static Type 肩Dt; + public static Type ShoulderDt; public static Type 角1_一Dt; @@ -294,15 +294,15 @@ namespace SlaveMatrix public static Type 腿_竜Dt; - public static Type 脚_人Dt; + public static Type Leg_人Dt; - public static Type 脚_獣Dt; + public static Type Leg_獣Dt; - public static Type 脚_蹄Dt; + public static Type Leg_蹄Dt; - public static Type 脚_鳥Dt; + public static Type Leg_鳥Dt; - public static Type 脚_竜Dt; + public static Type Leg_竜Dt; public static Type 足_人Dt; @@ -759,7 +759,7 @@ namespace SlaveMatrix } } - public static void 描画0(this IEnumerable es, Are Are) + public static void 描画0(this IEnumerable es, RenderArea Are) { foreach (Ele e in es) { @@ -767,7 +767,7 @@ namespace SlaveMatrix } } - public static void 描画1(this IEnumerable es, Are Are) + public static void 描画1(this IEnumerable es, RenderArea Are) { foreach (Ele e in es) { @@ -1084,12 +1084,17 @@ namespace SlaveMatrix static Sta() { - 胴体 = Resources.胴体.ObjLoad(); + var obj = Resources.胴体.ObjLoad(); + obj.MigrateKeys(); + 胴体 = obj; + //胴体.SaveExMod("C:\\Users\\dave\\Documents\\胴体"); //Ser.ToJson(胴体, "C:\\Users\\dave\\Documents\\胴体.json"); //胴体 = Ser.UnJson("C:\\Users\\dave\\Documents\\胴体.json"); - 肩左 = Resources.肩左.ObjLoad(); + obj = Resources.肩左.ObjLoad(); + obj.MigrateKeys(); + 肩左 = obj; //肩左.SaveExMod("C:\\Users\\dave\\Documents\\肩左"); //Ser.ToJson(肩左, "C:\\Users\\dave\\Documents\\肩左.json"); //肩左 = Ser.UnJson("C:\\Users\\dave\\Documents\\肩左.json"); @@ -1099,8 +1104,9 @@ namespace SlaveMatrix //Ser.ToJson(腕左, "C:\\Users\\dave\\Documents\\腕左.json"); //腕左 = Ser.UnJson("C:\\Users\\dave\\Documents\\腕左.json"); - - 脚左 = Resources.脚左.ObjLoad(); + obj = Resources.脚左.ObjLoad(); + obj.MigrateKeys(); + 脚左 = obj; //脚左.SaveExMod("C:\\Users\\dave\\Documents\\脚左"); //Ser.ToJson(脚左, "C:\\Users\\dave\\Documents\\脚左.json"); //脚左 = Ser.UnJson("C:\\Users\\dave\\Documents\\脚左.json"); @@ -1158,26 +1164,26 @@ namespace SlaveMatrix MaxAre = 0.0584246154149664; Elet = typeof(Ele); EleDt = typeof(EleD); - 胸t = typeof(胸); - 肩t = typeof(肩); - 胴t = typeof(胴); - 腰t = typeof(腰); + Chestt = typeof(Chest); + Shouldert = typeof(Shoulder); + 胴t = typeof(Torso); + 腰t = typeof(Waist); 尾_鯨t = typeof(尾_鯨); 上腕_人t = typeof(上腕_人); 上腕_鳥t = typeof(上腕_鳥); 長物_鯨t = typeof(長物_鯨); - 後髪0_ジグDt = typeof(後髪0_ジグD); - 後髪0_ハネDt = typeof(後髪0_ハネD); - 後髪0_パツDt = typeof(後髪0_パツD); - 後髪0_カルDt = typeof(後髪0_カルD); - 後髪0_肢系Dt = typeof(後髪0_肢系D); + 後髪0_ジグDt = typeof(BackHair0_ジグD); + 後髪0_ハネDt = typeof(BackHair0_ハネD); + 後髪0_パツDt = typeof(BackHair0_パツD); + 後髪0_カルDt = typeof(BackHair0_カルD); + 後髪0_肢系Dt = typeof(BackHair0_肢系D); 耳_人Dt = typeof(耳_人D); 耳_尖Dt = typeof(耳_尖D); 耳_長Dt = typeof(耳_長D); 耳_鰭Dt = typeof(耳_鰭D); 耳_羽Dt = typeof(耳_羽D); 耳_獣Dt = typeof(耳_獣D); - 肩Dt = typeof(肩D); + ShoulderDt = typeof(ShoulderD); 角1_一Dt = typeof(角1_一D); 角1_鬼Dt = typeof(角1_鬼D); 角1_虫Dt = typeof(角1_虫D); @@ -1280,11 +1286,11 @@ namespace SlaveMatrix 腿_蹄Dt = typeof(腿_蹄D); 腿_鳥Dt = typeof(腿_鳥D); 腿_竜Dt = typeof(腿_竜D); - 脚_人Dt = typeof(脚_人D); - 脚_獣Dt = typeof(脚_獣D); - 脚_蹄Dt = typeof(脚_蹄D); - 脚_鳥Dt = typeof(脚_鳥D); - 脚_竜Dt = typeof(脚_竜D); + Leg_人Dt = typeof(Leg_人D); + Leg_獣Dt = typeof(Leg_獣D); + Leg_蹄Dt = typeof(Leg_蹄D); + Leg_鳥Dt = typeof(Leg_鳥D); + Leg_竜Dt = typeof(Leg_竜D); 足_人Dt = typeof(足_人D); 足_獣Dt = typeof(足_獣D); 足_馬Dt = typeof(足_馬D); @@ -1292,8 +1298,8 @@ namespace SlaveMatrix 足_鳥Dt = typeof(足_鳥D); 足_竜Dt = typeof(足_竜D); 四足脇Dt = typeof(四足脇D); - 胴_蛇Dt = typeof(胴_蛇D); - 胴_蟲Dt = typeof(胴_蟲D); + 胴_蛇Dt = typeof(Torso_蛇D); + 胴_蟲Dt = typeof(Torso_蟲D); 大顎基Dt = typeof(大顎基D); 鳳凰Dt = typeof(鳳凰D); 大顎Dt = typeof(大顎D); @@ -1313,35 +1319,35 @@ namespace SlaveMatrix 左右無し = new HashSet(new ConnectionInfo[67] { ConnectionInfo.none, - ConnectionInfo.頭_基髪_接続, - ConnectionInfo.頭_鼻_接続, - ConnectionInfo.頭_口_接続, - ConnectionInfo.頭_額_接続, - ConnectionInfo.頭_鼻肌_接続, - ConnectionInfo.頭_単眼目_接続, - ConnectionInfo.頭_単眼眉_接続, - ConnectionInfo.頭_大顎基_接続, - ConnectionInfo.頭_顔面_接続, - ConnectionInfo.頭_頭頂_接続, + ConnectionInfo.Head_基髪_接続, + ConnectionInfo.Head_鼻_接続, + ConnectionInfo.Head_口_接続, + ConnectionInfo.Head_額_接続, + ConnectionInfo.Head_鼻肌_接続, + ConnectionInfo.Head_単眼目_接続, + ConnectionInfo.Head_単眼眉_接続, + ConnectionInfo.Head_大顎基_接続, + ConnectionInfo.Head_顔面_接続, + ConnectionInfo.Head_頭頂_接続, ConnectionInfo.基髪_前髪_接続, ConnectionInfo.基髪_後髪_接続, - ConnectionInfo.後髪0_肢系_中央_接続, + ConnectionInfo.BackHair0_肢系_中央_接続, ConnectionInfo.単目_瞼_接続, ConnectionInfo.縦目_瞼_接続, ConnectionInfo.吹出し_吹出し_接続, - ConnectionInfo.首_頭_接続, - ConnectionInfo.胸_首_接続, - ConnectionInfo.胸_肌_接続, - ConnectionInfo.胸_背中_接続, - ConnectionInfo.胴_胸_接続, - ConnectionInfo.胴_肌_接続, - ConnectionInfo.腰_胴_接続, - ConnectionInfo.腰_肌_接続, - ConnectionInfo.腰_膣基_接続, - ConnectionInfo.腰_肛門_接続, - ConnectionInfo.腰_尾_接続, - ConnectionInfo.腰_半身_接続, - ConnectionInfo.腰_上着_接続, + ConnectionInfo.Neck_Head_接続, + ConnectionInfo.Chest_Neck_接続, + ConnectionInfo.Chest_肌_接続, + ConnectionInfo.Chest_背中_接続, + ConnectionInfo.Torso_Chest_接続, + ConnectionInfo.Torso_肌_接続, + ConnectionInfo.Waist_Torso_接続, + ConnectionInfo.Waist_肌_接続, + ConnectionInfo.Waist_膣基_接続, + ConnectionInfo.Waist_肛門_接続, + ConnectionInfo.Waist_尾_接続, + ConnectionInfo.Waist_半身_接続, + ConnectionInfo.Waist_上着_接続, ConnectionInfo.ボテ腹_人_腹板_接続, ConnectionInfo.ボテ腹_獣_腹板_接続, ConnectionInfo.肛門_人_肛門精液_接続, @@ -1360,9 +1366,9 @@ namespace SlaveMatrix ConnectionInfo.尾_鯨_尾先_接続, ConnectionInfo.長物_魚_尾_接続, ConnectionInfo.長物_鯨_尾_接続, - ConnectionInfo.長物_蛇_胴_接続, - ConnectionInfo.長物_蟲_胴_接続, - ConnectionInfo.四足胸_胴_接続, + ConnectionInfo.長物_蛇_Torso_接続, + ConnectionInfo.長物_蟲_Torso_接続, + ConnectionInfo.四足胸_Torso_接続, ConnectionInfo.四足胸_肌_接続, ConnectionInfo.四足胸_背中_接続, ConnectionInfo.四足胴_腰_接続, @@ -1376,8 +1382,8 @@ namespace SlaveMatrix ConnectionInfo.多足_蜘_尾_接続, ConnectionInfo.多足_蠍_尾_接続, ConnectionInfo.単足_植_根中央_接続, - ConnectionInfo.胴_蛇_胴_接続, - ConnectionInfo.胴_蟲_胴_接続, + ConnectionInfo.Torso_蛇_Torso_接続, + ConnectionInfo.Torso_蟲_Torso_接続, ConnectionInfo.ペニス_尿道_接続 }); 接続情報t = typeof(ConnectionInfo); @@ -1434,7 +1440,13 @@ namespace SlaveMatrix public static string[] JSDPaths() { JsonSavePath = Path.Combine(CurrentDirectory, "save"); - IEnumerable source = Directory.EnumerateFiles(JsonSavePath); + + if (!Directory.Exists(JsonSavePath)) + { + Directory.CreateDirectory(JsonSavePath); + } + + IEnumerable source = Directory.EnumerateFiles(JsonSavePath); return new string[10] { source.FirstOrDefault((string e) => e.StartsWith(Path.Combine(JsonSavePath, "0： "))), diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs index c481fc3..729db04 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs @@ -15,10 +15,10 @@ namespace SlaveMatrix private ConstProp CP = new ConstProp(); - public Med Med; + public ModeEventDispatcher Med; - public Are Are; - private Are Film; + public RenderArea Are; + private RenderArea Film; public Cha Cha; @@ -146,7 +146,7 @@ namespace SlaveMatrix //moan queue :skull: public Onomatopoeia 擬音; - public Queue> 擬音キュー = new Queue>(); + public Queue> 擬音キュー = new Queue>(); //animation queue? public List<挿入処理> SubFocus = new List<挿入処理>(); @@ -391,7 +391,7 @@ namespace SlaveMatrix public void 発音(Vector2D p, string s, Color c, double d, bool b) { - 擬音キュー.Enqueue(delegate(Are a) + 擬音キュー.Enqueue(delegate(RenderArea a) { 擬音.Sound(a, p, s, new Font("MS Gothic", 1f), c, d, b); }); @@ -399,7 +399,7 @@ namespace SlaveMatrix public void 潮吹() { - 擬音キュー.Enqueue(delegate(Are a) + 擬音キュー.Enqueue(delegate(RenderArea a) { 擬音.Sound(a, Bod.尿道位置.GetAreaPoint(0.04), Sta.潮吹.GetVal(Player.変化V_潮吹, Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Color.Azure, 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_潮吹, b: true); }); @@ -409,7 +409,7 @@ namespace SlaveMatrix { if (CP.GetFlag(0.1 + 0.1 * Player.変化V_放尿 * 0.8)) { - 擬音キュー.Enqueue(delegate(Are a) + 擬音キュー.Enqueue(delegate(RenderArea a) { 擬音.Sound(a, Bod.尿道位置.GetAreaPoint(0.04), Sta.放尿.GetVal(Player.変化V_放尿, Player.変化V_固有値乱数), new Font("MS Gothic", 1f), Col.Black, 0.2 + 0.2 * RNG.XS.NextDouble() * Player.変化V_放尿, b: true); }); @@ -1580,7 +1580,7 @@ namespace SlaveMatrix { if (!Bod.Is拘束 && Bod.脚人n > 0) { - Cha.脚(); + Cha.Leg(); Cha.Bod.腿Update(); } } @@ -2038,14 +2038,14 @@ namespace SlaveMatrix PlayerStamina.Leave(); } - public TrainingUI(Med Med, Are Are, InfoPanel ip) + public TrainingUI(ModeEventDispatcher Med, RenderArea Are, InfoPanel ip) { TrainingUI 調教UI2 = this; try { this.Med = Med; this.Are = Are; - double disUnit = Are.DisUnit; + double disUnit = Are.DisplayUnitScale; this.ip = ip; ペニスCM = new CM(Med, this, ペニス = new ペニス(disUnit, 配色指定.N0, Sta.GameData.配色, Med, new ペニスD { @@ -2164,7 +2164,7 @@ namespace SlaveMatrix parT.SizeBase = 0.095; parT.Font = new Font("MS Gothic", 1f); parT.FontSize = 0.07; - parT.SetStringRectOutline(Are.Unit, Are.GD); + parT.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT.RectSize = new Vector2D(parT.OP[0].ps[1].X, parT.OP[0].ps[2].Y); parT.OP.ScalingY(parT.BasePointBase, 0.9); parT.Closed = true; @@ -2182,7 +2182,7 @@ namespace SlaveMatrix parT2.SizeBase = 0.095; parT2.Font = new Font("MS Gothic", 1f); parT2.FontSize = 0.07; - parT2.SetStringRectOutline(Are.Unit, Are.GD); + parT2.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT2.RectSize = new Vector2D(parT2.OP[0].ps[1].X, parT2.OP[0].ps[2].Y); parT2.OP.ScalingY(parT2.BasePointBase, 0.9); parT2.Closed = true; @@ -2214,7 +2214,7 @@ namespace SlaveMatrix parT3.SizeBase = 0.095; parT3.Font = new Font("MS Gothic", 1f); parT3.FontSize = 0.07; - parT3.SetStringRectOutline(Are.Unit, Are.GD); + parT3.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT3.RectSize = new Vector2D(parT3.OP[0].ps[1].X, parT3.OP[0].ps[2].Y); parT3.OP.ScalingY(parT3.BasePointBase, 0.9); parT3.Closed = true; @@ -2237,7 +2237,7 @@ namespace SlaveMatrix parT4.SizeBase = 0.095; parT4.Font = new Font("MS Gothic", 1f); parT4.FontSize = 0.07; - parT4.SetStringRectOutline(Are.Unit, Are.GD); + parT4.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT4.RectSize = new Vector2D(parT4.OP[0].ps[1].X, parT4.OP[0].ps[2].Y); parT4.OP.ScalingY(parT4.BasePointBase, 0.9); parT4.Closed = true; @@ -2260,7 +2260,7 @@ namespace SlaveMatrix parT5.SizeBase = 0.095; parT5.Font = new Font("MS Gothic", 1f); parT5.FontSize = 0.07; - parT5.SetStringRectOutline(Are.Unit, Are.GD); + parT5.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT5.RectSize = new Vector2D(parT5.OP[0].ps[1].X, parT5.OP[0].ps[2].Y); parT5.OP.ScalingY(parT5.BasePointBase, 0.9); parT5.Closed = true; @@ -2366,7 +2366,7 @@ namespace SlaveMatrix parT6.SizeBase = 0.095; parT6.Font = new Font("MS Gothic", 1f); parT6.FontSize = 0.07; - parT6.SetStringRectOutline(Are.Unit, Are.GD); + parT6.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT6.RectSize = new Vector2D(parT6.OP[0].ps[1].X, parT6.OP[0].ps[2].Y); parT6.OP.ScalingY(parT6.BasePointBase, 0.9); parT6.Closed = true; @@ -2401,7 +2401,7 @@ namespace SlaveMatrix parT7.SizeBase = 0.095; parT7.Font = new Font("MS Gothic", 1f); parT7.FontSize = 0.07; - parT7.SetStringRectOutline(Are.Unit, Are.GD); + parT7.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT7.RectSize = new Vector2D(parT7.OP[0].ps[1].X, parT7.OP[0].ps[2].Y); parT7.OP.ScalingY(parT7.BasePointBase, 0.9); parT7.Closed = true; @@ -2413,7 +2413,7 @@ namespace SlaveMatrix parT7.StringFormat.LineAlignment = StringAlignment.Center; parT7.PositionBase = parT6.PositionBase.AddY(0.015); string Path = "Photo"; - Film = new Are(Med, Hit: false); + Film = new RenderArea(Med, Hit: false); 撮影 = new But1(parT7, delegate { //Sounds.撮影.Play(); @@ -2434,13 +2434,13 @@ namespace SlaveMatrix } try { - 調教UI2.Film.GD.DrawString("Slave Matrix " + now.ToShortDateString().Replace("/", "."), font, Brushes.Coral, x, y); + 調教UI2.Film.DisplayGraphics.DrawString("Slave Matrix " + now.ToShortDateString().Replace("/", "."), font, Brushes.Coral, x, y); } finally { ((IDisposable)font)?.Dispose(); } - 調教UI2.Film.Dis.Save(Path + "\\" + now.ToString("yyyy_MM_dd_HH_mm_ss") + ".png", ImageFormat.Png); + 調教UI2.Film.DisplayLayer.Save(Path + "\\" + now.ToString("yyyy_MM_dd_HH_mm_ss") + ".png", ImageFormat.Png); ip.SubInfoIm = GameText.撮影しました + "\r\n" + GameText.写真はPhotoフォルダに保存されます; if (Sta.GameData.TrainingTarget.Trained && !調教UI2.Cha.Bod.Is拘束 && 調教UI2.Cha.Bod.Is腕人 && !Sta.GameData.TrainingTarget.ChaD.撮影ピース経験) { @@ -2782,7 +2782,7 @@ namespace SlaveMatrix 擬音.Clear(); } - public void 描画糸(Are Are) + public void 描画糸(RenderArea Are) { foreach (挿入処理 item in SubFocus) { @@ -2793,7 +2793,7 @@ namespace SlaveMatrix } } - public void 描画肛(Are Are) + public void 描画肛(RenderArea Are) { if (膣i肛f) { @@ -2829,7 +2829,7 @@ namespace SlaveMatrix } } - public override void 描画0(Are Are) + public override void 描画0(RenderArea Are) { foreach (挿入処理 item in SubFocus) { @@ -2848,7 +2848,7 @@ namespace SlaveMatrix } } - public override void 描画1(Are Are) + public override void 描画1(RenderArea Are) { if (ハンド挿入.Is膣) { @@ -2867,7 +2867,7 @@ namespace SlaveMatrix } } - public override void 描画2(Are Are) + public override void 描画2(RenderArea Are) { if (射精.表示) { @@ -2915,7 +2915,7 @@ namespace SlaveMatrix } } - public void StaDraw(Are Are, FPS FPS) + public void StaDraw(RenderArea Are, FPS FPS) { Player.表示ステート更新(); Player.ModBox(); @@ -2975,7 +2975,7 @@ namespace SlaveMatrix } } - public void DrawState(Are Are) + public void DrawState(RenderArea Are) { Player.表示ステート更新(); Player.ModBox(); @@ -3058,7 +3058,7 @@ namespace SlaveMatrix SensitivityBox = new Tex("Sens", new Vector2D(num + 0.02, 0.08), 0.1, 0.6, 1.99, new Font("MS Gothic", 1f), 0.057, 0, "", Col.White, Col.Transparent, Color.FromArgb(5, Col.DarkMagenta), 100.0); } - public void StaminaButtons(Are Are, Med Med, InfoPanel ip) + public void StaminaButtons(RenderArea Are, ModeEventDispatcher Med, InfoPanel ip) { double x = 0.08; double y = 0.1; @@ -3072,7 +3072,7 @@ namespace SlaveMatrix parT.SizeBase = 0.095; parT.Font = new Font("MS Gothic", 1f); parT.FontSize = 0.07; - parT.SetStringRectOutline(Are.Unit, Are.GD); + parT.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT.RectSize = new Vector2D(parT.OP[0].ps[1].X, parT.OP[0].ps[2].Y); parT.OP.ScalingY(parT.BasePointBase, 0.9); parT.Closed = true; @@ -3094,7 +3094,7 @@ namespace SlaveMatrix parT2.SizeBase = 0.095; parT2.Font = new Font("MS Gothic", 1f); parT2.FontSize = 0.07; - parT2.SetStringRectOutline(Are.Unit, Are.GD); + parT2.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); parT2.RectSize = new Vector2D(parT2.OP[0].ps[1].X, parT2.OP[0].ps[2].Y); parT2.OP.ScalingY(parT2.BasePointBase, 0.9); parT2.Closed = true; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs index e035899..34e6016 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Uni.cs @@ -4,9 +4,9 @@ namespace SlaveMatrix { public static class Uni { - public static 頭D 頭() + public static HeadD 頭() { - 頭D obj = new 頭D(); + HeadD obj = new HeadD(); obj.基髪接続(new 基髪D()); obj.目左接続(new 目傷D()); obj.目右接続(new 目傷D @@ -35,9 +35,9 @@ namespace SlaveMatrix return obj; } - public static 胸D 胸() + public static ChestD Chest() { - 胸D obj = new 胸D(); + ChestD obj = new ChestD(); obj.肌接続(new 胸毛D()); obj.肌接続(new 胸肌D()); obj.肌接続(new 胸腹板D()); @@ -53,18 +53,18 @@ namespace SlaveMatrix return obj; } - public static 胴D 胴() + public static TorsoD 胴() { - 胴D obj = new 胴D(); + TorsoD obj = new TorsoD(); obj.肌接続(new 胴腹板D()); obj.肌接続(new 胴肌D()); obj.肌接続(new 上着ミドル_ドレスD()); return obj; } - public static 腰D 腰() + public static WaistD 腰() { - 腰D waist_description = new 腰D(); + WaistD waist_description = new WaistD(); waist_description.膣基接続(new 膣基_人D()); waist_description.膣基接続(new 膣内精液_人D()); waist_description.膣基接続(new 断面_人D()); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs index fa35748..fa3aea4 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs @@ -563,7 +563,7 @@ namespace SlaveMatrix Muscular = ChaD.body_tree.筋肉; } - public void SetViola(Med Med, Are Are) + public void SetViola(ModeEventDispatcher Med, RenderArea Are) { 階層位置 = 0; RoomNumber = 0; @@ -993,7 +993,7 @@ namespace SlaveMatrix } if (eleD is 胸肌D) { - if (eleD.接続情報 == ConnectionInfo.胸_肌_接続) + if (eleD.接続情報 == ConnectionInfo.Chest_肌_接続) { 胸肌D2 = (胸肌D)eleD; } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs b/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs index 97ba431..5a63814 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/_Con.cs @@ -4,20 +4,20 @@ namespace SlaveMatrix.GameClasses { public static class _Con { - public static 胸D Get胸R() + public static ChestD GetChestR() { - 胸D obj = Uni.胸(); + ChestD obj = Uni.Chest(); Sta.SetValuesD(value: RNG.XS.NextDouble(), src: obj.EnumEleD(), s: "バスト"); return obj; } - public static 頭D Get頭R() + public static HeadD Get頭R() { - 頭D obj = Uni.頭().SetRandom(); + HeadD obj = Uni.頭().SetRandom(); 基髪D 基髪D2 = (基髪D)obj.基髪_接続[0]; EleD eleD = Get後髪0R(); 基髪D2.後髪接続(eleD); - if ((eleD is 後髪0_ジグD || eleD is 後髪0_ハネD || eleD is 後髪0_パツD || eleD is 後髪0_カルD || eleD is 後髪0_肢系D) && RNG.XS.NextBool()) + if ((eleD is BackHair0_ジグD || eleD is BackHair0_ハネD || eleD is BackHair0_パツD || eleD is BackHair0_カルD || eleD is BackHair0_肢系D) && RNG.XS.NextBool()) { 基髪D2.後髪接続(Get後髪1R()); } @@ -28,13 +28,13 @@ namespace SlaveMatrix.GameClasses return obj; } - public static 頭D Get頭R1() + public static HeadD Get頭R1() { - 頭D obj = Uni.頭().SetRandom(); + HeadD obj = Uni.頭().SetRandom(); 基髪D 基髪D2 = (基髪D)obj.基髪_接続[0]; EleD eleD = Get後髪0R(); 基髪D2.後髪接続(eleD); - if ((eleD is 後髪0_ジグD || eleD is 後髪0_ハネD || eleD is 後髪0_パツD || eleD is 後髪0_カルD || eleD is 後髪0_肢系D) && RNG.XS.NextBool()) + if ((eleD is BackHair0_ジグD || eleD is BackHair0_ハネD || eleD is BackHair0_パツD || eleD is BackHair0_カルD || eleD is BackHair0_肢系D) && RNG.XS.NextBool()) { 基髪D2.後髪接続(Get後髪1R()); } @@ -138,27 +138,27 @@ namespace SlaveMatrix.GameClasses { return RNG.XS.NextM(20) switch { - 0 => new 後髪0_ジグD().SetRandom(), - 1 => new 後髪0_ハネD().SetRandom(), - 2 => new 後髪0_パツD().SetRandom(), - 3 => new 後髪0_カルD().SetRandom(), - 4 => new 後髪0_肢系D().SetRandom(), + 0 => new BackHair0_ジグD().SetRandom(), + 1 => new BackHair0_ハネD().SetRandom(), + 2 => new BackHair0_パツD().SetRandom(), + 3 => new BackHair0_カルD().SetRandom(), + 4 => new BackHair0_肢系D().SetRandom(), 5 => new 後髪0_編1ジグD().SetRandom(), 6 => new 後髪0_編1ハネD().SetRandom(), - 7 => new 後髪0_編1パツD().SetRandom(), - 8 => new 後髪0_編1カルD().SetRandom(), - 9 => new 後髪0_下1ジグD().SetRandom(), - 10 => new 後髪0_下1ハネD().SetRandom(), - 11 => new 後髪0_下1パツD().SetRandom(), - 12 => new 後髪0_下1カルD().SetRandom(), + 7 => new BackHair0_編1パツD().SetRandom(), + 8 => new BackHair0_編1カルD().SetRandom(), + 9 => new BackHair0_下1ジグD().SetRandom(), + 10 => new BackHair0_下1ハネD().SetRandom(), + 11 => new BackHair0_下1パツD().SetRandom(), + 12 => new BackHair0_下1カルD().SetRandom(), 13 => new 後髪0_編2ジグD().SetRandom(), 14 => new 後髪0_編2ハネD().SetRandom(), 15 => new 後髪0_編2パツD().SetRandom(), 16 => new 後髪0_編2カルD().SetRandom(), - 17 => new 後髪0_下2ジグD().SetRandom(), + 17 => new BackHair0_下2ジグD().SetRandom(), 18 => new 後髪0_下2ハネD().SetRandom(), - 19 => new 後髪0_下2パツD().SetRandom(), - _ => new 後髪0_下2カルD().SetRandom(), + 19 => new BackHair0_下2パツD().SetRandom(), + _ => new BackHair0_下2カルD().SetRandom(), }; } @@ -166,15 +166,15 @@ namespace SlaveMatrix.GameClasses { return RNG.XS.NextM(8) switch { - 0 => new 後髪1_結1ジグD().SetRandom(), - 1 => new 後髪1_結1ハネD().SetRandom(), - 2 => new 後髪1_結1パツD().SetRandom(), - 3 => new 後髪1_結1カルD().SetRandom(), - 4 => new 後髪1_編結D().SetRandom(), - 5 => new 後髪1_結2ジグD().SetRandom(), - 6 => new 後髪1_結2ハネD().SetRandom(), - 7 => new 後髪1_結2パツD().SetRandom(), - _ => new 後髪1_結2カルD().SetRandom(), + 0 => new BackHair1_結1ジグD().SetRandom(), + 1 => new BackHair1_結1ハネD().SetRandom(), + 2 => new BackHair1_結1パツD().SetRandom(), + 3 => new BackHair1_結1カルD().SetRandom(), + 4 => new BackHair1_編結D().SetRandom(), + 5 => new BackHair1_結2ジグD().SetRandom(), + 6 => new BackHair1_結2ハネD().SetRandom(), + 7 => new BackHair1_結2パツD().SetRandom(), + _ => new BackHair1_結2カルD().SetRandom(), }; } @@ -182,27 +182,27 @@ namespace SlaveMatrix.GameClasses { return RNG.XS.NextM(5) switch { - 0 => new 横髪_ジグD + 0 => new SideHair_ジグD { 右 = 右 }.SetRandom(), - 1 => new 横髪_ハネD + 1 => new SideHair_ハネD { 右 = 右 }.SetRandom(), - 2 => new 横髪_パツD + 2 => new SideHair_パツD { 右 = 右 }.SetRandom(), - 3 => new 横髪_カルD + 3 => new SideHair_カルD { 右 = 右 }.SetRandom(), - 4 => new 横髪_編みD + 4 => new SideHair_編みD { 右 = 右 }.SetRandom(), - _ => new 横髪_肢系D + _ => new SideHair_肢系D { 右 = 右 }, @@ -269,42 +269,42 @@ namespace SlaveMatrix.GameClasses }; } - public static 胴D Set胴(this 腰D 腰) + public static TorsoD Set胴(this WaistD 腰) { - 胴D 胴D2 = Uni.胴(); + TorsoD 胴D2 = Uni.胴(); 腰.胴接続(胴D2); return 胴D2; } - public static 胸D Set胸R(this 胴D 胴) + public static ChestD SetChestR(this TorsoD 胴) { - 胸D 胸D2 = Get胸R(); - 胴.胸接続(胸D2); - return 胸D2; + ChestD ChestD2 = GetChestR(); + 胴.Torso接続(ChestD2); + return ChestD2; } - public static 首D Set首(this 胸D 胸) + public static NeckD Set首(this ChestD Chest) { - 首D 首D2 = new 首D(); - 胸.首接続(首D2); + NeckD 首D2 = new NeckD(); + Chest.首接続(首D2); return 首D2; } - public static 頭D Set頭R(this 首D 首) + public static HeadD Set頭R(this NeckD 首) { - 頭D 頭D2 = Get頭R(); + HeadD 頭D2 = Get頭R(); 首.頭接続(頭D2); return 頭D2; } - public static 頭D Set頭R1(this 首D 首) + public static HeadD Set頭R1(this NeckD 首) { - 頭D 頭D2 = Get頭R1(); + HeadD 頭D2 = Get頭R1(); 首.頭接続(頭D2); return 頭D2; } - public static void Set双目R(this 頭D 頭) + public static void Set双目R(this HeadD 頭) { 双目D 双目D2 = Get双眼R(右: false); 頭.目左接続(双目D2); @@ -314,7 +314,7 @@ namespace SlaveMatrix.GameClasses 頭.眉右接続(眉D2.Get逆()); } - public static void Set目弱R(this 頭D 頭) + public static void Set目弱R(this HeadD 頭) { 双目D 双目D2 = Uni.魔弱目(右: false); ((瞼_弱D)双目D2.瞼_接続[0]).SetRandom(); @@ -325,7 +325,7 @@ namespace SlaveMatrix.GameClasses 頭.眉右接続(眉D2.Get逆()); } - public static void Set目宇R(this 頭D 頭) + public static void Set目宇R(this HeadD 頭) { 双目D 双目D2 = Uni.宇宙目(右: false); ((瞼_宇D)双目D2.瞼_接続[0]).SetRandom(); @@ -336,23 +336,23 @@ namespace SlaveMatrix.GameClasses 頭.眉右接続(眉D2.Get逆()); } - public static void Set単目R(this 頭D 頭) + public static void Set単目R(this HeadD 頭) { 頭.単眼目接続(Get単眼R()); 頭.単眼眉接続(Get単眼眉R()); } - public static void Set鼻R(this 頭D 頭) + public static void Set鼻R(this HeadD 頭) { 頭.鼻接続(Get鼻R()); } - public static void Set鼻人(this 頭D 頭) + public static void Set鼻人(this HeadD 頭) { 頭.鼻接続(Uni.人鼻D()); } - public static void Set口R(this 頭D 頭) + public static void Set口R(this HeadD 頭) { EleD[] array = Get口R(); foreach (EleD e in array) @@ -361,7 +361,7 @@ namespace SlaveMatrix.GameClasses } } - public static void Set口人(this 頭D 頭) + public static void Set口人(this HeadD 頭) { EleD[] array = Uni.人口D(); foreach (EleD e in array) @@ -370,7 +370,7 @@ namespace SlaveMatrix.GameClasses } } - public static void Set口裂(this 頭D 頭) + public static void Set口裂(this HeadD 頭) { EleD[] array = Uni.裂口D(); foreach (EleD e in array) @@ -379,52 +379,52 @@ namespace SlaveMatrix.GameClasses } } - public static void Set舌短(this 頭D 頭) + public static void Set舌短(this HeadD 頭) { 頭.口接続(new 舌_短D()); } - public static void Set舌長(this 頭D 頭) + public static void Set舌長(this HeadD 頭) { 頭.口接続(new 舌_長D()); } - public static void Set耳人(this 頭D 頭) + public static void Set耳人(this HeadD 頭) { 耳_人D 耳_人D2 = new 耳_人D(); 頭.耳左接続(耳_人D2); 頭.耳右接続(耳_人D2.Get逆()); } - public static void Set耳尖(this 頭D 頭) + public static void Set耳尖(this HeadD 頭) { 耳_尖D 耳_尖D2 = new 耳_尖D(); 頭.耳左接続(耳_尖D2); 頭.耳右接続(耳_尖D2.Get逆()); } - public static void Set耳長(this 頭D 頭) + public static void Set耳長(this HeadD 頭) { 耳_長D 耳_長D2 = new 耳_長D(); 頭.耳左接続(耳_長D2); 頭.耳右接続(耳_長D2.Get逆()); } - public static void Set耳鰭(this 頭D 頭) + public static void Set耳鰭(this HeadD 頭) { 耳_鰭D 耳_鰭D2 = new 耳_鰭D(); 頭.耳左接続(耳_鰭D2); 頭.耳右接続(耳_鰭D2.Get逆()); } - public static void Set耳羽(this 頭D 頭) + public static void Set耳羽(this HeadD 頭) { 耳_羽D 耳_羽D2 = new 耳_羽D(); 頭.耳左接続(耳_羽D2); 頭.耳右接続(耳_羽D2.Get逆()); } - public static void Set耳獣(this 頭D 頭) + public static void Set耳獣(this HeadD 頭) { 耳_獣D 耳_獣D2 = new 耳_獣D(); 頭.耳左接続(耳_獣D2);