JonKazama-Hellion/Craftimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add Wachumeqimeqi collectabilities, update deps

Browse Source
This commit is contained in:
Asriel Camora
2024-07-26 18:14:59 -07:00
parent 4708a83020
commit 1587cbb148
8 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Benchmark/Craftimizer.Benchmark.csproj
+1 -1
View File
@@ -20,7 +20,7 @@
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.10" />
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.106">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.162">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Craftimizer/Craftimizer.csproj
+2 -2
View File
@@ -39,10 +39,10 @@
<ItemGroup>
<PackageReference Include="DalamudPackager" Version="2.1.13" />
<PackageReference Include="ExdSheets" Version="1.1.0" />
<PackageReference Include="ExdSheets" Version="1.2.2" />
<PackageReference Include="Lumina" Version="3.15.2" ExcludeAssets="all" />
<PackageReference Include="MathNet.Numerics" Version="5.0.0" />
<PackageReference Include="Meziantou.Analyzer" Version="2.0.159">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.162">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Craftimizer/LuminaSheets.cs
-5
View File
@@ -8,8 +8,6 @@ namespace Craftimizer.Plugin;
public static class LuminaSheets
{
public static readonly ExcelSheet<Recipe> RecipeSheet = Service.DataManager.GetExcelSheet<Recipe>()!;
public static readonly ExcelSheet<RecipeLevelTable> RecipeLevelTableSheet = Service.DataManager.GetExcelSheet<RecipeLevelTable>()!;
public static readonly ExcelSheet<ParamGrow> ParamGrowSheet = Service.DataManager.GetExcelSheet<ParamGrow>()!;
public static readonly ExcelSheet<Action> ActionSheet = Service.DataManager.GetExcelSheet<Action>()!;
public static readonly ExcelSheet<CraftAction> CraftActionSheet = Service.DataManager.GetExcelSheet<CraftAction>()!;
public static readonly ExcelSheet<Status> StatusSheet = Service.DataManager.GetExcelSheet<Status>()!;
@@ -23,10 +21,7 @@ public static class LuminaSheets
public static readonly ExcelSheet<Materia> MateriaSheet = Service.DataManager.GetExcelSheet<Materia>()!;
public static readonly ExcelSheet<BaseParam> BaseParamSheet = Service.DataManager.GetExcelSheet<BaseParam>()!;
public static readonly ExcelSheet<ItemFood> ItemFoodSheet = Service.DataManager.GetExcelSheet<ItemFood>()!;
public static readonly ExcelSheet<CollectablesShopRefine> CollectablesShopRefineSheet = Service.DataManager.GetExcelSheet<CollectablesShopRefine>()!;
public static readonly ExcelSheet<HWDCrafterSupply> HWDCrafterSupplySheet = Service.DataManager.GetExcelSheet<HWDCrafterSupply>()!;
public static readonly ExcelSheet<SatisfactionSupply> SatisfactionSupplySheet = Service.DataManager.GetExcelSheet<SatisfactionSupply>()!;
public static readonly ExcelSheet<SharlayanCraftWorksSupply> SharlayanCraftWorksSupplySheet = Service.DataManager.GetExcelSheet<SharlayanCraftWorksSupply>()!;
private static ConcurrentDictionary<(ExcelSheetImpl, uint), uint> SubRowCountCache { get; } = new();
public static uint? GetSubRowCount<T>(this ExcelSheet<T> sheet, uint row) where T : ExcelRow
Craftimizer/Utils/RecipeData.cs
+15 -6
View File
@@ -46,16 +46,16 @@ public sealed record RecipeData
ProgressDivider = Table.ProgressDivider,
};
CollectableThresholds = null;
int[]? thresholds = null;
if (Recipe.CollectableMetadata is LazyRow<CollectablesShopRefine> { Value: { } row })
CollectableThresholds = new int?[] { row.LowCollectability, row.MidCollectability, row.HighCollectability };
thresholds = [row.LowCollectability, row.MidCollectability, row.HighCollectability];
else if (Recipe.CollectableMetadata is LazyRow<HWDCrafterSupply> { Value: { } row2 })
{
foreach (var entry in row2.HWDCrafterSupplyParams)
{
if (entry.ItemTradeIn.Row == Recipe.ItemResult.Row)
{
CollectableThresholds = new int?[] { entry.BaseCollectableRating, entry.MidCollectableRating, entry.HighCollectableRating };
thresholds = [entry.BaseCollectableRating, entry.MidCollectableRating, entry.HighCollectableRating];
break;
}
}
@@ -72,7 +72,7 @@ public sealed record RecipeData
continue;
if (subRow.Item.Row == Recipe.ItemResult.Row)
{
CollectableThresholds = new int?[] { subRow.CollectabilityLow, subRow.CollectabilityMid, subRow.CollectabilityHigh };
thresholds = [subRow.CollectabilityLow, subRow.CollectabilityMid, subRow.CollectabilityHigh];
break;
}
}
@@ -82,13 +82,22 @@ public sealed record RecipeData
{
foreach (var item in row5.Item)
{
if (item.Id == Recipe.ItemResult.Row)
if (item.ItemId.Row == Recipe.ItemResult.Row)
{
CollectableThresholds = new int?[] { null, item.CollectabilityMid, item.CollectabilityHigh };
thresholds = [0, item.CollectabilityMid, item.CollectabilityHigh];
break;
}
}
}
else if (Recipe.CollectableMetadata is LazyRow<CollectablesRefine> { Value: { } row6 })
{
if (row6.CollectabilityHigh != 0)
thresholds = [row6.CollectabilityLow, row6.CollectabilityMid, row6.CollectabilityHigh];
else
thresholds = [0, row6.CollectabilityLow, row6.CollectabilityMid];
}
CollectableThresholds = thresholds?.Select<int, int?>(t => t == 0 ? null : t).ToArray();
Ingredients = Recipe.Ingredient.Zip(Recipe.AmountIngredient)
.Take(6)
Craftimizer/packages.lock.json
+21 -7
View File
@@ -10,9 +10,9 @@
},
"ExdSheets": {
"type": "Direct",
"requested": "[1.1.0, )",
"resolved": "1.1.0",
"contentHash": "Je/kV/jpZoIEmJVi1ICRnl1/ENB+nyFHX1KZUu3rkxMO8H9uJJ6CA1MdRiOD6OE6If1eGXAL1bLwEupC2Ikraw==",
"requested": "[1.2.2, )",
"resolved": "1.2.2",
"contentHash": "oS1oUBhlOpUWY1Wc3SwOLzfAMuSRzBn54I8p84euVUHrUEOzRZwA9vuNKNMAIY66eT1dpc/DxT+C7LNH0nK0jg==",
"dependencies": {
"Lumina": "3.15.2"
}
@@ -31,9 +31,22 @@
},
"Meziantou.Analyzer": {
"type": "Direct",
"requested": "[2.0.159, )",
"resolved": "2.0.159",
"contentHash": "+Lu4NktCK98/PkPCluTA+uRHS7uvMXa/Z2WLPE8TDsS/ybYtaOhfq8Wi745fO26wI8rNGaJlKsfFskcKWC5eDQ=="
"requested": "[2.0.162, )",
"resolved": "2.0.162",
"contentHash": "lU5ZkiNx6Jj++yYhkUkn2qsgl+PSfAy+BDFc0IkoVVeSCnmUOGBa0Eb1XzGLAeyAuIoz6vYN4J97Q/uiGdIkhw=="
},
"DotNext": {
"type": "Transitive",
"resolved": "5.8.0",
"contentHash": "5PwF7lUwgJKMcQRrMnFo8ilqrFq9OyaQ5Lq/zFHn0LahhLriNeySCPs08Zd15FdBV0G0KpZvPHBC8Rp1LIsrhg==",
"dependencies": {
"System.IO.Hashing": "8.0.0"
}
},
"System.IO.Hashing": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "ne1843evDugl0md7Fjzy6QjJrzsjh46ZKbhf8GwBXb5f/gw97J4bxMs0NQKifDuThh/f0bZ0e62NPl1jzTuRqA=="
},
"craftimizer.simulator": {
"type": "Project"
@@ -41,7 +54,8 @@
"craftimizer.solver": {
"type": "Project",
"dependencies": {
"Craftimizer.Simulator": "[1.0.0, )"
"Craftimizer.Simulator": "[1.0.0, )",
"DotNext": "[5.8.0, )"
}
}
}
Simulator/Craftimizer.Simulator.csproj
+1 -1
View File
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.106">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.162">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Solver/Craftimizer.Solver.csproj
+1
View File
@@ -11,6 +11,7 @@
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.106">
<PackageReference Include="Meziantou.Analyzer" Version="2.0.162">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Test/Craftimizer.Test.csproj
+4
View File
@@ -11,6 +11,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Meziantou.Analyzer" Version="2.0.162">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />