Skip to content

Update meta for mod manager and use PackageReferences instead of submodule #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MegaPiggy wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Update meta for mod manager and use PackageReferences instead of submodule #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d71410
Delete Winch
MegaPiggy Jun 25, 2024
6c90062
update for mod manager
MegaPiggy Jun 26, 2024
8775508
Better project
MegaPiggy Jun 26, 2024
05f59a6
Move Readme.md to README.md
MegaPiggy Jul 4, 2024
ead8eb4
stop extra images from blocking button
MegaPiggy Jul 4, 2024
357b2b8
Stop notifications from accumulating each time you press the button
MegaPiggy Jul 4, 2024
38a3d12
Update for latest Winch
MegaPiggy Jul 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions BeyondAbyss.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
0 BeyondAbyss/Text/de.json → BeyondAbyss/Assets/Localization/de.json
View file
Open in desktop
File renamed without changes.
0 BeyondAbyss/Text/en.json → BeyondAbyss/Assets/Localization/en.json
View file
Open in desktop
File renamed without changes.
14 changes: 1 addition & 13 deletions BeyondAbyss/BeyondAbyss.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
170 changes: 31 additions & 139 deletions BeyondAbyss/BeyondAbyss.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,146 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{CB46245F-3769-4E74-8F99-B6BBE8668A23}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BeyondAbyss</RootNamespace>
<AssemblyName>BeyondAbyss</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFramework>net48</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
<LangVersion>11</LangVersion>
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>

<PropertyGroup>
<DebugType>portable</DebugType>
<OutputPath>./bin</OutputPath>
<AssemblyVersion>1.0.*</AssemblyVersion>
<Deterministic>False</Deterministic>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<Reference Include="0Harmony, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Lib.Harmony.2.3.0-alpha.5\lib\net48\0Harmony.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="Cinemachine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Cinemachine.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Mdb, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Pdb, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Rocks, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="MonoMod.Backports, Version=23.3.22.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoModReorg.Backports.23.3.22.1\lib\net452\MonoMod.Backports.dll</HintPath>
</Reference>
<Reference Include="MonoMod.Core, Version=23.3.22.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoModReorg.Core.23.3.22.1\lib\net452\MonoMod.Core.dll</HintPath>
</Reference>
<Reference Include="MonoMod.Iced, Version=1.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoModReorg.Core.23.3.22.1\lib\net452\MonoMod.Iced.dll</HintPath>
</Reference>
<Reference Include="MonoMod.ILHelpers, Version=23.3.22.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoModReorg.ILHelpers.23.3.22.1\lib\net452\MonoMod.ILHelpers.dll</HintPath>
</Reference>
<Reference Include="MonoMod.RuntimeDetour, Version=22.7.31.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoMod.RuntimeDetour.22.7.31.1\lib\net452\MonoMod.RuntimeDetour.dll</HintPath>
</Reference>
<Reference Include="MonoMod.Utils, Version=22.7.31.1, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MonoMod.Utils.22.7.31.1\lib\net452\MonoMod.Utils.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Sirenix.Serialization, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Sirenix.Serialization.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Unity.Addressables, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Unity.Addressables.dll</HintPath>
</Reference>
<Reference Include="Unity.Localization, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Unity.Localization.dll</HintPath>
</Reference>
<Reference Include="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\Unity.ResourceManager.dll</HintPath>
</Reference>
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.AnimationModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\GOG Games\DREDGE\DREDGE_Data\Managed\UnityEngine.UI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BeyondAbyss.cs" />
<Compile Include="Helper\Transpiler.cs" />
<Compile Include="Patches\Dynamic\BoatActionsDestinationUI_Patch.cs" />
<Compile Include="Patches\Dynamic\HarvestMinigameView_Patch.cs" />
<Compile Include="Patches\Dynamic\PlayerSanity_Patch.cs" />
<Compile Include="Patches\Transpiler\HarvestMinigameView_Transpiler.cs" />
<Compile Include="Patches\Transpiler\TimeController_Transpiler.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Singletons\ConfigManager.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="mod_meta.json" />
<None Include="packages.config" />
<None Include="Text\de.json" />
<None Include="Text\en.json" />
<PackageReference Include="DredgeGameLibs" Version="1.4.2" />
<PackageReference Include="HarmonyX" Version="2.10.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Winch" Version="0.4.0" />
</ItemGroup>
<ItemGroup />

<ItemGroup>
<ProjectReference Include="..\Winch\Winch\Winch.csproj">
<Project>{38f8694d-178e-4ab0-b0f8-f2d19c81c021}</Project>
<Name>Winch</Name>
</ProjectReference>
<None Update="mod_meta.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Assets\**\*.*">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Config\**\*.*">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

</Project>
23 changes: 23 additions & 0 deletions BeyondAbyss/Config/Dredging_Minigame/Dredging_1_-_Very_Easy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
23 changes: 23 additions & 0 deletions BeyondAbyss/Config/Dredging_Minigame/Dredging_2_-_Easy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
23 changes: 23 additions & 0 deletions BeyondAbyss/Config/Dredging_Minigame/Dredging_3_-_Medium.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
23 changes: 23 additions & 0 deletions BeyondAbyss/Config/Dredging_Minigame/Dredging_4_-_Hard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
23 changes: 23 additions & 0 deletions BeyondAbyss/Config/Dredging_Minigame/Dredging_5_-_Very_Hard.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
Loading