diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index de3f888..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "Winch"]
- path = Winch
- url = https://github.com/Hacktix/Winch.git
diff --git a/BeyondAbyss.sln b/BeyondAbyss.sln
index 280b526..63a4cc4 100644
--- a/BeyondAbyss.sln
+++ b/BeyondAbyss.sln
@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.33530.505
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeyondAbyss", "BeyondAbyss\BeyondAbyss.csproj", "{CB46245F-3769-4E74-8F99-B6BBE8668A23}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Winch", "Winch\Winch\Winch.csproj", "{38F8694D-178E-4AB0-B0F8-F2D19C81C021}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BeyondAbyss", "BeyondAbyss\BeyondAbyss.csproj", "{CB46245F-3769-4E74-8F99-B6BBE8668A23}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +15,6 @@ Global
{CB46245F-3769-4E74-8F99-B6BBE8668A23}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CB46245F-3769-4E74-8F99-B6BBE8668A23}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CB46245F-3769-4E74-8F99-B6BBE8668A23}.Release|Any CPU.Build.0 = Release|Any CPU
- {38F8694D-178E-4AB0-B0F8-F2D19C81C021}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {38F8694D-178E-4AB0-B0F8-F2D19C81C021}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {38F8694D-178E-4AB0-B0F8-F2D19C81C021}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {38F8694D-178E-4AB0-B0F8-F2D19C81C021}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/BeyondAbyss/Text/de.json b/BeyondAbyss/Assets/Localization/de.json
similarity index 100%
rename from BeyondAbyss/Text/de.json
rename to BeyondAbyss/Assets/Localization/de.json
diff --git a/BeyondAbyss/Text/en.json b/BeyondAbyss/Assets/Localization/en.json
similarity index 100%
rename from BeyondAbyss/Text/en.json
rename to BeyondAbyss/Assets/Localization/en.json
diff --git a/BeyondAbyss/BeyondAbyss.cs b/BeyondAbyss/BeyondAbyss.cs
index 5920e52..be2c8fd 100644
--- a/BeyondAbyss/BeyondAbyss.cs
+++ b/BeyondAbyss/BeyondAbyss.cs
@@ -9,21 +9,9 @@ public class BeyondAbyss
{
public static void Init()
{
- //Winch.Core.API.DredgeEvent.ModAssetsLoaded += Patch;
WinchCore.Log.Info("Initializing BeyondAbyss...");
- var harmony = new Harmony("com.dredge.BeyondAbyss");
- harmony.PatchAll(Assembly.GetExecutingAssembly());
-
- WinchCore.Log.Info("Done :D");
- }
-
- public static void Patch(object sender, EventArgs e)
- {
- WinchCore.Log.Info("Initializing BeyondAbyss...");
-
- var harmony = new Harmony("com.dredge.BeyondAbyss");
- harmony.PatchAll(Assembly.GetExecutingAssembly());
+ new Harmony("sp00ktober.BeyondAbyss").PatchAll(Assembly.GetExecutingAssembly());
WinchCore.Log.Info("Done :D");
}
diff --git a/BeyondAbyss/BeyondAbyss.csproj b/BeyondAbyss/BeyondAbyss.csproj
index bdcea5b..b94b17f 100644
--- a/BeyondAbyss/BeyondAbyss.csproj
+++ b/BeyondAbyss/BeyondAbyss.csproj
@@ -1,146 +1,38 @@
-
-
-
+
+
- Debug
- AnyCPU
- {CB46245F-3769-4E74-8F99-B6BBE8668A23}
- Library
- Properties
- BeyondAbyss
- BeyondAbyss
- v4.8
- 512
- true
+ net48
+ false
+ false
+ 11
+ false
-
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
+
+
+ portable
+ ./bin
+ 1.0.*
+ False
+ True
+
-
- ..\packages\Lib.Harmony.2.3.0-alpha.5\lib\net48\0Harmony.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Assembly-CSharp.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Cinemachine.dll
-
-
- ..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.dll
-
-
- ..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Mdb.dll
-
-
- ..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Pdb.dll
-
-
- ..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Rocks.dll
-
-
- ..\packages\MonoModReorg.Backports.23.3.22.1\lib\net452\MonoMod.Backports.dll
-
-
- ..\packages\MonoModReorg.Core.23.3.22.1\lib\net452\MonoMod.Core.dll
-
-
- ..\packages\MonoModReorg.Core.23.3.22.1\lib\net452\MonoMod.Iced.dll
-
-
- ..\packages\MonoModReorg.ILHelpers.23.3.22.1\lib\net452\MonoMod.ILHelpers.dll
-
-
- ..\packages\MonoMod.RuntimeDetour.22.7.31.1\lib\net452\MonoMod.RuntimeDetour.dll
-
-
- ..\packages\MonoMod.Utils.22.7.31.1\lib\net452\MonoMod.Utils.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Newtonsoft.Json.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Sirenix.Serialization.dll
-
-
-
-
-
-
-
-
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Unity.Addressables.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Unity.Localization.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Unity.ResourceManager.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\UnityEngine.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\UnityEngine.AnimationModule.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\UnityEngine.CoreModule.dll
-
-
- False
- ..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\UnityEngine.UI.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
- {38f8694d-178e-4ab0-b0f8-f2d19c81c021}
- Winch
-
+
+ Always
+
+
+ Always
+
+
+ Always
+
-
-
\ No newline at end of file
+
+
diff --git a/BeyondAbyss/Config/Dredging_Minigame/Dredging_1_-_Very_Easy.json b/BeyondAbyss/Config/Dredging_Minigame/Dredging_1_-_Very_Easy.json
new file mode 100644
index 0000000..6bdd940
--- /dev/null
+++ b/BeyondAbyss/Config/Dredging_Minigame/Dredging_1_-_Very_Easy.json
@@ -0,0 +1,23 @@
+{
+ "targetValue": 0.2,
+ "secondsToPassivelyCatch": 7.0,
+ "rotationSpeed": 130.0,
+ "minTargets": 6,
+ "maxTargets": 7,
+ "minTargetWidth": 10,
+ "maxTargetWidth": 15,
+ "specialTargetWidth": 0,
+ "numPendulumSegments": 0,
+ "ballCatcherPatterns": null,
+ "valueFactor": 0.0,
+ "speedFactor": 0.0,
+ "ballTrophySpeedFactor": 0.0,
+ "targetZoneDegrees": 0.0,
+ "diamondRotation": 0.0,
+ "diamondScaleUpTimeSec": 0.0,
+ "diamondTrophySpeedFactor": 0.0,
+ "timeBetweenDiamondTargetsMin": 0.0,
+ "timeBetweenDiamondTargetsMax": 0.0,
+ "name": "Dredging 1 - Very Easy",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Dredging_Minigame/Dredging_2_-_Easy.json b/BeyondAbyss/Config/Dredging_Minigame/Dredging_2_-_Easy.json
new file mode 100644
index 0000000..206e4fc
--- /dev/null
+++ b/BeyondAbyss/Config/Dredging_Minigame/Dredging_2_-_Easy.json
@@ -0,0 +1,23 @@
+{
+ "targetValue": 0.2,
+ "secondsToPassivelyCatch": 8.0,
+ "rotationSpeed": 150.0,
+ "minTargets": 7,
+ "maxTargets": 7,
+ "minTargetWidth": 10,
+ "maxTargetWidth": 15,
+ "specialTargetWidth": 0,
+ "numPendulumSegments": 0,
+ "ballCatcherPatterns": null,
+ "valueFactor": 0.0,
+ "speedFactor": 0.0,
+ "ballTrophySpeedFactor": 0.0,
+ "targetZoneDegrees": 0.0,
+ "diamondRotation": 0.0,
+ "diamondScaleUpTimeSec": 0.0,
+ "diamondTrophySpeedFactor": 0.0,
+ "timeBetweenDiamondTargetsMin": 0.0,
+ "timeBetweenDiamondTargetsMax": 0.0,
+ "name": "Dredging 2 - Easy",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Dredging_Minigame/Dredging_3_-_Medium.json b/BeyondAbyss/Config/Dredging_Minigame/Dredging_3_-_Medium.json
new file mode 100644
index 0000000..26c7136
--- /dev/null
+++ b/BeyondAbyss/Config/Dredging_Minigame/Dredging_3_-_Medium.json
@@ -0,0 +1,23 @@
+{
+ "targetValue": 0.25,
+ "secondsToPassivelyCatch": 9.0,
+ "rotationSpeed": 160.0,
+ "minTargets": 8,
+ "maxTargets": 8,
+ "minTargetWidth": 10,
+ "maxTargetWidth": 15,
+ "specialTargetWidth": 0,
+ "numPendulumSegments": 0,
+ "ballCatcherPatterns": null,
+ "valueFactor": 0.0,
+ "speedFactor": 0.0,
+ "ballTrophySpeedFactor": 0.0,
+ "targetZoneDegrees": 0.0,
+ "diamondRotation": 0.0,
+ "diamondScaleUpTimeSec": 0.0,
+ "diamondTrophySpeedFactor": 0.0,
+ "timeBetweenDiamondTargetsMin": 0.0,
+ "timeBetweenDiamondTargetsMax": 0.0,
+ "name": "Dredging 3 - Medium",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Dredging_Minigame/Dredging_4_-_Hard.json b/BeyondAbyss/Config/Dredging_Minigame/Dredging_4_-_Hard.json
new file mode 100644
index 0000000..21686b5
--- /dev/null
+++ b/BeyondAbyss/Config/Dredging_Minigame/Dredging_4_-_Hard.json
@@ -0,0 +1,23 @@
+{
+ "targetValue": 0.25,
+ "secondsToPassivelyCatch": 11.0,
+ "rotationSpeed": 170.0,
+ "minTargets": 9,
+ "maxTargets": 9,
+ "minTargetWidth": 10,
+ "maxTargetWidth": 15,
+ "specialTargetWidth": 0,
+ "numPendulumSegments": 0,
+ "ballCatcherPatterns": null,
+ "valueFactor": 0.0,
+ "speedFactor": 0.0,
+ "ballTrophySpeedFactor": 0.0,
+ "targetZoneDegrees": 0.0,
+ "diamondRotation": 0.0,
+ "diamondScaleUpTimeSec": 0.0,
+ "diamondTrophySpeedFactor": 0.0,
+ "timeBetweenDiamondTargetsMin": 0.0,
+ "timeBetweenDiamondTargetsMax": 0.0,
+ "name": "Dredging 4 - Hard",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Dredging_Minigame/Dredging_5_-_Very_Hard.json b/BeyondAbyss/Config/Dredging_Minigame/Dredging_5_-_Very_Hard.json
new file mode 100644
index 0000000..43c9c9e
--- /dev/null
+++ b/BeyondAbyss/Config/Dredging_Minigame/Dredging_5_-_Very_Hard.json
@@ -0,0 +1,23 @@
+{
+ "targetValue": 0.25,
+ "secondsToPassivelyCatch": 13.0,
+ "rotationSpeed": 200.0,
+ "minTargets": 10,
+ "maxTargets": 10,
+ "minTargetWidth": 10,
+ "maxTargetWidth": 15,
+ "specialTargetWidth": 0,
+ "numPendulumSegments": 0,
+ "ballCatcherPatterns": null,
+ "valueFactor": 0.0,
+ "speedFactor": 0.0,
+ "ballTrophySpeedFactor": 0.0,
+ "targetZoneDegrees": 0.0,
+ "diamondRotation": 0.0,
+ "diamondScaleUpTimeSec": 0.0,
+ "diamondTrophySpeedFactor": 0.0,
+ "timeBetweenDiamondTargetsMin": 0.0,
+ "timeBetweenDiamondTargetsMax": 0.0,
+ "name": "Dredging 5 - Very Hard",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Fishing_Minigame/Fishing_1_-_Very_Easy.json b/BeyondAbyss/Config/Fishing_Minigame/Fishing_1_-_Very_Easy.json
new file mode 100644
index 0000000..2d4a47d
--- /dev/null
+++ b/BeyondAbyss/Config/Fishing_Minigame/Fishing_1_-_Very_Easy.json
@@ -0,0 +1,48 @@
+{
+ "targetValue": 0.35,
+ "secondsToPassivelyCatch": 6.0,
+ "rotationSpeed": 140.0,
+ "minTargets": 2,
+ "maxTargets": 3,
+ "minTargetWidth": 30,
+ "maxTargetWidth": 40,
+ "specialTargetWidth": 18,
+ "numPendulumSegments": 2,
+ "ballCatcherPatterns": [
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ]
+ ],
+ "valueFactor": 0.9,
+ "speedFactor": 1.1,
+ "ballTrophySpeedFactor": 3.5,
+ "targetZoneDegrees": 40.0,
+ "diamondRotation": 0.0,
+ "diamondScaleUpTimeSec": 1.5,
+ "diamondTrophySpeedFactor": 3.5,
+ "timeBetweenDiamondTargetsMin": 1.0,
+ "timeBetweenDiamondTargetsMax": 2.0,
+ "name": "Fishing 1 - Very Easy",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Fishing_Minigame/Fishing_2_-_Easy.json b/BeyondAbyss/Config/Fishing_Minigame/Fishing_2_-_Easy.json
new file mode 100644
index 0000000..5992558
--- /dev/null
+++ b/BeyondAbyss/Config/Fishing_Minigame/Fishing_2_-_Easy.json
@@ -0,0 +1,82 @@
+{
+ "targetValue": 0.3,
+ "secondsToPassivelyCatch": 8.0,
+ "rotationSpeed": 170.0,
+ "minTargets": 2,
+ "maxTargets": 3,
+ "minTargetWidth": 20,
+ "maxTargetWidth": 25,
+ "specialTargetWidth": 13,
+ "numPendulumSegments": 2,
+ "ballCatcherPatterns": [
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ }
+ ]
+ ],
+ "valueFactor": 0.7,
+ "speedFactor": 1.3,
+ "ballTrophySpeedFactor": 3.5,
+ "targetZoneDegrees": 35.0,
+ "diamondRotation": 45.0,
+ "diamondScaleUpTimeSec": 1.2,
+ "diamondTrophySpeedFactor": 3.5,
+ "timeBetweenDiamondTargetsMin": 0.9,
+ "timeBetweenDiamondTargetsMax": 2.0,
+ "name": "Fishing 2 - Easy",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Fishing_Minigame/Fishing_3_-_Medium.json b/BeyondAbyss/Config/Fishing_Minigame/Fishing_3_-_Medium.json
new file mode 100644
index 0000000..60107cd
--- /dev/null
+++ b/BeyondAbyss/Config/Fishing_Minigame/Fishing_3_-_Medium.json
@@ -0,0 +1,116 @@
+{
+ "targetValue": 0.25,
+ "secondsToPassivelyCatch": 10.0,
+ "rotationSpeed": 190.0,
+ "minTargets": 2,
+ "maxTargets": 3,
+ "minTargetWidth": 15,
+ "maxTargetWidth": 20,
+ "specialTargetWidth": 9,
+ "numPendulumSegments": 3,
+ "ballCatcherPatterns": [
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ]
+ ],
+ "valueFactor": 0.6,
+ "speedFactor": 1.4,
+ "ballTrophySpeedFactor": 3.5,
+ "targetZoneDegrees": 30.0,
+ "diamondRotation": 90.0,
+ "diamondScaleUpTimeSec": 1.0,
+ "diamondTrophySpeedFactor": 3.5,
+ "timeBetweenDiamondTargetsMin": 0.7,
+ "timeBetweenDiamondTargetsMax": 2.0,
+ "name": "Fishing 3 - Medium",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Fishing_Minigame/Fishing_4_-_Hard.json b/BeyondAbyss/Config/Fishing_Minigame/Fishing_4_-_Hard.json
new file mode 100644
index 0000000..968975b
--- /dev/null
+++ b/BeyondAbyss/Config/Fishing_Minigame/Fishing_4_-_Hard.json
@@ -0,0 +1,116 @@
+{
+ "targetValue": 0.25,
+ "secondsToPassivelyCatch": 12.0,
+ "rotationSpeed": 230.0,
+ "minTargets": 3,
+ "maxTargets": 4,
+ "minTargetWidth": 12,
+ "maxTargetWidth": 17,
+ "specialTargetWidth": 7,
+ "numPendulumSegments": 3,
+ "ballCatcherPatterns": [
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ]
+ ],
+ "valueFactor": 0.5,
+ "speedFactor": 1.5,
+ "ballTrophySpeedFactor": 3.5,
+ "targetZoneDegrees": 26.0,
+ "diamondRotation": 180.0,
+ "diamondScaleUpTimeSec": 0.8,
+ "diamondTrophySpeedFactor": 3.5,
+ "timeBetweenDiamondTargetsMin": 0.5,
+ "timeBetweenDiamondTargetsMax": 2.0,
+ "name": "Fishing 4 - Hard",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Config/Fishing_Minigame/Fishing_5_-_Very_Hard.json b/BeyondAbyss/Config/Fishing_Minigame/Fishing_5_-_Very_Hard.json
new file mode 100644
index 0000000..99dce52
--- /dev/null
+++ b/BeyondAbyss/Config/Fishing_Minigame/Fishing_5_-_Very_Hard.json
@@ -0,0 +1,116 @@
+{
+ "targetValue": 0.25,
+ "secondsToPassivelyCatch": 15.0,
+ "rotationSpeed": 280.0,
+ "minTargets": 3,
+ "maxTargets": 5,
+ "minTargetWidth": 10,
+ "maxTargetWidth": 13,
+ "specialTargetWidth": 6,
+ "numPendulumSegments": 3,
+ "ballCatcherPatterns": [
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 0.5,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ],
+ [
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 0,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ },
+ {
+ "direction": 1,
+ "delayBeforeNextBall": 1.0,
+ "ballType": 0
+ }
+ ]
+ ],
+ "valueFactor": 0.3,
+ "speedFactor": 1.8,
+ "ballTrophySpeedFactor": 3.5,
+ "targetZoneDegrees": 22.0,
+ "diamondRotation": 270.0,
+ "diamondScaleUpTimeSec": 0.6,
+ "diamondTrophySpeedFactor": 3.5,
+ "timeBetweenDiamondTargetsMin": 0.4,
+ "timeBetweenDiamondTargetsMax": 2.0,
+ "name": "Fishing 5 - Very Hard",
+ "hideFlags": 0
+}
\ No newline at end of file
diff --git a/BeyondAbyss/Patches/Dynamic/BoatActionsDestinationUI_Patch.cs b/BeyondAbyss/Patches/Dynamic/BoatActionsDestinationUI_Patch.cs
index af797a7..285b08b 100644
--- a/BeyondAbyss/Patches/Dynamic/BoatActionsDestinationUI_Patch.cs
+++ b/BeyondAbyss/Patches/Dynamic/BoatActionsDestinationUI_Patch.cs
@@ -13,6 +13,7 @@ internal class BoatActionsDestinationUI_Patch
{
private static GameObject newButton = null;
private static GameObject newIris = null;
+ private static decimal loss;
[HarmonyPostfix]
[HarmonyPatch(nameof(BoatActionsDestinationUI.Init))]
@@ -44,37 +45,40 @@ public static void Init_Postfix(BoatActionsDestinationUI __instance)
});
destButton.BasicButtonWrapper.OnClick = new System.Action(() =>
{
- decimal loss = (decimal)(-1.0f * UnityEngine.Random.Range(30.0f, (float)GameManager.Instance.SaveData.Funds / 100.0f * 10.0f));
+ loss = (decimal)(-1.0f * UnityEngine.Random.Range(30.0f, (float)GameManager.Instance.SaveData.Funds / 100.0f * 10.0f));
GameManager.Instance.AddFunds(loss);
+ WinchCore.Log.Debug("Lost funds: " + loss);
ConfigManager.INSTANCE.SleepingOnLand = true;
- GameEvents.Instance.OnTimeForcefullyPassingChanged += new System.Action((isForcefullyPassing, reason, mode) =>
- {
- if (!isForcefullyPassing)
- {
- ConfigManager.INSTANCE.SleepingOnLand = false;
- GameManager.Instance.UI.ShowNotification(NotificationType.MONEY_LOST, "notification.funds-removed", new object[]
- {
- string.Concat(new string[]
- {
- "$",
- loss.ToString("n2", LocalizationSettings.SelectedLocale.Formatter),
- ""
- })
- });
- }
- });
+ GameEvents.Instance.OnTimeForcefullyPassingChanged += OnTimeForcefullyPassingChanged;
restButton.GetComponent().BasicButtonWrapper.OnClick();
});
newIris = GameObject.Instantiate(iris);
+ newIris.name = "NewIris";
newIris.transform.parent = newButton.transform.GetChild(1);
+ foreach (var image in newIris.GetComponentsInChildren(true))
+ {
+ image.raycastTarget = false;
+ }
newButton.GetComponentsInChildren()[1].sprite = eyeOpenRed.GetComponent().sprite;
}
}
+ public static void OnTimeForcefullyPassingChanged(bool isForcefullyPassing, string reason, TimePassageMode mode)
+ {
+ if (!isForcefullyPassing)
+ {
+ if (loss != 0)
+ {
+ ConfigManager.INSTANCE.SleepingOnLand = false;
+ GameManager.Instance.UI.ShowMoneyNotification("notification.funds-removed", loss);
+ loss = 0;
+ }
+ GameEvents.Instance.OnTimeForcefullyPassingChanged -= OnTimeForcefullyPassingChanged;
+ }
+ }
+
[HarmonyPostfix]
[HarmonyPatch(typeof(BoatActionsDestinationUI), "OnDestroy")]
public static void OnDestroy_Postfix()
diff --git a/BeyondAbyss/Properties/AssemblyInfo.cs b/BeyondAbyss/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8c19a85..0000000
--- a/BeyondAbyss/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Allgemeine Informationen über eine Assembly werden über die folgenden
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die einer Assembly zugeordnet sind.
-[assembly: AssemblyTitle("BeyondAbyss")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("BeyondAbyss")]
-[assembly: AssemblyCopyright("Copyright © 2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf FALSE werden die Typen in dieser Assembly
-// für COM-Komponenten unsichtbar. Wenn Sie auf einen Typ in dieser Assembly von
-// COM aus zugreifen müssen, sollten Sie das ComVisible-Attribut für diesen Typ auf "True" festlegen.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("cb46245f-3769-4e74-8f99-b6bbe8668a23")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-// Hauptversion
-// Nebenversion
-// Buildnummer
-// Revision
-//
-// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
-// indem Sie "*" wie unten gezeigt eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/BeyondAbyss/app.config b/BeyondAbyss/app.config
deleted file mode 100644
index ea15c1b..0000000
--- a/BeyondAbyss/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/BeyondAbyss/mod_meta.json b/BeyondAbyss/mod_meta.json
index 92d2b32..0f00c1b 100644
--- a/BeyondAbyss/mod_meta.json
+++ b/BeyondAbyss/mod_meta.json
@@ -1,8 +1,10 @@
{
+ "Name": "Beyond Abyss",
"Author": "sp00ktober",
+ "ModGUID": "sp00ktober.BeyondAbyss",
"ModAssembly": "BeyondAbyss.dll",
"Entrypoint": "BeyondAbyss.BeyondAbyss/Init",
- "Version": "0.2.0",
- "MinWinchVersion": "alpha-1.3",
+ "Version": "0.3.0",
+ "MinWinchVersion": "alpha-1.4",
"DefaultConfig": {}
}
\ No newline at end of file
diff --git a/BeyondAbyss/packages.config b/BeyondAbyss/packages.config
deleted file mode 100644
index 31e4e87..0000000
--- a/BeyondAbyss/packages.config
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Readme.md b/README.md
similarity index 100%
rename from Readme.md
rename to README.md
diff --git a/Winch b/Winch
deleted file mode 160000
index e5f29d0..0000000
--- a/Winch
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e5f29d011654ab1291634904ebbdf5987855117f