Skip to content

fix crops that drop more than one item #1

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
huancz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix crops that drop more than one item #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2212c3b
bump ModBuildConfig to current version
huancz Aug 8, 2018
77f6813
rewrite GetHarvest() function to more closely match game version
huancz Aug 8, 2018
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
9 changes: 3 additions & 6 deletions DeluxeGrabber/DeluxeGrabber.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,12 @@
<None Include="manifest.json" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180625\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180625\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180625\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180625\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180625\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>
</Project>
140 changes: 88 additions & 52 deletions DeluxeGrabber/ModEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
using Microsoft.Xna.Framework;
using Netcode;
using StardewModdingAPI;
using StardewModdingAPI.Events;
using StardewValley;
using StardewValley.Buildings;
using StardewValley.Objects;
using StardewValley.TerrainFeatures;
using System;
using System.Collections.Generic;
using Object = StardewValley.Object;

namespace DeluxeGrabber
{
Expand Down Expand Up @@ -223,25 +226,16 @@ private void AutograbCrops() {
continue;
}
bool full = (grabber.heldObject.Value as Chest).items.Count >= 36;
for (int x = (int)pair.Key.X - range; x < pair.Key.X + range + 1; x ++) {
for (int x = (int)pair.Key.X - range; x < pair.Key.X + range + 1 && !full; x ++) {
for (int y = (int)pair.Key.Y - range; y < pair.Key.Y + range + 1 && !full; y++) {
Vector2 tile = new Vector2(x, y);
if (location.terrainFeatures.ContainsKey(tile) && location.terrainFeatures[tile] is HoeDirt dirt) {
Object harvest = GetHarvest(dirt, tile, location);
if (harvest != null) {
(grabber.heldObject.Value as Chest).addItem(harvest);
if (Config.DoGainExperience) {
gainExperience(FORAGING, 3);
}
}
} else if (location.Objects.ContainsKey(tile) && location.Objects[tile] is IndoorPot pot) {
Object harvest = GetHarvest(pot.hoeDirt.Value, tile, location);
if (harvest != null) {
(grabber.heldObject.Value as Chest).addItem(harvest);
if (Config.DoGainExperience) {
gainExperience(FORAGING, 3);
}
}
if (location.terrainFeatures.ContainsKey(tile) && location.terrainFeatures[tile] is HoeDirt dirt)
{
HarvestIntoGrabber(dirt, tile, location, grabber.heldObject.Value as Chest);
}
else if (location.Objects.ContainsKey(tile) && location.Objects[tile] is IndoorPot pot)
{
HarvestIntoGrabber(pot.hoeDirt.Value, tile, location, grabber.heldObject.Value as Chest);
}
full = (grabber.heldObject.Value as Chest).items.Count >= 36;
}
Expand All @@ -254,81 +248,123 @@ private void AutograbCrops() {
}
}

private Object GetHarvest(HoeDirt dirt, Vector2 tile, GameLocation location) {

private void HarvestIntoGrabber(HoeDirt dirt, Vector2 tile, GameLocation location, Chest grabberContents)
{
Crop crop = dirt.crop;
Object harvest;
int stack = 0;

if (crop is null) {
return null;
if (crop is null || crop.dead || crop.forageCrop) {
return;
}

if (!Config.DoHarvestFlowers) {
switch(crop.indexOfHarvest.Value) {
case 421: return null; // sunflower
case 593: return null; // summer spangle
case 595: return null; // fairy rose
case 591: return null; // tulip
case 597: return null; // blue jazz
case 376: return null; // poppy
case 421: return; // sunflower
case 593: return; // summer spangle
case 595: return; // fairy rose
case 591: return; // tulip
case 597: return; // blue jazz
case 376: return; // poppy
}
}

if (crop != null && crop.currentPhase.Value >= crop.phaseDays.Count - 1 && (!crop.fullyGrown.Value || crop.dayOfCurrentPhase.Value <= 0)) {
int num1 = 1;
int num2 = 0;
int num3 = 0;
if (crop.currentPhase.Value >= crop.phaseDays.Count - 1 && (!crop.fullyGrown.Value || crop.dayOfCurrentPhase.Value <= 0)) {
int harvest_amount = 1; // num1
int quality = 0; // num2
int fertilizer_quality_boost = 0; // num3
if (crop.indexOfHarvest.Value == 0)
return null;
{
return;
}
System.Random random = new System.Random((int)tile.X * 7 + (int)tile.Y * 11 + (int)Game1.stats.DaysPlayed + (int)Game1.uniqueIDForThisGame);
switch ((dirt.fertilizer.Value)) {
case 368:
num3 = 1;
fertilizer_quality_boost = 1;
break;
case 369:
num3 = 2;
fertilizer_quality_boost = 2;
break;
}
double num4 = 0.2 * (Game1.player.FarmingLevel / 10.0) + 0.2 * num3 * ((Game1.player.FarmingLevel + 2.0) / 12.0) + 0.01;
double num5 = System.Math.Min(0.75, num4 * 2.0);
if (random.NextDouble() < num4)
num2 = 2;
else if (random.NextDouble() < num5)
num2 = 1;
// num4
double gold_chance = 0.2 * (Game1.player.FarmingLevel / 10.0) + 0.2 * fertilizer_quality_boost * ((Game1.player.FarmingLevel + 2.0) / 12.0) + 0.01;
// num5
double silver_chance = System.Math.Min(0.75, gold_chance * 2.0);
if (random.NextDouble() < gold_chance)
quality = 2;
else if (random.NextDouble() < silver_chance)
quality = 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));
{
harvest_amount = random.Next(
crop.minHarvest.Value,
System.Math.Min(
crop.minHarvest.Value + 1,
crop.maxHarvest.Value + 1 + Game1.player.FarmingLevel / crop.maxHarvestIncreasePerFarmingLevel.Value));
}
if (crop.chanceForExtraCrops.Value > 0.0) {
while (random.NextDouble() < System.Math.Min(0.9, crop.chanceForExtraCrops.Value))
++num1;
++harvest_amount;
}
if (crop.harvestMethod.Value == 1) {
for (int i = 0; i < num1; i++) {
stack += 1;
// harvest with scythe
for (int i = 0; i < harvest_amount; i++) {
harvest = new Object(parentSheetIndex: crop.indexOfHarvest, initialStack: 1, quality: quality);
grabberContents.addItem(harvest);
}
if (Config.DoGainExperience)
{
float num6 = (float)(16.0 * Math.Log(0.018 * (double)Convert.ToInt32(Game1.objectInformation[(int)((NetFieldBase<int, NetInt>)crop.indexOfHarvest)].Split('/')[1]) + 1.0, Math.E));
Game1.player.gainExperience(0, (int)Math.Round((double)num6));
}
if (crop.regrowAfterHarvest.Value != -1) {
crop.dayOfCurrentPhase.Value = crop.regrowAfterHarvest.Value;
crop.fullyGrown.Value = true;
} else {
dirt.crop = null;
}
return new Object(crop.indexOfHarvest.Value, stack, false, -1, num2);
} else {
if (!crop.programColored.Value) {
harvest = new Object(crop.indexOfHarvest.Value, 1, false, -1, num2);
} else {
harvest = new ColoredObject(crop.indexOfHarvest.Value, 1, crop.tintColor.Value) { Quality = num2 };
if (!crop.programColored.Value)
{
// not a flower
harvest = new Object(crop.indexOfHarvest.Value, 1, false, -1, quality);
grabberContents.addItem(harvest);
}
else
{
// is a flower
harvest = new ColoredObject(crop.indexOfHarvest.Value, 1, crop.tintColor.Value);
harvest.Quality = quality;
grabberContents.addItem(harvest);
}
if (random.NextDouble() < (double)Game1.player.LuckLevel / 1500.0 + Game1.dailyLuck / 1200.0 + 9.99999974737875E-05)
{
harvest_amount *= 2;
}
if ((int)((NetFieldBase<int, NetInt>)crop.indexOfHarvest) == 421) // sunflower
{
crop.indexOfHarvest.Value = 431; // sunflower seed
harvest_amount = random.Next(1, 4);
}
for (int index = 0; index < harvest_amount - 1; ++index)
{
harvest = new Object(parentSheetIndex: crop.indexOfHarvest, initialStack: 1, quality: 0);
grabberContents.addItem(harvest);
// this may fail, we already used one slot for normal/silver/gold quality crop and now
// we are adding normal. We still do need to clear the crop, and parent won't call us again
}
if (Config.DoGainExperience)
{
float num8 = (float)(16.0 * Math.Log(0.018 * (double)Convert.ToInt32(Game1.objectInformation[(int)((NetFieldBase<int, NetInt>)crop.indexOfHarvest)].Split('/')[1]) + 1.0, Math.E));
Game1.player.gainExperience(0, (int)Math.Round((double)num8));
}
if (crop.regrowAfterHarvest.Value != -1) {
crop.dayOfCurrentPhase.Value = crop.regrowAfterHarvest.Value;
crop.fullyGrown.Value = true;
} else {
dirt.crop = null;
}
return harvest;
}
}
return null;
}

private void AutograbWorld() {
Expand Down
2 changes: 1 addition & 1 deletion DeluxeGrabber/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0-beta-20180625" targetFramework="net45" />
<package id="Pathoschild.Stardew.ModBuildConfig" version="2.1.0" targetFramework="net45" />
</packages>