diff --git a/2DGAMELIB/_2DGAMELIB/Gau.cs b/2DGAMELIB/_2DGAMELIB/Gau.cs index 8163990..865bf61 100644 --- a/2DGAMELIB/_2DGAMELIB/Gau.cs +++ b/2DGAMELIB/_2DGAMELIB/Gau.cs @@ -367,44 +367,44 @@ namespace _2DGAMELIB case Open.Top: { frame1.GetMiY_MaY(out var MM7); - PlusBrush = Oth.GetLGB(Unit, MM7, ref PlusColor2, ref PlusColor1); + PlusBrush = GeometryUtils.GetLGB(Unit, MM7, ref PlusColor2, ref PlusColor1); if (Range == Range.MinusPlus) { frame2.GetMiY_MaY(out var MM8); - MinusBrush = Oth.GetLGB(Unit, MM8, ref MinusColor1, ref MinusColor2); + MinusBrush = GeometryUtils.GetLGB(Unit, MM8, ref MinusColor1, ref MinusColor2); } break; } case Open.Bot: { frame1.GetMaY_MiY(out var MM3); - PlusBrush = Oth.GetLGB(Unit, MM3, ref PlusColor2, ref PlusColor1); + PlusBrush = GeometryUtils.GetLGB(Unit, MM3, ref PlusColor2, ref PlusColor1); if (Range == Range.MinusPlus) { frame2.GetMaY_MiY(out var MM4); - MinusBrush = Oth.GetLGB(Unit, MM4, ref MinusColor1, ref MinusColor2); + MinusBrush = GeometryUtils.GetLGB(Unit, MM4, ref MinusColor1, ref MinusColor2); } break; } case Open.Rig: { frame1.GetMaX_MiX(out var MM5); - PlusBrush = Oth.GetLGB(Unit, MM5, ref PlusColor2, ref PlusColor1); + PlusBrush = GeometryUtils.GetLGB(Unit, MM5, ref PlusColor2, ref PlusColor1); if (Range == Range.MinusPlus) { frame2.GetMaX_MiX(out var MM6); - MinusBrush = Oth.GetLGB(Unit, MM6, ref MinusColor1, ref MinusColor2); + MinusBrush = GeometryUtils.GetLGB(Unit, MM6, ref MinusColor1, ref MinusColor2); } break; } case Open.Lef: { frame1.GetMiX_MaX(out var MM); - PlusBrush = Oth.GetLGB(Unit, MM, ref PlusColor2, ref PlusColor1); + PlusBrush = GeometryUtils.GetLGB(Unit, MM, ref PlusColor2, ref PlusColor1); if (Range == Range.MinusPlus) { frame2.GetMiX_MaX(out var MM2); - MinusBrush = Oth.GetLGB(Unit, MM2, ref MinusColor1, ref MinusColor2); + MinusBrush = GeometryUtils.GetLGB(Unit, MM2, ref MinusColor1, ref MinusColor2); } break; } @@ -419,12 +419,12 @@ namespace _2DGAMELIB { PlusBrush.Dispose(); frame1.GetMiY_MaY(out var MM7); - PlusBrush = Oth.GetLGB(Unit, MM7, Color.FromArgb((int)(255.0 * Alpha), PlusColor2), Color.FromArgb((int)(255.0 * Alpha), PlusColor1)); + PlusBrush = GeometryUtils.GetLGB(Unit, MM7, Color.FromArgb((int)(255.0 * Alpha), PlusColor2), Color.FromArgb((int)(255.0 * Alpha), PlusColor1)); if (Range == Range.MinusPlus) { MinusBrush.Dispose(); frame2.GetMiY_MaY(out var MM8); - MinusBrush = Oth.GetLGB(Unit, MM8, Color.FromArgb((int)(255.0 * Alpha), MinusColor1), Color.FromArgb((int)(255.0 * Alpha), MinusColor2)); + MinusBrush = GeometryUtils.GetLGB(Unit, MM8, Color.FromArgb((int)(255.0 * Alpha), MinusColor1), Color.FromArgb((int)(255.0 * Alpha), MinusColor2)); } break; } @@ -432,12 +432,12 @@ namespace _2DGAMELIB { PlusBrush.Dispose(); frame1.GetMaY_MiY(out var MM3); - PlusBrush = Oth.GetLGB(Unit, MM3, Color.FromArgb((int)(255.0 * Alpha), PlusColor2), Color.FromArgb((int)(255.0 * Alpha), PlusColor1)); + PlusBrush = GeometryUtils.GetLGB(Unit, MM3, Color.FromArgb((int)(255.0 * Alpha), PlusColor2), Color.FromArgb((int)(255.0 * Alpha), PlusColor1)); if (Range == Range.MinusPlus) { MinusBrush.Dispose(); frame2.GetMaY_MiY(out var MM4); - MinusBrush = Oth.GetLGB(Unit, MM4, Color.FromArgb((int)(255.0 * Alpha), MinusColor1), Color.FromArgb((int)(255.0 * Alpha), MinusColor2)); + MinusBrush = GeometryUtils.GetLGB(Unit, MM4, Color.FromArgb((int)(255.0 * Alpha), MinusColor1), Color.FromArgb((int)(255.0 * Alpha), MinusColor2)); } break; } @@ -445,12 +445,12 @@ namespace _2DGAMELIB { PlusBrush.Dispose(); frame1.GetMaX_MiX(out var MM5); - PlusBrush = Oth.GetLGB(Unit, MM5, Color.FromArgb((int)(255.0 * Alpha), PlusColor2), Color.FromArgb((int)(255.0 * Alpha), PlusColor1)); + PlusBrush = GeometryUtils.GetLGB(Unit, MM5, Color.FromArgb((int)(255.0 * Alpha), PlusColor2), Color.FromArgb((int)(255.0 * Alpha), PlusColor1)); if (Range == Range.MinusPlus) { MinusBrush.Dispose(); frame2.GetMaX_MiX(out var MM6); - MinusBrush = Oth.GetLGB(Unit, MM6, Color.FromArgb((int)(255.0 * Alpha), MinusColor1), Color.FromArgb((int)(255.0 * Alpha), MinusColor2)); + MinusBrush = GeometryUtils.GetLGB(Unit, MM6, Color.FromArgb((int)(255.0 * Alpha), MinusColor1), Color.FromArgb((int)(255.0 * Alpha), MinusColor2)); } break; } @@ -458,12 +458,12 @@ namespace _2DGAMELIB { PlusBrush.Dispose(); frame1.GetMiX_MaX(out var MM); - PlusBrush = Oth.GetLGB(Unit, MM, Color.FromArgb((int)(255.0 * Alpha), PlusColor2), Color.FromArgb((int)(255.0 * Alpha), PlusColor1)); + PlusBrush = GeometryUtils.GetLGB(Unit, MM, Color.FromArgb((int)(255.0 * Alpha), PlusColor2), Color.FromArgb((int)(255.0 * Alpha), PlusColor1)); if (Range == Range.MinusPlus) { MinusBrush.Dispose(); frame2.GetMiX_MaX(out var MM2); - MinusBrush = Oth.GetLGB(Unit, MM2, Color.FromArgb((int)(255.0 * Alpha), MinusColor1), Color.FromArgb((int)(255.0 * Alpha), MinusColor2)); + MinusBrush = GeometryUtils.GetLGB(Unit, MM2, Color.FromArgb((int)(255.0 * Alpha), MinusColor1), Color.FromArgb((int)(255.0 * Alpha), MinusColor2)); } break; } diff --git a/2DGAMELIB/_2DGAMELIB/Oth.cs b/2DGAMELIB/_2DGAMELIB/GeometryUtils.cs similarity index 99% rename from 2DGAMELIB/_2DGAMELIB/Oth.cs rename to 2DGAMELIB/_2DGAMELIB/GeometryUtils.cs index 82b96a1..fbfa283 100644 --- a/2DGAMELIB/_2DGAMELIB/Oth.cs +++ b/2DGAMELIB/_2DGAMELIB/GeometryUtils.cs @@ -7,7 +7,7 @@ using System.Text; namespace _2DGAMELIB { - public static class Oth + public static class GeometryUtils { private static double s1; @@ -349,7 +349,7 @@ public static BodyTemplate ObjLoad(this byte[] bd) return string.Join(Separator, strs); } - static Oth() + static GeometryUtils() { s1 = 1.01; s0 = s1.Reciprocal(); diff --git a/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs b/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs index 74165c0..80a54a8 100644 --- a/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs +++ b/2DGAMELIB/_2DGAMELIB/ModeEventDispatcher.cs @@ -347,10 +347,10 @@ namespace _2DGAMELIB //hit color stuff public Color GetUniqueColor() { - Oth.GetRandomColor(out var ret); + GeometryUtils.GetRandomColor(out var ret); while (HitColors.Contains(ret)) { - Oth.GetRandomColor(out ret); + GeometryUtils.GetRandomColor(out ret); } HitColors.Add(ret); return ret; @@ -358,10 +358,10 @@ namespace _2DGAMELIB public void GetUniqueColor(out Color c) { - Oth.GetRandomColor(out c); + GeometryUtils.GetRandomColor(out c); while (HitColors.Contains(c)) { - Oth.GetRandomColor(out c); + GeometryUtils.GetRandomColor(out c); } HitColors.Add(c); } diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs index 4dce833..3564da6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/ペニス処理.cs @@ -619,7 +619,7 @@ namespace SlaveMatrix item.SizeXCont = xc; } } - 調教UI.ペニス.位置C = Oth.GetRandomVector() * 0.001; + 調教UI.ペニス.位置C = GeometryUtils.GetRandomVector() * 0.001; 調教UI.射精.位置C = 調教UI.ペニス.位置C; }, OnReach = delegate(Motion m) @@ -678,7 +678,7 @@ namespace SlaveMatrix if (調教UI.射精.Yv >= 0.65 && 調教UI.Focus == ペニス) { p = 調教UI.射精.Body.Current.EnumAllPar().First(); - cp = p.ToGlobal(p.OP.GetCenter() + Oth.GetRandomVector() * 0.0025); + cp = p.ToGlobal(p.OP.GetCenter() + GeometryUtils.GetRandomVector() * 0.0025); hc = ペニス処理2.Med.GetHitColor(ペニス処理2.Med.FromBasePosition(cp)); ペニス処理2.Bod.Addぶっかけ(cp, hc); 調教UI.Action(c = ペニス処理2.Cha.GetContact(ref hc).c, ActionType.Contact, CurrentState.Start, ToolType.Penis, 0, 1, 機械: false, 射精: true); diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs index 1778e8d..4be9221 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/マウス処理.cs @@ -364,8 +364,8 @@ namespace SlaveMatrix d = m.Value.Inverse(); マウス処理2.対象.Element.尺度C = s * d; } - マウス処理2.対象.Element.位置C = Oth.GetRandomVector() * d * 0.0005; - 調教UI.マウス.X2Y0_舌.PositionCont = Oth.GetRandomVector() * d * 0.001; + マウス処理2.対象.Element.位置C = GeometryUtils.GetRandomVector() * d * 0.0005; + 調教UI.マウス.X2Y0_舌.PositionCont = GeometryUtils.GetRandomVector() * d * 0.001; if (sw.IsRunning) { if (sw.ElapsedMilliseconds > 250) diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs index 7ba35e6..bd1462c 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/交配.cs @@ -1468,7 +1468,7 @@ namespace SlaveMatrix Color c4 = (Color)item2.GetValue(父方); if (!c3.IsEmpty && !c4.IsEmpty) { - item2.SetValue(体色2, Oth.GetInter(ref c3, ref c4)); + item2.SetValue(体色2, GeometryUtils.GetInter(ref c3, ref c4)); } else { @@ -1485,7 +1485,7 @@ namespace SlaveMatrix Color c6 = (Color)item3.GetValue(父方); if (!c5.IsEmpty && !c6.IsEmpty) { - item3.SetValue(体色2, Oth.GetInter(ref c5, ref c6)); + item3.SetValue(体色2, GeometryUtils.GetInter(ref c5, ref c6)); } else { @@ -1502,7 +1502,7 @@ namespace SlaveMatrix Color c2 = (Color)item4.GetValue(父方); if (!c.IsEmpty && !c2.IsEmpty) { - item4.SetValue(体色2, Oth.GetInter(ref c, ref c2)); + item4.SetValue(体色2, GeometryUtils.GetInter(ref c, ref c2)); } else { @@ -1549,7 +1549,7 @@ namespace SlaveMatrix { double[] obj = new double[4] { 1.0, 2.0, 8.0, 0.0 }; obj[3] = 500.0 * ((Sta.GameData.祝福 != null && Sta.GameData.祝福.Race == GameText.カーバンクル) ? 0.5 : 1.0); - switch (Oth.GetRandomIndex(obj)) + switch (GeometryUtils.GetRandomIndex(obj)) { case 0: if (体色2.血統.Contains(GameText.アルビノ)) @@ -1690,13 +1690,13 @@ namespace SlaveMatrix 体色2.目左 = 体色2.目右; break; case 2: - Oth.GetInter(ref 体色2.目左, ref 体色2.目右, out 体色2.縦目); + GeometryUtils.GetInter(ref 体色2.目左, ref 体色2.目右, out 体色2.縦目); 体色2.頬目左 = 体色2.目左; 体色2.頬目右 = 体色2.目左; 体色2.目右 = 体色2.目左; break; case 3: - Oth.GetInter(ref 体色2.目左, ref 体色2.目右, out 体色2.縦目); + GeometryUtils.GetInter(ref 体色2.目左, ref 体色2.目右, out 体色2.縦目); 体色2.頬目左 = 体色2.目右; 体色2.頬目右 = 体色2.目右; 体色2.目左 = 体色2.目右; @@ -1756,13 +1756,13 @@ namespace SlaveMatrix 体色2.目左 = 体色2.目右; break; case 2: - Oth.GetInter(ref 体色2.目左, ref 体色2.目右, out 体色2.縦目); + GeometryUtils.GetInter(ref 体色2.目左, ref 体色2.目右, out 体色2.縦目); 体色2.頬目左 = 体色2.目左; 体色2.頬目右 = 体色2.目左; 体色2.目右 = 体色2.目左; break; case 3: - Oth.GetInter(ref 体色2.目左, ref 体色2.目右, out 体色2.縦目); + GeometryUtils.GetInter(ref 体色2.目左, ref 体色2.目右, out 体色2.縦目); 体色2.頬目左 = 体色2.目右; 体色2.頬目右 = 体色2.目右; 体色2.目左 = 体色2.目右; diff --git a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs index f9f392f..87dfda6 100644 --- a/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs +++ b/SlaveMatrix/SlaveMatrix/BodyPartClasses/挿入処理.cs @@ -430,7 +430,7 @@ namespace SlaveMatrix { if ((0.1 * Player.肛挿入度 * Player.Tension.Inverse()).Lot()) { - switch (Oth.GetRandomIndex(4.0, 4.0, 1.0, 1.0)) + switch (GeometryUtils.GetRandomIndex(4.0, 4.0, 1.0, 1.0)) { case 0: //Sounds.挿抜前3.Play(); diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs index 70ec695..17ee363 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Generator.cs @@ -104,7 +104,7 @@ namespace SlaveMatrix public static Unit 娼婦労働妊娠父方() { - switch (Oth.GetRandomIndex(7.0, 5.0, 3.0, 1.0)) + switch (GeometryUtils.GetRandomIndex(7.0, 5.0, 3.0, 1.0)) { case 0: return Generate(SpeciesDefaults.Getヒューマン(), SpeciesDefaults.Getヒューマン(), 2, GameText.ヒューマン); @@ -139,7 +139,7 @@ namespace SlaveMatrix protected Unit GetBird() { - return Oth.GetRandomIndex(GameText.ハーピー.GetRareWeight(), GameText.ハルピュイア.GetRareWeight(), GameText.フェニックス.GetRareWeight()) switch + return GeometryUtils.GetRandomIndex(GameText.ハーピー.GetRareWeight(), GameText.ハルピュイア.GetRareWeight(), GameText.フェニックス.GetRareWeight()) switch { 0 => Generate(SpeciesDefaults.GetHarpy(), SpeciesDefaults.GetHarpy(), 2, GameText.ハーピー), 1 => Generate(SpeciesDefaults.Getハルピュイア(), SpeciesDefaults.Getハルピュイア(), 2, GameText.ハルピュイア), @@ -150,7 +150,7 @@ namespace SlaveMatrix protected Unit GetSnake() { - return Oth.GetRandomIndex(GameText.ラミア.GetRareWeight(), GameText.ヒュドラ.GetRareWeight(), GameText.エキドナ.GetRareWeight(), GameText.ウロボロス.GetRareWeight()) switch + return GeometryUtils.GetRandomIndex(GameText.ラミア.GetRareWeight(), GameText.ヒュドラ.GetRareWeight(), GameText.エキドナ.GetRareWeight(), GameText.ウロボロス.GetRareWeight()) switch { 0 => Generate(SpeciesDefaults.Getラミア(), SpeciesDefaults.Getラミア(), 2, GameText.ラミア), 1 => Generate(SpeciesDefaults.Getヒュドラ(), SpeciesDefaults.Getヒュドラ(), 3, GameText.ヒュドラ), @@ -162,7 +162,7 @@ namespace SlaveMatrix protected Unit GetBeast() { - return Oth.GetRandomIndex(GameText.ウェアキャット.GetRareWeight(), GameText.ウェアウルフ.GetRareWeight(), GameText.ウェアフォックス.GetRareWeight(), GameText.ミノタウロス.GetRareWeight(), GameText.アフール.GetRareWeight(), GameText.オノケンタウレ.GetRareWeight(), GameText.ヒッポケンタウレ.GetRareWeight(), GameText.ブケンタウレ.GetRareWeight(), GameText.カプラケンタウレ.GetRareWeight(), GameText.レオントケンタウレ.GetRareWeight(), GameText.ティグリスケンタウレ.GetRareWeight(), GameText.パンテーラケンタウレ.GetRareWeight(), GameText.チータケンタウレ.GetRareWeight()) switch + return GeometryUtils.GetRandomIndex(GameText.ウェアキャット.GetRareWeight(), GameText.ウェアウルフ.GetRareWeight(), GameText.ウェアフォックス.GetRareWeight(), GameText.ミノタウロス.GetRareWeight(), GameText.アフール.GetRareWeight(), GameText.オノケンタウレ.GetRareWeight(), GameText.ヒッポケンタウレ.GetRareWeight(), GameText.ブケンタウレ.GetRareWeight(), GameText.カプラケンタウレ.GetRareWeight(), GameText.レオントケンタウレ.GetRareWeight(), GameText.ティグリスケンタウレ.GetRareWeight(), GameText.パンテーラケンタウレ.GetRareWeight(), GameText.チータケンタウレ.GetRareWeight()) switch { 0 => Generate(SpeciesDefaults.Getウェアキャット(), SpeciesDefaults.Getウェアキャット(), 2, GameText.ウェアキャット), 1 => Generate(SpeciesDefaults.Getウェアウルフ(), SpeciesDefaults.Getウェアウルフ(), 2, GameText.ウェアウルフ), @@ -183,7 +183,7 @@ namespace SlaveMatrix protected Unit GetAquatic() { - switch (Oth.GetRandomIndex(GameText.カッパ.GetRareWeight(), GameText.マーメイド.GetRareWeight(), GameText.オールドマーメイド.GetRareWeight(), GameText.ドルフィンマーメイド.GetRareWeight(), GameText.イクテュオケンタウレ.GetRareWeight(), GameText.デルピヌスケンタウレ.GetRareWeight(), GameText.シーラミア.GetRareWeight(), GameText.セイレーン.GetRareWeight(), GameText.スキュラ.GetRareWeight(), GameText.カリュブディス.GetRareWeight(), GameText.クラーケン.GetRareWeight(), GameText.オールドスキュラ.GetRareWeight())) + switch (GeometryUtils.GetRandomIndex(GameText.カッパ.GetRareWeight(), GameText.マーメイド.GetRareWeight(), GameText.オールドマーメイド.GetRareWeight(), GameText.ドルフィンマーメイド.GetRareWeight(), GameText.イクテュオケンタウレ.GetRareWeight(), GameText.デルピヌスケンタウレ.GetRareWeight(), GameText.シーラミア.GetRareWeight(), GameText.セイレーン.GetRareWeight(), GameText.スキュラ.GetRareWeight(), GameText.カリュブディス.GetRareWeight(), GameText.クラーケン.GetRareWeight(), GameText.オールドスキュラ.GetRareWeight())) { case 0: return Generate(SpeciesDefaults.Getカッパ(), SpeciesDefaults.Getカッパ(), 2, GameText.カッパ); @@ -225,7 +225,7 @@ namespace SlaveMatrix protected Unit GetInsect() { - switch (Oth.GetRandomIndex(GameText.ウェアマンティス.GetRareWeight(), GameText.ウェアドラゴンフライ.GetRareWeight(), GameText.ウェアビートル.GetRareWeight(), GameText.ウェアスタッグビートル.GetRareWeight(), GameText.アラクネ.GetRareWeight(), GameText.ギルタブリル.GetRareWeight(), GameText.ギルタブルル.GetRareWeight(), GameText.ムカデジョウロウ.GetRareWeight(), GameText.サンドワーム.GetRareWeight(), GameText.フェアリー.GetRareWeight())) + switch (GeometryUtils.GetRandomIndex(GameText.ウェアマンティス.GetRareWeight(), GameText.ウェアドラゴンフライ.GetRareWeight(), GameText.ウェアビートル.GetRareWeight(), GameText.ウェアスタッグビートル.GetRareWeight(), GameText.アラクネ.GetRareWeight(), GameText.ギルタブリル.GetRareWeight(), GameText.ギルタブルル.GetRareWeight(), GameText.ムカデジョウロウ.GetRareWeight(), GameText.サンドワーム.GetRareWeight(), GameText.フェアリー.GetRareWeight())) { case 0: return Generate(SpeciesDefaults.Getウェアマンティス(), SpeciesDefaults.Getウェアマンティス(), 1, GameText.ウェアマンティス); @@ -261,7 +261,7 @@ namespace SlaveMatrix protected Unit GetHumanoid() { - switch (Oth.GetRandomIndex(GameText.リリン.GetRareWeight(), GameText.エルフ.GetRareWeight(), GameText.ドワーフ.GetRareWeight(), GameText.オーグリス.GetRareWeight(), GameText.サイクロプス.GetRareWeight(), GameText.デビル.GetRareWeight(), GameText.エンジェル.GetRareWeight(), GameText.サキュバス.GetRareWeight(), GameText.アルラウネ.GetRareWeight(), GameText.スライム.GetRareWeight(), GameText.エイリアン.GetRareWeight())) + switch (GeometryUtils.GetRandomIndex(GameText.リリン.GetRareWeight(), GameText.エルフ.GetRareWeight(), GameText.ドワーフ.GetRareWeight(), GameText.オーグリス.GetRareWeight(), GameText.サイクロプス.GetRareWeight(), GameText.デビル.GetRareWeight(), GameText.エンジェル.GetRareWeight(), GameText.サキュバス.GetRareWeight(), GameText.アルラウネ.GetRareWeight(), GameText.スライム.GetRareWeight(), GameText.エイリアン.GetRareWeight())) { case 0: return Generate(SpeciesDefaults.Getリリン(), SpeciesDefaults.Getリリン(), 2, GameText.リリン); @@ -298,7 +298,7 @@ namespace SlaveMatrix protected Unit Get幻獣() { - return Oth.GetRandomIndex(GameText.カーバンクル.GetRareWeight(), GameText.ペガサス.GetRareWeight(), GameText.ユニコーン.GetRareWeight(), GameText.バイコーン.GetRareWeight(), GameText.アリコーン.GetRareWeight(), GameText.グリフォン.GetRareWeight(), GameText.モノケロス.GetRareWeight(), GameText.ヒッポグリフ.GetRareWeight()) switch + return GeometryUtils.GetRandomIndex(GameText.カーバンクル.GetRareWeight(), GameText.ペガサス.GetRareWeight(), GameText.ユニコーン.GetRareWeight(), GameText.バイコーン.GetRareWeight(), GameText.アリコーン.GetRareWeight(), GameText.グリフォン.GetRareWeight(), GameText.モノケロス.GetRareWeight(), GameText.ヒッポグリフ.GetRareWeight()) switch { 0 => Generate(SpeciesDefaults.Getカーバンクル(), SpeciesDefaults.Getカーバンクル(), 2, GameText.カーバンクル), 1 => Generate(SpeciesDefaults.Getペガサス(), SpeciesDefaults.Getペガサス(), 3, GameText.ペガサス), @@ -314,7 +314,7 @@ namespace SlaveMatrix protected Unit Get魔獣() { - switch (Oth.GetRandomIndex(GameText.キマイラ.GetRareWeight(), GameText.スフィンクス.GetRareWeight(), GameText.カトブレパス.GetRareWeight(), GameText.バジリスク.GetRareWeight(), GameText.コカトリス.GetRareWeight(), GameText.ゴルゴン.GetRareWeight())) + switch (GeometryUtils.GetRandomIndex(GameText.キマイラ.GetRareWeight(), GameText.スフィンクス.GetRareWeight(), GameText.カトブレパス.GetRareWeight(), GameText.バジリスク.GetRareWeight(), GameText.コカトリス.GetRareWeight(), GameText.ゴルゴン.GetRareWeight())) { case 0: return Generate(SpeciesDefaults.Getキマイラ(), SpeciesDefaults.Getキマイラ(), 3, GameText.キマイラ); @@ -338,7 +338,7 @@ namespace SlaveMatrix protected Unit GetDragon() { - return Oth.GetRandomIndex(GameText.リザードマン.GetRareWeight(), GameText.ドラゴニュート.GetRareWeight(), GameText.ワーム.GetRareWeight(), GameText.リュウ.GetRareWeight(), GameText.ワイバーン.GetRareWeight(), GameText.ドラコケンタウレ.GetRareWeight(), GameText.ドラゴン.GetRareWeight()) switch + return GeometryUtils.GetRandomIndex(GameText.リザードマン.GetRareWeight(), GameText.ドラゴニュート.GetRareWeight(), GameText.ワーム.GetRareWeight(), GameText.リュウ.GetRareWeight(), GameText.ワイバーン.GetRareWeight(), GameText.ドラコケンタウレ.GetRareWeight(), GameText.ドラゴン.GetRareWeight()) switch { 0 => Generate(SpeciesDefaults.Getリザードマン(), SpeciesDefaults.Getリザードマン(), 2, GameText.リザードマン), 1 => Generate(SpeciesDefaults.Getドラゴニュート(), SpeciesDefaults.Getドラゴニュート(), 3, GameText.ドラゴニュート), diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs index 9864552..ef09a43 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Onomatopoeia.cs @@ -36,7 +36,7 @@ namespace SlaveMatrix { if (b) { - pt.PositionCont = Oth.GetRandomVector() * 0.0025 * d; + pt.PositionCont = GeometryUtils.GetRandomVector() * 0.0025 * d; } pt.TextColor = Color.FromArgb((int)((double)(int)pt.TextColor.A * m.Value.Inverse()), pt.TextColor); Are.DisplayGraphics.TextRenderingHint = TextRenderingHint.AntiAlias; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Player.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Player.cs index 3cc1d06..6d40437 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Player.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Player.cs @@ -2031,7 +2031,7 @@ namespace SlaveMatrix switch (c.CharacterData.Emotion) { case EmotionType.none: - switch (Oth.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.余裕_(), c.幸福_(), c.喜悦_(), c.淫乱_(), c.其他_())) + switch (GeometryUtils.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.余裕_(), c.幸福_(), c.喜悦_(), c.淫乱_(), c.其他_())) { case 0: c.CharacterData.Emotion = EmotionType.Denial; @@ -2069,7 +2069,7 @@ namespace SlaveMatrix } break; case EmotionType.Denial: - switch (Oth.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.喜悦_())) + switch (GeometryUtils.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.喜悦_())) { case 0: c.CharacterData.Emotion = EmotionType.Denial; @@ -2086,7 +2086,7 @@ namespace SlaveMatrix } break; case EmotionType.Humiliation: - switch (Oth.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.興奮_())) + switch (GeometryUtils.GetRandomIndex(c.否定_(), c.屈辱_(), c.羞恥_(), c.興奮_())) { case 0: c.CharacterData.Emotion = EmotionType.Denial; @@ -2103,7 +2103,7 @@ namespace SlaveMatrix } break; case EmotionType.Shame: - switch (Oth.GetRandomIndex(c.屈辱_(), c.羞恥_(), c.興奮_())) + switch (GeometryUtils.GetRandomIndex(c.屈辱_(), c.羞恥_(), c.興奮_())) { case 0: c.CharacterData.Emotion = EmotionType.Humiliation; @@ -2117,7 +2117,7 @@ namespace SlaveMatrix } break; case EmotionType.Acceptance: - switch (Oth.GetRandomIndex(c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.余裕_())) + switch (GeometryUtils.GetRandomIndex(c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.余裕_())) { case 0: c.CharacterData.Emotion = EmotionType.Shame; @@ -2137,7 +2137,7 @@ namespace SlaveMatrix } break; case EmotionType.Desire: - switch (Oth.GetRandomIndex(c.受容_(), c.欲望_(), c.興奮_(), c.喜悦_(), c.淫乱_())) + switch (GeometryUtils.GetRandomIndex(c.受容_(), c.欲望_(), c.興奮_(), c.喜悦_(), c.淫乱_())) { case 0: c.CharacterData.Emotion = EmotionType.Acceptance; @@ -2157,7 +2157,7 @@ namespace SlaveMatrix } break; case EmotionType.Excitement: - switch (Oth.GetRandomIndex(c.羞恥_(), c.欲望_(), c.興奮_(), c.喜悦_(), c.淫乱_())) + switch (GeometryUtils.GetRandomIndex(c.羞恥_(), c.欲望_(), c.興奮_(), c.喜悦_(), c.淫乱_())) { case 0: c.CharacterData.Emotion = EmotionType.Shame; @@ -2177,7 +2177,7 @@ namespace SlaveMatrix } break; case EmotionType.余裕: - switch (Oth.GetRandomIndex(c.受容_(), c.欲望_(), c.興奮_(), c.余裕_(), c.幸福_())) + switch (GeometryUtils.GetRandomIndex(c.受容_(), c.欲望_(), c.興奮_(), c.余裕_(), c.幸福_())) { case 0: c.CharacterData.Emotion = EmotionType.Acceptance; @@ -2197,7 +2197,7 @@ namespace SlaveMatrix } break; case EmotionType.Happiness: - switch (Oth.GetRandomIndex(c.受容_(), c.欲望_(), c.余裕_(), c.幸福_(), c.喜悦_())) + switch (GeometryUtils.GetRandomIndex(c.受容_(), c.欲望_(), c.余裕_(), c.幸福_(), c.喜悦_())) { case 0: c.CharacterData.Emotion = EmotionType.Acceptance; @@ -2217,7 +2217,7 @@ namespace SlaveMatrix } break; case EmotionType.Joy: - switch (Oth.GetRandomIndex(c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.幸福_(), c.喜悦_(), c.淫乱_())) + switch (GeometryUtils.GetRandomIndex(c.羞恥_(), c.受容_(), c.欲望_(), c.興奮_(), c.幸福_(), c.喜悦_(), c.淫乱_())) { case 0: c.CharacterData.Emotion = EmotionType.Shame; @@ -2243,7 +2243,7 @@ namespace SlaveMatrix } break; case EmotionType.Lewd: - switch (Oth.GetRandomIndex(c.屈辱_(), c.羞恥_(), c.欲望_(), c.興奮_(), c.幸福_(), c.喜悦_(), c.淫乱_())) + switch (GeometryUtils.GetRandomIndex(c.屈辱_(), c.羞恥_(), c.欲望_(), c.興奮_(), c.幸福_(), c.喜悦_(), c.淫乱_())) { case 0: c.CharacterData.Emotion = EmotionType.Humiliation; @@ -2269,7 +2269,7 @@ namespace SlaveMatrix } break; case EmotionType.Other: - switch (Oth.GetRandomIndex(c.羞恥_(), c.受容_(), c.余裕_(), c.幸福_(), c.其他_())) + switch (GeometryUtils.GetRandomIndex(c.羞恥_(), c.受容_(), c.余裕_(), c.幸福_(), c.其他_())) { case 0: c.CharacterData.Emotion = EmotionType.Shame; @@ -2331,7 +2331,7 @@ namespace SlaveMatrix if (Virgin && CurrentActionType == ActionType.Insertion && (CurrentToolType == ToolType.Penis || CurrentToolType == ToolType.Dildo || CurrentToolType == ToolType.Vibrator || CurrentToolType == ToolType.Drill || CurrentToolType == ToolType.デンマ || CurrentToolType == ToolType.AnalVibrator) && CurrentContactType == ContactType.Vagina && 挿入Lvn > 2) { Reaction2(); - Cha.Body.Waist.位置B += Oth.GetRandomVector() * 0.0004; + Cha.Body.Waist.位置B += GeometryUtils.GetRandomVector() * 0.0004; Cha.Body.HipMotionValue = RNG.XS.NextDouble(); switch (RNG.XS.Next(2)) { @@ -2393,7 +2393,7 @@ namespace SlaveMatrix public static void Reaction1() { Reaction2(); - Cha.Body.Waist.位置B += Oth.GetRandomVector() * 0.0004; + Cha.Body.Waist.位置B += GeometryUtils.GetRandomVector() * 0.0004; Cha.Body.HipMotionValue = RNG.XS.NextDouble(); Cha.Emotion(); Cha.UpdateExpression(); @@ -2503,7 +2503,7 @@ namespace SlaveMatrix else { double num2 = (Tension + Pride) * 0.5; - num = 1 + Oth.GetRandomIndex((Shame + Tension + Training + Pride) / 4.0, (Sensitivity + Affection + Lust) / 3.0 - num2, (Sensitivity + Excitement + Affection + Lust + Training) / 5.0 - num2); + num = 1 + GeometryUtils.GetRandomIndex((Shame + Tension + Training + Pride) / 4.0, (Sensitivity + Affection + Lust) / 3.0 - num2, (Sensitivity + Excitement + Affection + Lust + Training) / 5.0 - num2); } string text = ""; if (Cha.Body.口i == 4 || Cha.Body.口i == 10 || Cha.Body.口i == 11) @@ -2529,7 +2529,7 @@ namespace SlaveMatrix public static string 語尾(this string s) { - switch (Oth.GetRandomIndex((Shame + Tension) * 0.5, Cha.苦痛条件() ? 1.0 : ((Sensitivity + Excitement + Lust) / 3.0), (Affection + Lust) * 0.4 - Pride)) + switch (GeometryUtils.GetRandomIndex((Shame + Tension) * 0.5, Cha.苦痛条件() ? 1.0 : ((Sensitivity + Excitement + Lust) / 3.0), (Affection + Lust) * 0.4 - Pride)) { case 0: return s + Sta.end[(!RNG.XS.NextBool()) ? 1u : 0u]; diff --git a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs index 323ee9b..8b9d2f7 100644 --- a/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs +++ b/SlaveMatrix/SlaveMatrix/GameClasses/Sta.cs @@ -897,7 +897,7 @@ namespace SlaveMatrix { array[i] = count - (num - i).Abs(); } - num = Oth.GetRandomIndex(array); + num = GeometryUtils.GetRandomIndex(array); int num2 = ((int)((double)t[num].Length * v2)).Limit(0, t[num].Length); return t[num][num2]; }