Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 4 additions & 6 deletions DeluxeGrabber.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2035
# Visual Studio Version 16
VisualStudioVersion = 16.0.29509.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeluxeGrabber", "DeluxeGrabber\DeluxeGrabber.csproj", "{46A2FEC7-F9EB-4A12-A43F-92906F884961}"
EndProject
Expand All @@ -13,12 +13,10 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|Any CPU.Build.0 = Debug|Any CPU
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|Any CPU.ActiveCfg = Debug|x86
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|x86.ActiveCfg = Debug|x86
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Debug|x86.Build.0 = Debug|x86
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|Any CPU.ActiveCfg = Release|Any CPU
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|Any CPU.Build.0 = Release|Any CPU
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|Any CPU.ActiveCfg = Release|x86
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|x86.ActiveCfg = Release|x86
{46A2FEC7-F9EB-4A12-A43F-92906F884961}.Release|x86.Build.0 = Release|x86
EndGlobalSection
Expand Down
77 changes: 13 additions & 64 deletions DeluxeGrabber/DeluxeGrabber.csproj
Original file line number Diff line number Diff line change
@@ -1,73 +1,22 @@
<?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>{46A2FEC7-F9EB-4A12-A43F-92906F884961}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DeluxeGrabber</RootNamespace>
<AssemblyName>DeluxeGrabber</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</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>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<RootNamespace>DeluxeGrabber</RootNamespace>
<Version>2.5.2-unofficial.3-mizzion</Version>
<TargetFramework>net452</TargetFramework>
<Platforms>x86</Platforms>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>

<EnableHarmony>false</EnableHarmony>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<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" />
</ItemGroup>
<ItemGroup>
<Compile Include="ModAPI.cs" />
<Compile Include="ModConfig.cs" />
<Compile Include="ModEntry.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="manifest.json" />
<Folder Include="Properties\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

</Project>
2 changes: 1 addition & 1 deletion DeluxeGrabber/ModEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ private Object GetHarvest(HoeDirt dirt, Vector2 tile, GameLocation location) {
else if (random.NextDouble() < num5)
num2 = 1;
if ((crop.minHarvest.Value) > 1 || (crop.maxHarvest.Value) > 1)
num1 = random.Next(crop.minHarvest.Value, System.Math.Min(crop.minHarvest.Value + 1, crop.maxHarvest.Value + 1 + Game1.player.FarmingLevel / crop.maxHarvestIncreasePerFarmingLevel.Value));
num1 = random.Next(crop.minHarvest.Value, System.Math.Min(crop.minHarvest.Value + 1, crop.maxHarvest.Value + 1 + Game1.player.FarmingLevel / (crop.maxHarvestIncreasePerFarmingLevel.Value > 0 ? crop.maxHarvestIncreasePerFarmingLevel.Value : 1)));
if (crop.chanceForExtraCrops.Value > 0.0) {
while (random.NextDouble() < System.Math.Min(0.9, crop.chanceForExtraCrops.Value))
++num1;
Expand Down
36 changes: 0 additions & 36 deletions DeluxeGrabber/Properties/AssemblyInfo.cs

This file was deleted.

4 changes: 2 additions & 2 deletions DeluxeGrabber/manifest.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Name": "Deluxe Auto-Grabber",
"Author": "stokastic",
"Version": "2.5.1",
"Version": "2.5.2-unofficial.3-mizzion",
"Description": "Allows use of autograbber for coops, crops, and forage",
"UniqueID": "stokastic.DeluxeGrabber",
"EntryDll": "DeluxeGrabber.dll",
"MinimumApiVersion": "2.10.1",
"MinimumApiVersion": "3.0.0",
"UpdateKeys": [ "Nexus:2462" ]
}