linting 3

This commit is contained in:
lewd-alt
2025-09-15 17:52:51 -07:00
parent bb3bf291e2
commit 459e9d04a6
21 changed files with 2207 additions and 3083 deletions

View File

@@ -155,7 +155,7 @@ namespace SlaveMatrix
MaiB.BasePointBase = Dat.Vec2DZero;
MaiB.PositionBase = vector2D;
MaiB.SizeBase = num2;
MaiB.OP.AddRange(new Out[1] { Shas.Get正方形() });
MaiB.OP.AddRange(new Out[1] { Shas.GetSquare() });
MaiB.OP.ScalingX(MaiB.BasePointBase, num3);
MaiB.OP.ScalingY(MaiB.BasePointBase, num4);
MaiB.Closed = true;
@@ -174,7 +174,7 @@ namespace SlaveMatrix
Mai2B.BasePointBase = Dat.Vec2DZero;
Mai2B.PositionBase = new Vector2D(vector2D.X, 0.01);
Mai2B.SizeBase = num2;
Mai2B.OP.AddRange(new Out[1] { Shas.Get正方形() });
Mai2B.OP.AddRange(new Out[1] { Shas.GetSquare() });
Mai2B.OP.ScalingX(Mai2B.BasePointBase, num3);
Mai2B.OP.ScalingY(Mai2B.BasePointBase, num5);
Mai2B.Closed = true;
@@ -194,7 +194,7 @@ namespace SlaveMatrix
SubB.BasePointBase = Dat.Vec2DZero;
SubB.PositionBase = vector2D;
SubB.SizeBase = num2;
SubB.OP.AddRange(new Out[1] { Shas.Get正方形() });
SubB.OP.AddRange(new Out[1] { Shas.GetSquare() });
SubB.OP.ScalingX(SubB.BasePointBase, num3);
SubB.OP.ScalingY(SubB.BasePointBase, num4);
SubB.Closed = true;
@@ -204,13 +204,13 @@ namespace SlaveMatrix
Sub = new Tex("Tex4", vector2D, num2 * 1.01, num3 * 0.98, num4 * 0.91, new Font("MS Gothic", 1f), 0.07, 0, " ", Col.White, Col.Black, Color.Transparent, 15.0);
Sub.ParT.BasePointBase = Sub.ParT.OP.GetCenter().MulY(y);
Sub.Position = SubB.ToGlobal(SubB.JP[0].Joint);
SubInnfo_l = new Lab(Med, Are, "SubInfo", vector2D, num2, 1.0, new Font("MS Gothic", 1f), 0.07, "Sub Info.", Col.White, Col.Black, Color.FromArgb(160, Col.Black), Col.Empty, Input: false);
SubInnfo_l = new Lab(Are, "SubInfo", vector2D, num2, 1.0, new Font("MS Gothic", 1f), 0.07, "Sub Info.", Col.White, Col.Black, Color.FromArgb(160, Col.Black), Col.Empty);
SubInnfo_l.ParT.PositionBase = SubInnfo_l.ParT.PositionBase.AddY((0.0 - SubInnfo_l.ParT.OP[0].ps[3].Y) * SubInnfo_l.ParT.SizeBase);
Sub2B = new Par();
Sub2B.BasePointBase = Dat.Vec2DZero;
Sub2B.PositionBase = new Vector2D(0.0025, vector2D.Y);
Sub2B.SizeBase = num2;
Sub2B.OP.AddRange(new Out[1] { Shas.Get正方形() });
Sub2B.OP.AddRange(new Out[1] { Shas.GetSquare() });
Sub2B.OP.ScalingX(Sub2B.BasePointBase, num3);
Sub2B.OP.ScalingY(Sub2B.BasePointBase, num4);
Sub2B.Closed = true;

View File

@@ -2,13 +2,13 @@ using _2DGAMELIB;
namespace SlaveMatrix
{
public class
public class SlaveText
{
private Med Med;
private hd;
public (Med Med, hd)
public SlaveText(Med Med, hd)
{
this.Med = Med;
this.hd = hd;

View File

@@ -2,13 +2,13 @@ using _2DGAMELIB;
namespace SlaveMatrix
{
public class
public class ViolaText
{
private Med Med;
private hd;
public (Med Med, hd)
public ViolaText(Med Med, hd)
{
this.Med = Med;
this.hd = hd;

View File

@@ -1235,7 +1235,7 @@ namespace SlaveMatrix
X3Y5_膣口CP = new ColorP(X3Y5_膣口, CD, DisUnit, abj: true);
AreM = new AreM(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1);
AreM.Setting();
AreM.BasePoint = Shas.;
AreM.BasePoint = new Vector2D(0.5, 0.5);
AreMPos = AreM.GetPosition(ref AreM.BasePoint);
= e.;
Xi = 1;

View File

@@ -1235,7 +1235,7 @@ namespace SlaveMatrix
X3Y5_膣口CP = new ColorP(X3Y5_膣口, CD, DisUnit, abj: true);
AreM = new AreM(Med.Unit, 1.0, 1.0, 0.024, Med.DisQuality, Med.HitAccuracy, 0.1);
AreM.Setting();
AreM.BasePoint = Shas.;
AreM.BasePoint = new Vector2D(0.5, 0.5);
AreMPos = AreM.GetPosition(ref AreM.BasePoint);
= e.;
Xi = 1;

View File

@@ -5450,7 +5450,7 @@ namespace SlaveMatrix
nsb1 = .X0Y0_乳首.SizeBase;
nsb2 = .X0Y0_乳輪.SizeBase;
();
.B = Med.Base.GetPosition(ref Shas.);
.B = Med.Base.GetPosition(new Vector2D(0.5, 0.5));
Join();
Set腰();
if (.Count + .Count + .Count + .Count + .Count + .Count + .Count + .Count + .Count + s.Length + s.Length > 0)

View File

@@ -8,12 +8,6 @@ namespace SlaveMatrix
//race weighting/value information
public static class Def
{
public const double vd = 0.6;
public const double bd = 0.3;
public const double nd = 0.5;
public static Dictionary<string, RaceInformation> race_information = new Dictionary<string, RaceInformation>
{
{

File diff suppressed because it is too large Load Diff

View File

@@ -5,13 +5,10 @@ namespace SlaveMatrix
{
internal static class Program
{
public static bool biggerWindow;
[STAThread]
private static void Main(string[] A_0)
{
//Application.EnableVisualStyles();
//Application.SetCompatibleTextRenderingDefault(defaultValue: false);
Sta.LoadConfig();
@@ -19,7 +16,6 @@ namespace SlaveMatrix
if (Sta.BigWindow)
{
percent = 47.0;
biggerWindow = true;
}
Med med = new Med
@@ -33,21 +29,10 @@ namespace SlaveMatrix
};
med.InitializeModes("Start", Mods.GetMods);
UI uI = new UI(med);
//uI.Text = GameText.スレイブマトリクス;
//uI.Show();
//main loop
med.Drawing();
if (Mods.t1 != null)
{
Mods.t1.Wait();
}
med.Dispose();
Sta.Disposes();
}
}
}

View File

@@ -14,229 +14,148 @@ namespace SlaveMatrix
private ConstProp CP = new ConstProp();
public const double = 0.5;
public const double = 0.7;
public Med Med;
public Are Are;
public Are Are;
private Are Film;
public Unit Uni;
public Cha Cha;
public Cha Cha;
public Bod Bod;
public InfoPanel ip;
//tools
public ;
public ;
public ;
public ;
public ;
public _コモン ;
public _ディル ;
public _アナル ;
public _デンマ ;
public _ドリル ;
public ;
public ;
public 調 調;
public T剃刀 T剃刀;
public 1 1;
public 1 2;
public 1 3;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM CM;
public CM 調CM;
public CM T剃刀CM;
public CM 1CM;
public CM 2CM;
public CM 3CM;
private CM focus;
private CM hcm;
public CM 3CM;
public ;
//tool animations?
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public ;
public 調 調;
public ;
public ;
public ;
public ;
private f;
public s;
private ef;
public But 調;
//ui elements
public But 調;
public But ;
public But ;
public But ;
public But ;
public But ;
public But ;
public But SlaveStamina;
public But PlayerStamina;
private Swi sw = new Swi(Color.OrangeRed);
private Swi sw = new Swi(Color.OrangeRed);
private Swi sw = new Swi(Color.OrangeRed);
private Swi sw = new Swi(Color.OrangeRed);
private Swi sw = new Swi(Color.OrangeRed);
public Gau sゲージ;
public Gau sゲージ;
public Gau sゲージ;
public Gau mゲージ;
public Gau mゲージ;
public Gau mゲージ;
public Tex ;
public Tex InfoBox;
public Tex SensitivityBox;
public bool ;
public ;
//misc flags
public bool ;
public bool ;
public bool _;
private bool _;
public bool i肛f;
public bool f;
public bool oh;
public bool IsTB;
public bool ;
private bool IsTool;
private bool sf = true;
public bool ;
public bool bu;
public bool bu;
public ;
public Mot ;
public Mot ;
public Mots Mots = new Mots();
public Onomatopoeia ;
//moan queue :skull:
public Onomatopoeia ;
public Queue<Action<Are>> = new Queue<Action<Are>>();
private Are Film;
//animation queue?
public List<> SubFocus = new List<>();
public bool _;
public bool ;
private CM focus;
private bool _;
public List<> SubFocus = new List<>();
public bool i肛f;
public bool f;
public bool oh;
public bool IsTB;
private f;
public s;
public const double cs = 1.09;
public bool ;
private MouseButtons d;
private bool IsTool;
private CM hcm;
private ef;
private bool sf = true;
public bool ;
public bool bu;
public bool bu;
private MouseButtons HeldButton;
public double X;
public double Y;
public Tex InfoBox;
public Tex SensitivityBox;
public But SlaveStamina;
public But PlayerStamina;
public Color hc
{
@@ -468,6 +387,8 @@ namespace SlaveMatrix
}
}
public void (Vector2D p, string s, Color c, double d, bool b)
{
.Enqueue(delegate(Are a)
@@ -1697,7 +1618,7 @@ namespace SlaveMatrix
public void Move(ref MouseButtons mb, ref Vector2D cp, ref Vector2D op, ref Color hc, ref ContactD cd)
{
if (d != mb)
if (HeldButton != mb)
{
return;
}
@@ -1976,7 +1897,7 @@ namespace SlaveMatrix
public void Down(ref MouseButtons mb, ref Vector2D cp, ref Vector2D op, ref Color hc, ref ContactD cd)
{
if (d != 0)
if (HeldButton != 0)
{
return;
}
@@ -2050,12 +1971,12 @@ namespace SlaveMatrix
.Down(ref mb, ref cp, ref hc, ref cd);
調.Down(ref mb, ref cp, ref hc, ref cd);
SetIs膣i肛f();
d = mb;
HeldButton = mb;
}
public void Up(ref MouseButtons mb, ref Vector2D cp, ref Color hc, ref ContactD cd)
{
if (d == mb)
if (HeldButton == mb)
{
調.Up(ref hc);
.Up(ref hc);
@@ -2079,7 +2000,7 @@ namespace SlaveMatrix
.Up(ref mb, ref cp, ref hc);
.Up(ref mb, ref cp, ref hc, ref cd);
.Up(ref mb, ref cp, ref hc, ref cd);
d = MouseButtons.None;
HeldButton = MouseButtons.None;
}
}
@@ -2493,7 +2414,7 @@ namespace SlaveMatrix
= new But1(parT7, delegate
{
//Sounds.撮影.Play();
Med.();
Med.flash();
if (!Directory.Exists(Path))
{
Directory.CreateDirectory(Path);
@@ -2503,7 +2424,7 @@ namespace SlaveMatrix
Font font = new Font("MS Gothic", (float)(10.0 * Med.DpiY));
float x = 350f;
float y = 365f;
if (Program.biggerWindow)
if (Sta.BigWindow)
{
x = 525f;
y = 500f;
@@ -2679,7 +2600,6 @@ namespace SlaveMatrix
this.Cha. = null;
this.Cha.尿 = null;
}
Uni = Unit;
this.Cha = Cha;
Bod = Cha.Bod;
Bod. = this;
@@ -2792,7 +2712,7 @@ namespace SlaveMatrix
oh = false;
IsTB = false;
();
d = MouseButtons.None;
HeldButton = MouseButtons.None;
IsTool = false;
hcm = null;
ef = null;
@@ -3122,7 +3042,7 @@ namespace SlaveMatrix
{
double num = 0.31;
double width = 0.7;
if (Program.biggerWindow)
if (Sta.BigWindow)
{
num += 0.14;
}
@@ -3139,7 +3059,7 @@ namespace SlaveMatrix
{
double x = 0.08;
double y = 0.1;
if (Program.biggerWindow)
if (Sta.BigWindow)
{
x = 0.08;
y = 0.1;