From eecd2a03990e638cc4c6c66dd7d542f19694d79f Mon Sep 17 00:00:00 2001 From: lewd-alt <210463139+lewd-alt@users.noreply.github.com> Date: Wed, 7 May 2025 10:25:45 -0700 Subject: [PATCH] no more windows? --- 2DGAMELIB/2DGAMELIB.csproj | 28 +- 2DGAMELIB/_2DGAMELIB/Dif.cs | 2 - 2DGAMELIB/_2DGAMELIB/Difs.cs | 3 - 2DGAMELIB/_2DGAMELIB/Lab.cs | 63 +--- 2DGAMELIB/_2DGAMELIB/Med.cs | 36 +- 2DGAMELIB/_2DGAMELIB/Module.cs | 1 - 2DGAMELIB/_2DGAMELIB/Oth.cs | 2 - 2DGAMELIB/_2DGAMELIB/Out.cs | 2 - 2DGAMELIB/_2DGAMELIB/Par.cs | 4 - 2DGAMELIB/_2DGAMELIB/Pars.cs | 4 - 2DGAMELIB/_2DGAMELIB/SoundPlayer.cs | 35 +- 2DGAMELIB/_2DGAMELIB/UI.cs | 9 +- 2DGAMELIB/_2DGAMELIB/WPFImage.cs | 41 ++- SlaveMatrix/Properties/AssemblyInfo.cs | 2 - SlaveMatrix/Properties/Resources.Designer.cs | 8 +- SlaveMatrix/SlaveMatrix.csproj | 23 +- .../BodyPartClasses/ConnectionInfo.cs | 1 + .../BodyPartClasses/キャップ処理.cs | 1 - .../SlaveMatrix/BodyPartClasses/ハンド処理.cs | 4 +- .../SlaveMatrix/BodyPartClasses/ペニス処理.cs | 5 +- .../SlaveMatrix/BodyPartClasses/マウス処理.cs | 3 +- .../SlaveMatrix/BodyPartClasses/剃刀処理.cs | 1 - .../SlaveMatrix/BodyPartClasses/挿入処理.cs | 28 +- .../SlaveMatrix/BodyPartClasses/羽箒処理.cs | 1 - .../SlaveMatrix/BodyPartClasses/調鞭処理.cs | 6 +- SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs | 6 +- SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs | 4 +- .../SlaveMatrix/GameClasses/GameState.cs | 6 +- .../SlaveMatrix/GameClasses/Generator.cs | 11 +- SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs | 338 +++++++++--------- .../SlaveMatrix/GameClasses/Program.cs | 5 +- SlaveMatrix/SlaveMatrix/GameClasses/Sounds.cs | 60 ++-- SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs | 10 +- .../SlaveMatrix/GameClasses/TrainingUI.cs | 30 +- 34 files changed, 358 insertions(+), 425 deletions(-) diff --git a/2DGAMELIB/2DGAMELIB.csproj b/2DGAMELIB/2DGAMELIB.csproj index e9af2bc..1972427 100644 --- a/2DGAMELIB/2DGAMELIB.csproj +++ b/2DGAMELIB/2DGAMELIB.csproj @@ -1,10 +1,10 @@  - + 2DGAMELIB False True - net462 + netstandard2.1 x86 AnyCPU @@ -17,28 +17,10 @@ + + + - - - ..\..\..\..\..\Windows\Microsoft.NET\Framework\v4.0.30319\WPF\PresentationFramework.dll - - - - - - - - - - - - - - - - - true - \ No newline at end of file diff --git a/2DGAMELIB/_2DGAMELIB/Dif.cs b/2DGAMELIB/_2DGAMELIB/Dif.cs index 129bfb5..a1d5fa7 100644 --- a/2DGAMELIB/_2DGAMELIB/Dif.cs +++ b/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; diff --git a/2DGAMELIB/_2DGAMELIB/Difs.cs b/2DGAMELIB/_2DGAMELIB/Difs.cs index 8d6688c..6320d77 100644 --- a/2DGAMELIB/_2DGAMELIB/Difs.cs +++ b/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; diff --git a/2DGAMELIB/_2DGAMELIB/Lab.cs b/2DGAMELIB/_2DGAMELIB/Lab.cs index 9b5d8d2..d6ec888 100644 --- a/2DGAMELIB/_2DGAMELIB/Lab.cs +++ b/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(); - } } } diff --git a/2DGAMELIB/_2DGAMELIB/Med.cs b/2DGAMELIB/_2DGAMELIB/Med.cs index 63991f2..ff72528 100644 --- a/2DGAMELIB/_2DGAMELIB/Med.cs +++ b/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.Parent.Text = UITitle + " - FPS: " + System.Math.Round(FPSF.Value, 2); + baseControl.SetTitle(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; } } @@ -383,9 +370,10 @@ public class Med public void CursorShow() { if (!cur) - { - System.Windows.Forms.Cursor.Show(); - cur = true; + { + //TODO fix? + //System.Windows.Forms.Cursor.Show(); + cur = true; } } diff --git a/2DGAMELIB/_2DGAMELIB/Module.cs b/2DGAMELIB/_2DGAMELIB/Module.cs index df4a224..71f4bd5 100644 --- a/2DGAMELIB/_2DGAMELIB/Module.cs +++ b/2DGAMELIB/_2DGAMELIB/Module.cs @@ -1,6 +1,5 @@ using System; using System.Drawing; -using System.Windows.Forms; namespace _2DGAMELIB; diff --git a/2DGAMELIB/_2DGAMELIB/Oth.cs b/2DGAMELIB/_2DGAMELIB/Oth.cs index 1294f26..c565726 100644 --- a/2DGAMELIB/_2DGAMELIB/Oth.cs +++ b/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; diff --git a/2DGAMELIB/_2DGAMELIB/Out.cs b/2DGAMELIB/_2DGAMELIB/Out.cs index f4b1e25..312c6ff 100644 --- a/2DGAMELIB/_2DGAMELIB/Out.cs +++ b/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; diff --git a/2DGAMELIB/_2DGAMELIB/Par.cs b/2DGAMELIB/_2DGAMELIB/Par.cs index d3e8079..d3f2f99 100644 --- a/2DGAMELIB/_2DGAMELIB/Par.cs +++ b/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; diff --git a/2DGAMELIB/_2DGAMELIB/Pars.cs b/2DGAMELIB/_2DGAMELIB/Pars.cs index 2fd2474..37e45e1 100644 --- a/2DGAMELIB/_2DGAMELIB/Pars.cs +++ b/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; diff --git a/2DGAMELIB/_2DGAMELIB/SoundPlayer.cs b/2DGAMELIB/_2DGAMELIB/SoundPlayer.cs index a3850ff..4b08fc3 100644 --- a/2DGAMELIB/_2DGAMELIB/SoundPlayer.cs +++ b/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; - } - - private void loop(object s, EventArgs e) - { - mp.Position = ts; - mp.Play(); + //mp.Volume = 1.0; } public void Play() { - mp.Play(); + //mp.Play(); } public void Stop() { - mp.Stop(); - } - - public void Pause() - { - mp.Pause(); + //mp.Stop(); } public void Close() { - mp.Close(); + //mp.Close(); } } diff --git a/2DGAMELIB/_2DGAMELIB/UI.cs b/2DGAMELIB/_2DGAMELIB/UI.cs index e3eaa23..a33e7f0 100644 --- a/2DGAMELIB/_2DGAMELIB/UI.cs +++ b/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); diff --git a/2DGAMELIB/_2DGAMELIB/WPFImage.cs b/2DGAMELIB/_2DGAMELIB/WPFImage.cs index 849099a..1f59c7c 100644 --- a/2DGAMELIB/_2DGAMELIB/WPFImage.cs +++ b/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)) diff --git a/SlaveMatrix/Properties/AssemblyInfo.cs b/SlaveMatrix/Properties/AssemblyInfo.cs index 03d06c2..531844b 100644 --- a/SlaveMatrix/Properties/AssemblyInfo.cs +++ b/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")] diff --git a/SlaveMatrix/Properties/Resources.Designer.cs b/SlaveMatrix/Properties/Resources.Designer.cs index 462cc88..39b29de 100644 --- a/SlaveMatrix/Properties/Resources.Designer.cs +++ b/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.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + //[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + //[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + //[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() { } diff --git a/SlaveMatrix/SlaveMatrix.csproj b/SlaveMatrix/SlaveMatrix.csproj index 60cf0ff..f2d79ec 100644 --- a/SlaveMatrix/SlaveMatrix.csproj +++ b/SlaveMatrix/SlaveMatrix.csproj @@ -1,11 +1,10 @@  - + SlaveMatrix False - WinExe - True - net462 + Exe + netcoreapp3.1 x86 @@ -16,25 +15,9 @@ app.ico - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - true - True diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs index e3c82bf..c25a62a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ConnectionInfo.cs @@ -1,4 +1,5 @@ using System; +using System.Runtime.Serialization; namespace SlaveMatrix; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs index aaa572f..3109242 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/キャップ処理.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using System.Drawing; -using System.Windows.Forms; using _2DGAMELIB; namespace SlaveMatrix; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs index 77b59f5..c7d6653 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ハンド処理.cs +++ b/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モード) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs index d2f9cd0..d0a237f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs +++ b/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挿入) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs index 38436b9..c9ceca8 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs +++ b/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モード) { diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs index 11ea4d2..da1577a 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/剃刀処理.cs @@ -1,5 +1,4 @@ using System.Drawing; -using System.Windows.Forms; using _2DGAMELIB; namespace SlaveMatrix; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs index c552d70..d4ebc3f 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs +++ b/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モード) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs index 8b9c887..8a48025 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/羽箒処理.cs @@ -1,5 +1,4 @@ using System.Drawing; -using System.Windows.Forms; using _2DGAMELIB; namespace SlaveMatrix; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs index 46edb9c..3386cec 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/調鞭処理.cs +++ b/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) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs index 330c226..f71b70a 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Cha.cs +++ b/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); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs index cd1c954..9a8d383 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/EleD.cs @@ -73,7 +73,9 @@ public class EleD public double 濃度 = 1.0; - public Type ThisType; + //TODO figure out what this broke... + [NonSerialized] + public Type ThisType; public virtual Ele GetEle(double DisUnit, Med Med, 体配色 体配色) { diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/GameState.cs b/SlaveMatrix/SlaveMatrix/GameClasses/GameState.cs index 42356df..3dcfb19 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/GameState.cs +++ b/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; } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs index 9c2bc02..8e0f96a 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs +++ b/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); } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs index e1b6dab..0cfb605 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Mods.cs @@ -6,7 +6,6 @@ using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using System.Windows.Forms; using _2DGAMELIB; using SlaveMatrix.Properties; @@ -201,7 +200,8 @@ public static class Mods } else { - Sounds.精算.Play(); + //TODO fix? + //Sounds.精算.Play(); Sta.GameData.所持金 -= 10000000uL; ip.UpdateSub2(); @@ -233,14 +233,16 @@ public static class Mods parT2.StringFormat.LineAlignment = StringAlignment.Center; dbs.Add("タイトル", new But1(parT2, delegate { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); string tb = ((ip.TextIm == "") ? " " : ip.TextIm); bool sb = ip.MaiShow; ip.MaiShow = true; ip.TextIm = GameText.タイトル画面に戻りますか; ip.選択yAct = delegate { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); Med.Mode = "Title"; Color HitColor4 = Col.Empty; dbs.Move(ref HitColor4); @@ -248,7 +250,8 @@ public static class Mods }; ip.選択nAct = delegate { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); ip.TextIm = tb; ip.MaiShow = sb; Color HitColor3 = Col.Empty; @@ -278,7 +281,8 @@ public static class Mods parT3.StringFormat.LineAlignment = StringAlignment.Center; dbs.Add("セーブ", new But1(parT3, delegate { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); SaveData.bs["0"].Dra = false; save = true; SetSLlv(Med); @@ -309,7 +313,7 @@ public static class Mods parT4.StringFormat.LineAlignment = StringAlignment.Center; dbs.Add("ロード", new But1(parT4, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SaveData.bs["0"].Dra = true; save = false; title = false; @@ -562,7 +566,7 @@ public static class Mods { if (!processing) { - Sounds.操作.Play(); + //////Sounds.操作.Play(); if (save) { processing = true; @@ -604,7 +608,7 @@ public static class Mods SDShow = false; ip.SubInfoIm = i + ": " + Sta.GameData.GetSaveDateString() + "\r\n" + GameText.セーブしました; processing = false; - Med.InvokeL(Sounds.完了.Play); + //Med.InvokeL(Sounds.完了.Play); } private static void Load(string Path, int i, Med Med) @@ -647,7 +651,7 @@ public static class Mods Array.Copy(Sta.GameData.Slaves, array, Sta.GameData.Slaves.Length); Sta.GameData.Slaves = array; } - Med.InvokeL(Sounds.完了.Play); + //Med.InvokeL(Sounds.完了.Play); }); } @@ -810,7 +814,9 @@ public static class Mods public static void 時進行() { Player.RecoverPlayerStamina(); - Parallel.ForEach(Sta.GameData.Slaves, Sta.po3, delegate(Unit u) + //Parallel.ForEach(Sta.GameData.Slaves, Sta.po3, delegate(Unit u) + + foreach(Unit u in Sta.GameData.Slaves) { if (u != null) { @@ -837,7 +843,7 @@ public static class Mods u.RecoverStamina(); } } - }); + } } private static void 並列処理() @@ -1151,7 +1157,7 @@ public static class Mods ListView listView = new ListView(DrawBuffer, label.ParT.PositionBase.MulXY(1.015, 1.2), 0.25, new Font("MS Gothic", 1f), 0.09, Col.White, Col.Empty, Col.Empty, Col.Empty, new TA("Start", delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); Sta.GameData.SetDefault(); Viola?.Dispose(); @@ -1165,7 +1171,7 @@ public static class Mods }), new TA("Load", delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); SaveData.bs["0"].Dra = true; save = false; title = true; @@ -1193,8 +1199,8 @@ public static class Mods v = 0.0; b1 = true; mv.ResetValue(); - Sounds.日常BGM.Stop(); - Sounds.OPBGM.Play(); + //Sounds.日常BGM.Stop(); + //Sounds.OPBGM.Play(); }, Down = delegate (MouseButtons mb, Vector2D cp, Color hc) { @@ -1320,7 +1326,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン1", new But1(parT, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); Med.SwitchMode("Office", DrawBuffer, DrawOffice); })); ParT parT2 = new ParT(); @@ -1340,7 +1346,7 @@ public static class Mods parT2.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン2", new But1(parT2, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); Med.SwitchMode("調教中継行", DrawBuffer, 中継描画); })); ParT parT3 = new ParT(); @@ -1360,7 +1366,7 @@ public static class Mods parT3.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン3", new But1(parT3, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); Med.Mode = "対象"; })); ParT parT4 = new ParT(); @@ -1380,7 +1386,7 @@ public static class Mods parT4.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン4", new But1(parT4, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); si.Set(bre: true); 時間進行(Med); ip.UpdateSub2(); @@ -1402,7 +1408,7 @@ public static class Mods parT5.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン5", new But1(parT5, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); 日付進行(Med); })); ParT parT6 = new ParT(); @@ -1422,7 +1428,7 @@ public static class Mods parT6.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン6", new But1(parT6, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); Med.Mode = "Blessing"; })); ParT parT7 = new ParT(); @@ -1454,7 +1460,7 @@ public static class Mods { if (unit.Trained) { - Sounds.変更3.Play(); + //Sounds.変更3.Play(); } else { @@ -1465,7 +1471,7 @@ public static class Mods } else { - Sounds.操作.Play(); + ////Sounds.操作.Play(); ip.SubInfoIm = GameText.他の奴隷がいません; } })); @@ -1479,7 +1485,7 @@ public static class Mods SaveData.Down(ref hc); if (mb == MouseButtons.Right) { - Sounds.操作.Play(); + ////Sounds.操作.Play(); SDShow = false; ip.Up(ref hc); dbs.Move(ref hc); @@ -1603,8 +1609,8 @@ public static class Mods si.Set(bre: false); Color HitColor = Col.Empty; ip.Up(ref HitColor); - Sounds.OPBGM.Stop(); - Sounds.日常BGM.Play(); + //Sounds.OPBGM.Stop(); + //Sounds.日常BGM.Play(); npl.ParT.PositionBase = new Vector2D(Player.UI.ステート.Position.X, 0.026); } }; @@ -1652,7 +1658,7 @@ public static class Mods Player.UI = new TrainingUI(Med, DrawBuffer, ip); Player.UI.調教終了.Action = delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); Med.SwitchMode("調教中継帰", DrawBuffer, 中継描画); }; bool 調教完了 = false; @@ -1927,7 +1933,7 @@ public static class Mods Sta.GameData.祝福 = Sta.GameData.TrainingTarget; InfoPanel 情報パネル2 = ip; 情報パネル2.TextIm = 情報パネル2.TextIm + GameText.収容番号 + Sta.GameData.TrainingTarget.Number + "/" + Sta.GameData.TrainingTarget.Name + GameText.から祝福を受けました; - Sounds.祝福.Play(); + //Sounds.祝福.Play(); } Result3 = true; } @@ -2181,7 +2187,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン0", new But1(parT, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); if (Sta.GameData.TrainingTarget != null && bs["子"].Pars.Values.First().ToParT().PenColor != Color.Red) { Set調教対象(Med, Sta.GameData.TrainingTarget); @@ -2217,7 +2223,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + ////Sounds.操作.Play(); } bs縁色初期化(); b.Pars.Values.First().ToParT().PenColor = Color.Red; @@ -2251,7 +2257,7 @@ public static class Mods parT3.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("親形質1", new But1(parT3, delegate(But b) { - Sounds.操作.Play(); + ////Sounds.操作.Play(); bs縁色初期化(); b.Pars.Values.First().ToParT().PenColor = Color.Red; if (Sta.GameData.TrainingTarget != null) @@ -2309,7 +2315,7 @@ public static class Mods parT4.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("親形質2", new But1(parT4, delegate(But b) { - Sounds.操作.Play(); + ////Sounds.操作.Play(); bs縁色初期化(); b.Pars.Values.First().ToParT().PenColor = Color.Red; if (Sta.GameData.TrainingTarget != null) @@ -2367,7 +2373,7 @@ public static class Mods parT5.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("保守", new But1(parT5, delegate(But b) { - Sounds.操作.Play(); + ////Sounds.操作.Play(); if (Sta.GameData.TrainingTarget != null) { 保守sw.OnOff(b); @@ -2393,7 +2399,7 @@ public static class Mods parT6.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("一般労働", new But1(parT6, delegate(But b) { - Sounds.操作.Play(); + ////Sounds.操作.Play(); if (Sta.GameData.TrainingTarget != null) { 一般sw.OnOff(b); @@ -2423,7 +2429,7 @@ public static class Mods parT7.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("娼婦労働", new But1(parT7, delegate(But b) { - Sounds.操作.Play(); + ////Sounds.操作.Play(); if (Sta.GameData.TrainingTarget != null) { 娼婦sw.OnOff(b); @@ -2453,7 +2459,7 @@ public static class Mods parT8.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("全一般", new But1(parT8, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); if (Sta.GameData.TrainingTarget != null) { 一般sw.SetFlag(bs["一般労働"], On: true); @@ -2487,7 +2493,7 @@ public static class Mods parT9.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("全娼婦", new But1(parT9, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); if (Sta.GameData.TrainingTarget != null) { 一般sw.SetFlag(bs["一般労働"], On: false); @@ -2521,7 +2527,7 @@ public static class Mods parT10.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("全解除", new But1(parT10, delegate { - Sounds.操作.Play(); + ////Sounds.操作.Play(); if (Sta.GameData.TrainingTarget != null) { 一般sw.SetFlag(bs["一般労働"], On: false); @@ -2557,7 +2563,8 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //TODO fix? + ////Sounds.操作.Play(); } ip.Mai2Im = Sta.GameData.TrainingTarget.GetPriceInfo(); ip.Mai2Show = true; @@ -2571,7 +2578,7 @@ public static class Mods bs.Move(ref HitColor4); ulong price = Sta.GameData.TrainingTarget.GetPrice(); Sta.GameData.所持金 = Sta.GameData.所持金.加算(price); - Sounds.精算.Play(); + //Sounds.精算.Play(); ip.UpdateSub2(); for (int m = 0; m < Sta.GameData.Slaves.Length; m++) { @@ -2603,7 +2610,7 @@ public static class Mods }; ip.選択nAct = delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Color HitColor3 = Col.Empty; bs.Move(ref HitColor3); ip.Mai2Show = false; @@ -2637,7 +2644,7 @@ public static class Mods parT12.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("全売却", new But1(parT12, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); string tb = ip.TextIm; ip.Mai2Im = Sta.GameData.GetPriceInfo(out var p); ip.Mai2Show = true; @@ -2648,7 +2655,8 @@ public static class Mods bs.Move(ref HitColor2); ip.Mai2Show = false; Sta.GameData.所持金 = Sta.GameData.所持金.加算(p); - Sounds.精算.Play(); + //TODO fix? + ////Sounds.精算.Play(); ip.UpdateSub2(); for (int l = 0; l < Sta.GameData.Slaves.Length; l++) { @@ -2685,7 +2693,7 @@ public static class Mods }; ip.選択nAct = delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Color HitColor = Col.Empty; bs.Move(ref HitColor); ip.Mai2Show = false; @@ -2737,7 +2745,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 0); 部屋選択(); @@ -2761,7 +2769,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 15); 部屋選択(); @@ -2785,7 +2793,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 30); 部屋選択(); @@ -2809,7 +2817,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 45); 部屋選択(); @@ -2833,7 +2841,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 60); 部屋選択(); @@ -2857,7 +2865,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 75); 部屋選択(); @@ -2881,7 +2889,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 90); 部屋選択(); @@ -2905,7 +2913,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 105); 部屋選択(); @@ -2929,7 +2937,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } 階層選択(b, f = 120); 部屋選択(); @@ -2953,13 +2961,14 @@ public static class Mods { if (Sta.GameData.所持金 < 胸施術価格) { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.SubInfoIm = GameText.所持金が足りません; } else { Sta.GameData.所持金 -= 胸施術価格; - Sounds.精算.Play(); + //TODO fix? + ////Sounds.精算.Play(); ip.UpdateSub2(); Sta.GameData.TrainingTarget.ChaD.胸施術 = true; TrainingTarget.Bod.胸施術(); @@ -3005,13 +3014,13 @@ public static class Mods { if (Sta.GameData.所持金 < 股施術価格) { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.SubInfoIm = GameText.所持金が足りません; } else { Sta.GameData.所持金 -= 股施術価格; - Sounds.精算.Play(); + //Sounds.精算.Play(); ip.UpdateSub2(); Sta.GameData.TrainingTarget.ChaD.股施術 = true; TrainingTarget.Bod.股施術(); @@ -3057,13 +3066,13 @@ public static class Mods { if (Sta.GameData.所持金 < 淫紋価格) { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.SubInfoIm = GameText.所持金が足りません; } else { Sta.GameData.所持金 -= 淫紋価格; - Sounds.精算.Play(); + //Sounds.精算.Play(); ip.UpdateSub2(); Sta.GameData.TrainingTarget.ChaD.タトゥ = true; TrainingTarget.Bod.タトゥ(); @@ -3110,13 +3119,15 @@ public static class Mods { if (Sta.GameData.所持金 < 衣装変更価格) { - Sounds.操作.Play(); + //TODO fix? + ////Sounds.操作.Play(); ip.SubInfoIm = GameText.所持金が足りません; } else { Sta.GameData.所持金 -= 衣装変更価格; - Sounds.精算.Play(); + //TODO fix? + ////Sounds.精算.Play(); ip.UpdateSub2(); Sta.GameData.TrainingTarget.Change衣装(); TrainingTarget.Set衣装(Sta.GameData.TrainingTarget.着衣); @@ -3151,7 +3162,8 @@ public static class Mods SaveData.Down(ref hc); if (mb == MouseButtons.Right && !processing) { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); SDShow = false; ip.Up(ref hc); dbs.Move(ref hc); @@ -3537,7 +3549,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン0", new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.Mode = "メインフォーム"; })); Action rs1 = delegate(Buts bs_) @@ -3568,7 +3580,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } rs1(bs); bu.Pars.Values.First().ToParT().PenColor = Color.Red; @@ -3623,7 +3635,7 @@ public static class Mods parT3.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("親形質1", new But1(parT3, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); rs1(bs); bu.Pars.Values.First().ToParT().PenColor = Color.Red; if (Sta.GameData.祝福 != null) @@ -3677,7 +3689,7 @@ public static class Mods parT4.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("親形質2", new But1(parT4, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); rs1(bs); bu.Pars.Values.First().ToParT().PenColor = Color.Red; if (Sta.GameData.祝福 != null) @@ -3731,7 +3743,8 @@ public static class Mods parT5.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("祝福解除", new But1(parT5, delegate { - Sounds.解除.Play(); + //TODO fix? + //Sounds.解除.Play(); Sta.GameData.祝福 = null; 祝福なし(); ip.SubInfoIm = GameText.祝福を解除しました; @@ -3757,7 +3770,7 @@ public static class Mods SaveData.Down(ref hc); if (mb == MouseButtons.Right && !processing) { - Sounds.操作.Play(); + //Sounds.操作.Play(); SDShow = false; ip.Up(ref hc); dbs.Move(ref hc); @@ -3933,7 +3946,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン0", new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); if (!時間進行(Med)) { Med.SwitchMode("メインフォーム", DrawBuffer, メインフォーム描画); @@ -3956,7 +3969,7 @@ public static class Mods parT2.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン1", new But1(parT2, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.Mode = "Debt"; })); ParT parT3 = new ParT(); @@ -3976,7 +3989,7 @@ public static class Mods parT3.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン2", new But1(parT3, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.Mode = "SlaveShop"; })); ParT parT4 = new ParT(); @@ -3996,7 +4009,7 @@ public static class Mods parT4.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン3", new But1(parT4, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.SwitchMode("ViolaBlessing", DrawBuffer, 返済イベント描画); })); bs.SetHitColor(Med); @@ -4009,7 +4022,7 @@ public static class Mods SaveData.Down(ref hc); if (mb == MouseButtons.Right && !processing) { - Sounds.操作.Play(); + //Sounds.操作.Play(); SDShow = false; ip.Up(ref hc); dbs.Move(ref hc); @@ -4214,7 +4227,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン0", new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.Mode = "Office"; })); ParT parT2 = new ParT(); @@ -4233,7 +4246,7 @@ public static class Mods parT2.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("nc", new But1(parT2, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.TextIm = "0"; })); ParT parT3 = new ParT(); @@ -4252,7 +4265,7 @@ public static class Mods parT3.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("nm", new But1(parT3, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.TextIm = 9999999999999uL.ToString("#,0"); })); Action SetNum = delegate(string num) @@ -4279,7 +4292,7 @@ public static class Mods parT4.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n7", new But1(parT4, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("7"); })); ParT parT5 = new ParT(); @@ -4298,7 +4311,7 @@ public static class Mods parT5.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n8", new But1(parT5, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("8"); })); ParT parT6 = new ParT(); @@ -4317,7 +4330,7 @@ public static class Mods parT6.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n9", new But1(parT6, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("9"); })); ParT parT7 = new ParT(); @@ -4336,7 +4349,7 @@ public static class Mods parT7.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n4", new But1(parT7, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("4"); })); ParT parT8 = new ParT(); @@ -4355,7 +4368,7 @@ public static class Mods parT8.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n5", new But1(parT8, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("5"); })); ParT parT9 = new ParT(); @@ -4374,7 +4387,7 @@ public static class Mods parT9.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n6", new But1(parT9, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("6"); })); ParT parT10 = new ParT(); @@ -4393,7 +4406,7 @@ public static class Mods parT10.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n1", new But1(parT10, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("1"); })); ParT parT11 = new ParT(); @@ -4412,7 +4425,7 @@ public static class Mods parT11.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n2", new But1(parT11, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("2"); })); ParT parT12 = new ParT(); @@ -4431,7 +4444,7 @@ public static class Mods parT12.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n3", new But1(parT12, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("3"); })); ParT parT13 = new ParT(); @@ -4450,7 +4463,7 @@ public static class Mods parT13.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("n0", new But1(parT13, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SetNum("0"); })); ParT parT14 = new ParT(); @@ -4484,18 +4497,18 @@ public static class Mods Sta.GameData.借金 = Sta.GameData.借金.加算(num3); bs["nr"].Dra = Sta.GameData.借金 != 0; ip.TextIm = "0"; - Sounds.精算.Play(); + //Sounds.精算.Play(); ip.UpdateSub2(); ヴィオラ台詞.Set(); } else { - Sounds.操作.Play(); + //Sounds.操作.Play(); } } else { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.SubInfo = GameText.今日はこれ以上借りることが出来ません; } })); @@ -4538,17 +4551,17 @@ public static class Mods } bs["nr"].Dra = Sta.GameData.借金 != 0; ip.TextIm = "0"; - Sounds.精算.Play(); + //Sounds.精算.Play(); ip.UpdateSub2(); } else { - Sounds.操作.Play(); + //Sounds.操作.Play(); } } else { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.SubInfo = GameText.所持金がありません; } })); @@ -4562,7 +4575,7 @@ public static class Mods SaveData.Down(ref hc); if (mb == MouseButtons.Right && !processing) { - Sounds.操作.Play(); + //Sounds.操作.Play(); SDShow = false; ip.Up(ref hc); dbs.Move(ref hc); @@ -4734,7 +4747,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン0", new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); if (Sta.GameData.初事務所フラグ) { Med.SwitchMode("初事務所", DrawBuffer, 初事務所描画); @@ -4762,7 +4775,7 @@ public static class Mods parT2.PenColor = Color.Red; bs.Add("ボタン1", new But1(parT2, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.Mode = "SlaveShop"; })); ParT parT3 = new ParT(); @@ -4782,7 +4795,7 @@ public static class Mods parT3.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン2", new But1(parT3, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.Mode = "ToolShop"; })); Color bs初期縁色 = Col.Black; @@ -4814,7 +4827,7 @@ public static class Mods { if (d) { - Sounds.操作.Play(); + //Sounds.操作.Play(); } d = true; bs縁色初期化(); @@ -4837,7 +4850,7 @@ public static class Mods parT5.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象1", new But1(parT5, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -4858,7 +4871,7 @@ public static class Mods parT6.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象2", new But1(parT6, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -4879,7 +4892,7 @@ public static class Mods parT7.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象3", new But1(parT7, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -4900,7 +4913,7 @@ public static class Mods parT8.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象4", new But1(parT8, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -4921,7 +4934,7 @@ public static class Mods parT9.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象5", new But1(parT9, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -4942,7 +4955,7 @@ public static class Mods parT10.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象6", new But1(parT10, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -4963,7 +4976,7 @@ public static class Mods parT11.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象7", new But1(parT11, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -4984,7 +4997,7 @@ public static class Mods parT12.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象8", new But1(parT12, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -5005,7 +5018,7 @@ public static class Mods parT13.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("対象9", new But1(parT13, delegate(But bu) { - Sounds.操作.Play(); + //Sounds.操作.Play(); bs縁色初期化(); bu.Pars.Values.First().ToParT().PenColor = Color.Red; Reload(); @@ -5167,7 +5180,7 @@ public static class Mods } else { - Sounds.操作.Play(); + //Sounds.操作.Play(); } Reload(); })); @@ -5190,24 +5203,28 @@ public static class Mods { if (Sta.GameData.Is地下室一杯()) { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); ip.SubInfoIm = GameText.これ以上奴隷を収容できません; } else if (u == null) { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); ip.Mai.TextIm = GameText.売り切れです; } else if (Sta.GameData.所持金 < (買値 = (ulong)((double)u.GetPrice() * ((Sta.GameData.祝福 == Sta.GameData.ヴィオラ) ? 0.6 : 1.0)))) { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); ip.SubInfoIm = GameText.所持金が足りません; } else { u.Price = 買値; Sta.GameData.所持金 -= 買値; - Sounds.精算.Play(); + //TODO fix? + ////Sounds.精算.Play(); ip.UpdateSub2(); Sta.GameData.Add地下室(g.GetCharacter()); Reload(); @@ -5223,7 +5240,8 @@ public static class Mods SaveData.Down(ref hc); if (mb == MouseButtons.Right && !processing) { - Sounds.操作.Play(); + //TODO fix? + //Sounds.操作.Play(); SDShow = false; ip.Up(ref hc); dbs.Move(ref hc); @@ -5427,7 +5445,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン0", new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); if (Sta.GameData.初事務所フラグ) { Med.SwitchMode("初事務所", DrawBuffer, 初事務所描画); @@ -5454,7 +5472,7 @@ public static class Mods parT2.StringFormat.LineAlignment = StringAlignment.Center; bs.Add("ボタン1", new But1(parT2, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.Mode = "SlaveShop"; })); ParT parT3 = new ParT(); @@ -5475,7 +5493,7 @@ public static class Mods parT3.PenColor = Color.Red; bs.Add("ボタン2", new But1(parT3, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Med.Mode = "ToolShop"; })); bs.SetHitColor(Med); @@ -5487,7 +5505,7 @@ public static class Mods but.Dra = false; Sta.GameData.PurchasedTools[ind] = true; Sta.GameData.所持金 -= pri; - Sounds.精算.Play(); + //Sounds.精算.Play(); ip.UpdateSub2(); ip.TextIm = " "; if (!lv.bs.EnumBut.Any((But e) => e.Dra)) @@ -5498,7 +5516,7 @@ public static class Mods } else { - Sounds.操作.Play(); + ////Sounds.操作.Play(); ip.SubInfoIm = GameText.所持金が足りません; } }; @@ -5555,7 +5573,7 @@ public static class Mods b.Dra = false; } Sta.GameData.所持金 -= num; - Sounds.精算.Play(); + //Sounds.精算.Play(); ip.UpdateSub2(); ip.TextIm = " "; if (!lv.bs.EnumBut.Any((But e) => e.Dra)) @@ -5566,7 +5584,7 @@ public static class Mods } else { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.SubInfoIm = GameText.所持金が足りません; } })); @@ -5591,7 +5609,7 @@ public static class Mods SaveData.Down(ref hc); if (mb == MouseButtons.Right && !processing) { - Sounds.操作.Play(); + //Sounds.操作.Play(); SDShow = false; ip.Up(ref hc); dbs.Move(ref hc); @@ -5826,7 +5844,7 @@ public static class Mods { Sta.GameData.借金 = Sta.GameData.借金.加算(日利子額); } - Sounds.精算.Play(); + //Sounds.精算.Play(); ip.UpdateSub2(); } if (Sta.GameData.日数 >= 10) @@ -5858,7 +5876,7 @@ public static class Mods ip.Sub2Show = true; while (dayp) { - Application.DoEvents(); + //Application.DoEvents(); } ip.Mai2Im = (from e in 日終了ログa where !string.IsNullOrWhiteSpace(e) @@ -5926,7 +5944,7 @@ public static class Mods Player.UI.ペニス.再配色(Sta.GameData.配色); Player.UI.マウス.再配色(Sta.GameData.配色); Sta.GameData.プレーヤー = Generator.プレーヤー(); - Sounds.完了.Play(); + //Sounds.完了.Play(); if (start) { start = false; @@ -5977,57 +5995,57 @@ public static class Mods ls.Add("ラベル13", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.005)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, GameText.体格, Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); ls.Add("ラベル14", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.045)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, "H:", Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); ls.Add("ラベル15", DrawBuffer.GetPosition(new Vector2D(num2 + 0.19, num3 + num * 3.0 + 0.086)), 0.1, 1.0, new Font("MS Gothic", 1f), 0.085, "W:", Col.White, Col.Black, ip.MaiB.BrushColor, Col.Black, Input: false); - Gau H肌 = new Gau("H肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H肌 = new Gau("H肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H肌.Gauge.PenColor = Col.White; H肌.Frame1.PenColor = Col.White; H肌.Knob.PenColor = Col.White; H肌.Knob.HitColor = Med.GetUniqueColor(); - Gau S肌 = new Gau("S肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S肌 = new Gau("S肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S肌.Gauge.PenColor = Col.White; S肌.Frame1.PenColor = Col.White; S肌.Knob.PenColor = Col.White; S肌.Knob.HitColor = Med.GetUniqueColor(); - Gau V肌 = new Gau("V肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V肌 = new Gau("V肌", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 0.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V肌.Gauge.PenColor = Col.White; V肌.Frame1.PenColor = Col.White; V肌.Knob.PenColor = Col.White; V肌.Knob.HitColor = Med.GetUniqueColor(); - Gau H髪 = new Gau("H髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H髪 = new Gau("H髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H髪.Gauge.PenColor = Col.White; H髪.Frame1.PenColor = Col.White; H髪.Knob.PenColor = Col.White; H髪.Knob.HitColor = Med.GetUniqueColor(); - Gau S髪 = new Gau("S髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S髪 = new Gau("S髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S髪.Gauge.PenColor = Col.White; S髪.Frame1.PenColor = Col.White; S髪.Knob.PenColor = Col.White; S髪.Knob.HitColor = Med.GetUniqueColor(); - Gau V髪 = new Gau("V髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V髪 = new Gau("V髪", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 1.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V髪.Gauge.PenColor = Col.White; V髪.Frame1.PenColor = Col.White; V髪.Knob.PenColor = Col.White; V髪.Knob.HitColor = Med.GetUniqueColor(); - Gau H瞳 = new Gau("H瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau H瞳 = new Gau("H瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); H瞳.Gauge.PenColor = Col.White; H瞳.Frame1.PenColor = Col.White; H瞳.Knob.PenColor = Col.White; H瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau S瞳 = new Gau("S瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau S瞳 = new Gau("S瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); S瞳.Gauge.PenColor = Col.White; S瞳.Frame1.PenColor = Col.White; S瞳.Knob.PenColor = Col.White; S瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau V瞳 = new Gau("V瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau V瞳 = new Gau("V瞳", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 2.0 + 0.14)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); V瞳.Gauge.PenColor = Col.White; V瞳.Frame1.PenColor = Col.White; V瞳.Knob.PenColor = Col.White; V瞳.Knob.HitColor = Med.GetUniqueColor(); - Gau 身長 = new Gau("身長", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau 身長 = new Gau("身長", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.06)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); 身長.Gauge.PenColor = Col.White; 身長.Frame1.PenColor = Col.White; 身長.Knob.PenColor = Col.White; 身長.Knob.HitColor = Med.GetUniqueColor(); - Gau 体重 = new Gau("体重", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); + Gau 体重 = new Gau("体重", DrawBuffer.GetPosition(new Vector2D(num2 + 0.532, num3 + num * 3.0 + 0.1)), DrawBuffer.Size, 0.6, 0.03, 0.02, Open.Rig, _2DGAMELIB.Range.ZeroOne, DrawBuffer.DisUnit, Color.Transparent, Color.Transparent, Color.Transparent, Color.Transparent, Col.Black, Knob: true); 体重.Gauge.PenColor = Col.White; 体重.Frame1.PenColor = Col.White; 体重.Knob.PenColor = Col.White; @@ -6314,7 +6332,7 @@ public static class Mods ip.Mai2Show = false; ip.SubShow = true; ip.Sub2Show = true; - Sounds.OPBGM.Stop(); + //Sounds.OPBGM.Stop(); i = 0; wi = 0; ip.Text = tsp[i]; @@ -6467,10 +6485,10 @@ public static class Mods ip.SubInfo = GameText.安い額ではない; ip.選択yAct = delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); ヴィオラ吹出し.Tex.Done = delegate { - Sounds.精算.Play(); + //Sounds.精算.Play(); Sta.GameData.借金 = 5000000000uL; ip.UpdateSub2(); }; @@ -6491,10 +6509,10 @@ public static class Mods }; ip.選択nAct = delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); ヴィオラ吹出し.Tex.Done = delegate { - Sounds.精算.Play(); + //Sounds.精算.Play(); Sta.GameData.借金 = 5000000000uL; ip.UpdateSub2(); }; @@ -6575,7 +6593,7 @@ public static class Mods mod.Setting = delegate { ip.Mai.Feed.Dra = false; - Sounds.日常BGM.Play(); + //Sounds.日常BGM.Play(); Sta.GameData.ヴィオラ = new Unit(); Sta.GameData.ヴィオラ.SetViola(Med, DrawBuffer); Viola = new Cha(Med, DrawBuffer, Sta.GameData.ヴィオラ.ChaD); @@ -6871,7 +6889,7 @@ public static class Mods { ip.選択yAct = delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Viola.表情_不敵0眉上(); ヴィオラ吹出し.Text = GameText.うふふそうよね; ip.Text = GameText.点6; @@ -6889,7 +6907,7 @@ public static class Mods }; ip.選択nAct = delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Viola.表情_困り顔1(); ヴィオラ吹出し.Text = GameText.嘘おっしゃい無いのは分かっているわ; ip.Text = GameText.点6; @@ -6915,7 +6933,7 @@ public static class Mods { ip.選択yAct = delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); ip.Sub.Done = delegate { Viola.Bod.拘束具_表示 = false; @@ -6925,7 +6943,7 @@ public static class Mods Viola.SetSymmetry(); Viola.Bod.Update(); Viola.表情_不敵1(); - Sounds.弾け.Play(); + //Sounds.弾け.Play(); ip.Text = GameText.エクス2; ip.SubInfo = GameText.あなたの鎖は弾け飛ぶ; ヴィオラ吹出し.Text = GameText.あらあら今ので利子が上がってしまったわうふふ; @@ -6940,7 +6958,7 @@ public static class Mods Viola.SetSymmetry(); Viola.Bod.Update(); Viola.表情_素0眉上(); - Sounds.変更1.Play(); + //Sounds.変更1.Play(); ヴィオラ吹出し.Text = GameText.っ点3; ip.Text = GameText.エクス1; ip.SubInfo = GameText.鋼の鎖がヴィオラを縛る + " "; @@ -6957,7 +6975,7 @@ public static class Mods }; ip.選択nAct = delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Viola.表情_不敵0(); ヴィオラ吹出し.Text = GameText.点3うふふ + "\r\n" + GameText.慎重なのは良いことよ; ip.Text = GameText.点6; @@ -7436,7 +7454,7 @@ public static class Mods ip.選択yAct = delegate { yes = true; - Sounds.操作.Play(); + //Sounds.操作.Play(); Viola.表情_基本1眉上(); ヴィオラ吹出し.Text = GameText.え; ip.Text = GameText.点6; @@ -7455,7 +7473,7 @@ public static class Mods ip.選択nAct = delegate { yes = false; - Sounds.操作.Play(); + //Sounds.操作.Play(); Viola.表情_不敵0(); ヴィオラ吹出し.Text = GameText.うふふそうよね; ip.Text = GameText.点6; @@ -7613,7 +7631,7 @@ public static class Mods }, delegate { - Sounds.祝福.Play(); + //Sounds.祝福.Play(); Viola.表情_不敵0眉上(); } }; @@ -7751,7 +7769,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; dbs.Add("Senses", new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); Sta.ShowSenses = !Sta.ShowSenses; })); } @@ -7789,7 +7807,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; dbs.Add("SaveJSON", new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SaveData.bs["0"].Dra = false; save = true; SetJSLlv(med); @@ -7833,7 +7851,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; dbs.Add("LoadJSON", new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); SaveData.bs["0"].Dra = true; save = false; title = false; @@ -7876,7 +7894,7 @@ public static class Mods { if (!processing) { - Sounds.操作.Play(); + //Sounds.操作.Play(); if (save) { processing = true; @@ -7906,7 +7924,7 @@ public static class Mods SDShow = false; ip.SubInfoIm = i + ": " + Sta.GameData.GetSaveDateString() + "\r\n" + GameText.セーブしました; processing = false; - Sounds.完了.Play(); + //Sounds.完了.Play(); } private static void JsonLoad(string Path, int i, Med med) @@ -7964,7 +7982,7 @@ public static class Mods } Sta.GameData.Gen = new Generator[9]; Sta.GameData.GenInstance(); - Sounds.完了.Play(); + //Sounds.完了.Play(); }); } @@ -8115,7 +8133,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; return new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); MoveRoomDown(); mod.Setting(); if (Sta.AlwaysUseName) @@ -8154,7 +8172,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; return new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); MoveRoomUp(); mod.Setting(); if (Sta.AlwaysUseName) @@ -8193,7 +8211,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; return new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); MoveFloorDown(); mod.Setting(); if (Sta.AlwaysUseName) @@ -8232,7 +8250,7 @@ public static class Mods parT.StringFormat.LineAlignment = StringAlignment.Center; return new But1(parT, delegate { - Sounds.操作.Play(); + //Sounds.操作.Play(); MoveFloorUp(); mod.Setting(); if (Sta.AlwaysUseName) diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs index befa3ce..0881d9b 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Program.cs +++ b/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.SetCompatibleTextRenderingDefault(defaultValue: false); + //Application.EnableVisualStyles(); + //Application.SetCompatibleTextRenderingDefault(defaultValue: false); Sta.LoadConfig(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sounds.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sounds.cs index 7d54ac4..9bad8fd 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sounds.cs +++ b/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(); + */ } } diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index f6bec4f..9f08e89 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/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.日常BGM = new SoundPlayer(CurrentDirectory + "\\bgm\\doesntexist2", Loop: true); + //Sounds.OPBGM = new SoundPlayer(CurrentDirectory + "\\bgm\\doesntexist", 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; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs b/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs index d87d4f5..041f520 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/TrainingUI.cs +++ b/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; });