Refactor the handling of date time to no longer depend on a static
Build / Build (push) Successful in 10m13s
Build / Build (push) Successful in 10m13s
This commit is contained in:
11 files changed
+53
-39
No files matched your search
@@ -42,12 +42,12 @@ public class Gen7Plugin : Plugin<Gen7PluginConfiguration>, IResourceProvider
|
||||
public override uint LoadOrder => 0;
|
||||
|
||||
/// <inheritdoc />
|
||||
public override void Register(ScriptRegistry registry)
|
||||
public override void Register(ScriptRegistry registry, PluginEnvironmentHelpers helpers)
|
||||
{
|
||||
registry.RegisterAssemblyScripts(typeof(Gen7Plugin).Assembly);
|
||||
registry.RegisterBattleStatCalculator(new Gen7BattleStatCalculator());
|
||||
registry.RegisterDamageCalculator(new Gen7DamageCalculator(Configuration));
|
||||
registry.RegisterMiscLibrary(new Gen7MiscLibrary());
|
||||
registry.RegisterMiscLibrary(new Gen7MiscLibrary(helpers.DateTimeProvider));
|
||||
registry.RegisterCaptureLibrary(new Gen7CaptureLibrary(Configuration));
|
||||
registry.RegisterExperienceGainCalculator(new Gen7ExperienceGainCalculator());
|
||||
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
using PkmnLib.Dynamic;
|
||||
using PkmnLib.Dynamic.Libraries;
|
||||
using PkmnLib.Dynamic.Plugins;
|
||||
using PkmnLib.Static.Moves;
|
||||
|
||||
namespace PkmnLib.Plugin.Gen7.Libraries.Battling;
|
||||
|
||||
public class Gen7MiscLibrary : IMiscLibrary
|
||||
public class Gen7MiscLibrary(PluginEnvironmentHelpers.DateTimeProviderDelegate dateTimeProvider) : IMiscLibrary
|
||||
{
|
||||
private readonly IMoveData _struggleData = new MoveDataImpl("struggle", new TypeIdentifier(0, "none"),
|
||||
MoveCategory.Physical, 50, 255, 255, MoveTarget.Any, 0,
|
||||
@@ -21,7 +22,7 @@ public class Gen7MiscLibrary : IMiscLibrary
|
||||
/// <inheritdoc />
|
||||
public TimeOfDay GetTimeOfDay()
|
||||
{
|
||||
var time = StaticHelpers.GetCurrentDateTime().LocalDateTime;
|
||||
var time = dateTimeProvider().LocalDateTime;
|
||||
var hour = time.Hour;
|
||||
return hour switch
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user