Update to latest pkmnlib, adds LearnedMove wrapper

PkmnLibRSharpTests/DynamicData/LearnedMoveTests.cs

@@ -0,0 +1,72 @@
+using System;
+using NUnit.Framework;
+using PkmnLibSharp.DynamicData;
+using PkmnLibSharp.StaticData;
+
+namespace PkmnLibRSharpTests.DynamicData
+{
+    public class LearnedMoveTests
+    {
+        [Test]
+        public void LearnedMoveMoveData()
+        {
+            using var moveData = new MoveData("foo", new TypeIdentifier(0), MoveCategory.Physical, 100, 20, 30,
+                MoveTarget.All, 0, null, Array.Empty<string>());
+            using var learnedMove = new LearnedMove(moveData, MoveLearnMethod.Level);
+            Assert.AreEqual("foo", learnedMove.MoveData.Name);
+        }
+        
+        [Test]
+        public void LearnedMoveMaxPP()
+        {
+            using var moveData = new MoveData("foo", new TypeIdentifier(0), MoveCategory.Physical, 100, 20, 30,
+                MoveTarget.All, 0, null, Array.Empty<string>());
+            using var learnedMove = new LearnedMove(moveData, MoveLearnMethod.Level);
+            Assert.AreEqual(30, learnedMove.MaxPP);
+        }
+
+        [Test]
+        public void LearnedMoveRemainingPP()
+        {
+            using var moveData = new MoveData("foo", new TypeIdentifier(0), MoveCategory.Physical, 100, 20, 30,
+                MoveTarget.All, 0, null, Array.Empty<string>());
+            using var learnedMove = new LearnedMove(moveData, MoveLearnMethod.Level);
+            Assert.IsTrue(learnedMove.TryUse(1));
+            Assert.AreEqual(29, learnedMove.RemainingPP);
+        }
+
+        [Test]
+        public void LearnedMoveLearnMethod()
+        {
+            using var moveData = new MoveData("foo", new TypeIdentifier(0), MoveCategory.Physical, 100, 20, 30,
+                MoveTarget.All, 0, null, Array.Empty<string>());
+            using var learnedMove = new LearnedMove(moveData, MoveLearnMethod.Level);
+            Assert.AreEqual(MoveLearnMethod.Level, learnedMove.LearnMethod);
+        }
+
+        [Test]
+        public void LearnedMoveRestoreAllUses()
+        {
+            using var moveData = new MoveData("foo", new TypeIdentifier(0), MoveCategory.Physical, 100, 20, 30,
+                MoveTarget.All, 0, null, Array.Empty<string>());
+            using var learnedMove = new LearnedMove(moveData, MoveLearnMethod.Level);
+            Assert.IsTrue(learnedMove.TryUse(15));
+            Assert.AreEqual(15, learnedMove.RemainingPP);
+            learnedMove.RestoreAllUses();
+            Assert.AreEqual(30, learnedMove.RemainingPP);
+        }
+
+        [Test]
+        public void LearnedMoveRestoreUses()
+        {
+            using var moveData = new MoveData("foo", new TypeIdentifier(0), MoveCategory.Physical, 100, 20, 30,
+                MoveTarget.All, 0, null, Array.Empty<string>());
+            using var learnedMove = new LearnedMove(moveData, MoveLearnMethod.Level);
+            Assert.IsTrue(learnedMove.TryUse(15));
+            Assert.AreEqual(15, learnedMove.RemainingPP);
+            learnedMove.RestoreUses(5);
+            Assert.AreEqual(20, learnedMove.RemainingPP);
+        }
+
+    }
+}

PkmnLibRSharpTests/PkmnLibRSharpTests.csproj

@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>
+
+        <LangVersion>11</LangVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">

PkmnLibRSharpTests/StaticData/AbilityTests.cs

@@ -25,14 +25,14 @@ namespace PkmnLibRSharpTests.StaticData
         {
             using var ability = new Ability("", "",
                 new EffectParameter[] { new(100), new(false), new("foobar"), new(true) });
-            Assert.AreEqual(4, ability.ParameterLength);
-            using var p1 = ability.GetParameter(0);
+            Assert.AreEqual(4, ability.Parameters.Count);
+            var p1 = ability.Parameters[0];
             Assert.AreEqual(100, p1.Data);
-            using var p2 = ability.GetParameter(1);
+            var p2 = ability.Parameters[1];
             Assert.AreEqual(false, p2.Data);
-            using var p3 = ability.GetParameter(2);
+            var p3 = ability.Parameters[2];
             Assert.AreEqual("foobar", p3.Data);
-            using var p4 = ability.GetParameter(3);
+            var p4 = ability.Parameters[3];
             Assert.AreEqual(true, p4.Data);
         }
     }

PkmnLibRSharpTests/StaticData/Libraries/StaticDataTests.cs

@@ -5,74 +5,79 @@ namespace PkmnLibRSharpTests.StaticData.Libraries
 {
     public class StaticDataTests
     {
+        private PkmnLibSharp.StaticData.Libraries.StaticData Build()
+        {
+            using var settings = new LibrarySettings(100);
+            using var species = new SpeciesLibrary(0);
+            using var moves = new MoveLibrary(0);
+            using var items = new ItemLibrary(0);
+            using var growthRates = new GrowthRateLibrary(0);
+            using var types = new TypeLibrary(0);
+            using var natures = new NatureLibrary(0);
+            using var abilities = new AbilityLibrary(0);
+            return new PkmnLibSharp.StaticData.Libraries.StaticData(settings, species, moves, items,
+                growthRates, types, natures, abilities);
+        }
+
         [Test]
         public void CreateNewStaticData()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var _ = Build();
         }
         
         [Test]
         public void GetSettings()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var library = Build();
             var _ = library.LibrarySettings;
         }
 
         [Test]
         public void GetSpecies()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var library = Build();
             var _ = library.SpeciesLibrary;
         }
 
         [Test]
         public void GetMoves()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var library = Build();
             var _ = library.MoveLibrary;
         }
 
         [Test]
         public void GetItems()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var library = Build();
             var _ = library.ItemLibrary;
         }
         
         [Test]
         public void GetGrowthRates()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var library = Build();
             var _ = library.GrowthRateLibrary;
         }
 
         [Test]
         public void GetTypeLibrary()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var library = Build();
             var _ = library.TypeLibrary;
         }
         
         [Test]
         public void GetNatureLibrary()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var library = Build();
             var _ = library.NatureLibrary;
         }
 
         [Test]
         public void GetAbilityLibrary()
         {
-            using var settings = new LibrarySettings(100);
-            using var library = new PkmnLibSharp.StaticData.Libraries.StaticData(settings);
+            using var library = Build();
             var _ = library.AbilityLibrary;
         }
     }