Skip to content

Update for Stardew Valley 1.3.32 and SMAPI 3.0, minor changes #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
Pathoschild wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update for Stardew Valley 1.3.32 and SMAPI 3.0, minor changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc35417
migrate to new NuGet package reference format
Pathoschild Nov 23, 2018
941d53d
update mod build config package
Pathoschild Nov 23, 2018
dad8492
use enum for animal types
Pathoschild Nov 23, 2018
934f06a
update for SMAPI 3.0
Pathoschild Jan 13, 2019
ce96558
standardise manifest name
Pathoschild Jan 13, 2019
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
14 changes: 14 additions & 0 deletions AnimalChooser/Animal.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace AnimalChooser
{
internal enum Animal
{
None = 0,
Chicken,
Cow,
Pig,
Goat,
Sheep,
Rabbit,
Duck
}
}
19 changes: 4 additions & 15 deletions AnimalChooser/AnimalChooser.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<AssemblyName>AnimalChooser</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -49,6 +47,9 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -60,16 +61,11 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Animal.cs" />
<Compile Include="ModConfig.cs" />
<Compile Include="ModEntry.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180630\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
</ItemGroup>
<ItemGroup>
<None Include="manifest.json" />
</ItemGroup>
Expand Down Expand Up @@ -115,11 +111,4 @@
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180630\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180630\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-20180630\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.1.0-beta-20180630\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>
121 changes: 61 additions & 60 deletions AnimalChooser/ModEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,10 @@ namespace AnimalChooser
public class ModEntry : Mod {

private ModConfig Config;
private const int CHICKEN = 0;
private const int COW = 1;
private const int PIG = 2;
private const int GOAT = 3;
private const int SHEEP = 4;
private const int RABBIT = 5;
private const int DUCK = 6;





private bool choosingAnimal = false;
private bool drawAnimal = false;
private int currentAnimalType = -1;
private Animal currentAnimal = Animal.None;
private int heartLevel = 0;
private int chickenIndex = 0;
private int cowIndex = 0;
Expand Down Expand Up @@ -88,22 +77,25 @@ public override void Entry(IModHelper helper) {

animalData = Game1.content.Load<Dictionary<string, string>>("Data\\FarmAnimals");

InputEvents.ButtonPressed += InputEvents_ButtonPressed;
ControlEvents.MouseChanged += ControlEvents_MouseChanged;
MenuEvents.MenuChanged += MenuEvents_MenuChanged;
GraphicsEvents.OnPostRenderEvent += GraphicsEvents_OnPostRenderEvent;
GameEvents.OneSecondTick += GameEvents_OneSecondTick;
helper.Events.Input.ButtonPressed += OnButtonPressed;
helper.Events.Input.MouseWheelScrolled += OnMouseWheelScrolled;
helper.Events.Display.MenuChanged += OnMenuChanged;
helper.Events.Display.Rendered += OnRendered;
helper.Events.GameLoop.OneSecondUpdateTicked += OnOneSecondUpdateTicked;
}

private void ControlEvents_MouseChanged(object sender, EventArgsMouseStateChanged e) {
/// <summary>Raised after the player scrolls the mouse wheel.</summary>
/// <param name="sender">The event sender.</param>
/// <param name="e">The event arguments.</param>
private void OnMouseWheelScrolled(object sender, MouseWheelScrolledEventArgs e) {

if (!drawAnimal) {
return;
}

if (e.NewState.ScrollWheelValue < e.PriorState.ScrollWheelValue && heartLevel > 0) {
if (e.Delta < 0 && heartLevel > 0) {
heartLevel -= 1;
} else if (e.NewState.ScrollWheelValue > e.PriorState.ScrollWheelValue && heartLevel < 5) {
} else if (e.Delta > 0 && heartLevel < 5) {
heartLevel += 1;
} else {
return;
Expand All @@ -112,7 +104,10 @@ private void ControlEvents_MouseChanged(object sender, EventArgsMouseStateChange
Game1.playSound("smallSelect");
}

private void GameEvents_OneSecondTick(object sender, EventArgs e) {
/// <summary>Raised once per second after the game state is updated.</summary>
/// <param name="sender">The event sender.</param>
/// <param name="e">The event arguments.</param>
private void OnOneSecondUpdateTicked(object sender, OneSecondUpdateTickedEventArgs e) {

if (!choosingAnimal) {
return;
Expand All @@ -123,9 +118,9 @@ private void GameEvents_OneSecondTick(object sender, EventArgs e) {
FarmAnimal animal = Helper.Reflection.GetField<FarmAnimal>(Game1.activeClickableMenu, "animalBeingPurchased").GetValue();

if (animal != null) {
if (currentAnimalType == CHICKEN) {
if (currentAnimal == Animal.Chicken) {
animal.type.Value = chickens[chickenIndex];
} else if (currentAnimalType == COW) {
} else if (currentAnimal == Animal.Cow) {
animal.type.Value = cows[cowIndex];
}
}
Expand All @@ -134,7 +129,10 @@ private void GameEvents_OneSecondTick(object sender, EventArgs e) {
drawAnimal = true;
}

private void GraphicsEvents_OnPostRenderEvent(object sender, EventArgs e) {
/// <summary>Raised after the game draws to the sprite patch in a draw tick, just before the final sprite batch is rendered to the screen.</summary>
/// <param name="sender">The event sender.</param>
/// <param name="e">The event arguments.</param>
private void OnRendered(object sender, RenderedEventArgs e) {

if (!choosingAnimal) {
return;
Expand All @@ -148,17 +146,17 @@ private void GraphicsEvents_OnPostRenderEvent(object sender, EventArgs e) {
int dx;
int w = 64;
int h = 64;
switch (currentAnimalType) {
case CHICKEN:
case DUCK:
case RABBIT:
switch (currentAnimal) {
case Animal.Chicken:
case Animal.Duck:
case Animal.Rabbit:
dx = 24;
dy += 24;
break;
case COW:
case GOAT:
case PIG:
case SHEEP:
case Animal.Cow:
case Animal.Goat:
case Animal.Pig:
case Animal.Sheep:
dx = 64;
dy += 88;
w = 128;
Expand All @@ -171,14 +169,14 @@ private void GraphicsEvents_OnPostRenderEvent(object sender, EventArgs e) {
int mx = Game1.getMouseX();
int my = Game1.getMouseY();
Texture2D texture = chickenTextures[0];
switch (currentAnimalType) {
case CHICKEN: texture = chickenTextures[chickenIndex]; break;
case COW: texture = cowTextures[cowIndex]; break;
case DUCK: texture = duckTextures[0]; break;
case RABBIT: texture = rabbitTextures[0]; break;
case GOAT: texture = goatTextures[0]; break;
case PIG: texture = pigTextures[0]; break;
case SHEEP: texture = sheepTextures[0]; break;
switch (currentAnimal) {
case Animal.Chicken: texture = chickenTextures[chickenIndex]; break;
case Animal.Cow: texture = cowTextures[cowIndex]; break;
case Animal.Duck: texture = duckTextures[0]; break;
case Animal.Rabbit: texture = rabbitTextures[0]; break;
case Animal.Goat: texture = goatTextures[0]; break;
case Animal.Pig: texture = pigTextures[0]; break;
case Animal.Sheep: texture = sheepTextures[0]; break;
}

Game1.spriteBatch.Draw(texture, new Rectangle(mx - dx, my - 64 - dy, w, h), Color.White);
Expand All @@ -190,7 +188,10 @@ private void GraphicsEvents_OnPostRenderEvent(object sender, EventArgs e) {
}
}

private void InputEvents_ButtonPressed(object sender, EventArgsInput e) {
/// <summary>Raised after the player presses a button on the keyboard, controller, or mouse.</summary>
/// <param name="sender">The event sender.</param>
/// <param name="e">The event arguments.</param>
private void OnButtonPressed(object sender, ButtonPressedEventArgs e) {

if (e.Button == SButton.Escape || e.Button == SButton.E) {
choosingAnimal = false;
Expand Down Expand Up @@ -222,21 +223,21 @@ private void InputEvents_ButtonPressed(object sender, EventArgsInput e) {
if (type != null) {
choosingAnimal = true;
if (type.Contains("Chicken")) {
currentAnimalType = CHICKEN;
currentAnimal = Animal.Chicken;
} else if (type.Contains("Cow")) {
currentAnimalType = COW;
currentAnimal = Animal.Cow;
} else if (type.Contains("Pig")) {
currentAnimalType = PIG;
currentAnimal = Animal.Pig;
} else if (type.Contains("Goat")) {
currentAnimalType = GOAT;
currentAnimal = Animal.Goat;
} else if (type.Contains("Sheep")) {
currentAnimalType = SHEEP;
currentAnimal = Animal.Sheep;
} else if (type.Contains("Rabbit")) {
currentAnimalType = RABBIT;
currentAnimal = Animal.Rabbit;
} else if (type.Contains("Duck")) {
currentAnimalType = DUCK;
currentAnimal = Animal.Duck;
} else {
currentAnimalType = -1;
currentAnimal = Animal.None;
choosingAnimal = false;
}
break;
Expand All @@ -246,7 +247,7 @@ private void InputEvents_ButtonPressed(object sender, EventArgsInput e) {
}
}

if (currentAnimalType < 0) {
if (currentAnimal == Animal.None) {
return;
}

Expand All @@ -261,20 +262,20 @@ private void InputEvents_ButtonPressed(object sender, EventArgsInput e) {
}

if (leftOrRight) {
switch (currentAnimalType) {
case CHICKEN:
switch (currentAnimal) {
case Animal.Chicken:
chickenIndex = (delta + chickenIndex + chickens.Count) % chickens.Count;
while (!IsChickenTypeUnlocked(chickenIndex)) {
chickenIndex = (delta + chickenIndex + chickens.Count) % chickens.Count;
}
break;
case COW:
case Animal.Cow:
cowIndex = (delta + cowIndex + cows.Count) % cows.Count;
break;
}

if (currentAnimalType == CHICKEN || currentAnimalType == COW) {
animal.displayType = (currentAnimalType == CHICKEN) ? chickens[chickenIndex] : cows[cowIndex];
if (currentAnimal == Animal.Chicken || currentAnimal == Animal.Cow) {
animal.displayType = (currentAnimal == Animal.Chicken) ? chickens[chickenIndex] : cows[cowIndex];
}
}
}
Expand All @@ -293,9 +294,12 @@ private bool IsChickenTypeUnlocked(int type) {
}
}

private void MenuEvents_MenuChanged(object sender, EventArgsClickableMenuChanged e) {
/// <summary>Raised after a game menu is opened, closed, or replaced.</summary>
/// <param name="sender">The event sender.</param>
/// <param name="e">The event arguments.</param>
private void OnMenuChanged(object sender, MenuChangedEventArgs e) {

if (e.PriorMenu is PurchaseAnimalsMenu menu2) {
if (e.OldMenu is PurchaseAnimalsMenu menu2) {
FarmAnimal animal = Helper.Reflection.GetField<FarmAnimal>(menu2, "animalBeingPurchased").GetValue();
if (animal != null) {

Expand Down Expand Up @@ -341,9 +345,6 @@ private void MenuEvents_MenuChanged(object sender, EventArgsClickableMenuChanged
} else {
Monitor.Log($"data is null - key: {key}", LogLevel.Info);
}



}
}
choosingAnimal = false;
Expand Down
4 changes: 2 additions & 2 deletions AnimalChooser/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"Name": "AnimalChooser",
"Name": "Animal Chooser",
"Author": "stokastic",
"Version": "1.3",
"Description": "Allows manual selection of animal colour for cows and chickens",
"UniqueID": "stokastic.AnimalChooser",
"EntryDll": "AnimalChooser.dll",
"MinimumApiVersion": "2.7",
"MinimumApiVersion": "2.10.1",
"UpdateKeys": [ "Nexus:2573" ]
}
4 changes: 0 additions & 4 deletions AnimalChooser/packages.config
View file
Open in desktop

This file was deleted.