Skip to content

Commit

Permalink
2.1.8
Browse files Browse the repository at this point in the history
  • Loading branch information
Critical-Impact committed Jan 7, 2025
1 parent c51e532 commit 52f2f74
Show file tree
Hide file tree
Showing 9 changed files with 25,924 additions and 6,360 deletions.
3,769 changes: 3,769 additions & 0 deletions src/LuminaSupplemental.Excel/Generated/GardeningCrossbreed.csv

Large diffs are not rendered by default.

10,870 changes: 5,434 additions & 5,436 deletions src/LuminaSupplemental.Excel/Generated/ItemSupplement.csv

Large diffs are not rendered by default.

1,843 changes: 921 additions & 922 deletions src/LuminaSupplemental.Excel/Generated/MobSpawn.csv

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/LuminaSupplemental.Excel/LuminaSupplemental.Excel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<PackageProjectUrl>https://github.com/Critical-Impact/LuminaSupplemental</PackageProjectUrl>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<RepositoryUrl>https://github.com/Critical-Impact/LuminaSupplemental</RepositoryUrl>
<PackageVersion>2.1.7</PackageVersion>
<FileVersion>2.1.7</FileVersion>
<PackageVersion>2.1.8</PackageVersion>
<FileVersion>2.1.8</FileVersion>
<Description>Supplemental data for lumina and dalamud plugins.</Description>
</PropertyGroup>

Expand Down Expand Up @@ -79,5 +79,6 @@
<EmbeddedResource Include="Generated\StoreItem.csv" />
<EmbeddedResource Include="Generated\HouseVendor.csv" />
<EmbeddedResource Include="Generated\FateItem.csv" />
<EmbeddedResource Include="Generated\GardeningCrossbreed.csv" />
</ItemGroup>
</Project>
58 changes: 58 additions & 0 deletions src/LuminaSupplemental.Excel/Model/GardeningCrossbreed.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
using System.Globalization;

using CsvHelper.Configuration.Attributes;

using Lumina.Data;
using Lumina.Excel;
using Lumina.Excel.Sheets;

namespace LuminaSupplemental.Excel.Model;

public class GardeningCrossbreed : ICsv
{
[Name("ItemResultId")] public uint ItemResultId { get; set; }
[Name("ItemRequirement1Id")] public uint ItemRequirement1Id { get; set; }
[Name("ItemRequirement2Id")] public uint ItemRequirement2Id { get; set; }

public RowRef<Item> ItemResult;

public RowRef<Item> ItemRequirement1;
public RowRef<Item> ItemRequirement2;

public GardeningCrossbreed(uint itemResultId, uint itemRequirement1Id, uint itemRequirement2Id )
{
ItemResultId = itemResultId;
ItemRequirement1Id = itemRequirement1Id;
ItemRequirement2Id = itemRequirement2Id;
}

public GardeningCrossbreed()
{

}

public void FromCsv(string[] lineData)
{
ItemResultId = uint.Parse( lineData[ 0 ] );
ItemRequirement1Id = uint.Parse( lineData[ 1 ] );
ItemRequirement2Id = uint.Parse( lineData[ 2 ] );
}

public string[] ToCsv()
{
return [ItemResultId.ToString(CultureInfo.InvariantCulture), ItemRequirement1Id.ToString(CultureInfo.InvariantCulture), ItemRequirement2Id.ToString(CultureInfo.InvariantCulture)
];
}

public bool IncludeInCsv()
{
return true;
}

public void PopulateData(ExcelModule gameData, Language language)
{
ItemResult = new RowRef<Item>( gameData, ItemResultId, language);
ItemRequirement1 = new RowRef<Item>( gameData, ItemRequirement1Id, language);
ItemRequirement2 = new RowRef<Item>( gameData, ItemRequirement2Id, language);
}
}
1 change: 1 addition & 0 deletions src/LuminaSupplemental.Excel/Services/CsvLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public static class CsvLoader
public const string StoreItemResourceName = "LuminaSupplemental.Excel.Generated.StoreItem.csv";
public const string HouseVendorResourceName = "LuminaSupplemental.Excel.Generated.HouseVendor.csv";
public const string FateItemResourceName = "LuminaSupplemental.Excel.Generated.FateItem.csv";
public const string GardeningCrossbreedResourceName = "LuminaSupplemental.Excel.Generated.GardeningCrossbreed.csv";

public static List< T > LoadResource<T>(string resourceName, out List<string> failedLines, out List<Exception> exceptions, GameData? gameData = null, Language? language = null) where T : ICsv, new()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
<None Update="config.ini">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="ManualData\Gardening\crossbreeding.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -99,6 +102,7 @@

<ItemGroup>
<Folder Include="DB" />
<Folder Include="ManualData\Gardening\" />
</ItemGroup>

<Target Condition="$([MSBuild]::IsOSPlatform('Windows'))" Name="CopyGenerated" AfterTargets="Build">
Expand Down
Loading

0 comments on commit 52f2f74

Please sign in to comment.