no more windows?

2DGAMELIB/2DGAMELIB.csproj

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>2DGAMELIB</AssemblyName>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <UseWindowsForms>True</UseWindowsForms>
-    <TargetFramework>net462</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <PlatformTarget>x86</PlatformTarget>
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
@@ -17,28 +17,10 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="glfw-net" Version="3.3.1" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="OpenGL.Net" Version="0.8.4" />
+    <PackageReference Include="System.Collections" Version="4.3.0" />
+    <PackageReference Include="System.Drawing.Common" Version="5.0.3" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="PresentationFramework">
-      <HintPath>..\..\..\..\..\Windows\Microsoft.NET\Framework\v4.0.30319\WPF\PresentationFramework.dll</HintPath>
-    </Reference>
-	<Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Drawing" />
-
-
-    <Reference Include="PresentationCore" />
-    <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="System.Windows.Forms" />
-	<Reference Include="Microsoft.CSharp" />
-
-  </ItemGroup>
-	<PropertyGroup>
-		<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-	</PropertyGroup>
 </Project>

2DGAMELIB/_2DGAMELIB/Dif.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using System.IO;
-using System.Windows.Documents;
 
 namespace _2DGAMELIB;
 

2DGAMELIB/_2DGAMELIB/Difs.cs

@@ -2,9 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using System.Net.NetworkInformation;
-using System.IO;
-using System.Windows.Documents;
 using Newtonsoft.Json;
 
 namespace _2DGAMELIB;

2DGAMELIB/_2DGAMELIB/Lab.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Drawing;
-using System.Windows.Forms;
 
 namespace _2DGAMELIB;
 
@@ -18,8 +17,6 @@ public class Lab
 
 	private double Min;
 
-	private TextBox tb;
-
 	public ParT ParT => parT;
 
 	public string Text
@@ -46,6 +43,7 @@ public class Lab
 
 	public Lab(Med Med, Are Are, string Name, ref Vector2D Position, double Size, double Width, Font Font, double TextSize, string Text, ref Color TextColor, ref Color ShadColor, ref Color BackColor, ref Color FramColor, bool Input)
 	{
+		//Note: Input is always false
 		Setting(Med, Are, Name, ref Position, Size, Width, Font, TextSize, Text, ref TextColor, ref ShadColor, ref BackColor, ref FramColor, Input);
 	}
 
@@ -60,45 +58,7 @@ public class Lab
 		this.Are = Are;
 		this.Width = Width;
 		this.Input = Input;
-		if (Input)
+
-		{
-			tb = new TextBox();
-			tb.WordWrap = true;
-			tb.Multiline = true;
-			tb.Text = Text;
-			tb.ForeColor = TextColor;
-			tb.BackColor = Color.FromArgb(255, BackColor);
-			tb.KeyUp += delegate
-			{
-				lock (Med.obj)
-				{
-					SetText(tb.Text);
-					parT.Text = "";
-					SetRectT();
-				}
-			};
-			tb.KeyDown += delegate(object s, KeyEventArgs e)
-			{
-				lock (Med.obj)
-				{
-					if (e.KeyCode == Keys.Return)
-					{
-                        //TODO fix?
-                        //this.Med.BaseControl.Controls.Remove(tb);
-						SetText(tb.Text);
-						e.SuppressKeyPress = true;
-					}
-				}
-			};
-			tb.PreviewKeyDown += delegate(object s, PreviewKeyDownEventArgs e)
-			{
-				e.IsInputKey = true;
-			};
-            //TODO fix?
-            //Med.BaseControl.Controls.Add(tb);
-			//Med.BaseControl.Controls.Remove(tb);
-			//((Control)Med.BaseControl).Resize += Lab_Resize;
-		}
 		Out[] array = new Out[1] { Shas.Get正方形() };
 		if (FramColor == Color.Empty || FramColor == Color.Transparent)
 		{
@@ -132,7 +92,7 @@ public class Lab
 	{
         //TODO fix?
         //Med.BaseControl.Controls.Remove(tb);
-		SetText(tb.Text);
+		//SetText(tb.Text);
 	}
 
 	public void SetHitColor(Med Med)
@@ -166,24 +126,27 @@ public class Lab
 
 	private void SetRectT()
 	{
+		/*
 		double resMag = Med.ResMag;
 		Vector2D vector2D = (parT.Position + Are.GetPosition()) * Med.Unit / resMag + Med.ResVector;
+
 		tb.Location = new Point((int)vector2D.X - 1, (int)vector2D.Y - 1);
 		double num = parT.Size * Med.Unit;
+
 		if (tb.Font != null)
 		{
 			tb.Font.Dispose();
 		}
 		tb.Font = new Font(parT.Font.FontFamily, (float)(parT.FontSize * num / resMag));
 		Vector2D vector2D2 = parT.RectSize * num / resMag;
-		tb.Size = new Size((int)(vector2D2.X + 2.0), (int)(vector2D2.Y + 10.0));
+		tb.Size = new Size((int)(vector2D2.X + 2.0), (int)(vector2D2.Y + 10.0));*/
 	}
 
 	public bool Double(ref Color HitColor)
 	{
         //TODO fix?
         //if (Input && parT.HitColor == HitColor && !Med.BaseControl.Controls.Contains(tb))
-        {
+        /*{
             tb.Text = parT.Text;
 			parT.Text = "";
 			SetRectT();
@@ -192,18 +155,18 @@ public class Lab
 			tb.Focus();
 			tb.BringToFront();
 			return true;
-		}
+		}*/
 		return false;
 	}
 
 	public void Click(ref Color HitColor)
 	{
         //TODO fix?
-        //if (Input && parT.HitColor != HitColor && Med.BaseControl.Controls.Contains(tb))
+        /*if (Input && parT.HitColor != HitColor && Med.BaseControl.Controls.Contains(tb))
 		{
 			//Med.BaseControl.Controls.Remove(tb);
 			SetText(tb.Text);
-		}
+		}*/
 	}
 
 	public void Dispose()
@@ -214,9 +177,5 @@ public class Lab
             //TODO fix?
             //((Control)Med.BaseControl).Resize -= Lab_Resize;
 		}
-		if (tb != null)
-		{
-			tb.Dispose();
-		}
 	}
 }

2DGAMELIB/_2DGAMELIB/Med.cs

@@ -3,10 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using System.Net.Http.Headers;
 using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using System.Windows.Input;
 
 namespace _2DGAMELIB;
 
@@ -186,10 +183,10 @@ public class Med
                     arg2 = MouseButtons.Right;
                     break;
                 case GLFW.MouseButton.Button4:
-                    arg2 = MouseButtons.XButton1;
+                    arg2 = MouseButtons.Button4;
                     break;
                 case GLFW.MouseButton.Button5:
-                    arg2 = MouseButtons.XButton2;
+                    arg2 = MouseButtons.Button5;
                     break;
 			}
 
@@ -200,7 +197,7 @@ public class Med
 		BaseControl.Move = delegate (IntPtr window, double x, double y)
 		{
 			Point Position3 = new Point((int)x, (int)y);
-			Modes[mode].Move(Control.MouseButtons, ToBasePosition(Position3), GetHitColor(ref Position3));
+			Modes[mode].Move(BaseControl.GetMouseButtons(), ToBasePosition(Position3), GetHitColor(ref Position3));
 		};
 
 		BaseControl.Leave = delegate (IntPtr window, bool entered)
@@ -210,7 +207,7 @@ public class Med
 				double x, y;
 				Glfw.GetCursorPosition(GlImage.PtrToWindow(window), out x, out y);
 				Point Position2 = new Point((int)x, (int)y);
-				Modes[mode].Leave(Control.MouseButtons, ToBasePosition(Position2), GetHitColor(ref Position2));
+				Modes[mode].Leave(BaseControl.GetMouseButtons(), ToBasePosition(Position2), GetHitColor(ref Position2));
 			}
 		};
 
@@ -220,7 +217,7 @@ public class Med
             Glfw.GetCursorPosition(GlImage.PtrToWindow(window), out x, out y);
 			Point Position = new Point((int)x, (int)y);
 			//Note: yo may be inverted
-            Modes[mode].Wheel(Control.MouseButtons, ToBasePosition(Position), (int)yo, GetHitColor(ref Position));
+            Modes[mode].Wheel(BaseControl.GetMouseButtons(), ToBasePosition(Position), (int)yo, GetHitColor(ref Position));
         };
 
 		BaseControl.Resize = delegate (IntPtr window, int width, int height)
@@ -339,24 +336,13 @@ public class Med
 
 		while (Drive)
 		{
-			long frame_start = FPSF.sw.ElapsedMilliseconds;
-
 			FPSF.FPSFixed(action);
 
-            long frame_end = FPSF.sw.ElapsedMilliseconds;
-
             if (ShowFPS)
 			{
-				//TODO fix
+				baseControl.SetTitle(UITitle + " - FPS: " + System.Math.Round(FPSF.Value, 2));
-                //baseControl.Parent.Text = UITitle + " - FPS: " + System.Math.Round(FPSF.Value, 2);
 			}
-			Application.DoEvents();
 			baseControl.PollEvents();
-
-            long frame_update_end = FPSF.sw.ElapsedMilliseconds;
-
-			//System.Diagnostics.Debug.WriteLine("frame time: {0:D}", frame_end - frame_start);
-			//System.Diagnostics.Debug.WriteLine("event time: {0:D}", frame_update_end - frame_end);
 		}
 	}
 
@@ -375,7 +361,8 @@ public class Med
 	{
 		if (cur)
 		{
-			System.Windows.Forms.Cursor.Hide();
+			//TODO fix?
+			//System.Windows.Forms.Cursor.Hide();
 			cur = false;
 		}
 	}
@@ -384,7 +371,8 @@ public class Med
 	{
 		if (!cur)
         {
-			System.Windows.Forms.Cursor.Show();
+            //TODO fix?
+            //System.Windows.Forms.Cursor.Show();
             cur = true;
 		}
 	}

2DGAMELIB/_2DGAMELIB/Module.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Drawing;
-using System.Windows.Forms;
 
 namespace _2DGAMELIB;
 

2DGAMELIB/_2DGAMELIB/Oth.cs

@@ -2,10 +2,8 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using System.Drawing.Imaging;
 using System.Linq;
 using System.Text;
-using System.Windows.Forms;
 
 namespace _2DGAMELIB;
 

2DGAMELIB/_2DGAMELIB/Out.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement;
 
 namespace _2DGAMELIB;
 

2DGAMELIB/_2DGAMELIB/Par.cs

@@ -3,11 +3,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using System.IO;
 using System.Linq;
-using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
-using System.Windows.Media.Animation;
 
 namespace _2DGAMELIB;
 

2DGAMELIB/_2DGAMELIB/Pars.cs

@@ -2,10 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using System.IO;
-using System.Linq;
-using System.Runtime.ExceptionServices;
-using System.Windows.Documents;
 
 namespace _2DGAMELIB;
 

2DGAMELIB/_2DGAMELIB/SoundPlayer.cs

@@ -1,11 +1,11 @@
 using System;
-using System.Windows.Media;
 
 namespace _2DGAMELIB;
 
 public class SoundPlayer
 {
-	public MediaPlayer mp = new MediaPlayer();
+	//Todo Fix
+	//public MediaPlayer mp = new MediaPlayer();
 
 	private bool l;
 
@@ -23,53 +23,36 @@ public class SoundPlayer
 			{
 				if (l != value)
 				{
-					mp.MediaEnded += loop;
+					//mp.MediaEnded += loop;
 				}
 			}
 			else if (l != value)
 			{
-				mp.MediaEnded -= loop;
+				//mp.MediaEnded -= loop;
 			}
 			l = value;
 		}
 	}
 
-	public SoundPlayer(string Path)
-	{
-		mp.Open(new Uri(Path));
-		mp.Volume = 1.0;
-	}
-
 	public SoundPlayer(string Path, bool Loop)
 	{
-		mp.Open(new Uri(Path));
+		//mp.Open(new Uri(Path));
 		this.Loop = Loop;
-		mp.Volume = 1.0;
+		//mp.Volume = 1.0;
-	}
-
-	private void loop(object s, EventArgs e)
-	{
-		mp.Position = ts;
-		mp.Play();
 	}
 
 	public void Play()
 	{
-		mp.Play();
+		//mp.Play();
 	}
 
 	public void Stop()
 	{
-		mp.Stop();
+		//mp.Stop();
-	}
-
-	public void Pause()
-	{
-		mp.Pause();
 	}
 
 	public void Close()
 	{
-		mp.Close();
+		//mp.Close();
 	}
 }

2DGAMELIB/_2DGAMELIB/UI.cs

@@ -2,7 +2,6 @@ using System;
 using System.ComponentModel;
 using System.IO;
 using System.Linq;
-using System.Windows.Forms;
 
 namespace _2DGAMELIB;
 
@@ -14,7 +13,7 @@ public class UI //: Form
 
 	private GlImage wpfImage1;
 
-	private System.Windows.Controls.Image hostedComponent1;
+	//private System.Windows.Controls.Image hostedComponent1;
 
 	private string ConfigPath = Directory.GetCurrentDirectory() + "\\Config.ini";
 
@@ -54,7 +53,7 @@ public class UI //: Form
 		UI_Resize(null, null);
 	}
 
-	private void UI_FormClosing(object sender, FormClosingEventArgs e)
+	private void UI_FormClosing()
 	{
 		Med.Drive = false;
 	}
@@ -80,7 +79,7 @@ public class UI //: Form
 	{
 		System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(_2DGAMELIB.UI));
 		this.wpfImage1 = new GlImage();
-		this.hostedComponent1 = new System.Windows.Controls.Image();
+		//this.hostedComponent1 = new System.Windows.Controls.Image();
 
 		//base.SuspendLayout();
 
@@ -109,7 +108,7 @@ public class UI //: Form
 		//base.FormClosing += new System.Windows.Forms.FormClosingEventHandler(UI_FormClosing);
 
 		//beauty
-		this.wpfImage1.Closing = delegate () { UI_FormClosing(null, null); };
+		this.wpfImage1.Closing = delegate () { UI_FormClosing(); };
 
 		//TODO fix?
 		//base.Load += new System.EventHandler(UI_Load);

2DGAMELIB/_2DGAMELIB/WPFImage.cs

@@ -3,18 +3,20 @@ using OpenGL;
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
-using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Forms.Integration;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 
 namespace _2DGAMELIB;
 
+public enum MouseButtons { 
+	None = 0,
+	Left = 1,
+	Right = 2,
+	Middle = 4,
+	Button4 = 8,
+	Button5 = 16
+}
+
 public class GlImage
 {
 
@@ -45,6 +47,27 @@ public class GlImage
 		return new System.Drawing.Point((int)x, (int)y);
 	}
 
+	public MouseButtons GetMouseButtons() {
+		MouseButtons btns = 0;
+
+		if (Glfw.GetMouseButton(window, MouseButton.Left) == InputState.Press)
+			btns |= MouseButtons.Left;
+
+        if (Glfw.GetMouseButton(window, MouseButton.Right) == InputState.Press)
+            btns |= MouseButtons.Right;
+
+        if (Glfw.GetMouseButton(window, MouseButton.Middle) == InputState.Press)
+            btns |= MouseButtons.Middle;
+
+        if (Glfw.GetMouseButton(window, MouseButton.Button4) == InputState.Press)
+            btns |= MouseButtons.Button4;
+
+        if (Glfw.GetMouseButton(window, MouseButton.Button5) == InputState.Press)
+            btns |= MouseButtons.Button5;
+
+		return btns;
+    }
+
 	public delegate void ShouldCloseCallback();
 
 	public ShouldCloseCallback Closing = delegate () { };
@@ -54,6 +77,10 @@ public class GlImage
 	public MouseCallback Scroll = delegate (IntPtr window, double x, double y) { };
 	public MouseEnterCallback Leave = delegate (IntPtr window, bool entered) { };
 
+	public void SetTitle(string title) {
+		Glfw.SetWindowTitle(window, title);
+	}
+
     public void PollEvents() {
 		Glfw.PollEvents();
 		if (Glfw.WindowShouldClose(window))

SlaveMatrix/Properties/AssemblyInfo.cs

@@ -4,7 +4,6 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Security;
-using System.Security.Permissions;
 
 [assembly: AssemblyTitle("SlaveMatrix")]
 [assembly: AssemblyDescription("")]
@@ -14,6 +13,5 @@ using System.Security.Permissions;
 [assembly: AssemblyCopyright("Copyright ©  2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: ComVisible(false)]
-[assembly: Guid("9a24ba08-c231-4217-b31f-b963a704de51")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: AssemblyVersion("1.0.0.0")]

SlaveMatrix/Properties/Resources.Designer.cs

@@ -19,16 +19,16 @@ namespace SlaveMatrix.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    //[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    //[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    //[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     public class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
         private static global::System.Globalization.CultureInfo resourceCulture;
         
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        //[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal Resources() {
         }
         

SlaveMatrix/SlaveMatrix.csproj

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>SlaveMatrix</AssemblyName>
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
-    <OutputType>WinExe</OutputType>
+    <OutputType>Exe</OutputType>
-    <UseWindowsForms>True</UseWindowsForms>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <TargetFramework>net462</TargetFramework>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup>
@@ -16,25 +15,9 @@
     <ApplicationIcon>app.ico</ApplicationIcon>
     <RootNamespace />
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net45" Version="1.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\2DGAMELIB\2DGAMELIB.csproj" />
   </ItemGroup>
-  <ItemGroup>
-	<Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing"></Reference>
-
-	<Reference Include="System.Windows.Forms"></Reference>
-  </ItemGroup>
-	<PropertyGroup>
-		<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-	</PropertyGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>

SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.Serialization;
 
 namespace SlaveMatrix;
 

SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;

SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs

@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;
@@ -404,7 +403,8 @@ public class ハンド処理 : 処理B
 		{
 			return;
 		}
-		v = _2DGAMELIB._Con.ToVector2D(Cursor.Position);
+
+		v = cp;
 		x = (o.X - v.X) * 0.008;
 		if (Isモード)
 		{

SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs

@@ -1,6 +1,5 @@
 using System.Drawing;
 using System.Linq;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;
@@ -224,7 +223,7 @@ public class ペニス処理 : 処理B
 		{
 			return;
 		}
-		v = _2DGAMELIB._Con.ToVector2D(Cursor.Position);
+		v = cp;
 		x = (o.X - v.X) * 0.008;
 		y = (o.Y - v.Y) * 0.008;
 		if (Isモード)
@@ -655,7 +654,7 @@ public class ペニス処理 : 処理B
 			BaseSpeed = 3.0,
 			Staing = delegate
 			{
-				Sounds.射精.Play();
+				//Sounds.射精.Play();
 				ペニス処理2.射精_();
 				if (外出し = !調教UI.ペニス挿入.Is挿入)
 				{

SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using System.Drawing;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;
@@ -83,7 +82,7 @@ public class マウス処理 : 処理B
 		{
 			return;
 		}
-		v = _2DGAMELIB._Con.ToVector2D(Cursor.Position);
+		v = cp;
 		x = (o.X - v.X) * 0.008;
 		if (Isモード)
 		{

SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs

@@ -1,5 +1,4 @@
 using System.Drawing;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;

SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs

@@ -1,6 +1,5 @@
 using System.Drawing;
 using System.Linq;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;
@@ -401,10 +400,10 @@ public class 挿入処理 : 処理B
 			switch (RNG.XS.Next(2))
 			{
 			case 0:
-				Sounds.挿抜口1.Play();
+				//Sounds.挿抜口1.Play();
 				break;
 			case 1:
-				Sounds.挿抜口2.Play();
+				//Sounds.挿抜口2.Play();
 				break;
 			}
 		}
@@ -417,10 +416,10 @@ public class 挿入処理 : 処理B
 			switch (RNG.XS.Next(2))
 			{
 			case 0:
-				Sounds.挿抜前1.Play();
+				//Sounds.挿抜前1.Play();
 				break;
 			case 1:
-				Sounds.挿抜前2.Play();
+				//Sounds.挿抜前2.Play();
 				break;
 			}
 		}
@@ -433,16 +432,16 @@ public class 挿入処理 : 処理B
 			switch (Oth.GetRandomIndex(4.0, 4.0, 1.0, 1.0))
 			{
 			case 0:
-				Sounds.挿抜前3.Play();
+				//Sounds.挿抜前3.Play();
 				break;
 			case 1:
-				Sounds.挿抜前4.Play();
+				//Sounds.挿抜前4.Play();
 				break;
 			case 2:
-				Sounds.挿抜後1.Play();
+				//Sounds.挿抜後1.Play();
 				break;
 			case 3:
-				Sounds.挿抜後2.Play();
+				//Sounds.挿抜後2.Play();
 				break;
 			}
 		}
@@ -455,10 +454,10 @@ public class 挿入処理 : 処理B
 			switch (RNG.XS.Next(2))
 			{
 			case 0:
-				Sounds.挿抜糸1.Play();
+				//Sounds.挿抜糸1.Play();
 				break;
 			case 1:
-				Sounds.挿抜糸2.Play();
+				//Sounds.挿抜糸2.Play();
 				break;
 			}
 		}
@@ -616,7 +615,7 @@ public class 挿入処理 : 処理B
 	{
 		if (調教UI.SubFocus.Contains(this))
 		{
-			vr = _2DGAMELIB._Con.ToVector2D(Cursor.Position);
+			vr = cp;
 			xr = (or.X - vr.X) * -0.008;
 			yr = (or.Y - vr.Y) * -0.008;
 			if (挿入箇所 == ContactType.Vagina)
@@ -947,7 +946,10 @@ public class 挿入処理 : 処理B
 		{
 			return;
 		}
-		v = (挿抜モーション.Run ? cp : _2DGAMELIB._Con.ToVector2D(Cursor.Position));
+
+		//TODO fix?
+		//v = (挿抜モーション.Run ? cp : _2DGAMELIB._Con.ToVector2D(Cursor.Position));
+		v = cp;
 		if (調教UI.Focus == 対象 || 挿抜モーション.Run)
 		{
 			if (Isモード)

SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs

@@ -1,5 +1,4 @@
 using System.Drawing;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;

SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs

@@ -1,6 +1,5 @@
 using System.Drawing;
 using System.Linq;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;
@@ -52,7 +51,7 @@ public class 調鞭処理 : 処理B
 		if (調教UI.Focus == 対象)
 		{
 			調教UI.放し();
-			v = _2DGAMELIB._Con.ToVector2D(Cursor.Position);
+			v = cp;
 			x = (o.X - v.X).Sign();
 			o = v;
 			対象.Ele.角度C = 0.0;
@@ -208,7 +207,8 @@ public class 調鞭処理 : 処理B
 				調鞭処理2.衝撃.表示 = true;
 				調鞭処理2.衝撃.角度C = 360.0 * RNG.XS.NextDouble();
 				調鞭処理2.衝撃.尺度C = 0.0;
-				Sounds.鞭撃.Play();
+				//TODO fix?
+				//Sounds.鞭撃.Play();
 			},
 			Runing = delegate(Mot m)
 			{

SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs

@@ -960,7 +960,7 @@ public class Cha
 				{
 					染み.Start();
 				}
-				Sounds.放尿.Play();
+				//Sounds.放尿.Play();
 			},
 			Runing = delegate(Mot m)
 			{
@@ -1976,11 +1976,11 @@ public class Cha
 			{
 				if (RNG.XS.NextBool())
 				{
-					Sounds.挿抜口1.Play();
+					//Sounds.挿抜口1.Play();
 				}
 				else
 				{
-					Sounds.挿抜口2.Play();
+					//Sounds.挿抜口2.Play();
 				}
 				ChaD.Stamina = (ChaD.Stamina + 0.3 * 中出度_).Clamp(0.0, 1.0);
 			}

SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs

@@ -73,6 +73,8 @@ public class EleD
 
 	public double 濃度 = 1.0;
 
+	//TODO figure out what this broke...
+    [NonSerialized]
     public Type ThisType;
 
 	public virtual Ele GetEle(double DisUnit, Med Med, 体配色 体配色)

SlaveMatrix/SlaveMatrix/GameClasses/GameState.cs

@@ -177,10 +177,14 @@ public class GameState
 	public void GenRefresh()
 	{
 		Refresh = true;
+		/*
 		Parallel.ForEach(Gen, Sta.po3, delegate(Generator g)
 		{
 			g.Refresh(3);
-		});
+		});*/
+
+		foreach (Generator g in Gen)
+			g.Refresh(3);
 		Refresh = false;
 	}
 

SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs

@@ -360,10 +360,14 @@ public class Generator
 		i = 0;
 		Buf.Clear();
 		Unit[] a = new Unit[Capacity];
+
+		for (int i = 0; i < Capacity; i++)
+			a[i] = g();
+		/*
 		Parallel.For(0, Capacity, Sta.po3, delegate(int i)
 		{
 			a[i] = g();
-		});
+		});*/
 		Buf.AddRange(a);
 	}
 
@@ -374,10 +378,13 @@ public class Generator
 		Buf.Clear();
 		Buf.Capacity = Capacity;
 		Unit[] a = new Unit[Capacity];
+		for (int i = 0; i < Capacity; i++)
+			a[i] = g();
+		/*
 		Parallel.For(0, Capacity, Sta.po3, delegate(int i)
 		{
 			a[i] = g();
-		});
+		});*/
 		Buf.AddRange(a);
 	}
 

SlaveMatrix/SlaveMatrix/GameClasses/Program.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;
@@ -11,8 +10,8 @@ internal static class Program
 	[STAThread]
 	private static void Main(string[] A_0)
 	{
-		Application.EnableVisualStyles();
+		//Application.EnableVisualStyles();
-		Application.SetCompatibleTextRenderingDefault(defaultValue: false);
+		//Application.SetCompatibleTextRenderingDefault(defaultValue: false);
 
         Sta.LoadConfig();
 

SlaveMatrix/SlaveMatrix/GameClasses/Sounds.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using System.Media;
 using _2DGAMELIB;
 using SlaveMatrix.Properties;
 
@@ -7,55 +6,56 @@ namespace SlaveMatrix;
 
 public static class Sounds
 {
-	public static _2DGAMELIB.SoundPlayer 日常BGM = new _2DGAMELIB.SoundPlayer(Sta.CurrentDirectory + "\\bgm\\game_maoudamashii_5_town10.wav", Loop: true);
+	//TODO fix sound
+	//public static _2DGAMELIB.SoundPlayer 日常BGM = new _2DGAMELIB.SoundPlayer(Sta.CurrentDirectory + "\\bgm\\game_maoudamashii_5_town10.wav", Loop: true);
 
-	public static _2DGAMELIB.SoundPlayer OPBGM = new _2DGAMELIB.SoundPlayer(Sta.CurrentDirectory + "\\bgm\\bgm_maoudamashii_neorock60.wav", Loop: true);
+	//public static _2DGAMELIB.SoundPlayer OPBGM = new _2DGAMELIB.SoundPlayer(Sta.CurrentDirectory + "\\bgm\\bgm_maoudamashii_neorock60.wav", Loop: true);
 
-	public static System.Media.SoundPlayer 操作 = new System.Media.SoundPlayer(new MemoryStream(Resources.se_maoudamashii_system40));
+	//public static System.Media.SoundPlayer 操作 = new System.Media.SoundPlayer(new MemoryStream(Resources.se_maoudamashii_system40));
 
-	public static System.Media.SoundPlayer 精算 = new System.Media.SoundPlayer(new MemoryStream(Resources.tm2r_coin06));
+	//public static System.Media.SoundPlayer 精算 = new System.Media.SoundPlayer(new MemoryStream(Resources.tm2r_coin06));
 
-	public static System.Media.SoundPlayer 完了 = new System.Media.SoundPlayer(new MemoryStream(Resources.se_maoudamashii_onepoint12));
+	//public static System.Media.SoundPlayer 完了 = new System.Media.SoundPlayer(new MemoryStream(Resources.se_maoudamashii_onepoint12));
 
-	public static System.Media.SoundPlayer 鞭撃 = new System.Media.SoundPlayer(new MemoryStream(Resources.teasi_naguru_keru06));
+	//public static System.Media.SoundPlayer 鞭撃 = new System.Media.SoundPlayer(new MemoryStream(Resources.teasi_naguru_keru06));
 
-	public static System.Media.SoundPlayer 弾け = new System.Media.SoundPlayer(new MemoryStream(Resources.tm2r_crash25r));
+	//public static System.Media.SoundPlayer 弾け = new System.Media.SoundPlayer(new MemoryStream(Resources.tm2r_crash25r));
 
-	public static System.Media.SoundPlayer 撮影 = new System.Media.SoundPlayer(new MemoryStream(Resources.camera_shutter03));
+	//public static System.Media.SoundPlayer 撮影 = new System.Media.SoundPlayer(new MemoryStream(Resources.camera_shutter03));
 
-	public static System.Media.SoundPlayer 祝福 = new System.Media.SoundPlayer(new MemoryStream(Resources.se_maoudamashii_onepoint09));
+	//public static System.Media.SoundPlayer 祝福 = new System.Media.SoundPlayer(new MemoryStream(Resources.se_maoudamashii_onepoint09));
 
-	public static System.Media.SoundPlayer 解除 = new System.Media.SoundPlayer(new MemoryStream(Resources.se_maoudamashii_onepoint07));
+	//public static System.Media.SoundPlayer 解除 = new System.Media.SoundPlayer(new MemoryStream(Resources.se_maoudamashii_onepoint07));
 
-	public static System.Media.SoundPlayer 変更1 = new System.Media.SoundPlayer(new MemoryStream(Resources.keyholder));
+	//public static System.Media.SoundPlayer 変更1 = new System.Media.SoundPlayer(new MemoryStream(Resources.keyholder));
 
-	public static System.Media.SoundPlayer 変更2 = new System.Media.SoundPlayer(new MemoryStream(Resources.keyholder_catchsuru));
+	//public static System.Media.SoundPlayer 変更2 = new System.Media.SoundPlayer(new MemoryStream(Resources.keyholder_catchsuru));
 
-	public static System.Media.SoundPlayer 変更3 = new System.Media.SoundPlayer(new MemoryStream(Resources.keyholder_nigiru));
+	//public static System.Media.SoundPlayer 変更3 = new System.Media.SoundPlayer(new MemoryStream(Resources.keyholder_nigiru));
 
-	public static System.Media.SoundPlayer 射精 = new System.Media.SoundPlayer(new MemoryStream(Resources.sei_ge_nukarumu01));
+	//public static System.Media.SoundPlayer 射精 = new System.Media.SoundPlayer(new MemoryStream(Resources.sei_ge_nukarumu01));
 
-	public static System.Media.SoundPlayer 放尿 = new System.Media.SoundPlayer(new MemoryStream(Resources.near_a_brook_ex));
+	//public static System.Media.SoundPlayer 放尿 = new System.Media.SoundPlayer(new MemoryStream(Resources.near_a_brook_ex));
 
-	public static System.Media.SoundPlayer 挿抜口1 = new System.Media.SoundPlayer(new MemoryStream(Resources.hito_ge_goku01));
+	//public static System.Media.SoundPlayer 挿抜口1 = new System.Media.SoundPlayer(new MemoryStream(Resources.hito_ge_goku01));
 
-	public static System.Media.SoundPlayer 挿抜口2 = new System.Media.SoundPlayer(new MemoryStream(Resources.hito_ge_goku02));
+	//public static System.Media.SoundPlayer 挿抜口2 = new System.Media.SoundPlayer(new MemoryStream(Resources.hito_ge_goku02));
 
-	public static System.Media.SoundPlayer 挿抜前1 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi1));
+	//public static System.Media.SoundPlayer 挿抜前1 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi1));
 
-	public static System.Media.SoundPlayer 挿抜前2 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi2));
+	//public static System.Media.SoundPlayer 挿抜前2 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi2));
 
-	public static System.Media.SoundPlayer 挿抜前3 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi3));
+	//public static System.Media.SoundPlayer 挿抜前3 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi3));
 
-	public static System.Media.SoundPlayer 挿抜前4 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi6));
+	//public static System.Media.SoundPlayer 挿抜前4 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi6));
 
-	public static System.Media.SoundPlayer 挿抜後1 = new System.Media.SoundPlayer(new MemoryStream(Resources.hito_ge_onara01));
+	//public static System.Media.SoundPlayer 挿抜後1 = new System.Media.SoundPlayer(new MemoryStream(Resources.hito_ge_onara01));
 
-	public static System.Media.SoundPlayer 挿抜後2 = new System.Media.SoundPlayer(new MemoryStream(Resources.hito_ge_haramusi07));
+	//public static System.Media.SoundPlayer 挿抜後2 = new System.Media.SoundPlayer(new MemoryStream(Resources.hito_ge_haramusi07));
 
-	public static System.Media.SoundPlayer 挿抜糸1 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi4));
+	//public static System.Media.SoundPlayer 挿抜糸1 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi4));
 
-	public static System.Media.SoundPlayer 挿抜糸2 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi5));
+	//public static System.Media.SoundPlayer 挿抜糸2 = new System.Media.SoundPlayer(new MemoryStream(Resources.nukarumi5));
 
 	private static int o = -1;
 
@@ -71,19 +71,20 @@ public static class Sounds
 		switch (num)
 		{
 		case 0:
-			変更1.Play();
+			//変更1.Play();
 			break;
 		case 1:
-			変更2.Play();
+			//変更2.Play();
 			break;
 		case 2:
-			変更3.Play();
+			//変更3.Play();
 			break;
 		}
 	}
 
 	public static void Close()
 	{
+		/*
 		日常BGM.Stop();
 		日常BGM.Close();
 		OPBGM.Stop();
@@ -134,5 +135,6 @@ public static class Sounds
 		挿抜糸1.Dispose();
 		挿抜糸2.Stop();
 		挿抜糸2.Dispose();
+		*/
 	}
 }

SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs

@@ -470,7 +470,7 @@ public static class Sta
 
 	public static string[] end;
 
-	public static ParallelOptions po3;
+	//public static ParallelOptions po3;
 
 	public static string ConfigPath;
 
@@ -1148,8 +1148,8 @@ public static class Sta
 		}
 		if (!PlayBGM)
 		{
-			Sounds.OPBGM = new SoundPlayer(CurrentDirectory + "\\bgm\\doesntexist", Loop: true);
+			//Sounds.OPBGM = new SoundPlayer(CurrentDirectory + "\\bgm\\doesntexist", Loop: true);
-			Sounds.日常BGM = new SoundPlayer(CurrentDirectory + "\\bgm\\doesntexist2", Loop: true);
+			//Sounds.日常BGM = new SoundPlayer(CurrentDirectory + "\\bgm\\doesntexist2", Loop: true);
 		}
 	}
 
@@ -1477,10 +1477,12 @@ public static class Sta
 		SavePath = CurrentDirectory + "\\save";
 		ImiPath = CurrentDirectory + "\\text\\Basement\\Training\\Imitation.txt";
 		PanPath = CurrentDirectory + "\\text\\Basement\\Training\\Pant";
+
+		/*
 		po3 = new ParallelOptions
 		{
 			MaxDegreeOfParallelism = 3
-		};
+		};*/
 		ConfigPath = CurrentDirectory + "\\Config.ini";
 		SimpleMating = false;
 		AutoSort = false;

SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs

@@ -4,7 +4,6 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
-using System.Windows.Forms;
 using _2DGAMELIB;
 
 namespace SlaveMatrix;
@@ -2277,11 +2276,11 @@ public class TrainingUI : Ele
 			{
 				if (調教UI2.拘束具sw.Flag)
 				{
-					Sounds.変更2.Play();
+					//Sounds.変更2.Play();
 				}
 				else
 				{
-					Sounds.変更1.Play();
+					//Sounds.変更1.Play();
 				}
 				調教UI2.拘束具sw.OnOff(a);
 				Sta.GameData.拘束具 = 調教UI2.拘束具sw.Flag;
@@ -2466,7 +2465,8 @@ public class TrainingUI : Ele
 				else
 				{
 					Sta.GameData.所持金 -= 調教UI2.媚薬投与価格;
-					Sounds.精算.Play();
+                    //TODO fix?
+                    //Sounds.精算.Play();
 					ip.UpdateSub2();
 					Sta.GameData.TrainingTarget.発情フラグ = true;
 					ip.SubInfoIm = GameText.媚薬を打ち込んだ;
@@ -2496,7 +2496,7 @@ public class TrainingUI : Ele
 			Film.Setting();
 			撮影 = new But1(parT7, delegate
 			{
-				Sounds.撮影.Play();
+				//Sounds.撮影.Play();
 				Med.フラッシュ();
 				if (!Directory.Exists(Path))
 				{
@@ -2529,7 +2529,7 @@ public class TrainingUI : Ele
 					{
 						ip.選択yAct = delegate
 						{
-							Sounds.操作.Play();
+							//Sounds.操作.Play();
 							Sta.GameData.TrainingTarget.ChaD.撮影ピース経験 = true;
 							調教UI2.Cha.Setダブルピース();
 							調教UI2.Cha.Bod.Update();
@@ -2538,7 +2538,7 @@ public class TrainingUI : Ele
 						};
 						ip.選択nAct = delegate
 						{
-							Sounds.操作.Play();
+							//Sounds.操作.Play();
 							ip.選択肢表示 = false;
 							ip.MaiShow = false;
 						};
@@ -2548,20 +2548,20 @@ public class TrainingUI : Ele
 				}
 			});
 			int alpha = 200;
-			体力sゲージ = new Gau("体力", Are.GetPosition(new Vector2D(0.025, 0.5)), Are.Size, 0.025, Are.YRatio * 0.98, 0.02, Open.Top, Range.ZeroOne, disUnit, Color.FromArgb(alpha, Color.Red), Color.Yellow, Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Col.Black), Knob: false);
+			体力sゲージ = new Gau("体力", Are.GetPosition(new Vector2D(0.025, 0.5)), Are.Size, 0.025, Are.YRatio * 0.98, 0.02, Open.Top, _2DGAMELIB.Range.ZeroOne, disUnit, Color.FromArgb(alpha, Color.Red), Color.Yellow, Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Col.Black), Knob: false);
 			体力sゲージ.Frame1.Pen = null;
-			絶頂sゲージ = new Gau("絶頂", Are.GetPosition(new Vector2D(0.060000000000000005, 0.5)), Are.Size, 0.01, Are.YRatio * 0.98, 0.02, Open.Top, Range.ZeroOne, disUnit, Color.FromArgb(alpha, Color.DeepPink), Col.White, Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.Transparent, Knob: false);
+			絶頂sゲージ = new Gau("絶頂", Are.GetPosition(new Vector2D(0.060000000000000005, 0.5)), Are.Size, 0.01, Are.YRatio * 0.98, 0.02, Open.Top, _2DGAMELIB.Range.ZeroOne, disUnit, Color.FromArgb(alpha, Color.DeepPink), Col.White, Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.Transparent, Knob: false);
 			絶頂sゲージ.Frame1.Pen = null;
 			絶頂sゲージ.Gauge.Pen = null;
-			興奮sゲージ = new Gau("興奮", Are.GetPosition(new Vector2D(0.060000000000000005, 0.5)), Are.Size, 0.025, Are.YRatio * 0.98, 0.02, Open.Top, Range.ZeroOne, disUnit, Color.FromArgb(180, Col.White), Color.FromArgb(180, Color.Red), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Col.Black), Knob: false);
+			興奮sゲージ = new Gau("興奮", Are.GetPosition(new Vector2D(0.060000000000000005, 0.5)), Are.Size, 0.025, Are.YRatio * 0.98, 0.02, Open.Top, _2DGAMELIB.Range.ZeroOne, disUnit, Color.FromArgb(180, Col.White), Color.FromArgb(180, Color.Red), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Col.Black), Knob: false);
 			興奮sゲージ.Frame1.Pen = null;
 			興奮sゲージ.Gauge.Pen = null;
-			精力mゲージ = new Gau("精力", Are.GetPosition(new Vector2D(0.025.Inverse(), 0.5)), Are.Size, 0.025, Are.YRatio * 0.98, 0.02, Open.Top, Range.ZeroOne, disUnit, Color.FromArgb(alpha, Col.Yellow.Add(180, 0, 0)), Col.Red.Add(180, 0, 0), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Col.Black), Knob: false);
+			精力mゲージ = new Gau("精力", Are.GetPosition(new Vector2D(0.025.Inverse(), 0.5)), Are.Size, 0.025, Are.YRatio * 0.98, 0.02, Open.Top, _2DGAMELIB.Range.ZeroOne, disUnit, Color.FromArgb(alpha, Col.Yellow.Add(180, 0, 0)), Col.Red.Add(180, 0, 0), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Col.Black), Knob: false);
 			精力mゲージ.Frame1.Pen = null;
-			射精mゲージ = new Gau("射精", Are.GetPosition(new Vector2D(0.060000000000000005.Inverse(), 0.5)), Are.Size, 0.01, Are.YRatio * 0.98, 0.02, Open.Top, Range.ZeroOne, disUnit, Color.FromArgb(alpha, Col.DeepPink.Add(180, 0, 0)), Col.White.Add(180, 0, 0), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.Transparent, Knob: false);
+			射精mゲージ = new Gau("射精", Are.GetPosition(new Vector2D(0.060000000000000005.Inverse(), 0.5)), Are.Size, 0.01, Are.YRatio * 0.98, 0.02, Open.Top, _2DGAMELIB.Range.ZeroOne, disUnit, Color.FromArgb(alpha, Col.DeepPink.Add(180, 0, 0)), Col.White.Add(180, 0, 0), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.Transparent, Knob: false);
 			射精mゲージ.Frame1.Pen = null;
 			射精mゲージ.Gauge.Pen = null;
-			興奮mゲージ = new Gau("興奮", Are.GetPosition(new Vector2D(0.060000000000000005.Inverse(), 0.5)), Are.Size, 0.025, Are.YRatio * 0.98, 0.02, Open.Top, Range.ZeroOne, disUnit, Color.FromArgb(180, Col.White), Color.FromArgb(180, Color.Red), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Col.Black), Knob: false);
+			興奮mゲージ = new Gau("興奮", Are.GetPosition(new Vector2D(0.060000000000000005.Inverse(), 0.5)), Are.Size, 0.025, Are.YRatio * 0.98, 0.02, Open.Top, _2DGAMELIB.Range.ZeroOne, disUnit, Color.FromArgb(180, Col.White), Color.FromArgb(180, Color.Red), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Color.Gray), Color.FromArgb(alpha, Col.Black), Knob: false);
 			興奮mゲージ.Frame1.Pen = null;
 			興奮mゲージ.Gauge.Pen = null;
 			Color c = Med.GetUniqueColor();
@@ -3166,7 +3166,7 @@ public class TrainingUI : Ele
 		parT.PositionBase = Are.GetPosition(x, y);
 		SlaveStamina = new But1(parT, delegate
 		{
-			Sounds.操作.Play();
+			//Sounds.操作.Play();
 			ip.UpdateSub2();
 			Sta.GameData.TrainingTarget.ChaD.Stamina = 1.0;
 		});
@@ -3188,7 +3188,7 @@ public class TrainingUI : Ele
 		parT2.PositionBase = parT.PositionBase.AddY(0.015);
 		PlayerStamina = new But1(parT2, delegate
 		{
-			Sounds.操作.Play();
+			//Sounds.操作.Play();
 			ip.UpdateSub2();
 			Sta.GameData.精力 = 1.0;
 		});