Merge pull request #113 from DnDGen/develop

10.5.0
DnDGen · Mar 10, 2023 · a609905 · a609905
2 parents a82269b + bdf5802
commit a609905
Show file tree

Hide file tree

Showing 91 changed files with 116 additions and 105 deletions.
diff --git a/DnDGen.TreasureGen.Tests.Integration.IoC/DnDGen.TreasureGen.Tests.Integration.IoC.csproj b/DnDGen.TreasureGen.Tests.Integration.IoC/DnDGen.TreasureGen.Tests.Integration.IoC.csproj
@@ -8,11 +8,11 @@
 
   <ItemGroup>
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...n.TreasureGen.Tests.Integration.Stress/DnDGen.TreasureGen.Tests.Integration.Stress.csproj b/...n.TreasureGen.Tests.Integration.Stress/DnDGen.TreasureGen.Tests.Integration.Stress.csproj
@@ -9,11 +9,11 @@
   <ItemGroup>
     <PackageReference Include="DnDGen.Stress" Version="3.4.0" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...n.TreasureGen.Tests.Integration.Tables/DnDGen.TreasureGen.Tests.Integration.Tables.csproj b/...n.TreasureGen.Tests.Integration.Tables/DnDGen.TreasureGen.Tests.Integration.Tables.csproj
@@ -7,13 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DnDGen.Infrastructure" Version="4.3.0" />
+    <PackageReference Include="DnDGen.Infrastructure" Version="4.3.1" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/DnDGen.TreasureGen.Tests.Integration/DnDGen.TreasureGen.Tests.Integration.csproj b/DnDGen.TreasureGen.Tests.Integration/DnDGen.TreasureGen.Tests.Integration.csproj
@@ -7,15 +7,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DnDGen.Infrastructure" Version="4.3.0" />
-    <PackageReference Include="DnDGen.RollGen" Version="15.4.2" />
+    <PackageReference Include="DnDGen.Infrastructure" Version="4.3.1" />
+    <PackageReference Include="DnDGen.RollGen" Version="15.5.0" />
     <PackageReference Include="Ninject" Version="3.3.6" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/DnDGen.TreasureGen.Tests.Unit/DnDGen.TreasureGen.Tests.Unit.csproj b/DnDGen.TreasureGen.Tests.Unit/DnDGen.TreasureGen.Tests.Unit.csproj
@@ -9,11 +9,11 @@
   <ItemGroup>
     <PackageReference Include="Moq" Version="4.18.4" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/DnDGen.TreasureGen.Tests.Unit/Generators/Items/Magical/ChargesGeneratorTests.cs b/DnDGen.TreasureGen.Tests.Unit/Generators/Items/Magical/ChargesGeneratorTests.cs
@@ -305,7 +305,7 @@ private void SetUpRoll(int lower, int upper, int result)
         {
             var mockPartial = new Mock<PartialRoll>();
             mockPartial.Setup(p => p.AsSum<int>()).Returns(result);
-            var roll = RollHelper.GetRollWithMostEvenDistribution(lower, upper);
+            var roll = RollHelper.GetRollWithMostEvenDistribution(lower, upper, true);
 
             mockDice.Setup(d => d.Roll(roll)).Returns(mockPartial.Object);
         }

diff --git a/DnDGen.TreasureGen.Tests.Unit/Tables/AmountConstantsTests.cs b/DnDGen.TreasureGen.Tests.Unit/Tables/AmountConstantsTests.cs
@@ -102,9 +102,20 @@ public class AmountConstantsTests
         [TestCase(AmountConstants.Range7d6, 7, 6)]
         public void RangeConstant(string constant, int quantity, int die, int multiplier = 1, int bonus = 0)
         {
-            var lower = quantity * multiplier + bonus;
-            var upper = quantity * die * multiplier + bonus;
-            var roll = RollHelper.GetRollWithFewestDice(lower, upper);
+            var roll = $"{quantity}d{die}";
+
+            if (bonus > 0)
+                roll += $"+{bonus}";
+
+            if (die == 1)
+                roll = quantity.ToString();
+
+            if (multiplier > 1)
+            {
+                var lower = quantity * multiplier + bonus;
+                var upper = quantity * die * multiplier + bonus;
+                roll = RollHelper.GetRollWithFewestDice(lower, upper);
+            }
 
             Assert.That(constant, Is.EqualTo(roll));
         }

diff --git a/DnDGen.TreasureGen/DnDGen.TreasureGen.csproj b/DnDGen.TreasureGen/DnDGen.TreasureGen.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0</TargetFrameworks>
-    <Version>10.4.0</Version>
+    <Version>10.5.0</Version>
     <Authors>Karl M. Speer</Authors>
     <Company>DnDGen</Company>
     <Product>TreasureGen</Product>
@@ -966,8 +966,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DnDGen.Infrastructure" Version="4.3.0" />
-    <PackageReference Include="DnDGen.RollGen" Version="15.4.2" />
+    <PackageReference Include="DnDGen.Infrastructure" Version="4.3.1" />
+    <PackageReference Include="DnDGen.RollGen" Version="15.5.0" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/DnDGen.TreasureGen/Generators/Items/Magical/ChargesGenerator.cs b/DnDGen.TreasureGen/Generators/Items/Magical/ChargesGenerator.cs
@@ -35,7 +35,7 @@ public int GenerateFor(string itemType, string name)
             }
 
             var result = rangeDataSelector.SelectFrom(TableNameConstants.Collections.Set.ChargeLimits, name);
-            var roll = RollHelper.GetRollWithMostEvenDistribution(result.Minimum, result.Maximum);
+            var roll = RollHelper.GetRollWithMostEvenDistribution(result.Minimum, result.Maximum, true);
 
             return dice.Roll(roll).AsSum();
         }

diff --git a/DnDGen.TreasureGen/Tables/AmountConstants.cs b/DnDGen.TreasureGen/Tables/AmountConstants.cs
@@ -58,8 +58,8 @@ internal static class AmountConstants
         public const string Range2d12 = "2d12";
         public const string Range2d12x10 = "20d12";
         public const string Range2d100 = "2d100";
-        public const string Range3d3 = "2d4+1";
-        public const string Range3d4 = "1d10+2";
+        public const string Range3d3 = "3d3";
+        public const string Range3d4 = "3d4";
         public const string Range3d4x10 = "10d10+20";
         public const string Range3d4x100 = "100d10+200";
         public const string Range3d4x1000 = "1000d10+2000";
@@ -94,6 +94,6 @@ internal static class AmountConstants
         public const string Range5d6x100 = "500d6";
         public const string Range6d4x100 = "200d10+400";
         public const string Range6d6 = "6d6";
-        public const string Range7d6 = "5d8+2";
+        public const string Range7d6 = "7d6";
     }
 }
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level100Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level100Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level20Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level20Goods.xml
@@ -13,7 +13,7 @@
     </percentile>
     <percentile>
         <lower>39</lower>
-        <content>Art,5d8+2</content>
+        <content>Art,7d6</content>
         <upper>100</upper>
     </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level21Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level21Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level22Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level22Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level23Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level23Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level24Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level24Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level25Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level25Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level26Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level26Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level27Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level27Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level28Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level28Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level29Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level29Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level30Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level30Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level31Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level31Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level32Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level32Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level33Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level33Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level34Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level34Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level35Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level35Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level36Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level36Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level37Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level37Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level38Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level38Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level39Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level39Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level40Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level40Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level41Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level41Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+	  <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>
diff --git a/DnDGen.TreasureGen/Tables/Goods/Levels/Level42Goods.xml b/DnDGen.TreasureGen/Tables/Goods/Levels/Level42Goods.xml
@@ -8,7 +8,7 @@
   </percentile>
   <percentile>
     <lower>39</lower>
-    <content>Art,5d8+2</content>
+    <content>Art,7d6</content>
     <upper>100</upper>
   </percentile>
 </percentiles>