diff --git a/2DGAMELIB/_2DGAMELIB/Mot.cs b/2DGAMELIB/_2DGAMELIB/Motion.cs similarity index 51% rename from 2DGAMELIB/_2DGAMELIB/Mot.cs rename to 2DGAMELIB/_2DGAMELIB/Motion.cs index e0ceaae..abf558b 100644 --- a/2DGAMELIB/_2DGAMELIB/Mot.cs +++ b/2DGAMELIB/_2DGAMELIB/Motion.cs @@ -2,25 +2,25 @@ using System; namespace _2DGAMELIB { - public class Mot : MotV + public class Motion : MotV { - public Action Staing; + public Action OnStart; - public Action Runing; + public Action OnUpdate; - public Action Reaing; + public Action OnReach; - public Action Rouing; + public Action OnLoop; - public Action Ending; + public Action OnEnd; - private bool run; + private bool run; //OnUpdate - private bool rou; + private bool rou; //OnLoop public bool Run => run; - public Mot(double Min, double Max) + public Motion(double Min, double Max) : base(Min, Max) { } @@ -32,23 +32,23 @@ namespace _2DGAMELIB return; } base.GetValue(FPS); - if (Runing != null) + if (OnUpdate != null) { - Runing(this); + OnUpdate(this); } if (Value == min) { - if (rou && Rouing != null) + if (rou && OnLoop != null) { - Rouing(this); + OnLoop(this); } rou = false; } else if (Value == max) { - if (Reaing != null) + if (OnReach != null) { - Reaing(this); + OnReach(this); } rou = true; } @@ -56,9 +56,9 @@ namespace _2DGAMELIB public void Start() { - if (Staing != null) + if (OnStart != null) { - Staing(this); + OnStart(this); } run = true; } @@ -66,9 +66,9 @@ namespace _2DGAMELIB public void End() { run = false; - if (Ending != null) + if (OnEnd != null) { - Ending(this); + OnEnd(this); } ResetValue(); rou = false; diff --git a/2DGAMELIB/_2DGAMELIB/Mots.cs b/2DGAMELIB/_2DGAMELIB/Motions.cs similarity index 66% rename from 2DGAMELIB/_2DGAMELIB/Mots.cs rename to 2DGAMELIB/_2DGAMELIB/Motions.cs index 5264f87..5c2892f 100644 --- a/2DGAMELIB/_2DGAMELIB/Mots.cs +++ b/2DGAMELIB/_2DGAMELIB/Motions.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; namespace _2DGAMELIB { - public class Mots + public class Motions { - public Dictionary ms; + public Dictionary ms; - public Mot this[string Name] + public Motion this[string Name] { get { @@ -18,12 +18,12 @@ namespace _2DGAMELIB } } - public Mots() + public Motions() { - ms = new Dictionary(); + ms = new Dictionary(); } - public void Add(string Name, Mot Mot) + public void Add(string Name, Motion Mot) { //Broke some times here when adding existing keys //ms.Add(Name, Mot); @@ -37,7 +37,7 @@ namespace _2DGAMELIB public void Drive(FPS FPS) { - foreach (Mot value in ms.Values) + foreach (Motion value in ms.Values) { value.GetValue(FPS); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs index 6dcf26c..36ef82d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カル.cs @@ -291,7 +291,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -378,7 +378,7 @@ namespace SlaveMatrix } } - public BackHair0_カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_カルD e) + public BackHair0_カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_カルD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -465,7 +465,7 @@ namespace SlaveMatrix X0Y0_髪右3CP = new ColorP(X0Y0_髪右3, 髪右3CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); X0Y0_髪右5CP = new ColorP(X0Y0_髪右5, 髪右5CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -638,12 +638,12 @@ namespace SlaveMatrix X0Y0_髪右5CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪中CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs index f7c1ef4..5841c52 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_カルD.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs index 5d00a63..b029762 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグ.cs @@ -291,7 +291,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -378,7 +378,7 @@ namespace SlaveMatrix } } - public BackHair0_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_ジグD e) + public BackHair0_ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -465,7 +465,7 @@ namespace SlaveMatrix X0Y0_髪右3CP = new ColorP(X0Y0_髪右3, 髪右3CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); X0Y0_髪右5CP = new ColorP(X0Y0_髪右5, 髪右5CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -540,12 +540,12 @@ namespace SlaveMatrix X0Y0_髪右5CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪中CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs index 8ff75d9..7824f1d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ジグD.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs index dd80b62..527597f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネ.cs @@ -291,7 +291,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -378,7 +378,7 @@ namespace SlaveMatrix } } - public 後髪0_ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_ハネD e) + public 後髪0_ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_ハネD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -465,7 +465,7 @@ namespace SlaveMatrix X0Y0_髪右3CP = new ColorP(X0Y0_髪右3, 髪右3CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); X0Y0_髪右5CP = new ColorP(X0Y0_髪右5, 髪右5CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -540,12 +540,12 @@ namespace SlaveMatrix X0Y0_髪右5CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪中CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs index eb0f0b7..0ca65e9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_ハネD.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後髪0_ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs index 79d503a..496b046 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツ.cs @@ -291,7 +291,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -378,7 +378,7 @@ namespace SlaveMatrix } } - public BackHair0_パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_パツD e) + public BackHair0_パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_パツD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -465,7 +465,7 @@ namespace SlaveMatrix X0Y0_髪右3CP = new ColorP(X0Y0_髪右3, 髪右3CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); X0Y0_髪右5CP = new ColorP(X0Y0_髪右5, 髪右5CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -529,12 +529,12 @@ namespace SlaveMatrix X0Y0_髪右5CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪中CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs index 5a15f7c..ee21d59 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_パツD.cs @@ -55,7 +55,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs index 145b750..a8e4027 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カル.cs @@ -231,7 +231,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -301,7 +301,7 @@ namespace SlaveMatrix } } - public BackHair0_下1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下1カルD e) + public BackHair0_下1カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下1カルD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -380,7 +380,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪左2CP = new ColorP(X0Y0_お下げ_髪左2, お下げ_髪左2CD, DisUnit, abj: false); X0Y0_お下げ_髪左1CP = new ColorP(X0Y0_お下げ_髪左1, お下げ_髪左1CD, DisUnit, abj: false); X0Y0_お下げ_髪根CP = new ColorP(X0Y0_お下げ_髪根, お下げ_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -489,12 +489,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs index bf29ce2..376608f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1カルD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下1カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs index e630b72..25414ba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグ.cs @@ -231,7 +231,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -301,7 +301,7 @@ namespace SlaveMatrix } } - public 後髪0_下1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下1ジグD e) + public 後髪0_下1ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下1ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -380,7 +380,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪右2CP = new ColorP(X0Y0_お下げ_髪右2, お下げ_髪右2CD, DisUnit, abj: false); X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪根CP = new ColorP(X0Y0_お下げ_髪根, お下げ_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -449,12 +449,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs index 194695c..2a61a4c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ジグD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後髪0_下1ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs index 0a96cca..8e2dc1f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネ.cs @@ -231,7 +231,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -301,7 +301,7 @@ namespace SlaveMatrix } } - public BackHair0_下1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下1ハネD e) + public BackHair0_下1ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下1ハネD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -380,7 +380,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪右2CP = new ColorP(X0Y0_お下げ_髪右2, お下げ_髪右2CD, DisUnit, abj: false); X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪根CP = new ColorP(X0Y0_お下げ_髪根, お下げ_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -449,12 +449,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs index bcd0d03..78a835e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1ハネD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下1ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs index 48770e5..efecfc1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツ.cs @@ -231,7 +231,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -301,7 +301,7 @@ namespace SlaveMatrix } } - public BackHair0_下1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下1パツD e) + public BackHair0_下1パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下1パツD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -380,7 +380,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪右2CP = new ColorP(X0Y0_お下げ_髪右2, お下げ_髪右2CD, DisUnit, abj: false); X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪根CP = new ColorP(X0Y0_お下げ_髪根, お下げ_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -444,12 +444,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs index 5fddc4f..9e79836 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下1パツD.cs @@ -49,7 +49,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下1パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs index bd8a639..bfe5ae9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カル.cs @@ -271,7 +271,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -345,7 +345,7 @@ namespace SlaveMatrix } } - public BackHair0_下2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下2カルD e) + public BackHair0_下2カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下2カルD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -431,7 +431,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右CP = new ColorP(X0Y0_お下げ右_髪右, お下げ右_髪右CD, DisUnit, abj: false); X0Y0_お下げ右_髪左CP = new ColorP(X0Y0_お下げ右_髪左, お下げ右_髪左CD, DisUnit, abj: false); X0Y0_お下げ右_髪根CP = new ColorP(X0Y0_お下げ右_髪根, お下げ右_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -554,12 +554,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ左_髪縛1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs index 269f9e3..7cf6191 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2カルD.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下2カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs index 1261646..f360a38 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグ.cs @@ -271,7 +271,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -345,7 +345,7 @@ namespace SlaveMatrix } } - public BackHair0_下2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下2ジグD e) + public BackHair0_下2ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下2ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -431,7 +431,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右CP = new ColorP(X0Y0_お下げ右_髪右, お下げ右_髪右CD, DisUnit, abj: false); X0Y0_お下げ右_髪左CP = new ColorP(X0Y0_お下げ右_髪左, お下げ右_髪左CD, DisUnit, abj: false); X0Y0_お下げ右_髪根CP = new ColorP(X0Y0_お下げ右_髪根, お下げ右_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -506,12 +506,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ左_髪縛1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs index 37bc310..ea0e993 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ジグD.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下2ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs index a414e01..d98b1ca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネ.cs @@ -271,7 +271,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -345,7 +345,7 @@ namespace SlaveMatrix } } - public BackHair0_下2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_下2ハネD e) + public BackHair0_下2ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_下2ハネD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -431,7 +431,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪左CP = new ColorP(X0Y0_お下げ右_髪左, お下げ右_髪左CD, DisUnit, abj: false); X0Y0_お下げ右_髪右CP = new ColorP(X0Y0_お下げ右_髪右, お下げ右_髪右CD, DisUnit, abj: false); X0Y0_お下げ右_髪根CP = new ColorP(X0Y0_お下げ右_髪根, お下げ右_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -506,12 +506,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ左_髪縛1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs index 1cbbc0c..9c204f7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2ハネD.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下2ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs index 777f5cc..4d8c4a0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツ.cs @@ -271,7 +271,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -345,7 +345,7 @@ namespace SlaveMatrix } } - public BackHair0_下2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_下2パツD e) + public BackHair0_下2パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_下2パツD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -431,7 +431,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右CP = new ColorP(X0Y0_お下げ右_髪右, お下げ右_髪右CD, DisUnit, abj: false); X0Y0_お下げ右_髪左CP = new ColorP(X0Y0_お下げ右_髪左, お下げ右_髪左CD, DisUnit, abj: false); X0Y0_お下げ右_髪根CP = new ColorP(X0Y0_お下げ右_髪根, お下げ右_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -500,12 +500,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ左_髪縛1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs index 3da53ea..4dde3af 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_下2パツD.cs @@ -53,7 +53,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_下2パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs index 1503dd7..2993cdf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カル.cs @@ -491,7 +491,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public BackHair0_編1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_編1カルD e) + public BackHair0_編1カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_編1カルD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -724,7 +724,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪左1CP = new ColorP(X0Y0_お下げ_髪左1, お下げ_髪左1CD, DisUnit, abj: false); X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪根CP = new ColorP(X0Y0_お下げ_髪根, お下げ_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -848,12 +848,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs index 675c283..4d895c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1カルD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編1カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs index b45b65f..1579dc0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグ.cs @@ -491,7 +491,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public BackHair0_編1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編1ジグD e) + public BackHair0_編1ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編1ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -724,7 +724,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪左1CP = new ColorP(X0Y0_お下げ_髪左1, お下げ_髪左1CD, DisUnit, abj: false); X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪根CP = new ColorP(X0Y0_お下げ_髪根, お下げ_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -848,12 +848,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs index 6755f69..c2cd700 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ジグD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編1ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs index 1e61fac..0c212f6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネ.cs @@ -491,7 +491,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public BackHair0_編1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編1ハネD e) + public BackHair0_編1ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編1ハネD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -724,7 +724,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪左1CP = new ColorP(X0Y0_お下げ_髪左1, お下げ_髪左1CD, DisUnit, abj: false); X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪根CP = new ColorP(X0Y0_お下げ_髪根, お下げ_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -848,12 +848,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs index e3668f7..0e95446 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1ハネD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編1ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs index 43c0e7d..49fc42f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツ.cs @@ -491,7 +491,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public 後髪0_編1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_編1パツD e) + public 後髪0_編1パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_編1パツD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -724,7 +724,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪左1CP = new ColorP(X0Y0_お下げ_髪左1, お下げ_髪左1CD, DisUnit, abj: false); X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪根CP = new ColorP(X0Y0_お下げ_髪根, お下げ_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -845,12 +845,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs index 37051f4..7344468 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編1パツD.cs @@ -75,7 +75,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後髪0_編1パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs index ac841da..1370472 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カル.cs @@ -911,7 +911,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1081,7 +1081,7 @@ namespace SlaveMatrix } } - public 後髪0_編2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編2カルD e) + public 後髪0_編2カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編2カルD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1279,7 +1279,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右1CP = new ColorP(X0Y0_お下げ右_髪右1, お下げ右_髪右1CD, DisUnit, abj: false); X0Y0_お下げ右_髪左1CP = new ColorP(X0Y0_お下げ右_髪左1, お下げ右_髪左1CD, DisUnit, abj: false); X0Y0_お下げ右_髪根CP = new ColorP(X0Y0_お下げ右_髪根, お下げ右_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1499,12 +1499,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ左_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2カルD.cs index 9fcb36b..e1f4662 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後髪0_編2カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs index ea6a4f3..c16edc2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグ.cs @@ -911,7 +911,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1081,7 +1081,7 @@ namespace SlaveMatrix } } - public BackHair0_編2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編2ジグD e) + public BackHair0_編2ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編2ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1279,7 +1279,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右1CP = new ColorP(X0Y0_お下げ右_髪右1, お下げ右_髪右1CD, DisUnit, abj: false); X0Y0_お下げ右_髪左1CP = new ColorP(X0Y0_お下げ右_髪左1, お下げ右_髪左1CD, DisUnit, abj: false); X0Y0_お下げ右_髪根CP = new ColorP(X0Y0_お下げ右_髪根, お下げ右_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1499,12 +1499,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ左_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ジグD.cs index 4abde20..dde6515 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編2ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs index 18bc603..3610d4d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネ.cs @@ -911,7 +911,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1081,7 +1081,7 @@ namespace SlaveMatrix } } - public BackHair0_編2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編2ハネD e) + public BackHair0_編2ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編2ハネD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1279,7 +1279,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右1CP = new ColorP(X0Y0_お下げ右_髪右1, お下げ右_髪右1CD, DisUnit, abj: false); X0Y0_お下げ右_髪左1CP = new ColorP(X0Y0_お下げ右_髪左1, お下げ右_髪左1CD, DisUnit, abj: false); X0Y0_お下げ右_髪根CP = new ColorP(X0Y0_お下げ右_髪根, お下げ右_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1499,12 +1499,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ左_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2ハネD.cs index af4eb30..97e7388 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編2ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs index b3cdbdd..b89ebce 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツ.cs @@ -911,7 +911,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1081,7 +1081,7 @@ namespace SlaveMatrix } } - public BackHair0_編2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後髪0_編2パツD e) + public BackHair0_編2パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後髪0_編2パツD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1279,7 +1279,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右1CP = new ColorP(X0Y0_お下げ右_髪右1, お下げ右_髪右1CD, DisUnit, abj: false); X0Y0_お下げ右_髪左1CP = new ColorP(X0Y0_お下げ右_髪左1, お下げ右_髪左1CD, DisUnit, abj: false); X0Y0_お下げ右_髪根CP = new ColorP(X0Y0_お下げ右_髪根, お下げ右_髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1493,12 +1493,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ左_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編2パツD.cs index ff207df..eebb9fe 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_編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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_編2パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs index 7cee5f0..a2c1784 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -138,7 +138,7 @@ namespace SlaveMatrix public JointS 右5_接続点 => new JointS(Body, X0Y0_髪基, 6); - public BackHair0_肢系(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair0_肢系D e) + public BackHair0_肢系(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair0_肢系D e) { BackHair0_肢系 後髪0_肢系2 = this; ThisType = GetType(); @@ -312,7 +312,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_髪基CP = new ColorP(X0Y0_髪基, 髪基CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -332,12 +332,12 @@ namespace SlaveMatrix X0Y0_髪基CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs index 11ce807..8b1a8e3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair0_肢系D.cs @@ -169,7 +169,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair0_肢系(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs index bfdbefb..842fab5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カル.cs @@ -211,7 +211,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -281,7 +281,7 @@ namespace SlaveMatrix } } - public BackHair1_結1カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結1カルD e) + public BackHair1_結1カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結1カルD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -353,7 +353,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪右2CP = new ColorP(X0Y0_お下げ_髪右2, お下げ_髪右2CD, DisUnit, abj: false); X0Y0_お下げ_髪右3CP = new ColorP(X0Y0_お下げ_髪右3, お下げ_髪右3CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -368,12 +368,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪右3CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); お下げ_髪根CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs index e920342..44f1d54 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1カルD.cs @@ -44,7 +44,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結1カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs index 727a0a0..5592b81 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグ.cs @@ -211,7 +211,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -281,7 +281,7 @@ namespace SlaveMatrix } } - public BackHair1_結1ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結1ジグD e) + public BackHair1_結1ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結1ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -353,7 +353,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪右2CP = new ColorP(X0Y0_お下げ_髪右2, お下げ_髪右2CD, DisUnit, abj: false); X0Y0_お下げ_髪右3CP = new ColorP(X0Y0_お下げ_髪右3, お下げ_髪右3CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -368,12 +368,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪右3CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); お下げ_髪根CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs index d9f088d..d8b21af 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ジグD.cs @@ -44,7 +44,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結1ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs index 82d4edc..99e9602 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネ.cs @@ -211,7 +211,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -281,7 +281,7 @@ namespace SlaveMatrix } } - public BackHair1_結1ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結1ハネD e) + public BackHair1_結1ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結1ハネD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -353,7 +353,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪右2CP = new ColorP(X0Y0_お下げ_髪右2, お下げ_髪右2CD, DisUnit, abj: false); X0Y0_お下げ_髪右3CP = new ColorP(X0Y0_お下げ_髪右3, お下げ_髪右3CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -368,12 +368,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪右3CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); お下げ_髪根CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs index acbeeef..84bb33e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1ハネD.cs @@ -44,7 +44,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結1ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs index e7f5b79..c5cfa9a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツ.cs @@ -211,7 +211,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -281,7 +281,7 @@ namespace SlaveMatrix } } - public BackHair1_結1パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結1パツD e) + public BackHair1_結1パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結1パツD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -353,7 +353,7 @@ namespace SlaveMatrix X0Y0_お下げ_髪右1CP = new ColorP(X0Y0_お下げ_髪右1, お下げ_髪右1CD, DisUnit, abj: false); X0Y0_お下げ_髪右2CP = new ColorP(X0Y0_お下げ_髪右2, お下げ_髪右2CD, DisUnit, abj: false); X0Y0_お下げ_髪右3CP = new ColorP(X0Y0_お下げ_髪右3, お下げ_髪右3CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -368,12 +368,12 @@ namespace SlaveMatrix X0Y0_お下げ_髪右3CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); お下げ_髪根CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs index 8816947..617a7d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結1パツD.cs @@ -44,7 +44,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結1パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs index 9616805..c38ced3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カル.cs @@ -191,7 +191,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -258,7 +258,7 @@ namespace SlaveMatrix } } - public BackHair1_結2カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結2カルD e) + public BackHair1_結2カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結2カルD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -328,7 +328,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右根CP = new ColorP(X0Y0_お下げ右_髪右根, お下げ右_髪右根CD, DisUnit, abj: false); X0Y0_お下げ右_髪右1CP = new ColorP(X0Y0_お下げ右_髪右1, お下げ右_髪右1CD, DisUnit, abj: false); X0Y0_お下げ右_髪右2CP = new ColorP(X0Y0_お下げ右_髪右2, お下げ右_髪右2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -342,12 +342,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); お下げ左_髪左根CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs index f65dfb2..199250f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2カルD.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結2カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs index a237b8a..5cd2b8c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグ.cs @@ -191,7 +191,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -258,7 +258,7 @@ namespace SlaveMatrix } } - public BackHair1_結2ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結2ジグD e) + public BackHair1_結2ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結2ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -328,7 +328,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右根CP = new ColorP(X0Y0_お下げ右_髪右根, お下げ右_髪右根CD, DisUnit, abj: false); X0Y0_お下げ右_髪右1CP = new ColorP(X0Y0_お下げ右_髪右1, お下げ右_髪右1CD, DisUnit, abj: false); X0Y0_お下げ右_髪右2CP = new ColorP(X0Y0_お下げ右_髪右2, お下げ右_髪右2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -342,12 +342,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); お下げ左_髪左根CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs index d6d191a..0f52e1b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ジグD.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結2ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs index 7734837..4428d29 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネ.cs @@ -191,7 +191,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -258,7 +258,7 @@ namespace SlaveMatrix } } - public BackHair1_結2ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結2ハネD e) + public BackHair1_結2ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結2ハネD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -328,7 +328,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右根CP = new ColorP(X0Y0_お下げ右_髪右根, お下げ右_髪右根CD, DisUnit, abj: false); X0Y0_お下げ右_髪右1CP = new ColorP(X0Y0_お下げ右_髪右1, お下げ右_髪右1CD, DisUnit, abj: false); X0Y0_お下げ右_髪右2CP = new ColorP(X0Y0_お下げ右_髪右2, お下げ右_髪右2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -342,12 +342,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); お下げ左_髪左根CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs index 4b71267..5b026ed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2ハネD.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結2ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs index 3aabe07..91b82a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツ.cs @@ -191,7 +191,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -258,7 +258,7 @@ namespace SlaveMatrix } } - public BackHair1_結2パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_結2パツD e) + public BackHair1_結2パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_結2パツD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -328,7 +328,7 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右根CP = new ColorP(X0Y0_お下げ右_髪右根, お下げ右_髪右根CD, DisUnit, abj: false); X0Y0_お下げ右_髪右1CP = new ColorP(X0Y0_お下げ右_髪右1, お下げ右_髪右1CD, DisUnit, abj: false); X0Y0_お下げ右_髪右2CP = new ColorP(X0Y0_お下げ右_髪右2, お下げ右_髪右2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -342,12 +342,12 @@ namespace SlaveMatrix X0Y0_お下げ右_髪右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); お下げ左_髪左根CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs index 9dc4934..546ddef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_結2パツD.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_結2パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs index 41e95d6..c33e085 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結.cs @@ -351,7 +351,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -408,7 +408,7 @@ namespace SlaveMatrix } } - public BackHair1_編結(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, BackHair1_編結D e) + public BackHair1_編結(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, BackHair1_編結D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -506,7 +506,7 @@ namespace SlaveMatrix X0Y0_お下げ_編節6_髪編目CP = new ColorP(X0Y0_お下げ_編節6_髪編目, お下げ_編節6_髪編目CD, DisUnit, abj: false); X0Y0_お下げ_編節7_髪節CP = new ColorP(X0Y0_お下げ_編節7_髪節, お下げ_編節7_髪節CD, DisUnit, abj: false); X0Y0_お下げ_編節7_髪編目CP = new ColorP(X0Y0_お下げ_編節7_髪編目, お下げ_編節7_髪編目CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -534,12 +534,12 @@ namespace SlaveMatrix X0Y0_お下げ_編節7_髪編目CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); お下げ_編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs index a3baf2c..2297ee9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BackHair1_編結D.cs @@ -52,7 +52,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new BackHair1_編結(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/体配色.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BodyColorSet.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/BodyPartClasses/体配色.cs rename to SlaveMatrix/SlaveMatrix/BodyPartClasses/BodyColorSet.cs index 5024425..387108c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/体配色.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/BodyColorSet.cs @@ -2,7 +2,7 @@ using System.Drawing; namespace SlaveMatrix { - public class 体配色 + public class BodyColorSet { public Color2 髪O; @@ -218,7 +218,7 @@ namespace SlaveMatrix public Color 尿線; - public 体配色(体色 色) + public BodyColorSet(体色 色) { if (色.粘膜 == Col.Empty) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs index fbcf03f..5d6faa7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Chest.cs @@ -1321,7 +1321,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1412,7 +1412,7 @@ namespace SlaveMatrix public JointS 背中_接続点 => new JointS(Body, X0Y0_胸郭, 10); - public Chest(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ChestD e) + public Chest(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ChestD e) { Chest Chest2 = this; ThisType = GetType(); @@ -1776,7 +1776,7 @@ namespace SlaveMatrix 傷X左濃度 = e.傷X左濃度; 傷X右濃度 = e.傷X右濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度B = 0.99; 尺度YB = 0.99; } @@ -1969,12 +1969,12 @@ namespace SlaveMatrix X0Y0_ハイライト内右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 胸郭CD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋肉_筋肉左CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs index 186f865..aaee1ac 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ChestD.cs @@ -273,7 +273,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Chest(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs index c1271b2..907c9d8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Cough.cs @@ -315,7 +315,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -346,7 +346,7 @@ namespace SlaveMatrix } } - public Cough(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 咳D e) + public Cough(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 咳D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["Cough"]); @@ -454,7 +454,7 @@ namespace SlaveMatrix X0Y4_雫3CP = new ColorP(X0Y4_雫3, 雫3CD, DisUnit, abj: true); X0Y4_雫4CP = new ColorP(X0Y4_雫4, 雫4CD, DisUnit, abj: true); X0Y4_雫5CP = new ColorP(X0Y4_雫5, 雫5CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -504,12 +504,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 咳基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 雫1CD = new ColorD(ref Col.Empty, ref 体配色.体液); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs index 778f963..b197321 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Head.cs @@ -896,7 +896,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1033,7 +1033,7 @@ namespace SlaveMatrix public JointS 触覚右_接続点 => new JointS(Body, X0Y0_Head, 18); - public Head(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, HeadD e) + public Head(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, HeadD e) { Head 頭2 = this; ThisType = GetType(); @@ -1455,7 +1455,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); - 濃度 = e.濃度; + Intensity = e.濃度; X0Y0_Head.JP[8].Joint = X0Y0_Head.JP[8].Joint.AddX(-0.00012); X0Y0_Head.JP[9].Joint = X0Y0_Head.JP[9].Joint.AddX(0.00012); } @@ -1675,12 +1675,12 @@ namespace SlaveMatrix X0Y0_虫性_顎下CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { HeadCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 悪タトゥ_逆十字_逆十字1CD = new ColorD(ref 体配色.刺青.Col1, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs index b7137e9..027a84a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/HeadD.cs @@ -302,7 +302,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Head(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs index 9c63692..d44e94a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs @@ -5386,7 +5386,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -5752,7 +5752,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_脚輪下_金具右, 0); - public Leg_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_人D e) + public Leg_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, Leg_人D e) { Leg_人 Leg_人2 = this; ThisType = GetType(); @@ -7035,7 +7035,7 @@ namespace SlaveMatrix 傷I4濃度 = e.傷I4濃度; 傷I5濃度 = e.傷I5濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -7932,7 +7932,7 @@ namespace SlaveMatrix 鎖3.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -7978,7 +7978,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -8180,7 +8180,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -8382,7 +8382,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -8584,7 +8584,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色B0(体配色 体配色) + private void 配色B0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -8786,7 +8786,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色BT1(体配色 体配色) + private void 配色BT1(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -8988,7 +8988,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色BT0(体配色 体配色) + private void 配色BT0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -9190,7 +9190,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色C0(体配色 体配色) + private void 配色C0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -9392,7 +9392,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色CT1(体配色 体配色) + private void 配色CT1(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -9594,7 +9594,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色CT0(体配色 体配色) + private void 配色CT0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -9796,7 +9796,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色L0(体配色 体配色) + private void 配色L0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -9998,7 +9998,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色LT1(体配色 体配色) + private void 配色LT1(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -10200,7 +10200,7 @@ namespace SlaveMatrix 脚輪下_金具右CD = new ColorD(); } - private void 配色LT0(体配色 体配色) + private void 配色LT0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs index 70b3d55..2937387 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人D.cs @@ -469,7 +469,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Leg_人_脚輪上_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs index cdcc68f..d2d5afa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣.cs @@ -246,7 +246,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -271,7 +271,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public Leg_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_獣D e) + public Leg_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, Leg_獣D e) { Leg_獣 Leg_獣2 = this; ThisType = GetType(); @@ -351,7 +351,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -401,12 +401,12 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs index 0d452ef..50928d5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_獣D.cs @@ -38,7 +38,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Leg_獣_足_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs index c609584..e318cdc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜.cs @@ -606,7 +606,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -649,7 +649,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public Leg_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_竜D e) + public Leg_竜(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, Leg_竜D e) { Leg_竜 Leg_竜2 = this; ThisType = GetType(); @@ -785,7 +785,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -853,7 +853,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -872,7 +872,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗脹_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -902,7 +902,7 @@ namespace SlaveMatrix 脚輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗脹_鱗1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -932,7 +932,7 @@ namespace SlaveMatrix 脚輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗脹_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs index b702229..8c5b99d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_竜D.cs @@ -74,7 +74,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Leg_竜_足_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs index 8634555..51b20f2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄.cs @@ -246,7 +246,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -271,7 +271,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public Leg_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_蹄D e) + public Leg_蹄(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, Leg_蹄D e) { Leg_蹄 Leg_蹄2 = this; ThisType = GetType(); @@ -351,7 +351,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -401,12 +401,12 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs index 2322d3b..9bae8de 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_蹄D.cs @@ -38,7 +38,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Leg_蹄_足_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs index b69f210..06aa0b1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥.cs @@ -246,7 +246,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -271,7 +271,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public Leg_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Leg_鳥D e) + public Leg_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, Leg_鳥D e) { Leg_鳥 Leg_鳥2 = this; ThisType = GetType(); @@ -351,7 +351,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -401,12 +401,12 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { LegCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs index 9eb540e..e7c17b7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_鳥D.cs @@ -38,7 +38,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Leg_鳥_足_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Leg_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs index 04f8923..91771da 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人.cs @@ -4455,7 +4455,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -4622,7 +4622,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_腕輪_金具右, 0); - public LowerArm_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, LowerArm_人D e) + public LowerArm_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, LowerArm_人D e) { LowerArm_人 LowerArm_人2 = this; ThisType = GetType(); @@ -5284,7 +5284,7 @@ namespace SlaveMatrix 傷I1濃度 = e.傷I1濃度; 傷I2濃度 = e.傷I2濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); 鎖表示 = e.鎖表示; @@ -5665,7 +5665,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -5702,7 +5702,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); @@ -5806,7 +5806,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); @@ -5910,7 +5910,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); @@ -6014,7 +6014,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色B0(体配色 体配色) + private void 配色B0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); @@ -6118,7 +6118,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色BT0(体配色 体配色) + private void 配色BT0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); @@ -6222,7 +6222,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色BT1(体配色 体配色) + private void 配色BT1(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); @@ -6326,7 +6326,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色L0(体配色 体配色) + private void 配色L0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); @@ -6430,7 +6430,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色LT0(体配色 体配色) + private void 配色LT0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); @@ -6534,7 +6534,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色LT1(体配色 体配色) + private void 配色LT1(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.植1O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人D.cs index 9909b9f..53cfe27 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_人D.cs @@ -463,7 +463,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.LowerArm_人_虫鎌_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs index eb6e0ff..f7b678e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣.cs @@ -407,7 +407,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -452,7 +452,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_腕輪_金具右, 0); - public LowerArm_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, LowerArm_獣D e) + public LowerArm_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, LowerArm_獣D e) { LowerArm_獣 LowerArm_獣2 = this; ThisType = GetType(); @@ -559,7 +559,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-20) : 20); @@ -617,7 +617,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -636,7 +636,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); @@ -656,7 +656,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); @@ -676,7 +676,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣D.cs index 31cd436..0d6c5bb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_獣D.cs @@ -54,7 +54,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.LowerArm_獣_手_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs index 18688dc..ca2e3e3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙.cs @@ -487,7 +487,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -560,7 +560,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_腕輪_金具右, 0); - public LowerArm_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, LowerArm_蝙D e) + public LowerArm_蝙(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, LowerArm_蝙D e) { LowerArm_蝙 LowerArm_蝙2 = this; ThisType = GetType(); @@ -688,7 +688,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); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度B = 1.02; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -772,7 +772,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -791,7 +791,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 獣翼LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); @@ -815,7 +815,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 獣翼LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -839,7 +839,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 獣翼LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙D.cs index a22da36..103df61 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蝙D.cs @@ -76,7 +76,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.LowerArm_蝙_腕輪_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs index 40fae54..c81648b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄.cs @@ -114,7 +114,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -142,7 +142,7 @@ namespace SlaveMatrix public JointS 手_接続点 => new JointS(Body, X0Y0_LowerArm, 2); - public LowerArm_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, LowerArm_蹄D e) + public LowerArm_蹄(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, LowerArm_蹄D e) { LowerArm_蹄 LowerArm_蹄2 = this; ThisType = GetType(); @@ -207,7 +207,7 @@ namespace SlaveMatrix X0Y0_LowerArmCP = new ColorP(X0Y0_LowerArm, LowerArmCD, DisUnit, abj: true); X0Y0_筋肉_筋肉下CP = new ColorP(X0Y0_筋肉_筋肉下, 筋肉_筋肉下CD, DisUnit, abj: false); X0Y0_筋肉_筋肉上CP = new ColorP(X0Y0_筋肉_筋肉上, 筋肉_筋肉上CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -224,12 +224,12 @@ namespace SlaveMatrix X0Y0_筋肉_筋肉上CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { LowerArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉_筋肉下CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄D.cs index a80cf0c..bc09a3b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_蹄D.cs @@ -24,7 +24,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.LowerArm_蹄_手_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs index bede25b..ea909f9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥.cs @@ -1266,7 +1266,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2075,7 +2075,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_腕輪_金具右, 0); - public LowerArm_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, LowerArm_鳥D e) + public LowerArm_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, LowerArm_鳥D e) { LowerArm_鳥 LowerArm_鳥2 = this; ThisType = GetType(); @@ -2357,7 +2357,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -2562,7 +2562,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -2581,7 +2581,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鳥翼LowerArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 風切羽_羽15CD = new ColorD(ref Col.Black, ref 体配色.羽1O); @@ -2644,7 +2644,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 鳥翼LowerArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 風切羽_羽15CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -2707,7 +2707,7 @@ namespace SlaveMatrix 腕輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 鳥翼LowerArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 風切羽_羽15CD = new ColorD(ref Col.Black, ref 体配色.羽1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥D.cs index cef21c9..e1d601b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/LowerArm_鳥D.cs @@ -232,7 +232,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.LowerArm_鳥_手_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new LowerArm_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs index 2faebfd..a4243d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Neck.cs @@ -1103,7 +1103,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1169,7 +1169,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_首輪_金具右, 0); - public Neck(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, NeckD e) + public Neck(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, NeckD e) { Neck Neck2 = this; ThisType = GetType(); @@ -1386,7 +1386,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -1536,12 +1536,12 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 植性_蔦CD = new ColorD(ref Col.Black, ref 体配色.植0O); 植性_棘左上CD = new ColorD(ref Col.Black, ref 体配色.植1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs index 2ebe600..0917943 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/NeckD.cs @@ -127,7 +127,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Neck_Head_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Neck(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs index 060e690..8a4fc55 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs @@ -283,7 +283,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -307,7 +307,7 @@ namespace SlaveMatrix public JointS UpperArm_接続点 => new JointS(Body, X0Y0_Shoulder_Shoulder, 1); - public Shoulder(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ShoulderD e) + public Shoulder(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ShoulderD e) { Shoulder Shoulder2 = this; ThisType = GetType(); @@ -394,7 +394,7 @@ namespace SlaveMatrix 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.濃度; + Intensity = e.濃度; X0Y0_脇_脇.BasePointBase = X0Y0_脇_脇.BasePointBase.AddY(-0.001); } @@ -455,12 +455,12 @@ namespace SlaveMatrix X0Y0_Shoulder_ナースCP.Update(ナース); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 脇_脇CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 脇_筋肉CD = new ColorD(ref Col.Black, ref 体配色.人肌R); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs index e494f9f..b088952 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs @@ -43,7 +43,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Shoulder_UpperArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Shoulder(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs index 7f4c476..c86f58c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カル.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public SideHair_カル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_カルD e) + public SideHair_カル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_カルD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -194,7 +194,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_髪1CP = new ColorP(X0Y0_髪1, 髪1CD, DisUnit, abj: false); X0Y0_髪2CP = new ColorP(X0Y0_髪2, 髪2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -203,12 +203,12 @@ namespace SlaveMatrix X0Y0_髪2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs index 2fcfaa4..2cb11d2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_カルD.cs @@ -34,7 +34,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_カル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs index 93da0bf..ff2278d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグ.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public SideHair_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_ジグD e) + public SideHair_ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -194,7 +194,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_髪1CP = new ColorP(X0Y0_髪1, 髪1CD, DisUnit, abj: false); X0Y0_髪2CP = new ColorP(X0Y0_髪2, 髪2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -203,12 +203,12 @@ namespace SlaveMatrix X0Y0_髪2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs index f6d0407..13836c3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ジグD.cs @@ -34,7 +34,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs index 556ba61..e9282cc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネ.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public SideHair_ハネ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_ハネD e) + public SideHair_ハネ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_ハネD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -194,7 +194,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_髪1CP = new ColorP(X0Y0_髪1, 髪1CD, DisUnit, abj: false); X0Y0_髪2CP = new ColorP(X0Y0_髪2, 髪2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -203,12 +203,12 @@ namespace SlaveMatrix X0Y0_髪2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs index 88369b2..c715d2c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_ハネD.cs @@ -34,7 +34,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_ハネ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs index 3f68d68..3351779 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツ.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -141,7 +141,7 @@ namespace SlaveMatrix } } - public SideHair_パツ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_パツD e) + public SideHair_パツ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_パツD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -194,7 +194,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_髪1CP = new ColorP(X0Y0_髪1, 髪1CD, DisUnit, abj: false); X0Y0_髪2CP = new ColorP(X0Y0_髪2, 髪2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -203,12 +203,12 @@ namespace SlaveMatrix X0Y0_髪2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs index 95a1faf..dbc3eee 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_パツD.cs @@ -34,7 +34,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_パツ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs index 5ae27d5..252fbc7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編み.cs @@ -331,7 +331,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -414,7 +414,7 @@ namespace SlaveMatrix } } - public SideHair_編み(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_編みD e) + public SideHair_編み(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_編みD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -507,7 +507,7 @@ namespace SlaveMatrix X0Y0_髪左CP = new ColorP(X0Y0_髪左, 髪左CD, DisUnit, abj: false); X0Y0_髪右CP = new ColorP(X0Y0_髪右, 髪右CD, DisUnit, abj: false); X0Y0_髪根CP = new ColorP(X0Y0_髪根, 髪根CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override bool Is布(Par p) @@ -537,12 +537,12 @@ namespace SlaveMatrix X0Y0_髪根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 編節1_髪節CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs index ada2dcd..31199f3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_編みD.cs @@ -58,7 +58,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_編み(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs index f54b7aa..facddf9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系.cs @@ -74,7 +74,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -88,7 +88,7 @@ namespace SlaveMatrix public JointS 肢_接続点 => new JointS(Body, X0Y0_髪, 0); - public SideHair_肢系(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, SideHair_肢系D e) + public SideHair_肢系(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, SideHair_肢系D e) { SideHair_肢系 横髪_肢系2 = this; ThisType = GetType(); @@ -147,7 +147,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_髪CP = new ColorP(X0Y0_髪, 髪CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -155,12 +155,12 @@ namespace SlaveMatrix X0Y0_髪CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs index 58e6465..8301b1f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/SideHair_肢系D.cs @@ -28,7 +28,7 @@ namespace SlaveMatrix return this; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new SideHair_肢系(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs index 641ac01..561f21a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Stamp.cs @@ -25,9 +25,9 @@ namespace SlaveMatrix public RenderArea Are; - public Cha Cha; + public Character Cha; - public Bod Bod; + public Body Bod; protected EleD EleD; @@ -55,7 +55,7 @@ namespace SlaveMatrix { } - public Stamp(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD) + public Stamp(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, EleD EleD) { this.Med = Med; this.Are = Are; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs index 43ccfe6..414fb09 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs @@ -30,9 +30,9 @@ namespace SlaveMatrix private List 位置 = new List(); - public Mot 汗かき; + public Motion 汗かき; - private Mot 汗ひき; + private Motion 汗ひき; private bool 汗だし = true; @@ -57,7 +57,7 @@ namespace SlaveMatrix foreach (Vector2D local in ps) { 汗 = 全体[this.i]; - if (汗.濃度 != 0.0) + if (汗.Intensity != 0.0) { tp = ryps2.r.ToGlobal(local); 汗.Body.CurJoinRoot.PositionBase = tp + (ryps2.r.ToGlobal(ryps2.c) - tp) * 位置[this.i]; @@ -70,34 +70,34 @@ namespace SlaveMatrix } } - public Sweat(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Mots Mots) + public Sweat(ModeEventDispatcher Med, RenderArea Are, Character Cha, Motions Mots) { Ele[] es = null; Ele n = null; bool re = false; - 汗かき = new Mot(0.0, 1.0) + 汗かき = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { if (汗だし) { - es = 全体.Where((Ele e) => e.濃度 != 0.0).ToArray(); + es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); Ele[] array5 = es; for (int num3 = 0; num3 < array5.Length; num3++) { - array5[num3].濃度 = 0.0; + array5[num3].Intensity = 0.0; } } }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (汗だし) { Ele[] array4 = es; for (int num2 = 0; num2 < array4.Length; num2++) { - array4[num2].濃度 = m.Value; + array4[num2].Intensity = m.Value; } } else if (!re) @@ -106,21 +106,21 @@ namespace SlaveMatrix } else { - n.濃度 = m.Value; + n.Intensity = m.Value; } }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { if (汗だし) { Ele[] array3 = es; for (int l = 0; l < array3.Length; l++) { - array3[l].濃度 = 1.0; + array3[l].Intensity = 1.0; } m.ResetValue(); 汗だし = false; - es = 全体.Where((Ele e) => e.濃度 != 0.0).ToArray(); + es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); n = es[RNG.XS.Next(es.Length)]; } else @@ -128,36 +128,36 @@ namespace SlaveMatrix re = true; } }, - Rouing = delegate(Mot m) + OnLoop = delegate(Motion m) { if (!汗だし) { n.Yv = 0.0; - n.濃度 = 0.0; - es = 全体.Where((Ele e) => e.濃度 != 0.0).ToArray(); + n.Intensity = 0.0; + es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); if (es.Length != 0) { n = es[RNG.XS.Next(es.Length)]; } - es = 全体.Where((Ele e) => e.濃度 == 0.0).ToArray(); + es = 全体.Where((Ele e) => e.Intensity == 0.0).ToArray(); if (es.Length != 0) { - es[RNG.XS.Next(es.Length)].濃度 = 1.0; + es[RNG.XS.Next(es.Length)].Intensity = 1.0; } re = false; m.ResetValue(); } }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { if (!汗だし) { n.Yv = 0.0; - n.濃度 = 0.0; - es = 全体.Where((Ele e) => e.濃度 != 0.0).ToArray(); + n.Intensity = 0.0; + es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); n = es[RNG.XS.Next(es.Length)]; - es = 全体.Where((Ele e) => e.濃度 == 0.0).ToArray(); - es[RNG.XS.Next(es.Length)].濃度 = 1.0; + es = 全体.Where((Ele e) => e.Intensity == 0.0).ToArray(); + es[RNG.XS.Next(es.Length)].Intensity = 1.0; re = false; m.ResetValue(); 汗ひき.Start(); @@ -165,36 +165,36 @@ namespace SlaveMatrix } }; Mots.Add(汗かき.GetHashCode().ToString(), 汗かき); - 汗ひき = new Mot(0.0, 1.0) + 汗ひき = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { - es = 全体.Where((Ele e) => e.濃度 != 0.0).ToArray(); + es = 全体.Where((Ele e) => e.Intensity != 0.0).ToArray(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { Ele[] array2 = es; for (int k = 0; k < array2.Length; k++) { - array2[k].濃度 = m.Value.Inverse(); + array2[k].Intensity = m.Value.Inverse(); } }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.End(); m.ResetValue(); Ele[] array = es; for (int j = 0; j < array.Length; j++) { - array[j].濃度 = 1.0; + array[j].Intensity = 1.0; } 汗だし = true; }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { } }; @@ -203,7 +203,7 @@ namespace SlaveMatrix int num = 0; 汗D e2 = new 汗D(); ryps ryps; - foreach (Ele item in Cha.Bod.Elements.Where((Ele e) => 汗対象.Contains(e.GetType().ToString()))) + foreach (Ele item in Cha.Body.Elements.Where((Ele e) => 汗対象.Contains(e.GetType().ToString()))) { ryps = default(ryps); ryps.r = item.Body.CurJoinRoot; @@ -216,9 +216,9 @@ namespace SlaveMatrix for (int i = 0; i < ps.Length; i++) { _ = ref ps[i]; - 汗 = new 汗(Are.DisplayUnitScale, 配色指定.N0, Cha.配色, Med, e2); + 汗 = new 汗(Are.DisplayUnitScale, 配色指定.N0, Cha.ColorSet, Med, e2); 汗.SetHitFalse(); - 汗.濃度 = ((RNG.XS.NextDouble() < 0.2) ? 1.0 : 0.0); + 汗.Intensity = ((RNG.XS.NextDouble() < 0.2) ? 1.0 : 0.0); 位置.Add(num switch { 1 => 0.5, diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs index 88b9e95..4029916 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TextBubble.cs @@ -16,7 +16,7 @@ namespace SlaveMatrix public bool Dis; - public Mot 消失; + public Motion 消失; public Color GetHitColor => Tex.ParT.HitColor; @@ -66,13 +66,13 @@ namespace SlaveMatrix int sa = ShadColor.A; double v; - 消失 = new Mot(0.0, 1.0) + 消失 = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (m.Value < m.Max - 1) return; @@ -82,14 +82,14 @@ namespace SlaveMatrix Tex.ParT.TextColor = Color.FromArgb((int)((double)ta * v), Tex.ParT.TextColor); Tex.ParT.ShadColor = Color.FromArgb((int)((double)sa * v), Tex.ParT.ShadColor); }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { 表示 = false; 吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(pa, 吹出し.X0Y0_吹出し.PenColor); @@ -124,13 +124,13 @@ namespace SlaveMatrix int ta = TextColor.A; int sa = ShadColor.A; double v; - 消失 = new Mot(0.0, 1.0) + 消失 = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { //After full training slave if i tried to train again game crahes here :3 v = (m.Value >= 0) ? m.Value : m.Value.Inverse(); @@ -150,14 +150,14 @@ namespace SlaveMatrix Tex.ParT.TextColor = Color.FromArgb(correctTextAlpha, Tex.ParT.TextColor); Tex.ParT.ShadColor = Color.FromArgb(correctShadeAlpha, Tex.ParT.ShadColor); }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { 表示 = false; 吹出し.X0Y0_吹出し.PenColor = Color.FromArgb(pa, 吹出し.X0Y0_吹出し.PenColor); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs index 1436a9d..1f6cf5f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso.cs @@ -259,7 +259,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -287,7 +287,7 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(Body, X0Y0_Torso, 2); - public Torso(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, TorsoD e) + public Torso(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, TorsoD e) { Torso Torso2 = this; ThisType = GetType(); @@ -405,7 +405,7 @@ namespace SlaveMatrix X0Y0_植タトゥ_右_タトゥ2CP = new ColorP(X0Y0_植タトゥ_右_タトゥ2, 植タトゥ_右_タトゥ2CD, DisUnit, abj: true); X0Y0_植タトゥ_右_タトゥ1CP = new ColorP(X0Y0_植タトゥ_右_タトゥ1, 植タトゥ_右_タトゥ1CD, DisUnit, abj: true); 筋肉濃度 = e.筋肉濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.9; } @@ -429,12 +429,12 @@ namespace SlaveMatrix X0Y0_植タトゥ_右_タトゥ1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { TorsoCD = new ColorD(ref Col.Black, ref 体配色.人肌R); 筋肉_筋肉左CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs index ad4328d..0313fdb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/TorsoD.cs @@ -84,7 +84,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Torso(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs index 975baa3..c8638f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇.cs @@ -295,7 +295,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -326,7 +326,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public Torso_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Torso_蛇D e) + public Torso_蛇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, Torso_蛇D e) { Torso_蛇 Torso_蛇2 = this; ThisType = GetType(); @@ -441,7 +441,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -520,7 +520,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - public void 配色(体配色 体配色) + public void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -539,7 +539,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Torso_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); Torso_鱗左CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); @@ -553,7 +553,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { Torso_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); Torso_鱗左CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -567,7 +567,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { Torso_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); Torso_鱗左CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs index bf486a4..fc4c857 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蛇D.cs @@ -56,7 +56,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Torso_蛇_Torso_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Torso_蛇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs index 358f0d0..d47e5b5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲.cs @@ -375,7 +375,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -473,7 +473,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public Torso_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, Torso_蟲D e) + public Torso_蟲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, Torso_蟲D e) { Torso_蟲 Torso_蟲2 = this; ThisType = GetType(); @@ -605,7 +605,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -668,7 +668,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -687,7 +687,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Torso_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); Torso_節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -705,7 +705,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { Torso_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); Torso_節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -723,7 +723,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { Torso_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); Torso_節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs index efd369a..281547c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Torso_蟲D.cs @@ -74,7 +74,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.Torso_蟲_Torso_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Torso_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs index c66d641..35b3366 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀.cs @@ -451,7 +451,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -482,7 +482,7 @@ namespace SlaveMatrix } } - public T剃刀(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, T剃刀D e) + public T剃刀(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, T剃刀D e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["T字剃刀"]); @@ -582,7 +582,7 @@ namespace SlaveMatrix X0Y0_グリップ_グリップ13CP = new ColorP(X0Y0_グリップ_グリップ13, グリップ_グリップ13CD, DisUnit, abj: true); X0Y0_グリップ_グリップ14CP = new ColorP(X0Y0_グリップ_グリップ14, グリップ_グリップ14CD, DisUnit, abj: true); X0Y0_グリップ_グリップ15CP = new ColorP(X0Y0_グリップ_グリップ15, グリップ_グリップ15CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; Vector2D local = X0Y0_刃_刃1.OP[0].ps[1]; foreach (Par item in Body.EnumJoinRoot) { @@ -616,12 +616,12 @@ namespace SlaveMatrix X0Y0_グリップ_グリップ15CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { ヘッドCD = new ColorD(); ヘッドCD.線 = Col.Black; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/T剃刀D.cs index d873a39..5112cd2 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new T剃刀(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs index 80ffcc3..45ecf75 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人.cs @@ -3283,7 +3283,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -3443,7 +3443,7 @@ namespace SlaveMatrix public JointS LowerArm_接続点 => new JointS(Body, X0Y0_UpperArm, 1); - public UpperArm_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, UpperArm_人D e) + public UpperArm_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, UpperArm_人D e) { UpperArm_人 UpperArm_人2 = this; ThisType = GetType(); @@ -3926,7 +3926,7 @@ namespace SlaveMatrix X0Y0_鎧_鎧_鎧2CP = new ColorP(X0Y0_鎧_鎧_鎧2, 鎧_鎧_鎧2CD, DisUnit, abj: true); 傷X濃度 = e.傷X濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -4185,7 +4185,7 @@ namespace SlaveMatrix X0Y0_鎧_鎧_鎧2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -4204,7 +4204,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 筋肉上CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); UpperArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); @@ -4286,7 +4286,7 @@ namespace SlaveMatrix 鎧_鎧_鎧2CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 筋肉上CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); UpperArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); @@ -4368,7 +4368,7 @@ namespace SlaveMatrix 鎧_鎧_鎧2CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 筋肉上CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); UpperArmCD = new ColorD(ref Col.Black, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人D.cs index c6189e1..c9614a5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_人D.cs @@ -336,7 +336,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.UpperArm_人_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs index 49f5cff..1404667 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣.cs @@ -234,7 +234,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -268,7 +268,7 @@ namespace SlaveMatrix public JointS LowerArm_接続点 => new JointS(Body, X0Y0_UpperArm, 1); - public UpperArm_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, UpperArm_獣D e) + public UpperArm_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, UpperArm_獣D e) { UpperArm_獣 UpperArm_獣2 = this; ThisType = GetType(); @@ -352,7 +352,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗3CP = new ColorP(X0Y0_竜性_鱗3, 竜性_鱗3CD, DisUnit, abj: true); X0Y0_竜性_鱗2CP = new ColorP(X0Y0_竜性_鱗2, 竜性_鱗2CD, DisUnit, abj: true); X0Y0_竜性_鱗1CP = new ColorP(X0Y0_竜性_鱗1, 竜性_鱗1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -375,7 +375,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -394,7 +394,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 筋肉上CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); UpperArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -407,7 +407,7 @@ namespace SlaveMatrix 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 筋肉上CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); UpperArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -420,7 +420,7 @@ namespace SlaveMatrix 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 筋肉上CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); UpperArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣D.cs index 2615ba7..625c2aa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_獣D.cs @@ -36,7 +36,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.UpperArm_獣_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs index ea71574..6324195 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙.cs @@ -213,7 +213,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -507,7 +507,7 @@ namespace SlaveMatrix public JointS LowerArm_接続点 => new JointS(Body, X0Y0_獣翼UpperArm, 0); - public UpperArm_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, UpperArm_蝙D e) + public UpperArm_蝙(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, UpperArm_蝙D e) { UpperArm_蝙 UpperArm_蝙2 = this; 飛膜 = new 飛膜_根(DisUnit, 配色指定, 体配色); @@ -587,7 +587,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗4CP = new ColorP(X0Y0_竜性_鱗4, 竜性_鱗4CD, DisUnit, abj: true); X0Y0_竜性_鱗5CP = new ColorP(X0Y0_竜性_鱗5, 竜性_鱗5CD, DisUnit, abj: true); X0Y0_竜性_鱗6CP = new ColorP(X0Y0_竜性_鱗6, 竜性_鱗6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度B = 1.02; } @@ -625,7 +625,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗6CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -644,7 +644,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 獣翼UpperArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); @@ -655,7 +655,7 @@ namespace SlaveMatrix 竜性_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 獣翼UpperArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -666,7 +666,7 @@ namespace SlaveMatrix 竜性_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 獣翼UpperArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙D.cs index 3b8ecaf..7698160 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蝙D.cs @@ -40,7 +40,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.UpperArm_蝙_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs index 4cf4159..ee2718c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄.cs @@ -114,7 +114,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -142,7 +142,7 @@ namespace SlaveMatrix public JointS LowerArm_接続点 => new JointS(Body, X0Y0_UpperArm, 1); - public UpperArm_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, UpperArm_蹄D e) + public UpperArm_蹄(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, UpperArm_蹄D e) { UpperArm_蹄 UpperArm_蹄2 = this; ThisType = GetType(); @@ -206,7 +206,7 @@ namespace SlaveMatrix X0Y0_筋肉上CP = new ColorP(X0Y0_筋肉上, 筋肉上CD, DisUnit, abj: false); X0Y0_UpperArmCP = new ColorP(X0Y0_UpperArm, UpperArmCD, DisUnit, abj: true); X0Y0_筋肉下CP = new ColorP(X0Y0_筋肉下, 筋肉下CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -223,12 +223,12 @@ namespace SlaveMatrix X0Y0_筋肉下CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 筋肉上CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); UpperArmCD = new ColorD(ref Col.Black, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄D.cs index 1fa33cb..3473e72 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_蹄D.cs @@ -24,7 +24,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.UpperArm_蹄_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs index 4ccc0b1..6c67a6b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥.cs @@ -256,7 +256,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -400,7 +400,7 @@ namespace SlaveMatrix public JointS LowerArm_接続点 => new JointS(Body, X0Y0_鳥翼UpperArm, 0); - public UpperArm_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, UpperArm_鳥D e) + public UpperArm_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, UpperArm_鳥D e) { UpperArm_鳥 UpperArm_鳥2 = this; ThisType = GetType(); @@ -492,7 +492,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗2CP = new ColorP(X0Y0_竜性_鱗2, 竜性_鱗2CD, DisUnit, abj: true); X0Y0_竜性_鱗3CP = new ColorP(X0Y0_竜性_鱗3, 竜性_鱗3CD, DisUnit, abj: true); X0Y0_竜性_鱗4CP = new ColorP(X0Y0_竜性_鱗4, 竜性_鱗4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -536,7 +536,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗4CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -555,7 +555,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 風切羽_羽3CD = new ColorD(ref Col.Black, ref 体配色.羽1O); 風切羽_羽2CD = new ColorD(ref Col.Black, ref 体配色.羽1O); @@ -569,7 +569,7 @@ namespace SlaveMatrix 竜性_鱗4CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 風切羽_羽3CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 風切羽_羽2CD = new ColorD(ref Col.Black, ref 体配色.羽1O); @@ -583,7 +583,7 @@ namespace SlaveMatrix 竜性_鱗4CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 風切羽_羽3CD = new ColorD(ref Col.Black, ref 体配色.羽1O); 風切羽_羽2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥D.cs index e3e1356..68f9453 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/UpperArm_鳥D.cs @@ -54,7 +54,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.UpperArm_鳥_LowerArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new UpperArm_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs index 44bc9d7..8b717f0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/Waist.cs @@ -2075,7 +2075,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2151,7 +2151,7 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(Body, X0Y0_Waist, 9); - public Waist(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, WaistD e) + public Waist(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, WaistD e) { Waist Waist2 = this; ThisType = GetType(); @@ -2860,7 +2860,7 @@ namespace SlaveMatrix 傷I左濃度 = e.傷I左濃度; 傷I右濃度 = e.傷I右濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; double num = 1.0025; X0Y0_臍.BasePointBase = new Vector2D(X0Y0_臍.BasePointBase.X, 0.363998381176966); @@ -3433,7 +3433,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -3452,7 +3452,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { WaistCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 股CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌R); @@ -3499,7 +3499,7 @@ namespace SlaveMatrix ハイライト下右CD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { WaistCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 股CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌R); @@ -3546,7 +3546,7 @@ namespace SlaveMatrix ハイライト下右CD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { WaistCD = new ColorD(ref Col.Black, ref 体配色.人肌O); 股CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌R); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs index 13ed38e..7b11bae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/WaistD.cs @@ -257,7 +257,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Waist(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs index a93b638..42bac5c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_大.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -163,7 +163,7 @@ namespace SlaveMatrix X0Y2_精液CP = new ColorP(X0Y2_精液, 精液CD, DisUnit, abj: true); X0Y3_精液CP = new ColorP(X0Y3_精液, 精液CD, DisUnit, abj: true); X0Y4_精液CP = new ColorP(X0Y4_精液, 精液CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs index 6b621c7..e273328 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ぶっかけ_小.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -163,7 +163,7 @@ namespace SlaveMatrix X0Y2_精液CP = new ColorP(X0Y2_精液, 精液CD, DisUnit, abj: true); X0Y3_精液CP = new ColorP(X0Y3_精液, 精液CD, DisUnit, abj: true); X0Y4_精液CP = new ColorP(X0Y4_精液, 精液CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs index 20413f4..1d76c89 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマーク.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public キスマーク(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, キスマークD e) + public キスマーク(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キスマークD e) { ThisType = GetType(); Body = new Difs(Sta.スタンプ["キスマーク"]); @@ -124,7 +124,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_キスマークCP = new ColorP(X0Y0_キスマーク, キスマークCD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -132,12 +132,12 @@ namespace SlaveMatrix X0Y0_キスマークCP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { キスマークCD = new ColorD(ref Col.Empty, ref 体配色.粘膜); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キスマークD.cs index 45e862f..44925dd 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new キスマーク(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs index 6454951..78163a6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -118,7 +118,7 @@ namespace SlaveMatrix } } - public キャップ1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, キャップ1D e) + public キャップ1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キャップ1D e) { ThisType = GetType(); Body = new Difs(Sta.性器付["キャップ中"]); @@ -162,7 +162,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_根本CP = new ColorP(X0Y0_根本, 根本CD, DisUnit, abj: true); X0Y0_先端CP = new ColorP(X0Y0_先端, 先端CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; Vector2D local = X0Y0_根本.OP[0].ps[2]; foreach (Par item in Body.EnumJoinRoot) { @@ -176,12 +176,12 @@ namespace SlaveMatrix X0Y0_先端CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根本CD = new ColorD(); 先端CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ1D.cs index ae1ba21..9936aa1 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new キャップ1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs index edfdd98..bc8d894 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -118,7 +118,7 @@ namespace SlaveMatrix } } - public キャップ2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, キャップ2D e) + public キャップ2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, キャップ2D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["キャップ左"]); @@ -162,7 +162,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_根本CP = new ColorP(X0Y0_根本, 根本CD, DisUnit, abj: true); X0Y0_先端CP = new ColorP(X0Y0_先端, 先端CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -171,12 +171,12 @@ namespace SlaveMatrix X0Y0_先端CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根本CD = new ColorD(); 先端CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ2D.cs index 3226474..293ff32 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new キャップ2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs index 3d79f3d..e9abad3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs @@ -32,7 +32,7 @@ namespace SlaveMatrix private bool ハンドf; - private Mot キャップ振動; + private Motion キャップ振動; private bool キャップ中_; @@ -273,7 +273,7 @@ namespace SlaveMatrix キャップ[Bod.キャップ1].DraShow = true; キャップ[Bod.キャップ1].StaShow = true; キャップ[Bod.キャップ1].描画Show = true; - キャップ[Bod.キャップ1].Ele.濃度 = 0.5; + キャップ[Bod.キャップ1].Ele.Intensity = 0.5; キャップ[Bod.キャップ1].使用状態 = UsageStatus.Standby; キャップ.Remove(Bod.キャップ1); } @@ -319,7 +319,7 @@ namespace SlaveMatrix } else if (調教UI.Focus == キャップ1 || 調教UI.Focus == キャップ2 || 調教UI.Focus == キャップ3) { - if (!キャップ中着 && (cd.e is キャップ1 || cd.c == ContactType.Nucleus) && (Cha.ChaD.股施術 || (!Cha.Bod.Is蠍 && (!Cha.Bod.Is蛇 || !Cha.Bod.蛇.ガード)))) + if (!キャップ中着 && (cd.e is キャップ1 || cd.c == ContactType.Nucleus) && (Cha.CharacterData.股施術 || (!Cha.Body.Is蠍 && (!Cha.Body.Is蛇 || !Cha.Body.蛇.ガード)))) { 調教UI.押し(ref cd); 調教UI.Focus.DraShow = false; @@ -376,7 +376,7 @@ namespace SlaveMatrix public void Down(ref MouseButtons mb, ref Vector2D cp, ref Vector2D op, ref Color hc, ref ContactD cd) { - if (調教UI.Focus.Ele.濃度 == 1.0) + if (調教UI.Focus.Ele.Intensity == 1.0) { if (ハンドf) { @@ -419,7 +419,7 @@ namespace SlaveMatrix キャップ[Bod.キャップ1].DraShow = true; キャップ[Bod.キャップ1].StaShow = true; キャップ[Bod.キャップ1].描画Show = true; - キャップ[Bod.キャップ1].Ele.濃度 = 0.5; + キャップ[Bod.キャップ1].Ele.Intensity = 0.5; キャップ[Bod.キャップ1].使用状態 = UsageStatus.Standby; キャップ.Remove(Bod.キャップ1); キャップ中着 = false; @@ -459,7 +459,7 @@ namespace SlaveMatrix キャップ[Bod.キャップ2左].DraShow = true; キャップ[Bod.キャップ2左].StaShow = true; キャップ[Bod.キャップ2左].描画Show = true; - キャップ[Bod.キャップ2左].Ele.濃度 = 0.5; + キャップ[Bod.キャップ2左].Ele.Intensity = 0.5; キャップ[Bod.キャップ2左].使用状態 = UsageStatus.Standby; キャップ.Remove(Bod.キャップ2左); キャップ左着 = false; @@ -503,7 +503,7 @@ namespace SlaveMatrix キャップ[Bod.キャップ2右].DraShow = true; キャップ[Bod.キャップ2右].StaShow = true; キャップ[Bod.キャップ2右].描画Show = true; - キャップ[Bod.キャップ2右].Ele.濃度 = 0.5; + キャップ[Bod.キャップ2右].Ele.Intensity = 0.5; キャップ[Bod.キャップ2右].使用状態 = UsageStatus.Standby; キャップ.Remove(Bod.キャップ2右); キャップ右着 = false; @@ -518,7 +518,7 @@ namespace SlaveMatrix } if (mb == MouseButtons.Left) { - if (!キャップ中着 && (cd.c == ContactType.Nucleus || cd.e == Bod.キャップ1) && (Cha.ChaD.股施術 || (!Cha.Bod.Is蠍 && (!Cha.Bod.Is蛇 || !Cha.Bod.蛇.ガード)))) + if (!キャップ中着 && (cd.c == ContactType.Nucleus || cd.e == Bod.キャップ1) && (Cha.CharacterData.股施術 || (!Cha.Body.Is蠍 && (!Cha.Body.Is蛇 || !Cha.Body.蛇.ガード)))) { Bod.Setキャップ1 = キャップ着; キャップ.Add(Bod.キャップ1, 調教UI.Focus); @@ -597,21 +597,21 @@ namespace SlaveMatrix 調教UI.キャップ1.配色(配色); 調教UI.キャップ2.配色(配色); 調教UI.キャップ3.配色(配色); - 調教UI.キャップ1.濃度 = 0.5; - 調教UI.キャップ2.濃度 = 0.5; - 調教UI.キャップ3.濃度 = 0.5; + 調教UI.キャップ1.Intensity = 0.5; + 調教UI.キャップ2.Intensity = 0.5; + 調教UI.キャップ3.Intensity = 0.5; 調教UI.キャップ1CM = キャップ1; 調教UI.キャップ2CM = キャップ2; 調教UI.キャップ3CM = キャップ3; double d = 0.0005; Vector2D p = Dat.Vec2DZero; - キャップ振動 = new Mot(-1.0, 1.0) + キャップ振動 = new Motion(-1.0, 1.0) { BaseSpeed = double.MaxValue, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (キャップ処理2.キャップ左_) { @@ -641,13 +641,13 @@ namespace SlaveMatrix キャップ処理2.振動(キャップ処理2.Bod.キャップ1); } }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); キャップ処理2.Bod.キャップ2左.位置C = Dat.Vec2DZero; @@ -658,10 +658,10 @@ namespace SlaveMatrix 調教UI.Mots.Add(キャップ振動.GetHashCode().ToString(), キャップ振動); } - public void SetCha(Cha Cha) + public void SetCha(Character Cha) { base.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; } public new void Reset() @@ -700,19 +700,19 @@ namespace SlaveMatrix キャップ1.DraShow = true; キャップ1.StaShow = true; キャップ1.描画Show = true; - キャップ1.Ele.濃度 = 0.5; + キャップ1.Ele.Intensity = 0.5; キャップ1.使用状態 = UsageStatus.Standby; キャップ2.Show = true; キャップ2.DraShow = true; キャップ2.StaShow = true; キャップ2.描画Show = true; - キャップ2.Ele.濃度 = 0.5; + キャップ2.Ele.Intensity = 0.5; キャップ2.使用状態 = UsageStatus.Standby; キャップ3.Show = true; キャップ3.DraShow = true; キャップ3.StaShow = true; キャップ3.描画Show = true; - キャップ3.Ele.濃度 = 0.5; + キャップ3.Ele.Intensity = 0.5; キャップ3.使用状態 = UsageStatus.Standby; base.Reset(); CP中.Reset(); @@ -733,9 +733,9 @@ namespace SlaveMatrix キャップ左 = false; キャップ右 = false; キャップ着.SetDefault(); - 調教UI.キャップ1.濃度 = 0.5; - 調教UI.キャップ2.濃度 = 0.5; - 調教UI.キャップ3.濃度 = 0.5; + 調教UI.キャップ1.Intensity = 0.5; + 調教UI.キャップ2.Intensity = 0.5; + 調教UI.キャップ3.Intensity = 0.5; } } } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs index 8542133..84d7eb6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプB.cs @@ -7,7 +7,7 @@ namespace SlaveMatrix { public class スタンプB : Stamp { - private Mot ぶっかけ垂れ; + private Motion ぶっかけ垂れ; public override void Draw(RenderArea Are) { @@ -66,30 +66,30 @@ namespace SlaveMatrix } } - public スタンプB(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Mots Mots) + public スタンプB(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body Bod, EleD EleD, Motions Mots) : base(Med, Are, Cha, Bod, EleD) { Ele e = null; - ぶっかけ垂れ = new Mot(0.0, 1.0) + ぶっかけ垂れ = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate(Mot m) + OnStart = delegate(Motion m) { e = sta.Last().Sta; m.Max = RNG.XS.NextDouble(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { e.Yv = m.Value; }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { } }; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs index 02addba..433fddc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプK.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix { p = he.Body.GetHitPar_(hc); c2 = he.GetParOfColorP(p).ColorD.色; - if (c2.Col1 == Cha.配色.人肌O.Col1 || c2.Col2 == Cha.配色.人肌O.Col1) + if (c2.Col1 == Cha.ColorSet.人肌O.Col1 || c2.Col2 == Cha.ColorSet.人肌O.Col1) { if (sta.Count >= 33) { @@ -44,7 +44,7 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.配色); + sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.ColorSet); sep.Sta.SetHitFalse(); sep.Ele = he; sep.Par = p; @@ -57,7 +57,7 @@ namespace SlaveMatrix return null; } - public スタンプK(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) + public スタンプK(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body 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 a25cb44..55697cc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/スタンプW.cs @@ -35,7 +35,7 @@ namespace SlaveMatrix { p = he.Body.GetHitPar_(hc); c2 = he.GetParOfColorP(p).ColorD.色; - if (c2.Col1 == Cha.配色.人肌O.Col1 || c2.Col2 == Cha.配色.人肌O.Col1) + if (c2.Col1 == Cha.ColorSet.人肌O.Col1 || c2.Col2 == Cha.ColorSet.人肌O.Col1) { if (sta.Count >= 33) { @@ -44,7 +44,7 @@ namespace SlaveMatrix sep.Sta.Dispose(); } sep = default(sep); - sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.配色); + sep.Sta = EleD.GetEle(Are.DisplayUnitScale, Med, Cha.ColorSet); 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(ModeEventDispatcher Med, RenderArea Are, Cha Cha, Bod Bod, EleD EleD, Ele Par) + public スタンプW(ModeEventDispatcher Med, RenderArea Are, Character Cha, Body 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 bc8b76c..236da66 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド.cs @@ -3769,7 +3769,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -5204,7 +5204,7 @@ namespace SlaveMatrix X14Y2_呪印_鎖1CP = new ColorP(X14Y2_呪印_鎖1, 呪印_鎖1CD, DisUnit, abj: true); X14Y2_呪印_鎖2CP = new ColorP(X14Y2_呪印_鎖2, 呪印_鎖2CD, DisUnit, abj: true); X14Y2_呪印_鎖3CP = new ColorP(X14Y2_呪印_鎖3, 呪印_鎖3CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度B *= 1.1; double y = 0.0015; X6Y0_手.BasePointBase = X6Y0_手.ToLocal(X6Y0_人指.ToGlobal(X6Y0_人指.JP[0].Joint.AddY(y))); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs index 72a1dda..d52fddf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs @@ -18,9 +18,9 @@ namespace SlaveMatrix public bool Is体撫で; - public Mot バスト初期化; + public Motion バスト初期化; - public Mot くぱぁ中; + public Motion くぱぁ中; private bool 核捏ね初; @@ -730,7 +730,7 @@ namespace SlaveMatrix 切り替え = false; return; } - 調教UI.Focus.Ele.濃度 = 0.5; + 調教UI.Focus.Ele.Intensity = 0.5; 調教UI.Focus = 調教UI.ペニスCM; 調教UI.ペニスCM.Ele.位置B = cp; 調教UI.ペニス処理.選択 = true; @@ -751,7 +751,7 @@ namespace SlaveMatrix 切り替え = false; return; } - 調教UI.Focus.Ele.濃度 = 0.5; + 調教UI.Focus.Ele.Intensity = 0.5; 調教UI.Focus = 調教UI.マウスCM; 調教UI.マウスCM.Ele.位置B = cp; 調教UI.マウス処理.Move(ref mb, ref cp, ref hc, ref cd); @@ -872,15 +872,15 @@ namespace SlaveMatrix ハンド処理 ハンド処理2 = this; double d = 1.0; bool f = false; - バスト初期化 = new Mot(0.0, 1.0) + バスト初期化 = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { f = ハンド処理2.Bod.乳房右.Yi <= 2; d = ハンド処理2.Bod.乳房右.Yv; }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (f) { @@ -913,14 +913,14 @@ namespace SlaveMatrix } } }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); ハンド処理2.Bod.乳房右.Yi = 0; @@ -928,24 +928,24 @@ namespace SlaveMatrix } }; 調教UI.Mots.Add(バスト初期化.GetHashCode().ToString(), バスト初期化); - くぱぁ中 = new Mot(0.0, 1.0) + くぱぁ中 = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { }, - Runing = delegate + OnUpdate = delegate { 調教UI.Action(ContactType.Crotch, ActionType.くぱ, CurrentState.Continue, ToolType.Hand, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); } @@ -953,10 +953,10 @@ namespace SlaveMatrix 調教UI.Mots.Add(くぱぁ中.GetHashCode().ToString(), くぱぁ中); } - public void SetCha(Cha Cha) + public void SetCha(Character Cha) { base.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; } public new void Reset() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs index 84c4ead..fcc1fbf 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナル.cs @@ -535,7 +535,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -557,7 +557,7 @@ namespace SlaveMatrix } } - public バイブ_アナル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_アナルD e) + public バイブ_アナル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_アナルD e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["アナル"]); @@ -725,7 +725,7 @@ namespace SlaveMatrix X0Y4_ユニット_パワー2CP = new ColorP(X0Y4_ユニット_パワー2, ユニット_パワー2CD, DisUnit, abj: true); X0Y4_ユニット_パワー3CP = new ColorP(X0Y4_ユニット_パワー3, ユニット_パワー3CD, DisUnit, abj: true); X0Y4_ユニット_パワー4CP = new ColorP(X0Y4_ユニット_パワー4, ユニット_パワー4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; X0Y0_ユニット_ユニット.BasePointBase = X0Y0_ユニット_ユニット.ToLocal(X0Y0_ヘッド.ToGlobal(X0Y0_ヘッド.JP[0].Joint)); X0Y1_ユニット_ユニット.BasePointBase = X0Y1_ユニット_ユニット.ToLocal(X0Y1_ヘッド.ToGlobal(X0Y1_ヘッド.JP[0].Joint)); X0Y2_ユニット_ユニット.BasePointBase = X0Y2_ユニット_ユニット.ToLocal(X0Y2_ヘッド.ToGlobal(X0Y2_ヘッド.JP[0].Joint)); @@ -808,12 +808,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.GetGrad(ref Col.BlueViolet, out var ret); ヘッドCD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_アナルD.cs index 0562a80..46749cf 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_アナル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs index 81dcff4..5f49855 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモン.cs @@ -937,7 +937,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -971,7 +971,7 @@ namespace SlaveMatrix } } - public バイブ_コモン(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_コモンD e) + public バイブ_コモン(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_コモンD e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["コモン"]); @@ -1229,7 +1229,7 @@ namespace SlaveMatrix X0Y4_ユニット_パワー2CP = new ColorP(X0Y4_ユニット_パワー2, ユニット_パワー2CD, DisUnit, abj: true); X0Y4_ユニット_パワー3CP = new ColorP(X0Y4_ユニット_パワー3, ユニット_パワー3CD, DisUnit, abj: true); X0Y4_ユニット_パワー4CP = new ColorP(X0Y4_ユニット_パワー4, ユニット_パワー4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; X0Y0_ユニット_ユニット.BasePointBase = X0Y0_ユニット_ユニット.ToLocal(X0Y0_ヘッド.ToGlobal(X0Y0_ヘッド.JP[12].Joint)); X0Y1_ユニット_ユニット.BasePointBase = X0Y1_ユニット_ユニット.ToLocal(X0Y1_ヘッド.ToGlobal(X0Y1_ヘッド.JP[12].Joint)); X0Y2_ユニット_ユニット.BasePointBase = X0Y2_ユニット_ユニット.ToLocal(X0Y2_ヘッド.ToGlobal(X0Y2_ヘッド.JP[9].Joint)); @@ -1351,12 +1351,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.GetGrad(ref Col.HotPink, out var ret); ヘッドCD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_コモンD.cs index 43ac07b..518254d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_コモン(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs index 3044bb8..4a4e49a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディル.cs @@ -655,7 +655,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -680,7 +680,7 @@ namespace SlaveMatrix } } - public バイブ_ディル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_ディルD e) + public バイブ_ディル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_ディルD e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["ディル"]); @@ -874,7 +874,7 @@ namespace SlaveMatrix X0Y4_ユニット_パワー2CP = new ColorP(X0Y4_ユニット_パワー2, ユニット_パワー2CD, DisUnit, abj: true); X0Y4_ユニット_パワー3CP = new ColorP(X0Y4_ユニット_パワー3, ユニット_パワー3CD, DisUnit, abj: true); X0Y4_ユニット_パワー4CP = new ColorP(X0Y4_ユニット_パワー4, ユニット_パワー4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; X0Y0_ユニット_ユニット.BasePointBase = X0Y0_ユニット_ユニット.ToLocal(X0Y0_ヘッド.ToGlobal(X0Y0_ヘッド.JP[3].Joint)); X0Y1_ユニット_ユニット.BasePointBase = X0Y1_ユニット_ユニット.ToLocal(X0Y1_ヘッド.ToGlobal(X0Y1_ヘッド.JP[3].Joint)); X0Y2_ユニット_ユニット.BasePointBase = X0Y2_ユニット_ユニット.ToLocal(X0Y2_ヘッド.ToGlobal(X0Y2_ヘッド.JP[2].Joint)); @@ -968,12 +968,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Color2 色 = new Color2(ref Col.DimGray, ref Col.Black); ヘッドCD = new ColorD(ref Col.Black, ref 色); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ディルD.cs index 95d5b17..57cdfab 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_ディル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs index 81e99b8..c279e11 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマ.cs @@ -775,7 +775,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -803,7 +803,7 @@ namespace SlaveMatrix } } - public バイブ_デンマ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_デンマD e) + public バイブ_デンマ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_デンマD e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["デンマ"]); @@ -1028,7 +1028,7 @@ namespace SlaveMatrix X0Y4_ユニット_パワー2CP = new ColorP(X0Y4_ユニット_パワー2, ユニット_パワー2CD, DisUnit, abj: true); X0Y4_ユニット_パワー3CP = new ColorP(X0Y4_ユニット_パワー3, ユニット_パワー3CD, DisUnit, abj: true); X0Y4_ユニット_パワー4CP = new ColorP(X0Y4_ユニット_パワー4, ユニット_パワー4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; X0Y0_ユニット_ユニット.BasePointBase = X0Y0_ユニット_ユニット.ToLocal(X0Y0_ヘッド.ToGlobal(X0Y0_ヘッド.JP[1].Joint)); X0Y1_ユニット_ユニット.BasePointBase = X0Y1_ユニット_ユニット.ToLocal(X0Y1_ヘッド.ToGlobal(X0Y1_ヘッド.JP[1].Joint)); X0Y2_ユニット_ユニット.BasePointBase = X0Y2_ユニット_ユニット.ToLocal(X0Y2_ヘッド.ToGlobal(X0Y2_ヘッド.JP[1].Joint)); @@ -1135,12 +1135,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.GetGrad(ref Col.DarkGray, out var ret); ヘッドCD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_デンマD.cs index f818c81..2e49d7b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_デンマ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs index 33342b3..f9cb347 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリル.cs @@ -2599,7 +2599,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2642,7 +2642,7 @@ namespace SlaveMatrix } } - public バイブ_ドリル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, バイブ_ドリルD e) + public バイブ_ドリル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, バイブ_ドリルD e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["ドリル"]); @@ -3441,7 +3441,7 @@ namespace SlaveMatrix X2Y4_ユニット_パワー2CP = new ColorP(X2Y4_ユニット_パワー2, ユニット_パワー2CD, DisUnit, abj: true); X2Y4_ユニット_パワー3CP = new ColorP(X2Y4_ユニット_パワー3, ユニット_パワー3CD, DisUnit, abj: true); X2Y4_ユニット_パワー4CP = new ColorP(X2Y4_ユニット_パワー4, ユニット_パワー4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; X0Y0_ユニット_ユニット.BasePointBase = X0Y0_ユニット_ユニット.ToLocal(X0Y0_ヘッド.ToGlobal(X0Y0_ヘッド.JP[18].Joint)); X0Y1_ユニット_ユニット.BasePointBase = X0Y1_ユニット_ユニット.ToLocal(X0Y1_ヘッド.ToGlobal(X0Y1_ヘッド.JP[17].Joint)); X0Y2_ユニット_ユニット.BasePointBase = X0Y2_ユニット_ユニット.ToLocal(X0Y2_ヘッド.ToGlobal(X0Y2_ヘッド.JP[12].Joint)); @@ -3862,12 +3862,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.GetGrad(ref Col.DarkMagenta, out var ret); ヘッドCD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/バイブ_ドリルD.cs index 1d48e3e..6ff4c3a 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new バイブ_ドリル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs index 6d41e0a..2b8ab17 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パール.cs @@ -969,7 +969,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -992,7 +992,7 @@ namespace SlaveMatrix } } - public パール(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, パールD e) + public パール(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, パールD e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["パール"]); @@ -1305,7 +1305,7 @@ namespace SlaveMatrix X0Y16_軸CP = new ColorP(X0Y16_軸, 軸CD, DisUnit, abj: true); X0Y16_輪上境界CP = new ColorP(X0Y16_輪上境界, 輪上境界CD, DisUnit, abj: true); X0Y16_輪下CP = new ColorP(X0Y16_輪下, 輪下CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; X0Y0_輪下.BasePointBase = X0Y0_輪下.ToLocal(X0Y0_玉境界.ToGlobal(X0Y0_玉境界.JP[0].Joint)); X0Y1_輪下.BasePointBase = X0Y1_輪下.ToLocal(X0Y1_玉境界.ToGlobal(X0Y1_玉境界.JP[0].Joint)); X0Y2_輪下.BasePointBase = X0Y2_輪下.ToLocal(X0Y2_玉境界.ToGlobal(X0Y2_玉境界.JP[0].Joint)); @@ -1492,12 +1492,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.GetGrad(ref Col.Pink, out var ret); 軸CD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/パールD.cs index fcbf6a0..9242bad 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new パール(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs index 27b8f0c..0f4ed44 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアス.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -97,7 +97,7 @@ namespace SlaveMatrix } } - public ピアス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ピアスD e) + public ピアス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ピアスD e) { ThisType = GetType(); Body = new Difs(Sta.性器付["ピアス"]); @@ -138,7 +138,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_ピアスCP = new ColorP(X0Y0_ピアス, ピアスCD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -146,12 +146,12 @@ namespace SlaveMatrix X0Y0_ピアスCP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { ピアスCD = new ColorD(); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ピアスD.cs index 67b07f0..a1c92de 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ピアス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs index 16d1b95..382c994 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス.cs @@ -402,7 +402,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -589,7 +589,7 @@ namespace SlaveMatrix X1Y4_陰嚢CP = new ColorP(X1Y4_陰嚢, 陰嚢CD, DisUnit, abj: true); X1Y4_陰茎CP = new ColorP(X1Y4_陰茎, 陰茎CD, DisUnit, abj: true); X1Y4_血管下CP = new ColorP(X1Y4_血管下, 血管下CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; AreM = new AreM(Med.Unit, 3.0, 7.0, 0.07, Med.DisQuality, Med.HitAccuracy, 0.45); AreM.BasePoint = new Vector2D(0.5, 0.1); X0Y0_陰嚢.BasePointBase = X0Y0_陰嚢.ToLocal(X0Y0_陰茎.ToGlobal(X0Y0_陰茎.JP[3].Joint)); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs index 6878dfd..76e64c8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs @@ -18,31 +18,31 @@ namespace SlaveMatrix public bool 足固定; - public Mot チンピク; + public Motion チンピク; public double 射精時間; - public Mot 射精終了; + public Motion 射精終了; - public Mot 射精; + public Motion 射精; - private Mot 放精; + private Motion 放精; public int 中出しCount; - public Mot 手コキ; + public Motion 手コキ; public bool 手コキ左; - public Mot フェラ; + public Motion フェラ; - public Mot パイズリ; + public Motion パイズリ; public bool Isパイズリ相互; public bool Isパイズリ他動; - public Mot 足コキ; + public Motion 足コキ; private double 扱き = 1.0; @@ -122,18 +122,18 @@ namespace SlaveMatrix if (value) { 調教UI.ハンド右.Xi = 13; - 調教UI.ハンド右.濃度 = 調教UI.ペニス.濃度; + 調教UI.ハンド右.Intensity = 調教UI.ペニス.Intensity; 調教UI.ハンド右.角度C = 0.0; } else { 調教UI.Set持ち手(); 調教UI.ハンド右.位置B = 調教UI.ハンド右CM.bp; - 調教UI.ハンド右.濃度 = 0.5; + 調教UI.ハンド右.Intensity = 0.5; 調教UI.ハンド右.位置C = Dat.Vec2DZero; 調教UI.放し(); } - 調教UI.ハンド右.濃度 = 1.0; + 調教UI.ハンド右.Intensity = 1.0; } } @@ -237,7 +237,7 @@ namespace SlaveMatrix if (Isパイズリ他動) { 持ち手 = false; - 調教UI.ハンド右.濃度 = 0.5; + 調教UI.ハンド右.Intensity = 0.5; } else { @@ -358,7 +358,7 @@ namespace SlaveMatrix 調教UI.ハンド右.Xi = 4; 調教UI.ハンド左.Xi = 4; 調教UI.ハンド右CM.使用状態 = UsageStatus.InUse; - 調教UI.ハンド右.濃度 = 1.0; + 調教UI.ハンド右.Intensity = 1.0; 調教UI.ハンド左表示 = true; 調教UI.押し(ref cd); 調教UI.腕修正(); @@ -441,7 +441,7 @@ namespace SlaveMatrix if (!調教UI.ハンド挿入.Is挿入) { 持ち手 = false; - 調教UI.Focus.Ele.濃度 = 0.5; + 調教UI.Focus.Ele.Intensity = 0.5; 調教UI.Focus = 調教UI.ハンド右CM; 調教UI.ハンド右.位置B = cp; 調教UI.ハンド処理.切り替え = true; @@ -456,7 +456,7 @@ namespace SlaveMatrix else if (mb == MouseButtons.Middle && !手コキ.Run && !パイズリ.Run && !足コキ.Run && !Isモード && !調教UI.マウス挿入.Is挿入) { 持ち手 = false; - 調教UI.Focus.Ele.濃度 = 0.5; + 調教UI.Focus.Ele.Intensity = 0.5; 調教UI.Focus = 調教UI.マウスCM; 調教UI.マウスCM.Ele.位置B = cp; 調教UI.マウス処理.切り替え = true; @@ -549,27 +549,27 @@ namespace SlaveMatrix ペニス処理 ペニス処理2 = this; double d = 調教UI.ペニス.X0Y4_陰嚢.BasePointBase.Y - 調教UI.ペニス.X0Y0_陰嚢.BasePointBase.Y; Vector2D v = new Vector2D(対象.Ele.位置C.X, d); - チンピク = new Mot(0.0, 1.0) + チンピク = new Motion(0.0, 1.0) { BaseSpeed = 4.0, - Staing = delegate + OnStart = delegate { ペニス処理2.対象.Ele.Yi = 0; }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { ペニス処理2.対象.Ele.Yv = m.Value; v.Y = d * m.Value; ペニス処理2.対象.Ele.位置C = v; }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate(Mot m) + OnLoop = delegate(Motion m) { m.End(); }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); ペニス処理2.対象.Ele.Yi = 0; @@ -577,25 +577,25 @@ namespace SlaveMatrix } }; 調教UI.Mots.Add(チンピク.GetHashCode().ToString(), チンピク); - 射精終了 = new Mot(0.0, 1.0) + 射精終了 = new Motion(0.0, 1.0) { BaseSpeed = 0.2 - 0.18 * 射精時間, - Staing = delegate(Mot m) + OnStart = delegate(Motion m) { m.BaseSpeed = 0.2 - 0.18 * ペニス処理2.射精時間; }, - Runing = delegate + OnUpdate = delegate { Player.射精処理(); }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { ペニス処理2.射精.End(); Player.射精終了処理(); @@ -603,13 +603,13 @@ namespace SlaveMatrix }; 調教UI.Mots.Add(射精終了.GetHashCode().ToString(), 射精終了); double xc; - 射精 = new Mot(0.0, 1.0) + 射精 = new Motion(0.0, 1.0) { BaseSpeed = 4.0, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { xc = 1.0 + 0.2 * m.Value; foreach (Par item in 調教UI.ペニス.Body.EnumAllPar()) @@ -622,7 +622,7 @@ namespace SlaveMatrix 調教UI.ペニス.位置C = Oth.GetRandomVector() * 0.001; 調教UI.射精.位置C = 調教UI.ペニス.位置C; }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { ペニス処理2.放精.Start(); ペニス処理2.中出し = 調教UI.ペニス挿入.Is挿入; @@ -634,10 +634,10 @@ namespace SlaveMatrix Player.主精力消費大(); m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { ペニス処理2.対象.Ele.尺度XC = 1.0; 調教UI.ペニス.位置C = Dat.Vec2DZero; @@ -652,10 +652,10 @@ namespace SlaveMatrix Vector2D cp; Color hc; ContactType c; - 放精 = new Mot(0.0, 1.0) + 放精 = new Motion(0.0, 1.0) { BaseSpeed = 3.0, - Staing = delegate + OnStart = delegate { //Sounds.射精.Play(); ペニス処理2.射精_(); @@ -669,7 +669,7 @@ namespace SlaveMatrix 断面 = ペニス処理2.Bod.断面_表示 && ペニス処理2.挿入箇所 == ContactType.Vagina; } }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (外出し) { @@ -692,21 +692,21 @@ namespace SlaveMatrix { if (断面 && ペニス処理2.挿入箇所 == ContactType.Vagina) { - ペニス処理2.Bod.膣内精液.精液濃度 = (ペニス処理2.Bod.膣内精液.精液濃度 + 0.05).Clamp(0.0, 1.0); + ペニス処理2.Bod.VaginalCumDrip.精液濃度 = (ペニス処理2.Bod.VaginalCumDrip.精液濃度 + 0.05).Clamp(0.0, 1.0); ペニス処理2.Bod.断面.精液濃度 = (ペニス処理2.Bod.断面.精液濃度 + 0.025).Clamp(0.0, 1.0); } 調教UI.Action(ペニス処理2.挿入箇所, ActionType.Insertion, CurrentState.Start, ToolType.Penis, 0, 1, 機械: false, 射精: true); Player.中出し処理(); } }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { if (外出し) { @@ -723,10 +723,10 @@ namespace SlaveMatrix 調教UI.Mots.Add(放精.GetHashCode().ToString(), 放精); double LowerArmXC = 0.0; double s = 1.0; - 手コキ = new Mot(0.0, 1.0) + 手コキ = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { s = (ペニス処理2.手コキ左 ? 1.0 : (-1.0)); ペニス処理2.持ち手 = false; @@ -753,7 +753,7 @@ namespace SlaveMatrix Player.主精力消費小(); Player.奴体力消費小(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (ペニス処理2.Shoulder != null) { @@ -784,13 +784,13 @@ namespace SlaveMatrix Player.主精力消費小(); Player.奴体力消費小(); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { ペニス処理2.手固定 = false; 調教UI.コキ = false; @@ -821,10 +821,10 @@ namespace SlaveMatrix double t; double d1; double d2; - フェラ = new Mot(0.0, 1.0) + フェラ = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { ペニス処理2.Bod.頬濃度 = 0.0; ペニス処理2.Bod.口.Yi = 13; @@ -834,9 +834,9 @@ namespace SlaveMatrix Player.奴体力消費小(); Player.主精力消費小(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { - t = ペニス処理2.Cha.ChaD.SkillL / Sta.GameData.TrainingTarget.MaxSkillL * 0.4; + t = ペニス処理2.Cha.CharacterData.SkillL / Sta.GameData.TrainingTarget.MaxSkillL * 0.4; d1 = m.Value.Sin() * 調教UI.ペニス.Yv.Inverse() * t; d2 = m.Value * 調教UI.ペニス.Yv * t; ペニス処理2.Bod.頬濃度 = d1; @@ -846,14 +846,14 @@ namespace SlaveMatrix Player.奴体力消費小(); Player.主精力消費小(); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { s = RNG.XS.NextSign(); }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); ペニス処理2.Bod.舌_表示 = false; @@ -872,10 +872,10 @@ namespace SlaveMatrix bool sb = false; double vl; double vr; - パイズリ = new Mot(0.0, 1.0) + パイズリ = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { ペニス処理2.Cha.両腕_人_パイズリ(0, 左右: false, 前後: false); ペニス処理2.手固定 = true; @@ -890,7 +890,7 @@ namespace SlaveMatrix Player.主精力消費小(); Player.奴体力消費小(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { vl = ((!ペニス処理2.Isパイズリ相互) ? m.Value : (sb ? m.Value : m.Value.Inverse())); vr = ((!ペニス処理2.Isパイズリ相互) ? m.Value : (sb ? m.Value.Inverse() : m.Value)); @@ -958,13 +958,13 @@ namespace SlaveMatrix Player.主精力消費小(); Player.奴体力消費小(); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { ペニス処理2.手固定 = false; 調教UI.ハンド処理.バスト初期化.Start(); @@ -1005,14 +1005,14 @@ namespace SlaveMatrix } }; 調教UI.Mots.Add(パイズリ.GetHashCode().ToString(), パイズリ); - 足コキ = new Mot(0.0, 1.0) + 足コキ = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { ペニス処理2.持ち手 = false; 調教UI.コキ = true; - ペニス処理2.Bod.腰振り_人v = 1.0; + ペニス処理2.Bod.HipMotion_人v = 1.0; 調教UI.ペニス.位置B = ペニス処理2.Bod.局部位置.AddY(0.035); ペニス処理2.Cha.両脚_人_足コキ(0); ペニス処理2.足固定 = true; @@ -1020,7 +1020,7 @@ namespace SlaveMatrix Player.主精力消費小(); Player.奴体力消費小(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (ペニス処理2.腿左 != null) { @@ -1054,13 +1054,13 @@ namespace SlaveMatrix Player.主精力消費小(); Player.奴体力消費小(); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { ペニス処理2.足固定 = false; 調教UI.コキ = false; @@ -1100,10 +1100,10 @@ namespace SlaveMatrix 調教UI.Mots.Add(足コキ.GetHashCode().ToString(), 足コキ); } - public void SetCha(Cha Cha) + public void SetCha(Character Cha) { base.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; if (Bod.Arm人n > 0) { 肩左 = Bod.Arm人左[0].Shoulder; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs index bec1512..751c8f2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人.cs @@ -398,7 +398,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -418,7 +418,7 @@ namespace SlaveMatrix public JointS 腹板_接続点 => new JointS(Body, X0Y0_腹, 0); - public ボテ腹_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ボテ腹_人D e) + public ボテ腹_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ボテ腹_人D e) { ボテ腹_人 ボテ腹_人2 = this; ThisType = GetType(); @@ -552,7 +552,7 @@ namespace SlaveMatrix X0Y4_ハイライト右1CP = new ColorP(X0Y4_ハイライト右1, ハイライト右1CD, DisUnit, abj: true); X0Y4_ハイライト右2CP = new ColorP(X0Y4_ハイライト右2, ハイライト右2CD, DisUnit, abj: true); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; double num = 1.0; X0Y0_臍.BasePointBase = new Vector2D(X0Y0_臍.BasePointBase.X, 0.363449439772374); @@ -648,12 +648,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腹CD = new ColorD(ref Col.Black, ref 体配色.人肌O); ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_人D.cs index 3945f1c..b63d41f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ボテ腹_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs index be2c7ec..eb029a0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣.cs @@ -142,7 +142,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -157,7 +157,7 @@ namespace SlaveMatrix public JointS 腹板_接続点 => new JointS(Body, X0Y0_腹, 0); - public ボテ腹_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ボテ腹_獣D e) + public ボテ腹_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ボテ腹_獣D e) { ボテ腹_獣 ボテ腹_獣2 = this; ThisType = GetType(); @@ -234,7 +234,7 @@ namespace SlaveMatrix X0Y3_臍CP = new ColorP(X0Y3_臍, 臍CD, DisUnit, abj: false); X0Y4_腹CP = new ColorP(X0Y4_腹, 腹CD, DisUnit, abj: true); X0Y4_臍CP = new ColorP(X0Y4_臍, 臍CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; double num = 1.0; X0Y0_臍.BasePointBase = new Vector2D(X0Y0_臍.BasePointBase.X, 0.360579157918298); X0Y1_臍.BasePointBase = new Vector2D(X0Y1_臍.BasePointBase.X, 0.360579157918298); @@ -282,12 +282,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腹CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 臍CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹_獣D.cs index 81e4dc1..7ea51f0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ボテ腹_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs index 6e3579a..7842ef4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板.cs @@ -403,7 +403,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -422,7 +422,7 @@ namespace SlaveMatrix } } - public ボテ腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ボテ腹板D e) + public ボテ腹板(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ボテ腹板D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["ボテ腹板"]); @@ -572,7 +572,7 @@ namespace SlaveMatrix X0Y4_腹板2_縦線CP = new ColorP(X0Y4_腹板2_縦線, 腹板2_縦線CD, DisUnit, abj: true); X0Y4_腹板1_腹板CP = new ColorP(X0Y4_腹板1_腹板, 腹板1_腹板CD, DisUnit, abj: true); X0Y4_腹板1_縦線CP = new ColorP(X0Y4_腹板1_縦線, 腹板1_縦線CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; } @@ -633,12 +633,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腹板4_腹板CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 腹板4_縦線CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ボテ腹板D.cs index bfad6f2..3760a1b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ボテ腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs index e2f4084..198b25e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス.cs @@ -315,7 +315,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -456,7 +456,7 @@ namespace SlaveMatrix X4Y4_舌CP = new ColorP(X4Y4_舌, 舌CD, DisUnit, abj: true); X4Y4_上唇CP = new ColorP(X4Y4_上唇, 上唇CD, DisUnit, abj: true); X4Y4_下唇CP = new ColorP(X4Y4_下唇, 下唇CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; X4Y0_上唇.BasePointBase = X4Y0_上唇.ToLocal(X4Y0_舌.ToGlobal(X4Y0_舌.JP[0].Joint)); X4Y1_上唇.BasePointBase = X4Y1_上唇.ToLocal(X4Y1_舌.ToGlobal(X4Y1_舌.JP[0].Joint)); X4Y2_上唇.BasePointBase = X4Y2_上唇.ToLocal(X4Y2_舌.ToGlobal(X4Y2_舌.JP[0].Joint)); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs index 8824425..6d7535a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs @@ -10,7 +10,7 @@ namespace SlaveMatrix public bool Is舐め; - private Mot キスモーション; + private Motion キスモーション; private ContactD 箇所; @@ -126,7 +126,7 @@ namespace SlaveMatrix else if (Player.フェラ1 && cd.c == ContactType.Mouth) { 箇所 = cd; - 対象.Ele.濃度 = 0.5; + 対象.Ele.Intensity = 0.5; 調教UI.マウス.Xi = 4; 調教UI.マウス挿入.Move(ref mb, ref cp, ref hc, ref cd); } @@ -155,7 +155,7 @@ namespace SlaveMatrix 調教UI.放し(); if (!(調教UI.X < cp.X) || !(cp.Y < 調教UI.Y)) { - 対象.Ele.濃度 = 1.0; + 対象.Ele.Intensity = 1.0; } オーバー時("", ref cd); } @@ -190,7 +190,7 @@ namespace SlaveMatrix } else if (cd.c == ContactType.Mouth) { - 対象.Ele.濃度 = 0.5; + 対象.Ele.Intensity = 0.5; 対象.Ele.角度C = (double)RNG.XS.NextSign() * 45.0; 調教UI.Set_口(対象.Ele); 吸引時(GameText.口腔 + "\r\n"); @@ -232,7 +232,7 @@ namespace SlaveMatrix { if (!Isモード && !調教UI.ペニス挿入.Is挿入) { - 調教UI.Focus.Ele.濃度 = 0.5; + 調教UI.Focus.Ele.Intensity = 0.5; 調教UI.Focus = 調教UI.ペニスCM; 調教UI.ペニスCM.Ele.位置B = cp; 調教UI.ペニス処理.選択 = true; @@ -246,7 +246,7 @@ namespace SlaveMatrix 切り替え = false; return; } - 調教UI.Focus.Ele.濃度 = 0.5; + 調教UI.Focus.Ele.Intensity = 0.5; 調教UI.Focus = 調教UI.ハンド右CM; 調教UI.ハンド右.位置B = cp; 調教UI.ハンド処理.切り替え = true; @@ -264,7 +264,7 @@ namespace SlaveMatrix 調教UI.マウス.Xi = 0; Is吸付 = false; キスモーション.End(); - 対象.Ele.濃度 = 1.0; + 対象.Ele.Intensity = 1.0; 対象.Ele.角度C = 0.0; 調教UI.放し(); if (cd.c == ContactType.Mouth) @@ -323,7 +323,7 @@ namespace SlaveMatrix 調教UI.マウス.Yi = (調教UI.マウス.Yi - dt.Sign() * 2).Clamp(0, 調教UI.マウス.Body.CountY); if (cd.c == ContactType.Mouth) { - 対象.Ele.濃度 = 0.5; + 対象.Ele.Intensity = 0.5; } } } @@ -339,17 +339,17 @@ namespace SlaveMatrix キスマーク k = null; Vector2D cp; Color hc; - キスモーション = new Mot(0.0, 0.15) + キスモーション = new Motion(0.0, 0.15) { BaseSpeed = 4.0, - Staing = delegate + OnStart = delegate { f = true; sw.Restart(); s = 1.09.Reciprocal(); マウス処理2.吸引(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (マウス処理2.箇所.c == ContactType.Milk) { @@ -378,7 +378,7 @@ namespace SlaveMatrix } else if (k != null) { - k.濃度 = (k.濃度 + 0.05).Clamp(0.0, 1.0); + k.Intensity = (k.Intensity + 0.05).Clamp(0.0, 1.0); if (マウス処理2.Bod.EIChest != null) { マウス処理2.Bod.EIChest.Updatef = true; @@ -395,20 +395,20 @@ namespace SlaveMatrix 調教UI.Action(マウス処理2.箇所.c, ActionType.吸引, CurrentState.Continue, ToolType.マウス, 0, 1, 機械: false, 射精: false); Player.奴体力消費小(); Player.主精力消費小(); - if (マウス処理2.Bod.噴乳左.母乳垂れ1_表示 && マウス処理2.箇所.c == ContactType.Milk && マウス処理2.Cha.噴乳.Run) + if (マウス処理2.Bod.LeftMilkSpray.母乳垂れ1_表示 && マウス処理2.箇所.c == ContactType.Milk && マウス処理2.Cha.MilkSpray.Run) { Sta.GameData.精力 = (Sta.GameData.精力 + 0.02 * RNG.XS.NextDouble()).Clamp(0.0, 1.0); } }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { f = false; d = m.Value.Inverse(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); マウス処理2.対象.Ele.尺度C = 1.0; @@ -419,10 +419,10 @@ namespace SlaveMatrix 調教UI.Mots.Add(キスモーション.GetHashCode().ToString(), キスモーション); } - public void SetCha(Cha Cha) + public void SetCha(Character Cha) { base.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; } public new void Reset() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs index 0b347d9..1f430c2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータ.cs @@ -172,7 +172,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -186,7 +186,7 @@ namespace SlaveMatrix } } - public ロータ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, ロータD e) + public ロータ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, ロータD e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["ロータ"]); @@ -257,7 +257,7 @@ namespace SlaveMatrix X0Y3_コードCP = new ColorP(X0Y3_コード, コードCD, DisUnit, abj: true); X0Y4_ロータCP = new ColorP(X0Y4_ロータ, ロータCD, DisUnit, abj: true); X0Y4_コードCP = new ColorP(X0Y4_コード, コードCD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; X0Y0_ロータ.BasePointBase = X0Y0_ロータ.ToLocal(X0Y0_ロータ.ToGlobal(X0Y0_ロータ.JP[2].Joint)); X0Y1_ロータ.BasePointBase = X0Y1_ロータ.ToLocal(X0Y1_ロータ.ToGlobal(X0Y1_ロータ.JP[2].Joint)); X0Y2_ロータ.BasePointBase = X0Y2_ロータ.ToLocal(X0Y2_ロータ.ToGlobal(X0Y2_ロータ.JP[2].Joint)); @@ -297,12 +297,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.GetGrad(ref Col.Violet, out var ret); ロータCD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ロータD.cs index 67a4bf2..56d41e8 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new ロータ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs index 8178893..6e6bf35 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレス.cs @@ -647,7 +647,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -694,7 +694,7 @@ namespace SlaveMatrix } } - public 上着トップ_ドレス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着トップ_ドレスD e) + public 上着トップ_ドレス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着トップ_ドレスD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["上着トップ"][2]); @@ -841,7 +841,7 @@ namespace SlaveMatrix X0Y0_右_柄_柄2CP = new ColorP(X0Y0_右_柄_柄2, 右_柄_柄2CD, DisUnit, abj: true); X0Y0_右_バストCP = new ColorP(X0Y0_右_バスト, 右_バストCD, DisUnit, abj: true); X0Y0_右_縁CP = new ColorP(X0Y0_右_縁, 右_縁CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override bool Is革(Par p) @@ -907,12 +907,12 @@ namespace SlaveMatrix X0Y0_右_縁CP.Update(縁右); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 服基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 紐_紐1_紐下_紐CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着トップ_ドレスD.cs index d0103dd..a2d3d4b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着トップ_ドレス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs index 3e8c41b..345922d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス.cs @@ -612,7 +612,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -642,7 +642,7 @@ namespace SlaveMatrix public JointS 上着ボトム後_接続点 => new JointS(Body, X0Y0_中_下地, 4); - public 上着ボトム_クロス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着ボトム_クロスD e) + public 上着ボトム_クロス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着ボトム_クロスD e) { 上着ボトム_クロス 上着ボトム_クロス2 = this; ThisType = GetType(); @@ -797,7 +797,7 @@ namespace SlaveMatrix X0Y1_右_皺4CP = new ColorP(X0Y1_右_皺4, 右_皺4CD, DisUnit, abj: true); X0Y1_右_皺5CP = new ColorP(X0Y1_右_皺5, 右_皺5CD, DisUnit, abj: true); X0Y1_右_皺6CP = new ColorP(X0Y1_右_皺6, 右_皺6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度XB = 1.01; 尺度YB = 0.95; } @@ -855,12 +855,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 中_下地CD = new ColorD(); 中_皺1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロスD.cs index ab3cc11..19211d0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着ボトム_クロス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs index 8abf372..3153f9f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後.cs @@ -155,7 +155,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -169,7 +169,7 @@ namespace SlaveMatrix } } - public 上着ボトム_クロス後(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着ボトム_クロス後D e) + public 上着ボトム_クロス後(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着ボトム_クロス後D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["上着ボトム後"]); @@ -227,7 +227,7 @@ namespace SlaveMatrix X0Y1_染み_染み2CP = new ColorP(X0Y1_染み_染み2, 染み_染み2CD, DisUnit, abj: true); X0Y1_染み_染み1CP = new ColorP(X0Y1_染み_染み1, 染み_染み1CD, DisUnit, abj: true); 染み濃度 = e.染み濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度XB = 1.01; 尺度YB = 0.95; } @@ -257,12 +257,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 下地CD = new ColorD(); 染み_染み2CD = new ColorD(ref Col.Empty, ref 体配色.染み); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_クロス後D.cs index da31596..b7d4bf1 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着ボトム_クロス後(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs index 706b13e..9801b65 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛け.cs @@ -348,7 +348,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -369,7 +369,7 @@ namespace SlaveMatrix } } - public 上着ボトム_前掛け(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着ボトム_前掛けD e) + public 上着ボトム_前掛け(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着ボトム_前掛けD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["上着ボトム前"][1]); @@ -468,7 +468,7 @@ namespace SlaveMatrix X0Y1_縁前_縁左CP = new ColorP(X0Y1_縁前_縁左, 縁前_縁左CD, DisUnit, abj: true); X0Y1_縁前_縁右CP = new ColorP(X0Y1_縁前_縁右, 縁前_縁右CD, DisUnit, abj: true); X0Y1_縁前_縁中CP = new ColorP(X0Y1_縁前_縁中, 縁前_縁中CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; } @@ -544,12 +544,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 帯CD = new ColorD(); 巻CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ボトム_前掛けD.cs index 3d90495..0d8456a 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着ボトム_前掛け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs index 180e3e0..f4582c8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレス.cs @@ -301,7 +301,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -321,7 +321,7 @@ namespace SlaveMatrix } } - public 上着ミドル_ドレス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 上着ミドル_ドレスD e) + public 上着ミドル_ドレス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 上着ミドル_ドレスD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["上着ミドル"][2]); @@ -402,7 +402,7 @@ namespace SlaveMatrix 柄右 = new Par[2] { X0Y0_柄_柄右_柄2_柄1, X0Y0_柄_柄右_柄2_柄2 }; X0Y0_柄_柄右_柄2_柄1CP = new ColorP(X0Y0_柄_柄右_柄2_柄1, 柄_柄右_柄2_柄1CD, DisUnit, abj: true); X0Y0_柄_柄右_柄2_柄2CP = new ColorP(X0Y0_柄_柄右_柄2_柄2, 柄_柄右_柄2_柄2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; } @@ -445,12 +445,12 @@ namespace SlaveMatrix X0Y0_柄_柄右_柄2_柄2CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 服CD = new ColorD(); 縁_縁左CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/上着ミドル_ドレスD.cs index 4b4b9a8..f0a9bb0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 上着ミドル_ドレス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs index 263a943..3a38740 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロス.cs @@ -521,7 +521,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -588,7 +588,7 @@ namespace SlaveMatrix } } - public 下着トップ_クロス(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_クロスD e) + public 下着トップ_クロス(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_クロスD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][4]); @@ -705,7 +705,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -765,12 +765,12 @@ namespace SlaveMatrix X0Y0_カップ左_縁_縁2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 布_布左_布CD = new ColorD(); 布_布左_皺_皺1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_クロスD.cs index 78c9c84..0308119 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_クロス(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs index d8279d5..a562c53 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブ.cs @@ -469,7 +469,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -532,7 +532,7 @@ namespace SlaveMatrix } } - public 下着トップ_チューブ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_チューブD e) + public 下着トップ_チューブ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_チューブD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][3]); @@ -639,7 +639,7 @@ namespace SlaveMatrix X0Y0_皺_皺2CP = new ColorP(X0Y0_皺_皺2, 皺_皺2CD, DisUnit, abj: true); X0Y0_縁_縁1CP = new ColorP(X0Y0_縁_縁1, 縁_縁1CD, DisUnit, abj: true); X0Y0_縁_縁2CP = new ColorP(X0Y0_縁_縁2, 縁_縁2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -693,12 +693,12 @@ namespace SlaveMatrix X0Y0_縁_縁2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 布_布左_布CD = new ColorD(); 布_布左_皺_皺1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_チューブD.cs index 6c6c9eb..fbb7f54 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_チューブ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs index 37f8620..8c432af 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニ.cs @@ -383,7 +383,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -444,7 +444,7 @@ namespace SlaveMatrix } } - public 下着トップ_ビキニ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_ビキニD e) + public 下着トップ_ビキニ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_ビキニD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][1]); @@ -537,7 +537,7 @@ namespace SlaveMatrix X0Y0_カップ右_縁_縁3CP = new ColorP(X0Y0_カップ右_縁_縁3, カップ右_縁_縁3CD, DisUnit, abj: true); X0Y0_カップ右_縁_縁4CP = new ColorP(X0Y0_カップ右_縁_縁4, カップ右_縁_縁4CD, DisUnit, abj: true); 尺度YB *= 1.1; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -587,12 +587,12 @@ namespace SlaveMatrix X0Y0_カップ右_縁_縁4CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 紐CD = new ColorD(); カップ左_紐CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ビキニD.cs index a8f53c6..beb6243 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_ビキニ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs index 3078281..b6f8789 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラ.cs @@ -2042,7 +2042,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2299,7 +2299,7 @@ namespace SlaveMatrix } } - public 下着トップ_ブラ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_ブラD e) + public 下着トップ_ブラ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_ブラD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][0]); @@ -2640,7 +2640,7 @@ namespace SlaveMatrix X0Y0_リボン_リボンCP = new ColorP(X0Y0_リボン_リボン, リボン_リボンCD, DisUnit, abj: true); X0Y0_リボン_結び目CP = new ColorP(X0Y0_リボン_結び目, リボン_結び目CD, DisUnit, abj: true); 尺度YB *= 1.1; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -2826,12 +2826,12 @@ namespace SlaveMatrix X0Y0_リボン_結び目CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { バンド_バンドCD = new ColorD(); バンド_縁_下CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_ブラD.cs index a3da56f..1f6883e 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_ブラ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs index c3837ca..8397e27 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロ.cs @@ -383,7 +383,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -444,7 +444,7 @@ namespace SlaveMatrix } } - public 下着トップ_マイクロ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着トップ_マイクロD e) + public 下着トップ_マイクロ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着トップ_マイクロD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着トップ"][2]); @@ -537,7 +537,7 @@ namespace SlaveMatrix X0Y0_カップ右_縁_縁3CP = new ColorP(X0Y0_カップ右_縁_縁3, カップ右_縁_縁3CD, DisUnit, abj: true); X0Y0_カップ右_縁_縁4CP = new ColorP(X0Y0_カップ右_縁_縁4, カップ右_縁_縁4CD, DisUnit, abj: true); 尺度YB *= 1.1; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -587,12 +587,12 @@ namespace SlaveMatrix X0Y0_カップ右_縁_縁4CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 紐CD = new ColorD(); カップ左_紐CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着トップ_マイクロD.cs index 411149d..fab38e3 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着トップ_マイクロ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs index 5067bca..3eab405 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマル.cs @@ -2646,7 +2646,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2709,7 +2709,7 @@ namespace SlaveMatrix } } - public 下着ボトム_ノーマル(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着ボトム_ノーマルD e) + public 下着ボトム_ノーマル(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着ボトム_ノーマルD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着ボトム"][0]); @@ -3459,7 +3459,7 @@ namespace SlaveMatrix X0Y4_染み_染み2CP = new ColorP(X0Y4_染み_染み2, 染み_染み2CD, DisUnit, abj: true); X0Y4_染み_染み1CP = new ColorP(X0Y4_染み_染み1, 染み_染み1CD, DisUnit, abj: true); 染み濃度 = e.染み濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; double y = 0.0005; X0Y0_下地.BasePointBase = X0Y0_下地.BasePointBase.AddY(y); @@ -4049,12 +4049,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 紐左CD = new ColorD(); 紐右CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_ノーマルD.cs index a3f0e1a..6bd0f2b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着ボトム_ノーマル(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs index 6159366..cea96f9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロ.cs @@ -1738,7 +1738,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1784,7 +1784,7 @@ namespace SlaveMatrix } } - public 下着ボトム_マイクロ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着ボトム_マイクロD e) + public 下着ボトム_マイクロ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着ボトム_マイクロD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["下着ボトム"][1]); @@ -2279,7 +2279,7 @@ namespace SlaveMatrix X0Y4_染み_染み2CP = new ColorP(X0Y4_染み_染み2, 染み_染み2CD, DisUnit, abj: true); X0Y4_染み_染み1CP = new ColorP(X0Y4_染み_染み1, 染み_染み1CD, DisUnit, abj: true); 染み濃度 = e.染み濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; double y = 0.0005; X0Y0_下地.BasePointBase = X0Y0_下地.BasePointBase.AddY(y); @@ -2699,12 +2699,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 紐左CD = new ColorD(); 紐右CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着ボトム_マイクロD.cs index 5a176d0..6763f33 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着ボトム_マイクロ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs index 50aefd5..3399e1b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首.cs @@ -139,7 +139,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -177,7 +177,7 @@ namespace SlaveMatrix } } - public 下着乳首(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着乳首D e) + public 下着乳首(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着乳首D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["下着乳首左"]); @@ -228,7 +228,7 @@ namespace SlaveMatrix X0Y0_染み2CP = new ColorP(X0Y0_染み2, 染み2CD, DisUnit, abj: true); X0Y0_染み1CP = new ColorP(X0Y0_染み1, 染み1CD, DisUnit, abj: true); 染み濃度 = e.染み濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -238,12 +238,12 @@ namespace SlaveMatrix X0Y0_染み1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 乳首CD = new ColorD(); 染み2CD = new ColorD(ref Col.Empty, ref 体配色.染み); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着乳首D.cs index a0dd1f6..f73fe70 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着乳首(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs index 9c450ce..9fb1945 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 下着陰核(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 下着陰核D e) + public 下着陰核(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 下着陰核D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["下着陰核"]); @@ -124,7 +124,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_陰核CP = new ColorP(X0Y0_陰核, 陰核CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -132,12 +132,12 @@ namespace SlaveMatrix X0Y0_陰核CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 陰核CD = new ColorD(); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/下着陰核D.cs index e6d42b3..47387d4 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 下着陰核(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs index 611ff83..f95bdb4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房.cs @@ -676,7 +676,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -792,7 +792,7 @@ namespace SlaveMatrix public JointS 噴乳_接続点 => new JointS(Body, X0Y0_乳首, 0); - public 乳房(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 乳房D e) + public 乳房(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 乳房D e) { 乳房 乳房2 = this; ThisType = GetType(); @@ -1001,7 +1001,7 @@ namespace SlaveMatrix 傷I1濃度 = e.傷I1濃度; 傷I2濃度 = e.傷I2濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -1170,12 +1170,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 乳房CD = new ColorD(ref Col.Black, ref 体配色.人肌O); 乳輪CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/乳房D.cs index f4efb0d..cac6dc3 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 乳房(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs index 408e657..dc1adda 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs @@ -4589,11 +4589,11 @@ namespace SlaveMatrix return null; } - public static ChaD Mix(this ChaD 母方, ChaD 父方, bool 原種モード) + public static CharacterData Mix(this CharacterData 母方, CharacterData 父方, bool 原種モード) { double num = Mix(母方.魔力濃度, 父方.魔力濃度, 1.0); WaistD d; - return new ChaD(d = Mix(母方.body_tree, 父方.body_tree, num, 原種モード), Mix(母方.body_color, 父方.body_color, num, d)) + return new CharacterData(d = Mix(母方.body_tree, 父方.body_tree, num, 原種モード), Mix(母方.body_color, 父方.body_color, num, d)) { Lust = Mix(母方.Lust, 父方.Lust, 0.6), Affection = Mix(母方.Affection, 父方.Affection, 0.6), diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs index a360203..3fd9ba4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/処理B.cs @@ -10,9 +10,9 @@ namespace SlaveMatrix public RenderArea Are; - public Cha Cha; + public Character Cha; - public Bod Bod; + public Body Bod; public InfoPanel ip; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs index 8bfafbd..564c73a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs @@ -17,11 +17,11 @@ namespace SlaveMatrix public void 剃り() { - if (CP.GetFlag(0.1 * Cha.ChaD.現陰毛)) + if (CP.GetFlag(0.1 * Cha.CharacterData.現陰毛)) { 調教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); + 調教UI.擬音.Sound(a, 対象.Ele.位置.GetAreaPoint(0.01), Sta.剃り.GetVal(Cha.CharacterData.現陰毛, RNG.XS.NextDouble()), new Font("MS Gothic", 1f), Col.Black, 0.1 + 0.1 * RNG.XS.NextDouble(), b: true); }); } } @@ -88,10 +88,10 @@ namespace SlaveMatrix Player.奴体力消費小(); Player.主精力消費小(); 剃り(); - Cha.ChaD.現陰毛 = (Cha.ChaD.現陰毛 - 0.01).Clamp(0.0, 1.0); - Cha.Bod.腰肌_人.陰毛CD.不透明度 = Cha.ChaD.現陰毛 * Cha.ChaD.最陰毛濃度; - Cha.Bod.腰肌_人.獣性_獣毛CD.不透明度 = Cha.ChaD.現陰毛; - Cha.Bod.腰肌_人.陰毛_ハートCD.不透明度 = Cha.ChaD.現陰毛.Inverse() * Cha.ChaD.最陰毛濃度; + Cha.CharacterData.現陰毛 = (Cha.CharacterData.現陰毛 - 0.01).Clamp(0.0, 1.0); + Cha.Body.腰肌_人.陰毛CD.不透明度 = Cha.CharacterData.現陰毛 * Cha.CharacterData.最陰毛濃度; + Cha.Body.腰肌_人.獣性_獣毛CD.不透明度 = Cha.CharacterData.現陰毛; + Cha.Body.腰肌_人.陰毛_ハートCD.不透明度 = Cha.CharacterData.現陰毛.Inverse() * Cha.CharacterData.最陰毛濃度; } else if (調教UI.押し状態) { @@ -169,10 +169,10 @@ namespace SlaveMatrix { } - public void SetCha(Cha Cha) + public void SetCha(Character Cha) { base.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; } public new void Reset() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs index b4a130c..456e6a6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲.cs @@ -647,7 +647,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -709,7 +709,7 @@ namespace SlaveMatrix public JointS 軸3_接続点 => new JointS(Body, X0Y0_前翅_前翅軸_軸2, 0); - public 前翅_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前翅_甲D e) + public 前翅_甲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前翅_甲D e) { 前翅_甲 前翅_甲2 = this; ThisType = GetType(); @@ -904,7 +904,7 @@ namespace SlaveMatrix X0Y1_欠け1CP = new ColorP(X0Y1_欠け1, 欠け1CD, DisUnit, abj: true); X0Y1_欠け2CP = new ColorP(X0Y1_欠け2, 欠け2CD, DisUnit, abj: true); X0Y1_欠け3CP = new ColorP(X0Y1_欠け3, 欠け3CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -977,12 +977,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 前翅_前翅軸_軸1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 前翅_前翅軸_軸2CD = new ColorD(ref Col.Black, ref 体配色.甲0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_甲D.cs index e473fb3..970c4b5 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前翅_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs index 6fc71a8..b31209c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽.cs @@ -858,7 +858,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -900,7 +900,7 @@ namespace SlaveMatrix } } - public 前翅_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前翅_羽D e) + public 前翅_羽(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前翅_羽D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["前翅"][1]); @@ -1102,7 +1102,7 @@ namespace SlaveMatrix X0Y1_前翅_翅脈網2_翅脈網線1CP = new ColorP(X0Y1_前翅_翅脈網2_翅脈網線1, 前翅_翅脈網2_翅脈網線1CD, DisUnit, abj: true); X0Y1_前翅_翅脈網2_翅脈網線2CP = new ColorP(X0Y1_前翅_翅脈網2_翅脈網線2, 前翅_翅脈網2_翅脈網線2CD, DisUnit, abj: true); X0Y1_前翅_翅脈網2_翅脈網線3CP = new ColorP(X0Y1_前翅_翅脈網2_翅脈網線3, 前翅_翅脈網2_翅脈網線3CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1185,7 +1185,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1204,7 +1204,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 前翅_前翅CD = new ColorD(ref Col.Black, ref Color2.Empty); 前翅_翅脈1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -1239,7 +1239,7 @@ namespace SlaveMatrix 前翅_翅脈網2_翅脈網線3CD = new ColorD(ref Col.Black, ref 体配色.ハイライト2O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 前翅_前翅CD = new ColorD(ref Col.Black, ref Color2.Empty); 前翅_翅脈1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -1274,7 +1274,7 @@ namespace SlaveMatrix 前翅_翅脈網2_翅脈網線3CD = new ColorD(ref Col.Black, ref 体配色.ハイライト2O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 前翅_前翅CD = new ColorD(ref Col.Black, ref Color2.Empty); 前翅_翅脈1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_羽D.cs index 4e85b47..cddba77 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前翅_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs index 69f2855..012d4f9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草.cs @@ -364,7 +364,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -398,7 +398,7 @@ namespace SlaveMatrix } } - public 前翅_草(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前翅_草D e) + public 前翅_草(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前翅_草D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["前翅"][3]); @@ -502,7 +502,7 @@ namespace SlaveMatrix X0Y1_前翅_前翅2CP = new ColorP(X0Y1_前翅_前翅2, 前翅_前翅2CD, DisUnit, abj: true); X0Y1_前翅_紋1CP = new ColorP(X0Y1_前翅_紋1, 前翅_紋1CD, DisUnit, abj: true); X0Y1_前翅_紋2CP = new ColorP(X0Y1_前翅_紋2, 前翅_紋2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -547,12 +547,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.Alpha(ref 体配色.体0O, 128, out var ret); 前翅_前翅1CD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_草D.cs index 831fc26..bcf0f9d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前翅_草(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs index c6b4916..61a16f8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶.cs @@ -600,7 +600,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -664,7 +664,7 @@ namespace SlaveMatrix } } - public 前翅_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前翅_蝶D e) + public 前翅_蝶(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前翅_蝶D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["前翅"][2]); @@ -817,7 +817,7 @@ namespace SlaveMatrix X0Y1_前翅_揚羽_紋4CP = new ColorP(X0Y1_前翅_揚羽_紋4, 前翅_揚羽_紋4CD, DisUnit, abj: true); X0Y1_前翅_揚羽_紋5CP = new ColorP(X0Y1_前翅_揚羽_紋5, 前翅_揚羽_紋5CD, DisUnit, abj: true); X0Y1_前翅_揚羽_紋6CP = new ColorP(X0Y1_前翅_揚羽_紋6, 前翅_揚羽_紋6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -880,12 +880,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 前翅_前翅CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 前翅_水青_柄CD = new ColorD(ref Col.Empty, ref 体配色.柄O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前翅_蝶D.cs index c6617c8..f538d9f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前翅_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs index 8b9a506..91e99d0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ.cs @@ -731,7 +731,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_ジグ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_ジグD e) + public 前髪_ジグ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_ジグD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -961,7 +961,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -999,12 +999,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪左2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグD.cs index 8a81818..9a2c068 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_ジグ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs index 51b1b17..18af6da 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄.cs @@ -731,7 +731,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_ジグ中寄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_ジグ中寄D e) + public 前髪_ジグ中寄(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_ジグ中寄D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -961,7 +961,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -999,12 +999,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪左2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ中寄D.cs index 50f337b..f6f4e3d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_ジグ中寄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs index 5bc02ed..022f207 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分け.cs @@ -731,7 +731,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_ジグ分け(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_ジグ分けD e) + public 前髪_ジグ分け(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_ジグ分けD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -961,7 +961,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -999,12 +999,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪左2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_ジグ分けD.cs index 64362ff..0c53ea4 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_ジグ分け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs index f2cb123..0b70dda 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツン.cs @@ -731,7 +731,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_パッツン(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_パッツンD e) + public 前髪_パッツン(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_パッツンD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -961,7 +961,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -999,12 +999,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪左2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_パッツンD.cs index 54044f8..1b7df5b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_パッツン(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs index 166bfb7..05c7675 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャ.cs @@ -731,7 +731,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_モジャ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_モジャD e) + public 前髪_モジャ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_モジャD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -961,7 +961,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -999,12 +999,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪左2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_モジャD.cs index ca9cb25..407561b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_モジャ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs index 407f14a..15ce21b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1.cs @@ -771,7 +771,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -856,7 +856,7 @@ namespace SlaveMatrix } } - public 前髪_三分1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_三分1D e) + public 前髪_三分1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_三分1D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1011,7 +1011,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -1051,12 +1051,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分1D.cs index 0ad895c..2cf0092 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_三分1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs index 39f9bcd..847e817 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2.cs @@ -731,7 +731,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -787,7 +787,7 @@ namespace SlaveMatrix } } - public 前髪_三分2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_三分2D e) + public 前髪_三分2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_三分2D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -936,7 +936,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -974,12 +974,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_三分2D.cs index 8bce44b..36fe6f4 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_三分2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs index 063b646..33d8a48 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片.cs @@ -671,7 +671,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -721,7 +721,7 @@ namespace SlaveMatrix } } - public 前髪_上げ片(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ片D e) + public 前髪_上げ片(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ片D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -861,7 +861,7 @@ namespace SlaveMatrix X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); X0Y0_ハイライト右CP = new ColorP(X0Y0_ハイライト右, ハイライト右CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -896,12 +896,12 @@ namespace SlaveMatrix X0Y0_ハイライト右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ片D.cs index 805c2e1..3a2c497 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ片(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs index 8c87262..113660c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1.cs @@ -691,7 +691,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_上げ短1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ短1D e) + public 前髪_上げ短1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ短1D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -886,7 +886,7 @@ namespace SlaveMatrix X0Y0_髪右3CP = new ColorP(X0Y0_髪右3, 髪右3CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -922,12 +922,12 @@ namespace SlaveMatrix X0Y0_髪右4CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短1D.cs index 51bb877..ffc5861 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ短1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs index 14c72a8..fd37514 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2.cs @@ -691,7 +691,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_上げ短2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ短2D e) + public 前髪_上げ短2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ短2D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -886,7 +886,7 @@ namespace SlaveMatrix X0Y0_髪右3CP = new ColorP(X0Y0_髪右3, 髪右3CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -922,12 +922,12 @@ namespace SlaveMatrix X0Y0_髪右4CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ短2D.cs index 8a687f8..e1a0e08 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ短2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs index 720eb35..53bda88 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1.cs @@ -691,7 +691,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_上げ長1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ長1D e) + public 前髪_上げ長1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ長1D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -886,7 +886,7 @@ namespace SlaveMatrix X0Y0_髪右3CP = new ColorP(X0Y0_髪右3, 髪右3CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -922,12 +922,12 @@ namespace SlaveMatrix X0Y0_髪右4CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長1D.cs index d5bdfdf..6db6b47 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ長1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs index 88c2cd7..e9f2df5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2.cs @@ -691,7 +691,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_上げ長2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_上げ長2D e) + public 前髪_上げ長2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_上げ長2D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -886,7 +886,7 @@ namespace SlaveMatrix X0Y0_髪右3CP = new ColorP(X0Y0_髪右3, 髪右3CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -922,12 +922,12 @@ namespace SlaveMatrix X0Y0_髪右4CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_上げ長2D.cs index f35f98a..6f4a40c 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_上げ長2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs index 711ced8..27da79c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1.cs @@ -611,7 +611,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -659,7 +659,7 @@ namespace SlaveMatrix } } - public 前髪_中分け1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_中分け1D e) + public 前髪_中分け1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_中分け1D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -790,7 +790,7 @@ namespace SlaveMatrix X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); X0Y0_ハイライト右CP = new ColorP(X0Y0_ハイライト右, ハイライト右CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -822,12 +822,12 @@ namespace SlaveMatrix X0Y0_ハイライト右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け1D.cs index 3d3d9e4..27862ab 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_中分け1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs index 81da074..06658e5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2.cs @@ -611,7 +611,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -657,7 +657,7 @@ namespace SlaveMatrix } } - public 前髪_中分け2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_中分け2D e) + public 前髪_中分け2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_中分け2D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -788,7 +788,7 @@ namespace SlaveMatrix X0Y0_ハイライト右CP = new ColorP(X0Y0_ハイライト右, ハイライト右CD, DisUnit, abj: false); X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -820,12 +820,12 @@ namespace SlaveMatrix X0Y0_髪右4CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_中分け2D.cs index ff448d9..2cf0d95 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_中分け2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs index 4bf8ea5..76d54e6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1.cs @@ -731,7 +731,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -812,7 +812,7 @@ namespace SlaveMatrix } } - public 前髪_二分1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_二分1D e) + public 前髪_二分1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_二分1D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -961,7 +961,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -999,12 +999,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分1D.cs index 5286262..a6d891f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_二分1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs index 7e896ba..86a6a0b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2.cs @@ -691,7 +691,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_二分2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_二分2D e) + public 前髪_二分2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_二分2D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -886,7 +886,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -922,12 +922,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_二分2D.cs index 6e9414c..78168fd 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_二分2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs index 0137dc6..e31f632 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流し.cs @@ -689,7 +689,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -766,7 +766,7 @@ namespace SlaveMatrix } } - public 前髪_横流し(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_横流しD e) + public 前髪_横流し(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_横流しD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -909,7 +909,7 @@ namespace SlaveMatrix X0Y0_髪頭頂横右1CP = new ColorP(X0Y0_髪頭頂横右1, 髪頭頂横右1CD, DisUnit, abj: false); X0Y0_髪頭頂横右2CP = new ColorP(X0Y0_髪頭頂横右2, 髪頭頂横右2CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -945,12 +945,12 @@ namespace SlaveMatrix X0Y0_髪頭頂横右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_横流しD.cs index 6a10d9a..7d4b3cd 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_横流し(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs index 3d96ab1..7d5c796 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1.cs @@ -651,7 +651,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -724,7 +724,7 @@ namespace SlaveMatrix } } - public 前髪_目隠れ1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_目隠れ1D e) + public 前髪_目隠れ1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_目隠れ1D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -861,7 +861,7 @@ namespace SlaveMatrix X0Y0_ハイライト左CP = new ColorP(X0Y0_ハイライト左, ハイライト左CD, DisUnit, abj: false); X0Y0_ハイライト右CP = new ColorP(X0Y0_ハイライト右, ハイライト右CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -895,12 +895,12 @@ namespace SlaveMatrix X0Y0_ハイライト右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); 髪左2CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ1D.cs index 6b6562b..86dc9c0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_目隠れ1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs index 68b56d9..b8609a1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2.cs @@ -691,7 +691,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public 前髪_目隠れ2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 前髪_目隠れ2D e) + public 前髪_目隠れ2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 前髪_目隠れ2D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -886,7 +886,7 @@ namespace SlaveMatrix X0Y0_髪右4CP = new ColorP(X0Y0_髪右4, 髪右4CD, DisUnit, abj: false); X0Y0_髪右5CP = new ColorP(X0Y0_髪右5, 髪右5CD, DisUnit, abj: false); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -922,12 +922,12 @@ namespace SlaveMatrix X0Y0_髪右5CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 髪左1CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/前髪_目隠れ2D.cs index 42ae94f..75b66ee 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 前髪_目隠れ2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs index 270f7a7..23963ef 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目.cs @@ -174,7 +174,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -221,7 +221,7 @@ namespace SlaveMatrix public JointS 瞼_接続点 => new JointS(Body, X0Y0_白目, 0); - public 単目(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単目D e) + public 単目(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 単目D e) { 単目 単目2 = this; ThisType = GetType(); @@ -299,7 +299,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public void 猫目() @@ -324,12 +324,12 @@ namespace SlaveMatrix X0Y0_黒目_ハートCP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 白目CD = new ColorD(ref Col.Empty, ref 体配色.白部O); 黒目_黒目CD = new ColorD(ref Col.Black, ref 体配色.目左O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単目D.cs index 2b7ae57..b34b782 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs index 2cd5c56..0ff62c2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉.cs @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -121,7 +121,7 @@ namespace SlaveMatrix } } - public 単眼眉(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単眼眉D e) + public 単眼眉(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 単眼眉D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["単眼眉"]); @@ -168,7 +168,7 @@ namespace SlaveMatrix X0Y0_眉CP = new ColorP(X0Y0_眉, 眉CD, DisUnit, abj: false); X0Y1_眉CP = new ColorP(X0Y1_眉, 眉CD, DisUnit, abj: false); X0Y2_眉CP = new ColorP(X0Y2_眉, 眉CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -187,12 +187,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 眉CD = new ColorD(ref 体配色.薄線, ref 体配色.眉O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単眼眉D.cs index 91ba64e..0ef24a5 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単眼眉(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs index 0b11c78..1832cec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼.cs @@ -1013,7 +1013,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1268,7 +1268,7 @@ namespace SlaveMatrix } } - public 単瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単瞼D e) + public 単瞼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 単瞼D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["単眼瞼"]); @@ -1599,7 +1599,7 @@ namespace SlaveMatrix X1Y4_睫毛下下左CP = new ColorP(X1Y4_睫毛下下左, 睫毛下下左CD, DisUnit, abj: true); X1Y4_睫毛下上右CP = new ColorP(X1Y4_睫毛下上右, 睫毛下上右CD, DisUnit, abj: true); X1Y4_睫毛下下右CP = new ColorP(X1Y4_睫毛下下右, 睫毛下下右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } private void 睫毛長さ(Par p, double d) @@ -1943,12 +1943,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 瞼下CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.人肌O); 瞼上CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単瞼D.cs index 638a393..d1e9fae 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs index afae71d..54478b7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植.cs @@ -860,7 +860,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -923,7 +923,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public 単足_植(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単足_植D e) + public 単足_植(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 単足_植D e) { 単足_植 単足_植2 = this; ThisType = GetType(); @@ -1142,7 +1142,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -1229,7 +1229,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1248,7 +1248,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 幹上CD = new ColorD(ref Col.Black, ref 体配色.植0O); 幹下CD = new ColorD(ref Col.Black, ref 体配色.植0O); @@ -1290,7 +1290,7 @@ namespace SlaveMatrix 脚輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 幹上CD = new ColorD(ref Col.Black, ref 体配色.植0O); 幹下CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -1332,7 +1332,7 @@ namespace SlaveMatrix 脚輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 幹上CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 幹下CD = new ColorD(ref Col.Black, ref 体配色.植0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_植D.cs index 43e7514..1a8f6cd 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単足_植(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs index 5bd1c2c..455fb1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘.cs @@ -759,7 +759,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -802,7 +802,7 @@ namespace SlaveMatrix } } - public 単足_粘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 単足_粘D e) + public 単足_粘(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 単足_粘D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -950,7 +950,7 @@ namespace SlaveMatrix X0Y0_粘液上右_ハイライトCP = new ColorP(X0Y0_粘液上右_ハイライト, 粘液上右_ハイライトCD, DisUnit, abj: true); X0Y0_ハイライトCP = new ColorP(X0Y0_ハイライト, ハイライトCD, DisUnit, abj: true); ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -989,12 +989,12 @@ namespace SlaveMatrix X0Y0_ハイライトCP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.Alpha(ref 体配色.人肌O, 128, out var ret); 粘液0CD = new ColorD(ref Col.Empty, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/単足_粘D.cs index ad3b0c5..2c65744 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 単足_粘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs index 1943a91..ef4f4b8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目.cs @@ -174,7 +174,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -221,7 +221,7 @@ namespace SlaveMatrix public JointS 瞼_接続点 => new JointS(Body, X0Y0_白目, 0); - public 双目(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 双目D e) + public 双目(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 双目D e) { 双目 双目2 = this; ThisType = GetType(); @@ -298,7 +298,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public void 猫目() @@ -323,7 +323,7 @@ namespace SlaveMatrix X0Y0_黒目_ハイライト下CP.Update(); } - private void 配色N0(体配色 体配色, bool 右) + private void 配色N0(BodyColorSet 体配色, bool 右) { if (右) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/双目D.cs index c0b1d94..fad849f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 双目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs index 5a877b0..0c4da3a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂け.cs @@ -567,7 +567,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -583,7 +583,7 @@ namespace SlaveMatrix } } - public 口_裂け(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 口_裂けD e) + public 口_裂け(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 口_裂けD e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["口"][1]); @@ -792,7 +792,7 @@ namespace SlaveMatrix X0Y13_口紅下_ハイライトCP = new ColorP(X0Y13_口紅下_ハイライト, 口紅下_ハイライトCD, DisUnit, abj: true); 口紅濃度 = e.口紅濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; double y = 1.5E-05; X0Y0_口.BasePointBase = X0Y0_口.BasePointBase.AddY(y); X0Y1_口.BasePointBase = X0Y1_口.BasePointBase.AddY(y); @@ -911,12 +911,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 口CD = new ColorD(ref Col.Black, ref 体配色.粘膜); 歯CD = new ColorD(ref Col.Black, ref 体配色.歯); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_裂けD.cs index 0a842c1..87cd441 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 口_裂け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs index d7e1727..2e59071 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常.cs @@ -767,7 +767,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -787,7 +787,7 @@ namespace SlaveMatrix } } - public 口_通常(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 口_通常D e) + public 口_通常(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 口_通常D e) { ThisType = GetType(); Dif dif = new Dif(Sta.胴体["口"][0]); @@ -1048,7 +1048,7 @@ namespace SlaveMatrix X0Y13_口紅下_ハイライトCP = new ColorP(X0Y13_口紅下_ハイライト, 口紅下_ハイライトCD, DisUnit, abj: true); 口紅濃度 = e.口紅濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -1176,12 +1176,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 口CD = new ColorD(ref Col.Black, ref 体配色.粘膜); 歯CD = new ColorD(ref Col.Black, ref 体配色.歯); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/口_通常D.cs index 4613972..f672a25 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 口_通常(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs index ac6ea5c..a2e12a9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/吹出し.cs @@ -73,7 +73,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs index 14924bb..6a221c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気.cs @@ -363,7 +363,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -400,7 +400,7 @@ namespace SlaveMatrix } } - public 呼気(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 呼気D e) + public 呼気(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 呼気D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["呼気"]); @@ -511,7 +511,7 @@ namespace SlaveMatrix X0Y1_呼気右2_呼気2CP = new ColorP(X0Y1_呼気右2_呼気2, 呼気右2_呼気2CD, DisUnit, abj: true); X0Y1_呼気右3_呼気1CP = new ColorP(X0Y1_呼気右3_呼気1, 呼気右3_呼気1CD, DisUnit, abj: true); X0Y1_呼気右3_呼気2CP = new ColorP(X0Y1_呼気右3_呼気2, 呼気右3_呼気2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -548,12 +548,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 呼気左1_呼気1CD = new ColorD(ref Col.Empty, ref 体配色.呼気); 呼気左1_呼気2CD = new ColorD(ref Col.Empty, ref 体配色.呼気); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/呼気D.cs index c713282..7320a34 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 呼気(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/咳D.cs index 105584c..8c622a8 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new Cough(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs index 8c710de..4ebcc3f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳.cs @@ -327,7 +327,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -344,7 +344,7 @@ namespace SlaveMatrix } } - public 噴乳(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 噴乳D e) + public 噴乳(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 噴乳D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["噴乳左"]); @@ -457,7 +457,7 @@ namespace SlaveMatrix X0Y5_母乳4CP = new ColorP(X0Y5_母乳4, 母乳4CD, DisUnit, abj: true); X0Y5_母乳垂れ1CP = new ColorP(X0Y5_母乳垂れ1, 母乳垂れ1CD, DisUnit, abj: true); X0Y5_母乳垂れ2CP = new ColorP(X0Y5_母乳垂れ2, 母乳垂れ2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -511,12 +511,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 母乳1CD = new ColorD(ref 体配色.母乳線, ref 体配色.母乳); 母乳2CD = new ColorD(ref 体配色.母乳線, ref 体配色.母乳); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/噴乳D.cs index a1a60c7..4d1ed48 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 噴乳(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs index bcd8cfe..c436e70 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴.cs @@ -175,7 +175,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -199,13 +199,13 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(Body, X0Y0_Torso, 1); - public 四足胴(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 四足胴D e) + public 四足胴(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 四足胴D e) { 四足胴 四足胴2 = this; ThisType = GetType(); Body = new Difs(Sta.半身["四足胴"]); Pars pars = Body[0][0]; - X0Y0_Torso = pars["Torso"].ToPar(); + X0Y0_Torso = pars["胴"].ToPar(); Pars pars2 = pars["筋肉"].ToPars(); X0Y0_筋肉_筋肉左 = pars2["筋肉左"].ToPar(); X0Y0_筋肉_筋肉右 = pars2["筋肉右"].ToPar(); @@ -301,7 +301,7 @@ namespace SlaveMatrix X0Y0_獣性_獣毛左CP = new ColorP(X0Y0_獣性_獣毛左, 獣性_獣毛左CD, DisUnit, abj: true); X0Y0_獣性_獣毛右CP = new ColorP(X0Y0_獣性_獣毛右, 獣性_獣毛右CD, DisUnit, abj: true); 筋肉濃度 = e.筋肉濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.96; } @@ -314,12 +314,12 @@ namespace SlaveMatrix X0Y0_獣性_獣毛右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { TorsoCD = new ColorD(ref Col.Black, ref 体配色.毛0R); 筋肉_筋肉左CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胴D.cs index 460651b..baec8cb 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 四足胴(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs index b212a4b..6842c5c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸.cs @@ -743,7 +743,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -808,7 +808,7 @@ namespace SlaveMatrix public JointS 背中_接続点 => new JointS(Body, X0Y0_胸郭, 10); - public 四足胸(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 四足胸D e) + public 四足胸(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 四足胸D e) { 四足胸 四足胸2 = this; ThisType = GetType(); @@ -1077,7 +1077,7 @@ namespace SlaveMatrix X0Y0_竜性_右_鱗2CP = new ColorP(X0Y0_竜性_右_鱗2, 竜性_右_鱗2CD, DisUnit, abj: true); X0Y0_竜性_右_鱗3CP = new ColorP(X0Y0_竜性_右_鱗3, 竜性_右_鱗3CD, DisUnit, abj: true); 筋肉濃度 = e.筋肉濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.96; } @@ -1157,12 +1157,12 @@ namespace SlaveMatrix X0Y0_竜性_右_鱗3CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 胸郭CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉_筋肉左CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs index 349b9de..31df30a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足胸D.cs @@ -197,7 +197,7 @@ namespace SlaveMatrix } } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 四足胸(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs index d4064b3..0a78c1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇.cs @@ -107,7 +107,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -122,7 +122,7 @@ namespace SlaveMatrix public JointS UpperArm_接続点 => new JointS(Body, X0Y0_脇, 0); - public 四足脇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 四足脇D e) + public 四足脇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 四足脇D e) { 四足脇 四足脇2 = this; ThisType = GetType(); @@ -180,7 +180,7 @@ namespace SlaveMatrix X0Y0_脇CP = new ColorP(X0Y0_脇, 脇CD, DisUnit, abj: true); X0Y0_筋肉CP = new ColorP(X0Y0_筋肉, 筋肉CD, DisUnit, abj: true); 筋肉濃度 = e.筋肉濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -189,7 +189,7 @@ namespace SlaveMatrix X0Y0_筋肉CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -205,13 +205,13 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 脇CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋肉CD = new ColorD(ref Col.Black, ref 体配色.毛0O); } - private void 配色H0(体配色 体配色) + private void 配色H0(BodyColorSet 体配色) { 脇CD = new ColorD(ref Col.Black, ref 体配色.柄O); 筋肉CD = new ColorD(ref Col.Black, ref 体配色.柄O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs index b092b57..5021eb5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足脇D.cs @@ -27,7 +27,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.四足脇_UpperArm_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 四足脇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs index ef9d6f4..5211158 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰.cs @@ -1329,7 +1329,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1388,7 +1388,7 @@ namespace SlaveMatrix public JointS 翼右_接続点 => new JointS(Body, X0Y0_Waist, 8); - public 四足腰(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 四足腰D e) + public 四足腰(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 四足腰D e) { 四足腰 四足腰2 = this; ThisType = GetType(); @@ -1896,7 +1896,7 @@ namespace SlaveMatrix X0Y4_竜性_右_鱗1CP = new ColorP(X0Y4_竜性_右_鱗1, 竜性_右_鱗1CD, DisUnit, abj: true); X0Y4_竜性_右_鱗2CP = new ColorP(X0Y4_竜性_右_鱗2, 竜性_右_鱗2CD, DisUnit, abj: true); 筋肉濃度 = e.筋肉濃度; - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.96; double num = 1.0025; X0Y0_臍.BasePointBase = new Vector2D(X0Y0_臍.BasePointBase.X, 0.363998381176966); @@ -2075,7 +2075,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -2094,7 +2094,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { WaistCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 股CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); @@ -2126,7 +2126,7 @@ namespace SlaveMatrix 竜性_右_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { WaistCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 股CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); @@ -2158,7 +2158,7 @@ namespace SlaveMatrix 竜性_右_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { WaistCD = new ColorD(ref Col.Black, ref 体配色.毛0O); 股CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/四足腰D.cs index de9ab4f..a7ac2fc 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 四足腰(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs index c981a7d..adc68b9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪.cs @@ -84,7 +84,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -122,7 +122,7 @@ namespace SlaveMatrix public JointS 後髪_接続点 => new JointS(Body, X0Y0_髪, 3); - public 基髪(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 基髪D e) + public 基髪(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 基髪D e) { 基髪 基髪2 = this; ThisType = GetType(); @@ -231,7 +231,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_髪CP = new ColorP(X0Y0_髪, 髪CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -239,12 +239,12 @@ namespace SlaveMatrix X0Y0_髪CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 髪CD = new ColorD(ref 体配色.髪線, ref 体配色.髪O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/基髪D.cs index bf3c54b..881d57d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 基髪(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs index 8473f4e..77ba5db 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸.cs @@ -80,7 +80,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -100,7 +100,7 @@ namespace SlaveMatrix public JointS 軟体内右_接続点 => new JointS(Body, X0Y0_Torso, 2); - public 多足_蛸(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 多足_蛸D e) + public 多足_蛸(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 多足_蛸D e) { 多足_蛸 多足_蛸2 = this; ThisType = GetType(); @@ -111,7 +111,7 @@ namespace SlaveMatrix Body.Tag = dif.Tag; Body.Add(dif); Pars pars = Body[0][0]; - X0Y0_Torso = pars["Torso"].ToPar(); + X0Y0_Torso = pars["胴"].ToPar(); Body.SetJoints(); 接続根 = new JointD(Body); 右 = e.右; @@ -192,7 +192,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_TorsoCP = new ColorP(X0Y0_Torso, TorsoCD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -200,7 +200,7 @@ namespace SlaveMatrix X0Y0_TorsoCP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -219,17 +219,17 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { TorsoCD = new ColorD(ref Col.Black, ref 体配色.体0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { TorsoCD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { TorsoCD = new ColorD(ref Col.Black, ref 体配色.体0O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蛸D.cs index 6ac1d28..7dd7263 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 多足_蛸(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs index 61bcac5..bd4b64b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘.cs @@ -135,7 +135,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -171,7 +171,7 @@ namespace SlaveMatrix public JointS 尾_接続点 => new JointS(Body, X0Y0_Torso, 0); - public 多足_蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 多足_蜘D e) + public 多足_蜘(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 多足_蜘D e) { 多足_蜘 多足_蜘2 = this; ThisType = GetType(); @@ -346,7 +346,7 @@ namespace SlaveMatrix X0Y0_TorsoCP = new ColorP(X0Y0_Torso, TorsoCD, DisUnit, abj: true); X0Y0_胸版CP = new ColorP(X0Y0_胸版, 胸版CD, DisUnit, abj: true); X0Y0_柄CP = new ColorP(X0Y0_柄, 柄CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -356,7 +356,7 @@ namespace SlaveMatrix X0Y0_柄CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -375,21 +375,21 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { TorsoCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 胸版CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 柄CD = new ColorD(ref Col.Black, ref 体配色.体0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { TorsoCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 胸版CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 柄CD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { TorsoCD = new ColorD(ref Col.Black, ref 体配色.甲0O); 胸版CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蜘D.cs index 64b314f..533a974 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 多足_蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs index e82d100..4970b22 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍.cs @@ -881,7 +881,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -972,7 +972,7 @@ namespace SlaveMatrix public JointS 尾_接続点 => new JointS(Body, X0Y0_前腹_腹節7_節0, 2); - public 多足_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 多足_蠍D e) + public 多足_蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 多足_蠍D e) { 多足_蠍 多足_蠍2 = this; ThisType = GetType(); @@ -1290,7 +1290,7 @@ namespace SlaveMatrix X0Y0_生殖口蓋右CP = new ColorP(X0Y0_生殖口蓋右, 生殖口蓋右CD, DisUnit, abj: true); X0Y0_生殖口_生殖口0CP = new ColorP(X0Y0_生殖口_生殖口0, 生殖口_生殖口0CD, DisUnit, abj: true); X0Y0_生殖口_生殖口1CP = new ColorP(X0Y0_生殖口_生殖口1, 生殖口_生殖口1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1418,7 +1418,7 @@ namespace SlaveMatrix X0Y0_生殖口_生殖口1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1437,7 +1437,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 前腹_腹節7_節0CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 前腹_腹節7_節1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -1481,7 +1481,7 @@ namespace SlaveMatrix 生殖口_生殖口1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 前腹_腹節7_節0CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 前腹_腹節7_節1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -1525,7 +1525,7 @@ namespace SlaveMatrix 生殖口_生殖口1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 前腹_腹節7_節0CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 前腹_腹節7_節1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/多足_蠍D.cs index 7d7ed31..1fb9188 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 多足_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs index b8f6dfa..198c8c6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎.cs @@ -396,7 +396,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -426,7 +426,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 大顎(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 大顎D e) + public 大顎(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 大顎D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["虫顎"][1]); @@ -520,7 +520,7 @@ namespace SlaveMatrix X0Y1_折線2CP = new ColorP(X0Y1_折線2, 折線2CD, DisUnit, abj: true); X0Y1_折線3CP = new ColorP(X0Y1_折線3, 折線3CD, DisUnit, abj: true); X0Y1_穴CP = new ColorP(X0Y1_穴, 穴CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -590,7 +590,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -609,7 +609,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 刺_棘1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 刺_棘2CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -630,7 +630,7 @@ namespace SlaveMatrix 穴CD.色 = new Color2(ref Col.Black, ref 体配色.甲0O.Col2); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 刺_棘1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 刺_棘2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -651,7 +651,7 @@ namespace SlaveMatrix 穴CD.色 = new Color2(ref Col.Black, ref 体配色.甲0O.Col2); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 刺_棘1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 刺_棘2CD = new ColorD(ref Col.Black, ref 体配色.甲0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎D.cs index f8f1cb5..f69ee8f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 大顎(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs index d59d60d..fcc56ca 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎上.cs @@ -151,7 +151,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -167,7 +167,7 @@ namespace SlaveMatrix } } - public 大顎上(double DisUnit, 配色指定 配色指定, 体配色 体配色) + public 大顎上(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色) { ThisType = GetType(); Body = new Difs(Sta.肢中["大顎上"]); @@ -197,12 +197,12 @@ namespace SlaveMatrix X0Y0_棘右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 甲殻CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 線左CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs index 33e00fb..1906047 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基.cs @@ -147,7 +147,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -156,7 +156,7 @@ namespace SlaveMatrix set { 甲殻下CD.不透明度 = value; - 大顎上.濃度 = value; + 大顎上.Intensity = value; } } @@ -404,7 +404,7 @@ namespace SlaveMatrix public JointS 大顎上_接続点 => new JointS(Body, X0Y0_甲殻下, 2); - public 大顎基(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 大顎基D e) + public 大顎基(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 大顎基D e) { 大顎基 大顎基2 = this; 大顎上 = new 大顎上(DisUnit, 配色指定, 体配色); @@ -477,7 +477,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_甲殻下CP = new ColorP(X0Y0_甲殻下, 甲殻下CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void Dispose() @@ -504,12 +504,12 @@ namespace SlaveMatrix 大顎上.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 甲殻下CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/大顎基D.cs index 82070a2..bb3b7c6 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 大顎基(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs index a552393..c9fd6cc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/射精.cs @@ -247,7 +247,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -377,7 +377,7 @@ namespace SlaveMatrix X1Y13_精液掛けCP = new ColorP(X1Y13_精液掛け, 精液掛けCD, DisUnit, abj: true); X1Y13_精液CP = new ColorP(X1Y13_精液, 精液CD, DisUnit, abj: true); X1Y14_精液CP = new ColorP(X1Y14_精液, 精液CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs index fd18a8d..02a3020 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウ.cs @@ -3320,7 +3320,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -3500,7 +3500,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_ウ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_ウD e) + public 尾_ウ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_ウD e) { 尾_ウ 尾_ウ2 = this; ThisType = GetType(); @@ -4059,7 +4059,7 @@ namespace SlaveMatrix X0Y0_輪2_金具3CP = new ColorP(X0Y0_輪2_金具3, 輪2_金具3CD, DisUnit, abj: true); X0Y0_輪2_金具左CP = new ColorP(X0Y0_輪2_金具左, 輪2_金具左CD, DisUnit, abj: true); X0Y0_輪2_金具右CP = new ColorP(X0Y0_輪2_金具右, 輪2_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -4494,7 +4494,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -4513,7 +4513,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾20_尾CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 尾20_鱗左5CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -4676,7 +4676,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾20_尾CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 尾20_鱗左5CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -4839,7 +4839,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾20_尾CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 尾20_鱗左5CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ウD.cs index 9e34464..282472b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_ウ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs index 9f559fa..9afc708 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガ.cs @@ -2075,7 +2075,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2192,7 +2192,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_ガ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_ガD e) + public 尾_ガ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_ガD e) { ThisType = GetType(); Dif dif = new Dif(); @@ -2553,7 +2553,7 @@ namespace SlaveMatrix X0Y0_輪2_金具3CP = new ColorP(X0Y0_輪2_金具3, 輪2_金具3CD, DisUnit, abj: true); X0Y0_輪2_金具左CP = new ColorP(X0Y0_輪2_金具左, 輪2_金具左CD, DisUnit, abj: true); X0Y0_輪2_金具右CP = new ColorP(X0Y0_輪2_金具右, 輪2_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -2837,7 +2837,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -2856,7 +2856,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 尾9_尾CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -2958,7 +2958,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 尾9_尾CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -3060,7 +3060,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 尾9_尾CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ガD.cs index a8c1e53..b6bd779 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_ガ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs index 4bd5503..b0c172f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘ.cs @@ -5441,7 +5441,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -5722,7 +5722,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_ヘ(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_ヘD e) + public 尾_ヘ(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_ヘD e) { 尾_ヘ 尾_ヘ2 = this; ThisType = GetType(); @@ -6599,7 +6599,7 @@ namespace SlaveMatrix X0Y0_輪2_金具3CP = new ColorP(X0Y0_輪2_金具3, 輪2_金具3CD, DisUnit, abj: true); X0Y0_輪2_金具左CP = new ColorP(X0Y0_輪2_金具左, 輪2_金具左CD, DisUnit, abj: true); X0Y0_輪2_金具右CP = new ColorP(X0Y0_輪2_金具右, 輪2_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -7281,7 +7281,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -7300,7 +7300,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾35_尾CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 尾35_鱗左3CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -7564,7 +7564,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾35_尾CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 尾35_鱗左3CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -7828,7 +7828,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾35_尾CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 尾35_鱗左3CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_ヘD.cs index 3c2b780..b52b489 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_ヘ(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs index 12c3d00..25bc49b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪.cs @@ -613,7 +613,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -654,7 +654,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 尾_悪(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_悪D e) + public 尾_悪(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_悪D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -784,7 +784,7 @@ namespace SlaveMatrix X0Y0_尾17CP = new ColorP(X0Y0_尾17, 尾17CD, DisUnit, abj: true); X0Y0_先端_先CP = new ColorP(X0Y0_先端_先, 先端_先CD, DisUnit, abj: true); X0Y0_先端_尾CP = new ColorP(X0Y0_先端_尾, 先端_尾CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -927,7 +927,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -946,7 +946,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.体0O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -976,7 +976,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.体0O, ref 体配色.刺青O); 先端_先CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -988,7 +988,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.体0O, ref 体配色.刺青O); 先端_先CD = new ColorD(ref Col.Black, ref 体配色.体0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_悪D.cs index a4b6ae5..a7978d2 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_悪(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs index 91e9045..b68e342 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根.cs @@ -1313,7 +1313,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1389,7 +1389,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 尾_根(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_根D e) + public 尾_根(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_根D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1640,7 +1640,7 @@ namespace SlaveMatrix X0Y0_尾17_線1CP = new ColorP(X0Y0_尾17_線1, 尾17_線1CD, DisUnit, abj: true); X0Y0_尾17_線2CP = new ColorP(X0Y0_尾17_線2, 尾17_線2CD, DisUnit, abj: true); X0Y0_尾18CP = new ColorP(X0Y0_尾18, 尾18CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -1853,7 +1853,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1872,7 +1872,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0_尾CD = new ColorD(ref Col.Black, ref 体配色.植0R); 尾0_線1CD = new ColorD(ref Col.Black, ref 体配色.植1O); @@ -1937,7 +1937,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.植0R, ref 体配色.刺青R); 尾0_線1CD = new ColorD(ref Col.Black, ref 体配色.植1O); @@ -1984,7 +1984,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.植0R, ref 体配色.刺青R); 尾0_線1CD = new ColorD(ref Col.Black, ref 体配色.植1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_根D.cs index 15b7762..df31f06 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_根(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs index ca5f0bf..7922c4a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫.cs @@ -613,7 +613,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -654,7 +654,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 尾_淫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_淫D e) + public 尾_淫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_淫D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -784,7 +784,7 @@ namespace SlaveMatrix X0Y0_尾17CP = new ColorP(X0Y0_尾17, 尾17CD, DisUnit, abj: true); X0Y0_先端_先CP = new ColorP(X0Y0_先端_先, 先端_先CD, DisUnit, abj: true); X0Y0_先端_尾CP = new ColorP(X0Y0_先端_尾, 先端_尾CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -927,7 +927,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -946,7 +946,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.体0O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -976,7 +976,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.体0O, ref 体配色.刺青O); 先端_先CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -988,7 +988,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.体0O, ref 体配色.刺青O); 先端_先CD = new ColorD(ref Col.Black, ref 体配色.体0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_淫D.cs index 4215b9d..0c06af2 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_淫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs index 8e7ab62..6abf308 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛.cs @@ -1016,7 +1016,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1075,7 +1075,7 @@ namespace SlaveMatrix } } - public 尾_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_牛D e) + public 尾_牛(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_牛D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1276,7 +1276,7 @@ namespace SlaveMatrix X0Y0_毛尾_右1_尾4CP = new ColorP(X0Y0_毛尾_右1_尾4, 毛尾_右1_尾4CD, DisUnit, abj: true); X0Y0_毛尾_右1_尾5CP = new ColorP(X0Y0_毛尾_右1_尾5, 毛尾_右1_尾5CD, DisUnit, abj: true); X0Y0_毛尾_右1_尾6CP = new ColorP(X0Y0_毛尾_右1_尾6, 毛尾_右1_尾6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1399,7 +1399,7 @@ namespace SlaveMatrix X0Y0_毛尾_右1_尾6CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1418,7 +1418,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -1470,7 +1470,7 @@ namespace SlaveMatrix 毛尾_右1_尾6CD = new ColorD(ref Col.Black, ref 体配色.毛1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -1522,7 +1522,7 @@ namespace SlaveMatrix 毛尾_右1_尾6CD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_牛D.cs index e941c66..2fce063 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs index 04989f2..b0fa36a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬.cs @@ -216,7 +216,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -235,7 +235,7 @@ namespace SlaveMatrix } } - public 尾_犬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_犬D e) + public 尾_犬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_犬D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -303,7 +303,7 @@ namespace SlaveMatrix X0Y0_尾5CP = new ColorP(X0Y0_尾5, 尾5CD, DisUnit, abj: true); X0Y0_尾6CP = new ColorP(X0Y0_尾6, 尾6CD, DisUnit, abj: true); X0Y0_尾7CP = new ColorP(X0Y0_尾7, 尾7CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -346,7 +346,7 @@ namespace SlaveMatrix X0Y0_尾7CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -365,7 +365,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -377,12 +377,12 @@ namespace SlaveMatrix 尾7CD = new ColorD(ref Col.Black, ref 体配色.毛0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.毛0O, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.毛0O, ref 体配色.刺青O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_犬D.cs index 7155cda..082f995 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_犬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs index e90cf2b..8b67fe0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐.cs @@ -296,7 +296,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -319,7 +319,7 @@ namespace SlaveMatrix } } - public 尾_狐(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_狐D e) + public 尾_狐(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_狐D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -403,7 +403,7 @@ namespace SlaveMatrix X0Y0_尾9CP = new ColorP(X0Y0_尾9, 尾9CD, DisUnit, abj: true); X0Y0_尾10CP = new ColorP(X0Y0_尾10, 尾10CD, DisUnit, abj: true); X0Y0_尾11CP = new ColorP(X0Y0_尾11, 尾11CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -458,7 +458,7 @@ namespace SlaveMatrix X0Y0_尾11CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -477,7 +477,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -493,12 +493,12 @@ namespace SlaveMatrix 尾11CD = new ColorD(ref Col.Black, ref 体配色.毛1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.毛0O, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.毛0O, ref 体配色.刺青O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_狐D.cs index d59c915..e740d0f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_狐(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs index 6334c2a..60ecb68 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫.cs @@ -336,7 +336,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -361,7 +361,7 @@ namespace SlaveMatrix } } - public 尾_猫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_猫D e) + public 尾_猫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_猫D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -451,7 +451,7 @@ namespace SlaveMatrix X0Y0_尾11CP = new ColorP(X0Y0_尾11, 尾11CD, DisUnit, abj: true); X0Y0_尾12CP = new ColorP(X0Y0_尾12, 尾12CD, DisUnit, abj: true); X0Y0_尾13CP = new ColorP(X0Y0_尾13, 尾13CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -512,7 +512,7 @@ namespace SlaveMatrix X0Y0_尾13CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -531,7 +531,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -549,12 +549,12 @@ namespace SlaveMatrix 尾13CD = new ColorD(ref Col.Black, ref 体配色.毛0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.毛0O, ref 体配色.刺青O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.毛0O, ref 体配色.刺青O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_猫D.cs index e79f307..2989c08 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_猫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs index 5666b80..822cd82 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短.cs @@ -176,7 +176,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -193,7 +193,7 @@ namespace SlaveMatrix } } - public 尾_短(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_短D e) + public 尾_短(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_短D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -255,7 +255,7 @@ namespace SlaveMatrix X0Y0_尾3CP = new ColorP(X0Y0_尾3, 尾3CD, DisUnit, abj: true); X0Y0_尾4CP = new ColorP(X0Y0_尾4, 尾4CD, DisUnit, abj: true); X0Y0_尾5CP = new ColorP(X0Y0_尾5, 尾5CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -292,7 +292,7 @@ namespace SlaveMatrix X0Y0_尾5CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -311,7 +311,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.体0O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -321,12 +321,12 @@ namespace SlaveMatrix 尾5CD = new ColorD(ref Col.Black, ref 体配色.体0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.体0O, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.体0O, ref 体配色.刺青O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_短D.cs index 257a720..be0c6d4 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_短(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs index 5d4177b..ba7d019 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜.cs @@ -735,7 +735,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -785,7 +785,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_竜D e) + public 尾_竜(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_竜D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -925,7 +925,7 @@ namespace SlaveMatrix X0Y0_尾2CP = new ColorP(X0Y0_尾2, 尾2CD, DisUnit, abj: true); X0Y0_尾1CP = new ColorP(X0Y0_尾1, 尾1CD, DisUnit, abj: true); X0Y0_尾0CP = new ColorP(X0Y0_尾0, 尾0CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -1089,7 +1089,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1108,7 +1108,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾17CD = new ColorD(ref Col.Black, ref 体配色.鱗0R); 針CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -1143,7 +1143,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.鱗0R, ref 体配色.刺青R); 針CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -1161,7 +1161,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.鱗0R, ref 体配色.刺青R); 針CD = new ColorD(ref Col.Black, ref 体配色.体0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_竜D.cs index 70cf214..ebd2871 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs index 817164e..c167f26 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓.cs @@ -4795,7 +4795,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -5093,7 +5093,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_腓(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_腓D e) + public 尾_腓(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_腓D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -5897,7 +5897,7 @@ namespace SlaveMatrix X0Y0_輪2_金具3CP = new ColorP(X0Y0_輪2_金具3, 輪2_金具3CD, DisUnit, abj: true); X0Y0_輪2_金具左CP = new ColorP(X0Y0_輪2_金具左, 輪2_金具左CD, DisUnit, abj: true); X0Y0_輪2_金具右CP = new ColorP(X0Y0_輪2_金具右, 輪2_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -6491,7 +6491,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -6510,7 +6510,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾1_根CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 尾1_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1R); @@ -6748,7 +6748,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾1_根CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 尾1_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1R); @@ -6986,7 +6986,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾1_根CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 尾1_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1R); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_腓D.cs index f28f3e6..529f8c8 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_腓(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs index 407d46c..463a566 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫.cs @@ -595,7 +595,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -638,7 +638,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_虫D e) + public 尾_虫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_虫D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -757,7 +757,7 @@ namespace SlaveMatrix X0Y0_尾2CP = new ColorP(X0Y0_尾2, 尾2CD, DisUnit, abj: true); X0Y0_尾1CP = new ColorP(X0Y0_尾1, 尾1CD, DisUnit, abj: true); X0Y0_尾0CP = new ColorP(X0Y0_尾0, 尾0CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -893,7 +893,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -912,7 +912,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾10CD = new ColorD(ref Col.Black, ref 体配色.甲0R); 針CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -940,7 +940,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.甲0R, ref 体配色.刺青R); 針CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -958,7 +958,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.甲0R, ref 体配色.刺青R); 針CD = new ColorD(ref Col.Black, ref 体配色.体0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_虫D.cs index d9e241a..599e53c 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs index 1082c83..b84b95e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇.cs @@ -4835,7 +4835,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -5090,7 +5090,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_蛇D e) + public 尾_蛇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_蛇D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -5892,7 +5892,7 @@ namespace SlaveMatrix X0Y0_輪2_金具3CP = new ColorP(X0Y0_輪2_金具3, 輪2_金具3CD, DisUnit, abj: true); X0Y0_輪2_金具左CP = new ColorP(X0Y0_輪2_金具左, 輪2_金具左CD, DisUnit, abj: true); X0Y0_輪2_金具右CP = new ColorP(X0Y0_輪2_金具右, 輪2_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -6518,7 +6518,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -6537,7 +6537,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾1_根CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 尾1_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1R); @@ -6777,7 +6777,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾1_根CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 尾1_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1R); @@ -7017,7 +7017,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾1_根CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 尾1_鱗CD = new ColorD(ref Col.Black, ref 体配色.鱗1R); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蛇D.cs index 34e3a0f..9acea88 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_蛇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs index 4de1d86..27b9c39 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘.cs @@ -399,7 +399,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -447,7 +447,7 @@ namespace SlaveMatrix public JointS 出糸_接続点 => new JointS(Body, X0Y0_尾0, 0); - public 尾_蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_蜘D e) + public 尾_蜘(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_蜘D e) { 尾_蜘 尾_蜘2 = this; ThisType = GetType(); @@ -559,7 +559,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -595,7 +595,7 @@ namespace SlaveMatrix X0Y0_付根線CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -614,7 +614,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 柄0CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -635,7 +635,7 @@ namespace SlaveMatrix 付根線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 柄0CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -656,7 +656,7 @@ namespace SlaveMatrix 付根線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 柄0CD = new ColorD(ref Col.Black, ref 体配色.甲0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蜘D.cs index 2cfb3ee..bdd0f72 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs index 447f886..8817ecd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲.cs @@ -1340,7 +1340,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1546,7 +1546,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_蟲D e) + public 尾_蟲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_蟲D e) { 尾_蟲 尾_蟲2 = this; ThisType = GetType(); @@ -1918,7 +1918,7 @@ namespace SlaveMatrix X0Y0_輪1_金具3CP = new ColorP(X0Y0_輪1_金具3, 輪1_金具3CD, DisUnit, abj: true); X0Y0_輪1_金具左CP = new ColorP(X0Y0_輪1_金具左, 輪1_金具左CD, DisUnit, abj: true); X0Y0_輪1_金具右CP = new ColorP(X0Y0_輪1_金具右, 輪1_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -2116,7 +2116,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -2135,7 +2135,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾5_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 尾5_節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -2199,7 +2199,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾5_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 尾5_節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -2263,7 +2263,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾5_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 尾5_節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蟲D.cs index f0ceb2d..b1edbee 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs index 635ea03..8532e1a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍.cs @@ -815,7 +815,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -869,7 +869,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_蠍D e) + public 尾_蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_蠍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1027,7 +1027,7 @@ namespace SlaveMatrix X0Y0_輪2_金具3CP = new ColorP(X0Y0_輪2_金具3, 輪2_金具3CD, DisUnit, abj: true); X0Y0_輪2_金具左CP = new ColorP(X0Y0_輪2_金具左, 輪2_金具左CD, DisUnit, abj: true); X0Y0_輪2_金具右CP = new ColorP(X0Y0_輪2_金具右, 輪2_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -1175,7 +1175,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1194,7 +1194,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 節1_尾CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 節1_線CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -1233,7 +1233,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 節1_尾CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 節1_線CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -1272,7 +1272,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 節1_尾CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 節1_線CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_蠍D.cs index 3a3b2d8..c71005b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs index 8de7e4d..7f5a44c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬.cs @@ -856,7 +856,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -907,7 +907,7 @@ namespace SlaveMatrix } } - public 尾_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_馬D e) + public 尾_馬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_馬D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1082,7 +1082,7 @@ namespace SlaveMatrix X0Y0_右1_尾4CP = new ColorP(X0Y0_右1_尾4, 右1_尾4CD, DisUnit, abj: true); X0Y0_右1_尾5CP = new ColorP(X0Y0_右1_尾5, 右1_尾5CD, DisUnit, abj: true); X0Y0_右1_尾6CP = new ColorP(X0Y0_右1_尾6, 右1_尾6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1186,12 +1186,12 @@ namespace SlaveMatrix X0Y0_右1_尾6CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.毛1O); 尾1CD = new ColorD(ref Col.Black, ref 体配色.毛1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_馬D.cs index 2835b19..7abe2fc 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs index 8caa52a..e4d6de6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚.cs @@ -6577,7 +6577,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -7395,7 +7395,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 尾_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_魚D e) + public 尾_魚(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_魚D e) { 尾_魚 尾_魚2 = this; ThisType = GetType(); @@ -9230,7 +9230,7 @@ namespace SlaveMatrix X0Y0_尾0_鱗右_鱗3CP = new ColorP(X0Y0_尾0_鱗右_鱗3, 尾0_鱗右_鱗3CD, DisUnit, abj: true); X0Y0_尾0_鱗右_鱗4CP = new ColorP(X0Y0_尾0_鱗右_鱗4, 尾0_鱗右_鱗4CD, DisUnit, abj: true); X0Y0_尾0_尾CP = new ColorP(X0Y0_尾0_尾, 尾0_尾CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -10317,7 +10317,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -10336,7 +10336,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾33_鱗左_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 尾33_鱗左_鱗3CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); @@ -10648,7 +10648,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾33_鱗左_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 尾33_鱗左_鱗3CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); @@ -10960,7 +10960,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾33_鱗左_鱗1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 尾33_鱗左_鱗3CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_魚D.cs index 52e32c2..e66494b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs index 32b9c8e..8385f8c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨.cs @@ -2463,7 +2463,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2826,7 +2826,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 尾_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_鯨D e) + public 尾_鯨(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_鯨D e) { 尾_鯨 尾_鯨2 = this; ThisType = GetType(); @@ -4000,7 +4000,7 @@ namespace SlaveMatrix X0Y0_尾0_尾CP = new ColorP(X0Y0_尾0_尾, 尾0_尾CD, DisUnit, abj: true); X0Y0_尾0_柄CP = new ColorP(X0Y0_尾0_柄, 尾0_柄CD, DisUnit, abj: true); X0Y0_尾0_縦影CP = new ColorP(X0Y0_尾0_縦影, 尾0_縦影CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -4481,7 +4481,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -4500,7 +4500,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾33_尾CD = new ColorD(ref Col.Black, ref 体配色.体1O); 尾33_柄CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -4614,7 +4614,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾33_尾CD = new ColorD(ref Col.Black, ref 体配色.体1O); 尾33_柄CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -4726,7 +4726,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾33_尾CD = new ColorD(ref Col.Black, ref 体配色.体1O); 尾33_柄CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鯨D.cs index 35c4d4b..dffd2a5 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs index 93531b2..e48d100 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥.cs @@ -532,7 +532,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public 尾_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_鳥D e) + public 尾_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_鳥D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -720,7 +720,7 @@ namespace SlaveMatrix X0Y0_雨覆羽_右_羽4CP = new ColorP(X0Y0_雨覆羽_右_羽4, 雨覆羽_右_羽4CD, DisUnit, abj: true); X0Y0_雨覆羽_右_羽5CP = new ColorP(X0Y0_雨覆羽_右_羽5, 雨覆羽_右_羽5CD, DisUnit, abj: true); X0Y0_羽根CP = new ColorP(X0Y0_羽根, 羽根CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -784,7 +784,7 @@ namespace SlaveMatrix X0Y0_羽根CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -803,7 +803,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.体0O); 風切羽_左_羽1CD = new ColorD(ref Col.Black, ref 体配色.羽1O); @@ -831,7 +831,7 @@ namespace SlaveMatrix 羽根CD = new ColorD(ref Col.Black, ref 体配色.羽0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.体0O); 風切羽_左_羽1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -859,7 +859,7 @@ namespace SlaveMatrix 羽根CD = new ColorD(ref Col.Black, ref 体配色.羽0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 尾0CD = new ColorD(ref Col.Black, ref 体配色.体0O); 風切羽_左_羽1CD = new ColorD(ref Col.Black, ref 体配色.羽1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_鳥D.cs index 4e1c3c6..1c964ea 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs index 93f9e55..fab9688 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍.cs @@ -1175,7 +1175,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1247,7 +1247,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 尾_龍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾_龍D e) + public 尾_龍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾_龍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1453,7 +1453,7 @@ namespace SlaveMatrix X0Y0_尾2CP = new ColorP(X0Y0_尾2, 尾2CD, DisUnit, abj: true); X0Y0_尾1CP = new ColorP(X0Y0_尾1, 尾1CD, DisUnit, abj: true); X0Y0_尾0CP = new ColorP(X0Y0_尾0, 尾0CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -1707,7 +1707,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1726,7 +1726,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尾40CD = new ColorD(ref Col.Black, ref 体配色.鱗0R); 尾39CD = new ColorD(ref Col.Black, ref 体配色.鱗0R); @@ -1783,7 +1783,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "尾", ref 体配色.鱗0R, ref 体配色.刺青R); 輪1_革CD = new ColorD(); @@ -1800,7 +1800,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "尾", ref 体配色.鱗0R, ref 体配色.刺青R); 輪1_革CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾_龍D.cs index 2cd85fe..d7708cf 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾_龍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs index 1828569..a4ce02a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚.cs @@ -442,7 +442,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -485,7 +485,7 @@ namespace SlaveMatrix } } - public 尾鰭_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾鰭_魚D e) + public 尾鰭_魚(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾鰭_魚D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢中["尾"][0]); @@ -613,7 +613,7 @@ namespace SlaveMatrix X0Y1_尾_鱗左2CP = new ColorP(X0Y1_尾_鱗左2, 尾_鱗左2CD, DisUnit, abj: true); X0Y1_尾_鱗右1CP = new ColorP(X0Y1_尾_鱗右1, 尾_鱗右1CD, DisUnit, abj: true); X0Y1_尾_鱗左1CP = new ColorP(X0Y1_尾_鱗左1, 尾_鱗左1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -670,12 +670,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鰭左2_鰭膜CD = new ColorD(ref Col.Black, ref 体配色.膜O); 鰭左2_鰭条CD = new ColorD(ref Col.Black, ref 体配色.爪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_魚D.cs index 81fee07..06425c7 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾鰭_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs index 084e644..8829cb3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 尾鰭_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 尾鰭_鯨D e) + public 尾鰭_鯨(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 尾鰭_鯨D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -153,7 +153,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_鰭CP = new ColorP(X0Y0_鰭, 鰭CD, DisUnit, abj: true); X0Y0_尾CP = new ColorP(X0Y0_尾, 尾CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -162,12 +162,12 @@ namespace SlaveMatrix X0Y0_尾CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鰭CD = new ColorD(ref Col.Black, ref 体配色.体0O); 尾CD = new ColorD(ref Col.Black, ref 体配色.体0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/尾鰭_鯨D.cs index bcfddee..851aa26 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 尾鰭_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs index 4052cbe..ff3a81e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲.cs @@ -312,7 +312,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -350,7 +350,7 @@ namespace SlaveMatrix } } - public 後翅_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後翅_甲D e) + public 後翅_甲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後翅_甲D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["後翅"][0]); @@ -448,7 +448,7 @@ namespace SlaveMatrix X0Y1_後翅_後翅先_翅脈2CP = new ColorP(X0Y1_後翅_後翅先_翅脈2, 後翅_後翅先_翅脈2CD, DisUnit, abj: true); X0Y1_後翅_後翅先_翅脈3CP = new ColorP(X0Y1_後翅_後翅先_翅脈3, 後翅_後翅先_翅脈3CD, DisUnit, abj: true); X0Y1_後翅_後翅先_翅脈4CP = new ColorP(X0Y1_後翅_後翅先_翅脈4, 後翅_後翅先_翅脈4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -489,12 +489,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.Alpha(ref 体配色.甲1O, 128, out var ret); 後翅_後翅根_後翅CD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_甲D.cs index 8963c27..6f56e77 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後翅_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs index 2e6c71a..cde8836 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽.cs @@ -988,7 +988,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1035,7 +1035,7 @@ namespace SlaveMatrix } } - public 後翅_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後翅_羽D e) + public 後翅_羽(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後翅_羽D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["後翅"][1]); @@ -1266,7 +1266,7 @@ namespace SlaveMatrix X0Y1_後翅_翅脈網3_翅脈網線2CP = new ColorP(X0Y1_後翅_翅脈網3_翅脈網線2, 後翅_翅脈網3_翅脈網線2CD, DisUnit, abj: true); X0Y1_後翅_翅脈網4_翅脈網線1CP = new ColorP(X0Y1_後翅_翅脈網4_翅脈網線1, 後翅_翅脈網4_翅脈網線1CD, DisUnit, abj: true); X0Y1_後翅_翅脈網4_翅脈網線2CP = new ColorP(X0Y1_後翅_翅脈網4_翅脈網線2, 後翅_翅脈網4_翅脈網線2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1359,7 +1359,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1378,7 +1378,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 後翅_後翅CD = new ColorD(ref Col.Black, ref Color2.Empty); 後翅_翅脈1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -1418,7 +1418,7 @@ namespace SlaveMatrix 後翅_翅脈網4_翅脈網線2CD = new ColorD(ref Col.Black, ref 体配色.ハイライト2O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 後翅_後翅CD = new ColorD(ref Col.Black, ref Color2.Empty); 後翅_翅脈1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -1458,7 +1458,7 @@ namespace SlaveMatrix 後翅_翅脈網4_翅脈網線2CD = new ColorD(ref Col.Black, ref 体配色.ハイライト2O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 後翅_後翅CD = new ColorD(ref Col.Black, ref Color2.Empty); 後翅_翅脈1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_羽D.cs index 5d478ef..7787266 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後翅_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs index 091ee1a..6bb6863 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草.cs @@ -1196,7 +1196,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1282,7 +1282,7 @@ namespace SlaveMatrix } } - public 後翅_草(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後翅_草D e) + public 後翅_草(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後翅_草D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["後翅"][3]); @@ -1568,7 +1568,7 @@ namespace SlaveMatrix X0Y1_後翅_後翅11_翅脈1CP = new ColorP(X0Y1_後翅_後翅11_翅脈1, 後翅_後翅11_翅脈1CD, DisUnit, abj: true); X0Y1_後翅_後翅11_翅脈2CP = new ColorP(X0Y1_後翅_後翅11_翅脈2, 後翅_後翅11_翅脈2CD, DisUnit, abj: true); X0Y1_後翅_後翅11_翅脈3CP = new ColorP(X0Y1_後翅_後翅11_翅脈3, 後翅_後翅11_翅脈3CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1677,12 +1677,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.Alpha(ref 体配色.体1O, 128, out var ret); 後翅_後翅1_後翅CD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_草D.cs index da828b6..020d3a9 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後翅_草(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs index ac713c9..2b72778 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶.cs @@ -594,7 +594,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -658,7 +658,7 @@ namespace SlaveMatrix } } - public 後翅_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 後翅_蝶D e) + public 後翅_蝶(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 後翅_蝶D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["後翅"][2]); @@ -809,7 +809,7 @@ namespace SlaveMatrix X0Y1_後翅_揚羽_紋4CP = new ColorP(X0Y1_後翅_揚羽_紋4, 後翅_揚羽_紋4CD, DisUnit, abj: true); X0Y1_後翅_揚羽_紋5CP = new ColorP(X0Y1_後翅_揚羽_紋5, 後翅_揚羽_紋5CD, DisUnit, abj: true); X0Y1_後翅_揚羽_紋6CP = new ColorP(X0Y1_後翅_揚羽_紋6, 後翅_揚羽_紋6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -871,12 +871,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 後翅_後翅CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 後翅_水青_柄CD = new ColorD(ref Col.Empty, ref 体配色.柄O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/後翅_蝶D.cs index cc6fe4b..eaa0cc1 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 後翅_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs index 72e8de7..e7d857e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人.cs @@ -856,7 +856,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -891,7 +891,7 @@ namespace SlaveMatrix public JointS 膣口_接続点 => new JointS(Body, X0Y0_性器基, 2); - public 性器_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 性器_人D e) + public 性器_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 性器_人D e) { 性器_人 性器_人2 = this; ThisType = GetType(); @@ -1236,7 +1236,7 @@ namespace SlaveMatrix AreM = new AreM(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1); AreM.BasePoint = new Vector2D(0.5, 0.5); AreMPos = AreM.GetPosition(ref AreM.BasePoint); - 濃度 = e.濃度; + Intensity = e.濃度; Xi = 1; } @@ -1467,12 +1467,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 小陰唇CD = new ColorD(ref 体配色.粘膜線, ref 体配色.粘膜); 性器基CD = new ColorD(ref 体配色.粘膜線, ref 体配色.粘膜); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_人D.cs index 09d95e7..d8e1828 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 性器_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs index 9693f83..3790213 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣.cs @@ -856,7 +856,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -891,7 +891,7 @@ namespace SlaveMatrix public JointS 膣口_接続点 => new JointS(Body, X0Y0_性器基, 2); - public 性器_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 性器_獣D e) + public 性器_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 性器_獣D e) { 性器_獣 性器_獣2 = this; ThisType = GetType(); @@ -1236,7 +1236,7 @@ namespace SlaveMatrix AreM = new AreM(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1); AreM.BasePoint = new Vector2D(0.5, 0.5); AreMPos = AreM.GetPosition(ref AreM.BasePoint); - 濃度 = e.濃度; + Intensity = e.濃度; Xi = 1; } @@ -1467,12 +1467,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 小陰唇CD = new ColorD(ref 体配色.粘膜線, ref 体配色.粘膜); 性器基CD = new ColorD(ref 体配色.粘膜線, ref 体配色.粘膜); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器_獣D.cs index 3cd9538..46f3e3e 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 性器_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs index b649715..63c7e54 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人.cs @@ -201,7 +201,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -228,7 +228,7 @@ namespace SlaveMatrix } } - public 性器精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 性器精液_人D e) + public 性器精液_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 性器精液_人D e) { ThisType = GetType(); Body = new Difs(Sta.性器付["性器精液垂れ"]); @@ -310,7 +310,7 @@ namespace SlaveMatrix X0Y5_精液CP = new ColorP(X0Y5_精液, 精液CD, DisUnit, abj: true); X0Y5_血液1CP = new ColorP(X0Y5_血液1, 血液1CD, DisUnit, abj: true); X0Y5_血液2CP = new ColorP(X0Y5_血液2, 血液2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -350,12 +350,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 精液CD = new ColorD(); 血液1CD = new ColorD(ref Col.Empty, ref 体配色.血液O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_人D.cs index 7271cc2..2e29cc6 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 性器精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs index d404161..5045eeb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣.cs @@ -201,7 +201,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -228,7 +228,7 @@ namespace SlaveMatrix } } - public 性器精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 性器精液_獣D e) + public 性器精液_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 性器精液_獣D e) { ThisType = GetType(); Body = new Difs(Sta.性器付["四足性器精液垂れ"]); @@ -310,7 +310,7 @@ namespace SlaveMatrix X0Y5_精液CP = new ColorP(X0Y5_精液, 精液CD, DisUnit, abj: true); X0Y5_血液1CP = new ColorP(X0Y5_血液1, 血液1CD, DisUnit, abj: true); X0Y5_血液2CP = new ColorP(X0Y5_血液2, 血液2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -350,12 +350,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 精液CD = new ColorD(); 血液1CD = new ColorD(ref Col.Empty, ref 体配色.血液O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/性器精液_獣D.cs index d0ec0a6..ed2c832 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 性器精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs index a15249d..87b25d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人.cs @@ -2511,7 +2511,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2798,7 +2798,7 @@ namespace SlaveMatrix } } - public 手_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_人D e) + public 手_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_人D e) { ThisType = GetType(); Body = new Difs(Sta.腕左["手"]); @@ -3657,7 +3657,7 @@ namespace SlaveMatrix X0Y10_グローブ_グローブCP = new ColorP(X0Y10_グローブ_グローブ, グローブ_グローブCD, DisUnit, abj: true); X0Y10_グローブ_縁1CP = new ColorP(X0Y10_グローブ_縁1, グローブ_縁1CD, DisUnit, abj: true); X0Y10_グローブ_縁2CP = new ColorP(X0Y10_グローブ_縁2, グローブ_縁2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public void 虫性() @@ -4537,7 +4537,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -4562,7 +4562,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { グローブ_グローブCD = new ColorD(); グローブ_縁1CD = new ColorD(); @@ -4598,7 +4598,7 @@ namespace SlaveMatrix 悪タトゥ_五芒星_五角形CD = new ColorD(ref 体配色.刺青.Col1, ref Color2.Empty); } - private void 配色B0(体配色 体配色) + private void 配色B0(BodyColorSet 体配色) { グローブ_グローブCD = new ColorD(); グローブ_縁1CD = new ColorD(); @@ -4634,7 +4634,7 @@ namespace SlaveMatrix 悪タトゥ_五芒星_五角形CD = new ColorD(ref 体配色.刺青.Col1, ref Color2.Empty); } - private void 配色C0(体配色 体配色) + private void 配色C0(BodyColorSet 体配色) { グローブ_グローブCD = new ColorD(); グローブ_縁1CD = new ColorD(); @@ -4670,7 +4670,7 @@ namespace SlaveMatrix 悪タトゥ_五芒星_五角形CD = new ColorD(ref 体配色.刺青.Col1, ref Color2.Empty); } - private void 配色S0(体配色 体配色) + private void 配色S0(BodyColorSet 体配色) { グローブ_グローブCD = new ColorD(); グローブ_縁1CD = new ColorD(); @@ -4706,7 +4706,7 @@ namespace SlaveMatrix 悪タトゥ_五芒星_五角形CD = new ColorD(ref 体配色.刺青.Col1, ref Color2.Empty); } - private void 配色L0(体配色 体配色) + private void 配色L0(BodyColorSet 体配色) { グローブ_グローブCD = new ColorD(); グローブ_縁1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_人D.cs index 2322046..6fddf5f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs index 0da54b4..6ebc564 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛.cs @@ -325,7 +325,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -352,7 +352,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_腕輪_金具右, 0); - public 手_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_牛D e) + public 手_牛(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_牛D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -435,7 +435,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.反転Y = true; 鎖1.接続(鎖1_接続点); @@ -491,12 +491,12 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 指0CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_牛D.cs index 62bfa62..16135a7 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs index d9eeae5..6e02655 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣.cs @@ -331,7 +331,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -356,7 +356,7 @@ namespace SlaveMatrix } } - public 手_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_獣D e) + public 手_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_獣D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -448,7 +448,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗3CP = new ColorP(X0Y0_竜性_鱗3, 竜性_鱗3CD, DisUnit, abj: true); X0Y0_竜性_鱗2CP = new ColorP(X0Y0_竜性_鱗2, 竜性_鱗2CD, DisUnit, abj: true); X0Y0_竜性_鱗1CP = new ColorP(X0Y0_竜性_鱗1, 竜性_鱗1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -476,7 +476,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -495,7 +495,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 手CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 親指_指CD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -513,7 +513,7 @@ namespace SlaveMatrix 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 手CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 親指_指CD = new ColorD(ref Col.Black, ref 体配色.毛0O); @@ -531,7 +531,7 @@ namespace SlaveMatrix 竜性_鱗1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 手CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 親指_指CD = new ColorD(ref Col.Black, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_獣D.cs index b77910f..2fb7956 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs index 9f392ec..357425a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙.cs @@ -404,7 +404,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -732,7 +732,7 @@ namespace SlaveMatrix } } - public 手_蝙(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_蝙D e) + public 手_蝙(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_蝙D e) { 飛膜 = new 飛膜_先(DisUnit, 配色指定, 体配色); 飛膜.Par = this; @@ -838,7 +838,7 @@ namespace SlaveMatrix X0Y0_親指_指2CP = new ColorP(X0Y0_親指_指2, 親指_指2CD, DisUnit, abj: true); X0Y0_親指_指3CP = new ColorP(X0Y0_親指_指3, 親指_指3CD, DisUnit, abj: true); 尺度B = 1.02; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -923,12 +923,12 @@ namespace SlaveMatrix X0Y0_親指_指3CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 獣翼手CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 小指_指1CD = new ColorD(ref Col.Black, ref 体配色.毛0R); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_蝙D.cs index 464c3fc..bf241e0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_蝙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs index 0cf6e53..1af094d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬.cs @@ -285,7 +285,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -310,7 +310,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_腕輪_金具右, 0); - public 手_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_馬D e) + public 手_馬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_馬D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -386,7 +386,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.反転Y = true; 鎖1.接続(鎖1_接続点); @@ -440,12 +440,12 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 指0CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_馬D.cs index 49ca0be..6bf4194 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs index 364416b..7fe3da0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥.cs @@ -1571,7 +1571,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2064,7 +2064,7 @@ namespace SlaveMatrix } } - public 手_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 手_鳥D e) + public 手_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 手_鳥D e) { ThisType = GetType(); Body = new Difs(Sta.腕左["鳥翼手"]); @@ -2364,7 +2364,7 @@ namespace SlaveMatrix X0Y0_指_親指_鱗1_鱗4CP = new ColorP(X0Y0_指_親指_鱗1_鱗4, 指_親指_鱗1_鱗4CD, DisUnit, abj: true); X0Y0_指_親指_鱗1_鱗5CP = new ColorP(X0Y0_指_親指_鱗1_鱗5, 指_親指_鱗1_鱗5CD, DisUnit, abj: true); X0Y0_指_親指_鱗1_鱗6CP = new ColorP(X0Y0_指_親指_鱗1_鱗6, 指_親指_鱗1_鱗6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -2559,7 +2559,7 @@ namespace SlaveMatrix X0Y0_指_親指_鱗1_鱗6CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -2578,7 +2578,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鳥翼手CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 風切羽_羽10CD = new ColorD(ref Col.Black, ref 体配色.羽1O); @@ -2655,7 +2655,7 @@ namespace SlaveMatrix 指_親指_鱗1_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 鳥翼手CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 風切羽_羽10CD = new ColorD(ref Col.Black, ref 体配色.羽1O); @@ -2732,7 +2732,7 @@ namespace SlaveMatrix 指_親指_鱗1_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 鳥翼手CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 風切羽_羽10CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/手_鳥D.cs index 7b53f30..4152f8c 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 手_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs index 6807a2a..f27a663 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/拘束鎖.cs @@ -232,7 +232,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -252,7 +252,7 @@ namespace SlaveMatrix } } - public 拘束鎖(double DisUnit, bool 右, 配色指定 配色指定, 体配色 体配色, bool Xasix) + public 拘束鎖(double DisUnit, bool 右, 配色指定 配色指定, BodyColorSet 体配色, bool Xasix) { ThisType = GetType(); Body = new Difs(Sta.その他["拘束鎖"]); @@ -333,12 +333,12 @@ namespace SlaveMatrix X0Y0_鎖9CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鎖2CD = new ColorD(); 鎖1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs index fca0afc..a89a7e9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs @@ -53,11 +53,11 @@ namespace SlaveMatrix private bool 押し付け; - private Mot 振動モーション; + private Motion 振動モーション; - private Mot 回転モーション; + private Motion 回転モーション; - public Mot 抜け落ち; + public Motion 抜け落ち; public double 口排出度 = 1.0; @@ -67,7 +67,7 @@ namespace SlaveMatrix public double 糸排出度 = 1.0; - public Mot 挿抜モーション; + public Motion 挿抜モーション; public bool 挿抜フラグ; @@ -258,7 +258,7 @@ namespace SlaveMatrix if (!Bod.Is獣 && !(対象.Ele is バイブ_デンマ) && !(対象.Ele is ハンド) && !(対象.Ele is マウス) && !(対象.Ele is ロータ)) { Bod.断面.膣サイズY = 1.0 + 0.2 * dv.Clamp(0.0, 1.0); - Bod.膣内精液.尺度YC = Bod.断面.膣サイズY; + Bod.VaginalCumDrip.尺度YC = Bod.断面.膣サイズY; Bod.膣基.尺度YC = Bod.断面.膣サイズY; } if (!(対象.Ele is ハンド) || (対象.Ele.Xi != 6 && 対象.Ele.Xi != 7)) @@ -896,7 +896,7 @@ namespace SlaveMatrix if (!Bod.Is獣 && !(対象.Ele is バイブ_デンマ) && !(対象.Ele is ハンド) && !(対象.Ele is マウス) && !(対象.Ele is ロータ)) { Bod.断面.膣サイズY = 1.0 + 0.2 * dv.Clamp(0.0, 1.0); - Bod.膣内精液.尺度YC = Bod.断面.膣サイズY; + Bod.VaginalCumDrip.尺度YC = Bod.断面.膣サイズY; Bod.膣基.尺度YC = Bod.断面.膣サイズY; } if (!(対象.Ele is ハンド) || (対象.Ele.Xi != 6 && 対象.Ele.Xi != 7)) @@ -930,7 +930,7 @@ namespace SlaveMatrix { if (対象.Ele is ペニス && Insert > oi && Insert > 0.8) { - Cha.体揺れ.Start(); + Cha.BodySway.Start(); } oi = Insert; } @@ -997,13 +997,13 @@ namespace SlaveMatrix } if (調教UI.ペニス処理.中出し) { - if (Cha.ChaD.SkillL > 0.5 * Sta.GameData.TrainingTarget.MaxSkillL && Cha.ChaD.Affection > 0.6 && Cha.ChaD.Lust > 0.5) + if (Cha.CharacterData.SkillL > 0.5 * Sta.GameData.TrainingTarget.MaxSkillL && Cha.CharacterData.Affection > 0.6 && Cha.CharacterData.Lust > 0.5) { - Cha.ごっくん.Start(); + Cha.Swallow.Start(); } else { - Cha.口腔精液垂れ.Start(); + Cha.MouthCumDrip.Start(); } 調教UI.ペニス処理.中出しCount = 0; 調教UI.ペニス処理.中出し = false; @@ -1039,7 +1039,7 @@ namespace SlaveMatrix 待機時1(); if (調教UI.ペニス処理.中出し) { - Cha.肛門精液垂れ.Start(); + Cha.AnalCumDrip.Start(); 調教UI.ペニス処理.中出しCount = 0; 調教UI.ペニス処理.中出し = false; } @@ -1076,7 +1076,7 @@ namespace SlaveMatrix 待機時1(); if (調教UI.ペニス処理.中出し) { - Cha.性器精液垂れ.Start(); + Cha.GenitalCumDrip.Start(); 調教UI.ペニス処理.中出しCount = 0; 調教UI.ペニス処理.中出し = false; } @@ -1111,7 +1111,7 @@ namespace SlaveMatrix 待機時1(); if (調教UI.ペニス処理.中出し) { - Cha.出糸精液垂れ.Start(); + Cha.ThreadCumDrip.Start(); 調教UI.ペニス処理.中出しCount = 0; 調教UI.ペニス処理.中出し = false; } @@ -1505,13 +1505,13 @@ namespace SlaveMatrix Vector2D p = Dat.Vec2DZero; bool f = !(対象.Ele is ロータ); bool v = 対象.Ele is バイブ_ディル || 対象.Ele is バイブ_コモン || 対象.Ele is バイブ_ドリル || 対象.Ele is バイブ_アナル || 対象.Ele is バイブ_デンマ; - 振動モーション = new Mot(-1.0, 1.0) + 振動モーション = new Motion(-1.0, 1.0) { BaseSpeed = double.MaxValue, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { p.X = m.Value * d * 挿入処理2.強度; if (v) @@ -1548,13 +1548,13 @@ namespace SlaveMatrix } 挿入処理2.振動_(); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); foreach (Par item in 対象.Ele.Body.EnumAllPar()) @@ -1569,14 +1569,14 @@ namespace SlaveMatrix 回転機能 = 対象.Ele is バイブ_ドリル; if (回転機能) { - 回転モーション = new Mot(0.0, 1.0) + 回転モーション = new Motion(0.0, 1.0) { BaseSpeed = 10.0 * base.強度, - Staing = delegate + OnStart = delegate { 対象.Ele.Xv = 0.0; }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { 対象.Ele.Xv = m.Value; 対象.Ele.Body.JoinPA(); @@ -1592,14 +1592,14 @@ namespace SlaveMatrix } 挿入処理2.振動_(); }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.ResetValue(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); 対象.Ele.Xv = 0.0; @@ -1607,13 +1607,13 @@ namespace SlaveMatrix }; 調教UI.Mots.Add(回転モーション.GetHashCode().ToString(), 回転モーション); } - 抜け落ち = new Mot(0.0, 1.0) + 抜け落ち = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { 挿入処理2.Insert = (-0.01 - 0.04 * 挿入処理2.Insert.Inverse()) * 挿入処理2.排出; if (挿入処理2.Insert == 0.0) @@ -1636,7 +1636,7 @@ namespace SlaveMatrix break; } 挿入処理2.解除(); - 対象.Ele.濃度 = 0.5; + 対象.Ele.Intensity = 0.5; 対象.StaShow = true; 対象.使用状態 = UsageStatus.Standby; 対象.Ele.右 = false; @@ -1660,13 +1660,13 @@ namespace SlaveMatrix m.End(); } }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); } @@ -1688,35 +1688,35 @@ namespace SlaveMatrix MouseButtons mb_ = MouseButtons.None; Vector2D cp_ = default(Vector2D); Color hc_ = default(Color); - 挿抜モーション = new Mot(0.0, 1.0) + 挿抜モーション = new Motion(0.0, 1.0) { BaseSpeed = 1.0 + 3.0 * Player.PlayerExcitement, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { m.BaseSpeed = 1.0 + 3.0 * Player.PlayerExcitement; cp_ = new Vector2D(0.0, 100.0 * m.Value); 挿入処理2.MoveO(ref mb_, ref cp_, ref hc_, ref 挿入処理2.cd); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { } }; 調教UI.Mots.Add(挿抜モーション.GetHashCode().ToString(), 挿抜モーション); } - public void SetCha(Cha Cha) + public void SetCha(Character Cha) { base.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; 性器単位v = 1.0 / (double)Bod.性器.Body.CountY; 断面単位v = 1.0 / (double)Bod.断面.Body.CountY; 断面単位v2 = 断面単位v * 2.0; @@ -1743,7 +1743,7 @@ namespace SlaveMatrix break; } 解除(); - 対象.Ele.濃度 = 0.5; + 対象.Ele.Intensity = 0.5; 対象.StaShow = true; 対象.使用状態 = UsageStatus.Standby; 対象.Ele.右 = false; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs index 7c87643..d5b4850 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人.cs @@ -525,7 +525,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -542,7 +542,7 @@ namespace SlaveMatrix } } - public 放尿_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 放尿_人D e) + public 放尿_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 放尿_人D e) { ThisType = GetType(); Body = new Difs(Sta.性器付["放尿"]); @@ -726,7 +726,7 @@ namespace SlaveMatrix X0Y10_尿散り3CP = new ColorP(X0Y10_尿散り3, 尿散り3CD, DisUnit, abj: true); X0Y10_尿散り4CP = new ColorP(X0Y10_尿散り4, 尿散り4CD, DisUnit, abj: true); X0Y10_尿散り5CP = new ColorP(X0Y10_尿散り5, 尿散り5CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -823,12 +823,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尿CD = new ColorD(ref 体配色.尿線, ref 体配色.尿); 尿散り1CD = new ColorD(ref 体配色.尿線, ref 体配色.尿); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_人D.cs index 3794cbe..f86350c 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 放尿_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs index eea1116..0b97b73 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣.cs @@ -525,7 +525,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -542,7 +542,7 @@ namespace SlaveMatrix } } - public 放尿_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 放尿_獣D e) + public 放尿_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 放尿_獣D e) { ThisType = GetType(); Body = new Difs(Sta.性器付["四足放尿"]); @@ -726,7 +726,7 @@ namespace SlaveMatrix X0Y10_尿散り3CP = new ColorP(X0Y10_尿散り3, 尿散り3CD, DisUnit, abj: true); X0Y10_尿散り4CP = new ColorP(X0Y10_尿散り4, 尿散り4CD, DisUnit, abj: true); X0Y10_尿散り5CP = new ColorP(X0Y10_尿散り5, 尿散り5CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -823,12 +823,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 尿CD = new ColorD(ref 体配色.尿線, ref 体配色.尿); 尿散り1CD = new ColorD(ref 体配色.尿線, ref 体配色.尿); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/放尿_獣D.cs index 9b4c6e3..0f5e5b4 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 放尿_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs index 44edb5b..044f925 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人.cs @@ -535,7 +535,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -616,7 +616,7 @@ namespace SlaveMatrix } } - public 断面_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 断面_人D e) + public 断面_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 断面_人D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["断面"]); @@ -779,7 +779,7 @@ namespace SlaveMatrix X0Y4_子宮内CP = new ColorP(X0Y4_子宮内, 子宮内CD, DisUnit, abj: true); X0Y4_子宮口CP = new ColorP(X0Y4_子宮口, 子宮口CD, DisUnit, abj: true); X0Y4_精液CP = new ColorP(X0Y4_精液, 精液CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 精液濃度 = e.精液濃度; 尺度YB = 0.95; } @@ -856,12 +856,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 膣基CD = new ColorD(ref Col.Empty, ref Color2.Empty); Col.Alpha(ref 体配色.粘膜, 160, out var ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_人D.cs index e72efb0..4884e29 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 断面_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs index 5ce26be..0acbbc1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣.cs @@ -535,7 +535,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -616,7 +616,7 @@ namespace SlaveMatrix } } - public 断面_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 断面_獣D e) + public 断面_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 断面_獣D e) { ThisType = GetType(); Body = new Difs(Sta.半身["四足断面"]); @@ -779,7 +779,7 @@ namespace SlaveMatrix X0Y4_子宮内CP = new ColorP(X0Y4_子宮内, 子宮内CD, DisUnit, abj: true); X0Y4_子宮口CP = new ColorP(X0Y4_子宮口, 子宮口CD, DisUnit, abj: true); X0Y4_精液CP = new ColorP(X0Y4_精液, 精液CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 精液濃度 = e.精液濃度; } @@ -855,12 +855,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 膣基CD = new ColorD(ref Col.Empty, ref Color2.Empty); Col.Alpha(ref 体配色.粘膜, 160, out var ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/断面_獣D.cs index 6fa5758..2b6bffd 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 断面_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs index b6c83bc..0e9a5e7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人.cs @@ -411,7 +411,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -440,7 +440,7 @@ namespace SlaveMatrix } } - public 染み_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 染み_人D e) + public 染み_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 染み_人D e) { ThisType = GetType(); Body = new Difs(Sta.その他["染み"]); @@ -539,7 +539,7 @@ namespace SlaveMatrix X0Y0_湯気_湯気右2_湯気2CP = new ColorP(X0Y0_湯気_湯気右2_湯気2, 湯気_湯気右2_湯気2CD, DisUnit, abj: true); X0Y0_湯気_湯気右3_湯気1CP = new ColorP(X0Y0_湯気_湯気右3_湯気1, 湯気_湯気右3_湯気1CD, DisUnit, abj: true); X0Y0_湯気_湯気右3_湯気2CP = new ColorP(X0Y0_湯気_湯気右3_湯気2, 湯気_湯気右3_湯気2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -590,12 +590,12 @@ namespace SlaveMatrix X0Y0_湯気_湯気右3_湯気2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 潮1CD = new ColorD(ref Col.Empty, ref 体配色.染み); 潮2CD = new ColorD(ref Col.Empty, ref 体配色.染み); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_人D.cs index c13c262..d51d13d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 染み_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs index 402e5e8..5d194f0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣.cs @@ -411,7 +411,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -440,7 +440,7 @@ namespace SlaveMatrix } } - public 染み_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 染み_獣D e) + public 染み_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 染み_獣D e) { ThisType = GetType(); Body = new Difs(Sta.その他["四足染み"]); @@ -539,7 +539,7 @@ namespace SlaveMatrix X0Y0_湯気_湯気右2_湯気2CP = new ColorP(X0Y0_湯気_湯気右2_湯気2, 湯気_湯気右2_湯気2CD, DisUnit, abj: true); X0Y0_湯気_湯気右3_湯気1CP = new ColorP(X0Y0_湯気_湯気右3_湯気1, 湯気_湯気右3_湯気1CD, DisUnit, abj: true); X0Y0_湯気_湯気右3_湯気2CP = new ColorP(X0Y0_湯気_湯気右3_湯気2, 湯気_湯気右3_湯気2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -590,12 +590,12 @@ namespace SlaveMatrix X0Y0_湯気_湯気右3_湯気2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 潮1CD = new ColorD(ref Col.Empty, ref 体配色.染み); 潮2CD = new ColorD(ref Col.Empty, ref 体配色.染み); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/染み_獣D.cs index f3b9e66..059949b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 染み_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs index 2bcf33c..c903bf5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植.cs @@ -1122,7 +1122,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1160,7 +1160,7 @@ namespace SlaveMatrix public JointS 花_接続点 => new JointS(Body, X0Y0_茎, 6); - public 植(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 植D e) + public 植(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 植D e) { 植 植2 = this; ThisType = GetType(); @@ -1364,7 +1364,7 @@ namespace SlaveMatrix X0Y0_心臓葉3_通常_葉脈CP = new ColorP(X0Y0_心臓葉3_通常_葉脈, 葉脈3CD, DisUnit, abj: true); X0Y0_心臓葉3_欠損_葉CP = new ColorP(X0Y0_心臓葉3_欠損_葉, 葉3CD, DisUnit, abj: true); X0Y0_心臓葉3_欠損_葉脈CP = new ColorP(X0Y0_心臓葉3_欠損_葉脈, 葉脈3CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1431,7 +1431,7 @@ namespace SlaveMatrix X0Y0_心臓葉3_欠損_葉脈CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1450,7 +1450,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 葉4CD = new ColorD(ref Col.Black, ref 体配色.植1O); 葉脈4CD = new ColorD(ref Col.Black, ref 体配色.植0O); @@ -1465,7 +1465,7 @@ namespace SlaveMatrix 葉脈3CD = new ColorD(ref Col.Black, ref 体配色.植0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 葉4CD = new ColorD(ref Col.Black, ref 体配色.植1O); 葉脈4CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -1480,7 +1480,7 @@ namespace SlaveMatrix 葉脈3CD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 葉4CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 葉脈4CD = new ColorD(ref Col.Black, ref 体配色.植0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/植D.cs index 71e140a..9eb13f8 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 植(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs index 93fe583..40fe845 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗.cs @@ -149,7 +149,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -164,7 +164,7 @@ namespace SlaveMatrix } } - public 汗(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 汗D e) + public 汗(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 汗D e) { ThisType = GetType(); Body = new Difs(Sta.スタンプ["汗"]); @@ -224,7 +224,7 @@ namespace SlaveMatrix X0Y2_汗0流れCP = new ColorP(X0Y2_汗0流れ, 汗0流れCD, DisUnit, abj: true); X0Y3_汗0流れCP = new ColorP(X0Y3_汗0流れ, 汗0流れCD, DisUnit, abj: true); X0Y4_汗0流れCP = new ColorP(X0Y4_汗0流れ, 汗0流れCD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -251,12 +251,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 汗0流れCD = new ColorD(ref 体配色.体液線, ref Color2.Empty); 汗0CD = new ColorD(ref 体配色.体液線, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/汗D.cs index 2ebf8d9..10f5d5e 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 汗(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs index df70eac..54b3462 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂け.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -107,7 +107,7 @@ namespace SlaveMatrix } } - public 涎_裂け(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 涎_裂けD e) + public 涎_裂け(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 涎_裂けD e) { ThisType = GetType(); Body = new Difs(Sta.胴体["涎口裂け左"]); @@ -160,7 +160,7 @@ namespace SlaveMatrix X0Y2_涎CP = new ColorP(X0Y2_涎, 涎CD, DisUnit, abj: false); X0Y3_涎CP = new ColorP(X0Y3_涎, 涎CD, DisUnit, abj: false); X0Y4_涎CP = new ColorP(X0Y4_涎, 涎CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -185,12 +185,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 涎CD = new ColorD(ref 体配色.体液線, ref Color2.Empty); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_裂けD.cs index 62b41ff..e3d996a 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 涎_裂け(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs index 7c789fa..5140ef6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -107,7 +107,7 @@ namespace SlaveMatrix } } - public 涎_通常(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 涎_通常D e) + public 涎_通常(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 涎_通常D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["涎左"]); @@ -160,7 +160,7 @@ namespace SlaveMatrix X0Y2_涎CP = new ColorP(X0Y2_涎, 涎CD, DisUnit, abj: false); X0Y3_涎CP = new ColorP(X0Y3_涎, 涎CD, DisUnit, abj: false); X0Y4_涎CP = new ColorP(X0Y4_涎, 涎CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -185,12 +185,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 涎CD = new ColorD(ref 体配色.体液線, ref Color2.Empty); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涎_通常D.cs index 660ff3a..f7e0b29 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 涎_通常(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs index 3d975ef..9757675 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙.cs @@ -64,7 +64,7 @@ namespace SlaveMatrix public ColorD 涙0流れ0CD; - public ColorD 涙0流れ1CD; + public ColorD Tear0流れ1CD; public ColorD 涙0CD; @@ -166,7 +166,7 @@ namespace SlaveMatrix } } - public bool 涙0流れ0_表示 + public bool Tear0流れ0_表示 { get { @@ -189,7 +189,7 @@ namespace SlaveMatrix } } - public bool 涙0_表示 + public bool Tear0_表示 { get { @@ -235,7 +235,7 @@ namespace SlaveMatrix } } - public bool 涙ハイライト_表示 + public bool Tearハイライト_表示 { get { @@ -258,7 +258,7 @@ namespace SlaveMatrix } } - public bool 涙0流れ1_表示 + public bool Tear0流れ1_表示 { get { @@ -283,19 +283,19 @@ namespace SlaveMatrix { get { - return 涙0流れ0_表示; + return Tear0流れ0_表示; } set { - 涙0流れ0_表示 = value; - 涙0_表示 = value; + Tear0流れ0_表示 = value; + Tear0_表示 = value; 涙1_表示 = value; - 涙ハイライト_表示 = value; - 涙0流れ1_表示 = value; + Tearハイライト_表示 = value; + Tear0流れ1_表示 = value; } } - public override double 濃度 + public override double Intensity { get { @@ -304,7 +304,7 @@ namespace SlaveMatrix set { 涙0流れ0CD.不透明度 = value; - 涙0流れ1CD.不透明度 = value; + Tear0流れ1CD.不透明度 = value; 涙0CD.不透明度 = value; 涙1CD.不透明度 = value; 涙ハイライトCD.不透明度 = value; @@ -325,7 +325,7 @@ namespace SlaveMatrix } } - public 涙(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 涙D e) + public 涙(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 涙D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["涙左"]); @@ -388,11 +388,11 @@ namespace SlaveMatrix サイズ = e.サイズ; サイズX = e.サイズX; サイズY = e.サイズY; - 涙0流れ0_表示 = e.涙0流れ0_表示; - 涙0_表示 = e.涙0_表示; + Tear0流れ0_表示 = e.涙0流れ0_表示; + Tear0_表示 = e.涙0_表示; 涙1_表示 = e.涙1_表示; - 涙ハイライト_表示 = e.涙ハイライト_表示; - 涙0流れ1_表示 = e.涙0流れ1_表示; + Tearハイライト_表示 = e.涙ハイライト_表示; + Tear0流れ1_表示 = e.涙0流れ1_表示; 欠損 = e.欠損; 筋肉 = e.筋肉; 拘束 = e.拘束; @@ -407,31 +407,31 @@ namespace SlaveMatrix X0Y0_涙1CP = new ColorP(X0Y0_涙1, 涙1CD, DisUnit, abj: true); X0Y0_涙ハイライトCP = new ColorP(X0Y0_涙ハイライト, 涙ハイライトCD, DisUnit, abj: true); X0Y1_涙0流れ0CP = new ColorP(X0Y1_涙0流れ0, 涙0流れ0CD, DisUnit, abj: true); - X0Y1_涙0流れ1CP = new ColorP(X0Y1_涙0流れ1, 涙0流れ1CD, DisUnit, abj: true); + X0Y1_涙0流れ1CP = new ColorP(X0Y1_涙0流れ1, Tear0流れ1CD, DisUnit, abj: true); X0Y1_涙0CP = new ColorP(X0Y1_涙0, 涙0CD, DisUnit, abj: true); X0Y1_涙1CP = new ColorP(X0Y1_涙1, 涙1CD, DisUnit, abj: true); X0Y1_涙ハイライトCP = new ColorP(X0Y1_涙ハイライト, 涙ハイライトCD, DisUnit, abj: true); X0Y2_涙0流れ0CP = new ColorP(X0Y2_涙0流れ0, 涙0流れ0CD, DisUnit, abj: true); - X0Y2_涙0流れ1CP = new ColorP(X0Y2_涙0流れ1, 涙0流れ1CD, DisUnit, abj: true); + X0Y2_涙0流れ1CP = new ColorP(X0Y2_涙0流れ1, Tear0流れ1CD, DisUnit, abj: true); X0Y2_涙0CP = new ColorP(X0Y2_涙0, 涙0CD, DisUnit, abj: true); X0Y2_涙1CP = new ColorP(X0Y2_涙1, 涙1CD, DisUnit, abj: true); X0Y2_涙ハイライトCP = new ColorP(X0Y2_涙ハイライト, 涙ハイライトCD, DisUnit, abj: true); X0Y3_涙0流れ0CP = new ColorP(X0Y3_涙0流れ0, 涙0流れ0CD, DisUnit, abj: true); - X0Y3_涙0流れ1CP = new ColorP(X0Y3_涙0流れ1, 涙0流れ1CD, DisUnit, abj: true); + X0Y3_涙0流れ1CP = new ColorP(X0Y3_涙0流れ1, Tear0流れ1CD, DisUnit, abj: true); X0Y3_涙0CP = new ColorP(X0Y3_涙0, 涙0CD, DisUnit, abj: true); X0Y3_涙1CP = new ColorP(X0Y3_涙1, 涙1CD, DisUnit, abj: true); X0Y3_涙ハイライトCP = new ColorP(X0Y3_涙ハイライト, 涙ハイライトCD, DisUnit, abj: true); X0Y4_涙0流れ0CP = new ColorP(X0Y4_涙0流れ0, 涙0流れ0CD, DisUnit, abj: true); - X0Y4_涙0流れ1CP = new ColorP(X0Y4_涙0流れ1, 涙0流れ1CD, DisUnit, abj: true); + X0Y4_涙0流れ1CP = new ColorP(X0Y4_涙0流れ1, Tear0流れ1CD, DisUnit, abj: true); X0Y4_涙0CP = new ColorP(X0Y4_涙0, 涙0CD, DisUnit, abj: true); X0Y4_涙1CP = new ColorP(X0Y4_涙1, 涙1CD, DisUnit, abj: true); X0Y4_涙ハイライトCP = new ColorP(X0Y4_涙ハイライト, 涙ハイライトCD, DisUnit, abj: true); X0Y5_涙0流れ0CP = new ColorP(X0Y5_涙0流れ0, 涙0流れ0CD, DisUnit, abj: true); - X0Y5_涙0流れ1CP = new ColorP(X0Y5_涙0流れ1, 涙0流れ1CD, DisUnit, abj: true); + X0Y5_涙0流れ1CP = new ColorP(X0Y5_涙0流れ1, Tear0流れ1CD, DisUnit, abj: true); X0Y5_涙0CP = new ColorP(X0Y5_涙0, 涙0CD, DisUnit, abj: true); X0Y5_涙1CP = new ColorP(X0Y5_涙1, 涙1CD, DisUnit, abj: true); X0Y5_涙ハイライトCP = new ColorP(X0Y5_涙ハイライト, 涙ハイライトCD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -482,15 +482,15 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 涙0流れ0CD = new ColorD(ref 体配色.体液線, ref Color2.Empty); - 涙0流れ1CD = new ColorD(ref 体配色.体液線, ref Color2.Empty); + Tear0流れ1CD = new ColorD(ref 体配色.体液線, ref Color2.Empty); 涙0CD = new ColorD(ref 体配色.体液線, ref 体配色.人肌O); 涙1CD = new ColorD(ref 体配色.体液線, ref Color2.Empty); 涙ハイライトCD = new ColorD(ref 体配色.ハイライト.Col1, ref 体配色.ハイライト); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/涙D.cs index 0af465b..0f1acae 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 涙(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs index e2bd956..fb13cc8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人.cs @@ -1479,7 +1479,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1511,7 +1511,7 @@ namespace SlaveMatrix } } - public 潮吹_大_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 潮吹_大_人D e) + public 潮吹_大_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 潮吹_大_人D e) { ThisType = GetType(); Dif dif = new Dif(Sta.性器付["潮吹"][1]); @@ -1959,7 +1959,7 @@ namespace SlaveMatrix X0Y8_雫18CP = new ColorP(X0Y8_雫18, 雫18CD, DisUnit, abj: true); X0Y8_雫19CP = new ColorP(X0Y8_雫19, 雫19CD, DisUnit, abj: true); X0Y8_雫20CP = new ColorP(X0Y8_雫20, 雫20CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -2176,12 +2176,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 潮吹基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 雫1CD = new ColorD(ref Col.Empty, ref 体配色.体液); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_人D.cs index 9752069..cf07d17 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 潮吹_大_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs index c1a5e15..809e62d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣.cs @@ -1479,7 +1479,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1511,7 +1511,7 @@ namespace SlaveMatrix } } - public 潮吹_大_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 潮吹_大_獣D e) + public 潮吹_大_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 潮吹_大_獣D e) { ThisType = GetType(); Dif dif = new Dif(Sta.性器付["四足潮吹"][1]); @@ -1959,7 +1959,7 @@ namespace SlaveMatrix X0Y8_雫18CP = new ColorP(X0Y8_雫18, 雫18CD, DisUnit, abj: true); X0Y8_雫19CP = new ColorP(X0Y8_雫19, 雫19CD, DisUnit, abj: true); X0Y8_雫20CP = new ColorP(X0Y8_雫20, 雫20CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -2176,12 +2176,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 潮吹基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 雫1CD = new ColorD(ref Col.Empty, ref 体配色.体液); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_大_獣D.cs index 0d02c89..1c448ff 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 潮吹_大_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs index 7280eb1..46b9c1c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人.cs @@ -119,7 +119,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -131,7 +131,7 @@ namespace SlaveMatrix } } - public 潮吹_小_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 潮吹_小_人D e) + public 潮吹_小_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 潮吹_小_人D e) { ThisType = GetType(); Dif dif = new Dif(Sta.性器付["潮吹"][0]); @@ -199,7 +199,7 @@ namespace SlaveMatrix X0Y6_雫CP = new ColorP(X0Y6_雫, 雫CD, DisUnit, abj: true); X0Y7_雫CP = new ColorP(X0Y7_雫, 雫CD, DisUnit, abj: true); X0Y8_雫CP = new ColorP(X0Y8_雫, 雫CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -236,12 +236,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 雫CD = new ColorD(ref Col.Empty, ref 体配色.体液); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_人D.cs index f00ba5c..d26bc7b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 潮吹_小_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs index 0a3694e..6dd3711 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣.cs @@ -119,7 +119,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -131,7 +131,7 @@ namespace SlaveMatrix } } - public 潮吹_小_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 潮吹_小_獣D e) + public 潮吹_小_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 潮吹_小_獣D e) { ThisType = GetType(); Dif dif = new Dif(Sta.性器付["四足潮吹"][0]); @@ -199,7 +199,7 @@ namespace SlaveMatrix X0Y6_雫CP = new ColorP(X0Y6_雫, 雫CD, DisUnit, abj: true); X0Y7_雫CP = new ColorP(X0Y7_雫, 雫CD, DisUnit, abj: true); X0Y8_雫CP = new ColorP(X0Y8_雫, 雫CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -236,12 +236,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 雫CD = new ColorD(ref Col.Empty, ref 体配色.体液); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/潮吹_小_獣D.cs index 92ed689..a671220 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 潮吹_小_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs index e52b70c..49b177a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳.cs @@ -202,7 +202,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -216,7 +216,7 @@ namespace SlaveMatrix } } - public 獣耳(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 獣耳D e) + public 獣耳(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 獣耳D e) { ThisType = GetType(); Body = new Difs(Sta.肢左["獣耳"]); @@ -298,7 +298,7 @@ namespace SlaveMatrix X1Y2_獣耳外CP = new ColorP(X1Y2_獣耳外, 獣耳外CD, DisUnit, abj: true); X1Y2_獣耳内CP = new ColorP(X1Y2_獣耳内, 獣耳内CD, DisUnit, abj: true); X1Y2_耳毛CP = new ColorP(X1Y2_耳毛, 耳毛CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -359,7 +359,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -378,21 +378,21 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 獣耳外CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 獣耳内CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 耳毛CD = new ColorD(ref Col.Black, ref 体配色.毛1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 獣耳外CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 獣耳内CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 耳毛CD = new ColorD(ref Col.Black, ref 体配色.毛1O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 獣耳外CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 獣耳内CD = new ColorD(ref Col.Black, ref 体配色.人肌R); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/獣耳D.cs index 0eae277..d807cda 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 獣耳(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs index 0d5e2c4..56703b0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷.cs @@ -531,7 +531,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -566,7 +566,7 @@ namespace SlaveMatrix } } - public 玉口枷(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 玉口枷D e) + public 玉口枷(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 玉口枷D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["玉口枷"]); @@ -676,7 +676,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public override bool Is革(Par p) @@ -716,12 +716,12 @@ namespace SlaveMatrix X0Y0_丸金具右外CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 金具左上CD = new ColorD(); 金具左下CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/玉口枷D.cs index e4292ff..6e0588f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 玉口枷(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs index 900cde3..fa15b13 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷.cs @@ -139,7 +139,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -166,7 +166,7 @@ namespace SlaveMatrix } } - public 目傷(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 目傷D e) + public 目傷(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 目傷D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["目傷左"]); @@ -230,7 +230,7 @@ namespace SlaveMatrix X0Y3_傷下CP = new ColorP(X0Y3_傷下, 傷下CD, DisUnit, abj: true); X0Y4_傷上CP = new ColorP(X0Y4_傷上, 傷上CD, DisUnit, abj: true); X0Y4_傷下CP = new ColorP(X0Y4_傷下, 傷下CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -260,12 +260,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 傷上CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); 傷下CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目傷D.cs index 6329f4d..2cbeece 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 目傷(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs index c2c04ad..8f1fe0d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 目尻影(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 目尻影D e) + public 目尻影(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 目尻影D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["目尻影左"]); @@ -124,7 +124,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_目尻影CP = new ColorP(X0Y0_目尻影, 目尻影CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -132,12 +132,12 @@ namespace SlaveMatrix X0Y0_目尻影CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 目尻影CD = new ColorD(ref 体配色.肌濃.Col1, ref Color2.Empty); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目尻影D.cs index bd6677a..93ad355 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 目尻影(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs index 8eadfd2..0c48435 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯.cs @@ -491,7 +491,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -524,7 +524,7 @@ namespace SlaveMatrix } } - public 目隠帯(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 目隠帯D e) + public 目隠帯(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 目隠帯D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["目隠帯"]); @@ -628,7 +628,7 @@ namespace SlaveMatrix X0Y0_丸金具下右3CP = new ColorP(X0Y0_丸金具下右3, 丸金具下右3CD, DisUnit, abj: true); X0Y0_丸金具下右4CP = new ColorP(X0Y0_丸金具下右4, 丸金具下右4CD, DisUnit, abj: true); X0Y0_丸金具下右5CP = new ColorP(X0Y0_丸金具下右5, 丸金具下右5CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override bool Is革(Par p) @@ -666,12 +666,12 @@ namespace SlaveMatrix X0Y0_丸金具下右5CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 革CD = new ColorD(); 丸金具上中CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/目隠帯D.cs index f9fe801..1f650d0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 目隠帯(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs index b441f29..aab7f21 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉.cs @@ -109,7 +109,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -148,7 +148,7 @@ namespace SlaveMatrix } } - public 眉(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 眉D e) + public 眉(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 眉D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["眉左"]); @@ -200,7 +200,7 @@ namespace SlaveMatrix X0Y1_眉間CP = new ColorP(X0Y1_眉間, 眉間CD, DisUnit, abj: false); X0Y2_眉CP = new ColorP(X0Y2_眉, 眉CD, DisUnit, abj: true); X0Y2_眉間CP = new ColorP(X0Y2_眉間, 眉間CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; int num = (右 ? 1 : (-1)); X0Y0_眉.BasePointBase = X0Y0_眉.BasePointBase.AddX((double)num * 0.0009); X0Y1_眉.BasePointBase = X0Y1_眉.BasePointBase.AddX((double)num * 0.0009); @@ -225,12 +225,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 眉CD = new ColorD(ref Col.Black, ref 体配色.眉O); 眉間CD = new ColorD(ref 体配色.薄線, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/眉D.cs index e82250f..484e732 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 眉(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs index f5192d1..87cd7c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中.cs @@ -495,7 +495,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public 瞼_中(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_中D e) + public 瞼_中(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_中D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["魔性中瞼左"]); @@ -787,7 +787,7 @@ namespace SlaveMatrix X1Y4_睫毛_睫毛4CP = new ColorP(X1Y4_睫毛_睫毛4, 睫毛_睫毛4CD, DisUnit, abj: true); X1Y4_睫毛_睫毛1CP = new ColorP(X1Y4_睫毛_睫毛1, 睫毛_睫毛1CD, DisUnit, abj: true); X1Y4_睫毛_睫毛2CP = new ColorP(X1Y4_睫毛_睫毛2, 睫毛_睫毛2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度XB = 0.99; } @@ -992,12 +992,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 瞼CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.人肌O); 二重CD = new ColorD(ref Col.Black, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_中D.cs index a238410..7323350 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_中(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs index c70f9a1..57908b4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇.cs @@ -186,7 +186,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -202,7 +202,7 @@ namespace SlaveMatrix public JointS 涙_接続点 => new JointS(Body, X0Y0_目, 2); - public 瞼_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_宇D e) + public 瞼_宇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_宇D e) { 瞼_宇 瞼_宇2 = this; ThisType = GetType(); @@ -291,7 +291,7 @@ namespace SlaveMatrix X0Y4_目CP = new ColorP(X0Y4_目, 目CD, DisUnit, abj: true); X0Y4_ハイライトCP = new ColorP(X0Y4_ハイライト, ハイライトCD, DisUnit, abj: true); X0Y4_瞬膜CP = new ColorP(X0Y4_瞬膜, 瞬膜CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -326,12 +326,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 目CD = new ColorD(ref Col.Black, ref 体配色.目左O); ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_宇D.cs index 4fcf49e..512cab0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs index b2b2dbf..0678502 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱.cs @@ -421,7 +421,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -506,7 +506,7 @@ namespace SlaveMatrix } } - public 瞼_弱(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_弱D e) + public 瞼_弱(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_弱D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["魔性弱瞼左"]); @@ -673,7 +673,7 @@ namespace SlaveMatrix X1Y4_睫毛_睫毛3CP = new ColorP(X1Y4_睫毛_睫毛3, 睫毛_睫毛3CD, DisUnit, abj: true); X1Y4_睫毛_睫毛1CP = new ColorP(X1Y4_睫毛_睫毛1, 睫毛_睫毛1CD, DisUnit, abj: true); X1Y4_睫毛_睫毛2CP = new ColorP(X1Y4_睫毛_睫毛2, 睫毛_睫毛2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } private void 睫毛長さ(Par p, double d) @@ -857,12 +857,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 瞼CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.人肌O); 二重CD = new ColorD(ref Col.Black, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_弱D.cs index e7aa868..be37199 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_弱(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs index 9999999..d46c378 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強.cs @@ -495,7 +495,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -598,7 +598,7 @@ namespace SlaveMatrix } } - public 瞼_強(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_強D e) + public 瞼_強(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_強D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["魔性強瞼左"]); @@ -787,7 +787,7 @@ namespace SlaveMatrix X1Y4_睫毛_睫毛4CP = new ColorP(X1Y4_睫毛_睫毛4, 睫毛_睫毛4CD, DisUnit, abj: true); X1Y4_睫毛_睫毛1CP = new ColorP(X1Y4_睫毛_睫毛1, 睫毛_睫毛1CD, DisUnit, abj: true); X1Y4_睫毛_睫毛2CP = new ColorP(X1Y4_睫毛_睫毛2, 睫毛_睫毛2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度XB = 0.95; } @@ -992,12 +992,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 瞼CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.人肌O); 二重CD = new ColorD(ref Col.Black, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_強D.cs index d1e837a..f620253 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_強(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs index 00b7a69..dc2fb0f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣.cs @@ -421,7 +421,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -506,7 +506,7 @@ namespace SlaveMatrix } } - public 瞼_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 瞼_獣D e) + public 瞼_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 瞼_獣D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["獣性瞼左"]); @@ -673,7 +673,7 @@ namespace SlaveMatrix X1Y4_睫毛_睫毛3CP = new ColorP(X1Y4_睫毛_睫毛3, 睫毛_睫毛3CD, DisUnit, abj: true); X1Y4_睫毛_睫毛1CP = new ColorP(X1Y4_睫毛_睫毛1, 睫毛_睫毛1CD, DisUnit, abj: true); X1Y4_睫毛_睫毛2CP = new ColorP(X1Y4_睫毛_睫毛2, 睫毛_睫毛2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } private void 睫毛長さ(Par p, double d) @@ -857,12 +857,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 瞼CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.人肌O); 二重CD = new ColorD(ref Col.Black, ref 体配色.人肌O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/瞼_獣D.cs index 130e06f..bc7a1cd 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 瞼_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs index f585466..98b2f9f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航.cs @@ -308,7 +308,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -334,7 +334,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 節尾_曳航(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節尾_曳航D e) + public 節尾_曳航(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節尾_曳航D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -412,7 +412,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -484,7 +484,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -503,7 +503,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 前腿節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 腿節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -518,7 +518,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 前腿節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 腿節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -533,7 +533,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 前腿節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 腿節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_曳航D.cs index 390e5ca..e326914 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節尾_曳航(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs index 9adc7cd..6cbb4aa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏.cs @@ -288,7 +288,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -313,7 +313,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 節尾_鋏(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節尾_鋏D e) + public 節尾_鋏(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節尾_鋏D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -388,7 +388,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, 右: true, 配色指定, 体配色, Xasix); 鎖2.反転Y = true; @@ -448,7 +448,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -467,7 +467,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 牙CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 刺1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -481,7 +481,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 牙CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 刺1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -495,7 +495,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 牙CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 刺1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節尾_鋏D.cs index fa5fbef..cec2aa3 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節尾_鋏(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs index 1f7e3ed..a87419f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百.cs @@ -344,7 +344,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -372,7 +372,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 節足_足百(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節足_足百D e) + public 節足_足百(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節足_足百D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -457,7 +457,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖2 = new 拘束鎖(DisUnit, 右: true, 配色指定, 体配色, Xasix); 鎖2.反転Y = true; 鎖2.接続(鎖2_接続点); @@ -532,7 +532,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -551,7 +551,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 転節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -568,7 +568,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 転節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -585,7 +585,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 転節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足百D.cs index cd1ec92..50d09dc 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節足_足百(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs index 584fe2f..732bc2d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘.cs @@ -448,7 +448,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -497,7 +497,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 節足_足蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節足_足蜘D e) + public 節足_足蜘(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節足_足蜘D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -599,7 +599,7 @@ namespace SlaveMatrix X0Y0_跗節2CP = new ColorP(X0Y0_跗節2, 跗節2CD, DisUnit, abj: true); X0Y0_爪_爪1CP = new ColorP(X0Y0_爪_爪1, 爪_爪1CD, DisUnit, abj: true); X0Y0_爪_爪2CP = new ColorP(X0Y0_爪_爪2, 爪_爪2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.反転Y = 反転Y; 鎖1.接続(鎖1_接続点); @@ -687,7 +687,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -706,7 +706,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 転節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -728,7 +728,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 転節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -750,7 +750,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 転節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蜘D.cs index 1c3f14c..2332066 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節足_足蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs index d07b311..738b228 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍.cs @@ -408,7 +408,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -455,7 +455,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 節足_足蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 節足_足蠍D e) + public 節足_足蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 節足_足蠍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -551,7 +551,7 @@ namespace SlaveMatrix X0Y0_跗節2CP = new ColorP(X0Y0_跗節2, 跗節2CD, DisUnit, abj: true); X0Y0_爪_爪1CP = new ColorP(X0Y0_爪_爪1, 爪_爪1CD, DisUnit, abj: true); X0Y0_爪_爪2CP = new ColorP(X0Y0_爪_爪2, 爪_爪2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-20) : 20); @@ -631,7 +631,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -650,7 +650,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 転節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 腿節CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -670,7 +670,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 転節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 腿節CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -690,7 +690,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 転節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 腿節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/節足_足蠍D.cs index 04db01d..43de423 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 節足_足蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs index c7380e5..8056baa 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮.cs @@ -382,7 +382,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -403,7 +403,7 @@ namespace SlaveMatrix } } - public 紅潮(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 紅潮D e) + public 紅潮(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 紅潮D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["紅潮"]); @@ -481,7 +481,7 @@ namespace SlaveMatrix 紅潮線左右濃度 = e.紅潮線左右濃度; 紅潮弱左右濃度 = e.紅潮弱左右濃度; 紅潮線弱左右濃度 = e.紅潮線弱左右濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -498,12 +498,12 @@ namespace SlaveMatrix X0Y0_紅潮線弱右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Color Col = Color.FromArgb((int)((double)(int)体配色.紅潮.Col1.A * 0.7), 体配色.紅潮.Col1); 紅潮0CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/紅潮D.cs index a0cf680..e3bdbd0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 紅潮(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs index d53820f..d7a39c8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目.cs @@ -174,7 +174,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -221,7 +221,7 @@ namespace SlaveMatrix public JointS 瞼_接続点 => new JointS(Body, X0Y0_白目, 0); - public 縦目(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 縦目D e) + public 縦目(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 縦目D e) { 縦目 縦目2 = this; ThisType = GetType(); @@ -299,7 +299,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public void 猫目() @@ -324,12 +324,12 @@ namespace SlaveMatrix X0Y0_黒目_ハイライト下CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 白目CD = new ColorD(ref Col.Empty, ref 体配色.白部O); 黒目_黒目CD = new ColorD(ref Col.Black, ref 体配色.縦目O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦目D.cs index 4d74773..5cf6b75 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 縦目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs index 5a9a149..b07e5de 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼.cs @@ -315,7 +315,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -412,7 +412,7 @@ namespace SlaveMatrix } } - public 縦瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 縦瞼D e) + public 縦瞼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 縦瞼D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["額瞼"]); @@ -535,7 +535,7 @@ namespace SlaveMatrix X0Y4_瞼右_瞼CP = new ColorP(X0Y4_瞼右_瞼, 瞼右_瞼CD, DisUnit, abj: true); X0Y4_瞼右_睫毛1CP = new ColorP(X0Y4_瞼右_睫毛1, 瞼右_睫毛1CD, DisUnit, abj: true); X0Y4_瞼右_睫毛2CP = new ColorP(X0Y4_瞼右_睫毛2, 瞼右_睫毛2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } private void 睫毛長さ(Par p, double d) @@ -641,12 +641,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 瞼左_瞼CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.人肌O); 瞼左_睫毛1CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.睫毛); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/縦瞼D.cs index 0f76e7c..80094c1 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 縦瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs index 702edc4..ff4762b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒.cs @@ -191,7 +191,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -209,7 +209,7 @@ namespace SlaveMatrix } } - public 羽根箒(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 羽根箒D e) + public 羽根箒(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 羽根箒D e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["羽根箒"]); @@ -268,7 +268,7 @@ namespace SlaveMatrix X0Y0_羽根5CP = new ColorP(X0Y0_羽根5, 羽根5CD, DisUnit, abj: true); X0Y0_羽根CP = new ColorP(X0Y0_羽根, 羽根CD, DisUnit, abj: true); X0Y0_柄CP = new ColorP(X0Y0_柄, 柄CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; Body.JoinPAall(); } @@ -283,12 +283,12 @@ namespace SlaveMatrix X0Y0_柄CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.GetGrad(ref Col.White, out var ret); 羽根1CD = new ColorD(ref Col.Black, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽根箒D.cs index 7b4cd84..44f5c89 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 羽根箒(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs index b43e769..f0f34de 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs @@ -7,7 +7,7 @@ namespace SlaveMatrix { public bool Is擽り; - private Mot 擽りモーション; + private Motion 擽りモーション; private ハンド ハンド右; @@ -214,13 +214,13 @@ namespace SlaveMatrix ハンド右 = 調教UI.ハンド右; xc = Med.Base.LocalCenter.X; Color hc; - 擽りモーション = new Mot(0.0, 1.0) + 擽りモーション = new Motion(0.0, 1.0) { BaseSpeed = 16.0 * base.強度, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { 羽根箒.Ele.角度C = 10.0 * m.Value; hc = 調教UI.羽根箒先端hc; @@ -228,13 +228,13 @@ namespace SlaveMatrix Player.奴体力消費小(); Player.主精力消費小(); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); 羽根箒.Ele.角度C = 0.0; @@ -243,10 +243,10 @@ namespace SlaveMatrix 調教UI.Mots.Add(擽りモーション.GetHashCode().ToString(), 擽りモーション); } - public void SetCha(Cha Cha) + public void SetCha(Character Cha) { base.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; } public new void Reset() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs index 3d5d79a..7fa20d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人.cs @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -117,7 +117,7 @@ namespace SlaveMatrix } } - public 耳_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_人D e) + public 耳_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_人D e) { ThisType = GetType(); Body = new Difs(); @@ -170,7 +170,7 @@ namespace SlaveMatrix X0Y0_耳線CP = new ColorP(X0Y0_耳線, 耳線CD, DisUnit, abj: true); X1Y0_耳CP = new ColorP(X1Y0_耳, 耳CD, DisUnit, abj: true); X1Y0_耳線CP = new ColorP(X1Y0_耳線, 耳線CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -195,12 +195,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 耳CD = new ColorD(ref Col.Black, ref 体配色.人肌O); 耳線CD = new ColorD(ref Col.Black, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_人D.cs index 040a0e1..168c879 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs index fc75b62..5eca7c4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖.cs @@ -152,7 +152,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -165,7 +165,7 @@ namespace SlaveMatrix } } - public 耳_尖(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_尖D e) + public 耳_尖(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_尖D e) { ThisType = GetType(); Body = new Difs(); @@ -238,7 +238,7 @@ namespace SlaveMatrix X1Y1_耳線CP = new ColorP(X1Y1_耳線, 耳線CD, DisUnit, abj: true); X1Y2_耳CP = new ColorP(X1Y2_耳, 耳CD, DisUnit, abj: true); X1Y2_耳線CP = new ColorP(X1Y2_耳線, 耳線CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -293,12 +293,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 耳CD = new ColorD(ref Col.Black, ref 体配色.人肌O); 耳線CD = new ColorD(ref Col.Black, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_尖D.cs index 41bf19c..b77286b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_尖(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs index 892ab61..86373f4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣.cs @@ -202,7 +202,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -216,7 +216,7 @@ namespace SlaveMatrix } } - public 耳_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_獣D e) + public 耳_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_獣D e) { ThisType = GetType(); Body = new Difs(); @@ -302,7 +302,7 @@ namespace SlaveMatrix X1Y2_耳CP = new ColorP(X1Y2_耳, 耳CD, DisUnit, abj: true); X1Y2_耳線1CP = new ColorP(X1Y2_耳線1, 耳線1CD, DisUnit, abj: true); X1Y2_耳線2CP = new ColorP(X1Y2_耳線2, 耳線2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -363,12 +363,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 耳CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 耳線1CD = new ColorD(ref Col.Black, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_獣D.cs index 3814c0e..7f33f05 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs index 90fbc1f..484b717 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽.cs @@ -302,7 +302,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -318,7 +318,7 @@ namespace SlaveMatrix } } - public 耳_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_羽D e) + public 耳_羽(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_羽D e) { ThisType = GetType(); Body = new Difs(); @@ -429,7 +429,7 @@ namespace SlaveMatrix X1Y2_耳CP = new ColorP(X1Y2_耳, 耳CD, DisUnit, abj: true); X1Y2_耳線1CP = new ColorP(X1Y2_耳線1, 耳線1CD, DisUnit, abj: true); X1Y2_耳線2CP = new ColorP(X1Y2_耳線2, 耳線2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -514,7 +514,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -533,7 +533,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 羽2CD = new ColorD(ref Col.Black, ref 体配色.羽0O); 羽1CD = new ColorD(ref Col.Black, ref 体配色.羽0O); @@ -542,7 +542,7 @@ namespace SlaveMatrix 耳線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 羽2CD = new ColorD(ref Col.Black, ref 体配色.羽0O); 羽1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -551,7 +551,7 @@ namespace SlaveMatrix 耳線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 羽2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 羽1CD = new ColorD(ref Col.Black, ref 体配色.羽0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_羽D.cs index 2af5fc8..fbee7d7 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs index 1463165..693c22d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長.cs @@ -202,7 +202,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -216,7 +216,7 @@ namespace SlaveMatrix } } - public 耳_長(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_長D e) + public 耳_長(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_長D e) { ThisType = GetType(); Body = new Difs(); @@ -302,7 +302,7 @@ namespace SlaveMatrix X1Y2_耳CP = new ColorP(X1Y2_耳, 耳CD, DisUnit, abj: true); X1Y2_耳線1CP = new ColorP(X1Y2_耳線1, 耳線1CD, DisUnit, abj: true); X1Y2_耳線2CP = new ColorP(X1Y2_耳線2, 耳線2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -363,12 +363,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 耳CD = new ColorD(ref Col.Black, ref 体配色.人肌O); 耳線1CD = new ColorD(ref Col.Black, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_長D.cs index 3e66830..6ac745d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_長(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs index 81a8390..7194bc0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭.cs @@ -366,7 +366,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -383,7 +383,7 @@ namespace SlaveMatrix } } - public 耳_鰭(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 耳_鰭D e) + public 耳_鰭(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 耳_鰭D e) { ThisType = GetType(); Body = new Difs(); @@ -531,7 +531,7 @@ namespace SlaveMatrix X1Y2_鰭耳1_鰭条CP = new ColorP(X1Y2_鰭耳1_鰭条, 鰭耳1_鰭条CD, DisUnit, abj: true); X1Y2_鰭耳2_鰭膜CP = new ColorP(X1Y2_鰭耳2_鰭膜, 鰭耳2_鰭膜CD, DisUnit, abj: true); X1Y2_鰭耳2_鰭条CP = new ColorP(X1Y2_鰭耳2_鰭条, 鰭耳2_鰭条CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -604,12 +604,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鰭耳3_鰭膜CD = new ColorD(ref Col.Black, ref 体配色.膜O); 鰭耳3_鰭条CD = new ColorD(ref Col.Black, ref 体配色.爪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/耳_鰭D.cs index cc675a2..4fad035 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 耳_鰭(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs index 5233366..c538b69 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人.cs @@ -114,7 +114,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -130,7 +130,7 @@ namespace SlaveMatrix public JointS 肛門精液_接続点 => new JointS(Body, X0Y0_肛門2, 0); - public 肛門_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 肛門_人D e) + public 肛門_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 肛門_人D e) { 肛門_人 肛門_人2 = this; ThisType = GetType(); @@ -190,7 +190,7 @@ namespace SlaveMatrix X0Y0_肛門3CP = new ColorP(X0Y0_肛門3, 肛門3CD, DisUnit, abj: true); X0Y0_肛門2CP = new ColorP(X0Y0_肛門2, 肛門2CD, DisUnit, abj: true); X0Y0_肛門1CP = new ColorP(X0Y0_肛門1, 肛門1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -200,12 +200,12 @@ namespace SlaveMatrix X0Y0_肛門1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 肛門3CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); 肛門2CD = new ColorD(ref 体配色.粘膜線, ref 体配色.粘膜); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_人D.cs index f1490a9..e883132 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 肛門_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs index 4b48ac3..40cc555 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣.cs @@ -114,7 +114,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -130,7 +130,7 @@ namespace SlaveMatrix public JointS 肛門精液_接続点 => new JointS(Body, X0Y0_肛門2, 0); - public 肛門_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 肛門_獣D e) + public 肛門_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 肛門_獣D e) { 肛門_獣 肛門_獣2 = this; ThisType = GetType(); @@ -190,7 +190,7 @@ namespace SlaveMatrix X0Y0_肛門3CP = new ColorP(X0Y0_肛門3, 肛門3CD, DisUnit, abj: true); X0Y0_肛門2CP = new ColorP(X0Y0_肛門2, 肛門2CD, DisUnit, abj: true); X0Y0_肛門1CP = new ColorP(X0Y0_肛門1, 肛門1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -200,12 +200,12 @@ namespace SlaveMatrix X0Y0_肛門1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.Alpha(ref 体配色.粘膜, 180, out var ret); 肛門3CD = new ColorD(ref Col.Empty, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門_獣D.cs index 5947c3d..3bddd83 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 肛門_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs index 7f9261c..ef826d4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人.cs @@ -101,7 +101,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -113,7 +113,7 @@ namespace SlaveMatrix } } - public 肛門精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 肛門精液_人D e) + public 肛門精液_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 肛門精液_人D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["肛門精液垂れ"]); @@ -169,7 +169,7 @@ namespace SlaveMatrix X0Y3_精液CP = new ColorP(X0Y3_精液, 精液CD, DisUnit, abj: true); X0Y4_精液CP = new ColorP(X0Y4_精液, 精液CD, DisUnit, abj: true); X0Y5_精液CP = new ColorP(X0Y5_精液, 精液CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -197,12 +197,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 精液CD = new ColorD(); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_人D.cs index 6d0d3d1..513852b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 肛門精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs index ad9449a..28f01a7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣.cs @@ -101,7 +101,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -113,7 +113,7 @@ namespace SlaveMatrix } } - public 肛門精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 肛門精液_獣D e) + public 肛門精液_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 肛門精液_獣D e) { ThisType = GetType(); Body = new Difs(Sta.半身["四足肛門精液垂れ"]); @@ -169,7 +169,7 @@ namespace SlaveMatrix X0Y3_精液CP = new ColorP(X0Y3_精液, 精液CD, DisUnit, abj: true); X0Y4_精液CP = new ColorP(X0Y4_精液, 精液CD, DisUnit, abj: true); X0Y5_精液CP = new ColorP(X0Y5_精液, 精液CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -197,12 +197,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 精液CD = new ColorD(); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/肛門精液_獣D.cs index 7fa5375..285c0ae 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 肛門精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs index b69d9e8..9266eee 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光.cs @@ -93,7 +93,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -105,7 +105,7 @@ namespace SlaveMatrix } } - public 背中_光(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 背中_光D e) + public 背中_光(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 背中_光D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -155,7 +155,7 @@ namespace SlaveMatrix Pars = new Par[2] { X0Y0_後光左, X0Y0_後光右 }; X0Y0_後光左CP = new ColorP(X0Y0_後光左, 後光CD, DisUnit, abj: true); X0Y0_後光右CP = new ColorP(X0Y0_後光右, 後光CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -165,12 +165,12 @@ namespace SlaveMatrix X0Y0_後光右CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 後光CD = new ColorD(ref Col.Empty, ref 体配色.後光O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_光D.cs index 86cf24d..0dc79bf 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 背中_光(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs index 879a36d..acb1cc9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲.cs @@ -771,7 +771,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -854,7 +854,7 @@ namespace SlaveMatrix } } - public 背中_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 背中_甲D e) + public 背中_甲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 背中_甲D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1012,7 +1012,7 @@ namespace SlaveMatrix X0Y0_右_側甲_側甲3CP = new ColorP(X0Y0_右_側甲_側甲3, 右_側甲_側甲3CD, DisUnit, abj: true); X0Y0_右_側甲_側甲2CP = new ColorP(X0Y0_右_側甲_側甲2, 右_側甲_側甲2CD, DisUnit, abj: true); X0Y0_右_側甲_側甲1CP = new ColorP(X0Y0_右_側甲_側甲1, 右_側甲_側甲1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -1055,7 +1055,7 @@ namespace SlaveMatrix X0Y0_右_側甲_側甲1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1074,7 +1074,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 左_甲羅1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 左_甲羅2CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); @@ -1114,7 +1114,7 @@ namespace SlaveMatrix 右_側甲_側甲1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 左_甲羅1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 左_甲羅2CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); @@ -1154,7 +1154,7 @@ namespace SlaveMatrix 右_側甲_側甲1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 左_甲羅1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 左_甲羅2CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_甲D.cs index b7ac58a..fc27808 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 背中_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs index 7f2fa63..02d06c0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 背中_羽(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 背中_羽D e) + public 背中_羽(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 背中_羽D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -157,7 +157,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_羽毛1CP = new ColorP(X0Y0_羽毛1, 羽毛1CD, DisUnit, abj: true); X0Y0_羽毛2CP = new ColorP(X0Y0_羽毛2, 羽毛2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public void 毛() @@ -172,7 +172,7 @@ namespace SlaveMatrix X0Y0_羽毛2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -191,19 +191,19 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 羽毛1CD = new ColorD(ref Col.Black, ref 体配色.毛1O); 羽毛2CD = new ColorD(ref Col.Black, ref 体配色.毛1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 羽毛1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 羽毛2CD = new ColorD(ref Col.Black, ref 体配色.毛1O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 羽毛1CD = new ColorD(ref Col.Black, ref 体配色.毛1O); 羽毛2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/背中_羽D.cs index 718fbfd..88c3d4f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 背中_羽(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs index e81850e..77a6e68 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌.cs @@ -171,7 +171,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -188,7 +188,7 @@ namespace SlaveMatrix } } - public 胴肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胴肌D e) + public 胴肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胴肌D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["胴肌"]); @@ -244,7 +244,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; } @@ -258,12 +258,12 @@ namespace SlaveMatrix X0Y0_植タトゥ_タトゥ葉右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 植タトゥ_タトゥ花左CD = new ColorD(ref Col.Black, ref 体配色.刺青); 植タトゥ_タトゥ花右CD = new ColorD(ref Col.Black, ref 体配色.刺青); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴肌D.cs index 9c79c61..c0400a6 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胴肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs index a7eca10..e00ab43 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 胴腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胴腹板D e) + public 胴腹板(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胴腹板D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["胴腹板"]); @@ -148,7 +148,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_虫性_腹板CP = new ColorP(X0Y0_虫性_腹板, 虫性_腹板CD, DisUnit, abj: true); X0Y0_虫性_縦線CP = new ColorP(X0Y0_虫性_縦線, 虫性_縦線CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; } @@ -158,12 +158,12 @@ namespace SlaveMatrix X0Y0_虫性_縦線CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 虫性_腹板CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 虫性_縦線CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胴腹板D.cs index f94c0da..573f015 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胴腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs index e0e20cc..b4992a2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 胸毛(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胸毛D e) + public 胸毛(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胸毛D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["胸毛"]); @@ -124,7 +124,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_獣性_胸毛CP = new ColorP(X0Y0_獣性_胸毛, 獣性_胸毛CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -132,12 +132,12 @@ namespace SlaveMatrix X0Y0_獣性_胸毛CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 獣性_胸毛CD = new ColorD(ref Col.Black, ref 体配色.毛1O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸毛D.cs index d1e3e2e..6de3768 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胸毛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs index 30396d5..957d173 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌.cs @@ -771,7 +771,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -818,7 +818,7 @@ namespace SlaveMatrix } } - public 胸肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胸肌D e) + public 胸肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胸肌D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["胸郭肌"]); @@ -981,7 +981,7 @@ namespace SlaveMatrix X0Y0_コア_コア1_基CP = new ColorP(X0Y0_コア_コア1_基, コア_コア1_基CD, DisUnit, abj: true); X0Y0_コア_コア1_コアCP = new ColorP(X0Y0_コア_コア1_コア, コア_コア1_コアCD, DisUnit, abj: true); X0Y0_コア_コア1_ハイライトCP = new ColorP(X0Y0_コア_コア1_ハイライト, コア_コア1_ハイライトCD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.99; } @@ -1069,7 +1069,7 @@ namespace SlaveMatrix X0Y0_コア_コア1_ハイライトCP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1088,7 +1088,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 虫性_甲殻2CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 虫性_甲殻1_甲殻CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -1128,7 +1128,7 @@ namespace SlaveMatrix コア_コア1_ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 虫性_甲殻2CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 虫性_甲殻1_甲殻CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -1168,7 +1168,7 @@ namespace SlaveMatrix コア_コア1_ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 虫性_甲殻2CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 虫性_甲殻1_甲殻CD = new ColorD(ref Col.Black, ref 体配色.甲0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸肌D.cs index 97ab80a..1f4e7d1 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胸肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs index 56ba527..45be648 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 胸腹板(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 胸腹板D e) + public 胸腹板(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 胸腹板D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["胸郭腹板"]); @@ -148,7 +148,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_虫性_腹板CP = new ColorP(X0Y0_虫性_腹板, 虫性_腹板CD, DisUnit, abj: true); X0Y0_虫性_縦線CP = new ColorP(X0Y0_虫性_縦線, 虫性_縦線CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.99; } @@ -158,12 +158,12 @@ namespace SlaveMatrix X0Y0_虫性_縦線CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 虫性_腹板CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 虫性_縦線CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/胸腹板D.cs index bdd683a..952267d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 胸腹板(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs index 652a367..8f2e195 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌.cs @@ -975,7 +975,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1007,7 +1007,7 @@ namespace SlaveMatrix } } - public 腰肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腰肌D e) + public 腰肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 腰肌D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["腰肌"]); @@ -1320,7 +1320,7 @@ namespace SlaveMatrix X0Y4_虫性_腹板2_縦線CP = new ColorP(X0Y4_虫性_腹板2_縦線, 虫性_腹板2_縦線CD, DisUnit, abj: true); X0Y4_虫性_腹板1_腹板CP = new ColorP(X0Y4_虫性_腹板1_腹板, 虫性_腹板1_腹板CD, DisUnit, abj: true); X0Y4_虫性_腹板1_縦線CP = new ColorP(X0Y4_虫性_腹板1_縦線, 虫性_腹板1_縦線CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; } @@ -1446,7 +1446,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1465,7 +1465,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 淫タトゥ_ハート_タトゥ左1CD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_ハート_タトゥ右1CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -1490,7 +1490,7 @@ namespace SlaveMatrix 虫性_腹板1_縦線CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 淫タトゥ_ハート_タトゥ左1CD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_ハート_タトゥ右1CD = new ColorD(ref Col.Black, ref 体配色.刺青); @@ -1515,7 +1515,7 @@ namespace SlaveMatrix 虫性_腹板1_縦線CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 淫タトゥ_ハート_タトゥ左1CD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_ハート_タトゥ右1CD = new ColorD(ref Col.Black, ref 体配色.刺青); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腰肌D.cs index 61f0869..18b346a 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腰肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs index 5f9caa1..a1684e4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人.cs @@ -2707,7 +2707,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -2825,7 +2825,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(Body, X0Y0_腿, 0); - public 腿_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_人D e) + public 腿_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 腿_人D e) { 腿_人 腿_人2 = this; ThisType = GetType(); @@ -3573,7 +3573,7 @@ namespace SlaveMatrix 傷I4濃度 = e.傷I4濃度; 傷X濃度 = e.傷X濃度; ハイライト濃度 = e.ハイライト濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -4203,7 +4203,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -4231,7 +4231,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腿0CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 腿1CD = new ColorD(ref Col.Black, ref 体配色.人肌R); @@ -4314,7 +4314,7 @@ namespace SlaveMatrix ニーハイ_ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 腿0CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 腿1CD = new ColorD(ref Col.Black, ref 体配色.人肌R); @@ -4397,7 +4397,7 @@ namespace SlaveMatrix ニーハイ_ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 腿0CD = new ColorD(ref Col.Black, ref 体配色.人肌R); 腿1CD = new ColorD(ref Col.Black, ref 体配色.人肌R); @@ -4480,7 +4480,7 @@ namespace SlaveMatrix ニーハイ_ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); } - private void 配色C0(体配色 体配色) + private void 配色C0(BodyColorSet 体配色) { 腿0CD = new ColorD(ref Col.Black, ref 体配色.甲0R); 腿1CD = new ColorD(ref Col.Black, ref 体配色.甲0R); @@ -4563,7 +4563,7 @@ namespace SlaveMatrix ニーハイ_ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); } - private void 配色CT1(体配色 体配色) + private void 配色CT1(BodyColorSet 体配色) { 腿0CD = new ColorD(ref Col.Black, ref 体配色.甲0R); 腿1CD = new ColorD(ref Col.Black, ref 体配色.甲0R); @@ -4646,7 +4646,7 @@ namespace SlaveMatrix ニーハイ_ハイライトCD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); } - private void 配色CT0(体配色 体配色) + private void 配色CT0(BodyColorSet 体配色) { 腿0CD = new ColorD(ref Col.Black, ref 体配色.甲0R); 腿1CD = new ColorD(ref Col.Black, ref 体配色.甲0R); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs index f776836..89b4356 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_人D.cs @@ -162,7 +162,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.腿_人_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs index 0404382..3b58183 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣.cs @@ -133,7 +133,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -150,7 +150,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(Body, X0Y0_腿, 0); - public 腿_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_獣D e) + public 腿_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 腿_獣D e) { 腿_獣 腿_獣2 = this; ThisType = GetType(); @@ -217,7 +217,7 @@ namespace SlaveMatrix X0Y0_筋CP = new ColorP(X0Y0_筋, 筋CD, DisUnit, abj: false); X0Y0_虎柄_虎1CP = new ColorP(X0Y0_虎柄_虎1, 虎柄_虎1CD, DisUnit, abj: true); X0Y0_虎柄_虎2CP = new ColorP(X0Y0_虎柄_虎2, 虎柄_虎2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -235,12 +235,12 @@ namespace SlaveMatrix X0Y0_虎柄_虎2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腿CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs index 7932dbc..65fc864 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_獣D.cs @@ -26,7 +26,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.腿_獣_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs index 14ce142..86dad5f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜.cs @@ -293,7 +293,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -318,7 +318,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(Body, X0Y0_腿, 0); - public 腿_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_竜D e) + public 腿_竜(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 腿_竜D e) { 腿_竜 腿_竜2 = this; ThisType = GetType(); @@ -410,7 +410,7 @@ namespace SlaveMatrix X0Y0_竜性_鱗上_鱗3CP = new ColorP(X0Y0_竜性_鱗上_鱗3, 竜性_鱗上_鱗3CD, DisUnit, abj: true); X0Y0_竜性_鱗上_鱗4CP = new ColorP(X0Y0_竜性_鱗上_鱗4, 竜性_鱗上_鱗4CD, DisUnit, abj: true); X0Y0_筋CP = new ColorP(X0Y0_筋, 筋CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -436,7 +436,7 @@ namespace SlaveMatrix X0Y0_筋CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -455,7 +455,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腿CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗下_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -471,7 +471,7 @@ namespace SlaveMatrix 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 腿CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗下_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -487,7 +487,7 @@ namespace SlaveMatrix 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 腿CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗下_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs index a7fd462..e257d79 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_竜D.cs @@ -42,7 +42,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.腿_竜_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs index 18db229..4bca649 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄.cs @@ -93,7 +93,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -108,7 +108,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(Body, X0Y0_腿, 0); - public 腿_蹄(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_蹄D e) + public 腿_蹄(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 腿_蹄D e) { 腿_蹄 腿_蹄2 = this; ThisType = GetType(); @@ -168,7 +168,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_腿CP = new ColorP(X0Y0_腿, 腿CD, DisUnit, abj: true); X0Y0_筋CP = new ColorP(X0Y0_筋, 筋CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -184,12 +184,12 @@ namespace SlaveMatrix X0Y0_筋CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腿CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs index ebd7e86..bf94272 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_蹄D.cs @@ -22,7 +22,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.腿_蹄_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_蹄(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs index 730d9bc..fa23b86 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥.cs @@ -93,7 +93,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -108,7 +108,7 @@ namespace SlaveMatrix public JointS 脚_接続点 => new JointS(Body, X0Y0_腿, 0); - public 腿_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 腿_鳥D e) + public 腿_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 腿_鳥D e) { 腿_鳥 腿_鳥2 = this; ThisType = GetType(); @@ -168,7 +168,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_腿CP = new ColorP(X0Y0_腿, 腿CD, DisUnit, abj: true); X0Y0_筋CP = new ColorP(X0Y0_筋, 筋CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -184,12 +184,12 @@ namespace SlaveMatrix X0Y0_筋CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腿CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs index ce0a753..6b3d496 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/腿_鳥D.cs @@ -22,7 +22,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.腿_鳥_Leg_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 腿_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs index ca6d5c3..8055d3b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人.cs @@ -111,7 +111,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -137,7 +137,7 @@ namespace SlaveMatrix } } - public 膣内精液_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 膣内精液_人D e) + public 膣内精液_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 膣内精液_人D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["膣内精液"]); @@ -184,7 +184,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; 精液濃度 = e.精液濃度; 尺度YB = 0.95; } @@ -196,12 +196,12 @@ namespace SlaveMatrix X0Y0_血液2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 精液CD = new ColorD(); 血液1CD = new ColorD(ref Col.Empty, ref 体配色.血液O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_人D.cs index 7cbe8e7..827739b 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 膣内精液_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs index 8a774a7..9a44e06 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣.cs @@ -111,7 +111,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -137,7 +137,7 @@ namespace SlaveMatrix } } - public 膣内精液_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 膣内精液_獣D e) + public 膣内精液_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 膣内精液_獣D e) { ThisType = GetType(); Body = new Difs(Sta.半身["四足膣内精液"]); @@ -184,7 +184,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; 精液濃度 = e.精液濃度; } @@ -195,12 +195,12 @@ namespace SlaveMatrix X0Y0_血液2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 精液CD = new ColorD(); 血液1CD = new ColorD(ref Col.Empty, ref 体配色.血液O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣内精液_獣D.cs index a530385..ff08d06 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 膣内精液_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs index ba1e9a9..fa693e3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 膣基_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 膣基_人D e) + public 膣基_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 膣基_人D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["膣基"]); @@ -124,7 +124,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_膣基CP = new ColorP(X0Y0_膣基, 膣基CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度YB = 0.95; } @@ -133,12 +133,12 @@ namespace SlaveMatrix X0Y0_膣基CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.Alpha(ref 体配色.粘膜, 160, out var ret); 膣基CD = new ColorD(ref 体配色.粘膜線, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_人D.cs index b4742c4..0b59812 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 膣基_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs index 9386483..f397dae 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 膣基_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 膣基_獣D e) + public 膣基_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 膣基_獣D e) { ThisType = GetType(); Body = new Difs(Sta.半身["四足膣基"]); @@ -124,7 +124,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_膣基CP = new ColorP(X0Y0_膣基, 膣基CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -132,12 +132,12 @@ namespace SlaveMatrix X0Y0_膣基CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Col.Alpha(ref 体配色.粘膜, 160, out var ret); 膣基CD = new ColorD(ref 体配色.粘膜線, ref ret); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/膣基_獣D.cs index d8c7cba..0c3bf5e 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 膣基_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs index 53f1a2c..81c9c74 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短.cs @@ -155,7 +155,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -171,7 +171,7 @@ namespace SlaveMatrix } } - public 舌_短(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 舌_短D e) + public 舌_短(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 舌_短D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -230,7 +230,7 @@ namespace SlaveMatrix X0Y0_舌3CP = new ColorP(X0Y0_舌3, 舌3CD, DisUnit, abj: true); X0Y0_舌4CP = new ColorP(X0Y0_舌4, 舌4CD, DisUnit, abj: true); X0Y0_舌5CP = new ColorP(X0Y0_舌5, 舌5CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -243,12 +243,12 @@ namespace SlaveMatrix X0Y0_舌5CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 舌1CD = new ColorD(ref 体配色.粘膜線, ref 体配色.舌); 舌2CD = new ColorD(ref 体配色.粘膜線, ref 体配色.舌); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_短D.cs index 3a9aea4..30649ce 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 舌_短(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs index 1a9b258..a8e1bc6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長.cs @@ -418,7 +418,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -446,7 +446,7 @@ namespace SlaveMatrix } } - public 舌_長(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 舌_長D e) + public 舌_長(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 舌_長D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -548,7 +548,7 @@ namespace SlaveMatrix X0Y0_舌股右_舌4CP = new ColorP(X0Y0_舌股右_舌4, 舌股右_舌4CD, DisUnit, abj: true); X0Y0_舌股右_舌5CP = new ColorP(X0Y0_舌股右_舌5, 舌股右_舌5CD, DisUnit, abj: true); X0Y0_舌股右_舌6CP = new ColorP(X0Y0_舌股右_舌6, 舌股右_舌6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -573,12 +573,12 @@ namespace SlaveMatrix X0Y0_舌股右_舌6CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 舌1CD = new ColorD(ref 体配色.粘膜線, ref 体配色.舌); 舌2CD = new ColorD(ref 体配色.粘膜線, ref 体配色.舌); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/舌_長D.cs index 9c34c32..a001114 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 舌_長(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs index d707238..41ac079 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百.cs @@ -1459,7 +1459,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1492,7 +1492,7 @@ namespace SlaveMatrix } } - public 花_百(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 花_百D e) + public 花_百(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 花_百D e) { ThisType = GetType(); Pars pars = new Pars(); @@ -1718,7 +1718,7 @@ namespace SlaveMatrix X0Y0_花_ユリ_欠損_萼1_萼1CP = new ColorP(X0Y0_花_ユリ_欠損_萼1_萼1, 花_ユリ_萼1_萼1CD, DisUnit, abj: true); X0Y0_萼_通常_萼CP = new ColorP(X0Y0_萼_通常_萼, 萼_萼CD, DisUnit, abj: true); X0Y0_萼_欠損_萼CP = new ColorP(X0Y0_萼_欠損_萼, 萼_萼CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1776,7 +1776,7 @@ namespace SlaveMatrix X0Y0_萼_欠損_萼CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1795,7 +1795,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 花_ユリ_萼2CD = new ColorD(ref Col.Black, ref 体配色.百O); 花_ユリ_萼3CD = new ColorD(ref Col.Black, ref 体配色.百O); @@ -1821,7 +1821,7 @@ namespace SlaveMatrix 萼_萼CD = new ColorD(ref Col.Black, ref 体配色.植1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 花_ユリ_萼2CD = new ColorD(ref Col.Black, ref 体配色.百O); 花_ユリ_萼3CD = new ColorD(ref Col.Black, ref 体配色.百O); @@ -1847,7 +1847,7 @@ namespace SlaveMatrix 萼_萼CD = new ColorD(ref Col.Black, ref 体配色.植1O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 花_ユリ_萼2CD = new ColorD(ref Col.Black, ref 体配色.百O); 花_ユリ_萼3CD = new ColorD(ref Col.Black, ref 体配色.百O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_百D.cs index edfc862..089bd47 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 花_百(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs index f18c420..da39901 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔.cs @@ -883,7 +883,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -907,7 +907,7 @@ namespace SlaveMatrix } } - public 花_薔(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 花_薔D e) + public 花_薔(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 花_薔D e) { ThisType = GetType(); Pars pars = new Pars(); @@ -1052,7 +1052,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1092,7 +1092,7 @@ namespace SlaveMatrix X0Y0_萼_欠損_萼CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1111,7 +1111,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 花_バラ_花弁2CD = new ColorD(ref Col.Black, ref 体配色.薔O); 花_バラ_花弁4CD = new ColorD(ref Col.Black, ref 体配色.薔O); @@ -1128,7 +1128,7 @@ namespace SlaveMatrix 萼_萼CD = new ColorD(ref Col.Black, ref 体配色.植1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 花_バラ_花弁2CD = new ColorD(ref Col.Black, ref 体配色.薔O); 花_バラ_花弁4CD = new ColorD(ref Col.Black, ref 体配色.薔O); @@ -1145,7 +1145,7 @@ namespace SlaveMatrix 萼_萼CD = new ColorD(ref Col.Black, ref 体配色.植1O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 花_バラ_花弁2CD = new ColorD(ref Col.Black, ref 体配色.薔O); 花_バラ_花弁4CD = new ColorD(ref Col.Black, ref 体配色.薔O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/花_薔D.cs index 0ddd11a..9420b83 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 花_薔(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs index 6093a8a..2420765 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心.cs @@ -129,7 +129,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -142,7 +142,7 @@ namespace SlaveMatrix } } - public 葉_心(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 葉_心D e) + public 葉_心(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 葉_心D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["葉"][1]); @@ -200,7 +200,7 @@ namespace SlaveMatrix X0Y1_欠損1_葉脈CP = new ColorP(X0Y1_欠損1_葉脈, 葉脈CD, DisUnit, abj: true); X0Y2_欠損2_葉CP = new ColorP(X0Y2_欠損2_葉, 葉CD, DisUnit, abj: true); X0Y2_欠損2_葉脈CP = new ColorP(X0Y2_欠損2_葉脈, 葉脈CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -222,7 +222,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -241,19 +241,19 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 葉CD = new ColorD(ref Col.Black, ref 体配色.植1O); 葉脈CD = new ColorD(ref Col.Black, ref 体配色.植0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 葉CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 葉脈CD = new ColorD(ref Col.Black, ref 体配色.植0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 葉CD = new ColorD(ref Col.Black, ref 体配色.植1O); 葉脈CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_心D.cs index 2e1c638..223169c 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 葉_心(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs index 6a1ca41..c0dde81 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披.cs @@ -129,7 +129,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -142,7 +142,7 @@ namespace SlaveMatrix } } - public 葉_披(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 葉_披D e) + public 葉_披(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 葉_披D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["葉"][0]); @@ -200,7 +200,7 @@ namespace SlaveMatrix X0Y1_欠損1_葉脈CP = new ColorP(X0Y1_欠損1_葉脈, 葉脈CD, DisUnit, abj: true); X0Y2_欠損2_葉CP = new ColorP(X0Y2_欠損2_葉, 葉CD, DisUnit, abj: true); X0Y2_欠損2_葉脈CP = new ColorP(X0Y2_欠損2_葉脈, 葉脈CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -222,7 +222,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -241,19 +241,19 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 葉CD = new ColorD(ref Col.Black, ref 体配色.植1O); 葉脈CD = new ColorD(ref Col.Black, ref 体配色.植0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 葉CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 葉脈CD = new ColorD(ref Col.Black, ref 体配色.植0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 葉CD = new ColorD(ref Col.Black, ref 体配色.植1O); 葉脈CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/葉_披D.cs index 7ce1a3a..0fee89a 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 葉_披(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs index 2acd8c4..11fbbe1 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌.cs @@ -389,7 +389,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -440,7 +440,7 @@ namespace SlaveMatrix } } - public 虫鎌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 虫鎌D e) + public 虫鎌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 虫鎌D e) { ThisType = GetType(); Body = new Difs(Sta.肢左["虫鎌"]); @@ -529,7 +529,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); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -569,7 +569,7 @@ namespace SlaveMatrix X0Y0_輪_金具右CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -588,7 +588,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 虫鎌節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 虫棘1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -608,7 +608,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 虫鎌節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 虫棘1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -628,7 +628,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 虫鎌節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 虫棘1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫鎌D.cs index 2c4f455..e1a57de 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 虫鎌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs index 1feb462..6641667 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎.cs @@ -151,7 +151,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -167,7 +167,7 @@ namespace SlaveMatrix } } - public 虫顎(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 虫顎D e) + public 虫顎(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 虫顎D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["虫顎"][0]); @@ -224,7 +224,7 @@ namespace SlaveMatrix X0Y0_牙_牙1CP = new ColorP(X0Y0_牙_牙1, 牙_牙1CD, DisUnit, abj: true); X0Y0_牙_牙2CP = new ColorP(X0Y0_牙_牙2, 牙_牙2CD, DisUnit, abj: true); X0Y0_牙_牙0CP = new ColorP(X0Y0_牙_牙0, 牙_牙0CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -243,7 +243,7 @@ namespace SlaveMatrix X0Y0_牙_牙0CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -262,7 +262,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 顎CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -271,7 +271,7 @@ namespace SlaveMatrix 牙_牙0CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 顎CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -280,7 +280,7 @@ namespace SlaveMatrix 牙_牙0CD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 顎CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/虫顎D.cs index 652d970..582c56f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 虫顎(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs index fc78f19..9dafc67 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 衝撃(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 衝撃D e) + public 衝撃(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 衝撃D e) { ThisType = GetType(); Body = new Difs(Sta.その他["衝撃"]); @@ -124,7 +124,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_衝撃CP = new ColorP(X0Y0_衝撃, 衝撃CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -132,12 +132,12 @@ namespace SlaveMatrix X0Y0_衝撃CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 衝撃CD = new ColorD(); 衝撃CD.線 = Col.Empty; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衝撃D.cs index fb71f63..8f911ce 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 衝撃(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衣装.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衣装.cs index 30f1fc7..1b233dc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/衣装.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/衣装.cs @@ -9,7 +9,7 @@ namespace SlaveMatrix [Serializable] public static class 衣装 { - public static bool Is下着ボトム条件(this ChaD c) + public static bool Is下着ボトム条件(this CharacterData c) { if (!c.body_tree.半身_接続.IsEleD<長物_魚D>() && !c.body_tree.半身_接続.IsEleD<長物_鯨D>() && !c.body_tree.半身_接続.IsEleD<長物_蛇D>() && !c.body_tree.半身_接続.IsEleD<長物_蟲D>() && !c.body_tree.半身_接続.IsEleD<四足胸D>() && !c.body_tree.半身_接続.IsEleD<多足_蛸D>() && !c.body_tree.半身_接続.IsEleD<多足_蜘D>()) { @@ -18,12 +18,12 @@ namespace SlaveMatrix return false; } - public static bool Is上着ボトム条件(this ChaD c) + public static bool Is上着ボトム条件(this CharacterData c) { return true; } - public static bool Is紐付き条件(this ChaD c) + public static bool Is紐付き条件(this CharacterData c) { if (!c.body_tree.半身_接続.IsEleD<単足_植D>()) { @@ -32,7 +32,7 @@ namespace SlaveMatrix return true; } - public static bool Is前掛け条件(this ChaD c) + public static bool Is前掛け条件(this CharacterData c) { if (!c.body_tree.半身_接続.IsEleD<四足胸D>() && !c.body_tree.腿左_接続.IsEleD<獣腿D>()) { @@ -46,12 +46,12 @@ namespace SlaveMatrix return false; } - public static bool Isブーツ条件(this ChaD c) + public static bool Isブーツ条件(this CharacterData c) { return c.body_tree.EnumEleD().IsEleD(); } - public static IEnumerable Get髪留め(ChaD c) + public static IEnumerable Get髪留め(CharacterData c) { 髪留2情報 @default = 髪留2情報.GetDefault(); 髪留2情報 横髪 = 髪留2情報.GetDefault(); @@ -90,7 +90,7 @@ namespace SlaveMatrix yield return 横髪; } - public static IEnumerable Getビキニ(ChaD c, bool t) + public static IEnumerable Getビキニ(CharacterData c, bool t) { Col.GetRandomClothesColor(out var c0); Col.GetRandomClothesColor(out var c1); @@ -184,7 +184,7 @@ namespace SlaveMatrix } } - public static IEnumerable Getランジェリー(ChaD c, bool t, bool a) + public static IEnumerable Getランジェリー(CharacterData c, bool t, bool a) { Col.GetRandomClothesColor(a ? RNG.XS.Next(32, 256) : 255, out var c0); Col.GetRandomClothesColor(a ? RNG.XS.Next(32, 256) : 255, out var c1); @@ -238,7 +238,7 @@ namespace SlaveMatrix } } - public static IEnumerable Getピアス(ChaD c) + public static IEnumerable Getピアス(CharacterData c) { ピアス情報 ピアス中 = ピアス情報.GetDefault(); ピアス中.色.ピアス = (RNG.XS.NextBool() ? Color.Gold : Color.Silver); @@ -254,7 +254,7 @@ namespace SlaveMatrix yield return default2; } - public static IEnumerable Getヴィオラ服0(ChaD c) + public static IEnumerable Getヴィオラ服0(CharacterData c) { ドレス首情報 ドレス首 = ドレス首情報.GetDefault(); ドレス首.色.SetDefault(); @@ -297,7 +297,7 @@ namespace SlaveMatrix } } - public static IEnumerable Getヴィオラ服1(ChaD c) + public static IEnumerable Getヴィオラ服1(CharacterData c) { Col.GetRandomClothesColor(out var c0); Col.GetRandomClothesColor(out var c1); @@ -363,7 +363,7 @@ namespace SlaveMatrix } } - public static IEnumerable Get奴隷服(ChaD c, bool b, bool r, bool a) + public static IEnumerable Get奴隷服(CharacterData c, bool b, bool r, bool a) { Color c0 = Col.Empty; Color c1 = Col.Empty; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs index 59e85c4..2b20350 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一.cs @@ -342,7 +342,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -366,7 +366,7 @@ namespace SlaveMatrix } } - public 角1_一(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角1_一D e) + public 角1_一(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角1_一D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢中["角"][0]); @@ -457,7 +457,7 @@ namespace SlaveMatrix X0Y1_線2CP = new ColorP(X0Y1_線2, 線2CD, DisUnit, abj: false); X0Y1_線3CP = new ColorP(X0Y1_線3, 線3CD, DisUnit, abj: false); X0Y1_線4CP = new ColorP(X0Y1_線4, 線4CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -488,7 +488,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -507,7 +507,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 線1CD = new ColorD(ref 体配色.角1O.Col2, ref Color2.Empty); @@ -524,7 +524,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 線1CD = new ColorD(ref 体配色.刺青O.Col2, ref Color2.Empty); @@ -541,7 +541,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 線1CD = new ColorD(ref 体配色.角1O.Col2, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_一D.cs index 1d81288..a3e11de 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角1_一(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs index 9c16282..38929f0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫.cs @@ -256,7 +256,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -275,7 +275,7 @@ namespace SlaveMatrix } } - public 角1_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角1_虫D e) + public 角1_虫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角1_虫D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢中["角"][2]); @@ -358,7 +358,7 @@ namespace SlaveMatrix X0Y1_線CP = new ColorP(X0Y1_線, 線CD, DisUnit, abj: true); X0Y1_折線1CP = new ColorP(X0Y1_折線1, 折線1CD, DisUnit, abj: true); X0Y1_折線2CP = new ColorP(X0Y1_折線2, 折線2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -385,7 +385,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -404,7 +404,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 器官左_器官1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -416,7 +416,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 器官左_器官1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -428,7 +428,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 器官左_器官1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_虫D.cs index 770677d..fc15e35 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角1_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs index 64ff847..5534d5c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼.cs @@ -230,7 +230,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -249,7 +249,7 @@ namespace SlaveMatrix } } - public 角1_鬼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角1_鬼D e) + public 角1_鬼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角1_鬼D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢中["角"][1]); @@ -321,7 +321,7 @@ namespace SlaveMatrix X0Y1_折線2CP = new ColorP(X0Y1_折線2, 折線2CD, DisUnit, abj: true); X0Y1_線1CP = new ColorP(X0Y1_線1, 線1CD, DisUnit, abj: false); X0Y1_線2CP = new ColorP(X0Y1_線2, 線2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -345,7 +345,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -364,7 +364,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 線1CD = new ColorD(ref 体配色.角1O.Col2, ref Color2.Empty); @@ -376,7 +376,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 線1CD = new ColorD(ref 体配色.刺青O.Col2, ref Color2.Empty); @@ -388,7 +388,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 線1CD = new ColorD(ref 体配色.角1O.Col2, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角1_鬼D.cs index 0d812f2..acef8f2 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角1_鬼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs index cb3d9ff..01bca94 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1.cs @@ -262,7 +262,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -282,7 +282,7 @@ namespace SlaveMatrix } } - public 角2_山1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_山1D e) + public 角2_山1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_山1D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][0]); @@ -361,7 +361,7 @@ namespace SlaveMatrix X0Y1_凸2CP = new ColorP(X0Y1_凸2, 凸2CD, DisUnit, abj: true); X0Y1_凸3CP = new ColorP(X0Y1_凸3, 凸3CD, DisUnit, abj: true); X0Y1_凸4CP = new ColorP(X0Y1_凸4, 凸4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -396,7 +396,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -415,7 +415,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凸1CD = new ColorD(ref Col.Black, ref 体配色.角1O); @@ -428,7 +428,7 @@ namespace SlaveMatrix 折線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凸1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -441,7 +441,7 @@ namespace SlaveMatrix 折線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 凸1CD = new ColorD(ref Col.Black, ref 体配色.角1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山1D.cs index e9be139..bf8aa83 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_山1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs index 1a0cfd5..65547f5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2.cs @@ -308,7 +308,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -330,7 +330,7 @@ namespace SlaveMatrix } } - public 角2_山2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_山2D e) + public 角2_山2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_山2D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][1]); @@ -417,7 +417,7 @@ namespace SlaveMatrix X0Y1_凸3CP = new ColorP(X0Y1_凸3, 凸3CD, DisUnit, abj: true); X0Y1_凸4CP = new ColorP(X0Y1_凸4, 凸4CD, DisUnit, abj: true); X0Y1_凸5CP = new ColorP(X0Y1_凸5, 凸5CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -455,7 +455,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -474,7 +474,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凸1CD = new ColorD(ref Col.Black, ref 体配色.角1O); @@ -489,7 +489,7 @@ namespace SlaveMatrix 折線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凸1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -504,7 +504,7 @@ namespace SlaveMatrix 折線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 凸1CD = new ColorD(ref Col.Black, ref 体配色.角1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山2D.cs index b231937..f324253 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_山2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs index 9500b25..4a3ef4b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3.cs @@ -498,7 +498,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -529,7 +529,7 @@ namespace SlaveMatrix } } - public 角2_山3(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_山3D e) + public 角2_山3(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_山3D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][2]); @@ -648,7 +648,7 @@ namespace SlaveMatrix X0Y1_根_凸4CP = new ColorP(X0Y1_根_凸4, 根_凸4CD, DisUnit, abj: true); X0Y1_根_凸5CP = new ColorP(X0Y1_根_凸5, 根_凸5CD, DisUnit, abj: true); X0Y1_根_凸6CP = new ColorP(X0Y1_根_凸6, 根_凸6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 根描画(RenderArea Are) @@ -733,7 +733,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -752,7 +752,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根_根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 根_凸1CD = new ColorD(ref Col.Black, ref 体配色.角1O); @@ -776,7 +776,7 @@ namespace SlaveMatrix 根_折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根_根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 根_凸1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -800,7 +800,7 @@ namespace SlaveMatrix 根_折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根_根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 根_凸1CD = new ColorD(ref Col.Black, ref 体配色.角1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_山3D.cs index 6d69473..b76c5c5 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_山3(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs index abcfafc..57c9c3c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻.cs @@ -388,7 +388,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -414,7 +414,7 @@ namespace SlaveMatrix } } - public 角2_巻(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_巻D e) + public 角2_巻(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_巻D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][3]); @@ -515,7 +515,7 @@ namespace SlaveMatrix X0Y1_根_凸3CP = new ColorP(X0Y1_根_凸3, 根_凸3CD, DisUnit, abj: true); X0Y1_根_凸2CP = new ColorP(X0Y1_根_凸2, 根_凸2CD, DisUnit, abj: true); X0Y1_根_凸1CP = new ColorP(X0Y1_根_凸1, 根_凸1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 根描画(RenderArea Are) @@ -587,7 +587,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -606,7 +606,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根_根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 根_凸6CD = new ColorD(ref Col.Black, ref 体配色.角1O); @@ -625,7 +625,7 @@ namespace SlaveMatrix 根_折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根_根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 根_凸6CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -644,7 +644,7 @@ namespace SlaveMatrix 根_折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根_根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 根_凸6CD = new ColorD(ref Col.Black, ref 体配色.角1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_巻D.cs index 8d4c942..4afa4f0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_巻(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs index f8fb27a..3cb7a8d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1.cs @@ -276,7 +276,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -297,7 +297,7 @@ namespace SlaveMatrix } } - public 角2_牛1(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_牛1D e) + public 角2_牛1(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_牛1D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][4]); @@ -377,7 +377,7 @@ namespace SlaveMatrix X0Y1_凹1CP = new ColorP(X0Y1_凹1, 凹1CD, DisUnit, abj: true); X0Y1_凹2CP = new ColorP(X0Y1_凹2, 凹2CD, DisUnit, abj: true); X0Y1_凹3CP = new ColorP(X0Y1_凹3, 凹3CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -412,7 +412,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -431,7 +431,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.角1O); @@ -445,7 +445,7 @@ namespace SlaveMatrix 線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -459,7 +459,7 @@ namespace SlaveMatrix 線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.角1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛1D.cs index 2f0d0b0..6e2dc01 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_牛1(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs index f9f9106..b4ed1fd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2.cs @@ -230,7 +230,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -249,7 +249,7 @@ namespace SlaveMatrix } } - public 角2_牛2(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_牛2D e) + public 角2_牛2(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_牛2D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][5]); @@ -321,7 +321,7 @@ namespace SlaveMatrix X0Y1_根CP = new ColorP(X0Y1_根, 根CD, DisUnit, abj: true); X0Y1_凹1CP = new ColorP(X0Y1_凹1, 凹1CD, DisUnit, abj: true); X0Y1_凹2CP = new ColorP(X0Y1_凹2, 凹2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -353,7 +353,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -372,7 +372,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.角1O); @@ -384,7 +384,7 @@ namespace SlaveMatrix 線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -396,7 +396,7 @@ namespace SlaveMatrix 線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.角1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛2D.cs index 99e5743..09263d7 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_牛2(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs index f2fa677..0b6c5f4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3.cs @@ -242,7 +242,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -261,7 +261,7 @@ namespace SlaveMatrix } } - public 角2_牛3(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_牛3D e) + public 角2_牛3(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_牛3D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][6]); @@ -337,7 +337,7 @@ namespace SlaveMatrix X0Y1_凹2CP = new ColorP(X0Y1_凹2, 凹2CD, DisUnit, abj: true); X0Y1_凹3CP = new ColorP(X0Y1_凹3, 凹3CD, DisUnit, abj: true); X0Y1_凹4CP = new ColorP(X0Y1_凹4, 凹4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -371,7 +371,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -390,7 +390,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.角1O); @@ -402,7 +402,7 @@ namespace SlaveMatrix 凹7CD = new ColorD(ref Col.Black, ref 体配色.角1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -414,7 +414,7 @@ namespace SlaveMatrix 凹7CD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.角1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛3D.cs index 64c8f8b..a01397f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_牛3(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs index 3f0fa09..573d895 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4.cs @@ -296,7 +296,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -318,7 +318,7 @@ namespace SlaveMatrix } } - public 角2_牛4(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_牛4D e) + public 角2_牛4(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_牛4D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][7]); @@ -401,7 +401,7 @@ namespace SlaveMatrix X0Y1_凹1CP = new ColorP(X0Y1_凹1, 凹1CD, DisUnit, abj: true); X0Y1_凹2CP = new ColorP(X0Y1_凹2, 凹2CD, DisUnit, abj: true); X0Y1_線CP = new ColorP(X0Y1_線, 線CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -437,7 +437,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -456,7 +456,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.角1O); @@ -471,7 +471,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -486,7 +486,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 凹1CD = new ColorD(ref Col.Black, ref 体配色.角1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_牛4D.cs index 87a9f49..da6358c 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_牛4(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs index 0ab9c36..f578538 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫.cs @@ -322,7 +322,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -348,7 +348,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 角2_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_虫D e) + public 角2_虫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_虫D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][9]); @@ -433,7 +433,7 @@ namespace SlaveMatrix X0Y1_棘_棘2CP = new ColorP(X0Y1_棘_棘2, 刺_棘2CD, DisUnit, abj: true); X0Y1_棘_棘3CP = new ColorP(X0Y1_棘_棘3, 刺_棘3CD, DisUnit, abj: true); X0Y1_折線CP = new ColorP(X0Y1_折線, 折線CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -500,7 +500,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -519,7 +519,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 刺_棘1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -534,7 +534,7 @@ namespace SlaveMatrix 折線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 刺_棘1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -549,7 +549,7 @@ namespace SlaveMatrix 折線CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 刺_棘1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_虫D.cs index c9f4149..015b42e 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs index ba35e7c..c888fcc 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼.cs @@ -250,7 +250,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -270,7 +270,7 @@ namespace SlaveMatrix } } - public 角2_鬼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 角2_鬼D e) + public 角2_鬼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 角2_鬼D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["角"][8]); @@ -345,7 +345,7 @@ namespace SlaveMatrix X0Y1_折線2CP = new ColorP(X0Y1_折線2, 折線2CD, DisUnit, abj: true); X0Y1_線1CP = new ColorP(X0Y1_線1, 線1CD, DisUnit, abj: false); X0Y1_線2CP = new ColorP(X0Y1_線2, 線2CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -396,7 +396,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -415,7 +415,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 線1CD = new ColorD(ref 体配色.角1O.Col2, ref Color2.Empty); @@ -428,7 +428,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.角0O); 線1CD = new ColorD(ref 体配色.刺青O.Col2, ref Color2.Empty); @@ -441,7 +441,7 @@ namespace SlaveMatrix 折線2CD = new ColorD(ref Col.Black, ref Color2.Empty); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 根CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 線1CD = new ColorD(ref 体配色.角1O.Col2, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/角2_鬼D.cs index 7168a09..aa0c53d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 角2_鬼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs index d5073fe..78a33fb 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬.cs @@ -5744,7 +5744,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -6059,7 +6059,7 @@ namespace SlaveMatrix public JointS 鎖6_接続点 => new JointS(Body, X0Y0_脚前_輪_金具右, 0); - public 触手_犬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触手_犬D e) + public 触手_犬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触手_犬D e) { 触手_犬 触手_犬2 = this; ThisType = GetType(); @@ -7103,7 +7103,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖5 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); @@ -7782,7 +7782,7 @@ namespace SlaveMatrix 鎖5.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -7801,7 +7801,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 脚後_鰭_鰭膜1CD = new ColorD(ref Col.Black, ref 体配色.膜O); 脚後_鰭_鰭条1CD = new ColorD(ref Col.Black, ref 体配色.爪O); @@ -8083,7 +8083,7 @@ namespace SlaveMatrix 脚前_輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 脚後_鰭_鰭膜1CD = new ColorD(ref Col.Black, ref 体配色.膜O); 脚後_鰭_鰭条1CD = new ColorD(ref Col.Black, ref 体配色.爪O); @@ -8365,7 +8365,7 @@ namespace SlaveMatrix 脚前_輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 脚後_鰭_鰭膜1CD = new ColorD(ref Col.Black, ref 体配色.膜O); 脚後_鰭_鰭条1CD = new ColorD(ref Col.Black, ref 体配色.爪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs index e3278ac..812c821 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_犬D.cs @@ -643,7 +643,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.触手_犬_手右_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触手_犬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs index 228a66c..b0d0525 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦.cs @@ -3068,7 +3068,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -3279,7 +3279,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 触手_蔦(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触手_蔦D e) + public 触手_蔦(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触手_蔦D e) { 触手_蔦 触手_蔦2 = this; ThisType = GetType(); @@ -4066,7 +4066,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, 右: true, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); @@ -4501,7 +4501,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -4520,7 +4520,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 節1_節CD = new ColorD(ref Col.Black, ref 体配色.植0O); 節1_棘1CD = new ColorD(ref Col.Black, ref 体配色.植1O); @@ -4666,7 +4666,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 節1_節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 節1_棘1CD = new ColorD(ref Col.Black, ref 体配色.植1O); @@ -4812,7 +4812,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 節1_節CD = new ColorD(ref Col.Black, ref 体配色.植0O); 節1_棘1CD = new ColorD(ref Col.Black, ref 体配色.植1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_蔦D.cs index e3d707c..1b338a6 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触手_蔦(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs index 8c0238c..506893c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触.cs @@ -3579,7 +3579,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -3771,7 +3771,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_手先_輪2_金具右, 0); - public 触手_触(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触手_触D e) + public 触手_触(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触手_触D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -4426,7 +4426,7 @@ namespace SlaveMatrix X0Y0_手先_節10_吸盤_吸盤4CP = new ColorP(X0Y0_手先_節10_吸盤_吸盤4, 手先_節10_吸盤_吸盤4CD, DisUnit, abj: true); X0Y0_手先_節10_爪_爪2CP = new ColorP(X0Y0_手先_節10_爪_爪2, 手先_節10_爪_爪2CD, DisUnit, abj: true); X0Y0_手先_節10_爪_爪1CP = new ColorP(X0Y0_手先_節10_爪_爪1, 手先_節10_爪_爪1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -4991,7 +4991,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -5010,7 +5010,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 腕部_節1_節CD = new ColorD(ref Col.Black, ref 体配色.体1O); 腕部_節1_紋柄_紋柄1CD = new ColorD(ref Col.Empty, ref 体配色.紋O); @@ -5187,7 +5187,7 @@ namespace SlaveMatrix 手先_輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "節CD", ref 体配色.体1O, ref 体配色.刺青O); 腕部_節1_紋柄_紋柄1CD = new ColorD(ref Col.Empty, ref 体配色.紋O); @@ -5330,7 +5330,7 @@ namespace SlaveMatrix 手先_輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "節CD", ref 体配色.体1O, ref 体配色.刺青O); 腕部_節1_紋柄_紋柄1CD = new ColorD(ref Col.Empty, ref 体配色.紋O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_触D.cs index 4e1bc94..3b52858 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触手_触(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs index af42e18..9bbc8f6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟.cs @@ -6919,7 +6919,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -7278,7 +7278,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 触手_軟(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触手_軟D e) + public 触手_軟(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触手_軟D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -8402,7 +8402,7 @@ namespace SlaveMatrix X0Y0_節41_吸盤2CP = new ColorP(X0Y0_節41_吸盤2, 節41_吸盤2CD, DisUnit, abj: true); X0Y0_節41_吸盤3CP = new ColorP(X0Y0_節41_吸盤3, 節41_吸盤3CD, DisUnit, abj: true); X0Y0_節41_吸盤4CP = new ColorP(X0Y0_節41_吸盤4, 節41_吸盤4CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -9458,7 +9458,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -9477,7 +9477,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 節1_節CD = new ColorD(ref Col.Black, ref 体配色.体0O); 節1_紋柄1CD = new ColorD(ref Col.Empty, ref 体配色.紋O); @@ -9821,7 +9821,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "節CD", ref 体配色.体0O, ref 体配色.刺青O); 節1_紋柄1CD = new ColorD(ref Col.Empty, ref 体配色.紋O); @@ -10125,7 +10125,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "節CD", ref 体配色.体0O, ref 体配色.刺青O); 節1_紋柄1CD = new ColorD(ref Col.Empty, ref 体配色.紋O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触手_軟D.cs index e793d27..b76979f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触手_軟(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs index aa67be5..6eb4e93 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘.cs @@ -324,7 +324,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -351,7 +351,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪_金具右, 0); - public 触肢_肢蜘(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触肢_肢蜘D e) + public 触肢_肢蜘(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触肢_肢蜘D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -433,7 +433,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); 鎖表示 = e.鎖表示; @@ -513,7 +513,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -532,7 +532,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 転節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -548,7 +548,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 転節CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -564,7 +564,7 @@ namespace SlaveMatrix 輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 基節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 転節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蜘D.cs index 12722d5..9be6406 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触肢_肢蜘(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs index 09fd468..11d9dbd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍.cs @@ -454,7 +454,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -490,7 +490,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 触肢_肢蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触肢_肢蠍D e) + public 触肢_肢蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触肢_肢蠍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -589,7 +589,7 @@ namespace SlaveMatrix X0Y0_輪1_金具3CP = new ColorP(X0Y0_輪1_金具3, 輪1_金具3CD, DisUnit, abj: true); X0Y0_輪1_金具左CP = new ColorP(X0Y0_輪1_金具左, 輪1_金具左CD, DisUnit, abj: true); X0Y0_輪1_金具右CP = new ColorP(X0Y0_輪1_金具右, 輪1_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, 右: true, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右: false, 配色指定, 体配色, Xasix); @@ -699,7 +699,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -718,7 +718,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 爪2CD = new ColorD(ref Col.Black, ref 体配色.甲0R); 爪1CD = new ColorD(ref Col.Black, ref 体配色.甲0R); @@ -739,7 +739,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 爪2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 爪1CD = new ColorD(ref Col.Black, ref 体配色.甲0R); @@ -760,7 +760,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 爪2CD = new ColorD(ref Col.Black, ref 体配色.甲0R); 爪1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触肢_肢蠍D.cs index 3aef0aa..af24e20 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触肢_肢蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs index 1f29936..7974236 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲.cs @@ -272,7 +272,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -294,7 +294,7 @@ namespace SlaveMatrix } } - public 触覚_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_甲D e) + public 触覚_甲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_甲D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -370,7 +370,7 @@ namespace SlaveMatrix X0Y0_節8CP = new ColorP(X0Y0_節8, 節8CD, DisUnit, abj: true); X0Y0_節9CP = new ColorP(X0Y0_節9, 節9CD, DisUnit, abj: true); X0Y0_節10CP = new ColorP(X0Y0_節10, 節10CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -431,7 +431,7 @@ namespace SlaveMatrix X0Y0_節10CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -450,7 +450,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 節0CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 節1CD = new ColorD(ref Col.Black, ref 体配色.甲0O); @@ -465,12 +465,12 @@ namespace SlaveMatrix 節10CD = new ColorD(ref Col.Black, ref 体配色.甲0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "節", ref 体配色.甲0O, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "節", ref 体配色.甲0O, ref 体配色.刺青O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_甲D.cs index efb7efc..9f00af1 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs index 1ae43c6..c26e26d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節.cs @@ -572,7 +572,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -609,7 +609,7 @@ namespace SlaveMatrix } } - public 触覚_節(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_節D e) + public 触覚_節(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_節D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -730,7 +730,7 @@ namespace SlaveMatrix X0Y0_節24CP = new ColorP(X0Y0_節24, 節24CD, DisUnit, abj: true); X0Y0_節25CP = new ColorP(X0Y0_節25, 節25CD, DisUnit, abj: true); X0Y0_節26CP = new ColorP(X0Y0_節26, 節26CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -854,7 +854,7 @@ namespace SlaveMatrix X0Y0_節26CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -873,7 +873,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 節1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 節2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -903,12 +903,12 @@ namespace SlaveMatrix 節26CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "節", ref 体配色.甲1O, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "節", ref 体配色.甲1O, ref 体配色.刺青O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_節D.cs index 25b0eca..321d29f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_節(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs index ce1589e..7214629 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線.cs @@ -1252,7 +1252,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1323,7 +1323,7 @@ namespace SlaveMatrix } } - public 触覚_線(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_線D e) + public 触覚_線(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_線D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1546,7 +1546,7 @@ namespace SlaveMatrix X0Y0_節58CP = new ColorP(X0Y0_節58, 節58CD, DisUnit, abj: true); X0Y0_節59CP = new ColorP(X0Y0_節59, 節59CD, DisUnit, abj: true); X0Y0_節60CP = new ColorP(X0Y0_節60, 節60CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1805,7 +1805,7 @@ namespace SlaveMatrix X0Y0_節60CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1824,7 +1824,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 節1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 節2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -1888,12 +1888,12 @@ namespace SlaveMatrix 節60CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "節", ref 体配色.甲1O, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "節", ref 体配色.甲1O, ref 体配色.刺青O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_線D.cs index 9c7138d..b039b1f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_線(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs index 8236d18..de35de4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾.cs @@ -3072,7 +3072,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -3234,7 +3234,7 @@ namespace SlaveMatrix } } - public 触覚_蛾(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_蛾D e) + public 触覚_蛾(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_蛾D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -3780,7 +3780,7 @@ namespace SlaveMatrix X0Y0_節50_毛左CP = new ColorP(X0Y0_節50_毛左, 節50_毛左CD, DisUnit, abj: true); X0Y0_節50_毛右CP = new ColorP(X0Y0_節50_毛右, 節50_毛右CD, DisUnit, abj: true); X0Y0_節CP = new ColorP(X0Y0_節, 節CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -4104,7 +4104,7 @@ namespace SlaveMatrix X0Y0_節CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -4123,7 +4123,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 節1_節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 節1_毛左CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -4278,7 +4278,7 @@ namespace SlaveMatrix 節CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "節CD", ref 体配色.甲1O, ref 体配色.刺青O); 節1_毛左CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -4383,7 +4383,7 @@ namespace SlaveMatrix 節50_毛右CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "節CD", ref 体配色.甲1O, ref 体配色.刺青O); 節1_毛左CD = new ColorD(ref Col.Black, ref 体配色.甲1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蛾D.cs index 16eb463..a011095 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_蛾(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs index 658853c..fa0494c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶.cs @@ -752,7 +752,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -798,7 +798,7 @@ namespace SlaveMatrix } } - public 触覚_蝶(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_蝶D e) + public 触覚_蝶(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_蝶D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -946,7 +946,7 @@ namespace SlaveMatrix X0Y0_節33CP = new ColorP(X0Y0_節33, 節33CD, DisUnit, abj: true); X0Y0_節34CP = new ColorP(X0Y0_節34, 節34CD, DisUnit, abj: true); X0Y0_節35CP = new ColorP(X0Y0_節35, 節35CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1105,7 +1105,7 @@ namespace SlaveMatrix X0Y0_節35CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1124,7 +1124,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 節1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 節2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -1163,12 +1163,12 @@ namespace SlaveMatrix 節35CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { this.配色T(0, "節", ref 体配色.甲1O, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { this.配色T(1, "節", ref 体配色.甲1O, ref 体配色.刺青O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蝶D.cs index ec9d5a7..d761ded 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_蝶(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs index b5a5024..89a0f04 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍.cs @@ -451,7 +451,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -482,7 +482,7 @@ namespace SlaveMatrix } } - public 触覚_蠍(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 触覚_蠍D e) + public 触覚_蠍(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 触覚_蠍D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -586,7 +586,7 @@ namespace SlaveMatrix X0Y0_歯12CP = new ColorP(X0Y0_歯12, 歯12CD, DisUnit, abj: true); X0Y0_歯13CP = new ColorP(X0Y0_歯13, 歯13CD, DisUnit, abj: true); X0Y0_櫛状板2CP = new ColorP(X0Y0_櫛状板2, 櫛状板2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -620,7 +620,7 @@ namespace SlaveMatrix X0Y0_櫛状板2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -639,7 +639,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 櫛状版1_櫛状版1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 櫛状版1_櫛状版2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -663,7 +663,7 @@ namespace SlaveMatrix 櫛状板2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 櫛状版1_櫛状版1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 櫛状版1_櫛状版2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -687,7 +687,7 @@ namespace SlaveMatrix 櫛状板2CD = new ColorD(ref Col.Black, ref 体配色.甲1O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 櫛状版1_櫛状版1CD = new ColorD(ref Col.Black, ref 体配色.甲1O); 櫛状版1_櫛状版2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/触覚_蠍D.cs index 5c14c1c..42e4d8d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 触覚_蠍(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs index efe615b..5de9dba 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭.cs @@ -941,7 +941,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -965,7 +965,7 @@ namespace SlaveMatrix } } - public 調教鞭(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 調教鞭D e) + public 調教鞭(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 調教鞭D e) { ThisType = GetType(); Body = new Difs(Sta.カーソル["調教鞭"]); @@ -1261,7 +1261,7 @@ namespace SlaveMatrix X1Y4_紐CP = new ColorP(X1Y4_紐, 紐CD, DisUnit, abj: true); X1Y4_鞭撃エフェクト1CP = new ColorP(X1Y4_鞭撃エフェクト1, 鞭撃エフェクト1CD, DisUnit, abj: true); X1Y4_鞭撃エフェクト2CP = new ColorP(X1Y4_鞭撃エフェクト2, 鞭撃エフェクト2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 尺度B = 1.01; Body.JoinPAall(); } @@ -1418,12 +1418,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Color2 色 = new Color2(ref Col.Black, ref Col.Empty); 先CD = new ColorD(ref Col.Black, ref 色); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調教鞭D.cs index 8f67518..d5b58da 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 調教鞭(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs index e4e174b..ece1565 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs @@ -8,9 +8,9 @@ namespace SlaveMatrix { public 衝撃 衝撃; - public Mot 鞭撃モーション; + public Motion 鞭撃モーション; - private Mot 衝撃モーション; + private Motion 衝撃モーション; private Vector2D v; @@ -120,10 +120,10 @@ namespace SlaveMatrix Par p; Vector2D cp; Color hc; - 鞭撃モーション = new Mot(0.0, 1.0) + 鞭撃モーション = new Motion(0.0, 1.0) { BaseSpeed = 10.0 * 強さ_, - Staing = delegate + OnStart = delegate { l = 調鞭処理2.mb == MouseButtons.Left; 鞭.Xi = 1; @@ -141,7 +141,7 @@ namespace SlaveMatrix 鞭.鞭撃エフェクト2CD.不透明度 = 調鞭処理2.強度; 調鞭処理2.振り(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { if (l) { @@ -170,7 +170,7 @@ namespace SlaveMatrix 調鞭処理2.打ち(cp); } }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { 鞭.鞭撃エフェクト1_表示 = false; 鞭.鞭撃エフェクト2_表示 = false; @@ -185,10 +185,10 @@ namespace SlaveMatrix 鞭.Body.JoinPA(); m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { m.ResetValue(); } @@ -199,10 +199,10 @@ namespace SlaveMatrix 表示 = false }); 衝撃.尺度B = 1.2; - 衝撃モーション = new Mot(0.0, 1.0) + 衝撃モーション = new Motion(0.0, 1.0) { BaseSpeed = 5.0, - Staing = delegate + OnStart = delegate { 調鞭処理2.衝撃.表示 = true; 調鞭処理2.衝撃.角度C = 360.0 * RNG.XS.NextDouble(); @@ -210,18 +210,18 @@ namespace SlaveMatrix //TODO fix? //Sounds.鞭撃.Play(); }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { 調鞭処理2.衝撃.尺度C = m.Value * 調鞭処理2.強さ_; }, - Reaing = delegate(Mot m) + OnReach = delegate(Motion m) { m.End(); }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate(Mot m) + OnEnd = delegate(Motion m) { 調鞭処理2.衝撃.表示 = false; m.ResetValue(); @@ -230,10 +230,10 @@ namespace SlaveMatrix 調教UI.Mots.Add(衝撃モーション.GetHashCode().ToString(), 衝撃モーション); } - public void SetCha(Cha Cha) + public void SetCha(Character Cha) { base.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; } public new void Reset() diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs index 42e4e5c..48fd17a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人.cs @@ -2842,7 +2842,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -3169,7 +3169,7 @@ namespace SlaveMatrix } } - public 足_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_人D e) + public 足_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_人D e) { ThisType = GetType(); Body = new Difs(Sta.脚左["足"]); @@ -3859,7 +3859,7 @@ namespace SlaveMatrix X0Y1_アーマ1_鉄靴1CP = new ColorP(X0Y1_アーマ1_鉄靴1, アーマ1_鉄靴1CD, DisUnit, abj: true); X0Y1_アーマ1_鉄靴2CP = new ColorP(X0Y1_アーマ1_鉄靴2, アーマ1_鉄靴2CD, DisUnit, abj: true); X0Y1_アーマ1_鉄靴3CP = new ColorP(X0Y1_アーマ1_鉄靴3, アーマ1_鉄靴3CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -4424,7 +4424,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -4446,7 +4446,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { ヒール0_ヒールCD = new ColorD(); ヒール0_靴底CD = new ColorD(); @@ -4559,7 +4559,7 @@ namespace SlaveMatrix ナース1_ストラップ4_縁2CD = new ColorD(); } - private void 配色B0(体配色 体配色) + private void 配色B0(BodyColorSet 体配色) { ヒール0_ヒールCD = new ColorD(); ヒール0_靴底CD = new ColorD(); @@ -4672,7 +4672,7 @@ namespace SlaveMatrix ナース1_ストラップ4_縁2CD = new ColorD(); } - private void 配色C0(体配色 体配色) + private void 配色C0(BodyColorSet 体配色) { ヒール0_ヒールCD = new ColorD(); ヒール0_靴底CD = new ColorD(); @@ -4785,7 +4785,7 @@ namespace SlaveMatrix ナース1_ストラップ4_縁2CD = new ColorD(); } - private void 配色L0(体配色 体配色) + private void 配色L0(BodyColorSet 体配色) { ヒール0_ヒールCD = new ColorD(); ヒール0_靴底CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_人D.cs index 8a22326..5206f86 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs index abc0ee7..e71c01c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛.cs @@ -385,7 +385,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -415,7 +415,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public 足_牛(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_牛D e) + public 足_牛(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_牛D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -506,7 +506,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -558,12 +558,12 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_牛D.cs index 7b44454..76dcf1a 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_牛(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs index b45f266..0421cf2 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣.cs @@ -545,7 +545,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -583,7 +583,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public 足_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_獣D e) + public 足_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_獣D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -702,7 +702,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -763,12 +763,12 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_獣D.cs index 17bf45c..990f675 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs index 6efd06f..feff15d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜.cs @@ -1205,7 +1205,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1276,7 +1276,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public 足_竜(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_竜D e) + public 足_竜(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_竜D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1508,7 +1508,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -1601,7 +1601,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1620,7 +1620,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗足_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -1680,7 +1680,7 @@ namespace SlaveMatrix 脚輪_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗足_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -1740,7 +1740,7 @@ namespace SlaveMatrix 脚輪_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 竜性_鱗足_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_竜D.cs index 7baf462..be66885 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_竜(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs index e2b71ad..263dd3e 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬.cs @@ -305,7 +305,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -331,7 +331,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public 足_馬(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_馬D e) + public 足_馬(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_馬D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -410,7 +410,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); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -455,12 +455,12 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.毛0O); 筋CD = new ColorD(ref 体配色.薄線, ref 体配色.毛0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_馬D.cs index f7dbdb1..b98e57f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_馬(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs index 947c1e4..5cb4e77 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥.cs @@ -1765,7 +1765,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1864,7 +1864,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_脚輪_金具右, 0); - public 足_鳥(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 足_鳥D e) + public 足_鳥(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 足_鳥D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -2177,7 +2177,7 @@ namespace SlaveMatrix X0Y0_親指_竜性_鱗1_竜性_鱗4CP = new ColorP(X0Y0_親指_竜性_鱗1_竜性_鱗4, 親指_竜性_鱗1_竜性_鱗4CD, DisUnit, abj: true); X0Y0_親指_竜性_鱗1_竜性_鱗5CP = new ColorP(X0Y0_親指_竜性_鱗1_竜性_鱗5, 親指_竜性_鱗1_竜性_鱗5CD, DisUnit, abj: true); X0Y0_親指_竜性_鱗1_竜性_鱗6CP = new ColorP(X0Y0_親指_竜性_鱗1_竜性_鱗6, 親指_竜性_鱗1_竜性_鱗6CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); int num = (右 ? (-10) : 10); @@ -2387,7 +2387,7 @@ namespace SlaveMatrix 鎖1.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -2406,7 +2406,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -2494,7 +2494,7 @@ namespace SlaveMatrix 親指_竜性_鱗1_竜性_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); @@ -2582,7 +2582,7 @@ namespace SlaveMatrix 親指_竜性_鱗1_竜性_鱗6CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 足CD = new ColorD(ref Col.Black, ref 体配色.人肌O); 筋CD = new ColorD(ref 体配色.薄線, ref Color2.Empty); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/足_鳥D.cs index 25f0707..b8bd432 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 足_鳥(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs index 1b8a61a..45ac9a6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 鎖(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鎖D e) + public 鎖(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鎖D e) { ThisType = GetType(); Body = new Difs(Sta.その他["鎖"]); @@ -148,7 +148,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_鎖2CP = new ColorP(X0Y0_鎖2, 鎖2CD, DisUnit, abj: true); X0Y0_鎖1CP = new ColorP(X0Y0_鎖1, 鎖1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override bool Is鉄(Par p) @@ -166,12 +166,12 @@ namespace SlaveMatrix X0Y0_鎖1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鎖2CD = new ColorD(); 鎖1CD = new ColorD(); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鎖D.cs index 270d5f5..b0aa472 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鎖(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs index f6bf5c5..377506b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇.cs @@ -244,7 +244,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -301,7 +301,7 @@ namespace SlaveMatrix public JointS Torso_接続点 => new JointS(Body, X0Y0_Torso1_Torso, 1); - public 長物_蛇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 長物_蛇D e) + public 長物_蛇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 長物_蛇D e) { 長物_蛇 長物_蛇2 = this; ThisType = GetType(); @@ -411,7 +411,7 @@ namespace SlaveMatrix X0Y0_Torso1_鱗右2CP = new ColorP(X0Y0_Torso1_鱗右2, Torso1_鱗右2CD, DisUnit, abj: true); X0Y0_Torso1_鱗左1CP = new ColorP(X0Y0_Torso1_鱗左1, Torso1_鱗左1CD, DisUnit, abj: true); X0Y0_Torso1_鱗右1CP = new ColorP(X0Y0_Torso1_鱗右1, Torso1_鱗右1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -455,7 +455,7 @@ namespace SlaveMatrix X0Y0_Torso1_鱗右1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -474,7 +474,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Torso1_TorsoCD = new ColorD(ref Col.Empty, ref Color2.Empty); Torso1_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -487,7 +487,7 @@ namespace SlaveMatrix Torso1_鱗右1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { Torso1_TorsoCD = new ColorD(ref Col.Empty, ref Color2.Empty); Torso1_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); @@ -500,7 +500,7 @@ namespace SlaveMatrix Torso1_鱗右1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { Torso1_TorsoCD = new ColorD(ref Col.Empty, ref Color2.Empty); Torso1_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs index 03981f8..7cd07f3 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蛇D.cs @@ -61,7 +61,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.長物_蛇_Torso_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 長物_蛇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs index ca99beb..dc66490 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲.cs @@ -419,7 +419,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -513,7 +513,7 @@ namespace SlaveMatrix public JointS 鎖2_接続点 => new JointS(Body, X0Y0_輪1_金具右, 0); - public 長物_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 長物_蟲D e) + public 長物_蟲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 長物_蟲D e) { 長物_蟲 長物_蟲2 = this; ThisType = GetType(); @@ -673,7 +673,7 @@ namespace SlaveMatrix X0Y0_輪1_金具3CP = new ColorP(X0Y0_輪1_金具3, 輪1_金具3CD, DisUnit, abj: true); X0Y0_輪1_金具左CP = new ColorP(X0Y0_輪1_金具左, 輪1_金具左CD, DisUnit, abj: true); X0Y0_輪1_金具右CP = new ColorP(X0Y0_輪1_金具右, 輪1_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖1.接続(鎖1_接続点); @@ -731,7 +731,7 @@ namespace SlaveMatrix 鎖2.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -750,7 +750,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Torso1_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); Torso1_胸板CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -770,7 +770,7 @@ namespace SlaveMatrix 輪1_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { Torso1_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); Torso1_胸板CD = new ColorD(ref Col.Black, ref 体配色.甲1O); @@ -790,7 +790,7 @@ namespace SlaveMatrix 輪1_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { Torso1_背板CD = new ColorD(ref Col.Black, ref 体配色.甲0O); Torso1_胸板CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs index bfc57ba..48a56e0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_蟲D.cs @@ -101,7 +101,7 @@ namespace SlaveMatrix e.接続情報 = ConnectionInfo.長物_蟲_Torso_接続; } - public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 長物_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs index a9f30fc..83e849b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚.cs @@ -1648,7 +1648,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1892,7 +1892,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 長物_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 長物_魚D e) + public 長物_魚(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 長物_魚D e) { 長物_魚 長物_魚2 = this; ThisType = GetType(); @@ -2357,7 +2357,7 @@ namespace SlaveMatrix X0Y0_輪1_金具3CP = new ColorP(X0Y0_輪1_金具3, 輪1_金具3CD, DisUnit, abj: true); X0Y0_輪1_金具左CP = new ColorP(X0Y0_輪1_金具左, 輪1_金具左CD, DisUnit, abj: true); X0Y0_輪1_金具右CP = new ColorP(X0Y0_輪1_金具右, 輪1_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -2648,7 +2648,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -2667,7 +2667,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Torso6_鱗左_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); Torso6_鱗左_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); @@ -2746,7 +2746,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { Torso6_鱗左_鱗1CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); Torso6_鱗左_鱗2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); @@ -2825,7 +2825,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { Torso6_鱗左_鱗1CD = new ColorD(ref Col.Black, ref 体配色.刺青O); Torso6_鱗左_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_魚D.cs index a016836..21f2ac7 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 長物_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs index dbdf015..6acddc6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨.cs @@ -750,7 +750,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -875,7 +875,7 @@ namespace SlaveMatrix public JointS 鎖4_接続点 => new JointS(Body, X0Y0_輪2_金具右, 0); - public 長物_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 長物_鯨D e) + public 長物_鯨(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 長物_鯨D e) { 長物_鯨 長物_鯨2 = this; ThisType = GetType(); @@ -1188,7 +1188,7 @@ namespace SlaveMatrix X0Y0_輪1_金具3CP = new ColorP(X0Y0_輪1_金具3, 輪1_金具3CD, DisUnit, abj: true); X0Y0_輪1_金具左CP = new ColorP(X0Y0_輪1_金具左, 輪1_金具左CD, DisUnit, abj: true); X0Y0_輪1_金具右CP = new ColorP(X0Y0_輪1_金具右, 輪1_金具右CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; 鎖1 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); 鎖2 = new 拘束鎖(DisUnit, !右, 配色指定, 体配色, Xasix); 鎖3 = new 拘束鎖(DisUnit, 右, 配色指定, 体配色, Xasix); @@ -1357,7 +1357,7 @@ namespace SlaveMatrix 鎖4.色更新(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1376,7 +1376,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { Torso6_TorsoCD = new ColorD(ref Col.Black, ref 体配色.体1O); Torso6_柄CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -1411,7 +1411,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { Torso6_TorsoCD = new ColorD(ref Col.Black, ref 体配色.体1O); Torso6_柄CD = new ColorD(ref Col.Black, ref 体配色.体0O); @@ -1445,7 +1445,7 @@ namespace SlaveMatrix 輪2_金具右CD = new ColorD(); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { Torso6_TorsoCD = new ColorD(ref Col.Black, ref 体配色.体1O); Torso6_柄CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/長物_鯨D.cs index 933efbd..4586e08 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 長物_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs index 9d793f0..d6a4534 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 鞭痕(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鞭痕D e) + public 鞭痕(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鞭痕D e) { ThisType = GetType(); Body = new Difs(Sta.スタンプ["鞭痕"]); @@ -124,7 +124,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_鞭痕CP = new ColorP(X0Y0_鞭痕, 鞭痕CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -132,12 +132,12 @@ namespace SlaveMatrix X0Y0_鞭痕CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鞭痕CD = new ColorD(ref Col.Empty, ref 体配色.粘膜); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鞭痕D.cs index 16e0a96..ffa85b4 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鞭痕(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs index 8406ae3..d33482d 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目.cs @@ -174,7 +174,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -231,7 +231,7 @@ namespace SlaveMatrix public JointS 瞼_接続点 => new JointS(Body, X0Y0_白目, 0); - public 頬目(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頬目D e) + public 頬目(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頬目D e) { 頬目 頬目2 = this; ThisType = GetType(); @@ -309,7 +309,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public void 猫目() @@ -334,7 +334,7 @@ namespace SlaveMatrix X0Y0_黒目_ハイライト下CP.Update(); } - private void 配色N0(体配色 体配色, bool 右) + private void 配色N0(BodyColorSet 体配色, bool 右) { if (右) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬目D.cs index c32eb00..1096a44 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頬目(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs index 3b5f008..a3952c0 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼.cs @@ -315,7 +315,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -422,7 +422,7 @@ namespace SlaveMatrix } } - public 頬瞼(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頬瞼D e) + public 頬瞼(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頬瞼D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["頬瞼左"]); @@ -546,7 +546,7 @@ namespace SlaveMatrix X0Y4_瞼右_瞼CP = new ColorP(X0Y4_瞼右_瞼, 瞼右_瞼CD, DisUnit, abj: true); X0Y4_瞼右_睫毛1CP = new ColorP(X0Y4_瞼右_睫毛1, 瞼右_睫毛1CD, DisUnit, abj: true); X0Y4_瞼右_睫毛2CP = new ColorP(X0Y4_瞼右_睫毛2, 瞼右_睫毛2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } private void 睫毛長さ(Par p, double d) @@ -652,12 +652,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 瞼左_瞼CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.人肌O); 瞼左_睫毛1CD = new ColorD(ref 体配色.睫毛.Col1, ref 体配色.睫毛); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬瞼D.cs index 1304b7d..05ad9df 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頬瞼(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs index 14a8eb7..ee94334 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌.cs @@ -691,7 +691,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -734,7 +734,7 @@ namespace SlaveMatrix } } - public 頬肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頬肌D e) + public 頬肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頬肌D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["頬肌左"]); @@ -884,7 +884,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); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 描画0(RenderArea Are) @@ -963,12 +963,12 @@ namespace SlaveMatrix X0Y0_牛柄_牛柄CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 淫タトゥ_ハート_タトゥ左CD = new ColorD(ref Col.Black, ref 体配色.刺青); 淫タトゥ_ハート_タトゥ右CD = new ColorD(ref Col.Black, ref 体配色.刺青); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頬肌D.cs index d01f6aa..c5fdb53 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頬肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs index 9f7c49a..8fa83d5 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天.cs @@ -93,7 +93,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -105,7 +105,7 @@ namespace SlaveMatrix } } - public 頭頂_天(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頭頂_天D e) + public 頭頂_天(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頭頂_天D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -155,7 +155,7 @@ namespace SlaveMatrix Pars = new Par[2] { X0Y0_天輪上, X0Y0_天輪下 }; X0Y0_天輪上CP = new ColorP(X0Y0_天輪上, 天輪CD, DisUnit, abj: true); X0Y0_天輪下CP = new ColorP(X0Y0_天輪下, 天輪CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -165,12 +165,12 @@ namespace SlaveMatrix X0Y0_天輪下CP.Update(mm); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 天輪CD = new ColorD(ref Col.Empty, ref 体配色.後光O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_天D.cs index a8bcbdc..16f295f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頭頂_天(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs index ed8387a..c98441f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇.cs @@ -1676,7 +1676,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1855,7 +1855,7 @@ namespace SlaveMatrix public JointS 頭部後_接続点 => new JointS(Body, X0Y0_頭部, 0); - public 頭頂_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頭頂_宇D e) + public 頭頂_宇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頭頂_宇D e) { 頭頂_宇 頭頂_宇2 = this; ThisType = GetType(); @@ -2173,7 +2173,7 @@ namespace SlaveMatrix X0Y0_縁上_鱗_鱗右_鱗1CP = new ColorP(X0Y0_縁上_鱗_鱗右_鱗1, 縁上_鱗_鱗右_鱗1CD, DisUnit, abj: true); X0Y0_縁上_鱗_鱗1CP = new ColorP(X0Y0_縁上_鱗_鱗1, 縁上_鱗_鱗1CD, DisUnit, abj: true); X0Y0_縁上_鱗_鱗2CP = new ColorP(X0Y0_縁上_鱗_鱗2, 縁上_鱗_鱗2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -2261,7 +2261,7 @@ namespace SlaveMatrix X0Y0_縁上_鱗_鱗2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -2280,7 +2280,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 頭部CD = new ColorD(ref Col.Black, ref 体配色.体0O); 頭頂部_透_基CD = new ColorD(ref Col.Black, ref 体配色.コアO); @@ -2365,7 +2365,7 @@ namespace SlaveMatrix 縁上_鱗_鱗2CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 頭部CD = new ColorD(ref Col.Black, ref 体配色.鱗0O); 頭頂部_透_基CD = new ColorD(ref Col.Black, ref 体配色.コアO); @@ -2450,7 +2450,7 @@ namespace SlaveMatrix 縁上_鱗_鱗2CD = new ColorD(ref Col.Black, ref 体配色.刺青O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 頭部CD = new ColorD(ref Col.Black, ref 体配色.体0O); 頭頂部_透_基CD = new ColorD(ref Col.Black, ref 体配色.コアO); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_宇D.cs index 0cbce7d..6a2c2d0 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頭頂_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs index f050c86..241756f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿.cs @@ -173,7 +173,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -206,7 +206,7 @@ namespace SlaveMatrix } } - public 頭頂_皿(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頭頂_皿D e) + public 頭頂_皿(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頭頂_皿D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -269,7 +269,7 @@ namespace SlaveMatrix X0Y0_甲殻_甲殻3CP = new ColorP(X0Y0_甲殻_甲殻3, 甲殻_甲殻3CD, DisUnit, abj: true); X0Y0_甲殻_甲殻2CP = new ColorP(X0Y0_甲殻_甲殻2, 甲殻_甲殻2CD, DisUnit, abj: true); X0Y0_甲殻_甲殻1CP = new ColorP(X0Y0_甲殻_甲殻1, 甲殻_甲殻1CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -282,12 +282,12 @@ namespace SlaveMatrix X0Y0_甲殻_甲殻1CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 皿1CD = new ColorD(ref Col.Black, ref 体配色.歯); 皿2CD = new ColorD(ref Col.Black, ref 体配色.爪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂_皿D.cs index d214980..e8d4ac9 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頭頂_皿(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs index d7217b0..35b17a7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇.cs @@ -191,7 +191,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -209,7 +209,7 @@ namespace SlaveMatrix } } - public 頭頂後_宇(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 頭頂後_宇D e) + public 頭頂後_宇(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 頭頂後_宇D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -274,7 +274,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -288,12 +288,12 @@ namespace SlaveMatrix X0Y0_線_線右3CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 頭部CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); 線_線左1CD = new ColorD(ref Col.Black, ref 体配色.鱗1O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/頭頂後_宇D.cs index 156fef3..ce676e7 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 頭頂後_宇(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs index b36204b..75ce6f9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライト.cs @@ -91,7 +91,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -104,7 +104,7 @@ namespace SlaveMatrix } } - public 顔ハイライト(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 顔ハイライトD e) + public 顔ハイライト(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 顔ハイライトD e) { ThisType = GetType(); Body = new Difs(Sta.胴体["顔ハイライト左"]); @@ -148,7 +148,7 @@ namespace SlaveMatrix 配色(体配色); X0Y0_ハイライト1CP = new ColorP(X0Y0_ハイライト1, ハイライト1CD, DisUnit, abj: true); X0Y0_ハイライト2CP = new ColorP(X0Y0_ハイライト2, ハイライト2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -157,12 +157,12 @@ namespace SlaveMatrix X0Y0_ハイライト2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { ハイライト1CD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2O); ハイライト2CD = new ColorD(ref Col.Empty, ref 体配色.ハイライト2R); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔ハイライトD.cs index 9cfc256..e2b569c 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 顔ハイライト(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs index baa81d8..a23bf70 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲.cs @@ -452,7 +452,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -505,7 +505,7 @@ namespace SlaveMatrix public JointS 触覚右_接続点 => new JointS(Body, X0Y0_面中0_付根右_付根2, 0); - public 顔面_甲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 顔面_甲D e) + public 顔面_甲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 顔面_甲D e) { 顔面_甲 顔面_甲2 = this; ThisType = GetType(); @@ -641,7 +641,7 @@ namespace SlaveMatrix X0Y0_面中2_面中下CP = new ColorP(X0Y0_面中2_面中下, 面中2_面中下CD, DisUnit, abj: true); X0Y0_面中1_面中CP = new ColorP(X0Y0_面中1_面中, 面中1_面中CD, DisUnit, abj: true); X0Y0_面中1_面中下CP = new ColorP(X0Y0_面中1_面中下, 面中1_面中下CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -668,12 +668,12 @@ namespace SlaveMatrix X0Y0_面中1_面中下CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 面額CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 面左下_面目CD = new ColorD(ref Col.Black, ref 体配色.刺青O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_甲D.cs index 851c0a0..5977f70 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 顔面_甲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs index d1d4bcb..09141d8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫.cs @@ -572,7 +572,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -635,7 +635,7 @@ namespace SlaveMatrix public JointS 触覚右_接続点 => new JointS(Body, X0Y0_付根右_付根2, 0); - public 顔面_虫(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 顔面_虫D e) + public 顔面_虫(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 顔面_虫D e) { 顔面_虫 顔面_虫2 = this; ThisType = GetType(); @@ -789,7 +789,7 @@ namespace SlaveMatrix 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); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -822,12 +822,12 @@ namespace SlaveMatrix X0Y0_単眼_眼右_ハイライトCP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 面基CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 複眼左_複眼1CD = new ColorD(ref Col.Black, ref 体配色.眼0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_虫D.cs index 90a0be2..bf853e6 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 顔面_虫(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs index 8ed28fb..f889f40 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲.cs @@ -752,7 +752,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -819,7 +819,7 @@ namespace SlaveMatrix public JointS 触覚右_接続点 => new JointS(Body, X0Y0_面, 1); - public 顔面_蟲(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 顔面_蟲D e) + public 顔面_蟲(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 顔面_蟲D e) { 顔面_蟲 顔面_蟲2 = this; ThisType = GetType(); @@ -1005,7 +1005,7 @@ namespace SlaveMatrix X0Y0_角左_角左2CP = new ColorP(X0Y0_角左_角左2, 角左_角左2CD, DisUnit, abj: true); X0Y0_角右_角右1CP = new ColorP(X0Y0_角右_角右1, 角右_角右1CD, DisUnit, abj: true); X0Y0_角右_角右2CP = new ColorP(X0Y0_角右_角右2, 角右_角右2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -1047,12 +1047,12 @@ namespace SlaveMatrix X0Y0_角右_角右2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 面CD = new ColorD(ref Col.Black, ref 体配色.甲0O); 眼左_眼1_基CD = new ColorD(ref Col.Black, ref 体配色.眼0O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/顔面_蟲D.cs index 115b1b1..fec57e2 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 顔面_蟲(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs index 8541ede..c580939 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人.cs @@ -532,7 +532,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -554,7 +554,7 @@ namespace SlaveMatrix } } - public 飛沫_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 飛沫_人D e) + public 飛沫_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 飛沫_人D e) { ThisType = GetType(); Body = new Difs(Sta.性器付["飛沫"]); @@ -717,7 +717,7 @@ namespace SlaveMatrix X0Y4_雫8CP = new ColorP(X0Y4_雫8, 雫8CD, DisUnit, abj: true); X0Y4_雫9CP = new ColorP(X0Y4_雫9, 雫9CD, DisUnit, abj: true); X0Y4_雫10CP = new ColorP(X0Y4_雫10, 雫10CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -792,12 +792,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 飛沫基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 雫1CD = new ColorD(ref Col.Empty, ref 体配色.体液); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_人D.cs index 4802fb6..c2ea036 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 飛沫_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs index df87141..f393aa4 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣.cs @@ -532,7 +532,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -554,7 +554,7 @@ namespace SlaveMatrix } } - public 飛沫_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 飛沫_獣D e) + public 飛沫_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 飛沫_獣D e) { ThisType = GetType(); Body = new Difs(Sta.性器付["四足飛沫"]); @@ -717,7 +717,7 @@ namespace SlaveMatrix X0Y4_雫8CP = new ColorP(X0Y4_雫8, 雫8CD, DisUnit, abj: true); X0Y4_雫9CP = new ColorP(X0Y4_雫9, 雫9CD, DisUnit, abj: true); X0Y4_雫10CP = new ColorP(X0Y4_雫10, 雫10CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -792,12 +792,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 飛沫基CD = new ColorD(ref Col.Empty, ref Color2.Empty); 雫1CD = new ColorD(ref Col.Empty, ref 体配色.体液); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛沫_獣D.cs index 5f490f4..c49bf25 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 飛沫_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs index 4759528..182ba47 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs @@ -78,7 +78,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -103,7 +103,7 @@ namespace SlaveMatrix } } - public 飛膜_先(double DisUnit, 配色指定 配色指定, 体配色 体配色) + public 飛膜_先(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色) { ThisType = GetType(); Body = new Difs(Sta.腕左["飛膜先"]); @@ -615,7 +615,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -634,17 +634,17 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 飛膜CD = new ColorD(ref Col.Black, ref 体配色.膜R); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 飛膜CD = new ColorD(ref Col.Black, ref 体配色.刺青R); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 飛膜CD = new ColorD(ref Col.Black, ref 体配色.刺青R); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs index 25cc83d..be1732b 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_根.cs @@ -78,7 +78,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -103,7 +103,7 @@ namespace SlaveMatrix } } - public 飛膜_根(double DisUnit, 配色指定 配色指定, 体配色 体配色) + public 飛膜_根(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色) { ThisType = GetType(); Body = new Difs(Sta.腕左["飛膜根"]); @@ -349,7 +349,7 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -368,17 +368,17 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 飛膜CD = new ColorD(ref Col.Black, ref 体配色.膜R); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 飛膜CD = new ColorD(ref Col.Black, ref 体配色.刺青R); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 飛膜CD = new ColorD(ref Col.Black, ref 体配色.刺青R); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs index d6256a0..e082010 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 鰭_豚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鰭_豚D e) + public 鰭_豚(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鰭_豚D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -130,7 +130,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_鰭CP = new ColorP(X0Y0_鰭, 鰭CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -145,12 +145,12 @@ namespace SlaveMatrix X0Y0_鰭CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鰭CD = new ColorD(ref Col.Black, ref 体配色.体0O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_豚D.cs index 2661d83..8e0ca44 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鰭_豚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs index 6292bfe..0543607 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚.cs @@ -156,7 +156,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -171,7 +171,7 @@ namespace SlaveMatrix } } - public 鰭_魚(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鰭_魚D e) + public 鰭_魚(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鰭_魚D e) { ThisType = GetType(); Dif dif = new Dif(Sta.肢左["鰭"][0]); @@ -237,7 +237,7 @@ namespace SlaveMatrix X0Y1_鰭2_鰭条CP = new ColorP(X0Y1_鰭2_鰭条, 鰭2_鰭条CD, DisUnit, abj: true); X0Y1_鰭1_鰭膜CP = new ColorP(X0Y1_鰭1_鰭膜, 鰭1_鰭膜CD, DisUnit, abj: true); X0Y1_鰭1_鰭条CP = new ColorP(X0Y1_鰭1_鰭条, 鰭1_鰭条CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -272,12 +272,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鰭2_鰭膜CD = new ColorD(ref Col.Black, ref 体配色.膜O); 鰭2_鰭条CD = new ColorD(ref Col.Black, ref 体配色.爪O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_魚D.cs index cc25deb..10d9cba 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鰭_魚(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs index 3cc0e9d..da52cd7 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨.cs @@ -71,7 +71,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -83,7 +83,7 @@ namespace SlaveMatrix } } - public 鰭_鯨(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鰭_鯨D e) + public 鰭_鯨(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鰭_鯨D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -130,7 +130,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_鰭CP = new ColorP(X0Y0_鰭, 鰭CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -145,12 +145,12 @@ namespace SlaveMatrix X0Y0_鰭CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鰭CD = new ColorD(ref Col.Black, ref 体配色.体0O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鰭_鯨D.cs index 3cfe063..d3eab27 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鰭_鯨(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs index 4df1ebc..0ed27a9 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰.cs @@ -1311,7 +1311,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -1399,7 +1399,7 @@ namespace SlaveMatrix } } - public 鳳凰(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鳳凰D e) + public 鳳凰(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鳳凰D e) { ThisType = GetType(); Dif dif = new Dif(); @@ -1652,7 +1652,7 @@ namespace SlaveMatrix X0Y0_羽21_羽CP = new ColorP(X0Y0_羽21_羽, 羽21_羽CD, DisUnit, abj: true); X0Y0_羽21_紋1CP = new ColorP(X0Y0_羽21_紋1, 羽21_紋1CD, DisUnit, abj: true); X0Y0_羽21_紋2CP = new ColorP(X0Y0_羽21_紋2, 羽21_紋2CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void SetAngle0() @@ -1750,7 +1750,7 @@ namespace SlaveMatrix X0Y0_羽21_紋2CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { switch (配色指定) { @@ -1769,7 +1769,7 @@ namespace SlaveMatrix } } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 羽_羽CD = new ColorD(ref Col.Black, ref 体配色.羽0O); 羽_紋1CD = new ColorD(ref Col.Empty, ref 体配色.柄O); @@ -1836,7 +1836,7 @@ namespace SlaveMatrix 羽21_紋2CD = new ColorD(ref Col.Empty, ref 体配色.紋O); } - private void 配色T0(体配色 体配色) + private void 配色T0(BodyColorSet 体配色) { 羽_羽CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 羽_紋1CD = new ColorD(ref Col.Empty, ref 体配色.柄O); @@ -1903,7 +1903,7 @@ namespace SlaveMatrix 羽21_紋2CD = new ColorD(ref Col.Empty, ref 体配色.紋O); } - private void 配色T1(体配色 体配色) + private void 配色T1(BodyColorSet 体配色) { 羽_羽CD = new ColorD(ref Col.Black, ref 体配色.刺青O); 羽_紋1CD = new ColorD(ref Col.Empty, ref 体配色.柄O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鳳凰D.cs index 00f2843..dcbce55 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鳳凰(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs index e5a90ab..36197bd 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人.cs @@ -72,7 +72,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -88,7 +88,7 @@ namespace SlaveMatrix public JointS 鼻水右_接続点 => new JointS(Body, X0Y0_鼻, 1); - public 鼻_人(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鼻_人D e) + public 鼻_人(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鼻_人D e) { 鼻_人 鼻_人2 = this; ThisType = GetType(); @@ -158,7 +158,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_鼻CP = new ColorP(X0Y0_鼻, 鼻CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -166,12 +166,12 @@ namespace SlaveMatrix X0Y0_鼻CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鼻CD = new ColorD(ref Col.Black, ref Color2.Empty); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_人D.cs index 49f8961..b7aa21d 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鼻_人(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs index 5d4f6f0..a205fed 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣.cs @@ -72,7 +72,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -88,7 +88,7 @@ namespace SlaveMatrix public JointS 鼻水右_接続点 => new JointS(Body, X0Y0_鼻, 1); - public 鼻_獣(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鼻_獣D e) + public 鼻_獣(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鼻_獣D e) { 鼻_獣 鼻_獣2 = this; ThisType = GetType(); @@ -158,7 +158,7 @@ namespace SlaveMatrix base.配色指定 = 配色指定; 配色(体配色); X0Y0_鼻CP = new ColorP(X0Y0_鼻, 鼻CD, DisUnit, abj: true); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -166,12 +166,12 @@ namespace SlaveMatrix X0Y0_鼻CP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鼻CD = new ColorD(ref Col.Black, ref 体配色.紋O); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻_獣D.cs index 573babf..7ba2f25 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鼻_獣(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs index 2162ecf..b529592 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水.cs @@ -95,7 +95,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -121,7 +121,7 @@ namespace SlaveMatrix } } - public 鼻水(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鼻水D e) + public 鼻水(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鼻水D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["鼻水左"]); @@ -174,7 +174,7 @@ namespace SlaveMatrix X0Y2_鼻水CP = new ColorP(X0Y2_鼻水, 鼻水CD, DisUnit, abj: false); X0Y3_鼻水CP = new ColorP(X0Y3_鼻水, 鼻水CD, DisUnit, abj: false); X0Y4_鼻水CP = new ColorP(X0Y4_鼻水, 鼻水CD, DisUnit, abj: false); - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -199,12 +199,12 @@ namespace SlaveMatrix } } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 鼻水CD = new ColorD(ref 体配色.体液線, ref Color2.Empty); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻水D.cs index fa11d7e..7d499fc 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鼻水(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs index e2445f5..eaa0863 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌.cs @@ -283,7 +283,7 @@ namespace SlaveMatrix } } - public override double 濃度 + public override double Intensity { get { @@ -305,7 +305,7 @@ namespace SlaveMatrix } } - public 鼻肌(double DisUnit, 配色指定 配色指定, 体配色 体配色, ModeEventDispatcher Med, 鼻肌D e) + public 鼻肌(double DisUnit, 配色指定 配色指定, BodyColorSet 体配色, ModeEventDispatcher Med, 鼻肌D e) { ThisType = GetType(); Body = new Difs(Sta.胴体["鼻肌"]); @@ -380,7 +380,7 @@ namespace SlaveMatrix X0Y0_紋柄_紋右_紋5CP = new ColorP(X0Y0_紋柄_紋右_紋5, 紋柄_紋右_紋5CD, DisUnit, abj: true); X0Y0_傷ICP = new ColorP(X0Y0_傷I, 傷ICD, DisUnit, abj: true); 傷I右濃度 = e.傷I右濃度; - 濃度 = e.濃度; + Intensity = e.濃度; } public override void 色更新() @@ -398,12 +398,12 @@ namespace SlaveMatrix X0Y0_傷ICP.Update(); } - private void 配色(体配色 体配色) + private void 配色(BodyColorSet 体配色) { 配色N0(体配色); } - private void 配色N0(体配色 体配色) + private void 配色N0(BodyColorSet 体配色) { 紋柄_紋左_紋1CD = new ColorD(ref Col.Empty, ref 体配色.紋O); 紋柄_紋左_紋2CD = new ColorD(ref Col.Empty, ref 体配色.紋O); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/鼻肌D.cs index 3145216..4e05e8f 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, ModeEventDispatcher Med, 体配色 体配色) + public override Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return new 鼻肌(DisUnit, 配色指定, 体配色, Med, this); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs similarity index 95% rename from SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs rename to SlaveMatrix/SlaveMatrix/GameClasses/Body.cs index f88ae00..ebe29ba 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Body.cs @@ -32,11 +32,11 @@ namespace SlaveMatrix } } - public class Bod + public class Body { public ModeEventDispatcher Med; - public Cha Cha; + public Character Cha; public Ele[] Elements; @@ -98,27 +98,27 @@ namespace SlaveMatrix public 頬瞼 頬瞼右; - public 涙 涙左; + public 涙 LeftTear; - public 涙 涙右; + public 涙 RightTear; public 目隠帯 目隠帯; public 鼻 鼻; - public 鼻水 鼻水左; + public 鼻水 LeftNoseDrip; - public 鼻水 鼻水右; + public 鼻水 RightNoseDrip; public 口 口; public 舌 舌; - public 涎 涎左; + public 涎 LeftDrool; - public 涎 涎右; + public 涎 RightDrool; - public 性器精液_人 口精液; + public 性器精液_人 MouthCum; public Cough 咳; @@ -172,9 +172,9 @@ namespace SlaveMatrix public 乳房 乳房右; - public 噴乳 噴乳左; + public 噴乳 LeftMilkSpray; - public 噴乳 噴乳右; + public 噴乳 RightMilkSpary; public ピアス ピアス左; @@ -296,7 +296,7 @@ namespace SlaveMatrix public 多足_蜘 蜘; - public 性器精液_人 出糸精液; + public 性器精液_人 ThreadCum; public 多足_蠍 蠍; @@ -662,13 +662,13 @@ namespace SlaveMatrix public bool Is蜘尾; - public bool Is双眼; + public bool IsDualEyes; - public bool Is単眼; + public bool IsSingleEye; - public bool Is頬眼; + public bool IsCheekEyes; - public bool Is額眼; + public bool IsForeheadEye; public bool Is舌股; @@ -702,25 +702,25 @@ namespace SlaveMatrix public 膣基 膣基; - public 膣内精液 膣内精液; + public 膣内精液 VaginalCumDrip; public 断面 断面; public 性器 性器; - public 性器精液 性器精液; + public 性器精液 GenetalCum; - public 飛沫 飛沫; + public 飛沫 Splash; public 潮吹_小 潮吹_小; public 潮吹_大 潮吹_大; - public 放尿 放尿; + public 放尿 Urination; public 肛門 肛門; - public 肛門精液 肛門精液; + public 肛門精液 AnalCum; public 尾_蜘 蜘尾; @@ -883,7 +883,7 @@ namespace SlaveMatrix { get { - if (!膣基.表示 && !膣内精液.表示) + if (!膣基.表示 && !VaginalCumDrip.表示) { return 断面.表示; } @@ -892,12 +892,12 @@ namespace SlaveMatrix set { 膣基.表示 = value; - 膣内精液.精液_表示 = value; + VaginalCumDrip.精液_表示 = value; 断面.表示 = value; if (処女喪失) { - 膣内精液.血液1_表示 = value; - 膣内精液.血液2_表示 = value; + VaginalCumDrip.血液1_表示 = value; + VaginalCumDrip.血液2_表示 = value; } if (value) { @@ -1122,7 +1122,7 @@ namespace SlaveMatrix } } - public double 尿染み濃度 + public double UrineStainIntensity { get { @@ -1147,7 +1147,7 @@ namespace SlaveMatrix } } - public double 潮染み濃度 + public double SquirtStainIntensity { get { @@ -1170,7 +1170,7 @@ namespace SlaveMatrix } } - public double 飛沫濃度 + public double SplashIntencity { get { @@ -1303,11 +1303,11 @@ namespace SlaveMatrix { get { - return 下着陰核.濃度; + return 下着陰核.Intensity; } set { - 下着陰核.濃度 = value; + 下着陰核.Intensity = value; double sizeCont = 1.0 + 0.1 * value; if (Is獣) { @@ -1356,20 +1356,20 @@ namespace SlaveMatrix { get { - return 紅潮.濃度; + return 紅潮.Intensity; } set { - 紅潮.濃度 = value; + 紅潮.Intensity = value; if (頬瞼左 != null) { - 頬瞼左.瞼左_瞼CD.色 = Cha.ChaD.body_color.人肌.BlendP1(Color.FromArgb((int)(128.0 * value), Cha.ChaD.body_color.粘膜)).GetSkinGrad(); - 頬瞼左.瞼右_瞼CD.色 = Cha.ChaD.body_color.人肌.BlendP1(Color.FromArgb((int)(128.0 * value), Cha.ChaD.body_color.粘膜)).GetSkinGrad(); + 頬瞼左.瞼左_瞼CD.色 = Cha.CharacterData.body_color.人肌.BlendP1(Color.FromArgb((int)(128.0 * value), Cha.CharacterData.body_color.粘膜)).GetSkinGrad(); + 頬瞼左.瞼右_瞼CD.色 = Cha.CharacterData.body_color.人肌.BlendP1(Color.FromArgb((int)(128.0 * value), Cha.CharacterData.body_color.粘膜)).GetSkinGrad(); } if (頬瞼右 != null) { - 頬瞼右.瞼左_瞼CD.色 = Cha.ChaD.body_color.人肌.BlendP1(Color.FromArgb((int)(128.0 * value), Cha.ChaD.body_color.粘膜)).GetSkinGrad(); - 頬瞼右.瞼右_瞼CD.色 = Cha.ChaD.body_color.人肌.BlendP1(Color.FromArgb((int)(128.0 * value), Cha.ChaD.body_color.粘膜)).GetSkinGrad(); + 頬瞼右.瞼左_瞼CD.色 = Cha.CharacterData.body_color.人肌.BlendP1(Color.FromArgb((int)(128.0 * value), Cha.CharacterData.body_color.粘膜)).GetSkinGrad(); + 頬瞼右.瞼右_瞼CD.色 = Cha.CharacterData.body_color.人肌.BlendP1(Color.FromArgb((int)(128.0 * value), Cha.CharacterData.body_color.粘膜)).GetSkinGrad(); } } } @@ -1383,8 +1383,8 @@ namespace SlaveMatrix set { 体紅潮_ = value; - Col.Alpha(ref Cha.ChaD.body_color.粘膜, (int)(24.0 * 体紅潮_), out var ret); - Set人肌色(Cha.ChaD.body_color.人肌.BlendP1(ret)); + Col.Alpha(ref Cha.CharacterData.body_color.粘膜, (int)(24.0 * 体紅潮_), out var ret); + Set人肌色(Cha.CharacterData.body_color.人肌.BlendP1(ret)); } } @@ -1582,7 +1582,7 @@ namespace SlaveMatrix public bool 捲り判定1 => false; - public double 腰振り_人v + public double HipMotion_人v { get { @@ -1682,13 +1682,13 @@ namespace SlaveMatrix } } - public double 腰振りv + public double HipMotionValue { get { if (!Is獣) { - return 腰振り_人v; + return HipMotion_人v; } return 腰振り_獣v; } @@ -1700,7 +1700,7 @@ namespace SlaveMatrix } else { - 腰振り_人v = value; + HipMotion_人v = value; } } } @@ -2328,9 +2328,9 @@ namespace SlaveMatrix ピアス.配色(ピアスi.色); ピアス.SetHitFalse(); 腰肌_人.陰毛_ハート_表示 = (腰肌_人.陰毛_表示 || 腰肌_人.獣性_獣毛_表示) && ピアス.表示; - 腰肌_人.陰毛CD.不透明度 = Cha.ChaD.現陰毛 * Cha.ChaD.最陰毛濃度; - 腰肌_人.獣性_獣毛CD.不透明度 = Cha.ChaD.現陰毛; - 腰肌_人.陰毛_ハートCD.不透明度 = Cha.ChaD.現陰毛.Inverse() * Cha.ChaD.最陰毛濃度; + 腰肌_人.陰毛CD.不透明度 = Cha.CharacterData.現陰毛 * Cha.CharacterData.最陰毛濃度; + 腰肌_人.獣性_獣毛CD.不透明度 = Cha.CharacterData.現陰毛; + 腰肌_人.陰毛_ハートCD.不透明度 = Cha.CharacterData.現陰毛.Inverse() * Cha.CharacterData.最陰毛濃度; } } } @@ -2461,9 +2461,9 @@ namespace SlaveMatrix 下着乳首左.配色(下着T_チューブi.色.生地色); 下着乳首右.配色(下着T_チューブi.色.生地色); 乳首勃起 = 乳首勃起; - if (噴乳左.母乳垂れ1_表示) + if (LeftMilkSpray.母乳垂れ1_表示) { - 下着T染み = Cha.噴乳染み; + 下着T染み = Cha.MilkStain; } else { @@ -2495,9 +2495,9 @@ namespace SlaveMatrix 下着乳首左.配色(下着T_クロスi.色.生地色); 下着乳首右.配色(下着T_クロスi.色.生地色); 乳首勃起 = 乳首勃起; - if (噴乳左.母乳垂れ1_表示) + if (LeftMilkSpray.母乳垂れ1_表示) { - 下着T染み = Cha.噴乳染み; + 下着T染み = Cha.MilkStain; } else { @@ -2529,9 +2529,9 @@ namespace SlaveMatrix 下着乳首左.配色(下着T_ビキニi.色.生地色); 下着乳首右.配色(下着T_ビキニi.色.生地色); 乳首勃起 = 乳首勃起; - if (噴乳左.母乳垂れ1_表示) + if (LeftMilkSpray.母乳垂れ1_表示) { - 下着T染み = Cha.噴乳染み; + 下着T染み = Cha.MilkStain; } else { @@ -2563,9 +2563,9 @@ namespace SlaveMatrix 下着乳首左.配色(下着T_マイクロi.色.生地色); 下着乳首右.配色(下着T_マイクロi.色.生地色); 乳首勃起 = 乳首勃起; - if (噴乳左.母乳垂れ1_表示) + if (LeftMilkSpray.母乳垂れ1_表示) { - 下着T染み = Cha.噴乳染み; + 下着T染み = Cha.MilkStain; } else { @@ -2594,9 +2594,9 @@ namespace SlaveMatrix 下着T_ブラ.SetHitFalse(); 下着乳首左.表示 = false; 下着乳首右.表示 = false; - if (噴乳左.母乳垂れ1_表示) + if (LeftMilkSpray.母乳垂れ1_表示) { - 下着T染み = Cha.噴乳染み; + 下着T染み = Cha.MilkStain; } else { @@ -2931,13 +2931,13 @@ namespace SlaveMatrix } } - public Bod(ModeEventDispatcher Med, RenderArea Are, Cha Cha) + public Body(ModeEventDispatcher Med, RenderArea Are, Character Cha) { - Bod bod = this; + Body bod = this; this.Med = Med; this.Cha = Cha; double disUnit = Are.DisplayUnitScale; - Waist = (Waist)Cha.ChaD.body_tree.GetEle(disUnit, Med, Cha.配色); + Waist = (Waist)Cha.CharacterData.body_tree.GetEle(disUnit, Med, Cha.ColorSet); Elements = Waist.EnumEle().ToArray(); List<スタンプK> sk = new List<スタンプK>(); List<スタンプW> sw = new List<スタンプW>(); @@ -3067,34 +3067,34 @@ namespace SlaveMatrix if (current_element is 腿_獣) { 腿_獣 obj = (腿_獣)獣腿2; - obj.腿CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj.腿CD.c2.Col2 = Cha.配色.人肌O.Col2; - obj.筋CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj.筋CD.c2.Col2 = Cha.配色.人肌O.Col2; + obj.腿CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj.腿CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; + obj.筋CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj.筋CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; } if (current_element is 腿_蹄) { 腿_蹄 obj2 = (腿_蹄)獣腿2; - obj2.腿CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj2.腿CD.c2.Col2 = Cha.配色.人肌O.Col2; - obj2.筋CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj2.筋CD.c2.Col2 = Cha.配色.人肌O.Col2; + obj2.腿CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj2.腿CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; + obj2.筋CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj2.筋CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; } if (current_element is 腿_竜) { 腿_竜 obj3 = (腿_竜)獣腿2; - obj3.腿CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj3.腿CD.c2.Col2 = Cha.配色.人肌O.Col2; - obj3.筋CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj3.筋CD.c2.Col2 = Cha.配色.人肌O.Col2; + obj3.腿CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj3.腿CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; + obj3.筋CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj3.筋CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; } if (current_element is 腿_鳥) { 腿_鳥 obj4 = (腿_鳥)獣腿2; - obj4.腿CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj4.腿CD.c2.Col2 = Cha.配色.人肌O.Col2; - obj4.筋CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj4.筋CD.c2.Col2 = Cha.配色.人肌O.Col2; + obj4.腿CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj4.腿CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; + obj4.筋CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj4.筋CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; } } } @@ -3460,34 +3460,34 @@ namespace SlaveMatrix if (current_element is 腿_獣) { 腿_獣 obj5 = (腿_獣)獣腿2; - obj5.腿CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj5.腿CD.c2.Col2 = Cha.配色.人肌O.Col2; - obj5.筋CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj5.筋CD.c2.Col2 = Cha.配色.人肌O.Col2; + obj5.腿CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj5.腿CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; + obj5.筋CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj5.筋CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; } if (current_element is 腿_蹄) { 腿_蹄 obj6 = (腿_蹄)獣腿2; - obj6.腿CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj6.腿CD.c2.Col2 = Cha.配色.人肌O.Col2; - obj6.筋CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj6.筋CD.c2.Col2 = Cha.配色.人肌O.Col2; + obj6.腿CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj6.腿CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; + obj6.筋CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj6.筋CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; } if (current_element is 腿_竜) { 腿_竜 obj7 = (腿_竜)獣腿2; - obj7.腿CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj7.腿CD.c2.Col2 = Cha.配色.人肌O.Col2; - obj7.筋CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj7.筋CD.c2.Col2 = Cha.配色.人肌O.Col2; + obj7.腿CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj7.腿CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; + obj7.筋CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj7.筋CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; } if (current_element is 腿_鳥) { 腿_鳥 obj8 = (腿_鳥)獣腿2; - obj8.腿CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj8.腿CD.c2.Col2 = Cha.配色.人肌O.Col2; - obj8.筋CD.c2.Col1 = Cha.配色.毛0O.Col1; - obj8.筋CD.c2.Col2 = Cha.配色.人肌O.Col2; + obj8.腿CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj8.腿CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; + obj8.筋CD.c2.Col1 = Cha.ColorSet.毛0O.Col1; + obj8.筋CD.c2.Col2 = Cha.ColorSet.人肌O.Col2; } } } @@ -3904,19 +3904,19 @@ namespace SlaveMatrix 胸腹板_人.SetHitFalse(); 胸肌_人.SetHitFalse(); 乳房左 = Chest.胸左_接続.GetEle<乳房>(); - 噴乳左 = 乳房左.噴乳_接続.GetEle<噴乳>(); + LeftMilkSpray = 乳房左.噴乳_接続.GetEle<噴乳>(); ピアス左 = 乳房左.噴乳_接続.GetEle<ピアス>(); キャップ2左 = 乳房左.噴乳_接続.GetEle<キャップ2>(); 下着乳首左 = 乳房左.噴乳_接続.GetEle<下着乳首>(); - 噴乳左.SetHitFalse(); + LeftMilkSpray.SetHitFalse(); ピアス左.SetHitFalse(); 下着乳首左.SetHitFalse(); 乳房右 = Chest.胸右_接続.GetEle<乳房>(); - 噴乳右 = 乳房右.噴乳_接続.GetEle<噴乳>(); + RightMilkSpary = 乳房右.噴乳_接続.GetEle<噴乳>(); ピアス右 = 乳房右.噴乳_接続.GetEle<ピアス>(); キャップ2右 = 乳房右.噴乳_接続.GetEle<キャップ2>(); 下着乳首右 = 乳房右.噴乳_接続.GetEle<下着乳首>(); - 噴乳右.SetHitFalse(); + RightMilkSpary.SetHitFalse(); ピアス右.SetHitFalse(); 下着乳首右.SetHitFalse(); 下着T_チューブ = Chest.肌_接続.GetEle<下着トップ_チューブ>(); @@ -3943,30 +3943,30 @@ namespace SlaveMatrix if (単眼目 != null) { 単眼瞼 = 単眼目.瞼_接続.GetEle<単瞼>(); - 涙左 = 単眼目.瞼_接続.GetEle<涙>(右: false); - 涙右 = 単眼目.瞼_接続.GetEle<涙>(右: true); + LeftTear = 単眼目.瞼_接続.GetEle<涙>(右: false); + RightTear = 単眼目.瞼_接続.GetEle<涙>(右: true); 単眼目.SetHitFalse(); 単眼瞼.SetHitFalse(); - 涙左.SetHitFalse(); - 涙右.SetHitFalse(); + LeftTear.SetHitFalse(); + RightTear.SetHitFalse(); } 目左 = 頭.目左_接続.GetEle<双目>(); 目右 = 頭.目右_接続.GetEle<双目>(); if (目左 != null) { 瞼左 = 目左.瞼_接続.GetEle<双瞼>(); - 涙左 = 目左.瞼_接続.GetEle<涙>(); + LeftTear = 目左.瞼_接続.GetEle<涙>(); 目左.SetHitFalse(); 瞼左.SetHitFalse(); - 涙左.SetHitFalse(); + LeftTear.SetHitFalse(); } if (目右 != null) { 瞼右 = 目右.瞼_接続.GetEle<双瞼>(); - 涙右 = 目右.瞼_接続.GetEle<涙>(); + RightTear = 目右.瞼_接続.GetEle<涙>(); 目右.SetHitFalse(); 瞼右.SetHitFalse(); - 涙右.SetHitFalse(); + RightTear.SetHitFalse(); } 額目 = 頭.額_接続.GetEle<縦目>(); 頬目左 = 頭.頬肌左_接続.GetEle<頬目>(); @@ -3993,22 +3993,22 @@ namespace SlaveMatrix 鼻 = 頭.鼻_接続.GetEle<鼻>(); if (鼻 != null) { - 鼻水左 = 鼻.鼻水左_接続.GetEle<鼻水>(); - 鼻水右 = 鼻.鼻水右_接続.GetEle<鼻水>(); + LeftNoseDrip = 鼻.鼻水左_接続.GetEle<鼻水>(); + RightNoseDrip = 鼻.鼻水右_接続.GetEle<鼻水>(); 鼻.SetHitFalse(); - 鼻水左.SetHitFalse(); - 鼻水右.SetHitFalse(); + LeftNoseDrip.SetHitFalse(); + RightNoseDrip.SetHitFalse(); } 口 = 頭.口_接続.GetEle<口>(); 口.SetHitFalse(); 舌 = 頭.口_接続.GetEle<舌>(); 舌.SetHitFalse(); - 涎左 = 頭.口_接続.GetEle<涎>(右: false); - 涎右 = 頭.口_接続.GetEle<涎>(右: true); - 涎左.SetHitFalse(); - 涎右.SetHitFalse(); - 口精液 = 頭.口_接続.GetEle<性器精液_人>(); - 口精液.SetHitFalse(); + LeftDrool = 頭.口_接続.GetEle<涎>(右: false); + RightDrool = 頭.口_接続.GetEle<涎>(右: true); + LeftDrool.SetHitFalse(); + RightDrool.SetHitFalse(); + MouthCum = 頭.口_接続.GetEle<性器精液_人>(); + MouthCum.SetHitFalse(); 咳 = 頭.口_接続.GetEle(); 咳.SetHitFalse(); 呼気 = 頭.口_接続.GetEle<呼気>(); @@ -4088,10 +4088,10 @@ namespace SlaveMatrix sw.Add(乳房右.鞭痕); キスマーク = sk.ToArray(); 鞭痕 = sw.ToArray(); - ぶっかけ小 = new スタンプB(Med, Are, Cha, this, new ぶっかけ_小D(), Cha.Mots); - ぶっかけ大 = new スタンプB(Med, Are, Cha, this, new ぶっかけ_大D(), Cha.Mots); + ぶっかけ小 = new スタンプB(Med, Are, Cha, this, new ぶっかけ_小D(), Cha.Motions); + ぶっかけ大 = new スタンプB(Med, Are, Cha, this, new ぶっかけ_大D(), Cha.Motions); Is瞼宇 = 瞼左 is 瞼_宇; - 涙描画 = 涙左 != null; + 涙描画 = LeftTear != null; 鼻描画 = 鼻 != null; if (後髪1 != null) { @@ -5170,7 +5170,7 @@ namespace SlaveMatrix 腰後左接続.Remove(item17); 半身後接続.Insert(0, item17); } - if (Cha.ChaD.固有値 > 0.5) + if (Cha.CharacterData.固有値 > 0.5) { 大顎 ele6 = 大顎基接続.GetEle<大顎>(); if (ele6 != null) @@ -5226,10 +5226,10 @@ namespace SlaveMatrix Is触覚他 = 触覚左 != null; Is触覚甲 = 触覚甲左 != null; Is触覚 = Is触覚他 || Is触覚甲; - Is双眼 = 目左 != null; - Is単眼 = 単眼目 != null; - Is頬眼 = 頬目左 != null; - Is額眼 = 額目 != null; + IsDualEyes = 目左 != null; + IsSingleEye = 単眼目 != null; + IsCheekEyes = 頬目左 != null; + IsForeheadEye = 額目 != null; Is舌股 = 舌 is 舌_長 && ((舌_長)舌).舌股右_舌1_表示; Is最前腕人 = 肩左 != null && 肩左.UpperArm_接続.IsEle(); Is最前手人 = 肩左 != null && 肩左.EnumEle().IsEle<手_人>(); @@ -5263,7 +5263,7 @@ namespace SlaveMatrix e.Yi = 1; }); } - if (Is単眼) + if (IsSingleEye) { 頭.X0Y0_Head.JP[7] = new Joi(頭.X0Y0_Head.JP[7].Joint.MulY(0.96)); 頭.X0Y0_Head.JP[17] = new Joi(頭.X0Y0_Head.JP[17].Joint.MulY(0.96)); @@ -5276,37 +5276,37 @@ namespace SlaveMatrix 紅潮.X0Y0_紅潮弱右.AngleBase = -20.0; 紅潮.X0Y0_紅潮線右.AngleBase = -20.0; } - 染み_人 = new 染み_人(disUnit, 配色指定.N0, Cha.配色, Med, new 染み_人D()); + 染み_人 = new 染み_人(disUnit, 配色指定.N0, Cha.ColorSet, Med, new 染み_人D()); 染み_人.サイズ = Elements.Sum((Ele e) => e.サイズ) / (double)Elements.Length; - 染み_人.濃度 = 0.0; + 染み_人.Intensity = 0.0; Vector2D positionCont = Dat.Vec2DUnitY * -0.03; Vector2D positionCont2 = Dat.Vec2DUnitY * 0.03; 染み_人.X0Y0_汗.PositionCont = positionCont; 染み_人.X0Y0_潮1.PositionCont = positionCont2; if (Is獣) { - 膣内精液_獣.濃度 = 0.0; + 膣内精液_獣.Intensity = 0.0; 断面_獣.精液CD.不透明度 = 0.0; 膣基 = 膣基_獣; - 膣内精液 = 膣内精液_獣; + VaginalCumDrip = 膣内精液_獣; 断面 = 断面_獣; 性器 = 性器_獣; - 性器精液 = 性器精液_獣; - 飛沫 = 飛沫_獣; + GenetalCum = 性器精液_獣; + Splash = 飛沫_獣; 潮吹_小 = 潮吹_小_獣; 潮吹_大 = 潮吹_大_獣; - 放尿 = 放尿_獣; + Urination = 放尿_獣; 肛門 = 肛門_獣; - 肛門精液 = 肛門精液_獣; + AnalCum = 肛門精液_獣; 膣内精液_獣.精液配色(Sta.GameData.配色); 膣内精液_獣.精液濃度 = 0.0; 断面_獣.精液配色(Sta.GameData.配色); 断面_獣.精液濃度 = 0.0; 性器精液_獣.精液配色(Sta.GameData.配色); 肛門精液_獣.精液配色(Sta.GameData.配色); - 染み_獣 = new 染み_獣(disUnit, 配色指定.N0, Cha.配色, Med, new 染み_獣D()); + 染み_獣 = new 染み_獣(disUnit, 配色指定.N0, Cha.ColorSet, Med, new 染み_獣D()); 染み_獣.サイズ = Elements.Sum((Ele e) => e.サイズ) / (double)Elements.Length; - 染み_獣.濃度 = 0.0; + 染み_獣.Intensity = 0.0; if (Chest_獣.脇左_接続.IsEle<四足脇>()) { Chest_獣.X0Y0_胸郭.OP[0].Outline = false; @@ -5328,19 +5328,19 @@ namespace SlaveMatrix } else { - 膣内精液_人.濃度 = 0.0; + 膣内精液_人.Intensity = 0.0; 断面_人.精液CD.不透明度 = 0.0; 膣基 = 膣基_人; - 膣内精液 = 膣内精液_人; + VaginalCumDrip = 膣内精液_人; 断面 = 断面_人; 性器 = 性器_人; - 性器精液 = 性器精液_人; - 飛沫 = 飛沫_人; + GenetalCum = 性器精液_人; + Splash = 飛沫_人; 潮吹_小 = 潮吹_小_人; 潮吹_大 = 潮吹_大_人; - 放尿 = 放尿_人; + Urination = 放尿_人; 肛門 = 肛門_人; - 肛門精液 = 肛門精液_人; + AnalCum = 肛門精液_人; 膣内精液_人.精液配色(Sta.GameData.配色); 膣内精液_人.精液濃度 = 0.0; 断面_人.精液配色(Sta.GameData.配色); @@ -5372,22 +5372,22 @@ namespace SlaveMatrix 肛門y = 肛門.尺度YB; 肛門v = 肛門.尺度B; 口i = 0; - 口精液.精液配色(Sta.GameData.配色); + MouthCum.精液配色(Sta.GameData.配色); 頬濃度 = 0.3; 下着B_ノーマル.染み濃度 = 0.0; 下着B_マイクロ.染み濃度 = 0.0; 蜘尾 = Elements.GetEle<尾_蜘>(); if (Is蜘尾 = 蜘尾 != null) { - 出糸精液 = new 性器精液_人(disUnit, 配色指定.N0, Cha.配色, Med, new 性器精液_人D()); - 出糸精液.精液配色(Sta.GameData.配色); - 出糸精液.接続(蜘尾.出糸_接続点); + ThreadCum = new 性器精液_人(disUnit, 配色指定.N0, Cha.ColorSet, Med, new 性器精液_人D()); + ThreadCum.精液配色(Sta.GameData.配色); + ThreadCum.接続(蜘尾.出糸_接続点); } 頬濃度 = 0.0; 汗染み濃度 = 0.0; - 尿染み濃度 = 0.0; - 飛沫濃度 = 0.0; - 潮染み濃度 = 0.0; + UrineStainIntensity = 0.0; + SplashIntencity = 0.0; + SquirtStainIntensity = 0.0; 湯気左濃度 = 0.0; 湯気右濃度 = 0.0; 下着B染み = 0.0; @@ -5739,7 +5739,7 @@ namespace SlaveMatrix } if (bod.Is蜘尾) { - bod.出糸精液.描画0(are); + bod.ThreadCum.描画0(are); } if (bod.cb0) { @@ -5807,8 +5807,8 @@ namespace SlaveMatrix } bod.ピアス左.描画0(are); bod.ピアス右.描画0(are); - bod.噴乳左.描画0(are); - bod.噴乳右.描画0(are); + bod.LeftMilkSpray.描画0(are); + bod.RightMilkSpary.描画0(are); bod.キャップ2左.描画0(are); bod.キャップ2右.描画0(are); bod.胸肌_人.描画1(are); @@ -5817,7 +5817,7 @@ namespace SlaveMatrix bod.汗掻き.Draw(are); } bod.頭.描画0(are); - if (bod.Is双眼 && !bod.Is瞼宇) + if (bod.IsDualEyes && !bod.Is瞼宇) { bod.目左.描画0(are); bod.瞼左.描画0(are); @@ -5825,7 +5825,7 @@ namespace SlaveMatrix bod.瞼右.描画0(are); } bod.頭.描画1(are); - if (bod.Is単眼) + if (bod.IsSingleEye) { bod.単眼目.描画0(are); bod.単眼瞼.描画0(are); @@ -5838,12 +5838,12 @@ namespace SlaveMatrix bod.目傷右.描画0(are); bod.頬肌左.描画0(are); bod.頬肌右.描画0(are); - if (bod.Is額眼) + if (bod.IsForeheadEye) { bod.額目.描画0(are); bod.額瞼.描画0(are); } - if (bod.Is頬眼) + if (bod.IsCheekEyes) { bod.頬目左.描画0(are); bod.頬目右.描画0(are); @@ -5855,14 +5855,14 @@ namespace SlaveMatrix bod.瞼左.描画0(are); bod.瞼右.描画0(are); } - bod.涎左.描画0(are); - bod.涎右.描画0(are); + bod.LeftDrool.描画0(are); + bod.RightDrool.描画0(are); bod.口.描画0(are); if (bod.鼻描画) { bod.鼻.描画0(are); - bod.鼻水左.描画0(are); - bod.鼻水右.描画0(are); + bod.LeftNoseDrip.描画0(are); + bod.RightNoseDrip.描画0(are); } bod.頭.描画2(are); bod.玉口枷.描画0(are); @@ -5877,8 +5877,8 @@ namespace SlaveMatrix bod.頬肌右.描画1(are); if (bod.涙描画) { - bod.涙左.描画0(are); - bod.涙右.描画0(are); + bod.LeftTear.描画0(are); + bod.RightTear.描画0(are); } if (!bod.Is頭頂_宇 && !bod.Is顔面 && !bod.Is額角 && !bod.Is触覚) { @@ -5928,7 +5928,7 @@ namespace SlaveMatrix bod.胸毛_人.描画0(are); } bod.舌.描画0(are); - bod.口精液.描画0(are); + bod.MouthCum.描画0(are); bod.咳.描画0(are); bod.呼気.描画0(are); if (bod.cb0 && bod.カーソル.コキ) @@ -6166,7 +6166,7 @@ namespace SlaveMatrix } if (bod.Is蜘尾) { - bod.出糸精液.描画0(are); + bod.ThreadCum.描画0(are); } if (bod.cb0) { @@ -6234,8 +6234,8 @@ namespace SlaveMatrix } bod.ピアス左.描画0(are); bod.ピアス右.描画0(are); - bod.噴乳左.描画0(are); - bod.噴乳右.描画0(are); + bod.LeftMilkSpray.描画0(are); + bod.RightMilkSpary.描画0(are); bod.キャップ2左.描画0(are); bod.キャップ2右.描画0(are); bod.胸肌_人.描画1(are); @@ -6244,7 +6244,7 @@ namespace SlaveMatrix bod.汗掻き.Draw(are); } bod.頭.描画0(are); - if (bod.Is双眼 && !bod.Is瞼宇) + if (bod.IsDualEyes && !bod.Is瞼宇) { bod.目左.描画0(are); bod.瞼左.描画0(are); @@ -6252,7 +6252,7 @@ namespace SlaveMatrix bod.瞼右.描画0(are); } bod.頭.描画1(are); - if (bod.Is単眼) + if (bod.IsSingleEye) { bod.単眼目.描画0(are); bod.単眼瞼.描画0(are); @@ -6265,12 +6265,12 @@ namespace SlaveMatrix bod.目傷右.描画0(are); bod.頬肌左.描画0(are); bod.頬肌右.描画0(are); - if (bod.Is額眼) + if (bod.IsForeheadEye) { bod.額目.描画0(are); bod.額瞼.描画0(are); } - if (bod.Is頬眼) + if (bod.IsCheekEyes) { bod.頬目左.描画0(are); bod.頬目右.描画0(are); @@ -6282,14 +6282,14 @@ namespace SlaveMatrix bod.瞼左.描画0(are); bod.瞼右.描画0(are); } - bod.涎左.描画0(are); - bod.涎右.描画0(are); + bod.LeftDrool.描画0(are); + bod.RightDrool.描画0(are); bod.口.描画0(are); if (bod.鼻描画) { bod.鼻.描画0(are); - bod.鼻水左.描画0(are); - bod.鼻水右.描画0(are); + bod.LeftNoseDrip.描画0(are); + bod.RightNoseDrip.描画0(are); } bod.頭.描画2(are); bod.玉口枷.描画0(are); @@ -6304,8 +6304,8 @@ namespace SlaveMatrix bod.頬肌右.描画1(are); if (bod.涙描画) { - bod.涙左.描画0(are); - bod.涙右.描画0(are); + bod.LeftTear.描画0(are); + bod.RightTear.描画0(are); } if (!bod.Is頭頂_宇 && !bod.Is顔面 && !bod.Is額角 && !bod.Is触覚) { @@ -6359,7 +6359,7 @@ namespace SlaveMatrix bod.胸毛_人.描画0(are); } bod.舌.描画0(are); - bod.口精液.描画0(are); + bod.MouthCum.描画0(are); bod.咳.描画0(are); bod.呼気.描画0(are); if (bod.cb0 && bod.カーソル.コキ) @@ -6536,7 +6536,7 @@ namespace SlaveMatrix } if (bod.Is蜘尾) { - bod.出糸精液.描画0(are); + bod.ThreadCum.描画0(are); } if (bod.cb0) { @@ -6661,8 +6661,8 @@ namespace SlaveMatrix } bod.ピアス左.描画0(are); bod.ピアス右.描画0(are); - bod.噴乳左.描画0(are); - bod.噴乳右.描画0(are); + bod.LeftMilkSpray.描画0(are); + bod.RightMilkSpary.描画0(are); bod.キャップ2左.描画0(are); bod.キャップ2右.描画0(are); bod.胸肌_人.描画1(are); @@ -6671,7 +6671,7 @@ namespace SlaveMatrix bod.汗掻き.Draw(are); } bod.頭.描画0(are); - if (bod.Is双眼 && !bod.Is瞼宇) + if (bod.IsDualEyes && !bod.Is瞼宇) { bod.目左.描画0(are); bod.瞼左.描画0(are); @@ -6679,7 +6679,7 @@ namespace SlaveMatrix bod.瞼右.描画0(are); } bod.頭.描画1(are); - if (bod.Is単眼) + if (bod.IsSingleEye) { bod.単眼目.描画0(are); bod.単眼瞼.描画0(are); @@ -6692,12 +6692,12 @@ namespace SlaveMatrix bod.目傷右.描画0(are); bod.頬肌左.描画0(are); bod.頬肌右.描画0(are); - if (bod.Is額眼) + if (bod.IsForeheadEye) { bod.額目.描画0(are); bod.額瞼.描画0(are); } - if (bod.Is頬眼) + if (bod.IsCheekEyes) { bod.頬目左.描画0(are); bod.頬目右.描画0(are); @@ -6709,14 +6709,14 @@ namespace SlaveMatrix bod.瞼左.描画0(are); bod.瞼右.描画0(are); } - bod.涎左.描画0(are); - bod.涎右.描画0(are); + bod.LeftDrool.描画0(are); + bod.RightDrool.描画0(are); bod.口.描画0(are); if (bod.鼻描画) { bod.鼻.描画0(are); - bod.鼻水左.描画0(are); - bod.鼻水右.描画0(are); + bod.LeftNoseDrip.描画0(are); + bod.RightNoseDrip.描画0(are); } bod.頭.描画2(are); bod.玉口枷.描画0(are); @@ -6731,8 +6731,8 @@ namespace SlaveMatrix bod.頬肌右.描画1(are); if (bod.涙描画) { - bod.涙左.描画0(are); - bod.涙右.描画0(are); + bod.LeftTear.描画0(are); + bod.RightTear.描画0(are); } if (!bod.Is頭頂_宇 && !bod.Is顔面 && !bod.Is額角 && !bod.Is触覚) { @@ -6789,7 +6789,7 @@ namespace SlaveMatrix bod.胸毛_人.描画0(are); } bod.舌.描画0(are); - bod.口精液.描画0(are); + bod.MouthCum.描画0(are); bod.咳.描画0(are); bod.呼気.描画0(are); if (bod.cb0 && bod.カーソル.コキ) @@ -7019,7 +7019,7 @@ namespace SlaveMatrix } if (bod.Is蜘尾) { - bod.出糸精液.描画0(are); + bod.ThreadCum.描画0(are); } if (bod.cb0) { @@ -7091,8 +7091,8 @@ namespace SlaveMatrix } bod.ピアス左.描画0(are); bod.ピアス右.描画0(are); - bod.噴乳左.描画0(are); - bod.噴乳右.描画0(are); + bod.LeftMilkSpray.描画0(are); + bod.RightMilkSpary.描画0(are); bod.キャップ2左.描画0(are); bod.キャップ2右.描画0(are); bod.胸肌_人.描画1(are); @@ -7101,7 +7101,7 @@ namespace SlaveMatrix bod.汗掻き.Draw(are); } bod.頭.描画0(are); - if (bod.Is双眼 && !bod.Is瞼宇) + if (bod.IsDualEyes && !bod.Is瞼宇) { bod.目左.描画0(are); bod.瞼左.描画0(are); @@ -7109,7 +7109,7 @@ namespace SlaveMatrix bod.瞼右.描画0(are); } bod.頭.描画1(are); - if (bod.Is単眼) + if (bod.IsSingleEye) { bod.単眼目.描画0(are); bod.単眼瞼.描画0(are); @@ -7122,12 +7122,12 @@ namespace SlaveMatrix bod.目傷右.描画0(are); bod.頬肌左.描画0(are); bod.頬肌右.描画0(are); - if (bod.Is額眼) + if (bod.IsForeheadEye) { bod.額目.描画0(are); bod.額瞼.描画0(are); } - if (bod.Is頬眼) + if (bod.IsCheekEyes) { bod.頬目左.描画0(are); bod.頬目右.描画0(are); @@ -7139,14 +7139,14 @@ namespace SlaveMatrix bod.瞼左.描画0(are); bod.瞼右.描画0(are); } - bod.涎左.描画0(are); - bod.涎右.描画0(are); + bod.LeftDrool.描画0(are); + bod.RightDrool.描画0(are); bod.口.描画0(are); if (bod.鼻描画) { bod.鼻.描画0(are); - bod.鼻水左.描画0(are); - bod.鼻水右.描画0(are); + bod.LeftNoseDrip.描画0(are); + bod.RightNoseDrip.描画0(are); } bod.頭.描画2(are); bod.玉口枷.描画0(are); @@ -7161,8 +7161,8 @@ namespace SlaveMatrix bod.頬肌右.描画1(are); if (bod.涙描画) { - bod.涙左.描画0(are); - bod.涙右.描画0(are); + bod.LeftTear.描画0(are); + bod.RightTear.描画0(are); } if (!bod.Is頭頂_宇 && !bod.Is顔面 && !bod.Is額角 && !bod.Is触覚) { @@ -7208,7 +7208,7 @@ namespace SlaveMatrix bod.胸毛_人.描画0(are); } bod.舌.描画0(are); - bod.口精液.描画0(are); + bod.MouthCum.描画0(are); bod.咳.描画0(are); bod.呼気.描画0(are); if (bod.cb0 && bod.カーソル.コキ) @@ -7443,7 +7443,7 @@ namespace SlaveMatrix } if (bod.Is蜘尾) { - bod.出糸精液.描画0(are); + bod.ThreadCum.描画0(are); } if (bod.cb0) { @@ -7511,8 +7511,8 @@ namespace SlaveMatrix } bod.ピアス左.描画0(are); bod.ピアス右.描画0(are); - bod.噴乳左.描画0(are); - bod.噴乳右.描画0(are); + bod.LeftMilkSpray.描画0(are); + bod.RightMilkSpary.描画0(are); bod.キャップ2左.描画0(are); bod.キャップ2右.描画0(are); bod.胸肌_人.描画1(are); @@ -7521,7 +7521,7 @@ namespace SlaveMatrix bod.汗掻き.Draw(are); } bod.頭.描画0(are); - if (bod.Is双眼 && !bod.Is瞼宇) + if (bod.IsDualEyes && !bod.Is瞼宇) { bod.目左.描画0(are); bod.瞼左.描画0(are); @@ -7529,7 +7529,7 @@ namespace SlaveMatrix bod.瞼右.描画0(are); } bod.頭.描画1(are); - if (bod.Is単眼) + if (bod.IsSingleEye) { bod.単眼目.描画0(are); bod.単眼瞼.描画0(are); @@ -7542,12 +7542,12 @@ namespace SlaveMatrix bod.目傷右.描画0(are); bod.頬肌左.描画0(are); bod.頬肌右.描画0(are); - if (bod.Is額眼) + if (bod.IsForeheadEye) { bod.額目.描画0(are); bod.額瞼.描画0(are); } - if (bod.Is頬眼) + if (bod.IsCheekEyes) { bod.頬目左.描画0(are); bod.頬目右.描画0(are); @@ -7559,14 +7559,14 @@ namespace SlaveMatrix bod.瞼左.描画0(are); bod.瞼右.描画0(are); } - bod.涎左.描画0(are); - bod.涎右.描画0(are); + bod.LeftDrool.描画0(are); + bod.RightDrool.描画0(are); bod.口.描画0(are); if (bod.鼻描画) { bod.鼻.描画0(are); - bod.鼻水左.描画0(are); - bod.鼻水右.描画0(are); + bod.LeftNoseDrip.描画0(are); + bod.RightNoseDrip.描画0(are); } bod.頭.描画2(are); bod.玉口枷.描画0(are); @@ -7581,8 +7581,8 @@ namespace SlaveMatrix bod.頬肌右.描画1(are); if (bod.涙描画) { - bod.涙左.描画0(are); - bod.涙右.描画0(are); + bod.LeftTear.描画0(are); + bod.RightTear.描画0(are); } if (!bod.Is頭頂_宇 && !bod.Is顔面 && !bod.Is額角 && !bod.Is触覚) { @@ -7636,7 +7636,7 @@ namespace SlaveMatrix bod.胸毛_人.描画0(are); } bod.舌.描画0(are); - bod.口精液.描画0(are); + bod.MouthCum.描画0(are); bod.咳.描画0(are); bod.呼気.描画0(are); if (bod.cb0 && bod.カーソル.コキ) @@ -7866,7 +7866,7 @@ namespace SlaveMatrix } if (bod.Is蜘尾) { - bod.出糸精液.描画0(are); + bod.ThreadCum.描画0(are); } if (bod.cb0) { @@ -7934,8 +7934,8 @@ namespace SlaveMatrix } bod.ピアス左.描画0(are); bod.ピアス右.描画0(are); - bod.噴乳左.描画0(are); - bod.噴乳右.描画0(are); + bod.LeftMilkSpray.描画0(are); + bod.RightMilkSpary.描画0(are); bod.キャップ2左.描画0(are); bod.キャップ2右.描画0(are); bod.胸肌_人.描画1(are); @@ -7944,7 +7944,7 @@ namespace SlaveMatrix bod.汗掻き.Draw(are); } bod.頭.描画0(are); - if (bod.Is双眼 && !bod.Is瞼宇) + if (bod.IsDualEyes && !bod.Is瞼宇) { bod.目左.描画0(are); bod.瞼左.描画0(are); @@ -7952,7 +7952,7 @@ namespace SlaveMatrix bod.瞼右.描画0(are); } bod.頭.描画1(are); - if (bod.Is単眼) + if (bod.IsSingleEye) { bod.単眼目.描画0(are); bod.単眼瞼.描画0(are); @@ -7965,12 +7965,12 @@ namespace SlaveMatrix bod.目傷右.描画0(are); bod.頬肌左.描画0(are); bod.頬肌右.描画0(are); - if (bod.Is額眼) + if (bod.IsForeheadEye) { bod.額目.描画0(are); bod.額瞼.描画0(are); } - if (bod.Is頬眼) + if (bod.IsCheekEyes) { bod.頬目左.描画0(are); bod.頬目右.描画0(are); @@ -7982,14 +7982,14 @@ namespace SlaveMatrix bod.瞼左.描画0(are); bod.瞼右.描画0(are); } - bod.涎左.描画0(are); - bod.涎右.描画0(are); + bod.LeftDrool.描画0(are); + bod.RightDrool.描画0(are); bod.口.描画0(are); if (bod.鼻描画) { bod.鼻.描画0(are); - bod.鼻水左.描画0(are); - bod.鼻水右.描画0(are); + bod.LeftNoseDrip.描画0(are); + bod.RightNoseDrip.描画0(are); } bod.頭.描画2(are); bod.玉口枷.描画0(are); @@ -8004,8 +8004,8 @@ namespace SlaveMatrix bod.頬肌右.描画1(are); if (bod.涙描画) { - bod.涙左.描画0(are); - bod.涙右.描画0(are); + bod.LeftTear.描画0(are); + bod.RightTear.描画0(are); } if (!bod.Is頭頂_宇 && !bod.Is顔面 && !bod.Is額角 && !bod.Is触覚) { @@ -8072,7 +8072,7 @@ namespace SlaveMatrix bod.胸毛_人.描画0(are); } bod.舌.描画0(are); - bod.口精液.描画0(are); + bod.MouthCum.描画0(are); bod.咳.描画0(are); bod.呼気.描画0(are); if (bod.cb0 && bod.カーソル.コキ) @@ -8274,7 +8274,7 @@ namespace SlaveMatrix } if (bod.Is蜘尾) { - bod.出糸精液.描画0(are); + bod.ThreadCum.描画0(are); } if (bod.cb0) { @@ -8390,8 +8390,8 @@ namespace SlaveMatrix } bod.ピアス左.描画0(are); bod.ピアス右.描画0(are); - bod.噴乳左.描画0(are); - bod.噴乳右.描画0(are); + bod.LeftMilkSpray.描画0(are); + bod.RightMilkSpary.描画0(are); bod.キャップ2左.描画0(are); bod.キャップ2右.描画0(are); bod.胸肌_人.描画1(are); @@ -8400,7 +8400,7 @@ namespace SlaveMatrix bod.汗掻き.Draw(are); } bod.頭.描画0(are); - if (bod.Is双眼 && !bod.Is瞼宇) + if (bod.IsDualEyes && !bod.Is瞼宇) { bod.目左.描画0(are); bod.瞼左.描画0(are); @@ -8408,7 +8408,7 @@ namespace SlaveMatrix bod.瞼右.描画0(are); } bod.頭.描画1(are); - if (bod.Is単眼) + if (bod.IsSingleEye) { bod.単眼目.描画0(are); bod.単眼瞼.描画0(are); @@ -8421,12 +8421,12 @@ namespace SlaveMatrix bod.目傷右.描画0(are); bod.頬肌左.描画0(are); bod.頬肌右.描画0(are); - if (bod.Is額眼) + if (bod.IsForeheadEye) { bod.額目.描画0(are); bod.額瞼.描画0(are); } - if (bod.Is頬眼) + if (bod.IsCheekEyes) { bod.頬目左.描画0(are); bod.頬目右.描画0(are); @@ -8438,14 +8438,14 @@ namespace SlaveMatrix bod.瞼左.描画0(are); bod.瞼右.描画0(are); } - bod.涎左.描画0(are); - bod.涎右.描画0(are); + bod.LeftDrool.描画0(are); + bod.RightDrool.描画0(are); bod.口.描画0(are); if (bod.鼻描画) { bod.鼻.描画0(are); - bod.鼻水左.描画0(are); - bod.鼻水右.描画0(are); + bod.LeftNoseDrip.描画0(are); + bod.RightNoseDrip.描画0(are); } bod.頭.描画2(are); bod.玉口枷.描画0(are); @@ -8460,8 +8460,8 @@ namespace SlaveMatrix bod.頬肌右.描画1(are); if (bod.涙描画) { - bod.涙左.描画0(are); - bod.涙右.描画0(are); + bod.LeftTear.描画0(are); + bod.RightTear.描画0(are); } if (!bod.Is頭頂_宇 && !bod.Is顔面 && !bod.Is額角 && !bod.Is触覚) { @@ -8515,7 +8515,7 @@ namespace SlaveMatrix bod.胸毛_人.描画0(are); } bod.舌.描画0(are); - bod.口精液.描画0(are); + bod.MouthCum.描画0(are); bod.咳.描画0(are); bod.呼気.描画0(are); if (bod.cb0 && bod.カーソル.コキ) @@ -8746,7 +8746,7 @@ namespace SlaveMatrix } if (bod.Is蜘尾) { - bod.出糸精液.描画0(are); + bod.ThreadCum.描画0(are); } if (bod.cb0) { @@ -8818,8 +8818,8 @@ namespace SlaveMatrix } bod.ピアス左.描画0(are); bod.ピアス右.描画0(are); - bod.噴乳左.描画0(are); - bod.噴乳右.描画0(are); + bod.LeftMilkSpray.描画0(are); + bod.RightMilkSpary.描画0(are); bod.キャップ2左.描画0(are); bod.キャップ2右.描画0(are); bod.胸肌_人.描画1(are); @@ -8828,7 +8828,7 @@ namespace SlaveMatrix bod.汗掻き.Draw(are); } bod.頭.描画0(are); - if (bod.Is双眼 && !bod.Is瞼宇) + if (bod.IsDualEyes && !bod.Is瞼宇) { bod.目左.描画0(are); bod.瞼左.描画0(are); @@ -8836,7 +8836,7 @@ namespace SlaveMatrix bod.瞼右.描画0(are); } bod.頭.描画1(are); - if (bod.Is単眼) + if (bod.IsSingleEye) { bod.単眼目.描画0(are); bod.単眼瞼.描画0(are); @@ -8849,12 +8849,12 @@ namespace SlaveMatrix bod.目傷右.描画0(are); bod.頬肌左.描画0(are); bod.頬肌右.描画0(are); - if (bod.Is額眼) + if (bod.IsForeheadEye) { bod.額目.描画0(are); bod.額瞼.描画0(are); } - if (bod.Is頬眼) + if (bod.IsCheekEyes) { bod.頬目左.描画0(are); bod.頬目右.描画0(are); @@ -8866,14 +8866,14 @@ namespace SlaveMatrix bod.瞼左.描画0(are); bod.瞼右.描画0(are); } - bod.涎左.描画0(are); - bod.涎右.描画0(are); + bod.LeftDrool.描画0(are); + bod.RightDrool.描画0(are); bod.口.描画0(are); if (bod.鼻描画) { bod.鼻.描画0(are); - bod.鼻水左.描画0(are); - bod.鼻水右.描画0(are); + bod.LeftNoseDrip.描画0(are); + bod.RightNoseDrip.描画0(are); } bod.頭.描画2(are); bod.玉口枷.描画0(are); @@ -8888,8 +8888,8 @@ namespace SlaveMatrix bod.頬肌右.描画1(are); if (bod.涙描画) { - bod.涙左.描画0(are); - bod.涙右.描画0(are); + bod.LeftTear.描画0(are); + bod.RightTear.描画0(are); } if (!bod.Is頭頂_宇 && !bod.Is顔面 && !bod.Is額角 && !bod.Is触覚) { @@ -8951,7 +8951,7 @@ namespace SlaveMatrix bod.胸毛_人.描画0(are); } bod.舌.描画0(are); - bod.口精液.描画0(are); + bod.MouthCum.描画0(are); bod.咳.描画0(are); bod.呼気.描画0(are); if (bod.cb0 && bod.カーソル.コキ) @@ -9127,11 +9127,11 @@ namespace SlaveMatrix public void 変動ステート更新() { - Cha.ChaD.現乳首 = Cha.ChaD.Sesnsitivities[ContactType.Milk]; - Cha.ChaD.現陰核 = Cha.ChaD.Sesnsitivities[ContactType.Nucleus]; - Cha.ChaD.現性器 = Cha.ChaD.Sesnsitivities[ContactType.Vagina].Max(Cha.ChaD.Sesnsitivities[ContactType.Sex]); - Cha.ChaD.現肛門 = Cha.ChaD.Sesnsitivities[ContactType.Anal]; - double バスト = (Cha.ChaD.最乳房 - 0.3 * Cha.ChaD.現乳房.Inverse()).Clamp(0.0, 1.0); + Cha.CharacterData.現乳首 = Cha.CharacterData.Sesnsitivities[ContactType.Milk]; + Cha.CharacterData.現陰核 = Cha.CharacterData.Sesnsitivities[ContactType.Nucleus]; + Cha.CharacterData.現性器 = Cha.CharacterData.Sesnsitivities[ContactType.Vagina].Max(Cha.CharacterData.Sesnsitivities[ContactType.Sex]); + Cha.CharacterData.現肛門 = Cha.CharacterData.Sesnsitivities[ContactType.Anal]; + double バスト = (Cha.CharacterData.最乳房 - 0.3 * Cha.CharacterData.現乳房.Inverse()).Clamp(0.0, 1.0); 乳房左.バスト = バスト; 乳房右.バスト = バスト; 下着乳首左.バスト = バスト; @@ -9142,7 +9142,7 @@ namespace SlaveMatrix 下着T_マイクロ.バスト = バスト; 下着T_ブラ.バスト = バスト; 上着T_ドレス.バスト = バスト; - double num = 0.65 * Cha.ChaD.最乳首 * Cha.ChaD.現乳首; + double num = 0.65 * Cha.CharacterData.最乳首 * Cha.CharacterData.現乳首; 乳房左.X0Y0_乳首.SizeBase = nsb1 + num; 乳房左.X0Y0_乳輪.SizeBase = nsb2 + num; 乳房左.X0Y1_乳首.SizeBase = nsb1 + num; @@ -9163,11 +9163,11 @@ namespace SlaveMatrix 乳房右.X0Y3_乳輪.SizeBase = nsb2 + num; 乳房右.X0Y4_乳首.SizeBase = nsb1 + num; 乳房右.X0Y4_乳輪.SizeBase = nsb2 + num; - 乳房左.乳首CD.不透明度 = Cha.ChaD.素乳首濃度 + Cha.ChaD.最乳首濃度 * Cha.ChaD.現乳首; - 乳房左.乳輪CD.不透明度 = Cha.ChaD.素乳首濃度 + Cha.ChaD.最乳首濃度 * Cha.ChaD.現乳首; - 乳房右.乳首CD.不透明度 = Cha.ChaD.素乳首濃度 + Cha.ChaD.最乳首濃度 * Cha.ChaD.現乳首; - 乳房右.乳輪CD.不透明度 = Cha.ChaD.素乳首濃度 + Cha.ChaD.最乳首濃度 * Cha.ChaD.現乳首; - num = 0.65 * Cha.ChaD.最陰核 * Cha.ChaD.現陰核; + 乳房左.乳首CD.不透明度 = Cha.CharacterData.素乳首濃度 + Cha.CharacterData.最乳首濃度 * Cha.CharacterData.現乳首; + 乳房左.乳輪CD.不透明度 = Cha.CharacterData.素乳首濃度 + Cha.CharacterData.最乳首濃度 * Cha.CharacterData.現乳首; + 乳房右.乳首CD.不透明度 = Cha.CharacterData.素乳首濃度 + Cha.CharacterData.最乳首濃度 * Cha.CharacterData.現乳首; + 乳房右.乳輪CD.不透明度 = Cha.CharacterData.素乳首濃度 + Cha.CharacterData.最乳首濃度 * Cha.CharacterData.現乳首; + num = 0.65 * Cha.CharacterData.最陰核 * Cha.CharacterData.現陰核; if (Is獣) { 性器_獣.X0Y0_陰核.SizeBase = csb + num; @@ -9175,10 +9175,10 @@ namespace SlaveMatrix 性器_獣.X0Y2_陰核.SizeBase = csb + num; 性器_獣.X0Y3_陰核.SizeBase = csb + num; 性器_獣.X0Y4_陰核.SizeBase = csb + num; - 性器_獣.小陰唇CD.不透明度 = Cha.ChaD.素性器濃度 + Cha.ChaD.最性器濃度 * Cha.ChaD.現性器; - 性器_獣.性器基CD.不透明度 = Cha.ChaD.素性器濃度 + Cha.ChaD.最性器濃度 * Cha.ChaD.現性器; - 肛門_獣.肛門3CD.不透明度 = Cha.ChaD.素肛門濃度 + Cha.ChaD.最肛門濃度 * Cha.ChaD.現肛門; - num = 0.3 * Cha.ChaD.現肛門; + 性器_獣.小陰唇CD.不透明度 = Cha.CharacterData.素性器濃度 + Cha.CharacterData.最性器濃度 * Cha.CharacterData.現性器; + 性器_獣.性器基CD.不透明度 = Cha.CharacterData.素性器濃度 + Cha.CharacterData.最性器濃度 * Cha.CharacterData.現性器; + 肛門_獣.肛門3CD.不透明度 = Cha.CharacterData.素肛門濃度 + Cha.CharacterData.最肛門濃度 * Cha.CharacterData.現肛門; + num = 0.3 * Cha.CharacterData.現肛門; 肛門_獣.X0Y0_肛門2.SizeBase = asb1 + num; 肛門_獣.X0Y0_肛門3.SizeBase = asb2 + num; } @@ -9189,16 +9189,16 @@ namespace SlaveMatrix 性器_人.X0Y2_陰核.SizeBase = csb + num; 性器_人.X0Y3_陰核.SizeBase = csb + num; 性器_人.X0Y4_陰核.SizeBase = csb + num; - 性器_人.小陰唇CD.不透明度 = Cha.ChaD.素性器濃度 + Cha.ChaD.最性器濃度 * Cha.ChaD.現性器; - 性器_人.性器基CD.不透明度 = Cha.ChaD.素性器濃度 + Cha.ChaD.最性器濃度 * Cha.ChaD.現性器; - 肛門_人.肛門3CD.不透明度 = Cha.ChaD.素肛門濃度 + Cha.ChaD.最肛門濃度 * Cha.ChaD.現肛門; - num = 0.3 * Cha.ChaD.現肛門; + 性器_人.小陰唇CD.不透明度 = Cha.CharacterData.素性器濃度 + Cha.CharacterData.最性器濃度 * Cha.CharacterData.現性器; + 性器_人.性器基CD.不透明度 = Cha.CharacterData.素性器濃度 + Cha.CharacterData.最性器濃度 * Cha.CharacterData.現性器; + 肛門_人.肛門3CD.不透明度 = Cha.CharacterData.素肛門濃度 + Cha.CharacterData.最肛門濃度 * Cha.CharacterData.現肛門; + num = 0.3 * Cha.CharacterData.現肛門; 肛門_人.X0Y0_肛門2.SizeBase = asb1 + num; 肛門_人.X0Y0_肛門3.SizeBase = asb2 + num; } - 腰肌_人.陰毛CD.不透明度 = Cha.ChaD.現陰毛 * Cha.ChaD.最陰毛濃度; - 腰肌_人.獣性_獣毛CD.不透明度 = Cha.ChaD.現陰毛; - 腰肌_人.陰毛_ハートCD.不透明度 = Cha.ChaD.現陰毛.Inverse() * Cha.ChaD.最陰毛濃度; + 腰肌_人.陰毛CD.不透明度 = Cha.CharacterData.現陰毛 * Cha.CharacterData.最陰毛濃度; + 腰肌_人.獣性_獣毛CD.不透明度 = Cha.CharacterData.現陰毛; + 腰肌_人.陰毛_ハートCD.不透明度 = Cha.CharacterData.現陰毛.Inverse() * Cha.CharacterData.最陰毛濃度; } public Ele GetHitEle(Color hc) @@ -9590,7 +9590,7 @@ namespace SlaveMatrix } if (Is蜘尾) { - 出糸精液.接続P(); + ThreadCum.接続P(); } if (cb0) { @@ -9654,36 +9654,36 @@ namespace SlaveMatrix public bool Is口腔() { - return 口腔位置.DistanceSquared(Cha.CP) < r17; + return 口腔位置.DistanceSquared(Cha.CursorPosition) < r17; } public bool Is陰核() { - return 陰核位置.DistanceSquared(Cha.CP) < r10; + return 陰核位置.DistanceSquared(Cha.CursorPosition) < r10; } public bool Is乳首() { - if (!(乳首左位置.DistanceSquared(Cha.CP) < r10)) + if (!(乳首左位置.DistanceSquared(Cha.CursorPosition) < r10)) { - return 乳首右位置.DistanceSquared(Cha.CP) < r10; + return 乳首右位置.DistanceSquared(Cha.CursorPosition) < r10; } return true; } public bool Is膣口() { - return 膣口位置.DistanceSquared(Cha.CP) < r10; + return 膣口位置.DistanceSquared(Cha.CursorPosition) < r10; } public bool Is胸部() { - return 胸部位置.DistanceSquared(Cha.CP) < r17; + return 胸部位置.DistanceSquared(Cha.CursorPosition) < r17; } public bool Is局部() { - return 局部位置.DistanceSquared(Cha.CP) < r35; + return 局部位置.DistanceSquared(Cha.CursorPosition) < r35; } public bool Isくぱぁ() diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs b/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs index 08e1ab0..a7ef4ad 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/CM.cs @@ -56,7 +56,7 @@ namespace SlaveMatrix { Ele.Xi = 0; Ele.Yi = 0; - Ele.濃度 = 0.5; + Ele.Intensity = 0.5; 使用状態 = UsageStatus.Standby; Under = false; 描画Show = true; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs deleted file mode 100644 index 27d712b..0000000 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs +++ /dev/null @@ -1,2162 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Drawing; -using System.Linq; -using System.Reflection; -using _2DGAMELIB; - -namespace SlaveMatrix -{ - public class Cha - { - public ModeEventDispatcher Med; - - public RenderArea Are; - - public Bod Bod; - - public ChaD ChaD; - - public 体配色 配色; - - public double FPS; - - public Vector2D CP; - - private Mot 呼吸; - - private double 呼吸速度_; - - private Mot 涙流し; - - private Mot 涙ひき; - - private bool 泣き_; - - private Mot 瞬き1; - - private Mot 瞬き2; - - public Mot 汗かき; - - public Mot 口腔精液垂れ; - - public Mot 性器精液垂れ; - - public Mot 肛門精液垂れ; - - public Mot 出糸精液垂れ; - - public Mot 潮吹小; - - public Mot 潮吹大; - - public Mot 飛沫; - - public Mot 唾散; - - public Mot 放尿; - - public Action 放尿強制終了_ = delegate - { - }; - - public Func Is放尿 = () => false; - - public Mot 噴乳; - - public double 噴乳染み; - - public Mot 鼻水; - - public Mot 涎; - - public Mot EyeTracking; - - public bool 目逸し; - - public double 絶頂激しさ; - - public double 絶頂時間; - - public Mot 絶頂終了; - - public Mot 絶頂; - - public Mot 肛ヒク; - - public Mot 膣ヒク; - - public Mot 糸ヒク; - - public Mot 顔面展開; - - public Mot 体揺れ; - - public Mot Coughing; - - public Mot ごっくん; - - private Sweat 汗掻き; - - public double 瞼基準単; - - public double 瞼基準左; - - public double 瞼基準右; - - public double 瞼基準額; - - public double 瞼基準頬左; - - public double 瞼基準頬右; - - public Action 潮吹擬音; - - public Action 放尿擬音; - - private double 呼吸_; - - private double y; - - private bool 重髪; - - private bool 重耳; - - private bool 重胸; - - private bool 重Waist; - - private bool 重腕前; - - private bool 重半後; - - private bool 重半中1; - - private bool 重半中2; - - private bool 重半前; - - private bool 重腿; - - private Vector2D p = Dat.Vec2DZero; - - public Mots Mots = new Mots(); - - public double 呼吸速度 - { - get - { - return 呼吸速度_; - } - set - { - 呼吸速度_ = value; - 呼吸.BaseSpeed = 6.0 * 呼吸速度_; - } - } - - public bool Crying - { - get - { - return 泣き_; - } - set - { - 泣き_ = value; - if (!泣き_) - { - 涙ひき.Start(); - } - } - } - - public double 呼吸値 - { - get - { - return 呼吸_; - } - set - { - 呼吸_ = value; - Bod.Chest.尺度C = 0.99 + 0.02 * 呼吸_; - Bod.胸肌_人.尺度C = Bod.Chest.尺度C; - p.Y = y * 呼吸_ * 0.5; - if (Bod.Is髪) - { - Bod.EI髪.Position = p; - } - if (Bod.Is腕前) - { - Bod.EI腕前.Position = p; - } - p.Y = y * 呼吸_ * 0.28; - if (Bod.IsChest) - { - Bod.EIChest.Position = p; - } - p.Y = 0.0 - p.Y; - Bod.Waist.位置C = p; - if (Bod.IsWaist) - { - Bod.EIWaist.Position = p; - } - if (Bod.Is半後) - { - Bod.EI半後.Position = p; - } - if (Bod.Is半中1) - { - Bod.EI半中1.Position = p; - } - if (Bod.Is半中2) - { - Bod.EI半中2.Position = p; - } - if (Bod.Is半前) - { - Bod.EI半前.Position = p; - } - if (Bod.Is腿) - { - Bod.EI腿.Position = p; - } - } - } - - public double 中出度 - { - get - { - if (Bod.カーソル != null) - { - return (1.0 / (double)(Bod.カーソル.ペニス処理.中出しCount + 1)).Inverse(); - } - return 0.0; - } - } - - public void 放尿強制終了() - { - 放尿強制終了_(); - } - - 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.DisplayUnitScale; - Bod = new Bod(Med, Are, this); - 重髪 = Bod.Is髪 && Bod.EI髪.IsHeavy(); - 重胸 = Bod.IsChest && Bod.EIChest.IsHeavy(); - 重Waist = Bod.IsWaist && Bod.EIWaist.IsHeavy(); - 重腕前 = Bod.Is腕前 && Bod.EI腕前.IsHeavy(); - 重半後 = Bod.Is半後 && Bod.EI半後.IsHeavy(); - 重半中1 = Bod.Is半中1 && Bod.EI半中1.IsHeavy(); - 重半中2 = Bod.Is半中2 && Bod.EI半中2.IsHeavy(); - 重半前 = Bod.Is半前 && Bod.EI半前.IsHeavy(); - 重腿 = Bod.Is腿 && Bod.EI腿.IsHeavy(); - 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) - { - LowestIncrease = 0.25, - BaseSpeed = 6.0 * 呼吸速度_, - Staing = delegate - { - cha.Bod.呼気.濃度 = 0.0; - cha.Bod.呼気.表示 = true; - }, - Runing = delegate(Mot m) - { - cha.Bod.呼気.濃度 = m.Value.Inverse() * cha.呼吸速度_; - cha.呼吸値 = m.Value; - }, - Reaing = delegate - { - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.Bod.呼気.表示 = false; - cha.Bod.呼気.濃度 = 1.0; - cha.呼吸値 = 0.0; - } - }; - Mots.Add(呼吸.GetHashCode().ToString(), 呼吸); - 呼吸速度 = 0.2; - 呼吸.Start(); - bool go = true; - bool 涙左 = Bod.涙左 != null; - bool 涙右 = Bod.涙右 != null; - 涙流し = new Mot(0.0, 1.0) - { - BaseSpeed = 3.0, - Staing = delegate - { - go = true; - if (涙左) - { - if (cha.Bod.Is双眼) - { - cha.Bod.目左.黒目_ハイライト下_表示 = true; - } - if (cha.Bod.Is頬眼) - { - cha.Bod.頬目左.黒目_ハイライト下_表示 = true; - } - if (cha.Bod.Is単眼) - { - cha.Bod.単眼目.黒目_ハイライト下_表示 = true; - } - if (cha.Bod.Is額眼) - { - cha.Bod.額目.黒目_ハイライト下_表示 = true; - } - cha.Bod.涙左.涙0流れ0_表示 = cha.Bod.涙左.涙0流れ1_表示 || cha.Bod.涙左.涙0_表示; - cha.Bod.涙左.涙0流れ1_表示 = cha.Bod.涙左.涙0_表示; - cha.Bod.涙左.涙0_表示 = !cha.Bod.涙左.涙0_表示; - cha.Bod.涙左.涙ハイライト_表示 = cha.Bod.涙左.涙0_表示; - cha.Bod.涙左.Yv = 0.0; - cha.Bod.涙左.涙0流れ1CD.不透明度 = 1.0; - } - if (涙右) - { - if (cha.Bod.Is双眼) - { - cha.Bod.目右.黒目_ハイライト下_表示 = true; - } - if (cha.Bod.Is頬眼) - { - cha.Bod.頬目右.黒目_ハイライト下_表示 = true; - } - cha.Bod.涙右.涙0流れ0_表示 = cha.Bod.涙右.涙0流れ1_表示 || cha.Bod.涙右.涙0_表示; - cha.Bod.涙右.涙0流れ1_表示 = cha.Bod.涙右.涙0_表示; - cha.Bod.涙右.涙0_表示 = !cha.Bod.涙右.涙0_表示; - cha.Bod.涙右.涙ハイライト_表示 = cha.Bod.涙右.涙0_表示; - cha.Bod.涙右.Yv = 0.0; - cha.Bod.涙右.涙0流れ1CD.不透明度 = 1.0; - } - }, - Runing = delegate(Mot m) - { - if (go) - { - if (涙左) - { - cha.Bod.涙左.Yv = m.Value; - } - if (涙右) - { - cha.Bod.涙右.Yv = m.Value; - } - } - else - { - if (涙左) - { - cha.Bod.涙左.涙0流れ1CD.不透明度 = m.Value; - } - if (涙右) - { - cha.Bod.涙右.涙0流れ1CD.不透明度 = m.Value; - } - } - }, - Reaing = delegate - { - go = false; - if (涙左) - { - cha.Bod.涙左.Yv = 1.0; - } - if (涙右) - { - cha.Bod.涙右.Yv = 1.0; - } - }, - Rouing = delegate(Mot m) - { - m.End(); - }, - Ending = delegate - { - } - }; - Mots.Add(涙流し.GetHashCode().ToString(), 涙流し); - double vi; - 涙ひき = new Mot(0.0, 1.0) - { - BaseSpeed = 1.0, - Staing = delegate - { - }, - Runing = delegate(Mot m) - { - vi = m.Value.Inverse(); - if (涙左) - { - cha.Bod.涙左.濃度 *= vi; - if (cha.Bod.Is双眼) - { - cha.Bod.目左.黒目_ハイライト下CD.不透明度 *= vi; - } - if (cha.Bod.Is頬眼) - { - cha.Bod.頬目左.黒目_ハイライト下CD.不透明度 *= vi; - } - if (cha.Bod.Is単眼) - { - cha.Bod.単眼目.黒目_ハイライト下CD.不透明度 *= vi; - } - if (cha.Bod.Is額眼) - { - cha.Bod.額目.黒目_ハイライト下CD.不透明度 *= vi; - } - } - if (涙右) - { - cha.Bod.涙右.濃度 *= vi; - if (cha.Bod.Is双眼) - { - cha.Bod.目右.黒目_ハイライト下CD.不透明度 *= vi; - } - if (cha.Bod.Is頬眼) - { - cha.Bod.頬目右.黒目_ハイライト下CD.不透明度 *= vi; - } - } - }, - Reaing = delegate(Mot m) - { - m.End(); - m.ResetValue(); - if (涙左) - { - cha.Bod.涙左.表示 = false; - cha.Bod.涙左.濃度 = 1.0; - if (cha.Bod.Is双眼) - { - cha.Bod.目左.黒目_ハイライト下_表示 = false; - cha.Bod.目左.黒目_ハイライト下CD.不透明度 = 1.0; - } - if (cha.Bod.Is頬眼) - { - cha.Bod.頬目左.黒目_ハイライト下_表示 = false; - cha.Bod.頬目左.黒目_ハイライト下CD.不透明度 = 1.0; - } - if (cha.Bod.Is単眼) - { - cha.Bod.単眼目.黒目_ハイライト下_表示 = false; - cha.Bod.単眼目.黒目_ハイライト下CD.不透明度 = 1.0; - } - if (cha.Bod.Is額眼) - { - cha.Bod.額目.黒目_ハイライト下_表示 = false; - cha.Bod.額目.黒目_ハイライト下CD.不透明度 = 1.0; - } - } - if (涙右) - { - cha.Bod.涙右.表示 = false; - cha.Bod.涙右.濃度 = 1.0; - if (cha.Bod.Is双眼) - { - cha.Bod.目右.黒目_ハイライト下_表示 = false; - cha.Bod.目右.黒目_ハイライト下CD.不透明度 = 1.0; - } - if (cha.Bod.Is頬眼) - { - cha.Bod.頬目右.黒目_ハイライト下_表示 = false; - cha.Bod.頬目右.黒目_ハイライト下CD.不透明度 = 1.0; - } - } - }, - Rouing = delegate - { - }, - Ending = delegate - { - } - }; - Mots.Add(涙ひき.GetHashCode().ToString(), 涙ひき); - if (Bod.Is双眼 || Bod.Is単眼) - { - 瞬き1 = new Mot(0.0, 1.0) - { - BaseSpeed = 10.0, - GotoSpeed = 8.0, - RetuSpeed = 0.5, - LowestIncrease = 1.0, - Interval = 1000.0, - Staing = delegate - { - }, - Runing = delegate(Mot m) - { - if (cha.Bod.Is双眼) - { - cha.Bod.瞼左v = m.Value.Clamp(cha.Bod.Is瞼宇 ? 0.0 : cha.瞼基準左, 1.0); - cha.Bod.瞼右v = m.Value.Clamp(cha.Bod.Is瞼宇 ? 0.0 : cha.瞼基準右, 1.0); - } - if (cha.Bod.Is単眼) - { - cha.Bod.単眼瞼.Yv = m.Value.Clamp(cha.Bod.Is瞼宇 ? 0.0 : cha.瞼基準単, 1.0); - } - }, - Reaing = delegate - { - if (cha.泣き_) - { - cha.涙流し.Start(); - } - }, - Rouing = delegate(Mot m) - { - m.Interval = 5000.0 * RNG.XS.NextDouble(); - }, - Ending = delegate - { - } - }; - Mots.Add(瞬き1.GetHashCode().ToString(), 瞬き1); - 瞬き1.Start(); - } - if (Bod.Is頬眼 || Bod.Is額眼) - { - 瞬き2 = new Mot(0.0, 1.0) - { - BaseSpeed = 10.0, - GotoSpeed = 8.0, - RetuSpeed = 0.5, - LowestIncrease = 1.0, - Interval = 1000.0, - Staing = delegate - { - }, - Runing = delegate(Mot m) - { - if (cha.Bod.Is頬眼) - { - cha.Bod.頬瞼左.Yv = m.Value.Clamp(cha.瞼基準頬左, 1.0); - cha.Bod.頬瞼右.Yv = m.Value.Clamp(cha.瞼基準頬右, 1.0); - } - if (cha.Bod.Is額眼) - { - cha.Bod.額瞼.Yv = m.Value.Clamp(cha.瞼基準額, 1.0); - } - }, - Reaing = delegate - { - }, - Rouing = delegate(Mot m) - { - m.Interval = 5000.0 * RNG.XS.NextDouble(); - }, - Ending = delegate - { - } - }; - Mots.Add(瞬き2.GetHashCode().ToString(), 瞬き2); - 瞬き2.Start(); - } - bool o = false; - double ov = 0.0; - 口腔精液垂れ = new Mot(0.0, 1.0) - { - BaseSpeed = 0.8, - Staing = delegate - { - cha.Bod.口精液.Yi = 0; - ov = cha.中出度; - cha.Bod.口精液.濃度 = 1.0 * ov; - cha.Bod.口精液.精液_表示 = true; - o = true; - cha.Bod.口精液.右 = RNG.XS.NextBool(); - }, - Runing = delegate(Mot m) - { - if (o) - { - cha.Bod.口精液.Yv = m.Value; - } - else - { - cha.Bod.口精液.濃度 = m.Value * ov; - } - }, - Reaing = delegate - { - o = false; - }, - Rouing = delegate(Mot m) - { - cha.Bod.口精液.表示 = false; - m.End(); - }, - Ending = delegate - { - } - }; - Mots.Add(口腔精液垂れ.GetHashCode().ToString(), 口腔精液垂れ); - bool v = false; - double vv = 0.0; - double zd = Bod.膣内精液.精液濃度; - 性器精液垂れ = new Mot(0.0, 1.0) - { - BaseSpeed = 0.8, - Staing = delegate - { - cha.Bod.性器精液.Yi = 0; - vv = cha.中出度; - cha.Bod.性器精液.濃度 = 1.0 * vv; - cha.Bod.性器精液.精液_表示 = true; - v = true; - zd = cha.Bod.膣内精液.精液濃度; - cha.Bod.性器精液.右 = RNG.XS.NextBool(); - }, - Runing = delegate(Mot m) - { - if (v) - { - cha.Bod.性器精液.Yv = m.Value; - cha.Bod.膣内精液.精液濃度 = zd * m.Value.Inverse(); - } - else - { - cha.Bod.性器精液.濃度 = m.Value * vv; - } - }, - Reaing = delegate - { - v = false; - }, - Rouing = delegate(Mot m) - { - cha.Bod.性器精液.表示 = false; - m.End(); - }, - Ending = delegate - { - } - }; - Mots.Add(性器精液垂れ.GetHashCode().ToString(), 性器精液垂れ); - bool a = false; - double av = 0.0; - 肛門精液垂れ = new Mot(0.0, 1.0) - { - BaseSpeed = 0.8, - Staing = delegate - { - cha.Bod.肛門精液.Yi = 0; - av = cha.中出度; - cha.Bod.肛門精液.濃度 = 1.0 * av; - cha.Bod.肛門精液.精液_表示 = true; - a = true; - cha.Bod.肛門精液.右 = RNG.XS.NextBool(); - }, - Runing = delegate(Mot m) - { - if (a) - { - cha.Bod.肛門精液.Yv = m.Value; - } - else - { - cha.Bod.肛門精液.濃度 = m.Value * av; - } - }, - Reaing = delegate - { - a = false; - }, - Rouing = delegate(Mot m) - { - cha.Bod.肛門精液.表示 = false; - m.End(); - }, - Ending = delegate - { - } - }; - Mots.Add(肛門精液垂れ.GetHashCode().ToString(), 肛門精液垂れ); - bool z = false; - double zv = 0.0; - 出糸精液垂れ = new Mot(0.0, 1.0) - { - BaseSpeed = 0.8, - Staing = delegate - { - cha.Bod.出糸精液.Yi = 0; - zv = cha.中出度; - cha.Bod.出糸精液.濃度 = 1.0 * zv; - cha.Bod.出糸精液.精液_表示 = true; - z = true; - cha.Bod.出糸精液.右 = RNG.XS.NextBool(); - }, - Runing = delegate(Mot m) - { - if (z) - { - cha.Bod.出糸精液.Yv = m.Value; - } - else - { - cha.Bod.出糸精液.濃度 = m.Value * zv; - } - }, - Reaing = delegate - { - z = false; - }, - Rouing = delegate(Mot m) - { - cha.Bod.出糸精液.表示 = false; - m.End(); - }, - Ending = delegate - { - } - }; - Mots.Add(出糸精液垂れ.GetHashCode().ToString(), 出糸精液垂れ); - 潮吹小 = new Mot(0.0, 1.0) - { - BaseSpeed = 4.0, - Staing = delegate - { - cha.Bod.潮吹_小.Yv = 0.0; - cha.Bod.潮吹_小.表示 = true; - }, - Runing = delegate(Mot m) - { - cha.Bod.潮吹_小.Yv = m.Value; - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.Bod.潮吹_小.表示 = false; - cha.Bod.飛沫濃度 = (cha.Bod.飛沫濃度 + 0.01).Clamp(0.0, 1.0); - } - }; - Mots.Add(潮吹小.GetHashCode().ToString(), 潮吹小); - 潮吹大 = new Mot(0.0, 1.0) - { - BaseSpeed = 4.0, - Staing = delegate - { - cha.Bod.潮吹_大.Yv = 0.0; - cha.Bod.潮吹_大.表示 = true; - cha.Bod.潮吹_大.右 = RNG.XS.NextBool(); - if (cha.潮吹擬音 != null) - { - cha.潮吹擬音(); - } - }, - Runing = delegate(Mot m) - { - cha.Bod.潮吹_大.Yv = m.Value; - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.Bod.潮吹_大.表示 = false; - cha.Bod.潮染み濃度 = (cha.Bod.潮染み濃度 + 0.2).Clamp(0.0, 1.0); - } - }; - Mots.Add(潮吹大.GetHashCode().ToString(), 潮吹大); - 飛沫 = new Mot(0.0, 1.0) - { - BaseSpeed = 4.0, - Staing = delegate - { - cha.Bod.飛沫.Yv = 0.0; - cha.Bod.飛沫.表示 = true; - cha.Bod.飛沫.右 = RNG.XS.NextBool(); - }, - Runing = delegate(Mot m) - { - cha.Bod.飛沫.Yv = m.Value; - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.Bod.飛沫.表示 = false; - cha.Bod.飛沫濃度 = (cha.Bod.飛沫濃度 + 0.03).Clamp(0.0, 1.0); - } - }; - Mots.Add(飛沫.GetHashCode().ToString(), 飛沫); - 唾散 = new Mot(0.0, 1.0) - { - BaseSpeed = 3.0, - Staing = delegate - { - cha.Bod.咳.Yv = 0.0; - cha.Bod.咳.表示 = true; - }, - Runing = delegate(Mot m) - { - cha.Bod.咳.Yv = m.Value; - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.Bod.咳.表示 = false; - } - }; - Mots.Add(唾散.GetHashCode().ToString(), 唾散); - Mot 染み = new Mot(0.0, 1.0) - { - BaseSpeed = 0.1, - Staing = delegate - { - }, - Runing = delegate(Mot m) - { - cha.Bod.尿染み濃度 = m.Value; - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - } - }; - Mots.Add(染み.GetHashCode().ToString(), 染み); - Mot 放尿1 = null; - Mot 放尿2 = new Mot(0.0, 1.0) - { - BaseSpeed = 1.0, - Staing = delegate - { - }, - Runing = delegate(Mot m) - { - cha.Bod.放尿.濃度 = m.Value.Inverse(); - ChaD.Shyness = (ChaD.Shyness + 0.002).Clamp(0.0, 1.0); - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.Bod.放尿.表示 = false; - cha.Bod.放尿.濃度 = 1.0; - 放尿1.End(); - } - }; - Mots.Add(放尿2.GetHashCode().ToString(), 放尿2); - Stopwatch sw = new Stopwatch(); - 放尿1 = new Mot(8.0, 10.0) - { - BaseSpeed = 10.0, - Staing = delegate - { - cha.Bod.放尿.Yi = 8; - sw.Start(); - }, - Runing = delegate(Mot m) - { - if (sw.ElapsedMilliseconds > 4000) - { - 放尿2.Start(); - } - else if (cha.放尿擬音 != null) - { - cha.放尿擬音(); - } - cha.Bod.放尿.Yi = (int)m.Value; - ChaD.Shyness = (ChaD.Shyness + 0.002).Clamp(0.0, 1.0); - }, - Reaing = delegate - { - }, - Rouing = delegate - { - }, - Ending = delegate - { - sw.Reset(); - } - }; - Mots.Add(放尿1.GetHashCode().ToString(), 放尿1); - Mot 湯気 = new Mot(0.0, 1.0) - { - BaseSpeed = 0.2, - Staing = delegate - { - cha.Bod.湯気左濃度 = 0.0; - cha.Bod.湯気右濃度 = 0.0; - }, - Runing = delegate(Mot m) - { - cha.Bod.湯気左濃度 = m.Value; - cha.Bod.湯気右濃度 = m.Value; - }, - Reaing = delegate - { - }, - Rouing = delegate(Mot m) - { - m.End(); - }, - Ending = delegate - { - } - }; - Mots.Add(湯気.GetHashCode().ToString(), 湯気); - 放尿 = new Mot(0.0, 1.0) - { - BaseSpeed = 0.6, - Staing = delegate - { - cha.Bod.放尿.Yv = 0.0; - cha.Bod.放尿.表示 = true; - if (cha.Bod.尿染み濃度 != 1.0) - { - 染み.Start(); - } - //Sounds.放尿.Play(); - }, - Runing = delegate(Mot m) - { - cha.Bod.放尿.Yv = m.Value; - if (cha.放尿擬音 != null) - { - cha.放尿擬音(); - } - ChaD.Shyness = (ChaD.Shyness + 0.002).Clamp(0.0, 1.0); - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - 放尿1.Start(); - 湯気.Start(); - } - }; - Mots.Add(放尿.GetHashCode().ToString(), 放尿); - 放尿強制終了_ = delegate - { - cha.放尿.End(); - 放尿1.End(); - 湯気.End(); - 放尿2.End(); - 染み.End(); - }; - Is放尿 = () => cha.放尿.Run || 放尿1.Run || 放尿2.Run; - 噴乳 = new Mot(0.0, 1.0) - { - BaseSpeed = 2.0, - Staing = delegate - { - cha.Bod.噴乳左.Yi = 0; - cha.Bod.噴乳右.Yi = 0; - cha.Bod.噴乳左.母乳1_表示 = true; - cha.Bod.噴乳左.母乳2_表示 = true; - cha.Bod.噴乳左.母乳3_表示 = true; - cha.Bod.噴乳左.母乳4_表示 = true; - cha.Bod.噴乳右.母乳1_表示 = true; - cha.Bod.噴乳右.母乳2_表示 = true; - cha.Bod.噴乳右.母乳3_表示 = true; - cha.Bod.噴乳右.母乳4_表示 = true; - }, - Runing = delegate(Mot m) - { - cha.Bod.噴乳左.Yv = m.Value; - cha.Bod.噴乳右.Yv = m.Value; - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.Bod.噴乳左.母乳1_表示 = false; - cha.Bod.噴乳左.母乳2_表示 = false; - cha.Bod.噴乳左.母乳3_表示 = false; - cha.Bod.噴乳左.母乳4_表示 = false; - cha.Bod.噴乳左.母乳垂れ1_表示 = true; - cha.Bod.噴乳左.母乳垂れ2_表示 = true; - cha.Bod.噴乳右.母乳1_表示 = false; - cha.Bod.噴乳右.母乳2_表示 = false; - cha.Bod.噴乳右.母乳3_表示 = false; - cha.Bod.噴乳右.母乳4_表示 = false; - cha.Bod.噴乳右.母乳垂れ1_表示 = true; - cha.Bod.噴乳右.母乳垂れ2_表示 = true; - cha.噴乳染み = (cha.噴乳染み + 0.03).Clamp(0.0, 1.0); - } - }; - Mots.Add(噴乳.GetHashCode().ToString(), 噴乳); - bool hm = false; - bool 鼻水左 = Bod.鼻水左 != null; - bool 鼻水右 = Bod.鼻水右 != null; - 鼻水 = new Mot(0.0, 1.0) - { - BaseSpeed = 3.0, - Staing = delegate - { - hm = RNG.XS.NextBool(); - if (鼻水左 && hm && cha.Bod.鼻水左.Yv != 1.0 && cha.Bod.鼻水右.Yv != 1.0) - { - cha.Bod.鼻水左.Yv = 0.0; - cha.Bod.鼻水左.表示 = true; - } - if (鼻水右 && !hm && cha.Bod.鼻水左.Yv != 1.0 && cha.Bod.鼻水右.Yv != 1.0) - { - cha.Bod.鼻水右.Yv = 0.0; - cha.Bod.鼻水右.表示 = true; - } - }, - Runing = delegate(Mot m) - { - if (鼻水左 && hm && cha.Bod.鼻水左.Yv != 1.0 && cha.Bod.鼻水右.Yv != 1.0) - { - cha.Bod.鼻水左.Yv = m.Value; - } - if (鼻水右 && !hm && cha.Bod.鼻水左.Yv != 1.0 && cha.Bod.鼻水右.Yv != 1.0) - { - cha.Bod.鼻水右.Yv = m.Value; - } - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - } - }; - Mots.Add(鼻水.GetHashCode().ToString(), 鼻水); - bool yb = false; - bool 涎左 = Bod.涎左 != null; - bool 涎右 = Bod.涎右 != null; - 涎 = new Mot(0.0, 1.0) - { - BaseSpeed = 3.0, - Staing = delegate - { - yb = RNG.XS.NextBool(); - if (涎左 && yb && cha.Bod.涎左.Yv != 1.0 && cha.Bod.涎右.Yv != 1.0) - { - cha.Bod.涎左.Yv = 0.0; - cha.Bod.涎左.表示 = true; - } - if (涎右 && !yb && cha.Bod.涎左.Yv != 1.0 && cha.Bod.涎右.Yv != 1.0) - { - cha.Bod.涎右.Yv = 0.0; - cha.Bod.涎右.表示 = true; - } - }, - Runing = delegate(Mot m) - { - if (涎左 && yb && cha.Bod.涎左.Yv != 1.0 && cha.Bod.涎右.Yv != 1.0) - { - cha.Bod.涎左.Yv = m.Value; - } - if (涎右 && !yb && cha.Bod.涎左.Yv != 1.0 && cha.Bod.涎右.Yv != 1.0) - { - cha.Bod.涎右.Yv = m.Value; - } - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - } - }; - Mots.Add(涎.GetHashCode().ToString(), 涎); - int s; - Vector2D ev; - EyeTracking = new Mot(0.0, 1.0) - { - BaseSpeed = 0.1, - Staing = delegate - { - }, - Runing = delegate - { - s = ((!cha.目逸し) ? 1 : (-1)); - if (cha.目逸し) - { - if (cha.Bod.Is双眼) - { - ev = s * (cha.CP - (cha.Bod.目左.位置 + cha.Bod.目右.位置) * 0.5).newNormalize() * 0.002; - cha.Bod.目左.視線 = ev; - cha.Bod.目右.視線 = ev; - } - if (cha.Bod.Is頬眼) - { - ev = s * (cha.CP - (cha.Bod.頬目左.位置 + cha.Bod.頬目右.位置) * 0.5).newNormalize() * 0.00089; - cha.Bod.頬目左.視線 = ev; - cha.Bod.頬目右.視線 = ev; - } - if (cha.Bod.Is額眼) - { - ev = s * (cha.CP - cha.Bod.額目.位置).newNormalize() * 0.00089; - cha.Bod.額目.視線 = ev; - } - if (cha.Bod.Is単眼) - { - ev = s * (cha.CP - cha.Bod.単眼目.位置).newNormalize() * 0.003; - cha.Bod.単眼目.視線 = ev; - } - } - else - { - if (cha.Bod.Is双眼) - { - cha.Bod.目左.視線 = s * (cha.CP - cha.Bod.目左.位置).newNormalize() * 0.002; - cha.Bod.目右.視線 = s * (cha.CP - cha.Bod.目右.位置).newNormalize() * 0.002; - } - if (cha.Bod.Is頬眼) - { - cha.Bod.頬目左.視線 = s * (cha.CP - cha.Bod.頬目左.位置).newNormalize() * 0.00089; - cha.Bod.頬目右.視線 = s * (cha.CP - cha.Bod.頬目右.位置).newNormalize() * 0.00089; - } - if (cha.Bod.Is額眼) - { - cha.Bod.額目.視線 = s * (cha.CP - cha.Bod.額目.位置).newNormalize() * 0.00089; - } - if (cha.Bod.Is単眼) - { - cha.Bod.単眼目.視線 = s * (cha.CP - cha.Bod.単眼目.位置).newNormalize() * 0.003; - } - } - }, - Reaing = delegate - { - }, - Rouing = delegate - { - }, - Ending = delegate - { - } - }; - Mots.Add(EyeTracking.GetHashCode().ToString(), EyeTracking); - double l = 1.0; - 絶頂終了 = new Mot(0.0, 1.0) - { - BaseSpeed = 0.2 - 0.15 * 絶頂時間, - Staing = delegate(Mot m) - { - m.BaseSpeed = 0.2 - 0.15 * cha.絶頂時間; - l = 1.0; - }, - Runing = delegate(Mot m) - { - l = m.Value.Inverse(); - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.絶頂.End(); - Player.絶頂終了処理(); - } - }; - Mots.Add(絶頂終了.GetHashCode().ToString(), 絶頂終了); - double kv = 0.0; - Par pa = Bod.Waist.Body.CurJoinRoot; - Par pb = null; - Vector2D vec = Dat.Vec2DZero; - Action 腰接続 = delegate - { - pb = cha.Bod.Waist.Body.CurJoinRoot; - vec = pb.ToGlobal(pb.JP[5].Joint) - pa.ToGlobal(pa.JP[5].Joint); - if (cha.Bod.IsWaist) - { - if (cha.重Waist) - { - cha.Bod.EIWaist.PositionCont = vec; - } - else - { - cha.Bod.EIWaist.Updatef = true; - } - } - if (cha.Bod.Is半後) - { - if (cha.重半後) - { - cha.Bod.EI半後.PositionCont = vec; - } - else - { - cha.Bod.EI半後.Updatef = true; - } - } - if (cha.Bod.Is半中1) - { - if (cha.重半中1) - { - cha.Bod.EI半中1.PositionCont = vec; - } - else - { - cha.Bod.EI半中1.Updatef = true; - } - } - if (cha.Bod.Is半中2) - { - if (cha.重半中2) - { - cha.Bod.EI半中2.PositionCont = vec; - } - else - { - cha.Bod.EI半中2.Updatef = true; - } - } - if (cha.Bod.Is半前) - { - if (cha.重半前) - { - cha.Bod.EI半前.PositionCont = vec; - } - else - { - cha.Bod.EI半前.Updatef = true; - } - } - if (cha.Bod.Is腿) - { - if (cha.重腿) - { - cha.Bod.EI腿.PositionCont = vec; - } - else - { - cha.Bod.EI腿.Updatef = true; - } - } - }; - double d; - 絶頂 = new Mot(0.0, 1.0) - { - BaseSpeed = 20.0, - Staing = delegate - { - kv = cha.Bod.Waist.Yv; - cha.絶頂終了.Start(); - }, - Runing = delegate(Mot m) - { - d = 5.0 * (0.15 + cha.絶頂激しさ) * m.Value.Sin() * RNG.XS.NextDouble() * l; - if (cha.Bod.Arm人n > 0) - { - cha.腕人絶頂(d); - } - if (cha.Bod.腕翼鳥n > 0) - { - cha.腕翼鳥絶頂(d); - } - if (cha.Bod.腕翼獣n > 0) - { - cha.腕翼獣絶頂(d); - } - if (cha.Bod.腕獣n > 0) - { - cha.腕獣絶頂(d); - } - if (cha.Bod.Is触覚他) - { - cha.触覚絶頂(d); - } - if (cha.Bod.Is触覚甲) - { - cha.触覚甲絶頂(d); - } - if (cha.Bod.大顎n > 0) - { - cha.大顎絶頂(d); - } - if (cha.Bod.虫顎n > 0) - { - cha.虫顎絶頂(d); - } - if (cha.Bod.鰭n > 0) - { - cha.鰭絶頂(d); - } - if (cha.Bod.葉n > 0) - { - cha.葉絶頂(d); - } - if (cha.Bod.前翅1n > 0) - { - cha.前翅絶頂(d); - } - if (cha.Bod.後翅1n > 0) - { - cha.後翅絶頂(d); - } - if (cha.Bod.触肢蜘n > 0) - { - cha.触肢蜘絶頂(d); - } - if (cha.Bod.触肢蠍n > 0) - { - cha.触肢蠍絶頂(d); - } - if (cha.Bod.節足蜘n > 0) - { - cha.節足蜘絶頂(d); - } - if (cha.Bod.節足蠍n > 0) - { - cha.節足蠍絶頂(d); - } - if (cha.Bod.節足百n > 0) - { - cha.節足百絶頂(d); - } - if (cha.Bod.節尾曳n > 0) - { - cha.節尾曳絶頂(d); - } - if (cha.Bod.節尾鋏n > 0) - { - cha.節尾鋏絶頂(d); - } - if (cha.Bod.虫鎌n > 0) - { - cha.虫鎌絶頂(d); - } - if (cha.Bod.触手n > 0) - { - cha.触手絶頂(d); - } - if (cha.Bod.触手犬n > 0) - { - cha.触手犬絶頂(d); - } - if (cha.Bod.尾n > 0) - { - cha.尾絶頂(d); - } - if (cha.Bod.Is植) - { - cha.植絶頂(d); - } - if (cha.Bod.脚人n > 0) - { - cha.脚人絶頂(d); - } - if (cha.Bod.脚獣n > 0) - { - cha.脚獣絶頂(d); - } - cha.Bod.腰振りv = d * RNG.XS.NextDouble(); - cha.Bod.Waist.位置C = new Vector2D(0.0, 0.0005 * d); - cha.Bod.乳房左.位置C = cha.Bod.Waist.位置C; - cha.Bod.乳房右.位置C = cha.Bod.Waist.位置C; - if (cha.Bod.Is腕前) - { - cha.Bod.EI腕前.Updatef = true; - } - 腰接続(); - Player.絶頂中処理(); - if (0.3.Lot()) - { - Player.奴体力消費中(); - } - }, - Reaing = delegate - { - }, - Rouing = delegate - { - }, - Ending = delegate - { - cha.Bod.腰振り_人v = kv; - cha.Bod.Waist.位置C = Dat.Vec2DZero; - if (!cha.Bod.乳房左.着衣) - { - cha.Bod.乳房左.位置C = Dat.Vec2DZero; - cha.Bod.乳房右.位置C = Dat.Vec2DZero; - } - if (cha.Bod.IsWaist) - { - cha.Bod.EIWaist.PositionCont = Dat.Vec2DZero; - } - if (cha.Bod.Is半後) - { - cha.Bod.EI半後.PositionCont = Dat.Vec2DZero; - } - if (cha.Bod.Is半中1) - { - cha.Bod.EI半中1.PositionCont = Dat.Vec2DZero; - } - if (cha.Bod.Is半中2) - { - cha.Bod.EI半中2.PositionCont = Dat.Vec2DZero; - } - if (cha.Bod.Is半前) - { - cha.Bod.EI半前.PositionCont = Dat.Vec2DZero; - } - if (cha.Bod.Is腿) - { - cha.Bod.EI腿.PositionCont = Dat.Vec2DZero; - } - } - }; - Mots.Add(絶頂.GetHashCode().ToString(), 絶頂); - Stopwatch 肛sw = new Stopwatch(); - 肛ヒク = new Mot(0.0, 1.0) - { - BaseSpeed = 1.0, - Staing = delegate - { - 肛sw.Restart(); - }, - Runing = delegate(Mot m) - { - cha.Bod.肛門C = 0.5 + m.Value.Sin() * RNG.XS.NextDouble() * 0.5; - if (肛sw.ElapsedMilliseconds > 5000) - { - m.End(); - } - }, - Reaing = delegate - { - }, - Rouing = delegate - { - }, - Ending = delegate - { - 肛sw.Stop(); - cha.Bod.肛門C = 1.0; - } - }; - Mots.Add(肛ヒク.GetHashCode().ToString(), 肛ヒク); - Stopwatch 膣sw = new Stopwatch(); - 膣ヒク = new Mot(0.0, 1.0) - { - BaseSpeed = 1.0, - Staing = delegate - { - 膣sw.Restart(); - }, - Runing = delegate(Mot m) - { - cha.Bod.膣腔C = 1.0 + m.Value.Sin() * RNG.XS.NextDouble() * 0.5; - if (膣sw.ElapsedMilliseconds > 5000) - { - m.End(); - } - }, - Reaing = delegate - { - }, - Rouing = delegate - { - }, - Ending = delegate - { - 膣sw.Stop(); - cha.Bod.膣腔C = 1.0; - } - }; - Mots.Add(膣ヒク.GetHashCode().ToString(), 膣ヒク); - Stopwatch 糸sw = new Stopwatch(); - 糸ヒク = new Mot(0.0, 1.0) - { - BaseSpeed = 0.1, - Staing = delegate - { - 糸sw.Restart(); - }, - Runing = delegate(Mot m) - { - if (cha.Bod.Is蜘尾) - { - cha.Bod.出糸C = m.Value.Sin() * 30.0; - } - if (糸sw.ElapsedMilliseconds > 5000) - { - m.End(); - } - }, - Reaing = delegate - { - }, - Rouing = delegate - { - }, - Ending = delegate - { - 糸sw.Stop(); - if (cha.Bod.Is蜘尾) - { - cha.Bod.出糸C = 0.0; - } - } - }; - Mots.Add(糸ヒク.GetHashCode().ToString(), 糸ヒク); - bool 顔面開き = false; - bool Is展開 = Bod.Is顔面 || Bod.Is大顎基; - 顔面 顔面 = Bod.顔面; - 大顎基 大顎 = Bod.頭.大顎基_接続.GetEle<大顎基>(); - 角1_虫 虫角 = Bod.頭.額_接続.GetEle<角1_虫>(); - double o_ = 0.0; - 顔面展開 = new Mot(0.0, 1.0) - { - BaseSpeed = 5.0, - Staing = delegate - { - if (Is展開) - { - 顔面開き = o_ == 1.0; - } - }, - Runing = delegate(Mot m) - { - if (Is展開) - { - if (顔面開き) - { - o_ = m.Value.Inverse(); - } - else - { - o_ = m.Value; - } - if (cha.Bod.Is顔面) - { - 顔面.展開0 = o_; - 顔面.展開1 = o_; - } - if (cha.Bod.Is大顎基) - { - 大顎.展開 = o_; - } - if (cha.Bod.Is虫角) - { - 虫角.展開 = o_; - } - } - }, - Reaing = delegate(Mot m) - { - m.End(); - }, - Rouing = delegate - { - }, - Ending = delegate - { - } - }; - Mots.Add(顔面展開.GetHashCode().ToString(), 顔面展開); - Vector2D p_ = Dat.Vec2DZero; - double d_; - 体揺れ = new Mot(0.0, 1.0) - { - BaseSpeed = 7.0, - Staing = delegate - { - }, - Runing = delegate(Mot m) - { - d_ = 2.0 * m.Value; - if (cha.Bod.Arm人n > 0) - { - cha.腕人絶頂(d_); - } - if (cha.Bod.腕翼鳥n > 0) - { - cha.腕翼鳥絶頂(d_); - } - if (cha.Bod.腕翼獣n > 0) - { - cha.腕翼獣絶頂(d_); - } - if (cha.Bod.腕獣n > 0) - { - cha.腕獣絶頂(d_); - } - if (cha.Bod.Is触覚他) - { - cha.触覚絶頂(d_); - } - if (cha.Bod.Is触覚甲) - { - cha.触覚甲絶頂(d_); - } - if (cha.Bod.大顎n > 0) - { - cha.大顎絶頂(d_); - } - if (cha.Bod.虫顎n > 0) - { - cha.虫顎絶頂(d_); - } - if (cha.Bod.鰭n > 0) - { - cha.鰭絶頂(d_); - } - if (cha.Bod.葉n > 0) - { - cha.葉絶頂(d_); - } - if (cha.Bod.前翅1n > 0) - { - cha.前翅絶頂(0.0 - d_); - } - if (cha.Bod.後翅1n > 0) - { - cha.後翅絶頂(0.0 - d_); - } - if (cha.Bod.触肢蜘n > 0) - { - cha.触肢蜘絶頂(d_); - } - if (cha.Bod.触肢蠍n > 0) - { - cha.触肢蠍絶頂(d_); - } - if (cha.Bod.節足蜘n > 0) - { - cha.節足蜘絶頂(d_); - } - if (cha.Bod.節足蠍n > 0) - { - cha.節足蠍絶頂(d_); - } - if (cha.Bod.節足百n > 0) - { - cha.節足百絶頂(d_); - } - if (cha.Bod.節尾曳n > 0) - { - cha.節尾曳絶頂(d_); - } - if (cha.Bod.節尾鋏n > 0) - { - cha.節尾鋏絶頂(d_); - } - if (cha.Bod.虫鎌n > 0) - { - cha.虫鎌絶頂(d_); - } - if (cha.Bod.触手n > 0) - { - cha.触手絶頂(d_); - } - if (cha.Bod.触手犬n > 0) - { - cha.触手犬絶頂(d_); - } - if (cha.Bod.尾n > 0) - { - cha.尾絶頂(d_); - } - if (cha.Bod.Is植) - { - cha.植絶頂(d_); - } - if (cha.Bod.脚人n > 0) - { - cha.脚人絶頂(d_); - } - if (cha.Bod.脚獣n > 0) - { - cha.脚獣絶頂(d_); - } - p_.Y = -0.001 * m.Value; - cha.Bod.Waist.位置C = p_; - cha.Bod.乳房左.位置C = cha.Bod.Waist.位置C; - cha.Bod.乳房右.位置C = cha.Bod.Waist.位置C; - if (cha.Bod.Is髪) - { - if (cha.重髪) - { - cha.Bod.EI髪.Position = p_; - } - else - { - cha.Bod.EI髪.Updatef = true; - } - } - if (cha.Bod.IsChest) - { - if (cha.重胸) - { - cha.Bod.EIChest.Position = p_; - } - else - { - cha.Bod.EIChest.Updatef = true; - } - } - if (cha.Bod.IsWaist) - { - if (cha.重Waist) - { - cha.Bod.EIWaist.Position = p_; - } - else - { - cha.Bod.EIWaist.Updatef = true; - } - } - if (cha.Bod.Is腕前) - { - if (cha.重腕前) - { - cha.Bod.EI腕前.Position = p_; - } - else - { - cha.Bod.EI腕前.Updatef = true; - } - } - if (cha.Bod.Is半後) - { - if (cha.重半後) - { - cha.Bod.EI半後.Position = p_; - } - else - { - cha.Bod.EI半後.Updatef = true; - } - } - if (cha.Bod.Is半中1) - { - if (cha.重半中1) - { - cha.Bod.EI半中1.Position = p_; - } - else - { - cha.Bod.EI半中1.Updatef = true; - } - } - if (cha.Bod.Is半中2) - { - if (cha.重半中2) - { - cha.Bod.EI半中2.Position = p_; - } - else - { - cha.Bod.EI半中2.Updatef = true; - } - } - if (cha.Bod.Is半前) - { - if (cha.重半前) - { - cha.Bod.EI半前.Position = p_; - } - else - { - cha.Bod.EI半前.Updatef = true; - } - } - if (cha.Bod.Is腿) - { - if (cha.重腿) - { - cha.Bod.EI腿.Position = p_; - } - else - { - cha.Bod.EI腿.Updatef = true; - } - } - }, - Reaing = delegate - { - }, - Rouing = delegate(Mot m) - { - m.End(); - }, - Ending = delegate - { - cha.Bod.Waist.位置C = Dat.Vec2DZero; - if (!cha.Bod.乳房左.着衣) - { - cha.Bod.乳房左.位置C = Dat.Vec2DZero; - cha.Bod.乳房右.位置C = Dat.Vec2DZero; - } - if (cha.Bod.Is髪) - { - cha.Bod.EI髪.Position = Dat.Vec2DZero; - } - if (cha.Bod.IsChest) - { - cha.Bod.EIChest.Position = Dat.Vec2DZero; - } - if (cha.Bod.IsWaist) - { - cha.Bod.EIWaist.Position = Dat.Vec2DZero; - } - if (cha.Bod.Is腕前) - { - cha.Bod.EI腕前.Position = Dat.Vec2DZero; - } - if (cha.Bod.Is半後) - { - cha.Bod.EI半後.Position = Dat.Vec2DZero; - } - if (cha.Bod.Is半中1) - { - cha.Bod.EI半中1.Position = Dat.Vec2DZero; - } - if (cha.Bod.Is半中2) - { - cha.Bod.EI半中2.Position = Dat.Vec2DZero; - } - if (cha.Bod.Is半前) - { - cha.Bod.EI半前.Position = Dat.Vec2DZero; - } - if (cha.Bod.Is腿) - { - cha.Bod.EI腿.Position = Dat.Vec2DZero; - } - } - }; - Mots.Add(体揺れ.GetHashCode().ToString(), 体揺れ); - int c_ = 0; - int 咳込み数 = 1; - Coughing = new Mot(0.0, 1.0) - { - BaseSpeed = 10.0, - GotoSpeed = 0.5, - RetuSpeed = 2.0, - Staing = delegate - { - cha.UpdateExpression(); - if (cha.Bod.Is双眼) - { - cha.両瞼_1(RNG.XS.Next(1, 4), RNG.XS.Next(1, 4)); - } - else if (cha.Bod.Is単眼) - { - cha.単瞼_1(RNG.XS.Next(1, 4)); - } - if (cha.Bod.Is頬眼) - { - cha.両頬瞼_1(RNG.XS.Next(1, 4), RNG.XS.Next(1, 4)); - } - if (cha.Bod.Is額眼) - { - cha.額瞼_1(RNG.XS.Next(1, 4)); - } - c_ = 0; - 咳込み数 = RNG.XS.NextM(1, 2) + Player.UI.ペニス処理.中出しCount / 2; - }, - Runing = delegate(Mot m) - { - cha.呼吸値 = m.Value; - }, - Reaing = delegate - { - cha.唾散.Start(); - if ((Player.UI.ペニス処理.中出し || cha.Crying) && 0.18.Lot()) - { - cha.鼻水.Start(); - } - if (Player.UI.ペニス処理.中出し && 0.25.Lot()) - { - cha.涎.Start(); - } - }, - Rouing = delegate(Mot m) - { - c_++; - if (c_ >= 咳込み数) - { - m.End(); - } - }, - Ending = delegate - { - cha.SetInitialExpression(); - cha.口(); - } - }; - Mots.Add(Coughing.GetHashCode().ToString(), Coughing); - double 中出度_ = 0.0; - ごっくん = new Mot(0.0, 1.0) - { - BaseSpeed = 1.0, - Staing = delegate - { - cha.UpdateExpression(); - cha.口_紡ぎ(); - 中出度_ = cha.中出度; - }, - Runing = delegate(Mot m) - { - cha.呼吸値 = m.Value; - }, - Reaing = delegate - { - }, - Rouing = delegate(Mot m) - { - m.End(); - }, - Ending = delegate - { - if (RNG.XS.NextBool()) - { - //Sounds.挿抜口1.Play(); - } - else - { - //Sounds.挿抜口2.Play(); - } - ChaD.Stamina = (ChaD.Stamina + 0.3 * 中出度_).Clamp(0.0, 1.0); - } - }; - Mots.Add(ごっくん.GetHashCode().ToString(), ごっくん); - Mots.Drive(Med.FPSF); - Med.SetUniqueColor(Bod.Elements.Select((Ele e) => e.Body.EnumAllPar()).JoinEnum()); - 汗掻き = new Sweat(Med, Are, this, Mots); - 汗かき = 汗掻き.汗かき; - Bod.汗掻き = 汗掻き; - this.SetInitialAngle(); - } - - public void Draw(RenderArea Are, FPS FPS) - { - this.FPS = FPS.Value; - Mots.Drive(FPS); - Bod.描画(Are); - } - - public void Dispose() - { - Bod.Dispose(); - 汗掻き.Dispose(); - Med.RemUniqueColor(Bod.Elements.Select((Ele e) => e.Body.EnumAllPar()).JoinEnum()); - } - - public void Set衣装(IEnumerable 衣装) - { - Bod.脱衣(); - Dictionary dictionary = new Dictionary(); - Dictionary dictionary2 = new Dictionary(); - string ts; - foreach (object item in 衣装) - { - Type type = item.GetType(); - ts = type.ToString(); - if (dictionary.ContainsKey(type)) - { - dictionary2[type][dictionary[type]].SetValue(Bod, item, null); - dictionary[type]++; - continue; - } - dictionary.Add(type, 0); - dictionary2.Add(type, (from e in Sta.Bodt.GetProperties() - where e.PropertyType.ToString() == ts - select e).ToArray()); - dictionary2[type][dictionary[type]].SetValue(Bod, item, null); - dictionary[type]++; - } - if (!ChaD.股施術 && Bod.Is股防御()) - { - Bod.Setピアス = Sta.ピアス初期化; - } - if (!ChaD.胸施術 && Bod.Is胸甲殻()) - { - Bod.Setピアス左 = Sta.ピアス初期化; - Bod.Setピアス右 = Sta.ピアス初期化; - } - } - - public ContactD GetContact(ref Color HitColor) - { - ContactD result = default(ContactD); - result.e = this.Bod.GetHitEle(HitColor); - if (result.e != null) - { - result.p = result.e.Body.GetHitPar_(HitColor); - bool flag = false; - bool flag2 = result.e is Shoulder || result.e is UpperArm || result.e is LowerArm || 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; - } - else if (result.e is 耳 || result.e is 獣耳) - { - result.c = ContactType.Ear; - } - else if (this.Bod.Is口腔()) - { - result.c = ContactType.Mouth; - } - else if (result.e is Head) - { - result.c = ContactType.Face; - } - 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 Neck) - { - result.c = ContactType.Neck; - } - else if (result.e is Shoulder) - { - result.c = ContactType.Shoulder; - } - else if (!flag2 && !this.Bod.乳房左.虫性_甲殻_表示 && !(result.p.Tag == "乳房") && this.Bod.Is乳首()) - { - result.c = ContactType.Milk; - } - else if (result.e is 乳房) - { - result.c = ContactType.Chest; - } - else if (result.e is Chest) - { - result.c = ContactType.Side; - } - else if (((result.e is Waist || result.e is 四足腰) && result.p != null && result.p.Tag == "下腹") || result.e is ボテ腹) - { - result.c = ContactType.Stomache; - } - else if ((flag = !flag2 && this.Bod.Isくぱぁ()) && result.e is 肛門) - { - result.c = ContactType.Anal; - } - else if (flag && this.Bod.Is陰核()) - { - result.c = ContactType.Nucleus; - } - else if (flag && this.Bod.Is膣口()) - { - result.c = ContactType.Vagina; - } - else if (flag && result.e is 性器) - { - result.c = ContactType.Sex; - } - else if (flag && this.Bod.Is局部()) - { - result.c = ContactType.Crotch; - } - else if (result.e is 尾_蜘 && (result.p.Tag.Contains("出糸突起左") || result.p.Tag.Contains("出糸突起中") || result.p.Tag.Contains("出糸突起右"))) - { - result.c = ContactType.Thread; - } - else if (result.e.ConnectionType.ToString().Contains("腿") && !result.e.ConnectionType.Is左右無し()) - { - result.c = ContactType.Thigh; - } - else if (result.e is 足_人) - { - result.c = ContactType.Feet; - } - else if (result.e is 手_人) - { - result.c = ContactType.Hand; - } - else if (result.e is 触覚) - { - result.c = ContactType.Awareness; - } - else if (result.e is 触手) - { - result.c = ContactType.Touch; - } - else if (result.e.ConnectionType.ToString().Contains("尾")) - { - result.c = ContactType.Tail; - } - else if (result.e is 前翅 || result.e is 後翅 || result.e is UpperArm_鳥 || result.e is LowerArm_鳥 || result.e is 手_鳥 || result.e is UpperArm_蝙 || result.e is LowerArm_蝙 || result.e is 手_蝙) - { - result.c = ContactType.Wing; - } - else if (result.e is 鰭) - { - result.c = ContactType.Fin; - } - else - { - result.c = ContactType.Other; - } - } - return result; - } - } -} diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs new file mode 100644 index 0000000..87ce60f --- /dev/null +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Character.cs @@ -0,0 +1,1853 @@ +using _2DGAMELIB; +using SlaveMatrix.GameClasses; +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Drawing; +using System.Linq; +using System.Reflection; + +namespace SlaveMatrix +{ + public class Character + { + private sealed class BodyPartRef + { + public EleI EI; + public bool Heavy; + + public BodyPartRef(EleI ei, bool heavy) + { + this.EI = ei; + this.Heavy = heavy; + } + } + + private CharacterFluidSystem fluids; + + private List _moveParts; + private List _contParts; + + public ModeEventDispatcher ModeEventDispatcher; + + public RenderArea RenderArea; + + public Body Body; + + public CharacterData CharacterData; + + public BodyColorSet ColorSet; + + public double FPS; + + public Vector2D CursorPosition; + + private Motion Breathing; + + private double BaseBreathingSpeed; + + private Motion TearFlow; + + private Motion TearFade; + + private bool 泣き_; + + private Motion BlinkMain; + + private Motion BlinkExtra; + + public Motion 汗かき; + + public Motion MouthCumDrip; + + public Motion GenitalCumDrip; + + public Motion AnalCumDrip; + + public Motion ThreadCumDrip; + + public Motion SquirtSmall; + + public Motion SquirtLarge; + + public Motion Splash => fluids.Splash; + + public Motion SpitSplash => fluids.SpitSplash; + + public Motion Urination; + + public Action 放尿強制終了_ = delegate + { + }; + + public Func IsUrinating = () => false; + + public Motion MilkSpray; + + public double MilkStain; + + public Motion NoseDrip => fluids.NoseDrip; + + public Motion Drool => fluids.Drool; + + public Motion EyeTracking; + + public bool LookAway; + + public double ClimaxIntensity; + + public double ClimaxDuration; + + public Motion ClimaxEnd; + + public Motion Climax; + + public Motion 肛ヒク; + + public Motion 膣ヒク; + + public Motion 糸ヒク; + + public Motion 顔面展開; + + public Motion BodySway; + + public Motion Cough; + + public Motion Swallow; + + private Sweat 汗掻き; + + public double 瞼基準単; + + public double 瞼基準左; + + public double 瞼基準右; + + public double 瞼基準額; + + public double 瞼基準頬左; + + public double 瞼基準頬右; + + public Action 潮吹擬音; + + public Action 放尿擬音; + + private double 呼吸_; + + private double y; + + private bool 重髪; + + private bool 重耳; + + private bool 重胸; + + private bool 重Waist; + + private bool 重腕前; + + private bool 重半後; + + private bool 重半中1; + + private bool 重半中2; + + private bool 重半前; + + private bool 重腿; + + private Vector2D p = Dat.Vec2DZero; + + private delegate void MorphMotion(double value); + + private List _morphMotions; + private List _morphMotionsBodySway; + + public Motions Motions = new Motions(); + + private void InitMorphMotions() + { + _morphMotions = new List(32); + _morphMotionsBodySway = new List(32); + + if (Body.Arm人n > 0) + { + _morphMotions.Add(this.腕人絶頂); + _morphMotionsBodySway.Add(this.腕人絶頂); + } + + if (Body.腕翼鳥n > 0) + { + _morphMotions.Add(this.腕翼鳥絶頂); + _morphMotionsBodySway.Add(this.腕翼鳥絶頂); + } + + if (Body.腕翼獣n > 0) + { + _morphMotions.Add(this.腕翼獣絶頂); + _morphMotionsBodySway.Add(this.腕翼獣絶頂); + } + + if (Body.腕獣n > 0) + { + _morphMotions.Add(this.腕獣絶頂); + _morphMotionsBodySway.Add(this.腕獣絶頂); + } + + if (Body.Is触覚他) + { + _morphMotions.Add(this.触覚絶頂); + _morphMotionsBodySway.Add(this.触覚絶頂); + } + + if (Body.Is触覚甲) + { + _morphMotions.Add(this.触覚甲絶頂); + _morphMotionsBodySway.Add(this.触覚甲絶頂); + } + + if (Body.大顎n > 0) + { + _morphMotions.Add(this.大顎絶頂); + _morphMotionsBodySway.Add(this.大顎絶頂); + } + + if (Body.虫顎n > 0) + { + _morphMotions.Add(this.虫顎絶頂); + _morphMotionsBodySway.Add(this.虫顎絶頂); + } + + if (Body.鰭n > 0) + { + _morphMotions.Add(this.鰭絶頂); + _morphMotionsBodySway.Add(this.鰭絶頂); + } + + if (Body.葉n > 0) + { + _morphMotions.Add(this.葉絶頂); + _morphMotionsBodySway.Add(this.葉絶頂); + } + + if (Body.前翅1n > 0) + { + _morphMotions.Add(this.前翅絶頂); + _morphMotionsBodySway.Add(v => this.前翅絶頂(-v)); + } + + if (Body.後翅1n > 0) + { + _morphMotions.Add(this.後翅絶頂); + _morphMotionsBodySway.Add(v => this.後翅絶頂(-v)); + } + + if (Body.触肢蜘n > 0) + { + _morphMotions.Add(this.触肢蜘絶頂); + _morphMotionsBodySway.Add(this.触肢蜘絶頂); + } + + if (Body.触肢蠍n > 0) + { + _morphMotions.Add(this.触肢蠍絶頂); + _morphMotionsBodySway.Add(this.触肢蠍絶頂); + } + + if (Body.節足蜘n > 0) + { + _morphMotions.Add(this.節足蜘絶頂); + _morphMotionsBodySway.Add(this.節足蜘絶頂); + } + + if (Body.節足蠍n > 0) + { + _morphMotions.Add(this.節足蠍絶頂); + _morphMotionsBodySway.Add(this.節足蠍絶頂); + } + + if (Body.節足百n > 0) + { + _morphMotions.Add(this.節足百絶頂); + _morphMotionsBodySway.Add(this.節足百絶頂); + } + + if (Body.節尾曳n > 0) + { + _morphMotions.Add(this.節尾曳絶頂); + _morphMotionsBodySway.Add(this.節尾曳絶頂); + } + + if (Body.節尾鋏n > 0) + { + _morphMotions.Add(this.節尾鋏絶頂); + _morphMotionsBodySway.Add(this.節尾鋏絶頂); + } + + if (Body.虫鎌n > 0) + { + _morphMotions.Add(this.虫鎌絶頂); + _morphMotionsBodySway.Add(this.虫鎌絶頂); + } + + if (Body.触手n > 0) + { + _morphMotions.Add(this.触手絶頂); + _morphMotionsBodySway.Add(this.触手絶頂); + } + + if (Body.触手犬n > 0) + { + _morphMotions.Add(this.触手犬絶頂); + _morphMotionsBodySway.Add(this.触手犬絶頂); + } + + if (Body.尾n > 0) + { + _morphMotions.Add(this.尾絶頂); + _morphMotionsBodySway.Add(this.尾絶頂); + } + + if (Body.Is植) + { + _morphMotions.Add(this.植絶頂); + _morphMotionsBodySway.Add(this.植絶頂); + } + + if (Body.脚人n > 0) + { + _morphMotions.Add(this.脚人絶頂); + _morphMotionsBodySway.Add(this.脚人絶頂); + } + + if (Body.脚獣n > 0) + { + _morphMotions.Add(this.脚獣絶頂); + _morphMotionsBodySway.Add(this.脚獣絶頂); + } + } + private void ApplyMorphMotions(double value, bool invertWingForBoddySway) + { + List list = invertWingForBoddySway ? _morphMotions : _morphMotionsBodySway; + + for (int i = 0; i < list.Count; i++) + list[i](value); + } + private void ApplyMoveParts(Vector2D offset) + { + for (int i = 0; i < _moveParts.Count; i++) + { + var part = _moveParts[i]; + + if (part.Heavy) + part.EI.Position = offset; + else + part.EI.Updatef = true; + } + } + private void ResetMoveParts() + { + for (int i = 0; i < _moveParts.Count; i++) + _moveParts[i].EI.Position = Dat.Vec2DZero; + } + private void ApplyContParts(Vector2D offset) + { + for (int i = 0; i < _moveParts.Count; i++) + { + var part = _moveParts[i]; + + if (part.Heavy) + part.EI.PositionCont = offset; + else + part.EI.Updatef = true; + } + } + private void ResetContParts() + { + for (int i = 0; i < _moveParts.Count; i++) + _moveParts[i].EI.PositionCont = Dat.Vec2DZero; + } + public double BreathingSpeed + { + get + { + return BaseBreathingSpeed; + } + set + { + BaseBreathingSpeed = value; + Breathing.BaseSpeed = 6.0 * BaseBreathingSpeed; + } + } + public bool Crying + { + get + { + return 泣き_; + } + set + { + 泣き_ = value; + if (!泣き_) + { + TearFade.Start(); + } + } + } + public double BreathingValue + { + get + { + return 呼吸_; + } + set + { + 呼吸_ = value; + Body.Chest.尺度C = 0.99 + 0.02 * 呼吸_; + Body.胸肌_人.尺度C = Body.Chest.尺度C; + p.Y = y * 呼吸_ * 0.5; + if (Body.Is髪) + { + Body.EI髪.Position = p; + } + if (Body.Is腕前) + { + Body.EI腕前.Position = p; + } + p.Y = y * 呼吸_ * 0.28; + if (Body.IsChest) + { + Body.EIChest.Position = p; + } + p.Y = 0.0 - p.Y; + Body.Waist.位置C = p; + if (Body.IsWaist) + { + Body.EIWaist.Position = p; + } + if (Body.Is半後) + { + Body.EI半後.Position = p; + } + if (Body.Is半中1) + { + Body.EI半中1.Position = p; + } + if (Body.Is半中2) + { + Body.EI半中2.Position = p; + } + if (Body.Is半前) + { + Body.EI半前.Position = p; + } + if (Body.Is腿) + { + Body.EI腿.Position = p; + } + } + } + public double InternalCumLevel + { + get + { + if (Body.カーソル != null) + { + return (1.0 / (double)(Body.カーソル.ペニス処理.中出しCount + 1)).Inverse(); + } + return 0.0; + } + } + public void 放尿強制終了() + { + 放尿強制終了_(); + } + + public Character(ModeEventDispatcher Med, RenderArea Are, CharacterData ChaD) + { + Character cha = this; + this.ModeEventDispatcher = Med; + this.RenderArea = Are; + this.CharacterData = ChaD; + ColorSet = new BodyColorSet(ChaD.body_color); + _ = Are.DisplayUnitScale; + Body = new Body(Med, Are, this); + + fluids = new CharacterFluidSystem(this, Body, ChaD, Motions); + fluids.Initialize(); + + InitMorphMotions(); + + 重髪 = Body.Is髪 && Body.EI髪.IsHeavy(); + 重胸 = Body.IsChest && Body.EIChest.IsHeavy(); + 重Waist = Body.IsWaist && Body.EIWaist.IsHeavy(); + 重腕前 = Body.Is腕前 && Body.EI腕前.IsHeavy(); + 重半後 = Body.Is半後 && Body.EI半後.IsHeavy(); + 重半中1 = Body.Is半中1 && Body.EI半中1.IsHeavy(); + 重半中2 = Body.Is半中2 && Body.EI半中2.IsHeavy(); + 重半前 = Body.Is半前 && Body.EI半前.IsHeavy(); + 重腿 = Body.Is腿 && Body.EI腿.IsHeavy(); + + _moveParts = new List(9); + _contParts = new List(6); + + if (Body.Is髪) _moveParts.Add(new BodyPartRef(Body.EI髪, 重髪)); + if (Body.IsChest) _moveParts.Add(new BodyPartRef(Body.EIChest, 重胸)); + if (Body.IsWaist) _moveParts.Add(new BodyPartRef(Body.EIWaist, 重Waist)); + if (Body.Is腕前) _moveParts.Add(new BodyPartRef(Body.EI腕前, 重腕前)); + if (Body.Is半後) _moveParts.Add(new BodyPartRef(Body.EI半後, 重半後)); + if (Body.Is半中1) _moveParts.Add(new BodyPartRef(Body.EI半中1, 重半中1)); + if (Body.Is半中2) _moveParts.Add(new BodyPartRef(Body.EI半中2, 重半中2)); + if (Body.Is半前) _moveParts.Add(new BodyPartRef(Body.EI半前, 重半前)); + if (Body.Is腿) _moveParts.Add(new BodyPartRef(Body.EI腿, 重腿)); + + if (Body.IsWaist) _contParts.Add(new BodyPartRef(Body.EIWaist, 重Waist)); + if (Body.Is半後) _contParts.Add(new BodyPartRef(Body.EI半後, 重半後)); + if (Body.Is半中1) _contParts.Add(new BodyPartRef(Body.EI半中1, 重半中1)); + if (Body.Is半中2) _contParts.Add(new BodyPartRef(Body.EI半中2, 重半中2)); + if (Body.Is半前) _contParts.Add(new BodyPartRef(Body.EI半前, 重半前)); + if (Body.Is腿) _contParts.Add(new BodyPartRef(Body.EI腿, 重腿)); + + double 尺度C = Body.Chest.尺度C; + Body.Chest.尺度C = 0.99; + double num = Body.Chest.X0Y0_胸郭.ToGlobal(Body.Chest.X0Y0_胸郭.JP[0].Joint).Y; + Body.Chest.尺度C = 1.01; + double num2 = Body.Chest.X0Y0_胸郭.ToGlobal(Body.Chest.X0Y0_胸郭.JP[0].Joint).Y; + Body.Chest.尺度C = 尺度C; + y = num2 - num; + Breathing = new Motion(0.0, 1.0) + { + LowestIncrease = 0.25, + BaseSpeed = 6.0 * BaseBreathingSpeed, + OnStart = delegate + { + cha.Body.呼気.Intensity = 0.0; + cha.Body.呼気.表示 = true; + }, + OnUpdate = delegate(Motion m) + { + cha.Body.呼気.Intensity = m.Value.Inverse() * cha.BaseBreathingSpeed; + cha.BreathingValue = m.Value; + }, + OnReach = delegate + { + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + cha.Body.呼気.表示 = false; + cha.Body.呼気.Intensity = 1.0; + cha.BreathingValue = 0.0; + } + }; + Motions.Add(Breathing.GetHashCode().ToString(), Breathing); + BreathingSpeed = 0.2; + Breathing.Start(); + bool IsTearFlow = true; + bool LeftTear = Body.LeftTear != null; + bool RightTear = Body.RightTear != null; + TearFlow = new Motion(0.0, 1.0) + { + BaseSpeed = 3.0, + OnStart = delegate + { + IsTearFlow = true; + if (LeftTear) + { + if (cha.Body.IsDualEyes) + { + cha.Body.目左.黒目_ハイライト下_表示 = true; + } + if (cha.Body.IsCheekEyes) + { + cha.Body.頬目左.黒目_ハイライト下_表示 = true; + } + if (cha.Body.IsSingleEye) + { + cha.Body.単眼目.黒目_ハイライト下_表示 = true; + } + if (cha.Body.IsForeheadEye) + { + cha.Body.額目.黒目_ハイライト下_表示 = true; + } + cha.Body.LeftTear.Tear0流れ0_表示 = cha.Body.LeftTear.Tear0流れ1_表示 || cha.Body.LeftTear.Tear0_表示; + cha.Body.LeftTear.Tear0流れ1_表示 = cha.Body.LeftTear.Tear0_表示; + cha.Body.LeftTear.Tear0_表示 = !cha.Body.LeftTear.Tear0_表示; + cha.Body.LeftTear.Tearハイライト_表示 = cha.Body.LeftTear.Tear0_表示; + cha.Body.LeftTear.Yv = 0.0; + cha.Body.LeftTear.Tear0流れ1CD.不透明度 = 1.0; + } + if (RightTear) + { + if (cha.Body.IsDualEyes) + { + cha.Body.目右.黒目_ハイライト下_表示 = true; + } + if (cha.Body.IsCheekEyes) + { + cha.Body.頬目右.黒目_ハイライト下_表示 = true; + } + cha.Body.RightTear.Tear0流れ0_表示 = cha.Body.RightTear.Tear0流れ1_表示 || cha.Body.RightTear.Tear0_表示; + cha.Body.RightTear.Tear0流れ1_表示 = cha.Body.RightTear.Tear0_表示; + cha.Body.RightTear.Tear0_表示 = !cha.Body.RightTear.Tear0_表示; + cha.Body.RightTear.Tearハイライト_表示 = cha.Body.RightTear.Tear0_表示; + cha.Body.RightTear.Yv = 0.0; + cha.Body.RightTear.Tear0流れ1CD.不透明度 = 1.0; + } + }, + OnUpdate = delegate(Motion m) + { + if (IsTearFlow) + { + if (LeftTear) + { + cha.Body.LeftTear.Yv = m.Value; + } + if (RightTear) + { + cha.Body.RightTear.Yv = m.Value; + } + } + else + { + if (LeftTear) + { + cha.Body.LeftTear.Tear0流れ1CD.不透明度 = m.Value; + } + if (RightTear) + { + cha.Body.RightTear.Tear0流れ1CD.不透明度 = m.Value; + } + } + }, + OnReach = delegate + { + IsTearFlow = false; + if (LeftTear) + { + cha.Body.LeftTear.Yv = 1.0; + } + if (RightTear) + { + cha.Body.RightTear.Yv = 1.0; + } + }, + OnLoop = delegate(Motion m) + { + m.End(); + }, + OnEnd = delegate + { + } + }; + Motions.Add(TearFlow.GetHashCode().ToString(), TearFlow); + double vi; + TearFade = new Motion(0.0, 1.0) + { + BaseSpeed = 1.0, + OnStart = delegate + { + }, + OnUpdate = delegate(Motion m) + { + vi = m.Value.Inverse(); + if (LeftTear) + { + cha.Body.LeftTear.Intensity *= vi; + if (cha.Body.IsDualEyes) + { + cha.Body.目左.黒目_ハイライト下CD.不透明度 *= vi; + } + if (cha.Body.IsCheekEyes) + { + cha.Body.頬目左.黒目_ハイライト下CD.不透明度 *= vi; + } + if (cha.Body.IsSingleEye) + { + cha.Body.単眼目.黒目_ハイライト下CD.不透明度 *= vi; + } + if (cha.Body.IsForeheadEye) + { + cha.Body.額目.黒目_ハイライト下CD.不透明度 *= vi; + } + } + if (RightTear) + { + cha.Body.RightTear.Intensity *= vi; + if (cha.Body.IsDualEyes) + { + cha.Body.目右.黒目_ハイライト下CD.不透明度 *= vi; + } + if (cha.Body.IsCheekEyes) + { + cha.Body.頬目右.黒目_ハイライト下CD.不透明度 *= vi; + } + } + }, + OnReach = delegate(Motion m) + { + m.End(); + m.ResetValue(); + if (LeftTear) + { + cha.Body.LeftTear.表示 = false; + cha.Body.LeftTear.Intensity = 1.0; + if (cha.Body.IsDualEyes) + { + cha.Body.目左.黒目_ハイライト下_表示 = false; + cha.Body.目左.黒目_ハイライト下CD.不透明度 = 1.0; + } + if (cha.Body.IsCheekEyes) + { + cha.Body.頬目左.黒目_ハイライト下_表示 = false; + cha.Body.頬目左.黒目_ハイライト下CD.不透明度 = 1.0; + } + if (cha.Body.IsSingleEye) + { + cha.Body.単眼目.黒目_ハイライト下_表示 = false; + cha.Body.単眼目.黒目_ハイライト下CD.不透明度 = 1.0; + } + if (cha.Body.IsForeheadEye) + { + cha.Body.額目.黒目_ハイライト下_表示 = false; + cha.Body.額目.黒目_ハイライト下CD.不透明度 = 1.0; + } + } + if (RightTear) + { + cha.Body.RightTear.表示 = false; + cha.Body.RightTear.Intensity = 1.0; + if (cha.Body.IsDualEyes) + { + cha.Body.目右.黒目_ハイライト下_表示 = false; + cha.Body.目右.黒目_ハイライト下CD.不透明度 = 1.0; + } + if (cha.Body.IsCheekEyes) + { + cha.Body.頬目右.黒目_ハイライト下_表示 = false; + cha.Body.頬目右.黒目_ハイライト下CD.不透明度 = 1.0; + } + } + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + } + }; + Motions.Add(TearFade.GetHashCode().ToString(), TearFade); + if (Body.IsDualEyes || Body.IsSingleEye) + { + BlinkMain = new Motion(0.0, 1.0) + { + BaseSpeed = 10.0, + GotoSpeed = 8.0, + RetuSpeed = 0.5, + LowestIncrease = 1.0, + Interval = 1000.0, + OnStart = delegate + { + }, + OnUpdate = delegate(Motion m) + { + if (cha.Body.IsDualEyes) + { + cha.Body.瞼左v = m.Value.Clamp(cha.Body.Is瞼宇 ? 0.0 : cha.瞼基準左, 1.0); + cha.Body.瞼右v = m.Value.Clamp(cha.Body.Is瞼宇 ? 0.0 : cha.瞼基準右, 1.0); + } + if (cha.Body.IsSingleEye) + { + cha.Body.単眼瞼.Yv = m.Value.Clamp(cha.Body.Is瞼宇 ? 0.0 : cha.瞼基準単, 1.0); + } + }, + OnReach = delegate + { + if (cha.泣き_) + { + cha.TearFlow.Start(); + } + }, + OnLoop = delegate(Motion m) + { + m.Interval = 5000.0 * RNG.XS.NextDouble(); + }, + OnEnd = delegate + { + } + }; + Motions.Add(BlinkMain.GetHashCode().ToString(), BlinkMain); + BlinkMain.Start(); + } + if (Body.IsCheekEyes || Body.IsForeheadEye) + { + BlinkExtra = new Motion(0.0, 1.0) + { + BaseSpeed = 10.0, + GotoSpeed = 8.0, + RetuSpeed = 0.5, + LowestIncrease = 1.0, + Interval = 1000.0, + OnStart = delegate + { + }, + OnUpdate = delegate(Motion m) + { + if (cha.Body.IsCheekEyes) + { + cha.Body.頬瞼左.Yv = m.Value.Clamp(cha.瞼基準頬左, 1.0); + cha.Body.頬瞼右.Yv = m.Value.Clamp(cha.瞼基準頬右, 1.0); + } + if (cha.Body.IsForeheadEye) + { + cha.Body.額瞼.Yv = m.Value.Clamp(cha.瞼基準額, 1.0); + } + }, + OnReach = delegate + { + }, + OnLoop = delegate(Motion m) + { + m.Interval = 5000.0 * RNG.XS.NextDouble(); + }, + OnEnd = delegate + { + } + }; + Motions.Add(BlinkExtra.GetHashCode().ToString(), BlinkExtra); + BlinkExtra.Start(); + } + bool o = false; + double mouthCumIntensity = 0.0; + MouthCumDrip = new Motion(0.0, 1.0) + { + BaseSpeed = 0.8, + OnStart = delegate + { + cha.Body.MouthCum.Yi = 0; + mouthCumIntensity = cha.InternalCumLevel; + cha.Body.MouthCum.Intensity = 1.0 * mouthCumIntensity; + cha.Body.MouthCum.精液_表示 = true; + o = true; + cha.Body.MouthCum.右 = RNG.XS.NextBool(); + }, + OnUpdate = delegate(Motion m) + { + if (o) + { + cha.Body.MouthCum.Yv = m.Value; + } + else + { + cha.Body.MouthCum.Intensity = m.Value * mouthCumIntensity; + } + }, + OnReach = delegate + { + o = false; + }, + OnLoop = delegate(Motion m) + { + cha.Body.MouthCum.表示 = false; + m.End(); + }, + OnEnd = delegate + { + } + }; + Motions.Add(MouthCumDrip.GetHashCode().ToString(), MouthCumDrip); + bool v = false; + double genetalCumIntensity = 0.0; + double zd = Body.VaginalCumDrip.精液濃度; + GenitalCumDrip = new Motion(0.0, 1.0) + { + BaseSpeed = 0.8, + OnStart = delegate + { + cha.Body.GenetalCum.Yi = 0; + genetalCumIntensity = cha.InternalCumLevel; + cha.Body.GenetalCum.Intensity = 1.0 * genetalCumIntensity; + cha.Body.GenetalCum.精液_表示 = true; + v = true; + zd = cha.Body.VaginalCumDrip.精液濃度; + cha.Body.GenetalCum.右 = RNG.XS.NextBool(); + }, + OnUpdate = delegate(Motion m) + { + if (v) + { + cha.Body.GenetalCum.Yv = m.Value; + cha.Body.VaginalCumDrip.精液濃度 = zd * m.Value.Inverse(); + } + else + { + cha.Body.GenetalCum.Intensity = m.Value * genetalCumIntensity; + } + }, + OnReach = delegate + { + v = false; + }, + OnLoop = delegate(Motion m) + { + cha.Body.GenetalCum.表示 = false; + m.End(); + }, + OnEnd = delegate + { + } + }; + Motions.Add(GenitalCumDrip.GetHashCode().ToString(), GenitalCumDrip); + bool a = false; + double analCumIntensity = 0.0; + AnalCumDrip = new Motion(0.0, 1.0) + { + BaseSpeed = 0.8, + OnStart = delegate + { + cha.Body.AnalCum.Yi = 0; + analCumIntensity = cha.InternalCumLevel; + cha.Body.AnalCum.Intensity = 1.0 * analCumIntensity; + cha.Body.AnalCum.精液_表示 = true; + a = true; + cha.Body.AnalCum.右 = RNG.XS.NextBool(); + }, + OnUpdate = delegate(Motion m) + { + if (a) + { + cha.Body.AnalCum.Yv = m.Value; + } + else + { + cha.Body.AnalCum.Intensity = m.Value * analCumIntensity; + } + }, + OnReach = delegate + { + a = false; + }, + OnLoop = delegate(Motion m) + { + cha.Body.AnalCum.表示 = false; + m.End(); + }, + OnEnd = delegate + { + } + }; + Motions.Add(AnalCumDrip.GetHashCode().ToString(), AnalCumDrip); + bool z = false; + double threadCumIntensity = 0.0; + ThreadCumDrip = new Motion(0.0, 1.0) + { + BaseSpeed = 0.8, + OnStart = delegate + { + cha.Body.ThreadCum.Yi = 0; + threadCumIntensity = cha.InternalCumLevel; + cha.Body.ThreadCum.Intensity = 1.0 * threadCumIntensity; + cha.Body.ThreadCum.精液_表示 = true; + z = true; + cha.Body.ThreadCum.右 = RNG.XS.NextBool(); + }, + OnUpdate = delegate(Motion m) + { + if (z) + { + cha.Body.ThreadCum.Yv = m.Value; + } + else + { + cha.Body.ThreadCum.Intensity = m.Value * threadCumIntensity; + } + }, + OnReach = delegate + { + z = false; + }, + OnLoop = delegate(Motion m) + { + cha.Body.ThreadCum.表示 = false; + m.End(); + }, + OnEnd = delegate + { + } + }; + Motions.Add(ThreadCumDrip.GetHashCode().ToString(), ThreadCumDrip); + SquirtSmall = new Motion(0.0, 1.0) + { + BaseSpeed = 4.0, + OnStart = delegate + { + cha.Body.潮吹_小.Yv = 0.0; + cha.Body.潮吹_小.表示 = true; + }, + OnUpdate = delegate(Motion m) + { + cha.Body.潮吹_小.Yv = m.Value; + }, + OnReach = delegate(Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + cha.Body.潮吹_小.表示 = false; + cha.Body.SplashIntencity = (cha.Body.SplashIntencity + 0.01).Clamp(0.0, 1.0); + } + }; + Motions.Add(SquirtSmall.GetHashCode().ToString(), SquirtSmall); + SquirtLarge = new Motion(0.0, 1.0) + { + BaseSpeed = 4.0, + OnStart = delegate + { + cha.Body.潮吹_大.Yv = 0.0; + cha.Body.潮吹_大.表示 = true; + cha.Body.潮吹_大.右 = RNG.XS.NextBool(); + if (cha.潮吹擬音 != null) + { + cha.潮吹擬音(); + } + }, + OnUpdate = delegate(Motion m) + { + cha.Body.潮吹_大.Yv = m.Value; + }, + OnReach = delegate(Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + cha.Body.潮吹_大.表示 = false; + cha.Body.SquirtStainIntensity = (cha.Body.SquirtStainIntensity + 0.2).Clamp(0.0, 1.0); + } + }; + Motions.Add(SquirtLarge.GetHashCode().ToString(), SquirtLarge); + Motion Stain = new Motion(0.0, 1.0) + { + BaseSpeed = 0.1, + OnStart = delegate + { + }, + OnUpdate = delegate(Motion m) + { + cha.Body.UrineStainIntensity = m.Value; + }, + OnReach = delegate(Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + } + }; + Motions.Add(Stain.GetHashCode().ToString(), Stain); + Motion UrinationStage1 = null; + Motion UrinationStage2 = new Motion(0.0, 1.0) + { + BaseSpeed = 1.0, + OnStart = delegate + { + }, + OnUpdate = delegate(Motion m) + { + cha.Body.Urination.Intensity = m.Value.Inverse(); + ChaD.Shyness = (ChaD.Shyness + 0.002).Clamp(0.0, 1.0); + }, + OnReach = delegate(Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + cha.Body.Urination.表示 = false; + cha.Body.Urination.Intensity = 1.0; + UrinationStage1.End(); + } + }; + Motions.Add(UrinationStage2.GetHashCode().ToString(), UrinationStage2); + Stopwatch sw = new Stopwatch(); + UrinationStage1 = new Motion(8.0, 10.0) + { + BaseSpeed = 10.0, + OnStart = delegate + { + cha.Body.Urination.Yi = 8; + sw.Start(); + }, + OnUpdate = delegate(Motion m) + { + if (sw.ElapsedMilliseconds > 4000) + { + UrinationStage2.Start(); + } + else if (cha.放尿擬音 != null) + { + cha.放尿擬音(); + } + cha.Body.Urination.Yi = (int)m.Value; + ChaD.Shyness = (ChaD.Shyness + 0.002).Clamp(0.0, 1.0); + }, + OnReach = delegate + { + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + sw.Reset(); + } + }; + Motions.Add(UrinationStage1.GetHashCode().ToString(), UrinationStage1); + Motion Steam = new Motion(0.0, 1.0) + { + BaseSpeed = 0.2, + OnStart = delegate + { + cha.Body.湯気左濃度 = 0.0; + cha.Body.湯気右濃度 = 0.0; + }, + OnUpdate = delegate(Motion m) + { + cha.Body.湯気左濃度 = m.Value; + cha.Body.湯気右濃度 = m.Value; + }, + OnReach = delegate + { + }, + OnLoop = delegate(Motion m) + { + m.End(); + }, + OnEnd = delegate + { + } + }; + Motions.Add(Steam.GetHashCode().ToString(), Steam); + Urination = new Motion(0.0, 1.0) + { + BaseSpeed = 0.6, + OnStart = delegate + { + cha.Body.Urination.Yv = 0.0; + cha.Body.Urination.表示 = true; + if (cha.Body.UrineStainIntensity != 1.0) + { + Stain.Start(); + } + //Sounds.放尿.Play(); + }, + OnUpdate = delegate(Motion m) + { + cha.Body.Urination.Yv = m.Value; + if (cha.放尿擬音 != null) + { + cha.放尿擬音(); + } + ChaD.Shyness = (ChaD.Shyness + 0.002).Clamp(0.0, 1.0); + }, + OnReach = delegate(Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + UrinationStage1.Start(); + Steam.Start(); + } + }; + Motions.Add(Urination.GetHashCode().ToString(), Urination); + 放尿強制終了_ = delegate + { + cha.Urination.End(); + UrinationStage1.End(); + Steam.End(); + UrinationStage2.End(); + Stain.End(); + }; + IsUrinating = () => cha.Urination.Run || UrinationStage1.Run || UrinationStage2.Run; + MilkSpray = new Motion(0.0, 1.0) + { + BaseSpeed = 2.0, + OnStart = delegate + { + cha.Body.LeftMilkSpray.Yi = 0; + cha.Body.RightMilkSpary.Yi = 0; + cha.Body.LeftMilkSpray.母乳1_表示 = true; + cha.Body.LeftMilkSpray.母乳2_表示 = true; + cha.Body.LeftMilkSpray.母乳3_表示 = true; + cha.Body.LeftMilkSpray.母乳4_表示 = true; + cha.Body.RightMilkSpary.母乳1_表示 = true; + cha.Body.RightMilkSpary.母乳2_表示 = true; + cha.Body.RightMilkSpary.母乳3_表示 = true; + cha.Body.RightMilkSpary.母乳4_表示 = true; + }, + OnUpdate = delegate(Motion m) + { + cha.Body.LeftMilkSpray.Yv = m.Value; + cha.Body.RightMilkSpary.Yv = m.Value; + }, + OnReach = delegate(Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + cha.Body.LeftMilkSpray.母乳1_表示 = false; + cha.Body.LeftMilkSpray.母乳2_表示 = false; + cha.Body.LeftMilkSpray.母乳3_表示 = false; + cha.Body.LeftMilkSpray.母乳4_表示 = false; + cha.Body.LeftMilkSpray.母乳垂れ1_表示 = true; + cha.Body.LeftMilkSpray.母乳垂れ2_表示 = true; + cha.Body.RightMilkSpary.母乳1_表示 = false; + cha.Body.RightMilkSpary.母乳2_表示 = false; + cha.Body.RightMilkSpary.母乳3_表示 = false; + cha.Body.RightMilkSpary.母乳4_表示 = false; + cha.Body.RightMilkSpary.母乳垂れ1_表示 = true; + cha.Body.RightMilkSpary.母乳垂れ2_表示 = true; + cha.MilkStain = (cha.MilkStain + 0.03).Clamp(0.0, 1.0); + } + }; + Motions.Add(MilkSpray.GetHashCode().ToString(), MilkSpray); + int s; + Vector2D ev; + EyeTracking = new Motion(0.0, 1.0) + { + BaseSpeed = 0.1, + OnStart = delegate + { + }, + OnUpdate = delegate + { + s = ((!cha.LookAway) ? 1 : (-1)); + if (cha.LookAway) + { + if (cha.Body.IsDualEyes) + { + ev = s * (cha.CursorPosition - (cha.Body.目左.位置 + cha.Body.目右.位置) * 0.5).newNormalize() * 0.002; + cha.Body.目左.視線 = ev; + cha.Body.目右.視線 = ev; + } + if (cha.Body.IsCheekEyes) + { + ev = s * (cha.CursorPosition - (cha.Body.頬目左.位置 + cha.Body.頬目右.位置) * 0.5).newNormalize() * 0.00089; + cha.Body.頬目左.視線 = ev; + cha.Body.頬目右.視線 = ev; + } + if (cha.Body.IsForeheadEye) + { + ev = s * (cha.CursorPosition - cha.Body.額目.位置).newNormalize() * 0.00089; + cha.Body.額目.視線 = ev; + } + if (cha.Body.IsSingleEye) + { + ev = s * (cha.CursorPosition - cha.Body.単眼目.位置).newNormalize() * 0.003; + cha.Body.単眼目.視線 = ev; + } + } + else + { + if (cha.Body.IsDualEyes) + { + cha.Body.目左.視線 = s * (cha.CursorPosition - cha.Body.目左.位置).newNormalize() * 0.002; + cha.Body.目右.視線 = s * (cha.CursorPosition - cha.Body.目右.位置).newNormalize() * 0.002; + } + if (cha.Body.IsCheekEyes) + { + cha.Body.頬目左.視線 = s * (cha.CursorPosition - cha.Body.頬目左.位置).newNormalize() * 0.00089; + cha.Body.頬目右.視線 = s * (cha.CursorPosition - cha.Body.頬目右.位置).newNormalize() * 0.00089; + } + if (cha.Body.IsForeheadEye) + { + cha.Body.額目.視線 = s * (cha.CursorPosition - cha.Body.額目.位置).newNormalize() * 0.00089; + } + if (cha.Body.IsSingleEye) + { + cha.Body.単眼目.視線 = s * (cha.CursorPosition - cha.Body.単眼目.位置).newNormalize() * 0.003; + } + } + }, + OnReach = delegate + { + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + } + }; + Motions.Add(EyeTracking.GetHashCode().ToString(), EyeTracking); + double l = 1.0; + ClimaxEnd = new Motion(0.0, 1.0) + { + BaseSpeed = 0.2 - 0.15 * ClimaxDuration, + OnStart = delegate(Motion m) + { + m.BaseSpeed = 0.2 - 0.15 * cha.ClimaxDuration; + l = 1.0; + }, + OnUpdate = delegate(Motion m) + { + l = m.Value.Inverse(); + }, + OnReach = delegate(Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + cha.Climax.End(); + Player.絶頂終了処理(); + } + }; + Motions.Add(ClimaxEnd.GetHashCode().ToString(), ClimaxEnd); + double savedHipValue = 0.0; + Par pa = Body.Waist.Body.CurJoinRoot; + Par pb = null; + Vector2D vec = Dat.Vec2DZero; + Action 腰接続 = delegate + { + pb = cha.Body.Waist.Body.CurJoinRoot; + vec = pb.ToGlobal(pb.JP[5].Joint) - pa.ToGlobal(pa.JP[5].Joint); + + ApplyContParts(vec); + }; + double d; + Climax = new Motion(0.0, 1.0) + { + BaseSpeed = 20.0, + OnStart = delegate + { + savedHipValue = cha.Body.Waist.Yv; + cha.ClimaxEnd.Start(); + }, + OnUpdate = delegate(Motion m) + { + d = 5.0 * (0.15 + cha.ClimaxIntensity) * m.Value.Sin() * RNG.XS.NextDouble() * l; + + cha.ApplyMorphMotions(d, false); + + cha.Body.HipMotionValue = d * RNG.XS.NextDouble(); + cha.Body.Waist.位置C = new Vector2D(0.0, 0.0005 * d); + cha.Body.乳房左.位置C = cha.Body.Waist.位置C; + cha.Body.乳房右.位置C = cha.Body.Waist.位置C; + if (cha.Body.Is腕前) + { + cha.Body.EI腕前.Updatef = true; + } + 腰接続(); + Player.絶頂中処理(); + if (0.3.Lot()) + { + Player.奴体力消費中(); + } + }, + OnReach = delegate + { + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + cha.Body.HipMotion_人v = savedHipValue; + cha.Body.Waist.位置C = Dat.Vec2DZero; + if (!cha.Body.乳房左.着衣) + { + cha.Body.乳房左.位置C = Dat.Vec2DZero; + cha.Body.乳房右.位置C = Dat.Vec2DZero; + } + + ResetContParts(); + } + }; + Motions.Add(Climax.GetHashCode().ToString(), Climax); + Stopwatch 肛sw = new Stopwatch(); + 肛ヒク = new Motion(0.0, 1.0) + { + BaseSpeed = 1.0, + OnStart = delegate + { + 肛sw.Restart(); + }, + OnUpdate = delegate(Motion m) + { + cha.Body.肛門C = 0.5 + m.Value.Sin() * RNG.XS.NextDouble() * 0.5; + if (肛sw.ElapsedMilliseconds > 5000) + { + m.End(); + } + }, + OnReach = delegate + { + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + 肛sw.Stop(); + cha.Body.肛門C = 1.0; + } + }; + Motions.Add(肛ヒク.GetHashCode().ToString(), 肛ヒク); + Stopwatch 膣sw = new Stopwatch(); + 膣ヒク = new Motion(0.0, 1.0) + { + BaseSpeed = 1.0, + OnStart = delegate + { + 膣sw.Restart(); + }, + OnUpdate = delegate(Motion m) + { + cha.Body.膣腔C = 1.0 + m.Value.Sin() * RNG.XS.NextDouble() * 0.5; + if (膣sw.ElapsedMilliseconds > 5000) + { + m.End(); + } + }, + OnReach = delegate + { + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + 膣sw.Stop(); + cha.Body.膣腔C = 1.0; + } + }; + Motions.Add(膣ヒク.GetHashCode().ToString(), 膣ヒク); + Stopwatch 糸sw = new Stopwatch(); + 糸ヒク = new Motion(0.0, 1.0) + { + BaseSpeed = 0.1, + OnStart = delegate + { + 糸sw.Restart(); + }, + OnUpdate = delegate(Motion m) + { + if (cha.Body.Is蜘尾) + { + cha.Body.出糸C = m.Value.Sin() * 30.0; + } + if (糸sw.ElapsedMilliseconds > 5000) + { + m.End(); + } + }, + OnReach = delegate + { + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + 糸sw.Stop(); + if (cha.Body.Is蜘尾) + { + cha.Body.出糸C = 0.0; + } + } + }; + Motions.Add(糸ヒク.GetHashCode().ToString(), 糸ヒク); + bool 顔面開き = false; + bool Is展開 = Body.Is顔面 || Body.Is大顎基; + 顔面 顔面 = Body.顔面; + 大顎基 大顎 = Body.頭.大顎基_接続.GetEle<大顎基>(); + 角1_虫 虫角 = Body.頭.額_接続.GetEle<角1_虫>(); + double o_ = 0.0; + 顔面展開 = new Motion(0.0, 1.0) + { + BaseSpeed = 5.0, + OnStart = delegate + { + if (Is展開) + { + 顔面開き = o_ == 1.0; + } + }, + OnUpdate = delegate(Motion m) + { + if (Is展開) + { + if (顔面開き) + { + o_ = m.Value.Inverse(); + } + else + { + o_ = m.Value; + } + if (cha.Body.Is顔面) + { + 顔面.展開0 = o_; + 顔面.展開1 = o_; + } + if (cha.Body.Is大顎基) + { + 大顎.展開 = o_; + } + if (cha.Body.Is虫角) + { + 虫角.展開 = o_; + } + } + }, + OnReach = delegate(Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + } + }; + Motions.Add(顔面展開.GetHashCode().ToString(), 顔面展開); + Vector2D p_ = Dat.Vec2DZero; + double d_; + BodySway = new Motion(0.0, 1.0) + { + BaseSpeed = 7.0, + OnStart = delegate + { + }, + OnUpdate = delegate(Motion m) + { + d_ = 2.0 * m.Value; + + ApplyMorphMotions(d_, true); + + p_.Y = -0.001 * m.Value; + cha.Body.Waist.位置C = p_; + cha.Body.乳房左.位置C = cha.Body.Waist.位置C; + cha.Body.乳房右.位置C = cha.Body.Waist.位置C; + + ApplyMoveParts(p_); + }, + OnReach = delegate + { + }, + OnLoop = delegate(Motion m) + { + m.End(); + }, + OnEnd = delegate + { + cha.Body.Waist.位置C = Dat.Vec2DZero; + if (!cha.Body.乳房左.着衣) + { + cha.Body.乳房左.位置C = Dat.Vec2DZero; + cha.Body.乳房右.位置C = Dat.Vec2DZero; + } + + ResetMoveParts(); + } + }; + Motions.Add(BodySway.GetHashCode().ToString(), BodySway); + int c_ = 0; + int CoughCount = 1; + Cough = new Motion(0.0, 1.0) + { + BaseSpeed = 10.0, + GotoSpeed = 0.5, + RetuSpeed = 2.0, + OnStart = delegate + { + cha.UpdateExpression(); + if (cha.Body.IsDualEyes) + { + cha.両瞼_1(RNG.XS.Next(1, 4), RNG.XS.Next(1, 4)); + } + else if (cha.Body.IsSingleEye) + { + cha.単瞼_1(RNG.XS.Next(1, 4)); + } + if (cha.Body.IsCheekEyes) + { + cha.両頬瞼_1(RNG.XS.Next(1, 4), RNG.XS.Next(1, 4)); + } + if (cha.Body.IsForeheadEye) + { + cha.額瞼_1(RNG.XS.Next(1, 4)); + } + c_ = 0; + CoughCount = RNG.XS.NextM(1, 2) + Player.UI.ペニス処理.中出しCount / 2; + }, + OnUpdate = delegate(Motion m) + { + cha.BreathingValue = m.Value; + }, + OnReach = delegate + { + cha.SpitSplash.Start(); + if ((Player.UI.ペニス処理.中出し || cha.Crying) && 0.18.Lot()) + { + cha.NoseDrip.Start(); + } + if (Player.UI.ペニス処理.中出し && 0.25.Lot()) + { + cha.Drool.Start(); + } + }, + OnLoop = delegate(Motion m) + { + c_++; + if (c_ >= CoughCount) + { + m.End(); + } + }, + OnEnd = delegate + { + cha.SetInitialExpression(); + cha.口(); + } + }; + Motions.Add(Cough.GetHashCode().ToString(), Cough); + double 中出度_ = 0.0; + Swallow = new Motion(0.0, 1.0) + { + BaseSpeed = 1.0, + OnStart = delegate + { + cha.UpdateExpression(); + cha.口_紡ぎ(); + 中出度_ = cha.InternalCumLevel; + }, + OnUpdate = delegate(Motion m) + { + cha.BreathingValue = m.Value; + }, + OnReach = delegate + { + }, + OnLoop = delegate(Motion m) + { + m.End(); + }, + OnEnd = delegate + { + if (RNG.XS.NextBool()) + { + //Sounds.挿抜口1.Play(); + } + else + { + //Sounds.挿抜口2.Play(); + } + ChaD.Stamina = (ChaD.Stamina + 0.3 * 中出度_).Clamp(0.0, 1.0); + } + }; + Motions.Add(Swallow.GetHashCode().ToString(), Swallow); + Motions.Drive(Med.FPSF); + Med.SetUniqueColor(Body.Elements.Select((Ele e) => e.Body.EnumAllPar()).JoinEnum()); + 汗掻き = new Sweat(Med, Are, this, Motions); + 汗かき = 汗掻き.汗かき; + Body.汗掻き = 汗掻き; + this.SetInitialAngle(); + } + + public void Draw(RenderArea Are, FPS FPS) + { + this.FPS = FPS.Value; + Motions.Drive(FPS); + Body.描画(Are); + } + + public void Dispose() + { + Body.Dispose(); + 汗掻き.Dispose(); + ModeEventDispatcher.RemUniqueColor(Body.Elements.Select((Ele e) => e.Body.EnumAllPar()).JoinEnum()); + } + + public void Set衣装(IEnumerable 衣装) + { + Body.脱衣(); + Dictionary dictionary = new Dictionary(); + Dictionary dictionary2 = new Dictionary(); + string ts; + foreach (object item in 衣装) + { + Type type = item.GetType(); + ts = type.ToString(); + if (dictionary.ContainsKey(type)) + { + dictionary2[type][dictionary[type]].SetValue(Body, item, null); + dictionary[type]++; + continue; + } + dictionary.Add(type, 0); + dictionary2.Add(type, (from e in Sta.Bodt.GetProperties() + where e.PropertyType.ToString() == ts + select e).ToArray()); + dictionary2[type][dictionary[type]].SetValue(Body, item, null); + dictionary[type]++; + } + if (!CharacterData.股施術 && Body.Is股防御()) + { + Body.Setピアス = Sta.ピアス初期化; + } + if (!CharacterData.胸施術 && Body.Is胸甲殻()) + { + Body.Setピアス左 = Sta.ピアス初期化; + Body.Setピアス右 = Sta.ピアス初期化; + } + } + + public ContactD GetContact(ref Color HitColor) + { + ContactD result = default(ContactD); + result.e = this.Body.GetHitEle(HitColor); + if (result.e != null) + { + result.p = result.e.Body.GetHitPar_(HitColor); + bool flag = false; + bool flag2 = result.e is Shoulder || result.e is UpperArm || result.e is LowerArm || 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; + } + else if (result.e is 耳 || result.e is 獣耳) + { + result.c = ContactType.Ear; + } + else if (this.Body.Is口腔()) + { + result.c = ContactType.Mouth; + } + else if (result.e is Head) + { + result.c = ContactType.Face; + } + 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 Neck) + { + result.c = ContactType.Neck; + } + else if (result.e is Shoulder) + { + result.c = ContactType.Shoulder; + } + else if (!flag2 && !this.Body.乳房左.虫性_甲殻_表示 && !(result.p.Tag == "乳房") && this.Body.Is乳首()) + { + result.c = ContactType.Milk; + } + else if (result.e is 乳房) + { + result.c = ContactType.Chest; + } + else if (result.e is Chest) + { + result.c = ContactType.Side; + } + else if (((result.e is Waist || result.e is 四足腰) && result.p != null && result.p.Tag == "下腹") || result.e is ボテ腹) + { + result.c = ContactType.Stomache; + } + else if ((flag = !flag2 && this.Body.Isくぱぁ()) && result.e is 肛門) + { + result.c = ContactType.Anal; + } + else if (flag && this.Body.Is陰核()) + { + result.c = ContactType.Nucleus; + } + else if (flag && this.Body.Is膣口()) + { + result.c = ContactType.Vagina; + } + else if (flag && result.e is 性器) + { + result.c = ContactType.Sex; + } + else if (flag && this.Body.Is局部()) + { + result.c = ContactType.Crotch; + } + else if (result.e is 尾_蜘 && (result.p.Tag.Contains("出糸突起左") || result.p.Tag.Contains("出糸突起中") || result.p.Tag.Contains("出糸突起右"))) + { + result.c = ContactType.Thread; + } + else if (result.e.ConnectionType.ToString().Contains("腿") && !result.e.ConnectionType.Is左右無し()) + { + result.c = ContactType.Thigh; + } + else if (result.e is 足_人) + { + result.c = ContactType.Feet; + } + else if (result.e is 手_人) + { + result.c = ContactType.Hand; + } + else if (result.e is 触覚) + { + result.c = ContactType.Awareness; + } + else if (result.e is 触手) + { + result.c = ContactType.Touch; + } + else if (result.e.ConnectionType.ToString().Contains("尾")) + { + result.c = ContactType.Tail; + } + else if (result.e is 前翅 || result.e is 後翅 || result.e is UpperArm_鳥 || result.e is LowerArm_鳥 || result.e is 手_鳥 || result.e is UpperArm_蝙 || result.e is LowerArm_蝙 || result.e is 手_蝙) + { + result.c = ContactType.Wing; + } + else if (result.e is 鰭) + { + result.c = ContactType.Fin; + } + else + { + result.c = ContactType.Other; + } + } + return result; + } + } +} diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/ChaD.cs b/SlaveMatrix/SlaveMatrix/GameClasses/CharacterData.cs similarity index 99% rename from SlaveMatrix/SlaveMatrix/GameClasses/ChaD.cs rename to SlaveMatrix/SlaveMatrix/GameClasses/CharacterData.cs index 6bfd538..5311f40 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/ChaD.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/CharacterData.cs @@ -5,7 +5,7 @@ using _2DGAMELIB; namespace SlaveMatrix { [Serializable] - public class ChaD + public class CharacterData { public Unit Parent; @@ -129,7 +129,7 @@ namespace SlaveMatrix return false; } - public ChaD(WaistD 構成, 体色 体色) + public CharacterData(WaistD 構成, 体色 体色) { this.body_tree = 構成; this.body_color = 体色; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/CharacterFluidSystem.cs b/SlaveMatrix/SlaveMatrix/GameClasses/CharacterFluidSystem.cs new file mode 100644 index 0000000..de2ab5c --- /dev/null +++ b/SlaveMatrix/SlaveMatrix/GameClasses/CharacterFluidSystem.cs @@ -0,0 +1,262 @@ +using _2DGAMELIB; +using System; +using System.Collections.Generic; +using System.Text; + +namespace SlaveMatrix.GameClasses +{ + internal class CharacterFluidSystem + { + private readonly Character owner; + private readonly Body body; + private readonly CharacterData data; + private readonly Motions motions; + + private Motion urineStage1; + private Motion urineStage2; + private Motion urineStain; + private Motion urineSteam; + + public Motion MouthCumDrip { get; private set; } + public Motion GenitalCumDrip { get; private set; } + public Motion AnalCumDrip { get; private set; } + public Motion ThreadCumDrip { get; private set; } + public Motion SquirtSmall { get; private set; } + public Motion SquirtLarge { get; private set; } + public Motion Splash { get; private set; } + public Motion SpitSplash { get; private set; } + public Motion Urination { get; private set; } + public Motion MilkSpray { get; private set; } + public double MilkStain { get; private set; } + public Motion NoseDrip { get; private set; } + public Motion Drool { get; private set; } + + public bool IsUrinating => Urination.Run || urineStage1.Run || urineStage2.Run; + + public CharacterFluidSystem(Character owner, Body body, CharacterData data, Motions motions) + { + this.owner = owner; + this.body = body; + this.data = data; + this.motions = motions; + } + + public void Initialize() + { + CreateNoseDrip(); + CreateDrool(); + CreateSplash(); + CreateSpitSplash(); + } + + private void Register(string key, Motion motion) + { + motions.Add(key, motion); + } + + private bool CanUpdateSingleDrip(涎 left, 涎 right) + { + bool leftOk = left == null || left.Yv != 1.0; + bool rightOk = right == null || right.Yv != 1.0; + return leftOk && rightOk; + } + + private bool CanUpdateSingleDrip(鼻水 left, 鼻水 right) + { + bool leftOk = left == null || left.Yv != 1.0; + bool rightOk = right == null || right.Yv != 1.0; + return leftOk && rightOk; + } + private void CreateNoseDrip() + { + bool useLeftNose = false; + bool hasLeft = body.LeftNoseDrip != null; + bool hasRight = body.RightNoseDrip != null; + + NoseDrip = new Motion(0.0, 1.0) + { + BaseSpeed = 3.0, + OnStart = delegate + { + useLeftNose = RNG.XS.NextBool(); + + if (!CanUpdateSingleDrip(body.LeftNoseDrip, body.RightNoseDrip)) + return; + + if (useLeftNose) + { + if (hasLeft) + { + body.LeftNoseDrip.Yv = 0.0; + body.LeftNoseDrip.表示 = true; + } + } + else + { + if (hasRight) + { + body.RightNoseDrip.Yv = 0.0; + body.RightNoseDrip.表示 = true; + } + } + }, + OnUpdate = delegate (Motion m) + { + if (!CanUpdateSingleDrip(body.LeftNoseDrip, body.RightNoseDrip)) + return; + + if (useLeftNose) + { + if (hasLeft) + body.LeftNoseDrip.Yv = m.Value; + } + else + { + if (hasRight) + body.RightNoseDrip.Yv = m.Value; + } + }, + OnReach = delegate (Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + } + }; + + Register(NoseDrip.GetHashCode().ToString(), NoseDrip); + } + + private void CreateDrool() + { + bool useLeftDrool = false; + bool hasLeft = body.LeftDrool != null; + bool hasRight = body.RightDrool != null; + + Drool = new Motion(0.0, 1.0) + { + BaseSpeed = 3.0, + OnStart = delegate + { + useLeftDrool = RNG.XS.NextBool(); + + if (!CanUpdateSingleDrip(body.LeftDrool, body.RightDrool)) + return; + + if (useLeftDrool) + { + if (hasLeft) + { + body.LeftDrool.Yv = 0.0; + body.LeftDrool.表示 = true; + } + } + else + { + if (hasRight) + { + body.RightDrool.Yv = 0.0; + body.RightDrool.表示 = true; + } + } + }, + OnUpdate = delegate (Motion m) + { + if (!CanUpdateSingleDrip(body.LeftDrool, body.RightDrool)) + return; + + if (useLeftDrool) + { + if (hasLeft) + body.LeftDrool.Yv = m.Value; + } + else + { + if (hasRight) + body.RightDrool.Yv = m.Value; + } + }, + OnReach = delegate (Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + } + }; + + Register(Drool.GetHashCode().ToString(), Drool); + } + + private void CreateSplash() + { + Splash = new Motion(0.0, 1.0) + { + BaseSpeed = 4.0, + + OnStart = delegate + { + body.Splash.Yv = 0.0; + body.Splash.表示 = true; + body.Splash.右 = RNG.XS.NextBool(); + }, + OnUpdate = delegate (Motion m) + { + body.Splash.Yv = m.Value; + }, + OnReach = delegate (Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + body.Splash.表示 = false; + body.SplashIntencity = (body.SplashIntencity + 0.03).Clamp(0.0, 1.0); + } + }; + + Register(Splash.GetHashCode().ToString(), Splash); + } + + private void CreateSpitSplash() + { + SpitSplash = new Motion(0.0, 1.0) + { + BaseSpeed = 3.0, + + OnStart = delegate + { + body.咳.Yv = 0.0; + body.咳.表示 = true; + }, + OnUpdate = delegate (Motion m) + { + body.咳.Yv = m.Value; + }, + OnReach = delegate (Motion m) + { + m.End(); + }, + OnLoop = delegate + { + }, + OnEnd = delegate + { + body.咳.表示 = false; + } + }; + + Register(SpitSplash.GetHashCode().ToString(), SpitSplash); + } + } +} diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs index 68dea80..23514b6 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs @@ -538,7 +538,7 @@ namespace SlaveMatrix public virtual bool 表示 { get; set; } - public virtual double 濃度 { get; set; } + public virtual double Intensity { get; set; } public int 描画前後 => ConnectionType switch { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs index 7697436..ca709bf 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs @@ -87,7 +87,7 @@ namespace SlaveMatrix [OnDeserialized] private void OnDeserialized(StreamingContext _) => ThisType = GetType(); - public virtual Ele GetEle(double DisUnit, ModeEventDispatcher Med, 体配色 体配色) + public virtual Ele GetEle(double DisUnit, ModeEventDispatcher Med, BodyColorSet 体配色) { return null; } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/GameText.cs b/SlaveMatrix/SlaveMatrix/GameClasses/GameText.cs index e000eb9..9d46a4f 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/GameText.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/GameText.cs @@ -373,7 +373,7 @@ namespace SlaveMatrix public static string 後から変更できます => Comm[56]; - public static string スレイブマトリクス => Comm[57]; + public static string SlaveMatrix => Comm[57]; public static string 事務所 => Base[0]; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs index c56faea..5b8311b 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs @@ -70,7 +70,7 @@ namespace SlaveMatrix return GetHumanoid(); } - private static Unit Generate(ChaD ChaD1, ChaD ChaD2, int 妊娠進行期間, string 種族) + private static Unit Generate(CharacterData ChaD1, CharacterData ChaD2, int 妊娠進行期間, string 種族) { 妊娠進行期間 = (int)((double)妊娠進行期間 * 0.5).Clamp(0.0, 5.0); Unit unit = GetUnit(ChaD1, 妊娠進行期間, 種族).Mix(GetUnit(ChaD2, 妊娠進行期間, 種族), 原種モード: true); @@ -86,7 +86,7 @@ namespace SlaveMatrix return unit; } - private static Unit GetUnit(ChaD ChaD, int 妊娠進行期間, string 種族) + private static Unit GetUnit(CharacterData ChaD, int 妊娠進行期間, string 種族) { Unit unit = new Unit(); unit.ChaD = ChaD; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs index 78fc62f..20ce0a8 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs @@ -144,8 +144,8 @@ namespace SlaveMatrix //misc character stuff - private static Cha TrainingTarget; - private static Cha Viola; + private static Character TrainingTarget; + private static Character Viola; public static ViolaText ViolaText; public static SlaveText SlaveText; @@ -411,7 +411,7 @@ namespace SlaveMatrix }, { "メインフォーム", - メインフォーム(Med) + MainForm(Med) }, { "対象", @@ -576,19 +576,19 @@ namespace SlaveMatrix { if (Sta.GameData.RepaymentStage == 0) { - DemandMax = 8.0; + DemandMax = 88.0; } else if (Sta.GameData.RepaymentStage == 1) { - DemandMax = 9.0; + DemandMax = 99.0; } else if (Sta.GameData.RepaymentStage == 2) { - DemandMax = 10.0; + DemandMax = 110.0; } else { - DemandMax = 11.0; + DemandMax = 111.0; } } @@ -658,10 +658,10 @@ namespace SlaveMatrix ip.SubInfoIm = GameText.ロード中です + "\r\n" + GameText.しばらくお待ちください; Sta.GameData = Path.LoadExMod(); - Cha d = Viola; - Viola = new Cha(Med, DrawBuffer, Sta.GameData.ヴィオラ.ChaD); + Character d = Viola; + Viola = new Character(Med, DrawBuffer, Sta.GameData.ヴィオラ.ChaD); Viola.Set衣装(Sta.GameData.ヴィオラ.着衣); - ViolaTextBubble.接続(Viola.Bod.頭.口_接続点); + ViolaTextBubble.接続(Viola.Body.頭.口_接続点); Initialize(); if (d != null) @@ -756,10 +756,10 @@ namespace SlaveMatrix Sta.GameData = Ser.UnJson(Path); } Sta.DontScar = false; - Cha d = Viola; - Viola = new Cha(med, DrawBuffer, Sta.GameData.ヴィオラ.ChaD); + Character d = Viola; + Viola = new Character(med, DrawBuffer, Sta.GameData.ヴィオラ.ChaD); Viola.Set衣装(Sta.GameData.ヴィオラ.着衣); - ViolaTextBubble.接続(Viola.Bod.頭.口_接続点); + ViolaTextBubble.接続(Viola.Body.頭.口_接続点); Initialize(); if (d != null) @@ -793,12 +793,6 @@ namespace SlaveMatrix //Sounds.完了.Play(); } - - - - - - private static void Initialize() { Sta.GameData.Refresh = false; @@ -816,8 +810,6 @@ namespace SlaveMatrix npl.Text = GameText.収容番号 + u.Number + "\r\n" + (Sta.AlwaysUseName ? u.Name : (u.Trained ? u.Name : u.Race)); } - - public static void EndDay() { Player.RecoverPlayerStamina(); @@ -1019,20 +1011,20 @@ namespace SlaveMatrix { if (Sta.GameData.TrainingTarget.妊娠状態変数 > -1) { - TrainingTarget.Bod.ボテ腹i = Sta.GameData.TrainingTarget.妊娠状態変数; - TrainingTarget.Bod.ボテ腹_表示 = true; - if (!TrainingTarget.Bod.Is獣) + TrainingTarget.Body.ボテ腹i = Sta.GameData.TrainingTarget.妊娠状態変数; + TrainingTarget.Body.ボテ腹_表示 = true; + if (!TrainingTarget.Body.Is獣) { - TrainingTarget.Bod.ボテ腹_人.ハイライト表示 = Sta.GameData.TrainingTarget.妊娠状態変数 > 2; + TrainingTarget.Body.ボテ腹_人.ハイライト表示 = Sta.GameData.TrainingTarget.妊娠状態変数 > 2; } } else { - TrainingTarget.Bod.ボテ腹i = 0; - TrainingTarget.Bod.ボテ腹_表示 = false; + TrainingTarget.Body.ボテ腹i = 0; + TrainingTarget.Body.ボテ腹_表示 = false; } - TrainingTarget.Bod.断面_表示 = TrainingTarget.Bod.断面_表示; - TrainingTarget.Bod.変動ステート更新(); + //TrainingTarget.Bod.断面_表示 = TrainingTarget.Bod.断面_表示; + TrainingTarget.Body.変動ステート更新(); } public static void ResetTrainingTarget() @@ -1049,33 +1041,33 @@ namespace SlaveMatrix TrainingTarget.口修正(); if (Sta.GameData.TrainingTarget.Trained) { - TrainingTarget.Bod.拘束具_表示 = false; - TrainingTarget.Bod.首輪_表示 = true; + TrainingTarget.Body.拘束具_表示 = false; + TrainingTarget.Body.首輪_表示 = true; TrainingTarget.Set基本姿勢(); } else { - TrainingTarget.Bod.拘束具_表示 = true; + TrainingTarget.Body.拘束具_表示 = true; TrainingTarget.Set拘束姿勢(); } if (Sta.GameData.TrainingTarget.ChaD.胸施術) { - TrainingTarget.Bod.胸施術(); + TrainingTarget.Body.胸施術(); } if (Sta.GameData.TrainingTarget.ChaD.股施術) { - TrainingTarget.Bod.股施術(); + TrainingTarget.Body.股施術(); } if (Sta.GameData.TrainingTarget.ChaD.タトゥ) { - TrainingTarget.Bod.タトゥ(); + TrainingTarget.Body.タトゥ(); } if (Sta.GameData.TrainingTarget.着衣 != null) { TrainingTarget.Set衣装(Sta.GameData.TrainingTarget.着衣); } - TrainingTarget.Bod.Join(); - TrainingTarget.Bod.Update(); + TrainingTarget.Body.Join(); + TrainingTarget.Body.Update(); } public static void SetTrainingTarget(ModeEventDispatcher Med, Unit u) @@ -1085,22 +1077,22 @@ namespace SlaveMatrix { TrainingTarget.Dispose(); } - TrainingTarget = new Cha(Med, DrawBuffer, Sta.GameData.TrainingTarget.ChaD); - SlaveTextBubble.接続(TrainingTarget.Bod.頭.口_接続点); + TrainingTarget = new Character(Med, DrawBuffer, Sta.GameData.TrainingTarget.ChaD); + SlaveTextBubble.接続(TrainingTarget.Body.頭.口_接続点); Setnpl(u); double d = ((u.Trained && Sta.MoveInsectMask) ? 1.0 : 0.0); - if (TrainingTarget.Bod.Is顔面) + if (TrainingTarget.Body.Is顔面) { - TrainingTarget.Bod.頭.顔面_接続.SetEle(delegate(顔面 顔面) + TrainingTarget.Body.頭.顔面_接続.SetEle(delegate(顔面 顔面) { 顔面.展開0 = d; 顔面.展開1 = d; }); - TrainingTarget.Bod.頭.大顎基_接続.SetEle(delegate(大顎基 大顎) + TrainingTarget.Body.頭.大顎基_接続.SetEle(delegate(大顎基 大顎) { 大顎.展開 = d; }); - TrainingTarget.Bod.頭.額_接続.SetEle(delegate(角1_虫 虫角) + TrainingTarget.Body.頭.額_接続.SetEle(delegate(角1_虫 虫角) { 虫角.展開 = d; }); @@ -1112,20 +1104,20 @@ namespace SlaveMatrix { Player.SetState(); TrainingTarget.Crying = false; - if (TrainingTarget.Bod.鼻水左 != null) + if (TrainingTarget.Body.LeftNoseDrip != null) { - TrainingTarget.Bod.鼻水左.表示 = false; - TrainingTarget.Bod.鼻水右.表示 = false; + TrainingTarget.Body.LeftNoseDrip.表示 = false; + TrainingTarget.Body.RightNoseDrip.表示 = false; } - if (TrainingTarget.Bod.涎左 != null) + if (TrainingTarget.Body.LeftDrool != null) { - TrainingTarget.Bod.涎左.表示 = false; - TrainingTarget.Bod.涎右.表示 = false; + TrainingTarget.Body.LeftDrool.表示 = false; + TrainingTarget.Body.RightDrool.表示 = false; } - TrainingTarget.Bod.噴乳左.表示 = false; - TrainingTarget.Bod.噴乳右.表示 = false; - TrainingTarget.噴乳染み = 0.0; - TrainingTarget.Bod.下着T染み = 0.0; + TrainingTarget.Body.LeftMilkSpray.表示 = false; + TrainingTarget.Body.RightMilkSpary.表示 = false; + TrainingTarget.MilkStain = 0.0; + TrainingTarget.Body.下着T染み = 0.0; TrainingTarget.SetInitialExpression(); TrainingTarget.Emotion(); TrainingTarget.UpdateExpression(); @@ -1142,7 +1134,6 @@ namespace SlaveMatrix Player.SensBox(); } - public static void Player説明(ref Color hc, Action Reset) { if (dbs["プレイヤー"].Pars.Values.First().ToPar().HitColor == hc) @@ -1155,9 +1146,6 @@ namespace SlaveMatrix } } - - - //modules public static Module Start(ModeEventDispatcher Med) { @@ -1169,7 +1157,6 @@ namespace SlaveMatrix } }; } - public static Module Credit(ModeEventDispatcher Med) { MotV mv = new MotV(0.0, 1.0){BaseSpeed = 0.5}; @@ -1404,7 +1391,7 @@ namespace SlaveMatrix }; } - public static Module メインフォーム(ModeEventDispatcher Med) + public static Module MainForm(ModeEventDispatcher Med) { Buts bs = new Buts(); @@ -1560,7 +1547,7 @@ namespace SlaveMatrix { if (TrainingTarget != null) { - TrainingTarget.CP = cp; + TrainingTarget.CursorPosition = cp; } dbs.Move(ref hc); bs.Move(ref hc); @@ -1653,36 +1640,36 @@ namespace SlaveMatrix { TrainingTarget.EyeTracking.End(); } - if (TrainingTarget.Bod.Is双眉) + if (TrainingTarget.Body.Is双眉) { - TrainingTarget.Bod.眉左.眉間_表示 = false; - TrainingTarget.Bod.眉右.眉間_表示 = false; + TrainingTarget.Body.眉左.眉間_表示 = false; + TrainingTarget.Body.眉右.眉間_表示 = false; } - if (TrainingTarget.Bod.Is双眼) + if (TrainingTarget.Body.IsDualEyes) { TrainingTarget.瞼_半1左(); TrainingTarget.瞼_半1右(); TrainingTarget.目_見つめ左(); TrainingTarget.目_見つめ右(); } - if (TrainingTarget.Bod.Is頬眼) + if (TrainingTarget.Body.IsCheekEyes) { TrainingTarget.頬瞼_半1左(); TrainingTarget.頬瞼_半1右(); TrainingTarget.頬目_見つめ左(); TrainingTarget.頬目_見つめ右(); } - if (TrainingTarget.Bod.Is単眼) + if (TrainingTarget.Body.IsSingleEye) { TrainingTarget.単瞼_半1(); TrainingTarget.単目_見つめ(); } - if (TrainingTarget.Bod.Is額眼) + if (TrainingTarget.Body.IsForeheadEye) { TrainingTarget.額瞼_半1(); TrainingTarget.額目_見つめ(); } - if (!TrainingTarget.Bod.玉口枷_表示) + if (!TrainingTarget.Body.玉口枷_表示) { TrainingTarget.口_閉笑(); } @@ -1711,7 +1698,7 @@ namespace SlaveMatrix { 調教完了表情(); SlaveText.Set状態(); - if (TrainingTarget.Bod.Is顔面) + if (TrainingTarget.Body.Is顔面) { Action o_done = SlaveTextBubble.Tex.Done; SlaveTextBubble.Tex.Done = delegate (Tex tex) @@ -1761,18 +1748,18 @@ namespace SlaveMatrix Player.表示ステート更新(); Player.ModBox(); Player.SensBox(); - if (TrainingTarget.Bod.Is獣) + if (TrainingTarget.Body.Is獣) { - TrainingTarget.Bod.Waist.位置B = Med.Base.GetPosition(new Vector2D(0.5, 0.5)).AddY(-0.03); + TrainingTarget.Body.Waist.位置B = Med.Base.GetPosition(new Vector2D(0.5, 0.5)).AddY(-0.03); } - else if (TrainingTarget.Bod.Is半身) + else if (TrainingTarget.Body.Is半身) { - TrainingTarget.Bod.Waist.位置B = Med.Base.GetPosition(new Vector2D(0.5, 0.5)).AddY(-0.02); + TrainingTarget.Body.Waist.位置B = Med.Base.GetPosition(new Vector2D(0.5, 0.5)).AddY(-0.02); } - TrainingTarget.Bod.Join(); - TrainingTarget.Bod.Update(); + TrainingTarget.Body.Join(); + TrainingTarget.Body.Update(); SlaveTextBubble.接続(); - TrainingTarget.Bod.汗染み濃度 = 1.0; + TrainingTarget.Body.汗染み濃度 = 1.0; 調教済みチェック = true; TrainingTargetTrained = Sta.GameData.TrainingTarget.Trained; if (調教完了 = Sta.GameData.TrainingTarget.IsTrained()) @@ -1793,7 +1780,7 @@ namespace SlaveMatrix }, Move = delegate (MouseButtons mb, Vector2D cp, Color hc) { - TrainingTarget.CP = cp; + TrainingTarget.CursorPosition = cp; cd = TrainingTarget.GetContact(ref hc); Player.UI.Move(ref mb, ref cp, ref op, ref hc, ref cd); ip.Move(ref hc); @@ -1847,16 +1834,16 @@ namespace SlaveMatrix ip.SubShow = true; ip.Sub2Show = false; ip.Text = GameText.点6; - if (!TrainingTarget.Bod.Setピアス.ピアス_表示) + if (!TrainingTarget.Body.Setピアス.ピアス_表示) { - TrainingTarget.Bod.脱衣(); + TrainingTarget.Body.脱衣(); } Player.UI.SetTarget(Sta.GameData.TrainingTarget, TrainingTarget); Player.SetStateTraining(); Player.表示ステート更新(); Player.ModBox(); Player.SensBox(); - TrainingTarget.Bod.首輪_表示 = true; + TrainingTarget.Body.首輪_表示 = true; si.Set(bre: false); Player.UI.Reset(); Player.UI.擬音キュー.Clear(); @@ -1935,8 +1922,8 @@ namespace SlaveMatrix } Sta.GameData.TrainingTarget.発情フラグ = Player.UI.発情bu; Player.調教終了時(); - TrainingTarget.絶頂.End(); - TrainingTarget.体揺れ.End(); + TrainingTarget.Climax.End(); + TrainingTarget.BodySway.End(); TrainingTarget.放尿強制終了(); @@ -1945,33 +1932,33 @@ namespace SlaveMatrix Player.絶頂終了処理_(); Player.射精終了処理_(); - TrainingTarget.Bod.膣内精液.精液濃度 = 0.0; - TrainingTarget.Bod.断面.精液濃度 = 0.0; - TrainingTarget.Bod.スタンプClear(); - TrainingTarget.Bod.Waist.位置B = Med.Base.GetPosition(new Vector2D(0.5, 0.5)); - TrainingTarget.Bod.汗染み濃度 = 0.0; - TrainingTarget.Bod.飛沫濃度 = 0.0; - TrainingTarget.Bod.潮染み濃度 = 0.0; - TrainingTarget.Bod.尿染み濃度 = 0.0; - if (!TrainingTarget.Bod.Is粘) + TrainingTarget.Body.VaginalCumDrip.精液濃度 = 0.0; + TrainingTarget.Body.断面.精液濃度 = 0.0; + TrainingTarget.Body.スタンプClear(); + TrainingTarget.Body.Waist.位置B = Med.Base.GetPosition(new Vector2D(0.5, 0.5)); + TrainingTarget.Body.汗染み濃度 = 0.0; + TrainingTarget.Body.SplashIntencity = 0.0; + TrainingTarget.Body.SquirtStainIntensity = 0.0; + TrainingTarget.Body.UrineStainIntensity = 0.0; + if (!TrainingTarget.Body.Is粘) { - TrainingTarget.Bod.断面_表示 = false; + TrainingTarget.Body.断面_表示 = false; } TrainingTarget.EyeTracking.End(); - TrainingTarget.口腔精液垂れ.End(); - TrainingTarget.性器精液垂れ.End(); - TrainingTarget.肛門精液垂れ.End(); - TrainingTarget.出糸精液垂れ.End(); - TrainingTarget.Bod.SetWaist(); + TrainingTarget.MouthCumDrip.End(); + TrainingTarget.GenitalCumDrip.End(); + TrainingTarget.AnalCumDrip.End(); + TrainingTarget.ThreadCumDrip.End(); + TrainingTarget.Body.SetWaist(); if (Sta.GameData.TrainingTarget.Trained) { - TrainingTarget.Bod.拘束具_表示 = false; - TrainingTarget.Bod.首輪_表示 = true; + TrainingTarget.Body.拘束具_表示 = false; + TrainingTarget.Body.首輪_表示 = true; TrainingTarget.Set基本姿勢(); } else { - TrainingTarget.Bod.拘束具_表示 = true; + TrainingTarget.Body.拘束具_表示 = true; TrainingTarget.Set拘束姿勢(); } TrainingTarget.Emotion(); @@ -1983,9 +1970,9 @@ namespace SlaveMatrix Player.表示ステート更新(); Player.ModBox(); Player.SensBox(); - TrainingTarget.Bod.カーソル = null; - TrainingTarget.Bod.Join(); - TrainingTarget.Bod.Update(); + TrainingTarget.Body.カーソル = null; + TrainingTarget.Body.Join(); + TrainingTarget.Body.Update(); SlaveTextBubble.接続(); SlaveTextBubble.消失.End(); Result2 = false; @@ -2244,11 +2231,11 @@ namespace SlaveMatrix } if (TrainingTarget != null) { - if (bs["股施術"].Pars.Values.First().ToPar().HitColor == hc && !(ip.SubInfoIm == GameText.股の + (TrainingTarget.Bod.Is蛇 ? GameText.鱗 : GameText.甲殻) + GameText.を切除しました) && !(ip.SubInfoIm == GameText.所持金が足りません)) + if (bs["股施術"].Pars.Values.First().ToPar().HitColor == hc && !(ip.SubInfoIm == GameText.股の + (TrainingTarget.Body.Is蛇 ? GameText.鱗 : GameText.甲殻) + GameText.を切除しました) && !(ip.SubInfoIm == GameText.所持金が足りません)) { - ip.SubInfoIm = GameText.股の + (TrainingTarget.Bod.Is蛇 ? GameText.鱗 : GameText.甲殻) + GameText.を切除します + "(-" + 股施術価格.ToString("#,0") + ")"; + ip.SubInfoIm = GameText.股の + (TrainingTarget.Body.Is蛇 ? GameText.鱗 : GameText.甲殻) + GameText.を切除します + "(-" + 股施術価格.ToString("#,0") + ")"; } - else if (ip.SubInfoIm == GameText.股の + (TrainingTarget.Bod.Is蛇 ? GameText.鱗 : GameText.甲殻) + GameText.を切除します + "(-" + 股施術価格.ToString("#,0") + ")") + else if (ip.SubInfoIm == GameText.股の + (TrainingTarget.Body.Is蛇 ? GameText.鱗 : GameText.甲殻) + GameText.を切除します + "(-" + 股施術価格.ToString("#,0") + ")") { si.Set(bre: false); } @@ -2498,7 +2485,7 @@ namespace SlaveMatrix b.Pars.Values.First().ToParT().PenColor = Color.Red; if (Sta.GameData.TrainingTarget != null) { - if (TrainingTarget == null || TrainingTarget.ChaD != Sta.GameData.TrainingTarget.ChaD) + if (TrainingTarget == null || TrainingTarget.CharacterData != Sta.GameData.TrainingTarget.ChaD) { SetTrainingTarget(Med, Sta.GameData.TrainingTarget); } @@ -2521,20 +2508,20 @@ namespace SlaveMatrix { TrainingTarget.Dispose(); } - TrainingTarget = new Cha(Med, DrawBuffer, Sta.GameData.TrainingTarget.Mother.ChaD); - if (TrainingTarget.Bod.Is双眼) + TrainingTarget = new Character(Med, DrawBuffer, Sta.GameData.TrainingTarget.Mother.ChaD); + if (TrainingTarget.Body.IsDualEyes) { TrainingTarget.両目_見つめ(); } - if (TrainingTarget.Bod.Is頬眼) + if (TrainingTarget.Body.IsCheekEyes) { TrainingTarget.両頬目_見つめ(); } - if (TrainingTarget.Bod.Is単眼) + if (TrainingTarget.Body.IsSingleEye) { TrainingTarget.単目_見つめ(); } - if (TrainingTarget.Bod.Is額眼) + if (TrainingTarget.Body.IsForeheadEye) { TrainingTarget.額目_見つめ(); } @@ -2565,20 +2552,20 @@ namespace SlaveMatrix { TrainingTarget.Dispose(); } - TrainingTarget = new Cha(Med, DrawBuffer, Sta.GameData.TrainingTarget.Father.ChaD); - if (TrainingTarget.Bod.Is双眼) + TrainingTarget = new Character(Med, DrawBuffer, Sta.GameData.TrainingTarget.Father.ChaD); + if (TrainingTarget.Body.IsDualEyes) { TrainingTarget.両目_見つめ(); } - if (TrainingTarget.Bod.Is頬眼) + if (TrainingTarget.Body.IsCheekEyes) { TrainingTarget.両頬目_見つめ(); } - if (TrainingTarget.Bod.Is単眼) + if (TrainingTarget.Body.IsSingleEye) { TrainingTarget.単目_見つめ(); } - if (TrainingTarget.Bod.Is額眼) + if (TrainingTarget.Body.IsForeheadEye) { TrainingTarget.額目_見つめ(); } @@ -3072,7 +3059,7 @@ namespace SlaveMatrix ////Sounds.精算.Play(); ip.UpdateSub2(); Sta.GameData.TrainingTarget.ChaD.胸施術 = true; - TrainingTarget.Bod.胸施術(); + TrainingTarget.Body.胸施術(); if (Sta.GameData.TrainingTarget.着衣 != null) { TrainingTarget.Set衣装(Sta.GameData.TrainingTarget.着衣); @@ -3085,13 +3072,13 @@ namespace SlaveMatrix TrainingTarget.UpdateExpression(); if (Sta.GameData.TrainingTarget.Trained) { - TrainingTarget.Bod.拘束具_表示 = false; - TrainingTarget.Bod.首輪_表示 = true; + TrainingTarget.Body.拘束具_表示 = false; + TrainingTarget.Body.首輪_表示 = true; TrainingTarget.Set基本姿勢(); } else { - TrainingTarget.Bod.拘束具_表示 = true; + TrainingTarget.Body.拘束具_表示 = true; TrainingTarget.Set拘束姿勢(); } } @@ -3113,26 +3100,26 @@ namespace SlaveMatrix //Sounds.精算.Play(); ip.UpdateSub2(); Sta.GameData.TrainingTarget.ChaD.股施術 = true; - TrainingTarget.Bod.股施術(); + TrainingTarget.Body.股施術(); if (Sta.GameData.TrainingTarget.着衣 != null) { TrainingTarget.Set衣装(Sta.GameData.TrainingTarget.着衣); } Sta.GameData.TrainingTarget.体力消費(); bs["股施術"].Dra = false; - ip.SubInfoIm = GameText.股の + (TrainingTarget.Bod.Is蠍 ? GameText.甲殻 : GameText.鱗) + GameText.を切除しました; + ip.SubInfoIm = GameText.股の + (TrainingTarget.Body.Is蠍 ? GameText.甲殻 : GameText.鱗) + GameText.を切除しました; TrainingTarget.SetInitialExpression(); TrainingTarget.Emotion(); TrainingTarget.UpdateExpression(); if (Sta.GameData.TrainingTarget.Trained) { - TrainingTarget.Bod.拘束具_表示 = false; - TrainingTarget.Bod.首輪_表示 = true; + TrainingTarget.Body.拘束具_表示 = false; + TrainingTarget.Body.首輪_表示 = true; TrainingTarget.Set基本姿勢(); } else { - TrainingTarget.Bod.拘束具_表示 = true; + TrainingTarget.Body.拘束具_表示 = true; TrainingTarget.Set拘束姿勢(); } } @@ -3153,7 +3140,7 @@ namespace SlaveMatrix //Sounds.精算.Play(); ip.UpdateSub2(); Sta.GameData.TrainingTarget.ChaD.タトゥ = true; - TrainingTarget.Bod.タトゥ(); + TrainingTarget.Body.タトゥ(); Sta.GameData.TrainingTarget.発情フラグ = true; Sta.GameData.TrainingTarget.体力消費(); bs["淫紋"].Dra = false; @@ -3163,18 +3150,18 @@ namespace SlaveMatrix TrainingTarget.UpdateExpression(); if (Sta.GameData.TrainingTarget.Trained) { - TrainingTarget.Bod.拘束具_表示 = false; - TrainingTarget.Bod.首輪_表示 = true; + TrainingTarget.Body.拘束具_表示 = false; + TrainingTarget.Body.首輪_表示 = true; TrainingTarget.Set基本姿勢(); } else { - TrainingTarget.Bod.拘束具_表示 = true; + TrainingTarget.Body.拘束具_表示 = true; TrainingTarget.Set拘束姿勢(); } - if (TrainingTarget.Bod.Is獣) + if (TrainingTarget.Body.Is獣) { - TrainingTarget.Bod.EI半中1.Updatef = true; + TrainingTarget.Body.EI半中1.Updatef = true; } } })); @@ -3203,13 +3190,13 @@ namespace SlaveMatrix TrainingTarget.UpdateExpression(); if (Sta.GameData.TrainingTarget.Trained) { - TrainingTarget.Bod.拘束具_表示 = false; - TrainingTarget.Bod.首輪_表示 = true; + TrainingTarget.Body.拘束具_表示 = false; + TrainingTarget.Body.首輪_表示 = true; TrainingTarget.Set基本姿勢(); } else { - TrainingTarget.Bod.拘束具_表示 = true; + TrainingTarget.Body.拘束具_表示 = true; TrainingTarget.Set拘束姿勢(); } } @@ -3318,7 +3305,7 @@ namespace SlaveMatrix public static Module Blessing(ModeEventDispatcher Med) { - Cha 祝福 = null; + Character 祝福 = null; bool d = false; Lab l = new Lab(DrawBuffer, "ラベル1", new Vector2D(ip.MaiB.Position.X, 0.026), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, "No blessing", Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black); Buts bs = new Buts(); @@ -3367,20 +3354,20 @@ namespace SlaveMatrix { 祝福.Dispose(); } - 祝福 = new Cha(Med, DrawBuffer, Sta.GameData.祝福.ChaD); - if (祝福.Bod.Is双眼) + 祝福 = new Character(Med, DrawBuffer, Sta.GameData.祝福.ChaD); + if (祝福.Body.IsDualEyes) { 祝福.両目_見つめ(); } - if (祝福.Bod.Is頬眼) + if (祝福.Body.IsCheekEyes) { 祝福.両頬目_見つめ(); } - if (祝福.Bod.Is単眼) + if (祝福.Body.IsSingleEye) { 祝福.単目_見つめ(); } - if (祝福.Bod.Is額眼) + if (祝福.Body.IsForeheadEye) { 祝福.額目_見つめ(); } @@ -3407,20 +3394,20 @@ namespace SlaveMatrix { 祝福.Dispose(); } - 祝福 = new Cha(Med, DrawBuffer, Sta.GameData.祝福.Mother.ChaD); - if (祝福.Bod.Is双眼) + 祝福 = new Character(Med, DrawBuffer, Sta.GameData.祝福.Mother.ChaD); + if (祝福.Body.IsDualEyes) { 祝福.両目_見つめ(); } - if (祝福.Bod.Is頬眼) + if (祝福.Body.IsCheekEyes) { 祝福.両頬目_見つめ(); } - if (祝福.Bod.Is単眼) + if (祝福.Body.IsSingleEye) { 祝福.単目_見つめ(); } - if (祝福.Bod.Is額眼) + if (祝福.Body.IsForeheadEye) { 祝福.額目_見つめ(); } @@ -3447,20 +3434,20 @@ namespace SlaveMatrix { 祝福.Dispose(); } - 祝福 = new Cha(Med, DrawBuffer, Sta.GameData.祝福.Father.ChaD); - if (祝福.Bod.Is双眼) + 祝福 = new Character(Med, DrawBuffer, Sta.GameData.祝福.Father.ChaD); + if (祝福.Body.IsDualEyes) { 祝福.両目_見つめ(); } - if (祝福.Bod.Is頬眼) + if (祝福.Body.IsCheekEyes) { 祝福.両頬目_見つめ(); } - if (祝福.Bod.Is単眼) + if (祝福.Body.IsSingleEye) { 祝福.単目_見つめ(); } - if (祝福.Bod.Is額眼) + if (祝福.Body.IsForeheadEye) { 祝福.額目_見つめ(); } @@ -4388,7 +4375,7 @@ namespace SlaveMatrix ViolaText.Set(); si.Set(bre: false); bs["nr"].Dra = Sta.GameData.借金 != 0; - bs["nr"].Dra = Sta.GameData.借金 != 0; + //bs["nr"].Dra = Sta.GameData.借金 != 0; } }; DrawDebt = delegate(RenderArea a, FPS FPS) @@ -4424,7 +4411,7 @@ namespace SlaveMatrix public static Module SlaveShop(ModeEventDispatcher Med) { Module mod = new Module(); - Cha PurchasTarget = null; + Character PurchasTarget = null; bool d = false; Action Reload = null; Unit u = null; @@ -4843,12 +4830,12 @@ namespace SlaveMatrix if (u != null) { PurchasTarget?.Dispose(); - PurchasTarget = new Cha(Med, DrawBuffer, u.ChaD); + PurchasTarget = new Character(Med, DrawBuffer, u.ChaD); PurchasTarget.SetInitialExpression(); PurchasTarget.Emotion(); PurchasTarget.UpdateExpression(); - PurchasTarget.Bod.拘束具_表示 = true; + PurchasTarget.Body.拘束具_表示 = true; PurchasTarget.Set拘束姿勢(); PurchasTarget.Set衣装(u.着衣); ip.TextIm = u.GetStatus(); @@ -5530,7 +5517,7 @@ namespace SlaveMatrix { if (TrainingTarget != null) { - TrainingTarget.Mots.Drive(FPS); + TrainingTarget.Motions.Drive(FPS); } Med.HitGraphics.Clear(Col.Transparent); if (a.HitGraphics != null) @@ -6199,9 +6186,9 @@ namespace SlaveMatrix //Sounds.日常BGM.Play(); Sta.GameData.ヴィオラ = new Unit(); Sta.GameData.ヴィオラ.SetViola(Med, DrawBuffer); - Viola = new Cha(Med, DrawBuffer, Sta.GameData.ヴィオラ.ChaD); + Viola = new Character(Med, DrawBuffer, Sta.GameData.ヴィオラ.ChaD); Viola.Set衣装(Sta.GameData.ヴィオラ.着衣); - ViolaTextBubble.接続(Viola.Bod.頭.口_接続点); + ViolaTextBubble.接続(Viola.Body.頭.口_接続点); i = 0; wi = 0; sfc[i](); @@ -6533,12 +6520,12 @@ namespace SlaveMatrix //Sounds.操作.Play(); ip.Sub.Done = delegate { - Viola.Bod.拘束具_表示 = false; + Viola.Body.拘束具_表示 = false; Viola.両翼獣_全開(0); Viola.両触手_S字(0); Viola.両触手_S字(1); Viola.SetSymmetry(); - Viola.Bod.Update(); + Viola.Body.Update(); Viola.表情_不敵1(); //Sounds.弾け.Play(); ip.Text = GameText.エクス2; @@ -6548,12 +6535,12 @@ namespace SlaveMatrix Sta.GameData.利子 *= 2.0; }; ViolaTextBubble.Tex.Feed.Dra = false; - Viola.Bod.拘束具_表示 = true; + Viola.Body.拘束具_表示 = true; Viola.両翼獣_閉じ(0); Viola.両触手_S字(0); Viola.両触手_S字(1); Viola.SetSymmetry(); - Viola.Bod.Update(); + Viola.Body.Update(); Viola.表情_素0眉上(); //Sounds.変更1.Play(); ViolaTextBubble.Text = GameText.っ点3; @@ -6606,7 +6593,7 @@ namespace SlaveMatrix if (i == 8) { Viola.両翼獣_半開き(0); - Viola.Bod.Update(); + Viola.Body.Update(); } if (i == 1) { @@ -7305,10 +7292,6 @@ namespace SlaveMatrix return mod; } - - - - static Mods() { TrainingTarget = null; @@ -7327,9 +7310,7 @@ namespace SlaveMatrix 日利子額 = 0uL; } - //buttons added by the other guy - public static void NewButtons(ModeEventDispatcher med) { if (Sta.SensesButton) @@ -7413,8 +7394,6 @@ namespace SlaveMatrix } } - - //room buttons or smthn? public static void MoveRoomDown() { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs index 1b160d8..0d1e0a2 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs @@ -7,7 +7,7 @@ namespace SlaveMatrix { public class Onomatopoeia { - private Mots ms = new Mots(); + private Motions ms = new Motions(); private List del = new List(); @@ -28,11 +28,11 @@ namespace SlaveMatrix }; pt.SetStringRectOutline(Are.UnitScale, Are.DisplayGraphics); pt.BasePointBase = pt.OP.GetCenter(); - Mot mot = new Mot(0.0, 1.0); + Motion mot = new Motion(0.0, 1.0); string n = mot.GetHashCode().ToString(); TextRenderingHint tr = Are.DisplayGraphics.TextRenderingHint; mot.BaseSpeed = 0.1; - mot.Runing = delegate(Mot m) + mot.OnUpdate = delegate(Motion m) { if (b) { @@ -43,11 +43,11 @@ namespace SlaveMatrix Are.Draw(pt); Are.DisplayGraphics.TextRenderingHint = tr; }; - mot.Reaing = delegate(Mot m) + mot.OnReach = delegate(Motion m) { m.End(); }; - mot.Ending = delegate + mot.OnEnd = delegate { Are.DisplayGraphics.TextRenderingHint = tr; pt.Dispose(); @@ -69,7 +69,7 @@ namespace SlaveMatrix public void Clear() { - foreach (KeyValuePair m in ms.ms) + foreach (KeyValuePair m in ms.ms) { m.Value.End(); } @@ -82,7 +82,7 @@ namespace SlaveMatrix public void Dispose() { - foreach (Mot value in ms.ms.Values) + foreach (Motion value in ms.ms.Values) { value.End(); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Player.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Player.cs index b6bef3e..3cc1d06 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Player.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Player.cs @@ -86,7 +86,7 @@ namespace SlaveMatrix //probably represents the player public static class Player { - public static Cha Cha; + public static Character Cha; public static TrainingUI UI; @@ -154,7 +154,7 @@ namespace SlaveMatrix public static double 調教前調教力; - public static Mot ゲージ降下処理; + public static Motion ゲージ降下処理; public static bool 強制終了; @@ -406,7 +406,7 @@ namespace SlaveMatrix { if (!強制終了 && Sta.GameData.TrainingTarget != null && Cha != null) { - return Cha.Med.Mode == "Training"; + return Cha.ModeEventDispatcher.Mode == "Training"; } return false; } @@ -475,7 +475,7 @@ namespace SlaveMatrix public static double 緊張値 => (Sensitivity + Tension.Inverse() + Shame.Inverse()) / 3.0 * Lust * Affection * 処女0_8w * 傷物0_8w * 調教済1_1w * 拘束具補正減 * 目隠帯補正減; - public static double 羞恥値 => (Sensitivity + Excitement + PlayerExcitement + Shame + Cha.Bod.くぱぁ0) / 5.0 * Affection * 無毛1_5w * 処女1_5w * 発情0_5w * 調教済1_1w * 目隠帯補正減 * 玉口枷補正増; + public static double 羞恥値 => (Sensitivity + Excitement + PlayerExcitement + Shame + Cha.Body.くぱぁ0) / 5.0 * Affection * 無毛1_5w * 処女1_5w * 発情0_5w * 調教済1_1w * 目隠帯補正減 * 玉口枷補正増; public static double 奉仕補正 { @@ -612,7 +612,7 @@ namespace SlaveMatrix { get { - if (!Cha.Bod.拘束具_表示) + if (!Cha.Body.拘束具_表示) { return 1.0; } @@ -624,7 +624,7 @@ namespace SlaveMatrix { get { - if (!Cha.Bod.拘束具_表示) + if (!Cha.Body.拘束具_表示) { return 1.0; } @@ -636,7 +636,7 @@ namespace SlaveMatrix { get { - if (!Cha.Bod.目隠帯_表示) + if (!Cha.Body.目隠帯_表示) { return 1.0; } @@ -648,7 +648,7 @@ namespace SlaveMatrix { get { - if (!Cha.Bod.目隠帯_表示) + if (!Cha.Body.目隠帯_表示) { return 1.0; } @@ -660,7 +660,7 @@ namespace SlaveMatrix { get { - if (!Cha.Bod.玉口枷_表示) + if (!Cha.Body.玉口枷_表示) { return 1.0; } @@ -672,7 +672,7 @@ namespace SlaveMatrix { get { - if (!Cha.Bod.玉口枷_表示) + if (!Cha.Body.玉口枷_表示) { return 1.0; } @@ -726,7 +726,7 @@ namespace SlaveMatrix { get { - if (!絶頂中 && !Cha.Bod.Is拘束 && Pride == 0.0) + if (!絶頂中 && !Cha.Body.Is拘束 && Pride == 0.0) { if (!(Lust > 0.5) && !(Affection > 0.5)) { @@ -758,7 +758,7 @@ namespace SlaveMatrix { get { - if (Cha.Bod.Is最前手人 && 奉仕0) + if (Cha.Body.Is最前手人 && 奉仕0) { return SkillL > 0.1 * Sta.GameData.TrainingTarget.MaxSkillL; } @@ -782,7 +782,7 @@ namespace SlaveMatrix { get { - if (Cha.Bod.Is最前手人 && 奉仕0) + if (Cha.Body.Is最前手人 && 奉仕0) { return SkillL > 0.2 * Sta.GameData.TrainingTarget.MaxSkillL; } @@ -794,7 +794,7 @@ namespace SlaveMatrix { get { - if (Cha.Bod.Is最前手人 && 奉仕0) + if (Cha.Body.Is最前手人 && 奉仕0) { return SkillL > 0.4 * Sta.GameData.TrainingTarget.MaxSkillL; } @@ -806,7 +806,7 @@ namespace SlaveMatrix { get { - if (Cha.Bod.Is最前手人 && 奉仕0) + if (Cha.Body.Is最前手人 && 奉仕0) { return SkillL > 0.6 * Sta.GameData.TrainingTarget.MaxSkillL; } @@ -818,7 +818,7 @@ namespace SlaveMatrix { get { - if (奉仕1 && !Cha.Bod.玉口枷_表示) + if (奉仕1 && !Cha.Body.玉口枷_表示) { return SkillL > 0.15 * Sta.GameData.TrainingTarget.MaxSkillL; } @@ -830,7 +830,7 @@ namespace SlaveMatrix { get { - if (!絶頂中 && 奉仕1 && !Cha.Bod.玉口枷_表示 && SkillL > 0.5 * Sta.GameData.TrainingTarget.MaxSkillL) + if (!絶頂中 && 奉仕1 && !Cha.Body.玉口枷_表示 && SkillL > 0.5 * Sta.GameData.TrainingTarget.MaxSkillL) { return CurrentToolType == ToolType.Penis; } @@ -878,7 +878,7 @@ namespace SlaveMatrix public static double 変化V_糸 => 糸挿入度; - public static double 変化V_固有値乱数 => Cha.ChaD.固有値 * RNG.XS.NextDouble(); + public static double 変化V_固有値乱数 => Cha.CharacterData.固有値 * RNG.XS.NextDouble(); public static double 無毛1_5w { @@ -1067,21 +1067,21 @@ namespace SlaveMatrix Cha.Emotion(); Cha.UpdateExpression(); Cha.UpdatePosture(); - Cha.Bod.処女喪失 = false; - Cha.Bod.膣内精液.血液1_表示 = false; - Cha.Bod.膣内精液.血液2_表示 = false; - Cha.Bod.性器精液.血液1_表示 = false; - Cha.Bod.性器精液.血液2_表示 = false; - Cha.Bod.飛沫濃度 = 0.0; - Cha.Bod.潮染み濃度 = 0.0; - Cha.Bod.尿染み濃度 = 0.0; - Cha.Bod.湯気左濃度 = 0.0; - Cha.Bod.湯気右濃度 = 0.0; + Cha.Body.処女喪失 = false; + Cha.Body.VaginalCumDrip.血液1_表示 = false; + Cha.Body.VaginalCumDrip.血液2_表示 = false; + Cha.Body.GenetalCum.血液1_表示 = false; + Cha.Body.GenetalCum.血液2_表示 = false; + Cha.Body.SplashIntencity = 0.0; + Cha.Body.SquirtStainIntensity = 0.0; + Cha.Body.UrineStainIntensity = 0.0; + Cha.Body.湯気左濃度 = 0.0; + Cha.Body.湯気右濃度 = 0.0; 放尿率 = 1.0; - Cha.Bod.噴乳左.母乳垂れ1_表示 = false; - Cha.Bod.噴乳左.母乳垂れ2_表示 = false; - Cha.Bod.噴乳右.母乳垂れ1_表示 = false; - Cha.Bod.噴乳右.母乳垂れ2_表示 = false; + Cha.Body.LeftMilkSpray.母乳垂れ1_表示 = false; + Cha.Body.LeftMilkSpray.母乳垂れ2_表示 = false; + Cha.Body.RightMilkSpary.母乳垂れ1_表示 = false; + Cha.Body.RightMilkSpary.母乳垂れ2_表示 = false; 表示ステート更新(); 強制終了 = false; ModBox(); @@ -1097,7 +1097,7 @@ namespace SlaveMatrix public static void Result2() { UI.ip.TextIm = GameText.抵抗値 + Pride.Numf2() + "\r\n" + GameText.欲望度 + Lust.Numf2() + " " + GameText.情愛度 + Affection.Numf2() + "\r\n" + GameText.卑屈度 + Training.Numf2() + " " + GameText.技巧度 + SkillL.Numf2() + "\r\n\r\n" + GameText.調教力 + 調教力.Numf2(); - Cha.Bod.変動ステート更新(); + Cha.Body.変動ステート更新(); } public static void アクション入力(ContactType contactType, ActionType actionType, CurrentState タイミング情報, ToolType toolType, int 挿入Lv, int 強さ, bool 機械, bool 射精) @@ -1198,11 +1198,11 @@ namespace SlaveMatrix } if (0.05.Lot()) { - if (Cha.Bod.Is双眉) + if (Cha.Body.Is双眉) { Cha.両眉_0(RNG.XS.NextBool(), RNG.XS.NextM(3, 4), RNG.XS.NextM(3, 4)); } - if (Cha.Bod.Is単眉) + if (Cha.Body.Is単眉) { Cha.単眉_顰(); } @@ -1221,10 +1221,10 @@ namespace SlaveMatrix } 絶頂中 = true; double value = 4.0 * Excitement * Tension.Inverse() * Shame * Pride.Inverse() * Lust * Affection; - Cha.絶頂激しさ = value.Clamp(0.0, 1.0); - Cha.絶頂時間 = value.Clamp(0.0, 0.85); + Cha.ClimaxIntensity = value.Clamp(0.0, 1.0); + Cha.ClimaxDuration = value.Clamp(0.0, 0.85); UI.絶頂ゲージ点滅.Start(); - Cha.絶頂.Start(); + Cha.Climax.Start(); if (UI.ペニス処理.手コキ.Run) { UI.ペニス処理.手コキ.End(); @@ -1246,11 +1246,11 @@ namespace SlaveMatrix Reaction0(); if (0.05.Lot()) { - if (Cha.Bod.Is双眉) + if (Cha.Body.Is双眉) { Cha.両眉_0(RNG.XS.NextBool(), RNG.XS.NextM(3, 4), RNG.XS.NextM(3, 4)); } - if (Cha.Bod.Is単眉) + if (Cha.Body.Is単眉) { Cha.単眉_顰(); } @@ -1275,21 +1275,21 @@ namespace SlaveMatrix } if (絶頂回数 > 1 && Lust > 0.6 && 0.1.Lot()) { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.目_上転左(); Cha.目_上転右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単目_上転(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬目_上転左(); Cha.頬目_上転右(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額目_上転(); } @@ -1298,21 +1298,21 @@ namespace SlaveMatrix { if (0.1.Lot()) { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.瞼_瞑左(); Cha.瞼_瞑右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単瞼_瞑(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬瞼_瞑左(); Cha.頬瞼_瞑右(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額瞼_瞑(); } @@ -1320,48 +1320,48 @@ namespace SlaveMatrix } else if (0.1.Lot()) { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.瞼_半1左(); Cha.瞼_半1右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単瞼_半1(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬瞼_半1左(); Cha.頬瞼_半1右(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額瞼_半1(); } } if (手膣 && Stamina > 0.1 && Wetness > 0.6 && Tension == 0.0 && Lust > 0.7 && Affection > 0.7 && (Excitement * 0.05).Lot()) { - Cha.潮吹大.Start(); + Cha.SquirtLarge.Start(); } else if (Wetness > 0.5 && Tension == 0.0 && Lust > 0.5 && Affection > 0.5 && (Excitement * 0.05).Lot()) { - Cha.潮吹小.Start(); + Cha.SquirtSmall.Start(); } - if (Cha.Crying && Cha.Bod.舌_表示 && (Cha.絶頂激しさ * 0.0008).Lot()) + if (Cha.Crying && Cha.Body.舌_表示 && (Cha.ClimaxIntensity * 0.0008).Lot()) { - Cha.鼻水.Start(); + Cha.NoseDrip.Start(); } - if ((Cha.Bod.舌_表示 || Cha.Bod.玉口枷_表示) && (Cha.絶頂激しさ * 0.001).Lot()) + if ((Cha.Body.舌_表示 || Cha.Body.玉口枷_表示) && (Cha.ClimaxIntensity * 0.001).Lot()) { - Cha.涎.Start(); + Cha.Drool.Start(); } if (0.05.Lot()) { - if (Cha.Bod.Is双眉) + if (Cha.Body.Is双眉) { Cha.両眉_0(RNG.XS.NextBool(), RNG.XS.NextM(3, 4), RNG.XS.NextM(3, 4)); } - if (Cha.Bod.Is単眉) + if (Cha.Body.Is単眉) { Cha.単眉_顰(); } @@ -1377,9 +1377,9 @@ namespace SlaveMatrix if (加算前提) { 絶頂終了処理_(); - if (Cha.Bod.くぱぁ0 > 0.5 && (0.1 + 放尿率 * 放尿経験値 * Tension.Inverse() * 0.5).Lot()) + if (Cha.Body.くぱぁ0 > 0.5 && (0.1 + 放尿率 * 放尿経験値 * Tension.Inverse() * 0.5).Lot()) { - Cha.放尿.Start(); + Cha.Urination.Start(); 放尿率 = (放尿率 - 0.1).Clamp(0.0, 1.0); 放尿経験値 = (放尿経験値 + 0.03 * RNG.XS.NextDouble()).Clamp(0.0, 1.0); } @@ -1391,8 +1391,8 @@ namespace SlaveMatrix { UI.絶頂ゲージ点滅.End(); 絶頂中 = false; - Sensitivity -= Cha.絶頂激しさ.Inverse() * 0.5; - Excitement -= Cha.絶頂激しさ.Inverse() * 0.5; + Sensitivity -= Cha.ClimaxIntensity.Inverse() * 0.5; + Excitement -= Cha.ClimaxIntensity.Inverse() * 0.5; } public static void 射精処理() @@ -1411,26 +1411,26 @@ namespace SlaveMatrix } if (((SkillL + Lust) * 0.05).Lot()) { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.目_見つめ左(); Cha.目_見つめ右(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬目_見つめ左(); Cha.頬目_見つめ右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単目_見つめ(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額目_見つめ(); } } - if (!Cha.Bod.玉口枷_表示 && !Cha.Bod.舌_表示 && ((SkillL + Lust) * 0.05).Lot()) + if (!Cha.Body.玉口枷_表示 && !Cha.Body.舌_表示 && ((SkillL + Lust) * 0.05).Lot()) { Cha.口_開き(); Cha.舌_出し(); @@ -1465,26 +1465,26 @@ namespace SlaveMatrix } if (((SkillL + Lust) * 0.05).Lot()) { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.目_見つめ左(); Cha.目_見つめ右(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬目_見つめ左(); Cha.頬目_見つめ右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単目_見つめ(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額目_見つめ(); } } - if (!Cha.Bod.玉口枷_表示 && !Cha.Bod.舌_表示 && ((SkillL + Lust) * 0.05).Lot()) + if (!Cha.Body.玉口枷_表示 && !Cha.Body.舌_表示 && ((SkillL + Lust) * 0.05).Lot()) { Cha.口_開き(); Cha.舌_出し(); @@ -1538,42 +1538,42 @@ namespace SlaveMatrix } if (0.7.Lot()) { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.瞼_瞑左(); Cha.瞼_瞑右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単瞼_瞑(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬瞼_瞑左(); Cha.頬瞼_瞑右(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額瞼_瞑(); } } else { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.瞼_半2左(); Cha.瞼_半2右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単瞼_半2(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬瞼_半2左(); Cha.頬瞼_半2右(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額瞼_半2(); } @@ -1681,7 +1681,7 @@ namespace SlaveMatrix double num2 = 0.0005 - num; if (接触o == CurrentContactType && 強さo == 強さn) { - 奴隷接触慣れ = (奴隷接触慣れ + (num + num2 * Cha.ChaD.固有値 * 調教力.Inverse())).Clamp(0.0, 1.0); + 奴隷接触慣れ = (奴隷接触慣れ + (num + num2 * Cha.CharacterData.固有値 * 調教力.Inverse())).Clamp(0.0, 1.0); } else { @@ -1689,7 +1689,7 @@ namespace SlaveMatrix } if (アクション情報o == CurrentActionType && 強さo == 強さn) { - 奴隷アクション慣れ = (奴隷アクション慣れ + (num + num2 * Cha.ChaD.固有値 * 調教力.Inverse())).Clamp(0.0, 1.0); + 奴隷アクション慣れ = (奴隷アクション慣れ + (num + num2 * Cha.CharacterData.固有値 * 調教力.Inverse())).Clamp(0.0, 1.0); } else { @@ -1748,17 +1748,17 @@ namespace SlaveMatrix Wetness = (Wetness + (num + num2 * 奴隷a * 潤滑値)).Clamp(0.0, 1.0); } - public static bool 苦痛条件(this Cha c) + public static bool 苦痛条件(this Character c) { - if ((!機械n || !(c.ChaD.Lust < 0.5) || !(c.ChaD.Affection < 0.5)) && (CurrentActionType != ActionType.Whipping || !(c.ChaD.Lust < 0.65))) + if ((!機械n || !(c.CharacterData.Lust < 0.5) || !(c.CharacterData.Affection < 0.5)) && (CurrentActionType != ActionType.Whipping || !(c.CharacterData.Lust < 0.65))) { if (CurrentActionType == ActionType.Insertion) { - if (!(c.ChaD.Wetness < 0.5) && !Virgin) + if (!(c.CharacterData.Wetness < 0.5) && !Virgin) { if (CurrentContactType != 0) { - return c.ChaD.Sesnsitivities[CurrentContactType] < 0.5; + return c.CharacterData.Sesnsitivities[CurrentContactType] < 0.5; } return false; } @@ -1822,7 +1822,7 @@ namespace SlaveMatrix { 部位感度[CurrentContactType] = (部位感度[CurrentContactType] + 0.015 * 奴隷a * 調教力影響値 * 発情1_5w * 調教済1_1w).Clamp(0.0, 1.0); } - if (Cha.Bod.玉口枷_表示 && 部位感度.ContainsKey(ContactType.Mouth)) + if (Cha.Body.玉口枷_表示 && 部位感度.ContainsKey(ContactType.Mouth)) { 部位感度[ContactType.Mouth] = (部位感度[ContactType.Mouth] + 0.005 * 奴隷a * 調教力影響値 * 発情1_5w * 調教済1_1w).Clamp(0.0, 1.0); } @@ -1852,7 +1852,7 @@ namespace SlaveMatrix { Training = (Training + 0.5 * 奴隷a * 調教力影響値 * 傷物1_2w * 拘束具補正増 * 玉口枷補正増).Clamp(0.0, 1.0); } - if ((0.1 * RNG.XS.NextDouble() * Cha.ChaD.固有値).Lot()) + if ((0.1 * RNG.XS.NextDouble() * Cha.CharacterData.固有値).Lot()) { Training = (Training + 0.2 * 奴隷a * 調教力影響値 * 傷物1_2w * 拘束具補正増 * 玉口枷補正増).Clamp(0.0, 1.0); } @@ -1877,7 +1877,7 @@ namespace SlaveMatrix { 部位感度[CurrentContactType] = (部位感度[CurrentContactType] + 0.03 * 奴隷a * 感度興奮差 * 調教力影響値 * 発情1_5w * 調教済1_1w * RNG.XS.NextDouble()).Clamp(0.0, 1.0); } - if (Cha.Bod.玉口枷_表示 && 部位感度.ContainsKey(ContactType.Mouth)) + if (Cha.Body.玉口枷_表示 && 部位感度.ContainsKey(ContactType.Mouth)) { 部位感度[ContactType.Mouth] = (部位感度[ContactType.Mouth] + 0.01 * 奴隷a * 調教力影響値 * 発情1_5w * 調教済1_1w).Clamp(0.0, 1.0); } @@ -1923,30 +1923,30 @@ namespace SlaveMatrix UI.精力mゲージ.Value = PlayerStamina; UI.射精mゲージ.Value = PlayerSensitivity; UI.興奮mゲージ.Value = PlayerExcitement; - Cha.Bod.下着B染み = Wetness; - Cha.Bod.陰核勃起 = Excitement; - Cha.Bod.乳首勃起 = Excitement; - Cha.Bod.顔紅潮 = Excitement.Max(Shame); - Cha.Bod.体紅潮 = Excitement; - Cha.呼吸速度 = 0.2 + 0.8 * Excitement; + Cha.Body.下着B染み = Wetness; + Cha.Body.陰核勃起 = Excitement; + Cha.Body.乳首勃起 = Excitement; + Cha.Body.顔紅潮 = Excitement.Max(Shame); + Cha.Body.体紅潮 = Excitement; + Cha.BreathingSpeed = 0.2 + 0.8 * Excitement; if (Lust > 0.5 && Affection > 0.5) { - Cha.Bod.子宮下がり = Excitement; + Cha.Body.子宮下がり = Excitement; } if (Lust > 0.5 && 部位感度[ContactType.Anal] > 0.75) { - Cha.Bod.肛門開き = Excitement; + Cha.Body.肛門開き = Excitement; } if (Lust > 0.3) { if (!UI.ハンド処理.Isくぱぁ && (!UI.Is挿入 || UI.ハンド左.Xi == 7)) { - Cha.Bod.くぱぁ0 = Excitement; + Cha.Body.くぱぁ0 = Excitement; } - if (!Cha.ChaD.股施術 && (Cha.Bod.Is蠍 || (Cha.Bod.Is蛇 && Cha.Bod.蛇.ガード))) + if (!Cha.CharacterData.股施術 && (Cha.Body.Is蠍 || (Cha.Body.Is蛇 && Cha.Body.蛇.ガード))) { - Cha.Bod.くぱぁ1 = Excitement; - if (Cha.Bod.くぱぁ1 < 0.3) + Cha.Body.くぱぁ1 = Excitement; + if (Cha.Body.くぱぁ1 < 0.3) { UI.くぱぁ閉じ時(); } @@ -1971,100 +1971,100 @@ namespace SlaveMatrix } } - public static double 否定_(this Cha c) + public static double 否定_(this Character c) { - return c.ChaD.Pride; + return c.CharacterData.Pride; } - public static double 屈辱_(this Cha c) + public static double 屈辱_(this Character c) { - return c.ChaD.Sensitivity * c.ChaD.Pride * c.ChaD.Taming; + return c.CharacterData.Sensitivity * c.CharacterData.Pride * c.CharacterData.Taming; } - public static double 羞恥_(this Cha c) + public static double 羞恥_(this Character c) { - return c.ChaD.Shyness; + return c.CharacterData.Shyness; } - public static double 受容_(this Cha c) + public static double 受容_(this Character c) { - return c.ChaD.Tension.Inverse() * c.ChaD.Pride.Inverse() * c.ChaD.Affection; + return c.CharacterData.Tension.Inverse() * c.CharacterData.Pride.Inverse() * c.CharacterData.Affection; } - public static double 欲望_(this Cha c) + public static double 欲望_(this Character c) { - return c.ChaD.Tension.Inverse() * c.ChaD.Pride.Inverse() * c.ChaD.Lust; + return c.CharacterData.Tension.Inverse() * c.CharacterData.Pride.Inverse() * c.CharacterData.Lust; } - public static double 興奮_(this Cha c) + public static double 興奮_(this Character c) { - return c.ChaD.Tension.Inverse() * c.ChaD.Pride.Inverse() * c.ChaD.Excitement * c.ChaD.Lust; + return c.CharacterData.Tension.Inverse() * c.CharacterData.Pride.Inverse() * c.CharacterData.Excitement * c.CharacterData.Lust; } - public static double 余裕_(this Cha c) + public static double 余裕_(this Character c) { - return c.ChaD.Tension.Inverse() * c.ChaD.Stamina * c.ChaD.Sensitivity.Inverse() * c.ChaD.Taming.Inverse() * c.ChaD.SkillL; + return c.CharacterData.Tension.Inverse() * c.CharacterData.Stamina * c.CharacterData.Sensitivity.Inverse() * c.CharacterData.Taming.Inverse() * c.CharacterData.SkillL; } - public static double 幸福_(this Cha c) + public static double 幸福_(this Character c) { - return c.ChaD.Tension.Inverse() * c.ChaD.Pride.Inverse() * c.ChaD.Tension.Inverse() * c.ChaD.Affection; + return c.CharacterData.Tension.Inverse() * c.CharacterData.Pride.Inverse() * c.CharacterData.Tension.Inverse() * c.CharacterData.Affection; } - public static double 喜悦_(this Cha c) + public static double 喜悦_(this Character c) { - return c.ChaD.Tension.Inverse() * c.ChaD.Pride.Inverse() * c.ChaD.Sensitivity * c.ChaD.Affection * c.ChaD.Lust; + return c.CharacterData.Tension.Inverse() * c.CharacterData.Pride.Inverse() * c.CharacterData.Sensitivity * c.CharacterData.Affection * c.CharacterData.Lust; } - public static double 淫乱_(this Cha c) + public static double 淫乱_(this Character c) { - return c.ChaD.Tension.Inverse() * c.ChaD.Pride.Inverse() * c.ChaD.Sensitivity * c.ChaD.Excitement * c.ChaD.Lust * c.ChaD.Taming; + return c.CharacterData.Tension.Inverse() * c.CharacterData.Pride.Inverse() * c.CharacterData.Sensitivity * c.CharacterData.Excitement * c.CharacterData.Lust * c.CharacterData.Taming; } - public static double 其他_(this Cha c) + public static double 其他_(this Character c) { return 0.2; } - public static void Emotion(this Cha c) + public static void Emotion(this Character c) { - switch (c.ChaD.Emotion) + switch (c.CharacterData.Emotion) { case EmotionType.none: switch (Oth.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.余裕_(), c.幸福_(), c.喜悦_(), c.淫乱_(), c.其他_())) { case 0: - c.ChaD.Emotion = EmotionType.Denial; + c.CharacterData.Emotion = EmotionType.Denial; break; case 1: - c.ChaD.Emotion = EmotionType.Humiliation; + c.CharacterData.Emotion = EmotionType.Humiliation; break; case 2: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 3: - c.ChaD.Emotion = EmotionType.Acceptance; + c.CharacterData.Emotion = EmotionType.Acceptance; break; case 4: - c.ChaD.Emotion = EmotionType.Desire; + c.CharacterData.Emotion = EmotionType.Desire; break; case 5: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; case 6: - c.ChaD.Emotion = EmotionType.余裕; + c.CharacterData.Emotion = EmotionType.余裕; break; case 7: - c.ChaD.Emotion = EmotionType.Happiness; + c.CharacterData.Emotion = EmotionType.Happiness; break; case 8: - c.ChaD.Emotion = EmotionType.Joy; + c.CharacterData.Emotion = EmotionType.Joy; break; case 9: - c.ChaD.Emotion = EmotionType.Lewd; + c.CharacterData.Emotion = EmotionType.Lewd; break; case 10: - c.ChaD.Emotion = EmotionType.Other; + c.CharacterData.Emotion = EmotionType.Other; break; } break; @@ -2072,16 +2072,16 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.喜悦_())) { case 0: - c.ChaD.Emotion = EmotionType.Denial; + c.CharacterData.Emotion = EmotionType.Denial; break; case 1: - c.ChaD.Emotion = EmotionType.Humiliation; + c.CharacterData.Emotion = EmotionType.Humiliation; break; case 2: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 3: - c.ChaD.Emotion = EmotionType.Joy; + c.CharacterData.Emotion = EmotionType.Joy; break; } break; @@ -2089,16 +2089,16 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.興奮_())) { case 0: - c.ChaD.Emotion = EmotionType.Denial; + c.CharacterData.Emotion = EmotionType.Denial; break; case 1: - c.ChaD.Emotion = EmotionType.Humiliation; + c.CharacterData.Emotion = EmotionType.Humiliation; break; case 2: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 3: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; } break; @@ -2106,13 +2106,13 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.屈辱_(), c.羞恥_(), c.興奮_())) { case 0: - c.ChaD.Emotion = EmotionType.Humiliation; + c.CharacterData.Emotion = EmotionType.Humiliation; break; case 1: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 2: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; } break; @@ -2120,19 +2120,19 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.余裕_())) { case 0: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 1: - c.ChaD.Emotion = EmotionType.Acceptance; + c.CharacterData.Emotion = EmotionType.Acceptance; break; case 2: - c.ChaD.Emotion = EmotionType.Desire; + c.CharacterData.Emotion = EmotionType.Desire; break; case 3: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; case 4: - c.ChaD.Emotion = EmotionType.余裕; + c.CharacterData.Emotion = EmotionType.余裕; break; } break; @@ -2140,19 +2140,19 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.受容_(), c.欲望_(), c.興奮_(), c.喜悦_(), c.淫乱_())) { case 0: - c.ChaD.Emotion = EmotionType.Acceptance; + c.CharacterData.Emotion = EmotionType.Acceptance; break; case 1: - c.ChaD.Emotion = EmotionType.Desire; + c.CharacterData.Emotion = EmotionType.Desire; break; case 2: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; case 3: - c.ChaD.Emotion = EmotionType.Joy; + c.CharacterData.Emotion = EmotionType.Joy; break; case 4: - c.ChaD.Emotion = EmotionType.Lewd; + c.CharacterData.Emotion = EmotionType.Lewd; break; } break; @@ -2160,19 +2160,19 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.羞恥_(), c.欲望_(), c.興奮_(), c.喜悦_(), c.淫乱_())) { case 0: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 1: - c.ChaD.Emotion = EmotionType.Desire; + c.CharacterData.Emotion = EmotionType.Desire; break; case 2: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; case 3: - c.ChaD.Emotion = EmotionType.Joy; + c.CharacterData.Emotion = EmotionType.Joy; break; case 4: - c.ChaD.Emotion = EmotionType.Lewd; + c.CharacterData.Emotion = EmotionType.Lewd; break; } break; @@ -2180,19 +2180,19 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.受容_(), c.欲望_(), c.興奮_(), c.余裕_(), c.幸福_())) { case 0: - c.ChaD.Emotion = EmotionType.Acceptance; + c.CharacterData.Emotion = EmotionType.Acceptance; break; case 1: - c.ChaD.Emotion = EmotionType.Desire; + c.CharacterData.Emotion = EmotionType.Desire; break; case 2: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; case 3: - c.ChaD.Emotion = EmotionType.余裕; + c.CharacterData.Emotion = EmotionType.余裕; break; case 4: - c.ChaD.Emotion = EmotionType.Happiness; + c.CharacterData.Emotion = EmotionType.Happiness; break; } break; @@ -2200,19 +2200,19 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.受容_(), c.欲望_(), c.余裕_(), c.幸福_(), c.喜悦_())) { case 0: - c.ChaD.Emotion = EmotionType.Acceptance; + c.CharacterData.Emotion = EmotionType.Acceptance; break; case 1: - c.ChaD.Emotion = EmotionType.Desire; + c.CharacterData.Emotion = EmotionType.Desire; break; case 2: - c.ChaD.Emotion = EmotionType.余裕; + c.CharacterData.Emotion = EmotionType.余裕; break; case 3: - c.ChaD.Emotion = EmotionType.Happiness; + c.CharacterData.Emotion = EmotionType.Happiness; break; case 4: - c.ChaD.Emotion = EmotionType.Joy; + c.CharacterData.Emotion = EmotionType.Joy; break; } break; @@ -2220,25 +2220,25 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.幸福_(), c.喜悦_(), c.淫乱_())) { case 0: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 1: - c.ChaD.Emotion = EmotionType.Acceptance; + c.CharacterData.Emotion = EmotionType.Acceptance; break; case 2: - c.ChaD.Emotion = EmotionType.Desire; + c.CharacterData.Emotion = EmotionType.Desire; break; case 3: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; case 4: - c.ChaD.Emotion = EmotionType.Happiness; + c.CharacterData.Emotion = EmotionType.Happiness; break; case 5: - c.ChaD.Emotion = EmotionType.Joy; + c.CharacterData.Emotion = EmotionType.Joy; break; case 6: - c.ChaD.Emotion = EmotionType.Lewd; + c.CharacterData.Emotion = EmotionType.Lewd; break; } break; @@ -2246,25 +2246,25 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.屈辱_(), c.羞恥_(), c.欲望_(), c.興奮_(), c.幸福_(), c.喜悦_(), c.淫乱_())) { case 0: - c.ChaD.Emotion = EmotionType.Humiliation; + c.CharacterData.Emotion = EmotionType.Humiliation; break; case 1: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 2: - c.ChaD.Emotion = EmotionType.Desire; + c.CharacterData.Emotion = EmotionType.Desire; break; case 3: - c.ChaD.Emotion = EmotionType.Excitement; + c.CharacterData.Emotion = EmotionType.Excitement; break; case 4: - c.ChaD.Emotion = EmotionType.Happiness; + c.CharacterData.Emotion = EmotionType.Happiness; break; case 5: - c.ChaD.Emotion = EmotionType.Joy; + c.CharacterData.Emotion = EmotionType.Joy; break; case 6: - c.ChaD.Emotion = EmotionType.Lewd; + c.CharacterData.Emotion = EmotionType.Lewd; break; } break; @@ -2272,30 +2272,30 @@ namespace SlaveMatrix switch (Oth.GetRandomIndex(c.羞恥_(), c.受容_(), c.余裕_(), c.幸福_(), c.其他_())) { case 0: - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; break; case 1: - c.ChaD.Emotion = EmotionType.Acceptance; + c.CharacterData.Emotion = EmotionType.Acceptance; break; case 2: - c.ChaD.Emotion = EmotionType.余裕; + c.CharacterData.Emotion = EmotionType.余裕; break; case 3: - c.ChaD.Emotion = EmotionType.Happiness; + c.CharacterData.Emotion = EmotionType.Happiness; break; case 4: - c.ChaD.Emotion = EmotionType.Other; + c.CharacterData.Emotion = EmotionType.Other; break; } break; } if (c.苦痛条件()) { - c.ChaD.Emotion = EmotionType.Humiliation; + c.CharacterData.Emotion = EmotionType.Humiliation; } - if (c.放尿.Run) + if (c.Urination.Run) { - c.ChaD.Emotion = EmotionType.Shame; + c.CharacterData.Emotion = EmotionType.Shame; } } @@ -2313,9 +2313,9 @@ namespace SlaveMatrix { Cha.Crying = false; } - if (Cha.Bod.Is初期腰) + if (Cha.Body.Is初期腰) { - Cha.Bod.SetWaist(); + Cha.Body.SetWaist(); } Cha.Emotion(); Cha.UpdateExpression(); @@ -2331,34 +2331,34 @@ namespace SlaveMatrix if (Virgin && CurrentActionType == ActionType.Insertion && (CurrentToolType == ToolType.Penis || CurrentToolType == ToolType.Dildo || CurrentToolType == ToolType.Vibrator || CurrentToolType == ToolType.Drill || CurrentToolType == ToolType.デンマ || CurrentToolType == ToolType.AnalVibrator) && CurrentContactType == ContactType.Vagina && 挿入Lvn > 2) { Reaction2(); - Cha.Bod.Waist.位置B += Oth.GetRandomVector() * 0.0004; - Cha.Bod.腰振りv = RNG.XS.NextDouble(); + Cha.Body.Waist.位置B += Oth.GetRandomVector() * 0.0004; + Cha.Body.HipMotionValue = RNG.XS.NextDouble(); switch (RNG.XS.Next(2)) { case 0: - Cha.ChaD.Emotion = EmotionType.Humiliation; + Cha.CharacterData.Emotion = EmotionType.Humiliation; break; case 1: - Cha.ChaD.Emotion = EmotionType.Shame; + Cha.CharacterData.Emotion = EmotionType.Shame; break; } Cha.SetInitialExpression(); Cha.UpdatePosture(); Virgin = false; Sta.GameData.TrainingTarget.Virgin = false; - UI.発音(Cha.Bod.膣口位置.GetAreaPoint(0.04), Sta.処女喪失, Color.Red, 0.3, b: true); - Cha.Bod.処女喪失 = true; - if (Cha.Bod.断面_表示) + UI.発音(Cha.Body.膣口位置.GetAreaPoint(0.04), Sta.処女喪失, Color.Red, 0.3, b: true); + Cha.Body.処女喪失 = true; + if (Cha.Body.断面_表示) { - Cha.Bod.膣内精液.血液1_表示 = true; - Cha.Bod.膣内精液.血液2_表示 = true; + Cha.Body.VaginalCumDrip.血液1_表示 = true; + Cha.Body.VaginalCumDrip.血液2_表示 = true; } - Cha.Bod.性器精液.血液1_表示 = true; - Cha.Bod.性器精液.血液2_表示 = true; - Cha.Bod.性器精液.血液濃度 = 0.0; + Cha.Body.GenetalCum.血液1_表示 = true; + Cha.Body.GenetalCum.血液2_表示 = true; + Cha.Body.GenetalCum.血液濃度 = 0.0; 発声(); } - else if (!射精n && (初回 || タイミング情報n == CurrentState.Start || CurrentActionType == ActionType.Whipping || (CurrentContactType == ContactType.Vagina && CurrentActionType == ActionType.Insertion && 挿入Lvn == (int)(5.0 * Cha.ChaD.固有値) && 0.2.Lot()))) + else if (!射精n && (初回 || タイミング情報n == CurrentState.Start || CurrentActionType == ActionType.Whipping || (CurrentContactType == ContactType.Vagina && CurrentActionType == ActionType.Insertion && 挿入Lvn == (int)(5.0 * Cha.CharacterData.固有値) && 0.2.Lot()))) { Reaction1(); 初回 = false; @@ -2380,9 +2380,9 @@ namespace SlaveMatrix WaitingState1(); 初回 = true; 反応度 = 1.0; - if (CurrentActionType == ActionType.Insertion && CurrentContactType == ContactType.Mouth && SkillL < 0.5 * Sta.GameData.TrainingTarget.MaxSkillL && Reactions.Tongue.Contains(Cha.Bod.口i) && ((CurrentToolType == ToolType.Hand && 手口) || CurrentToolType == ToolType.Penis || CurrentToolType == ToolType.Dildo || CurrentToolType == ToolType.Vibrator || CurrentToolType == ToolType.Drill || CurrentToolType == ToolType.デンマ || CurrentToolType == ToolType.AnalVibrator) && (SkillL.Inverse() * 0.8).Lot()) + if (CurrentActionType == ActionType.Insertion && CurrentContactType == ContactType.Mouth && SkillL < 0.5 * Sta.GameData.TrainingTarget.MaxSkillL && Reactions.Tongue.Contains(Cha.Body.口i) && ((CurrentToolType == ToolType.Hand && 手口) || CurrentToolType == ToolType.Penis || CurrentToolType == ToolType.Dildo || CurrentToolType == ToolType.Vibrator || CurrentToolType == ToolType.Drill || CurrentToolType == ToolType.デンマ || CurrentToolType == ToolType.AnalVibrator) && (SkillL.Inverse() * 0.8).Lot()) { - Cha.Coughing.Start(); + Cha.Cough.Start(); return; } Cha.SetInitialExpression(); @@ -2393,8 +2393,8 @@ namespace SlaveMatrix public static void Reaction1() { Reaction2(); - Cha.Bod.Waist.位置B += Oth.GetRandomVector() * 0.0004; - Cha.Bod.腰振りv = RNG.XS.NextDouble(); + Cha.Body.Waist.位置B += Oth.GetRandomVector() * 0.0004; + Cha.Body.HipMotionValue = RNG.XS.NextDouble(); Cha.Emotion(); Cha.UpdateExpression(); Cha.UpdatePosture(); @@ -2402,42 +2402,42 @@ namespace SlaveMatrix { if (0.7.Lot()) { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.瞼_瞑左(); Cha.瞼_瞑右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単瞼_瞑(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬瞼_瞑左(); Cha.頬瞼_瞑右(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額瞼_瞑(); } } else { - if (Cha.Bod.Is双眼) + if (Cha.Body.IsDualEyes) { Cha.瞼_半2左(); Cha.瞼_半2右(); } - if (Cha.Bod.Is単眼) + if (Cha.Body.IsSingleEye) { Cha.単瞼_半2(); } - if (Cha.Bod.Is頬眼) + if (Cha.Body.IsCheekEyes) { Cha.頬瞼_半2左(); Cha.頬瞼_半2右(); } - if (Cha.Bod.Is額眼) + if (Cha.Body.IsForeheadEye) { Cha.額瞼_半2(); } @@ -2459,21 +2459,21 @@ namespace SlaveMatrix { Cha.Crying = false; } - if ((Cha.Bod.玉口枷_表示 && Sensitivity.Lot()) || (CurrentActionType == ActionType.Insertion && CurrentContactType == ContactType.Mouth && Sensitivity > 0.5 && Excitement > 0.5 && Lust > 0.8 && Sensitivity.Lot() && ((CurrentToolType == ToolType.Hand && 手膣) || CurrentToolType == ToolType.Penis || CurrentToolType == ToolType.Dildo || CurrentToolType == ToolType.Vibrator || CurrentToolType == ToolType.Drill || CurrentToolType == ToolType.デンマ || CurrentToolType == ToolType.AnalVibrator))) + if ((Cha.Body.玉口枷_表示 && Sensitivity.Lot()) || (CurrentActionType == ActionType.Insertion && CurrentContactType == ContactType.Mouth && Sensitivity > 0.5 && Excitement > 0.5 && Lust > 0.8 && Sensitivity.Lot() && ((CurrentToolType == ToolType.Hand && 手膣) || CurrentToolType == ToolType.Penis || CurrentToolType == ToolType.Dildo || CurrentToolType == ToolType.Vibrator || CurrentToolType == ToolType.Drill || CurrentToolType == ToolType.デンマ || CurrentToolType == ToolType.AnalVibrator))) { - Cha.涎.Start(); + Cha.Drool.Start(); } if (Stamina > 0.1 && Sensitivity > 0.5 && Wetness > 0.6 && Tension == 0.0 && Lust > 0.7 && Affection > 0.7 && (Excitement * 0.05).Lot()) { - Cha.潮吹小.Start(); + Cha.SquirtSmall.Start(); } if (CurrentActionType == ActionType.Insertion && CurrentContactType == ContactType.Vagina && Sensitivity > 0.4 && Wetness == 1.0 && Lust > 0.7 && Affection > 0.7 && Sensitivity.Lot() && ((CurrentToolType == ToolType.Hand && 手膣) || CurrentToolType == ToolType.Penis || CurrentToolType == ToolType.Dildo || CurrentToolType == ToolType.Vibrator || CurrentToolType == ToolType.Drill || CurrentToolType == ToolType.デンマ || CurrentToolType == ToolType.AnalVibrator)) { - Cha.飛沫.Start(); + Cha.Splash.Start(); } - if (Sta.GameData.TrainingTarget.妊娠状態変数 > 2 && !Cha.Bod.乳房左.虫性_甲殻_表示 && (CurrentActionType == ActionType.乳捏 || CurrentActionType == ActionType.パイ || ((double)Sta.GameData.TrainingTarget.妊娠状態変数 * 0.1).Lot())) + if (Sta.GameData.TrainingTarget.妊娠状態変数 > 2 && !Cha.Body.乳房左.虫性_甲殻_表示 && (CurrentActionType == ActionType.乳捏 || CurrentActionType == ActionType.パイ || ((double)Sta.GameData.TrainingTarget.妊娠状態変数 * 0.1).Lot())) { - Cha.噴乳.Start(); + Cha.MilkSpray.Start(); } if (!Cha.膣ヒク.Run && (CurrentContactType == ContactType.Crotch || CurrentContactType == ContactType.Sex || CurrentContactType == ContactType.Nucleus || CurrentContactType == ContactType.Vagina || RNG.XS.NextBool()) && 部位感度[ContactType.Vagina] > 0.4) { @@ -2506,12 +2506,12 @@ namespace SlaveMatrix num = 1 + Oth.GetRandomIndex((Shame + Tension + Training + Pride) / 4.0, (Sensitivity + Affection + Lust) / 3.0 - num2, (Sensitivity + Excitement + Affection + Lust + Training) / 5.0 - num2); } string text = ""; - if (Cha.Bod.口i == 4 || Cha.Bod.口i == 10 || Cha.Bod.口i == 11) + if (Cha.Body.口i == 4 || Cha.Body.口i == 10 || Cha.Body.口i == 11) { string[][] n = Sta.n; text = n[num][RNG.XS.Next(n[num].Length)]; } - else if (Cha.Bod.玉口枷_表示) + else if (Cha.Body.玉口枷_表示) { text = Sta.o[3][RNG.XS.Next(Sta.o[3].Length)]; } @@ -2524,7 +2524,7 @@ namespace SlaveMatrix } while (n[num].Length < 1 || string.IsNullOrWhiteSpace(text = n[num][RNG.XS.Next(n[num].Length)])); } - UI.発音(Cha.Bod.口腔位置.GetAreaPoint(0.05), text.語尾() + " ", Color.Pink, 0.3 + 0.1 * Excitement, b: true); + UI.発音(Cha.Body.口腔位置.GetAreaPoint(0.05), text.語尾() + " ", Color.Pink, 0.3 + 0.1 * Excitement, b: true); } public static string 語尾(this string s) @@ -2564,13 +2564,13 @@ namespace SlaveMatrix { 絶頂中 = false; 射精中 = false; - ゲージ降下処理 = new Mot(0.0, 1.0) + ゲージ降下処理 = new Motion(0.0, 1.0) { BaseSpeed = 1.0, - Staing = delegate + OnStart = delegate { }, - Runing = delegate + OnUpdate = delegate { if (加算前提) { @@ -2591,13 +2591,13 @@ namespace SlaveMatrix WaitingState0(); } }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { } }; @@ -2612,7 +2612,7 @@ namespace SlaveMatrix { return; } - ChaD chaD = Sta.GameData.TrainingTarget.ChaD; + CharacterData chaD = Sta.GameData.TrainingTarget.ChaD; List list = new List(); foreach (KeyValuePair item in chaD.Sesnsitivities) { @@ -2634,7 +2634,7 @@ namespace SlaveMatrix { return; } - ChaD chaD = Sta.GameData.TrainingTarget.ChaD; + CharacterData chaD = Sta.GameData.TrainingTarget.ChaD; UI.SensitivityBox.TextIm = "Sensitivities:\r\n"; foreach (KeyValuePair item in chaD.Sesnsitivities) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs index e9be5bb..260a122 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs @@ -20,7 +20,7 @@ namespace SlaveMatrix ModeEventDispatcher med = new ModeEventDispatcher { - UITitle = GameText.スレイブマトリクス, + UITitle = GameText.SlaveMatrix, //sureibumatorikusu Unit = Sta.HighQuality ? 2203.0 : 1101.5, ShowFPS = Sta.ShowFPS, Base = new Rectangle(4.0, 3.0, percent / 100.0), diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs index 089044e..db13ac7 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs @@ -2803,9 +2803,9 @@ namespace SlaveMatrix public const int 植_0数 = 1; - public static void SetInitialAngle(this Cha Cha) + public static void SetInitialAngle(this Character Cha) { - Ele[] Elements = Cha.Bod.Elements; + Ele[] Elements = Cha.Body.Elements; foreach (Ele obj in Elements) { obj.AngleAll = 0.0; @@ -2813,9 +2813,9 @@ namespace SlaveMatrix } } - public static void SetSymmetry(this Cha Cha) + public static void SetSymmetry(this Character Cha) { - Ele[] Elements = Cha.Bod.Elements; + Ele[] Elements = Cha.Body.Elements; try { List list = new List(); @@ -2972,69 +2972,69 @@ namespace SlaveMatrix } } - public static double 角度ムラ(this Cha c, int rs1, double ba1, int rs2, double ba2) + public static double 角度ムラ(this Character c, int rs1, double ba1, int rs2, double ba2) { - return (double)rs1 * ba1 * c.ChaD.固有値 + (double)rs2 * ba2 * RNG.XS.NextDouble(); + return (double)rs1 * ba1 * c.CharacterData.固有値 + (double)rs2 * ba2 * RNG.XS.NextDouble(); } - public static void 眉_無左(this Cha Cha, double u1) + public static void 眉_無左(this Character Cha, double u1) { - Cha.Bod.眉左.眉間_表示 = false; - Cha.Bod.眉左.Yi = 0; - Cha.Bod.眉左.角度B = u1; + Cha.Body.眉左.眉間_表示 = false; + Cha.Body.眉左.Yi = 0; + Cha.Body.眉左.角度B = u1; } - public static void 眉_無右(this Cha Cha, double u1) + public static void 眉_無右(this Character Cha, double u1) { - Cha.Bod.眉右.眉間_表示 = false; - Cha.Bod.眉右.Yi = 0; - Cha.Bod.眉右.角度B = 0.0 - u1; + Cha.Body.眉右.眉間_表示 = false; + Cha.Body.眉右.Yi = 0; + Cha.Body.眉右.角度B = 0.0 - u1; } - public static void 眉_吊左(this Cha Cha, bool 眉間, double u1) + public static void 眉_吊左(this Character Cha, bool 眉間, double u1) { - Cha.Bod.眉左.眉間_表示 = 眉間; - Cha.Bod.眉左.Yi = 1; - Cha.Bod.眉左.角度B = u1; + Cha.Body.眉左.眉間_表示 = 眉間; + Cha.Body.眉左.Yi = 1; + Cha.Body.眉左.角度B = u1; } - public static void 眉_吊右(this Cha Cha, bool 眉間, double u1) + public static void 眉_吊右(this Character Cha, bool 眉間, double u1) { - Cha.Bod.眉右.眉間_表示 = 眉間; - Cha.Bod.眉右.Yi = 1; - Cha.Bod.眉右.角度B = 0.0 - u1; + Cha.Body.眉右.眉間_表示 = 眉間; + Cha.Body.眉右.Yi = 1; + Cha.Body.眉右.角度B = 0.0 - u1; } - public static void 眉_顰左(this Cha Cha, bool 眉間, double u1) + public static void 眉_顰左(this Character Cha, bool 眉間, double u1) { - Cha.Bod.眉左.眉間_表示 = 眉間; - Cha.Bod.眉左.Yi = 2; - Cha.Bod.眉左.角度B = u1; + Cha.Body.眉左.眉間_表示 = 眉間; + Cha.Body.眉左.Yi = 2; + Cha.Body.眉左.角度B = u1; } - public static void 眉_顰右(this Cha Cha, bool 眉間, double u1) + public static void 眉_顰右(this Character Cha, bool 眉間, double u1) { - Cha.Bod.眉右.眉間_表示 = 眉間; - Cha.Bod.眉右.Yi = 2; - Cha.Bod.眉右.角度B = 0.0 - u1; + Cha.Body.眉右.眉間_表示 = 眉間; + Cha.Body.眉右.Yi = 2; + Cha.Body.眉右.角度B = 0.0 - u1; } - public static void 両眉_無(this Cha Cha) + public static void 両眉_無(this Character Cha) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 0.5, RNG.XS.NextSign(), 0.25); Cha.眉_無左(u); Cha.眉_無右(u); } - public static void 両眉_顰(this Cha Cha) + public static void 両眉_顰(this Character Cha) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 0.5, RNG.XS.NextSign(), 0.25); - bool flag = Cha.ChaD.固有値 * RNG.XS.NextDouble() > 0.5; + bool flag = Cha.CharacterData.固有値 * RNG.XS.NextDouble() > 0.5; Cha.眉_顰左(flag, u); Cha.眉_顰右(!flag, u); } - public static void 両眉_0(this Cha Cha, bool 同角, int i1, int i2) + public static void 両眉_0(this Character Cha, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 1.0, RNG.XS.NextSign(), 0.5); double u = ((!同角) ? Cha.角度ムラ(RNG.XS.NextSign(), 1.0, RNG.XS.NextSign(), 0.5) : num); @@ -3042,7 +3042,7 @@ namespace SlaveMatrix Cha.眉右_0(i2, u); } - public static void 眉左_0(this Cha c, int i, double u1) + public static void 眉左_0(this Character c, int i, double u1) { switch (i) { @@ -3064,7 +3064,7 @@ namespace SlaveMatrix } } - public static void 眉右_0(this Cha c, int i, double u1) + public static void 眉右_0(this Character c, int i, double u1) { switch (i) { @@ -3086,45 +3086,45 @@ namespace SlaveMatrix } } - public static void 眉_下左(this Cha Cha) + public static void 眉_下左(this Character Cha) { - Cha.Bod.眉左.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; + Cha.Body.眉左.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; } - public static void 眉_下右(this Cha Cha) + public static void 眉_下右(this Character Cha) { - Cha.Bod.眉右.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; + Cha.Body.眉右.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; } - public static void 眉_上左(this Cha Cha) + public static void 眉_上左(this Character Cha) { - Cha.Bod.眉左.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; + Cha.Body.眉左.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; } - public static void 眉_上右(this Cha Cha) + public static void 眉_上右(this Character Cha) { - Cha.Bod.眉右.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; + Cha.Body.眉右.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; } - public static void 両眉_下(this Cha Cha) + public static void 両眉_下(this Character Cha) { Cha.眉_下左(); Cha.眉_下右(); } - public static void 両眉_上(this Cha Cha) + public static void 両眉_上(this Character Cha) { Cha.眉_上左(); Cha.眉_上右(); } - public static void 両眉_1(this Cha Cha, int i1, int i2) + public static void 両眉_1(this Character Cha, int i1, int i2) { Cha.眉左_1(i1); Cha.眉右_1(i2); } - public static void 眉左_1(this Cha c, int i) + public static void 眉左_1(this Character c, int i) { switch (i) { @@ -3137,7 +3137,7 @@ namespace SlaveMatrix } } - public static void 眉右_1(this Cha c, int i) + public static void 眉右_1(this Character c, int i) { switch (i) { @@ -3150,22 +3150,22 @@ namespace SlaveMatrix } } - public static void 単眉_無(this Cha Cha) + public static void 単眉_無(this Character Cha) { - Cha.Bod.単眼眉.Yi = 0; + Cha.Body.単眼眉.Yi = 0; } - public static void 単眉_吊(this Cha Cha) + public static void 単眉_吊(this Character Cha) { - Cha.Bod.単眼眉.Yi = 1; + Cha.Body.単眼眉.Yi = 1; } - public static void 単眉_顰(this Cha Cha) + public static void 単眉_顰(this Character Cha) { - Cha.Bod.単眼眉.Yi = 2; + Cha.Body.単眼眉.Yi = 2; } - public static void 単眉_0(this Cha c, int i) + public static void 単眉_0(this Character c, int i) { switch (i) { @@ -3181,17 +3181,17 @@ namespace SlaveMatrix } } - public static void 単眉_下(this Cha Cha) + public static void 単眉_下(this Character Cha) { - Cha.Bod.単眼眉.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; + Cha.Body.単眼眉.Body.CurJoinRoot.PositionCont = Dat.Vec2DZero; } - public static void 単眉_上(this Cha Cha) + public static void 単眉_上(this Character Cha) { - Cha.Bod.単眼眉.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; + Cha.Body.単眼眉.Body.CurJoinRoot.PositionCont = -Dat.Vec2DUnitY * 0.003; } - public static void 単眉_1(this Cha c, int i) + public static void 単眉_1(this Character c, int i) { switch (i) { @@ -3204,61 +3204,61 @@ namespace SlaveMatrix } } - public static void 目_見つめ左(this Cha Cha) + public static void 目_見つめ左(this Character Cha) { - Cha.Bod.目左.視線 = new Vector2D(0.0, -0.00023); - Cha.Bod.目左.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.目左.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.目左.視線 = new Vector2D(0.0, -0.00023); + Cha.Body.目左.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.目左.X0Y0_黒目_瞳孔.SizeXCont = 1.0; } - public static void 目_見つめ右(this Cha Cha) + public static void 目_見つめ右(this Character Cha) { - Cha.Bod.目右.視線 = new Vector2D(0.0, -0.00023); - Cha.Bod.目右.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.目右.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.目右.視線 = new Vector2D(0.0, -0.00023); + Cha.Body.目右.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.目右.X0Y0_黒目_瞳孔.SizeXCont = 1.0; } - public static void 目_逸らし左(this Cha Cha, bool b) + public static void 目_逸らし左(this Character Cha, bool b) { - Cha.Bod.目左.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0015, 0.0); - Cha.Bod.目左.X0Y0_黒目_黒目.SizeXCont = 0.95; - Cha.Bod.目左.X0Y0_黒目_瞳孔.SizeXCont = 0.95; + Cha.Body.目左.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0015, 0.0); + Cha.Body.目左.X0Y0_黒目_黒目.SizeXCont = 0.95; + Cha.Body.目左.X0Y0_黒目_瞳孔.SizeXCont = 0.95; } - public static void 目_逸らし右(this Cha Cha, bool b) + public static void 目_逸らし右(this Character Cha, bool b) { - Cha.Bod.目右.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0015, 0.0); - Cha.Bod.目右.X0Y0_黒目_黒目.SizeXCont = 0.95; - Cha.Bod.目右.X0Y0_黒目_瞳孔.SizeXCont = 0.95; + Cha.Body.目右.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0015, 0.0); + Cha.Body.目右.X0Y0_黒目_黒目.SizeXCont = 0.95; + Cha.Body.目右.X0Y0_黒目_瞳孔.SizeXCont = 0.95; } - public static void 目_上転左(this Cha Cha) + public static void 目_上転左(this Character Cha) { - Cha.Bod.目左.視線 = new Vector2D(0.0, -0.0021); - Cha.Bod.目左.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.目左.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.目左.視線 = new Vector2D(0.0, -0.0021); + Cha.Body.目左.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.目左.X0Y0_黒目_瞳孔.SizeXCont = 1.0; } - public static void 目_上転右(this Cha Cha) + public static void 目_上転右(this Character Cha) { - Cha.Bod.目右.視線 = new Vector2D(0.0, -0.002); - Cha.Bod.目右.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.目右.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.目右.視線 = new Vector2D(0.0, -0.002); + Cha.Body.目右.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.目右.X0Y0_黒目_瞳孔.SizeXCont = 1.0; } - public static void 両目_見つめ(this Cha Cha) + public static void 両目_見つめ(this Character Cha) { Cha.目_見つめ左(); Cha.目_見つめ右(); } - public static void 両目_0(this Cha Cha, int i1, int i2) + public static void 両目_0(this Character Cha, int i1, int i2) { Cha.目左_0(i1); Cha.目右_0(i2); } - public static void 目左_0(this Cha c, int i) + public static void 目左_0(this Character c, int i) { switch (i) { @@ -3277,7 +3277,7 @@ namespace SlaveMatrix } } - public static void 目右_0(this Cha c, int i) + public static void 目右_0(this Character c, int i) { switch (i) { @@ -3296,73 +3296,73 @@ namespace SlaveMatrix } } - public static void 頬目_見つめ左(this Cha Cha) + public static void 頬目_見つめ左(this Character Cha) { - Cha.Bod.頬目左.視線 = new Vector2D(0.0, -0.00023); - Cha.Bod.頬目左.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.頬目左.X0Y0_黒目_瞳孔.SizeXCont = 1.0; - Cha.Bod.頬目左.X0Y0_黒目_黒目.SizeYCont = 1.0; - Cha.Bod.頬目左.X0Y0_黒目_瞳孔.SizeYCont = 1.0; + Cha.Body.頬目左.視線 = new Vector2D(0.0, -0.00023); + Cha.Body.頬目左.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.頬目左.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.頬目左.X0Y0_黒目_黒目.SizeYCont = 1.0; + Cha.Body.頬目左.X0Y0_黒目_瞳孔.SizeYCont = 1.0; } - public static void 頬目_見つめ右(this Cha Cha) + public static void 頬目_見つめ右(this Character Cha) { - Cha.Bod.頬目右.視線 = new Vector2D(0.0, -0.00023); - Cha.Bod.頬目右.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.頬目右.X0Y0_黒目_瞳孔.SizeXCont = 1.0; - Cha.Bod.頬目右.X0Y0_黒目_黒目.SizeYCont = 1.0; - Cha.Bod.頬目右.X0Y0_黒目_瞳孔.SizeYCont = 1.0; + Cha.Body.頬目右.視線 = new Vector2D(0.0, -0.00023); + Cha.Body.頬目右.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.頬目右.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.頬目右.X0Y0_黒目_黒目.SizeYCont = 1.0; + Cha.Body.頬目右.X0Y0_黒目_瞳孔.SizeYCont = 1.0; } - public static void 頬目_逸らし左(this Cha Cha, bool b) + public static void 頬目_逸らし左(this Character Cha, bool b) { - Cha.Bod.頬目左.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0015, 0.0); - Cha.Bod.頬目左.X0Y0_黒目_黒目.SizeXCont = 0.95; - Cha.Bod.頬目左.X0Y0_黒目_瞳孔.SizeXCont = 0.95; - Cha.Bod.頬目左.X0Y0_黒目_黒目.SizeYCont = 1.0; - Cha.Bod.頬目左.X0Y0_黒目_瞳孔.SizeYCont = 1.0; + Cha.Body.頬目左.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0015, 0.0); + Cha.Body.頬目左.X0Y0_黒目_黒目.SizeXCont = 0.95; + Cha.Body.頬目左.X0Y0_黒目_瞳孔.SizeXCont = 0.95; + Cha.Body.頬目左.X0Y0_黒目_黒目.SizeYCont = 1.0; + Cha.Body.頬目左.X0Y0_黒目_瞳孔.SizeYCont = 1.0; } - public static void 頬目_逸らし右(this Cha Cha, bool b) + public static void 頬目_逸らし右(this Character Cha, bool b) { - Cha.Bod.頬目右.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0015, 0.0); - Cha.Bod.頬目右.X0Y0_黒目_黒目.SizeXCont = 0.95; - Cha.Bod.頬目右.X0Y0_黒目_瞳孔.SizeXCont = 0.95; - Cha.Bod.頬目右.X0Y0_黒目_黒目.SizeYCont = 1.0; - Cha.Bod.頬目右.X0Y0_黒目_瞳孔.SizeYCont = 1.0; + Cha.Body.頬目右.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0015, 0.0); + Cha.Body.頬目右.X0Y0_黒目_黒目.SizeXCont = 0.95; + Cha.Body.頬目右.X0Y0_黒目_瞳孔.SizeXCont = 0.95; + Cha.Body.頬目右.X0Y0_黒目_黒目.SizeYCont = 1.0; + Cha.Body.頬目右.X0Y0_黒目_瞳孔.SizeYCont = 1.0; } - public static void 頬目_上転左(this Cha Cha) + public static void 頬目_上転左(this Character Cha) { - Cha.Bod.頬目左.視線 = new Vector2D(0.0, -0.0016); - Cha.Bod.頬目左.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.頬目左.X0Y0_黒目_瞳孔.SizeXCont = 1.0; - Cha.Bod.頬目左.X0Y0_黒目_黒目.SizeYCont = 0.75; - Cha.Bod.頬目左.X0Y0_黒目_瞳孔.SizeYCont = 0.75; + Cha.Body.頬目左.視線 = new Vector2D(0.0, -0.0016); + Cha.Body.頬目左.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.頬目左.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.頬目左.X0Y0_黒目_黒目.SizeYCont = 0.75; + Cha.Body.頬目左.X0Y0_黒目_瞳孔.SizeYCont = 0.75; } - public static void 頬目_上転右(this Cha Cha) + public static void 頬目_上転右(this Character Cha) { - Cha.Bod.頬目右.視線 = new Vector2D(0.0, -0.0016); - Cha.Bod.頬目右.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.頬目右.X0Y0_黒目_瞳孔.SizeXCont = 1.0; - Cha.Bod.頬目右.X0Y0_黒目_黒目.SizeYCont = 0.75; - Cha.Bod.頬目右.X0Y0_黒目_瞳孔.SizeYCont = 0.75; + Cha.Body.頬目右.視線 = new Vector2D(0.0, -0.0016); + Cha.Body.頬目右.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.頬目右.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.頬目右.X0Y0_黒目_黒目.SizeYCont = 0.75; + Cha.Body.頬目右.X0Y0_黒目_瞳孔.SizeYCont = 0.75; } - public static void 両頬目_見つめ(this Cha Cha) + public static void 両頬目_見つめ(this Character Cha) { Cha.頬目_見つめ左(); Cha.頬目_見つめ右(); } - public static void 両頬目_0(this Cha Cha, int i1, int i2) + public static void 両頬目_0(this Character Cha, int i1, int i2) { Cha.頬目左_0(i1); Cha.頬目右_0(i2); } - public static void 頬目左_0(this Cha c, int i) + public static void 頬目左_0(this Character c, int i) { switch (i) { @@ -3381,7 +3381,7 @@ namespace SlaveMatrix } } - public static void 頬目右_0(this Cha c, int i) + public static void 頬目右_0(this Character c, int i) { switch (i) { @@ -3400,34 +3400,34 @@ namespace SlaveMatrix } } - public static void 額目_見つめ(this Cha Cha) + public static void 額目_見つめ(this Character Cha) { - Cha.Bod.額目.視線 = new Vector2D(0.0, 0.0); - Cha.Bod.額目.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.額目.X0Y0_黒目_瞳孔.SizeXCont = 1.0; - Cha.Bod.額目.X0Y0_黒目_黒目.SizeYCont = 1.0; - Cha.Bod.額目.X0Y0_黒目_瞳孔.SizeYCont = 1.0; + Cha.Body.額目.視線 = new Vector2D(0.0, 0.0); + Cha.Body.額目.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.額目.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.額目.X0Y0_黒目_黒目.SizeYCont = 1.0; + Cha.Body.額目.X0Y0_黒目_瞳孔.SizeYCont = 1.0; } - public static void 額目_逸らし(this Cha Cha, bool b) + public static void 額目_逸らし(this Character Cha, bool b) { - Cha.Bod.額目.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0014, 0.0); - Cha.Bod.額目.X0Y0_黒目_黒目.SizeXCont = 0.9; - Cha.Bod.額目.X0Y0_黒目_瞳孔.SizeXCont = 0.9; - Cha.Bod.額目.X0Y0_黒目_黒目.SizeYCont = 1.0; - Cha.Bod.額目.X0Y0_黒目_瞳孔.SizeYCont = 1.0; + Cha.Body.額目.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0014, 0.0); + Cha.Body.額目.X0Y0_黒目_黒目.SizeXCont = 0.9; + Cha.Body.額目.X0Y0_黒目_瞳孔.SizeXCont = 0.9; + Cha.Body.額目.X0Y0_黒目_黒目.SizeYCont = 1.0; + Cha.Body.額目.X0Y0_黒目_瞳孔.SizeYCont = 1.0; } - public static void 額目_上転(this Cha Cha) + public static void 額目_上転(this Character Cha) { - Cha.Bod.額目.視線 = new Vector2D(0.0, -0.0025); - Cha.Bod.額目.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.額目.X0Y0_黒目_瞳孔.SizeXCont = 1.0; - Cha.Bod.額目.X0Y0_黒目_黒目.SizeYCont = 0.95; - Cha.Bod.額目.X0Y0_黒目_瞳孔.SizeYCont = 0.95; + Cha.Body.額目.視線 = new Vector2D(0.0, -0.0025); + Cha.Body.額目.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.額目.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.額目.X0Y0_黒目_黒目.SizeYCont = 0.95; + Cha.Body.額目.X0Y0_黒目_瞳孔.SizeYCont = 0.95; } - public static void 額目_0(this Cha c, int i) + public static void 額目_0(this Character c, int i) { switch (i) { @@ -3446,28 +3446,28 @@ namespace SlaveMatrix } } - public static void 単目_見つめ(this Cha Cha) + public static void 単目_見つめ(this Character Cha) { - Cha.Bod.単眼目.視線 = new Vector2D(0.0, -0.00023); - Cha.Bod.単眼目.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.単眼目.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.単眼目.視線 = new Vector2D(0.0, -0.00023); + Cha.Body.単眼目.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.単眼目.X0Y0_黒目_瞳孔.SizeXCont = 1.0; } - public static void 単目_逸らし(this Cha Cha, bool b) + public static void 単目_逸らし(this Character Cha, bool b) { - Cha.Bod.単眼目.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0025, 0.0); - Cha.Bod.単眼目.X0Y0_黒目_黒目.SizeXCont = 0.95; - Cha.Bod.単眼目.X0Y0_黒目_瞳孔.SizeXCont = 0.95; + Cha.Body.単眼目.視線 = new Vector2D((b ? 1.0 : (-1.0)) * 0.0025, 0.0); + Cha.Body.単眼目.X0Y0_黒目_黒目.SizeXCont = 0.95; + Cha.Body.単眼目.X0Y0_黒目_瞳孔.SizeXCont = 0.95; } - public static void 単目_上転(this Cha Cha) + public static void 単目_上転(this Character Cha) { - Cha.Bod.単眼目.視線 = new Vector2D(0.0, -0.0035); - Cha.Bod.単眼目.X0Y0_黒目_黒目.SizeXCont = 1.0; - Cha.Bod.単眼目.X0Y0_黒目_瞳孔.SizeXCont = 1.0; + Cha.Body.単眼目.視線 = new Vector2D(0.0, -0.0035); + Cha.Body.単眼目.X0Y0_黒目_黒目.SizeXCont = 1.0; + Cha.Body.単眼目.X0Y0_黒目_瞳孔.SizeXCont = 1.0; } - public static void 単目_0(this Cha c, int i) + public static void 単目_0(this Character c, int i) { switch (i) { @@ -3486,39 +3486,39 @@ namespace SlaveMatrix } } - public static void 瞼_普左(this Cha Cha) + public static void 瞼_普左(this Character Cha) { - Cha.Bod.瞼左.Xi = 0; + Cha.Body.瞼左.Xi = 0; } - public static void 瞼_普右(this Cha Cha) + public static void 瞼_普右(this Character Cha) { - Cha.Bod.瞼右.Xi = 0; + Cha.Body.瞼右.Xi = 0; } - public static void 瞼_卑左(this Cha Cha) + public static void 瞼_卑左(this Character Cha) { - Cha.Bod.瞼左.Xi = 1; + Cha.Body.瞼左.Xi = 1; } - public static void 瞼_卑右(this Cha Cha) + public static void 瞼_卑右(this Character Cha) { - Cha.Bod.瞼右.Xi = 1; + Cha.Body.瞼右.Xi = 1; } - public static void 両瞼_卑(this Cha Cha) + public static void 両瞼_卑(this Character Cha) { Cha.瞼_卑左(); Cha.瞼_卑右(); } - public static void 両瞼_0(this Cha Cha, int i1, int i2) + public static void 両瞼_0(this Character Cha, int i1, int i2) { Cha.瞼左_0(i1); Cha.瞼右_0(i2); } - public static void 瞼左_0(this Cha c, int i) + public static void 瞼左_0(this Character c, int i) { switch (i) { @@ -3531,7 +3531,7 @@ namespace SlaveMatrix } } - public static void 瞼右_0(this Cha c, int i) + public static void 瞼右_0(this Character c, int i) { switch (i) { @@ -3544,33 +3544,33 @@ namespace SlaveMatrix } } - public static void 頬瞼_普左(this Cha Cha) + public static void 頬瞼_普左(this Character Cha) { - Cha.Bod.頬瞼左.Xi = 0; + Cha.Body.頬瞼左.Xi = 0; } - public static void 頬瞼_普右(this Cha Cha) + public static void 頬瞼_普右(this Character Cha) { - Cha.Bod.頬瞼右.Xi = 0; + Cha.Body.頬瞼右.Xi = 0; } - public static void 頬瞼_卑左(this Cha Cha) + public static void 頬瞼_卑左(this Character Cha) { - Cha.Bod.頬瞼左.Xi = 1; + Cha.Body.頬瞼左.Xi = 1; } - public static void 頬瞼_卑右(this Cha Cha) + public static void 頬瞼_卑右(this Character Cha) { - Cha.Bod.頬瞼右.Xi = 1; + Cha.Body.頬瞼右.Xi = 1; } - public static void 両頬瞼_0(this Cha Cha, int i1, int i2) + public static void 両頬瞼_0(this Character Cha, int i1, int i2) { Cha.頬瞼左_0(i1); Cha.頬瞼右_0(i2); } - public static void 頬瞼左_0(this Cha c, int i) + public static void 頬瞼左_0(this Character c, int i) { switch (i) { @@ -3583,7 +3583,7 @@ namespace SlaveMatrix } } - public static void 頬瞼右_0(this Cha c, int i) + public static void 頬瞼右_0(this Character c, int i) { switch (i) { @@ -3596,17 +3596,17 @@ namespace SlaveMatrix } } - public static void 額瞼_普(this Cha Cha) + public static void 額瞼_普(this Character Cha) { - Cha.Bod.額瞼.Xi = 0; + Cha.Body.額瞼.Xi = 0; } - public static void 額瞼_卑(this Cha Cha) + public static void 額瞼_卑(this Character Cha) { - Cha.Bod.額瞼.Xi = 1; + Cha.Body.額瞼.Xi = 1; } - public static void 額瞼_0(this Cha c, int i) + public static void 額瞼_0(this Character c, int i) { switch (i) { @@ -3619,17 +3619,17 @@ namespace SlaveMatrix } } - public static void 単瞼_普(this Cha Cha) + public static void 単瞼_普(this Character Cha) { - Cha.Bod.単眼瞼.Xi = 0; + Cha.Body.単眼瞼.Xi = 0; } - public static void 単瞼_卑(this Cha Cha) + public static void 単瞼_卑(this Character Cha) { - Cha.Bod.単眼瞼.Xi = 1; + Cha.Body.単眼瞼.Xi = 1; } - public static void 単瞼_0(this Cha c, int i) + public static void 単瞼_0(this Character c, int i) { switch (i) { @@ -3642,65 +3642,65 @@ namespace SlaveMatrix } } - public static void 瞼_基左(this Cha Cha) + public static void 瞼_基左(this Character Cha) { Cha.瞼基準左 = 0.0; } - public static void 瞼_基右(this Cha Cha) + public static void 瞼_基右(this Character Cha) { Cha.瞼基準右 = 0.0; } - public static void 瞼_半1左(this Cha Cha) + public static void 瞼_半1左(this Character Cha) { Cha.瞼基準左 = 0.2; } - public static void 瞼_半1右(this Cha Cha) + public static void 瞼_半1右(this Character Cha) { Cha.瞼基準右 = 0.2; } - public static void 瞼_半2左(this Cha Cha) + public static void 瞼_半2左(this Character Cha) { Cha.瞼基準左 = 0.4; } - public static void 瞼_半2右(this Cha Cha) + public static void 瞼_半2右(this Character Cha) { Cha.瞼基準右 = 0.4; } - public static void 瞼_瞑左(this Cha Cha) + public static void 瞼_瞑左(this Character Cha) { Cha.瞼基準左 = 1.0; } - public static void 瞼_瞑右(this Cha Cha) + public static void 瞼_瞑右(this Character Cha) { Cha.瞼基準右 = 1.0; } - public static void 両瞼_半1(this Cha Cha) + public static void 両瞼_半1(this Character Cha) { Cha.瞼_半1左(); Cha.瞼_半1右(); } - public static void 両瞼_半2(this Cha Cha) + public static void 両瞼_半2(this Character Cha) { Cha.瞼_半2左(); Cha.瞼_半2右(); } - public static void 両瞼_1(this Cha Cha, int i1, int i2) + public static void 両瞼_1(this Character Cha, int i1, int i2) { Cha.瞼左_1(i1); Cha.瞼右_1(i2); } - public static void 瞼左_1(this Cha c, int i) + public static void 瞼左_1(this Character c, int i) { switch (i) { @@ -3719,7 +3719,7 @@ namespace SlaveMatrix } } - public static void 瞼右_1(this Cha c, int i) + public static void 瞼右_1(this Character c, int i) { switch (i) { @@ -3738,53 +3738,53 @@ namespace SlaveMatrix } } - public static void 頬瞼_基左(this Cha Cha) + public static void 頬瞼_基左(this Character Cha) { Cha.瞼基準頬左 = 0.0; } - public static void 頬瞼_基右(this Cha Cha) + public static void 頬瞼_基右(this Character Cha) { Cha.瞼基準頬右 = 0.0; } - public static void 頬瞼_半1左(this Cha Cha) + public static void 頬瞼_半1左(this Character Cha) { Cha.瞼基準頬左 = 0.2; } - public static void 頬瞼_半1右(this Cha Cha) + public static void 頬瞼_半1右(this Character Cha) { Cha.瞼基準頬右 = 0.2; } - public static void 頬瞼_半2左(this Cha Cha) + public static void 頬瞼_半2左(this Character Cha) { Cha.瞼基準頬左 = 0.4; } - public static void 頬瞼_半2右(this Cha Cha) + public static void 頬瞼_半2右(this Character Cha) { Cha.瞼基準頬右 = 0.4; } - public static void 頬瞼_瞑左(this Cha Cha) + public static void 頬瞼_瞑左(this Character Cha) { Cha.瞼基準頬左 = 1.0; } - public static void 頬瞼_瞑右(this Cha Cha) + public static void 頬瞼_瞑右(this Character Cha) { Cha.瞼基準頬右 = 1.0; } - public static void 両頬瞼_1(this Cha Cha, int i1, int i2) + public static void 両頬瞼_1(this Character Cha, int i1, int i2) { Cha.頬瞼左_1(i1); Cha.頬瞼右_1(i2); } - public static void 頬瞼左_1(this Cha c, int i) + public static void 頬瞼左_1(this Character c, int i) { switch (i) { @@ -3803,7 +3803,7 @@ namespace SlaveMatrix } } - public static void 頬瞼右_1(this Cha c, int i) + public static void 頬瞼右_1(this Character c, int i) { switch (i) { @@ -3822,27 +3822,27 @@ namespace SlaveMatrix } } - public static void 額瞼_基(this Cha Cha) + public static void 額瞼_基(this Character Cha) { Cha.瞼基準額 = 0.0; } - public static void 額瞼_半1(this Cha Cha) + public static void 額瞼_半1(this Character Cha) { Cha.瞼基準額 = 0.2; } - public static void 額瞼_半2(this Cha Cha) + public static void 額瞼_半2(this Character Cha) { Cha.瞼基準額 = 0.4; } - public static void 額瞼_瞑(this Cha Cha) + public static void 額瞼_瞑(this Character Cha) { Cha.瞼基準額 = 1.0; } - public static void 額瞼_1(this Cha c, int i) + public static void 額瞼_1(this Character c, int i) { switch (i) { @@ -3861,27 +3861,27 @@ namespace SlaveMatrix } } - public static void 単瞼_基(this Cha Cha) + public static void 単瞼_基(this Character Cha) { Cha.瞼基準単 = 0.0; } - public static void 単瞼_半1(this Cha Cha) + public static void 単瞼_半1(this Character Cha) { Cha.瞼基準単 = 0.2; } - public static void 単瞼_半2(this Cha Cha) + public static void 単瞼_半2(this Character Cha) { Cha.瞼基準単 = 0.4; } - public static void 単瞼_瞑(this Cha Cha) + public static void 単瞼_瞑(this Character Cha) { Cha.瞼基準単 = 1.0; } - public static void 単瞼_1(this Cha c, int i) + public static void 単瞼_1(this Character c, int i) { switch (i) { @@ -3900,77 +3900,77 @@ namespace SlaveMatrix } } - public static void 口_閉じ(this Cha Cha) + public static void 口_閉じ(this Character Cha) { - Cha.Bod.口i = 10; + Cha.Body.口i = 10; } - public static void 口_半開1(this Cha Cha) + public static void 口_半開1(this Character Cha) { - Cha.Bod.口i = 5; + Cha.Body.口i = 5; } - public static void 口_半開2(this Cha Cha) + public static void 口_半開2(this Character Cha) { - Cha.Bod.口i = 6; + Cha.Body.口i = 6; } - public static void 口_開き(this Cha Cha) + public static void 口_開き(this Character Cha) { - Cha.Bod.口i = 9; + Cha.Body.口i = 9; } - public static void 口_閉笑(this Cha Cha) + public static void 口_閉笑(this Character Cha) { - Cha.Bod.口i = 4; + Cha.Body.口i = 4; } - public static void 口_薄笑(this Cha Cha) + public static void 口_薄笑(this Character Cha) { - Cha.Bod.口i = 0; + Cha.Body.口i = 0; } - public static void 口_笑い(this Cha Cha) + public static void 口_笑い(this Character Cha) { - Cha.Bod.口i = 1; + Cha.Body.口i = 1; } - public static void 口_薄笑食縛(this Cha Cha) + public static void 口_薄笑食縛(this Character Cha) { - Cha.Bod.口i = 2; + Cha.Body.口i = 2; } - public static void 口_笑い食縛(this Cha Cha) + public static void 口_笑い食縛(this Character Cha) { - Cha.Bod.口i = 3; + Cha.Body.口i = 3; } - public static void 口_紡ぎ(this Cha Cha) + public static void 口_紡ぎ(this Character Cha) { - Cha.Bod.口i = 11; + Cha.Body.口i = 11; } - public static void 口_食縛1(this Cha Cha) + public static void 口_食縛1(this Character Cha) { - Cha.Bod.口i = 7; + Cha.Body.口i = 7; } - public static void 口_食縛2(this Cha Cha) + public static void 口_食縛2(this Character Cha) { - Cha.Bod.口i = 8; + Cha.Body.口i = 8; } - public static void 口_咥え(this Cha Cha) + public static void 口_咥え(this Character Cha) { - Cha.Bod.口i = 12; + Cha.Body.口i = 12; } - public static void 口_しゃぶり(this Cha Cha) + public static void 口_しゃぶり(this Character Cha) { - Cha.Bod.口i = 13; + Cha.Body.口i = 13; } - public static void 口_0(this Cha c, int i) + public static void 口_0(this Character c, int i) { switch (i) { @@ -4019,13 +4019,13 @@ namespace SlaveMatrix } } - public static void 口修正(this Cha c) + public static void 口修正(this Character c) { - if (c.Bod.口i != 5 && c.Bod.口i != 6 && c.Bod.口i != 7 && c.Bod.口i != 8 && c.Bod.口i != 9 && c.Bod.口i != 12 && c.Bod.口i != 13) + if (c.Body.口i != 5 && c.Body.口i != 6 && c.Body.口i != 7 && c.Body.口i != 8 && c.Body.口i != 9 && c.Body.口i != 12 && c.Body.口i != 13) { return; } - if (c.ChaD.Emotion < EmotionType.Acceptance) + if (c.CharacterData.Emotion < EmotionType.Acceptance) { switch (RNG.XS.Next(2)) { @@ -4052,18 +4052,18 @@ namespace SlaveMatrix } } - public static void 舌_無し(this Cha Cha) + public static void 舌_無し(this Character Cha) { - Cha.Bod.舌_表示 = false; + Cha.Body.舌_表示 = false; } - public static void 舌_出し(this Cha Cha) + public static void 舌_出し(this Character Cha) { - Cha.Bod.舌_表示 = true; - Cha.Bod.舌.尺度YC = 0.2 + 0.8 * RNG.XS.NextDouble(); + Cha.Body.舌_表示 = true; + Cha.Body.舌.尺度YC = 0.2 + 0.8 * RNG.XS.NextDouble(); } - public static void 舌_0(this Cha c, int i) + public static void 舌_0(this Character c, int i) { switch (i) { @@ -4076,43 +4076,43 @@ namespace SlaveMatrix } } - public static void 耳_人_基左(this Cha Cha) + public static void 耳_人_基左(this Character Cha) { - Cha.Bod.耳左.Yi = 0; + Cha.Body.耳左.Yi = 0; } - public static void 耳_人_基右(this Cha Cha) + public static void 耳_人_基右(this Character Cha) { - Cha.Bod.耳右.Yi = 0; + Cha.Body.耳右.Yi = 0; } - public static void 耳_人_半左(this Cha Cha) + public static void 耳_人_半左(this Character Cha) { - Cha.Bod.耳左.Yi = 1; + Cha.Body.耳左.Yi = 1; } - public static void 耳_人_半右(this Cha Cha) + public static void 耳_人_半右(this Character Cha) { - Cha.Bod.耳右.Yi = 1; + Cha.Body.耳右.Yi = 1; } - public static void 耳_人_伏左(this Cha Cha) + public static void 耳_人_伏左(this Character Cha) { - Cha.Bod.耳左.Yi = 2; + Cha.Body.耳左.Yi = 2; } - public static void 耳_人_伏右(this Cha Cha) + public static void 耳_人_伏右(this Character Cha) { - Cha.Bod.耳右.Yi = 2; + Cha.Body.耳右.Yi = 2; } - public static void 両耳_0(this Cha Cha, int i1, int i2) + public static void 両耳_0(this Character Cha, int i1, int i2) { Cha.耳左_0(i1); Cha.耳右_0(i2); } - public static void 耳左_0(this Cha c, int i) + public static void 耳左_0(this Character c, int i) { switch (i) { @@ -4128,7 +4128,7 @@ namespace SlaveMatrix } } - public static void 耳右_0(this Cha c, int i) + public static void 耳右_0(this Character c, int i) { switch (i) { @@ -4144,43 +4144,43 @@ namespace SlaveMatrix } } - public static void 耳_獣_基左(this Cha Cha) + public static void 耳_獣_基左(this Character Cha) { - Cha.Bod.獣耳左.Yi = 0; + Cha.Body.獣耳左.Yi = 0; } - public static void 耳_獣_基右(this Cha Cha) + public static void 耳_獣_基右(this Character Cha) { - Cha.Bod.獣耳右.Yi = 0; + Cha.Body.獣耳右.Yi = 0; } - public static void 耳_獣_半左(this Cha Cha) + public static void 耳_獣_半左(this Character Cha) { - Cha.Bod.獣耳左.Yi = 1; + Cha.Body.獣耳左.Yi = 1; } - public static void 耳_獣_半右(this Cha Cha) + public static void 耳_獣_半右(this Character Cha) { - Cha.Bod.獣耳右.Yi = 1; + Cha.Body.獣耳右.Yi = 1; } - public static void 耳_獣_伏左(this Cha Cha) + public static void 耳_獣_伏左(this Character Cha) { - Cha.Bod.獣耳左.Yi = 2; + Cha.Body.獣耳左.Yi = 2; } - public static void 耳_獣_伏右(this Cha Cha) + public static void 耳_獣_伏右(this Character Cha) { - Cha.Bod.獣耳右.Yi = 2; + Cha.Body.獣耳右.Yi = 2; } - public static void 両獣耳_0(this Cha Cha, int i1, int i2) + public static void 両獣耳_0(this Character Cha, int i1, int i2) { Cha.獣耳左_0(i1); Cha.獣耳右_0(i2); } - public static void 獣耳左_0(this Cha c, int i) + public static void 獣耳左_0(this Character c, int i) { switch (i) { @@ -4196,7 +4196,7 @@ namespace SlaveMatrix } } - public static void 獣耳右_0(this Cha c, int i) + public static void 獣耳右_0(this Character c, int i) { switch (i) { @@ -4212,63 +4212,63 @@ namespace SlaveMatrix } } - public static void 触覚絶頂(this Cha Cha, double a) + public static void 触覚絶頂(this Character Cha, double a) { - Cha.Bod.触覚左.角度C = a * RNG.XS.NextDouble(); - Cha.Bod.触覚右.角度C = (0.0 - a) * RNG.XS.NextDouble(); + Cha.Body.触覚左.角度C = a * RNG.XS.NextDouble(); + Cha.Body.触覚右.角度C = (0.0 - a) * RNG.XS.NextDouble(); } - public static void 触覚甲絶頂(this Cha Cha, double a) + public static void 触覚甲絶頂(this Character Cha, double a) { - Cha.Bod.触覚甲左.角度C = a * RNG.XS.NextDouble(); - Cha.Bod.触覚甲右.角度C = (0.0 - a) * RNG.XS.NextDouble(); + Cha.Body.触覚甲左.角度C = a * RNG.XS.NextDouble(); + Cha.Body.触覚甲右.角度C = (0.0 - a) * RNG.XS.NextDouble(); } - public static void 大顎左(this Cha Cha, int n, double u1, double 根本角度) + public static void 大顎左(this Character Cha, int n, double u1, double 根本角度) { - 大顎 obj = Cha.Bod.大顎左[n]; + 大顎 obj = Cha.Body.大顎左[n]; obj.SetAngle0(); obj.Body.CurJoinRoot.AngleBase += 根本角度 + u1; } - public static void 大顎右(this Cha Cha, int n, double u1, double 根本角度) + public static void 大顎右(this Character Cha, int n, double u1, double 根本角度) { - 大顎 obj = Cha.Bod.大顎右[n]; + 大顎 obj = Cha.Body.大顎右[n]; obj.SetAngle0(); obj.Body.CurJoinRoot.AngleBase += 0.0 - 根本角度 + (0.0 - u1); } - public static void 大顎_基本左(this Cha Cha, int n, double u1) + public static void 大顎_基本左(this Character Cha, int n, double u1) { Cha.大顎左(n, u1, 0.0); } - public static void 大顎_基本右(this Cha Cha, int n, double u1) + public static void 大顎_基本右(this Character Cha, int n, double u1) { Cha.大顎右(n, u1, 0.0); } - public static void 大顎_開き左(this Cha Cha, int n, double u1) + public static void 大顎_開き左(this Character Cha, int n, double u1) { Cha.大顎左(n, u1, 25.0); } - public static void 大顎_開き右(this Cha Cha, int n, double u1) + public static void 大顎_開き右(this Character Cha, int n, double u1) { Cha.大顎右(n, u1, 25.0); } - public static void 大顎_閉じ左(this Cha Cha, int n, double u1) + public static void 大顎_閉じ左(this Character Cha, int n, double u1) { Cha.大顎左(n, u1, -15.0); } - public static void 大顎_閉じ右(this Cha Cha, int n, double u1) + public static void 大顎_閉じ右(this Character Cha, int n, double u1) { Cha.大顎右(n, u1, -15.0); } - public static void 両大顎_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両大顎_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = 0.0; @@ -4277,7 +4277,7 @@ namespace SlaveMatrix Cha.大顎右_0(i2, n, num2); } - public static void 大顎左_0(this Cha c, int i, int n, double u1) + public static void 大顎左_0(this Character c, int i, int n, double u1) { switch (i) { @@ -4293,7 +4293,7 @@ namespace SlaveMatrix } } - public static void 大顎右_0(this Cha c, int i, int n, double u1) + public static void 大顎右_0(this Character c, int i, int n, double u1) { switch (i) { @@ -4309,63 +4309,63 @@ namespace SlaveMatrix } } - public static void 大顎絶頂(this Cha Cha, double a) + public static void 大顎絶頂(this Character Cha, double a) { - foreach (大顎 item in Cha.Bod.大顎左) + foreach (大顎 item in Cha.Body.大顎左) { item.角度C = a * RNG.XS.NextDouble(); } - foreach (大顎 item2 in Cha.Bod.大顎右) + foreach (大顎 item2 in Cha.Body.大顎右) { item2.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } - public static void 虫顎左(this Cha Cha, int n, double u1, double 根本角度) + public static void 虫顎左(this Character Cha, int n, double u1, double 根本角度) { - 虫顎 obj = Cha.Bod.虫顎左[n]; + 虫顎 obj = Cha.Body.虫顎左[n]; obj.SetAngle0(); obj.X0Y0_顎.AngleBase += 根本角度 + u1; } - public static void 虫顎右(this Cha Cha, int n, double u1, double 根本角度) + public static void 虫顎右(this Character Cha, int n, double u1, double 根本角度) { - 虫顎 obj = Cha.Bod.虫顎右[n]; + 虫顎 obj = Cha.Body.虫顎右[n]; obj.SetAngle0(); obj.X0Y0_顎.AngleBase += 0.0 - 根本角度 + (0.0 - u1); } - public static void 虫顎_基本左(this Cha Cha, int n, double u1) + public static void 虫顎_基本左(this Character Cha, int n, double u1) { Cha.虫顎左(n, u1, 0.0); } - public static void 虫顎_基本右(this Cha Cha, int n, double u1) + public static void 虫顎_基本右(this Character Cha, int n, double u1) { Cha.虫顎右(n, u1, 0.0); } - public static void 虫顎_開き左(this Cha Cha, int n, double u1) + public static void 虫顎_開き左(this Character Cha, int n, double u1) { Cha.虫顎左(n, u1, 25.0); } - public static void 虫顎_開き右(this Cha Cha, int n, double u1) + public static void 虫顎_開き右(this Character Cha, int n, double u1) { Cha.虫顎右(n, u1, 25.0); } - public static void 虫顎_閉じ左(this Cha Cha, int n, double u1) + public static void 虫顎_閉じ左(this Character Cha, int n, double u1) { Cha.虫顎左(n, u1, -10.0); } - public static void 虫顎_閉じ右(this Cha Cha, int n, double u1) + public static void 虫顎_閉じ右(this Character Cha, int n, double u1) { Cha.虫顎右(n, u1, -10.0); } - public static void 両虫顎_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両虫顎_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = 0.0; @@ -4374,7 +4374,7 @@ namespace SlaveMatrix Cha.虫顎右_0(i2, n, num2); } - public static void 虫顎左_0(this Cha c, int i, int n, double u1) + public static void 虫顎左_0(this Character c, int i, int n, double u1) { switch (i) { @@ -4390,7 +4390,7 @@ namespace SlaveMatrix } } - public static void 虫顎右_0(this Cha c, int i, int n, double u1) + public static void 虫顎右_0(this Character c, int i, int n, double u1) { switch (i) { @@ -4406,21 +4406,21 @@ namespace SlaveMatrix } } - public static void 虫顎絶頂(this Cha Cha, double a) + public static void 虫顎絶頂(this Character Cha, double a) { - foreach (虫顎 item in Cha.Bod.虫顎左) + foreach (虫顎 item in Cha.Body.虫顎左) { item.角度C = a * RNG.XS.NextDouble(); } - foreach (虫顎 item2 in Cha.Bod.虫顎右) + foreach (虫顎 item2 in Cha.Body.虫顎右) { item2.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } - public static void 腕_人左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B, double UpperArm尺度XC, double LowerArm尺度XC, double 手尺度XC, double LowerArm尺度C, double 手尺度C, bool UpperArm外線, bool LowerArm外線, bool LowerArm反転Y, int 手Yi, bool 前後) + public static void 腕_人左(this Character Cha, int n, double u1, double u2, double u3, double u4, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B, double UpperArm尺度XC, double LowerArm尺度XC, double 手尺度XC, double LowerArm尺度C, double 手尺度C, bool UpperArm外線, bool LowerArm外線, bool LowerArm反転Y, int 手Yi, bool 前後) { - Arm人 腕人2 = Cha.Bod.Arm人左[n]; + Arm人 腕人2 = Cha.Body.Arm人左[n]; 腕人2.Shoulder.SetAngle0(); 腕人2.Shoulder.角度B = 肩角度B + u1; if (腕人2.UpperArm != null) @@ -4430,7 +4430,7 @@ namespace SlaveMatrix 腕人2.UpperArm.角度B = UpperArm角度B + u2; if (腕人2.LowerArm != null) { - Cha.Bod.腕前後(右: false, n, 前後); + Cha.Body.腕前後(右: false, n, 前後); 腕人2.LowerArm.反転Y = false; 腕人2.LowerArm.肘部_外線 = LowerArm外線; 腕人2.LowerArm.尺度XC = LowerArm尺度XC; @@ -4507,9 +4507,9 @@ namespace SlaveMatrix 腕人2.Shoulder.重複角度処理(); } - public static void 腕_人右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B, double UpperArm尺度XC, double LowerArm尺度XC, double 手尺度XC, double LowerArm尺度C, double 手尺度C, bool UpperArm外線, bool LowerArm外線, bool LowerArm反転Y, int 手Yi, bool 前後) + public static void 腕_人右(this Character Cha, int n, double u1, double u2, double u3, double u4, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B, double UpperArm尺度XC, double LowerArm尺度XC, double 手尺度XC, double LowerArm尺度C, double 手尺度C, bool UpperArm外線, bool LowerArm外線, bool LowerArm反転Y, int 手Yi, bool 前後) { - Arm人 腕人2 = Cha.Bod.Arm人右[n]; + Arm人 腕人2 = Cha.Body.Arm人右[n]; 腕人2.Shoulder.SetAngle0(); 腕人2.Shoulder.角度B = 0.0 - 肩角度B + (0.0 - u1); if (腕人2.UpperArm != null) @@ -4519,7 +4519,7 @@ namespace SlaveMatrix 腕人2.UpperArm.角度B = 0.0 - UpperArm角度B + (0.0 - u2); if (腕人2.LowerArm != null) { - Cha.Bod.腕前後(右: true, n, 前後); + Cha.Body.腕前後(右: true, n, 前後); 腕人2.LowerArm.反転Y = false; 腕人2.LowerArm.肘部_外線 = LowerArm外線; 腕人2.LowerArm.尺度XC = LowerArm尺度XC; @@ -4596,207 +4596,207 @@ namespace SlaveMatrix 腕人2.Shoulder.重複角度処理(); } - public static void 腕_人_腕置き左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_腕置き左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -30.0, 130.0, 0.0, 0.95, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 0, 前後: false); } - public static void 腕_人_腕置き右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_腕置き右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -30.0, 130.0, 0.0, 0.95, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 0, 前後: false); } - public static void 腕_人_胸庇い左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_胸庇い左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -80.0, -230.0, 35.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 1, 前後: false); } - public static void 腕_人_胸庇い右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_胸庇い右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -80.0, -230.0, 35.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 1, 前後: false); } - public static void 腕_人_体支え左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_体支え左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -60.0, 360.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: false, LowerArm外線: false, LowerArm反転Y: true, 2, 前後: true); } - public static void 腕_人_体支え右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_体支え右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -60.0, 360.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: false, LowerArm外線: false, LowerArm反転Y: true, 2, 前後: true); } - public static void 腕_人_胸乗せ左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_胸乗せ左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 5.0, -80.0, 185.0, 45.0, 1.0, 0.85, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 3, 前後: false); } - public static void 腕_人_胸乗せ右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_胸乗せ右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 5.0, -80.0, 185.0, 45.0, 1.0, 0.85, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 3, 前後: false); } - public static void 腕_人_顔隠し左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_顔隠し左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 10.0, -109.0, -202.0, -13.0, 0.8, 0.95, 1.0, 1.1, 1.0, UpperArm外線: true, LowerArm外線: true, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_顔隠し右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_顔隠し右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 10.0, -109.0, -202.0, -13.0, 0.8, 0.95, 1.0, 1.1, 1.0, UpperArm外線: true, LowerArm外線: true, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_チラ見左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_チラ見左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 10.0, -109.0, -202.0, -6.0, 1.0, 0.9, 1.0, 1.1, 1.0, UpperArm外線: true, LowerArm外線: true, LowerArm反転Y: true, 10, 前後: false); } - public static void 腕_人_チラ見右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_チラ見右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 10.0, -109.0, -202.0, -6.0, 1.0, 0.9, 1.0, 1.1, 1.0, UpperArm外線: true, LowerArm外線: true, LowerArm反転Y: true, 10, 前後: false); } - public static void 腕_人_指咥え左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_指咥え左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 10.0, -102.0, -194.0, 39.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 5, 前後: false); } - public static void 腕_人_指咥え右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_指咥え右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 10.0, -102.0, -194.0, 39.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 5, 前後: false); } - public static void 腕_人_腕下げ左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_腕下げ左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, -5.0, -75.0, 350.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: false, LowerArm外線: false, LowerArm反転Y: true, 6, 前後: true); } - public static void 腕_人_腕下げ右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_腕下げ右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, -5.0, -75.0, 350.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: false, LowerArm外線: false, LowerArm反転Y: true, 6, 前後: true); } - public static void 腕_人_股隠し左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_股隠し左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -91.0, -331.0, 23.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_股隠し右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_股隠し右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -91.0, -331.0, 23.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_開帳左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_開帳左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 10.0, -101.0, -330.0, 33.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 10, 前後: false); } - public static void 腕_人_開帳右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_開帳右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 10.0, -101.0, -330.0, 33.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 10, 前後: false); } - public static void 腕_人_口押さえ1左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_口押さえ1左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 10.0, -102.0, -194.0, 39.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_口押さえ1右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_口押さえ1右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 10.0, -102.0, -194.0, 39.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_口押さえ2左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_口押さえ2左(this Character Cha, int n, double u1, double u2, double u3, double u4) { - Cha.Bod.腕左右前後 = false; + Cha.Body.腕左右前後 = false; Cha.腕_人左(n, u1, u2, u3, u4, 10.0, -102.0, -194.0, 39.0, 0.9, 0.9, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_口押さえ2右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_口押さえ2右(this Character Cha, int n, double u1, double u2, double u3, double u4) { - Cha.Bod.腕左右前後 = true; + Cha.Body.腕左右前後 = true; Cha.腕_人右(n, u1, u2, u3, u4, 10.0, -102.0, -194.0, 39.0, 0.9, 0.9, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_口押さえ3左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_口押さえ3左(this Character Cha, int n, double u1, double u2, double u3, double u4) { - Cha.Bod.腕左右前後 = false; + Cha.Body.腕左右前後 = false; Cha.腕_人左(n, u1, u2, u3, u4, 10.0, -102.0, -204.0, -19.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_口押さえ3右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_口押さえ3右(this Character Cha, int n, double u1, double u2, double u3, double u4) { - Cha.Bod.腕左右前後 = true; + Cha.Body.腕左右前後 = true; Cha.腕_人右(n, u1, u2, u3, u4, 10.0, -102.0, -204.0, -19.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 4, 前後: false); } - public static void 腕_人_脇見せ左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_脇見せ左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 20.0, 25.0, 135.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 0, 前後: true); } - public static void 腕_人_脇見せ右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_脇見せ右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 20.0, 25.0, 135.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 0, 前後: true); } - public static void 腕_人_腰手当左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_腰手当左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -43.0, 90.0, -30.0, 1.0, 0.85, 0.8, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 7, 前後: false); } - public static void 腕_人_腰手当右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_腰手当右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -43.0, 90.0, -30.0, 1.0, 0.85, 0.8, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 7, 前後: false); } - public static void 腕_人_ピース左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_ピース左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -35.0, 160.0, -50.0, 0.9, 0.9, 1.0, 1.0, 1.05, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 9, 前後: false); } - public static void 腕_人_ピース右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_ピース右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -35.0, 160.0, -50.0, 0.9, 0.9, 1.0, 1.0, 1.05, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 9, 前後: false); } - public static void Arm_人_手コキ左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Arm_人_手コキ左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -60.0, -160.0, 30.0, 0.8, 0.84, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 11, 前後: false); } - public static void Arm_人_手コキ右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Arm_人_手コキ右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -60.0, -160.0, 30.0, 0.8, 0.84, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 11, 前後: false); } - public static void 腕_人_パイズリ左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_パイズリ左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -45.0, 155.0, 15.0, 1.0, 0.55, 0.6, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 8, 前後: false); } - public static void 腕_人_パイズリ右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_パイズリ右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -45.0, 155.0, 15.0, 1.0, 0.55, 0.6, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: true, 8, 前後: false); } - public static void 腕_人_腕上げ左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_腕上げ左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人左(n, u1, u2, u3, u4, 0.0, -20.0, 120.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 0, 前後: false); } - public static void 腕_人_腕上げ右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_人_腕上げ右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_人右(n, u1, u2, u3, u4, 0.0, -20.0, 120.0, 0.0, 1.0, 1.0, 1.0, 1.0, 1.0, UpperArm外線: true, LowerArm外線: false, LowerArm反転Y: false, 0, 前後: false); } - public static void 両腕_人_腕下げ(this Cha Cha, int n, bool 左右, bool 前後) + public static void 両腕_人_腕下げ(this Character Cha, int n, bool 左右, bool 前後) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); 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); double u4 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); - Cha.Bod.腕左右前後 = 前後; + Cha.Body.腕左右前後 = 前後; if (左右) { Cha.腕_人_腕下げ右(n, u, u2, u3, u4); @@ -4809,13 +4809,13 @@ namespace SlaveMatrix } } - public static void 両腕_人_パイズリ(this Cha Cha, int n, bool 左右, bool 前後) + public static void 両腕_人_パイズリ(this Character Cha, int n, bool 左右, bool 前後) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); 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); double u4 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); - Cha.Bod.腕左右前後 = 前後; + Cha.Body.腕左右前後 = 前後; if (左右) { Cha.腕_人_パイズリ右(n, u, u2, u3, u4); @@ -4828,9 +4828,9 @@ namespace SlaveMatrix } } - public static void 両腕人_0(this Cha Cha, int n, bool 前後, bool 同角, bool 左右, int i1, int i2) + public static void 両腕人_0(this Character Cha, int n, bool 前後, bool 同角, bool 左右, int i1, int i2) { - Cha.Bod.腕左右前後 = 前後; + Cha.Body.腕左右前後 = 前後; double num = Cha.角度ムラ(RNG.XS.NextSign(), 0.25, RNG.XS.NextSign(), 0.125); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 0.25, RNG.XS.NextSign(), 0.125); double num3 = Cha.角度ムラ(RNG.XS.NextSign(), 1.5, RNG.XS.NextSign(), 0.75); @@ -4865,7 +4865,7 @@ namespace SlaveMatrix } } - public static void 腕人左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 腕人左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -4929,7 +4929,7 @@ namespace SlaveMatrix } } - public static void 腕人右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 腕人右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -4993,9 +4993,9 @@ namespace SlaveMatrix } } - public static void 腕人絶頂(this Cha Cha, double a) + public static void 腕人絶頂(this Character Cha, double a) { - foreach (Arm人 item in Cha.Bod.Arm人左) + foreach (Arm人 item in Cha.Body.Arm人左) { item.Shoulder.角度C = a * RNG.XS.NextDouble(); if (item.UpperArm == null) @@ -5012,7 +5012,7 @@ namespace SlaveMatrix } } } - foreach (Arm人 item2 in Cha.Bod.Arm人右) + foreach (Arm人 item2 in Cha.Body.Arm人右) { item2.Shoulder.角度C = (0.0 - a) * RNG.XS.NextDouble(); if (item2.UpperArm == null) @@ -5031,9 +5031,9 @@ namespace SlaveMatrix } } - public static void 腕_翼鳥左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double UpperArm展開, double LowerArm展開, double 手展開, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B) + public static void 腕_翼鳥左(this Character Cha, int n, double u1, double u2, double u3, double u4, double UpperArm展開, double LowerArm展開, double 手展開, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B) { - Arm翼鳥 腕翼鳥2 = Cha.Bod.腕翼鳥左[n]; + Arm翼鳥 腕翼鳥2 = Cha.Body.腕翼鳥左[n]; 腕翼鳥2.Shoulder.SetAngle0(); if (n == 0) { @@ -5060,9 +5060,9 @@ namespace SlaveMatrix 腕翼鳥2.Shoulder.重複角度処理(); } - public static void 腕_翼鳥右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double UpperArm展開, double LowerArm展開, double 手展開, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B) + public static void 腕_翼鳥右(this Character Cha, int n, double u1, double u2, double u3, double u4, double UpperArm展開, double LowerArm展開, double 手展開, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B) { - Arm翼鳥 腕翼鳥2 = Cha.Bod.腕翼鳥右[n]; + Arm翼鳥 腕翼鳥2 = Cha.Body.腕翼鳥右[n]; 腕翼鳥2.Shoulder.SetAngle0(); if (n == 0) { @@ -5089,77 +5089,77 @@ namespace SlaveMatrix 腕翼鳥2.Shoulder.重複角度処理(); } - public static void 腕_翼鳥_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_脱力左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥左(n, u1, u2, u3, u4, 0.0, 0.25, 0.25, 0.0, -1.0, 0.0, 0.0); } - public static void 腕_翼鳥_脱力右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_脱力右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥右(n, u1, u2, u3, u4, 0.0, 0.25, 0.25, 0.0, -1.0, 0.0, 0.0); } - public static void 腕_翼鳥_強張り左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_強張り左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 0.0, -5.0, 10.0, 0.0); } - public static void 腕_翼鳥_強張り右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_強張り右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 0.0, -5.0, 10.0, 0.0); } - public static void 腕_翼鳥_恥じらい左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_恥じらい左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 8.0, -13.0, 13.0, 0.0); } - public static void 腕_翼鳥_恥じらい右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_恥じらい右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 8.0, -13.0, 13.0, 0.0); } - public static void 腕_翼鳥_顔隠し左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_顔隠し左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 5.0, -10.0, 15.0, 0.0); } - public static void 腕_翼鳥_顔隠し右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_顔隠し右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 5.0, -10.0, 15.0, 0.0); } - public static void 腕_翼鳥_閉じ左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_閉じ左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 腕_翼鳥_閉じ右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_閉じ右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 腕_翼鳥_半開き左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_半開き左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥左(n, u1, u2, u3, u4, 0.25, 0.25, 0.25, -3.0, 0.0, 0.0, 0.0); } - public static void 腕_翼鳥_半開き右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_半開き右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥右(n, u1, u2, u3, u4, 0.25, 0.25, 0.25, -3.0, 0.0, 0.0, 0.0); } - public static void 腕_翼鳥_全開左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_全開左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥左(n, u1, u2, u3, u4, 1.0, 1.0, 1.0, 6.0, 3.0, 0.0, 0.0); } - public static void 腕_翼鳥_全開右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼鳥_全開右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼鳥右(n, u1, u2, u3, u4, 1.0, 1.0, 1.0, 6.0, 3.0, 0.0, 0.0); } - public static void 両腕翼鳥_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両腕翼鳥_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 0.5, RNG.XS.NextSign(), 0.25); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 0.5, RNG.XS.NextSign(), 0.25); @@ -5187,7 +5187,7 @@ namespace SlaveMatrix Cha.腕翼鳥右_0(i2, n, u, u2, u3, u4); } - public static void 腕翼鳥左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 腕翼鳥左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -5215,7 +5215,7 @@ namespace SlaveMatrix } } - public static void 腕翼鳥右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 腕翼鳥右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -5243,21 +5243,21 @@ namespace SlaveMatrix } } - public static void 腕翼鳥絶頂(this Cha Cha, double a) + public static void 腕翼鳥絶頂(this Character Cha, double a) { - foreach (Arm翼鳥 item in Cha.Bod.腕翼鳥左) + foreach (Arm翼鳥 item in Cha.Body.腕翼鳥左) { item.Shoulder.角度C = a * RNG.XS.NextDouble(); } - foreach (Arm翼鳥 item2 in Cha.Bod.腕翼鳥右) + foreach (Arm翼鳥 item2 in Cha.Body.腕翼鳥右) { 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 UpperArm展開, double LowerArm展開, double 手展開, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B) + public static void 腕_翼獣左(this Character Cha, int n, double u1, double u2, double u3, double u4, double UpperArm展開, double LowerArm展開, double 手展開, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B) { - Arm翼獣 腕翼獣2 = Cha.Bod.腕翼獣左[n]; + Arm翼獣 腕翼獣2 = Cha.Body.腕翼獣左[n]; 腕翼獣2.Shoulder.SetAngle0(); if (n == 0) { @@ -5284,9 +5284,9 @@ namespace SlaveMatrix 腕翼獣2.Shoulder.重複角度処理(); } - public static void 腕_翼獣右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double UpperArm展開, double LowerArm展開, double 手展開, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B) + public static void 腕_翼獣右(this Character Cha, int n, double u1, double u2, double u3, double u4, double UpperArm展開, double LowerArm展開, double 手展開, double 肩角度B, double UpperArm角度B, double LowerArm角度B, double 手角度B) { - Arm翼獣 腕翼獣2 = Cha.Bod.腕翼獣右[n]; + Arm翼獣 腕翼獣2 = Cha.Body.腕翼獣右[n]; 腕翼獣2.Shoulder.SetAngle0(); if (n == 0) { @@ -5313,57 +5313,57 @@ namespace SlaveMatrix 腕翼獣2.Shoulder.重複角度処理(); } - public static void 腕_翼獣_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_脱力左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣左(n, u1, u2, u3, u4, 0.0, 0.25, 0.25, 0.0, -1.0, 0.0, 0.0); } - public static void 腕_翼獣_脱力右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_脱力右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣右(n, u1, u2, u3, u4, 0.0, 0.25, 0.25, 0.0, -1.0, 0.0, 0.0); } - public static void 腕_翼獣_強張り左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_強張り左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 0.0, -10.0, 10.0, 0.0); } - public static void 腕_翼獣_強張り右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_強張り右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 0.0, -10.0, 10.0, 0.0); } - public static void 腕_翼獣_閉じ左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_閉じ左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 腕_翼獣_閉じ右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_閉じ右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 腕_翼獣_半開き左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_半開き左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣左(n, u1, u2, u3, u4, 0.25, 0.25, 0.25, -3.0, 0.0, 0.0, 0.0); } - public static void 腕_翼獣_半開き右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_半開き右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣右(n, u1, u2, u3, u4, 0.25, 0.25, 0.25, -3.0, 0.0, 0.0, 0.0); } - public static void 腕_翼獣_全開左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_全開左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣左(n, u1, u2, u3, u4, 1.0, 1.0, 1.0, 6.0, 3.0, 0.0, 0.0); } - public static void 腕_翼獣_全開右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_翼獣_全開右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_翼獣右(n, u1, u2, u3, u4, 1.0, 1.0, 1.0, 6.0, 3.0, 0.0, 0.0); } - public static void 両腕翼獣_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両腕翼獣_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); @@ -5391,7 +5391,7 @@ namespace SlaveMatrix Cha.腕翼獣右_0(i2, n, u, u2, u3, u4); } - public static void 腕翼獣左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 腕翼獣左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -5413,7 +5413,7 @@ namespace SlaveMatrix } } - public static void 腕翼獣右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 腕翼獣右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -5435,21 +5435,21 @@ namespace SlaveMatrix } } - public static void 腕翼獣絶頂(this Cha Cha, double a) + public static void 腕翼獣絶頂(this Character Cha, double a) { - foreach (Arm翼獣 item in Cha.Bod.腕翼獣左) + foreach (Arm翼獣 item in Cha.Body.腕翼獣左) { item.Shoulder.角度C = a * RNG.XS.NextDouble(); } - foreach (Arm翼獣 item2 in Cha.Bod.腕翼獣右) + foreach (Arm翼獣 item2 in Cha.Body.腕翼獣右) { item2.Shoulder.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } - public static void 腕_獣左(this Cha Cha, int n, double u2, double u3, double u4, double UpperArm角度B, double LowerArm角度B, double 手角度B, double UpperArm尺度XC, double LowerArm尺度XC, double 手尺度XC) + public static void 腕_獣左(this Character Cha, int n, double u2, double u3, double u4, double UpperArm角度B, double LowerArm角度B, double 手角度B, double UpperArm尺度XC, double LowerArm尺度XC, double 手尺度XC) { - Arm獣 腕獣2 = Cha.Bod.腕獣左[n]; + Arm獣 腕獣2 = Cha.Body.腕獣左[n]; 腕獣2.Shoulder.SetAngle0(); if (腕獣2.UpperArm != null) { @@ -5472,9 +5472,9 @@ namespace SlaveMatrix 腕獣2.Shoulder.重複角度処理(); } - public static void 腕_獣右(this Cha Cha, int n, double u2, double u3, double u4, double UpperArm角度B, double LowerArm角度B, double 手角度B, double UpperArm尺度XC, double LowerArm尺度XC, double 手尺度XC) + public static void 腕_獣右(this Character Cha, int n, double u2, double u3, double u4, double UpperArm角度B, double LowerArm角度B, double 手角度B, double UpperArm尺度XC, double LowerArm尺度XC, double 手尺度XC) { - Arm獣 腕獣2 = Cha.Bod.腕獣右[n]; + Arm獣 腕獣2 = Cha.Body.腕獣右[n]; 腕獣2.Shoulder.SetAngle0(); if (腕獣2.UpperArm != null) { @@ -5497,37 +5497,37 @@ namespace SlaveMatrix 腕獣2.Shoulder.重複角度処理(); } - public static void 腕_獣_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_獣_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_獣左(n, 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 腕_獣_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_獣右(n, 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 腕_獣_脱力左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_獣左(n, u2, u3, u4, 0.0, -25.0, 30.0, 0.9, 0.8, 1.0); } - public static void 腕_獣_脱力右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_獣_脱力右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_獣右(n, u2, u3, u4, 0.0, -25.0, 30.0, 0.9, 0.8, 1.0); } - public static void 腕_獣_媚び左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void 腕_獣_媚び左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_獣左(n, u2, u3, u4, -25.0, 33.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 腕_獣_媚び右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.腕_獣右(n, u2, u3, u4, -25.0, 33.0, 0.0, 1.0, 1.0, 1.0); } - public static void 両腕獣_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両腕獣_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -5555,7 +5555,7 @@ namespace SlaveMatrix Cha.腕獣右_0(i2, n, u, u2, u3, u4); } - public static void 腕獣左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 腕獣左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -5571,7 +5571,7 @@ namespace SlaveMatrix } } - public static void 腕獣右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 腕獣右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -5587,9 +5587,9 @@ namespace SlaveMatrix } } - public static void 腕獣絶頂(this Cha Cha, double a) + public static void 腕獣絶頂(this Character Cha, double a) { - foreach (Arm獣 item in Cha.Bod.腕獣左) + foreach (Arm獣 item in Cha.Body.腕獣左) { if (item.UpperArm == null) { @@ -5605,7 +5605,7 @@ namespace SlaveMatrix } } } - foreach (Arm獣 item2 in Cha.Bod.腕獣右) + foreach (Arm獣 item2 in Cha.Body.腕獣右) { if (item2.UpperArm == null) { @@ -5623,9 +5623,9 @@ namespace SlaveMatrix } } - public static void 脚_人左(this Cha Cha, int n, double u1, double u2, double u3, double 腿角度B, double 脚角度B, double 足角度B, double 腿尺度YC, double 脚尺度YC, double 足尺度YC) + public static void 脚_人左(this Character Cha, int n, double u1, double u2, double u3, double 腿角度B, double 脚角度B, double 足角度B, double 腿尺度YC, double 脚尺度YC, double 足尺度YC) { - 脚人 脚人2 = Cha.Bod.脚人左[n]; + 脚人 脚人2 = Cha.Body.脚人左[n]; 脚人2.腿.SetAngle0(); 脚人2.腿.尺度YC = 腿尺度YC; 脚人2.腿.角度B += 腿角度B + u1; @@ -5645,9 +5645,9 @@ namespace SlaveMatrix } } - public static void 脚_人右(this Cha Cha, int n, double u1, double u2, double u3, double 腿角度B, double 脚角度B, double 足角度B, double 腿尺度YC, double 脚尺度YC, double 足尺度YC) + public static void 脚_人右(this Character Cha, int n, double u1, double u2, double u3, double 腿角度B, double 脚角度B, double 足角度B, double 腿尺度YC, double 脚尺度YC, double 足尺度YC) { - 脚人 脚人2 = Cha.Bod.脚人右[n]; + 脚人 脚人2 = Cha.Body.脚人右[n]; 脚人2.腿.SetAngle0(); 脚人2.腿.尺度YC = 腿尺度YC; 脚人2.腿.角度B += 0.0 - 腿角度B + (0.0 - u1); @@ -5667,137 +5667,137 @@ namespace SlaveMatrix } } - public static void Leg_人_上開き左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上開き左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 3; + Cha.Body.左腿開きi = 3; Cha.脚_人左(n, u1, u2, u3, 0.0, 5.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_上開き右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上開き右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 3; + Cha.Body.右腿開きi = 3; Cha.脚_人右(n, u1, u2, u3, 0.0, 5.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_上閉じ左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上閉じ左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 4; + Cha.Body.左腿開きi = 4; Cha.脚_人左(n, u1, u2, u3, 3.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_上閉じ右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上閉じ右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 4; + Cha.Body.右腿開きi = 4; Cha.脚_人右(n, u1, u2, u3, 3.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_上閉じ内左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上閉じ内左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 4; + Cha.Body.左腿開きi = 4; Cha.脚_人左(n, u1, u2, u3, 3.0, 10.0, -15.0, 1.0, 1.0, 1.0); } - public static void Leg_人_上閉じ内右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_上閉じ内右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 4; + Cha.Body.右腿開きi = 4; Cha.脚_人右(n, u1, u2, u3, 3.0, 10.0, -15.0, 1.0, 1.0, 1.0); } - public static void Leg_人_脱力左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_脱力左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 1; + Cha.Body.左腿開きi = 1; Cha.脚_人左(n, u1, u2, u3, 0.0, -5.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_脱力右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_脱力右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 1; + Cha.Body.右腿開きi = 1; Cha.脚_人右(n, u1, u2, u3, 0.0, -5.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_内股左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_内股左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 0; + Cha.Body.左腿開きi = 0; Cha.脚_人左(n, u1, u2, u3, -5.0, 15.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_内股右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_内股右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 0; + Cha.Body.右腿開きi = 0; Cha.脚_人右(n, u1, u2, u3, -5.0, 15.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_直立左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_直立左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 0; + Cha.Body.左腿開きi = 0; Cha.脚_人左(n, u1, u2, u3, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_直立右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_直立右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 0; + Cha.Body.右腿開きi = 0; Cha.脚_人右(n, u1, u2, u3, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_がに股左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_がに股左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 2; + Cha.Body.左腿開きi = 2; Cha.脚_人左(n, u1, u2, u3, 0.0, -10.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_がに股右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_がに股右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 2; + Cha.Body.右腿開きi = 2; Cha.脚_人右(n, u1, u2, u3, 0.0, -10.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_おっぴろげ左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_おっぴろげ左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 2; + Cha.Body.左腿開きi = 2; Cha.脚_人左(n, u1, u2, u3, 10.0, 10.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_おっぴろげ右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_おっぴろげ右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 2; + Cha.Body.右腿開きi = 2; Cha.脚_人右(n, u1, u2, u3, 10.0, 10.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_M字開脚左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_M字開脚左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 3; + Cha.Body.左腿開きi = 3; Cha.脚_人左(n, u1, u2, u3, -10.0, 10.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_M字開脚右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_M字開脚右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 3; + Cha.Body.右腿開きi = 3; Cha.脚_人右(n, u1, u2, u3, -10.0, 10.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_人_足コキ左(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_足コキ左(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.左腿開きi = 2; + Cha.Body.左腿開きi = 2; Cha.脚_人左(n, u1, u2, u3, -23.0, -68.0, 47.0, 1.0, 1.0, 1.0); } - public static void Leg_人_足コキ右(this Cha Cha, int n, double u1, double u2, double u3) + public static void Leg_人_足コキ右(this Character Cha, int n, double u1, double u2, double u3) { - Cha.Bod.右腿開きi = 2; + Cha.Body.右腿開き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) + public static void 両脚_人_足コキ(this Character Cha, int n) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); 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.Body.腿開きi = 2; 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) + public static void 両脚人_0(this Character Cha, int n, bool 同角, int i1, int i2) { double ba; double ba2; @@ -5843,7 +5843,7 @@ namespace SlaveMatrix Cha.脚人右_0(i2, n, u, u2, u3); } - public static void 脚人左_0(this Cha c, int i, int n, double u1, double u2, double u3) + public static void 脚人左_0(this Character c, int i, int n, double u1, double u2, double u3) { switch (i) { @@ -5880,7 +5880,7 @@ namespace SlaveMatrix } } - public static void 脚人右_0(this Cha c, int i, int n, double u1, double u2, double u3) + public static void 脚人右_0(this Character c, int i, int n, double u1, double u2, double u3) { switch (i) { @@ -5917,9 +5917,9 @@ namespace SlaveMatrix } } - public static void 脚人絶頂(this Cha Cha, double a) + public static void 脚人絶頂(this Character Cha, double a) { - foreach (脚人 item in Cha.Bod.脚人左) + foreach (脚人 item in Cha.Body.脚人左) { item.腿.角度C = a * RNG.XS.NextDouble(); if (item.Leg != null) @@ -5931,7 +5931,7 @@ namespace SlaveMatrix } } } - foreach (脚人 item2 in Cha.Bod.脚人右) + foreach (脚人 item2 in Cha.Body.脚人右) { item2.腿.角度C = (0.0 - a) * RNG.XS.NextDouble(); if (item2.Leg != null) @@ -5945,9 +5945,9 @@ namespace SlaveMatrix } } - 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) + public static void Leg_獣左(this Character 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]; + 脚獣 脚獣2 = Cha.Body.脚獣左[n]; if (脚獣2.腿 != null) { 脚獣2.腿.SetAngle0(); @@ -5987,9 +5987,9 @@ namespace SlaveMatrix } } - 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) + public static void Leg_獣右(this Character 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]; + 脚獣 脚獣2 = Cha.Body.脚獣右[n]; if (脚獣2.腿 != null) { 脚獣2.腿.SetAngle0(); @@ -6029,37 +6029,37 @@ namespace SlaveMatrix } } - public static void Leg_獣_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.Leg_獣左(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_獣_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.Leg_獣右(n, u1, u2, u3, u4, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0); } - public static void Leg_獣_萎縮左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_萎縮左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.Leg_獣左(n, u1, u2, u3, u4, 12.0, -12.0, 12.0, 1.0, 1.0, 1.0); } - public static void Leg_獣_萎縮右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_萎縮右(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.Leg_獣右(n, u1, u2, u3, u4, 12.0, -12.0, 12.0, 1.0, 1.0, 1.0); } - public static void Leg_獣_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_脱力左(this Character Cha, int n, double u1, double u2, double u3, double u4) { Cha.Leg_獣左(n, u1, u2, u3, u4, -10.0, 10.0, -10.0, 1.0, 1.0, 1.0); } - public static void Leg_獣_脱力右(this Cha Cha, int n, double u1, double u2, double u3, double u4) + public static void Leg_獣_脱力右(this Character Cha, int n, double u1, double u2, double u3, double u4) { 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) + public static void 両脚獣_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -6087,7 +6087,7 @@ namespace SlaveMatrix Cha.脚獣右_0(i2, n, u, u2, u3, u4); } - public static void 脚獣左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 脚獣左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -6103,7 +6103,7 @@ namespace SlaveMatrix } } - public static void 脚獣右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4) + public static void 脚獣右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4) { switch (i) { @@ -6119,9 +6119,9 @@ namespace SlaveMatrix } } - public static void 脚獣絶頂(this Cha Cha, double a) + public static void 脚獣絶頂(this Character Cha, double a) { - foreach (脚獣 item in Cha.Bod.脚獣左) + foreach (脚獣 item in Cha.Body.脚獣左) { if (item.腿 != null) { @@ -6136,7 +6136,7 @@ namespace SlaveMatrix } } } - foreach (脚獣 item2 in Cha.Bod.脚獣右) + foreach (脚獣 item2 in Cha.Body.脚獣右) { if (item2.腿 != null) { @@ -6153,9 +6153,9 @@ namespace SlaveMatrix } } - public static void 翼鳥左(this Cha Cha, int n, double u1, double u2, double u3, double UpperArm展開, double LowerArm展開, double 手展開, double UpperArm角度B, double LowerArm角度B, double 手角度B) + public static void 翼鳥左(this Character Cha, int n, double u1, double u2, double u3, double UpperArm展開, double LowerArm展開, double 手展開, double UpperArm角度B, double LowerArm角度B, double 手角度B) { - 翼鳥 翼鳥2 = Cha.Bod.翼鳥左[n]; + 翼鳥 翼鳥2 = Cha.Body.翼鳥左[n]; 翼鳥2.UpperArm.SetAngle0(); 翼鳥2.UpperArm.展開 = UpperArm展開; 翼鳥2.UpperArm.角度B += UpperArm角度B + u1; @@ -6174,9 +6174,9 @@ namespace SlaveMatrix 翼鳥2.UpperArm.重複角度処理(); } - public static void 翼鳥右(this Cha Cha, int n, double u1, double u2, double u3, double UpperArm展開, double LowerArm展開, double 手展開, double UpperArm角度B, double LowerArm角度B, double 手角度B) + public static void 翼鳥右(this Character Cha, int n, double u1, double u2, double u3, double UpperArm展開, double LowerArm展開, double 手展開, double UpperArm角度B, double LowerArm角度B, double 手角度B) { - 翼鳥 翼鳥2 = Cha.Bod.翼鳥右[n]; + 翼鳥 翼鳥2 = Cha.Body.翼鳥右[n]; 翼鳥2.UpperArm.SetAngle0(); 翼鳥2.UpperArm.展開 = UpperArm展開; 翼鳥2.UpperArm.角度B += 0.0 - UpperArm角度B + (0.0 - u1); @@ -6195,77 +6195,77 @@ namespace SlaveMatrix 翼鳥2.UpperArm.重複角度処理(); } - public static void 翼鳥_脱力左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_脱力左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥左(n, u1, u2, u3, 0.0, 0.25, 0.25, -1.0, 5.0, 0.0); } - public static void 翼鳥_脱力右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_脱力右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥右(n, u1, u2, u3, 0.0, 0.25, 0.25, -1.0, 5.0, 0.0); } - public static void 翼鳥_強張り左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_強張り左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥左(n, u1, u2, u3, 0.0, 0.0, 0.0, -10.0, 10.0, 0.0); } - public static void 翼鳥_強張り右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_強張り右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥右(n, u1, u2, u3, 0.0, 0.0, 0.0, -10.0, 10.0, 0.0); } - public static void 翼鳥_恥じらい左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_恥じらい左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥左(n, u1, u2, u3, 0.0, 0.0, 0.0, -20.0, 15.0, 0.0); } - public static void 翼鳥_恥じらい右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_恥じらい右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥右(n, u1, u2, u3, 0.0, 0.0, 0.0, -20.0, 15.0, 0.0); } - public static void 翼鳥_顔隠し左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_顔隠し左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥左(n, u1, u2, u3, 0.0, 0.0, 0.0, -20.0, 20.0, 0.0); } - public static void 翼鳥_顔隠し右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_顔隠し右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥右(n, u1, u2, u3, 0.0, 0.0, 0.0, -20.0, 20.0, 0.0); } - public static void 翼鳥_閉じ左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_閉じ左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥左(n, u1, u2, u3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 翼鳥_閉じ右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_閉じ右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥右(n, u1, u2, u3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 翼鳥_半開き左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_半開き左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥左(n, u1, u2, u3, 0.25, 0.25, 0.25, 0.0, 0.0, 0.0); } - public static void 翼鳥_半開き右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_半開き右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥右(n, u1, u2, u3, 0.25, 0.25, 0.25, 0.0, 0.0, 0.0); } - public static void 翼鳥_全開左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_全開左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥左(n, u1, u2, u3, 1.0, 1.0, 1.0, 3.0, 0.0, 0.0); } - public static void 翼鳥_全開右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼鳥_全開右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼鳥右(n, u1, u2, u3, 1.0, 1.0, 1.0, 3.0, 0.0, 0.0); } - public static void 両翼鳥_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両翼鳥_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -6289,7 +6289,7 @@ namespace SlaveMatrix Cha.翼鳥右_0(i2, n, u, u2, u3); } - public static void 翼鳥左_0(this Cha c, int i, int n, double u1, double u2, double u3) + public static void 翼鳥左_0(this Character c, int i, int n, double u1, double u2, double u3) { switch (i) { @@ -6317,7 +6317,7 @@ namespace SlaveMatrix } } - public static void 翼鳥右_0(this Cha c, int i, int n, double u1, double u2, double u3) + public static void 翼鳥右_0(this Character c, int i, int n, double u1, double u2, double u3) { switch (i) { @@ -6345,9 +6345,9 @@ namespace SlaveMatrix } } - public static void 翼獣左(this Cha Cha, int n, double u1, double u2, double u3, double UpperArm展開, double LowerArm展開, double 手展開, double UpperArm角度B, double LowerArm角度B, double 手角度B) + public static void 翼獣左(this Character Cha, int n, double u1, double u2, double u3, double UpperArm展開, double LowerArm展開, double 手展開, double UpperArm角度B, double LowerArm角度B, double 手角度B) { - 翼獣 翼獣2 = Cha.Bod.翼獣左[n]; + 翼獣 翼獣2 = Cha.Body.翼獣左[n]; 翼獣2.UpperArm.SetAngle0(); 翼獣2.UpperArm.展開 = UpperArm展開; 翼獣2.UpperArm.角度B += UpperArm角度B + u1; @@ -6366,9 +6366,9 @@ namespace SlaveMatrix 翼獣2.UpperArm.重複角度処理(); } - public static void 翼獣右(this Cha Cha, int n, double u1, double u2, double u3, double UpperArm展開, double LowerArm展開, double 手展開, double UpperArm角度B, double LowerArm角度B, double 手角度B) + public static void 翼獣右(this Character Cha, int n, double u1, double u2, double u3, double UpperArm展開, double LowerArm展開, double 手展開, double UpperArm角度B, double LowerArm角度B, double 手角度B) { - 翼獣 翼獣2 = Cha.Bod.翼獣右[n]; + 翼獣 翼獣2 = Cha.Body.翼獣右[n]; 翼獣2.UpperArm.SetAngle0(); 翼獣2.UpperArm.展開 = UpperArm展開; 翼獣2.UpperArm.角度B += 0.0 - UpperArm角度B + (0.0 - u1); @@ -6387,77 +6387,77 @@ namespace SlaveMatrix 翼獣2.UpperArm.重複角度処理(); } - public static void 翼獣_脱力左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_脱力左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣左(n, u1, u2, u3, 0.0, 0.25, 0.25, -1.0, 5.0, 0.0); } - public static void 翼獣_脱力右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_脱力右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣右(n, u1, u2, u3, 0.0, 0.25, 0.25, -1.0, 5.0, 0.0); } - public static void 翼獣_強張り左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_強張り左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣左(n, u1, u2, u3, 0.0, 0.0, 0.0, -10.0, 10.0, 0.0); } - public static void 翼獣_強張り右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_強張り右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣右(n, u1, u2, u3, 0.0, 0.0, 0.0, -10.0, 10.0, 0.0); } - public static void 翼獣_恥じらい左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_恥じらい左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣左(n, u1, u2, u3, 0.0, 0.0, 0.0, -20.0, 15.0, 0.0); } - public static void 翼獣_恥じらい右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_恥じらい右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣右(n, u1, u2, u3, 0.0, 0.0, 0.0, -20.0, 15.0, 0.0); } - public static void 翼獣_顔隠し左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_顔隠し左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣左(n, u1, u2, u3, 0.0, 0.0, 0.0, -20.0, 20.0, 0.0); } - public static void 翼獣_顔隠し右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_顔隠し右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣右(n, u1, u2, u3, 0.0, 0.0, 0.0, -20.0, 20.0, 0.0); } - public static void 翼獣_閉じ左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_閉じ左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣左(n, u1, u2, u3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 翼獣_閉じ右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_閉じ右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣右(n, u1, u2, u3, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 翼獣_半開き左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_半開き左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣左(n, u1, u2, u3, 0.25, 0.25, 0.25, 0.0, 0.0, 0.0); } - public static void 翼獣_半開き右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_半開き右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣右(n, u1, u2, u3, 0.25, 0.25, 0.25, 0.0, 0.0, 0.0); } - public static void 翼獣_全開左(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_全開左(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣左(n, u1, u2, u3, 1.0, 1.0, 1.0, 3.0, 0.0, 0.0); } - public static void 翼獣_全開右(this Cha Cha, int n, double u1, double u2, double u3) + public static void 翼獣_全開右(this Character Cha, int n, double u1, double u2, double u3) { Cha.翼獣右(n, u1, u2, u3, 1.0, 1.0, 1.0, 3.0, 0.0, 0.0); } - public static void 両翼獣_閉じ(this Cha Cha, int n) + public static void 両翼獣_閉じ(this Character Cha, int n) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); double u2 = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); @@ -6466,7 +6466,7 @@ namespace SlaveMatrix Cha.翼獣_閉じ右(n, u, u2, u3); } - public static void 両翼獣_半開き(this Cha Cha, int n) + public static void 両翼獣_半開き(this Character Cha, int n) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); double u2 = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); @@ -6475,7 +6475,7 @@ namespace SlaveMatrix Cha.翼獣_半開き右(n, u, u2, u3); } - public static void 両翼獣_全開(this Cha Cha, int n) + public static void 両翼獣_全開(this Character Cha, int n) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); double u2 = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); @@ -6484,7 +6484,7 @@ namespace SlaveMatrix Cha.翼獣_全開右(n, u, u2, u3); } - public static void 両翼獣_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両翼獣_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 2.0, RNG.XS.NextSign(), 1.0); @@ -6508,7 +6508,7 @@ namespace SlaveMatrix Cha.翼獣右_0(i2, n, u, u2, u3); } - public static void 翼獣左_0(this Cha c, int i, int n, double u1, double u2, double u3) + public static void 翼獣左_0(this Character c, int i, int n, double u1, double u2, double u3) { switch (i) { @@ -6536,7 +6536,7 @@ namespace SlaveMatrix } } - public static void 翼獣右_0(this Cha c, int i, int n, double u1, double u2, double u3) + public static void 翼獣右_0(this Character c, int i, int n, double u1, double u2, double u3) { switch (i) { @@ -6564,9 +6564,9 @@ namespace SlaveMatrix } } - public static void 鰭左(this Cha Cha, int n, double u1, double 根本角度) + public static void 鰭左(this Character Cha, int n, double u1, double 根本角度) { - 鰭 鰭2 = Cha.Bod.鰭左[n]; + 鰭 鰭2 = Cha.Body.鰭左[n]; 鰭2.SetAngle0(); 鰭2.角度B += 根本角度 + u1; if (鰭2 is 鰭_魚 && 根本角度 < 0.0) @@ -6575,9 +6575,9 @@ namespace SlaveMatrix } } - public static void 鰭右(this Cha Cha, int n, double u1, double 根本角度) + public static void 鰭右(this Character Cha, int n, double u1, double 根本角度) { - 鰭 鰭2 = Cha.Bod.鰭右[n]; + 鰭 鰭2 = Cha.Body.鰭右[n]; 鰭2.SetAngle0(); 鰭2.角度B += 0.0 - 根本角度 + (0.0 - u1); if (鰭2 is 鰭_魚 && 根本角度 < 0.0) @@ -6586,37 +6586,37 @@ namespace SlaveMatrix } } - public static void 鰭_基本左(this Cha Cha, int n, double u1) + public static void 鰭_基本左(this Character Cha, int n, double u1) { Cha.鰭左(n, 0.0, u1); } - public static void 鰭_基本右(this Cha Cha, int n, double u1) + public static void 鰭_基本右(this Character Cha, int n, double u1) { Cha.鰭右(n, 0.0, u1); } - public static void 鰭_上げ左(this Cha Cha, int n, double u1) + public static void 鰭_上げ左(this Character Cha, int n, double u1) { Cha.鰭左(n, 25.0, u1); } - public static void 鰭_上げ右(this Cha Cha, int n, double u1) + public static void 鰭_上げ右(this Character Cha, int n, double u1) { Cha.鰭右(n, 25.0, u1); } - public static void 鰭_下げ左(this Cha Cha, int n, double u1) + public static void 鰭_下げ左(this Character Cha, int n, double u1) { Cha.鰭左(n, -25.0, u1); } - public static void 鰭_下げ右(this Cha Cha, int n, double u1) + public static void 鰭_下げ右(this Character Cha, int n, double u1) { Cha.鰭右(n, -25.0, u1); } - public static void 両鰭_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両鰭_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double u = ((!同角) ? Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5) : num); @@ -6624,7 +6624,7 @@ namespace SlaveMatrix Cha.鰭右_0(i2, n, u); } - public static void 鰭左_0(this Cha c, int i, int n, double u1) + public static void 鰭左_0(this Character c, int i, int n, double u1) { switch (i) { @@ -6640,7 +6640,7 @@ namespace SlaveMatrix } } - public static void 鰭右_0(this Cha c, int i, int n, double u1) + public static void 鰭右_0(this Character c, int i, int n, double u1) { switch (i) { @@ -6656,63 +6656,63 @@ namespace SlaveMatrix } } - public static void 鰭絶頂(this Cha Cha, double a) + public static void 鰭絶頂(this Character Cha, double a) { - foreach (鰭 item in Cha.Bod.鰭左) + foreach (鰭 item in Cha.Body.鰭左) { item.角度C = a * RNG.XS.NextDouble(); } - foreach (鰭 item2 in Cha.Bod.鰭右) + foreach (鰭 item2 in Cha.Body.鰭右) { item2.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } - public static void 葉左(this Cha Cha, int n, double u1, double 根本角度) + public static void 葉左(this Character Cha, int n, double u1, double 根本角度) { - 葉 obj = Cha.Bod.葉左[n]; + 葉 obj = Cha.Body.葉左[n]; obj.SetAngle0(); obj.角度B += 根本角度 + u1; } - public static void 葉右(this Cha Cha, int n, double u1, double 根本角度) + public static void 葉右(this Character Cha, int n, double u1, double 根本角度) { - 葉 obj = Cha.Bod.葉右[n]; + 葉 obj = Cha.Body.葉右[n]; obj.SetAngle0(); obj.角度B += 0.0 - 根本角度 + (0.0 - u1); } - public static void 葉_基本左(this Cha Cha, int n, double u1) + public static void 葉_基本左(this Character Cha, int n, double u1) { Cha.葉左(n, 0.0, u1); } - public static void 葉_基本右(this Cha Cha, int n, double u1) + public static void 葉_基本右(this Character Cha, int n, double u1) { Cha.葉右(n, 0.0, u1); } - public static void 葉_上げ左(this Cha Cha, int n, double u1) + public static void 葉_上げ左(this Character Cha, int n, double u1) { Cha.葉左(n, 25.0, u1); } - public static void 葉_上げ右(this Cha Cha, int n, double u1) + public static void 葉_上げ右(this Character Cha, int n, double u1) { Cha.葉右(n, 25.0, u1); } - public static void 葉_下げ左(this Cha Cha, int n, double u1) + public static void 葉_下げ左(this Character Cha, int n, double u1) { Cha.葉左(n, -25.0, u1); } - public static void 葉_下げ右(this Cha Cha, int n, double u1) + public static void 葉_下げ右(this Character Cha, int n, double u1) { Cha.葉右(n, -25.0, u1); } - public static void 両葉_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両葉_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double u = ((!同角) ? Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5) : num); @@ -6720,7 +6720,7 @@ namespace SlaveMatrix Cha.葉右_0(i2, n, u); } - public static void 葉左_0(this Cha c, int i, int n, double u1) + public static void 葉左_0(this Character c, int i, int n, double u1) { switch (i) { @@ -6736,7 +6736,7 @@ namespace SlaveMatrix } } - public static void 葉右_0(this Cha c, int i, int n, double u1) + public static void 葉右_0(this Character c, int i, int n, double u1) { switch (i) { @@ -6752,63 +6752,63 @@ namespace SlaveMatrix } } - public static void 葉絶頂(this Cha Cha, double a) + public static void 葉絶頂(this Character Cha, double a) { - foreach (葉 item in Cha.Bod.葉左) + foreach (葉 item in Cha.Body.葉左) { item.角度C = a * RNG.XS.NextDouble(); } - foreach (葉 item2 in Cha.Bod.葉右) + foreach (葉 item2 in Cha.Body.葉右) { item2.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } - public static void 前翅1左(this Cha Cha, int n, double u1, double 根本角度) + public static void 前翅1左(this Character Cha, int n, double u1, double 根本角度) { - 前翅 obj = Cha.Bod.前翅1左[n]; + 前翅 obj = Cha.Body.前翅1左[n]; obj.SetAngle0(); obj.角度B += 根本角度 + u1; } - public static void 前翅1右(this Cha Cha, int n, double u1, double 根本角度) + public static void 前翅1右(this Character Cha, int n, double u1, double 根本角度) { - 前翅 obj = Cha.Bod.前翅1右[n]; + 前翅 obj = Cha.Body.前翅1右[n]; obj.SetAngle0(); obj.角度B += 0.0 - 根本角度 + (0.0 - u1); } - public static void 前翅1_基本左(this Cha Cha, int n, double u1) + public static void 前翅1_基本左(this Character Cha, int n, double u1) { Cha.前翅1左(n, 0.0, u1); } - public static void 前翅1_基本右(this Cha Cha, int n, double u1) + public static void 前翅1_基本右(this Character Cha, int n, double u1) { Cha.前翅1右(n, 0.0, u1); } - public static void 前翅1_上げ左(this Cha Cha, int n, double u1) + public static void 前翅1_上げ左(this Character Cha, int n, double u1) { Cha.前翅1左(n, 15.0, u1); } - public static void 前翅1_上げ右(this Cha Cha, int n, double u1) + public static void 前翅1_上げ右(this Character Cha, int n, double u1) { Cha.前翅1右(n, 15.0, u1); } - public static void 前翅1_下げ左(this Cha Cha, int n, double u1) + public static void 前翅1_下げ左(this Character Cha, int n, double u1) { Cha.前翅1左(n, -15.0, u1); } - public static void 前翅1_下げ右(this Cha Cha, int n, double u1) + public static void 前翅1_下げ右(this Character Cha, int n, double u1) { Cha.前翅1右(n, -15.0, u1); } - public static void 両前翅_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両前翅_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double u = ((!同角) ? Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5) : num); @@ -6816,7 +6816,7 @@ namespace SlaveMatrix Cha.前翅右_0(i2, n, u); } - public static void 前翅左_0(this Cha c, int i, int n, double u1) + public static void 前翅左_0(this Character c, int i, int n, double u1) { switch (i) { @@ -6832,7 +6832,7 @@ namespace SlaveMatrix } } - public static void 前翅右_0(this Cha c, int i, int n, double u1) + public static void 前翅右_0(this Character c, int i, int n, double u1) { switch (i) { @@ -6848,21 +6848,21 @@ namespace SlaveMatrix } } - public static void 前翅絶頂(this Cha Cha, double a) + public static void 前翅絶頂(this Character Cha, double a) { - foreach (前翅 item in Cha.Bod.前翅1左) + foreach (前翅 item in Cha.Body.前翅1左) { item.角度C = a * RNG.XS.NextDouble(); } - foreach (前翅 item2 in Cha.Bod.前翅1右) + foreach (前翅 item2 in Cha.Body.前翅1右) { item2.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } - public static void 前翅2左(this Cha Cha, int n, double 展開) + public static void 前翅2左(this Character Cha, int n, double 展開) { - 前翅 前翅2 = Cha.Bod.前翅2左[n]; + 前翅 前翅2 = Cha.Body.前翅2左[n]; if (前翅2 is 前翅_甲) { if (展開 != 0.5) @@ -6878,9 +6878,9 @@ namespace SlaveMatrix } } - public static void 前翅2右(this Cha Cha, int n, double 展開) + public static void 前翅2右(this Character Cha, int n, double 展開) { - 前翅 前翅2 = Cha.Bod.前翅2右[n]; + 前翅 前翅2 = Cha.Body.前翅2右[n]; if (前翅2 is 前翅_甲) { if (展開 != 0.5) @@ -6896,43 +6896,43 @@ namespace SlaveMatrix } } - public static void 前翅2_基本左(this Cha Cha, int n) + public static void 前翅2_基本左(this Character Cha, int n) { Cha.前翅2左(n, 0.0); } - public static void 前翅2_基本右(this Cha Cha, int n) + public static void 前翅2_基本右(this Character Cha, int n) { Cha.前翅2右(n, 0.0); } - public static void 前翅2_半開左(this Cha Cha, int n) + public static void 前翅2_半開左(this Character Cha, int n) { Cha.前翅2左(n, 0.5); } - public static void 前翅2_半開右(this Cha Cha, int n) + public static void 前翅2_半開右(this Character Cha, int n) { Cha.前翅2右(n, 0.5); } - public static void 前翅2_全開左(this Cha Cha, int n) + public static void 前翅2_全開左(this Character Cha, int n) { Cha.前翅2左(n, 1.0); } - public static void 前翅2_全開右(this Cha Cha, int n) + public static void 前翅2_全開右(this Character Cha, int n) { Cha.前翅2右(n, 1.0); } - public static void 両前翅_1(this Cha Cha, int n, int i1, int i2) + public static void 両前翅_1(this Character Cha, int n, int i1, int i2) { Cha.前翅左_1(i1, n); Cha.前翅右_1(i2, n); } - public static void 前翅左_1(this Cha c, int i, int n) + public static void 前翅左_1(this Character c, int i, int n) { switch (i) { @@ -6948,7 +6948,7 @@ namespace SlaveMatrix } } - public static void 前翅右_1(this Cha c, int i, int n) + public static void 前翅右_1(this Character c, int i, int n) { switch (i) { @@ -6964,51 +6964,51 @@ namespace SlaveMatrix } } - public static void 後翅1左(this Cha Cha, int n, double u1, double 根本角度) + public static void 後翅1左(this Character Cha, int n, double u1, double 根本角度) { - 後翅 obj = Cha.Bod.後翅1左[n]; + 後翅 obj = Cha.Body.後翅1左[n]; obj.SetAngle0(); obj.角度B += 根本角度 + u1; } - public static void 後翅1右(this Cha Cha, int n, double u1, double 根本角度) + public static void 後翅1右(this Character Cha, int n, double u1, double 根本角度) { - 後翅 obj = Cha.Bod.後翅1右[n]; + 後翅 obj = Cha.Body.後翅1右[n]; obj.SetAngle0(); obj.角度B += 0.0 - 根本角度 + (0.0 - u1); } - public static void 後翅1_基本左(this Cha Cha, int n, double u1) + public static void 後翅1_基本左(this Character Cha, int n, double u1) { Cha.後翅1左(n, 0.0, u1); } - public static void 後翅1_基本右(this Cha Cha, int n, double u1) + public static void 後翅1_基本右(this Character Cha, int n, double u1) { Cha.後翅1右(n, 0.0, u1); } - public static void 後翅1_上げ左(this Cha Cha, int n, double u1) + public static void 後翅1_上げ左(this Character Cha, int n, double u1) { Cha.後翅1左(n, 15.0, u1); } - public static void 後翅1_上げ右(this Cha Cha, int n, double u1) + public static void 後翅1_上げ右(this Character Cha, int n, double u1) { Cha.後翅1右(n, 15.0, u1); } - public static void 後翅1_下げ左(this Cha Cha, int n, double u1) + public static void 後翅1_下げ左(this Character Cha, int n, double u1) { Cha.後翅1左(n, -15.0, u1); } - public static void 後翅1_下げ右(this Cha Cha, int n, double u1) + public static void 後翅1_下げ右(this Character Cha, int n, double u1) { Cha.後翅1右(n, -15.0, u1); } - public static void 両後翅_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両後翅_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double u = ((!同角) ? Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5) : num); @@ -7016,7 +7016,7 @@ namespace SlaveMatrix Cha.後翅右_0(i2, n, u); } - public static void 後翅左_0(this Cha c, int i, int n, double u1) + public static void 後翅左_0(this Character c, int i, int n, double u1) { switch (i) { @@ -7032,7 +7032,7 @@ namespace SlaveMatrix } } - public static void 後翅右_0(this Cha c, int i, int n, double u1) + public static void 後翅右_0(this Character c, int i, int n, double u1) { switch (i) { @@ -7048,21 +7048,21 @@ namespace SlaveMatrix } } - public static void 後翅絶頂(this Cha Cha, double a) + public static void 後翅絶頂(this Character Cha, double a) { - foreach (後翅 item in Cha.Bod.後翅1左) + foreach (後翅 item in Cha.Body.後翅1左) { item.角度C = a * RNG.XS.NextDouble(); } - foreach (後翅 item2 in Cha.Bod.後翅1右) + foreach (後翅 item2 in Cha.Body.後翅1右) { item2.角度C = (0.0 - a) * RNG.XS.NextDouble(); } } - public static void 後翅2左(this Cha Cha, int n, double 展開) + public static void 後翅2左(this Character Cha, int n, double 展開) { - 後翅 後翅2 = Cha.Bod.後翅2左[n]; + 後翅 後翅2 = Cha.Body.後翅2左[n]; if (後翅2 is 後翅_甲) { if (展開 != 0.5) @@ -7078,9 +7078,9 @@ namespace SlaveMatrix } } - public static void 後翅2右(this Cha Cha, int n, double 展開) + public static void 後翅2右(this Character Cha, int n, double 展開) { - 後翅 後翅2 = Cha.Bod.後翅2右[n]; + 後翅 後翅2 = Cha.Body.後翅2右[n]; if (後翅2 is 後翅_甲) { if (展開 != 0.5) @@ -7096,43 +7096,43 @@ namespace SlaveMatrix } } - public static void 後翅2_基本左(this Cha Cha, int n) + public static void 後翅2_基本左(this Character Cha, int n) { Cha.後翅2左(n, 0.0); } - public static void 後翅2_基本右(this Cha Cha, int n) + public static void 後翅2_基本右(this Character Cha, int n) { Cha.後翅2右(n, 0.0); } - public static void 後翅2_半開左(this Cha Cha, int n) + public static void 後翅2_半開左(this Character Cha, int n) { Cha.後翅2左(n, 0.5); } - public static void 後翅2_半開右(this Cha Cha, int n) + public static void 後翅2_半開右(this Character Cha, int n) { Cha.後翅2右(n, 0.5); } - public static void 後翅2_全開左(this Cha Cha, int n) + public static void 後翅2_全開左(this Character Cha, int n) { Cha.後翅2左(n, 1.0); } - public static void 後翅2_全開右(this Cha Cha, int n) + public static void 後翅2_全開右(this Character Cha, int n) { Cha.後翅2右(n, 1.0); } - public static void 両後翅_1(this Cha Cha, int n, int i1, int i2) + public static void 両後翅_1(this Character Cha, int n, int i1, int i2) { Cha.後翅左_1(i1, n); Cha.後翅右_1(i2, n); } - public static void 後翅左_1(this Cha c, int i, int n) + public static void 後翅左_1(this Character c, int i, int n) { switch (i) { @@ -7148,7 +7148,7 @@ namespace SlaveMatrix } } - public static void 後翅右_1(this Cha c, int i, int n) + public static void 後翅右_1(this Character c, int i, int n) { switch (i) { @@ -7164,9 +7164,9 @@ namespace SlaveMatrix } } - public static void 触肢蜘左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double 基節角度, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度) + public static void 触肢蜘左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double 基節角度, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度) { - 触肢_肢蜘 obj = Cha.Bod.触肢蜘左[n]; + 触肢_肢蜘 obj = Cha.Body.触肢蜘左[n]; obj.SetAngle0(); obj.X0Y0_基節.AngleBase += 基節角度 + u1; obj.X0Y0_転節.AngleBase += 転節角度 + u2; @@ -7176,9 +7176,9 @@ namespace SlaveMatrix obj.X0Y0_蹠節.AngleBase += 蹠節角度 + u6; } - public static void 触肢蜘右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double 基節角度, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度) + public static void 触肢蜘右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double 基節角度, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度) { - 触肢_肢蜘 obj = Cha.Bod.触肢蜘右[n]; + 触肢_肢蜘 obj = Cha.Body.触肢蜘右[n]; obj.SetAngle0(); obj.X0Y0_基節.AngleBase += 0.0 - 基節角度 + (0.0 - u1); obj.X0Y0_転節.AngleBase += 0.0 - 転節角度 + (0.0 - u2); @@ -7188,37 +7188,37 @@ namespace SlaveMatrix obj.X0Y0_蹠節.AngleBase += 0.0 - 蹠節角度 + (0.0 - u6); } - public static void 触肢蜘_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蜘_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蜘左(n, u1, u2, u3, u4, u5, u6, -30.0, 0.0, 0.0, -45.0, 0.0, 30.0); } - public static void 触肢蜘_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蜘_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蜘右(n, u1, u2, u3, u4, u5, u6, -30.0, 0.0, 0.0, -45.0, 0.0, 30.0); } - public static void 触肢蜘_萎縮左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蜘_萎縮左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蜘左(n, u1, u2, u3, u4, u5, u6, -10.0, 0.0, 0.0, -8.0, 0.0, 25.0); } - public static void 触肢蜘_萎縮右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蜘_萎縮右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蜘右(n, u1, u2, u3, u4, u5, u6, -10.0, 0.0, 0.0, -8.0, 0.0, 25.0); } - public static void 触肢蜘_開く左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蜘_開く左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蜘左(n, u1, u2, u3, u4, u5, u6, -40.0, 0.0, 0.0, -100.0, 0.0, -30.0); } - public static void 触肢蜘_開く右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蜘_開く右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蜘右(n, u1, u2, u3, u4, u5, u6, -40.0, 0.0, 0.0, -100.0, 0.0, -30.0); } - public static void 両触肢蜘_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両触肢蜘_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -7250,7 +7250,7 @@ namespace SlaveMatrix Cha.触肢蜘右_0(i2, n, u3, u4, u5, u6, u, u2); } - public static void 触肢蜘左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蜘左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6) { switch (i) { @@ -7266,7 +7266,7 @@ namespace SlaveMatrix } } - public static void 触肢蜘右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蜘右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6) { switch (i) { @@ -7282,9 +7282,9 @@ namespace SlaveMatrix } } - public static void 触肢蜘絶頂(this Cha Cha, double a) + public static void 触肢蜘絶頂(this Character Cha, double a) { - foreach (触肢_肢蜘 item in Cha.Bod.触肢蜘左) + foreach (触肢_肢蜘 item in Cha.Body.触肢蜘左) { item.X0Y0_基節.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_転節.AngleCont = a * RNG.XS.NextDouble(); @@ -7293,7 +7293,7 @@ namespace SlaveMatrix item.X0Y0_脛節.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_蹠節.AngleCont = a * RNG.XS.NextDouble(); } - foreach (触肢_肢蜘 item2 in Cha.Bod.触肢蜘右) + foreach (触肢_肢蜘 item2 in Cha.Body.触肢蜘右) { item2.X0Y0_基節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); item2.X0Y0_転節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); @@ -7304,9 +7304,9 @@ namespace SlaveMatrix } } - public static void 触肢蠍左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double 転節角度, double 腿節角度, double 膝節角度, double 爪1角度, double 爪2角度) + public static void 触肢蠍左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double 転節角度, double 腿節角度, double 膝節角度, double 爪1角度, double 爪2角度) { - 触肢_肢蠍 触肢_肢蠍2 = Cha.Bod.触肢蠍左[n]; + 触肢_肢蠍 触肢_肢蠍2 = Cha.Body.触肢蠍左[n]; 触肢_肢蠍2.SetAngle0(); 触肢_肢蠍2.X0Y0_転節.AngleBase += 転節角度 + u1; 触肢_肢蠍2.X0Y0_腿節.AngleBase += 腿節角度 + u2; @@ -7322,9 +7322,9 @@ namespace SlaveMatrix } } - public static void 触肢蠍右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double 転節角度, double 腿節角度, double 膝節角度, double 爪1角度, double 爪2角度) + public static void 触肢蠍右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double 転節角度, double 腿節角度, double 膝節角度, double 爪1角度, double 爪2角度) { - 触肢_肢蠍 触肢_肢蠍2 = Cha.Bod.触肢蠍右[n]; + 触肢_肢蠍 触肢_肢蠍2 = Cha.Body.触肢蠍右[n]; 触肢_肢蠍2.SetAngle0(); 触肢_肢蠍2.X0Y0_転節.AngleBase += 0.0 - 転節角度 + (0.0 - u1); 触肢_肢蠍2.X0Y0_腿節.AngleBase += 0.0 - 腿節角度 + (0.0 - u2); @@ -7340,37 +7340,37 @@ namespace SlaveMatrix } } - public static void 触肢蠍_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蠍_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蠍左(n, u1, u2, u3, u4, u5, 0.0, 0.0, -5.0, 20.0, 10.0); } - public static void 触肢蠍_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蠍_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蠍右(n, u1, u2, u3, u4, u5, 0.0, 0.0, -5.0, 20.0, 10.0); } - public static void 触肢蠍_萎縮左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蠍_萎縮左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蠍左(n, u1, u2, u3, u4, u5, -25.0, 5.0, 5.0, 35.0, 15.0); } - public static void 触肢蠍_萎縮右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蠍_萎縮右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蠍右(n, u1, u2, u3, u4, u5, -25.0, 5.0, 5.0, 35.0, 15.0); } - public static void 触肢蠍_開く左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蠍_開く左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蠍左(n, u1, u2, u3, u4, u5, 10.0, -5.0, -20.0, -5.0, -10.0); } - public static void 触肢蠍_開く右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蠍_開く右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6) { Cha.触肢蠍右(n, u1, u2, u3, u4, u5, 10.0, -5.0, -20.0, -5.0, -10.0); } - public static void 両触肢蠍_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両触肢蠍_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -7402,7 +7402,7 @@ namespace SlaveMatrix Cha.触肢蠍右_0(i2, n, u3, u4, u5, u6, u, u2); } - public static void 触肢蠍左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蠍左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6) { switch (i) { @@ -7418,7 +7418,7 @@ namespace SlaveMatrix } } - public static void 触肢蠍右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6) + public static void 触肢蠍右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6) { switch (i) { @@ -7434,9 +7434,9 @@ namespace SlaveMatrix } } - public static void 触肢蠍絶頂(this Cha Cha, double a) + public static void 触肢蠍絶頂(this Character Cha, double a) { - foreach (触肢_肢蠍 item in Cha.Bod.触肢蠍左) + foreach (触肢_肢蠍 item in Cha.Body.触肢蠍左) { item.X0Y0_転節.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_腿節.AngleCont = a * RNG.XS.NextDouble(); @@ -7447,7 +7447,7 @@ namespace SlaveMatrix item.X0Y0_爪2.AngleCont = a * RNG.XS.NextDouble(); } } - foreach (触肢_肢蠍 item2 in Cha.Bod.触肢蠍右) + foreach (触肢_肢蠍 item2 in Cha.Body.触肢蠍右) { item2.X0Y0_転節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); item2.X0Y0_腿節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); @@ -7460,9 +7460,9 @@ namespace SlaveMatrix } } - public static void 節足蜘左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8, double 基節角度, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度, double 跗節1角度, double 跗節2角度) + public static void 節足蜘左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8, double 基節角度, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度, double 跗節1角度, double 跗節2角度) { - 節足_足蜘 節足_足蜘2 = Cha.Bod.節足蜘左[n]; + 節足_足蜘 節足_足蜘2 = Cha.Body.節足蜘左[n]; 節足_足蜘2.SetAngle0(); switch (節足_足蜘2.ConnectionType) { @@ -7503,9 +7503,9 @@ namespace SlaveMatrix } } - public static void 節足蜘右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8, double 基節角度, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度, double 跗節1角度, double 跗節2角度) + public static void 節足蜘右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8, double 基節角度, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度, double 跗節1角度, double 跗節2角度) { - 節足_足蜘 節足_足蜘2 = Cha.Bod.節足蜘右[n]; + 節足_足蜘 節足_足蜘2 = Cha.Body.節足蜘右[n]; 節足_足蜘2.SetAngle0(); switch (節足_足蜘2.ConnectionType) { @@ -7546,37 +7546,37 @@ namespace SlaveMatrix } } - public static void 節足蜘_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蜘_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蜘左(n, u1, u2, u3, u4, u5, u6, u7, u8, 0.0, 0.0, 0.0, 15.0, 0.0, 0.0, 0.0, 0.0); } - public static void 節足蜘_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蜘_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蜘右(n, u1, u2, u3, u4, u5, u6, u7, u8, 0.0, 0.0, 0.0, 15.0, 0.0, 0.0, 0.0, 0.0); } - public static void 節足蜘_萎縮左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蜘_萎縮左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蜘左(n, u1, u2, u3, u4, u5, u6, u7, u8, 0.0, 0.0, 0.0, 45.0, -15.0, 45.0, 0.0, 0.0); } - public static void 節足蜘_萎縮右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蜘_萎縮右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蜘右(n, u1, u2, u3, u4, u5, u6, u7, u8, 0.0, 0.0, 0.0, 45.0, -15.0, 45.0, 0.0, 0.0); } - public static void 節足蜘_開く左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蜘_開く左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蜘左(n, u1, u2, u3, u4, u5, u6, u7, u8, 20.0, 0.0, 0.0, -25.0, 0.0, 0.0, 0.0, 0.0); } - public static void 節足蜘_開く右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蜘_開く右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蜘右(n, u1, u2, u3, u4, u5, u6, u7, u8, 20.0, 0.0, 0.0, -25.0, 0.0, 0.0, 0.0, 0.0); } - public static void 両節足蜘_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両節足蜘_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -7612,7 +7612,7 @@ namespace SlaveMatrix Cha.節足蜘右_0(i2, n, u5, u6, u7, u8, u, u2, u3, u4); } - public static void 節足蜘左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蜘左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { switch (i) { @@ -7628,7 +7628,7 @@ namespace SlaveMatrix } } - public static void 節足蜘右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蜘右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { switch (i) { @@ -7644,9 +7644,9 @@ namespace SlaveMatrix } } - public static void 節足蜘絶頂(this Cha Cha, double a) + public static void 節足蜘絶頂(this Character Cha, double a) { - foreach (節足_足蜘 item in Cha.Bod.節足蜘左) + foreach (節足_足蜘 item in Cha.Body.節足蜘左) { item.X0Y0_基節.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_転節.AngleCont = a * RNG.XS.NextDouble(); @@ -7657,7 +7657,7 @@ namespace SlaveMatrix item.X0Y0_跗節1.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_跗節2.AngleCont = a * RNG.XS.NextDouble(); } - foreach (節足_足蜘 item2 in Cha.Bod.節足蜘右) + foreach (節足_足蜘 item2 in Cha.Body.節足蜘右) { item2.X0Y0_基節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); item2.X0Y0_転節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); @@ -7670,9 +7670,9 @@ namespace SlaveMatrix } } - public static void 節足蠍_蠍左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度, double 跗節1角度, double 跗節2角度) + public static void 節足蠍_蠍左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度, double 跗節1角度, double 跗節2角度) { - 節足_足蠍 節足_足蠍2 = Cha.Bod.節足蠍左[n]; + 節足_足蠍 節足_足蠍2 = Cha.Body.節足蠍左[n]; 節足_足蠍2.SetAngle0(); switch (節足_足蠍2.ConnectionType) { @@ -7711,9 +7711,9 @@ namespace SlaveMatrix } } - public static void 節足蠍_蠍右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度, double 跗節1角度, double 跗節2角度) + public static void 節足蠍_蠍右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 転節角度, double 腿節角度, double 膝節角度, double 脛節角度, double 蹠節角度, double 跗節1角度, double 跗節2角度) { - 節足_足蠍 節足_足蠍2 = Cha.Bod.節足蠍右[n]; + 節足_足蠍 節足_足蠍2 = Cha.Body.節足蠍右[n]; 節足_足蠍2.SetAngle0(); switch (節足_足蠍2.ConnectionType) { @@ -7752,37 +7752,37 @@ namespace SlaveMatrix } } - public static void 節足蠍_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蠍_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蠍_蠍左(n, u1, u2, u3, u4, u5, u6, u7, -15.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 節足蠍_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蠍_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蠍_蠍右(n, u1, u2, u3, u4, u5, u6, u7, -15.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0); } - public static void 節足蠍_萎縮左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蠍_萎縮左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蠍_蠍左(n, u1, u2, u3, u4, u5, u6, u7, -20.0, 0.0, 45.0, 25.0, 0.0, 0.0, 0.0); } - public static void 節足蠍_萎縮右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蠍_萎縮右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蠍_蠍右(n, u1, u2, u3, u4, u5, u6, u7, -20.0, 0.0, 45.0, 25.0, 0.0, 0.0, 0.0); } - public static void 節足蠍_開く左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蠍_開く左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蠍_蠍左(n, u1, u2, u3, u4, u5, u6, u7, 0.0, 0.0, -15.0, -25.0, 0.0, 0.0, 0.0); } - public static void 節足蠍_開く右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蠍_開く右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足蠍_蠍右(n, u1, u2, u3, u4, u5, u6, u7, 0.0, 0.0, -15.0, -25.0, 0.0, 0.0, 0.0); } - public static void 両節足蠍_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両節足蠍_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -7818,7 +7818,7 @@ namespace SlaveMatrix Cha.節足蠍右_0(i2, n, u5, u6, u7, u8, u, u2, u3, u4); } - public static void 節足蠍左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蠍左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { switch (i) { @@ -7834,7 +7834,7 @@ namespace SlaveMatrix } } - public static void 節足蠍右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足蠍右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { switch (i) { @@ -7850,9 +7850,9 @@ namespace SlaveMatrix } } - public static void 節足蠍絶頂(this Cha Cha, double a) + public static void 節足蠍絶頂(this Character Cha, double a) { - foreach (節足_足蠍 item in Cha.Bod.節足蠍左) + foreach (節足_足蠍 item in Cha.Body.節足蠍左) { item.X0Y0_転節.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_腿節.AngleCont = a * RNG.XS.NextDouble(); @@ -7862,7 +7862,7 @@ namespace SlaveMatrix item.X0Y0_跗節1.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_跗節2.AngleCont = a * RNG.XS.NextDouble(); } - foreach (節足_足蠍 item2 in Cha.Bod.節足蠍右) + foreach (節足_足蠍 item2 in Cha.Body.節足蠍右) { item2.X0Y0_転節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); item2.X0Y0_腿節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); @@ -7874,9 +7874,9 @@ namespace SlaveMatrix } } - public static void 節足百左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 基節角度, double 転節角度, double 前腿節角度, double 腿節角度, double 脛節角度, double 跗節1角度, double 跗節2角度) + public static void 節足百左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 基節角度, double 転節角度, double 前腿節角度, double 腿節角度, double 脛節角度, double 跗節1角度, double 跗節2角度) { - 節足_足百 節足_足百2 = Cha.Bod.節足百左[n]; + 節足_足百 節足_足百2 = Cha.Body.節足百左[n]; 節足_足百2.SetAngle0(); if (節足_足百2.反転Y) { @@ -7900,9 +7900,9 @@ namespace SlaveMatrix } } - public static void 節足百右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 基節角度, double 転節角度, double 前腿節角度, double 腿節角度, double 脛節角度, double 跗節1角度, double 跗節2角度) + public static void 節足百右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 基節角度, double 転節角度, double 前腿節角度, double 腿節角度, double 脛節角度, double 跗節1角度, double 跗節2角度) { - 節足_足百 節足_足百2 = Cha.Bod.節足百右[n]; + 節足_足百 節足_足百2 = Cha.Body.節足百右[n]; 節足_足百2.SetAngle0(); if (節足_足百2.反転Y) { @@ -7926,37 +7926,37 @@ namespace SlaveMatrix } } - public static void 節足百_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足百_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足百左(n, u1, u2, u3, u4, u5, u6, u7, 0.0, 0.0, 15.0, 0.0, -15.0, 0.0, 0.0); } - public static void 節足百_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足百_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足百右(n, u1, u2, u3, u4, u5, u6, u7, 0.0, 0.0, 15.0, 0.0, -15.0, 0.0, 0.0); } - public static void 節足百_萎縮左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足百_萎縮左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足百左(n, u1, u2, u3, u4, u5, u6, u7, 0.0, 0.0, 5.0, -25.0, -35.0, -25.0, 0.0); } - public static void 節足百_萎縮右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足百_萎縮右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足百右(n, u1, u2, u3, u4, u5, u6, u7, 0.0, 0.0, 5.0, -25.0, -35.0, -25.0, 0.0); } - public static void 節足百_開く左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足百_開く左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足百左(n, u1, u2, u3, u4, u5, u6, u7, 0.0, 0.0, 15.0, 5.0, 5.0, 5.0, 0.0); } - public static void 節足百_開く右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足百_開く右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { Cha.節足百右(n, u1, u2, u3, u4, u5, u6, u7, 0.0, 0.0, 15.0, 5.0, 5.0, 5.0, 0.0); } - public static void 両節足百_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両節足百_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -7992,7 +7992,7 @@ namespace SlaveMatrix Cha.節足百右_0(i2, n, u5, u6, u7, u8, u, u2, u3, u4); } - public static void 節足百左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足百左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { switch (i) { @@ -8008,7 +8008,7 @@ namespace SlaveMatrix } } - public static void 節足百右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) + public static void 節足百右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double u8) { switch (i) { @@ -8024,9 +8024,9 @@ namespace SlaveMatrix } } - public static void 節足百絶頂(this Cha Cha, double a) + public static void 節足百絶頂(this Character Cha, double a) { - foreach (節足_足百 item in Cha.Bod.節足百左) + foreach (節足_足百 item in Cha.Body.節足百左) { item.X0Y0_基節.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_転節.AngleCont = a * RNG.XS.NextDouble(); @@ -8036,7 +8036,7 @@ namespace SlaveMatrix item.X0Y0_跗節1.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_跗節2.AngleCont = a * RNG.XS.NextDouble(); } - foreach (節足_足百 item2 in Cha.Bod.節足百右) + foreach (節足_足百 item2 in Cha.Body.節足百右) { item2.X0Y0_基節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); item2.X0Y0_転節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); @@ -8048,9 +8048,9 @@ namespace SlaveMatrix } } - public static void 節尾曳左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double 根本角度, double 節角度1, double 節角度2, double 節角度3, double 節角度4) + public static void 節尾曳左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double 根本角度, double 節角度1, double 節角度2, double 節角度3, double 節角度4) { - 節尾_曳航 obj = Cha.Bod.節尾曳左[n]; + 節尾_曳航 obj = Cha.Body.節尾曳左[n]; obj.SetAngle0(); obj.X0Y0_前腿節.AngleBase += 根本角度 + u1; obj.X0Y0_腿節.AngleBase += 節角度1 + u2; @@ -8059,9 +8059,9 @@ namespace SlaveMatrix obj.X0Y0_付節2.AngleBase += 節角度4 + u5; } - public static void 節尾曳右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double 根本角度, double 節角度1, double 節角度2, double 節角度3, double 節角度4) + public static void 節尾曳右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double 根本角度, double 節角度1, double 節角度2, double 節角度3, double 節角度4) { - 節尾_曳航 obj = Cha.Bod.節尾曳右[n]; + 節尾_曳航 obj = Cha.Body.節尾曳右[n]; obj.SetAngle0(); obj.X0Y0_前腿節.AngleBase += 0.0 - 根本角度 + (0.0 - u1); obj.X0Y0_腿節.AngleBase += 0.0 - 節角度1 + (0.0 - u2); @@ -8070,37 +8070,37 @@ namespace SlaveMatrix obj.X0Y0_付節2.AngleBase += 0.0 - 節角度4 + (0.0 - u5); } - public static void 節尾曳_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾曳_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾曳左(n, u1, u2, u3, u4, u5, 10.0, 0.0, 0.0, 0.0, 0.0); } - public static void 節尾曳_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾曳_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾曳右(n, u1, u2, u3, u4, u5, 10.0, 0.0, 0.0, 0.0, 0.0); } - public static void 節尾曳_閉じ左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾曳_閉じ左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾曳左(n, u1, u2, u3, u4, u5, 45.0, -25.0, -45.0, -45.0, 0.0); } - public static void 節尾曳_閉じ右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾曳_閉じ右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾曳右(n, u1, u2, u3, u4, u5, 45.0, -25.0, -45.0, -45.0, 0.0); } - public static void 節尾曳_開き左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾曳_開き左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾曳左(n, u1, u2, u3, u4, u5, 25.0, 0.0, 0.0, 0.0, 0.0); } - public static void 節尾曳_開き右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾曳_開き右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾曳右(n, u1, u2, u3, u4, u5, 25.0, 0.0, 0.0, 0.0, 0.0); } - public static void 両節尾曳_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両節尾曳_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -8132,7 +8132,7 @@ namespace SlaveMatrix Cha.節尾曳右_0(i2, n, u, u2, u3, u4, u5); } - public static void 節尾曳左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾曳左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5) { switch (i) { @@ -8148,7 +8148,7 @@ namespace SlaveMatrix } } - public static void 節尾曳右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾曳右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5) { switch (i) { @@ -8164,9 +8164,9 @@ namespace SlaveMatrix } } - public static void 節尾曳絶頂(this Cha Cha, double a) + public static void 節尾曳絶頂(this Character Cha, double a) { - foreach (節尾_曳航 item in Cha.Bod.節尾曳左) + foreach (節尾_曳航 item in Cha.Body.節尾曳左) { item.X0Y0_前腿節.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_腿節.AngleCont = a * RNG.XS.NextDouble(); @@ -8174,7 +8174,7 @@ namespace SlaveMatrix item.X0Y0_付節1.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_付節2.AngleCont = a * RNG.XS.NextDouble(); } - foreach (節尾_曳航 item2 in Cha.Bod.節尾曳右) + foreach (節尾_曳航 item2 in Cha.Body.節尾曳右) { item2.X0Y0_前腿節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); item2.X0Y0_腿節.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); @@ -8184,51 +8184,51 @@ namespace SlaveMatrix } } - public static void 節尾鋏左(this Cha Cha, int n, double u1, double 根本角度) + public static void 節尾鋏左(this Character Cha, int n, double u1, double 根本角度) { - 節尾_鋏 obj = Cha.Bod.節尾鋏左[n]; + 節尾_鋏 obj = Cha.Body.節尾鋏左[n]; obj.SetAngle0(); obj.X0Y0_牙.AngleBase += 根本角度 + u1; } - public static void 節尾鋏右(this Cha Cha, int n, double u1, double 根本角度) + public static void 節尾鋏右(this Character Cha, int n, double u1, double 根本角度) { - 節尾_鋏 obj = Cha.Bod.節尾鋏右[n]; + 節尾_鋏 obj = Cha.Body.節尾鋏右[n]; obj.SetAngle0(); obj.X0Y0_牙.AngleBase += 0.0 - 根本角度 + (0.0 - u1); } - public static void 節尾鋏_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾鋏_基本左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾鋏左(n, u1, 0.0); } - public static void 節尾鋏_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾鋏_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾鋏右(n, u1, 0.0); } - public static void 節尾鋏_閉じ左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾鋏_閉じ左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾鋏左(n, u1, -15.0); } - public static void 節尾鋏_閉じ右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾鋏_閉じ右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾鋏右(n, u1, -15.0); } - public static void 節尾鋏_開き左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾鋏_開き左(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾鋏左(n, u1, 25.0); } - public static void 節尾鋏_開き右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾鋏_開き右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5) { Cha.節尾鋏右(n, u1, 25.0); } - public static void 両節尾鋏_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両節尾鋏_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double num2 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); @@ -8260,7 +8260,7 @@ namespace SlaveMatrix Cha.節尾鋏右_0(i2, n, u, u2, u3, u4, u5); } - public static void 節尾鋏左_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾鋏左_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5) { switch (i) { @@ -8276,7 +8276,7 @@ namespace SlaveMatrix } } - public static void 節尾鋏右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5) + public static void 節尾鋏右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5) { switch (i) { @@ -8292,21 +8292,21 @@ namespace SlaveMatrix } } - public static void 節尾鋏絶頂(this Cha Cha, double a) + public static void 節尾鋏絶頂(this Character Cha, double a) { - foreach (節尾_鋏 item in Cha.Bod.節尾鋏左) + foreach (節尾_鋏 item in Cha.Body.節尾鋏左) { item.X0Y0_牙.AngleCont = a * RNG.XS.NextDouble(); } - foreach (節尾_鋏 item2 in Cha.Bod.節尾鋏右) + foreach (節尾_鋏 item2 in Cha.Body.節尾鋏右) { item2.X0Y0_牙.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); } } - public static void 虫鎌左(this Cha Cha, int n, double u1, double 根本角度) + public static void 虫鎌左(this Character Cha, int n, double u1, double 根本角度) { - 虫鎌 虫鎌2 = Cha.Bod.虫鎌左[n]; + 虫鎌 虫鎌2 = Cha.Body.虫鎌左[n]; if (虫鎌2.拘束) { 虫鎌2.SetAngle0(); @@ -8323,9 +8323,9 @@ namespace SlaveMatrix } } - public static void 虫鎌右(this Cha Cha, int n, double u1, double 根本角度) + public static void 虫鎌右(this Character Cha, int n, double u1, double 根本角度) { - 虫鎌 虫鎌2 = Cha.Bod.虫鎌右[n]; + 虫鎌 虫鎌2 = Cha.Body.虫鎌右[n]; if (虫鎌2.拘束) { 虫鎌2.SetAngle0(); @@ -8342,37 +8342,37 @@ namespace SlaveMatrix } } - public static void 虫鎌_基本左(this Cha Cha, int n, double u1) + public static void 虫鎌_基本左(this Character Cha, int n, double u1) { Cha.虫鎌左(n, u1, 0.0); } - public static void 虫鎌_基本右(this Cha Cha, int n, double u1) + public static void 虫鎌_基本右(this Character Cha, int n, double u1) { Cha.虫鎌右(n, u1, 0.0); } - public static void 虫鎌_半開左(this Cha Cha, int n, double u1) + public static void 虫鎌_半開左(this Character Cha, int n, double u1) { Cha.虫鎌左(n, u1, 45.0); } - public static void 虫鎌_半開右(this Cha Cha, int n, double u1) + public static void 虫鎌_半開右(this Character Cha, int n, double u1) { Cha.虫鎌右(n, u1, 45.0); } - public static void 虫鎌_全開左(this Cha Cha, int n, double u1) + public static void 虫鎌_全開左(this Character Cha, int n, double u1) { Cha.虫鎌左(n, u1, 90.0); } - public static void 虫鎌_全開右(this Cha Cha, int n, double u1) + public static void 虫鎌_全開右(this Character Cha, int n, double u1) { Cha.虫鎌右(n, u1, 90.0); } - public static void 両虫鎌_0(this Cha Cha, int n, bool 同角, int i1, int i2) + public static void 両虫鎌_0(this Character Cha, int n, bool 同角, int i1, int i2) { double num = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); double u = ((!同角) ? Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5) : num); @@ -8380,7 +8380,7 @@ namespace SlaveMatrix Cha.虫鎌右_0(i2, n, u); } - public static void 虫鎌左_0(this Cha c, int i, int n, double u1) + public static void 虫鎌左_0(this Character c, int i, int n, double u1) { switch (i) { @@ -8396,7 +8396,7 @@ namespace SlaveMatrix } } - public static void 虫鎌右_0(this Cha c, int i, int n, double u1) + public static void 虫鎌右_0(this Character c, int i, int n, double u1) { switch (i) { @@ -8412,16 +8412,16 @@ namespace SlaveMatrix } } - public static void 虫鎌絶頂(this Cha Cha, double a) + public static void 虫鎌絶頂(this Character Cha, double a) { - foreach (虫鎌 item in Cha.Bod.虫鎌左) + foreach (虫鎌 item in Cha.Body.虫鎌左) { if (!item.拘束) { item.角度C = a * RNG.XS.NextDouble(); } } - foreach (虫鎌 item2 in Cha.Bod.虫鎌右) + foreach (虫鎌 item2 in Cha.Body.虫鎌右) { if (!item2.拘束) { @@ -8430,9 +8430,9 @@ namespace SlaveMatrix } } - public static void 触手左(this Cha Cha, int n, int si, double u1, double u2, double u3, double 根本角度, double 開口, params Func[] angs) + public static void 触手左(this Character Cha, int n, int si, double u1, double u2, double u3, double 根本角度, double 開口, params Func[] angs) { - 触手 触手2 = Cha.Bod.触手左[n]; + 触手 触手2 = Cha.Body.触手左[n]; 触手2.SetAngle0(); if (angs.Length != 0) { @@ -8480,9 +8480,9 @@ namespace SlaveMatrix 触手2.重複角度処理(); } - public static void 触手右(this Cha Cha, int n, int si, double u1, double u2, double u3, double 根本角度, double 開口, params Func[] angs) + public static void 触手右(this Character Cha, int n, int si, double u1, double u2, double u3, double 根本角度, double 開口, params Func[] angs) { - 触手 触手2 = Cha.Bod.触手右[n]; + 触手 触手2 = Cha.Body.触手右[n]; 触手2.SetAngle0(); if (angs.Length != 0) { @@ -8530,32 +8530,32 @@ namespace SlaveMatrix 触手2.重複角度処理(); } - public static void 触手_基本右(this Cha Cha, int n, int s, double u1, double u2, double u3) + public static void 触手_基本右(this Character Cha, int n, int s, double u1, double u2, double u3) { Cha.触手右(n, s, u1, u2, u3, 20.0.GetRanAngle(), 0.0); } - public static void 触手_S字左(this Cha Cha, int n, int s, double u1, double u2, double u3) + public static void 触手_S字左(this Character Cha, int n, int s, double u1, double u2, double u3) { Cha.触手左(n, s, u1, u2, u3, 20.0.GetRanAngle(), 0.25, (int i) => 35.0, (int i) => -35.0); } - public static void 触手_S字右(this Cha Cha, int n, int s, double u1, double u2, double u3) + public static void 触手_S字右(this Character Cha, int n, int s, double u1, double u2, double u3) { Cha.触手右(n, s, u1, u2, u3, 20.0.GetRanAngle(), 0.25, (int i) => 35.0, (int i) => -35.0); } - public static void 触手_波右(this Cha Cha, int n, int s, double u1, double u2, double u3) + public static void 触手_波右(this Character Cha, int n, int s, double u1, double u2, double u3) { Cha.触手右(n, s, u1, u2, u3, 20.0.GetRanAngle(), 0.25, (int i) => System.Math.Sin(i) * 80.0); } - public static void 触手_ピーン右(this Cha Cha, int n, int s, double u1, double u2, double u3) + public static void 触手_ピーン右(this Character Cha, int n, int s, double u1, double u2, double u3) { Cha.触手右(n, s, u1, u2, u3, 20.0.GetRanAngle(), 0.0, (int i) => 0.0, (int i) => 25.0.GetRanAngle()); } - public static void 両触手_S字(this Cha Cha, int n) + public static void 両触手_S字(this Character Cha, int n) { double u = Cha.角度ムラ(RNG.XS.NextSign(), 1.5, RNG.XS.NextSign(), 0.75); double u2 = Cha.角度ムラ(RNG.XS.NextSign(), 1.5, RNG.XS.NextSign(), 0.75); @@ -8565,12 +8565,12 @@ namespace SlaveMatrix Cha.触手_S字右(n, s, u, u2, u3); } - public static void 両触手_0(this Cha Cha, int n, int i2) + public static void 両触手_0(this Character Cha, int n, int i2) { Cha.触手右_0(i2, n, RNG.XS.NextSign(), Cha.角度ムラ(RNG.XS.NextSign(), 1.5, RNG.XS.NextSign(), 0.25), Cha.角度ムラ(RNG.XS.NextSign(), 1.5, RNG.XS.NextSign(), 0.25), Cha.角度ムラ(RNG.XS.NextSign(), 1.5, RNG.XS.NextSign(), 0.25)); } - public static void 触手右_0(this Cha c, int i, int n, int s, double u1, double u2, double u3) + public static void 触手右_0(this Character c, int i, int n, int s, double u1, double u2, double u3) { switch (i) { @@ -8589,9 +8589,9 @@ namespace SlaveMatrix } } - public static void 触手絶頂(this Cha Cha, double a) + public static void 触手絶頂(this Character Cha, double a) { - foreach (触手 item in Cha.Bod.触手左) + foreach (触手 item in Cha.Body.触手左) { foreach (Par item2 in item.Enum軸()) { @@ -8610,7 +8610,7 @@ namespace SlaveMatrix } } } - foreach (触手 item3 in Cha.Bod.触手右) + foreach (触手 item3 in Cha.Body.触手右) { foreach (Par item4 in item3.Enum軸()) { @@ -8631,9 +8631,9 @@ namespace SlaveMatrix } } - public static void 触手犬右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 根本角度, double UpperArm角度, double LowerArm角度, double 手角度, double 開口, double 開指, params Func[] angs) + public static void 触手犬右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7, double 根本角度, double UpperArm角度, double LowerArm角度, double 手角度, double 開口, double 開指, params Func[] angs) { - 触手_犬 触手_犬2 = Cha.Bod.触手犬右[n]; + 触手_犬 触手_犬2 = Cha.Body.触手犬右[n]; 触手_犬2.SetAngle0(); 触手_犬2.X0Y0_脚後_UpperArm.AngleBase -= 触手_犬2.X0Y0_Torso_節9_Torso.Angle; 触手_犬2.X0Y0_脚前_UpperArm.AngleBase -= 触手_犬2.X0Y0_Torso_節9_Torso.Angle; @@ -8683,32 +8683,32 @@ namespace SlaveMatrix 触手_犬2.重複角度処理(); } - public static void 触手犬_基本右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) + public static void 触手犬_基本右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) { Cha.触手犬右(n, u1, u2, u3, u4, u5, u6, u7, 5.0.GetRanAngle(), 10.0, 0.0, 0.0, 0.0, 0.0); } - public static void 触手犬_伏せ右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) + public static void 触手犬_伏せ右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) { Cha.触手犬右(n, u1, u2, u3, u4, u5, u6, u7, 5.0.GetRanAngle(), -35.0, 130.0, -80.0, 0.0, 0.0, (int i) => 8.0, (int i) => -10.0); } - public static void 触手犬_威嚇右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) + public static void 触手犬_威嚇右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) { Cha.触手犬右(n, u1, u2, u3, u4, u5, u6, u7, 5.0.GetRanAngle(), -20.0, 65.0, -40.0, 1.0, 1.0, (int i) => 2.5); } - public static void 触手犬_竦み右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) + public static void 触手犬_竦み右(this Character Cha, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) { Cha.触手犬右(n, u1, u2, u3, u4, u5, u6, u7, 2.0.GetRanAngle(), -40.0, 130.0, -80.0, 0.0, 0.0, (int i) => 8.0); } - public static void 両触手犬_0(this Cha Cha, int n, int i2) + public static void 両触手犬_0(this Character Cha, int n, int i2) { Cha.触手犬右_0(i2, n, Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5), Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5), Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5), Cha.角度ムラ(RNG.XS.NextSign(), 0.5, RNG.XS.NextSign(), 0.5), Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5), Cha.角度ムラ(RNG.XS.NextSign(), 1.0, RNG.XS.NextSign(), 0.5), Cha.角度ムラ(RNG.XS.NextSign(), 1.0, RNG.XS.NextSign(), 0.5)); } - public static void 触手犬右_0(this Cha c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) + public static void 触手犬右_0(this Character c, int i, int n, double u1, double u2, double u3, double u4, double u5, double u6, double u7) { switch (i) { @@ -8727,9 +8727,9 @@ namespace SlaveMatrix } } - public static void 触手犬絶頂(this Cha Cha, double a) + public static void 触手犬絶頂(this Character Cha, double a) { - foreach (触手_犬 item in Cha.Bod.触手犬左) + foreach (触手_犬 item in Cha.Body.触手犬左) { item.X0Y0_脚後_UpperArm.AngleCont = a * RNG.XS.NextDouble(); item.X0Y0_脚前_UpperArm.AngleCont = a * RNG.XS.NextDouble(); @@ -8760,7 +8760,7 @@ namespace SlaveMatrix item2.AngleCont = a * RNG.XS.NextDouble(); } } - foreach (触手_犬 item3 in Cha.Bod.触手犬右) + foreach (触手_犬 item3 in Cha.Body.触手犬右) { item3.X0Y0_脚後_UpperArm.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); item3.X0Y0_脚前_UpperArm.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); @@ -8793,9 +8793,9 @@ namespace SlaveMatrix } } - public static void 尾(this Cha Cha, int n, int s, double 展開, double 根本角度, params Func[] angs) + public static void 尾(this Character Cha, int n, int s, double 展開, double 根本角度, params Func[] angs) { - 尾 尾2 = Cha.Bod.尾[n]; + 尾 尾2 = Cha.Body.尾[n]; string text = 尾2.ConnectionType.ToString(); if (text.Contains("左")) { @@ -8841,11 +8841,11 @@ namespace SlaveMatrix 尾鰭_魚 ele = 尾2.EnumEle().GetEle<尾鰭_魚>(); if (ele != null) { - ele.展開 = 展開 * Cha.ChaD.固有値 * RNG.XS.NextDouble(); + ele.展開 = 展開 * Cha.CharacterData.固有値 * RNG.XS.NextDouble(); } else if (尾2 is 尾_鳥) { - ((尾_鳥)尾2).展開 = 展開 * Cha.ChaD.固有値 * RNG.XS.NextDouble(); + ((尾_鳥)尾2).展開 = 展開 * Cha.CharacterData.固有値 * RNG.XS.NextDouble(); } if (尾2.EnumEle().IsEle<尾鰭>()) { @@ -8853,27 +8853,27 @@ namespace SlaveMatrix } } - public static void 尾_基本(this Cha Cha, int n) + public static void 尾_基本(this Character Cha, int n) { Cha.尾(n, RNG.XS.NextSign(), RNG.XS.NextDouble(), 0.0); } - public static void 尾_S字(this Cha Cha, int n) + public static void 尾_S字(this Character Cha, int n) { Cha.尾(n, RNG.XS.NextSign(), 0.5, 10.0.GetRanAngle(), (int i) => 25.0, (int i) => -25.0); } - public static void 尾_波(this Cha Cha, int n) + public static void 尾_波(this Character Cha, int n) { Cha.尾(n, RNG.XS.NextSign(), 0.5, 10.0.GetRanAngle(), (int i) => System.Math.Sin(i) * 40.0); } - public static void 尾_ピーン(this Cha Cha, int n) + public static void 尾_ピーン(this Character Cha, int n) { Cha.尾(n, RNG.XS.NextSign(), 1.0, 10.0.GetRanAngle(), (int i) => 0.0, (int i) => 25.0.GetRanAngle()); } - public static void 尾_0(this Cha c, int n, int i) + public static void 尾_0(this Character c, int n, int i) { switch (i) { @@ -8892,10 +8892,10 @@ namespace SlaveMatrix } } - public static void 尾絶頂(this Cha Cha, double a) + public static void 尾絶頂(this Character Cha, double a) { double 展開 = a * 0.015 * RNG.XS.NextDouble(); - foreach (尾 item in Cha.Bod.尾) + foreach (尾 item in Cha.Body.尾) { if (item.右) { @@ -8930,35 +8930,35 @@ namespace SlaveMatrix } } - public static void 長胴(this Cha Cha, int si, params Func[] angs) + public static void 長胴(this Character Cha, int si, params Func[] angs) { if (angs.Length == 0) { return; } int num = 0; - int num2 = Cha.Bod.長胴n / angs.Length; + int num2 = Cha.Body.長胴n / angs.Length; if (num2 == 0) { num2 = 1; } - double num3 = (double)Cha.Bod.長胴n * 0.1; + double num3 = (double)Cha.Body.長胴n * 0.1; double num4 = Cha.角度ムラ(RNG.XS.NextSign(), 3.0, RNG.XS.NextSign(), 1.5); - foreach (長胴 item in Cha.Bod.長胴.Skip(1)) + foreach (長胴 item in Cha.Body.長胴.Skip(1)) { item.角度B = (double)si * angs[(num / num2).Limit(0, angs.Length)](num) / num3 + num4; num++; } } - public static void 長胴_基本(this Cha Cha) + public static void 長胴_基本(this Character Cha) { Cha.長胴(RNG.XS.NextSign(), (int i) => 4.0.GetRanAngle()); } - public static void 魚(this Cha Cha, int s, params Func[] angs) + public static void 魚(this Character Cha, int s, params Func[] angs) { - Par[] array = Cha.Bod.魚.軸列挙().ToArray(); + Par[] array = Cha.Body.魚.軸列挙().ToArray(); if (angs.Length != 0) { int num = 0; @@ -8974,27 +8974,27 @@ namespace SlaveMatrix } } - public static void 魚_基本(this Cha Cha) + public static void 魚_基本(this Character Cha) { Cha.魚(RNG.XS.NextSign(), (int i) => 5.0.GetRanAngle()); } - public static void 魚_S字(this Cha Cha) + public static void 魚_S字(this Character Cha) { Cha.魚(RNG.XS.NextSign(), (int i) => 5.0, (int i) => -5.0); } - public static void 魚_波(this Cha Cha) + public static void 魚_波(this Character Cha) { Cha.魚(RNG.XS.NextSign(), (int i) => System.Math.Sin(i) * 5.0); } - public static void 魚_ピーン(this Cha Cha) + public static void 魚_ピーン(this Character Cha) { Cha.魚(RNG.XS.NextSign(), (int i) => 0.0, (int i) => 5.0.GetRanAngle()); } - public static void 魚_0(this Cha c, int i) + public static void 魚_0(this Character c, int i) { switch (i) { @@ -9013,9 +9013,9 @@ namespace SlaveMatrix } } - public static void 鯨(this Cha Cha, int s, params Func[] angs) + public static void 鯨(this Character Cha, int s, params Func[] angs) { - Par[] array = Cha.Bod.鯨.軸列挙().ToArray(); + Par[] array = Cha.Body.鯨.軸列挙().ToArray(); if (angs.Length != 0) { int num = 0; @@ -9031,27 +9031,27 @@ namespace SlaveMatrix } } - public static void 鯨_基本(this Cha Cha) + public static void 鯨_基本(this Character Cha) { Cha.鯨(RNG.XS.NextSign(), (int i) => 5.0.GetRanAngle()); } - public static void 鯨_S字(this Cha Cha) + public static void 鯨_S字(this Character Cha) { Cha.鯨(RNG.XS.NextSign(), (int i) => 5.0, (int i) => -5.0); } - public static void 鯨_波(this Cha Cha) + public static void 鯨_波(this Character Cha) { Cha.鯨(RNG.XS.NextSign(), (int i) => System.Math.Sin(i) * 5.0); } - public static void 鯨_ピーン(this Cha Cha) + public static void 鯨_ピーン(this Character Cha) { Cha.鯨(RNG.XS.NextSign(), (int i) => 0.0, (int i) => 5.0.GetRanAngle()); } - public static void 鯨_0(this Cha c, int i) + public static void 鯨_0(this Character c, int i) { switch (i) { @@ -9070,9 +9070,9 @@ namespace SlaveMatrix } } - public static void 蠍(this Cha Cha, int s, params Func[] angs) + public static void 蠍(this Character Cha, int s, params Func[] angs) { - Par[] array = Cha.Bod.蠍.軸列挙().ToArray(); + Par[] array = Cha.Body.蠍.軸列挙().ToArray(); if (angs.Length != 0) { int num = 0; @@ -9088,27 +9088,27 @@ namespace SlaveMatrix } } - public static void 蠍_基本(this Cha Cha) + public static void 蠍_基本(this Character Cha) { Cha.蠍(RNG.XS.NextSign(), (int i) => 5.0.GetRanAngle()); } - public static void 蠍_S字(this Cha Cha) + public static void 蠍_S字(this Character Cha) { Cha.蠍(RNG.XS.NextSign(), (int i) => 5.0, (int i) => -5.0); } - public static void 蠍_波(this Cha Cha) + public static void 蠍_波(this Character Cha) { Cha.蠍(RNG.XS.NextSign(), (int i) => System.Math.Sin(i) * 5.0); } - public static void 蠍_ピーン(this Cha Cha) + public static void 蠍_ピーン(this Character Cha) { Cha.蠍(RNG.XS.NextSign(), (int i) => 0.0, (int i) => 5.0.GetRanAngle()); } - public static void 蠍_0(this Cha c, int i) + public static void 蠍_0(this Character c, int i) { switch (i) { @@ -9127,29 +9127,29 @@ namespace SlaveMatrix } } - public static void 植(this Cha Cha, int si, double 角度) + public static void 植(this Character Cha, int si, double 角度) { - Cha.Bod.植.X0Y0_幹下.AngleBase = (double)si * 角度 + Cha.角度ムラ(RNG.XS.NextSign(), 10.0, RNG.XS.NextSign(), 5.0); + Cha.Body.植.X0Y0_幹下.AngleBase = (double)si * 角度 + Cha.角度ムラ(RNG.XS.NextSign(), 10.0, RNG.XS.NextSign(), 5.0); } - public static void 植_基本(this Cha Cha) + public static void 植_基本(this Character Cha) { Cha.植(RNG.XS.NextSign(), 5.0.GetRanAngle()); } - public static void 植絶頂(this Cha Cha, double a) + public static void 植絶頂(this Character Cha, double a) { - if (Cha.Bod.植.右) + if (Cha.Body.植.右) { - Cha.Bod.植.X0Y0_幹下.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); + Cha.Body.植.X0Y0_幹下.AngleCont = (0.0 - a) * RNG.XS.NextDouble(); } else { - Cha.Bod.植.X0Y0_幹下.AngleCont = a * RNG.XS.NextDouble(); + Cha.Body.植.X0Y0_幹下.AngleCont = a * RNG.XS.NextDouble(); } } - public static void 表情_基本0(this Cha c) + public static void 表情_基本0(this Character c) { c.両眉_無(); c.両眉_下(); @@ -9158,7 +9158,7 @@ namespace SlaveMatrix c.口_閉笑(); } - public static void 表情_基本1(this Cha c) + public static void 表情_基本1(this Character c) { c.両眉_無(); c.両眉_下(); @@ -9167,7 +9167,7 @@ namespace SlaveMatrix c.口_薄笑(); } - public static void 表情_基本1眉上(this Cha c) + public static void 表情_基本1眉上(this Character c) { c.両眉_無(); c.両眉_上(); @@ -9176,7 +9176,7 @@ namespace SlaveMatrix c.口_薄笑(); } - public static void 表情_不敵0(this Cha c) + public static void 表情_不敵0(this Character c) { c.両眉_無(); c.両眉_下(); @@ -9185,7 +9185,7 @@ namespace SlaveMatrix c.口_閉笑(); } - public static void 表情_不敵0眉上(this Cha c) + public static void 表情_不敵0眉上(this Character c) { c.両眉_無(); c.両眉_上(); @@ -9194,7 +9194,7 @@ namespace SlaveMatrix c.口_閉笑(); } - public static void 表情_不敵1(this Cha c) + public static void 表情_不敵1(this Character c) { c.両眉_無(); c.両眉_下(); @@ -9203,7 +9203,7 @@ namespace SlaveMatrix c.口_薄笑(); } - public static void 表情_不敵1眉上(this Cha c) + public static void 表情_不敵1眉上(this Character c) { c.両眉_無(); c.両眉_上(); @@ -9212,7 +9212,7 @@ namespace SlaveMatrix c.口_薄笑(); } - public static void 表情_困り顔0(this Cha c) + public static void 表情_困り顔0(this Character c) { c.両眉_顰(); c.両眉_下(); @@ -9221,7 +9221,7 @@ namespace SlaveMatrix c.口_閉笑(); } - public static void 表情_困り顔1(this Cha c) + public static void 表情_困り顔1(this Character c) { c.両眉_顰(); c.両眉_下(); @@ -9230,7 +9230,7 @@ namespace SlaveMatrix c.口_薄笑(); } - public static void 表情_卑屈(this Cha c) + public static void 表情_卑屈(this Character c) { c.両眉_顰(); c.両眉_下(); @@ -9239,7 +9239,7 @@ namespace SlaveMatrix c.口_薄笑(); } - public static void 表情_素0(this Cha c) + public static void 表情_素0(this Character c) { c.両眉_無(); c.両眉_下(); @@ -9248,7 +9248,7 @@ namespace SlaveMatrix c.口_閉じ(); } - public static void 表情_素0眉上(this Cha c) + public static void 表情_素0眉上(this Character c) { c.両眉_無(); c.両眉_上(); @@ -9257,7 +9257,7 @@ namespace SlaveMatrix c.口_閉じ(); } - public static void 表情_素1(this Cha c) + public static void 表情_素1(this Character c) { c.両眉_無(); c.両眉_下(); @@ -9266,7 +9266,7 @@ namespace SlaveMatrix c.口_半開1(); } - public static void SetInitialExpression(this Cha c) + public static void SetInitialExpression(this Character c) { c.眉(); c.目(); @@ -9276,7 +9276,7 @@ namespace SlaveMatrix c.顎(); } - public static void UpdateExpression(this Cha c) + public static void UpdateExpression(this Character c) { switch (RNG.XS.Next(6)) { @@ -9301,10 +9301,10 @@ namespace SlaveMatrix } } - public static void 眉(this Cha c) + public static void 眉(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.Is双眉) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.Is双眉) { if (状態 == EmotionType.Acceptance || 状態 == EmotionType.Desire || 状態 == EmotionType.Excitement || 状態 == EmotionType.余裕 || 状態 == EmotionType.Happiness || 状態 == EmotionType.Joy || 状態 == EmotionType.Lewd || 状態 == EmotionType.Other) { @@ -9326,130 +9326,130 @@ namespace SlaveMatrix c.両眉_1(眉_1感情対応[状態][RNG.XS.Next(眉_1感情対応[状態].Count)], 眉_1感情対応[状態][RNG.XS.Next(眉_1感情対応[状態].Count)]); } } - else if (c.Bod.Is単眉) + else if (c.Body.Is単眉) { c.単眉_0(単眉_0感情対応[状態][RNG.XS.Next(単眉_0感情対応[状態].Count)]); c.単眉_1(単眉_1感情対応[状態][RNG.XS.Next(単眉_1感情対応[状態].Count)]); } } - public static void 目(this Cha c) + public static void 目(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.Is双眼 || c.Bod.Is単眼 || c.Bod.Is頬眼 || c.Bod.Is額眼) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.IsDualEyes || c.Body.IsSingleEye || c.Body.IsCheekEyes || c.Body.IsForeheadEye) { int num = 目_0感情対応[状態][RNG.XS.Next(目_0感情対応[状態].Count)]; - if (c.ChaD.Stamina < 0.3 && c.ChaD.Sensitivity > 0.8 && c.ChaD.Excitement > 0.8 && c.ChaD.Taming > 0.8 && 0.5.Lot()) + if (c.CharacterData.Stamina < 0.3 && c.CharacterData.Sensitivity > 0.8 && c.CharacterData.Excitement > 0.8 && c.CharacterData.Taming > 0.8 && 0.5.Lot()) { num = 3; } - if (c.Bod.Is双眼) + if (c.Body.IsDualEyes) { c.両目_0(num, num); } - else if (c.Bod.Is単眼) + else if (c.Body.IsSingleEye) { c.単目_0(num); } - if (c.Bod.Is頬眼) + if (c.Body.IsCheekEyes) { c.両頬目_0(num, num); } - if (c.Bod.Is額眼) + if (c.Body.IsForeheadEye) { c.額目_0(num); } } } - public static void 瞼(this Cha c) + public static void 瞼(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.Is双眼) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.IsDualEyes) { int num = 瞼_0感情対応[状態][RNG.XS.Next(瞼_0感情対応[状態].Count)]; c.両瞼_0(num, num); - int num2 = (c.Bod.目隠帯_表示 ? 3 : 瞼_1感情対応[状態][RNG.XS.Next(瞼_1感情対応[状態].Count)]); + int num2 = (c.Body.目隠帯_表示 ? 3 : 瞼_1感情対応[状態][RNG.XS.Next(瞼_1感情対応[状態].Count)]); c.両瞼_1(num2, num2); } - else if (c.Bod.Is単眼) + else if (c.Body.IsSingleEye) { c.単瞼_0(単瞼_0感情対応[状態][RNG.XS.Next(単瞼_0感情対応[状態].Count)]); - c.単瞼_1(c.Bod.目隠帯_表示 ? 3 : 単瞼_1感情対応[状態][RNG.XS.Next(単瞼_1感情対応[状態].Count)]); + c.単瞼_1(c.Body.目隠帯_表示 ? 3 : 単瞼_1感情対応[状態][RNG.XS.Next(単瞼_1感情対応[状態].Count)]); } - if (c.Bod.Is頬眼) + if (c.Body.IsCheekEyes) { int num = 頬瞼_0感情対応[状態][RNG.XS.Next(頬瞼_0感情対応[状態].Count)]; c.両頬瞼_0(num, num); - int num2 = (c.Bod.目隠帯_表示 ? 3 : 頬瞼_1感情対応[状態][RNG.XS.Next(頬瞼_1感情対応[状態].Count)]); + int num2 = (c.Body.目隠帯_表示 ? 3 : 頬瞼_1感情対応[状態][RNG.XS.Next(頬瞼_1感情対応[状態].Count)]); c.両頬瞼_1(num2, num2); } - if (c.Bod.Is額眼) + if (c.Body.IsForeheadEye) { c.額瞼_0(額瞼_0感情対応[状態][RNG.XS.Next(額瞼_0感情対応[状態].Count)]); - c.額瞼_1(c.Bod.目隠帯_表示 ? 3 : 額瞼_1感情対応[状態][RNG.XS.Next(額瞼_1感情対応[状態].Count)]); + c.額瞼_1(c.Body.目隠帯_表示 ? 3 : 額瞼_1感情対応[状態][RNG.XS.Next(額瞼_1感情対応[状態].Count)]); } } - public static void 口(this Cha c) + public static void 口(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (!Player.UI.Is口挿入 && !c.Bod.玉口枷_表示) + EmotionType 状態 = c.CharacterData.Emotion; + if (!Player.UI.Is口挿入 && !c.Body.玉口枷_表示) { int num = 口_0感情対応[状態][RNG.XS.Next(口_0感情対応[状態].Count)]; c.口_0(num); - num = ((c.Med.Mode == "Training" && Tongue.Contains(num) && c.ChaD.Sesnsitivities[ContactType.Mouth] > 0.6 && c.ChaD.Sensitivity > 0.6 && c.ChaD.Excitement > 0.6 && c.ChaD.Tension < 0.5 && c.ChaD.Pride == 0.0 && c.ChaD.Lust > 0.6 && c.ChaD.Taming > 0.5 && 0.5.Lot()) ? 1 : 0); + num = ((c.ModeEventDispatcher.Mode == "Training" && Tongue.Contains(num) && c.CharacterData.Sesnsitivities[ContactType.Mouth] > 0.6 && c.CharacterData.Sensitivity > 0.6 && c.CharacterData.Excitement > 0.6 && c.CharacterData.Tension < 0.5 && c.CharacterData.Pride == 0.0 && c.CharacterData.Lust > 0.6 && c.CharacterData.Taming > 0.5 && 0.5.Lot()) ? 1 : 0); c.舌_0(num); } } - public static void 耳(this Cha c) + public static void 耳(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.Is人耳) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.Is人耳) { int num = 耳_0感情対応[状態][RNG.XS.Next(耳_0感情対応[状態].Count)]; c.両耳_0(num, num); } - else if (c.Bod.Is獣耳) + else if (c.Body.Is獣耳) { c.両獣耳_0(獣耳_0感情対応[状態][RNG.XS.Next(獣耳_0感情対応[状態].Count)], 獣耳_0感情対応[状態][RNG.XS.Next(獣耳_0感情対応[状態].Count)]); } } - public static void 顎(this Cha c) + public static void 顎(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.虫顎n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.虫顎n > 0) { int num = 虫顎_0感情対応[状態][RNG.XS.Next(虫顎_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.虫顎n; i++) + for (int i = 0; i < c.Body.虫顎n; i++) { c.両虫顎_0(i, 同角: true, num, num); } } - if (c.Bod.大顎n > 0) + if (c.Body.大顎n > 0) { int num = 大顎_0感情対応[状態][RNG.XS.Next(大顎_0感情対応[状態].Count)]; - if (Player.UI.Is口挿入 || c.Bod.Is拘束) + if (Player.UI.Is口挿入 || c.Body.Is拘束) { num = 1; } - for (int i = 0; i < c.Bod.大顎n; i++) + for (int i = 0; i < c.Body.大顎n; i++) { c.両大顎_0(i, 同角: true, num, num); } } } - public static void SetInitialPosture(this Cha c) + public static void SetInitialPosture(this Character c) { if (Sta.GameData.拘束具) { c.Set調教拘束姿勢(b: true); return; } - c.Bod.腿左右前後 = RNG.XS.NextBool(); + c.Body.腿左右前後 = RNG.XS.NextBool(); c.腕(); c.Leg(); c.翼(); @@ -9464,10 +9464,10 @@ namespace SlaveMatrix c.尾(); c.半身(); c.SetSymmetry(); - c.Bod.Update(); + c.Body.Update(); } - public static void UpdatePosture(this Cha c) + public static void UpdatePosture(this Character c) { if (Sta.GameData.拘束具) { @@ -9476,7 +9476,7 @@ namespace SlaveMatrix } if (0.35.Lot()) { - c.Bod.腿左右前後 = RNG.XS.NextBool(); + c.Body.腿左右前後 = RNG.XS.NextBool(); } switch (RNG.XS.Next(13)) { @@ -9525,23 +9525,23 @@ namespace SlaveMatrix c.半身(); break; } - c.Bod.Update(); + c.Body.Update(); } - public static void 腕(this Cha c) + public static void 腕(this Character c) { if (Player.UI.ペニス処理.手コキ.Run || Player.UI.ペニス処理.Isパイズリ他動) { return; } - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.Arm人n > 0 && !Player.UI.ペニス処理.手固定) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.Arm人n > 0 && !Player.UI.ペニス処理.手固定) { int[] array = null; - if (c.ChaD.撮影ピース経験) + if (c.CharacterData.撮影ピース経験) { IEnumerable source; - if (!c.Bod.Is獣 && !c.Is放尿() && !Player.Is性器接触) + if (!c.Body.Is獣 && !c.IsUrinating() && !Player.Is性器接触) { IEnumerable enumerable = 腕人_0感情対応[状態]; source = enumerable; @@ -9555,7 +9555,7 @@ namespace SlaveMatrix else { IEnumerable source2; - if (!c.Bod.Is獣 && !c.Is放尿() && !Player.Is性器接触) + if (!c.Body.Is獣 && !c.IsUrinating() && !Player.Is性器接触) { IEnumerable enumerable = 腕人_0感情対応[状態]; source2 = enumerable; @@ -9580,46 +9580,46 @@ namespace SlaveMatrix array = (flag ? new int[5] { 0, 2, 7, 13, 18 } : new int[7] { 0, 1, 2, 3, 7, 13, 18 }); } } - for (int i = 0; i < c.Bod.Arm人n; i++) + for (int i = 0; i < c.Body.Arm人n; i++) { c.両腕人_0(i, RNG.XS.NextBool(), RNG.XS.NextBool(), RNG.XS.NextBool(), array[RNG.XS.Next(array.Length)], array[RNG.XS.Next(array.Length)]); } } - if (c.Bod.腕翼鳥n > 0) + if (c.Body.腕翼鳥n > 0) { int num = 腕翼鳥_0感情対応[状態][RNG.XS.Next(腕翼鳥_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.腕翼鳥n; i++) + for (int i = 0; i < c.Body.腕翼鳥n; i++) { c.両腕翼鳥_0(i, RNG.XS.NextBool(), num, num); } } - if (c.Bod.腕翼獣n > 0) + if (c.Body.腕翼獣n > 0) { int num = 腕翼獣_0感情対応[状態][RNG.XS.Next(腕翼獣_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.腕翼獣n; i++) + for (int i = 0; i < c.Body.腕翼獣n; i++) { c.両腕翼獣_0(i, RNG.XS.NextBool(), num, num); } } - if (c.Bod.腕獣n > 0) + if (c.Body.腕獣n > 0) { int num = 腕獣_0感情対応[状態][RNG.XS.Next(腕獣_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.腕獣n; i++) + for (int i = 0; i < c.Body.腕獣n; i++) { c.両腕獣_0(i, RNG.XS.NextBool(), num, num); } } } - public static void Leg(this Cha c) + public static void Leg(this Character c) { if (Player.UI.ペニス処理.足コキ.Run) { return; } - EmotionType 状態 = c.ChaD.Emotion; + EmotionType 状態 = c.CharacterData.Emotion; int num = 0; - if (c.Bod.脚人n > 0 && !Player.UI.ペニス処理.足固定 && !c.Bod.Is粘 && !c.Bod.Is植) + if (c.Body.脚人n > 0 && !Player.UI.ペニス処理.足固定 && !c.Body.Is粘 && !c.Body.Is植) { if (Player.UI.Is脚修正1) { @@ -9695,968 +9695,968 @@ namespace SlaveMatrix { num = 脚人_0感情対応[状態][RNG.XS.Next(脚人_0感情対応[状態].Count)]; } - for (int i = 0; i < c.Bod.脚人n; i++) + for (int i = 0; i < c.Body.脚人n; i++) { c.両脚人_0(0, RNG.XS.NextBool(), num, num); } } - if (c.Bod.脚獣n > 0) + if (c.Body.脚獣n > 0) { num = 脚獣_0感情対応[状態][RNG.XS.Next(脚獣_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.脚獣n; i++) + for (int i = 0; i < c.Body.脚獣n; i++) { c.両脚獣_0(i, RNG.XS.NextBool(), num, num); } } } - public static void 翼(this Cha c) + public static void 翼(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.翼鳥n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.翼鳥n > 0) { int num = 翼_0感情対応[状態][RNG.XS.Next(翼_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.翼鳥n; i++) + for (int i = 0; i < c.Body.翼鳥n; i++) { c.両翼鳥_0(i, RNG.XS.NextBool(), num, num); } } - if (c.Bod.翼獣n > 0) + if (c.Body.翼獣n > 0) { int num2 = 翼_0感情対応[状態][RNG.XS.Next(翼_0感情対応[状態].Count)]; - for (int j = 0; j < c.Bod.翼獣n; j++) + for (int j = 0; j < c.Body.翼獣n; j++) { c.両翼獣_0(j, RNG.XS.NextBool(), num2, num2); } } } - public static void 鰭(this Cha c) + public static void 鰭(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.鰭n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.鰭n > 0) { int num = 鰭_0感情対応[状態][RNG.XS.Next(鰭_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.鰭n; i++) + for (int i = 0; i < c.Body.鰭n; i++) { c.両鰭_0(i, RNG.XS.NextBool(), num, num); } } } - public static void 葉(this Cha c) + public static void 葉(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.葉n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.葉n > 0) { int num = 葉_0感情対応[状態][RNG.XS.Next(葉_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.葉n; i++) + for (int i = 0; i < c.Body.葉n; i++) { c.両葉_0(i, RNG.XS.NextBool(), num, num); } } } - public static void 翅(this Cha c) + public static void 翅(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; + EmotionType 状態 = c.CharacterData.Emotion; int num; - if (c.Bod.前翅1n > 0 || c.Bod.後翅1n > 0) + if (c.Body.前翅1n > 0 || c.Body.後翅1n > 0) { num = 前翅_0感情対応[状態][RNG.XS.Next(前翅_0感情対応[状態].Count)]; - if (c.Bod.前翅1n > 0) + if (c.Body.前翅1n > 0) { - for (int i = 0; i < c.Bod.前翅1n; i++) + for (int i = 0; i < c.Body.前翅1n; i++) { c.両前翅_0(i, 同角: true, num, num); } } - if (c.Bod.後翅1n > 0) + if (c.Body.後翅1n > 0) { - for (int i = 0; i < c.Bod.後翅1n; i++) + for (int i = 0; i < c.Body.後翅1n; i++) { c.両後翅_0(i, 同角: true, num, num); } } } - if (c.Bod.前翅2n <= 0 && c.Bod.後翅2n <= 0) + if (c.Body.前翅2n <= 0 && c.Body.後翅2n <= 0) { return; } num = 前翅_1感情対応[状態][RNG.XS.Next(前翅_1感情対応[状態].Count)]; - if (c.Bod.前翅2n > 0) + if (c.Body.前翅2n > 0) { - for (int i = 0; i < c.Bod.前翅2n; i++) + for (int i = 0; i < c.Body.前翅2n; i++) { c.両前翅_1(i, num, num); } } - if (c.Bod.後翅2n > 0) + if (c.Body.後翅2n > 0) { - for (int i = 0; i < c.Bod.後翅2n; i++) + for (int i = 0; i < c.Body.後翅2n; i++) { c.両後翅_1(i, num, num); } } } - public static void 触肢(this Cha c) + public static void 触肢(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.触肢蜘n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.触肢蜘n > 0) { int num = 触肢蜘_0感情対応[状態][RNG.XS.Next(触肢蜘_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.触肢蜘n; i++) + for (int i = 0; i < c.Body.触肢蜘n; i++) { c.両触肢蜘_0(i, RNG.XS.NextBool(), num, num); } } - if (c.Bod.触肢蠍n > 0) + if (c.Body.触肢蠍n > 0) { int num = 触肢蠍_0感情対応[状態][RNG.XS.Next(触肢蠍_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.触肢蠍n; i++) + for (int i = 0; i < c.Body.触肢蠍n; i++) { c.両触肢蠍_0(i, RNG.XS.NextBool(), num, num); } } } - public static void 節足(this Cha c) + public static void 節足(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.節足蜘n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.節足蜘n > 0) { int num = 節足蜘_0感情対応[状態][RNG.XS.Next(節足蜘_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.節足蜘n; i++) + for (int i = 0; i < c.Body.節足蜘n; i++) { c.両節足蜘_0(i, RNG.XS.NextBool(), num, num); } } - if (c.Bod.節足蠍n > 0) + if (c.Body.節足蠍n > 0) { int num = 節足蠍_0感情対応[状態][RNG.XS.Next(節足蠍_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.節足蠍n; i++) + for (int i = 0; i < c.Body.節足蠍n; i++) { c.両節足蠍_0(i, RNG.XS.NextBool(), num, num); } } - if (c.Bod.節足百n > 0) + if (c.Body.節足百n > 0) { int num = 節足百_0感情対応[状態][RNG.XS.Next(節足百_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.節足百n; i++) + for (int i = 0; i < c.Body.節足百n; i++) { c.両節足百_0(i, RNG.XS.NextBool(), num, num); } } } - public static void 節尾(this Cha c) + public static void 節尾(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.節尾曳n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.節尾曳n > 0) { int num = 節尾曳_0感情対応[状態][RNG.XS.Next(節尾曳_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.節尾曳n; i++) + for (int i = 0; i < c.Body.節尾曳n; i++) { c.両節尾曳_0(i, RNG.XS.NextBool(), num, num); } } - if (c.Bod.節尾鋏n > 0) + if (c.Body.節尾鋏n > 0) { int num = 節尾鋏_0感情対応[状態][RNG.XS.Next(節尾鋏_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.節尾鋏n; i++) + for (int i = 0; i < c.Body.節尾鋏n; i++) { c.両節尾鋏_0(i, RNG.XS.NextBool(), num, num); } } } - public static void 虫鎌(this Cha c) + public static void 虫鎌(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.虫鎌n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.虫鎌n > 0) { int num = 虫鎌_0感情対応[状態][RNG.XS.Next(虫鎌_0感情対応[状態].Count)]; - for (int i = 0; i < c.Bod.虫鎌n; i++) + for (int i = 0; i < c.Body.虫鎌n; i++) { c.両虫鎌_0(i, RNG.XS.NextBool(), num, num); } } } - public static void 触手(this Cha c) + public static void 触手(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.触手n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.触手n > 0) { - for (int i = 0; i < c.Bod.触手n; i++) + for (int i = 0; i < c.Body.触手n; i++) { c.両触手_0(i, 触手_0感情対応[状態][RNG.XS.Next(触手_0感情対応[状態].Count)]); } } - if (c.Bod.触手犬n > 0) + if (c.Body.触手犬n > 0) { - for (int i = 0; i < c.Bod.触手犬n; i++) + for (int i = 0; i < c.Body.触手犬n; i++) { c.両触手犬_0(i, 触手犬_0感情対応[状態][RNG.XS.Next(触手犬_0感情対応[状態].Count)]); } } } - public static void 尾(this Cha c) + public static void 尾(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.尾n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.尾n > 0) { int i = 尾_0感情対応[状態][RNG.XS.Next(尾_0感情対応[状態].Count)]; int num = 0; - for (num = 0; num < c.Bod.尾n; num++) + for (num = 0; num < c.Body.尾n; num++) { c.尾_0(num, i); } } } - public static void 半身(this Cha c) + public static void 半身(this Character c) { - EmotionType 状態 = c.ChaD.Emotion; - if (c.Bod.長胴n > 0) + EmotionType 状態 = c.CharacterData.Emotion; + if (c.Body.長胴n > 0) { c.長胴_基本(); } - if (c.Bod.Is魚) + if (c.Body.Is魚) { c.魚_0(魚_0感情対応[状態][RNG.XS.Next(魚_0感情対応[状態].Count)]); } - if (c.Bod.Is鯨) + if (c.Body.Is鯨) { c.鯨_0(鯨_0感情対応[状態][RNG.XS.Next(鯨_0感情対応[状態].Count)]); } - if (c.Bod.Is蠍) + if (c.Body.Is蠍) { c.蠍_0(蠍_0感情対応[状態][RNG.XS.Next(蠍_0感情対応[状態].Count)]); } - if (c.Bod.Is植) + if (c.Body.Is植) { c.植_基本(); } - if (c.Bod.Is粘) + if (c.Body.Is粘) { - c.Bod.粘.尺度C = 0.9 + 0.1 * RNG.XS.NextDouble(); + c.Body.粘.尺度C = 0.9 + 0.1 * RNG.XS.NextDouble(); } } - public static void Set基本姿勢(this Cha c) + public static void Set基本姿勢(this Character c) { if (0.35.Lot()) { - c.Bod.腿左右前後 = RNG.XS.NextBool(); + c.Body.腿左右前後 = RNG.XS.NextBool(); } - if (c.Bod.Arm人n > 0) + if (c.Body.Arm人n > 0) { int num = 7; - for (int i = 0; i < c.Bod.Arm人n; i++) + for (int i = 0; i < c.Body.Arm人n; i++) { c.両腕人_0(i, RNG.XS.NextBool(), 同角: true, RNG.XS.NextBool(), num, num); } } - if (c.Bod.腕翼鳥n > 0) + if (c.Body.腕翼鳥n > 0) { int num = 腕翼鳥_0基本[RNG.XS.Next(腕翼鳥_0基本.Length)]; - for (int j = 0; j < c.Bod.腕翼鳥n; j++) + for (int j = 0; j < c.Body.腕翼鳥n; j++) { c.両腕翼鳥_0(j, 同角: true, num, num); } } - if (c.Bod.腕翼獣n > 0) + if (c.Body.腕翼獣n > 0) { int num = 腕翼獣_0基本[RNG.XS.Next(腕翼獣_0基本.Length)]; - for (int k = 0; k < c.Bod.腕翼獣n; k++) + for (int k = 0; k < c.Body.腕翼獣n; k++) { c.両腕翼獣_0(k, 同角: true, num, num); } } - if (c.Bod.腕獣n > 0) + if (c.Body.腕獣n > 0) { int num = 腕獣_0基本[RNG.XS.Next(腕獣_0基本.Length)]; - for (int l = 0; l < c.Bod.腕獣n; l++) + for (int l = 0; l < c.Body.腕獣n; l++) { c.両腕獣_0(l, 同角: true, num, num); } } - if (!c.Bod.Is粘 && !c.Bod.Is植 && c.Bod.脚人n > 0) + if (!c.Body.Is粘 && !c.Body.Is植 && c.Body.脚人n > 0) { - for (int m = 0; m < c.Bod.脚人n; m++) + for (int m = 0; m < c.Body.脚人n; m++) { c.両脚人_0(0, 同角: true, 脚人_0基本[RNG.XS.Next(脚人_0基本.Length)], 脚人_0基本[RNG.XS.Next(脚人_0基本.Length)]); } } - if (c.Bod.脚獣n > 0) + if (c.Body.脚獣n > 0) { int num = 脚獣_0基本[RNG.XS.Next(脚獣_0基本.Length)]; - for (int n = 0; n < c.Bod.脚獣n; n++) + for (int n = 0; n < c.Body.脚獣n; n++) { c.両脚獣_0(n, 同角: true, num, num); } } - if (c.Bod.翼鳥n > 0) + if (c.Body.翼鳥n > 0) { int num = 翼_0基本[RNG.XS.Next(翼_0基本.Length)]; - for (int num2 = 0; num2 < c.Bod.翼鳥n; num2++) + for (int num2 = 0; num2 < c.Body.翼鳥n; num2++) { c.両翼鳥_0(num2, 同角: true, num, num); } } - if (c.Bod.翼獣n > 0) + if (c.Body.翼獣n > 0) { int num = 翼_0基本[RNG.XS.Next(翼_0基本.Length)]; - for (int num3 = 0; num3 < c.Bod.翼獣n; num3++) + for (int num3 = 0; num3 < c.Body.翼獣n; num3++) { c.両翼獣_0(num3, 同角: true, num, num); } } - if (c.Bod.鰭n > 0) + if (c.Body.鰭n > 0) { int num = 鰭_0基本[RNG.XS.Next(鰭_0基本.Length)]; - for (int num4 = 0; num4 < c.Bod.鰭n; num4++) + for (int num4 = 0; num4 < c.Body.鰭n; num4++) { c.両鰭_0(num4, 同角: true, num, num); } } - if (c.Bod.葉n > 0) + if (c.Body.葉n > 0) { int num = 葉_0基本[RNG.XS.Next(葉_0基本.Length)]; - for (int num5 = 0; num5 < c.Bod.葉n; num5++) + for (int num5 = 0; num5 < c.Body.葉n; num5++) { c.両葉_0(num5, 同角: true, num, num); } } - if (c.Bod.前翅1n > 0 || c.Bod.後翅1n > 0) + if (c.Body.前翅1n > 0 || c.Body.後翅1n > 0) { int num = 前翅_0基本[RNG.XS.Next(前翅_0基本.Length)]; - if (c.Bod.前翅1n > 0) + if (c.Body.前翅1n > 0) { - for (int num6 = 0; num6 < c.Bod.前翅1n; num6++) + for (int num6 = 0; num6 < c.Body.前翅1n; num6++) { c.両前翅_0(num6, 同角: true, num, num); } } - if (c.Bod.後翅1n > 0) + if (c.Body.後翅1n > 0) { - for (int num7 = 0; num7 < c.Bod.後翅1n; num7++) + for (int num7 = 0; num7 < c.Body.後翅1n; num7++) { c.両後翅_0(num7, 同角: true, num, num); } } } - if (c.Bod.前翅2n > 0 || c.Bod.後翅2n > 0) + if (c.Body.前翅2n > 0 || c.Body.後翅2n > 0) { int num8 = 前翅_1基本[RNG.XS.Next(前翅_1基本.Length)]; - if (c.Bod.前翅2n > 0) + if (c.Body.前翅2n > 0) { - for (int num9 = 0; num9 < c.Bod.前翅2n; num9++) + for (int num9 = 0; num9 < c.Body.前翅2n; num9++) { c.両前翅_1(num9, num8, num8); } } - if (c.Bod.後翅2n > 0) + if (c.Body.後翅2n > 0) { - for (int num10 = 0; num10 < c.Bod.後翅2n; num10++) + for (int num10 = 0; num10 < c.Body.後翅2n; num10++) { c.両後翅_1(num10, num8, num8); } } } - if (c.Bod.触肢蜘n > 0) + if (c.Body.触肢蜘n > 0) { int num = 触肢蜘_0基本[RNG.XS.Next(触肢蜘_0基本.Length)]; - for (int num11 = 0; num11 < c.Bod.触肢蜘n; num11++) + for (int num11 = 0; num11 < c.Body.触肢蜘n; num11++) { c.両触肢蜘_0(num11, 同角: true, num, num); } } - if (c.Bod.触肢蠍n > 0) + if (c.Body.触肢蠍n > 0) { int num = 触肢蠍_0基本[RNG.XS.Next(触肢蠍_0基本.Length)]; - for (int num12 = 0; num12 < c.Bod.触肢蠍n; num12++) + for (int num12 = 0; num12 < c.Body.触肢蠍n; num12++) { c.両触肢蠍_0(num12, 同角: true, num, num); } } - if (c.Bod.節足蜘n > 0) + if (c.Body.節足蜘n > 0) { int num = 節足蜘_0基本[RNG.XS.Next(節足蜘_0基本.Length)]; - for (int num13 = 0; num13 < c.Bod.節足蜘n; num13++) + for (int num13 = 0; num13 < c.Body.節足蜘n; num13++) { c.両節足蜘_0(num13, 同角: true, num, num); } } - if (c.Bod.節足蠍n > 0) + if (c.Body.節足蠍n > 0) { int num = 節足蠍_0基本[RNG.XS.Next(節足蠍_0基本.Length)]; - for (int num14 = 0; num14 < c.Bod.節足蠍n; num14++) + for (int num14 = 0; num14 < c.Body.節足蠍n; num14++) { c.両節足蠍_0(num14, 同角: true, num, num); } } - if (c.Bod.節足百n > 0) + if (c.Body.節足百n > 0) { int num = 節足百_0基本[RNG.XS.Next(節足百_0基本.Length)]; - for (int num15 = 0; num15 < c.Bod.節足百n; num15++) + for (int num15 = 0; num15 < c.Body.節足百n; num15++) { c.両節足百_0(num15, 同角: true, num, num); } } - if (c.Bod.節尾曳n > 0) + if (c.Body.節尾曳n > 0) { int num = 節尾曳_0基本[RNG.XS.Next(節尾曳_0基本.Length)]; - for (int num16 = 0; num16 < c.Bod.節尾曳n; num16++) + for (int num16 = 0; num16 < c.Body.節尾曳n; num16++) { c.両節尾曳_0(num16, 同角: true, num, num); } } - if (c.Bod.節尾鋏n > 0) + if (c.Body.節尾鋏n > 0) { int num = 節尾鋏_0基本[RNG.XS.Next(節尾鋏_0基本.Length)]; - for (int num17 = 0; num17 < c.Bod.節尾鋏n; num17++) + for (int num17 = 0; num17 < c.Body.節尾鋏n; num17++) { c.両節尾鋏_0(num17, 同角: true, num, num); } } - if (c.Bod.虫鎌n > 0) + if (c.Body.虫鎌n > 0) { int num = 虫鎌_0基本[RNG.XS.Next(虫鎌_0基本.Length)]; - for (int num18 = 0; num18 < c.Bod.虫鎌n; num18++) + for (int num18 = 0; num18 < c.Body.虫鎌n; num18++) { c.両虫鎌_0(num18, 同角: true, num, num); } } - if (c.Bod.触手n > 0) + if (c.Body.触手n > 0) { - for (int num19 = 0; num19 < c.Bod.触手n; num19++) + for (int num19 = 0; num19 < c.Body.触手n; num19++) { c.両触手_0(num19, 触手_0基本[RNG.XS.Next(触手_0基本.Length)]); } } - if (c.Bod.触手犬n > 0) + if (c.Body.触手犬n > 0) { - for (int num20 = 0; num20 < c.Bod.触手犬n; num20++) + for (int num20 = 0; num20 < c.Body.触手犬n; num20++) { c.両触手犬_0(num20, 触手犬_0基本[RNG.XS.Next(触手犬_0基本.Length)]); } } - if (c.Bod.尾n > 0) + if (c.Body.尾n > 0) { int num = 尾_0基本[RNG.XS.Next(尾_0基本.Length)]; - for (int num21 = 0; num21 < c.Bod.尾n; num21++) + for (int num21 = 0; num21 < c.Body.尾n; num21++) { c.尾_0(num21, num); } } - if (c.Bod.触手n > 0 || c.Bod.触手犬n > 0 || c.Bod.尾n > 0) + if (c.Body.触手n > 0 || c.Body.触手犬n > 0 || c.Body.尾n > 0) { c.SetSymmetry(); } - if (c.Bod.長胴n > 0) + if (c.Body.長胴n > 0) { c.長胴_基本(); } - if (c.Bod.Is魚) + if (c.Body.Is魚) { c.魚_0(魚_0基本[RNG.XS.Next(魚_0基本.Length)]); } - if (c.Bod.Is鯨) + if (c.Body.Is鯨) { c.鯨_0(鯨_0基本[RNG.XS.Next(鯨_0基本.Length)]); } - if (c.Bod.Is蠍) + if (c.Body.Is蠍) { c.蠍_0(蠍_0基本[RNG.XS.Next(蠍_0基本.Length)]); } - if (c.Bod.Is植) + if (c.Body.Is植) { c.植_基本(); } - if (c.Bod.Is粘) + if (c.Body.Is粘) { - c.Bod.粘.尺度C = 0.9 + 0.1 * RNG.XS.NextDouble(); + c.Body.粘.尺度C = 0.9 + 0.1 * RNG.XS.NextDouble(); } - c.Bod.Update(); + c.Body.Update(); } - public static void Set拘束姿勢(this Cha c) + public static void Set拘束姿勢(this Character c) { if (0.35.Lot()) { - c.Bod.腿左右前後 = RNG.XS.NextBool(); + c.Body.腿左右前後 = RNG.XS.NextBool(); } - if (c.Bod.Arm人n > 0) + if (c.Body.Arm人n > 0) { int num = 7; - for (int i = 0; i < c.Bod.Arm人n; i++) + for (int i = 0; i < c.Body.Arm人n; i++) { c.両腕人_0(i, RNG.XS.NextBool(), 同角: true, RNG.XS.NextBool(), num, num); } } - if (c.Bod.腕翼鳥n > 0) + if (c.Body.腕翼鳥n > 0) { int num = 4; - for (int j = 0; j < c.Bod.腕翼鳥n; j++) + for (int j = 0; j < c.Body.腕翼鳥n; j++) { c.両腕翼鳥_0(j, 同角: true, num, num); } } - if (c.Bod.腕翼獣n > 0) + if (c.Body.腕翼獣n > 0) { int num = 2; - for (int k = 0; k < c.Bod.腕翼獣n; k++) + for (int k = 0; k < c.Body.腕翼獣n; k++) { c.両腕翼獣_0(k, 同角: true, num, num); } } - if (c.Bod.腕獣n > 0) + if (c.Body.腕獣n > 0) { int num = 腕獣_0基本[RNG.XS.Next(腕獣_0基本.Length)]; - for (int l = 0; l < c.Bod.腕獣n; l++) + for (int l = 0; l < c.Body.腕獣n; l++) { c.両腕獣_0(l, 同角: true, num, num); } } - if (!c.Bod.Is粘 && !c.Bod.Is植 && c.Bod.脚人n > 0) + if (!c.Body.Is粘 && !c.Body.Is植 && c.Body.脚人n > 0) { - for (int m = 0; m < c.Bod.脚人n; m++) + for (int m = 0; m < c.Body.脚人n; m++) { c.両脚人_0(0, 同角: true, 脚人_0基本[RNG.XS.Next(脚人_0基本.Length)], 脚人_0基本[RNG.XS.Next(脚人_0基本.Length)]); } } - if (c.Bod.脚獣n > 0) + if (c.Body.脚獣n > 0) { int num = 脚獣_0基本[RNG.XS.Next(脚獣_0基本.Length)]; - for (int n = 0; n < c.Bod.脚獣n; n++) + for (int n = 0; n < c.Body.脚獣n; n++) { c.両脚獣_0(n, 同角: true, num, num); } } - if (c.Bod.翼鳥n > 0) + if (c.Body.翼鳥n > 0) { int num = 4; - for (int num2 = 0; num2 < c.Bod.翼鳥n; num2++) + for (int num2 = 0; num2 < c.Body.翼鳥n; num2++) { c.両翼鳥_0(num2, 同角: true, num, num); } } - if (c.Bod.翼獣n > 0) + if (c.Body.翼獣n > 0) { int num = 4; - for (int num3 = 0; num3 < c.Bod.翼獣n; num3++) + for (int num3 = 0; num3 < c.Body.翼獣n; num3++) { c.両翼獣_0(num3, 同角: true, num, num); } } - if (c.Bod.鰭n > 0) + if (c.Body.鰭n > 0) { int num = 鰭_0基本[RNG.XS.Next(鰭_0基本.Length)]; - for (int num4 = 0; num4 < c.Bod.鰭n; num4++) + for (int num4 = 0; num4 < c.Body.鰭n; num4++) { c.両鰭_0(num4, 同角: true, num, num); } } - if (c.Bod.葉n > 0) + if (c.Body.葉n > 0) { int num = 葉_0基本[RNG.XS.Next(葉_0基本.Length)]; - for (int num5 = 0; num5 < c.Bod.葉n; num5++) + for (int num5 = 0; num5 < c.Body.葉n; num5++) { c.両葉_0(num5, 同角: true, num, num); } } - if (c.Bod.前翅1n > 0 || c.Bod.後翅1n > 0) + if (c.Body.前翅1n > 0 || c.Body.後翅1n > 0) { int num = 前翅_0基本[RNG.XS.Next(前翅_0基本.Length)]; - if (c.Bod.前翅1n > 0) + if (c.Body.前翅1n > 0) { - for (int num6 = 0; num6 < c.Bod.前翅1n; num6++) + for (int num6 = 0; num6 < c.Body.前翅1n; num6++) { c.両前翅_0(num6, 同角: true, num, num); } } - if (c.Bod.後翅1n > 0) + if (c.Body.後翅1n > 0) { - for (int num7 = 0; num7 < c.Bod.後翅1n; num7++) + for (int num7 = 0; num7 < c.Body.後翅1n; num7++) { c.両後翅_0(num7, 同角: true, num, num); } } } - if (c.Bod.前翅2n > 0 || c.Bod.後翅2n > 0) + if (c.Body.前翅2n > 0 || c.Body.後翅2n > 0) { int num8 = 0; - if (c.Bod.前翅2n > 0) + if (c.Body.前翅2n > 0) { - for (int num9 = 0; num9 < c.Bod.前翅2n; num9++) + for (int num9 = 0; num9 < c.Body.前翅2n; num9++) { c.両前翅_1(num9, num8, num8); } } - if (c.Bod.後翅2n > 0) + if (c.Body.後翅2n > 0) { - for (int num10 = 0; num10 < c.Bod.後翅2n; num10++) + for (int num10 = 0; num10 < c.Body.後翅2n; num10++) { c.両後翅_1(num10, num8, num8); } } } - if (c.Bod.触肢蜘n > 0) + if (c.Body.触肢蜘n > 0) { int num = 触肢蜘_0拘束[RNG.XS.Next(触肢蜘_0拘束.Length)]; - for (int num11 = 0; num11 < c.Bod.触肢蜘n; num11++) + for (int num11 = 0; num11 < c.Body.触肢蜘n; num11++) { c.両触肢蜘_0(num11, 同角: true, num, num); } } - if (c.Bod.触肢蠍n > 0) + if (c.Body.触肢蠍n > 0) { int num = 触肢蠍_0拘束[RNG.XS.Next(触肢蠍_0拘束.Length)]; - for (int num12 = 0; num12 < c.Bod.触肢蠍n; num12++) + for (int num12 = 0; num12 < c.Body.触肢蠍n; num12++) { c.両触肢蠍_0(num12, 同角: true, num, num); } } - if (c.Bod.節足蜘n > 0) + if (c.Body.節足蜘n > 0) { int num = 節足蜘_0基本[RNG.XS.Next(節足蜘_0基本.Length)]; - for (int num13 = 0; num13 < c.Bod.節足蜘n; num13++) + for (int num13 = 0; num13 < c.Body.節足蜘n; num13++) { c.両節足蜘_0(num13, 同角: true, num, num); } } - if (c.Bod.節足蠍n > 0) + if (c.Body.節足蠍n > 0) { int num = 節足蠍_0基本[RNG.XS.Next(節足蠍_0基本.Length)]; - for (int num14 = 0; num14 < c.Bod.節足蠍n; num14++) + for (int num14 = 0; num14 < c.Body.節足蠍n; num14++) { c.両節足蠍_0(num14, 同角: true, num, num); } } - if (c.Bod.節足百n > 0) + if (c.Body.節足百n > 0) { int num = 節足百_0基本[RNG.XS.Next(節足百_0基本.Length)]; - for (int num15 = 0; num15 < c.Bod.節足百n; num15++) + for (int num15 = 0; num15 < c.Body.節足百n; num15++) { c.両節足百_0(num15, 同角: true, num, num); } } - if (c.Bod.節尾曳n > 0) + if (c.Body.節尾曳n > 0) { int num = 節尾曳_0基本[RNG.XS.Next(節尾曳_0基本.Length)]; - for (int num16 = 0; num16 < c.Bod.節尾曳n; num16++) + for (int num16 = 0; num16 < c.Body.節尾曳n; num16++) { c.両節尾曳_0(num16, 同角: true, num, num); } } - if (c.Bod.節尾鋏n > 0) + if (c.Body.節尾鋏n > 0) { int num = 節尾鋏_0基本[RNG.XS.Next(節尾鋏_0基本.Length)]; - for (int num17 = 0; num17 < c.Bod.節尾鋏n; num17++) + for (int num17 = 0; num17 < c.Body.節尾鋏n; num17++) { c.両節尾鋏_0(num17, 同角: true, num, num); } } - if (c.Bod.虫鎌n > 0) + if (c.Body.虫鎌n > 0) { int num = 0; - for (int num18 = 0; num18 < c.Bod.虫鎌n; num18++) + for (int num18 = 0; num18 < c.Body.虫鎌n; num18++) { c.両虫鎌_0(num18, 同角: true, num, num); } } - if (c.Bod.触手n > 0) + if (c.Body.触手n > 0) { - for (int num19 = 0; num19 < c.Bod.触手n; num19++) + for (int num19 = 0; num19 < c.Body.触手n; num19++) { c.両触手_0(num19, 触手_0基本[RNG.XS.Next(触手_0基本.Length)]); } } - if (c.Bod.触手犬n > 0) + if (c.Body.触手犬n > 0) { - for (int num20 = 0; num20 < c.Bod.触手犬n; num20++) + for (int num20 = 0; num20 < c.Body.触手犬n; num20++) { c.両触手犬_0(num20, 触手犬_0基本[RNG.XS.Next(触手犬_0基本.Length)]); } } - if (c.Bod.尾n > 0) + if (c.Body.尾n > 0) { int num = 尾_0基本[RNG.XS.Next(尾_0基本.Length)]; - for (int num21 = 0; num21 < c.Bod.尾n; num21++) + for (int num21 = 0; num21 < c.Body.尾n; num21++) { c.尾_0(num21, num); } } - if (c.Bod.触手n > 0 || c.Bod.触手犬n > 0 || c.Bod.尾n > 0) + if (c.Body.触手n > 0 || c.Body.触手犬n > 0 || c.Body.尾n > 0) { c.SetSymmetry(); } - if (c.Bod.長胴n > 0) + if (c.Body.長胴n > 0) { c.長胴_基本(); } - if (c.Bod.Is魚) + if (c.Body.Is魚) { c.魚_0(魚_0基本[RNG.XS.Next(魚_0基本.Length)]); } - if (c.Bod.Is鯨) + if (c.Body.Is鯨) { c.鯨_0(鯨_0基本[RNG.XS.Next(鯨_0基本.Length)]); } - if (c.Bod.Is蠍) + if (c.Body.Is蠍) { c.蠍_0(蠍_0基本[RNG.XS.Next(蠍_0基本.Length)]); } - if (c.Bod.Is植) + if (c.Body.Is植) { c.植_基本(); } - if (c.Bod.Is粘) + if (c.Body.Is粘) { - c.Bod.粘.尺度C = 0.9 + 0.1 * RNG.XS.NextDouble(); + c.Body.粘.尺度C = 0.9 + 0.1 * RNG.XS.NextDouble(); } - c.Bod.Update(); + c.Body.Update(); } - public static void Set調教拘束姿勢(this Cha c, bool b) + public static void Set調教拘束姿勢(this Character c, bool b) { if (0.35.Lot()) { - c.Bod.腿左右前後 = RNG.XS.NextBool(); + c.Body.腿左右前後 = RNG.XS.NextBool(); } - if (c.Bod.Arm人n > 0) + if (c.Body.Arm人n > 0) { int num = 18; - for (int i = 0; i < c.Bod.Arm人n; i++) + for (int i = 0; i < c.Body.Arm人n; i++) { c.両腕人_0(i, RNG.XS.NextBool(), RNG.XS.NextBool(), RNG.XS.NextBool(), num, num); } } - if (c.Bod.腕翼鳥n > 0) + if (c.Body.腕翼鳥n > 0) { int num = 4; - for (int j = 0; j < c.Bod.腕翼鳥n; j++) + for (int j = 0; j < c.Body.腕翼鳥n; j++) { c.両腕翼鳥_0(j, RNG.XS.NextBool(), num, num); } } - if (c.Bod.腕翼獣n > 0) + if (c.Body.腕翼獣n > 0) { int num = 2; - for (int k = 0; k < c.Bod.腕翼獣n; k++) + for (int k = 0; k < c.Body.腕翼獣n; k++) { c.両腕翼獣_0(k, RNG.XS.NextBool(), num, num); } } - if (c.Bod.腕獣n > 0) + if (c.Body.腕獣n > 0) { int num = 0; - for (int l = 0; l < c.Bod.腕獣n; l++) + for (int l = 0; l < c.Body.腕獣n; l++) { c.両腕獣_0(l, RNG.XS.NextBool(), num, num); } } - if (!c.Bod.Is粘 && !c.Bod.Is植 && c.Bod.脚人n > 0) + if (!c.Body.Is粘 && !c.Body.Is植 && c.Body.脚人n > 0) { int num = 8; - for (int m = 0; m < c.Bod.脚人n; m++) + for (int m = 0; m < c.Body.脚人n; m++) { c.両脚人_0(0, RNG.XS.NextBool(), num, num); } } - if (c.Bod.脚獣n > 0) + if (c.Body.脚獣n > 0) { int num = 0; - for (int n = 0; n < c.Bod.脚獣n; n++) + for (int n = 0; n < c.Body.脚獣n; n++) { c.両脚獣_0(n, RNG.XS.NextBool(), num, num); } } - if (c.Bod.翼鳥n > 0) + if (c.Body.翼鳥n > 0) { int num = 4; - for (int num2 = 0; num2 < c.Bod.翼鳥n; num2++) + for (int num2 = 0; num2 < c.Body.翼鳥n; num2++) { c.両翼鳥_0(num2, RNG.XS.NextBool(), num, num); } } - if (c.Bod.翼獣n > 0) + if (c.Body.翼獣n > 0) { int num = 4; - for (int num3 = 0; num3 < c.Bod.翼獣n; num3++) + for (int num3 = 0; num3 < c.Body.翼獣n; num3++) { c.両翼獣_0(num3, RNG.XS.NextBool(), num, num); } } - if (c.Bod.鰭n > 0) + if (c.Body.鰭n > 0) { int num = 鰭_0基本[RNG.XS.Next(鰭_0基本.Length)]; - for (int num4 = 0; num4 < c.Bod.鰭n; num4++) + for (int num4 = 0; num4 < c.Body.鰭n; num4++) { c.両鰭_0(num4, RNG.XS.NextBool(), num, num); } } - if (c.Bod.葉n > 0) + if (c.Body.葉n > 0) { int num = 葉_0基本[RNG.XS.Next(葉_0基本.Length)]; - for (int num5 = 0; num5 < c.Bod.葉n; num5++) + for (int num5 = 0; num5 < c.Body.葉n; num5++) { c.両葉_0(num5, RNG.XS.NextBool(), num, num); } } - if (c.Bod.前翅1n > 0 || c.Bod.後翅1n > 0) + if (c.Body.前翅1n > 0 || c.Body.後翅1n > 0) { int num = 前翅_0基本[RNG.XS.Next(前翅_0基本.Length)]; - if (c.Bod.前翅1n > 0) + if (c.Body.前翅1n > 0) { - for (int num6 = 0; num6 < c.Bod.前翅1n; num6++) + for (int num6 = 0; num6 < c.Body.前翅1n; num6++) { c.両前翅_0(num6, 同角: true, num, num); } } - if (c.Bod.後翅1n > 0) + if (c.Body.後翅1n > 0) { - for (int num7 = 0; num7 < c.Bod.後翅1n; num7++) + for (int num7 = 0; num7 < c.Body.後翅1n; num7++) { c.両後翅_0(num7, 同角: true, num, num); } } } - if (c.Bod.前翅2n > 0 || c.Bod.後翅2n > 0) + if (c.Body.前翅2n > 0 || c.Body.後翅2n > 0) { int num8 = 0; - if (c.Bod.前翅2n > 0) + if (c.Body.前翅2n > 0) { - for (int num9 = 0; num9 < c.Bod.前翅2n; num9++) + for (int num9 = 0; num9 < c.Body.前翅2n; num9++) { c.両前翅_1(num9, num8, num8); } } - if (c.Bod.後翅2n > 0) + if (c.Body.後翅2n > 0) { - for (int num10 = 0; num10 < c.Bod.後翅2n; num10++) + for (int num10 = 0; num10 < c.Body.後翅2n; num10++) { c.両後翅_1(num10, num8, num8); } } } - if (c.Bod.触肢蜘n > 0) + if (c.Body.触肢蜘n > 0) { int num = 0; - for (int num11 = 0; num11 < c.Bod.触肢蜘n; num11++) + for (int num11 = 0; num11 < c.Body.触肢蜘n; num11++) { c.両触肢蜘_0(num11, RNG.XS.NextBool(), num, num); } } - if (c.Bod.触肢蠍n > 0) + if (c.Body.触肢蠍n > 0) { int num = 0; - for (int num12 = 0; num12 < c.Bod.触肢蠍n; num12++) + for (int num12 = 0; num12 < c.Body.触肢蠍n; num12++) { c.両触肢蠍_0(num12, RNG.XS.NextBool(), num, num); } } - if (c.Bod.節足蜘n > 0) + if (c.Body.節足蜘n > 0) { int num = 0; - for (int num13 = 0; num13 < c.Bod.節足蜘n; num13++) + for (int num13 = 0; num13 < c.Body.節足蜘n; num13++) { c.両節足蜘_0(num13, RNG.XS.NextBool(), num, num); } } - if (c.Bod.節足蠍n > 0) + if (c.Body.節足蠍n > 0) { int num = 0; - for (int num14 = 0; num14 < c.Bod.節足蠍n; num14++) + for (int num14 = 0; num14 < c.Body.節足蠍n; num14++) { c.両節足蠍_0(num14, RNG.XS.NextBool(), num, num); } } - if (c.Bod.節足百n > 0) + if (c.Body.節足百n > 0) { int num = 0; - for (int num15 = 0; num15 < c.Bod.節足百n; num15++) + for (int num15 = 0; num15 < c.Body.節足百n; num15++) { c.両節足百_0(num15, RNG.XS.NextBool(), num, num); } } - if (c.Bod.節尾曳n > 0) + if (c.Body.節尾曳n > 0) { int num = 0; - for (int num16 = 0; num16 < c.Bod.節尾曳n; num16++) + for (int num16 = 0; num16 < c.Body.節尾曳n; num16++) { c.両節尾曳_0(num16, RNG.XS.NextBool(), num, num); } } - if (c.Bod.節尾鋏n > 0) + if (c.Body.節尾鋏n > 0) { int num = 0; - for (int num17 = 0; num17 < c.Bod.節尾鋏n; num17++) + for (int num17 = 0; num17 < c.Body.節尾鋏n; num17++) { c.両節尾鋏_0(num17, RNG.XS.NextBool(), num, num); } } - if (c.Bod.虫鎌n > 0) + if (c.Body.虫鎌n > 0) { int num = 0; - for (int num18 = 0; num18 < c.Bod.虫鎌n; num18++) + for (int num18 = 0; num18 < c.Body.虫鎌n; num18++) { c.両虫鎌_0(num18, RNG.XS.NextBool(), num, num); } } if (b) { - _ = c.Bod.触手n; + _ = c.Body.触手n; _ = 0; - if (c.Bod.触手犬n > 0) + if (c.Body.触手犬n > 0) { - for (int num19 = 0; num19 < c.Bod.触手犬n; num19++) + for (int num19 = 0; num19 < c.Body.触手犬n; num19++) { c.両触手犬_0(num19, 触手犬_0基本[RNG.XS.Next(触手犬_0基本.Length)]); } } - if (c.Bod.尾n > 0) + if (c.Body.尾n > 0) { int num = 尾_0基本[RNG.XS.Next(尾_0基本.Length)]; - for (int num20 = 0; num20 < c.Bod.尾n; num20++) + for (int num20 = 0; num20 < c.Body.尾n; num20++) { c.尾_0(num20, num); } } } - if ((b && (c.Bod.触手n > 0 || c.Bod.触手犬n > 0)) || c.Bod.尾n > 0) + if ((b && (c.Body.触手n > 0 || c.Body.触手犬n > 0)) || c.Body.尾n > 0) { c.SetSymmetry(); } - if (c.Bod.Is魚) + if (c.Body.Is魚) { c.魚_0(魚_0基本[RNG.XS.Next(魚_0基本.Length)]); } - if (c.Bod.Is鯨) + if (c.Body.Is鯨) { c.鯨_0(鯨_0基本[RNG.XS.Next(鯨_0基本.Length)]); } - if (c.Bod.Is蠍) + if (c.Body.Is蠍) { c.蠍_0(蠍_0基本[RNG.XS.Next(蠍_0基本.Length)]); } - if (c.Bod.Is植) + if (c.Body.Is植) { c.植_基本(); } - c.Bod.Update(); + c.Body.Update(); } - public static void Setダブルピース(this Cha c) + public static void Setダブルピース(this Character c) { - if (c.Bod.Arm人n > 0) + if (c.Body.Arm人n > 0) { int num = 15; - for (int i = 0; i < c.Bod.Arm人n; i++) + for (int i = 0; i < c.Body.Arm人n; i++) { c.両腕人_0(i, RNG.XS.NextBool(), RNG.XS.NextBool(), RNG.XS.NextBool(), num, num); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs b/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs index 35be918..c5c51c3 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs @@ -47,7 +47,7 @@ namespace SlaveMatrix } } - public static ChaD GetHarpy() + public static CharacterData GetHarpy() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -116,10 +116,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getアフール() + public static CharacterData Getアフール() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -161,10 +161,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getハルピュイア() + public static CharacterData Getハルピュイア() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -218,10 +218,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD GetPhoenix() + public static CharacterData GetPhoenix() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -278,10 +278,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getラミア() + public static CharacterData Getラミア() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -326,10 +326,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getシーラミア() + public static CharacterData Getシーラミア() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -369,10 +369,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("身長", 頭D2.目高); WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getオノケンタウレ() + public static CharacterData Getオノケンタウレ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -424,10 +424,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getヒッポケンタウレ() + public static CharacterData Getヒッポケンタウレ() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -490,10 +490,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getブケンタウレ() + public static CharacterData Getブケンタウレ() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -560,10 +560,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getカプラケンタウレ() + public static CharacterData Getカプラケンタウレ() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -630,10 +630,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getマーメイド() + public static CharacterData Getマーメイド() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -662,10 +662,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getドルフィンマーメイド() + public static CharacterData Getドルフィンマーメイド() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -694,10 +694,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getオールドマーメイド() + public static CharacterData Getオールドマーメイド() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -730,10 +730,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getイクテュオケンタウレ(bool b) + public static CharacterData Getイクテュオケンタウレ(bool b) { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -786,10 +786,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("身長", 頭D2.目高); WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getデルピヌスケンタウレ() + public static CharacterData Getデルピヌスケンタウレ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -822,10 +822,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getスキュラ() + public static CharacterData Getスキュラ() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -887,10 +887,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("身長", 頭D2.目高); WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getオールドスキュラ(bool b) + public static CharacterData Getオールドスキュラ(bool b) { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -938,10 +938,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getカリュブディス() + public static CharacterData Getカリュブディス() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -996,10 +996,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("身長", 頭D2.目高); WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getアラクネ(bool b) + public static CharacterData Getアラクネ(bool b) { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -1075,10 +1075,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getギルタブリル() + public static CharacterData Getギルタブリル() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -1167,10 +1167,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getギルタブルル() + public static CharacterData Getギルタブルル() { WaistD obj = Uni.Waist(); TorsoD 胴D2 = obj.SetTorso(); @@ -1234,10 +1234,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getアルラウネ() + public static CharacterData Getアルラウネ() { WaistD obj = Uni.Waist(); TorsoD obj2 = obj.SetTorso(); @@ -1343,10 +1343,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getサキュバス() + public static CharacterData Getサキュバス() { WaistD WaistD2 = Uni.Waist(); TorsoD TorsoD2 = WaistD2.SetTorso(); @@ -1417,13 +1417,13 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())) + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())) { 現陰毛 = 0.0 }; } - public static ChaD Getデビル() + public static CharacterData Getデビル() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -1522,10 +1522,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getエンジェル(bool b) + public static CharacterData Getエンジェル(bool b) { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -1584,10 +1584,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getウェアキャット() + public static CharacterData Getウェアキャット() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -1635,10 +1635,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getウェアフォックス() + public static CharacterData Getウェアフォックス() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -1688,10 +1688,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getウェアウルフ() + public static CharacterData Getウェアウルフ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -1733,10 +1733,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getリザードマン() + public static CharacterData Getリザードマン() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -1790,10 +1790,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getドラゴニュート() + public static CharacterData Getドラゴニュート() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -1903,10 +1903,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getドラゴン() + public static CharacterData Getドラゴン() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -2018,10 +2018,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getドラコケンタウレ() + public static CharacterData Getドラコケンタウレ() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -2111,10 +2111,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getワイバーン() + public static CharacterData Getワイバーン() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -2219,10 +2219,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getワーム() + public static CharacterData Getワーム() { WaistD WaistD2 = Uni.Waist(); HeadD 頭D2 = WaistD2.SetTorso().SetChestR().SetNeck() @@ -2268,10 +2268,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getサンドワーム() + public static CharacterData Getサンドワーム() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -2343,10 +2343,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("身長", 頭D2.目高); WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getリュウ() + public static CharacterData Getリュウ() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -2405,10 +2405,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getスライム() + public static CharacterData Getスライム() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -2448,10 +2448,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getフェアリー(bool b1, bool b2) + public static CharacterData Getフェアリー(bool b1, bool b2) { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -2574,10 +2574,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getオーグリス(bool b) + public static CharacterData Getオーグリス(bool b) { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -2645,10 +2645,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getサイクロプス() + public static CharacterData Getサイクロプス() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -2687,10 +2687,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getエイリアン() + public static CharacterData Getエイリアン() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -2746,10 +2746,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("身長", 頭D2.目高); WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getクラーケン() + public static CharacterData Getクラーケン() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -2801,10 +2801,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("身長", 頭D2.目高); WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getセイレーン(int i) + public static CharacterData Getセイレーン(int i) { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -2935,10 +2935,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getユニコーン() + public static CharacterData Getユニコーン() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -2992,10 +2992,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getモノケロス() + public static CharacterData Getモノケロス() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -3059,10 +3059,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getアリコーン() + public static CharacterData Getアリコーン() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -3132,10 +3132,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getバイコーン() + public static CharacterData Getバイコーン() { WaistD obj = Uni.Waist(); ChestD ChestD2 = obj.SetTorso().SetChestR(); @@ -3195,10 +3195,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getペガサス() + public static CharacterData Getペガサス() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -3267,10 +3267,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getグリフォン() + public static CharacterData Getグリフォン() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -3340,10 +3340,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getヒッポグリフ() + public static CharacterData Getヒッポグリフ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -3418,10 +3418,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getキマイラ() + public static CharacterData Getキマイラ() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -3489,10 +3489,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getスフィンクス(bool b) + public static CharacterData Getスフィンクス(bool b) { WaistD WaistD2 = Uni.Waist(); TorsoD e = WaistD2.SetTorso(); @@ -3600,10 +3600,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getレオントケンタウレ() + public static CharacterData Getレオントケンタウレ() { WaistD obj = Uni.Waist(); ChestD ChestD2 = obj.SetTorso().SetChestR(); @@ -3665,10 +3665,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getティグリスケンタウレ() + public static CharacterData Getティグリスケンタウレ() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -3741,10 +3741,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getパンテーラケンタウレ() + public static CharacterData Getパンテーラケンタウレ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -3805,10 +3805,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getチータケンタウレ() + public static CharacterData Getチータケンタウレ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -3882,10 +3882,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getウェアドラゴンフライ() + public static CharacterData Getウェアドラゴンフライ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -3945,10 +3945,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getウェアビートル() + public static CharacterData Getウェアビートル() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -4007,10 +4007,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getウェアスタッグビートル() + public static CharacterData Getウェアスタッグビートル() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -4072,10 +4072,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getウェアマンティス() + public static CharacterData Getウェアマンティス() { WaistD obj = Uni.Waist(); TorsoD obj2 = obj.SetTorso(); @@ -4134,10 +4134,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("身長", 頭D2.目高); obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getエキドナ() + public static CharacterData Getエキドナ() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -4196,10 +4196,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getゴルゴン() + public static CharacterData Getゴルゴン() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -4286,10 +4286,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getヒュドラ() + public static CharacterData Getヒュドラ() { WaistD WaistD2 = Uni.Waist(); HeadD 頭D2 = WaistD2.SetTorso().SetChestR().SetNeck() @@ -4337,10 +4337,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getウロボロス() + public static CharacterData Getウロボロス() { WaistD WaistD2 = Uni.Waist(); HeadD 頭D2 = WaistD2.SetTorso().SetChestR().SetNeck() @@ -4375,10 +4375,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getカッパ() + public static CharacterData Getカッパ() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -4424,10 +4424,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("身長", 頭D2.目高); WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getムカデジョウロウ() + public static CharacterData Getムカデジョウロウ() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -4511,10 +4511,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getカーバンクル() + public static CharacterData Getカーバンクル() { WaistD WaistD2 = Uni.Waist(); ChestD obj = WaistD2.SetTorso().SetChestR(); @@ -4563,10 +4563,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getバジリスク() + public static CharacterData Getバジリスク() { WaistD WaistD2 = Uni.Waist(); TorsoD obj = WaistD2.SetTorso(); @@ -4633,10 +4633,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getコカトリス() + public static CharacterData Getコカトリス() { WaistD WaistD2 = Uni.Waist(); TorsoD obj = WaistD2.SetTorso(); @@ -4694,10 +4694,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(b0: false)); + return new CharacterData(WaistD2, new 体色(b0: false)); } - public static ChaD Getカトブレパス() + public static CharacterData Getカトブレパス() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -4757,10 +4757,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: false)); + return new CharacterData(obj, new 体色(b0: false)); } - public static ChaD Getミノタウロス() + public static CharacterData Getミノタウロス() { WaistD WaistD2 = Uni.Waist(); ChestD ChestD2 = WaistD2.SetTorso().SetChestR(); @@ -4810,10 +4810,10 @@ namespace SlaveMatrix WaistD2.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); WaistD2.SetLowerHair(); WaistD2.AdjustScale(頭D2); - return new ChaD(WaistD2, new 体色(RNG.XS.NextBool())); + return new CharacterData(WaistD2, new 体色(RNG.XS.NextBool())); } - public static ChaD Getリリン() + public static CharacterData Getリリン() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -4845,10 +4845,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(RNG.XS.NextBool())); + return new CharacterData(obj, new 体色(RNG.XS.NextBool())); } - public static ChaD Getエルフ() + public static CharacterData Getエルフ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -4880,10 +4880,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: true)); + return new CharacterData(obj, new 体色(b0: true)); } - public static ChaD Getドワーフ() + public static CharacterData Getドワーフ() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -4915,10 +4915,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.2 + RNG.XS.NextDouble(0.8)); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: true)); + return new CharacterData(obj, new 体色(b0: true)); } - public static ChaD GetViola() + public static CharacterData GetViola() { WaistD waist_description = Uni.Waist(); TorsoD body_description = waist_description.SetTorso(); @@ -5083,7 +5083,7 @@ namespace SlaveMatrix waist_description.EnumEleD().SetValuesD("身長", 0.9); waist_description.EnumEleD().SetValuesD("鋭爪", 0.6); - ChaD chaD = new ChaD(waist_description, new 体色(b0: false) + CharacterData chaD = new CharacterData(waist_description, new 体色(b0: false) { 髪 = Color.FromArgb(255, 239, 241, 194).Add(0, 128, 0), 眉 = Color.FromArgb(255, 239, 241, 194).Add(0, 128, 0), @@ -5106,7 +5106,7 @@ namespace SlaveMatrix } - public static ChaD Getヒューマン() + public static CharacterData Getヒューマン() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -5138,10 +5138,10 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.0); obj.SetLowerHair(); obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: true)); + return new CharacterData(obj, new 体色(b0: true)); } - public static ChaD Getプレーヤー() + public static CharacterData Getプレーヤー() { WaistD obj = Uni.Waist(); ChestD obj2 = obj.SetTorso().SetChestR(); @@ -5173,7 +5173,7 @@ namespace SlaveMatrix obj.EnumEleD().SetValuesD("鋭爪", 0.0); obj.肌_接続.GetEleD<腰肌D>().陰毛_表示 = true; obj.AdjustScale(頭D2); - return new ChaD(obj, new 体色(b0: true) + return new CharacterData(obj, new 体色(b0: true) { 目左 = Sta.GameData.色.瞳色, 目右 = Sta.GameData.色.瞳色, diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index c1d13c4..d992f31 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -1315,7 +1315,7 @@ namespace SlaveMatrix at = typeof(Ele[]).ToString(); cdt = typeof(ColorD).ToString(); cpt = typeof(ColorP).ToString(); - Bodt = typeof(Bod); + Bodt = typeof(Body); dt = typeof(double).ToString(); bt = typeof(bool).ToString(); ct = typeof(Color).ToString(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs index e0e0242..9ff1c11 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs @@ -20,9 +20,9 @@ namespace SlaveMatrix public RenderArea Are; private RenderArea Film; - public Cha Cha; + public Character Cha; - public Bod Bod; + public Body Bod; public InfoPanel ip; @@ -139,9 +139,9 @@ namespace SlaveMatrix public 射精 射精; - public Mot 絶頂ゲージ点滅; - public Mot 射精ゲージ点滅; - public Mots Mots = new Mots(); + public Motion 絶頂ゲージ点滅; + public Motion 射精ゲージ点滅; + public Motions Mots = new Motions(); //moan queue :skull: @@ -188,7 +188,7 @@ namespace SlaveMatrix { if (!ペニス挿入.Is膣 && !ペニス挿入.Is肛 && !ペニス挿入.Is糸 && !マウス挿入.Is膣 && !マウス挿入.Is肛 && !マウス挿入.Is糸 && !ハンド挿入.Is膣 && !ハンド挿入.Is肛 && !ハンド挿入.Is糸 && !ロータ挿入.Is膣 && !ロータ挿入.Is肛 && !ロータ挿入.Is糸 && !コモン挿入.Is膣 && !コモン挿入.Is肛 && !コモン挿入.Is糸 && !ディル挿入.Is膣 && !ディル挿入.Is肛 && !ディル挿入.Is糸 && !アナル挿入.Is膣 && !アナル挿入.Is肛 && !アナル挿入.Is糸 && !デンマ挿入.Is膣 && !デンマ挿入.Is肛 && !デンマ挿入.Is糸 && !ドリル挿入.Is膣 && !ドリル挿入.Is肛 && !ドリル挿入.Is糸 && !パール挿入.Is膣 && !パール挿入.Is肛 && !パール挿入.Is糸 && !ハンド処理.Isくぱぁ && !Player.Is性器接触) { - return Cha.Is放尿(); + return Cha.IsUrinating(); } return true; } @@ -241,7 +241,7 @@ namespace SlaveMatrix { FocusReset(); Focus_nr = value; - if (Med.Mode == "Training" && Cha != null && Cha.ChaD.Lust > 0.5 && RNG.XS.NextBool()) + if (Med.Mode == "Training" && Cha != null && Cha.CharacterData.Lust > 0.5 && RNG.XS.NextBool()) { Cha.EyeTracking.Start(); } @@ -259,7 +259,7 @@ namespace SlaveMatrix focus = value; focus.StaShow = false; focus.使用状態 = UsageStatus.InUse; - focus.Ele.濃度 = 1.0; + focus.Ele.Intensity = 1.0; if (focus == 羽根箒CM) { 羽根箒.角度B = -90.0; @@ -1180,7 +1180,7 @@ namespace SlaveMatrix { if (持ち手) { - ハンド右.濃度 = 0.2; + ハンド右.Intensity = 0.2; } } @@ -1188,7 +1188,7 @@ namespace SlaveMatrix { if (持ち手) { - ハンド右.濃度 = 1.0; + ハンド右.Intensity = 1.0; } } @@ -1338,7 +1338,7 @@ namespace SlaveMatrix public void 通常放し() { - focus.Ele.濃度 = 0.5; + focus.Ele.Intensity = 0.5; Focus = ハンド右CM; if (Med.Mode == "Training") { @@ -1581,7 +1581,7 @@ namespace SlaveMatrix if (!Bod.Is拘束 && Bod.脚人n > 0) { Cha.Leg(); - Cha.Bod.腿Update(); + Cha.Body.腿Update(); } } @@ -1590,7 +1590,7 @@ namespace SlaveMatrix if (!Bod.Is拘束 && Bod.Arm人n > 0 && Bod.Is最前腕人) { Cha.腕(); - Cha.Bod.EI腕前.Updatef = true; + Cha.Body.EI腕前.Updatef = true; } } @@ -1633,9 +1633,9 @@ namespace SlaveMatrix if (IsTool = X < cp.X && cp.Y < Y && mb != MouseButtons.Left && !Isモード) { Med.CursorShow(); - if (focus.Ele.濃度 == 1.0) + if (focus.Ele.Intensity == 1.0) { - Focus.Ele.濃度 = 0.2; + Focus.Ele.Intensity = 0.2; } In持ち手(); Color hc_ = hc; @@ -1648,17 +1648,17 @@ namespace SlaveMatrix where e.使用状態 == UsageStatus.Standby select e) { - item.Ele.濃度 = 0.5; + item.Ele.Intensity = 0.5; } - hcm.Ele.濃度 = 1.0; + hcm.Ele.Intensity = 1.0; } else { foreach (CM item2 in from e in EnumCM() - where e.使用状態 == UsageStatus.Standby && e.Ele.濃度 == 1.0 + where e.使用状態 == UsageStatus.Standby && e.Ele.Intensity == 1.0 select e) { - item2.Ele.濃度 = 0.5; + item2.Ele.Intensity = 0.5; } } } @@ -1672,16 +1672,16 @@ namespace SlaveMatrix { Med.CursorHide(); } - if (focus.Ele.濃度 == 0.2) + if (focus.Ele.Intensity == 0.2) { - Focus.Ele.濃度 = 1.0; + Focus.Ele.Intensity = 1.0; } Out持ち手(); foreach (CM item3 in from e in EnumCM() - where e.使用状態 == UsageStatus.Standby && e.Ele.濃度 == 1.0 + where e.使用状態 == UsageStatus.Standby && e.Ele.Intensity == 1.0 select e) { - item3.Ele.濃度 = 0.5; + item3.Ele.Intensity = 0.5; } if (!Isモード) { @@ -1919,14 +1919,14 @@ namespace SlaveMatrix select e).FirstOrDefault((CM e) => e.Ele.Body.IsHit(ref hc_)); if (cM != null) { - Focus.Ele.濃度 = 0.5; + Focus.Ele.Intensity = 0.5; Focus = cM; - Focus.Ele.濃度 = 0.2; + Focus.Ele.Intensity = 0.2; Focus.Ele.位置B = Med.CursorPosition; Set持ち手(); if (持ち手) { - ハンド右.濃度 = 0.2; + ハンド右.Intensity = 0.2; } else { @@ -2442,7 +2442,7 @@ namespace SlaveMatrix } 調教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.撮影ピース経験) + if (Sta.GameData.TrainingTarget.Trained && !調教UI2.Cha.Body.Is拘束 && 調教UI2.Cha.Body.Is腕人 && !Sta.GameData.TrainingTarget.ChaD.撮影ピース経験) { ip.Text = GameText.愛想が悪い + "\r\n" + GameText.ダブルピースさせますか; ip.Mai.Done = delegate @@ -2452,7 +2452,7 @@ namespace SlaveMatrix //Sounds.操作.Play(); Sta.GameData.TrainingTarget.ChaD.撮影ピース経験 = true; 調教UI2.Cha.Setダブルピース(); - 調教UI2.Cha.Bod.Update(); + 調教UI2.Cha.Body.Update(); ip.選択肢表示 = false; ip.MaiShow = false; }; @@ -2546,45 +2546,45 @@ namespace SlaveMatrix Player.ゲージ降下処理.Start(); 擬音 = new Onomatopoeia(); AddBoxes(); - 絶頂ゲージ点滅 = new Mot(0.0, 1.0) + 絶頂ゲージ点滅 = new Motion(0.0, 1.0) { BaseSpeed = 2.0, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { 調教UI2.絶頂sゲージ.SetAlphaG(m.Value); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { 調教UI2.絶頂sゲージ.SetAlphaG(1.0); } }; Mots.Add(絶頂ゲージ点滅.GetHashCode().ToString(), 絶頂ゲージ点滅); - 射精ゲージ点滅 = new Mot(0.0, 1.0) + 射精ゲージ点滅 = new Motion(0.0, 1.0) { BaseSpeed = 2.0, - Staing = delegate + OnStart = delegate { }, - Runing = delegate(Mot m) + OnUpdate = delegate(Motion m) { 調教UI2.射精mゲージ.SetAlphaG(m.Value); }, - Reaing = delegate + OnReach = delegate { }, - Rouing = delegate + OnLoop = delegate { }, - Ending = delegate + OnEnd = delegate { 調教UI2.射精mゲージ.SetAlphaG(1.0); } @@ -2596,7 +2596,7 @@ namespace SlaveMatrix } } - public void SetTarget(Unit Unit, Cha Cha) + public void SetTarget(Unit Unit, Character Cha) { if (this.Cha != null) { @@ -2604,7 +2604,7 @@ namespace SlaveMatrix this.Cha.放尿擬音 = null; } this.Cha = Cha; - Bod = Cha.Bod; + Bod = Cha.Body; Bod.カーソル = this; ペニス挿入.SetCha(Cha); マウス挿入.SetCha(Cha); @@ -2669,7 +2669,7 @@ namespace SlaveMatrix Bod.断面_表示 = Sta.GameData.断面; } 断面.Dra = Sta.GameData.心眼; - 媚薬.Dra = Sta.GameData.媚薬 && !Cha.ChaD.タトゥ; + 媚薬.Dra = Sta.GameData.媚薬 && !Cha.CharacterData.タトゥ; 拘束具.Dra = Unit.Trained; SlaveStamina.Dra = Sta.StaminaButton; PlayerStamina.Dra = Sta.StaminaButton; @@ -2677,7 +2677,7 @@ namespace SlaveMatrix public void Reset() { - foreach (Mot value in Mots.ms.Values) + foreach (Motion value in Mots.ms.Values) { if (value != Player.ゲージ降下処理) { @@ -2724,7 +2724,7 @@ namespace SlaveMatrix マウスCM.Reset(); ハンド右CM.Reset(); ハンド左CM.Reset(); - ハンド左.濃度 = 1.0; + ハンド左.Intensity = 1.0; ハンド左.SetHitFalse(); ロータCM.Reset(); コモンCM.Reset(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs index fa3aea4..3d5e71e 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Unit.cs @@ -24,7 +24,7 @@ namespace SlaveMatrix public Unit Child; - private ChaD cd; + private CharacterData cd; public ulong Price; @@ -106,7 +106,7 @@ namespace SlaveMatrix } } - public ChaD ChaD + public CharacterData ChaD { get {