REDCODE/SlaveMatrix-SDL
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added rename Shoulder

Browse Source
This commit is contained in:
Absolutely disgusting
2025-11-04 09:19:00 +04:00
parent 011dc69d0f
commit b7cd096825
21 changed files with 946 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs
View File

@@ -70,7 +70,7 @@ namespace SlaveMatrix
胸_翼下右_接続,
胸_背中_接続,
乳房_噴乳_接続,
肩_上腕_接続,
Shoulder_上腕_接続,
Torso_胸_接続,
Torso_肌_接続,
Torso_翼左_接続,

3
SlaveMatrix/SlaveMatrix/BodyPartClasses/Leg_人.cs
View File

@@ -5756,7 +5756,8 @@ namespace SlaveMatrix
{
Leg_人 Leg_人2 = this;
ThisType = GetType();
本体 = new Difs(Sta.脚左["脚"]);
//Leg but if renamed to Leg it broke game
本体 = new Difs(Sta.脚左["Leg"]);
Pars pars = 本体[0][0];
X0Y0_Leg = pars["脚"].ToPar();
X0Y0_筋 = pars["筋"].ToPar();

478
SlaveMatrix/SlaveMatrix/BodyPartClasses/Shoulder.cs Normal file
View File

@@ -0,0 +1,478 @@
using System.Linq;
using _2DGAMELIB;
namespace SlaveMatrix
{
public class Shoulder : Ele
{
public Par X0Y0_脇_脇;
public Par X0Y0_脇_筋肉;
public Par X0Y0_Shoulder_Shoulder;
public Par X0Y0_Shoulder_虫性_甲殻1;
public Par X0Y0_Shoulder_虫性_甲殻2;
public Par X0Y0_Shoulder_傷I1;
public Par X0Y0_Shoulder_傷I2;
public Par X0Y0_Shoulder_傷I3;
public Par X0Y0_Shoulder_傷I4;
public Par X0Y0_Shoulder_シャツ;
public Par X0Y0_Shoulder_ナース;
public ColorD 脇_脇CD;
public ColorD 脇_筋肉CD;
public ColorD Shoulder_ShoulderCD;
public ColorD Shoulder_虫性_甲殻1CD;
public ColorD Shoulder_虫性_甲殻2CD;
public ColorD Shoulder_傷I1CD;
public ColorD Shoulder_傷I2CD;
public ColorD Shoulder_傷I3CD;
public ColorD Shoulder_傷I4CD;
public ColorD Shoulder_シャツCD;
public ColorD Shoulder_ナースCD;
public ColorP X0Y0_脇_脇CP;
public ColorP X0Y0_脇_筋肉CP;
public ColorP X0Y0_Shoulder_ShoulderCP;
public ColorP X0Y0_Shoulder_虫性_甲殻1CP;
public ColorP X0Y0_Shoulder_虫性_甲殻2CP;
public ColorP X0Y0_Shoulder_傷I1CP;
public ColorP X0Y0_Shoulder_傷I2CP;
public ColorP X0Y0_Shoulder_傷I3CP;
public ColorP X0Y0_Shoulder_傷I4CP;
public ColorP X0Y0_Shoulder_シャツCP;
public ColorP X0Y0_Shoulder_ナースCP;
public スタンプK キスマーク;
public スタンプW 鞭痕;
public Ele[] 上腕_接続;
public override bool 欠損
{
get
{
return 欠損_;
}
set
{
欠損_ = value;
}
}
public override bool 筋肉
{
get
{
return 筋肉_;
}
set
{
筋肉_ = value;
脇_筋肉_表示 = 筋肉_;
X0Y0_脇_脇.OP.ExpansionXY(X0Y0_脇_脇.OP.GetCenter(), 0.0005);
X0Y0_脇_脇.JP.ExpansionXY(X0Y0_脇_脇.JP.GetCenter(), 0.0005);
X0Y0_Shoulder_Shoulder.OP.ExpansionXY(X0Y0_Shoulder_Shoulder.OP.GetCenter(), 0.0005);
X0Y0_Shoulder_Shoulder.JP.ExpansionXY(X0Y0_Shoulder_Shoulder.JP.GetCenter(), 0.0005);
}
}
public override bool 拘束
{
get
{
return 拘束_;
}
set
{
拘束_ = value;
}
}
public bool 脇_脇_表示
{
get
{
return X0Y0_脇_脇.Dra;
}
set
{
X0Y0_脇_脇.Dra = value;
X0Y0_脇_脇.Hit = value;
}
}
public bool 脇_筋肉_表示
{
get
{
return X0Y0_脇_筋肉.Dra;
}
set
{
X0Y0_脇_筋肉.Dra = value;
X0Y0_脇_筋肉.Hit = value;
}
}
public bool Shoulder_表示
{
get
{
return X0Y0_Shoulder_Shoulder.Dra;
}
set
{
X0Y0_Shoulder_Shoulder.Dra = value;
X0Y0_Shoulder_Shoulder.Hit = value;
}
}
public bool Shoulder_虫性_甲殻1_表示
{
get
{
return X0Y0_Shoulder_虫性_甲殻1.Dra;
}
set
{
X0Y0_Shoulder_虫性_甲殻1.Dra = value;
X0Y0_Shoulder_虫性_甲殻1.Hit = value;
}
}
public bool Shoulder_虫性_甲殻2_表示
{
get
{
return X0Y0_Shoulder_虫性_甲殻2.Dra;
}
set
{
X0Y0_Shoulder_虫性_甲殻2.Dra = value;
X0Y0_Shoulder_虫性_甲殻2.Hit = value;
}
}
public bool Shoulder_傷I1_表示
{
get
{
return X0Y0_Shoulder_傷I1.Dra;
}
set
{
X0Y0_Shoulder_傷I1.Dra = value;
X0Y0_Shoulder_傷I1.Hit = value;
}
}
public bool Shoulder_傷I2_表示
{
get
{
return X0Y0_Shoulder_傷I2.Dra;
}
set
{
X0Y0_Shoulder_傷I2.Dra = value;
X0Y0_Shoulder_傷I2.Hit = value;
}
}
public bool Shoulder_傷I3_表示
{
get
{
return X0Y0_Shoulder_傷I3.Dra;
}
set
{
X0Y0_Shoulder_傷I3.Dra = value;
X0Y0_Shoulder_傷I3.Hit = value;
}
}
public bool Shoulder_傷I4_表示
{
get
{
return X0Y0_Shoulder_傷I4.Dra;
}
set
{
X0Y0_Shoulder_傷I4.Dra = value;
X0Y0_Shoulder_傷I4.Hit = value;
}
}
public bool Shoulder_シャツ_表示
{
get
{
return X0Y0_Shoulder_シャツ.Dra;
}
set
{
X0Y0_Shoulder_シャツ.Dra = value;
X0Y0_Shoulder_シャツ.Hit = value;
}
}
public bool Shoulder_ナース_表示
{
get
{
return X0Y0_Shoulder_ナース.Dra;
}
set
{
X0Y0_Shoulder_ナース.Dra = value;
X0Y0_Shoulder_ナース.Hit = value;
}
}
public override bool 表示
{
get
{
return 脇_脇_表示;
}
set
{
脇_脇_表示 = value;
脇_筋肉_表示 = value;
Shoulder_表示 = value;
Shoulder_虫性_甲殻1_表示 = value;
Shoulder_虫性_甲殻2_表示 = value;
Shoulder_傷I1_表示 = value;
Shoulder_傷I2_表示 = value;
Shoulder_傷I3_表示 = value;
Shoulder_傷I4_表示 = value;
Shoulder_シャツ_表示 = value;
Shoulder_ナース_表示 = value;
}
}
public override double 濃度
{
get
{
return 脇_脇CD.不透明度;
}
set
{
脇_脇CD.不透明度 = value;
脇_筋肉CD.不透明度 = value;
Shoulder_ShoulderCD.不透明度 = value;
Shoulder_虫性_甲殻1CD.不透明度 = value;
Shoulder_虫性_甲殻2CD.不透明度 = value;
Shoulder_傷I1CD.不透明度 = value;
Shoulder_傷I2CD.不透明度 = value;
Shoulder_傷I3CD.不透明度 = value;
Shoulder_傷I4CD.不透明度 = value;
Shoulder_シャツCD.不透明度 = value;
Shoulder_ナースCD.不透明度 = value;
}
}
public JointS 上腕_接続点 => new JointS(本体, X0Y0_Shoulder_Shoulder, 1);
public Shoulder(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, ShoulderD e)
{
Shoulder Shoulder2 = this;
ThisType = GetType();
本体 = new Difs(Sta.肩左["Shoulder"]);
Pars pars = 本体[0][0];
Pars pars2 = pars["脇"].ToPars();
X0Y0_脇_脇 = pars2["脇"].ToPar();
X0Y0_脇_筋肉 = pars2["筋肉"].ToPar();
pars2 = pars["肩"].ToPars();
X0Y0_Shoulder_Shoulder = pars2["肩"].ToPar();
Pars pars3 = pars2["虫性"].ToPars();
X0Y0_Shoulder_虫性_甲殻1 = pars3["甲殻1"].ToPar();
X0Y0_Shoulder_虫性_甲殻2 = pars3["甲殻2"].ToPar();
X0Y0_Shoulder_傷I1 = pars2["傷I1"].ToPar();
X0Y0_Shoulder_傷I2 = pars2["傷I2"].ToPar();
X0Y0_Shoulder_傷I3 = pars2["傷I3"].ToPar();
X0Y0_Shoulder_傷I4 = pars2["傷I4"].ToPar();
X0Y0_Shoulder_シャツ = pars2["シャツ"].ToPar();
X0Y0_Shoulder_ナース = pars2["ナース"].ToPar();
本体.SetJoints();
接続根 = new JointD(本体);
右 = e.右;
反転X = e.反転X;
反転Y = e.反転Y;
基準C = e.基準C;
位置C = e.位置C;
角度B = e.角度B;
角度C = e.角度C;
尺度B = e.尺度B;
尺度C = e.尺度C;
尺度XB = e.尺度XB;
尺度XC = e.尺度XC;
尺度YB = e.尺度YB;
尺度YC = e.尺度YC;
肥大 = e.肥大;
身長 = e.身長;
Xv = e.Xv;
Yv = e.Yv;
Xi = e.Xi;
Yi = e.Yi;
サイズ = e.サイズ;
サイズX = e.サイズX;
サイズY = e.サイズY;
脇_脇_表示 = e.脇_脇_表示;
脇_筋肉_表示 = e.脇_筋肉_表示;
Shoulder_表示 = e.Shoulder_表示;
Shoulder_虫性_甲殻1_表示 = e.Shoulder_虫性_甲殻1_表示;
Shoulder_虫性_甲殻2_表示 = e.Shoulder_虫性_甲殻2_表示;
Shoulder_傷I1_表示 = e.Shoulder_傷I1_表示;
Shoulder_傷I2_表示 = e.Shoulder_傷I2_表示;
Shoulder_傷I3_表示 = e.Shoulder_傷I3_表示;
Shoulder_傷I4_表示 = e.Shoulder_傷I4_表示;
Shoulder_シャツ_表示 = e.Shoulder_シャツ_表示;
Shoulder_ナース_表示 = e.Shoulder_ナース_表示;
欠損 = e.欠損;
筋肉 = e.筋肉;
拘束 = e.拘束;
if (!e.表示)
{
表示 = false;
}
if (e.上腕_接続.Count > 0)
{
Ele f;
上腕_接続 = e.上腕_接続.Select(delegate(EleD g)
{
f = g.GetEle(DisUnit, Med, 体配色);
f.Par = Shoulder2;
f.ConnectionType = ConnectionInfo.Shoulder_上腕_接続;
f.接続(Shoulder2.上腕_接続点);
return f;
}).ToArray();
}
base.配色指定 = 配色指定;
配色(体配色);
X0Y0_脇_脇CP = new ColorP(X0Y0_脇_脇, 脇_脇CD, DisUnit, abj: true);
X0Y0_脇_筋肉CP = new ColorP(X0Y0_脇_筋肉, 脇_筋肉CD, DisUnit, abj: true);
X0Y0_Shoulder_ShoulderCP = new ColorP(X0Y0_Shoulder_Shoulder, Shoulder_ShoulderCD, DisUnit, abj: true);
X0Y0_Shoulder_虫性_甲殻1CP = new ColorP(X0Y0_Shoulder_虫性_甲殻1, Shoulder_虫性_甲殻1CD, DisUnit, abj: true);
X0Y0_Shoulder_虫性_甲殻2CP = new ColorP(X0Y0_Shoulder_虫性_甲殻2, Shoulder_虫性_甲殻2CD, DisUnit, abj: true);
X0Y0_Shoulder_傷I1CP = new ColorP(X0Y0_Shoulder_傷I1, Shoulder_傷I1CD, DisUnit, abj: true);
X0Y0_Shoulder_傷I2CP = new ColorP(X0Y0_Shoulder_傷I2, Shoulder_傷I2CD, DisUnit, abj: true);
X0Y0_Shoulder_傷I3CP = new ColorP(X0Y0_Shoulder_傷I3, Shoulder_傷I3CD, DisUnit, abj: true);
X0Y0_Shoulder_傷I4CP = new ColorP(X0Y0_Shoulder_傷I4, Shoulder_傷I4CD, DisUnit, abj: true);
X0Y0_Shoulder_シャツCP = new ColorP(X0Y0_Shoulder_シャツ, Shoulder_シャツCD, DisUnit, abj: true);
X0Y0_Shoulder_ナースCP = new ColorP(X0Y0_Shoulder_ナース, Shoulder_ナースCD, DisUnit, abj: true);
濃度 = e.濃度;
X0Y0_脇_脇.BasePointBase = X0Y0_脇_脇.BasePointBase.AddY(-0.001);
}
public void 脇描画(RenderArea Are)
{
Are.Draw(X0Y0_脇_脇);
Are.Draw(X0Y0_脇_筋肉);
}
public void 服描画(RenderArea Are)
{
Are.Draw(X0Y0_Shoulder_シャツ);
Are.Draw(X0Y0_Shoulder_ナース);
}
public override void 描画0(RenderArea Are)
{
Are.Draw(X0Y0_Shoulder_Shoulder);
Are.Draw(X0Y0_Shoulder_傷I1);
Are.Draw(X0Y0_Shoulder_傷I2);
Are.Draw(X0Y0_Shoulder_傷I3);
Are.Draw(X0Y0_Shoulder_傷I4);
キスマーク.Draw(Are);
鞭痕.Draw(Are);
Are.Draw(X0Y0_Shoulder_虫性_甲殻1);
Are.Draw(X0Y0_Shoulder_虫性_甲殻2);
}
public override bool Is布(Par p)
{
if (p != X0Y0_Shoulder_シャツ)
{
return p == X0Y0_Shoulder_ナース;
}
return true;
}
public override void 色更新()
{
X0Y0_脇_脇CP.Update();
X0Y0_脇_筋肉CP.Update();
X0Y0_Shoulder_ShoulderCP.Update();
X0Y0_Shoulder_虫性_甲殻1CP.Update();
X0Y0_Shoulder_虫性_甲殻2CP.Update();
X0Y0_Shoulder_傷I1CP.Update();
X0Y0_Shoulder_傷I2CP.Update();
X0Y0_Shoulder_傷I3CP.Update();
X0Y0_Shoulder_傷I4CP.Update();
}
public void シャツ色更新(Vector2D[] シャツ)
{
X0Y0_Shoulder_シャツCP.Update(シャツ);
}
public void ナース色更新(Vector2D[] ナース)
{
X0Y0_Shoulder_ナースCP.Update(ナース);
}
private void 配色(体配色 体配色)
{
配色N0(体配色);
}
private void 配色N0(体配色 体配色)
{
脇_脇CD = new ColorD(ref Col.Black, ref 体配色.人肌R);
脇_筋肉CD = new ColorD(ref Col.Black, ref 体配色.人肌R);
Shoulder_ShoulderCD = new ColorD(ref Col.Black, ref 体配色.人肌O);
Shoulder_虫性_甲殻1CD = new ColorD(ref Col.Black, ref 体配色.甲1O);
Shoulder_虫性_甲殻2CD = new ColorD(ref Col.Black, ref 体配色.甲1O);
Shoulder_傷I1CD = new ColorD(ref Col.Empty, ref 体配色.粘膜);
Shoulder_傷I2CD = new ColorD(ref Col.Empty, ref 体配色.粘膜);
Shoulder_傷I3CD = new ColorD(ref Col.Empty, ref 体配色.粘膜);
Shoulder_傷I4CD = new ColorD(ref Col.Empty, ref 体配色.粘膜);
Shoulder_シャツCD = new ColorD();
Shoulder_ナースCD = new ColorD();
}
}
}

51
SlaveMatrix/SlaveMatrix/BodyPartClasses/ShoulderD.cs Normal file
View File

@@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using _2DGAMELIB;
namespace SlaveMatrix
{
[Serializable]
public class ShoulderD : EleD
{
public bool 脇_脇_表示 = true;
public bool 脇_筋肉_表示;
public bool Shoulder_表示 = true;
public bool Shoulder_虫性_甲殻1_表示;
public bool Shoulder_虫性_甲殻2_表示;
public bool Shoulder_傷I1_表示;
public bool Shoulder_傷I2_表示;
public bool Shoulder_傷I3_表示;
public bool Shoulder_傷I4_表示;
public bool Shoulder_シャツ_表示;
public bool Shoulder_ナース_表示;
public List<EleD> 上腕_接続 = new List<EleD>();
public ShoulderD()
{
ThisType = GetType();
}
public void 上腕接続(EleD e)
{
上腕_接続.Add(e);
e.Par = this;
e.接続情報 = ConnectionInfo.Shoulder_上腕_接続;
}
public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色)
{
return new Shoulder(DisUnit, 配色指定, 体配色, Med, this);
}
}
}

2
SlaveMatrix/SlaveMatrix/BodyPartClasses/Sweat.cs
View File

@@ -20,7 +20,7 @@ namespace SlaveMatrix
{
Sta.胸t.ToString(),
Sta.胴t.ToString(),
Sta.肩t.ToString(),
Sta.Shouldert.ToString(),
Sta.腰t.ToString()
};

20
SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs
View File

@@ -62,11 +62,11 @@ namespace SlaveMatrix
private ContactType 挿入箇所;
private 肩 肩;
private Shoulder Shoulder;
private 肩 肩左;
private Shoulder 肩左;
private 肩 肩右;
private Shoulder 肩右;
private 上腕_人 上腕;
@@ -740,7 +740,7 @@ namespace SlaveMatrix
ペニス処理2.Cha.腕_人_手コキ右(0, 0.0, 0.0, 0.0, 0.0);
}
ペニス処理2.手固定 = true;
ペニス処理2.肩 = (ペニス処理2.手コキ左 ? ペニス処理2.肩左 : ペニス処理2.肩右);
ペニス処理2.Shoulder = (ペニス処理2.手コキ左 ? ペニス処理2.肩左 : ペニス処理2.肩右);
ペニス処理2.上腕 = (ペニス処理2.手コキ左 ? ペニス処理2.上腕左 : ペニス処理2.上腕右);
ペニス処理2.下腕 = (ペニス処理2.手コキ左 ? ペニス処理2.下腕左 : ペニス処理2.下腕右);
ペニス処理2.手 = (ペニス処理2.手コキ左 ? ペニス処理2.手左 : ペニス処理2.手右);
@@ -755,9 +755,9 @@ namespace SlaveMatrix
},
Runing = delegate(Mot m)
{
if (ペニス処理2.肩 != null)
if (ペニス処理2.Shoulder != null)
{
ペニス処理2.肩.角度C = s * 5.0 * m.Value;
ペニス処理2.Shoulder.角度C = s * 5.0 * m.Value;
}
if (ペニス処理2.下腕 != null)
{
@@ -794,9 +794,9 @@ namespace SlaveMatrix
{
ペニス処理2.手固定 = false;
調教UI.コキ = false;
if (ペニス処理2.肩 != null)
if (ペニス処理2.Shoulder != null)
{
ペニス処理2.肩.角度C = 0.0;
ペニス処理2.Shoulder.角度C = 0.0;
}
if (ペニス処理2.下腕 != null)
{
@@ -1106,11 +1106,11 @@ namespace SlaveMatrix
Bod = Cha.Bod;
if (Bod.腕人n > 0)
{
肩左 = Bod.腕人左[0].肩;
肩左 = Bod.腕人左[0].Shoulder;
上腕左 = Bod.腕人左[0].上腕;
下腕左 = Bod.腕人左[0].下腕;
手左 = Bod.腕人左[0].手;
肩右 = Bod.腕人右[0].肩;
肩右 = Bod.腕人右[0].Shoulder;
上腕右 = Bod.腕人右[0].上腕;
下腕右 = Bod.腕人右[0].下腕;
手右 = Bod.腕人右[0].手;

8
SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs
View File

@@ -87,7 +87,7 @@ namespace SlaveMatrix
Sta.鳳凰Dt.ToString()
};
private static HashSet<string> 肩人 = new HashSet<string> { Sta.肩Dt.ToString() };
private static HashSet<string> 肩人 = new HashSet<string> { Sta.ShoulderDt.ToString() };
private static HashSet<string> 胸翼上人 = new HashSet<string>
{
@@ -1247,7 +1247,7 @@ namespace SlaveMatrix
顔面
},
{
ConnectionInfo.肩_上腕_接続,
ConnectionInfo.Shoulder_上腕_接続,
上腕人
},
{
@@ -3784,7 +3784,7 @@ namespace SlaveMatrix
{
((上腕_蝙D)item32).竜性_鱗1_表示 = false;
}
else if (item32 is 上腕D && item32.Par is 肩D)
else if (item32 is 上腕D && item32.Par is ShoulderD)
{
item32.AlignR();
}
@@ -4448,7 +4448,7 @@ namespace SlaveMatrix
if (!原種モード)
{
string text = 接続.ToString();
if (text.Contains("肩") || text.Contains("脇") || text.Contains("翼"))
if (text.Contains("Shoulder") || text.Contains("脇") || text.Contains("翼"))
{
if (num.Lot())
{

478
SlaveMatrix/SlaveMatrix/BodyPartClasses/肩.cs
View File

@@ -1,478 +0,0 @@
using System.Linq;
using _2DGAMELIB;
namespace SlaveMatrix
{
public class 肩 : Ele
{
public Par X0Y0_脇_脇;
public Par X0Y0_脇_筋肉;
public Par X0Y0_肩_肩;
public Par X0Y0_肩_虫性_甲殻1;
public Par X0Y0_肩_虫性_甲殻2;
public Par X0Y0_肩_傷I1;
public Par X0Y0_肩_傷I2;
public Par X0Y0_肩_傷I3;
public Par X0Y0_肩_傷I4;
public Par X0Y0_肩_シャツ;
public Par X0Y0_肩_ナース;
public ColorD 脇_脇CD;
public ColorD 脇_筋肉CD;
public ColorD 肩_肩CD;
public ColorD 肩_虫性_甲殻1CD;
public ColorD 肩_虫性_甲殻2CD;
public ColorD 肩_傷I1CD;
public ColorD 肩_傷I2CD;
public ColorD 肩_傷I3CD;
public ColorD 肩_傷I4CD;
public ColorD 肩_シャツCD;
public ColorD 肩_ナースCD;
public ColorP X0Y0_脇_脇CP;
public ColorP X0Y0_脇_筋肉CP;
public ColorP X0Y0_肩_肩CP;
public ColorP X0Y0_肩_虫性_甲殻1CP;
public ColorP X0Y0_肩_虫性_甲殻2CP;
public ColorP X0Y0_肩_傷I1CP;
public ColorP X0Y0_肩_傷I2CP;
public ColorP X0Y0_肩_傷I3CP;
public ColorP X0Y0_肩_傷I4CP;
public ColorP X0Y0_肩_シャツCP;
public ColorP X0Y0_肩_ナースCP;
public スタンプK キスマーク;
public スタンプW 鞭痕;
public Ele[] 上腕_接続;
public override bool 欠損
{
get
{
return 欠損_;
}
set
{
欠損_ = value;
}
}
public override bool 筋肉
{
get
{
return 筋肉_;
}
set
{
筋肉_ = value;
脇_筋肉_表示 = 筋肉_;
X0Y0_脇_脇.OP.ExpansionXY(X0Y0_脇_脇.OP.GetCenter(), 0.0005);
X0Y0_脇_脇.JP.ExpansionXY(X0Y0_脇_脇.JP.GetCenter(), 0.0005);
X0Y0_肩_肩.OP.ExpansionXY(X0Y0_肩_肩.OP.GetCenter(), 0.0005);
X0Y0_肩_肩.JP.ExpansionXY(X0Y0_肩_肩.JP.GetCenter(), 0.0005);
}
}
public override bool 拘束
{
get
{
return 拘束_;
}
set
{
拘束_ = value;
}
}
public bool 脇_脇_表示
{
get
{
return X0Y0_脇_脇.Dra;
}
set
{
X0Y0_脇_脇.Dra = value;
X0Y0_脇_脇.Hit = value;
}
}
public bool 脇_筋肉_表示
{
get
{
return X0Y0_脇_筋肉.Dra;
}
set
{
X0Y0_脇_筋肉.Dra = value;
X0Y0_脇_筋肉.Hit = value;
}
}
public bool 肩_表示
{
get
{
return X0Y0_肩_肩.Dra;
}
set
{
X0Y0_肩_肩.Dra = value;
X0Y0_肩_肩.Hit = value;
}
}
public bool 肩_虫性_甲殻1_表示
{
get
{
return X0Y0_肩_虫性_甲殻1.Dra;
}
set
{
X0Y0_肩_虫性_甲殻1.Dra = value;
X0Y0_肩_虫性_甲殻1.Hit = value;
}
}
public bool 肩_虫性_甲殻2_表示
{
get
{
return X0Y0_肩_虫性_甲殻2.Dra;
}
set
{
X0Y0_肩_虫性_甲殻2.Dra = value;
X0Y0_肩_虫性_甲殻2.Hit = value;
}
}
public bool 肩_傷I1_表示
{
get
{
return X0Y0_肩_傷I1.Dra;
}
set
{
X0Y0_肩_傷I1.Dra = value;
X0Y0_肩_傷I1.Hit = value;
}
}
public bool 肩_傷I2_表示
{
get
{
return X0Y0_肩_傷I2.Dra;
}
set
{
X0Y0_肩_傷I2.Dra = value;
X0Y0_肩_傷I2.Hit = value;
}
}
public bool 肩_傷I3_表示
{
get
{
return X0Y0_肩_傷I3.Dra;
}
set
{
X0Y0_肩_傷I3.Dra = value;
X0Y0_肩_傷I3.Hit = value;
}
}
public bool 肩_傷I4_表示
{
get
{
return X0Y0_肩_傷I4.Dra;
}
set
{
X0Y0_肩_傷I4.Dra = value;
X0Y0_肩_傷I4.Hit = value;
}
}
public bool 肩_シャツ_表示
{
get
{
return X0Y0_肩_シャツ.Dra;
}
set
{
X0Y0_肩_シャツ.Dra = value;
X0Y0_肩_シャツ.Hit = value;
}
}
public bool 肩_ナース_表示
{
get
{
return X0Y0_肩_ナース.Dra;
}
set
{
X0Y0_肩_ナース.Dra = value;
X0Y0_肩_ナース.Hit = value;
}
}
public override bool 表示
{
get
{
return 脇_脇_表示;
}
set
{
脇_脇_表示 = value;
脇_筋肉_表示 = value;
肩_表示 = value;
肩_虫性_甲殻1_表示 = value;
肩_虫性_甲殻2_表示 = value;
肩_傷I1_表示 = value;
肩_傷I2_表示 = value;
肩_傷I3_表示 = value;
肩_傷I4_表示 = value;
肩_シャツ_表示 = value;
肩_ナース_表示 = value;
}
}
public override double 濃度
{
get
{
return 脇_脇CD.不透明度;
}
set
{
脇_脇CD.不透明度 = value;
脇_筋肉CD.不透明度 = value;
肩_肩CD.不透明度 = value;
肩_虫性_甲殻1CD.不透明度 = value;
肩_虫性_甲殻2CD.不透明度 = value;
肩_傷I1CD.不透明度 = value;
肩_傷I2CD.不透明度 = value;
肩_傷I3CD.不透明度 = value;
肩_傷I4CD.不透明度 = value;
肩_シャツCD.不透明度 = value;
肩_ナースCD.不透明度 = value;
}
}
public JointS 上腕_接続点 => new JointS(本体, X0Y0_肩_肩, 1);
public 肩(double DisUnit, 配色指定 配色指定, 体配色 体配色, Med Med, 肩D e)
{
肩 肩2 = this;
ThisType = GetType();
本体 = new Difs(Sta.肩左["肩"]);
Pars pars = 本体[0][0];
Pars pars2 = pars["脇"].ToPars();
X0Y0_脇_脇 = pars2["脇"].ToPar();
X0Y0_脇_筋肉 = pars2["筋肉"].ToPar();
pars2 = pars["肩"].ToPars();
X0Y0_肩_肩 = pars2["肩"].ToPar();
Pars pars3 = pars2["虫性"].ToPars();
X0Y0_肩_虫性_甲殻1 = pars3["甲殻1"].ToPar();
X0Y0_肩_虫性_甲殻2 = pars3["甲殻2"].ToPar();
X0Y0_肩_傷I1 = pars2["傷I1"].ToPar();
X0Y0_肩_傷I2 = pars2["傷I2"].ToPar();
X0Y0_肩_傷I3 = pars2["傷I3"].ToPar();
X0Y0_肩_傷I4 = pars2["傷I4"].ToPar();
X0Y0_肩_シャツ = pars2["シャツ"].ToPar();
X0Y0_肩_ナース = pars2["ナース"].ToPar();
本体.SetJoints();
接続根 = new JointD(本体);
右 = e.右;
反転X = e.反転X;
反転Y = e.反転Y;
基準C = e.基準C;
位置C = e.位置C;
角度B = e.角度B;
角度C = e.角度C;
尺度B = e.尺度B;
尺度C = e.尺度C;
尺度XB = e.尺度XB;
尺度XC = e.尺度XC;
尺度YB = e.尺度YB;
尺度YC = e.尺度YC;
肥大 = e.肥大;
身長 = e.身長;
Xv = e.Xv;
Yv = e.Yv;
Xi = e.Xi;
Yi = e.Yi;
サイズ = e.サイズ;
サイズX = e.サイズX;
サイズY = e.サイズY;
脇_脇_表示 = e.脇_脇_表示;
脇_筋肉_表示 = e.脇_筋肉_表示;
肩_表示 = e.肩_表示;
肩_虫性_甲殻1_表示 = e.肩_虫性_甲殻1_表示;
肩_虫性_甲殻2_表示 = e.肩_虫性_甲殻2_表示;
肩_傷I1_表示 = e.肩_傷I1_表示;
肩_傷I2_表示 = e.肩_傷I2_表示;
肩_傷I3_表示 = e.肩_傷I3_表示;
肩_傷I4_表示 = e.肩_傷I4_表示;
肩_シャツ_表示 = e.肩_シャツ_表示;
肩_ナース_表示 = e.肩_ナース_表示;
欠損 = e.欠損;
筋肉 = e.筋肉;
拘束 = e.拘束;
if (!e.表示)
{
表示 = false;
}
if (e.上腕_接続.Count > 0)
{
Ele f;
上腕_接続 = e.上腕_接続.Select(delegate(EleD g)
{
f = g.GetEle(DisUnit, Med, 体配色);
f.Par = 肩2;
f.ConnectionType = ConnectionInfo.肩_上腕_接続;
f.接続(肩2.上腕_接続点);
return f;
}).ToArray();
}
base.配色指定 = 配色指定;
配色(体配色);
X0Y0_脇_脇CP = new ColorP(X0Y0_脇_脇, 脇_脇CD, DisUnit, abj: true);
X0Y0_脇_筋肉CP = new ColorP(X0Y0_脇_筋肉, 脇_筋肉CD, DisUnit, abj: true);
X0Y0_肩_肩CP = new ColorP(X0Y0_肩_肩, 肩_肩CD, DisUnit, abj: true);
X0Y0_肩_虫性_甲殻1CP = new ColorP(X0Y0_肩_虫性_甲殻1, 肩_虫性_甲殻1CD, DisUnit, abj: true);
X0Y0_肩_虫性_甲殻2CP = new ColorP(X0Y0_肩_虫性_甲殻2, 肩_虫性_甲殻2CD, DisUnit, abj: true);
X0Y0_肩_傷I1CP = new ColorP(X0Y0_肩_傷I1, 肩_傷I1CD, DisUnit, abj: true);
X0Y0_肩_傷I2CP = new ColorP(X0Y0_肩_傷I2, 肩_傷I2CD, DisUnit, abj: true);
X0Y0_肩_傷I3CP = new ColorP(X0Y0_肩_傷I3, 肩_傷I3CD, DisUnit, abj: true);
X0Y0_肩_傷I4CP = new ColorP(X0Y0_肩_傷I4, 肩_傷I4CD, DisUnit, abj: true);
X0Y0_肩_シャツCP = new ColorP(X0Y0_肩_シャツ, 肩_シャツCD, DisUnit, abj: true);
X0Y0_肩_ナースCP = new ColorP(X0Y0_肩_ナース, 肩_ナースCD, DisUnit, abj: true);
濃度 = e.濃度;
X0Y0_脇_脇.BasePointBase = X0Y0_脇_脇.BasePointBase.AddY(-0.001);
}
public void 脇描画(RenderArea Are)
{
Are.Draw(X0Y0_脇_脇);
Are.Draw(X0Y0_脇_筋肉);
}
public void 服描画(RenderArea Are)
{
Are.Draw(X0Y0_肩_シャツ);
Are.Draw(X0Y0_肩_ナース);
}
public override void 描画0(RenderArea Are)
{
Are.Draw(X0Y0_肩_肩);
Are.Draw(X0Y0_肩_傷I1);
Are.Draw(X0Y0_肩_傷I2);
Are.Draw(X0Y0_肩_傷I3);
Are.Draw(X0Y0_肩_傷I4);
キスマーク.Draw(Are);
鞭痕.Draw(Are);
Are.Draw(X0Y0_肩_虫性_甲殻1);
Are.Draw(X0Y0_肩_虫性_甲殻2);
}
public override bool Is布(Par p)
{
if (p != X0Y0_肩_シャツ)
{
return p == X0Y0_肩_ナース;
}
return true;
}
public override void 色更新()
{
X0Y0_脇_脇CP.Update();
X0Y0_脇_筋肉CP.Update();
X0Y0_肩_肩CP.Update();
X0Y0_肩_虫性_甲殻1CP.Update();
X0Y0_肩_虫性_甲殻2CP.Update();
X0Y0_肩_傷I1CP.Update();
X0Y0_肩_傷I2CP.Update();
X0Y0_肩_傷I3CP.Update();
X0Y0_肩_傷I4CP.Update();
}
public void シャツ色更新(Vector2D[] シャツ)
{
X0Y0_肩_シャツCP.Update(シャツ);
}
public void ナース色更新(Vector2D[] ナース)
{
X0Y0_肩_ナースCP.Update(ナース);
}
private void 配色(体配色 体配色)
{
配色N0(体配色);
}
private void 配色N0(体配色 体配色)
{
脇_脇CD = new ColorD(ref Col.Black, ref 体配色.人肌R);
脇_筋肉CD = new ColorD(ref Col.Black, ref 体配色.人肌R);
肩_肩CD = new ColorD(ref Col.Black, ref 体配色.人肌O);
肩_虫性_甲殻1CD = new ColorD(ref Col.Black, ref 体配色.甲1O);
肩_虫性_甲殻2CD = new ColorD(ref Col.Black, ref 体配色.甲1O);
肩_傷I1CD = new ColorD(ref Col.Empty, ref 体配色.粘膜);
肩_傷I2CD = new ColorD(ref Col.Empty, ref 体配色.粘膜);
肩_傷I3CD = new ColorD(ref Col.Empty, ref 体配色.粘膜);
肩_傷I4CD = new ColorD(ref Col.Empty, ref 体配色.粘膜);
肩_シャツCD = new ColorD();
肩_ナースCD = new ColorD();
}
}
}

51
SlaveMatrix/SlaveMatrix/BodyPartClasses/肩D.cs
View File

@@ -1,51 +0,0 @@
using System;
using System.Collections.Generic;
using _2DGAMELIB;
namespace SlaveMatrix
{
[Serializable]
public class 肩D : EleD
{
public bool 脇_脇_表示 = true;
public bool 脇_筋肉_表示;
public bool 肩_表示 = true;
public bool 肩_虫性_甲殻1_表示;
public bool 肩_虫性_甲殻2_表示;
public bool 肩_傷I1_表示;
public bool 肩_傷I2_表示;
public bool 肩_傷I3_表示;
public bool 肩_傷I4_表示;
public bool 肩_シャツ_表示;
public bool 肩_ナース_表示;
public List<EleD> 上腕_接続 = new List<EleD>();
public 肩D()
{
ThisType = GetType();
}
public void 上腕接続(EleD e)
{
上腕_接続.Add(e);
e.Par = this;
e.接続情報 = ConnectionInfo.肩_上腕_接続;
}
public override Ele GetEle(double DisUnit, Med Med, 体配色 体配色)
{
return new 肩(DisUnit, 配色指定, 体配色, Med, this);
}
}
}

2
SlaveMatrix/SlaveMatrix/BodyPartClasses/腕人.cs
View File

@@ -2,7 +2,7 @@ namespace SlaveMatrix
{
public struct 腕人
{
public 肩 肩;
public Shoulder Shoulder;
public 上腕_人 上腕;

2
SlaveMatrix/SlaveMatrix/BodyPartClasses/腕獣.cs
View File

@@ -2,7 +2,7 @@ namespace SlaveMatrix
{
public struct 腕獣
{
public 四足脇 肩;
public 四足脇 Shoulder;
public 獣上腕 上腕;

2
SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼獣.cs
View File

@@ -2,7 +2,7 @@ namespace SlaveMatrix
{
public struct 腕翼獣
{
public 肩 肩;
public Shoulder Shoulder;
public 上腕_蝙 上腕;

2
SlaveMatrix/SlaveMatrix/BodyPartClasses/腕翼鳥.cs
View File

@@ -2,7 +2,7 @@ namespace SlaveMatrix
{
public struct 腕翼鳥
{
public 肩 肩;
public Shoulder Shoulder;
public 上腕_鳥 上腕;

16
SlaveMatrix/SlaveMatrix/BodyPartClasses/飛膜_先.cs
View File

@@ -173,7 +173,7 @@ namespace SlaveMatrix
}
else
{
if (上腕.ConnectionType == ConnectionInfo.肩_上腕_接続)
if (上腕.ConnectionType == ConnectionInfo.Shoulder_上腕_接続)
{
X0Y0_飛膜.OP[2].ps[3] = X0Y0_飛膜.ToLocal(上腕.X0Y0_獣翼上腕.ToGlobal(上腕.X0Y0_獣翼上腕.OP[3].ps[1]));
}
@@ -197,7 +197,7 @@ namespace SlaveMatrix
X0Y0_飛膜.OP[2].ps[1] += (vector2D5 - X0Y0_飛膜.OP[2].ps[1]) * 0.3;
X0Y0_飛膜.OP[2].ps[2] += (vector2D5 - X0Y0_飛膜.OP[2].ps[2]) * 0.3;
}
if (上腕.ConnectionType != ConnectionInfo.肩_上腕_接続)
if (上腕.ConnectionType != ConnectionInfo.Shoulder_上腕_接続)
{
X0Y0_飛膜.OP[3].ps[0] = X0Y0_飛膜.OP[2].ps[3];
}
@@ -263,7 +263,7 @@ namespace SlaveMatrix
}
else
{
if (上腕.ConnectionType == ConnectionInfo.肩_上腕_接続)
if (上腕.ConnectionType == ConnectionInfo.Shoulder_上腕_接続)
{
X0Y0_飛膜.OP[6].ps[0] = X0Y0_飛膜.ToLocal(上腕.X0Y0_獣翼上腕.ToGlobal(上腕.X0Y0_獣翼上腕.OP[0].ps[4]));
}
@@ -287,7 +287,7 @@ namespace SlaveMatrix
X0Y0_飛膜.OP[6].ps[2] += (vector2D5 - X0Y0_飛膜.OP[6].ps[2]) * 0.3;
X0Y0_飛膜.OP[6].ps[1] += (vector2D5 - X0Y0_飛膜.OP[6].ps[1]) * 0.3;
}
if (上腕.ConnectionType != ConnectionInfo.肩_上腕_接続)
if (上腕.ConnectionType != ConnectionInfo.Shoulder_上腕_接続)
{
X0Y0_飛膜.OP[5].ps[2] = X0Y0_飛膜.OP[6].ps[0];
}
@@ -353,7 +353,7 @@ namespace SlaveMatrix
}
else
{
if (上腕.ConnectionType == ConnectionInfo.肩_上腕_接続)
if (上腕.ConnectionType == ConnectionInfo.Shoulder_上腕_接続)
{
X0Y1_飛膜.OP[2].ps[3] = X0Y0_飛膜.ToLocal(上腕.X0Y0_獣翼上腕.ToGlobal(上腕.X0Y0_獣翼上腕.OP[3].ps[1]));
}
@@ -377,7 +377,7 @@ namespace SlaveMatrix
X0Y1_飛膜.OP[2].ps[1] += (vector2D5 - X0Y1_飛膜.OP[2].ps[1]) * 0.3;
X0Y1_飛膜.OP[2].ps[2] += (vector2D5 - X0Y1_飛膜.OP[2].ps[2]) * 0.3;
}
if (上腕.ConnectionType != ConnectionInfo.肩_上腕_接続)
if (上腕.ConnectionType != ConnectionInfo.Shoulder_上腕_接続)
{
X0Y1_飛膜.OP[3].ps[0] = X0Y1_飛膜.OP[2].ps[3];
}
@@ -487,7 +487,7 @@ namespace SlaveMatrix
}
else
{
if (上腕.ConnectionType == ConnectionInfo.肩_上腕_接続)
if (上腕.ConnectionType == ConnectionInfo.Shoulder_上腕_接続)
{
X0Y1_飛膜.OP[40].ps[0] = X0Y0_飛膜.ToLocal(上腕.X0Y0_獣翼上腕.ToGlobal(上腕.X0Y0_獣翼上腕.OP[0].ps[4]));
}
@@ -511,7 +511,7 @@ namespace SlaveMatrix
X0Y1_飛膜.OP[40].ps[2] += (vector2D5 - X0Y1_飛膜.OP[40].ps[2]) * 0.3;
X0Y1_飛膜.OP[40].ps[1] += (vector2D5 - X0Y1_飛膜.OP[40].ps[1]) * 0.3;
}
if (上腕.ConnectionType != ConnectionInfo.肩_上腕_接続)
if (上腕.ConnectionType != ConnectionInfo.Shoulder_上腕_接続)
{
X0Y1_飛膜.OP[39].ps[2] = X0Y1_飛膜.OP[40].ps[0];
}

56
SlaveMatrix/SlaveMatrix/GameClasses/Bod.cs
View File

@@ -344,17 +344,17 @@ namespace SlaveMatrix
private List<Ele> 大顎基接続 = new List<Ele>();
private 肩[] 後脇左s = new 肩[0];
private Shoulder[] 後脇左s = new Shoulder[0];
private 肩[] 後脇右s = new 肩[0];
private Shoulder[] 後脇右s = new Shoulder[0];
public List<Ele>[] 後腕左s = new List<Ele>[0];
public List<Ele>[] 後腕右s = new List<Ele>[0];
private 肩 肩左;
private Shoulder 肩左;
private 肩 肩右;
private Shoulder 肩右;
private List<Ele> 肩左飛膜 = new List<Ele>();
@@ -2947,7 +2947,7 @@ namespace SlaveMatrix
};
鞭痕D wd = new 鞭痕D();
蝙通常 = new List<蝙通常>();
肩 人肩;
Shoulder 人肩;
腕獣 腕獣;
腿_人 人腿;
脚人 脚人;
@@ -2982,9 +2982,9 @@ namespace SlaveMatrix
}
if (current_element.右)
{
if (current_element is 肩)
if (current_element is Shoulder)
{
人肩 = (肩)current_element;
人肩 = (Shoulder)current_element;
人肩.キスマーク = new スタンプK(Med, Are, Cha, this, kd, 人肩);
sk.Add(人肩.キスマーク);
人肩.鞭痕 = new スタンプW(Med, Are, Cha, this, wd, 人肩);
@@ -2998,7 +2998,7 @@ namespace SlaveMatrix
current_element.表示 = false;
}
腕獣 = default(腕獣);
腕獣.肩 = 四足脇2;
腕獣.Shoulder = 四足脇2;
四足脇2.上腕_接続.SetEle(delegate(獣上腕 上腕)
{
腕獣.上腕 = 上腕;
@@ -3111,13 +3111,13 @@ namespace SlaveMatrix
}
else if (current_element is 上腕)
{
if (current_element.ConnectionType == ConnectionInfo.肩_上腕_接続)
if (current_element.ConnectionType == ConnectionInfo.Shoulder_上腕_接続)
{
人肩 = (肩)current_element.Par;
人肩 = (Shoulder)current_element.Par;
if (current_element is 上腕_鳥)
{
腕翼鳥 = default(腕翼鳥);
腕翼鳥.肩 = 人肩;
腕翼鳥.Shoulder = 人肩;
人肩.上腕_接続.SetEle(delegate(上腕_鳥 上腕)
{
上腕.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 上腕);
@@ -3140,10 +3140,10 @@ namespace SlaveMatrix
else if (current_element is 上腕_蝙)
{
腕翼獣 = default(腕翼獣);
腕翼獣.肩 = 人肩;
腕翼獣.Shoulder = 人肩;
人肩.上腕_接続.SetEle(delegate(上腕_蝙 上腕)
{
上腕.獣翼上腕CD.c2.Col1 = 人肩.肩_肩CD.c2.Col1;
上腕.獣翼上腕CD.c2.Col1 = 人肩.Shoulder_ShoulderCD.c2.Col1;
腕翼獣.上腕 = 上腕;
上腕.下腕_接続.SetEle(delegate(下腕_蝙 下腕)
{
@@ -3161,7 +3161,7 @@ namespace SlaveMatrix
else
{
腕人 = default(腕人);
腕人.肩 = 人肩;
腕人.Shoulder = 人肩;
人肩.上腕_接続.SetEle(delegate(上腕_人 上腕)
{
上腕.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 上腕);
@@ -3375,9 +3375,9 @@ namespace SlaveMatrix
触手右.Add((触手)current_element);
}
}
else if (current_element is 肩)
else if (current_element is Shoulder)
{
人肩 = (肩)current_element;
人肩 = (Shoulder)current_element;
人肩.キスマーク = new スタンプK(Med, Are, Cha, this, kd, 人肩);
sk.Add(人肩.キスマーク);
人肩.鞭痕 = new スタンプW(Med, Are, Cha, this, wd, 人肩);
@@ -3391,7 +3391,7 @@ namespace SlaveMatrix
current_element.表示 = false;
}
腕獣 = default(腕獣);
腕獣.肩 = 四足脇2;
腕獣.Shoulder = 四足脇2;
四足脇2.上腕_接続.SetEle(delegate(獣上腕 上腕)
{
腕獣.上腕 = 上腕;
@@ -3504,13 +3504,13 @@ namespace SlaveMatrix
}
else if (current_element is 上腕)
{
if (current_element.ConnectionType == ConnectionInfo.肩_上腕_接続)
if (current_element.ConnectionType == ConnectionInfo.Shoulder_上腕_接続)
{
人肩 = (肩)current_element.Par;
人肩 = (Shoulder)current_element.Par;
if (current_element is 上腕_鳥)
{
腕翼鳥 = default(腕翼鳥);
腕翼鳥.肩 = 人肩;
腕翼鳥.Shoulder = 人肩;
人肩.上腕_接続.SetEle(delegate(上腕_鳥 上腕)
{
上腕.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 上腕);
@@ -3533,10 +3533,10 @@ namespace SlaveMatrix
else if (current_element is 上腕_蝙)
{
腕翼獣 = default(腕翼獣);
腕翼獣.肩 = 人肩;
腕翼獣.Shoulder = 人肩;
人肩.上腕_接続.SetEle(delegate(上腕_蝙 上腕)
{
上腕.獣翼上腕CD.c2.Col1 = 人肩.肩_肩CD.c2.Col1;
上腕.獣翼上腕CD.c2.Col1 = 人肩.Shoulder_ShoulderCD.c2.Col1;
腕翼獣.上腕 = 上腕;
上腕.下腕_接続.SetEle(delegate(下腕_蝙 下腕)
{
@@ -3554,7 +3554,7 @@ namespace SlaveMatrix
else
{
腕人 = default(腕人);
腕人.肩 = 人肩;
腕人.Shoulder = 人肩;
人肩.上腕_接続.SetEle(delegate(上腕_人 上腕)
{
上腕.キスマーク = new スタンプK(Med, Are, Cha, bod, kd, 上腕);
@@ -4180,7 +4180,7 @@ namespace SlaveMatrix
}
if (胸.肩左_接続 != null)
{
後脇左s = 胸.肩左_接続.GetEles<肩>().ToArray();
後脇左s = 胸.肩左_接続.GetEles<Shoulder>().ToArray();
肩左 = 後脇左s.LastOrDefault();
if (後脇左s.Length > 1)
{
@@ -4210,7 +4210,7 @@ namespace SlaveMatrix
nsl = new bool[1 + ((後腕左s != null) ? 後腕左s.Length : 0)];
if (胸.肩右_接続 != null)
{
後脇右s = 胸.肩右_接続.GetEles<肩>().ToArray();
後脇右s = 胸.肩右_接続.GetEles<Shoulder>().ToArray();
肩右 = 後脇右s.LastOrDefault();
if (後脇右s.Length > 1)
{
@@ -4307,7 +4307,7 @@ namespace SlaveMatrix
{
Sort(魚.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続);
}
if (腕獣左.Count > 0 && 腕獣左.First().肩.上腕_接続.IsEle<獣脚>())
if (腕獣左.Count > 0 && 腕獣左.First().Shoulder.上腕_接続.IsEle<獣脚>())
{
Sort(from e in 魚.EnumEle().Skip(1)
where !bod.半身後接続.Contains(e)
@@ -4342,7 +4342,7 @@ namespace SlaveMatrix
{
Sort(鯨.尾_接続.Select((Ele e) => e.EnumEle()).JoinEnum(), 半身後接続);
}
if (腕獣左.Count > 0 && 腕獣左.First().肩.上腕_接続.IsEle<獣脚>())
if (腕獣左.Count > 0 && 腕獣左.First().Shoulder.上腕_接続.IsEle<獣脚>())
{
Sort(from e in 鯨.EnumEle().Skip(1)
where !bod.半身後接続.Contains(e)
@@ -5495,7 +5495,7 @@ namespace SlaveMatrix
bod.頭頂左後接続.描画1(are);
bod.頭頂右後接続.描画0(are);
bod.頭頂右後接続.描画1(are);
肩[] array5 = bod.後脇左s;
Shoulder[] array5 = bod.後脇左s;
for (int n = 0; n < array5.Length; n++)
{
array5[n].脇描画(are);

4
SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs
View File

@@ -2050,7 +2050,7 @@ namespace SlaveMatrix
{
result.p = result.e.本体.GetHitPar_(HitColor);
bool flag = false;
bool flag2 = result.e is 肩 || result.e is 上腕 || result.e is 下腕 || result.e is 手 || result.e is 四足脇 || result.e is 腿 || result.e is 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 触手;
bool flag2 = result.e is Shoulder || result.e is 上腕 || result.e is 下腕 || result.e is 手 || result.e is 四足脇 || result.e is 腿 || result.e is Leg || result.e is 足 || result.e is 鰭 || result.e is 葉 || result.e is 前翅 || result.e is 後翅 || result.e is 触肢 || result.e is 節足 || result.e is 節尾 || result.e is 大顎 || result.e is 虫顎 || result.e is 虫鎌 || result.e is 触手;
if (result.e is 前髪 || result.e is 頭頂)
{
result.c = ContactType.Head;
@@ -2075,7 +2075,7 @@ namespace SlaveMatrix
{
result.c = ContactType.Neck;
}
else if (result.e is 肩)
else if (result.e is Shoulder)
{
result.c = ContactType.Shoulder;
}

2
SlaveMatrix/SlaveMatrix/GameClasses/Ele.cs
View File

@@ -599,7 +599,7 @@ namespace SlaveMatrix
ConnectionInfo.胸_翼下右_接続 => 0,
ConnectionInfo.胸_背中_接続 => 0,
ConnectionInfo.乳房_噴乳_接続 => 1,
ConnectionInfo.肩_上腕_接続 => 1,
ConnectionInfo.Shoulder_上腕_接続 => 1,
ConnectionInfo.Torso_胸_接続 => 1,
ConnectionInfo.Torso_肌_接続 => 1,
ConnectionInfo.Torso_翼左_接続 => 0,

56
SlaveMatrix/SlaveMatrix/GameClasses/Reactions.cs
View File

@@ -4421,8 +4421,8 @@ namespace SlaveMatrix
public static void 腕_人左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B, double 上腕尺度XC, double 下腕尺度XC, double 手尺度XC, double 下腕尺度C, double 手尺度C, bool 上腕外線, bool 下腕外線, bool 下腕反転Y, int 手Yi, bool 前後)
{
腕人 腕人2 = Cha.Bod.腕人左[n];
腕人2.肩.SetAngle0();
腕人2.肩.角度B = 肩角度B + u1;
腕人2.Shoulder.SetAngle0();
腕人2.Shoulder.角度B = 肩角度B + u1;
if (腕人2.上腕 != null)
{
腕人2.上腕.肘部_外線 = 上腕外線;
@@ -4504,14 +4504,14 @@ namespace SlaveMatrix
}
}
}
腕人2.肩.重複角度処理();
腕人2.Shoulder.重複角度処理();
}
public static void 腕_人右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B, double 上腕尺度XC, double 下腕尺度XC, double 手尺度XC, double 下腕尺度C, double 手尺度C, bool 上腕外線, bool 下腕外線, bool 下腕反転Y, int 手Yi, bool 前後)
{
腕人 腕人2 = Cha.Bod.腕人右[n];
腕人2.肩.SetAngle0();
腕人2.肩.角度B = 0.0 - 肩角度B + (0.0 - u1);
腕人2.Shoulder.SetAngle0();
腕人2.Shoulder.角度B = 0.0 - 肩角度B + (0.0 - u1);
if (腕人2.上腕 != null)
{
腕人2.上腕.肘部_外線 = 上腕外線;
@@ -4593,7 +4593,7 @@ namespace SlaveMatrix
}
}
}
腕人2.肩.重複角度処理();
腕人2.Shoulder.重複角度処理();
}
public static void 腕_人_腕置き左(this Cha Cha, int n, double u1, double u2, double u3, double u4)
@@ -4997,7 +4997,7 @@ namespace SlaveMatrix
{
foreach (腕人 item in Cha.Bod.腕人左)
{
item.肩.角度C = a * RNG.XS.NextDouble();
item.Shoulder.角度C = a * RNG.XS.NextDouble();
if (item.上腕 == null)
{
continue;
@@ -5014,7 +5014,7 @@ namespace SlaveMatrix
}
foreach (腕人 item2 in Cha.Bod.腕人右)
{
item2.肩.角度C = (0.0 - a) * RNG.XS.NextDouble();
item2.Shoulder.角度C = (0.0 - a) * RNG.XS.NextDouble();
if (item2.上腕 == null)
{
continue;
@@ -5034,10 +5034,10 @@ namespace SlaveMatrix
public static void 腕_翼鳥左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 上腕展開, double 下腕展開, double 手展開, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B)
{
腕翼鳥 腕翼鳥2 = Cha.Bod.腕翼鳥左[n];
腕翼鳥2.肩.SetAngle0();
腕翼鳥2.Shoulder.SetAngle0();
if (n == 0)
{
腕翼鳥2.肩.角度B = 肩角度B + u1;
腕翼鳥2.Shoulder.角度B = 肩角度B + u1;
}
if (腕翼鳥2.上腕 != null)
{
@@ -5057,16 +5057,16 @@ namespace SlaveMatrix
}
}
}
腕翼鳥2.肩.重複角度処理();
腕翼鳥2.Shoulder.重複角度処理();
}
public static void 腕_翼鳥右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 上腕展開, double 下腕展開, double 手展開, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B)
{
腕翼鳥 腕翼鳥2 = Cha.Bod.腕翼鳥右[n];
腕翼鳥2.肩.SetAngle0();
腕翼鳥2.Shoulder.SetAngle0();
if (n == 0)
{
腕翼鳥2.肩.角度B = 0.0 - 肩角度B + (0.0 - u1);
腕翼鳥2.Shoulder.角度B = 0.0 - 肩角度B + (0.0 - u1);
}
if (腕翼鳥2.上腕 != null)
{
@@ -5086,7 +5086,7 @@ namespace SlaveMatrix
}
}
}
腕翼鳥2.肩.重複角度処理();
腕翼鳥2.Shoulder.重複角度処理();
}
public static void 腕_翼鳥_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4)
@@ -5247,21 +5247,21 @@ namespace SlaveMatrix
{
foreach (腕翼鳥 item in Cha.Bod.腕翼鳥左)
{
item.肩.角度C = a * RNG.XS.NextDouble();
item.Shoulder.角度C = a * RNG.XS.NextDouble();
}
foreach (腕翼鳥 item2 in Cha.Bod.腕翼鳥右)
{
item2.肩.角度C = (0.0 - a) * RNG.XS.NextDouble();
item2.Shoulder.角度C = (0.0 - a) * RNG.XS.NextDouble();
}
}
public static void 腕_翼獣左(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 上腕展開, double 下腕展開, double 手展開, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B)
{
腕翼獣 腕翼獣2 = Cha.Bod.腕翼獣左[n];
腕翼獣2.肩.SetAngle0();
腕翼獣2.Shoulder.SetAngle0();
if (n == 0)
{
腕翼獣2.肩.角度B = 肩角度B + u1;
腕翼獣2.Shoulder.角度B = 肩角度B + u1;
}
if (腕翼獣2.上腕 != null)
{
@@ -5281,16 +5281,16 @@ namespace SlaveMatrix
}
}
}
腕翼獣2.肩.重複角度処理();
腕翼獣2.Shoulder.重複角度処理();
}
public static void 腕_翼獣右(this Cha Cha, int n, double u1, double u2, double u3, double u4, double 上腕展開, double 下腕展開, double 手展開, double 肩角度B, double 上腕角度B, double 下腕角度B, double 手角度B)
{
腕翼獣 腕翼獣2 = Cha.Bod.腕翼獣右[n];
腕翼獣2.肩.SetAngle0();
腕翼獣2.Shoulder.SetAngle0();
if (n == 0)
{
腕翼獣2.肩.角度B = 0.0 - 肩角度B + (0.0 - u1);
腕翼獣2.Shoulder.角度B = 0.0 - 肩角度B + (0.0 - u1);
}
if (腕翼獣2.上腕 != null)
{
@@ -5310,7 +5310,7 @@ namespace SlaveMatrix
}
}
}
腕翼獣2.肩.重複角度処理();
腕翼獣2.Shoulder.重複角度処理();
}
public static void 腕_翼獣_脱力左(this Cha Cha, int n, double u1, double u2, double u3, double u4)
@@ -5439,18 +5439,18 @@ namespace SlaveMatrix
{
foreach (腕翼獣 item in Cha.Bod.腕翼獣左)
{
item.肩.角度C = a * RNG.XS.NextDouble();
item.Shoulder.角度C = a * RNG.XS.NextDouble();
}
foreach (腕翼獣 item2 in Cha.Bod.腕翼獣右)
{
item2.肩.角度C = (0.0 - a) * RNG.XS.NextDouble();
item2.Shoulder.角度C = (0.0 - a) * RNG.XS.NextDouble();
}
}
public static void 腕_獣左(this Cha Cha, int n, double u2, double u3, double u4, double 上腕角度B, double 下腕角度B, double 手角度B, double 上腕尺度XC, double 下腕尺度XC, double 手尺度XC)
{
腕獣 腕獣2 = Cha.Bod.腕獣左[n];
腕獣2.肩.SetAngle0();
腕獣2.Shoulder.SetAngle0();
if (腕獣2.上腕 != null)
{
腕獣2.上腕.SetAngle0();
@@ -5469,13 +5469,13 @@ namespace SlaveMatrix
}
}
}
腕獣2.肩.重複角度処理();
腕獣2.Shoulder.重複角度処理();
}
public static void 腕_獣右(this Cha Cha, int n, double u2, double u3, double u4, double 上腕角度B, double 下腕角度B, double 手角度B, double 上腕尺度XC, double 下腕尺度XC, double 手尺度XC)
{
腕獣 腕獣2 = Cha.Bod.腕獣右[n];
腕獣2.肩.SetAngle0();
腕獣2.Shoulder.SetAngle0();
if (腕獣2.上腕 != null)
{
腕獣2.上腕.SetAngle0();
@@ -5494,7 +5494,7 @@ namespace SlaveMatrix
}
}
}
腕獣2.肩.重複角度処理();
腕獣2.Shoulder.重複角度処理();
}
public static void 腕_獣_基本左(this Cha Cha, int n, double u1, double u2, double u3, double u4)

630
SlaveMatrix/SlaveMatrix/GameClasses/SpeciesDefaults.cs
View File

File diff suppressed because it is too large Load Diff

17
SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs
View File

@@ -52,7 +52,7 @@ namespace SlaveMatrix
public static Type 胸t;
public static Type 肩t;
public static Type Shouldert;
public static Type 胴t;
@@ -88,7 +88,7 @@ namespace SlaveMatrix
public static Type 耳_獣Dt;
public static Type 肩Dt;
public static Type ShoulderDt;
public static Type 角1_一Dt;
@@ -1092,7 +1092,9 @@ namespace SlaveMatrix
//Ser.ToJson(胴体, "C:\\Users\\dave\\Documents\\胴体.json");
//胴体 = Ser.UnJson<Obj>("C:\\Users\\dave\\Documents\\胴体.json");
肩左 = Resources.肩左.ObjLoad();
obj = Resources.肩左.ObjLoad();
obj.MigrateKeys();
肩左 = obj;
//肩左.SaveExMod("C:\\Users\\dave\\Documents\\肩左");
//Ser.ToJson(肩左, "C:\\Users\\dave\\Documents\\肩左.json");
//肩左 = Ser.UnJson<Obj>("C:\\Users\\dave\\Documents\\肩左.json");
@@ -1102,8 +1104,9 @@ namespace SlaveMatrix
//Ser.ToJson(腕左, "C:\\Users\\dave\\Documents\\腕左.json");
//腕左 = Ser.UnJson<Obj>("C:\\Users\\dave\\Documents\\腕左.json");
脚左 = Resources.脚左.ObjLoad();
obj = Resources.脚左.ObjLoad();
obj.MigrateKeys();
脚左 = obj;
//脚左.SaveExMod("C:\\Users\\dave\\Documents\\脚左");
//Ser.ToJson(脚左, "C:\\Users\\dave\\Documents\\脚左.json");
//脚左 = Ser.UnJson<Obj>("C:\\Users\\dave\\Documents\\脚左.json");
@@ -1162,7 +1165,7 @@ namespace SlaveMatrix
Elet = typeof(Ele);
EleDt = typeof(EleD);
胸t = typeof(胸);
肩t = typeof(肩);
Shouldert = typeof(Shoulder);
胴t = typeof(Torso);
腰t = typeof(Waist);
尾_鯨t = typeof(尾_鯨);
@@ -1180,7 +1183,7 @@ namespace SlaveMatrix
耳_鰭Dt = typeof(耳_鰭D);
耳_羽Dt = typeof(耳_羽D);
耳_獣Dt = typeof(耳_獣D);
肩Dt = typeof(肩D);
ShoulderDt = typeof(ShoulderD);
角1_一Dt = typeof(角1_一D);
角1_鬼Dt = typeof(角1_鬼D);
角1_虫Dt = typeof(角1_虫D);