Merge pull request #56 from janavarro95/PyTKOverhaul
Merged all pytk overhaul branch with development branch. Getting ready for merging all to master branch.
Joshua Navarro
GitHub
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"Name": "Advanced Save Backup",
|
||||
"Author": "Alpha_Omegasis",
|
||||
"Version": "1.7.0",
|
||||
"Version": "1.7.1",
|
||||
"Description": "Backs up your save files when loading SMAPI and every in game night when saving.",
|
||||
"UniqueID": "Omegasis.AdvancedSaveBackup",
|
||||
"EntryDll": "AdvancedSaveBackup.dll",
|
||||
"MinimumApiVersion": "2.10.1",
|
||||
"MinimumApiVersion": "3.0.0",
|
||||
"UpdateKeys": [ "Nexus:435" ]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,5 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Omegasis.AutoSpeed.Framework;
|
||||
using StardewModdingAPI;
|
||||
using StardewModdingAPI.Events;
|
||||
|
|
@ -8,12 +10,24 @@ namespace Omegasis.AutoSpeed
|
|||
/// <summary>The mod entry point.</summary>
|
||||
public class AutoSpeed : Mod
|
||||
{
|
||||
/*********
|
||||
**Static Fields
|
||||
*********/
|
||||
/// <summary>
|
||||
/// All of the speed that is added together for auto speed. This is used for mod authors to hook in their speed boosts before auto speed applies the default speed boost.
|
||||
/// </summary>
|
||||
public Dictionary<string, int> combinedAddedSpeed;
|
||||
|
||||
/*********
|
||||
** Fields
|
||||
*********/
|
||||
/// <summary>The mod configuration.</summary>
|
||||
private ModConfig Config;
|
||||
|
||||
/// <summary>
|
||||
/// A static reference to expose public fields.
|
||||
/// </summary>
|
||||
public static AutoSpeed Instance;
|
||||
|
||||
/*********
|
||||
** Public methods
|
||||
|
|
@ -24,6 +38,17 @@ namespace Omegasis.AutoSpeed
|
|||
{
|
||||
helper.Events.GameLoop.UpdateTicked += this.OnUpdateTicked;
|
||||
this.Config = helper.ReadConfig<ModConfig>();
|
||||
this.combinedAddedSpeed = new Dictionary<string, int>();
|
||||
Instance = this;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Returns a copy of the mods' api.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public override object GetApi()
|
||||
{
|
||||
return new AutoSpeedAPI();
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -36,7 +61,10 @@ namespace Omegasis.AutoSpeed
|
|||
private void OnUpdateTicked(object sender, UpdateTickedEventArgs e)
|
||||
{
|
||||
if (Context.IsPlayerFree)
|
||||
Game1.player.addedSpeed = this.Config.Speed;
|
||||
{
|
||||
int addedSpeed = this.combinedAddedSpeed.Values.Sum();
|
||||
Game1.player.addedSpeed = this.Config.Speed+addedSpeed;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
@ -77,6 +77,8 @@
|
|||
<Link>Properties\GlobalAssemblyInfo.cs</Link>
|
||||
</Compile>
|
||||
<Compile Include="AutoSpeed.cs" />
|
||||
<Compile Include="Framework\AutoSpeedAPI.cs" />
|
||||
<Compile Include="Framework\IAutoSpeedAPI.cs" />
|
||||
<Compile Include="Framework\ModConfig.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Omegasis.AutoSpeed.Framework
|
||||
{
|
||||
/// <summary>
|
||||
/// API for auto speed to hook into the Game1.player.addedSpeed function.
|
||||
/// </summary>
|
||||
public class AutoSpeedAPI
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Allows adding a speed for Auto Speed to take acount for when calculating Game1.player.addedSpeed; Will fail if a unique key has already been added.
|
||||
/// </summary>
|
||||
/// <param name="ID"></param>
|
||||
/// <param name="Amount"></param>
|
||||
public void addSpeedBoost(string ID, int Amount)
|
||||
{
|
||||
AutoSpeed.Instance.combinedAddedSpeed.Add(ID, Amount);
|
||||
}
|
||||
/// <summary>
|
||||
/// Removes an added speed boost by passing in the unique key.
|
||||
/// </summary>
|
||||
/// <param name="ID"></param>
|
||||
/// <param name="Amount"></param>
|
||||
public void remvoveSpeedBoost(string ID, int Amount)
|
||||
{
|
||||
AutoSpeed.Instance.combinedAddedSpeed.Remove(ID);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Omegasis.AutoSpeed.Framework
|
||||
{
|
||||
/// <summary>
|
||||
/// Interface used to interface AutoSpeed's API class.
|
||||
/// </summary>
|
||||
public interface IAutoSpeedAPI
|
||||
{
|
||||
void addSpeedBoost(string ID, int Amount);
|
||||
/// <summary>
|
||||
/// Removes an added speed boost by passing in the unique key.
|
||||
/// </summary>
|
||||
/// <param name="ID"></param>
|
||||
/// <param name="Amount"></param>
|
||||
void remvoveSpeedBoost(string ID, int Amount);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
"Name": "Auto Speed",
|
||||
"Author": "Alpha_Omegasis",
|
||||
"Version": "1.8.0",
|
||||
"Version": "1.9.0",
|
||||
"Description": "Got to go fast!",
|
||||
"UniqueID": "Omegasis.AutoSpeed",
|
||||
"EntryDll": "AutoSpeed.dll",
|
||||
"MinimumApiVersion": "2.10.1",
|
||||
"MinimumApiVersion": "3.0.0",
|
||||
"UpdateKeys": [ "Nexus:443" ]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -50,15 +50,12 @@
|
|||
<None Include="manifest.json" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
|
||||
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.3.0.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.0.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.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.0.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.3.0.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<packages>
|
||||
<package id="Pathoschild.Stardew.ModBuildConfig" version="2.2.0" targetFramework="net461" />
|
||||
<package id="Pathoschild.Stardew.ModBuildConfig" version="3.0.0" targetFramework="net461" />
|
||||
</packages>
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
|
||||
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="System" />
|
||||
|
|
|
|||
|
After Width: | Height: | Size: 614 B |
|
After Width: | Height: | Size: 199 B |
|
After Width: | Height: | Size: 259 B |
|
After Width: | Height: | Size: 254 B |
|
After Width: | Height: | Size: 236 B |
|
After Width: | Height: | Size: 244 B |
|
After Width: | Height: | Size: 270 B |
|
After Width: | Height: | Size: 243 B |
|
After Width: | Height: | Size: 263 B |
|
After Width: | Height: | Size: 237 B |
|
After Width: | Height: | Size: 235 B |
|
After Width: | Height: | Size: 233 B |
|
After Width: | Height: | Size: 260 B |
|
After Width: | Height: | Size: 273 B |
|
After Width: | Height: | Size: 932 B |
|
After Width: | Height: | Size: 278 B |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 311 B |
|
After Width: | Height: | Size: 837 B |
|
After Width: | Height: | Size: 362 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 792 B |
|
After Width: | Height: | Size: 295 B |
|
After Width: | Height: | Size: 993 B |
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 908 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 280 B |
|
After Width: | Height: | Size: 973 B |
|
After Width: | Height: | Size: 307 B |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 328 B |
|
After Width: | Height: | Size: 865 B |
|
After Width: | Height: | Size: 374 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 254 B |
|
After Width: | Height: | Size: 603 B |
|
After Width: | Height: | Size: 369 B |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 301 B |
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 306 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 330 B |
|
After Width: | Height: | Size: 915 B |
|
After Width: | Height: | Size: 413 B |
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 621 B |
|
After Width: | Height: | Size: 244 B |
|
After Width: | Height: | Size: 175 B |
|
After Width: | Height: | Size: 140 B |
|
After Width: | Height: | Size: 353 B |
|
After Width: | Height: | Size: 180 B |
|
After Width: | Height: | Size: 127 B |
|
After Width: | Height: | Size: 173 B |
|
After Width: | Height: | Size: 590 B |
|
After Width: | Height: | Size: 349 B |
|
After Width: | Height: | Size: 255 B |
|
After Width: | Height: | Size: 248 B |
|
After Width: | Height: | Size: 917 B |
|
After Width: | Height: | Size: 558 B |
|
After Width: | Height: | Size: 743 B |
|
After Width: | Height: | Size: 563 B |
|
After Width: | Height: | Size: 718 B |
|
After Width: | Height: | Size: 353 B |
|
After Width: | Height: | Size: 335 B |
|
After Width: | Height: | Size: 616 B |
|
After Width: | Height: | Size: 490 B |
|
After Width: | Height: | Size: 437 B |
|
After Width: | Height: | Size: 845 B |
|
After Width: | Height: | Size: 231 B |
|
After Width: | Height: | Size: 588 B |
|
After Width: | Height: | Size: 321 B |
|
After Width: | Height: | Size: 291 B |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 648 B |
|
After Width: | Height: | Size: 317 B |